merge revision(s) 15429, 15471:

shyouhei · shyouhei · commit 432ec4f2c4fd · 2008-06-13T04:12:35.000Z
* gc.c (rb_newobj): prohibit call of rb_newobj() during gc. Submitted by Sylvain Joyeux [ruby-core:12099]. * ext/dl/ptr.c: do not use LONG2NUM() inside dlptr_free(). Slightly modified fix bassed on a patch by Sylvain Joyeux [ruby-core:12099] [ ruby-bugs-11859 ] [ ruby-bugs-11882 ] [ ruby-patches-13151 ]. * ext/dl/ptr.c (dlmem_each_i): typo fixed. a patch from IKOMA Yoshiki <ikoma@mb.i-chubu.ne.jp> in [ruby-dev:33776]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,18 @@
+Fri Jun 13 13:10:12 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/dl/ptr.c (dlmem_each_i): typo fixed.  a patch from IKOMA
+	  Yoshiki <ikoma@mb.i-chubu.ne.jp> in [ruby-dev:33776].
+
+Fri Jun 13 12:10:58 2008  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+
+	* gc.c (rb_newobj): prohibit call of rb_newobj() during gc.
+	  Submitted by Sylvain Joyeux [ruby-core:12099].
+
+	* ext/dl/ptr.c: do not use LONG2NUM() inside dlptr_free().
+	  Slightly modified fix bassed on a patch by Sylvain Joyeux
+	  [ruby-core:12099] [ ruby-bugs-11859 ] [ ruby-bugs-11882 ]
+	  [ ruby-patches-13151 ].
+
 Fri Jun 13 12:09:02 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/benchmark.rb (Job::Benchmark#item): fix typo.
diff --git a/ext/dl/ptr.c b/ext/dl/ptr.c
@@ -4,30 +4,22 @@
 
 #include <ruby.h>
 #include <ctype.h>
-#include <version.h> /* for ruby version code */
+#include "st.h"
 #include "dl.h"
 
 VALUE rb_cDLPtrData;
 VALUE rb_mDLMemorySpace;
-static VALUE DLMemoryTable;
+static st_table* st_memory_table;
 
 #ifndef T_SYMBOL
 # define T_SYMBOL T_FIXNUM
 #endif
 
-#if RUBY_VERSION_CODE < 171
-static VALUE
-rb_hash_delete(VALUE hash, VALUE key)
-{
-  return rb_funcall(hash, rb_intern("delete"), 1, key);
-}
-#endif
-
 static void
 rb_dlmem_delete(void *ptr)
 {
   rb_secure(4);
-  rb_hash_delete(DLMemoryTable, DLLONG2NUM(ptr));
+  st_delete(st_memory_table, (st_data_t*)&ptr, NULL);
 }
 
 static void
@@ -37,7 +29,7 @@ rb_dlmem_aset(void *ptr, VALUE obj)
     rb_dlmem_delete(ptr);
   }
   else{
-    rb_hash_aset(DLMemoryTable, DLLONG2NUM(ptr), DLLONG2NUM(obj));
+    st_insert(st_memory_table, (st_data_t)ptr, (st_data_t)obj);
   }
 }
 
@@ -46,8 +38,8 @@ rb_dlmem_aref(void *ptr)
 {
   VALUE val;
 
-  val = rb_hash_aref(DLMemoryTable, DLLONG2NUM(ptr));
-  return val == Qnil ? Qnil : (VALUE)DLNUM2LONG(val);
+  if(!st_lookup(st_memory_table, (st_data_t)ptr, &val)) return Qnil;
+  return val == Qundef ? Qnil : val;
 }
 
 void
@@ -1010,20 +1002,18 @@ rb_dlptr_size(int argc, VALUE argv[], VALUE self)
   }
 }
 
-static VALUE
-dlmem_each_i(VALUE assoc, void *data)
+static int
+dlmem_each_i(void* key, VALUE value, void* arg)
 {
-  VALUE key, val;
-  key = rb_ary_entry(assoc, 0);
-  val = rb_ary_entry(assoc, 1);
-  rb_yield(rb_assoc_new(key,(VALUE)DLNUM2LONG(val)));
+  VALUE vkey = DLLONG2NUM(key);
+  rb_yield(rb_assoc_new(vkey, value));
   return Qnil;
 }
 
 VALUE
 rb_dlmem_each(VALUE self)
 {
-  rb_iterate(rb_each, DLMemoryTable, dlmem_each_i, 0);
+  st_foreach(st_memory_table, dlmem_each_i, 0);
   return Qnil;
 }
 
@@ -1062,7 +1052,7 @@ Init_dlptr()
   rb_define_method(rb_cDLPtrData, "size=", rb_dlptr_size, -1);
 
   rb_mDLMemorySpace = rb_define_module_under(rb_mDL, "MemorySpace");
-  DLMemoryTable = rb_hash_new();
-  rb_define_const(rb_mDLMemorySpace, "MemoryTable", DLMemoryTable);
+  st_memory_table = st_init_numtable();
+  rb_define_const(rb_mDLMemorySpace, "MemoryTable", Qnil); /* historical */
   rb_define_module_function(rb_mDLMemorySpace, "each", rb_dlmem_each, 0);
 }
