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
control better random, returning to assertion
[simgrid.git]
/
teshsuite
/
surf
/
surf_usage
/
surf_usage2.cpp
diff --git
a/teshsuite/surf/surf_usage/surf_usage2.cpp
b/teshsuite/surf/surf_usage/surf_usage2.cpp
index
9c95d45
..
3230aa2
100644
(file)
--- a/
teshsuite/surf/surf_usage/surf_usage2.cpp
+++ b/
teshsuite/surf/surf_usage/surf_usage2.cpp
@@
-9,8
+9,8
@@
#include <stdio.h>
#include "simgrid/sg_config.h"
#include "surf/surf.h"
#include <stdio.h>
#include "simgrid/sg_config.h"
#include "surf/surf.h"
-#include "surf/surfxml_parse.h" // for reset callback
#include "src/surf/surf_interface.hpp"
#include "src/surf/surf_interface.hpp"
+#include "src/surf/cpu_interface.hpp"
#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test,
#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test,
@@
-57,8
+57,8
@@
void test(char *platform)
XBT_DEBUG("%s : %p", sg_host_get_name(hostB), hostB);
/* Let's do something on it */
XBT_DEBUG("%s : %p", sg_host_get_name(hostB), hostB);
/* Let's do something on it */
-
surf_host_execute(hostA,
1000.0);
-
surf_host_execute(hostB,
1000.0);
+
hostA->pimpl_cpu->execution_start(
1000.0);
+
hostB->pimpl_cpu->execution_start(
1000.0);
surf_host_sleep(hostB, 7.32);
surf_network_model_communicate(surf_network_model, hostA, hostB, 150.0, -1.0);
surf_host_sleep(hostB, 7.32);
surf_network_model_communicate(surf_network_model, hostA, hostB, 150.0, -1.0);