xbad 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b040f5e82df3f21ac0c18bc8cfb6fbd8d21ce3e
-  data.tar.gz: 496906d81a204a7a1493a8e65bf4eb1cd9c7a4de
+  metadata.gz: 9fafb42bcbc0fa8b8439fe6f2c08acf8c0957c64
+  data.tar.gz: dda1a795814fd9a98b88061bd8ffa7f0fa36bd82
 SHA512:
-  metadata.gz: 155170d26a537e7431b9e023e3f239c7fc681045282f35a291883f9470f039f5ff915c3b59c16a691700df4ebf58b3182591328d2554edeeca4ab0b987f35aff
-  data.tar.gz: e80f0b09863a03719ff46086aa7349045a4b88f239453c69eecef64e3af3f3fafae5e341ec6b6b4f3a8680363b0fdf49427ea5d906dd0845a0bd0e85ec875dcf
+  metadata.gz: 3c533eaab413ff1462f5880e4b8fd61a37b884dfb222e6ed1ba0d6e632659ea7c9f18de1f59f5eb33798ac8b3d7e67bf631e0964e04980f64eb6e50407c3eb47
+  data.tar.gz: 51ced76814b9bb55743d78f51f2e07d3c365758d5eb93e96aafde2da37e8de0a95cc5def07f1224362efe1144e96da0ef9171e8766682ea4fb2c6b25eec3c087

data/ext/xbad/xbad.c

@@ -4,21 +4,26 @@
 #include "xbad.h"
  
 
