copy over changes made to pypy

Author: planrich

src/_vmprof.c

@@ -9,18 +9,18 @@
 #include <signal.h>
 
 #include "_vmprof.h"
-#include "vmprof_common.h"
 
+static volatile int is_enabled = 0;
 static destructor Original_code_dealloc = 0;
 static PyObject* (*_default_eval_loop)(PyFrameObject *, int) = 0;
 
 #if VMPROF_UNIX
 #include "trampoline.h"
 #include "machine.h"
 #include "symboltable.h"
-#include "vmprof_unix.h"
+#include "vmprof_main.h"
 #else
-#include "vmprof_win.h"
+#include "vmprof_main_win32.h"
 #endif
 #include "vmp_stack.h"
 
@@ -156,7 +156,7 @@ void emit_all_code_objects(PyObject * seen_code_ids)
 
 static void cpyprof_code_dealloc(PyObject *co)
 {
-    if (vmprof_is_enabled()) {
+    if (is_enabled) {
         emit_code_object((PyCodeObject *)co);
         /* xxx error return values are ignored */
     }
@@ -187,7 +187,7 @@ static PyObject *enable_vmprof(PyObject* self, PyObject *args)
         return NULL;
     }
 
-    if (vmprof_is_enabled()) {
+    if (is_enabled) {
         PyErr_SetString(PyExc_ValueError, "vmprof is already enabled");
         return NULL;
     }
@@ -217,13 +217,13 @@ static PyObject *enable_vmprof(PyObject* self, PyObject *args)
         return NULL;
     }
 
-    vmprof_set_enabled(1);
+    is_enabled = 1;
 
     Py_RETURN_NONE;
 }
 
 static PyObject * vmp_is_enabled(PyObject *module, PyObject *noargs) {
-    if (vmprof_is_enabled()) {
+    if (is_enabled) {
         Py_RETURN_TRUE;
     }
     Py_RETURN_FALSE;
@@ -237,7 +237,7 @@ disable_vmprof(PyObject *module, PyObject *noargs)
         return NULL;
     }
 
-    vmprof_set_enabled(0);
+    is_enabled = 0;
 
     if (PyErr_Occurred())
         return NULL;
@@ -362,7 +362,7 @@ start_sampling(PyObject *module, PyObject *noargs)
 #ifdef VMPROF_UNIX
 static PyObject * vmp_get_profile_path(PyObject *module, PyObject *noargs) {
     PyObject * o;
-    if (vmprof_is_enabled()) {
+    if (is_enabled) {
         char buffer[4096];
         buffer[0] = 0;
         ssize_t buffer_len = vmp_fd_to_path(vmp_profile_fileno(), buffer, 4096);
@@ -382,19 +382,21 @@ static PyObject *
 insert_real_time_thread(PyObject *module, PyObject * noargs) {
     ssize_t thread_count;
 
-    if (!vmprof_is_enabled()) {
+    if (!is_enabled) {
         PyErr_SetString(PyExc_ValueError, "vmprof is not enabled");
         return NULL;
     }
 
-    if (vmprof_get_signal_type() != SIGALRM) {
+    if (signal_type != SIGALRM) {
         PyErr_SetString(PyExc_ValueError, "vmprof is not in real time mode");
         return NULL;
     }
 
-    vmprof_aquire_lock();
+    while (__sync_lock_test_and_set(&spinlock, 1)) {
+    }
+
     thread_count = insert_thread(pthread_self(), -1);
-    vmprof_release_lock();
+    __sync_lock_release(&spinlock);
 
     return PyLong_FromSsize_t(thread_count);
 }
@@ -403,19 +405,21 @@ static PyObject *
 remove_real_time_thread(PyObject *module, PyObject * noargs) {
     ssize_t thread_count;
 
-    if (!vmprof_is_enabled()) {
+    if (!is_enabled) {
         PyErr_SetString(PyExc_ValueError, "vmprof is not enabled");
         return NULL;
     }
 
-    if (vmprof_get_signal_type() != SIGALRM) {
+    if (signal_type != SIGALRM) {
         PyErr_SetString(PyExc_ValueError, "vmprof is not in real time mode");
         return NULL;
     }
 
-    vmprof_aquire_lock();
+    while (__sync_lock_test_and_set(&spinlock, 1)) {
+    }
+
     thread_count = remove_thread(pthread_self(), -1);
-    vmprof_release_lock();
+    __sync_lock_release(&spinlock);
 
     return PyLong_FromSsize_t(thread_count);
 }

src/machine.c

@@ -27,8 +27,6 @@ const char * vmp_machine_os_name(void)
     #endif
 #elif __linux__
     return "linux";
-#elif __FreeBSD__
-    return "freebsd"
 #else
     #error "Unknown compiler"
 #endif
@@ -40,7 +38,7 @@ long vmp_fd_to_path(int fd, char * buffer, long buffer_len)
     char proffs[24];
     (void)snprintf(proffs, 24, "/proc/self/fd/%d", fd);
     return readlink(proffs, buffer, buffer_len);
-#elif defined(VMPROF_UNIX) && !defined(__FreeBSD__)
+#elif defined(VMPROF_UNIX)
     fcntl(fd, F_GETPATH, buffer);
     return strlen(buffer);
 #endif

src/vmp_stack.c

@@ -523,7 +523,7 @@ static void * libhandle = NULL;
 
 int vmp_native_enable(void) {
 #ifdef VMPROF_LINUX
-    if (libhandle == NULL) {
+    if (!unw_get_reg) {
         if ((libhandle = dlopen(LIBUNWIND, RTLD_LAZY | RTLD_LOCAL)) == NULL) {
             goto bail_out;
         }
@@ -570,7 +570,6 @@ void vmp_native_disable(void) {
             vmprof_error = dlerror();
             fprintf(stderr, "could not close libunwind at runtime. error: %s\n", vmprof_error);
         }
-        libhandle = NULL;
     }
 
     vmp_native_traces_enabled = 0;

src/vmprof.h

@@ -1,11 +1,5 @@
 #pragma once
 
-#define _GNU_SOURCE 1
-
-#ifndef RPYTHON_VMPROF
-#include <Python.h>
-#endif
-
 #ifdef VMPROF_UNIX
 #include <unistd.h>
 #endif
@@ -85,7 +79,3 @@ int IS_VMPROF_EVAL(void * ptr);
 
 #endif
 
-void set_current_codes(void * to);
-int opened_profile(const char *interp_name, int memory, int proflines, int native, int real_time);
-void flush_codes(void);
-