ruby-dev

こんにちは、sheepman です。

DL::PtrData オブジェクトでは ruby が GC をする時に呼ぶ
free function を指定することができます。

で、たとえば regex ライブラリだと regfree したあとに、
free を呼びたいので、以下のような DL.callback を使ったコードを
書きたくなります。

require 'dl'
include DL

h = dlopen(nil)
regcomp = h.sym('regcomp', 'IPSI')
regfree = h.sym('regfree', '0P')

free = callback('0P'){|ptr|
  regfree[ptr]
  FREE[ptr]
}
100000.times do |i|
  ptr = PtrData.malloc(50, free)
  regcomp.call(ptr, '123', 0)
end

しかし、これは segv します。原因を正確に追うことができていないのですが、
おそらく GC の真最中にブロックが呼ばれることで起きているんだと思います。

というわけで、DL::Symbol オブジェクトにcallbackかどうかのフラグを持たせて、
callback は PtrData の free 関数として指定できないようにパッチを書いてみました。

segv している原因が違っているなら、このパッチは無用のものになります。

-- 
sheepman / TAMURA Takashi
sheepman@sheepman.sakura.ne.jp

Attachments (1)

dl.pacth.txt (3 KB, text/x-diff)

Index: dl.c
===================================================================
--- dl.c	(revision 12087)
+++ dl.c	(working copy)
@@ -653,7 +653,7 @@
 	       rb_assoc_new(INT2NUM(rettype),INT2NUM(entry)),
 	       rb_assoc_new(type,proc));
   sprintf(fname, "rb_dl_callback_func_%d_%d", rettype, entry);
-  return rb_dlsym_new((void (*)())rb_dl_callback_table[rettype][entry],
+  return rb_dlsym_callback_new((void (*)())rb_dl_callback_table[rettype][entry],
 		      fname, RSTRING(type)->ptr);
 }
 
Index: dl.h
===================================================================
--- dl.h	(revision 12087)
+++ dl.h	(working copy)
@@ -261,6 +261,7 @@
   char *name;
   char *type;
   int  len;
+  int  is_callback;
 };
 
 enum DLPTR_CTYPE {
Index: ptr.c
===================================================================
--- ptr.c	(revision 12087)
+++ ptr.c	(working copy)
@@ -128,6 +128,15 @@
   return rb_dlptr_new2(rb_cDLPtrData, ptr, size, func);
 }
 
+static
+void
+dlptr_check_free_func(VALUE sym)
+{
+  if(rb_dlsym_is_callback(sym) == Qtrue){
+    rb_raise(rb_eDLTypeError, "free function must not be callbak defined by DL.callback");
+  }
+}
+
 VALUE
 rb_dlptr_malloc(long size, freefunc_t func)
 {
@@ -200,6 +209,7 @@
   case 3:
     p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
     s = DLNUM2LONG(size);
+    dlptr_check_free_func(sym);
     f = rb_dlsym2csym(sym);
     break;
   default:
@@ -233,6 +243,7 @@
     break;
   case 2:
     s = NUM2INT(size);
+    dlptr_check_free_func(sym);
     f = rb_dlsym2csym(sym);
     break;
   default:
@@ -285,6 +296,8 @@
 {
   struct ptr_data *data;
 
+  dlptr_check_free_func(val);
+  
   Data_Get_Struct(self, struct ptr_data, data);
 
   data->free = DLFREEFUNC(rb_dlsym2csym(val));
Index: sym.c
===================================================================
--- sym.c	(revision 12087)
+++ sym.c	(working copy)
@@ -108,6 +108,17 @@
   return val;
 }
 
+VALUE
+rb_dlsym_callback_new(void (*func)(), const char *name, const char *type)
+{
+  VALUE val;
+  struct sym_data *data;
+  val = rb_dlsym_new(func, name, type);
+  Data_Get_Struct(val, struct sym_data, data);
+  data->is_callback = 1;
+  return val;
+}
+
 freefunc_t
 rb_dlsym2csym(VALUE val)
 {
@@ -139,7 +150,8 @@
   data->name = 0;
   data->type = 0;
   data->len  = 0;
-
+  data->is_callback = 0;
+  
   return obj;
 }
 
@@ -185,6 +197,14 @@
 }
 
 VALUE
