ruby-prof 0.16.2 → 1.1.0

data/ext/ruby_prof/rp_profile.h

@@ -0,0 +1,37 @@
+/* Copyright (C) 2005-2019 Shugo Maeda <shugo@ruby-lang.org> and Charlie Savage <cfis@savagexi.com>
+   Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RP_PROFILE_H__
+#define __RP_PROFILE_H__
+
+#include "ruby_prof.h"
+#include "rp_measurement.h"
+#include "rp_thread.h"
+
+extern VALUE cProfile;
+
+typedef struct
+{
+    VALUE running;
+    VALUE paused;
+
+    prof_measurer_t* measurer;
+    VALUE threads;
+
+    VALUE tracepoints;
+
+    st_table* threads_tbl;
+    st_table* exclude_threads_tbl;
+    st_table* include_threads_tbl;
+    st_table* exclude_methods_tbl;
+    thread_data_t* last_thread_data;
+    double measurement_at_pause_resume;
+    bool allow_exceptions;
+    bool merge_fibers;
+} prof_profile_t;
+
+void rp_init_profile(void);
+prof_profile_t* prof_get_profile(VALUE self);
+
+
+#endif //__RP_PROFILE_H__

data/ext/ruby_prof/rp_stack.c

@@ -1,128 +1,196 @@
-/* Copyright (C) 2005-2013 Shugo Maeda <shugo@ruby-lang.org> and Charlie Savage <cfis@savagexi.com>
-   Please see the LICENSE file for copyright and distribution information */
-
-#include "rp_stack.h"
-
-#define INITIAL_STACK_SIZE 8
-
-void
-prof_frame_pause(prof_frame_t *frame, double current_measurement)
-{
-    if (frame && prof_frame_is_unpaused(frame))
-        frame->pause_time = current_measurement;
-}
-
-void
-prof_frame_unpause(prof_frame_t *frame, double current_measurement)
-{
-    if (frame && prof_frame_is_paused(frame)) {
-        frame->dead_time += (current_measurement - frame->pause_time);
-        frame->pause_time = -1;
-    }
-}
-
-
-/* Creates a stack of prof_frame_t to keep track
-   of timings for active methods. */
-prof_stack_t *
-prof_stack_create()
-{
-    prof_stack_t *stack = ALLOC(prof_stack_t);
-    stack->start = ALLOC_N(prof_frame_t, INITIAL_STACK_SIZE);
-    stack->ptr = stack->start;
-    stack->end = stack->start + INITIAL_STACK_SIZE;
-
-    return stack;
-}
-
-void
-prof_stack_free(prof_stack_t *stack)
-{
-    xfree(stack->start);
-    xfree(stack);
-}
-
-prof_frame_t *
-prof_stack_push(prof_stack_t *stack, double measurement)
-{
-  prof_frame_t* result = NULL;
-
-  /* Is there space on the stack?  If not, double
-     its size. */
-  if (stack->ptr == stack->end  )   
-  {
-    size_t len = stack->ptr - stack->start;
-    size_t new_capacity = (stack->end - stack->start) * 2;
-    REALLOC_N(stack->start, prof_frame_t, new_capacity);
-    /* Memory just got moved, reset pointers */
-    stack->ptr = stack->start + len;
-    stack->end = stack->start + new_capacity;
-  }
-
-  // Setup returned stack pointer to be valid
-  result = stack->ptr;
-  result->child_time = 0;
-  result->switch_time = 0;
-  result->wait_time = 0;
-  result->dead_time = 0;
-  result->depth = (int)(stack->ptr - stack->start); // shortening of 64 bit into 32
-  result->start_time = measurement;
-
-  // Increment the stack ptr for next time
-  stack->ptr++;
-
-  // Return the result
-  return result;
-}
-
-prof_frame_t *
-prof_stack_pop(prof_stack_t *stack, double measurement)
-{
-  prof_frame_t *frame = NULL;
-  prof_frame_t* parent_frame = NULL;
-  prof_call_info_t *call_info;
-
-  double total_time;
-  double self_time;
-
-  /* Frame can be null.  This can happen if RubProf.start is called from
-     a method that exits.  And it can happen if an exception is raised
-     in code that is being profiled and the stack unwinds (RubyProf is
-     not notified of that by the ruby runtime. */
-  if (stack->ptr == stack->start)
-    return NULL;
-  
-  frame = --stack->ptr;
-
-  /* Calculate the total time this method took */
-  prof_frame_unpause(frame, measurement);
-  total_time = measurement - frame->start_time - frame->dead_time;
-  self_time = total_time - frame->child_time - frame->wait_time;
-
-  /* Update information about the current method */
-  call_info = frame->call_info;
-  call_info->called++;
-  call_info->total_time += total_time;
-  call_info->self_time += self_time;
-  call_info->wait_time += frame->wait_time;
-
-  parent_frame = prof_stack_peek(stack);
-  if (parent_frame)
-  {
-      parent_frame->child_time += total_time;
-      parent_frame->dead_time += frame->dead_time;
-
-      call_info->line = parent_frame->line;
-  }
-
-  return frame;
-}
-
-prof_frame_t *
-prof_stack_peek(prof_stack_t *stack)
-{
-    if (stack->ptr == stack->start)
-      return NULL;
-    else
-      return stack->ptr - 1;
-}
+/* Copyright (C) 2005-2019 Shugo Maeda <shugo@ruby-lang.org> and Charlie Savage <cfis@savagexi.com>
+   Please see the LICENSE file for copyright and distribution information */
+
+#include "rp_stack.h"
+
+#define INITIAL_STACK_SIZE 32
+
+void
+prof_frame_pause(prof_frame_t *frame, double current_measurement)
+{
+    if (frame && prof_frame_is_unpaused(frame))
+        frame->pause_time = current_measurement;
+}
+
+void
+prof_frame_unpause(prof_frame_t *frame, double current_measurement)
+{
+    if (frame && prof_frame_is_paused(frame))
+    {
+        frame->dead_time += (current_measurement - frame->pause_time);
+        frame->pause_time = -1;
+    }
+}
+
+/* Creates a stack of prof_frame_t to keep track
+   of timings for active methods. */
+prof_stack_t *
+prof_stack_create()
+{
+    prof_stack_t *stack = ALLOC(prof_stack_t);
+    stack->start = ZALLOC_N(prof_frame_t, INITIAL_STACK_SIZE);
+    stack->ptr = stack->start;
+    stack->end = stack->start + INITIAL_STACK_SIZE;
+
+    return stack;
+}
+
+void
+prof_stack_free(prof_stack_t *stack)
+{
+    xfree(stack->start);
+    xfree(stack);
+}
+
+prof_frame_t *
+prof_stack_push(prof_stack_t *stack, prof_call_info_t *call_info, double measurement, int paused)
+{
+    prof_frame_t *result;
+    prof_frame_t* parent_frame;
+
+    /* Is there space on the stack?  If not, double
+     its size. */
+    if (stack->ptr == stack->end - 1)
+    {
+        size_t len = stack->ptr - stack->start;
+        size_t new_capacity = (stack->end - stack->start) * 2;
+        REALLOC_N(stack->start, prof_frame_t, new_capacity);
+
+        /* Memory just got moved, reset pointers */
+        stack->ptr = stack->start + len;
+        stack->end = stack->start + new_capacity;
+    }
+
+    parent_frame = stack->ptr;
+    stack->ptr++;
+
+    result = stack->ptr;
+    result->call_info = call_info;
+    result->call_info->depth = (int)(stack->ptr - stack->start); // shortening of 64 bit into 32;
+    result->passes = 0;
+
+    result->start_time = measurement;
+    result->pause_time = -1; // init as not paused.
+    result->switch_time = 0;
+    result->wait_time = 0;
+    result->child_time = 0;
+    result->dead_time = 0;
+    result->source_file = Qnil;
+    result->source_line = 0;
+
+    call_info->measurement->called++;
+    call_info->visits++;
+
+    if (call_info->method->visits > 0)
+    {
+        call_info->method->recursive = true;
+    }
+    call_info->method->measurement->called++;
+    call_info->method->visits++;
+
+    // Unpause the parent frame, if it exists.
+    // If currently paused then:
+    //   1) The child frame will begin paused.
+    //   2) The parent will inherit the child's dead time.
+    prof_frame_unpause(parent_frame, measurement);
+
+    if (paused)
+    {
+        prof_frame_pause(result, measurement);
+    }
+
+    // Return the result
+    return result;
+}
+
+prof_frame_t *
+prof_stack_pop(prof_stack_t *stack, double measurement)
+{
+  prof_frame_t *frame;
+  prof_frame_t *parent_frame;
+  prof_call_info_t *call_info;
+
+  double total_time;
+  double self_time;
+
+  if (stack->ptr == stack->start)
+      return NULL;
+
+  frame = stack->ptr;
+
+  /* Match passes until we reach the frame itself. */
+  if (prof_frame_is_pass(frame))
+  {
+    frame->passes--;
+    /* Additional frames can be consumed. See pop_frames(). */
+    return frame;
+  }
+
+  /* Consume this frame. */
+  stack->ptr--;
+
+  parent_frame = stack->ptr;
+
+  /* Calculate the total time this method took */
+  prof_frame_unpause(frame, measurement);
+  
+  total_time = measurement - frame->start_time - frame->dead_time;
+  self_time = total_time - frame->child_time - frame->wait_time;
+
+  /* Update information about the current method */
+  call_info = frame->call_info;
+
+  // Update method measurement
+  call_info->method->measurement->self_time += self_time;
+  call_info->method->measurement->wait_time += frame->wait_time;
+  if (call_info->method->visits == 1)
+    call_info->method->measurement->total_time += total_time;
+
+  call_info->method->visits--;
+
+  // Update method measurement
+  call_info->measurement->self_time += self_time;
+  call_info->measurement->wait_time += frame->wait_time;
+  if (call_info->visits == 1)
+      call_info->measurement->total_time += total_time;
+
+  call_info->visits--;
+
+  if (parent_frame)
+  {
+      parent_frame->child_time += total_time;
+      parent_frame->dead_time += frame->dead_time;
+  }
+
+  return frame;
+}
+
+prof_frame_t *
+prof_stack_pass(prof_stack_t *stack)
+{
+    prof_frame_t* frame = stack->ptr;
+    if (frame)
+    {
+        frame->passes++;
+    }
+    return frame;
+}
+
+prof_method_t*
+prof_find_method(prof_stack_t* stack, VALUE source_file, int source_line)
+{
+    prof_frame_t* frame = stack->ptr;
+    while (frame >= stack->start)
+    {
+        if (!frame->call_info)
+            return NULL;
+
+        if (rb_str_equal(source_file, frame->call_info->method->source_file) &&
+            source_line >= frame->call_info->method->source_line)
+        {
+            return frame->call_info->method;
+        }
+        frame--;
+    }
+    return NULL;
+}

