/* A few basic tests for the surf library */
-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
parse_platform_file(platform);
/*********************** CPU ***********************************/
- XBT_DEBUG("%p", surf_cpu_model);
+ XBT_DEBUG("%p", surf_cpu_model_pm);
cpuA = surf_cpu_resource_by_name("Cpu A");
cpuB = surf_cpu_resource_by_name("Cpu B");
XBT_DEBUG("Next Event : %g", now);
XBT_DEBUG("\t CPU actions");
while ((action =
- xbt_swag_extract(surf_model_failed_action_set((surf_model_t)surf_cpu_model)))) {
+ surf_model_extract_failed_action_set((surf_model_t)surf_cpu_model_pm))) {
XBT_DEBUG("\t * Failed : %p", action);
surf_action_unref(action);
}
while ((action =
- xbt_swag_extract(surf_model_done_action_set((surf_model_t)surf_cpu_model)))) {
+ surf_model_extract_done_action_set((surf_model_t)surf_cpu_model_pm))) {
XBT_DEBUG("\t * Done : %p", action);
surf_action_unref(action);
}
XBT_DEBUG("\t Network actions");
while ((action =
- xbt_swag_extract(surf_model_failed_action_set((surf_model_t)surf_network_model)))) {
+ surf_model_extract_failed_action_set((surf_model_t)surf_network_model))) {
XBT_DEBUG("\t * Failed : %p", action);
surf_action_unref(action);
}
while ((action =
- xbt_swag_extract(surf_model_done_action_set((surf_model_t)surf_network_model)))) {
+ surf_model_extract_done_action_set((surf_model_t)surf_network_model))) {
XBT_DEBUG("\t * Done : %p", action);
surf_action_unref(action);
}
- } while ((xbt_swag_size(surf_model_running_action_set((surf_model_t)surf_network_model)) ||
- xbt_swag_size(surf_model_running_action_set((surf_model_t)surf_cpu_model))) &&
+ } while ((surf_model_running_action_set_size((surf_model_t)surf_network_model) ||
+ surf_model_running_action_set_size((surf_model_t)surf_cpu_model_pm)) &&
surf_solve(-1.0) >= 0.0);
XBT_DEBUG("Simulation Terminated");