byebug 3.5.1 → 4.0.0

data/ext/byebug/byebug.c

@@ -1,10 +1,10 @@
 #include <byebug.h>
 
-static VALUE mByebug; /* Ruby Byebug Module object */
+static VALUE mByebug;   /* Ruby Byebug Module object */
 
-static VALUE tracing     = Qfalse;
+static VALUE tracing = Qfalse;
 static VALUE post_mortem = Qfalse;
-static VALUE verbose     = Qfalse;
+static VALUE verbose = Qfalse;
 
 static VALUE catchpoints = Qnil;
 static VALUE breakpoints = Qnil;
@@ -12,8 +12,7 @@ static VALUE tracepoints = Qnil;
 
 static VALUE raised_exception = Qnil;
 
-/* To allow thread syncronization, we must stop threads when debugging */
-VALUE locker = Qnil;
+static ID idPuts;
 
 /* Hash table with active threads and their associated contexts */
 VALUE threads = Qnil;
@@ -25,8 +24,10 @@ VALUE threads = Qnil;
  *  Returns an array of breakpoints.
  */
 static VALUE
-bb_breakpoints(VALUE self)
+Breakpoints(VALUE self)
 {
+  UNUSED(self);
+
   if (NIL_P(breakpoints))
     breakpoints = rb_ary_new();
 
@@ -40,8 +41,10 @@ bb_breakpoints(VALUE self)
  *  Returns an array of catchpoints.
  */
 static VALUE
-bb_catchpoints(VALUE self)
+Catchpoints(VALUE self)
 {
+  UNUSED(self);
+
   return catchpoints;
 }
 
@@ -52,8 +55,10 @@ bb_catchpoints(VALUE self)
  *  Returns raised exception when in post_mortem mode.
  */
 static VALUE
-bb_raised_exception(VALUE self)
+Raised_exception(VALUE self)
 {
+  UNUSED(self);
+
   return raised_exception;
 }
 
@@ -68,90 +73,95 @@ check_started()
 }
 
 static void
-trace_print(rb_trace_arg_t *trace_arg, debug_context_t *dc)
+trace_print(rb_trace_arg_t * trace_arg, debug_context_t * dc,
+            const char *file_filter, const char *debug_msg)
 {
-  if (trace_arg)
-  {
-    const char *event = rb_id2name(SYM2ID(rb_tracearg_event(trace_arg)));
-    char *path = RSTRING_PTR(rb_tracearg_path(trace_arg));
-    int line = NUM2INT(rb_tracearg_lineno(trace_arg));
-    VALUE v_mid_sym = rb_tracearg_method_id(trace_arg);
-    VALUE v_mid_id = NIL_P(v_mid_sym) ? Qnil : SYM2ID(v_mid_sym);
-    const char *mid = NIL_P(v_mid_id) ? "" : rb_id2name(v_mid_id);
-    printf("%*s (%d)->[#%d] %s@%s:%d %s\n", dc->calced_stack_size, "",
-           dc->calced_stack_size, dc->thnum, event, path, line, mid);
-  }
-}
+  char *fullpath = NULL;
+  const char *basename;
+  int filtered = 0;
+  const char *event = rb_id2name(SYM2ID(rb_tracearg_event(trace_arg)));
 
-static void
-cleanup(debug_context_t *dc)
-{
-  VALUE thread;
+  VALUE rb_path = rb_tracearg_path(trace_arg);
+  const char *path = NIL_P(rb_path) ? "" : RSTRING_PTR(rb_path);
 
-  dc->stop_reason = CTX_STOP_NONE;
+  int line = NUM2INT(rb_tracearg_lineno(trace_arg));
 
-  /* checks for dead threads */
-  check_threads_table();
+  VALUE rb_mid = rb_tracearg_method_id(trace_arg);
+  const char *mid = NIL_P(rb_mid) ? "(top level)" : rb_id2name(SYM2ID(rb_mid));
 
-  /* release a lock */
-  locker = Qnil;
-
-  /* let the next thread to run */
-  thread = remove_from_locked();
-  if (thread != Qnil)
-    rb_thread_run(thread);
-}
+  VALUE rb_cl = rb_tracearg_defined_class(trace_arg);
+  VALUE rb_cl_name = NIL_P(rb_cl) ? rb_cl : rb_mod_name(rb_cl);
+  const char *defined_class = NIL_P(rb_cl_name) ? "" : RSTRING_PTR(rb_cl_name);
 
