vmprof_memory.c

Author: planrich

setup.py

@@ -75,6 +75,7 @@ def run(self):
                                'src/vmprof_unix.c',
                                'src/vmprof_common.c',
                                'src/vmprof_mt.c',
+                               'src/vmprof_memory.c',
                                ] + extra_source_files,
                            depends=[
                                'src/vmprof_unix.h',
@@ -84,6 +85,7 @@ def run(self):
                                'src/symboltable.h',
                                'src/machine.h',
                                'src/vmprof.h',
+                               'src/vmprof_memory.h',
                            ],
                            extra_compile_args=extra_compile_args,
                            libraries=libraries)]

src/rss_darwin.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#define _GNU_SOURCE 1
+
 #ifndef RPYTHON_VMPROF
 #include <Python.h>
 #endif

src/rss_unix.h

@@ -1,5 +1,8 @@
 #include "vmprof_common.h"
 
+#include <assert.h>
+#include <errno.h>
+
 static volatile int is_enabled = 0;
 static long prepare_interval_usec = 0;
 static long profile_interval_usec = 0;
@@ -149,7 +152,7 @@ void *volatile _PyThreadState_Current;
 
 #ifdef RPYTHON_VMPROF
 #ifndef RPYTHON_LL2CTYPES
-static PY_STACK_FRAME_T *get_vmprof_stack(void)
+PY_STACK_FRAME_T *get_vmprof_stack(void)
 {
     struct pypy_threadlocal_s *tl;
     _OP_THREADLOCALREF_ADDR_SIGHANDLER(tl);
@@ -159,7 +162,7 @@ static PY_STACK_FRAME_T *get_vmprof_stack(void)
         return tl->vmprof_tl_stack;
 }
 #else
-static PY_STACK_FRAME_T *get_vmprof_stack(void)
+PY_STACK_FRAME_T *get_vmprof_stack(void)
 {
     return 0;
 }

src/vmprof.h

@@ -15,6 +15,8 @@
 #include <pthread.h>
 #endif
 
+#include "vmprof_getpc.h"
+
 #ifdef VMPROF_LINUX
 #include <syscall.h>
 #endif

src/vmprof_common.c

@@ -131,20 +131,23 @@ struct CallUnrollInfo {
 // typedef int ucontext_t;
 // #endif
 
-static intptr_t GetPC(ucontext_t *signal_ucontext) {
-  // RAW_LOG(ERROR, "GetPC is not yet implemented on Windows\n");
-  fprintf(stderr, "GetPC is not yet implemented on Windows\n");
-  return NULL;
-}
+#define GetPC(__SIGNAL_UCONTEXT) (NULL)
+//inline intptr_t GetPC(ucontext_t *signal_ucontext) {
+//  // RAW_LOG(ERROR, "GetPC is not yet implemented on Windows\n");
+//  fprintf(stderr, "GetPC is not yet implemented on Windows\n");
+//  return NULL;
+//}
 
 // Normal cases.  If this doesn't compile, it's probably because
 // PC_FROM_UCONTEXT is the empty string.  You need to figure out
 // the right value for your system, and add it to the list in
 // vmrpof_config.h
 #else
-static intptr_t GetPC(ucontext_t *signal_ucontext) {
-  return signal_ucontext->PC_FROM_UCONTEXT;   // defined in config.h
-}
+
+#define GetPC(__SIGNAL_UCONTEXT) (__SIGNAL_UCONTEXT->PC_FROM_UCONTEXT)
+//inline intptr_t GetPC(ucontext_t *signal_ucontext) {
+//  return signal_ucontext->PC_FROM_UCONTEXT;   // defined in config.h
+//}
 
 #endif
 

src/vmprof_common.h

@@ -0,0 +1,78 @@
+#include "vmprof_memory.h"
+
+#ifdef VMPROF_APPLE
+/* On OS X we can get RSS using the Mach API. */
+#include <mach/mach.h>
+#include <mach/message.h>
+#include <mach/kern_return.h>
+#include <mach/task_info.h>
+
+static mach_port_t mach_task;
+#else
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+/* On '''normal''' Unices we can get RSS from '/proc/<pid>/status'. */
+static int proc_file = -1;
+#endif
+
+int setup_rss(void)
+{
+#ifdef VMPROF_LINUX
+    char buf[128];
+
+    sprintf(buf, "/proc/%d/status", getpid());
+    proc_file = open(buf, O_RDONLY);
+    return proc_file;
+#elif defined(VMPROF_APPLE)
+    mach_task = mach_task_self();
+    return 0;
+#else
+    return 0;
+#endif
+}
+
+int teardown_rss(void)
+{
+#ifdef VMPROF_LINUX
+    close(proc_file);
+    proc_file = -1;
+    return 0;
+#else
+    return 0;
+#endif
+}
+
+long get_current_proc_rss(void)
+{
+#ifdef VMPROF_LINUX
+    char buf[1024];
+    int i = 0;
+
+    if (lseek(proc_file, 0, SEEK_SET) == -1)
+        return -1;
+    if (read(proc_file, buf, 1024) == -1)
+        return -1;
+    while (i < 1020) {
+        if (strncmp(buf + i, "VmRSS:\t", 7) == 0) {
+            i += 7;
+            return atoi(buf + i);
+        }
+        i++;
+    }
+    return -1;
+#elif defined(VMPROF_APPLE)
+    mach_msg_type_number_t out_count = MACH_TASK_BASIC_INFO_COUNT;
+    mach_task_basic_info_data_t taskinfo = { .resident_size = 0 };
+
+    kern_return_t error = task_info(mach_task, MACH_TASK_BASIC_INFO, (task_info_t)&taskinfo, &out_count);
+    if (error == KERN_SUCCESS) {
+        return (long)(taskinfo.resident_size / 1024);
+    } else {
+        return -1;
+    }
+#else
+    return -1; // not implemented
+#endif
+}

src/vmprof_getpc.h

@@ -0,0 +1,5 @@
+#pragma once
+
+int setup_rss(void);
+int teardown_rss(void);
+long get_current_proc_rss(void);

src/vmprof_memory.c

@@ -1,6 +1,8 @@
 #include "vmprof_mt.h"
 /* Support for multithreaded write() operations (implementation) */
 
+#include <assert.h>
+
 #if defined(__i386__) || defined(__amd64__)
   static inline void write_fence(void) { asm("" : : : "memory"); }
 #else