eio backend, second attempt

.github/workflows/gh-pages.yml

@@ -20,10 +20,10 @@ jobs:
           allow-prerelease-opam: true
 
       - name: Deps
-        run: opam install odig tiny_httpd tiny_httpd_camlzip
+        run: opam install odig tiny_httpd tiny_httpd_camlzip tiny_httpd_eio
 
       - name: Build
-        run: opam exec -- odig odoc --cache-dir=_doc/ tiny_httpd tiny_httpd_camlzip
+        run: opam exec -- odig odoc --cache-dir=_doc/ tiny_httpd tiny_httpd_camlzip tiny_httpd_eio
 
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3

.github/workflows/main.yml

@@ -38,7 +38,7 @@ jobs:
 
       - run: opam install ./tiny_httpd.opam ./tiny_httpd_camlzip.opam --deps-only --with-test
 
-      - run: opam exec -- dune build @install -p tiny_httpd,tiny_httpd_camlzip
+      - run: opam exec -- dune build @install -p tiny_httpd,tiny_httpd_camlzip,tiny_httpd_eio
 
       - run: opam exec -- dune build @src/runtest @examples/runtest @tests/runtest -p tiny_httpd
         if: ${{ matrix.os == 'ubuntu-latest' }}
@@ -50,4 +50,4 @@ jobs:
 
       - run: opam install logs magic-mime -y
 
-      - run: opam exec -- dune build @install -p tiny_httpd,tiny_httpd_camlzip
+      - run: opam exec -- dune build @install -p tiny_httpd,tiny_httpd_camlzip,tiny_httpd_eio

dune-project

@@ -39,3 +39,12 @@
     (iostream-camlzip (>= 0.2.1))
     (logs :with-test)
     (odoc :with-doc)))
+
+(package
+  (name tiny_httpd_eio)
+  (synopsis "Use eio for tiny_httpd")
+  (depends
+    (tiny_httpd (= :version))
+    (eio (and (>= 1.0) (< 2.0)))
+    (logs :with-test)
+    (odoc :with-doc)))

echo_eio.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec dune exec --display=quiet --profile=release "examples/echo_eio.exe" -- $@

examples/dune

@@ -11,8 +11,29 @@
 (executable
  (name echo)
  (flags :standard -warn-error -a+8)
- (modules echo vfs)
- (libraries tiny_httpd logs tiny_httpd_camlzip tiny_httpd.multipart-form-data))
+ (modules echo)
+ (libraries
+  tiny_httpd
+  logs
+  echo_vfs
+  tiny_httpd_camlzip
+  tiny_httpd.multipart-form-data))
+
+(executable
+ (name echo_eio)
+ (flags :standard -warn-error -a+8)
+ (modules echo_eio)
+ (libraries
+  tiny_httpd
+  tiny_httpd_eio
+  eio
+  eio_main
+  logs
+  echo_vfs
+  trace.core
+  trace-tef
+  tiny_httpd_camlzip
+  tiny_httpd.multipart-form-data))
 
 (executable
  (name writer)
@@ -51,6 +72,12 @@
 
 ; produce an embedded FS
 
+(library
+  (name echo_vfs)
+  (modules vfs)
+  (wrapped false)
+  (libraries tiny_httpd))
+
 (rule
  (targets vfs.ml)
  (deps

examples/echo.ml

@@ -142,12 +142,14 @@ let () =
          "-p", Arg.Set_int port_, " set port";
          "--debug", Arg.Unit setup_logging, " enable debug";
          "-j", Arg.Set_int j, " maximum number of connections";
-        "--addr", Arg.Set_string addr, " binding address";
+         "--addr", Arg.Set_string addr, " binding address";
        ])
     (fun _ -> raise (Arg.Bad ""))
     "echo [option]*";
 
-  let server = Tiny_httpd.create ~addr:!addr ~port:!port_ ~max_connections:!j () in
+  let server =
+    Tiny_httpd.create ~addr:!addr ~port:!port_ ~max_connections:!j ()
+  in
 
   Tiny_httpd_camlzip.setup ~compress_above:1024 ~buf_size:(16 * 1024) server;
   let m_stats, get_stats = middleware_stat () in