/* A few basic tests for the surf library */
-/* Copyright (c) 2004-2014. The SimGrid Team.
+/* Copyright (c) 2004-2015. 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. */
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
#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"
void test(char *platform);
void test(char *platform)
{
- void *workstationA = NULL;
- void *workstationB = NULL;
+ sg_host_t hostA = NULL;
+ sg_host_t hostB = NULL;
double now = -1.0;
int running;
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 */
- XBT_DEBUG("%s : %p", surf_resource_name(workstationA), workstationA);
- XBT_DEBUG("%s : %p", surf_resource_name(workstationB), workstationB);
+ XBT_DEBUG("%s : %p", sg_host_get_name(hostA), hostA);
+ XBT_DEBUG("%s : %p", sg_host_get_name(hostB), hostB);
/* Let's do something on it */
- surf_workstation_execute(workstationA, 1000.0);
- surf_workstation_execute(workstationB, 1000.0);
- surf_workstation_sleep(workstationB, 7.32);
+ surf_host_execute(hostA, 1000.0);
+ surf_host_execute(hostB, 1000.0);
+ surf_host_sleep(hostB, 7.32);
- surf_workstation_model_communicate(surf_workstation_model, workstationA, workstationB, 150.0, -1.0);
+ surf_network_model_communicate(surf_network_model, hostA, hostB, 150.0, -1.0);
surf_solve(-1.0); /* Takes traces into account. Returns 0.0 */
do {
}
-#ifdef __BORLANDC__
-#pragma argsused
-#endif
-
int main(int argc, char **argv)
{
surf_init(&argc, argv); /* Initialize some common structures */