drbqs 0.0.0 → 0.0.1

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/drbqs.gemspec

@@ -0,0 +1,72 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{drbqs}
+  s.version = "0.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Takayuki YAMAGUCHI"]
+  s.date = %q{2011-02-26}
+  s.description = %q{Queuing system over network that is implemented by dRuby.}
+  s.email = %q{d@ytak.info}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "drbqs.gemspec",
+    "lib/drbqs.rb",
+    "lib/drbqs/client.rb",
+    "lib/drbqs/connection.rb",
+    "lib/drbqs/message.rb",
+    "lib/drbqs/queue.rb",
+    "lib/drbqs/server.rb",
+    "lib/drbqs/task_client.rb",
+    "spec/drbqs_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/ytaka/drbqs}
+  s.licenses = ["GPL3"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.5.2}
+  s.summary = %q{dRuby Queueing System}
+  s.test_files = [
+    "spec/drbqs_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, [">= 2.5.0"])
+      s.add_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 2.5.0"])
+    s.add_dependency(%q<yard>, ["~> 0.6.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

data/lib/drbqs/client.rb

@@ -12,11 +12,20 @@ module DRbQS
       @task_client = nil
     end
 
+    def execute_task(marshal_obj, method_sym, args)
+      obj = Marshal.load(marshal_obj)
+      obj.__send__(method_sym, *args)
+    end
+    private :execute_task
+
     def connect
       obj = DRbObject.new_with_uri(@access_uri)
       @connection = ConnectionClient.new(obj[:message], @logger)
       node_id = @connection.get_id
       @task_client = TaskClient.new(node_id, obj[:queue], obj[:result], @logger)
+      if ary = @connection.get_initialization
+        execute_task(*ary)
+      end
     end
 
     def calculate
@@ -31,12 +40,9 @@ module DRbQS
       exec = Thread.new do
         loop do
           marshal_obj, method_sym, args = @task_client.get
-          obj = Marshal.load(marshal_obj)
-          result = obj.__send__(method_sym, *args)
-          @task_client.transmit(result)
+          @task_client.transmit(execute_task(marshal_obj, method_sym, args))
         end
       end
-      exec.join
       cn.join
     end
   end

data/lib/drbqs/connection.rb

@@ -1,3 +1,5 @@
+require 'socket'
+
 module DRbQS
   # The class of connection to s.erver.
   class ConnectionClient
@@ -9,7 +11,7 @@ module DRbQS
 
     def create_id_string
       t = Time.now
-      sprintf("%d%d%d", t.to_i, t.usec, rand(1000))
+      sprintf("#{Socket.gethostname} %d%d%d", t.to_i, t.usec, rand(1000))
     end
     private :create_id_string
 
@@ -19,6 +21,15 @@ module DRbQS
       @id = @message.take([s, Fixnum])[1]
     end
 
+    def get_initialization
+      begin
+        ary = @message.read([:initialize, nil, Symbol, nil], 0)
+        ary[1..-1]
+      rescue
+        nil
+      end
+    end
+
     def respond_alive_signal
       begin
         node_id, sym = @message.take([@id, Symbol], 0)

data/lib/drbqs/message.rb

@@ -87,6 +87,17 @@ module DRbQS
     def node_not_exist?
       @node_list.empty?
     end
+
+    # If the task has already set,
+    # the method overwrite old task of initialization by new task.
+    def set_initialization(task)
+      begin
+        @message.take([:initialize, nil, Symbol, nil], 0)
+      rescue
+      end
+      @message.write(task.drb_args(:initialize))
+    end
+
   end
 
 end

data/lib/drbqs/queue.rb

@@ -8,7 +8,10 @@ module DRbQS
       rescue
         raise "Can not dump an instance of #{obj.class}."
       end
-      @method_sym = method_sym
+      unless Array === args
+        raise "Arguments of task must be an array."
+      end
+      @method_sym = method_sym.intern
       @args = args
       @hook = hook
     end

data/lib/drbqs/server.rb

@@ -54,6 +54,10 @@ module DRbQS
     end
     private :check_connection
 
+    def set_initialization_task(task)
+      @message.set_initialization(task)
+    end
+
     def set_empty_queue_hook(&block)
       if block_given?
         @empty_queue_hook = block

metadata

@@ -2,7 +2,7 @@
 name: drbqs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - Takayuki YAMAGUCHI
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 +09:00
+date: 2011-02-26 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- drbqs.gemspec
 - lib/drbqs.rb
 - lib/drbqs/client.rb
 - lib/drbqs/connection.rb
@@ -108,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4249913023693362240
+      hash: 2055221894709119612
       segments: 
       - 0
       version: "0"