Author: Matti Picus <[email protected]>
Branch: win32-vmprof
Changeset: r92985:e68720efe25c
Date: 2017-11-09 19:57 +0200
http://bitbucket.org/pypy/pypy/changeset/e68720efe25c/
Log: wip - shared files must be fixed upstream then pulled into here
diff --git a/rpython/rlib/rvmprof/src/rvmprof.h
b/rpython/rlib/rvmprof/src/rvmprof.h
--- a/rpython/rlib/rvmprof/src/rvmprof.h
+++ b/rpython/rlib/rvmprof/src/rvmprof.h
@@ -6,10 +6,8 @@
#define SINGLE_BUF_SIZE (8192 - 2 * sizeof(unsigned int))
#ifdef VMPROF_WINDOWS
-#include <crtdefs.h>
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-typedef intptr_t ssize_t;
+#include "shared/msiinttypes/inttypes.h"
+#include "shared/msiinttypes/stdint.h"
#else
#include <inttypes.h>
#include <stdint.h>
diff --git a/rpython/rlib/rvmprof/src/shared/vmprof_win.c
b/rpython/rlib/rvmprof/src/shared/vmprof_win.c
--- a/rpython/rlib/rvmprof/src/shared/vmprof_win.c
+++ b/rpython/rlib/rvmprof/src/shared/vmprof_win.c
@@ -1,4 +1,8 @@
#include "vmprof_win.h"
+#ifdef RPYTHON_VMPROF
+#include "common_header.h"
+#include "structdef.h" /* for struct pypy_threadlocal_s */
+#endif
volatile int thread_started = 0;
volatile int enabled = 0;
diff --git a/rpython/rlib/rvmprof/src/shared/vmprof_win.h
b/rpython/rlib/rvmprof/src/shared/vmprof_win.h
--- a/rpython/rlib/rvmprof/src/shared/vmprof_win.h
+++ b/rpython/rlib/rvmprof/src/shared/vmprof_win.h
@@ -1,10 +1,9 @@
#pragma once
+#include "compat.h"
#include "windows.h"
-#include "compat.h"
#include "vmp_stack.h"
#include <tlhelp32.h>
-
int prepare_concurrent_bufs(void);
// This file has been inspired (but not copied from since the LICENSE
diff --git a/rpython/rlib/rvmprof/test/test_rvmprof.py
b/rpython/rlib/rvmprof/test/test_rvmprof.py
--- a/rpython/rlib/rvmprof/test/test_rvmprof.py
+++ b/rpython/rlib/rvmprof/test/test_rvmprof.py
@@ -144,7 +144,9 @@
@pytest.fixture
def init(self, tmpdir):
- eci = ExternalCompilationInfo(compile_extra=['-g','-O0'],
+ compile_flags = []
+ #compile_flags = ['-g', '-O0']
+ eci = ExternalCompilationInfo(compile_extra=compile_flags,
separate_module_sources=["""
RPY_EXTERN int native_func(int d) {
int j = 0;
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
