ignore certification files +

performance test fio_memcpy##x primitives +
Use pub/sub to monitor manager / root process (and shut down if lost) +
WIP HTTP +
WIP WebSockets

Author: boazsegev

.gitignore

@@ -1,3 +1,4 @@
 # Specify filepatterns you want git to ignore.
 tmp/*
 .DS_Store
+*.pem

fio-stl.h

@@ -12,6 +12,11 @@ extern "C" {
 #ifndef restrict
 #define restrict
 #endif
+/* C keyword - unavailable in C++ */
+#ifndef _Bool
+#define _Bool bool
+#endif
+
 #endif
 
 /* *****************************************************************************
@@ -650,10 +655,12 @@ Memory Copying Primitives
 #endif
 #endif /* FIO_MEMMOVE */
 
+/** No-op. */
 FIO_SFUNC void *fio_memcpy0(void *restrict d, const void *restrict s) {
   ((void)s);
   return d;
 }
+/** Copies 1 byte from `src` (`s`) to `dest` (`d`). */
 FIO_SFUNC void *fio_memcpy1(void *restrict d, const void *restrict s) {
   *(char *)d = *(const char *)s;
   return (void *)((uintptr_t)d + 1);

fio-stl/001 header.h

@@ -2534,7 +2534,47 @@ FIO_SFUNC void FIO_NAME_TEST(stl, mem_helper_speeds)(void) {
       fprintf(stderr, "%zuus\n", (size_t)(end - start));
     }
   }
-
+  {
+    fprintf(stderr, "\n");
+    struct {
+      void *(*fn)(void *, const void *, size_t);
+      size_t bytes;
+    } tests[] = {
+        {fio_memcpy7x, 7},
+        {fio_memcpy15x, 15},
+        {fio_memcpy31x, 31},
+        {fio_memcpy63x, 63},
+        {fio_memcpy127x, 127},
+        {fio_memcpy255x, 255},
+        {fio_memcpy511x, 511},
+        {fio_memcpy1023x, 1023},
+        {fio_memcpy2047x, 2047},
+        {fio_memcpy4095x, 4095},
+        {NULL},
+    };
+    char buf[4096 * 2];
+    memset(buf, 0x80, 4096 * 2);
+    for (size_t i = 0; tests[i].bytes; ++i) {
+      start = fio_time_micro();
+      for (size_t r = 0; r < (base_repetitions << 4); ++r) {
+        tests[i].fn(buf, buf + 4096, ((tests[i].bytes + r) & tests[i].bytes));
+        FIO_COMPILER_GUARD;
+      }
+      end = fio_time_micro();
+      fprintf(stderr,
+              "\tfio_memcpy%zux\tmemcpy(a,b,%zu)   \t%zuus\t",
+              tests[i].bytes,
+              tests[i].bytes,
+              (size_t)(end - start));
+      start = fio_time_micro();
+      for (size_t r = 0; r < (base_repetitions << 4); ++r) {
+        memcpy(buf, buf + 4096, ((tests[i].bytes + r) & tests[i].bytes));
+        FIO_COMPILER_GUARD;
+      }
+      end = fio_time_micro();
+      fprintf(stderr, "%zuus\n", (size_t)(end - start));
+    }
+  }
   fprintf(stderr, "* Speed testing memset:\n");
 
   for (size_t len_i = 5; len_i < 20; ++len_i) {

fio-stl/100 mem.h

@@ -114,6 +114,8 @@ struct fio_listen_args {
   fio_queue_s *queue_for_accept;
   /** If the server is forked - listen on the root process or the workers? */
   uint8_t on_root;
+  /** Hides "started/stopped listening" messages from log (if set). */
+  uint8_t hide_from_log;
 };
 
 /**
@@ -1681,12 +1683,14 @@ SFUNC void fio_srv_start(int workers) {
   fio_signal_monitor(SIGPIPE, NULL, NULL);
 #endif
   fio___srvdata.tick = fio_time_milli();
-  if (workers)
-    FIO_LOG_DEBUG2("starting facil.io server using %d workers.", workers);
-  else
-    FIO_LOG_DEBUG2("starting facil.io server in single process mode.");
-  for (int i = 0; i < workers; ++i) {
-    fio___srv_spawn_worker(NULL, NULL);
+  if (workers) {
+    FIO_LOG_INFO("(%d) spawning %d workers.", fio___srvdata.root_pid, workers);
+    for (int i = 0; i < workers; ++i) {
+      fio___srv_spawn_worker(NULL, NULL);
+    }
+  } else {
+    FIO_LOG_DEBUG2("(%d) starting facil.io server in single process mode.",
+                   fio___srvdata.root_pid);
   }
   fio___srv_work(!workers);
   fio_signal_forget(SIGINT);
@@ -1863,10 +1867,10 @@ static void fio___srv_listen_on_data(fio_s *io) {
   }
 }
 static void fio___srv_listen_on_close(void *settings_) {
-  struct fio_listen_args *s = (struct fio_listen_args *)settings_;
-  if ((!s->on_root && fio_srv_is_worker()) ||
-      (s->on_root && fio_srv_is_master()))
-    FIO_LOG_INFO("(%d) stopped listening on %s", fio___srvdata.pid, s->url);
+  struct fio_listen_args *l = (struct fio_listen_args *)settings_;
+  if (!l->hide_from_log && ((!l->on_root && fio_srv_is_worker()) ||
+                            (l->on_root && fio_srv_is_master())))
+    FIO_LOG_INFO("(%d) stopped listening on %s", fio___srvdata.pid, l->url);
 }
 
 FIO_SFUNC void fio___srv_listen_cleanup_task(void *udata) {
@@ -1906,7 +1910,8 @@ FIO_SFUNC void fio___srv_listen_attach_task(void *udata) {
   fio_attach_fd(fd, &FIO___LISTEN_PROTOCOL, l, NULL);
   if (l->on_start)
     l->on_start(l->udata);
-  FIO_LOG_INFO("(%d) started listening on %s", fio___srvdata.pid, l->url);
+  if (!l->hide_from_log)
+    FIO_LOG_INFO("(%d) started listening on %s", fio___srvdata.pid, l->url);
 }
 
 FIO_SFUNC void fio___srv_listen_attach_task_deferred(void *udata, void *ignr_) {

fio-stl/400 server.h

@@ -1154,6 +1154,14 @@ FIO_SFUNC void fio___letter_on_data_ipc_child(fio_s *io) {
 FIO_SFUNC void fio___letter_on_close(void *p) {
   fio_letter_parser_free((fio_letter_parser_s *)p);
 }
+FIO_SFUNC void fio___letter_on_close_in_child(void *p) {
+  fio___letter_on_close(p);
+  if (!fio_srv_is_running())
+    return;
+  fio_srv_stop();
+  FIO_LOG_FATAL("(%d) lost connection with manager process, shutting down!",
+                getpid());
+}
 FIO_SFUNC void fio___letter_on_timeout(fio_s *io) {
   static const char ping_buf[FIO___LETTER_MINIMAL_LEN] = {0};
   fio_write2(io, .buf = (char *)ping_buf, .len = FIO___LETTER_MINIMAL_LEN);
@@ -1180,7 +1188,7 @@ static fio_protocol_s FIO_LETTER_PROTOCOL_IPC_MASTER = {
 static fio_protocol_s FIO_LETTER_PROTOCOL_IPC_CHILD = {
     .on_attach = fio___letter_on_attach,
     .on_data = fio___letter_on_data_ipc_child,
-    .on_close = fio___letter_on_close,
+    .on_close = fio___letter_on_close_in_child,
     .on_timeout = fio___letter_on_timeout,
 };
 
@@ -1192,6 +1200,11 @@ FIO_SFUNC void fio_letter_local_ipc_on_open(int fd, void *udata) {
   fio_attach_fd(fd, (fio_protocol_s *)udata, NULL, NULL);
 }
 
+#if defined(DEBUG)
+#define FIO___PUBSUB_HIDE_FROM_LOG 0
+#else
+#define FIO___PUBSUB_HIDE_FROM_LOG 1
+#endif
 /** Starts listening to IPC connections on a local socket. */
 FIO_IFUNC void fio___pubsub_ipc_listen(void *ignr_) {
   (void)ignr_;
@@ -1203,11 +1216,12 @@ FIO_IFUNC void fio___pubsub_ipc_listen(void *ignr_) {
   FIO_ASSERT(!fio_listen(.url = FIO_POSTOFFICE.ipc_url,
                          .on_open = fio_letter_local_ipc_on_open,
                          .udata = (void *)&FIO_LETTER_PROTOCOL_IPC_MASTER,
-                         .on_root = 1),
+                         .on_root = 1,
+                         .hide_from_log = FIO___PUBSUB_HIDE_FROM_LOG),
              "(pub/sub) couldn't open a socket for "
              "IPC.");
 }
-
+#undef FIO___PUBSUB_HIDE_FROM_LOG
 /* *****************************************************************************
 Letter Listening to Remote Connections - TODO!
 ***************************************************************************** */

fio-stl/420 pubsub.h

@@ -1,7 +1,7 @@
 /* ************************************************************************* */
 #if !defined(FIO_INCLUDE_FILE) /* Dev test - ignore line */
 #define FIO___DEV___           /* Development inclusion - ignore line */
-#define FIO_MODULE_NAME module /* Development inclusion - ignore line */
+#define FIO_HTTP1_PARSER       /* Development inclusion - ignore line */
 #include "./include.h"         /* Development inclusion - ignore line */
 #endif                         /* Development inclusion - ignore line */
 /* *****************************************************************************
@@ -16,12 +16,12 @@
 
 Copyright and License: see header file (000 copyright.h) or top of file
 ***************************************************************************** */
-#if defined(FIO_HTTP1_PARSER) && !defined(H___FIO_HTTP1_PARSER___H)
-#define H___FIO_HTTP1_PARSER___H
+#if defined(FIO_HTTP1_PARSER) && !defined(H___FIO_HTTP1_PARSER___H) &&         \
+    (defined(FIO_EXTERN_COMPLETE) || !defined(FIO_EXTERN))
 /* *****************************************************************************
 The HTTP/1.1 provides static functions only, always as part or implementation.
 ***************************************************************************** */
-#if defined(FIO_EXTERN_COMPLETE) || !defined(FIO_EXTERN)
+#define H___FIO_HTTP1_PARSER___H
 
 /* *****************************************************************************
 HTTP/1.x Parser API
@@ -171,7 +171,7 @@ static int fio_http1___start(fio_http1_parser_s *p,
     buf->buf = start;
     return fio_http1___finish(p, buf, udata);
   }
-  char *eol = FIO_MEMCHR(start, '\n', buf->len);
+  char *eol = (char *)FIO_MEMCHR(start, '\n', buf->len);
   if (!eol)
     return 1;
   if (start + 13 > eol) /* test for minimal data GET HTTP/1 or ### HTTP/1 */
@@ -186,35 +186,36 @@ static int fio_http1___start(fio_http1_parser_s *p,
   if (start[0] > ('0' - 1) && start[0] < ('9' + 1))
     goto parse_response_line;
   /* request: method path version */
-  if (!(tmp = FIO_MEMCHR(start, ' ', eol - start)))
+  if (!(tmp = (char *)FIO_MEMCHR(start, ' ', (size_t)(eol - start))))
     return -1;
-  if (fio_http1_on_method(FIO_BUF_INFO2(start, tmp - start), udata))
+  if (fio_http1_on_method(FIO_BUF_INFO2(start, (size_t)(tmp - start)), udata))
     return -1;
   start = tmp + 1;
-  if (!(tmp = FIO_MEMCHR(start, ' ', eol - start)))
+  if (!(tmp = (char *)FIO_MEMCHR(start, ' ', eol - start)))
     return -1;
-  if (fio_http1_on_url(FIO_BUF_INFO2(start, tmp - start), udata))
+  if (fio_http1_on_url(FIO_BUF_INFO2(start, (size_t)(tmp - start)), udata))
     return -1;
   start = tmp + 1;
   if (start >= eol)
     return -1;
   if (fio_http1_on_version(
-          FIO_BUF_INFO2(start, ((eol - start) > 14) ? 14 : (eol - start)),
+          FIO_BUF_INFO2(start,
+                        (size_t)(((eol - start) > 14) ? 14 : (eol - start))),
           udata))
     return -1;
   return (p->fn = fio_http1___read_header)(p, buf, udata);
 
 parse_response_line:
   /* response: version code text */
-  if (!(tmp = FIO_MEMCHR(start, ' ', eol - start)))
+  if (!(tmp = (char *)FIO_MEMCHR(start, ' ', eol - start)))
     return -1;
-  if (fio_http1_on_version(FIO_BUF_INFO2(start, (tmp - start)), udata))
+  if (fio_http1_on_version(FIO_BUF_INFO2(start, (size_t)(tmp - start)), udata))
     return -1;
   start = tmp + 1;
-  if (!(tmp = FIO_MEMCHR(start, ' ', eol - start)))
+  if (!(tmp = (char *)FIO_MEMCHR(start, ' ', eol - start)))
     return -1;
   if (fio_http1_on_status(fio_atol10(&start),
-                          FIO_BUF_INFO2((tmp + 1), eol - tmp),
+                          FIO_BUF_INFO2((tmp + 1), (size_t)(eol - tmp)),
                           udata))
     return -1;
   return (p->fn = fio_http1___read_header)(p, buf, udata);
@@ -290,19 +291,19 @@ static inline int fio_http1___on_trailer(fio_http1_parser_s *p,
                                          void *udata) {
   (void)p;
   fio_buf_info_s forbidden[] = {
-      FIO_BUF_INFO1("authorization"),
-      FIO_BUF_INFO1("cache-control"),
-      FIO_BUF_INFO1("content-encoding"),
-      FIO_BUF_INFO1("content-length"),
-      FIO_BUF_INFO1("content-range"),
-      FIO_BUF_INFO1("content-type"),
-      FIO_BUF_INFO1("expect"),
-      FIO_BUF_INFO1("host"),
-      FIO_BUF_INFO1("max-forwards"),
-      FIO_BUF_INFO1("set-cookie"),
-      FIO_BUF_INFO1("te"),
-      FIO_BUF_INFO1("trailer"),
-      FIO_BUF_INFO1("transfer-encoding"),
+      FIO_BUF_INFO1((char *)"authorization"),
+      FIO_BUF_INFO1((char *)"cache-control"),
+      FIO_BUF_INFO1((char *)"content-encoding"),
+      FIO_BUF_INFO1((char *)"content-length"),
+      FIO_BUF_INFO1((char *)"content-range"),
+      FIO_BUF_INFO1((char *)"content-type"),
+      FIO_BUF_INFO1((char *)"expect"),
+      FIO_BUF_INFO1((char *)"host"),
+      FIO_BUF_INFO1((char *)"max-forwards"),
+      FIO_BUF_INFO1((char *)"set-cookie"),
+      FIO_BUF_INFO1((char *)"te"),
+      FIO_BUF_INFO1((char *)"trailer"),
+      FIO_BUF_INFO1((char *)"transfer-encoding"),
       FIO_BUF_INFO2(NULL, 0),
   }; /* known forbidden headers in trailer */
   for (size_t i = 0; forbidden[i].buf; ++i) {
@@ -354,7 +355,7 @@ static inline int fio_http1___read_header_line(
   int r;
   for (;;) {
     char *start = buf->buf;
-    char *eol = FIO_MEMCHR(start, '\n', buf->len);
+    char *eol = (char *)FIO_MEMCHR(start, '\n', buf->len);
     char *div;
     fio_buf_info_s name, value;
     if (!eol)
@@ -369,15 +370,15 @@ static inline int fio_http1___read_header_line(
     div = fio_http1___seek_header_div(start);
     if (div[0] != ':')
       return -1;
-    name = FIO_BUF_INFO2(start, (div - start));
+    name = FIO_BUF_INFO2(start, (size_t)(div - start));
     do {
       ++div;
     } while (*div == ' ' || *div == '\t');
 
     if (div != eol)
       while (eol[-1] == ' ' || eol[-1] == '\t')
         --eol;
-    value = FIO_BUF_INFO2((div == eol) ? NULL : div, (eol - div));
+    value = FIO_BUF_INFO2((div == eol) ? NULL : div, (size_t)(eol - div));
     r = handler(p, name, value, udata);
     if (FIO_UNLIKELY(r))
       return r;
@@ -514,7 +515,5 @@ FIO_SFUNC void FIO_NAME_TEST(stl, FIO_MODULE_NAME)(void) {
 /* *****************************************************************************
 Cleanup
 ***************************************************************************** */
-
-#endif /* FIO_EXTERN_COMPLETE */
 #undef FIO_HTTP1_PARSER
-#endif /* FIO_HTTP1_PARSER */
+#endif /* FIO_HTTP1_PARSER && FIO_EXTERN_COMPLETE*/