more cleanup and joy

.github/workflows/Windows.yml

@@ -31,7 +31,7 @@ jobs:
         ruby-version: ${{ matrix.ruby-version }}
     - name: Install Gems
       run: bundle install
-    - name: Build and Test Iodine
+    - name: Compile and Install Iodine
       run: |
         echo CFLAGS = $CFLAGS
         echo cflags = $cflags

.github/workflows/posix.yml

@@ -31,7 +31,7 @@ jobs:
         ruby-version: ${{ matrix.ruby-version }}
     - name: Install Gems
       run: bundle install
-    - name: Build and Test Iodine
+    - name: Compile Iodine
       run: |
         echo CFLAGS = $CFLAGS
         echo cflags = $cflags

ext/iodine/fio-stl.h

@@ -40825,9 +40825,7 @@ static int fio_http1___start(fio_http1_parser_s *p,
   eol -= eol[-1] == '\r';
 
   /* parse first line */
-  if (start[0] > ('0' - 1) && start[0] < ('9' + 1))
-    goto parse_response_line;
-  /* request: method path version */
+  /* request: method path version ; response: version code txt */
   if (!(tmp = (char *)FIO_MEMCHR(start, ' ', (size_t)(eol - start))))
     return -1;
   wrd[0] = FIO_BUF_INFO2(start, (size_t)(tmp - start));
@@ -40839,7 +40837,7 @@ static int fio_http1___start(fio_http1_parser_s *p,
   if (start >= eol)
     return -1;
   wrd[2] = FIO_BUF_INFO2(start, (size_t)(eol - start));
-  if (fio_c2i(wrd[1].buf[0]) < 10)
+  if (fio_c2i(wrd[1].buf[0]) < 10) /* test if path or code */
     goto parse_response_line;
   if (wrd[2].len > 14)
     wrd[2].len = 14;

ext/iodine/iodine_connection.h

@@ -664,7 +664,7 @@ FIO_SFUNC VALUE iodine_connection_body_seek(int argc, VALUE *argv, VALUE o) {
   iodine_connection_s *c = iodine_connection_ptr(o);
   if (!c->http)
     return Qnil;
-  long long pos = 0;
+  int64_t pos = 0;
   iodine_rb2c_arg(argc, argv, IODINE_ARG_NUM(pos, 0, "pos", 0));
   pos = (long long)fio_http_body_seek(c->http, (ssize_t)pos);
   return ULL2NUM(pos);
@@ -1719,7 +1719,7 @@ FIO_IFUNC VALUE iodine_connection_subscribe_internal(fio_s *io,
                                                      int argc,
                                                      VALUE *argv) {
   fio_buf_info_s channel = FIO_BUF_INFO2(NULL, 0);
-  long long filter = 0;
+  int64_t filter = 0;
   VALUE proc = Qnil;
 
   iodine_rb2c_arg(argc,
@@ -1748,7 +1748,7 @@ FIO_IFUNC VALUE iodine_connection_subscribe_internal(fio_s *io,
 static VALUE iodine_connection_unsubscribe_internal(fio_s *io,
                                                     int argc,
                                                     VALUE *argv) {
-  long long filter = 0;
+  int64_t filter = 0;
   fio_buf_info_s channel = FIO_BUF_INFO2(NULL, 0);
   iodine_rb2c_arg(argc,
                   argv,
@@ -1805,12 +1805,12 @@ FIO_IFUNC iodine_connection_args_s iodine_connection_parse_args(int argc,
               .log = fio_cli_get_bool("-v"),
           },
   };
-  VALUE proc = Qnil;
+  VALUE proc = Qnil, handler_tmp = Qnil;
   iodine_rb2c_arg(
       argc,
       argv,
       IODINE_ARG_BUF(r.url, 0, "url", 0),
-      IODINE_ARG_RB((((VALUE *)&r.settings.udata)[0]), 0, "handler", 0),
+      IODINE_ARG_RB(handler_tmp, 0, "handler", 0),
       IODINE_ARG_BUF(r.hint, 0, "service", 0),
       IODINE_ARG_RB(r.rb_tls, 0, "tls", 0),
       IODINE_ARG_STR(r.settings.public_folder, 0, "public", 0),
@@ -1827,7 +1827,7 @@ FIO_IFUNC iodine_connection_args_s iodine_connection_parse_args(int argc,
       IODINE_ARG_BUF(r.body, 0, "body", 0),
       IODINE_ARG_RB(r.cookies, 0, "cookies", 0),
       IODINE_ARG_PROC(proc, 0, "block", 0));
-
+  r.settings.udata = (void *)handler_tmp;
   /* test for errors before allocating or protecting data */
 
   if (r.headers != Qnil && !RB_TYPE_P(r.headers, RUBY_T_HASH))
@@ -2408,7 +2408,7 @@ static VALUE iodine_connection_publish_internal(fio_s *io,
                                                 VALUE self) {
   VALUE message = Qnil;
   VALUE engine = Qnil;
-  long long filter = 0;
+  int64_t filter = 0;
   fio_buf_info_s channel = FIO_BUF_INFO2(NULL, 0);
   fio_buf_info_s msg = FIO_BUF_INFO2(NULL, 0);
   char *to_free = NULL;

ext/iodine/iodine_minimap.h

@@ -38,7 +38,7 @@ static _Bool iodinde_hmap_object_cmp(VALUE a, VALUE b) {
 #define FIO_MAP_KEY                 VALUE
 #define FIO_MAP_VALUE               VALUE
 #define FIO_MAP_HASH_FN             iodinde_hmap_hash
-#define FIO_MAP_KEY_CMP(a, b)       iodinde_hmap_object_cmp
+#define FIO_MAP_KEY_CMP(a, b)       iodinde_hmap_object_cmp(a, b)
 #define FIO_MAP_KEY_COPY(dest, src) ((dest) = (src))
 #include FIO_INCLUDE_FILE
 

ext/iodine/iodine_pubsub_eng.h

@@ -6,20 +6,10 @@
 Ruby PubSub Engine Type
 ***************************************************************************** */
 
-typedef enum {
-  // IODINE_PUBSUB_ENG_STORE_handler,
-  // IODINE_PUBSUB_ENG_STORE_channel,
-  // IODINE_PUBSUB_ENG_STORE_filter,
-  // IODINE_PUBSUB_ENG_STORE_engine,
-  // IODINE_PUBSUB_ENG_STORE_published,
-  IODINE_PUBSUB_ENG_STORE_FINISH,
-} iodine_pubsub_eng_store_e;
-
 typedef struct iodine_pubsub_eng_s {
   fio_pubsub_engine_s engine;
   fio_pubsub_engine_s *ptr;
   VALUE handler;
-  VALUE store[IODINE_PUBSUB_ENG_STORE_FINISH];
 } iodine_pubsub_eng_s;
 
 /* *****************************************************************************
@@ -180,13 +170,6 @@ static size_t iodine_pubsub_eng_data_size(const void *ptr_) {
   return sizeof(*m);
 }
 
-static void iodine_pubsub_eng_mark(void *m_) {
-  iodine_pubsub_eng_s *m = (iodine_pubsub_eng_s *)m_;
-  for (size_t i = 0; i < IODINE_PUBSUB_ENG_STORE_FINISH; ++i)
-    if (!IODINE_STORE_IS_SKIP(m->store[i]))
-      rb_gc_mark(m->store[i]);
-}
-
 static void iodine_pubsub_eng_free(void *ptr_) {
   iodine_pubsub_eng_s *e = (iodine_pubsub_eng_s *)ptr_;
   if (FIO_PUBSUB_DEFAULT == e->ptr)
@@ -199,7 +182,6 @@ static const rb_data_type_t IODINE_PUBSUB_ENG_DATA_TYPE = {
     .wrap_struct_name = "IodinePSEngine",
     .function =
         {
-            .dmark = iodine_pubsub_eng_mark,
             .dfree = iodine_pubsub_eng_free,
             .dsize = iodine_pubsub_eng_data_size,
         },
@@ -213,8 +195,6 @@ static VALUE iodine_pubsub_eng_alloc(VALUE klass) {
     goto no_memory;
   *m = (iodine_pubsub_eng_s){0};
   m->ptr = &m->engine;
-  for (size_t i = 0; i < IODINE_PUBSUB_ENG_STORE_FINISH; ++i)
-    m->store[i] = Qnil;
   FIO_LEAK_COUNTER_ON_ALLOC(iodine_pubsub_eng);
   m->handler = TypedData_Wrap_Struct(klass, &IODINE_PUBSUB_ENG_DATA_TYPE, m);
   m->engine = iodine_pubsub___engine_validate(m->handler);

ext/iodine/iodine_utils.h

@@ -164,7 +164,7 @@ Time to String Helpers
 
 FIO_IFUNC time_t iodine_utils_rb2time(VALUE rtm) {
   rtm = rb_funcallv(rtm, rb_intern("to_i"), 0, NULL);
-  return FIX2ULONG(rtm) ? FIX2ULONG(rtm) : fio_time_real().tv_sec;
+  return FIX2LONG(rtm) ? FIX2LONG(rtm) : fio_time_real().tv_sec;
 }
 
 /** Takes a Time object and returns a String conforming to RFC 2109. */