Yet some more cleanups in ruby (and this time, I go to bed)

[simgrid.git] / src / bindings / ruby / MasterSlave.rb

diff --git a/src/bindings/ruby/MasterSlave.rb b/src/bindings/ruby/MasterSlave.rb
index 9b1cbe6..19afa26 100644 (file)
--- a/src/bindings/ruby/MasterSlave.rb
+++ b/src/bindings/ruby/MasterSlave.rb
@@ -1,3 +1,6 @@
+# Debug it with this command:
+# make -C ../.. && valgrind ruby MasterSlave.rb --log=ruby.thres:debug 2>&1 | less
+
 require 'simgrid'
 include MSG
 
@@ -5,46 +8,37 @@ include MSG
 # Class Master
 #################################################
 
-class Master < RbProcess  
-  def initialize2()
-    super()
-  end
- 
-  
-  # msg_main : that function that will be executed when Running Simulation
-  def msg_main(args) # args is an array containing arguments for function master
-    info("Hello From Master")
-    size = args.size
-    info ("Number of Args for Master = " + size.to_s)
+class Master < MsgProcess  
+  # main : that function that will be executed when Running Simulation
+  def main(args) # args is an array containing arguments for function master
+   size = args.size
    for i in 0..size-1
-      info("args["+String(i)+"]="+args[i])
+     info("args["+String(i)+"]="+args[i])
    end
-   
+  
    raise "Master needs 3 arguments" if size < 3 
    numberOfTask = Integer(args[0]) 
    taskComputeSize = Float(args[1])
    taskCommunicationSize = Float(args[2])
    slaveCount = Integer(args[3]) 
    
-   #Creating & Sending Task
+   # Creates and sends the tasks
    for i in 0..numberOfTask-1
-  
-     
-     task = RbTask.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)
-#      puts "Master Receiving its Own Task"
+     task = Task.new("Task_"+ i.to_s, taskComputeSize , taskCommunicationSize);
+     mailbox = "slave " + (i%slaveCount).to_s
+     info("Master Sending "+ Task.name(task) + " to " + mailbox + " with Comput Size " + 
+          Task.compSize(task).to_s)
+#          task.compSize.to_s) # FIXME: This version creates a deadlock. Interesting
+     Task.send(task,mailbox)
+     info("Master Done Sending " +Task.name(task) + " to " + mailbox)
    end
   
    # Sending Finalize Tasks
    info ("Master: All tasks have been dispatched. Let's tell everybody the computation is over.")
    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)
+     mailbox = "slave " + i.to_s
+     info ("Master Sending Finalize to " + mailbox)
+     Task.send(Task.new("finalize",0,0),mailbox)
    end
    info("Master : Everything's Done")
   end    
@@ -53,34 +47,25 @@ end
 #################################################
 # Class Slave
 #################################################
-class Slave < RbProcess
-  
-  def initialize()
-    super()
-  end
-  
- # msg_main : that function that will be executed when Running Simulation
-  def msg_main(args)
-    info("Hello From Slave")
-    s_mailbox = "slave>>" + args[0]
+class Slave < MsgProcess
+  def main(args)
+    mailbox = "slave " + args[0]
 
     while true
-        
        info("Ready to Receive Task")
-       task = RbTask.receive(s_mailbox)
-       task_name = RbTask.name(task)
+       task = Task.receive(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)
+       if (task_name == "finalize")
+              info("Slave" + s_mailbox + "got finalize msg")
+              break
+       end
+       info("Slave " + s_mailbox + " ...Processing" + Task.name(task))
+       Task.execute(task)
     end
     info("Slave " + s_mailbox +  "I'm Done , See You !!")
-    end
-    
-  end
+  end    
+end
 
 
 #################################################
@@ -93,7 +78,7 @@ if (ARGV.length == 2)
 else 
        MSG.createEnvironment("platform.xml")
        MSG.deployApplication("deploy.xml")
-  Thread.list.each {|t| p t}
+  #Thread.list.each {|t| p t}
 end
 
 # Thread.list.each {|t| p t}