ruby-prof 1.7.2 → 2.0.0

data/ext/ruby_prof/rp_measurement.h

@@ -1,53 +1,49 @@
-/* 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_measurementMENT_H__
-#define __rp_measurementMENT_H__
-
-#include "ruby_prof.h"
-
-extern VALUE mMeasure;
-
-typedef double (*get_measurement)(rb_trace_arg_t* trace_arg);
-
-typedef enum
-{
-    MEASURE_WALL_TIME,
-    MEASURE_PROCESS_TIME,
-    MEASURE_ALLOCATIONS,
-    MEASURE_MEMORY
-} prof_measure_mode_t;
-
-typedef struct prof_measurer_t
-{
-    get_measurement measure;
-    prof_measure_mode_t mode;
-    double multiplier;
-    bool track_allocations;
-} prof_measurer_t;
-
-/* Callers and callee information for a method. */
-typedef struct prof_measurement_t
-{
-    prof_owner_t owner;
-    double total_time;
-    double self_time;
-    double wait_time;
-    int called;
-    VALUE object;
-} prof_measurement_t;
-
-prof_measurer_t* prof_measurer_create(prof_measure_mode_t measure, bool track_allocations);
-double prof_measure(prof_measurer_t* measurer, rb_trace_arg_t* trace_arg);
-
-prof_measurement_t* prof_measurement_create(void);
-prof_measurement_t* prof_measurement_copy(prof_measurement_t* other);
-void prof_measurement_free(prof_measurement_t* measurement);
-VALUE prof_measurement_wrap(prof_measurement_t* measurement);
-prof_measurement_t* prof_get_measurement(VALUE self);
-void prof_measurement_mark(void* data);
-void prof_measurement_merge_internal(prof_measurement_t* destination, prof_measurement_t* other);
-
-void rp_init_measure(void);
-
-#endif //__rp_measurementMENT_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 */
+
+#pragma once
+
+#include "ruby_prof.h"
+
+extern VALUE mMeasure;
+
+typedef double (*get_measurement)(rb_trace_arg_t* trace_arg);
+
+typedef enum
+{
+    MEASURE_WALL_TIME,
+    MEASURE_PROCESS_TIME,
+    MEASURE_ALLOCATIONS
+} prof_measure_mode_t;
+
+typedef struct prof_measurer_t
+{
+    get_measurement measure;
+    prof_measure_mode_t mode;
+    double multiplier;
+    bool track_allocations;
+} prof_measurer_t;
+
+/* Callers and callee information for a method. */
+typedef struct prof_measurement_t
+{
+    prof_owner_t owner;
+    double total_time;
+    double self_time;
+    double wait_time;
+    int called;
+    VALUE object;
+} prof_measurement_t;
+
+prof_measurer_t* prof_measurer_create(prof_measure_mode_t measure, bool track_allocations);
+double prof_measure(prof_measurer_t* measurer, rb_trace_arg_t* trace_arg);
+
+prof_measurement_t* prof_measurement_create(void);
+prof_measurement_t* prof_measurement_copy(prof_measurement_t* other);
+void prof_measurement_free(prof_measurement_t* measurement);
+VALUE prof_measurement_wrap(prof_measurement_t* measurement);
+prof_measurement_t* prof_get_measurement(VALUE self);
+void prof_measurement_mark(void* data);
+void prof_measurement_merge_internal(prof_measurement_t* destination, prof_measurement_t* other);
+
+void rp_init_measure(void);

data/ext/ruby_prof/rp_method.c

