noda 0.0.8 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/bin/noda_job_worker

@@ -20,8 +20,10 @@ options = {
 require "socket" 
 ip=TCPSocket.gethostbyname(Socket::gethostname).last
 STDOUT.puts " connect to   job_server  at  druby://#{ip}:10001"
+STDOUT.puts " job_worekr   working     at  druby://#{ip}:10101"
 Daemons.run_proc("job_worker",options){
-  s=Noda::JobWorker.new("#{ip}", "10001")
-  s.start_service
+  w=Noda::JobWorker.new("#{ip}", "10001")
+  t = DRb.start_service("druby://#{ip}:10101",w)
+  w.start_service
 }
 

data/lib/noda/job_server.rb

@@ -10,6 +10,7 @@ class JobServer
     @server     = DRb.start_service("druby://#{addr}:#{port}",self)
     @thread     = @server.thread
     @logger     = Logger.new(log_file)
+    @task_class_source_list = {}
   end
   def stop
     @server.stop_service
@@ -33,6 +34,15 @@ class JobServer
   def logger
     @logger
   end
+  def add_task_class(class_name, source_code)
+    @task_class_source_list[class_name] = source_code
+  end
+  def task_class(class_name)
+    @task_class_source_list[class_name]
+  end
+  def task_class_source_list
+    @task_class_source_list
+  end
 end
 
 

data/lib/noda/job_worker.rb

@@ -11,6 +11,7 @@ class JobWorker
     require "socket" 
     @local_addr = IPSocket::getaddress(Socket::gethostname)
     self.connect
+    self
   end
   def connect_job_server
     error_conter = 0
@@ -28,11 +29,15 @@ class JobWorker
   def handle_task()
     # @logger.info("self.class@#{@local_addr}#{self.object_id}"){"i try to pop a task."} 
     task = @job.input.pop
-    # @logger.info("self.class@#{@local_addr}#{self.object_id}"){"i got a task-#{task.name}"} 
-    # @logger.info("self.class@#{@local_addr}#{self.object_id}"){"i start handling a task-#{task.name}"} 
+    self.load_class if task.class ==  DRb::DRbUnknown
     result = task.do_task(@job.hash_table)
     @job.output.push result
   end
+  def load_class
+    @job.task_class_source_list.each{|k,v|
+      eval(v)
+    }
+  end
   def init_thread
     @table = @job.hash_table
     @thread= Thread.new{

data/test/test_job_server.rb

@@ -12,17 +12,17 @@ class TestJobServer < Test::Unit::TestCase
   def test_job_server_input_queue
     #druby�o�R�Ő������u���b�N����邩�ǂ���
     test_str = "hello world"
-    s=JobServer.new
-    m =  m = DRbObject.new_with_uri('druby://localhost:10001')
+    s=JobServer.new("localhost", "10002")
+    m =  m = DRbObject.new_with_uri('druby://localhost:10002')
     t1 = Thread.new{
-      m1 = DRbObject.new_with_uri('druby://localhost:10001')
+      m1 = DRbObject.new_with_uri('druby://localhost:10002')
       q1 = m1.input
       q1.pop
       
     }
     #�u���b�N����Ă��邩
     assert t1.status == "sleep"
-    m2 = DRbObject.new_with_uri('druby://localhost:10001')
+    m2 = DRbObject.new_with_uri('druby://localhost:10002')
     q2 = m2.input
     q2.push test_str
     #�u���b�N��������ꂩ�ǂ���
@@ -33,17 +33,17 @@ class TestJobServer < Test::Unit::TestCase
   def test_job_server_output_queue
     #druby�o�R�Ő������u���b�N����邩�ǂ���
     test_str = "hello world"
-    s=JobServer.new
-    m =  m = DRbObject.new_with_uri('druby://localhost:10001')
+    s=JobServer.new("localhost", "10003")
+    m =  m = DRbObject.new_with_uri('druby://localhost:10003')
     t1 = Thread.new{
-      m1 = DRbObject.new_with_uri('druby://localhost:10001')
+      m1 = DRbObject.new_with_uri('druby://localhost:10003')
       q1 = m1.output
       q1.pop
       
     }
     #�u���b�N����Ă��邩
     assert t1.status == "sleep"
-    m2 = DRbObject.new_with_uri('druby://localhost:10001')
+    m2 = DRbObject.new_with_uri('druby://localhost:10003')
     q2 = m2.output
     q2.push test_str
     #�u���b�N��������ꂩ�ǂ���
@@ -52,34 +52,56 @@ class TestJobServer < Test::Unit::TestCase
     s.stop
   end
   def test_job_server_input_queue_data
-    s=JobServer.new
-    m =  m = DRbObject.new_with_uri('druby://localhost:10001')
+    s=JobServer.new("localhost", "10004")
+    m =  m = DRbObject.new_with_uri('druby://localhost:10004')
     t1 = Thread.new{
-      m1 = DRbObject.new_with_uri('druby://localhost:10001')
+      m1 = DRbObject.new_with_uri('druby://localhost:10004')
       q1 = m1.input
       q1.push "hello world"
       
     }
-    m2 = DRbObject.new_with_uri('druby://localhost:10001')
+    m2 = DRbObject.new_with_uri('druby://localhost:10004')
     q2 = m2.input
     ret = q2.pop
     assert ret == "hello world"
     s.stop
   end
   def test_job_server_output_queue_data
-    s=JobServer.new
-    m =  m = DRbObject.new_with_uri('druby://localhost:10001')
+    s=JobServer.new("localhost", "10005")
+    m =  m = DRbObject.new_with_uri('druby://localhost:10005')
     t1 = Thread.new{
-      m1 = DRbObject.new_with_uri('druby://localhost:10001')
+      m1 = DRbObject.new_with_uri('druby://localhost:10005')
       q1 = m1.output
       q1.push "hello world"
       
     }
-    m2 = DRbObject.new_with_uri('druby://localhost:10001')
+    m2 = DRbObject.new_with_uri('druby://localhost:10005')
     q2 = m2.output
     ret = q2.pop
     assert ret == "hello world"
     s.stop
   end
+  def test_job_server_add_class_source_code
+    s=JobServer.new("localhost", "10006")
+    str1  = "class MyTestUnitTask\n end"
+    s.add_task_class("MyTestUnitTask", str1)
+    str2 = s.task_class("MyTestUnitTask")
+    assert str1 == str1
+    e = nil
+    begin 
+      t = MyTestUnitTask.class
+      rescue NameError => e 
+      ensure 
+        assert e !=nil
+    end
+    eval(str2)
+    assert MyTestUnitTask.class == Class
+    
+    m1 = DRbObject.new_with_uri('druby://localhost:10006')
+    str3 = m1.task_class("MyTestUnitTask")
+    assert str1 == str3
+    s.stop
+  end
 end
 
+

data/test/test_job_worker.rb

@@ -3,7 +3,8 @@ class TestJobWoker < Test::Unit::TestCase
 
 
   def test_init_job_woker
-    worker = JobWorker.new
+    s=JobServer.new("localhost", "10001")
+    worker = JobWorker.new("localhost", "10001")
     assert worker
   end
   #test task 
@@ -13,8 +14,8 @@ class TestJobWoker < Test::Unit::TestCase
     end
   end
   def test_start_stop
-    s =JobServer.new
-    w = JobWorker.new
+    s=JobServer.new("localhost", "10002")
+    w = JobWorker.new("localhost", "10002")
     t = Thread.new{
       w.start
     }
@@ -26,8 +27,8 @@ class TestJobWoker < Test::Unit::TestCase
     assert w.status == false #�X���b�h�I���ł����H
   end
   def test_do_task
-    s=JobServer.new
-    worker = JobWorker.new
+    s=JobServer.new("localhost", "10003")
+    worker = JobWorker.new("localhost", "10003")
     s.input.push MyTask.new
     worker.handle_task
     ret = s.output.pop
@@ -42,8 +43,8 @@ class TestJobWoker < Test::Unit::TestCase
   end
   def test_task_write_hash_table
     #�W���u�T�[�o�[�̋��L�̈�ɏ������߂邩�ǂ���
-    s=JobServer.new
-    worker = JobWorker.new
+    s=JobServer.new("localhost", "10004")
+    worker = JobWorker.new("localhost", "10004")
     s.input.push MyTask2.new
     worker.handle_task
     ret = s.output.pop
@@ -52,4 +53,24 @@ class TestJobWoker < Test::Unit::TestCase
     assert v == "foooo"
     s.stop
   end
+  def test_task_class_load
+    s=JobServer.new("localhost", "10005")
+    worker = JobWorker.new("localhost", "10005")
+    str = "class MyTaskTime\n
+    attr_accessor :name
+    def initialize(name)
+      @name = name
+    end
+    def do_task(hash)
+      return self.name+1.to_s
+    end
+    end
+    "
+    s.add_task_class("MyTaskTime",str)
+    eval(str)
+    s.input.push MyTaskTime.new("test_task")
+    worker.handle_task
+    ret = s.output.pop
+    assert ret == "test_task1"
+  end
 end

data/test/test_table_saver_woker.rb

@@ -3,14 +3,14 @@ Thread.abort_on_exception=true
 
 class TestTableSaverWorker < Test::Unit::TestCase
   def test_table_saver_initialize
-    s = JobServer.new("localhost","10001")
+    s = JobServer.new("localhost","10011")
     saver = TableAutoSaver.new
     saver.interval = 12
     assert saver.interval == 12
   end
   def test_table_saver_save_dir
-    s = JobServer.new("localhost","10002")
-    saver = TableAutoSaver.new("localhost","10002")
+    s = JobServer.new("localhost","10012")
+    saver = TableAutoSaver.new("localhost","10012")
     begin 
       saver.save_dir = Dir.tmpdir + "a"
     rescue => e
@@ -23,8 +23,8 @@ class TestTableSaverWorker < Test::Unit::TestCase
     assert FileTest.exists? d == false
   end
   def test_table_saver_save_dir
-    s = JobServer.new("localhost","10003")
-    saver = TableAutoSaver.new("localhost","10003")
+    s = JobServer.new("localhost","10013")
+    saver = TableAutoSaver.new("localhost","10013")
     t1 = saver.init_thread
     t2 = Thread.new{
       s.hash_table.put("aaaa",1234)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noda
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - takuya
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-29 00:00:00 +09:00
+date: 2011-06-03 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency