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
Revert "Replace xbt_heap by boost::heap::fibonacci_heap"
[simgrid.git]
/
examples
/
msg
/
cloud
/
two_tasks_vm.c
diff --git
a/examples/msg/cloud/two_tasks_vm.c
b/examples/msg/cloud/two_tasks_vm.c
index
a4c1017
..
0e2aaab
100644
(file)
--- a/
examples/msg/cloud/two_tasks_vm.c
+++ b/
examples/msg/cloud/two_tasks_vm.c
@@
-1,9
+1,8
@@
-/*
- * vm_bug.c
- *
- * Created on: Jan 30, 2014
- * Author: bedaride
- */
+/* Copyright (c) 2014. 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. */
#include <stdio.h>
#include "msg/msg.h"
#include <stdio.h>
#include "msg/msg.h"
@@
-65,10
+64,10
@@
static int master_main(int argc, char *argv[])
msg_host_t pm0 = xbt_dynar_get_as(hosts_dynar, 0, msg_host_t);
msg_vm_t vm0;
vm0 = MSG_vm_create_core(pm0, "VM0");
msg_host_t pm0 = xbt_dynar_get_as(hosts_dynar, 0, msg_host_t);
msg_vm_t vm0;
vm0 = MSG_vm_create_core(pm0, "VM0");
-
+ MSG_vm_start(vm0);
//MSG_process_sleep(1);
//MSG_process_sleep(1);
- launch_computation_worker(
p
m0);
+ launch_computation_worker(
v
m0);
while(MSG_get_clock()<100) {
if (atask != NULL)
while(MSG_get_clock()<100) {
if (atask != NULL)
@@
-77,6
+76,8
@@
static int master_main(int argc, char *argv[])
}
MSG_process_sleep(10000);
}
MSG_process_sleep(10000);
+ MSG_vm_destroy(vm0);
+ xbt_dynar_free(&hosts_dynar);
return 1;
}
return 1;
}
@@
-102,6
+103,7
@@
int main(int argc, char *argv[]){
int res = MSG_main();
XBT_INFO("Bye (simulation time %g)", MSG_get_clock());
int res = MSG_main();
XBT_INFO("Bye (simulation time %g)", MSG_get_clock());
+ xbt_dynar_free(&hosts_dynar);
return !(res == MSG_OK);
}
return !(res == MSG_OK);
}