Added round trip time contraint to the SDP program, this parameter

[simgrid.git] / src / gras / DataDesc / ddt_exchange.c

diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c
index 18f0caa..8c15e20 100644 (file)
--- a/src/gras/DataDesc/ddt_exchange.c
+++ b/src/gras/DataDesc/ddt_exchange.c
@@ -23,7 +23,7 @@ const char *gras_datadesc_cat_names[9] = {
 static gras_datadesc_type_t int_type = NULL;
 static gras_datadesc_type_t pointer_type = NULL;    
 
-static _XBT_INLINE void
+static XBT_INLINE void
 gras_dd_send_int(gras_socket_t sock,int *i, int stable) {
 
   if (!int_type) {
@@ -35,7 +35,7 @@ gras_dd_send_int(gras_socket_t sock,int *i, int stable) {
   gras_trp_send(sock, (char*)i, int_type->size[GRAS_THISARCH], stable);
 }
 
-static _XBT_INLINE void
+static XBT_INLINE void
 gras_dd_recv_int(gras_socket_t sock, int r_arch, int *i) {
 
   if (!int_type) {
@@ -63,7 +63,7 @@ gras_dd_recv_int(gras_socket_t sock, int r_arch, int *i) {
  *       of 'length' bytes set to 0.
  * FIXME: Check in configure?
  */
-static _XBT_INLINE int 
+static XBT_INLINE int 
 gras_dd_is_r_null(char **r_ptr, long int length) {
   int i;
 
@@ -76,7 +76,7 @@ gras_dd_is_r_null(char **r_ptr, long int length) {
   return 1;
 }
 
-static _XBT_INLINE void
+static XBT_INLINE void
 gras_dd_alloc_ref(xbt_dict_t  refs,
                  long int     size,
                  char       **r_ref,
@@ -100,7 +100,7 @@ gras_dd_alloc_ref(xbt_dict_t  refs,
     DEBUG2("Insert l_ref=%p under r_ref=%p",*(void**)ptr, *(void**)r_ref);
      
     if (detect_cycle)
-       xbt_dict_set_ext(refs,(const char *) r_ref, r_len, ptr, free);
+       xbt_dict_set_ext(refs,(const char *) r_ref, r_len, ptr, xbt_free_f);
   }
 }
 
@@ -369,21 +369,22 @@ gras_datadesc_copy_rec(gras_cbps_t           state,
 int gras_datadesc_copy(gras_datadesc_type_t type, 
                       void *src, void *dst) {
   xbt_ex_t e;
-  static gras_cbps_t  state=NULL;
-  xbt_dict_t  refs; /* all references already sent */
+  static gras_cbps_t state=NULL;
+  static xbt_dict_t  refs=NULL; /* all references already sent */
   int size=0;
  
   xbt_assert0(type,"called with NULL type descriptor");
 
-  refs = xbt_dict_new();
-  if (!state)
+  if (!state) {
     state = gras_cbps_new();
+    refs = xbt_dict_new();
+  }
   
   TRY {
     size = gras_datadesc_copy_rec(state,refs,type,(char*)src,(char*)dst,0, 
                                  type->cycle);
   } CLEANUP {
-    xbt_dict_free(&refs);
+    xbt_dict_reset(refs);
     gras_cbps_reset(state);
   } CATCH(e) {
     RETHROW;
@@ -610,18 +611,19 @@ void gras_datadesc_send(gras_socket_t        sock,
 
   xbt_ex_t e;
   static gras_cbps_t state=NULL;
-  xbt_dict_t  refs; /* all references already sent */
+  static xbt_dict_t  refs=NULL; /* all references already sent */
  
   xbt_assert0(type,"called with NULL type descriptor");
 
-  refs = xbt_dict_new();
-  if (!state)
+  if (!state) {
     state = gras_cbps_new();
-  
+    refs = xbt_dict_new();
+  }
+   
   TRY {
     gras_datadesc_send_rec(sock,state,refs,type,(char*)src, type->cycle);
   } CLEANUP {
-    xbt_dict_free(&refs);
+    xbt_dict_reset(refs);
     gras_cbps_reset(state);
   } CATCH(e) {
     RETHROW;
@@ -947,12 +949,13 @@ gras_datadesc_recv(gras_socket_t         sock,
 
   xbt_ex_t e;
   static gras_cbps_t state=NULL; /* callback persistent state */
-  xbt_dict_t  refs;  /* all references already sent */
+  static xbt_dict_t  refs=NULL;  /* all references already sent */
 
-  refs = xbt_dict_new();
-  if (!state)
+  if (!state) {
     state = gras_cbps_new();
-
+    refs = xbt_dict_new();
+  }
+   
   xbt_assert0(type,"called with NULL type descriptor");
   TRY {
     gras_datadesc_recv_rec(sock, state, refs, type, 
@@ -960,7 +963,7 @@ gras_datadesc_recv(gras_socket_t         sock,
                           (char *) dst,-1, 
                           type->cycle);
   } CLEANUP {
-    xbt_dict_free(&refs);
+    xbt_dict_reset(refs);
     gras_cbps_reset(state);
   } CATCH(e) {
     RETHROW;