ruby-prof 0.17.0 → 0.18.0

data/ext/ruby_prof/rp_call_info.h

@@ -1,53 +1,53 @@
-/* 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_CALL_INFO_H__
-#define __RP_CALL_INFO_H__
-
-#include "rp_measure.h"
-#include "rp_method.h"
-
-extern VALUE cCallInfo;
-
-/* Callers and callee information for a method. */
-typedef struct prof_call_info_t
-{
-    prof_method_t *target; /* Use target instead of method to avoid conflict with Ruby method */
-    struct prof_call_info_t *parent;
-    st_table *call_infos;
-
-    double total_time;
-    double self_time;
-    double wait_time;
-
-    VALUE object;
-    VALUE children;
-
-    int called;
-
-    unsigned int recursive : 1;
-    unsigned int depth : 15;
-    unsigned int line : 16;
-} prof_call_info_t;
-
-/* Array of call_info objects */
-typedef struct prof_call_infos_t
-{
-    prof_call_info_t **start;
-    prof_call_info_t **end;
-    prof_call_info_t **ptr;
-    VALUE object;
-} prof_call_infos_t;
-
-
-void rp_init_call_info(void);
-prof_call_infos_t* prof_call_infos_create();
-void prof_call_infos_mark(prof_call_infos_t *call_infos);
-void prof_call_infos_free(prof_call_infos_t *call_infos);
-void prof_add_call_info(prof_call_infos_t *call_infos, prof_call_info_t *call_info);
-VALUE prof_call_infos_wrap(prof_call_infos_t *call_infos);
-prof_call_info_t * prof_call_info_create(prof_method_t* method, prof_call_info_t* parent);
-prof_call_info_t * call_info_table_lookup(st_table *table, const prof_method_key_t *key);
-size_t call_info_table_insert(st_table *table, const prof_method_key_t *key, prof_call_info_t *val);
-
-#endif //__RP_CALL_INFO_H__
+/* 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_CALL_INFO_H__
+#define __RP_CALL_INFO_H__
+
+#include "rp_measure.h"
+#include "rp_method.h"
+
+extern VALUE cCallInfo;
+
+/* Callers and callee information for a method. */
+typedef struct prof_call_info_t
+{
+    prof_method_t *target; /* Use target instead of method to avoid conflict with Ruby method */
+    struct prof_call_info_t *parent;
+    st_table *call_infos;
+
+    double total_time;
+    double self_time;
+    double wait_time;
+
+    VALUE object;
+    VALUE children;
+
+    int called;
+
+    unsigned int recursive : 1;
+    unsigned int depth : 15;
+    unsigned int line : 16;
+} prof_call_info_t;
+
+/* Array of call_info objects */
+typedef struct prof_call_infos_t
+{
+    prof_call_info_t **start;
+    prof_call_info_t **end;
+    prof_call_info_t **ptr;
+    VALUE object;
+} prof_call_infos_t;
+
+
+void rp_init_call_info(void);
+prof_call_infos_t* prof_call_infos_create();
+void prof_call_infos_mark(prof_call_infos_t *call_infos);
+void prof_call_infos_free(prof_call_infos_t *call_infos);
+void prof_add_call_info(prof_call_infos_t *call_infos, prof_call_info_t *call_info);
+VALUE prof_call_infos_wrap(prof_call_infos_t *call_infos);
+prof_call_info_t * prof_call_info_create(prof_method_t* method, prof_call_info_t* parent);
+prof_call_info_t * call_info_table_lookup(st_table *table, const prof_method_key_t *key);
+size_t call_info_table_insert(st_table *table, const prof_method_key_t *key, prof_call_info_t *val);
+
+#endif //__RP_CALL_INFO_H__

data/ext/ruby_prof/rp_measure.c

