exhq/neowofetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New ram usage "calculator" (#178)

Browse source
This commit is contained in:
TheDarkBug 2021-12-26 21:33:23 +01:00
parent a03fdc506a
commit f023da2459
1 changed files with 42 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
uwufetch.c
View file

@ -683,12 +683,29 @@ int print_cache(struct configuration* config_flags, struct info* user_info) {
#ifdef __FREEBSD__ #ifdef __FREEBSD__
meminfo = popen("LANG=EN_us freecolor -om 2> /dev/null", "r"); // free alternative meminfo = popen("LANG=EN_us freecolor -om 2> /dev/null", "r"); // free alternative
#else #else
meminfo = popen("LANG=EN_us free -m 2> /dev/null", "r"); // using free to get // getting memory info from /proc/meminfo: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716
meminfo = fopen("/proc/meminfo", "r"); // popen("LANG=EN_us free -m 2> /dev/null", "r"); // get ram info with free
#endif #endif
char line[256]; // brackets are here to restrict the access to this int variables, which are temporary
while (fgets(line, sizeof(line), meminfo)) // reading free output {
// free command prints like this: "Mem:" total used free shared buff/cache available char buffer[256];
sscanf(line, "Mem: %d %d", &user_info->ram_total, &user_info->ram_used); int memtotal = 0, shmem = 0, memfree = 0, buffers = 0, cached = 0, sreclaimable = 0;
while (fgets(buffer, sizeof(buffer), meminfo)) {
sscanf(buffer, "MemTotal: %d", &memtotal);
sscanf(buffer, "Shmem: %d", &shmem);
sscanf(buffer, "MemFree: %d", &memfree);
sscanf(buffer, "Buffers: %d", &buffers);
sscanf(buffer, "Cached: %d", &cached);
sscanf(buffer, "SReclaimable: %d", &sreclaimable);
}
user_info->ram_total = memtotal / 1024;
user_info->ram_used = ((memtotal + shmem) - (memfree + buffers + cached + sreclaimable)) / 1024;
}
// char line[256];
// while (fgets(line, sizeof(line), meminfo)) // old way to get ram usage that uses the "free" command
// // free command prints like this: "Mem:" total used free shared buff/cache available
// sscanf(line, "Mem: %d %d", &user_info->ram_total, &user_info->ram_used);
fclose(meminfo); fclose(meminfo);
#elif defined(_WIN32) #elif defined(_WIN32)
FILE* mem_used_fp; FILE* mem_used_fp;
@ -1114,11 +1131,27 @@ struct info get_info()
#ifdef __FREEBSD__ #ifdef __FREEBSD__
meminfo = popen("LANG=EN_us freecolor -om 2> /dev/null", "r"); // free alternative for freebsd meminfo = popen("LANG=EN_us freecolor -om 2> /dev/null", "r"); // free alternative for freebsd
#else #else
meminfo = popen("LANG=EN_us free -m 2> /dev/null", "r"); // get ram info with free // getting memory info from /proc/meminfo: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716
meminfo = fopen("/proc/meminfo", "r"); // popen("LANG=EN_us free -m 2> /dev/null", "r"); // get ram info with free
#endif #endif
while (fgets(buffer, sizeof(buffer), meminfo)) // brackets are here to restrict the access to this int variables, which are temporary
// free command prints like this: "Mem:" total used free shared buff/cache available {
sscanf(buffer, "Mem: %d %d", &user_info.ram_total, &user_info.ram_used); int memtotal = 0, shmem = 0, memfree = 0, buffers = 0, cached = 0, sreclaimable = 0;
while (fgets(buffer, sizeof(buffer), meminfo)) {
sscanf(buffer, "MemTotal: %d", &memtotal);
sscanf(buffer, "Shmem: %d", &shmem);
sscanf(buffer, "MemFree: %d", &memfree);
sscanf(buffer, "Buffers: %d", &buffers);
sscanf(buffer, "Cached: %d", &cached);
sscanf(buffer, "SReclaimable: %d", &sreclaimable);
}
user_info.ram_total = memtotal / 1024;
user_info.ram_used = ((memtotal + shmem) - (memfree + buffers + cached + sreclaimable)) / 1024;
}
// while (fgets(buffer, sizeof(buffer), meminfo)) // old way to get ram usage that uses the "free" command
// // free command prints like this: "Mem:" total used free shared buff/cache available
// sscanf(buffer, "Mem: %d %d", &user_info.ram_total, &user_info.ram_used);
fclose(meminfo); fclose(meminfo);
#endif #endif
#else // if __APPLE__ #else // if __APPLE__