new implementation for ocurl backend, using ezcurl and queues

src/client-ocurl/batch.ml

@@ -0,0 +1,24 @@
+type 'a t = {
+  mutable len: int;
+  mutable l: 'a list list;
+  mutable started: Mtime.t;
+}
+
+let create () = { len = 0; l = []; started = Mtime_clock.now () }
+
+let push self l =
+  if l != [] then (
+    if self.l == [] then self.started <- Mtime_clock.now ();
+    self.l <- l :: self.l;
+    self.len <- self.len + List.length l
+  )
+
+let len self = self.len
+
+let time_started self = self.started
+
+let pop_all self =
+  let l = self.l in
+  self.l <- [];
+  self.len <- 0;
+  l

src/client-ocurl/batch.mli

@@ -0,0 +1,14 @@
+(** List of lists with length *)
+
+type 'a t
+
+val create : unit -> 'a t
+
+val push : 'a t -> 'a list -> unit
+
+val len : _ t -> int
+
+val time_started : _ t -> Mtime.t
+(** Time at which the batch most recently became non-empty *)
+
+val pop_all : 'a t -> 'a list list

src/client-ocurl/config.ml

@@ -18,10 +18,6 @@ let pp out self =
     debug url ppheaders headers batch_timeout_ms bg_threads
 
 let make ?(debug = !debug_) ?(url = get_url ()) ?(headers = get_headers ())
-    ?(batch_timeout_ms = 500) ?bg_threads () : t =
+    ?(batch_timeout_ms = 500) ?(bg_threads = 4) () : t =
-  let bg_threads =
+  let bg_threads = max 2 (min bg_threads 32) in
-    match bg_threads with
-    | Some n -> max n 2
-    | None -> 4
-  in
   { debug; url; headers; batch_timeout_ms; bg_threads }

src/client-ocurl/config.mli

@@ -1,3 +1,5 @@
+(** Configuration for the ocurl backend *)
+
 type t = private {
   debug: bool;
   url: string;