about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2016-02-02 20:11:22 +0000
committerEric Wong <e@80x24.org>2016-02-02 20:11:22 +0000
commit879bccec2058505f3d5c446595083649169b357c (patch)
treeb498365b6a583b98d999032c164a588dd20f883d
parenta95c89375c43557ebed870b04f499ea66a06b1f2 (diff)
downloadruby_posix_mq-879bccec2058505f3d5c446595083649169b357c.tar.gz
No changes for older Rubies, but this reduces garbage under 2.3
-rwxr-xr-xbin/posix-mq-rb3
-rw-r--r--lib/posix_mq.rb3
-rw-r--r--test/test_posix_mq.rb15
3 files changed, 11 insertions, 10 deletions
diff --git a/bin/posix-mq-rb b/bin/posix-mq-rb
index 8c77aea..45efb7b 100755
--- a/bin/posix-mq-rb
+++ b/bin/posix-mq-rb
@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # -*- encoding: binary -*-
+# -*- frozen_string_literal: true -*-
 $stderr.sync = $stdout.sync = true
 $stdout.binmode
 $stderr.binmode
@@ -100,7 +101,7 @@ begin
   when :create
     exit
   when :receive
-    buf, prio = mq.receive("", timeout)
+    buf, prio = mq.receive(nil, timeout)
     $stderr.write("priority=#{prio}\n") if priority
     $stdout.write(buf)
   when :send
diff --git a/lib/posix_mq.rb b/lib/posix_mq.rb
index 5424667..2dc6dcf 100644
--- a/lib/posix_mq.rb
+++ b/lib/posix_mq.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# -*- frozen_string_literal: true -*-
 #
 # This class represents an POSIX message queue descriptor (mqd_t)
 # object.  It matches the C API for POSIX messages queues closely.
@@ -79,7 +79,6 @@ class POSIX_MQ
   # All send/receive operations are atomic and only one
   # native thread may be notified at a time
   alias clone dup
-
 end
 
 require 'posix_mq_ext'
diff --git a/test/test_posix_mq.rb b/test/test_posix_mq.rb
index 35967e8..d726d36 100644
--- a/test/test_posix_mq.rb
+++ b/test/test_posix_mq.rb
@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: true
 require 'test/unit'
 require 'thread'
 require 'fcntl'
@@ -68,7 +69,7 @@ class Test_POSIX_MQ < Test::Unit::TestCase
     @mq = POSIX_MQ.new(@path, :rw)
     assert ! @mq.nonblock?
     t0 = Time.now
-    maybe_timeout { @mq.receive "", interval } or return
+    maybe_timeout { @mq.receive nil, interval } or return
     elapsed = Time.now - t0
     assert_operator elapsed, :>, interval, elapsed.inspect
     assert_operator elapsed, :<, 0.04, elapsed.inspect
@@ -82,7 +83,7 @@ class Test_POSIX_MQ < Test::Unit::TestCase
     @mq = POSIX_MQ.new(@path, :rw)
     assert ! @mq.nonblock?
     t0 = Time.now
-    maybe_timeout { @mq.receive "", interval } or return
+    maybe_timeout { @mq.receive nil, interval } or return
     elapsed = Time.now - t0
     assert_operator elapsed, :>=, 0.01, elapsed.inspect
     assert_operator elapsed, :<=, 0.04, elapsed.inspect
@@ -93,7 +94,7 @@ class Test_POSIX_MQ < Test::Unit::TestCase
     @mq = POSIX_MQ.new(@path, :rw)
     assert ! @mq.nonblock?
     t0 = Time.now
-    maybe_timeout { @mq.receive "", interval } or return
+    maybe_timeout { @mq.receive nil, interval } or return
     elapsed = Time.now - t0
     assert elapsed >= interval, elapsed.inspect
     assert elapsed < 1.10, elapsed.inspect
@@ -159,7 +160,7 @@ class Test_POSIX_MQ < Test::Unit::TestCase
   end
 
   def test_name
-    path = "" << @path.dup
+    path = @path.dup
     path.freeze
     @mq = POSIX_MQ.new @path, IO::CREAT|IO::WRONLY, 0666
     assert_equal path, @mq.name
@@ -192,7 +193,7 @@ class Test_POSIX_MQ < Test::Unit::TestCase
   end
 
   def test_shift_buf
-    buf = ""
+    buf = "".dup
     @mq = POSIX_MQ.new @path, IO::CREAT|IO::RDWR, 0666
     @mq << "hello"
     assert_equal "hello", @mq.shift(buf)
@@ -206,7 +207,7 @@ class Test_POSIX_MQ < Test::Unit::TestCase
   end
 
   def test_send_receive_buf
-    buf = ""
+    buf = "".dup
     @mq = POSIX_MQ.new @path, IO::CREAT|IO::RDWR, 0666
     assert_equal true, @mq.send("hello", 0)
     assert_equal [ "hello", 0 ], @mq.receive(buf)
@@ -236,7 +237,7 @@ class Test_POSIX_MQ < Test::Unit::TestCase
   end if POSIX_MQ.method_defined?(:to_io)
 
   def test_for_fd
-    buf = ""
+    buf = "".dup
     @mq = POSIX_MQ.new @path, IO::CREAT|IO::RDWR, 0666
     @alt = POSIX_MQ.for_fd(@mq.to_io.to_i)
     assert_equal true, @mq.send("hello", 0)