Remove instrumentation of C code

Author: UlfNorell

c_src/bitcask_nifs.c

@@ -80,10 +80,6 @@ void DEBUG2(const char *fmt, ...) { }
 #  define DEBUG_ENTRY(E) {}
 #endif
 
-#ifdef PULSE
-#include "pulse_c_send.h"
-#endif
-
 #ifdef BITCASK_DEBUG
 void format_bin(char * buf, size_t buf_size, const unsigned char * bin, size_t bin_size)
 {
@@ -378,9 +374,6 @@ static void bitcask_nifs_file_resource_cleanup(ErlNifEnv* env, void* arg);
 
 static ErlNifFunc nif_funcs[] =
 {
-#ifdef PULSE
-    {"set_pulse_pid", 1, set_pulse_pid},
-#endif
     {"keydir_new", 0, bitcask_nifs_keydir_new0},
     {"keydir_new", 1, bitcask_nifs_keydir_new1},
     {"maybe_keydir_new", 1, bitcask_nifs_maybe_keydir_new1},
@@ -1213,12 +1206,6 @@ static void perhaps_sweep_siblings(bitcask_keydir* keydir)
         return;
     }
 
-#ifdef  PULSE
-    i = 10;
-#else   /* PULSE */
-    i = 100*1000;
-#endif
-
     gettimeofday(&target, NULL);
     target.tv_usec += max_usec;
     if (target.tv_usec > 1000000)
@@ -2728,17 +2715,7 @@ static void msg_pending_awaken(ErlNifEnv* env, bitcask_keydir* keydir,
     for (idx = 0; idx < keydir->pending_awaken_count; idx++)
     {
         enif_clear_env(msg_env);
-#ifdef PULSE
-        /* Using PULSE_SEND here sometimes deadlocks the Bitcask PULSE test.
-           Reverting to using enif_send for now.
-           TODO: Check if PULSE_SEND is really necessary and investigate/fix
-                 deadlock in the future
-        */
-        /* PULSE_SEND(env, &keydir->pending_awaken[idx], msg_env, msg); */
         enif_send(env, &keydir->pending_awaken[idx], msg_env, msg);
-#else
-        enif_send(env, &keydir->pending_awaken[idx], msg_env, msg);
-#endif
     }
     enif_free_env(msg_env);
 }
@@ -3055,10 +3032,6 @@ static int on_load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
     ATOM_CUR = enif_make_atom(env, "cur");
     ATOM_BOF = enif_make_atom(env, "bof");
 
-#ifdef PULSE
-    pulse_c_send_on_load(env);
-#endif
-
     return 0;
 }
 

c_src/pulse_c_send.c

@@ -322,7 +322,6 @@ run_commands_on_node(LocalOrSlave, Cmds, Seed, Verbose, KeepFiles) ->
                 end,
     event_logger:start_link(),
     pulse:start(),
-    bitcask_nifs:set_pulse_pid(utils:whereis(pulse)),
     error_logger:tty(false),
     error_logger:add_report_handler(handle_errors),
     token:next_name(),

c_src/pulse_c_send.h

@@ -69,7 +69,6 @@
 -ifdef(PULSE).
 -compile({parse_transform, pulse_instrument}).
 -include_lib("pulse_otp/include/pulse_otp.hrl").
--export([set_pulse_pid/1]).
 -compile({pulse_skip, [{init,0}]}).
 -endif.
 
@@ -100,11 +99,6 @@ init() ->
     end,
     erlang:load_nif(SoName, 0).
 
--ifdef(PULSE).
-set_pulse_pid(_Pid) ->
-    erlang:nif_error({error, not_loaded}).
--endif.
-
 %% ===================================================================
 %% Internal functions
 %% ===================================================================