X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3d9680ac65d8bdd8e267aed69fc32a5abab12d7..ed95f6aa5479b9dab84fd9e2e303fdc63a9089af:/src/bindings/ruby/MasterSlave.rb

diff --git a/src/bindings/ruby/MasterSlave.rb b/src/bindings/ruby/MasterSlave.rb
index 9b1cbe64ea..6f809f290f 100644
--- a/src/bindings/ruby/MasterSlave.rb
+++ b/src/bindings/ruby/MasterSlave.rb
@@ -5,7 +5,7 @@ include MSG
 # Class Master
 #################################################
 
-class Master < RbProcess  
+class Master < MsgProcess  
   def initialize2()
     super()
   end
@@ -30,12 +30,12 @@ class Master < RbProcess
    for i in 0..numberOfTask-1
   
      
-     task = RbTask.new("Task_"+ i.to_s, taskComputeSize , taskCommunicationSize );
+     task = Task.new("Task_"+ i.to_s, taskComputeSize , taskCommunicationSize );
      s_alias = "slave>>" + (i%slaveCount).to_s
-     info("Master Sending "+ RbTask.name(task) + " to " + s_alias + " with Comput Size " + RbTask.compSize(task).to_s)
-     RbTask.send(task,s_alias)
-     info("Master Done Sending " +RbTask.name(task) + " to " + s_alias)
-#       sameTask = RbTask.receive(s_alias)
+     info("Master Sending "+ Task.name(task) + " to " + s_alias + " with Comput Size " + Task.compSize(task).to_s)
+     Task.send(task,s_alias)
+     info("Master Done Sending " +Task.name(task) + " to " + s_alias)
+#       sameTask = Task.receive(s_alias)
 #      puts "Master Receiving its Own Task"
    end
   
@@ -44,7 +44,7 @@ class Master < RbProcess
    for i in 0..slaveCount-1
      s_alias = "slave " + i.to_s
      info ("Master Sending Finalize to " + s_alias)
-     RbTask.send(RbTask.new("finalize",0,0),s_alias)
+     Task.send(Task.new("finalize",0,0),s_alias)
    end
    info("Master : Everything's Done")
   end    
@@ -53,7 +53,7 @@ end
 #################################################
 # Class Slave
 #################################################
-class Slave < RbProcess
+class Slave < MsgProcess
   
   def initialize()
     super()
@@ -67,15 +67,15 @@ class Slave < RbProcess
     while true
         
        info("Ready to Receive Task")
-       task = RbTask.receive(s_mailbox)
-       task_name = RbTask.name(task)
+       task = Task.receive(s_mailbox)
+       task_name = Task.name(task)
        info ("Task Received : " + task.name)
       if (task_name == "finalize")
 	info("Slave" + s_mailbox + "got finalize msg")
 	break
       end
-      info("Slave " + s_mailbox + " ...Processing" + RbTask.name(task))
-       RbTask.execute(task)
+      info("Slave " + s_mailbox + " ...Processing" + Task.name(task))
+       Task.execute(task)
     end
     info("Slave " + s_mailbox +  "I'm Done , See You !!")
     end