From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 30 Jun 2009 23:33:48 +0000 (+0000)
Subject: rename src/surf/model.c into surf_model.c to avoid name conflicts on .o files
X-Git-Tag: SVN~1228
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c6eae7b5cb8fbc38590e58329aba017d3ec95400

rename src/surf/model.c into surf_model.c to avoid name conflicts on .o files

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6413 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/Makefile.am b/src/Makefile.am
index b1c11f755a..890be638df 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -169,7 +169,7 @@ XBT_SG_SRC = \
   xbt/xbt_sg_time.c     
 
 SURF_SRC= \
-  surf/model.c                                                               \
+  surf/surf_model.c                                                          \
   surf/surf_resource.c                                                       \
   surf/surf_config.c                                                         \
   surf/maxmin.c                                                              \
diff --git a/src/surf/model.c b/src/surf/model.c
deleted file mode 100644
index 02104c2aaf..0000000000
--- a/src/surf/model.c
+++ /dev/null
@@ -1,61 +0,0 @@
-
-/* Copyright (c) 2009 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_private.h"
-#include "xbt/dict.h"
-
-static void void_die_impossible_paction(surf_action_t action)
-{
-  DIE_IMPOSSIBLE;
-}
-
-static int int_die_impossible_paction(surf_action_t action)
-{
-  DIE_IMPOSSIBLE;
-}
-
-/** @brief initialize common datastructures to all models */
-surf_model_t surf_model_init(void)
-{
-  s_surf_action_t action;
-  surf_model_t model = xbt_new0(s_surf_model_t, 1);
-
-  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));
-  model->states.running_action_set =
-    xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  model->states.failed_action_set =
-    xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  model->states.done_action_set =
-    xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  model->resource_set = xbt_dict_new();
-
-  model->action_free = int_die_impossible_paction;
-  model->action_cancel = void_die_impossible_paction;
-  model->action_recycle = void_die_impossible_paction;
-
-  return model;
-}
-/** @brief finalize common datastructures to all models */
-void surf_model_exit(surf_model_t model)
-{
-  xbt_swag_free(model->states.ready_action_set);
-  xbt_swag_free(model->states.running_action_set);
-  xbt_swag_free(model->states.failed_action_set);
-  xbt_swag_free(model->states.done_action_set);
-  xbt_dict_free(&model->resource_set);
-  free(model->model_private);
-  free(model);
-}
-
-void *surf_model_resource_by_name(surf_model_t model, const char *name)
-{
-  return xbt_dict_get_or_null(model->resource_set, name);
-}
-
-