From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id A5C6620954 for ; Thu, 16 Mar 2017 03:14:14 +0000 (UTC) From: Eric Wong To: raindrops-public@bogomips.org Subject: [PATCH 2/3] aggregate/pmq: remove io-extra requirement Date: Thu, 16 Mar 2017 03:14:11 +0000 Message-Id: <20170316031412.16713-3-e@80x24.org> In-Reply-To: <20170316031412.16713-1-e@80x24.org> References: <20170316031412.16713-1-e@80x24.org> List-Id: IO.copy_stream is standard in 1.9+ and can use pread when given an offset. We do not need to use pwrite with fcntl locking, actually. --- lib/raindrops/aggregate/pmq.rb | 12 ++++++++---- raindrops.gemspec | 1 - 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/raindrops/aggregate/pmq.rb b/lib/raindrops/aggregate/pmq.rb index f543302..5a6a1f6 100644 --- a/lib/raindrops/aggregate/pmq.rb +++ b/lib/raindrops/aggregate/pmq.rb @@ -3,8 +3,8 @@ require "aggregate" require "posix_mq" require "fcntl" -require "io/extra" require "thread" +require "stringio" # \Aggregate + POSIX message queues support for Ruby 1.9 and \Linux # @@ -19,7 +19,6 @@ # or libraries: # # * aggregate (tested with 0.2.2) -# * io-extra (tested with 1.2.3) # * posix_mq (tested with 1.0.0) # # == Design @@ -84,6 +83,7 @@ def initialize(params = {}) @wr = File.open(t.path, "wb") @rd = File.open(t.path, "rb") end + @wr.sync = true @cached_aggregate = @aggregate flush_master @mq_send = if opts[:lossy] @@ -151,7 +151,10 @@ def aggregate @cached_aggregate ||= begin flush Marshal.load(synchronize(@rd, RDLOCK) do |rd| - IO.pread rd.fileno, rd.stat.size, 0 + dst = StringIO.new + dst.binmode + IO.copy_stream(rd, dst, rd.stat.size, 0) + dst.string end) end end @@ -163,7 +166,8 @@ def flush_master dump = Marshal.dump @aggregate synchronize(@wr, WRLOCK) do |wr| wr.truncate 0 - IO.pwrite wr.fileno, dump, 0 + wr.rewind + wr.write(dump) end end diff --git a/raindrops.gemspec b/raindrops.gemspec index c00a6b5..4651fa9 100644 --- a/raindrops.gemspec +++ b/raindrops.gemspec @@ -22,7 +22,6 @@ s.test_files = test_files s.add_development_dependency('aggregate', '~> 0.2') s.add_development_dependency('test-unit', '~> 3.0') - s.add_development_dependency('io-extra', [ '~> 1.2', '>= 1.2.3']) s.add_development_dependency('posix_mq', '~> 2.0') s.add_development_dependency('rack', [ '>= 1.2', '< 3.0' ]) s.add_development_dependency('olddoc', '~> 1.0') -- EW