@@ -157,6 +157,9 @@ prof_method_t* prof_method_create(struct prof_profile_t* profile, VALUE klass, V
 prof_method_t* prof_method_copy(prof_method_t* other)
 {
     prof_method_t* result = prof_method_create(other->profile, other->klass, other->method_name, other->source_file, other->source_line);
+
+    // Free the measurement created by prof_method_create before replacing it with the copy
+    prof_measurement_free(result->measurement);
     result->measurement = prof_measurement_copy(other->measurement);
 
     return result;

data/ext/ruby_prof/rp_method.h

@@ -1,8 +1,7 @@
 /* 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_METHOD_INFO__
-#define __RP_METHOD_INFO__
+#pragma once
 
 #include "ruby_prof.h"
 #include "rp_measurement.h"
@@ -62,5 +61,3 @@ void prof_method_mark(void* data);
 
 VALUE resolve_klass(VALUE klass, unsigned int* klass_flags);
 VALUE resolve_klass_name(VALUE klass, unsigned int* klass_flags);
-
-#endif //__RP_METHOD_INFO__

data/ext/ruby_prof/rp_profile.c

@@ -186,7 +186,7 @@ static void prof_trace(prof_profile_t* profile, rb_trace_arg_t* trace_arg, doubl
     const char* source_file_char = (source_file != Qnil ? StringValuePtr(source_file) : "");
 
     fprintf(trace_file, "%2lu:%2f %-8s %s#%s    %s:%2d\n",
-            FIX2ULONG(fiber), (double)measurement,
+            NUM2ULONG(rb_obj_id(fiber)), (double)measurement,
             event_name, class_name, method_name_char, source_file_char, source_line);
     fflush(trace_file);
     last_fiber = fiber;

data/ext/ruby_prof/rp_profile.h

@@ -1,8 +1,7 @@
 /* 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__
+#pragma once
 
 #include "ruby_prof.h"
 #include "rp_measurement.h"
@@ -31,6 +30,3 @@ typedef struct 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.h

@@ -1,53 +1,50 @@
-/* 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_tree.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 prof_frame_t
-{
-    /* Caching prof_method_t values significantly
-       increases performance. */
-    prof_call_tree_t* call_tree;
-
-    VALUE source_file;
-    unsigned int source_line;
-
-    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_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_stack_t
-{
-    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_frame_current(prof_stack_t* stack);
-prof_frame_t* prof_frame_push(prof_stack_t* stack, prof_call_tree_t* call_tree, double measurement, bool paused);
-prof_frame_t* prof_frame_unshift(prof_stack_t* stack, prof_call_tree_t* parent_call_tree, prof_call_tree_t* call_tree, double measurement);
-prof_frame_t* prof_frame_pop(prof_stack_t* stack, double measurement);
-prof_method_t* prof_find_method(prof_stack_t* stack, VALUE source_file, int source_line);
-
-#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 */
+
+#pragma once
+
+#include "ruby_prof.h"
+#include "rp_call_tree.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 prof_frame_t
+{
+    /* Caching prof_method_t values significantly
+       increases performance. */
+    prof_call_tree_t* call_tree;
+
+    VALUE source_file;
+    unsigned int source_line;
+
+    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;
+
+static inline bool prof_frame_is_paused(prof_frame_t* f) { return f->pause_time >= 0; }
+static inline bool prof_frame_is_unpaused(prof_frame_t* f) { return 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_stack_t
+{
+    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_frame_current(prof_stack_t* stack);
+prof_frame_t* prof_frame_push(prof_stack_t* stack, prof_call_tree_t* call_tree, double measurement, bool paused);
+prof_frame_t* prof_frame_unshift(prof_stack_t* stack, prof_call_tree_t* parent_call_tree, prof_call_tree_t* call_tree, double measurement);
+prof_frame_t* prof_frame_pop(prof_stack_t* stack, double measurement);
+prof_method_t* prof_find_method(prof_stack_t* stack, VALUE source_file, int source_line);

data/ext/ruby_prof/rp_thread.h

@@ -1,8 +1,7 @@
 /* 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_THREAD__
-#define __RP_THREAD__
+#pragma once
 
 #include "ruby_prof.h"
 #include "rp_stack.h"
@@ -35,5 +34,3 @@ void prof_thread_mark(void* data);
 void switch_thread(void* profile, thread_data_t* thread_data, double measurement);
 int pause_thread(st_data_t key, st_data_t value, st_data_t data);
 int unpause_thread(st_data_t key, st_data_t value, st_data_t data);
-
-#endif //__RP_THREAD__

data/ext/ruby_prof/ruby_prof.h

@@ -1,8 +1,7 @@
 /* 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 __RUBY_PROF_H__
-#define __RUBY_PROF_H__
+#pragma once
 
 #include <stdio.h>
 #include <stdbool.h>
@@ -31,5 +30,3 @@ typedef enum
   OWNER_C = 2
 } prof_owner_t;
 
-
-#endif //__RUBY_PROF_H__

data/ext/ruby_prof/vc/ruby_prof.vcxproj

@@ -29,21 +29,21 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -104,14 +104,14 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>C:\msys64\usr\local\ruby-3.4.3-mswin\include\ruby-3.4.0\x64-mswin64_140;C:\msys64\usr\local\ruby-3.4.3-mswin\include\ruby-3.4.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\msys64\usr\local\ruby-4.0.1-mswin\include\ruby-4.0.0\x64-mswin64_140;C:\msys64\usr\local\ruby-4.0.1-mswin\include\ruby-4.0.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>C:\msys64\usr\local\ruby-3.4.3-mswin\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>x64-vcruntime140-ruby340.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:\msys64\usr\local\ruby-4.0.1-mswin\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>x64-vcruntime140-ruby400.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>ruby_prof.def</ModuleDefinitionFile>
       <SubSystem>Console</SubSystem>
     </Link>
@@ -144,7 +144,6 @@
     <ClCompile Include="..\rp_call_trees.c" />
     <ClCompile Include="..\rp_measurement.c" />
     <ClCompile Include="..\rp_measure_allocations.c" />
-    <ClCompile Include="..\rp_measure_memory.c" />
     <ClCompile Include="..\rp_measure_process_time.c" />
     <ClCompile Include="..\rp_measure_wall_time.c" />
     <ClCompile Include="..\rp_method.c" />