diff options
| author | murphy <murphy@rubychan.de> | 2011-05-21 04:50:53 +0000 |
|---|---|---|
| committer | murphy <murphy@rubychan.de> | 2011-05-21 04:50:53 +0000 |
| commit | b2bb9edd2ab749a99234d75984004471780f8f27 (patch) | |
| tree | d774f6add97aaa32f5be4d285d1ce94aa439a4e7 | |
| parent | b1222196c6416a625caf3d15f13bf9415a1765ca (diff) | |
| download | coderay-b2bb9edd2ab749a99234d75984004471780f8f27.tar.gz | |
etc updates
| -rw-r--r-- | etc/CodeRay.tmproj | 12 | ||||
| -rw-r--r-- | etc/speedup/current.rb | 2 | ||||
| -rw-r--r-- | etc/speedup/direct-stream.rb | 2 | ||||
| -rw-r--r-- | etc/speedup2/multi.rb | 30 |
4 files changed, 26 insertions, 20 deletions
diff --git a/etc/CodeRay.tmproj b/etc/CodeRay.tmproj index 1456168..5da0eeb 100644 --- a/etc/CodeRay.tmproj +++ b/etc/CodeRay.tmproj @@ -5,6 +5,8 @@ <key>documents</key> <array> <dict> + <key>expanded</key> + <true/> <key>name</key> <string>lib</string> <key>regexFolderFilter</key> @@ -24,7 +26,7 @@ <key>filename</key> <string>../diff</string> <key>lastUsed</key> - <date>2011-03-07T22:50:28Z</date> + <date>2011-05-08T07:53:59Z</date> </dict> <dict> <key>filename</key> @@ -36,9 +38,7 @@ <key>filename</key> <string>../Changes.textile</string> <key>lastUsed</key> - <date>2011-03-07T22:50:29Z</date> - <key>selected</key> - <true/> + <date>2011-05-08T09:37:51Z</date> </dict> <dict> <key>filename</key> @@ -53,6 +53,8 @@ <date>2010-06-27T05:41:28Z</date> </dict> <dict> + <key>expanded</key> + <true/> <key>name</key> <string>etc</string> <key>regexFolderFilter</key> @@ -125,7 +127,7 @@ <key>filename</key> <string>../test/scanners/coderay_suite.rb</string> <key>lastUsed</key> - <date>2011-03-01T00:15:35Z</date> + <date>2011-05-08T16:19:54Z</date> </dict> <dict> <key>filename</key> diff --git a/etc/speedup/current.rb b/etc/speedup/current.rb index 71acae6..e98d0e2 100644 --- a/etc/speedup/current.rb +++ b/etc/speedup/current.rb @@ -21,7 +21,7 @@ protected tokens << [matched, :space] elsif matched = scan(/!/) tokens << [matched, :not_going_to_happen] - elsif matched = scan(/=/) + elsif matched = scan(/=/) #/ tokens << [matched, :not_going_to_happen] elsif matched = scan(/%/) tokens << [matched, :not_going_to_happen] diff --git a/etc/speedup/direct-stream.rb b/etc/speedup/direct-stream.rb index dc6984d..a32c2a7 100644 --- a/etc/speedup/direct-stream.rb +++ b/etc/speedup/direct-stream.rb @@ -21,7 +21,7 @@ protected encoder.text_token matched, :space elsif matched = scan(/!/) encoder.text_token matched, :not_going_to_happen - elsif matched = scan(/=/) + elsif matched = scan(/=/) #/ encoder.text_token matched, :not_going_to_happen elsif matched = scan(/%/) encoder.text_token matched, :not_going_to_happen diff --git a/etc/speedup2/multi.rb b/etc/speedup2/multi.rb index c32c140..bd9551c 100644 --- a/etc/speedup2/multi.rb +++ b/etc/speedup2/multi.rb @@ -119,20 +119,24 @@ end N = (5 ** (ARGV.first || 8).to_i) code = (1..N).map { |n| "#{n} alpha, beta, (gamma).\n" }.join -time = Benchmark.realtime do - out = Encoder.new.encode(Scanner.new(code)) -end -puts 'Current: %0.2fs -- %0.0f kTok/s' % [time, (N * 11 + 1) / time / 1000] - slice_size = (ARGV[1] || 100).to_i -time = Benchmark.realtime do - threads = [] - code.lines.each_slice slice_size do |lines| - threads << Thread.new do - Thread.current[:out] = Encoder.new.encode(Scanner.new(lines.inject(&:+))) +3.times do + time = Benchmark.realtime do + threads = [] + code.lines.each_slice slice_size do |lines| + threads << Thread.new do + Thread.current[:out] = Encoder.new.encode(Scanner.new(lines.inject(&:+))) + end end + threads.each(&:join) + out = threads.map { |t| t[:out] }.join + end + puts 'Multi-Threaded: %0.2fs -- %0.0f kTok/s' % [time, (N * 11 + 1) / time / 1000] +end + +3.times do + time = Benchmark.realtime do + out = Encoder.new.encode(Scanner.new(code)) end - threads.each(&:join) - out = threads.map { |t| t[:out] }.join + puts 'Current: %0.2fs -- %0.0f kTok/s' % [time, (N * 11 + 1) / time / 1000] end -puts 'Multi-Threaded: %0.2fs -- %0.0f kTok/s' % [time, (N * 11 + 1) / time / 1000] |