Merge branch 'master' into freebsd

linux/LinuxProcessList.c

@@ -571,17 +571,13 @@ static bool LinuxProcessList_processEntries(ProcessList* this, const char* dirna
    return true;
 }
 
-void ProcessList_scan(ProcessList* this) {
-   unsigned long long int usertime, nicetime, systemtime, idletime;
+static inline void LinuxProcessList_scanMemoryInfo(ProcessList* this) {
    unsigned long long int swapFree = 0;
 
    FILE* file = fopen(PROCMEMINFOFILE, "r");
    if (file == NULL) {
       CRT_fatalError("Cannot open " PROCMEMINFOFILE);
    }
-   int cpus = this->cpuCount;
-   assert(cpus > 0);
-   {
    char buffer[128];
    while (fgets(buffer, 128, file)) {
 
@@ -610,16 +606,21 @@ void ProcessList_scan(ProcessList* this) {
          break;
       }
    }
-   }
 
    this->usedMem = this->totalMem - this->freeMem;
    this->usedSwap = this->totalSwap - swapFree;
    fclose(file);
+}
+
+static inline double LinuxProcessList_scanCPUTime(ProcessList* this) {
+   unsigned long long int usertime, nicetime, systemtime, idletime;
 
-   file = fopen(PROCSTATFILE, "r");
+   FILE* file = fopen(PROCSTATFILE, "r");
    if (file == NULL) {
       CRT_fatalError("Cannot open " PROCSTATFILE);
    }
+   int cpus = this->cpuCount;
+   assert(cpus > 0);
    for (int i = 0; i <= cpus; i++) {
       char buffer[256];
       int cpuid;
@@ -684,6 +685,14 @@ void ProcessList_scan(ProcessList* this) {
       cpuData->totalTime = totaltime;
    }
    double period = (double)this->cpus[0].totalPeriod / cpus; fclose(file);
+   return period;
+}
+
+void ProcessList_scan(ProcessList* this) {
+
+   LinuxProcessList_scanMemoryInfo(this);
+   
+   double period = LinuxProcessList_scanCPUTime(this);
 
    // mark all process as "dirty"
    for (int i = 0; i < Vector_size(this->processes); i++) {