xthread 0.1.3 → 0.1.4.001

data/cond.c

@@ -43,10 +43,19 @@ xthread_cond_memsize(const void *ptr)
     return ptr ? sizeof(xthread_cond_t) : 0;
 }
 
+#ifdef HAVE_RB_DATA_TYPE_T_FUNCTION
 static const rb_data_type_t xthread_cond_data_type = {
     "xthread_cond",
     {xthread_cond_mark, xthread_cond_free, xthread_cond_memsize,},
 };
+#else
+static const rb_data_type_t xthread_cond_data_type = {
+    "xthread_cond",
+    xthread_cond_mark,
+    xthread_cond_free,
+    xthread_cond_memsize,
+};
+#endif
 
 static VALUE
 xthread_cond_alloc(VALUE klass)

data/fifo.c

@@ -55,8 +55,10 @@ static void
 xthread_fifo_free(void *ptr)
 {
   xthread_fifo_t *fifo = (xthread_fifo_t*)ptr;
-  
-  ruby_xfree(fifo->elements);
+
+  if (fifo->elements) {
+    ruby_xfree(fifo->elements);
+  }
   ruby_xfree(ptr);
 }
 
@@ -68,10 +70,19 @@ xthread_fifo_memsize(const void *ptr)
   return ptr ? sizeof(xthread_fifo_t) + fifo->capa * sizeof(VALUE): 0;
 }
 
+#ifdef HAVE_RB_DATA_TYPE_T_FUNCTION
 static const rb_data_type_t xthread_fifo_data_type = {
     "xthread_fifo",
     {xthread_fifo_mark, xthread_fifo_free, xthread_fifo_memsize,},
 };
+#else
+static const rb_data_type_t xthread_fifo_data_type = {
+    "xthread_fifo",
+    xthread_fifo_mark,
+    xthread_fifo_free,
+    xthread_fifo_memsize,
+};
+#endif
 
 static VALUE
 xthread_fifo_alloc(VALUE klass)
@@ -84,7 +95,7 @@ xthread_fifo_alloc(VALUE klass)
   fifo->push = 0;
   fifo->pop = 0;
 
-  fifo->capa = FIFO_DEFAULT_CAPA;
+  fifo->capa = 0;
   fifo->elements = NULL;
 
   return obj;
@@ -117,7 +128,8 @@ xthread_fifo_initialize(VALUE self)
 {
   xthread_fifo_t *fifo;
   GetXThreadFifoPtr(self, fifo);
-  
+
+  fifo->capa = FIFO_DEFAULT_CAPA;
   fifo->elements = ALLOC_N(VALUE, fifo->capa);
   return self;
 }
@@ -165,7 +177,8 @@ rb_xthread_fifo_pop(VALUE self)
   if (fifo->push == fifo->pop)
     return Qnil;
 
-  item = fifo->elements[fifo->pop++];
+  item = fifo->elements[fifo->pop];
+  fifo->elements[fifo->pop++] = Qnil;
   if(fifo->pop >= fifo->capa) {
     fifo->pop -= fifo->capa;
     fifo->push -= fifo->capa;

data/monitor.c

@@ -56,10 +56,19 @@ xthread_monitor_memsize(const void *ptr)
   return ptr ? sizeof(xthread_monitor_t) : 0;
 }
 
+#ifdef HAVE_RB_DATA_TYPE_T_FUNCTION
 static const rb_data_type_t xthread_monitor_data_type = {
     "xthread_monitor",
     {xthread_monitor_mark, xthread_monitor_free, xthread_monitor_memsize,},
 };
+#else
+static const rb_data_type_t xthread_monitor_data_type = {
+    "xthread_monitor",
+    xthread_monitor_mark,
+    xthread_monitor_free,
+    xthread_monitor_memsize,
+};
+#endif
 
 static VALUE
 xthread_monitor_alloc(VALUE klass)
@@ -243,10 +252,19 @@ xthread_monitor_cond_memsize(const void *ptr)
     return ptr ? sizeof(xthread_monitor_cond_t) : 0;
 }
 
+#ifdef HAVE_RB_DATA_TYPE_T_FUNCTION
 static const rb_data_type_t xthread_monitor_cond_data_type = {
     "xthread_monitor_cond",
     {xthread_monitor_cond_mark, xthread_monitor_cond_free, xthread_monitor_cond_memsize,},
 };
