apply patches for pypy

Author: planrich

src/vmprof_common.c

@@ -3,6 +3,24 @@
 #include <assert.h>
 #include <errno.h>
 
+#ifdef RPYTHON_VMPROF
+#ifdef RPYTHON_LL2CTYPES
+   /* only for testing: ll2ctypes sets RPY_EXTERN from the command-line */
+
+#else
+#  include "common_header.h"
+#  include "structdef.h"
+#  include "src/threadlocal.h"
+#  include "rvmprof.h"
+#  include "forwarddecl.h"
+#endif
+#endif
+
+#ifdef VMP_SUPPORTS_NATIVE_PROFILING
+#include "vmp_stack.h" // reduces warings
+#endif
+
+
 static volatile int is_enabled = 0;
 static long prepare_interval_usec = 0;
 static long profile_interval_usec = 0;

src/vmprof_getpc.h

@@ -131,23 +131,21 @@ struct CallUnrollInfo {
 // typedef int ucontext_t;
 // #endif
 
-#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;
-//}
+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;
+}
 
 // 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
 
-#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
-//}
+static intptr_t GetPC(ucontext_t *signal_ucontext) {
+  return signal_ucontext->PC_FROM_UCONTEXT;   // defined in config.h
+}
 
 #endif
 

src/vmprof_memory.c

@@ -9,10 +9,13 @@
 
 static mach_port_t mach_task;
 #else
+#include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
 /* On '''normal''' Unices we can get RSS from '/proc/<pid>/status'. */
 static int proc_file = -1;
 #endif