M main.cpp → main.cpp

@@ -1,7 +1,10 @@ 
 #include <iostream>
 #include <unistd.h>
 #include <cstdlib>
-#include "tinydir.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string>
+#include <dirent.h>
 
 void panic(const char* msg){
     // escape sequences
@@ -13,36 +16,41 @@ struct meminfo{
     int total;
     int free;
     int available;
-    void get();
+    void loadinfo();
     int used(){return total-free;}
     int taken(){return total-available;}
 };
-void meminfo::get(){
+void meminfo::loadinfo() {
     FILE* file = fopen("/proc/meminfo", "r");
-    if(file == NULL) panic("ERROR: Unable to open proc file");
     int line, n = 0;
-    while(!feof(file)) {
-        char c = fgetc(file);
-        if (c > 47 && c < 58)(n*=10)+=c-48;
-        else if (c == 10) {
-            n/=1000;
-            switch(line){
-                case 0: total = n;
-                case 1: free = n;
-                case 2: available = n; break;
+    char c[81];
+    fread(c, 1, 81, file);
+    fclose(file);
+    for (int i = 0; i < 81; i++) {
+        if (c[i] > 47 && c[i] < 58)(n *= 10) += c[i] - 48;
+        else if (c[i] == 10) {
+            n /= 1000;
+            switch (line) {
+                case 0:
+                    total = n;
+                case 1:
+                    free = n;
+                case 2:
+                    available = n;
+                    break;
             }
             n = 0;
             line++;
         }
     }
-    fclose(file);
 }
 
 struct cpuinfo{
     int temp;
     int loadavg;
-    void get();
+    void loadinfo();
     int getloadavg();
+    int gettemp();
 };
 int cpuinfo::getloadavg() {
     long double a[4], b[4];
@@ -57,17 +65,32 @@ fscanf(fp,"%*s %Lf %Lf %Lf %Lf",&b[0],&b[1],&b[2],&b[3]);
     fclose(fp);
     return 100 * ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3]));
 }
-int cpuinfo::gettemp(){
+int cpuinfo::gettemp() {
+    struct dirent *item;
+    DIR *dir = opendir("/sys/class/thermal");
+    while ((item = readdir(dir))) {
+        if (strncmp(item->d_name, "thermal_zone", 12) != 0) continue;
+        printf("%s\n", item->d_name);
+    }
+}
 
-}
-void cpuinfo::get(){
+void cpuinfo::loadinfo(){
     loadavg = getloadavg();
-
+    temp = gettemp();
 }
 
 
 int main(){
     cpuinfo cpu;
-    cpu.get();
+    cpu.loadinfo();
     printf("CPU load: %d\n", cpu.loadavg);
+    printf("CPU temp: %d\n", cpu.temp);
+    meminfo mem;
+    mem.loadinfo();
+    printf("Memory used: %d\n", mem.used());
+    printf("Memory taken: %d\n", mem.taken());
+    printf("Memory free: %d\n", mem.free);
+    printf("Memory available: %d\n", mem.available);
+    printf("Memory total: %d\n", mem.total);
+    return 0;
 }