iodine 0.7.15 → 0.7.16

data/ext/iodine/fio_cli.c

@@ -91,11 +91,11 @@ char const *fio_cli_get_line_type(fio_cli_parser_data_s *parser,
   char const **pos = parser->names;
   while (*pos) {
     switch ((intptr_t)*pos) {
-    case /* FIO_CLI_TYPE_STRING */ 0x1:       /* fallthrough */
-    case /* FIO_CLI_TYPE_BOOL */ 0x2:         /* fallthrough */
-    case /* FIO_CLI_TYPE_INT */ 0x3:          /* fallthrough */
-    case /* FIO_CLI_TYPE_PRINT */ 0x4:        /* fallthrough */
-    case /* FIO_CLI_TYPE_PRINT_HEADER */ 0x5: /* fallthrough */
+    case FIO_CLI_STRING__TYPE_I:       /* fallthrough */
+    case FIO_CLI_BOOL__TYPE_I:         /* fallthrough */
+    case FIO_CLI_INT__TYPE_I:          /* fallthrough */
+    case FIO_CLI_PRINT__TYPE_I:        /* fallthrough */
+    case FIO_CLI_PRINT_HEADER__TYPE_I: /* fallthrough */
       ++pos;
       continue;
     }
@@ -107,11 +107,11 @@ char const *fio_cli_get_line_type(fio_cli_parser_data_s *parser,
   return NULL;
 found:
   switch ((size_t)pos[1]) {
-  case /* FIO_CLI_TYPE_STRING */ 0x1:       /* fallthrough */
-  case /* FIO_CLI_TYPE_BOOL */ 0x2:         /* fallthrough */
-  case /* FIO_CLI_TYPE_INT */ 0x3:          /* fallthrough */
-  case /* FIO_CLI_TYPE_PRINT */ 0x4:        /* fallthrough */
-  case /* FIO_CLI_TYPE_PRINT_HEADER */ 0x5: /* fallthrough */
+  case FIO_CLI_STRING__TYPE_I:       /* fallthrough */
+  case FIO_CLI_BOOL__TYPE_I:         /* fallthrough */
+  case FIO_CLI_INT__TYPE_I:          /* fallthrough */
+  case FIO_CLI_PRINT__TYPE_I:        /* fallthrough */
+  case FIO_CLI_PRINT_HEADER__TYPE_I: /* fallthrough */
     return pos[1];
   }
   return NULL;
@@ -141,26 +141,21 @@ static void fio_cli_set_arg(cstr_s arg, char const *value, char const *line,
   /* validate data types */
   char const *type = fio_cli_get_line_type(parser, line);
   switch ((size_t)type) {
-  case /* FIO_CLI_TYPE_BOOL */ 0x2:
+  case FIO_CLI_BOOL__TYPE_I:
     if (value && value != parser->argv[parser->pos + 1]) {
       goto error;
     }
     value = "1";
     break;
-  case /* FIO_CLI_TYPE_INT */ 0x3: /* fallthrough */
+  case FIO_CLI_INT__TYPE_I:
     if (value) {
       char const *tmp = value;
-      if (*tmp == '-' || *tmp == '+') {
-        ++tmp;
-      }
-      while (*tmp && *tmp >= '0' && *tmp <= '9') {
-        ++tmp;
-      }
+      fio_atol((char **)&tmp);
       if (*tmp) {
         goto error;
       }
     }
-  case /* FIO_CLI_TYPE_STRING */ 0x1: /* fallthrough */
+  case FIO_CLI_STRING__TYPE_I: /* fallthrough */
     if (!value)
       goto error;
     if (!value[0])
@@ -206,28 +201,28 @@ print_help:
   char const **pos = parser->names;
   while (*pos) {
     switch ((intptr_t)*pos) {
-    case /* FIO_CLI_TYPE_STRING */ 0x1:       /* fallthrough */
-    case /* FIO_CLI_TYPE_BOOL */ 0x2:         /* fallthrough */
-    case /* FIO_CLI_TYPE_INT */ 0x3:          /* fallthrough */
-    case /* FIO_CLI_TYPE_PRINT */ 0x4:        /* fallthrough */
-    case /* FIO_CLI_TYPE_PRINT_HEADER */ 0x5: /* fallthrough */
+    case FIO_CLI_STRING__TYPE_I:       /* fallthrough */
+    case FIO_CLI_BOOL__TYPE_I:         /* fallthrough */
+    case FIO_CLI_INT__TYPE_I:          /* fallthrough */
+    case FIO_CLI_PRINT__TYPE_I:        /* fallthrough */
+    case FIO_CLI_PRINT_HEADER__TYPE_I: /* fallthrough */
       ++pos;
       continue;
     }
-    type = FIO_CLI_TYPE_STRING;
+    type = (char *)FIO_CLI_STRING__TYPE_I;
     switch ((intptr_t)pos[1]) {
-    case /* FIO_CLI_TYPE_PRINT */ 0x4:
+    case FIO_CLI_PRINT__TYPE_I:
       fprintf(stderr, "%s\n", pos[0]);
       pos += 2;
       continue;
-    case /* FIO_CLI_TYPE_PRINT_HEADER */ 0x5:
+    case FIO_CLI_PRINT_HEADER__TYPE_I:
       fprintf(stderr, "\n\x1B[4m%s\x1B[0m\n", pos[0]);
       pos += 2;
       continue;
 
-    case /* FIO_CLI_TYPE_STRING */ 0x1: /* fallthrough */
-    case /* FIO_CLI_TYPE_BOOL */ 0x2:   /* fallthrough */
-    case /* FIO_CLI_TYPE_INT */ 0x3:    /* fallthrough */
+    case FIO_CLI_STRING__TYPE_I: /* fallthrough */
+    case FIO_CLI_BOOL__TYPE_I:   /* fallthrough */
+    case FIO_CLI_INT__TYPE_I:    /* fallthrough */
       type = pos[1];
     }
     /* print line @ pos, starting with main argument name */
@@ -247,14 +242,14 @@ print_help:
       }
     }
     switch ((size_t)type) {
-    case /* FIO_CLI_TYPE_STRING */ 0x1:
+    case FIO_CLI_STRING__TYPE_I:
       fprintf(stderr, " \x1B[1m%.*s\x1B[0m\x1B[2m <>\x1B[0m\t%s\n", first_len,
               p, p + tmp);
       break;
-    case /* FIO_CLI_TYPE_BOOL */ 0x2:
+    case FIO_CLI_BOOL__TYPE_I:
       fprintf(stderr, " \x1B[1m%.*s\x1B[0m   \t%s\n", first_len, p, p + tmp);
       break;
-    case /* FIO_CLI_TYPE_INT */ 0x3:
+    case FIO_CLI_INT__TYPE_I:
       fprintf(stderr, " \x1B[1m%.*s\x1B[0m\x1B[2m ##\x1B[0m\t%s\n", first_len,
               p, p + tmp);
       break;
@@ -273,18 +268,18 @@ print_help:
       if (padding < 0)
         padding = 0;
       switch ((size_t)type) {
-      case /* FIO_CLI_TYPE_STRING */ 0x1:
+      case FIO_CLI_STRING__TYPE_I:
         fprintf(stderr,
                 " \x1B[1m%.*s\x1B[0m\x1B[2m <>\x1B[0m%*s\t(same as "
                 "\x1B[1m%.*s\x1B[0m)\n",
                 (int)(tmp - start), p + start, padding, "", first_len, p);
         break;
-      case /* FIO_CLI_TYPE_BOOL */ 0x2:
+      case FIO_CLI_BOOL__TYPE_I:
         fprintf(stderr,
                 " \x1B[1m%.*s\x1B[0m   %*s\t(same as \x1B[1m%.*s\x1B[0m)\n",
                 (int)(tmp - start), p + start, padding, "", first_len, p);
         break;
-      case /* FIO_CLI_TYPE_INT */ 0x3:
+      case FIO_CLI_INT__TYPE_I:
         fprintf(stderr,
                 " \x1B[1m%.*s\x1B[0m\x1B[2m ##\x1B[0m%*s\t(same as "
                 "\x1B[1m%.*s\x1B[0m)\n",
@@ -304,9 +299,18 @@ print_help:
   exit(0);
 }
 
+static void fio_cli_end_promise(void *ignr_) {
+  /* make sure fio_cli_end is called before facil.io exists. */
+  fio_cli_end();
+  (void)ignr_;
+}
+
 void fio_cli_start AVOID_MACRO(int argc, char const *argv[], int unnamed_min,
                                int unnamed_max, char const *description,
                                char const **names) {
+  static fio_lock_i run_once = FIO_LOCK_INIT;
+  if (!fio_trylock(&run_once))
+    fio_state_callback_add(FIO_CALL_AT_EXIT, fio_cli_end_promise, NULL);
   if (unnamed_max >= 0 && unnamed_max < unnamed_min)
     unnamed_max = unnamed_min;
   fio_cli_parser_data_s parser = {
@@ -328,15 +332,16 @@ void fio_cli_start AVOID_MACRO(int argc, char const *argv[], int unnamed_min,
   char const **line = names;
   while (*line) {
     switch ((intptr_t)*line) {
-    case /* FIO_CLI_TYPE_STRING */ 0x1:       /* fallthrough */
-    case /* FIO_CLI_TYPE_BOOL */ 0x2:         /* fallthrough */
-    case /* FIO_CLI_TYPE_INT */ 0x3:          /* fallthrough */
-    case /* FIO_CLI_TYPE_PRINT */ 0x4:        /* fallthrough */
-    case /* FIO_CLI_TYPE_PRINT_HEADER */ 0x5: /* fallthrough */
+    case FIO_CLI_STRING__TYPE_I:       /* fallthrough */
+    case FIO_CLI_BOOL__TYPE_I:         /* fallthrough */
+    case FIO_CLI_INT__TYPE_I:          /* fallthrough */
+    case FIO_CLI_PRINT__TYPE_I:        /* fallthrough */
+    case FIO_CLI_PRINT_HEADER__TYPE_I: /* fallthrough */
       ++line;
       continue;
     }
-    if (line[1] != FIO_CLI_TYPE_PRINT && line[1] != FIO_CLI_TYPE_PRINT_HEADER)
+    if (line[1] != (char *)FIO_CLI_PRINT__TYPE_I &&
+        line[1] != (char *)FIO_CLI_PRINT_HEADER__TYPE_I)
       fio_cli_map_line2alias(*line);
     ++line;
   }
@@ -385,7 +390,8 @@ char const *fio_cli_get(char const *name) {
   if (!fio_cli_hash_count(&fio_values)) {
     return NULL;
   }
-  return fio_cli_hash_find(&fio_values, FIO_CLI_HASH_VAL(n), n);
+  char const *val = fio_cli_hash_find(&fio_values, FIO_CLI_HASH_VAL(n), n);
+  return val;
 }
 
 /** Returns the argument's value as an integer. */
@@ -393,22 +399,8 @@ int fio_cli_get_i(char const *name) {
   char const *val = fio_cli_get(name);
   if (!val)
     return 0;
-  int ret = 0;
-  int invert = 0;
-  while (*val == '-' || *val == '+') {
-    if (*val == '-') {
-      invert += 1;
-    }
-    ++val;
-  }
-  while (*val) {
-    ret = (ret * 10) + (*val - '0');
-    ++val;
-  }
-  if ((invert & 1)) {
-    ret = 0 - ret;
-  }
-  return ret;
+  int i = (int)fio_atol((char **)&val);
+  return i;
 }
 
 /** Returns the number of unrecognized argument. */

data/ext/iodine/fio_cli.h

@@ -16,16 +16,16 @@ extern "C" {
 CLI API
 ***************************************************************************** */
 
-/** Indicates the previous CLI argument should be a String (default). */
-#define FIO_CLI_TYPE_STRING ((char *)0x1)
-/** Indicates the previous CLI argument is a Boolean value. */
-#define FIO_CLI_TYPE_BOOL ((char *)0x2)
-/** Indicates the previous CLI argument should be an Integer (numerical). */
-#define FIO_CLI_TYPE_INT ((char *)0x3)
-/** Indicates the previous CLI string should be printed as is. */
-#define FIO_CLI_TYPE_PRINT ((char *)0x4)
-/** Indicates the previous CLI string should be printed as a header. */
-#define FIO_CLI_TYPE_PRINT_HEADER ((char *)0x5)
+/** Indicates the CLI argument should be a String (default). */
+#define FIO_CLI_STRING(line)
+/** Indicates the CLI argument is a Boolean value. */
+#define FIO_CLI_BOOL(line)
+/** Indicates the CLI argument should be an Integer (numerical). */
+#define FIO_CLI_INT(line)
+/** Indicates the CLI string should be printed as is. */
+#define FIO_CLI_PRINT(line)
+/** Indicates the CLI string should be printed as a header. */
+#define FIO_CLI_PRINT_HEADER(line)
 
 /**
  * This function parses the Command Line Interface (CLI), creating a temporary
@@ -45,9 +45,11 @@ CLI API
  *
  * The following optional type requirements are:
  *
- * * FIO_CLI_TYPE_STRING - (default) string argument.
- * * FIO_CLI_TYPE_BOOL   - boolean argument (no value).
- * * FIO_CLI_TYPE_INT    - integer argument ('-', '+', '0'-'9' chars accepted).
+ * * FIO_CLI_STRING(desc_line)       - (default) string argument.
+ * * FIO_CLI_BOOL(desc_line)         - boolean argument (no value).
+ * * FIO_CLI_INT(desc_line)          - integer argument.
+ * * FIO_CLI_PRINT_HEADER(desc_line) - extra header for output.
+ * * FIO_CLI_PRINT(desc_line)        - extra information for output.
  *
  * Argument names MUST start with the '-' character. The first word starting
  * without the '-' character will begin the description for the CLI argument.
@@ -60,11 +62,15 @@ CLI API
  * Example use:
  *
  *    fio_cli_start(argc, argv, 0, 0, "this example accepts the following:",
- *                  "-t -thread number of threads to run.", FIO_CLI_TYPE_INT,
- *                  "-w -workers number of workers to run.", FIO_CLI_TYPE_INT,
+ *                  FIO_CLI_PRINT_HREADER("Concurrency:"),
+ *                  FIO_CLI_INT("-t -thread number of threads to run."),
+ *                  FIO_CLI_INT("-w -workers number of workers to run."),
+ *                  FIO_CLI_PRINT_HREADER("Address Binding:"),
  *                  "-b, -address the address to bind to.",
- *                  "-p,-port the port to bind to.", FIO_CLI_TYPE_INT,
- *                  "-v -log enable logging.", FIO_CLI_TYPE_BOOL);
+ *                  FIO_CLI_INT("-p,-port the port to bind to."),
+ *                  FIO_CLI_PRINT("\t\tset port to zero (0) for Unix s."),
+ *                  FIO_CLI_PRINT_HREADER("Logging:"),
+ *                  FIO_CLI_BOOL("-v -log enable logging."));
  *
  *
  * This would allow access to the named arguments:
@@ -123,12 +129,14 @@ char const *fio_cli_unnamed(unsigned int index);
  *
  *     fio_cli_start(argc, argv,
  *                  "this is example accepts the following options:",
- *                  "-p -port the port to bind to", FIO_CLI_TYPE_INT;
+ *                  "-p -port the port to bind to", FIO_CLI_INT;
  *
  *     fio_cli_set("-p", "hello"); // fio_cli_get("-p") != fio_cli_get("-port");
  *
  * Note: this does NOT copy the C strings to memory. Memory should be kept alive
- * until `fio_cli_end` is called.
+ *       until `fio_cli_end` is called.
+ *
+ * This function is NOT thread safe.
  */
 void fio_cli_set(char const *name, char const *value);
 
@@ -138,6 +146,8 @@ void fio_cli_set(char const *name, char const *value);
  *     if(!fio_cli_get(name)) {
  *       fio_cli_set(name, value)
  *     }
+ *
+ * See fio_cli_set for notes and restrictions.
  */
 #define fio_cli_set_default(name, value)                                       \
   if (!fio_cli_get((name)))                                                    \
@@ -147,4 +157,33 @@ void fio_cli_set(char const *name, char const *value);
 } /* extern "C" */
 #endif
 
+/* *****************************************************************************
+Internal Macro Implementation
+***************************************************************************** */
+
+/** Used internally. */
+#define FIO_CLI_STRING__TYPE_I 0x1
+#define FIO_CLI_BOOL__TYPE_I 0x2
+#define FIO_CLI_INT__TYPE_I 0x3
+#define FIO_CLI_PRINT__TYPE_I 0x4
+#define FIO_CLI_PRINT_HEADER__TYPE_I 0x5
+
+#undef FIO_CLI_STRING
+#undef FIO_CLI_BOOL
+#undef FIO_CLI_INT
+#undef FIO_CLI_PRINT
+#undef FIO_CLI_PRINT_HEADER
+
+/** Indicates the CLI argument should be a String (default). */
+#define FIO_CLI_STRING(line) (line), ((char *)FIO_CLI_STRING__TYPE_I)
+/** Indicates the CLI argument is a Boolean value. */
+#define FIO_CLI_BOOL(line) (line), ((char *)FIO_CLI_BOOL__TYPE_I)
+/** Indicates the CLI argument should be an Integer (numerical). */
+#define FIO_CLI_INT(line) (line), ((char *)FIO_CLI_INT__TYPE_I)
+/** Indicates the CLI string should be printed as is. */
+#define FIO_CLI_PRINT(line) (line), ((char *)FIO_CLI_PRINT__TYPE_I)
+/** Indicates the CLI string should be printed as a header. */
+#define FIO_CLI_PRINT_HEADER(line)                                             \
+  (line), ((char *)FIO_CLI_PRINT_HEADER__TYPE_I)
+
 #endif

data/ext/iodine/fio_siphash.c

@@ -133,64 +133,11 @@ uint64_t __attribute__((weak)) fio_siphash13(const void *data, size_t len) {
   return fio_siphash_xy(data, len, 1, 3);
 }
 
-#if defined(DEBUG) && DEBUG == 1
+#if DEBUG
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
 
-#if 0
-static void fio_siphash_speed_test(void) {
-  /* test based on code from BearSSL with credit to Thomas Pornin */
-  uint8_t buffer[8192];
-  memset(buffer, 'T', sizeof(buffer));
-  /* warmup */
-  uint64_t hash = 0;
-  for (size_t i = 0; i < 4; i++) {
-    hash += fio_siphash(buffer, sizeof(buffer));
-    memcpy(buffer, &hash, sizeof(hash));
-  }
-  /* loop until test runs for more than 2 seconds */
-  for (uint64_t cycles = 8192;;) {
-    clock_t start, end;
-    start = clock();
-    for (size_t i = cycles; i > 0; i--) {
-      hash += fio_siphash(buffer, sizeof(buffer));
-      __asm__ volatile("" ::: "memory");
-    }
-    end = clock();
-    memcpy(buffer, &hash, sizeof(hash));
-    if ((end - start) >= (2 * CLOCKS_PER_SEC) ||
-        cycles >= ((uint64_t)1 << 62)) {
-      fprintf(stderr, "%-20s %8.2f MB/s\n", "fio SipHash24",
-              (double)(sizeof(buffer) * cycles) /
-                  (((end - start) * 1000000.0 / CLOCKS_PER_SEC)));
-      break;
-    }
-    cycles <<= 2;
-  }
-  /* loop until test runs for more than 2 seconds */
-  for (uint64_t cycles = 8192;;) {
-    clock_t start, end;
-    start = clock();
-    for (size_t i = cycles; i > 0; i--) {
-      hash += fio_siphash13(buffer, sizeof(buffer));
-      __asm__ volatile("" ::: "memory");
-    }
-    end = clock();
-    memcpy(buffer, &hash, sizeof(hash));
-    if ((end - start) >= (2 * CLOCKS_PER_SEC) ||
-        cycles >= ((uint64_t)1 << 62)) {
-      fprintf(stderr, "%-20s %8.2f MB/s\n", "fio SipHash13",
-              (double)(sizeof(buffer) * cycles) /
-                  (((end - start) * 1000000.0 / CLOCKS_PER_SEC)));
-      break;
-    }
-    cycles <<= 2;
-  }
-}
-
-#endif
-
 void fiobj_siphash_test(void) {
   fprintf(stderr, "===================================\n");
   // fio_siphash_speed_test();

data/ext/iodine/fio_siphash.h

@@ -25,7 +25,7 @@ uint64_t fio_siphash13(const void *data, size_t len);
  */
 #define fio_siphash(data, length) fio_siphash13((data), (length))
 
-#if defined(DEBUG) && DEBUG
+#if DEBUG
 void fiobj_siphash_test(void);
 #else
 #define fiobj_siphash_test()

data/ext/iodine/http1.c

@@ -679,6 +679,8 @@ static inline void http1_consume_data(intptr_t uuid, http1pr_s *p) {
   ssize_t i = 0;
   size_t org_len = p->buf_len;
   int pipeline_limit = 8;
+  if (!p->buf_len)
+    return;
   do {
     i = http1_fio_parser(.parser = &p->parser,
                          .buffer = p->buf + (org_len - p->buf_len),
@@ -772,6 +774,7 @@ fio_protocol_s *http1_new(uintptr_t uuid, http_settings_s *settings,
   if (unread_data && unread_length > HTTP_MAX_HEADER_LENGTH)
     return NULL;
   http1pr_s *p = fio_malloc(sizeof(*p) + HTTP_MAX_HEADER_LENGTH);
+  // FIO_LOG_DEBUG("Allocated HTTP/1.1 protocol at. %p", (void *)p);
   FIO_ASSERT_ALLOC(p);
   *p = (http1pr_s){
       .p.protocol =
@@ -785,10 +788,12 @@ fio_protocol_s *http1_new(uintptr_t uuid, http_settings_s *settings,
       .is_client = settings->is_client,
   };
   http_s_new(&p->request, &p->p, &HTTP1_VTABLE);
-  fio_attach(uuid, &p->p.protocol);
   if (unread_data && unread_length <= HTTP_MAX_HEADER_LENGTH) {
     memcpy(p->buf, unread_data, unread_length);
     p->buf_len = unread_length;
+  }
+  fio_attach(uuid, &p->p.protocol);
+  if (unread_data && unread_length <= HTTP_MAX_HEADER_LENGTH) {
     fio_force_event(uuid, FIO_EVENT_ON_DATA);
   }
   return &p->p.protocol;
@@ -800,6 +805,7 @@ void http1_destroy(fio_protocol_s *pr) {
   http1_pr2handle(p).status = 0;
   http_s_destroy(&http1_pr2handle(p), 0);
   fio_free(p);
+  // FIO_LOG_DEBUG("Deallocated HTTP/1.1 protocol at. %p", (void *)p);
 }
 
 /* *****************************************************************************