aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkeiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-06 08:50:51 +0000
committerkeiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-06 08:50:51 +0000
commit835f040be29b1a32f93428a6a90de7978b7c2779 (patch)
tree4bb74be8356cd9e4bc867d6df6337acfc816a01b
parent4cd2a9864c9d215500dacef309c4eacb0db9ce3a (diff)
downloadruby-835f040be29b1a32f93428a6a90de7978b7c2779.tar.gz
* lib/shell/process-controller.rb: fix thread synchronization problem for [ruby-dev:30477].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/shell/process-controller.rb8
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c8e0d04471..9faa919112 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Mar 6 16:35:04 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
+
+ * lib/shell/process-controller.rb: fix thread synchronization problem for [ruby-dev:30477].
+
Tue Mar 6 11:53:25 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/sample/irbtkw.rbw: fails to exit process.
diff --git a/lib/shell/process-controller.rb b/lib/shell/process-controller.rb
index f74abfd686..8929805506 100644
--- a/lib/shell/process-controller.rb
+++ b/lib/shell/process-controller.rb
@@ -246,9 +246,11 @@ class Shell
redo
end
Thread.exclusive do
- terminate_job(command)
- @job_condition.signal
- command.notify "job(%id) finish.", @shell.debug?
+ @job_monitor.synchronize do
+ terminate_job(command)
+ @job_condition.signal
+ command.notify "job(%id) finish.", @shell.debug?
+ end
end
end
}