mv msg/msg.h simgrid/msg.h

[simgrid.git] / examples / scala / master_slave_bypass / Master.scala

diff --git a/examples/scala/master_slave_bypass/Master.scala b/examples/scala/master_slave_bypass/Master.scala
index 5e2fbee..9969982 100644 (file)
--- a/examples/scala/master_slave_bypass/Master.scala
+++ b/examples/scala/master_slave_bypass/Master.scala
@@ -1,10 +1,11 @@
 /*
  * Master of a basic master/slave example in Java
  *
- * Copyright 2006-2012 The SimGrid Team. All rights reserved. 
+ * Copyright (c) 2006-2013. The SimGrid Team.
+ * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package. 
+ * under the terms of the license (GNU LGPL) which comes with this package.
  */
 
 package master_slave_bypass
@@ -17,20 +18,20 @@ import org.simgrid.msg.Process
 import org.simgrid.msg.Task
 
 class Master(hostname:String, name:String) extends Process(hostname,name) {
-  
+
   def main(args:Array[String]) {
     Msg.info("Master Hello!")
-       
+
     //Create a slave on host "alice"
     try {
-      Msg.info("Create process on host 'alice'")
-      new Slave("alice","process2").start()
+      Msg.info("Create process on host 'Tremblay'")
+      new Slave("Tremblay","process2").start()
     } catch {
       case e:MsgException => println("Process2!")
     }
-       
+
     //Wait for slave "alice"
-    continually({Task.receive("alice")})
+    continually({Task.receive("Tremblay")})
       .takeWhile(!_.isInstanceOf[FinalizeTask])
       .force // to force the list to be compute