distributor 0.5.0 → 0.5.1

data/lib/distributor/multiplexer.rb

@@ -1,7 +1,6 @@
 require "distributor"
 require "distributor/okjson"
 require "distributor/packet"
-require "thread"
 
 class Distributor::Multiplexer
 
@@ -9,7 +8,6 @@ class Distributor::Multiplexer
     @output  = output
     @readers = Hash.new { |hash,key| hash[key] = StringIO.new }
     @writers = Hash.new { |hash,key| hash[key] = StringIO.new }
-    @write_lock = Mutex.new
 
     @output.sync = true
   end
@@ -38,9 +36,7 @@ class Distributor::Multiplexer
   end
 
   def output(ch, data)
-    @write_lock.synchronize do
-      Distributor::Packet.write(@output, ch, data)
-    end
+    Distributor::Packet.write(@output, ch, data)
   rescue Errno::EPIPE
   end
 

data/lib/distributor/packet.rb

@@ -20,15 +20,17 @@ class Distributor::Packet
   end
 
   def self.parse(io)
-    header = io.read(4)
-    return if header.nil?
-    raise "invalid header" unless header == "DIST"
-    version = unpack(io.read(4))
-    channel = unpack(io.read(4))
-    length  = unpack(io.read(4))
-    data    = io.read(length)
-
-    [ channel, data ]
+    @@input ||= Mutex.new
+    @@input.synchronize do
+      header = io.read(4)
+      return if header.nil?
+      raise "invalid header" unless header == "DIST"
+      version = unpack(io.read(4))
+      channel = unpack(io.read(4))
+      length  = unpack(io.read(4))
+      data    = io.read(length)
+      return [ channel, data ]
+    end
   end
 
   def self.pack(num)

data/lib/distributor/version.rb

@@ -1,5 +1,5 @@
 module Distributor
 
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: distributor
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70092817757520 !ruby/object:Gem::Requirement
+  requirement: &70284552374260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.13.6
   type: :runtime
   prerelease: false
-  version_requirements: *70092817757520
+  version_requirements: *70284552374260
 description: TCP Multiplexer
 email: ddollar@gmail.com
 executables: []