Add microbenchmarks for the scheduler

CHANGES.md

@@ -3,6 +3,9 @@ next
 
 - Support colors on Windows (#1290, @diml)
 
+- Allow `dune.configurator` and `base` to be used together (#1291, fix
+  #1167, @diml)
+
 1.2.1 (17/09/2018)
 ------------------
 

bench/dune

@@ -0,0 +1,11 @@
+(library
+ (name dune_bench)
+ (libraries stdune fiber dune)
+ (modules :standard \ main)
+ (library_flags -linkall)
+ (preprocess (pps ppx_bench)))
+
+(executable
+ (name main)
+ (modules main)
+ (libraries which_program_dune dune_bench core_bench.inline_benchmarks))

bench/main.ml

@@ -0,0 +1 @@
+Inline_benchmarks_public.Runner.main ~libname:"dune_bench"

bench/runner.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+export BENCHMARKS_RUNNER=TRUE
+export BENCH_LIB=dune_bench
+exec dune exec -- ./main.exe -fork -run-without-cross-library-inlining "$@"

bench/scheduler_bench.ml

@@ -0,0 +1,21 @@
+(* Benchmark the scheduler *)
+
+open Stdune
+open Dune
+
+let () =
+  Path.set_root (Path.External.cwd ());
+  Path.set_build_dir (Path.Kind.of_string "_build")
+
+let prog = Option.value_exn (Bin.which "true")
+let run () = Process.run ~env:Env.initial Strict prog []
+
+let go ~jobs fiber =
+  Scheduler.go fiber ~config:{ Config.default with concurrency = Fixed jobs }
+
+let%bench "single" = go (run ()) ~jobs:1
+
+let l = List.init ~len:100 ~f:ignore
+
+let%bench "many" [@indexed jobs = [1; 2; 4; 8]] =
+  go ~jobs (Fiber.parallel_iter l ~f:run)

bootstrap.ml

@@ -30,7 +30,7 @@ end
 (* Directories with library names *)
 let dirs =
   [ "src/which_program"      , Some "Which_program"
-  ; "src/stdune/caml"        , Some "Caml"
+  ; "src/stdune/caml"        , Some "Dune_caml"
   ; "src/stdune"             , Some "Stdune"
   ; "src/fiber"              , Some "Fiber"
   ; "src/xdg"                , Some "Xdg"

src/dune

@@ -4,7 +4,7 @@
               stdune
               fiber
               xdg
-              re
+              dune_re
               opam_file_format
               dsexp
               ocaml_config

src/glob_lexer.boot.ml

@@ -4,4 +4,4 @@
 let parse_string _ = failwith "globs are not available during bootstrap"
 
 (* To force the ordering during bootstrap *)
-let _ = Re.compile
+let _ = Dune_re.compile

src/glob_lexer.mli

@@ -1,3 +1,3 @@
 open Stdune
 
-val parse_string : string -> (Re.t, int * string) Result.result
+val parse_string : string -> (Dune_re.t, int * string) Result.result

src/glob_lexer.mll

@@ -1,5 +1,6 @@
 {
 open! Stdune
+module Re = Dune_re
 open Re
 
 let no_slash        = diff any (char '/')

src/import.ml

@@ -3,6 +3,8 @@ open! Stdune
 include Stdune
 include Errors
 
+module Re = Dune_re
+
 (* To make bug reports usable *)
 let () = Printexc.record_backtrace true
 

src/stdune/bytes.ml

@@ -3,7 +3,7 @@
 include StdLabels.Bytes
 
 let blit_string ~src ~src_pos ~dst ~dst_pos ~len =
-  Caml.Bytes.blit_string src src_pos dst dst_pos len
+  Dune_caml.Bytes.blit_string src src_pos dst dst_pos len
 
 let sub_string dst ~pos ~len =
-  Caml.Bytes.sub_string dst pos len
+  Dune_caml.Bytes.sub_string dst pos len

src/stdune/caml/dune

@@ -1,4 +1,4 @@
 (library
- (name caml)
+ (name dune_caml)
  (public_name dune._caml)
  (synopsis "[Internal] Wrapped version of the OCaml stdlib"))

src/stdune/char.ml

@@ -1,4 +1,4 @@
-module Char = Caml.Char
+module Char = Dune_caml.Char
 
 include struct
   [@@@warning "-32-3"]

src/stdune/dune

@@ -2,4 +2,4 @@
  (name stdune)
  (public_name dune._stdune)
  (synopsis "[Internal] Standard library of Dune")
- (libraries caml unix))
+ (libraries dune_caml unix))

src/stdune/filename.ml

@@ -1,4 +1,4 @@
-include Caml.Filename
+include Dune_caml.Filename
 
 (* Return the index of the start of the extension, using the same semantic as
    [Filename.extension] in 4.04 *)

src/stdune/filename.mli

@@ -1,4 +1,4 @@
-include module type of struct include Caml.Filename end
+include module type of struct include Dune_caml.Filename end
 
 val split_extension : string -> string * string
 val split_extension_after_dot : string -> string * string

src/stdune/result.ml

@@ -1,4 +1,4 @@
-type ('a, 'error) t = ('a, 'error) Caml.result =
+type ('a, 'error) t = ('a, 'error) Dune_caml.result =
   | Ok    of 'a
   | Error of 'error
 

src/stdune/result.mli

@@ -1,6 +1,6 @@
 (** Result type *)
 
-type ('a, 'error) t = ('a, 'error) Caml.result =
+type ('a, 'error) t = ('a, 'error) Dune_caml.result =
   | Ok    of 'a
   | Error of 'error
 

src/stdune/string.ml

@@ -1,5 +1,5 @@
 (* Because other the syntax s.[x] causes trouble *)
-module String = Caml.String
+module String = Dune_caml.String
 
 include struct
   [@@@warning "-32-3"]

vendor/cmdliner/src/dune

@@ -1,5 +1,5 @@
 (library
  (name      cmdliner)
- (libraries caml)
+ (libraries dune_caml)
  (wrapped   false)
- (flags     (-w -3-6-27-32-33-35-50 -open Caml)))
+ (flags     (-w -3-6-27-32-33-35-50 -open Dune_caml)))

vendor/re/src/dune

@@ -1,4 +1,6 @@
 (library
- (name     re)
+ (name     dune_re)
  (flags    (:standard -w -50))
  (synopsis "Internal Dune library, do not use!"))
+
+(rule (with-stdout-to dune_re.ml (echo "include Re")))