diff --git a/gc.c b/gc.c
@@ -392,6 +392,9 @@ rb_newobj()
 {
     VALUE obj;
 
+    if (during_gc)
+	rb_bug("object allocation during garbage collection phase");
+
     if (!freelist) garbage_collect();
 
     obj = (VALUE)freelist;
diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-13"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080613
-#define RUBY_PATCHLEVEL 173
+#define RUBY_PATCHLEVEL 174
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

Original file line number	Diff line number	Diff line change
`@@ -4,30 +4,22 @@`
`4`	`4`
`5`	`5`	`#include <ruby.h>`
`6`	`6`	`#include <ctype.h>`
`7`		`-#include <version.h> /* for ruby version code */`
	`7`	`+#include "st.h"`
`8`	`8`	`#include "dl.h"`
`9`	`9`
`10`	`10`	`VALUE rb_cDLPtrData;`
`11`	`11`	`VALUE rb_mDLMemorySpace;`
`12`		`-static VALUE DLMemoryTable;`
	`12`	`+static st_table* st_memory_table;`
`13`	`13`
`14`	`14`	`#ifndef T_SYMBOL`
`15`	`15`	`# define T_SYMBOL T_FIXNUM`
`16`	`16`	`#endif`
`17`	`17`
`18`		`-#if RUBY_VERSION_CODE < 171`
`19`		`-static VALUE`
`20`		`-rb_hash_delete(VALUE hash, VALUE key)`
`21`		`-{`
`22`		`- return rb_funcall(hash, rb_intern("delete"), 1, key);`
`23`		`-}`
`24`		`-#endif`
`25`		`-`
`26`	`18`	`static void`
`27`	`19`	`rb_dlmem_delete(void *ptr)`
`28`	`20`	`{`
`29`	`21`	`rb_secure(4);`
`30`		`- rb_hash_delete(DLMemoryTable, DLLONG2NUM(ptr));`
	`22`	`+ st_delete(st_memory_table, (st_data_t*)&ptr, NULL);`
`31`	`23`	`}`
`32`	`24`
`33`	`25`	`static void`
`@@ -37,7 +29,7 @@ rb_dlmem_aset(void *ptr, VALUE obj)`
`37`	`29`	`rb_dlmem_delete(ptr);`
`38`	`30`	`}`
`39`	`31`	`else{`
`40`		`- rb_hash_aset(DLMemoryTable, DLLONG2NUM(ptr), DLLONG2NUM(obj));`
	`32`	`+ st_insert(st_memory_table, (st_data_t)ptr, (st_data_t)obj);`
`41`	`33`	`}`
`42`	`34`	`}`
`43`	`35`
`@@ -46,8 +38,8 @@ rb_dlmem_aref(void *ptr)`
`46`	`38`	`{`
`47`	`39`	`VALUE val;`
`48`	`40`
`49`		`- val = rb_hash_aref(DLMemoryTable, DLLONG2NUM(ptr));`
`50`		`- return val == Qnil ? Qnil : (VALUE)DLNUM2LONG(val);`
	`41`	`+ if(!st_lookup(st_memory_table, (st_data_t)ptr, &val)) return Qnil;`
	`42`	`+ return val == Qundef ? Qnil : val;`
`51`	`43`	`}`
`52`	`44`
`53`	`45`	`void`
`@@ -1010,20 +1002,18 @@ rb_dlptr_size(int argc, VALUE argv[], VALUE self)`
`1010`	`1002`	`}`
`1011`	`1003`	`}`
`1012`	`1004`
`1013`		`-static VALUE`
`1014`		`-dlmem_each_i(VALUE assoc, void *data)`
	`1005`	`+static int`
	`1006`	`+dlmem_each_i(void* key, VALUE value, void* arg)`
`1015`	`1007`	`{`
`1016`		`- VALUE key, val;`
`1017`		`- key = rb_ary_entry(assoc, 0);`
`1018`		`- val = rb_ary_entry(assoc, 1);`
`1019`		`- rb_yield(rb_assoc_new(key,(VALUE)DLNUM2LONG(val)));`
	`1008`	`+ VALUE vkey = DLLONG2NUM(key);`
	`1009`	`+ rb_yield(rb_assoc_new(vkey, value));`
`1020`	`1010`	`return Qnil;`
`1021`	`1011`	`}`
`1022`	`1012`
`1023`	`1013`	`VALUE`
`1024`	`1014`	`rb_dlmem_each(VALUE self)`
`1025`	`1015`	`{`
`1026`		`- rb_iterate(rb_each, DLMemoryTable, dlmem_each_i, 0);`
	`1016`	`+ st_foreach(st_memory_table, dlmem_each_i, 0);`
`1027`	`1017`	`return Qnil;`
`1028`	`1018`	`}`
`1029`	`1019`
`@@ -1062,7 +1052,7 @@ Init_dlptr()`
`1062`	`1052`	`rb_define_method(rb_cDLPtrData, "size=", rb_dlptr_size, -1);`
`1063`	`1053`
`1064`	`1054`	`rb_mDLMemorySpace = rb_define_module_under(rb_mDL, "MemorySpace");`
`1065`		`- DLMemoryTable = rb_hash_new();`
`1066`		`- rb_define_const(rb_mDLMemorySpace, "MemoryTable", DLMemoryTable);`
	`1055`	`+ st_memory_table = st_init_numtable();`
	`1056`	`+ rb_define_const(rb_mDLMemorySpace, "MemoryTable", Qnil); /* historical */`
`1067`	`1057`	`rb_define_module_function(rb_mDLMemorySpace, "each", rb_dlmem_each, 0);`
`1068`	`1058`	`}`
Original file line number	Diff line number	Diff line change
`@@ -392,6 +392,9 @@ rb_newobj()`
`392`	`392`	`{`
`393`	`393`	`VALUE obj;`
`394`	`394`
	`395`	`+ if (during_gc)`
	`396`	`+ rb_bug("object allocation during garbage collection phase");`
	`397`	`+`
`395`	`398`	`if (!freelist) garbage_collect();`
`396`	`399`
`397`	`400`	`obj = (VALUE)freelist;`