v0.18~preview.130.31+242

Author: public-release

base.opam

@@ -20,7 +20,7 @@ depends: [
   "sexplib0"
   "dune"                    {>= "3.17.0"}
   "dune-configurator"
-  "ppxlib"                  {>= "0.33.0"}
+  "ppxlib"                  {>= "0.33.0" & < "0.36.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
 synopsis: "Full standard library replacement for OCaml"

src/array.ml

@@ -5,6 +5,8 @@ include Array0
 type 'a t = 'a array
 [@@deriving compare ~localize, globalize, sexp ~localize, sexp_grammar]
 
+[@@@warning "-incompatible-with-upstream"]
+
 (* This module implements a new in-place, constant heap sorting algorithm to replace the
    one used by the standard libraries.  Its only purpose is to be faster (hopefully
    strictly faster) than the base sort and stable_sort.
@@ -34,7 +36,7 @@ type 'a t = 'a array
    - http://www.sorting-algorithms.com/quick-sort-3-way *)
 
 module%template.portable
-  [@modality p] Sorter (S : sig
+  [@kind k = (value, immediate, immediate64)] [@modality p] Sorter (S : sig
     type 'a t
 
     val get : 'a t -> int -> 'a
@@ -279,7 +281,8 @@ struct
 end
 [@@inline]
 
-module%template Sort = Sorter [@modality portable] (struct
+module%template [@kind k = (value, immediate, immediate64)] Sort =
+Sorter [@kind k] [@modality portable] (struct
     type nonrec 'a t = 'a t
 
     let get = unsafe_get
@@ -922,6 +925,11 @@ let sub t ~pos ~len = sub t ~pos ~len
 let invariant invariant_a t = iter t ~f:invariant_a
 
 module Private = struct
-  module Sort = Sort
-  module%template.portable [@modality p] Sorter = Sorter [@modality p]
+  module%template [@kind k = (value, immediate, immediate64)] Sort = Sort [@kind k]
+
+  module%template.portable
+    [@kind k = (value, immediate, immediate64)] [@modality p] Sorter =
+    Sorter
+    [@kind k]
+    [@modality p]
 end

src/array_intf.ml

@@ -2,6 +2,8 @@
 
 open! Import
 
+[@@@warning "-incompatible-with-upstream"]
+
 module Definitions = struct
   module type Public = sig
     type 'a t
@@ -311,7 +313,8 @@ module type Array = sig
       end
     end
 
-    module%template.portable Sorter (S : sig
+    module%template.portable
+      [@kind k = (value, immediate, immediate64)] Sorter (S : sig
         type 'a t
 
         val get : 'a t -> int -> 'a

src/atomic.ml

@@ -7,10 +7,19 @@ module Compare_failed_or_set_here = struct
   [@@deriving sexp_of ~localize]
 end
 
-type 'a t = 'a Stdlib.Atomic.t
+type 'a t = 'a Basement.Portable_atomic.t
 
-let make = Stdlib.Atomic.make
-let make_alone = Stdlib.Atomic.make_contended
+let make = Basement.Portable_atomic.make
+
+let make_alone =
+  if Basement.Stdlib_shim.runtime5 ()
+  then Basement.Portable_atomic.make_contended
+  else
+    (* [caml_atomic_make_contended] is not supported on runtime4; we can just fall back to
+       regular make, which is semantically correct and we shouldn't be as worried about
+       false sharing on single-core applications anyway. *)
+    make
+;;
 
 external get : ('a t[@local_opt]) -> 'a = "%atomic_load"
 external exchange : ('a t[@local_opt]) -> 'a -> 'a = "%atomic_exchange"
@@ -30,13 +39,17 @@ external compare_exchange
   -> 'a
   = "caml_atomic_compare_exchange_stub"
 
+external is_runtime5 : unit -> bool = "caml_is_runtime5_stub"
+
+let cpu_relax = if is_runtime5 () then Stdlib.Domain.cpu_relax else Fn.id
+
 let rec update_and_return t ~pure_f =
   let old = get t in
   let new_ = pure_f old in
   match compare_and_set t ~if_phys_equal_to:old ~replace_with:new_ with
   | Set_here -> old
   | Compare_failed ->
-    Stdlib.Domain.cpu_relax ();
+    cpu_relax ();
     update_and_return t ~pure_f
 ;;
 

src/atomic.mli

@@ -35,7 +35,7 @@ module Compare_failed_or_set_here : sig
   [@@deriving sexp_of ~localize]
 end
 
-type !'a t = 'a Stdlib.Atomic.t
+type !'a t = 'a Basement.Portable_atomic.t
 
 [%%rederive: type nonrec !'a t = 'a t [@@deriving sexp_of]]
 [%%rederive: type nonrec !'a t = 'a t [@@deriving of_sexp]]