/* 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 *hostA = NULL;
- void *hostB = NULL;
+ sg_host_t hostA = NULL;
+ sg_host_t hostB = NULL;
double now = -1.0;
int running;
parse_platform_file(platform);
/*********************** HOST ***********************************/
- hostA = surf_host_resource_by_name("Cpu A");
- hostB = surf_host_resource_by_name("Cpu B");
+ 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(hostA), hostA);
- XBT_DEBUG("%s : %p", surf_resource_name(hostB), hostB);
+ 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_host_execute(hostA, 1000.0);
surf_host_execute(hostB, 1000.0);
surf_host_sleep(hostB, 7.32);
- surf_host_model_communicate(surf_host_model, hostA, hostB, 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 {
now = surf_get_clock();
XBT_DEBUG("Next Event : %g", now);
- xbt_dynar_foreach(model_list, iter, model) {
- XBT_DEBUG("\t %s actions", surf_model_name(model));
+ xbt_dynar_foreach(all_existing_models, iter, model) {
+ XBT_DEBUG("\t Actions");
while ((action = surf_model_extract_failed_action_set((surf_model_t)model))) {
XBT_DEBUG("\t * Failed : %p", action);
surf_action_unref(action);
surf_action_unref(action);
}
if (surf_model_running_action_set_size((surf_model_t)model)) {
- XBT_DEBUG("running %s", surf_model_name(model));
+ XBT_DEBUG("running that model");
running = 1;
}
}
}
-#ifdef __BORLANDC__
-#pragma argsused
-#endif
-
int main(int argc, char **argv)
{
surf_init(&argc, argv); /* Initialize some common structures */