Changeset 21d3542 for memlog.cpp

Timestamp:

06/02/15 16:50:48 (9 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master

Children:

6444e03

Parents:

192a260

git-author:

Hal Finkel <hfinkel@…> (06/02/15 16:50:48)

git-committer:

Hal Finkel <hfinkel@…> (06/02/15 16:50:48)

Message:

collect and report on mmap totals

File:

• memlog.cpp (modified) (6 diffs)

memlog.cpp

@@ -6 +6 @@
 #include <cstdio>
 #include <cstring>
+#include <cstdint>
 
 // NOTE: This source makes very minimal use of C++11 features. It can still be
@@ -29 +30 @@
 #ifdef __bgq__
 #include <spi/include/kernel/location.h>
+#include <spi/include/kernel/memory.h>
 #endif
 
@@ -45 +47 @@
 static char self_path[PATH_MAX+1] = { '\0' };
 
+#ifdef __bgq__
+int on_bgq = 0;
+#endif
+
+void *initial_brk = 0;
+
 __attribute__((__constructor__))
 static void record_init() {
@@ -54 +62 @@
   // If we're really running on a BG/Q compute node, use the job rank instead
   // of the pid because the node name might not really be globally unique.
-  if (!strcmp(u.sysname, "CNK") && !strcmp(u.machine, "BGQ"))
+  if (!strcmp(u.sysname, "CNK") && !strcmp(u.machine, "BGQ")) {
     id = (int) Kernel_GetRank();
+    on_bgq = 1;
+  }
 #endif
 
@@ -81 +91 @@
   const char *link_name = "/proc/self/exe";
   readlink(link_name, self_path, PATH_MAX);
+
+  initial_brk = sbrk(0);
 }
 
@@ -128 +140 @@
   fprintf(log_file, "\t%ld.%06ld %ld %ld", usage.ru_utime.tv_sec,
           usage.ru_utime.tv_usec, usage.ru_maxrss, syscall(SYS_gettid));
+
+  // Some other memory stats (like with maxrss, report these in KB).
+  size_t arena_size = ((size_t) sbrk(0)) - (size_t) initial_brk;
+
+  uint64_t mmap_size = 0;
+#ifdef __bgq__
+  if (on_bgq)
+    (void) Kernel_GetMemorySize(KERNEL_MEMSIZE_MMAP, &mmap_size);
+#endif
+
+  fprintf(log_file, " %ld %ld", arena_size >> 10, mmap_size >> 10);
 
   if (!show_backtrace)