data/ext/ruby_prof/rp_stack.h

@@ -1,51 +1,56 @@
-/* Copyright (C) 2005-2013 Shugo Maeda <shugo@ruby-lang.org> and Charlie Savage <cfis@savagexi.com>
-   Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RP_STACK__
-#define __RP_STACK__
-
-#include <ruby.h>
-
-#include "rp_measure.h"
-#include "rp_call_info.h"
-
-
-/* Temporary object that maintains profiling information
-   for active methods.  They are created and destroyed
-   as the program moves up and down its stack. */
-typedef struct 
-{
-    /* Caching prof_method_t values significantly
-       increases performance. */
-    prof_call_info_t *call_info;
-    double start_time;
-    double switch_time;  /* Time at switch to different thread */
-    double wait_time;
-    double child_time;
-    double pause_time; // Time pause() was initiated
-    double dead_time; // Time to ignore (i.e. total amount of time between pause/resume blocks)
-    int depth;
-    unsigned int line;
-} prof_frame_t;
-
-#define prof_frame_is_paused(f) (f->pause_time >= 0)
-#define prof_frame_is_unpaused(f) (f->pause_time < 0)
-void prof_frame_pause(prof_frame_t*, double current_measurement);
-void prof_frame_unpause(prof_frame_t*, double current_measurement);
-
-
-/* Current stack of active methods.*/
-typedef struct 
-{
-    prof_frame_t *start;
-    prof_frame_t *end;
-    prof_frame_t *ptr;
-} prof_stack_t;
-
-prof_stack_t * prof_stack_create();
-void prof_stack_free(prof_stack_t *stack);
-prof_frame_t * prof_stack_push(prof_stack_t *stack, double measurement);
-prof_frame_t * prof_stack_pop(prof_stack_t *stack, double measurement);
-prof_frame_t * prof_stack_peek(prof_stack_t *stack);
-
-#endif //__RP_STACK__
+/* Copyright (C) 2005-2019 Shugo Maeda <shugo@ruby-lang.org> and Charlie Savage <cfis@savagexi.com>
+   Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RP_STACK__
+#define __RP_STACK__
+
+#include "ruby_prof.h"
+#include "rp_call_info.h"
+
+/* Temporary object that maintains profiling information
+   for active methods.  They are created and destroyed
+   as the program moves up and down its stack. */
+typedef struct
+{
+    /* Caching prof_method_t values significantly
+       increases performance. */
+    prof_call_info_t *call_info;
+
+    VALUE source_file;
+    unsigned int source_line;
+    unsigned int passes; /* Count of "pass" frames, _after_ this one. */
+
+    double start_time;
+    double switch_time;  /* Time at switch to different thread */
+    double wait_time;
+    double child_time;
+    double pause_time; // Time pause() was initiated
+    double dead_time; // Time to ignore (i.e. total amount of time between pause/resume blocks)
+} prof_frame_t;
+
+#define prof_frame_is_real(f) ((f)->passes == 0)
+#define prof_frame_is_pass(f) ((f)->passes > 0)
+
+#define prof_frame_is_paused(f) (f->pause_time >= 0)
+#define prof_frame_is_unpaused(f) (f->pause_time < 0)
+
+void prof_frame_pause(prof_frame_t*, double current_measurement);
+void prof_frame_unpause(prof_frame_t*, double current_measurement);
+
+/* Current stack of active methods.*/
+typedef struct
+{
+    prof_frame_t *start;
+    prof_frame_t *end;
+    prof_frame_t *ptr;
+} prof_stack_t;
+
+prof_stack_t *prof_stack_create(void);
+void prof_stack_free(prof_stack_t *stack);
+
+prof_frame_t *prof_stack_push(prof_stack_t *stack, prof_call_info_t *call_info, double measurement, int paused);
+prof_frame_t *prof_stack_pop(prof_stack_t *stack, double measurement);
+prof_frame_t *prof_stack_pass(prof_stack_t *stack);
+prof_method_t *prof_find_method(prof_stack_t* stack, VALUE source_file, int source_line);
+
+#endif //__RP_STACK__