-static VALUE XBAD_init(VALUE class, VALUE _shmid, VALUE _hash_bits, VALUE _item_size ) {
-    int shmid = NUM2INT(_shmid);
-    int item_size = NUM2INT(_item_size);
-    int hash_bits = NUM2INT(_hash_bits);
-    struct shared_pool *p = shared_pool_init(shmid,hash_bits,item_size);
-    VALUE sp = Data_Wrap_Struct(class, 0, shared_pool_destroy, p);
-    return sp;
-}
-
-inline struct shared_pool *shared_pool(VALUE obj) {
+inline struct shared_pool *get_shared_pool(VALUE obj) {
     struct shared_pool *sp;
     Data_Get_Struct(obj,struct shared_pool, sp);
     return sp;
 }
 
+static VALUE XBAD_alloc(VALUE class) {
+    struct shared_pool *p = shared_pool_alloc();
+    return Data_Wrap_Struct(class, 0, shared_pool_destroy, p);
+}
+
+static VALUE XBAD_init(VALUE self, VALUE _shmid, VALUE _hash_bits, VALUE _item_size ) {
+    int shmid = NUM2INT(_shmid);
+    int item_size = NUM2INT(_item_size);
+    int hash_bits = NUM2INT(_hash_bits);
+    struct shared_pool *sp = get_shared_pool(self);
+    shared_pool_init(sp,shmid,hash_bits,item_size);
+    return self;
+}
+
 static inline void die_unless_string(VALUE x) {
     if (TYPE(x) != T_STRING)
         rb_raise(rb_eTypeError, "invalid type for input %s",rb_obj_classname(x));
@@ -27,7 +32,7 @@ static inline void die_unless_string(VALUE x) {
 static VALUE XBAD_store(VALUE self, VALUE key, VALUE value, VALUE _expire_after) {
     die_unless_string(key);
     die_unless_string(value);
-    struct shared_pool *sp = shared_pool(self);
+    struct shared_pool *sp = get_shared_pool(self);
     int expire_after = NUM2INT(_expire_after);
     if (t_add(sp,RSTRING_PTR(key),RSTRING_LEN(key),RSTRING_PTR(value),RSTRING_LEN(value),expire_after) != 0)
         rb_raise(rb_eArgError,"failed to store");
@@ -37,7 +42,7 @@ static VALUE XBAD_store(VALUE self, VALUE key, VALUE value, VALUE _expire_after)
 static VALUE XBAD_store_and_broadcast(VALUE self, VALUE key, VALUE value, VALUE _expire_after,VALUE _port) {
     die_unless_string(key);
     die_unless_string(value);
-    struct shared_pool *sp = shared_pool(self);
+    struct shared_pool *sp = get_shared_pool(self);
     int expire_after = NUM2INT(_expire_after);
     unsigned short port = NUM2INT(_port);
     struct in_addr ip = { .s_addr = htonl(0xffffffff) };                                                                                                                                                        
@@ -49,7 +54,7 @@ static VALUE XBAD_store_and_broadcast(VALUE self, VALUE key, VALUE value, VALUE
 
 static VALUE XBAD_find(VALUE self, VALUE key) {
     VALUE ret = Qnil;
-    struct shared_pool *sp = shared_pool(self);
+    struct shared_pool *sp = get_shared_pool(self);
     struct item *item = t_find_and_lock(sp,RSTRING_PTR(key),RSTRING_LEN(key));
     if (item) {
         ret = rb_str_new(ITEM_BLOB(item),item->blob_len);
@@ -59,14 +64,16 @@ static VALUE XBAD_find(VALUE self, VALUE key) {
 }
 
 static VALUE XBAD_reset(VALUE self) {
-    struct shared_pool *sp = shared_pool(self);
+    struct shared_pool *sp = get_shared_pool(self);
     shared_pool_reset(sp);
     return Qtrue;
 }
 
 void Init_xbad() {
   VALUE c = rb_define_class("XBAD", rb_cObject);
-  rb_define_singleton_method(c, "create", RUBY_METHOD_FUNC(XBAD_init), 3);
+  rb_define_alloc_func(c, XBAD_alloc);
+  rb_define_method(c, "initialize", XBAD_init, 3);
+  //rb_define_singleton_method(c, "initialize", RUBY_METHOD_FUNC(XBAD_init), 3);
   rb_define_method(c, "find", XBAD_find, 1);
   rb_define_method(c, "store", XBAD_store, 3);
   rb_define_method(c, "store_and_broadcast", XBAD_store_and_broadcast, 4);

data/ext/xbad/xbad.h

@@ -191,15 +191,20 @@ static void t_bind_and_wait_for_updates(struct shared_pool *sp, struct in_addr i
     }
 }
 
-static struct shared_pool *shared_pool_init(int key, int hash_bits, int item_size) {
+static struct shared_pool *shared_pool_alloc(void) {
+    struct shared_pool *sp;
+    BAD_ALLOC(sp,struct shared_pool);
+    memset(sp,0,sizeof(*sp));
+    return sp;
+}
+
+static struct shared_pool *shared_pool_init(struct shared_pool *sp, int key, int hash_bits, int item_size) {
     if (hash_bits < 16 || hash_bits > 32 )
         SAYX("hash bits must be between 16 and 32");
  
     if (item_size <= sizeof(struct item))
         SAYX("item size must be at least %zu",sizeof(struct item));
 
-    struct shared_pool *sp;
-    BAD_ALLOC(sp,struct shared_pool);
     sp->c_sock = 0;
     sp->s_sock = 0;
     sp->pool = NULL;
@@ -220,6 +225,10 @@ static struct shared_pool *shared_pool_init(int key, int hash_bits, int item_siz
     return sp;
 }
 
+static struct shared_pool *shared_pool_alloc_and_init(int key, int hash_bits, int item_size) {
+    struct shared_pool *sp = shared_pool_alloc();
+    return shared_pool_init(sp,key,hash_bits,item_size);
+}
 static void shared_pool_reset(struct shared_pool *sp) {
     int i;
     for (i = 0; i < sp->hash_mask + 1; i++) {
@@ -257,16 +266,18 @@ static void shared_pool_blind_guardian(struct shared_pool *sp, int interval_us,i
 }
 
 static void shared_pool_destroy(struct shared_pool *sp) {
-    if (shmdt(sp->pool) != 0)
-        SAYPX("detach failed");
-    
-    struct shmid_ds ds;
-
-    if (shmctl(sp->shm_id, IPC_STAT, &ds) != 0)
-        SAYPX("IPC_STAT failed");
-    if (ds.shm_nattch == 0) {
-        if (shmctl(sp->shm_id, IPC_RMID, NULL) != 0) 
-            SAYPX("IPC_RMID failed on shm_id %d",sp->shm_id);
+    if (sp->pool) {
+        if (shmdt(sp->pool) != 0)
+            SAYPX("detach failed");
+        
+        struct shmid_ds ds;
+
+        if (shmctl(sp->shm_id, IPC_STAT, &ds) != 0)
+            SAYPX("IPC_STAT failed");
+        if (ds.shm_nattch == 0) {
+            if (shmctl(sp->shm_id, IPC_RMID, NULL) != 0) 
+                SAYPX("IPC_RMID failed on shm_id %d",sp->shm_id);
+        }
     }
     BAD_FREE(sp);
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xbad
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Borislav Nikolov