Kill deprecated cruft and unused variables

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

diff --git a/src/surf/network.c b/src/surf/network.c
index 165a1fb..fa21cae 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -20,12 +20,9 @@ double latency_factor = 1.0;    /* default value */
 double bandwidth_factor = 1.0;  /* default value */
 double weight_S_parameter = 0.0;        /* default value */
 
-int card_number = 0;
-int host_count = 0;
 double sg_tcp_gamma = 0.0;
 
 
-
 static link_CM02_t link_new(char *name,
                             double bw_initial,
                             tmgr_trace_t bw_trace,
@@ -470,7 +467,6 @@ static void finalize(void)
   surf_network_model = NULL;
 
   used_routing->finalize();
-  host_count = 0;
   lmm_system_free(network_maxmin_system);
   network_maxmin_system = NULL;
 }

diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c
index 2b0b2ed..07c045f 100644 (file)
--- a/src/surf/network_constant.c
+++ b/src/surf/network_constant.c
@@ -21,7 +21,6 @@ typedef struct surf_action_network_Constant {
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
 static random_data_t random_latency = NULL;
-static int card_number = 0;
 static int host_number = 0;
 
 static void count_hosts(void)
@@ -187,8 +186,6 @@ static void finalize(void)
 {
   surf_model_exit(surf_network_model);
   surf_network_model = NULL;
-
-  card_number = 0;
 }
 
 static void surf_network_model_init_internal(void)

diff --git a/src/surf/network_gtnets_private.h b/src/surf/network_gtnets_private.h
index c981fb1..2a6534c 100644 (file)
--- a/src/surf/network_gtnets_private.h
+++ b/src/surf/network_gtnets_private.h
@@ -32,10 +32,6 @@ typedef struct surf_action_network_GTNETS {
   lmm_variable_t variable;
   double rate;
   int suspended;
-#ifdef KILLME
-  network_card_GTNETS_t src;
-  network_card_GTNETS_t dst;
-#endif
 } s_surf_action_network_GTNETS_t, *surf_action_network_GTNETS_t;
 
 //extern xbt_dict_t network_card_set;

diff --git a/src/surf/network_private.h b/src/surf/network_private.h
index 7120d46..da65b00 100644 (file)
--- a/src/surf/network_private.h
+++ b/src/surf/network_private.h
@@ -30,10 +30,6 @@ typedef struct surf_action_network_CM02 {
   lmm_variable_t variable;
   double rate;
   int suspended;
-#ifdef KILLME
-  int src;
-  int dst;
-#endif
 } s_surf_action_network_CM02_t, *surf_action_network_CM02_t;
 
 #endif /* _SURF_NETWORK_PRIVATE_H */

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 40f6bcc..7b8d8ae 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -13,8 +13,6 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
                                 "Logging specific to SURF (kernel)");
 
-//int use_lagrange_solver = 0; KILLME
-
 /* Additional declarations for Windows potability. */
 
 #ifndef MAX_DRIVE

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index d093be4..de1a7b6 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -37,11 +37,6 @@ typedef struct surf_model_private {
   void (*finalize) (void);
 } s_surf_model_private_t;
 
-/* #define pub2priv(r) ((surf_model_private_t) ((char *)(r) -(sizeof(struct surf_model_private_part)))) */
-/* #define priv2pub(r) ((void *) ((char *)(r) +(sizeof(struct surf_model_private_part)))) */
-
-//extern int use_lagrange_solver;
-
 double generic_maxmin_share_resources(xbt_swag_t running_actions,
                                       size_t offset,
                                       lmm_system_t sys,