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
Merge branch 'actor-yield' of github.com:Takishipp/simgrid into actor-yield
[simgrid.git]
/
examples
/
java
/
cloud
/
migration
/
Daemon.java
diff --git
a/examples/java/cloud/migration/Daemon.java
b/examples/java/cloud/migration/Daemon.java
index
d03d09a
..
6e1bae9
100644
(file)
--- a/
examples/java/cloud/migration/Daemon.java
+++ b/
examples/java/cloud/migration/Daemon.java
@@
-1,4
+1,4
@@
-/* Copyright (c) 2014. The SimGrid Team.
+/* Copyright (c) 2014
-2017
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-11,7
+11,7
@@
import org.simgrid.msg.Process;
public class Daemon extends Process {
private Task currentTask;
public class Daemon extends Process {
private Task currentTask;
- public Daemon(VM vm
, int load
) {
+ public Daemon(VM vm) {
super((Host)vm,"Daemon");
currentTask = new Task(this.getHost().getName()+"-daemon-0", this.getHost().getSpeed()*100, 0);
}
super((Host)vm,"Daemon");
currentTask = new Task(this.getHost().getName()+"-daemon-0", this.getHost().getSpeed()*100, 0);
}
@@
-24,7
+24,7
@@
public class Daemon extends Process {
} catch (HostFailureException e) {
e.printStackTrace();
} catch (TaskCancelledException e) {
} catch (HostFailureException e) {
e.printStackTrace();
} catch (TaskCancelledException e) {
-
System.out.println
("task cancelled");
+
Msg.info
("task cancelled");
suspend(); // Suspend the process
}
currentTask = new Task(this.getHost().getName()+"-daemon-"+(i++), this.getHost().getSpeed()*100, 0);
suspend(); // Suspend the process
}
currentTask = new Task(this.getHost().getName()+"-daemon-"+(i++), this.getHost().getSpeed()*100, 0);