summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorttate <ttate@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-06-10 18:23:39 +0000
committerttate <ttate@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-06-10 18:23:39 +0000
commitceade7b9268e9620b123843afeb25a7136f8a576 (patch)
tree5934090e772e41a4b3f75a7744a031f4576d60b1 /ext
parent5c1bdda10cc0febcac126532cf6f3aac51c08271 (diff)
bugfix.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/dl/doc/dl.txt12
-rw-r--r--ext/dl/lib/dl/types.rb1
-rw-r--r--ext/dl/sample/libc.rb7
3 files changed, 19 insertions, 1 deletions
diff --git a/ext/dl/doc/dl.txt b/ext/dl/doc/dl.txt
index 114baafcb72..9964c4e12f5 100644
--- a/ext/dl/doc/dl.txt
+++ b/ext/dl/doc/dl.txt
@@ -59,6 +59,18 @@ to wrap the given PtrData object which is, for example, created by DL::malloc().
DL::malloc() is a function to allocate a memory by using the C library function
malloc().
+We can define a callback using the module function "callback" as follows:
+
+ module Foo
+ extend DL::Importable
+ def my_comp(str1,str2)
+ str1 <=> str2
+ end
+ COMPARE = callback "int my_comp(char*,char*)"
+ end
+
+where Foo::COMPARE is a Symbol object which invokes the method "my_comp".
+
DL::Importable module is very useful. However, we sometimes encounter a case
that we must directly use low-level functions such as dlsym(). In such case,
we would use DL module functions. They are described in next section.
diff --git a/ext/dl/lib/dl/types.rb b/ext/dl/lib/dl/types.rb
index 51489921ff7..53680ac5362 100644
--- a/ext/dl/lib/dl/types.rb
+++ b/ext/dl/lib/dl/types.rb
@@ -88,6 +88,7 @@ module DL
["long", "L", nil, nil, nil, nil],
["float", "F", nil, nil, nil, nil],
["double", "D", nil, nil, nil, nil],
+ [/char\s*\*/,"S",nil, nil, nil, nil],
[/.+\*/, "P", nil, nil, nil, nil],
[/.+\[\]/, "a", nil, nil, nil, nil],
["void", "0", nil, nil, nil, nil],
diff --git a/ext/dl/sample/libc.rb b/ext/dl/sample/libc.rb
index 9975828be31..32816fd331c 100644
--- a/ext/dl/sample/libc.rb
+++ b/ext/dl/sample/libc.rb
@@ -35,6 +35,11 @@ module LIBC
"int tz_minuteswest",
"int tz_dsttime",
]
+
+ def my_compare(ptr1, ptr2)
+ ptr1.ptr.to_s <=> ptr2.ptr.to_s
+ end
+ COMPARE = callback "int my_compare(char**, char**)"
end
@@ -54,7 +59,7 @@ p LIBC.strcat("a", "b")
ary = ["a","c","b"]
ptr = ary.to_ptr
-LIBC.qsort(ptr, ary.length, DL.sizeof('P'), $cb1)
+LIBC.qsort(ptr, ary.length, DL.sizeof('P'), LIBC::COMPARE)
p ptr.to_a('S', ary.length)
tv = LIBC::Timeval.malloc