Merge pull request #74 from djs55/better-debug

Update to new shared-block-ring tracing API

lib/s.mli → lib/s.ml

@@ -11,6 +11,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  *)
+open Sexplib.Std
 
 module type PRINT = sig
   type t
@@ -38,10 +39,18 @@ module type SEXPABLE = sig
   val sexp_of_t: t -> Sexplib.Sexp.t
 end
 
+type traced_operation = [
+  | `Set of string * string * [ `Producer | `Consumer | `Suspend | `Suspend_ack ] * [ `Int64 of int64 | `Bool of bool ]
+  | `Get of string * string * [ `Producer | `Consumer | `Suspend | `Suspend_ack ] * [ `Int64 of int64 | `Bool of bool ]
+] with sexp
+type traced_operation_list = traced_operation list with sexp
+
 module type LOG = sig
   val debug : ('a, unit, string, unit) format4 -> 'a
   val info  : ('a, unit, string, unit) format4 -> 'a
   val error : ('a, unit, string, unit) format4 -> 'a
+
+  val trace: traced_operation list -> unit
 end
 
 type error = [

lib_test/vg_test.ml

@@ -22,6 +22,8 @@ module Log = struct
   let info  fmt = Printf.ksprintf (fun s -> print_endline s) fmt
   let error fmt = Printf.ksprintf (fun s -> print_endline s) fmt
 
+  let trace _ = ()
+
   let _ =
     debug "This is the debug output";
     info "This is the info output";

src/impl.ml

@@ -92,6 +92,8 @@ module Log = struct
   let debug fmt = Printf.ksprintf (fun s -> print_endline s) fmt
   let info  fmt = Printf.ksprintf (fun s -> print_endline s) fmt
   let error fmt = Printf.ksprintf (fun s -> print_endline s) fmt
+
+  let trace _ = ()
 end
 
 let read common filename =