summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOisin Canty <o.canty@f5.com>2021-07-21 14:53:33 +0000
committerOisin Canty <o.canty@f5.com>2021-07-21 14:53:33 +0000
commit1f2ba4dca8c67442e19367ac7f1f96dbff6457ff (patch)
tree20bf57870180fb6b6f08e39067abec562479030a
parentf27fbd9b4d2bdaddf1e7001d0d0bc5586ba04cd4 (diff)
downloadunit-1f2ba4dca8c67442e19367ac7f1f96dbff6457ff.tar.gz
unit-1f2ba4dca8c67442e19367ac7f1f96dbff6457ff.tar.bz2
Tests: use mutex with multitthreaded Ruby hooks.
This commit fixes a rare crash that can occur when File.write is called by many threads.
-rw-r--r--test/ruby/hooks/multiple.rb6
-rw-r--r--test/ruby/hooks/on_thread_boot.rb6
-rw-r--r--test/ruby/hooks/on_thread_shutdown.rb6
3 files changed, 15 insertions, 3 deletions
diff --git a/test/ruby/hooks/multiple.rb b/test/ruby/hooks/multiple.rb
index 295b46a9..b1b659a5 100644
--- a/test/ruby/hooks/multiple.rb
+++ b/test/ruby/hooks/multiple.rb
@@ -1,9 +1,13 @@
require 'securerandom'
+@mutex = Mutex.new
+
on_worker_boot do
File.write("./cookie_worker_boot.#{SecureRandom.hex}", "worker booted")
end
on_thread_boot do
- File.write("./cookie_thread_boot.#{SecureRandom.hex}", "thread booted")
+ @mutex.synchronize do
+ File.write("./cookie_thread_boot.#{SecureRandom.hex}", "thread booted")
+ end
end
diff --git a/test/ruby/hooks/on_thread_boot.rb b/test/ruby/hooks/on_thread_boot.rb
index 1e05e248..4f88424e 100644
--- a/test/ruby/hooks/on_thread_boot.rb
+++ b/test/ruby/hooks/on_thread_boot.rb
@@ -1,5 +1,9 @@
require 'securerandom'
+@mutex = Mutex.new
+
on_thread_boot do
- File.write("./cookie_thread_boot.#{SecureRandom.hex}", "booted")
+ @mutex.synchronize do
+ File.write("./cookie_thread_boot.#{SecureRandom.hex}", "booted")
+ end
end
diff --git a/test/ruby/hooks/on_thread_shutdown.rb b/test/ruby/hooks/on_thread_shutdown.rb
index e65c1b42..d953b8b7 100644
--- a/test/ruby/hooks/on_thread_shutdown.rb
+++ b/test/ruby/hooks/on_thread_shutdown.rb
@@ -1,5 +1,9 @@
require 'securerandom'
+@mutex = Mutex.new
+
on_thread_shutdown do
- File.write("./cookie_thread_shutdown.#{SecureRandom.hex}", "shutdown")
+ @mutex.synchronize do
+ File.write("./cookie_thread_shutdown.#{SecureRandom.hex}", "shutdown")
+ end
end