diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-27 16:48:14 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-27 16:48:14 +0000 |
commit | 6244e502cc12a7b8c5698740d3b5b355c1695e37 (patch) | |
tree | 63f6fc1cd8a5df52669315113ecedbe3e62d0c09 /benchmark | |
parent | 51fb5511e0f4ac9eb96819648beaac173f054c0b (diff) |
* thread.c: fix Mutex to be interruptable lock.
* thread_win32.ci, thread_win32.h, thread_pthread.ci, thread_pthread.h:
prepare native_cond_*() which are based on pthread_cond_*() spec.
* prelude.rb: fix Mutex#synchronize method.
* vm_core.h, include/ruby/intern.h: change unblock function interface
(to pass some user data).
* file.c, process.c: ditto.
* benchmark/bm_vm2_mutex.rb: add a benchmark for mutex.
* benchmark/bm_vm3_thread_mutex.rb: add a benchmark for mutex
with contension.
* benchmark/run.rb: fix to remove ENV['RUBYLIB'] for matzruby.
* test/ruby/test_thread.rb: add a test.
* common.mk: fix benchmark options.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13290 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'benchmark')
-rw-r--r-- | benchmark/bm_loop_generator.rb | 28 | ||||
-rw-r--r-- | benchmark/bm_vm2_case.rb | 28 | ||||
-rw-r--r-- | benchmark/bm_vm2_mutex.rb | 9 | ||||
-rw-r--r-- | benchmark/bm_vm3_thread_mutex.rb | 18 | ||||
-rw-r--r-- | benchmark/bmx_temp.rb | 0 | ||||
-rw-r--r-- | benchmark/run.rb | 6 |
6 files changed, 60 insertions, 29 deletions
diff --git a/benchmark/bm_loop_generator.rb b/benchmark/bm_loop_generator.rb index e9bf9afc24..d3375c744c 100644 --- a/benchmark/bm_loop_generator.rb +++ b/benchmark/bm_loop_generator.rb @@ -1,14 +1,14 @@ -max = 600000
-
-if defined? Fiber
- gen = (1..max).each
- loop do
- gen.next
- end
-else
- require 'generator'
- gen = Generator.new((0..max))
- while gen.next?
- gen.next
- end
-end
+max = 600000 + +if defined? Fiber + gen = (1..max).each + loop do + gen.next + end +else + require 'generator' + gen = Generator.new((0..max)) + while gen.next? + gen.next + end +end diff --git a/benchmark/bm_vm2_case.rb b/benchmark/bm_vm2_case.rb index efbd366ebb..1ec34ad692 100644 --- a/benchmark/bm_vm2_case.rb +++ b/benchmark/bm_vm2_case.rb @@ -1,14 +1,14 @@ -i=0
-while i<6000000 # while loop 2
- case :foo
- when :bar
- raise
- when :baz
- raise
- when :boo
- raise
- when :foo
- i+=1
- end
-end
-
+i=0 +while i<6000000 # while loop 2 + case :foo + when :bar + raise + when :baz + raise + when :boo + raise + when :foo + i+=1 + end +end + diff --git a/benchmark/bm_vm2_mutex.rb b/benchmark/bm_vm2_mutex.rb new file mode 100644 index 0000000000..9ec1a0f136 --- /dev/null +++ b/benchmark/bm_vm2_mutex.rb @@ -0,0 +1,9 @@ +require 'thread' + +m = Mutex.new + +i=0 +while i<6000000 # benchmark loop 2 + i+=1 + m.synchronize{} +end diff --git a/benchmark/bm_vm3_thread_mutex.rb b/benchmark/bm_vm3_thread_mutex.rb new file mode 100644 index 0000000000..649f1fddac --- /dev/null +++ b/benchmark/bm_vm3_thread_mutex.rb @@ -0,0 +1,18 @@ +require 'thread' +m = Mutex.new +r = 0 +max = 1000 +(1..max).map{ + Thread.new{ + i=0 + while i<max + i+=1 + m.synchronize{ + r += 1 + } + end + } +}.each{|e| + e.join +} +raise r.to_s if r != max * max diff --git a/benchmark/bmx_temp.rb b/benchmark/bmx_temp.rb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/benchmark/bmx_temp.rb diff --git a/benchmark/run.rb b/benchmark/run.rb index 7f4899e7dd..6ef2943642 100644 --- a/benchmark/run.rb +++ b/benchmark/run.rb @@ -68,7 +68,11 @@ end def matzruby_exec file print 'matz' - benchmark file, $matzruby_program + rubylib = ENV['RUBYLIB'] + ENV['RUBYLIB'] = '' + r = benchmark file, $matzruby_program + ENV['RUBYLIB'] = rubylib + r end if $0 == __FILE__ |