-#define EVENT_SETUP                                                     \
-  rb_trace_arg_t *trace_arg = rb_tracearg_from_tracepoint(trace_point); \
-  debug_context_t *dc;                                                  \
-  VALUE context;                                                        \
-  thread_context_lookup(rb_thread_current(), &context);                 \
-  Data_Get_Struct(context, debug_context_t, dc);                        \
-
-#define EVENT_COMMON                                                    \
-  if (verbose == Qtrue) trace_print(trace_arg, dc);                     \
-  if (!trace_common(trace_arg, dc)) { return; }                         \
+  if (!trace_arg)
+    return;
 
-static int
-trace_common(rb_trace_arg_t *trace_arg, debug_context_t *dc)
-{
-  /* return if thread marked as 'ignored', like byebug's control thread */
-  if (CTX_FL_TEST(dc, CTX_FL_IGNORE))
+  if (file_filter)
   {
-    cleanup(dc);
-    return 0;
-  }
+#ifndef _WIN32
+    fullpath = realpath(path, NULL);
+#endif
+    basename = fullpath ? strrchr(fullpath, '/') : path;
 
-  halt_while_other_thread_is_active(dc);
+    if (!basename || strncmp(basename + 1, file_filter, strlen(file_filter)))
+      filtered = 1;
 
-  /* Get the lock! */
-  locker = rb_thread_current();
+#ifndef _WIN32
+    free(fullpath);
+#endif
+  }
 
-  /* Many events per line, but only *one* breakpoint */
-  if (dc->last_line != rb_tracearg_lineno(trace_arg) ||
-      dc->last_file != rb_tracearg_path(trace_arg))
+  if (!filtered)
   {
-    CTX_FL_SET(dc, CTX_FL_ENABLE_BKPT);
+    if (debug_msg)
+      rb_funcall(mByebug, idPuts, 1,
+                 rb_sprintf("[#%d] %s\n", dc->thnum, debug_msg));
+    else
+      rb_funcall(mByebug, idPuts, 1,
+                 rb_sprintf("%*s [#%d] %s@%s:%d %s#%s\n", dc->calced_stack_size,
+                            "", dc->thnum, event, path, line, defined_class,
+                            mid));
   }
-
-  return 1;
 }
 
 static void
-save_current_position(debug_context_t *dc, VALUE file, VALUE line)
+cleanup(debug_context_t * dc)
 {
-  dc->last_file = file;
-  dc->last_line = line;
-  CTX_FL_UNSET(dc, CTX_FL_ENABLE_BKPT);
-  CTX_FL_UNSET(dc, CTX_FL_FORCE_MOVE);
-}
+  dc->stop_reason = CTX_STOP_NONE;
+
+  release_lock();
+}
+
+#define EVENT_TEARDOWN cleanup(dc);
+
+#define EVENT_SETUP                                     \
+  debug_context_t *dc;                                  \
+  VALUE context;                                        \
+  rb_trace_arg_t *trace_arg;                            \
+                                                        \
+  UNUSED(data);                                         \
+                                                        \
+  if (!is_living_thread(rb_thread_current()))           \
+    return;                                             \
+                                                        \
+  thread_context_lookup(rb_thread_current(), &context); \
+  Data_Get_Struct(context, debug_context_t, dc);        \
+                                                        \
+  if (CTX_FL_TEST(dc, CTX_FL_IGNORE))                   \
+    return;                                             \
+                                                        \
+  acquire_lock(dc);                                     \
+                                                        \
+  trace_arg = rb_tracearg_from_tracepoint(trace_point); \
+  if (verbose == Qtrue)                                 \
+    trace_print(trace_arg, dc, 0, 0);                   \
+
 
 /* Functions that return control to byebug after the different events */
 
 static VALUE
