ruby-oci8 2.1.7 → 2.1.8

data/ext/oci8/oci8.h

@@ -2,7 +2,7 @@
 /*
  * oci8.h - part of ruby-oci8
  *
- * Copyright (C) 2002-2013 Kubo Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2002-2014 Kubo Takehiro <kubo@jiubao.org>
  */
 #ifndef _RUBY_OCI_H_
 #define _RUBY_OCI_H_ 1
@@ -40,6 +40,7 @@ extern "C"
 #define ORAVER_10_1 ORAVERNUM(10, 1, 0, 0, 0)
 #define ORAVER_10_2 ORAVERNUM(10, 2, 0, 0, 0)
 #define ORAVER_11_1 ORAVERNUM(11, 1, 0, 0, 0)
+#define ORAVER_12_1 ORAVERNUM(12, 1, 0, 0, 0)
 
 #include "extconf.h"
 #ifdef HAVE_TYPE_RB_ENCODING
@@ -116,6 +117,13 @@ typedef struct OCICPool OCICPool;
 #define RARRAY_LEN(obj) RARRAY(obj)->len
 #endif
 
+#ifndef HAVE_RB_STR_SET_LEN
+#define rb_str_set_len(s, l) do { \
+    RSTRING(s)->len = (l); \
+    RSTRING(s)->ptr[l] = '\0'; \
+} while (0)
+#endif
+
 /* new macros in ruby 1.9.
  * define compatible macros for ruby 1.8 or lower.
  */