@@ -1,40 +1,40 @@
-/* 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 "ruby_prof.h"
-
-VALUE mMeasure;
-
-prof_measurer_t* prof_get_measurer(prof_measure_mode_t measure)
-{
-    switch (measure) {
-    case MEASURE_WALL_TIME:
-        return prof_measurer_wall_time();
-    case MEASURE_PROCESS_TIME:
-        return prof_measurer_process_time();
-    case MEASURE_CPU_TIME:
-        return prof_measurer_cpu_time();
-    case MEASURE_ALLOCATIONS:
-        return prof_measurer_allocations();
-    case MEASURE_MEMORY:
-        return prof_measurer_memory();
-    case MEASURE_GC_TIME:
-        return prof_measurer_gc_time();
-    case MEASURE_GC_RUNS:
-        return prof_measurer_gc_runs();
-    default:
-        rb_raise(rb_eArgError, "Unknown measure mode: %d", measure);
-    }
-};
-
-void rp_init_measure()
-{
-    mMeasure = rb_define_module_under(mProf, "Measure");
-    rp_init_measure_wall_time();
-    rp_init_measure_cpu_time();
-    rp_init_measure_process_time();
-    rp_init_measure_allocations();
-    rp_init_measure_memory();
-    rp_init_measure_gc_time();
-    rp_init_measure_gc_runs();
-}
+/* 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 "ruby_prof.h"
+
+VALUE mMeasure;
+
+prof_measurer_t* prof_get_measurer(prof_measure_mode_t measure)
+{
+    switch (measure) {
+    case MEASURE_WALL_TIME:
+        return prof_measurer_wall_time();
+    case MEASURE_PROCESS_TIME:
+        return prof_measurer_process_time();
+    case MEASURE_CPU_TIME:
+        return prof_measurer_cpu_time();
+    case MEASURE_ALLOCATIONS:
+        return prof_measurer_allocations();
+    case MEASURE_MEMORY:
+        return prof_measurer_memory();
+    case MEASURE_GC_TIME:
+        return prof_measurer_gc_time();
+    case MEASURE_GC_RUNS:
+        return prof_measurer_gc_runs();
+    default:
+        rb_raise(rb_eArgError, "Unknown measure mode: %d", measure);
+    }
+};
+
+void rp_init_measure()
+{
+    mMeasure = rb_define_module_under(mProf, "Measure");
+    rp_init_measure_wall_time();
+    rp_init_measure_cpu_time();
+    rp_init_measure_process_time();
+    rp_init_measure_allocations();
+    rp_init_measure_memory();
+    rp_init_measure_gc_time();
+    rp_init_measure_gc_runs();
+}

data/ext/ruby_prof/rp_measure.h

@@ -1,45 +1,45 @@
-/* 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_MEASUREMENT_H__
-#define __RP_MEASUREMENT_H__
-
-extern VALUE mMeasure;
-
-typedef double (*get_measurement)();
-
-typedef struct
-{
-    get_measurement measure;
-} prof_measurer_t;
-
-typedef enum
-{
-    MEASURE_WALL_TIME,
-    MEASURE_PROCESS_TIME,
-    MEASURE_CPU_TIME,
-    MEASURE_ALLOCATIONS,
-    MEASURE_MEMORY,
-    MEASURE_GC_TIME,
-    MEASURE_GC_RUNS,
-} prof_measure_mode_t;
-
-prof_measurer_t* prof_get_measurer(prof_measure_mode_t measure);
-prof_measurer_t* prof_measurer_allocations();
-prof_measurer_t* prof_measurer_cpu_time();
-prof_measurer_t* prof_measurer_gc_runs();
-prof_measurer_t* prof_measurer_gc_time();
-prof_measurer_t* prof_measurer_memory();
-prof_measurer_t* prof_measurer_process_time();
-prof_measurer_t* prof_measurer_wall_time();
-
-void rp_init_measure();
-void rp_init_measure_allocations();
-void rp_init_measure_cpu_time();
-void rp_init_measure_gc_runs();
-void rp_init_measure_gc_time();
-void rp_init_measure_memory();
-void rp_init_measure_process_time();
-void rp_init_measure_wall_time();
-
-#endif //__RP_MEASUREMENT_H__
+/* 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_MEASUREMENT_H__
+#define __RP_MEASUREMENT_H__
+
+extern VALUE mMeasure;
+
+typedef double (*get_measurement)();
+
+typedef struct
+{
+    get_measurement measure;
+} prof_measurer_t;
+
+typedef enum
+{
+    MEASURE_WALL_TIME,
+    MEASURE_PROCESS_TIME,
+    MEASURE_CPU_TIME,
+    MEASURE_ALLOCATIONS,
+    MEASURE_MEMORY,
+    MEASURE_GC_TIME,
+    MEASURE_GC_RUNS,
+} prof_measure_mode_t;
+
+prof_measurer_t* prof_get_measurer(prof_measure_mode_t measure);
+prof_measurer_t* prof_measurer_allocations();
+prof_measurer_t* prof_measurer_cpu_time();
+prof_measurer_t* prof_measurer_gc_runs();
+prof_measurer_t* prof_measurer_gc_time();
+prof_measurer_t* prof_measurer_memory();
+prof_measurer_t* prof_measurer_process_time();
+prof_measurer_t* prof_measurer_wall_time();
+
+void rp_init_measure();
+void rp_init_measure_allocations();
+void rp_init_measure_cpu_time();
+void rp_init_measure_gc_runs();
+void rp_init_measure_gc_time();
+void rp_init_measure_memory();
+void rp_init_measure_process_time();
+void rp_init_measure_wall_time();
+
+#endif //__RP_MEASUREMENT_H__

data/ext/ruby_prof/rp_measure_allocations.c

@@ -1,76 +1,76 @@
-/* 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 */
-
-/* :nodoc: */
-
-#include "ruby_prof.h"
-
-static VALUE cMeasureAllocations;
-
-#if defined(HAVE_RB_OS_ALLOCATED_OBJECTS)
-  unsigned LONG_LONG rb_os_allocated_objects();
-#endif
-
-#if defined(HAVE_RB_GC_STAT)
-size_t rb_gc_stat(VALUE key);
-
-#if RUBY_PROF_RUBY_VERSION >= 20200
-#define TOTAL_ALLOCATED_OBJECTS_STRING "total_allocated_objects"
-#else
-#define TOTAL_ALLOCATED_OBJECTS_STRING "total_allocated_object"
-#endif
-
-#endif
-
-static double
-measure_allocations()
-{
-#if defined(HAVE_RB_OS_ALLOCATED_OBJECTS)
-#define MEASURE_ALLOCATIONS_ENABLED Qtrue
-    return rb_os_allocated_objects();
-
-#elif defined(HAVE_RB_GC_STAT) && RUBY_PROF_RUBY_VERSION >= 20100
-#define MEASURE_ALLOCATIONS_ENABLED Qtrue
-    static VALUE total_alloc_symbol = 0;
-    if (!total_alloc_symbol) {
-      total_alloc_symbol = ID2SYM(rb_intern_const(TOTAL_ALLOCATED_OBJECTS_STRING));
-    }
-    return rb_gc_stat(total_alloc_symbol);
-
-#else
-#define MEASURE_ALLOCATIONS_ENABLED Qfalse
-    return 0;
-#endif
-}
-
-
-prof_measurer_t* prof_measurer_allocations()
-{
-  prof_measurer_t* measure = ALLOC(prof_measurer_t);
-  measure->measure = measure_allocations;
-  return measure;
-}
-
-/* call-seq:
-     measure -> int
-
-Returns the number of Ruby object allocations. */
-
-static VALUE
-prof_measure_allocations(VALUE self)
-{
-#if defined(HAVE_LONG_LONG)
-    return ULL2NUM(measure_allocations());
-#else
-    return ULONG2NUM(measure_allocations());
-#endif
-}
-
-void rp_init_measure_allocations()
-{
-    rb_define_const(mProf, "ALLOCATIONS", INT2NUM(MEASURE_ALLOCATIONS));
-    rb_define_const(mProf, "ALLOCATIONS_ENABLED", MEASURE_ALLOCATIONS_ENABLED);
-
-    cMeasureAllocations = rb_define_class_under(mMeasure, "Allocations", rb_cObject);
-    rb_define_singleton_method(cMeasureAllocations, "measure", prof_measure_allocations, 0);
-}
+/* 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 */
+
+/* :nodoc: */
+
+#include "ruby_prof.h"
+
+static VALUE cMeasureAllocations;
+
+#if defined(HAVE_RB_OS_ALLOCATED_OBJECTS)
+  unsigned LONG_LONG rb_os_allocated_objects();
+#endif
+
+#if defined(HAVE_RB_GC_STAT)
+size_t rb_gc_stat(VALUE key);
+
+#if RUBY_PROF_RUBY_VERSION >= 20200
+#define TOTAL_ALLOCATED_OBJECTS_STRING "total_allocated_objects"
+#else
+#define TOTAL_ALLOCATED_OBJECTS_STRING "total_allocated_object"
+#endif
+
+#endif
+
+static double
+measure_allocations()
+{
+#if defined(HAVE_RB_OS_ALLOCATED_OBJECTS)
+#define MEASURE_ALLOCATIONS_ENABLED Qtrue
+    return rb_os_allocated_objects();
+
+#elif defined(HAVE_RB_GC_STAT) && RUBY_PROF_RUBY_VERSION >= 20100
+#define MEASURE_ALLOCATIONS_ENABLED Qtrue
+    static VALUE total_alloc_symbol = 0;
+    if (!total_alloc_symbol) {
+      total_alloc_symbol = ID2SYM(rb_intern_const(TOTAL_ALLOCATED_OBJECTS_STRING));
+    }
+    return rb_gc_stat(total_alloc_symbol);
+
+#else
+#define MEASURE_ALLOCATIONS_ENABLED Qfalse
+    return 0;
+#endif
+}
+
+
+prof_measurer_t* prof_measurer_allocations()
+{
+  prof_measurer_t* measure = ALLOC(prof_measurer_t);
+  measure->measure = measure_allocations;
+  return measure;
+}
+
+/* call-seq:
+     measure -> int
+
+Returns the number of Ruby object allocations. */
+
+static VALUE
+prof_measure_allocations(VALUE self)
+{
+#if defined(HAVE_LONG_LONG)
+    return ULL2NUM(measure_allocations());
+#else
+    return ULONG2NUM(measure_allocations());
+#endif
+}
+
+void rp_init_measure_allocations()
+{
+    rb_define_const(mProf, "ALLOCATIONS", INT2NUM(MEASURE_ALLOCATIONS));
+    rb_define_const(mProf, "ALLOCATIONS_ENABLED", MEASURE_ALLOCATIONS_ENABLED);
+
+    cMeasureAllocations = rb_define_class_under(mMeasure, "Allocations", rb_cObject);
+    rb_define_singleton_method(cMeasureAllocations, "measure", prof_measure_allocations, 0);
+}

