Merge pull request #81 from basho/enable-kernel-poll

Enable kernel poll

Author: slfritchie

rebar.config

@@ -34,5 +34,6 @@
 
 {escript_incl_apps, [lager, getopt, bear, folsom, ibrowse, riakc, mochiweb, protobuffs, velvet]}.
 
-%% Uncomment to use the Java client bench driver
-%% {escript_emu_args, "%%! -name bb@127.0.0.1 -setcookie YOUR_ERLANG_COOKIE\n"}.
+{escript_emu_args, "%%! +K true\n"}.
+%% Use this for the Java client bench driver
+%% {escript_emu_args, "%%! +K true -name bb@127.0.0.1 -setcookie YOUR_ERLANG_COOKIE\n"}.

src/basho_bench.erl

@@ -50,7 +50,7 @@ main(Args) ->
     %% Load baseline configs
     case application:load(basho_bench) of
         ok -> ok;
-	{error, {already_loaded, basho_bench}} -> ok
+        {error, {already_loaded, basho_bench}} -> ok
     end,
     register(basho_bench, self()),
     basho_bench_config:set(test_id, BenchName),

src/basho_bench_driver_cs.erl

@@ -109,7 +109,7 @@ new(ID) ->
                                               ["127.0.0.1"]) of
                       [C|_] = String when is_integer(C), C < 256 ->
                           [String];
-                      T = Tuple when is_tuple(T) ->
+                      T when is_tuple(T) ->
                           [T];
                       Else ->
                           Else
@@ -209,7 +209,7 @@ run2(Op, _KeyGen, _ValueGen, State) ->
 
 bigfile_valgen(Id, Props) ->
     if Id == 1 ->
-            lager:log(info, "~p value gen props: ~p\n", [?MODULE, Props]);
+            lager:log(info, self(), "~p value gen props: ~p\n", [?MODULE, Props]);
        true ->
             ok
     end,