cleanup

krunal · Sep 10, 2012 · ccf8b09 · ccf8b09
1 parent ca630ca
commit ccf8b09
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -20,9 +20,8 @@
        | end
        | 
        | File.readlines(__FILE__).each_with_index do |line, num|
-       |   sample = per_line[num+1]
-       |   if sample
-       |     printf "% 6d |  %s", per_line[num+1], line
+       |   if sample = per_line[num+1]
+       |     printf "% 6d |  %s", sample, line
        |   else
        |     printf "       | %s", line
        |   end

diff --git a/ext/rblineprof.c b/ext/rblineprof.c
@@ -23,20 +23,17 @@ profiler_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
 {
   char *file = node->nd_file;
   long line  = nd_line(node);
-  /* fprintf(stderr, "event: %d, file: %s:%lu\n", event, file, line);*/
 
   if (source_filename == file) {
     uint64_t now = timeofday_usec();
 
-    if (!start_time) {
-      start_time = now;
-      last_line = line;
-
-    } else {
-      per_line[last_line] += now - start_time;
-      start_time = now;
-      last_line = line;
+    if (start_time) {
+      if (last_line < MAX_LINES)
+        per_line[last_line] += now - start_time;
     }
+
+    start_time = now;
+    last_line = line;
   }
 }
 
@@ -48,6 +45,7 @@ lineprof(VALUE self, VALUE filename)
 
   start_time = 0;
   source_filename = rb_source_filename(StringValuePtr(filename));
+  memset(per_line, 0, sizeof(per_line));
 
   rb_add_event_hook(profiler_hook, RUBY_EVENT_LINE);
   rb_yield(Qnil);

diff --git a/test.rb b/test.rb
@@ -14,9 +14,8 @@
 end
 
 File.readlines(__FILE__).each_with_index do |line, num|
-  sample = per_line[num+1]
-  if sample
-    printf "% 6d |  %s", per_line[num+1], line
+  if sample = per_line[num+1]
+    printf "% 6d |  %s", sample, line
   else
     printf "       | %s", line
   end