Justincase: something weird with counter_op and infinite looping

slfritchie · May 31, 2011 · a601b47 · a601b47
1 parent aacdb9d
commit a601b47
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/src/distrib_counter_2phase_vclocksetwatch_sim.erl b/src/distrib_counter_2phase_vclocksetwatch_sim.erl
@@ -858,12 +858,12 @@ startup(server) ->
     fun e_server/2.
 
 e_client(Ops, State) ->
+    mc_put(short_circuit, 0),
     [mc_bang(mc_self(), Op) || Op <- Ops],
     mc_self() ! stop_now_kludge,
     e_client_init(State).
 
 e_client_init(C) ->
-    mc_put(short_circuit, 0),
     receive
         {counter_op, Servers} ->
             %% The clop/ClOp is short for "Client Operation".  It's used in
@@ -975,7 +975,7 @@ e_client_ph2_waiting(C = #c{clop = ClOp,
                     e_client_ph2_waiting(C#c{num_responses = NumResps + 1,
                                              watchers = NewWatchers});
                true ->
-                    io:format(user, "\nDELME ~w ", [{counter, C#c.ph2_now, Z, NewWatchers}]),
+                    %% io:format(user, "\nDELME ~w ", [{counter, C#c.ph2_now, Z, NewWatchers}]),
                     mc_probe({counter, C#c.ph2_now, Z, NewWatchers}),
                     if NewWatchers == [] ->
                             e_client_init(#c{});
@@ -1003,7 +1003,7 @@ e_client_ph2_waiting(C = #c{clop = ClOp,
     after ?TIMEOUT ->
             Q = calc_q(C),
             if NumResps >= Q ->
-                    io:format(user, "\nDELME ~w ", [{counter, C#c.ph2_now, Z, lists:usort(Ws)}]),
+                    %% io:format(user, "\nDELME ~w ", [{counter, C#c.ph2_now, Z, lists:usort(Ws)}]),
                     mc_probe({counter, C#c.ph2_now, Z, lists:usort(Ws)}),
                     e_cl_send_notifications(C),
                     e_client_notif_resp_waiting(C);
@@ -1166,10 +1166,10 @@ e_client_watch_waiting_2(C = #c{clop = ClOp,
 %%% Server counter-related states
 
 e_server(_Ops, State) ->
+    mc_put(short_circuit, 0),
     e_server_unasked(State).
 
 e_server_unasked(S = #s{val = Z1}) ->
-    mc_put(short_circuit, 0),
     receive
         {ph1_ask, From, ClOp} when S#s.cookie == undefined ->
             S2 = e_send_ask_ok(From, ClOp, S),
@@ -1255,7 +1255,7 @@ e_server_change_notif_fromsetter(S = #s{watchers = Ws}) ->
         {watch_cancel_req, _From, _ClOp} = Msg ->
             e_server_change_notif_fromsetter(e_sv_watch_cancel(Msg, S))
     after ?TIMEOUT ->
-            io:format(user, "ms=~p,", [length(S#s.watchers)]),
+            %% io:format(user, "ms=~p,", [length(S#s.watchers)]),
             mc_probe({slf, ?LINE, S#s.watchers}),
             e_sv_send_maybe_notifications(S)
     end.
@@ -1285,7 +1285,7 @@ e_server_change_notif_toindividuals(S = #s{watchers = Ws}) ->
         {watch_cancel_req, _From, _ClOp} = Msg ->
             e_server_change_notif_toindividuals(e_sv_watch_cancel(Msg, S))
     after ?TIMEOUT ->
-            io:format(user, "ms=~p,", [length(S#s.watchers)]),
+            %% io:format(user, "ms=~p,", [length(S#s.watchers)]),
             mc_probe({slf, ?LINE, S#s.watchers}),
             mc_put(short_circuit, mc_get(short_circuit) + 1),
             e_sv_send_maybe_notifications(S)

diff --git a/src/slf_msgsim_qc.erl b/src/slf_msgsim_qc.erl
@@ -273,22 +273,29 @@ start_mc_proc(Parent, Module, Type, Name, Ops, InitState) ->
                         set_self(Name),
                         receive {ping, From} -> From ! pong end,
                         StartFun = Module:startup(Type),
-                        try
-%% io:format(user, "<", []),
-                            V = StartFun(Ops, InitState),
 %% io:format(user, ">", []),
-                            Parent ! {self(), V}
-                        catch
-                            X:Y ->
-                                io:format(user, "ERROR ~p ~p, ", [X,Y]),
-                                Parent ! {self(), bad}
-                        end,
-                        exit(normal)
+                        V = StartFun(Ops, InitState),
+%% io:format(user, "<", []),
+                        Parent ! {self(), V},
+                        %% catch
+                        %%     X:Y ->
+                        %%         io:format(user, "ERROR ~p ~p at ~p", [X,Y,erlang:get_stacktrace()]),
+                        %%         Parent ! {self(), bad}
+                        %% end,
+                        %% %% %% exit(normal)
+                        eat_everything()
                 end),
     Pid ! {ping, self()},
     receive pong -> pong after 250 -> exit({failed_pingpong, Name}) end,
     Pid.
 
+eat_everything() ->
+    receive X ->
+            distrib_counter_2phase_vclocksetwatch_sim:mc_probe(
+              {eat_everything, self(), X}),
+            eat_everything()
+    end.
+
 harvest_client_results(Pids) ->
     [begin
          %% io:format(user, "harvest ~p: ", [Pid]),