diff options
| author |  Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2016-09-02 00:24:53 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2016-09-02 00:28:43 +0200 |
| commit | def03f31c1c639629e6bb07e266319bf6930f8fb (patch) | |
| tree | a49452925b94da614f06df0941892ea1af69ec58 /stm/asyncTaskQueue.ml | |
| parent | 1ae74bfd16f00bea0de14299cace8b638f768a70 (diff) | |
| parent | af2df1ada04da94a41a400c637788db461a532d9 (diff) | |
Merge branch 'v8.5' into v8.6
Diffstat (limited to 'stm/asyncTaskQueue.ml')
| -rw-r--r-- | stm/asyncTaskQueue.ml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/stm/asyncTaskQueue.ml b/stm/asyncTaskQueue.ml index 73a90f611..2d1f725ef 100644 --- a/stm/asyncTaskQueue.ml +++ b/stm/asyncTaskQueue.ml @@ -229,10 +229,8 @@ module Make(T : Task) = struct | (Die | TQueue.BeingDestroyed) -> giveback_exec_token (); kill proc; exit () | Sys_error _ | Invalid_argument _ | End_of_file -> - giveback_exec_token (); T.on_task_cancellation_or_expiration_or_slave_death !last_task; - kill proc; - exit () + giveback_exec_token (); kill proc; exit () end module Pool = WorkerPool.Make(Model) |