Author: Maciej Fijalkowski <[email protected]>
Branch: vmprof
Changeset: r76671:2e6cd706e475
Date: 2015-04-01 12:36 +0200
http://bitbucket.org/pypy/pypy/changeset/2e6cd706e475/

Log:    tweaks and sync with upstream

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
@@ -84,6 +84,7 @@
     for(i=0; i<depth; i++)
         prof_word((long)stack[i]);
     write(profile_file, profile_write_buffer, profile_buffer_position);
+    profile_buffer_position = 0;
 }
 
 
@@ -220,7 +221,6 @@
 static void sigprof_handler(int sig_nr, siginfo_t* info, void *ucontext) {
     void* stack[MAX_STACK_DEPTH];
     int saved_errno = errno;
-       profile_buffer_position = 0;
     stack[0] = GetPC((ucontext_t*)ucontext);
     int depth = frame_forcer(get_stack_trace(stack+1, MAX_STACK_DEPTH-1, 
ucontext));
     depth++;  // To account for pc value in stack[0];
@@ -238,6 +238,7 @@
        if ((fd = dup(fd)) == -1) {
                return -1;
        }
+       profile_buffer_position = 0;
     profile_file = fd;
        if (write_header)
                prof_header(period_usec);
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to