"Message %s re-registred with another payload (%s was %s)",
namev,gras_datadesc_get_name(payload),
gras_datadesc_get_name(msgtype->ctn_type));
+
+ return no_error; /* do really ignore it */
+
} else if (errcode == mismatch_error) {
INFO3("Register version %d of message '%s' (payload: %s).",
version, name, gras_datadesc_get_name(payload));
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;
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));
*
* 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_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;
char *namev = make_namev(name,version);
errcode = gras_set_get_by_name(_gras_msgtype_set, namev,
- (gras_set_elm_t**)dst);
+ (gras_set_elm_t**)&res);
+ if (errcode != no_error)
+ res = NULL;
if (name != namev)
free(namev);
-
- return errcode;
+
+ return res;
}
/**
gras_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");
gras_assert(string_type);
*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();