1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* tcltklib.c:

Browse Source 
Stop the running zombi-eventloop when mainloop_watchdog is killed.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2523 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai 2002-06-05 01:56:47 +00:00
parent 160a9f79ef
commit a9f672c47b
1 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
ext/tcltklib/tcltklib.c
View File

@ -202,19 +202,18 @@ lib_mainloop_core(check_root_widget)
return Qnil; return Qnil;
} }
VALUE VALUE
lib_mainloop_ensure(parent_evloop) lib_mainloop_ensure(parent_evloop)
VALUE parent_evloop; VALUE parent_evloop;
{ {
if (ruby_debug) {
fprintf(stderr, "tcltklib: eventloop-thread : %lx -> %lx\n",
eventloop_thread, parent_evloop);
}
Tk_DeleteTimerHandler(timer_token); Tk_DeleteTimerHandler(timer_token);
timer_token = (Tcl_TimerToken)NULL; timer_token = (Tcl_TimerToken)NULL;
eventloop_thread = parent_evloop; DUMP2("mainloop-ensure: current-thread : %lx\n", rb_thread_current());
DUMP2("mainloop-ensure: eventloop-thread : %lx\n", eventloop_thread);
if (eventloop_thread == rb_thread_current()) {
DUMP2("tcltklib: eventloop-thread -> %lx\n", parent_evloop);
eventloop_thread = parent_evloop;
}
return Qnil; return Qnil;
} }
@ -255,26 +254,14 @@ lib_mainloop(argc, argv, self)
return lib_mainloop_launcher(check_rootwidget); return lib_mainloop_launcher(check_rootwidget);
} }
static VALUE VALUE
lib_mainloop_watchdog(argc, argv, self) lib_watchdog_core(check_rootwidget)
int argc;
VALUE *argv;
VALUE self;
{
VALUE check_rootwidget; VALUE check_rootwidget;
{
VALUE current = eventloop_thread;
VALUE evloop; VALUE evloop;
int check; int check = (check_rootwidget == Qtrue);
ID stop; ID stop = rb_intern("stop?");
if (rb_scan_args(argc, argv, "01", &check_rootwidget) == 0) {
check_rootwidget = Qtrue;
} else if (RTEST(check_rootwidget)) {
check_rootwidget = Qtrue;
} else {
check_rootwidget = Qfalse;
}
check = (check_rootwidget == Qtrue);
stop = rb_intern("stop?");
/* check other watchdog thread */ /* check other watchdog thread */
if (watchdog_thread != 0) { if (watchdog_thread != 0) {
@ -296,13 +283,42 @@ lib_mainloop_watchdog(argc, argv, self)
(void*)&check_rootwidget); (void*)&check_rootwidget);
DUMP2("create new eventloop thread %lx", evloop); DUMP2("create new eventloop thread %lx", evloop);
rb_thread_run(evloop); rb_thread_run(evloop);
} else {
rb_thread_schedule();
} }
rb_thread_schedule();
} while(!check || Tk_GetNumMainWindows() != 0); } while(!check || Tk_GetNumMainWindows() != 0);
return Qnil; return Qnil;
} }
VALUE
lib_watchdog_ensure(arg)
VALUE arg;
{
eventloop_thread = 0; /* stop eventloops */
return Qnil;
}
static VALUE
lib_mainloop_watchdog(argc, argv, self)
int argc;
VALUE *argv;
VALUE self;
{
VALUE check_rootwidget;
if (rb_scan_args(argc, argv, "01", &check_rootwidget) == 0) {
check_rootwidget = Qtrue;
} else if (RTEST(check_rootwidget)) {
check_rootwidget = Qtrue;
} else {
check_rootwidget = Qfalse;
}
return rb_ensure(lib_watchdog_core, check_rootwidget,
lib_watchdog_ensure, Qnil);
}
static VALUE static VALUE
lib_do_one_event(argc, argv, self) lib_do_one_event(argc, argv, self)
int argc; int argc;