Author: Richard Plangger <[email protected]>
Branch:
Changeset: r91524:5a98d3aa0153
Date: 2017-06-05 08:04 -0400
http://bitbucket.org/pypy/pypy/changeset/5a98d3aa0153/
Log: adjust _vmprof.enable parameters to carry real_time over to the
vmprof C library
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
@@ -51,8 +51,8 @@
return OperationError(w_VMProfError, space.newtext(e.msg))
-@unwrap_spec(fileno=int, period=float, memory=int, lines=int, native=int)
-def enable(space, fileno, period, memory, lines, native):
+@unwrap_spec(fileno=int, period=float, memory=int, lines=int, native=int,
real_time=int)
+def enable(space, fileno, period, memory, lines, native, real_time):
"""Enable vmprof. Writes go to the given 'fileno', a file descriptor
opened for writing. *The file descriptor must remain open at least
until disable() is called.*
@@ -66,7 +66,7 @@
# "with vmprof will crash"),
# space.w_RuntimeWarning)
try:
- rvmprof.enable(fileno, period, memory, native)
+ rvmprof.enable(fileno, period, memory, native, real_time)
except rvmprof.VMProfError as e:
raise VMProfError(space, e)
diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -86,7 +86,7 @@
[rffi.INT, rffi.DOUBLE, rffi.INT, rffi.INT,
rffi.CCHARP, rffi.INT],
rffi.CCHARP, compilation_info=eci)
- vmprof_enable = rffi.llexternal("vmprof_enable", [rffi.INT, rffi.INT],
+ vmprof_enable = rffi.llexternal("vmprof_enable", [rffi.INT, rffi.INT,
rffi.INT],
rffi.INT,
compilation_info=eci,
save_err=rffi.RFFI_SAVE_ERRNO)
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
@@ -29,7 +29,7 @@
RPY_EXTERN char *vmprof_init(int fd, double interval, int memory,
int lines, const char *interp_name, int native);
RPY_EXTERN void vmprof_ignore_signals(int);
-RPY_EXTERN int vmprof_enable(int memory, int native);
+RPY_EXTERN int vmprof_enable(int memory, int native, int real_time);
RPY_EXTERN int vmprof_disable(void);
RPY_EXTERN int vmprof_register_virtual_function(char *, intptr_t, int);
RPY_EXTERN void* vmprof_stack_new(void);
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
