1. james woodyatt
  2. oni

Commits

jhwoodyatt  committed 4de1360

Rollback. Change tx0_guardQ_ back to tx0_gateQ_.

  • Participants
  • Parent commits 534d316
  • Branches PAGODA

Comments (0)

Files changed (1)

File cf/cf_gadget.ml

View file
 }
 and ('x, 'i, 'o) tx0_t = {
     tx0_rxPtr_: ('x, 'i, 'o) rx0_t Weak.t;
-    tx0_guardQ_: ('x, 'i, 'o) guard0_t Queue.t;
+    tx0_gateQ_: ('x, 'i, 'o) guard0_t Queue.t;
 }
 and ('x, 'i, 'o) guard0_t = {
     x0_txLst_: (Obj.t, 'i, 'o) tx0_t list;
 
 let tx0_ () = {
     tx0_rxPtr_ = Weak.create 1;
-    tx0_guardQ_ = Queue.create ();
+    tx0_gateQ_ = Queue.create ();
 }
 
 let null = None, (Lazy.lazy_from_val "wire[null]")
         | M_blocked (txLst, gLst) ->
             List.iter begin fun (tx0, getF) ->
                 let g = { x0_txLst_ = txLst; x0_getF_ = getF } in
-                Queue.add g tx0.tx0_guardQ_
+                Queue.add g tx0.tx0_gateQ_
             end gLst
     end;
     scheduler_ k
             fun obj f c1 s k c0 ->
                 begin
                     try
-                        let x0 = Queue.take tx0.tx0_guardQ_ in
+                        let x0 = Queue.take tx0.tx0_gateQ_ in
                         let x0: (Obj.t, 'i, 'o) guard0_t = Obj.magic x0 in
                         let obj = Obj.repr obj in
                         List.iter begin fun tx0 ->
                             Queue.iter begin fun x0' ->
                                 if x0'.x0_txLst_ != x0.x0_txLst_ then
                                     Queue.add x0' q
-                            end tx0.tx0_guardQ_;
-                            Queue.clear tx0.tx0_guardQ_;
-                            Queue.transfer q tx0.tx0_guardQ_
+                            end tx0.tx0_gateQ_;
+                            Queue.clear tx0.tx0_gateQ_;
+                            Queue.transfer q tx0.tx0_gateQ_
                         end x0.x0_txLst_;
                         Queue.add (lazy (x0.x0_getF_ obj)) k.k_rdyQ_
                     with
                     | Queue.Empty ->
                         match Weak.get tx0_.tx0_rxPtr_ 0 with
                         | None ->
-                            Queue.clear tx0_.tx0_guardQ_
+                            Queue.clear tx0_.tx0_gateQ_
                         | Some rx0 ->
                             Queue.add obj rx0.rx0_pendQ_
                 end;