Author: ko1
Date: 2006-08-18 17:58:35 +0900 (Fri, 18 Aug 2006)
New Revision: 539

Modified:
   trunk/
   trunk/ChangeLog
   trunk/common.mk
   trunk/gc.c
   trunk/thread.c
   trunk/yarvcore.c
Log:
 r842@lermite:  ko1 | 2006-08-18 17:58:01 +0900
 	* common.mk : add dependency of yarvcore.h to thread.o
 
 	* gc.c : change comment line
 
 	* thread.c : remove some line break
 
 	* yarvcore.c : reoder initialize sequence to mark main thread
 



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 81cd9672-7512-7e48-ae48-6936450e977d:/local/yarv/trunk:840
   + 81cd9672-7512-7e48-ae48-6936450e977d:/local/yarv/trunk:842

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-08-18 07:56:17 UTC (rev 538)
+++ trunk/ChangeLog	2006-08-18 08:58:35 UTC (rev 539)
@@ -4,6 +4,17 @@
 #  from Mon, 03 May 2004 01:24:19 +0900
 #
 
+2006-08-18(Fri) 17:55:31 +0900  Koichi Sasada  <ko1 atdot.net>
+
+	* common.mk : add dependency of yarvcore.h to thread.o
+
+	* gc.c : change comment line
+
+	* thread.c : remove some line break
+
+	* yarvcore.c : reoder initialize sequence to mark main thread
+
+
 2006-08-18(Fri) 16:51:34 +0900  Koichi Sasada  <ko1 atdot.net>
 
 	* yarvcore.h : add a support for cache values per thread

Modified: trunk/common.mk
===================================================================
--- trunk/common.mk	2006-08-18 07:56:17 UTC (rev 538)
+++ trunk/common.mk	2006-08-18 08:58:35 UTC (rev 539)
@@ -277,7 +277,8 @@
   {$(VPATH)}thread_win32.h {$(VPATH)}thread_pthread.h {$(VPATH)}ruby.h config.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
   {$(VPATH)}node.h {$(VPATH)}util.h \
-  {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h {$(VPATH)}yarv.h
+  {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h \
+  {$(VPATH)}yarv.h {$(VPATH)}yarvcore.h
 
 file.$(OBJEXT): {$(VPATH)}file.c {$(VPATH)}ruby.h config.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \

Modified: trunk/gc.c
===================================================================
--- trunk/gc.c	2006-08-18 07:56:17 UTC (rev 538)
+++ trunk/gc.c	2006-08-18 08:58:35 UTC (rev 539)
@@ -493,9 +493,9 @@
 	th->value_cache[i] = v;
 	RBASIC(v)->flags = FL_MARK;
     }
-    // UNLOCK
     th->value_cache_ptr = &th->value_cache[0];
     rv = rb_newobj_from_heap();
+    // UNLOCK
     return rv;
 }
 #endif

Modified: trunk/thread.c
===================================================================
--- trunk/thread.c	2006-08-18 07:56:17 UTC (rev 538)
+++ trunk/thread.c	2006-08-18 08:58:35 UTC (rev 539)
@@ -1971,10 +1971,8 @@
     rb_define_method(cYarvThread, "status", rb_thread_status, 0);
     rb_define_method(cYarvThread, "alive?", rb_thread_alive_p, 0);
     rb_define_method(cYarvThread, "stop?", rb_thread_stop_p, 0);
-    rb_define_method(cYarvThread, "abort_on_exception", rb_thread_abort_exc,
-		     0);
-    rb_define_method(cYarvThread, "abort_on_exception=",
-		     rb_thread_abort_exc_set, 1);
+    rb_define_method(cYarvThread, "abort_on_exception", rb_thread_abort_exc, 0);
+    rb_define_method(cYarvThread, "abort_on_exception=", rb_thread_abort_exc_set, 1);
     rb_define_method(cYarvThread, "safe_level", rb_thread_safe_level, 0);
     rb_define_method(cYarvThread, "group", rb_thread_group, 0);
 
@@ -2001,7 +1999,6 @@
 	"class Mutex;"
 	"  def synchronize; self.lock; yield; ensure; self.unlock; end;"
 	"end;") , rb_str_new2("<preload>"), INT2FIX(1));
-
     Init_native_thread();
     {
 	/* main thread setting */

Modified: trunk/yarvcore.c
===================================================================
--- trunk/yarvcore.c	2006-08-18 07:56:17 UTC (rev 538)
+++ trunk/yarvcore.c	2006-08-18 08:58:35 UTC (rev 539)
@@ -313,7 +313,7 @@
 #endif
 
 	if (th->vm->main_thread == th) {
-	    GC_INFO("main thread");
+	    GC_INFO("main thread\n");
 	}
 	else {
 	    ruby_xfree(ptr);
@@ -975,7 +975,6 @@
 #if TEST_AOT_COMPILE
     Init_compiled();
 #endif
-
     // make vm
     {
 	/* create vm object */
@@ -1004,12 +1003,11 @@
 	yarv_set_current_running_thread(th);
 
 	th->machine_stack_start = rb_gc_stack_start;
-	Init_yarvthread();
-
-	th->thgroup = th->vm->thgroup_default;
-
 	vm->living_threads = st_init_numtable();
 	st_insert(vm->living_threads, th->self, (st_data_t) th->thread_id);
+
+	Init_yarvthread();
+	th->thgroup = th->vm->thgroup_default;
     }
     yarv_init_redefined_flag();
 }


--
ML: yarv-diff quickml.atdot.net
Info: http://www.atdot.net/~ko1/quickml