@@ -173,6 +181,46 @@ static inline volatile VALUE *rb_gc_guarded_ptr(volatile VALUE *ptr) {return ptr
 #endif
 #endif
 
+/*
+ * Use TypedData on ruby 1.9.3 and later.
+ */
+#ifndef HAVE_RB_DATA_TYPE_T_FUNCTION
+
+/*
+ * Don't use TypedData even though ruby 1.9.2 has it because the
+ * definitions are slightly different from ruby 1.9.3 and later.
+ */
+#define rb_data_type_t oci8_data_type_t
+#undef TypedData_Make_Struct
+#undef TypedData_Wrap_Struct
+#undef TypedData_Get_Struct
+#undef RTYPEDDATA_DATA
+#undef RUBY_DEFAULT_FREE
+
+/*
+ * To pass compilation on ruby 1.9.2 and earlier.
+ */
+typedef struct oci8_data_type_struct rb_data_type_t;
+struct oci8_data_type_struct {
+    const char *wrap_struct_name;
+    struct {
+        void (*dmark)(void*);
+        void (*dfree)(void*);
+        size_t (*dsize)(const void *);
+    } function;
+    const rb_data_type_t *parent;
+    void *data;
+};
+#define TypedData_Make_Struct(klass, type, data_type, sval) \
+             Data_Make_Struct((klass), type, (data_type)->function.dmark, (data_type)->function.dfree, (sval))
+#define TypedData_Wrap_Struct(klass, data_type, sval) \
+             Data_Wrap_Struct((klass), (data_type)->function.dmark, (data_type)->function.dfree, (sval))
+#define TypedData_Get_Struct(obj, type, data_type, sval) \
+             Data_Get_Struct((obj), type, (sval))
+#define RTYPEDDATA_DATA(obj) DATA_PTR(obj)
+#define RUBY_DEFAULT_FREE xfree
+#endif
+
 /* a new function in ruby 1.9.3.
  * define a compatible macro for ruby 1.9.2 or lower.
  */
@@ -184,6 +232,21 @@ static inline volatile VALUE *rb_gc_guarded_ptr(volatile VALUE *ptr) {return ptr
 #endif
 #endif
 
+/* new macros in ruby 2.1.0
+ */
+#ifndef RARRAY_AREF
+#define RARRAY_AREF(a, i)    (RARRAY_PTR(a)[i])
+#endif
+#ifndef RARRAY_CONST_PTR
+#define RARRAY_CONST_PTR(a)  RARRAY_PTR(a)
+#endif
+#ifndef RB_OBJ_WRITE
+#define RB_OBJ_WRITE(a, slot, b)   do {*(slot) = (b);} while (0)
+#endif
+#ifndef RB_OBJ_WRITTEN
+#define RB_OBJ_WRITTEN(a, oldv, b) do {(void)oldv;} while (0)
+#endif
+
 #if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL) || defined(HAVE_RB_THREAD_BLOCKING_REGION)
 #define NATIVE_THREAD_WITH_GVL 1
 #endif
@@ -270,6 +333,8 @@ static ALWAYS_INLINE char *to_charptr(OraText *c)
 #define RSTRING_ORATEXT(obj) TO_ORATEXT(RSTRING_PTR(obj))
 #define rb_str_new2_ora(str) rb_str_new2(TO_CHARPTR(str))
 
+#define TO_BIND(obj) ((oci8_bind_t *)oci8_check_typeddata((obj), &oci8_bind_data_type, 1))
+
 /*
  * prevent rdoc from gathering the specified method.
  */
@@ -282,23 +347,22 @@ typedef struct {
     char buf[1];
 } oci8_vstr_t;
 
-typedef struct oci8_base_vtable oci8_base_vtable_t;
-typedef struct oci8_bind_vtable oci8_bind_vtable_t;
+typedef struct oci8_handle_data_type oci8_handle_data_type_t;
+typedef struct oci8_bind_data_type oci8_bind_data_type_t;
 
 typedef struct oci8_base oci8_base_t;
 typedef struct oci8_bind oci8_bind_t;
 
 /* The virtual method table of oci8_base_t */
-struct oci8_base_vtable {
-    void (*mark)(oci8_base_t *base);
+struct oci8_handle_data_type {
+    rb_data_type_t rb_data_type;
     void (*free)(oci8_base_t *base);
     size_t size;
-    void (*init)(oci8_base_t *base);
 };
 
 /* The virtual method table of oci8_bind_t */
-struct oci8_bind_vtable {
-    oci8_base_vtable_t base;
+struct oci8_bind_data_type {
+    oci8_handle_data_type_t base;
     VALUE (*get)(oci8_bind_t *obind, void *data, void *null_struct);
     void (*set)(oci8_bind_t *obind, void *data, void **null_structp, VALUE val);
     void (*init)(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE length);
@@ -311,12 +375,11 @@ struct oci8_bind_vtable {
 /* Class structure implemented by C language.
  * oci8_base_t represents OCIHandle and its subclasses.
  *
- * The vptr member points to a virtual method table.
- * See: http://en.wikipedia.org/wiki/Virtual_method_table
  */
 struct oci8_base {
-    const oci8_base_vtable_t *vptr;
+    const oci8_handle_data_type_t *data_type;
     ub4 type;
+    ub1 closed;
     union {
         dvoid *ptr;
         OCISvcCtx *svc;
@@ -397,19 +460,6 @@ typedef struct {
     ub2 *alenp;
 } oci8_exec_sql_var_t;
 
-#define Check_Handle(obj, klass, hp) do { \
-    if (!rb_obj_is_kind_of(obj, klass)) { \
-        rb_raise(rb_eTypeError, "invalid argument %s (expect %s)", rb_class2name(CLASS_OF(obj)), rb_class2name(klass)); \
-    } \
-    Data_Get_Struct(obj, oci8_base_t, hp); \
-} while (0)
-
-#define Check_Object(obj, klass) do {\
-  if (!rb_obj_is_kind_of(obj, klass)) { \
-    rb_raise(rb_eTypeError, "invalid argument %s (expect %s)", rb_class2name(CLASS_OF(obj)), rb_class2name(klass)); \
-  } \
-} while (0)
-
 #define oci8_raise(err, status, stmt) oci8_do_raise(err, status, stmt, __FILE__, __LINE__)
 #define oci8_env_raise(err, status) oci8_do_env_raise(err, status, __FILE__, __LINE__)
 #define oci8_raise_init_error() oci8_do_raise_init_error(__FILE__, __LINE__)
@@ -462,7 +512,6 @@ void Init_oci8_env(void);
 extern ID oci8_id_at_last_error;
 extern ID oci8_id_get;
 extern ID oci8_id_set;
-extern ID oci8_id_oci8_vtable;
 #ifdef CHAR_IS_NOT_A_SHORTCUT_TO_ID
 extern ID oci8_id_add_op; /* ID of the addition operator '+' */
 extern ID oci8_id_sub_op; /* ID of the subtraction operator '-' */
@@ -477,9 +526,9 @@ extern ID oci8_id_div_op; /* ID of the division operator '/' */
 extern int oci8_in_finalizer;
 extern VALUE oci8_cOCIHandle;
 void oci8_base_free(oci8_base_t *base);
-VALUE oci8_define_class(const char *name, oci8_base_vtable_t *vptr);
-VALUE oci8_define_class_under(VALUE outer, const char *name, oci8_base_vtable_t *vptr);
-VALUE oci8_define_bind_class(const char *name, const oci8_bind_vtable_t *vptr);
+VALUE oci8_define_class(const char *name, const oci8_handle_data_type_t *data_type, VALUE (*alloc_func)(VALUE));
+VALUE oci8_define_class_under(VALUE outer, const char *name, const oci8_handle_data_type_t *data_type, VALUE (*alloc_func)(VALUE));
+VALUE oci8_define_bind_class(const char *name, const oci8_bind_data_type_t *data_type, VALUE (*alloc_func)(VALUE));
 void oci8_link_to_parent(oci8_base_t *base, oci8_base_t *parent);
 void oci8_unlink_from_parent(oci8_base_t *base);
 sword oci8_call_without_gvl(oci8_svcctx_t *svcctx, void *(*func)(void *), void *data);
@@ -487,7 +536,7 @@ sword oci8_exec_sql(oci8_svcctx_t *svcctx, const char *sql_text, ub4 num_define_
 #if defined RUNTIME_API_CHECK
 void *oci8_find_symbol(const char *symbol_name);
 #endif
-oci8_base_t *oci8_get_handle(VALUE obj, VALUE klass);
+void *oci8_check_typeddata(VALUE obj, const oci8_handle_data_type_t *data_type, int error_if_closed);
 
 /* error.c */
 extern VALUE eOCIException;
@@ -501,7 +550,11 @@ NORETURN(void oci8_do_raise_by_msgno(ub4 msgno, const char *default_msg, const c
 void oci8_check_error_(sword status, oci8_base_t *base, OCIStmt *stmthp, const char *file, int line);
 
 /* ocihandle.c */
+extern const oci8_handle_data_type_t oci8_handle_data_type;
 void Init_oci8_handle(void);
+VALUE oci8_allocate_typeddata(VALUE klass, const oci8_handle_data_type_t *data_type);
+void oci8_handle_cleanup(void *ptr);
+size_t oci8_handle_size(const void *ptr);
 
 /* oci8.c */
 void Init_oci8(VALUE *out);
@@ -515,7 +568,6 @@ void oci8_check_pid_consistency(oci8_svcctx_t *svcctx);
 void Init_oci8_connection_pool(VALUE cOCI8);
 
 /* stmt.c */
-extern VALUE cOCIStmt;
 void Init_oci8_stmt(VALUE cOCI8);
 
 /* bind.c */
@@ -523,13 +575,13 @@ typedef struct {
     void *hp;
     VALUE obj;
 } oci8_hp_obj_t;
+extern const oci8_handle_data_type_t oci8_bind_data_type;
 void oci8_bind_free(oci8_base_t *base);
 void oci8_bind_hp_obj_mark(oci8_base_t *base);
 void Init_oci8_bind(VALUE cOCI8BindTypeBase);
-oci8_bind_t *oci8_get_bind(VALUE obj);
 
 /* metadata.c */
-extern VALUE cOCI8MetadataBase;
+extern const oci8_handle_data_type_t oci8_metadata_base_data_type;
 void Init_oci8_metadata(VALUE cOCI8);
 VALUE oci8_metadata_create(OCIParam *parmhp, VALUE svc, VALUE parent);
 
@@ -580,7 +632,6 @@ VALUE oci8_make_interval_ds(OCIInterval *s);
 void Init_oci_object(VALUE mOCI);
 
 /* attr.c */
-VALUE oci8_get_ub2_attr(oci8_base_t *base, ub4 attrtype, OCIStmt *stmtp);
 VALUE oci8_get_rowid_attr(oci8_base_t *base, ub4 attrtype, OCIStmt *stmtp);
 
 /* encoding.c */
@@ -591,6 +642,10 @@ extern int oci8_nls_ratio;
 /* win32.c */
 void Init_oci8_win32(VALUE cOCI8);
 
+/* hook_funcs.c */
+void oci8_install_hook_functions(void);
+void oci8_shutdown_sockets(void);
+
 #ifdef HAVE_TYPE_RB_ENCODING
 extern rb_encoding *oci8_encoding;
 

data/ext/oci8/oci8lib.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2002-2012 KUBO Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2002-2015 Kubo Takehiro <kubo@jiubao.org>
  */
 
 #include "oci8.h"
@@ -11,7 +11,6 @@
 ID oci8_id_at_last_error;
 ID oci8_id_get;
 ID oci8_id_set;
-ID oci8_id_oci8_vtable;
 #ifdef CHAR_IS_NOT_A_SHORTCUT_TO_ID
 ID oci8_id_add_op;
 ID oci8_id_sub_op;
@@ -39,8 +38,8 @@ void oci8_base_free(oci8_base_t *base)
         oci8_base_free(base->children);
     }
     oci8_unlink_from_parent(base);
-    if (base->vptr->free != NULL)
-        base->vptr->free(base);
+    if (base->data_type->free != NULL)
+        base->data_type->free(base);
     if (base->type >= OCI_DTYPE_FIRST) {
         OCIDescriptorFree(base->hp.ptr, base->type);
     } else if (base->type == OCI_HTYPE_BIND || base->type == OCI_HTYPE_DEFINE) {
@@ -51,6 +50,7 @@ void oci8_base_free(oci8_base_t *base)
         OCIHandleFree(base->hp.ptr, base->type);
     }
     base->type = 0;
+    base->closed = 1;
     base->hp.ptr = NULL;
 }
 
@@ -58,9 +58,17 @@ void oci8_base_free(oci8_base_t *base)
 static void at_exit_func(VALUE val)
 {
     oci8_in_finalizer = 1;
+#ifdef HAVE_PLTHOOK
+    oci8_shutdown_sockets();
+#endif
 }
 #endif
 
+static VALUE bind_base_alloc(VALUE klass)
+{
+    rb_raise(rb_eNameError, "private method `new' called for %s:Class", rb_class2name(klass));
+}
+
 #ifdef _WIN32
 __declspec(dllexport)
 #endif
@@ -88,7 +96,6 @@ Init_oci8lib()
     oci8_id_at_last_error = rb_intern("@last_error");
     oci8_id_get = rb_intern("get");
     oci8_id_set = rb_intern("set");
-    oci8_id_oci8_vtable = rb_intern("__oci8_vtable__");
 #ifdef CHAR_IS_NOT_A_SHORTCUT_TO_ID
     oci8_id_add_op = rb_intern("+");
     oci8_id_sub_op = rb_intern("-");
@@ -115,7 +122,7 @@ Init_oci8lib()
     /* OCI8::BindType module */
     mOCI8BindType = rb_define_module_under(cOCI8, "BindType");
     /* OCI8::BindType::Base class */
-    cOCI8BindTypeBase = rb_define_class_under(mOCI8BindType, "Base", oci8_cOCIHandle);
+    cOCI8BindTypeBase = oci8_define_class_under(mOCI8BindType, "Base", &oci8_bind_data_type, bind_base_alloc);
 
     /* Handle */
     Init_oci8_bind(cOCI8BindTypeBase);
@@ -149,33 +156,39 @@ Init_oci8lib()
 #endif
 }
 
-VALUE oci8_define_class(const char *name, oci8_base_vtable_t *vptr)
+VALUE oci8_define_class(const char *name, const oci8_handle_data_type_t *data_type, VALUE (*alloc_func)(VALUE))
 {
-    VALUE klass = rb_define_class(name, oci8_cOCIHandle);
-    VALUE obj = Data_Wrap_Struct(rb_cObject, 0, 0, vptr);
-    rb_ivar_set(klass, oci8_id_oci8_vtable, obj);
+    VALUE parent_class = rb_eval_string(data_type->rb_data_type.parent->wrap_struct_name);
+    VALUE klass = rb_define_class(name, parent_class);
+
+    rb_define_alloc_func(klass, alloc_func);
     return klass;
 }
 
-VALUE oci8_define_class_under(VALUE outer, const char *name, oci8_base_vtable_t *vptr)
+VALUE oci8_define_class_under(VALUE outer, const char *name, const oci8_handle_data_type_t *data_type, VALUE (*alloc_func)(VALUE))
 {
-    VALUE klass = rb_define_class_under(outer, name, oci8_cOCIHandle);
-    VALUE obj = Data_Wrap_Struct(rb_cObject, 0, 0, vptr);
-    rb_ivar_set(klass, oci8_id_oci8_vtable, obj);
+    VALUE parent_class = rb_eval_string(data_type->rb_data_type.parent->wrap_struct_name);
+    VALUE klass = rb_define_class_under(outer, name, parent_class);
+
+    rb_define_alloc_func(klass, alloc_func);
     return klass;
 }
 
-VALUE oci8_define_bind_class(const char *name, const oci8_bind_vtable_t *vptr)
+VALUE oci8_define_bind_class(const char *name, const oci8_bind_data_type_t *data_type, VALUE (*alloc_func)(VALUE))
 {
-    VALUE klass = rb_define_class_under(mOCI8BindType, name, cOCI8BindTypeBase);
-    VALUE obj = Data_Wrap_Struct(rb_cObject, 0, 0, (void*)vptr);
-    rb_ivar_set(klass, oci8_id_oci8_vtable, obj);
+    VALUE parent_class = rb_eval_string(data_type->base.rb_data_type.parent->wrap_struct_name);
+    VALUE klass = rb_define_class_under(mOCI8BindType, name, parent_class);
+
+    rb_define_alloc_func(klass, alloc_func);
     return klass;
 }
 
 void oci8_link_to_parent(oci8_base_t *base, oci8_base_t *parent)
 {
+    VALUE old_parent = Qundef;
+
     if (base->parent != NULL) {
+        old_parent = base->parent->self;
         oci8_unlink_from_parent(base);
     }
     if (parent->children == NULL) {
@@ -187,6 +200,8 @@ void oci8_link_to_parent(oci8_base_t *base, oci8_base_t *parent)
         parent->children->prev = base;
     }
     base->parent = parent;
+    RB_OBJ_WRITTEN(parent->self, Qundef, base->self);
+    RB_OBJ_WRITTEN(base->self, old_parent, parent->self);
 }
 
 void oci8_unlink_from_parent(oci8_base_t *base)
@@ -246,7 +261,7 @@ static VALUE protected_call(VALUE data)
     if (!NIL_P(parg->svcctx->executing_thread)) {
         rb_raise(rb_eRuntimeError, "executing in another thread");
     }
-    parg->svcctx->executing_thread = rb_thread_current();
+    RB_OBJ_WRITE(parg->svcctx->base.self, &parg->svcctx->executing_thread, rb_thread_current());
 #ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
     rv = (VALUE)rb_thread_call_without_gvl(parg->func, parg->data, oci8_unblock_func, parg->svcctx);
 #else
@@ -527,7 +542,7 @@ void *oci8_find_symbol(const char *symbol_name)
         };
 #define NUM_SONAMES (sizeof(sonames)/sizeof(sonames[0]))
         size_t idx;
-        VALUE err = rb_ary_new();
+        volatile VALUE err = rb_ary_new();
 
 #ifdef _AIX
 #define DLOPEN_FLAG (RTLD_LAZY|RTLD_GLOBAL|RTLD_MEMBER)
@@ -543,10 +558,11 @@ void *oci8_find_symbol(const char *symbol_name)
         }
         if (handle == NULL) {
             VALUE msg;
+            const char *ary = RARRAY_CONST_PTR(err);
 
             msg = rb_str_buf_new(NUM_SONAMES * 50);
             for (idx = 0; idx < NUM_SONAMES; idx++) {
-                const char *errmsg = RSTRING_PTR(RARRAY_PTR(err)[idx]);
+                const char *errmsg = RSTRING_PTR(arr[idx]);
                 if (idx != 0) {
                     rb_str_buf_cat2(msg, " ");
                 }
@@ -557,7 +573,7 @@ void *oci8_find_symbol(const char *symbol_name)
                     rb_str_buf_cat2(msg, sonames[idx]);
                     rb_str_buf_cat2(msg, ": ");
                 }
-                rb_str_buf_append(msg, RARRAY_PTR(err)[idx]);
+                rb_str_buf_append(msg, arr[idx]);
                 rb_str_buf_cat2(msg, ";");
             }
             rb_exc_raise(rb_exc_new3(rb_eLoadError, msg));
@@ -568,16 +584,31 @@ void *oci8_find_symbol(const char *symbol_name)
 }
 #endif /* RUNTIME_API_CHECK */
 
-oci8_base_t *oci8_get_handle(VALUE obj, VALUE klass)
+void *oci8_check_typeddata(VALUE obj, const oci8_handle_data_type_t *data_type, int error_if_closed)
 {
+#ifdef HAVE_RB_DATA_TYPE_T_FUNCTION
+    oci8_base_t *hp = Check_TypedStruct(obj, &data_type->rb_data_type);
+#else
     oci8_base_t *hp;
+    const char *expected_type_name = data_type->rb_data_type.wrap_struct_name;
+    const rb_data_type_t *rb_data_type;
+    const rb_data_type_t *expected_rb_data_type = &data_type->rb_data_type;
 
-    if (!rb_obj_is_kind_of(obj, klass)) {
-        rb_raise(rb_eTypeError, "invalid argument %s (expect %s)",
-                 rb_obj_classname(obj), rb_class2name(klass));
+    if (TYPE(obj) != T_DATA || !rb_obj_is_kind_of(obj, oci8_cOCIHandle)) {
+        rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
+                 rb_obj_classname(obj), expected_type_name);
     }
-    Data_Get_Struct(obj, oci8_base_t, hp);
-    if (hp->type == 0) {
+    hp = DATA_PTR(obj);
+    rb_data_type = &hp->data_type->rb_data_type;
+    while (rb_data_type != expected_rb_data_type) {
+        if (rb_data_type == NULL) {
+            rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
+                     rb_obj_classname(obj), expected_type_name);
+        }
+        rb_data_type = rb_data_type->parent;
+    }
+#endif
+    if (error_if_closed && hp->closed) {
         rb_raise(eOCIException, "%s was already closed.",
                  rb_obj_classname(obj));
     }