From a65af9cc95088e0b83af31e744ff4a9bbae3fad7 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 24 Dec 2012 23:17:08 +0100 Subject: [PATCH 1/1] remove the 'new_' part of function name sg_platf_new_trace_connect --- ChangeLog | 5 +++++ include/simgrid/platf.h | 6 +++--- src/surf/sg_platf.c | 2 +- src/surf/surfxml_parse.c | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5828d0c58c..067482d9f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,11 @@ SimGrid (3.9) NOT RELEASED; urgency=low * Bug fix about the way periodic availability/state traces are handled. * Bug fix: use default values at start when first event in availability/state trace is not at time 0. + + PLATFORM: + * remove the "new_" part of function name sg_platf_new_trace_connect + (resulting in sg_platf_trace_connect), since it does not create + anything new XBT: * Kill synchronized dynars, and xbt_dynar_dopar(). We cannot think of a diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h index 24a5533973..677ea14d1d 100644 --- a/include/simgrid/platf.h +++ b/include/simgrid/platf.h @@ -33,7 +33,7 @@ typedef enum { SURF_TRACE_CONNECT_KIND_LINK_AVAIL = 2, SURF_TRACE_CONNECT_KIND_BANDWIDTH = 1, SURF_TRACE_CONNECT_KIND_LATENCY = 0 -} e_surf_trace_connect_kin_t; +} e_surf_trace_connect_kind_t; typedef enum { SURF_PROCESS_ON_FAILURE_DIE = 1, @@ -258,7 +258,7 @@ typedef struct s_sg_platf_trace_cbarg { typedef struct s_sg_platf_trace_connect_cbarg *sg_platf_trace_connect_cbarg_t; typedef struct s_sg_platf_trace_connect_cbarg { - e_surf_trace_connect_kin_t kind; + e_surf_trace_connect_kind_t kind; const char *trace; const char *element; } s_sg_platf_trace_connect_cbarg_t; @@ -320,7 +320,7 @@ XBT_PUBLIC(void) sg_platf_new_bypassASroute (sg_platf_route_cbarg_t bypassASrout XBT_PUBLIC(void) sg_platf_new_prop (sg_platf_prop_cbarg_t prop); // Add a prop XBT_PUBLIC(void) sg_platf_new_trace(sg_platf_trace_cbarg_t trace); -XBT_PUBLIC(void) sg_platf_new_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect); +XBT_PUBLIC(void) sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect); XBT_PUBLIC(void) sg_platf_new_storage(sg_platf_storage_cbarg_t storage); // Add a storage to the currently described AS XBT_PUBLIC(void) sg_platf_new_storage(sg_platf_storage_cbarg_t storage); // Add a storage to the currently described AS diff --git a/src/surf/sg_platf.c b/src/surf/sg_platf.c index 0af5c72f57..35580899fa 100644 --- a/src/surf/sg_platf.c +++ b/src/surf/sg_platf.c @@ -249,7 +249,7 @@ void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) { fun(trace); } } -void sg_platf_new_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect) { +void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect) { unsigned int iterator; sg_platf_trace_connect_cb_t fun; xbt_dynar_foreach(sg_platf_trace_connect_cb_list, iterator, fun) { diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 41d8386c77..2c03573f2b 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -672,7 +672,7 @@ void STag_surfxml_trace___connect(void){ trace_connect.kind = SURF_TRACE_CONNECT_KIND_LINK_AVAIL; break; } - sg_platf_new_trace_connect(&trace_connect); + sg_platf_trace_connect(&trace_connect); } void STag_surfxml_AS(void){ -- 2.20.1