Author: Maciej Fijalkowski <[email protected]>
Branch: vmprof
Changeset: r76143:873a6476e1de
Date: 2015-02-25 19:45 +0200
http://bitbucket.org/pypy/pypy/changeset/873a6476e1de/
Log: remove the need for get_virtual_ip in pypy (that does nothing
anyway)
diff --git a/pypy/module/_vmprof/interp_vmprof.py
b/pypy/module/_vmprof/interp_vmprof.py
--- a/pypy/module/_vmprof/interp_vmprof.py
+++ b/pypy/module/_vmprof/interp_vmprof.py
@@ -28,14 +28,13 @@
libraries = ['unwind'],
post_include_bits=["""
- void* pypy_vmprof_get_virtual_ip(long);
void pypy_vmprof_init(void);
"""],
separate_module_sources=["""
void pypy_vmprof_init(void) {
vmprof_set_mainloop(pypy_execute_frame_trampoline, 0,
- pypy_vmprof_get_virtual_ip);
+ NULL);
}
"""],
)
@@ -104,10 +103,6 @@
return original_execute_frame(frame, w_inputvalue, operr)
[email protected]_lowlevel('main', [lltype.Signed],
- 'pypy_vmprof_get_virtual_ip', True)
-def get_virtual_ip(unique_id):
- return rffi.cast(rffi.VOIDP, unique_id)
def write_long_to_string_builder(l, b):
if sys.maxint == 2147483647:
diff --git a/pypy/module/_vmprof/src/vmprof.c b/pypy/module/_vmprof/src/vmprof.c
--- a/pypy/module/_vmprof/src/vmprof.c
+++ b/pypy/module/_vmprof/src/vmprof.c
@@ -176,7 +176,11 @@
void **arg_ptr = (void**)arg_addr;
// fprintf(stderr, "stacktrace mainloop: rsp %p &f2 %p offset
%ld\n",
// sp, arg_addr, mainloop_sp_offset);
- ip = mainloop_get_virtual_ip(*arg_ptr);
+ if (mainloop_get_virtual_ip) {
+ ip = mainloop_get_virtual_ip(*arg_ptr);
+ } else {
+ ip = *arg_ptr;
+ }
}
result[n++] = ip;
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
