aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwhitequark2018-06-19 14:51:53 +0000
committerPierre-Marie Pédrot2018-10-03 14:00:42 +0200
commit695e8b577ee9bc49888133b8690db77f3d6ac3b7 (patch)
tree65824e9dbfa0980e0aec675f2722f2f28e0535ab
parent326f52393f03b4255822f80ffaa52c4e585c8a61 (diff)
Rename CEphemeron.clear→clean for clarity.
-rw-r--r--clib/cEphemeron.ml3
-rw-r--r--clib/cEphemeron.mli2
-rw-r--r--stm/asyncTaskQueue.ml2
3 files changed, 3 insertions, 4 deletions
diff --git a/clib/cEphemeron.ml b/clib/cEphemeron.ml
index 75b75a1dd4..d7cc0a4dc2 100644
--- a/clib/cEphemeron.ml
+++ b/clib/cEphemeron.ml
@@ -107,5 +107,4 @@ let iter_opt (typ, boxkey) f =
try f ((EHashtbl.find values boxkey).get typ)
with Not_found -> ()
-(* NB: clear only removes dead bindings, so it uses Ephemeron.S.clean *)
-let clear () = EHashtbl.clean values
+let clean () = EHashtbl.clean values
diff --git a/clib/cEphemeron.mli b/clib/cEphemeron.mli
index 00cdf87ab5..96391e10fa 100644
--- a/clib/cEphemeron.mli
+++ b/clib/cEphemeron.mli
@@ -51,4 +51,4 @@ val get : 'a key -> 'a
val default : 'a key -> 'a -> 'a
val iter_opt : 'a key -> ('a -> unit) -> unit
-val clear : unit -> unit
+val clean : unit -> unit
diff --git a/stm/asyncTaskQueue.ml b/stm/asyncTaskQueue.ml
index 768d94d305..94e04d1842 100644
--- a/stm/asyncTaskQueue.ml
+++ b/stm/asyncTaskQueue.ml
@@ -325,7 +325,7 @@ module Make(T : Task) () = struct
let response = slave_respond request in
report_status "Idle";
marshal_response (Option.get !slave_oc) response;
- CEphemeron.clear ()
+ CEphemeron.clean ()
with
| MarshalError s ->
stm_pr_err Pp.(prlist str ["Fatal marshal error: "; s]); flush_all (); exit 2