From 10af47a5790987ee5211bac88c3a16396f30bcb0 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Wed, 26 Nov 2014 18:41:34 +0100 Subject: Feedback: API cleaned up, documented and made user extensible --- stm/asyncTaskQueue.ml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'stm/asyncTaskQueue.ml') diff --git a/stm/asyncTaskQueue.ml b/stm/asyncTaskQueue.ml index fa7aa9584..8b4e0844c 100644 --- a/stm/asyncTaskQueue.ml +++ b/stm/asyncTaskQueue.ml @@ -135,7 +135,7 @@ module Make(T : Task) = struct exception Expired let report_status ?(id = !Flags.async_proofs_worker_id) s = - Pp.feedback ~state_id:Stateid.initial (Feedback.SlaveStatus(id, s)) + Pp.feedback ~state_id:Stateid.initial (Feedback.WorkerStatus(id, s)) let rec manage_slave ~cancel:cancel_user_req ~die id respawn = let ic, oc, proc = @@ -265,16 +265,8 @@ module Make(T : Task) = struct let slave_handshake () = WorkersPool.worker_handshake !slave_ic !slave_oc let main_loop () = - let feedback_queue = ref [] in let slave_feeder oc fb = - match fb.Feedback.content with - | Feedback.Goals _ -> feedback_queue := fb :: !feedback_queue - | _ -> Marshal.to_channel oc (RespFeedback fb) []; flush oc in - let flush_feeder oc = - List.iter (fun fb -> Marshal.to_channel oc (RespFeedback fb) []) - !feedback_queue; - feedback_queue := []; - flush oc in + Marshal.to_channel oc (RespFeedback fb) []; flush oc in Pp.set_feeder (slave_feeder !slave_oc); Pp.log_via_feedback (); Universes.set_remote_new_univ_level (bufferize (fun () -> @@ -290,7 +282,6 @@ module Make(T : Task) = struct working := true; report_status (name_of_request request); let response = slave_respond request in - flush_feeder !slave_oc; report_status "Idle"; marshal_response !slave_oc response; Ephemeron.clear () -- cgit v1.2.3