summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-13 13:49:44 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-13 13:49:44 +0000
commitb0f2785d6c2bd99c39e634304164e343c7c5b4ae (patch)
tree77295cda7419afe8f3138e8484c3d9685be53dfd
parentd22a09e189d772fe9c640aaf7b2c3fbbc5bcf039 (diff)
timeout.rb: freeze a string message
* lib/timeout.rb (Timeout#timeout): freeze a string message to reduce string allocations. [Fix GH-996] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/timeout.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f2f1186be3..cb94fb876a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 13 22:49:42 2015 Juanito Fatas <katehuang0320@gmail.com>
+
+ * lib/timeout.rb (Timeout#timeout): freeze a string message to
+ reduce string allocations. [Fix GH-996]
+
Thu Aug 13 17:42:34 2015 Koichi Sasada <ko1@atdot.net>
* vm_core.h (rb_call_info_kw_arg_bytes): move the definition
diff --git a/lib/timeout.rb b/lib/timeout.rb
index 20a594898f..63a629923d 100644
--- a/lib/timeout.rb
+++ b/lib/timeout.rb
@@ -71,7 +71,7 @@ module Timeout
# a module method, so you can call it directly as Timeout.timeout().
def timeout(sec, klass = nil) #:yield: +sec+
return yield(sec) if sec == nil or sec.zero?
- message = "execution expired"
+ message = "execution expired".freeze
e = Error
bl = proc do |exception|
begin