Use TypedData

Author: andyundso

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## (unreleased)
 
 * Use freetds v1.5.1 and OpenSSL v3.5.0 for Windows and Linux builds.
+* Use `TypedData` in C-Land.
 
 ## 3.2.1
 

ext/tiny_tds/client.c

@@ -8,12 +8,54 @@ static ID intern_source_eql, intern_severity_eql, intern_db_error_number_eql, in
 static ID intern_new, intern_dup, intern_transpose_iconv_encoding, intern_local_offset, intern_gsub, intern_call;
 VALUE opt_escape_regex, opt_escape_dblquote;
 
+static void rb_tinytds_client_mark(void *ptr)
+{
+ tinytds_client_wrapper *cwrap = (tinytds_client_wrapper *)ptr;
+
+ if (cwrap) {
+ rb_gc_mark(cwrap->charset);
+ }
+}
+
+static void rb_tinytds_client_free(void *ptr)
+{
+ tinytds_client_wrapper *cwrap = (tinytds_client_wrapper *)ptr;
+
+ if (cwrap->login) {
+ dbloginfree(cwrap->login);
+ }
+
+ if (cwrap->client && !cwrap->closed) {
+ dbclose(cwrap->client);
+ cwrap->client = NULL;
+ cwrap->closed = 1;
+ cwrap->userdata->closed = 1;
+ }
+
+ xfree(cwrap->userdata);
+ xfree(ptr);
+}
+
+static size_t tinytds_client_wrapper_size(const void* data)
+{
+ return sizeof(tinytds_client_wrapper);
+}
+
+static const rb_data_type_t tinytds_client_wrapper_type = {
+ .wrap_struct_name = "tinytds_client_wrapper",
+ .function = {
+ .dmark = rb_tinytds_client_mark,
+ .dfree = rb_tinytds_client_free,
+ .dsize = tinytds_client_wrapper_size,
+ },
+ .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
 
 // Lib Macros
 
 #define GET_CLIENT_WRAPPER(self) \
  tinytds_client_wrapper *cwrap; \
- Data_Get_Struct(self, tinytds_client_wrapper, cwrap)
+ TypedData_Get_Struct(self, tinytds_client_wrapper, &tinytds_client_wrapper_type, cwrap)
 
 #define REQUIRE_OPEN_CLIENT(cwrap) \
  if (cwrap->closed || cwrap->userdata->closed) { \
@@ -244,39 +286,11 @@ static void rb_tinytds_client_reset_userdata(tinytds_client_userdata *userdata)
  userdata->nonblocking_errors_size = 0;
 }
 
-static void rb_tinytds_client_mark(void *ptr)
-{
- tinytds_client_wrapper *cwrap = (tinytds_client_wrapper *)ptr;
-
- if (cwrap) {
- rb_gc_mark(cwrap->charset);
- }
-}
-
-static void rb_tinytds_client_free(void *ptr)
-{
- tinytds_client_wrapper *cwrap = (tinytds_client_wrapper *)ptr;
-
- if (cwrap->login) {
- dbloginfree(cwrap->login);
- }
-
- if (cwrap->client && !cwrap->closed) {
- dbclose(cwrap->client);
- cwrap->client = NULL;
- cwrap->closed = 1;
- cwrap->userdata->closed = 1;
- }
-
- xfree(cwrap->userdata);
- xfree(ptr);
-}
-
 static VALUE allocate(VALUE klass)
 {
  VALUE obj;
  tinytds_client_wrapper *cwrap;
- obj = Data_Make_Struct(klass, tinytds_client_wrapper, rb_tinytds_client_mark, rb_tinytds_client_free, cwrap);
+ obj = TypedData_Make_Struct(klass, tinytds_client_wrapper, &tinytds_client_wrapper_type, cwrap);
  cwrap->closed = 1;
  cwrap->charset = Qnil;
  cwrap->userdata = malloc(sizeof(tinytds_client_userdata));

ext/tiny_tds/result.c

@@ -35,7 +35,6 @@ rb_encoding *binaryEncoding;
 
 
 // Lib Backend (Memory Management)
-
 static void rb_tinytds_result_mark(void *ptr)
 {
  tinytds_result_wrapper *rwrap = (tinytds_result_wrapper *)ptr;
@@ -54,11 +53,26 @@ static void rb_tinytds_result_free(void *ptr)
  xfree(ptr);
 }
 
+static size_t tinytds_result_wrapper_size(const void* data)
+{
+ return sizeof(tinytds_result_wrapper);
+}
+
+const rb_data_type_t tinytds_result_wrapper_type = {
+ .wrap_struct_name = "tinytds_result_wrapper",
+ .function = {
+ .dmark = rb_tinytds_result_mark,
+ .dfree = rb_tinytds_result_free,
+ .dsize = tinytds_result_wrapper_size,
+ },
+ .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 VALUE rb_tinytds_new_result_obj(tinytds_client_wrapper *cwrap)
 {
  VALUE obj;
  tinytds_result_wrapper *rwrap;
- obj = Data_Make_Struct(cTinyTdsResult, tinytds_result_wrapper, rb_tinytds_result_mark, rb_tinytds_result_free, rwrap);
+ obj = TypedData_Make_Struct(cTinyTdsResult, tinytds_result_wrapper, &tinytds_result_wrapper_type, rwrap);
  rwrap->cwrap = cwrap;
  rwrap->client = cwrap->client;
  rwrap->local_offset = Qnil;

ext/tiny_tds/result.h

@@ -19,12 +19,12 @@ typedef struct {
  unsigned long number_of_rows;
 } tinytds_result_wrapper;
 
+extern const rb_data_type_t tinytds_result_wrapper_type;
 
 // Lib Macros
-
 #define GET_RESULT_WRAPPER(self) \
  tinytds_result_wrapper *rwrap; \
- Data_Get_Struct(self, tinytds_result_wrapper, rwrap)
+ TypedData_Get_Struct(self, tinytds_result_wrapper, &tinytds_result_wrapper_type, rwrap)