X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/824b99a5272ff8ce814336ab8bc9817eecd6de60..5b78fc9f704153c9832230883dfd847f2bcf791d:/src/surf/surf_model.c?ds=sidebyside diff --git a/src/surf/surf_model.c b/src/surf/surf_model.c index cd5993a8c0..cfe7d57ace 100644 --- a/src/surf/surf_model.c +++ b/src/surf/surf_model.c @@ -1,5 +1,6 @@ -/* Copyright (c) 2009 The SimGrid Team. All rights reserved. */ +/* Copyright (c) 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. */ @@ -26,20 +27,21 @@ surf_model_t surf_model_init(void) model->model_private = xbt_new0(s_surf_model_private_t, 1); model->states.ready_action_set = - xbt_swag_new(xbt_swag_offset(action, state_hookup)); + xbt_swag_new(xbt_swag_offset(action, state_hookup)); model->states.running_action_set = - xbt_swag_new(xbt_swag_offset(action, state_hookup)); + xbt_swag_new(xbt_swag_offset(action, state_hookup)); model->states.failed_action_set = - xbt_swag_new(xbt_swag_offset(action, state_hookup)); + xbt_swag_new(xbt_swag_offset(action, state_hookup)); model->states.done_action_set = - xbt_swag_new(xbt_swag_offset(action, state_hookup)); + xbt_swag_new(xbt_swag_offset(action, state_hookup)); model->resource_set = xbt_dict_new(); - model->action_free = int_die_impossible_paction; + model->action_unref = int_die_impossible_paction; model->action_cancel = void_die_impossible_paction; model->action_recycle = void_die_impossible_paction; model->action_state_get = surf_action_state_get; + model->action_state_set = surf_action_state_set; model->action_get_start_time = surf_action_get_start_time; model->action_get_finish_time = surf_action_get_finish_time; model->action_data_set = surf_action_data_set; @@ -47,6 +49,7 @@ surf_model_t surf_model_init(void) return model; } + /** @brief finalize common datastructures to all models */ void surf_model_exit(surf_model_t model) { @@ -63,5 +66,3 @@ void *surf_model_resource_by_name(surf_model_t model, const char *name) { return xbt_dict_get_or_null(model->resource_set, name); } - -