yarv-diff:301
From: ko1 atdot.net
Date: 22 Feb 2006 03:52:10 -0000
Subject: [yarv-diff:301] r466 - in trunk: . ext/readline ext/win32ole win32
Author: ko1
Date: 2006-02-22 12:52:09 +0900 (Wed, 22 Feb 2006)
New Revision: 466
Removed:
trunk/tmpl/
Modified:
trunk/
trunk/ChangeLog
trunk/Changes
trunk/eval.c
trunk/eval_load.c
trunk/ext/readline/readline.c
trunk/ext/win32ole/.document
trunk/rubysig.h
trunk/thread.c
trunk/win32/win32.c
trunk/yarv_version.h
Log:
r717@lermite: ko1 | 2006-02-22 12:51:21 +0900
* rubysig.h : remove CHECK_INTS
* eval.c : ditto
* eval_load.c : ditto
* ext/readline/readline.c : ditto
* thread.c : ditto
* win32/win32.c : ditto
* yarv_version.h : 0.4.0
* Changes : ditto
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 81cd9672-7512-7e48-ae48-6936450e977d:/local/yarv/trunk:716
+ 81cd9672-7512-7e48-ae48-6936450e977d:/local/yarv/trunk:717
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-02-22 03:51:54 UTC (rev 465)
+++ trunk/ChangeLog 2006-02-22 03:52:09 UTC (rev 466)
@@ -4,6 +4,27 @@
# from Mon, 03 May 2004 01:24:19 +0900
#
+2006-02-22(Wed) 12:15:12 +0900 Koichi Sasada <ko1 atdot.net>
+
+2006-02-22(Wed) 12:49:02 +0900 Koichi Sasada <ko1 atdot.net>
+
+ * rubysig.h : remove CHECK_INTS
+
+ * eval.c : ditto
+
+ * eval_load.c : ditto
+
+ * ext/readline/readline.c : ditto
+
+ * thread.c : ditto
+
+ * win32/win32.c : ditto
+
+ * yarv_version.h : 0.4.0
+
+ * Changes : ditto
+
+
2006-02-22(Wed) 11:36:04 +0900 Koichi Sasada <ko1 atdot.net>
* test.rb : removed
Modified: trunk/Changes
===================================================================
--- trunk/Changes 2006-02-22 03:51:54 UTC (rev 465)
+++ trunk/Changes 2006-02-22 03:52:09 UTC (rev 466)
@@ -1,3 +1,10 @@
+= 0.4.0 (2006-02-22)
+
+* many many many bug fixes
+
+* Support normal build process
+
+
= 0.3.3 (2005-12-22)
* BUG fix release
Modified: trunk/eval.c
===================================================================
--- trunk/eval.c 2006-02-22 03:51:54 UTC (rev 465)
+++ trunk/eval.c 2006-02-22 03:52:09 UTC (rev 466)
@@ -1241,7 +1241,6 @@
{
for (;;) {
rb_yield_0(Qundef, 0, 0, 0, Qfalse);
- CHECK_INTS;
}
return Qnil; /* dummy */
}
Modified: trunk/eval_load.c
===================================================================
--- trunk/eval_load.c 2006-02-22 03:51:54 UTC (rev 465)
+++ trunk/eval_load.c 2006-02-22 03:52:09 UTC (rev 466)
@@ -211,16 +211,7 @@
return Qfalse;
}
- /*
- if((rb_thread_t)th == curr_thread){
- return Qtrue;
- }
-
- do{
- CHECK_INTS;
- rb_thread_schedule();
- }while (st_lookup(loading_tbl, (st_data_t)ftptr, &th));
- */
+ // TODO: write wait routine
return Qtrue;
}
Modified: trunk/ext/readline/readline.c
===================================================================
--- trunk/ext/readline/readline.c 2006-02-22 03:51:54 UTC (rev 465)
+++ trunk/ext/readline/readline.c 2006-02-22 03:52:09 UTC (rev 466)
@@ -44,7 +44,6 @@
static int
readline_event()
{
- CHECK_INTS;
rb_thread_schedule();
return 0;
}
Modified: trunk/ext/win32ole/.document
===================================================================
--- trunk/ext/win32ole/.document 2006-02-22 03:51:54 UTC (rev 465)
+++ trunk/ext/win32ole/.document 2006-02-22 03:52:09 UTC (rev 466)
@@ -0,0 +1 @@
+win32ole.c
Modified: trunk/rubysig.h
===================================================================
--- trunk/rubysig.h 2006-02-22 03:51:54 UTC (rev 465)
+++ trunk/rubysig.h 2006-02-22 03:52:09 UTC (rev 466)
@@ -30,7 +30,6 @@
# define TRAP_END\
ATOMIC_SET(rb_trap_immediate, trap_immediate);\
saved_errno = errno;\
- CHECK_INTS;\
errno = saved_errno;\
} while (0)
@@ -55,7 +54,6 @@
# define TRAP_END \
rb_trap_immediate = trap_immediate;\
saved_errno = errno;\
- CHECK_INTS;\
errno = saved_errno;\
} while (0)
@@ -72,7 +70,6 @@
#define DEFER_INTS (rb_prohibit_interrupt++)
#define ALLOW_INTS do {\
rb_prohibit_interrupt--;\
- CHECK_INTS;\
} while (0)
#define ENABLE_INTS (rb_prohibit_interrupt--)
@@ -83,30 +80,5 @@
RUBY_EXTERN int rb_thread_critical;
void rb_thread_schedule(void);
-#if defined(HAVE_SETITIMER) || defined(_THREAD_SAFE)
-RUBY_EXTERN int rb_thread_pending;
-# define CHECK_INTS do {\
- if (!rb_prohibit_interrupt) {\
- if (rb_trap_pending) rb_trap_exec();\
- if (rb_thread_pending && !rb_thread_critical)\
- rb_thread_schedule();\
- }\
-} while (0)
-#else
-/* pseudo preemptive thread switching */
-RUBY_EXTERN int rb_thread_tick;
-#define THREAD_TICK 500
-#define CHECK_INTS do {\
- if (!rb_prohibit_interrupt) {\
- if (rb_trap_pending) rb_trap_exec();\
- if (!rb_thread_critical) {\
- if (rb_thread_tick-- <= 0) {\
- rb_thread_tick = THREAD_TICK;\
- rb_thread_schedule();\
- }\
- }\
- }\
-} while (0)
-#endif
#endif /* ifndef RUBYSIG_H */
Modified: trunk/thread.c
===================================================================
--- trunk/thread.c 2006-02-22 03:51:54 UTC (rev 465)
+++ trunk/thread.c 2006-02-22 03:52:09 UTC (rev 466)
@@ -21,7 +21,7 @@
scheduling, running thread release GVL. If running thread
try blocking operation, this thread must release GVL and another
thread can continue this flow. After blocking operation, thread
- must check interrupt (CHECK_INTS).
+ must check interrupt (YARV_CHECK_INTS).
Every VM can run parallel.
Modified: trunk/win32/win32.c
===================================================================
--- trunk/win32/win32.c 2006-02-22 03:51:54 UTC (rev 465)
+++ trunk/win32/win32.c 2006-02-22 03:52:09 UTC (rev 466)
@@ -3568,7 +3568,6 @@
DWORD ret;
RUBY_CRITICAL(ret = wait_events(NULL, msec));
yield_once();
- CHECK_INTS;
return ret != WAIT_TIMEOUT;
}
@@ -3577,7 +3576,6 @@
{
yield_once();
RUBY_CRITICAL(wait_events(NULL, 0));
- CHECK_INTS;
}
#if defined __BORLANDC__ || defined _WIN32_WCE
@@ -3724,10 +3722,6 @@
rb_fatal("failed to launch waiter thread:%d", GetLastError());
}
- if (interrupted) {
- CHECK_INTS;
- }
-
return val;
}
Modified: trunk/yarv_version.h
===================================================================
--- trunk/yarv_version.h 2006-02-22 03:51:54 UTC (rev 465)
+++ trunk/yarv_version.h 2006-02-22 03:52:09 UTC (rev 466)
@@ -9,8 +9,8 @@
#define _VERSION_H_INCLUDED_
#define MAJOR_VER 0
-#define MINOR_VER 3
-#define DEVEL_VER 3
+#define MINOR_VER 4
+#define DEVEL_VER 0
extern char yarv_version[];
extern char *yarv_options;
--
ML: yarv-diff quickml.atdot.net
Info: http://www.atdot.net/~ko1/quickml