+#else
+static const rb_data_type_t xthread_monitor_cond_data_type = {
+    "xthread_monitor_cond",
+    xthread_monitor_cond_mark,
+    xthread_monitor_cond_free,
+    xthread_monitor_cond_memsize,
+};
+#endif
 
 static VALUE
 xthread_monitor_cond_alloc(VALUE klass)

data/queue.c

@@ -49,10 +49,19 @@ xthread_queue_memsize(const void *ptr)
   return ptr ? sizeof(xthread_queue_t) : 0;
 }
 
+#ifdef HAVE_RB_DATA_TYPE_T_FUNCTION
 static const rb_data_type_t xthread_queue_data_type = {
     "xthread_queue",
     {xthread_queue_mark, xthread_queue_free, xthread_queue_memsize,},
 };
+#else
+static const rb_data_type_t xthread_queue_data_type = {
+    "xthread_queue",
+    xthread_queue_mark,
+    xthread_queue_free,
+    xthread_queue_memsize,
+};
+#endif
 
 static void
 xthread_queue_alloc_init(xthread_queue_t *que)
@@ -217,6 +226,8 @@ xthread_sized_queue_memsize(const void *ptr)
   return ptr ? sizeof(xthread_sized_queue_t) : 0;
 }
 
+
+#ifdef HAVE_RB_DATA_TYPE_T_FUNCTION
 static const rb_data_type_t xthread_sized_queue_data_type = {
     "xthread_sized_queue",
     {xthread_sized_queue_mark, xthread_sized_queue_free, xthread_sized_queue_memsize,},
@@ -355,6 +366,7 @@ xthread_sized_queue_pop(int argc, VALUE *argv, VALUE self)
   }
   return item;
 }
+#endif
 
 void
 Init_XThreadQueue()
@@ -374,7 +386,7 @@ Init_XThreadQueue()
   rb_define_method(rb_cXThreadQueue, "length", rb_xthread_queue_length, 0);
   rb_define_alias(rb_cXThreadQueue,  "size", "length");
 
-
+#ifdef HAVE_RB_DATA_TYPE_T_FUNCTION
   rb_cXThreadSizedQueue  = rb_define_class_under(rb_mXThread, "SizedQueue", rb_cXThreadQueue);
 
   rb_define_alloc_func(rb_cXThreadSizedQueue, xthread_sized_queue_alloc);
@@ -388,6 +400,5 @@ Init_XThreadQueue()
 
   rb_define_method(rb_cXThreadSizedQueue, "max", rb_xthread_sized_queue_max, 0);
   rb_define_method(rb_cXThreadSizedQueue, "max=", rb_xthread_sized_queue_set_max, 1);
-
-  
+#endif
 }

data/xthread.gemspec

@@ -1,15 +1,23 @@
 
 require "rubygems"
 
+tag = `git tag`.split.sort.last
+v, dmy, p = tag.scan(/^v([0-9]+\.[0-9]+\.[0-9]+)(-([0-9]+))?/).first
+if p.to_i > 0
+  v += "."+p
+end
+p v
+
 Gem::Specification.new do |s|
   s.name = "xthread"
   s.authors = "Keiju.Ishitsuka"
   s.email = "keiju@ishitsuka.com"
   s.platform = Gem::Platform::RUBY
-  s.summary = "C-implementation version of thread.rb and monitor.eb libraries"
+  s.summary = "C-implementation version of thread.rb and monitor.rb libraries"
   s.rubyforge_project = s.name
   s.homepage = "http://github.com/keiju/xthread"
-  s.version = `git tag`.split.collect{|e| e.sub(/v([0-9]+\.[0-9]+\.[0-9]+).*/, "\\1")}.sort.last
+  
+  s.version = v
   s.require_path = "."
 #  s.test_file = ""
 #  s.executable = ""

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: xthread
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 85
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  - 1
+  version: 0.1.4.001
 platform: ruby
 authors: 
 - Keiju.Ishitsuka
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-10 00:00:00 +09:00
+date: 2011-04-19 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -74,6 +75,6 @@ rubyforge_project: xthread
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: C-implementation version of thread.rb and monitor.eb libraries
+summary: C-implementation version of thread.rb and monitor.rb libraries
 test_files: []