thread-dump 0.0.3 → 0.0.5

data/ext/thread_dumper.c

@@ -6,6 +6,8 @@ static VALUE rb_cDumper;
 static VALUE backtrace(rb_thread_t th)
 {
   char buf[BUFSIZ];
+  char buf2[BUFSIZ];
+	char otherbuf[BUFSIZ];
   VALUE ary;
   NODE *n;
   struct FRAME *frame;
@@ -14,41 +16,29 @@ static VALUE backtrace(rb_thread_t th)
   frame = th->frame;
   ary = rb_ary_new();
 
-  rb_ary_push(ary, rb_obj_id(th->thread));
-
   if (n) {
-    snprintf(buf, BUFSIZ, "%s:%d", n->nd_file, nd_line(n));
-    rb_ary_push(ary, rb_str_new2(buf));
-  } 
-
-    /*for (; frame && (n = frame->node); frame = frame->prev) {
-	if (frame->prev && frame->prev->last_func) {
-	    if (frame->prev->node == n) continue;
-	    snprintf(buf, BUFSIZ, "%s:%d:in `%s'",
-		     n->nd_file, nd_line(n),
-		     rb_id2name(frame->prev->last_func));
-	}
-	else {
+		if(nd_line(n) && n->nd_file){
 	    snprintf(buf, BUFSIZ, "%s:%d", n->nd_file, nd_line(n));
-	}
-	rb_ary_push(ary, rb_str_new2(buf));
-    }*/
+	    rb_ary_push(ary, rb_str_new2(buf));			
+		}
+  } 
 
   return ary;
 }
 
+
 static VALUE
 dump() 
 {
   VALUE ary_dump;
   VALUE curr_rb_thread;
-  struct thread* curr_thread;
-  struct thread* th;
+  struct rb_thread* curr_thread;
+  struct rb_thread* th;
 
   ary_dump = rb_ary_new();
    
   curr_rb_thread = rb_thread_current();
-  Data_Get_Struct(curr_rb_thread, struct thread, curr_thread);
+  Data_Get_Struct(curr_rb_thread, struct rb_thread, curr_thread);
 
   if (curr_thread) {
     FOREACH_THREAD_FROM(curr_thread, th) {
@@ -66,5 +56,7 @@ Init_thread_dumper()
 {
   rb_mThreadDump = rb_define_module("ThreadDump");
   rb_cDumper = rb_define_class_under(rb_mThreadDump, "Dumper", rb_cObject);
-  rb_define_method(rb_cDumper, "dump", dump, 0);
+  rb_define_singleton_method(rb_cDumper, "dump", dump, 0);
 }
+
+

data/ext/thread_dumper.h

@@ -7,75 +7,5 @@
 #define FOREACH_THREAD_FROM(f,x) x = f; do { x = x->next;
 #define END_FOREACH_FROM(f,x) } while (x != f)
 
-typedef jmp_buf rb_jmpbuf_t;
-
-enum thread_status {
-    THREAD_TO_KILL,
-    THREAD_RUNNABLE,
-    THREAD_STOPPED,
-    THREAD_KILLED,
-};
-
-typedef struct thread * rb_thread_t; 
-
-struct thread {
-    struct thread *next, *prev;
-    rb_jmpbuf_t context;
-#ifdef SAVE_WIN32_EXCEPTION_LIST
-    DWORD win32_exception_list;
-#endif
-
-    VALUE result;
-
-    long   stk_len;
-    long   stk_max;
-    VALUE *stk_ptr;
-    VALUE *stk_pos;
-#ifdef __ia64__
-    VALUE *bstr_ptr;
-    long   bstr_len;
-#endif
-
-    struct FRAME *frame;
-    struct SCOPE *scope;
-    struct RVarmap *dyna_vars;
-    struct BLOCK *block;
-    struct iter *iter;
-    struct tag *tag;
-    VALUE klass;
-    VALUE wrapper;
-    NODE *cref;
-
-    int flags;		/* misc. states (vmode/rb_trap_immediate/raised) */
-
-    NODE *node;
-
-    int tracing;
-    VALUE errinfo;
-    VALUE last_status;
-    VALUE last_line;
-    VALUE last_match;
-
-    int safe;
-
-    enum thread_status status;
-    int wait_for;
-    int fd;
-    fd_set readfds;
-    fd_set writefds;
-    fd_set exceptfds;
-    int select_value;
-    double delay;
-    rb_thread_t join;
-
-    int abort;
-    int priority;
-    VALUE thgroup;
-
-    st_table *locals;
-
-    VALUE thread;
-};
-
-static rb_thread_t curr_thread = 0;
 static VALUE backtrace(rb_thread_t);
+// static VALUE backtrace(rb_thread_t th, int lev);

data/lib/thread-dump.rb

@@ -3,7 +3,7 @@ require 'thread_dumper'
 module ThreadDump
   VERSION_MAJOR = 0
   VERSION_MINOR = 0
-  VERSION_SUB = 3
+  VERSION_SUB = 5
 
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_SUB}"
 end
@@ -18,7 +18,7 @@ module ThreadDump
       def dump_target=(dump_target)
         @@dump_target = dump_target
       end
-      
+
       def output_format
         @@output_format ||= :text
       end
@@ -44,19 +44,18 @@ module ThreadDump
     def self.write_threads
       out_arr = []
 
-      ThreadDump::Dumper.new.dump.each do |thread_info| 
+      ThreadDump::Dumper.dump.each do |thread_info|
         if ThreadDump::Config.output_format == :html
           out_arr << "<dt>#{thread_info[1]}</dt><dd>#{thread_info[0]}</dd>"
         else
           out_arr << "Thread #{thread_info[0]}: #{thread_info[1]}"
         end
       end
-
       max_l_out_arr = out_arr.map { |out| out.size }.max
       fout = STDERR
 
       if ThreadDump::Config.dump_target == :file
-        fout = File.open("/tmp/#{$$}.ruby_threads.html", "w") 
+        fout = File.open("/tmp/#{$$}.ruby_threads.html", "w")
       end
 
       out_arr.each do |out|
@@ -76,6 +75,6 @@ end
 
 trap("QUIT") do
   Thread.start do
-    ThreadDump::Monitor.save_threads
+    ThreadDump::Monitor.write_threads
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: thread-dump
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2007-08-09 00:00:00 -07:00
+  version: 0.0.5
+date: 2007-10-30 00:00:00 -07:00
 summary: Utility which will cause thread dumps during ctrl-break of Ruby process.
 require_paths: 
 - lib
 email: 
 homepage: 
-rubyforge_project: thread-dump
+rubyforge_project: 
 description: 
 autorequire: lib
 default_executable: 
@@ -27,7 +27,7 @@ signing_key:
 cert_chain: 
 post_install_message: 
 authors: 
-- Greg Fodor
+- Greg Fodor and Bryan Duxbury
 files: 
 - ext/thread_dumper.c
 - ext/thread_dumper.h