data/ext/ruby_prof/rp_measure_cpu_time.c

@@ -1,136 +1,136 @@
-/* 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 "ruby_prof.h"
-
-static VALUE cMeasureCpuTime;
-
-/* The _WIN32 check is needed for msys (and maybe cygwin?) */
-#if defined(_WIN32)
-
-static unsigned long long get_cpu_time()
-{
-    LARGE_INTEGER time;
-    QueryPerformanceCounter(&time);
-    return time.QuadPart;
-}
-
-static unsigned long long get_cpu_frequency()
-{
-    static unsigned long long cpu_frequency;
-
-    if(!cpu_frequency) {
-        LARGE_INTEGER cpu_frequency_struct;
-        QueryPerformanceFrequency(&cpu_frequency_struct);
-        cpu_frequency = cpu_frequency_struct.QuadPart;
-    }
-
-    return cpu_frequency;
-}
-
-static double measure_cpu_time()
-{
-    return ((double)get_cpu_time()) / get_cpu_frequency();
-}
-
-#else
-
-#include <sys/resource.h>
-#include <stdint.h>
-#include <time.h>
-
-static unsigned long long get_cpu_time()
-{
-#if defined(__i386__) || defined(__x86_64__)
-    uint32_t a, d;
-    __asm__ volatile("rdtsc" : "=a" (a), "=d" (d));
-    return ((uint64_t)d << 32) + a;
-#elif defined(__powerpc__) || defined(__ppc__)
-    unsigned long long x, y;
-
-    __asm__ __volatile__ ("\n\
-    1:  mftbu   %1\n\
-        mftb    %L0\n\
-        mftbu   %0\n\
-        cmpw    %0,%1\n\
-        bne-    1b"
-        : "=r" (x), "=r" (y));
-
-    return x;
-#endif
-}
-
-static unsigned long long get_cpu_frequency()
-{
-    static unsigned long long cpu_frequency;
-
-    if(!cpu_frequency) {
-        unsigned long long x, y;
-
-        struct timespec ts;
-        ts.tv_sec = 0;
-        ts.tv_nsec = 500000000;
-        x = get_cpu_time();
-        nanosleep(&ts, NULL);
-        y = get_cpu_time();
-        cpu_frequency = (y - x) * 2;
-    }
-
-    return cpu_frequency;
-}
-
-static double measure_cpu_time()
-{
-    struct rusage rusage;
-    getrusage(RUSAGE_SELF, &rusage);
-
-    double seconds = 0;
-
-    seconds += rusage.ru_utime.tv_sec;
-    seconds += rusage.ru_stime.tv_sec;
-
-    seconds += rusage.ru_utime.tv_usec / 1000000.0;
-    seconds += rusage.ru_stime.tv_usec / 1000000.0;
-
-    return seconds;
-}
-#endif
-
-
-prof_measurer_t* prof_measurer_cpu_time()
-{
-    prof_measurer_t* measure = ALLOC(prof_measurer_t);
-    measure->measure = measure_cpu_time;
-    return measure;
-}
-
-/* call-seq:
-   measure -> float
-
-Returns the cpu time.*/
-static VALUE
-prof_measure_cpu_time(VALUE self)
-{
-    return rb_float_new(measure_cpu_time());
-}
-
-/* call-seq:
-   cpu_frequency -> int
-
-Returns the cpu's frequency.  This value is needed when
-RubyProf::measure_mode is set to CPU_TIME. */
-static VALUE
-prof_get_cpu_frequency(VALUE self)
-{
-    return ULL2NUM(get_cpu_frequency());
-}
-
-void rp_init_measure_cpu_time()
-{
-    rb_define_const(mProf, "CPU_TIME", INT2NUM(MEASURE_CPU_TIME));
-    rb_define_const(mProf, "CPU_TIME_ENABLED", Qtrue);
-
-    cMeasureCpuTime = rb_define_class_under(mMeasure, "CpuTime", rb_cObject);
-    rb_define_singleton_method(cMeasureCpuTime, "measure", prof_measure_cpu_time, 0);
-    rb_define_singleton_method(cMeasureCpuTime, "frequency", prof_get_cpu_frequency, 0);
-}
+/* 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 "ruby_prof.h"
+
+static VALUE cMeasureCpuTime;
+
+/* The _WIN32 check is needed for msys (and maybe cygwin?) */
+#if defined(_WIN32)
+
+static unsigned long long get_cpu_time()
+{
+    LARGE_INTEGER time;
+    QueryPerformanceCounter(&time);
+    return time.QuadPart;
+}
+
+static unsigned long long get_cpu_frequency()
+{
+    static unsigned long long cpu_frequency;
+
+    if(!cpu_frequency) {
+        LARGE_INTEGER cpu_frequency_struct;
+        QueryPerformanceFrequency(&cpu_frequency_struct);
+        cpu_frequency = cpu_frequency_struct.QuadPart;
+    }
+
+    return cpu_frequency;
+}
+
+static double measure_cpu_time()
+{
+    return ((double)get_cpu_time()) / get_cpu_frequency();
+}
+
+#else
+
+#include <sys/resource.h>
+#include <stdint.h>
+#include <time.h>
+
+static unsigned long long get_cpu_time()
+{
+#if defined(__i386__) || defined(__x86_64__)
+    uint32_t a, d;
+    __asm__ volatile("rdtsc" : "=a" (a), "=d" (d));
+    return ((uint64_t)d << 32) + a;
+#elif defined(__powerpc__) || defined(__ppc__)
+    unsigned long long x, y;
+
+    __asm__ __volatile__ ("\n\
+    1:  mftbu   %1\n\
+        mftb    %L0\n\
+        mftbu   %0\n\
+        cmpw    %0,%1\n\
+        bne-    1b"
+        : "=r" (x), "=r" (y));
+
+    return x;
+#endif
+}
+
+static unsigned long long get_cpu_frequency()
+{
+    static unsigned long long cpu_frequency;
+
+    if(!cpu_frequency) {
+        unsigned long long x, y;
+
+        struct timespec ts;
+        ts.tv_sec = 0;
+        ts.tv_nsec = 500000000;
+        x = get_cpu_time();
+        nanosleep(&ts, NULL);
+        y = get_cpu_time();
+        cpu_frequency = (y - x) * 2;
+    }
+
+    return cpu_frequency;
+}
+
+static double measure_cpu_time()
+{
+    struct rusage rusage;
+    getrusage(RUSAGE_SELF, &rusage);
+
+    double seconds = 0;
+
+    seconds += rusage.ru_utime.tv_sec;
+    seconds += rusage.ru_stime.tv_sec;
+
+    seconds += rusage.ru_utime.tv_usec / 1000000.0;
+    seconds += rusage.ru_stime.tv_usec / 1000000.0;
+
+    return seconds;
+}
+#endif
+
+
+prof_measurer_t* prof_measurer_cpu_time()
+{
+    prof_measurer_t* measure = ALLOC(prof_measurer_t);
+    measure->measure = measure_cpu_time;
+    return measure;
+}
+
+/* call-seq:
+   measure -> float
+
+Returns the cpu time.*/
+static VALUE
+prof_measure_cpu_time(VALUE self)
+{
+    return rb_float_new(measure_cpu_time());
+}
+
+/* call-seq:
+   cpu_frequency -> int
+
+Returns the cpu's frequency.  This value is needed when
+RubyProf::measure_mode is set to CPU_TIME. */
+static VALUE
+prof_get_cpu_frequency(VALUE self)
+{
+    return ULL2NUM(get_cpu_frequency());
+}
+
+void rp_init_measure_cpu_time()
+{
+    rb_define_const(mProf, "CPU_TIME", INT2NUM(MEASURE_CPU_TIME));
+    rb_define_const(mProf, "CPU_TIME_ENABLED", Qtrue);
+
+    cMeasureCpuTime = rb_define_class_under(mMeasure, "CpuTime", rb_cObject);
+    rb_define_singleton_method(cMeasureCpuTime, "measure", prof_measure_cpu_time, 0);
+    rb_define_singleton_method(cMeasureCpuTime, "frequency", prof_get_cpu_frequency, 0);
+}