Merge pull request #96 from basho/pevm-riakclient-fix

riakclient fix + misc

Author: evanmcc

rebar

@@ -88,6 +88,10 @@ start(_StartType, _StartArgs) ->
 
 
 stop(_State) ->
+    %% intentionally left in to show where worker profiling start/stop calls go.
+    %% eprof:stop_profiling(),
+    %% eprof:analyze(total),
+    %% eprof:log("bb.eprof"),
     ok.
 
 %% ===================================================================

src/basho_bench_app.erl

@@ -58,6 +58,10 @@ stop_child(Id) ->
 init([]) ->
     %% Get the number concurrent workers we're expecting and generate child
     %% specs for each
+
+    %% intentionally left in to show where worker profiling start/stop calls go.
+    %% eprof:start(),
+    %% eprof:start_profiling([self()]),
     Workers = worker_specs(basho_bench_config:get(concurrent), []),
     MeasurementDriver =
         case basho_bench_config:get(measurement_driver, undefined) of

src/basho_bench_sup.erl

@@ -279,10 +279,18 @@ worker_next_op(State) ->
 needs_shutdown(State) ->
     Parent = State#state.parent_pid,
     receive
-        {'EXIT', Parent, _Reason} ->
-            %% Give the driver a chance to cleanup
-            (catch (State#state.driver):terminate(normal, State#state.driver_state)),
-            true
+        {'EXIT', Pid, _Reason} ->
+            case Pid of
+                Parent ->
+                    %% Give the driver a chance to cleanup
+                    (catch (State#state.driver):terminate(normal, 
+                                                          State#state.driver_state)),
+                    true;
+                _Else -> 
+                    %% catch this so that selective recieve doesn't kill us when running 
+                    %% the riakclient_driver
+                    false
+            end
     after 0 ->
             false
     end.