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
Remove borland-compiler related cruft
[simgrid.git]
/
teshsuite
/
surf
/
surf_usage
/
surf_usage2.c
diff --git
a/teshsuite/surf/surf_usage/surf_usage2.c
b/teshsuite/surf/surf_usage/surf_usage2.c
index
2e633a9
..
c59240d
100644
(file)
--- a/
teshsuite/surf/surf_usage/surf_usage2.c
+++ b/
teshsuite/surf/surf_usage/surf_usage2.c
@@
-6,14
+6,9
@@
/* 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. */
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
#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/surf_resource.h"
#include "surf/surfxml_parse.h" // for reset callback
#include "xbt/log.h"
#include "surf/surfxml_parse.h" // for reset callback
#include "xbt/log.h"
@@
-43,8
+38,8
@@
const char *string_action(e_surf_action_state_t state)
void test(char *platform);
void test(char *platform)
{
void test(char *platform);
void test(char *platform)
{
-
void *workstation
A = NULL;
-
void *workstation
B = NULL;
+
sg_host_t host
A = NULL;
+
sg_host_t host
B = NULL;
double now = -1.0;
int running;
double now = -1.0;
int running;
@@
-52,22
+47,20
@@
void test(char *platform)
xbt_cfg_set_parse(_sg_cfg_set, "cpu/model:Cas01");
parse_platform_file(platform);
xbt_cfg_set_parse(_sg_cfg_set, "cpu/model:Cas01");
parse_platform_file(platform);
- /*********************** WORKSTATION ***********************************/
- workstationA =
- surf_workstation_resource_by_name("Cpu A");
- workstationB =
- surf_workstation_resource_by_name("Cpu B");
+ /*********************** HOST ***********************************/
+ hostA = sg_host_by_name("Cpu A");
+ hostB = sg_host_by_name("Cpu B");
/* Let's check that those two processors exist */
/* Let's check that those two processors exist */
- XBT_DEBUG("%s : %p", s
urf_resource_name(workstationA), workstation
A);
- XBT_DEBUG("%s : %p", s
urf_resource_name(workstationB), workstation
B);
+ XBT_DEBUG("%s : %p", s
g_host_get_name(hostA), host
A);
+ XBT_DEBUG("%s : %p", s
g_host_get_name(hostB), host
B);
/* Let's do something on it */
/* Let's do something on it */
- surf_
workstation_execute(workstation
A, 1000.0);
- surf_
workstation_execute(workstation
B, 1000.0);
- surf_
workstation_sleep(workstation
B, 7.32);
+ surf_
host_execute(host
A, 1000.0);
+ surf_
host_execute(host
B, 1000.0);
+ surf_
host_sleep(host
B, 7.32);
- surf_
workstation_model_communicate(surf_workstation_model, workstationA, workstation
B, 150.0, -1.0);
+ surf_
network_model_communicate(surf_network_model, hostA, host
B, 150.0, -1.0);
surf_solve(-1.0); /* Takes traces into account. Returns 0.0 */
do {
surf_solve(-1.0); /* Takes traces into account. Returns 0.0 */
do {
@@
-100,10
+93,6
@@
void test(char *platform)
}
}
-#ifdef __BORLANDC__
-#pragma argsused
-#endif
-
int main(int argc, char **argv)
{
surf_init(&argc, argv); /* Initialize some common structures */
int main(int argc, char **argv)
{
surf_init(&argc, argv); /* Initialize some common structures */