kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/dl/method.c: Adding DL::Method as a superclass for DL::Function

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tenderlove 2010-02-16 02:05:46 +00:00
parent 1e7d74f39e
commit 8f8947a260
6 changed files with 49 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Feb 16 11:03:19 2010 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/dl/method.c: Adding DL::Method as a superclass for DL::Function
Mon Feb 15 23:37:30 2010 Tanaka Akira <akr@fsij.org>
* io.c: check lseek error by errno. NetBSD 4.0.1 may return -1 as

1
ext/dl/dl.h
View file

@ -136,6 +136,7 @@
extern VALUE rb_mDL;
extern VALUE rb_cDLHandle;
extern VALUE rb_cDLCPtr;
extern VALUE rb_cDLSymbol;
extern VALUE rb_eDLError;
extern VALUE rb_eDLTypeError;

6
ext/dl/lib/dl/func.rb
View file

@ -6,7 +6,7 @@ require 'dl/value'
require 'thread'
module DL
class Function
class Function < DL::Method
include DL
include ValueUtil
@ -20,7 +20,7 @@ module DL
end
@args = argtypes
native_init(@args.reject { |x| x == TYPE_VOID }, cfunc.ctype, abi)
super(@cfunc, @args.reject { |x| x == TYPE_VOID }, cfunc.ctype, abi)
end
def to_i()
@ -35,7 +35,7 @@ module DL
if block_given?
args.find { |a| DL::Function === a }.bind_at_call(&block)
end
native_call(*args)
super
end
def wrap_result(r)

13
ext/dl/lib/dl/value.rb
View file

@ -36,19 +36,6 @@ module DL
end
end
def ruby2ffi arg, type
return arg unless type == TYPE_VOIDP
case arg
when nil
0
when CPtr
arg.to_i
else
CPtr[arg].to_i
end
end
private :ruby2ffi
def wrap_arg(arg, ty, funcs = [], &block)
funcs ||= []
case arg

47
ext/dl/function.c → ext/dl/method.c
View file

@ -7,7 +7,7 @@
#include "dl.h"
#include <dl_conversions.h>
VALUE rb_cDLFunction;
VALUE rb_cDLMethod;
typedef union
{
@ -49,7 +49,7 @@ dlfunction_memsize(const void *p)
}
const rb_data_type_t dlfunction_data_type = {
"dl/function",
"dl/method",
0, dlfunction_free, dlfunction_memsize,
};
@ -62,13 +62,22 @@ rb_dlfunc_allocate(VALUE klass)
}
static VALUE
rb_dlfunction_native_init(VALUE self, VALUE args, VALUE ret_type, VALUE abi)
rb_dlfunction_initialize(int argc, VALUE argv[], VALUE self)
{
ffi_cif * cif;
ffi_type **arg_types;
ffi_status result;
VALUE ptr, args, ret_type, abi;
int i;
rb_scan_args(argc, argv, "31", &ptr, &args, &ret_type, &abi);
if(NIL_P(abi)) abi = INT2NUM(FFI_DEFAULT_ABI);
rb_iv_set(self, "@ptr", ptr);
rb_iv_set(self, "@args", args);
rb_iv_set(self, "@return_type", ret_type);
rb_iv_set(self, "@abi", abi);
TypedData_Get_Struct(self, ffi_cif, &dlfunction_data_type, cif);
arg_types = xcalloc(RARRAY_LEN(args) + 1, sizeof(ffi_type *));
@ -188,17 +197,21 @@ rb_dlfunction_call(int argc, VALUE argv[], VALUE self)
values = xcalloc((size_t)argc + 1, (size_t)sizeof(void *));
generic_args = xcalloc((size_t)argc, (size_t)sizeof(dl_generic));
cfunc = rb_iv_get(self, "@cfunc");
cfunc = rb_iv_get(self, "@ptr");
types = rb_iv_get(self, "@args");
for (i = 0; i < argc; i++) {
VALUE dl_type = RARRAY_PTR(types)[i];
VALUE src = rb_funcall(self,
rb_intern("ruby2ffi"),
2,
argv[i],
dl_type
);
VALUE src = argv[i];
if(NUM2INT(dl_type) == DLTYPE_VOIDP) {
if(NIL_P(src)) {
src = INT2NUM(0);
} else if(rb_cDLCPtr != CLASS_OF(src)) {
src = rb_funcall(rb_cDLCPtr, rb_intern("[]"), 1, src);
}
src = rb_Integer(src);
}
dl2generic(NUM2INT(dl_type), src, &generic_args[i]);
values[i] = (void *)&generic_args[i];
@ -215,24 +228,24 @@ rb_dlfunction_call(int argc, VALUE argv[], VALUE self)
xfree(values);
xfree(generic_args);
return unwrap_ffi(rb_funcall(cfunc, rb_intern("ctype"), 0), retval);
return unwrap_ffi(rb_iv_get(self, "@return_type"), retval);
}
void
Init_dlfunction(void)
{
rb_cDLFunction = rb_define_class_under(rb_mDL, "Function", rb_cObject);
rb_cDLMethod = rb_define_class_under(rb_mDL, "Method", rb_cObject);
rb_define_const(rb_cDLFunction, "DEFAULT", INT2NUM(FFI_DEFAULT_ABI));
rb_define_const(rb_cDLMethod, "DEFAULT", INT2NUM(FFI_DEFAULT_ABI));
#ifdef FFI_STDCALL
rb_define_const(rb_cDLFunction, "STDCALL", INT2NUM(FFI_STDCALL));
rb_define_const(rb_cDLMethod, "STDCALL", INT2NUM(FFI_STDCALL));
#endif
rb_define_alloc_func(rb_cDLFunction, rb_dlfunc_allocate);
rb_define_alloc_func(rb_cDLMethod, rb_dlfunc_allocate);
rb_define_private_method(rb_cDLFunction, "native_call", rb_dlfunction_call, -1);
rb_define_method(rb_cDLMethod, "call", rb_dlfunction_call, -1);
rb_define_private_method(rb_cDLFunction, "native_init", rb_dlfunction_native_init, 3);
rb_define_method(rb_cDLMethod, "initialize", rb_dlfunction_initialize, -1);
}
/* vim: set noet sw=4 sts=4 */

11
test/dl/test_method.rb Normal file
View file

@ -0,0 +1,11 @@
require_relative 'test_base'
require 'dl/func'
module DL
class TestMethod < TestBase
def test_method_call
f = Method.new(@libc['sinf'], [TYPE_FLOAT], TYPE_FLOAT)
assert_in_delta 1.0, f.call(90 * Math::PI / 180), 0.0001
end
end
end