A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
019aa5f
..
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 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) {
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);
}
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) {
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?
*/
* 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;
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;
}
return 1;
}
-static
_
XBT_INLINE void
+static XBT_INLINE void
gras_dd_alloc_ref(xbt_dict_t refs,
long int size,
char **r_ref,
gras_dd_alloc_ref(xbt_dict_t refs,
long int size,
char **r_ref,
@@
-95,13
+95,12
@@
gras_dd_alloc_ref(xbt_dict_t refs,
if (detect_cycle && r_ref && !gras_dd_is_r_null( r_ref, r_len)) {
void *ptr = xbt_malloc(sizeof(void *));
if (detect_cycle && r_ref && !gras_dd_is_r_null( r_ref, r_len)) {
void *ptr = xbt_malloc(sizeof(void *));
- CRITICAL0("Check for cycles");
memcpy(ptr,l_ref, sizeof(void *));
DEBUG2("Insert l_ref=%p under r_ref=%p",*(void**)ptr, *(void**)r_ref);
memcpy(ptr,l_ref, sizeof(void *));
DEBUG2("Insert l_ref=%p under r_ref=%p",*(void**)ptr, *(void**)r_ref);
-
+
if (detect_cycle)
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
);
}
}
}
}
@@
-240,11
+239,12
@@
gras_datadesc_copy_rec(gras_cbps_t state,
reference_is_to_cpy = 0;
TRY {
reference_is_to_cpy = 0;
TRY {
- if (detect_cycle)
+ if (detect_cycle)
{
/* return ignored. Just checking whether it's known or not */
n_ref=xbt_dict_get_ext(refs,(char*)o_ref, sizeof(char*));
/* return ignored. Just checking whether it's known or not */
n_ref=xbt_dict_get_ext(refs,(char*)o_ref, sizeof(char*));
- else
+ } else {
reference_is_to_cpy = 1;
reference_is_to_cpy = 1;
+ }
} CATCH(e) {
if (e.category != not_found_error)
RETHROW;
} CATCH(e) {
if (e.category != not_found_error)
RETHROW;
@@
-369,21
+369,23
@@
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;
int gras_datadesc_copy(gras_datadesc_type_t type,
void *src, void *dst) {
xbt_ex_t e;
-
gras_cbps_t state
;
-
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");
int size=0;
xbt_assert0(type,"called with NULL type descriptor");
- refs = xbt_dict_new();
- state = gras_cbps_new();
+ 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 {
TRY {
size = gras_datadesc_copy_rec(state,refs,type,(char*)src,(char*)dst,0,
type->cycle);
} CLEANUP {
- xbt_dict_
free(&
refs);
- gras_cbps_
free(&
state);
+ xbt_dict_
reset(
refs);
+ gras_cbps_
reset(
state);
} CATCH(e) {
RETHROW;
}
} CATCH(e) {
RETHROW;
}
@@
-609,18
+611,19
@@
void gras_datadesc_send(gras_socket_t sock,
xbt_ex_t e;
static gras_cbps_t state=NULL;
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");
xbt_assert0(type,"called with NULL type descriptor");
- refs = xbt_dict_new();
- if (!state)
+ if (!state) {
state = gras_cbps_new();
state = gras_cbps_new();
-
+ refs = xbt_dict_new();
+ }
+
TRY {
gras_datadesc_send_rec(sock,state,refs,type,(char*)src, type->cycle);
} CLEANUP {
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;
gras_cbps_reset(state);
} CATCH(e) {
RETHROW;
@@
-777,16
+780,18
@@
gras_datadesc_recv_rec(gras_socket_t sock,
reference_is_to_recv = 0;
TRY {
reference_is_to_recv = 0;
TRY {
- if (detect_cycle)
+ if (detect_cycle)
{
l_ref = xbt_dict_get_ext(refs, (char*)r_ref, pointer_type->size[r_arch]);
l_ref = xbt_dict_get_ext(refs, (char*)r_ref, pointer_type->size[r_arch]);
- else
+ } else {
reference_is_to_recv = 1;
reference_is_to_recv = 1;
+ }
} CATCH(e) {
if (e.category != not_found_error)
RETHROW;
reference_is_to_recv = 1;
xbt_ex_free(e);
}
} CATCH(e) {
if (e.category != not_found_error)
RETHROW;
reference_is_to_recv = 1;
xbt_ex_free(e);
}
+
if (reference_is_to_recv) {
int subsubcount = 0;
void *l_referenced=NULL;
if (reference_is_to_recv) {
int subsubcount = 0;
void *l_referenced=NULL;
@@
-944,12
+949,13
@@
gras_datadesc_recv(gras_socket_t sock,
xbt_ex_t e;
static gras_cbps_t state=NULL; /* callback persistent state */
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();
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,
xbt_assert0(type,"called with NULL type descriptor");
TRY {
gras_datadesc_recv_rec(sock, state, refs, type,
@@
-957,7
+963,7
@@
gras_datadesc_recv(gras_socket_t sock,
(char *) dst,-1,
type->cycle);
} CLEANUP {
(char *) dst,-1,
type->cycle);
} CLEANUP {
- xbt_dict_
free(&
refs);
+ xbt_dict_
reset(
refs);
gras_cbps_reset(state);
} CATCH(e) {
RETHROW;
gras_cbps_reset(state);
} CATCH(e) {
RETHROW;