-call_at(VALUE context_obj, debug_context_t *dc, ID mid, int argc, VALUE a0,
-                                                                  VALUE a1)
+call_at(VALUE context_obj, debug_context_t * dc, ID mid, int argc, VALUE a0,
+        VALUE a1)
 {
   struct call_with_inspection_data cwi;
   VALUE argv[2];
@@ -159,52 +169,51 @@ call_at(VALUE context_obj, debug_context_t *dc, ID mid, int argc, VALUE a0,
   argv[0] = a0;
   argv[1] = a1;
 
-  cwi.dc          = dc;
+  cwi.dc = dc;
   cwi.context_obj = context_obj;
-  cwi.id          = mid;
-  cwi.argc        = argc;
-  cwi.argv        = &argv[0];
+  cwi.id = mid;
+  cwi.argc = argc;
+  cwi.argv = &argv[0];
 
   return call_with_debug_inspector(&cwi);
 }
 
 static VALUE
-call_at_line(VALUE context_obj, debug_context_t *dc, VALUE file, VALUE line)
+call_at_line(VALUE context_obj, debug_context_t * dc, VALUE file, VALUE line)
 {
-  save_current_position(dc, file, line);
   return call_at(context_obj, dc, rb_intern("at_line"), 2, file, line);
 }
 
 static VALUE
-call_at_tracing(VALUE context_obj, debug_context_t *dc, VALUE file, VALUE line)
+call_at_tracing(VALUE context_obj, debug_context_t * dc, VALUE file, VALUE line)
 {
   return call_at(context_obj, dc, rb_intern("at_tracing"), 2, file, line);
 }
 
 static VALUE
-call_at_breakpoint(VALUE context_obj, debug_context_t *dc, VALUE breakpoint)
+call_at_breakpoint(VALUE context_obj, debug_context_t * dc, VALUE breakpoint)
 {
   dc->stop_reason = CTX_STOP_BREAKPOINT;
   return call_at(context_obj, dc, rb_intern("at_breakpoint"), 1, breakpoint, 0);
 }
 
 static VALUE
-call_at_catchpoint(VALUE context_obj, debug_context_t *dc, VALUE exp)
+call_at_catchpoint(VALUE context_obj, debug_context_t * dc, VALUE exp)
 {
   dc->stop_reason = CTX_STOP_CATCHPOINT;
   return call_at(context_obj, dc, rb_intern("at_catchpoint"), 1, exp, 0);
 }
 
 static VALUE
-call_at_return(VALUE context_obj, debug_context_t *dc, VALUE file, VALUE line)
+call_at_return(VALUE context_obj, debug_context_t * dc, VALUE file, VALUE line)
 {
-  CTX_FL_UNSET(dc, CTX_FL_STOP_ON_RET);
+  dc->stop_reason = CTX_STOP_BREAKPOINT;
   return call_at(context_obj, dc, rb_intern("at_return"), 2, file, line);
 }
 
 static void
-call_at_line_check(VALUE context_obj, debug_context_t *dc,
-                   VALUE breakpoint, VALUE file, VALUE line)
+call_at_line_check(VALUE context_obj, debug_context_t * dc, VALUE breakpoint,
+                   VALUE file, VALUE line)
 {
   dc->stop_reason = CTX_STOP_STEP;
 
@@ -221,102 +230,95 @@ call_at_line_check(VALUE context_obj, debug_context_t *dc,
 static void
 line_event(VALUE trace_point, void *data)
 {
-  VALUE breakpoint, file, line, binding, self;
-  int moved = 0;
+  VALUE brkpnt, file, line, binding;
 
-  EVENT_SETUP
+  EVENT_SETUP;
 
-  breakpoint = Qnil;
-  file    = rb_tracearg_path(trace_arg);
-  line    = rb_tracearg_lineno(trace_arg);
+  file = rb_tracearg_path(trace_arg);
+  line = rb_tracearg_lineno(trace_arg);
   binding = rb_tracearg_binding(trace_arg);
-  self    = rb_tracearg_self(trace_arg);
-
-  EVENT_COMMON
-
-  if (dc->calced_stack_size == 0) dc->calced_stack_size++;
-
-  if (dc->last_line != rb_tracearg_lineno(trace_arg) ||
-      dc->last_file != rb_tracearg_path(trace_arg))
-  {
-    moved = 1;
-  }
 
   if (RTEST(tracing))
     call_at_tracing(context, dc, file, line);
 
-  if (moved || !CTX_FL_TEST(dc, CTX_FL_FORCE_MOVE))
-  {
+  if (!CTX_FL_TEST(dc, CTX_FL_IGNORE_STEPS))
     dc->steps = dc->steps <= 0 ? -1 : dc->steps - 1;
-    if (dc->calced_stack_size <= dc->dest_frame)
-    {
-      dc->lines = dc->lines <= 0 ? -1 : dc->lines - 1;
-      if (dc->calced_stack_size < dc->dest_frame)
-      {
-        dc->dest_frame = dc->calced_stack_size;
-        rb_funcall(mByebug, rb_intern("puts"), 1,
-          rb_str_new2("Next went up a frame because previous frame finished\n"));
-      }
-    }
-  }
 
-  if (dc->steps == 0 || dc->lines == 0 ||
-      (CTX_FL_TEST(dc, CTX_FL_ENABLE_BKPT) &&
-      (!NIL_P(
-       breakpoint = find_breakpoint_by_pos(bb_breakpoints(self), file, line, binding)))))
+  if (dc->calced_stack_size <= dc->dest_frame)
   {
-    call_at_line_check(context, dc, breakpoint, file, line);
+    dc->dest_frame = dc->calced_stack_size;
+    CTX_FL_UNSET(dc, CTX_FL_IGNORE_STEPS);
+
+    dc->lines = dc->lines <= 0 ? -1 : dc->lines - 1;
   }
 
-  cleanup(dc);
+  if (dc->steps == 0 || dc->lines == 0)
+    call_at_line_check(context, dc, Qnil, file, line);
+
+  brkpnt = Qnil;
+
+  if (!NIL_P(breakpoints))
+    brkpnt = find_breakpoint_by_pos(breakpoints, file, line, binding);
+
+  if (!NIL_P(brkpnt))
+    call_at_line_check(context, dc, brkpnt, file, line);
+
+  EVENT_TEARDOWN;
 }
 
 static void
 call_event(VALUE trace_point, void *data)
 {
-  VALUE breakpoint, klass, msym, mid, binding, self, file, line;
+  VALUE brkpnt, klass, msym, mid, binding, self, file, line;
 
-  EVENT_SETUP
+  EVENT_SETUP;
+
+  if (dc->calced_stack_size <= dc->dest_frame)
+    CTX_FL_UNSET(dc, CTX_FL_IGNORE_STEPS);
 
   dc->calced_stack_size++;
 
-  if (CTX_FL_TEST(dc, CTX_FL_STOP_ON_RET))
-    dc->steps_out = dc->steps_out <= 0 ? -1 : dc->steps_out + 1;
+  dc->steps_out = dc->steps_out <= 0 ? -1 : dc->steps_out + 1;
 
-  EVENT_COMMON
+  /* nil method_id means we are at top level so there can't be a method
+   * breakpoint here. Just leave then. */
+  msym = rb_tracearg_method_id(trace_arg);
+  if (NIL_P(msym))
+  {
+    EVENT_TEARDOWN;
+    return;
+  }
 
-  breakpoint = Qnil;
-  klass   = rb_tracearg_defined_class(trace_arg);
-  msym    = rb_tracearg_method_id(trace_arg);
-  mid     = NIL_P(msym) ? Qnil : SYM2ID(msym);
+  mid = SYM2ID(msym);
+  klass = rb_tracearg_defined_class(trace_arg);
   binding = rb_tracearg_binding(trace_arg);
-  self    = rb_tracearg_self(trace_arg);
-  file    = rb_tracearg_path(trace_arg);
-  line    = rb_tracearg_lineno(trace_arg);
+  self = rb_tracearg_self(trace_arg);
+  file = rb_tracearg_path(trace_arg);
+  line = rb_tracearg_lineno(trace_arg);
 
-  breakpoint = find_breakpoint_by_method(bb_breakpoints(self), klass, mid, binding, self);
-  if (breakpoint != Qnil)
+  brkpnt = Qnil;
+
+  if (!NIL_P(breakpoints))
+    brkpnt = find_breakpoint_by_method(breakpoints, klass, mid, binding, self);
+
+  if (!NIL_P(brkpnt))
   {
-    call_at_breakpoint(context, dc, breakpoint);
+    call_at_breakpoint(context, dc, brkpnt);
     call_at_line(context, dc, file, line);
   }
 
-  cleanup(dc);
+  EVENT_TEARDOWN;
 }
 
 static void
 return_event(VALUE trace_point, void *data)
 {
-  EVENT_SETUP
-
-  if (dc->calced_stack_size > 0) dc->calced_stack_size--;
+  EVENT_SETUP;
 
-  EVENT_COMMON
+  dc->calced_stack_size--;
 
   if (dc->steps_out == 1)
-  {
     dc->steps = 1;
-  }
   else if ((dc->steps_out == 0) && (CTX_FL_TEST(dc, CTX_FL_STOP_ON_RET)))
   {
     VALUE file, line;
@@ -329,41 +331,27 @@ return_event(VALUE trace_point, void *data)
 
   dc->steps_out = dc->steps_out <= 0 ? -1 : dc->steps_out - 1;
 
-  cleanup(dc);
+  EVENT_TEARDOWN;
 }
 
 static void
-c_call_event(VALUE trace_point, void *data)
+raw_call_event(VALUE trace_point, void *data)
 {
-  EVENT_SETUP
+  EVENT_SETUP;
 
   dc->calced_stack_size++;
 
-  EVENT_COMMON
-
-  cleanup(dc);
+  EVENT_TEARDOWN;
 }
 
 static void
-c_return_event(VALUE trace_point, void *data)
+raw_return_event(VALUE trace_point, void *data)
 {
-  EVENT_SETUP
+  EVENT_SETUP;
 
-  if (dc->calced_stack_size > 0) dc->calced_stack_size--;
+  dc->calced_stack_size--;
 
-  EVENT_COMMON
-
-  cleanup(dc);
-}
-
-static void
-thread_event(VALUE trace_point, void *data)
-{
-  EVENT_SETUP
-
-  EVENT_COMMON
-
-  cleanup(dc);
+  EVENT_TEARDOWN;
 }
 
 static void
@@ -374,32 +362,30 @@ raise_event(VALUE trace_point, void *data)
   int i;
   debug_context_t *new_dc;
 
-  EVENT_SETUP
-
-  EVENT_COMMON
+  EVENT_SETUP;
 
-  path             = rb_tracearg_path(trace_arg);
-  lineno           = rb_tracearg_lineno(trace_arg);
-  binding          = rb_tracearg_binding(trace_arg);
+  path = rb_tracearg_path(trace_arg);
+  lineno = rb_tracearg_lineno(trace_arg);
+  binding = rb_tracearg_binding(trace_arg);
   raised_exception = rb_tracearg_raised_exception(trace_arg);
 
   if (post_mortem == Qtrue)
   {
     post_mortem_context = context_dup(dc);
-    rb_ivar_set(raised_exception, rb_intern("@__bb_file")   , path);
-    rb_ivar_set(raised_exception, rb_intern("@__bb_line")   , lineno);
+    rb_ivar_set(raised_exception, rb_intern("@__bb_file"), path);
+    rb_ivar_set(raised_exception, rb_intern("@__bb_line"), lineno);
     rb_ivar_set(raised_exception, rb_intern("@__bb_binding"), binding);
-    rb_ivar_set(raised_exception, rb_intern("@__bb_context"), post_mortem_context);
+    rb_ivar_set(raised_exception, rb_intern("@__bb_context"),
+                post_mortem_context);
 
     Data_Get_Struct(post_mortem_context, debug_context_t, new_dc);
     rb_debug_inspector_open(context_backtrace_set, (void *)new_dc);
   }
 
-  if (catchpoints == Qnil ||
-      dc->calced_stack_size == 0 ||
-      RHASH_TBL(catchpoints)->num_entries == 0)
+  if (catchpoints == Qnil || dc->calced_stack_size == 0
+      || RHASH_TBL(catchpoints)->num_entries == 0)
   {
-    cleanup(dc);
+    EVENT_TEARDOWN;
     return;
   }
 
@@ -410,8 +396,8 @@ raise_event(VALUE trace_point, void *data)
     VALUE ancestor_class, module_name, hit_count;
 
     ancestor_class = rb_ary_entry(ancestors, i);
-    module_name    = rb_mod_name(ancestor_class);
-    hit_count      = rb_hash_aref(catchpoints, module_name);
+    module_name = rb_mod_name(ancestor_class);
+    hit_count = rb_hash_aref(catchpoints, module_name);
 
     /* increment exception */
     if (hit_count != Qnil)
@@ -423,7 +409,7 @@ raise_event(VALUE trace_point, void *data)
     }
   }
 
-  cleanup(dc);
+  EVENT_TEARDOWN;
 }
 
 
@@ -435,23 +421,23 @@ register_tracepoints(VALUE self)
   int i;
   VALUE traces = tracepoints;
 
+  UNUSED(self);
+
   if (NIL_P(traces))
   {
-    int line_msk   = RUBY_EVENT_LINE;
-    int call_msk   = RUBY_EVENT_CALL | RUBY_EVENT_B_CALL | RUBY_EVENT_CLASS;
-    int return_msk = RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN | RUBY_EVENT_END;
-    int c_call_msk = RUBY_EVENT_C_CALL;
-    int c_ret_msk  = RUBY_EVENT_C_RETURN;
-    int raise_msk  = RUBY_EVENT_RAISE;
-    int thread_msk = RUBY_EVENT_THREAD_BEGIN | RUBY_EVENT_THREAD_END;
-
-    VALUE tpLine    = rb_tracepoint_new(Qnil, line_msk  , line_event    , 0);
-    VALUE tpCall    = rb_tracepoint_new(Qnil, call_msk  , call_event    , 0);
-    VALUE tpReturn  = rb_tracepoint_new(Qnil, return_msk, return_event  , 0);
-    VALUE tpCCall   = rb_tracepoint_new(Qnil, c_call_msk, c_call_event  , 0);
-    VALUE tpCReturn = rb_tracepoint_new(Qnil, c_ret_msk , c_return_event, 0);
-    VALUE tpRaise   = rb_tracepoint_new(Qnil, raise_msk , raise_event   , 0);
-    VALUE tpThread  = rb_tracepoint_new(Qnil, thread_msk, thread_event  , 0);
+    int line_msk = RUBY_EVENT_LINE;
+    int call_msk = RUBY_EVENT_CALL;
+    int ret_msk = RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN | RUBY_EVENT_END;
+    int raw_call_msk = RUBY_EVENT_C_CALL | RUBY_EVENT_B_CALL | RUBY_EVENT_CLASS;
+    int raw_ret_msk = RUBY_EVENT_C_RETURN;
+    int raise_msk = RUBY_EVENT_RAISE;
+
+    VALUE tpLine = rb_tracepoint_new(Qnil, line_msk, line_event, 0);
+    VALUE tpCall = rb_tracepoint_new(Qnil, call_msk, call_event, 0);
+    VALUE tpReturn = rb_tracepoint_new(Qnil, ret_msk, return_event, 0);
+    VALUE tpCCall = rb_tracepoint_new(Qnil, raw_call_msk, raw_call_event, 0);
+    VALUE tpCReturn = rb_tracepoint_new(Qnil, raw_ret_msk, raw_return_event, 0);
+    VALUE tpRaise = rb_tracepoint_new(Qnil, raise_msk, raise_event, 0);
 
     traces = rb_ary_new();
     rb_ary_push(traces, tpLine);
@@ -460,7 +446,6 @@ register_tracepoints(VALUE self)
     rb_ary_push(traces, tpCCall);
     rb_ary_push(traces, tpCReturn);
     rb_ary_push(traces, tpRaise);
-    rb_ary_push(traces, tpThread);
 
     tracepoints = traces;
   }
@@ -474,7 +459,9 @@ clear_tracepoints(VALUE self)
 {
   int i;
 
-  for (i = RARRAY_LENINT(tracepoints)-1; i >= 0; i--)
+  UNUSED(self);
+
+  for (i = RARRAY_LENINT(tracepoints) - 1; i >= 0; i--)
     rb_tracepoint_disable(rb_ary_entry(tracepoints, i));
 }
 
@@ -488,7 +475,7 @@ clear_tracepoints(VALUE self)
  *   Returns an array of all contexts.
  */
 static VALUE
-bb_contexts(VALUE self)
+Contexts(VALUE self)
 {
   volatile VALUE list;
   volatile VALUE new_list;
@@ -497,6 +484,8 @@ bb_contexts(VALUE self)
   debug_context_t *dc;
   int i;
 
+  UNUSED(self);
+
   check_started();
 
   new_list = rb_ary_new();
@@ -505,6 +494,7 @@ bb_contexts(VALUE self)
   for (i = 0; i < RARRAY_LENINT(list); i++)
   {
     VALUE thread = rb_ary_entry(list, i);
+
     thread_context_lookup(thread, &context);
     rb_ary_push(new_list, context);
   }
@@ -529,10 +519,12 @@ bb_contexts(VALUE self)
  *   Returns context of the thread passed as an argument.
  */
 static VALUE
-bb_thread_context(VALUE self, VALUE thread)
+Thread_context(VALUE self, VALUE thread)
 {
   VALUE context;
 
+  UNUSED(self);
+
   check_started();
 
   thread_context_lookup(thread, &context);
@@ -548,10 +540,12 @@ bb_thread_context(VALUE self, VALUE thread)
  *    <i>Note:</i> Byebug.current_context.thread == Thread.current
  */
 static VALUE
-bb_current_context(VALUE self)
+Current_context(VALUE self)
 {
   VALUE context;
 
+  UNUSED(self);
+
   check_started();
 
   thread_context_lookup(rb_thread_current(), &context);
@@ -566,8 +560,10 @@ bb_current_context(VALUE self)
  *  Returns +true+ byebug is started.
  */
 static VALUE
-bb_started(VALUE self)
+Started(VALUE self)
 {
+  UNUSED(self);
+
   return IS_STARTED;
 }
 
@@ -579,55 +575,49 @@ bb_started(VALUE self)
  *  disabled, otherwise it returns +false+.
  */
 static VALUE
-bb_stop(VALUE self)
+Stop(VALUE self)
 {
+  UNUSED(self);
+
   if (IS_STARTED)
   {
     clear_tracepoints(self);
 
     breakpoints = Qnil;
     catchpoints = Qnil;
-    threads     = Qnil;
+    threads = Qnil;
 
     return Qfalse;
   }
+
   return Qtrue;
 }
 
 /*
  *  call-seq:
  *    Byebug.start -> bool
- *    Byebug.start { ... } -> bool
- *
- *  If a block is given, it starts byebug and yields block. After the block is
- *  executed it stops byebug with Byebug.stop method. Inside the block you
- *  will probably want to have a call to Byebug.byebug. For example:
- *
- *      Byebug.start { byebug; foo }  # Stop inside of foo
  *
  *  The return value is the value of !Byebug.started? <i>before</i> issuing the
  *  +start+; That is, +true+ is returned, unless byebug was previously started.
  */
 static VALUE
-bb_start(VALUE self)
+Start(VALUE self)
 {
   VALUE result;
 
+  UNUSED(self);
+
   if (IS_STARTED)
     result = Qfalse;
   else
   {
-    locker      = Qnil;
     catchpoints = rb_hash_new();
-    threads     = create_threads_table();
+    threads = create_threads_table();
 
     register_tracepoints(self);
     result = Qtrue;
   }
 
-  if (rb_block_given_p())
-    rb_ensure(rb_yield, self, bb_stop, self);
-
   return result;
 }
 
@@ -639,29 +629,28 @@ bb_start(VALUE self)
  *  +stop+ parameter forces byebug to stop at the first line of code in +file+
  */
 static VALUE
-bb_load(int argc, VALUE *argv, VALUE self)
+Debug_load(int argc, VALUE * argv, VALUE self)
 {
   VALUE file, stop, context;
   debug_context_t *dc;
   VALUE status = Qnil;
   int state = 0;
 
+  UNUSED(self);
+
   if (rb_scan_args(argc, argv, "11", &file, &stop) == 1)
-  {
     stop = Qfalse;
-  }
 
-  bb_start(self);
+  Start(self);
 
-  context = bb_current_context(self);
+  context = Current_context(self);
   Data_Get_Struct(context, debug_context_t, dc);
 
   dc->calced_stack_size = 1;
 
-  if (RTEST(stop)) dc->steps = 1;
+  if (RTEST(stop))
+    dc->steps = 1;
 
-  /* Initializing $0 to the script's path */
-  ruby_script(RSTRING_PTR(file));
   rb_load_protect(file, 0, &state);
   if (0 != state)
   {
@@ -669,10 +658,6 @@ bb_load(int argc, VALUE *argv, VALUE self)
     reset_stepping_stop_points(dc);
   }
 
-  /* We should run all at_exit handler's in order to provide, for instance, a
-   * chance to run all defined test cases */
-  rb_exec_end_proc();
-
   return status;
 }
 
@@ -683,8 +668,10 @@ bb_load(int argc, VALUE *argv, VALUE self)
  *  Returns +true+ if verbose output of TracePoint API events is enabled.
  */
 static VALUE
-bb_verbose(VALUE self)
+Verbose(VALUE self)
 {
+  UNUSED(self);
+
   return verbose;
 }
 
@@ -696,8 +683,10 @@ bb_verbose(VALUE self)
  *  byebug.
  */
 static VALUE
-bb_set_verbose(VALUE self, VALUE value)
+Set_verbose(VALUE self, VALUE value)
 {
+  UNUSED(self);
+
   verbose = RTEST(value) ? Qtrue : Qfalse;
   return value;
 }
@@ -709,8 +698,10 @@ bb_set_verbose(VALUE self, VALUE value)
  *  Returns +true+ if global tracing is enabled.
  */
 static VALUE
-bb_tracing(VALUE self)
+Tracing(VALUE self)
 {
+  UNUSED(self);
+
   return tracing;
 }
 
@@ -721,8 +712,10 @@ bb_tracing(VALUE self)
  *  Sets the global tracing flag.
  */
 static VALUE
-bb_set_tracing(VALUE self, VALUE value)
+Set_tracing(VALUE self, VALUE value)
 {
+  UNUSED(self);
+
   tracing = RTEST(value) ? Qtrue : Qfalse;
   return value;
 }
@@ -734,8 +727,10 @@ bb_set_tracing(VALUE self, VALUE value)
  *  Returns +true+ if post-mortem debugging is enabled.
  */
 static VALUE
-bb_post_mortem(VALUE self)
+Post_mortem(VALUE self)
 {
+  UNUSED(self);
+
   return post_mortem;
 }
 
@@ -746,8 +741,10 @@ bb_post_mortem(VALUE self)
  *  Sets post-moterm flag.
  */
 static VALUE
-bb_set_post_mortem(VALUE self, VALUE value)
+Set_post_mortem(VALUE self, VALUE value)
 {
+  UNUSED(self);
+
   post_mortem = RTEST(value) ? Qtrue : Qfalse;
   return value;
 }
@@ -759,8 +756,10 @@ bb_set_post_mortem(VALUE self, VALUE value)
  *  Adds a new exception to the catchpoints array.
  */
 static VALUE
-bb_add_catchpoint(VALUE self, VALUE value)
+Add_catchpoint(VALUE self, VALUE value)
 {
+  UNUSED(self);
+
   if (TYPE(value) != T_STRING)
     rb_raise(rb_eTypeError, "value of a catchpoint must be String");
 
@@ -781,23 +780,23 @@ Init_byebug()
 {
   mByebug = rb_define_module("Byebug");
 
-  rb_define_module_function(mByebug, "add_catchpoint"  , bb_add_catchpoint  ,  1);
-  rb_define_module_function(mByebug, "breakpoints"     , bb_breakpoints     ,  0);
-  rb_define_module_function(mByebug, "catchpoints"     , bb_catchpoints     ,  0);
-  rb_define_module_function(mByebug, "contexts"        , bb_contexts        ,  0);
-  rb_define_module_function(mByebug, "current_context" , bb_current_context ,  0);
-  rb_define_module_function(mByebug, "debug_load"      , bb_load            , -1);
-  rb_define_module_function(mByebug, "post_mortem?"    , bb_post_mortem     ,  0);
-  rb_define_module_function(mByebug, "post_mortem="    , bb_set_post_mortem ,  1);
-  rb_define_module_function(mByebug, "raised_exception", bb_raised_exception,  0);
-  rb_define_module_function(mByebug, "start"           , bb_start           ,  0);
-  rb_define_module_function(mByebug, "started?"        , bb_started         ,  0);
-  rb_define_module_function(mByebug, "stop"            , bb_stop            ,  0);
-  rb_define_module_function(mByebug, "thread_context"  , bb_thread_context  ,  1);
-  rb_define_module_function(mByebug, "tracing?"        , bb_tracing         ,  0);
-  rb_define_module_function(mByebug, "tracing="        , bb_set_tracing     ,  1);
-  rb_define_module_function(mByebug, "verbose?"        , bb_verbose         ,  0);
-  rb_define_module_function(mByebug, "verbose="        , bb_set_verbose     ,  1);
+  rb_define_module_function(mByebug, "add_catchpoint", Add_catchpoint, 1);
+  rb_define_module_function(mByebug, "breakpoints", Breakpoints, 0);
+  rb_define_module_function(mByebug, "catchpoints", Catchpoints, 0);
+  rb_define_module_function(mByebug, "contexts", Contexts, 0);
+  rb_define_module_function(mByebug, "current_context", Current_context, 0);
+  rb_define_module_function(mByebug, "debug_load", Debug_load, -1);
+  rb_define_module_function(mByebug, "post_mortem?", Post_mortem, 0);
+  rb_define_module_function(mByebug, "post_mortem=", Set_post_mortem, 1);
+  rb_define_module_function(mByebug, "raised_exception", Raised_exception, 0);
+  rb_define_module_function(mByebug, "start", Start, 0);
+  rb_define_module_function(mByebug, "started?", Started, 0);
+  rb_define_module_function(mByebug, "stop", Stop, 0);
+  rb_define_module_function(mByebug, "thread_context", Thread_context, 1);
+  rb_define_module_function(mByebug, "tracing?", Tracing, 0);
+  rb_define_module_function(mByebug, "tracing=", Set_tracing, 1);
+  rb_define_module_function(mByebug, "verbose?", Verbose, 0);
+  rb_define_module_function(mByebug, "verbose=", Set_verbose, 1);
 
   Init_threads_table(mByebug);
   Init_context(mByebug);
@@ -808,4 +807,6 @@ Init_byebug()
   rb_global_variable(&tracepoints);
   rb_global_variable(&raised_exception);
   rb_global_variable(&threads);
+
+  idPuts = rb_intern("puts");
 }