Author: ko1
Date: 2006-08-25 17:18:06 +0900 (Fri, 25 Aug 2006)
New Revision: 542

Modified:
   branches/parallel/ChangeLog
   branches/parallel/thread_pthread.h
   branches/parallel/vm.c
Log:
	* thread_pthread.h : solve compile error...

	* vm.c : ditto



Modified: branches/parallel/ChangeLog
===================================================================
--- branches/parallel/ChangeLog	2006-08-25 08:09:25 UTC (rev 541)
+++ branches/parallel/ChangeLog	2006-08-25 08:18:06 UTC (rev 542)
@@ -4,6 +4,13 @@
 #  from Mon, 03 May 2004 01:24:19 +0900
 #
 
+2006-08-25(Fri) 17:17:25 +0900  Koichi Sasada  <ko1 atdot.net>
+
+	* thread_pthread.h : 
+
+	* vm.c : 
+
+
 2006-08-25(Fri) 16:20:52 +0900  Koichi Sasada  <ko1 atdot.net>
 
 	* eval_method.h : thread-safe method cache

Modified: branches/parallel/thread_pthread.h
===================================================================
--- branches/parallel/thread_pthread.h	2006-08-25 08:09:25 UTC (rev 541)
+++ branches/parallel/thread_pthread.h	2006-08-25 08:18:06 UTC (rev 542)
@@ -30,6 +30,7 @@
   { FGLOCK(lock); { body; } FGUNLOCK(lock); }
 
 
+#if 0
 typedef struct native_global_lock_struct {
     native_thread_lock_t lock;
     yarv_thread_t *th;
@@ -56,6 +57,8 @@
     native_mutex_unlock(&lock->lock);
 }
 
+#endif
+
 #define GL_LOCK_RANGE(th_, lock_, body) { \
     yarv_aquire_global_lock(th_, lock_); \
     { body; } ; \

Modified: branches/parallel/vm.c
===================================================================
--- branches/parallel/vm.c	2006-08-25 08:09:25 UTC (rev 541)
+++ branches/parallel/vm.c	2006-08-25 08:18:06 UTC (rev 542)
@@ -1552,11 +1552,6 @@
     VALUE initial = 0;
     int locked = 0;
     
-    if (glock->th == th) {
-	yarv_release_global_lock(th, glock);
-	locked = 1;
-    }
-
     TH_PUSH_TAG(th);
     if ((state = EXEC_TAG()) == 0) {
       vm_loop_start:
@@ -1753,14 +1748,5 @@
   finish_vme:
     TH_POP_TAG();
 
-    if (locked) {
-	yarv_acquire_global_lock(th, glock);
-    }
-    else {
-	if (glock->th == th) {
-	    rb_bug("illegal glock");
-	}
-    }
-
     return result;
 }


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