kill some unused static functions

diff --git a/src/bindings/java/jmsg_process.c b/src/bindings/java/jmsg_process.c
index fd7b069..ed259b7 100644 (file)
--- a/src/bindings/java/jmsg_process.c
+++ b/src/bindings/java/jmsg_process.c
@@ -405,7 +405,7 @@ Java_org_simgrid_msg_Process_setKillTime (JNIEnv *env , jobject jprocess, jdoubl
 
 JNIEXPORT jint JNICALL
 Java_org_simgrid_msg_Process_getCount(JNIEnv * env, jclass cls) {
-       /* FIXME: the next test on SimGrid version is to ensure that this still compiles with SG 3.8 while the C function were added in SG 3.9 only.
+       /* The next test on SimGrid version is to ensure that this still compiles with SG 3.8 while the C function were added in SG 3.9 only.
         * This kind of pimple becomes mandatory when you get so slow to release the java version that it begins evolving further after the C release date.
         */
 #if SIMGRID_VERSION >= 30900

diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c
index 0d73dea..4ceb168 100644 (file)
--- a/src/simix/smx_host.c
+++ b/src/simix/smx_host.c
@@ -524,15 +524,6 @@ smx_action_t SIMIX_host_parallel_execute(const char *name,
   return action;
 }
 
-//FIXME: REMOVE not used
-static surf_model_t get_ws_model_from_action(smx_action_t action)
-{
-  xbt_assert(action->type == SIMIX_ACTION_EXECUTE);
-  smx_host_t host = action->execution.host;
-  surf_model_t model = surf_resource_model(host, SURF_WKS_LEVEL);
-  return model;
-}
-
 void SIMIX_pre_host_execution_destroy(smx_simcall_t simcall, smx_action_t action){
   SIMIX_host_execution_destroy(action);
 }

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index 8462493..5c1cf64 100644 (file)
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -198,23 +198,6 @@ typedef struct s_smx_action {
 #endif
 } s_smx_action_t;
 
-/* FIXME: check if we can delete this function */
-static XBT_INLINE e_smx_state_t SIMIX_action_map_state(e_surf_action_state_t state)
-{
-  switch (state) {
-    case SURF_ACTION_READY:
-      return SIMIX_READY;
-    case SURF_ACTION_RUNNING:
-      return SIMIX_RUNNING;
-    case SURF_ACTION_FAILED:
-      return SIMIX_FAILED;
-    case SURF_ACTION_DONE:
-      return SIMIX_DONE;
-    default:
-      xbt_die("Unexpected SURF action state");
-  }
-}
-
 void SIMIX_context_mod_init(void);
 void SIMIX_context_mod_exit(void);
 

diff --git a/src/surf/instr_surf.c b/src/surf/instr_surf.c
index f0f3df2..9a2764a 100644 (file)
--- a/src/surf/instr_surf.c
+++ b/src/surf/instr_surf.c
@@ -6,7 +6,6 @@
 
 #include "instr/instr_private.h"
 #include "surf/surf_private.h"
-//FIXME:#include "surf/network_gtnets_private.h"
 
 #ifdef HAVE_TRACING
 

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 918bfab..ff091ec 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -27,7 +27,6 @@ int ETag_surfxml_include_state(void);
 char* surf_parsed_filename = NULL; // to locate parse error messages
 
 xbt_dynar_t parsed_link_list = NULL;   /* temporary store of current list link of a route */
-extern AS_t current_routing;
 /*
  * Helping functions
  */
@@ -217,9 +216,6 @@ xbt_dict_t random_data_list = NULL;
 YY_BUFFER_STATE surf_input_buffer;
 FILE *surf_file_to_parse = NULL;
 
-static void init_randomness(void);
-static void add_randomness(void);
-
 /*
  * Stuff relative to storage
  */
@@ -1057,8 +1053,6 @@ int_f_void_t surf_parse = _surf_parse;
  * With XML parser
  */
 
-/* Random tag functions */
-
 double get_cpu_power(const char *power)
 {
   double power_scale = 0.0;
@@ -1086,44 +1080,6 @@ double random_min, random_max, random_mean, random_std_deviation;
 e_random_generator_t random_generator;
 char *random_id;
 
-static void init_randomness(void)
-{
-  random_id = A_surfxml_random_id;
-  random_min = surf_parse_get_double(A_surfxml_random_min);
-  random_max = surf_parse_get_double(A_surfxml_random_max);
-  random_mean = surf_parse_get_double(A_surfxml_random_mean);
-  random_std_deviation = surf_parse_get_double(A_surfxml_random_std___deviation);
-  switch (A_surfxml_random_generator) {
-  case AU_surfxml_random_generator:
-  case A_surfxml_random_generator_NONE:
-    random_generator = NONE;
-    break;
-  case A_surfxml_random_generator_DRAND48:
-    random_generator = DRAND48;
-    break;
-  case A_surfxml_random_generator_RAND:
-    random_generator = RAND;
-    break;
-  case A_surfxml_random_generator_RNGSTREAM:
-    random_generator = RNGSTREAM;
-    break;
-  default:
-    surf_parse_error("Invalid random generator");
-    break;
-  }
-}
-
-static void add_randomness(void)
-{
-  /* If needed, additional properties can be added by using the prop tag */
-  random_data_t random =
-      random_new(random_generator, 0, random_min, random_max, random_mean,
-                 random_std_deviation);
-  xbt_dict_set(random_data_list, random_id, (void *) random,
-               &xbt_free_ref);
-}
-
-
 xbt_dict_t get_as_router_properties(const char* name)
 {
   return xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL);

diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c
index 7b02657..26c9196 100644 (file)
--- a/src/xbt/dynar.c
+++ b/src/xbt/dynar.c
@@ -82,17 +82,6 @@ _xbt_dynar_get_elm(void *const dst,
   memcpy(dst, elm, dynar->elmsize);
 }
 
-static XBT_INLINE
-    void
-_xbt_dynar_put_elm(const xbt_dynar_t dynar,
-                   const unsigned long idx, const void *const src)
-{
-  void *const elm = _xbt_dynar_elm(dynar, idx);
-  const unsigned long elmsize = dynar->elmsize;
-
-  memcpy(elm, src, elmsize);
-}
-
 void xbt_dynar_dump(xbt_dynar_t dynar)
 {
   XBT_INFO("Dynar dump: size=%lu; used=%lu; elmsize=%lu; data=%p; free_f=%p",

diff --git a/teshsuite/simdag/platforms/basic_parsing_test.c b/teshsuite/simdag/platforms/basic_parsing_test.c
index 245cd48..f34e57f 100644 (file)
--- a/teshsuite/simdag/platforms/basic_parsing_test.c
+++ b/teshsuite/simdag/platforms/basic_parsing_test.c
@@ -9,8 +9,6 @@
 #include "simdag/simdag.h"
 #include "surf/surf_private.h"
 
-extern routing_platf_t routing_platf;
-
 int main(int argc, char **argv)
 {
   /* initialisation of SD */