diff options
| author |  Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2017-01-19 14:23:51 +0100 |
|---|---|---|
| committer | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2017-01-19 14:23:51 +0100 |
| commit | f22969902223ab54f56f25583b24dc27c4cd6f4e (patch) | |
| tree | 09c893b1dd14c9b2b38067a01486fc61452d0209 /lib | |
| parent | 34c19354c9997621a40ad053a2a12edcd8c5b5e4 (diff) | |
| parent | 8d783c10d9505cbc1beb1c8e3451ea5dd567f260 (diff) | |
Merge branch 'v8.6'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/aux_file.ml | 4 | ||||
| -rw-r--r-- | lib/system.ml | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/lib/aux_file.ml b/lib/aux_file.ml index 17f55330d..1b6651a55 100644 --- a/lib/aux_file.ml +++ b/lib/aux_file.ml @@ -17,10 +17,6 @@ let version = 1 let oc = ref None -let chop_extension f = - if check_suffix f ".v" then chop_extension f - else f - let aux_file_name_for vfile = dirname vfile ^ "/." ^ chop_extension(basename vfile) ^ ".aux" diff --git a/lib/system.ml b/lib/system.ml index 74dd224a0..e0e2c829d 100644 --- a/lib/system.ml +++ b/lib/system.ml @@ -309,6 +309,7 @@ let with_time time f x = raise e let process_id () = - if Flags.async_proofs_is_worker () then !Flags.async_proofs_worker_id - else Printf.sprintf "master:%d" (Thread.id (Thread.self ())) - + Printf.sprintf "%d:%s:%d" (Unix.getpid ()) + (if Flags.async_proofs_is_worker () then !Flags.async_proofs_worker_id + else "master") + (Thread.id (Thread.self ())) |