-/* $Id$ */
-
/* A few basic tests for the surf library */
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. 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 "surf/surf.h"
#include "xbt/log.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test,
+ "Messages specific for surf example");
const char *string_action(e_surf_action_state_t state);
const char *string_action(e_surf_action_state_t state)
/*********************** CPU ***********************************/
DEBUG1("%p", surf_cpu_model);
- cpuA = surf_cpu_model->common_public->name_service("Cpu A");
- cpuB = surf_cpu_model->common_public->name_service("Cpu B");
+ cpuA = surf_model_resource_by_name(surf_cpu_model, "Cpu A");
+ cpuB = surf_model_resource_by_name(surf_cpu_model, "Cpu B");
/* Let's check that those two processors exist */
- DEBUG2("%s : %p",
- surf_cpu_model->common_public->get_resource_name(cpuA), cpuA);
- DEBUG2("%s : %p",
- surf_cpu_model->common_public->get_resource_name(cpuB), cpuB);
+ DEBUG2("%s : %p", surf_resource_name(cpuA), cpuA);
+ DEBUG2("%s : %p", surf_resource_name(cpuB), cpuB);
/* Let's do something on it */
- actionA = surf_cpu_model->extension_public->execute(cpuA, 1000.0);
- actionB = surf_cpu_model->extension_public->execute(cpuB, 1000.0);
- actionC = surf_cpu_model->extension_public->sleep(cpuB, 7.32);
+ actionA = surf_cpu_model->extension.cpu.execute(cpuA, 1000.0);
+ actionB = surf_cpu_model->extension.cpu.execute(cpuB, 1000.0);
+ actionC = surf_cpu_model->extension.cpu.sleep(cpuB, 7.32);
/* Use whatever calling style you want... */
- stateActionA = surf_cpu_model->common_public->action_get_state(actionA); /* When you know actionA model type */
- stateActionB = actionB->model_type->common_public->action_get_state(actionB); /* If you're unsure about it's model type */
- stateActionC = surf_cpu_model->common_public->action_get_state(actionC); /* When you know actionA model type */
+ stateActionA = surf_cpu_model->action_state_get(actionA); /* When you know actionA model type */
+ stateActionB = actionB->model_type->action_state_get(actionB); /* If you're unsure about it's model type */
+ stateActionC = surf_cpu_model->action_state_get(actionC); /* When you know actionA model type */
/* And just look at the state of these tasks */
DEBUG2("actionA : %p (%s)", actionA, string_action(stateActionA));
/*********************** Network *******************************/
DEBUG1("%p", surf_network_model);
- cardA = surf_network_model->common_public->name_service("Cpu A");
- cardB = surf_network_model->common_public->name_service("Cpu B");
+ cardA = surf_model_resource_by_name(surf_network_model, "Cpu A");
+ cardB = surf_model_resource_by_name(surf_network_model, "Cpu B");
/* Let's check that those two processors exist */
- DEBUG2("%s : %p",
- surf_network_model->common_public->get_resource_name(cardA), cardA);
- DEBUG2("%s : %p",
- surf_network_model->common_public->get_resource_name(cardB), cardB);
+ DEBUG2("%s : %p", surf_resource_name(cardA), cardA);
+ DEBUG2("%s : %p", surf_resource_name(cardB), cardB);
/* Let's do something on it */
commAB =
- surf_network_model->extension_public->communicate(cardA, cardB,
- 150.0, -1.0);
+ surf_network_model->extension.network.communicate("Cpu A", "Cpu B",
+ 150.0, -1.0);
surf_solve(); /* Takes traces into account. Returns 0.0 */
do {
DEBUG1("Next Event : %g", now);
DEBUG0("\t CPU actions");
while ((action =
- xbt_swag_extract(surf_cpu_model->common_public->
- states.failed_action_set))) {
+ xbt_swag_extract(surf_cpu_model->states.failed_action_set))) {
DEBUG1("\t * Failed : %p", action);
- action->model_type->common_public->action_free(action);
+ action->model_type->action_unref(action);
}
while ((action =
- xbt_swag_extract(surf_cpu_model->common_public->
- states.done_action_set))) {
+ xbt_swag_extract(surf_cpu_model->states.done_action_set))) {
DEBUG1("\t * Done : %p", action);
- action->model_type->common_public->action_free(action);
+ action->model_type->action_unref(action);
}
DEBUG0("\t Network actions");
while ((action =
- xbt_swag_extract(surf_network_model->common_public->
- states.failed_action_set))) {
+ xbt_swag_extract(surf_network_model->states.
+ failed_action_set))) {
DEBUG1("\t * Failed : %p", action);
- action->model_type->common_public->action_free(action);
+ action->model_type->action_unref(action);
}
while ((action =
- xbt_swag_extract(surf_network_model->common_public->
- states.done_action_set))) {
+ xbt_swag_extract(surf_network_model->states.
+ done_action_set))) {
DEBUG1("\t * Done : %p", action);
- action->model_type->common_public->action_free(action);
+ action->model_type->action_unref(action);
}
- } while (surf_solve() >= 0.0);
+ } while ((xbt_swag_size(surf_network_model->states.running_action_set) ||
+ xbt_swag_size(surf_cpu_model->states.running_action_set)) &&
+ surf_solve() >= 0.0);
DEBUG0("Simulation Terminated");
}
