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
cosmetics
[simgrid.git]
/
src
/
gras
/
Msg
/
rpc.c
diff --git
a/src/gras/Msg/rpc.c
b/src/gras/Msg/rpc.c
index
bd93d54
..
551ab75
100644
(file)
--- a/
src/gras/Msg/rpc.c
+++ b/
src/gras/Msg/rpc.c
@@
-113,9
+113,10
@@
void gras_msg_rpc_async_wait(gras_msg_cb_ctx_t ctx,
/* Damn. Got an exception. Extract it and revive it */
xbt_ex_t e;
memcpy(&e,received.payl,received.payl_size);
/* Damn. Got an exception. Extract it and revive it */
xbt_ex_t e;
memcpy(&e,received.payl,received.payl_size);
- VERB2("Raise a remote exception comming from %s %s",e.host,
- (__xbt_ex_ctx()->ctx_caught?"caught":"not caught"));
free(received.payl);
free(received.payl);
+ VERB3("Raise a remote exception cat:%d comming from %s %s",
+ e.category, e.host,
+ (__xbt_ex_ctx()->ctx_caught?"caught":"not caught"));
__xbt_ex_ctx()->ctx_ex.msg = e.msg;
__xbt_ex_ctx()->ctx_ex.category = e.category;
__xbt_ex_ctx()->ctx_ex.value = e.value;
__xbt_ex_ctx()->ctx_ex.msg = e.msg;
__xbt_ex_ctx()->ctx_ex.category = e.category;
__xbt_ex_ctx()->ctx_ex.value = e.value;
@@
-126,9
+127,8
@@
void gras_msg_rpc_async_wait(gras_msg_cb_ctx_t ctx,
__xbt_ex_ctx()->ctx_ex.line = e.line;
__xbt_ex_ctx()->ctx_ex.func = e.func;
__xbt_ex_ctx()->ctx_ex.used = e.used;
__xbt_ex_ctx()->ctx_ex.line = e.line;
__xbt_ex_ctx()->ctx_ex.func = e.func;
__xbt_ex_ctx()->ctx_ex.used = e.used;
-
// memcpy((void*)&(__xbt_ex_ctx()->ctx_ex),&e,sizeof(xbt_ex_t))
;
+
__xbt_ex_ctx()->ctx_ex.bt_strings = e.bt_strings
;
DO_THROW(__xbt_ex_ctx()->ctx_ex);
DO_THROW(__xbt_ex_ctx()->ctx_ex);
-
}
memcpy(answer,received.payl,received.payl_size);
free(received.payl);
}
memcpy(answer,received.payl,received.payl_size);
free(received.payl);
@@
-154,6
+154,7
@@
void gras_msg_rpccall(gras_socket_t server,
*/
void gras_msg_rpcreturn(double timeOut,gras_msg_cb_ctx_t ctx,void *answer) {
*/
void gras_msg_rpcreturn(double timeOut,gras_msg_cb_ctx_t ctx,void *answer) {
- gras_msg_send_ext(ctx->expeditor, e_gras_msg_kind_rpcanswer, ctx->ID, ctx->msgtype, answer);
+ gras_msg_send_ext(ctx->expeditor, e_gras_msg_kind_rpcanswer,
+ ctx->ID, ctx->msgtype, answer);
}
}