A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add (empty) ChangeLog entry for release 3.10.
[simgrid.git]
/
examples
/
master_slave_kill
/
Master.java
diff --git
a/examples/master_slave_kill/Master.java
b/examples/master_slave_kill/Master.java
index
0600913
..
783e9a1
100644
(file)
--- a/
examples/master_slave_kill/Master.java
+++ b/
examples/master_slave_kill/Master.java
@@
-1,7
+1,7
@@
/*
* Master of a basic master/slave example in Java
*
/*
* Master of a basic master/slave example in Java
*
- * Copyright 2006
,2007,2010
The SimGrid Team. All rights reserved.
+ * Copyright 2006
-2012
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.
*
* 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.
@@
-27,6
+27,7
@@
public class Master extends Process {
try {
Msg.info("Create process on host 'alice'");
process2 = new Slave("alice","slave");
try {
Msg.info("Create process on host 'alice'");
process2 = new Slave("alice","slave");
+ process2.start();
} catch (MsgException e){
System.out.println("Process2!");
}
} catch (MsgException e){
System.out.println("Process2!");
}
@@
-40,7
+41,6
@@
public class Master extends Process {
break;
}
}
break;
}
}
-
process2.kill();
Msg.info("Process2 is now killed, should exit now");
process2.kill();
Msg.info("Process2 is now killed, should exit now");