+rb_dlsym_is_callback(VALUE self)
+{
+  struct sym_data *sym;
+  Data_Get_Struct(self, struct sym_data, sym);
+  return sym->is_callback ? Qtrue : Qfalse;
+}
+
+VALUE
 rb_dlsym_name(VALUE self)
 {
   struct sym_data *sym;
@@ -974,6 +994,7 @@
   rb_define_method(rb_cDLSymbol, "call", rb_dlsym_call, -1);
   rb_define_method(rb_cDLSymbol, "[]",   rb_dlsym_call, -1);
   rb_define_method(rb_cDLSymbol, "name", rb_dlsym_name, 0);
+  rb_define_method(rb_cDLSymbol, "is_callback?", rb_dlsym_is_callback, 0);
   rb_define_method(rb_cDLSymbol, "proto", rb_dlsym_proto, 0);
   rb_define_method(rb_cDLSymbol, "cproto", rb_dlsym_cproto, 0);
   rb_define_method(rb_cDLSymbol, "inspect", rb_dlsym_inspect, 0);

Thread

Prev Next

In This Thread

Prev Next

[#30454] [ANN] CVSサービスの廃止 — Shugo Maeda <shugo@...>

[#30455] a[] += 1 で SEGV — "Hiroki Motoyoshi" <himotoyoshi.ml@...>

[#30465] Ruby 1.8.6 delayed for seven days — "Akinori MUSHA" <knu@...>

[#30476] Re: [ruby-cvs:19211] Ruby:r11975: * lib/fileutils.rb (touch): last #touch change causes error when :mtime option was not given. — Nobuyoshi Nakada <nobu@...>

[#30477] ThreadError on shell.rb — "Akira ODA" <oda.org@...>

[#30482] Ruby 1.8.6 preview3 has been released — "Akinori MUSHA" <knu@...>

[#30486] str.lines[1..-1] — Minero Aoki <aamine@...>

[#30487] Time#to_s format — OHARA Shigeki <os@...>

[#30500] MD5.md5 in RubyGems — Kazuhiro Yoshida <moriq@...>

[#30504] num_tとthread_initという名前について — "Yutaka Kanemoto" <kinpoco@...>

[#30505] [BUG?] SIGTERM の取り扱い — Hidetoshi NAGAI <nagai@...>

[#30507] monitor.rb for ruby-1.9 — keiju@... (Keiju ISHITSUKA)

[#30524] DL::Symbol#call dumps core — sheepman <sheepman@...>

[#30530] dl/import is not thread safe — sheepman <sheepman@...>

[#30531] DL::PtrData#to_a dumps core — sheepman <sheepman@...>

[#30532] DL::PtrData#inspect — sheepman <sheepman@...>

[#30536] Ruby 1.8.6 will be released in 24 hours — "Akinori MUSHA" <knu@...>

[#30537] Microsoft-IIS 上で cgi.rb がレスポンス行を２重に出力する — MIYASAKA Masaru <alkaid@...>

[#30547] dl memory leak — sheepman <sheepman@...>

[#30549] [ANN] Ruby 1.8.6 has been released — "Akinori MUSHA" <knu@...>

[#30551] rb_rescue2 with vm — wanabe <s.wanabe@...>

[#30553] help: lib/shell for ruby 1.9 — keiju@... (Keiju ISHITSUKA)

[#30554] rb_ary2cary in dl.c has a bug — sheepman <sheepman@...>

[#30556] ruby 1.8.6のdateとrails — akira yamada / やまだあきら <akira@...>

[#30563] ext/openssl のメンテナについて — "Akinori MUSHA" <knu@...>

[#30564] release code and revision number — Nobuyoshi Nakada <nobu@...>

[#30575] RSS::Parser.parseでSecurityError — Kazuhiro NISHIYAMA <zn@...>

[#30576] Changelog-1.8.6 — moonwolf@...

[#30581] [ruby-core:10580] Thread後のexecでENOTSUPPエラー対応 — "H.Holon" <holon@...>

[#30586] Etc.getgrgid が getgid の値に固定されています — 植田裕之 <ueda@...>

[#30593] [BUG] waitpid for ruby-trunk — keiju@... (Keiju ISHITSUKA)

[#30612] stdout flush in fork — keiju@... (Keiju ISHITSUKA)

[#30615] Etc モジュールのテスト — 植田 裕之 <ueda@...>

[#30618] possible bug in rb_detach_process() — "KUBO Takehiro" <kubo@...>

[#30620] DL.callback as free function causes errors — sheepman <sheepman@...>

[#30622] dl when $SAFE = 1 — sheepman <sheepman@...>

[#30624] test/rdoc occurs errors. — NAKANO Kouichi <curving@...>

[#30627] [ ruby-Bugs-9360 ] Matrix inverse problem — Yukihiro Matsumoto <matz@...>

[#30629] at_exit — keiju@... (Keiju ISHITSUKA)

[#30637] strlcpy and strlcat — "U.Nakamura" <usa@...>

[#30641] Re: [ruby-cvs:19321] Ruby:r12085: fixed the problem reported in — Urabe Shyouhei <shyouhei@...>

[#30648] YARVでのalias名の取得方法 — Yukihiro Matsumoto <matz@...>

[#30653] [BUG] queue 0x424010 freed with live thread(s) waiting — Masatoshi SEKI <m_seki@...>

[#30655] win32/registry wtime — moonwolf@...

[#30657] ロード済み拡張ライブラリの判別 — arton <artonx@...>

[#30667] $! assignment does not work properly — Yukihiro Matsumoto <matz@...>

[#30671] invalid CFP in rb_protect — wanabe <s.wanabe@...>

[#30672] fail to copy argv on Win32? — wanabe <s.wanabe@...>

[#30674] socket blocking on mingw32 — wanabe <s.wanabe@...>

[#30675] coredump on NetBSD with trunk — "U.Nakamura" <usa@...>

[#30676] excel is not closed in runtime using excel.Quit() — "Md. Ruhul Amin" <amin@...>

[ruby-dev:30620] DL.callback as free function causes errors

Attachments (1)

Thread

In This Thread

[#30615] Etc モジュールのテスト — 植田裕之 <ueda@...>