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
Fixed licence and copyright. No more reference to da GRAS possee or the
[simgrid.git]
/
src
/
gras
/
Msg
/
msg.c
diff --git
a/src/gras/Msg/msg.c
b/src/gras/Msg/msg.c
index
6e6bf80
..
02705dd
100644
(file)
--- a/
src/gras/Msg/msg.c
+++ b/
src/gras/Msg/msg.c
@@
-2,20
+2,20
@@
/* messaging - Function related to messaging (code shared between RL and SG)*/
/* messaging - Function related to messaging (code shared between RL and SG)*/
-/* Authors: Martin Quinson */
-/* Copyright (C) 2003 the OURAGAN project. */
+/* Copyright (c) 2004 Martin Quinson. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
/* This program is free software; you can redistribute it and/or modify it
-
under the terms of the license (GNU LGPL) which comes with this package. */
+
*
under the terms of the license (GNU LGPL) which comes with this package. */
-#include "Msg/msg_private.h"
-#include "DataDesc/datadesc_interface.h"
-#include "Transport/transport_interface.h" /* gras_trp_chunk_send/recv */
-#include "Virtu/virtu_interface.h"
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(msg,GRAS);
+#include "gras/Msg/msg_private.h"
+#include "gras/DataDesc/datadesc_interface.h"
+#include "gras/Transport/transport_interface.h" /* gras_trp_chunk_send/recv */
+#include "gras/Virtu/virtu_interface.h"
-gras_set_t *_gras_msgtype_set = NULL;
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg,gras,"High level messaging");
+
+xbt_set_t _gras_msgtype_set = NULL;
static char GRAS_header[6];
static char *make_namev(const char *name, short int ver);
static char GRAS_header[6];
static char *make_namev(const char *name, short int ver);
@@
-25,15
+25,13
@@
static char *make_namev(const char *name, short int ver);
* Initialize this submodule.
*/
void gras_msg_init(void) {
* Initialize this submodule.
*/
void gras_msg_init(void) {
- gras_error_t errcode;
-
/* only initialize once */
if (_gras_msgtype_set != NULL)
return;
VERB0("Initializing Msg");
/* only initialize once */
if (_gras_msgtype_set != NULL)
return;
VERB0("Initializing Msg");
-
TRYFAIL(gras_set_new(&_gras_msgtype_set)
);
+
_gras_msgtype_set = xbt_set_new(
);
memcpy(GRAS_header,"GRAS", 4);
GRAS_header[4]=GRAS_PROTOCOL_VERSION;
memcpy(GRAS_header,"GRAS", 4);
GRAS_header[4]=GRAS_PROTOCOL_VERSION;
@@
-48,8
+46,7
@@
void gras_msg_init(void) {
void
gras_msg_exit(void) {
VERB0("Exiting Msg");
void
gras_msg_exit(void) {
VERB0("Exiting Msg");
- gras_set_free(&_gras_msgtype_set);
- _gras_msgtype_set = NULL;
+ xbt_set_free(&_gras_msgtype_set);
}
/**
}
/**
@@
-58,10
+55,10
@@
gras_msg_exit(void) {
* Reclamed memory
*/
void gras_msgtype_free(void *t) {
* Reclamed memory
*/
void gras_msgtype_free(void *t) {
- gras_msgtype_t
*msgtype=(gras_msgtype_t *
)t;
+ gras_msgtype_t
msgtype=(gras_msgtype_t
)t;
if (msgtype) {
if (msgtype) {
- free(msgtype->name);
- free(msgtype);
+
xbt_
free(msgtype->name);
+
xbt_
free(msgtype);
}
}
}
}
@@
-77,11
+74,11
@@
static char *make_namev(const char *name, short int ver) {
if (!ver)
return (char *)name;
if (!ver)
return (char *)name;
- namev = malloc(strlen(name)+2+3+1);
+ namev =
(char*)xbt_
malloc(strlen(name)+2+3+1);
- if (namev)
{
+ if (namev)
sprintf(namev,"%s_v%d",name,ver);
sprintf(namev,"%s_v%d",name,ver);
- }
+
return namev;
}
return namev;
}
@@
-92,10
+89,9
@@
static char *make_namev(const char *name, short int ver) {
*
* Registers a message to the GRAS mecanism.
*/
*
* Registers a message to the GRAS mecanism.
*/
-gras_error_t
-gras_msgtype_declare(const char *name,
- gras_datadesc_type_t *payload) {
- return gras_msgtype_declare_v(name, 0, payload);
+void gras_msgtype_declare(const char *name,
+ gras_datadesc_type_t payload) {
+ gras_msgtype_declare_v(name, 0, payload);
}
/**
}
/**
@@
-110,50
+106,41
@@
gras_msgtype_declare(const char *name,
* will be handled as an independent message type, so you can register
* differents for each of them.
*/
* will be handled as an independent message type, so you can register
* differents for each of them.
*/
-gras_error_t
-gras_msgtype_declare_v(const char
*name,
- short int
version,
- gras_datadesc_type_t
*
payload) {
+void
+gras_msgtype_declare_v(const char *name,
+ short int version,
+ gras_datadesc_type_t payload) {
-
gras_error_t
errcode;
- gras_msgtype_t
*
msgtype;
+
xbt_error_t
errcode;
+ gras_msgtype_t msgtype;
char *namev=make_namev(name,version);
char *namev=make_namev(name,version);
- if (!namev)
- RAISE_MALLOC;
-
- errcode = gras_set_get_by_name(_gras_msgtype_set,
- namev,(gras_set_elm_t**)&msgtype);
+ errcode = xbt_set_get_by_name(_gras_msgtype_set,
+ namev,(xbt_set_elm_t*)&msgtype);
if (errcode == no_error) {
VERB2("Re-register version %d of message '%s' (same payload, ignored).",
version, name);
if (errcode == no_error) {
VERB2("Re-register version %d of message '%s' (same payload, ignored).",
version, name);
-
gras
_assert3(!gras_datadesc_type_cmp(msgtype->ctn_type, payload),
+
xbt
_assert3(!gras_datadesc_type_cmp(msgtype->ctn_type, payload),
"Message %s re-registred with another payload (%s was %s)",
namev,gras_datadesc_get_name(payload),
gras_datadesc_get_name(msgtype->ctn_type));
"Message %s re-registred with another payload (%s was %s)",
namev,gras_datadesc_get_name(payload),
gras_datadesc_get_name(msgtype->ctn_type));
- } else if (errcode == mismatch_error) {
- INFO3("Register version %d of message '%s' (payload: %s).",
- version, name, gras_datadesc_get_name(payload));
- } else {
- return errcode; /* Was expecting for mismatch_error */
- }
- /* create type anyway so that the old type gets removed from here, and
- hopefully free'd when ref counter gets 0 */
- if (! (msgtype = malloc(sizeof(gras_msgtype_t))) )
- RAISE_MALLOC;
+ return ; /* do really ignore it */
+ }
+ xbt_assert_error(mismatch_error); /* expect this error */
+ VERB3("Register version %d of message '%s' (payload: %s).",
+ version, name, gras_datadesc_get_name(payload));
+
+ msgtype = xbt_new(s_gras_msgtype_t,1);
msgtype->name = (namev == name ? strdup(name) : namev);
msgtype->name_len = strlen(namev);
msgtype->version = version;
msgtype->ctn_type = payload;
msgtype->name = (namev == name ? strdup(name) : namev);
msgtype->name_len = strlen(namev);
msgtype->version = version;
msgtype->ctn_type = payload;
- gras_datadesc_addref(payload);
- TRY(gras_set_add(_gras_msgtype_set, (gras_set_elm_t*)msgtype,
- &gras_msgtype_free));
-
- return no_error;
+ xbt_set_add(_gras_msgtype_set, (xbt_set_elm_t)msgtype,
+ &gras_msgtype_free);
}
/**
}
/**
@@
-161,30
+148,31
@@
gras_msgtype_declare_v(const char *name,
*
* Retrieve a datatype description from its name
*/
*
* Retrieve a datatype description from its name
*/
-gras_error_t
-gras_msgtype_by_name (const char *name,
- gras_msgtype_t **dst) {
- return gras_msgtype_by_namev(name,0,dst);
+gras_msgtype_t gras_msgtype_by_name (const char *name) {
+ return gras_msgtype_by_namev(name,0);
}
/**
* gras_msgtype_by_namev:
*
* Retrieve a datatype description from its name and version
*/
}
/**
* gras_msgtype_by_namev:
*
* Retrieve a datatype description from its name and version
*/
-gras_error_t
-gras_msgtype_by_namev(const char *name,
- short int version,
- gras_msgtype_t **dst) {
+gras_msgtype_t gras_msgtype_by_namev(const char *name,
+ short int version) {
+ gras_msgtype_t res;
-
gras
_error_t errcode;
+
xbt
_error_t errcode;
char *namev = make_namev(name,version);
char *namev = make_namev(name,version);
- errcode = gras_set_get_by_name(_gras_msgtype_set, namev,
- (gras_set_elm_t**)dst);
+ errcode = xbt_set_get_by_name(_gras_msgtype_set, namev,
+ (xbt_set_elm_t*)&res);
+ if (errcode != no_error)
+ res = NULL;
+ if (!res)
+ WARN1("msgtype_by_name(%s) returns NULL",namev);
if (name != namev)
if (name != namev)
- free(namev);
-
- return
errcode
;
+
xbt_
free(namev);
+
+ return
res
;
}
/**
}
/**
@@
-192,16
+180,21
@@
gras_msgtype_by_namev(const char *name,
*
* Send the given message on the given socket
*/
*
* Send the given message on the given socket
*/
-
gras
_error_t
-gras_msg_send(gras_socket_t
*
sock,
- gras_msgtype_t
*
msgtype,
+
xbt
_error_t
+gras_msg_send(gras_socket_t
sock,
+ gras_msgtype_t
msgtype,
void *payload) {
void *payload) {
- gras_error_t errcode;
- static gras_datadesc_type_t *string_type=NULL;
+ xbt_error_t errcode;
+ static gras_datadesc_type_t string_type=NULL;
+
+ if (!msgtype)
+ RAISE0(mismatch_error,
+ "Cannot send the NULL message (did msgtype_by_name fail?)");
+
if (!string_type) {
string_type = gras_datadesc_by_name("string");
if (!string_type) {
string_type = gras_datadesc_by_name("string");
-
gras
_assert(string_type);
+
xbt
_assert(string_type);
}
DEBUG3("send '%s' to %s:%d", msgtype->name,
}
DEBUG3("send '%s' to %s:%d", msgtype->name,
@@
-219,14
+212,14
@@
gras_msg_send(gras_socket_t *sock,
*
* receive the next message on the given socket.
*/
*
* receive the next message on the given socket.
*/
-
gras
_error_t
-gras_msg_recv(gras_socket_t
*
sock,
- gras_msgtype_t
*
*msgtype,
+
xbt
_error_t
+gras_msg_recv(gras_socket_t
sock,
+ gras_msgtype_t
*msgtype,
void **payload,
int *payload_size) {
void **payload,
int *payload_size) {
-
gras
_error_t errcode;
- static gras_datadesc_type_t
*
string_type=NULL;
+
xbt
_error_t errcode;
+ static gras_datadesc_type_t string_type=NULL;
char header[6];
int cpt;
int r_arch;
char header[6];
int cpt;
int r_arch;
@@
-234,7
+227,7
@@
gras_msg_recv(gras_socket_t *sock,
if (!string_type) {
string_type=gras_datadesc_by_name("string");
if (!string_type) {
string_type=gras_datadesc_by_name("string");
-
gras
_assert(string_type);
+
xbt
_assert(string_type);
}
TRY(gras_trp_chunk_recv(sock, header, 6));
}
TRY(gras_trp_chunk_recv(sock, header, 6));
@@
-249,21
+242,21
@@
gras_msg_recv(gras_socket_t *sock,
(int)header[4],gras_datadesc_arch_name(r_arch));
TRY(gras_datadesc_recv(sock, string_type, r_arch, &msg_name));
(int)header[4],gras_datadesc_arch_name(r_arch));
TRY(gras_datadesc_recv(sock, string_type, r_arch, &msg_name));
- errcode =
gras
_set_get_by_name(_gras_msgtype_set,
- msg_name,(
gras_set_elm_t*
*)msgtype);
+ errcode =
xbt
_set_get_by_name(_gras_msgtype_set,
+ msg_name,(
xbt_set_elm_t
*)msgtype);
if (errcode != no_error)
RAISE2(errcode,
"Got error %s while retrieving the type associated to messages '%s'",
if (errcode != no_error)
RAISE2(errcode,
"Got error %s while retrieving the type associated to messages '%s'",
-
gras
_error_name(errcode),msg_name);
+
xbt
_error_name(errcode),msg_name);
/* FIXME: Survive unknown messages */
/* FIXME: Survive unknown messages */
- free(msg_name);
+
xbt_
free(msg_name);
*payload_size=gras_datadesc_size((*msgtype)->ctn_type);
*payload_size=gras_datadesc_size((*msgtype)->ctn_type);
-
gras
_assert2(*payload_size > 0,
+
xbt
_assert2(*payload_size > 0,
"%s %s",
"Dynamic array as payload is forbided for now (FIXME?).",
"Reference to dynamic array is allowed.");
"%s %s",
"Dynamic array as payload is forbided for now (FIXME?).",
"Reference to dynamic array is allowed.");
- *payload = malloc(*payload_size);
+ *payload =
xbt_
malloc(*payload_size);
TRY(gras_datadesc_recv(sock, (*msgtype)->ctn_type, r_arch, *payload));
return no_error;
TRY(gras_datadesc_recv(sock, (*msgtype)->ctn_type, r_arch, *payload));
return no_error;
@@
-280,16
+273,16
@@
gras_msg_recv(gras_socket_t *sock,
* Every message of another type received before the one waited will be queued
* and used by subsequent call to this function or MsgHandle().
*/
* Every message of another type received before the one waited will be queued
* and used by subsequent call to this function or MsgHandle().
*/
-
gras
_error_t
-gras_msg_wait(double
timeout,
- gras_msgtype_t
*
msgt_want,
- gras_socket_t
*
*expeditor,
- void
*payload) {
+
xbt
_error_t
+gras_msg_wait(double timeout,
+ gras_msgtype_t msgt_want,
+ gras_socket_t *expeditor,
+ void *payload) {
- gras_msgtype_t
*
msgt_got;
+ gras_msgtype_t msgt_got;
void *payload_got;
int payload_size_got;
void *payload_got;
int payload_size_got;
-
gras
_error_t errcode;
+
xbt
_error_t errcode;
double start, now;
gras_procdata_t *pd=gras_procdata_get();
int cpt;
double start, now;
gras_procdata_t *pd=gras_procdata_get();
int cpt;
@@
-298,16
+291,20
@@
gras_msg_wait(double timeout,
*expeditor = NULL;
payload_got = NULL;
*expeditor = NULL;
payload_got = NULL;
+ if (!msgt_want)
+ RAISE0(mismatch_error,
+ "Cannot wait for the NULL message (did msgtype_by_name fail?)");
+
VERB1("Waiting for message %s",msgt_want->name);
start = now = gras_os_time();
VERB1("Waiting for message %s",msgt_want->name);
start = now = gras_os_time();
-
gras
_dynar_foreach(pd->msg_queue,cpt,msg){
+
xbt
_dynar_foreach(pd->msg_queue,cpt,msg){
if (msg.type->code == msgt_want->code) {
*expeditor = msg.expeditor;
memcpy(payload, msg.payload, msg.payload_size);
if (msg.type->code == msgt_want->code) {
*expeditor = msg.expeditor;
memcpy(payload, msg.payload, msg.payload_size);
- free(msg.payload);
-
gras
_dynar_cursor_rm(pd->msg_queue, &cpt);
+
xbt_
free(msg.payload);
+
xbt
_dynar_cursor_rm(pd->msg_queue, &cpt);
VERB0("The waited message was queued");
return no_error;
}
VERB0("The waited message was queued");
return no_error;
}
@@
-318,7
+315,7
@@
gras_msg_wait(double timeout,
TRY(gras_msg_recv(*expeditor, &msgt_got, &payload_got, &payload_size_got));
if (msgt_got->code == msgt_want->code) {
memcpy(payload, payload_got, payload_size_got);
TRY(gras_msg_recv(*expeditor, &msgt_got, &payload_got, &payload_size_got));
if (msgt_got->code == msgt_want->code) {
memcpy(payload, payload_got, payload_size_got);
- free(payload_got);
+
xbt_
free(payload_got);
VERB0("Got waited message");
return no_error;
}
VERB0("Got waited message");
return no_error;
}
@@
-328,7
+325,7
@@
gras_msg_wait(double timeout,
msg.type = msgt_got;
msg.payload = payload;
msg.payload_size = payload_size_got;
msg.type = msgt_got;
msg.payload = payload;
msg.payload_size = payload_size_got;
-
TRY(gras_dynar_push(pd->msg_queue,&msg)
);
+
xbt_dynar_push(pd->msg_queue,&msg
);
now=gras_os_time();
if (now - start + 0.001 < timeout) {
now=gras_os_time();
if (now - start + 0.001 < timeout) {
@@
-347,17
+344,17
@@
gras_msg_wait(double timeout,
* Waits up to #timeOut# seconds to see if a message comes in; if so, calls the
* registered listener for that message (see RegisterCallback()).
*/
* Waits up to #timeOut# seconds to see if a message comes in; if so, calls the
* registered listener for that message (see RegisterCallback()).
*/
-
gras
_error_t
+
xbt
_error_t
gras_msg_handle(double timeOut) {
gras_msg_handle(double timeOut) {
-
gras
_error_t errcode;
+
xbt
_error_t errcode;
int cpt;
gras_msg_t msg;
int cpt;
gras_msg_t msg;
- gras_socket_t
*
expeditor;
+ gras_socket_t
expeditor;
void *payload=NULL;
int payload_size;
void *payload=NULL;
int payload_size;
- gras_msgtype_t
*
msgtype;
+ gras_msgtype_t
msgtype;
gras_procdata_t*pd=gras_procdata_get();
gras_cblist_t *list;
gras_procdata_t*pd=gras_procdata_get();
gras_cblist_t *list;
@@
-368,8
+365,8
@@
gras_msg_handle(double timeOut) {
VERB1("Handling message within the next %.2fs",timeOut);
/* get a message (from the queue or from the net) */
VERB1("Handling message within the next %.2fs",timeOut);
/* get a message (from the queue or from the net) */
- if (
gras
_dynar_length(pd->msg_queue)) {
-
gras
_dynar_shift(pd->msg_queue,&msg);
+ if (
xbt
_dynar_length(pd->msg_queue)) {
+
xbt
_dynar_shift(pd->msg_queue,&msg);
expeditor = msg.expeditor;
msgtype = msg.type;
payload = msg.payload;
expeditor = msg.expeditor;
msgtype = msg.type;
payload = msg.payload;
@@
-380,7
+377,7
@@
gras_msg_handle(double timeOut) {
}
/* handle it */
}
/* handle it */
-
gras
_dynar_foreach(pd->cbl_list,cpt,list) {
+
xbt
_dynar_foreach(pd->cbl_list,cpt,list) {
if (list->id == msgtype->code) {
break;
} else {
if (list->id == msgtype->code) {
break;
} else {
@@
-394,12
+391,12
@@
gras_msg_handle(double timeOut) {
return no_error;
}
return no_error;
}
-
gras
_dynar_foreach(list->cbs,cpt,cb) {
- INFO3("
Invoqu
e the callback #%d (@%p) for incomming msg %s",
+
xbt
_dynar_foreach(list->cbs,cpt,cb) {
+ INFO3("
Us
e the callback #%d (@%p) for incomming msg %s",
cpt+1,cb,msgtype->name);
if ((*cb)(expeditor,payload)) {
/* cb handled the message */
cpt+1,cb,msgtype->name);
if ((*cb)(expeditor,payload)) {
/* cb handled the message */
- free(payload);
+
xbt_
free(payload);
return no_error;
}
}
return no_error;
}
}
@@
-413,15
+410,14
@@
void
gras_cbl_free(void *data){
gras_cblist_t *list=*(void**)data;
if (list) {
gras_cbl_free(void *data){
gras_cblist_t *list=*(void**)data;
if (list) {
-
gras_dynar_free(list->cbs
);
- free(list);
+
xbt_dynar_free(&( list->cbs )
);
+
xbt_
free(list);
}
}
}
}
-gras_error_t
-gras_cb_register(gras_msgtype_t
*
msgtype,
+void
+gras_cb_register(gras_msgtype_t msgtype,
gras_cb_t cb) {
gras_cb_t cb) {
- gras_error_t errcode;
gras_procdata_t *pd=gras_procdata_get();
gras_cblist_t *list=NULL;
int cpt;
gras_procdata_t *pd=gras_procdata_get();
gras_cblist_t *list=NULL;
int cpt;
@@
-429,7
+425,7
@@
gras_cb_register(gras_msgtype_t *msgtype,
DEBUG2("Register %p as callback to %s",cb,msgtype->name);
/* search the list of cb for this message on this host (creating if NULL) */
DEBUG2("Register %p as callback to %s",cb,msgtype->name);
/* search the list of cb for this message on this host (creating if NULL) */
-
gras
_dynar_foreach(pd->cbl_list,cpt,list) {
+
xbt
_dynar_foreach(pd->cbl_list,cpt,list) {
if (list->id == msgtype->code) {
break;
} else {
if (list->id == msgtype->code) {
break;
} else {
@@
-438,23
+434,18
@@
gras_cb_register(gras_msgtype_t *msgtype,
}
if (!list) {
/* First cb? Create room */
}
if (!list) {
/* First cb? Create room */
- list = malloc(sizeof(gras_cblist_t));
- if (!list)
- RAISE_MALLOC;
-
+ list = xbt_new(gras_cblist_t,1);
list->id = msgtype->code;
list->id = msgtype->code;
-
TRY(gras_dynar_new(&(list->cbs), sizeof(gras_cb_t), NULL)
);
-
TRY(gras_dynar_push(pd->cbl_list,&list)
);
+
list->cbs = xbt_dynar_new(sizeof(gras_cb_t), NULL
);
+
xbt_dynar_push(pd->cbl_list,&list
);
}
/* Insert the new one into the set */
}
/* Insert the new one into the set */
- TRY(gras_dynar_insert_at(list->cbs,0,&cb));
-
- return no_error;
+ xbt_dynar_insert_at(list->cbs,0,&cb);
}
void
}
void
-gras_cb_unregister(gras_msgtype_t
*
msgtype,
+gras_cb_unregister(gras_msgtype_t msgtype,
gras_cb_t cb) {
gras_procdata_t *pd=gras_procdata_get();
gras_cb_t cb) {
gras_procdata_t *pd=gras_procdata_get();
@@
-464,7
+455,7
@@
gras_cb_unregister(gras_msgtype_t *msgtype,
int found = 0;
/* search the list of cb for this message on this host */
int found = 0;
/* search the list of cb for this message on this host */
-
gras
_dynar_foreach(pd->cbl_list,cpt,list) {
+
xbt
_dynar_foreach(pd->cbl_list,cpt,list) {
if (list->id == msgtype->code) {
break;
} else {
if (list->id == msgtype->code) {
break;
} else {
@@
-474,9
+465,9
@@
gras_cb_unregister(gras_msgtype_t *msgtype,
/* Remove it from the set */
if (list) {
/* Remove it from the set */
if (list) {
-
gras
_dynar_foreach(list->cbs,cpt,cb_cpt) {
+
xbt
_dynar_foreach(list->cbs,cpt,cb_cpt) {
if (cb == cb_cpt) {
if (cb == cb_cpt) {
-
gras
_dynar_cursor_rm(list->cbs, &cpt);
+
xbt
_dynar_cursor_rm(list->cbs, &cpt);
found = 1;
}
}
found = 1;
}
}