summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-18 07:18:22 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-18 07:18:22 +0000
commitfaa9d5eced17729f0a6edda4ba445dec26ca73a5 (patch)
tree4c5e938826a6135b577e5b0d2703276fe6d25f79
parent862bad2d2aa7eda686b41c050de22f049760f35a (diff)
* array.c: add logging feature for RGenGC's write barrier unprotect
event. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42038 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--array.c50
2 files changed, 55 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index db17d8e708..534775a1db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 18 16:16:17 2013 Koichi Sasada <ko1@atdot.net>
+
+ * array.c: add logging feature for RGenGC's write barrier unprotect
+ event.
+
Thu Jul 18 15:45:47 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/ruby.h (RUBY_SAFE_LEVEL_CHECK): make only
diff --git a/array.c b/array.c
index 3d387f33cd..6e071e6f17 100644
--- a/array.c
+++ b/array.c
@@ -11,6 +11,12 @@
**********************************************************************/
+#define RGENGC_UNPROTECT_LOGGING 0
+#if RGENGC_UNPROTECT_LOGGING
+static void ary_unprotect_logging(unsigned long x, const char *filename, int line);
+#define RGENGC_LOGGING_WB_UNPROTECT ary_unprotect_logging
+#endif
+
#include "ruby/ruby.h"
#include "ruby/util.h"
#include "ruby/st.h"
@@ -31,6 +37,45 @@ static ID id_cmp, id_div, id_power;
#define ARY_DEFAULT_SIZE 16
#define ARY_MAX_SIZE (LONG_MAX / (int)sizeof(VALUE))
+#if RGENGC_UNPROTECT_LOGGING
+static void ary_unprotect_logging(VALUE x, const char *filename, int line);
+static st_table *ary_unprotect_logging_table;
+
+static void
+ary_unprotect_logging(VALUE x, const char *filename, int line)
+{
+ if (OBJ_WB_PROTECTED(x)) {
+ char buff[0x100];
+ st_data_t cnt = 1;
+ char *ptr = buff;
+
+ snprintf(ptr, 0x100 - 1, "%s:%d", filename, line);
+
+ if (st_lookup(ary_unprotect_logging_table, (st_data_t)ptr, &cnt)) {
+ cnt++;
+ }
+ else {
+ ptr = (char *)malloc(strlen(buff) + 1);
+ strcpy(ptr, buff);
+ }
+ st_insert(ary_unprotect_logging_table, (st_data_t)ptr, cnt);
+ }
+}
+
+static int
+ary_unprotect_logging_exit_func_i(st_data_t key, st_data_t val)
+{
+ fprintf(stderr, "%s\t%d\n", (char *)key, (int)val);
+ return ST_CONTINUE;
+}
+
+static void
+ary_unprotect_logging_exit_func(void)
+{
+ st_foreach(ary_unprotect_logging_table, ary_unprotect_logging_exit_func_i, 0);
+}
+#endif
+
void
rb_mem_clear(register VALUE *mem, register long size)
{
@@ -5462,6 +5507,11 @@ Init_Array(void)
rb_cArray = rb_define_class("Array", rb_cObject);
rb_include_module(rb_cArray, rb_mEnumerable);
+#if RGENGC_UNPROTECT_LOGGING
+ ary_unprotect_logging_table = st_init_strtable();
+ atexit(ary_unprotect_logging_exit_func);
+#endif
+
rb_define_alloc_func(rb_cArray, empty_ary_alloc);
rb_define_singleton_method(rb_cArray, "[]", rb_ary_s_create, -1);
rb_define_singleton_method(rb_cArray, "try_convert", rb_ary_s_try_convert, 1);