1 files changed, 101 insertions, 27 deletions

diff --git a/debug_counter.c b/debug_counter.c
index f17fb1c488..3dcc4c6a3a 100644
--- a/debug_counter.c
+++ b/debug_counter.c
@@ -9,21 +9,79 @@
 **********************************************************************/
 
 #include "debug_counter.h"
-#if USE_DEBUG_COUNTER
+#include "internal.h"
 #include <stdio.h>
 #include <locale.h>
-#include "internal.h"
+#include "ruby/thread_native.h"
+
+#if USE_DEBUG_COUNTER
 
-static const char *const debug_counter_names[] = {
-    ""
+const char *const rb_debug_counter_names[] = {
+#define DEBUG_COUNTER_NAME_EMPTY "" /* Suppress -Wstring-concatenation */
+    DEBUG_COUNTER_NAME_EMPTY
+#undef DEBUG_COUNTER_NAME_EMPTY
 #define RB_DEBUG_COUNTER(name) #name,
 #include "debug_counter.h"
 #undef RB_DEBUG_COUNTER
 };
 
-MJIT_SYMBOL_EXPORT_BEGIN
-size_t rb_debug_counter[numberof(debug_counter_names)];
-MJIT_SYMBOL_EXPORT_END
+size_t rb_debug_counter[numberof(rb_debug_counter_names)];
+void rb_debug_counter_add_atomic(enum rb_debug_counter_type type, int add);
+
+static rb_nativethread_lock_t debug_counter_lock;
+
+__attribute__((constructor))
+static void
+debug_counter_setup(void)
+{
+    rb_nativethread_lock_initialize(&debug_counter_lock);
+}
+
+void
+rb_debug_counter_add_atomic(enum rb_debug_counter_type type, int add)
+{
+    rb_nativethread_lock_lock(&debug_counter_lock);
+    {
+        rb_debug_counter[(int)type] += add;
+    }
+    rb_nativethread_lock_unlock(&debug_counter_lock);
+}
+
+static int debug_counter_disable_show_at_exit = 0;
+
+// note that this operation is not atomic.
+void
+ruby_debug_counter_reset(void)
+{
+    for (int i = 0; i < RB_DEBUG_COUNTER_MAX; i++) {
+        rb_debug_counter[i] = 0;
+    }
+}
+
+// note that this operation is not atomic.
+size_t
+ruby_debug_counter_get(const char **names_ptr, size_t *counters_ptr)
+{
+    int i;
+    if (names_ptr != NULL) {
+        for (i=0; i<RB_DEBUG_COUNTER_MAX; i++) {
+            names_ptr[i] = rb_debug_counter_names[i];
+        }
+    }
+    if (counters_ptr != NULL) {
+        for (i=0; i<RB_DEBUG_COUNTER_MAX; i++) {
+            counters_ptr[i] = rb_debug_counter[i];
+        }
+    }
+
+    return RB_DEBUG_COUNTER_MAX;
+}
+
+void
+ruby_debug_counter_show_at_exit(int enable)
+{
+    debug_counter_disable_show_at_exit = !enable;
+}
 
 void
 rb_debug_counter_show_results(const char *msg)
@@ -33,32 +91,28 @@ rb_debug_counter_show_results(const char *msg)
     setlocale(LC_NUMERIC, "");
 
     if (env == NULL || strcmp("1", env) != 0) {
-	int i;
+        int i;
         fprintf(stderr, "[RUBY_DEBUG_COUNTER]\t%d %s\n", getpid(), msg);
-	for (i=0; i<RB_DEBUG_COUNTER_MAX; i++) {
+        for (i=0; i<RB_DEBUG_COUNTER_MAX; i++) {
             fprintf(stderr, "[RUBY_DEBUG_COUNTER]\t%-30s\t%'14"PRIuSIZE"\n",
-		    debug_counter_names[i],
-		    rb_debug_counter[i]);
-	}
+                    rb_debug_counter_names[i],
+                    rb_debug_counter[i]);
+        }
     }
 }
 
 VALUE
-rb_debug_counter_reset(void)
+rb_debug_counter_show(RB_UNUSED_VAR(VALUE klass))
 {
-    for (int i = 0; i < RB_DEBUG_COUNTER_MAX; i++) {
-        switch (i) {
-          case RB_DEBUG_COUNTER_mjit_length_unit_queue:
-          case RB_DEBUG_COUNTER_mjit_length_active_units:
-          case RB_DEBUG_COUNTER_mjit_length_compact_units:
-          case RB_DEBUG_COUNTER_mjit_length_stale_units:
-            // These counters may be decreased and should not be reset.
-            break;
-          default:
-            rb_debug_counter[i] = 0;
-            break;
-        }
-    }
+    rb_debug_counter_show_results("show_debug_counters");
+    ruby_debug_counter_show_at_exit(FALSE);
+    return Qnil;
+}
+
+VALUE
+rb_debug_counter_reset(RB_UNUSED_VAR(VALUE klass))
+{
+    ruby_debug_counter_reset();
     return Qnil;
 }
 
@@ -66,11 +120,31 @@ __attribute__((destructor))
 static void
 debug_counter_show_results_at_exit(void)
 {
-    rb_debug_counter_show_results("normal exit.");
+    if (debug_counter_disable_show_at_exit == 0) {
+        rb_debug_counter_show_results("normal exit.");
+    }
 }
+
 #else
+
 void
 rb_debug_counter_show_results(const char *msg)
 {
 }
+
+size_t
+ruby_debug_counter_get(const char **names_ptr, size_t *counters_ptr)
+{
+    return 0;
+}
+void
+ruby_debug_counter_reset(void)
+{
+}
+
+void
+ruby_debug_counter_show_at_exit(int enable)
+{
+}
+
 #endif /* USE_DEBUG_COUNTER */