iodine 0.7.2 → 0.7.3

data/ext/iodine/iodine_pubsub.c

@@ -412,9 +412,8 @@ static VALUE iodine_pubsub_redis_new(int argc, VALUE *argv, VALUE self) {
   /* parse URL assume redis://redis:password@localhost:6379 */
   http_url_s info = http_url_parse(RSTRING_PTR(url), RSTRING_LEN(url));
 
-  fprintf(
-      stderr,
-      "INFO: Initializing Redis engine for address: %s - port: %s -  auth %s\n",
+  FIO_LOG_INFO(
+      "Initializing Redis engine for address: %s - port: %s -  auth %s\n",
       info.host.data ? info.host.data : "-",
       info.port.data ? info.port.data : "-",
       info.password.data ? info.password.data : "-");

data/ext/iodine/iodine_store.c

@@ -22,23 +22,26 @@ API
 
 /** Adds an object to the storage (or increases it's reference count). */
 static VALUE storage_add(VALUE obj) {
-  if (obj == Qnil || obj == Qtrue || obj == Qfalse)
+  if (!obj || obj == Qnil || obj == Qtrue || obj == Qfalse)
     return obj;
   fio_lock(&lock);
-  uintptr_t *val = fio_hash_insert(&storage, obj, 0);
-  ++val[0];
+  uintptr_t old = 0;
+  fio_hash_overwrite(&storage, obj, 1, &old);
+  if (old)
+    fio_hash_overwrite(&storage, obj, old + 1, NULL);
   fio_unlock(&lock);
   return obj;
 }
 /** Removes an object from the storage (or decreases it's reference count). */
 static VALUE storage_remove(VALUE obj) {
-  if (obj == Qnil || obj == Qtrue || obj == Qfalse || storage.map == NULL ||
+  if (!obj || obj == Qnil || obj == Qtrue || obj == Qfalse ||
       storage.count == 0)
     return obj;
   fio_lock(&lock);
-  uintptr_t *val = fio_hash_find(&storage, obj, 0);
-  if (val && *val <= 1)
-    fio_hash_remove(&storage, obj, 0);
+  uintptr_t old = 0;
+  fio_hash_remove(&storage, obj, 0, &old);
+  if (old > 1)
+    fio_hash_overwrite(&storage, obj, old - 1, NULL);
   fio_unlock(&lock);
   return obj;
 }
@@ -47,7 +50,7 @@ static void storage_after_fork(void) { lock = FIO_LOCK_INIT; }
 
 /** Prints debugging information to the console. */
 static void storage_print(void) {
-  fprintf(stderr, "Ruby <=> C Memory storage stats (pid: %d):\n", getpid());
+  FIO_LOG_DEBUG("Ruby <=> C Memory storage stats (pid: %d):\n", getpid());
   fio_lock(&lock);
   uintptr_t index = 0;
   FIO_SET_FOR_LOOP(&storage, pos) {
@@ -58,7 +61,7 @@ static void storage_print(void) {
   }
   fprintf(stderr, "Total of %" PRIuPTR " objects protected form GC\n", index);
   fprintf(stderr,
-          "Storage uses %" PRIuPTR " Hash bins for %" PRIuPTR " objects\n",
+          "Storage uses %" PRIuPTR " Hash bins for %" PRIuPTR " objects",
           storage.capa, storage.count);
   fio_unlock(&lock);
 }
@@ -78,9 +81,8 @@ GC protection
 /* a callback for the GC (marking active objects) */
 static void storage_mark(void *ignore) {
   (void)ignore;
-#if IODINE_DEBUG
-  storage_print();
-#endif
+  if (FIO_LOG_LEVEL >= FIO_LOG_LEVEL_DEBUG)
+    storage_print();
   fio_lock(&lock);
   // fio_hash_compact(&storage);
   FIO_SET_FOR_LOOP(&storage, pos) {
@@ -94,9 +96,7 @@ static void storage_mark(void *ignore) {
 /* clear the registry (end of lifetime) */
 static void storage_clear(void *ignore) {
   (void)ignore;
-#if IODINE_DEBUG == 1
-  fprintf(stderr, "* INFO: Ruby<=>C Storage cleared.\n");
-#endif
+  FIO_LOG_DEBUG("Ruby<=>C Storage cleared.\n");
   fio_lock(&lock);
   fio_hash_free(&storage);
   storage = (fio_hash_s)FIO_SET_INIT;

data/ext/iodine/iodine_tcp.c

@@ -39,7 +39,7 @@ typedef struct {
 static void *iodine_tcp_on_data_in_GIL(void *b_) {
   iodine_buffer_s *b = b_;
   if (!b) {
-    fprintf(stderr, "FATAL ERROR: (iodine->tcp/ip->on_data->GIL) WTF?!\n");
+    FIO_LOG_FATAL("(iodine->tcp/ip->on_data->GIL) WTF?!\n");
   }
   VALUE data = IodineStore.add(rb_str_new(b->buffer, b->len));
   rb_enc_associate(data, IodineBinaryEncoding);

data/ext/iodine/redis_engine.c

@@ -360,8 +360,7 @@ static void resp_on_sub_message(struct redis_engine_internal_s *i, FIOBJ msg) {
         fiobj_obj2cstr(msg).data[0] != 'P') {
       FIO_LOG_WARNING("(redis) unexpected data format in "
                       "subscription stream:");
-      fio_str_info_s tmp = fiobj_obj2cstr(msg);
-      FIO_LOG_STATE("     %s\n", tmp.data);
+      FIO_LOG_STATE("     %s\n", fiobj_obj2cstr(msg).data);
     }
   } else {
     // FIOBJ *ary = fiobj_ary2ptr(msg);

data/ext/iodine/websockets.c

@@ -327,10 +327,7 @@ static void destroy_ws(ws_s *ws) {
 void websocket_attach(intptr_t uuid, http_settings_s *http_settings,
                       websocket_settings_s *args, void *data, size_t length) {
   ws_s *ws = new_websocket(uuid);
-  if (!ws) {
-    FIO_LOG_FATAL("couldn't allocate Websocket protocol object");
-    exit(errno);
-  }
+  FIO_ASSERT_ALLOC(ws);
   // we have an active websocket connection - prep the connection buffer
   ws->buffer = create_ws_buffer(ws);
   // Setup ws callbacks
@@ -531,11 +528,11 @@ typedef struct {
 
 static void websocket_on_unsubscribe(void *u1, void *u2) {
   websocket_sub_data_s *d = u2;
-  (void)u1;
   if (d->on_unsubscribe) {
     d->on_unsubscribe(d->udata);
   }
   free(d);
+  (void)u1;
 }
 
 static inline void websocket_on_pubsub_message_direct_internal(fio_msg_s *msg,
@@ -615,7 +612,7 @@ static void websocket_on_pubsub_message(fio_msg_s *msg) {
  */
 #undef websocket_subscribe
 uintptr_t websocket_subscribe(struct websocket_subscribe_s args) {
-  if (!args.ws)
+  if (!args.ws || !fio_is_valid(args.ws->fd))
     goto error;
   websocket_sub_data_s *d = malloc(sizeof(*d));
   FIO_ASSERT_ALLOC(d);
@@ -637,14 +634,15 @@ uintptr_t websocket_subscribe(struct websocket_subscribe_s args) {
                                : websocket_on_pubsub_message_direct),
           .udata1 = (void *)args.ws->fd, .udata2 = d);
   if (!sub) {
-    /* don't free `d`, return (`d` freed by callback) */
+    /* don't free `d`, return (`d` freed by fio_subscribe) */
     return 0;
   }
+  fio_ls_s *pos;
   fio_lock(&args.ws->sub_lock);
-  fio_ls_push(&args.ws->subscriptions, sub);
+  pos = fio_ls_push(&args.ws->subscriptions, sub);
   fio_unlock(&args.ws->sub_lock);
 
-  return (uintptr_t)args.ws->subscriptions.prev;
+  return (uintptr_t)pos;
 error:
   if (args.on_unsubscribe)
     args.on_unsubscribe(args.udata);

data/lib/iodine.rb

@@ -106,6 +106,10 @@ if ARGV.index('-tout') && ARGV[ARGV.index('-tout') + 1]
 end
 Iodine::DEFAULT_HTTP_ARGS[:log] = true if ARGV.index('-v')
 
+if ARGV.index('-logging') && ARGV[ARGV.index('-logging') + 1] && ARGV[ARGV.index('-logging') + 1].to_s[0] >= '0' && ARGV[ARGV.index('-logging') + 1].to_s[0] <= '9'
+  Iodine.verbosity = ARGV[ARGV.index('-logging') + 1].to_i
+end
+
 if ARGV.index('-t') && ARGV[ARGV.index('-t') + 1].to_i != 0
   Iodine.threads = ARGV[ARGV.index('-t') + 1].to_i
 end

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '0.7.2'.freeze
+  VERSION = '0.7.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack