update facil.io to version 0.7.0.beta2 (#4194)

facil.io's core engine had been updated for the upcoming 0.7.0 release.

Since facil.io 0.7.0 edge has been in use for a while (it's used as the engine behind the iodine Ruby server), I thought it would be time to update the benchmarks.

The changes could effect performance in some ways (I suspect some of which are negative).

I'm also updating the automated thread/process selection command-line, (from 4 workers with a 5/CPU core automated thread count to 2/CPU core workers with 2 threads each).

I'm not sure what the best worker/thread ration and it changes between thre cloud and physical environment, so there's that.

Thanks,
   Bo.

frameworks/C/facil.io/bench_app.c

@@ -8,7 +8,6 @@ using the full HTTP framework stack (without any DB support).
 #include "http.h"
 
 #include "fio_cli.h"
-#include "fio_hashmap.h"
 
 /* *****************************************************************************
 Internal Helpers
@@ -62,25 +61,25 @@ int main(int argc, char const *argv[]) {
 
   /* Server name and header */
   HTTP_HEADER_SERVER = fiobj_str_new("server", 6);
-  HTTP_VALUE_SERVER = fiobj_strprintf("facil.io %u.%u.%u", FACIL_VERSION_MAJOR,
-                                      FACIL_VERSION_MINOR, FACIL_VERSION_PATCH);
+  HTTP_VALUE_SERVER = fiobj_str_new("facil.io " FIO_VERSION_STRING,
+                                    strlen("facil.io " FIO_VERSION_STRING));
   /* JSON values to be serialized */
   JSON_KEY = fiobj_str_new("message", 7);
   JSON_VALUE = fiobj_str_new("Hello, World!", 13);
 
   /* Test for static file service */
-  const char *public_folder = fio_cli_get_str("www");
+  const char *public_folder = fio_cli_get("-www");
   if (public_folder) {
     fprintf(stderr, "* serving static files from:%s\n", public_folder);
   }
 
   /* listen to HTTP connections */
-  http_listen(fio_cli_get_str("port"), fio_cli_get_str("address"),
+  http_listen(fio_cli_get("-port"), fio_cli_get("-address"),
               .on_request = route_perform, .public_folder = public_folder,
-              .log = fio_cli_get_int("log"));
+              .log = fio_cli_get_bool("-log"));
 
   /* Start the facil.io reactor */
-  facil_run(.threads = fio_cli_get_int("t"), .processes = fio_cli_get_int("w"));
+  fio_start(.threads = fio_cli_get_i("-t"), .workers = fio_cli_get_i("-w"));
 
   /* perform cleanup */
   cleanup();
@@ -100,7 +99,7 @@ static void on_request_json(http_s *h) {
   fiobj_hash_set(hash, JSON_KEY, fiobj_dup(JSON_VALUE));
   json = fiobj_obj2json(hash, 0);
   fiobj_free(hash);
-  fio_cstr_s tmp = fiobj_obj2cstr(json);
+  fio_str_info_s tmp = fiobj_obj2cstr(json);
   http_send_body(h, tmp.data, tmp.len);
   fiobj_free(json);
 }
@@ -117,53 +116,60 @@ CLI
 
 /* initialize CLI helper and manage it's default options */
 static void cli_init(int argc, char const *argv[]) {
-  fio_cli_start(argc, argv,
-                "This is a facil.io framework benchmark application.\n"
-                "\nFor details about the benchmarks visit:\n"
-                "http://frameworkbenchmarks.readthedocs.io/en/latest/\n"
-                "\nThe following arguments are supported:");
-  fio_cli_accept_num("threads t",
-                     "The number of threads to use. System dependent default.");
-  fio_cli_accept_num(
-      "workers w", "The number of processes to use. System dependent default.");
-  fio_cli_accept_num(
-      "port p", "The port number to listen to (set to 0 for Unix Sockets.");
-  fio_cli_accept_str("address b", "The address to bind to.");
-  fio_cli_accept_str("public www",
-                     "A public folder for serve an HTTP static file service.");
-  fio_cli_accept_bool("log v", "Turns logging on (logs to terminal).");
-  fio_cli_accept_str("database db", "The database adrress.");
-  fio_cli_accept_num("database-port dbp", "The database port.");
+  fio_cli_start(
+      argc, argv, 0, 0,
+      "This is a facil.io framework benchmark application.\n"
+      "\nFor details about the benchmarks visit:\n"
+      "http://frameworkbenchmarks.readthedocs.io/en/latest/\n"
+      "\nThe following arguments are supported:",
+      "-threads -t The number of threads to use. System dependent default.",
+      FIO_CLI_TYPE_INT,
+      "-workers -w The number of processes to use. System dependent default.",
+      FIO_CLI_TYPE_INT,
+      "-port -p The port number to listen to (set to 0 for Unix Sockets.",
+      FIO_CLI_TYPE_INT, "-address -b The address to bind to.",
+      "-public -www A public folder for serve an HTTP static file service.",
+      "-log -v Turns logging on (logs to terminal).", FIO_CLI_TYPE_BOOL,
+      "-database -db The database adrress (URL).");
 
   /* setup default port */
-  if (!fio_cli_get_str("p"))
-    fio_cli_set_str("p", "8080");
+  if (!fio_cli_get("-p")) {
+    fio_cli_set("-p", "8080");
+    fio_cli_set("-port", "8080");
+  }
 
   /* setup database address */
-  if (!fio_cli_get_str("db")) {
+  if (!fio_cli_get("-db")) {
     char *database = getenv("DBHOST");
     if (!database)
       database = "localhost";
-    fio_cli_set_str("db", database);
+    fio_cli_set("-db", database);
+    fio_cli_set("-database", database);
   }
-  /* setup database port - default for Redis */
-  if (!fio_cli_get_str("dbp"))
-    fio_cli_set_str("dbp", "6379");
 }
 
 /* *****************************************************************************
 Routing
 ***************************************************************************** */
 
+typedef void (*fio_router_handler_fn)(http_s *);
+#define FIO_SET_NAME fio_router
+#define FIO_SET_OBJ_TYPE fio_router_handler_fn
+#define FIO_SET_KEY_TYPE fio_str_s
+#define FIO_SET_KEY_COPY(dest, obj) fio_str_concat(&(dest), &(obj))
+#define FIO_SET_KEY_DESTROY(obj) fio_str_free(&(obj))
+#define FIO_SET_KEY_COMPARE(k1, k2) fio_str_iseq(&(k1), &k2)
+#define FIO_INCLUDE_STR
+#define FIO_STR_NO_REF
+#include <fio.h>
 /* the router is a simple hash map */
-static fio_hash_s routes;
+static fio_router_s routes;
 
 /* adds a route to our simple router */
 static void route_add(char *path, void (*handler)(http_s *)) {
   /* add handler to the hash map */
-  size_t len = strlen(path);
-  uint64_t hash = fio_siphash(path, len);
-  fio_hash_insert(&routes, hash, (void *)(uintptr_t)handler);
+  fio_str_s tmp = FIO_STR_INIT_STATIC(path);
+  fio_router_insert(&routes, fio_str_hash(&tmp), tmp, handler, NULL);
 }
 
 /* routes a request to the correct handler */
@@ -171,10 +177,10 @@ static void route_perform(http_s *h) {
   /* add required Serevr header */
   http_set_header(h, HTTP_HEADER_SERVER, fiobj_dup(HTTP_VALUE_SERVER));
   /* collect path from hash map */
-  fio_cstr_s tmp = fiobj_obj2cstr(h->path);
-  uint64_t hash = fio_siphash(tmp.data, tmp.len);
-  void (*handler)(http_s *) =
-      (void (*)(http_s *))(uintptr_t)fio_hash_find(&routes, hash);
+  fio_str_info_s tmp_i = fiobj_obj2cstr(h->path);
+  fio_str_s tmp = FIO_STR_INIT_EXISTING(tmp_i.data, tmp_i.len, 0);
+  fio_router_handler_fn handler =
+      fio_router_find(&routes, fio_str_hash(&tmp), tmp);
   /* forward request or send error */
   if (handler) {
     handler(h);
@@ -184,7 +190,7 @@ static void route_perform(http_s *h) {
 }
 
 /* cleanup for our router */
-static void route_clear(void) { fio_hash_free(&routes); }
+static void route_clear(void) { fio_router_free(&routes); }
 
 /* *****************************************************************************
 Cleanup

frameworks/C/facil.io/facil.io.dockerfile

@@ -6,7 +6,7 @@ COPY ./ ./
 RUN ./setup-common.sh
 
 # we don't need more than 32K concurrent connections
-ENV CFLAGS="-DLIB_SOCK_MAX_CAPACITY=32768"
+ENV CFLAGS="-DFIO_MAX_SOCK_CAPACITY=65536"
 
 # compile test
 RUN cp -f bench_app.c facil_app/src/app.c
@@ -15,4 +15,4 @@ RUN cp -f bench_app.c facil_app/src/app.c
 RUN cd facil_app && make -j build
 
 # Run the app
-CMD ./facil_app/tmp/demo -p 8080 -db "tfb-database" -w 4 -t -5
+CMD ./facil_app/tmp/fioapp -p 8080 -db "tfb-database" -w -2 -t 2

frameworks/C/facil.io/setup-common.sh

@@ -17,7 +17,8 @@ if [[ (! -d facil_app) ||  (-n "${FIO_EDGE}") ]] ; then
 	# Setting FIO_EDGE will test against the master branch on the development machine. i.e.:
 	#     $ FIO_EDGE=1 tfb --mode verify --test facil.io
 	if [[ -z "${FIO_EDGE}" ]]; then
-	  FIO_URL="https://api.github.com/repos/boazsegev/facil.io/tarball/0.6.4"
+		echo "INFO: loading facil.io version 0.7.0.beta2"
+	  FIO_URL="https://api.github.com/repos/boazsegev/facil.io/tarball/0.7.0.beta2"
 	else
 		echo "INFO: development mode detected, loading facil.io from master."
 		FIO_URL="https://github.com/boazsegev/facil.io/archive/master.tar.gz"