Get pause/resume tests passing.

bforma · Jan 7, 2013 · c9d2c0a · c9d2c0a
1 parent 9af9bfd
commit c9d2c0a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/ext/ruby_prof/rp_stack.c b/ext/ruby_prof/rp_stack.c
@@ -100,7 +100,7 @@ prof_stack_pop(prof_stack_t *stack, double measurement)
   frame = --stack->ptr;
 
   /* Calculate the total time this method took */
-  //prof_frame_unpause(frame, measurement);
+  prof_frame_unpause(frame, measurement);
   total_time = measurement - frame->start_time - frame->dead_time;
   self_time = total_time - frame->child_time - frame->wait_time;
 

diff --git a/ext/ruby_prof/rp_thread.c b/ext/ruby_prof/rp_thread.c
@@ -179,25 +179,24 @@ switch_thread(void* prof, VALUE thread_id)
     return thread_data;
 }
 
-
 int pause_thread(st_data_t key, st_data_t value, st_data_t data) 
 {
     thread_data_t* thread_data = (thread_data_t *) value;
-    double measurement = (double) data;
+	prof_profile_t* profile = (prof_profile_t*)data;
 
     prof_frame_t* frame = prof_stack_peek(thread_data->stack);
-    prof_frame_pause(frame, measurement);
+	prof_frame_pause(frame, profile->measurement_at_pause_resume);
 
     return ST_CONTINUE;
 }
 
 int unpause_thread(st_data_t key, st_data_t value, st_data_t data) 
 {
     thread_data_t* thread_data = (thread_data_t *) value;
-    double measurement = (double) data;
+	prof_profile_t* profile = (prof_profile_t*)data;
 
     prof_frame_t* frame = prof_stack_peek(thread_data->stack);
-    prof_frame_unpause(frame, measurement);
+	prof_frame_unpause(frame, profile->measurement_at_pause_resume);
 
     return ST_CONTINUE;
 }