chunkio 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 328b09a0f74379b9a415ccefd4ac6bfc0cb8ff47ec1944ce99a02a1e91780066
-  data.tar.gz: 39cbef7c28eae30b08aab87f436bcad8265b196079226535d2929dc9b885a68b
+  metadata.gz: 230de38a2734b474235db25f5d470783aeda36489e0a0f1fae42f25f360541ee
+  data.tar.gz: ee656bc59c3569a1790dae2a1e46c7f2a7e21b675d728956183cf12ff126f774
 SHA512:
-  metadata.gz: 1e2f403020ea65060493f75e0c4785aa726946d01f370a57b96611b323cf9325a3c349be727a475b36ef1ab6763d1aaeca466c31277667d59d7000d04135a838
-  data.tar.gz: 62dd1a7226e4c2c492cf74ce5c77c84e18210621e40bf934f2f092e2e61ee52eef6bd0125efa898411835ed3be2f423c89b00d73cb2da59b074afa6e6c74df62
+  metadata.gz: 6f3e0a1739be527f0a730ed3d908bc23807d49797e89ec62fda5227c3199f203021d853fd1776c1ea252b1b01ba9b6fbe5f0942c50f70bc4911bb927f1443846
+  data.tar.gz: 855dce6c8e2a8aaea5dee11516ad60445a107811d76e99c7c86d4fd02dff87ed2f867ff1db5cad9aa740d6492ad34c659bf7d185500df814301e701299ef25de

data/ext/chunkio/chunkio.h

@@ -5,7 +5,7 @@
 #include <chunkio/chunkio.h>
 #include <chunkio/cio_meta.h>
 
-typedef struct chunkio_chunk {
+typedef struct chunkio_chunk_type {
     struct cio_chunk* inner;
     int closed;
     int sync_mode;              /* 0 is false, 1 is true */
@@ -20,30 +20,21 @@ static const rb_data_type_t chunkio_context_type =
     {
      "ChunkIO::Context",
      {0, (void (*)(void *))chunkio_context_free, 0,},
-     0, 0,
-#ifdef RUBY_TYPED_FREE_IMMEDIATELY
-     RUBY_TYPED_FREE_IMMEDIATELY,
-#endif
+     0, 0, 0
     };
 
 static const rb_data_type_t chunkio_stream_type =
     {
      "ChunkIO::Stream",
      {0, (void (*)(void *))chunkio_stream_free, 0,},
-     0, 0,
-#ifdef RUBY_TYPED_FREE_IMMEDIATELY
-     RUBY_TYPED_FREE_IMMEDIATELY,
-#endif
+     0, 0, 0
     };
 
 static const rb_data_type_t chunkio_chunk_type =
     {
      "ChunkIO::Chunk",
      {0, (void (*)(void *))chunkio_chunk_free, 0,},                /* TODO free ch->name and ch->head */
-     0, 0,
-#ifdef RUBY_TYPED_FREE_IMMEDIATELY
-     RUBY_TYPED_FREE_IMMEDIATELY,
-#endif
+     0, 0, 0
     };
 
 struct cio_ctx *UnwrapChunkIOContext(VALUE self);

data/ext/chunkio/chunkio_chunk.c

@@ -6,24 +6,34 @@ void *chunkio_chunk_free(chunkio_chunk *ch)
 {
     if (ch->inner != NULL) {
         /*
-          cio_stream can be freed before this line.
-          but cio_chunk_close and cio_chunk_sync needs to stream->type.
+          `cio_stream` and `cio_ctx` can be freed before this line.
+          but cio_chunk_close and cio_chunk_sync needs them during freeing itself.
           So creating dummy object to work correctly.
-         */
+        */
         struct cio_stream st;
         st.type = CIO_STORE_FS;
+        st.name = (char *)"stream";
         ch->inner->st = &st;
+
+        struct cio_ctx ct;
+        ct.flags = CIO_CHECKSUM;
+        ct.log_cb = NULL;
+        ch->inner->ctx = &ct;
+
         cio_chunk_sync(ch->inner);
         cio_chunk_close(ch->inner, CIO_FALSE);
         ch->inner = NULL;
     }
 
-    xfree(ch);
+    if (ch != NULL) {
+        xfree(ch);
+        ch = NULL;
+    }
 }
 
 static VALUE chunkio_chunk_allocate_context(VALUE klass)
 {
-    chunkio_chunk *c = (chunkio_chunk *)xmalloc(sizeof(chunkio_chunk));
+    chunkio_chunk *c = (chunkio_chunk *)xmalloc(sizeof(struct chunkio_chunk_type));
     c->inner = NULL;
     c->closed = 0;
     c->sync_mode = 0;

data/ext/chunkio/chunkio_stream.c

@@ -10,7 +10,6 @@ void *chunkio_stream_free(struct cio_stream *st)
      */
     if (st) {
         /* destroy stream */
-        mk_list_del(&st->_head);
         free(st->name);
         free(st);
         st = NULL;

data/lib/chunkio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ChunkIO
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chunkio
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Yuta Iwama