Switched to mallinfo for memory usage information

Author: kentavv

Build.cpp

@@ -383,7 +383,7 @@ int SolveEquations(SparseMatrix &SM, int cols, vector<Unique_basis_pair> &BPtoCo
                                     "truncated-dense-avx-float",
                                     "precompute-division-cache"};
 
-        vector<pair<double, size_t> > profiles[7];
+        vector<pair<double, int> > profiles[7];
         profiles[0] = memory_usage;
 
         for (int i = 0; i < nfuncs; i++) {
@@ -403,9 +403,9 @@ int SolveEquations(SparseMatrix &SM, int cols, vector<Unique_basis_pair> &BPtoCo
             profiles[i+1] = memory_usage;
         }
         for(int i=0; i<profiles[0].size(); i++) {
-            printf("%d:", i);
+            printf("Profile%07d:", i);
             for(int j=0; j<nfuncs+1; j++) {
-                printf("\t%.02f/%.02f", profiles[j][i].first, profiles[j][i].second/1024./1024.);
+                printf("\t%.02f/%.02f", profiles[j][i].first, profiles[j][i].second/1024.);
             }
             putchar('\n');
         }

Makefile

@@ -24,7 +24,7 @@ LDFLAGS=-fopenmp
 #LDFLAGS=-fopenmp -fprofile-use -fprofile-correction
 #LDFLAGS=-g -O3 -flto
 #LIBS=-lcurses -ltermcap -lm
-LIBS=-lreadline
+LIBS=-lreadline -lprocps
 
 C_FILES=$(wildcard *.c)
 CPP_FILES=$(wildcard *.cpp)

memory_usage.cpp

@@ -8,22 +8,29 @@
 
 #ifdef __linux__
 #include <proc/readproc.h>
+#include <malloc.h>
 #endif
 
 using std::vector;
 using std::fill;
 using std::pair;
 using std::make_pair;
 
-size_t memory_usage0;
+int memory_usage0;
 double t0;
-vector<pair<double, size_t> > memory_usage;
+vector<pair<double, int> > memory_usage;
 
-size_t current_memory_usage() {
+int current_memory_usage() {
 #ifdef __linux__
+#if 0
     proc_t usage;
     look_up_our_self(&usage);
     return usage.vsize;
+#else
+    struct mallinfo m = mallinfo();
+    //return m.arena;
+    return m.uordblks;
+#endif
 #else
     return 0;
 #endif

memory_usage.h

@@ -8,7 +8,7 @@
 
 #include <vector>
 
-extern std::vector<std::pair<double, size_t> > memory_usage;
+extern std::vector<std::pair<double, int> > memory_usage;
 
 void memory_usage_init(int n);