From 469e72039bdd41a4c959146c15ad93bf13488287 Mon Sep 17 00:00:00 2001 From: Albert Chu Date: Fri, 2 Jul 2021 15:59:55 -0700 Subject: [PATCH] libflux/message: name route functions consistently Problem: The naming of the flux msg route functions was inconsistent, with some prefixing the action with "get" while others not. Some stating the "action" before "route" and others not. Solution: Make the function names consistent. Specifically, the following functions have been renamed. flux_msg_enable_route -> flux_msg_route_enable flux_msg_disable_route -> flux_msg_route_disable flux_msg_clear_route -> flux_msg_route_clear flux_msg_push_route -> flux_msg_route_push flux_msg_delete_route_last -> flux_msg_route_delete_last flux_msg_get_route_first -> flux_msg_route_first flux_msg_get_route_last -> flux_msg_route_last flux_msg_get_route_count -> flux_msg_route_count flux_msg_get_route_string -> flux_msg_route_string flux_msg_match_route_first -> flux_msg_route_match_first Some internal functions were renamed as well for consistency. Update all callers appropriately. --- src/broker/broker.c | 14 +- src/broker/log.c | 4 +- src/broker/module.c | 10 +- src/broker/overlay.c | 22 +- src/broker/ping.c | 4 +- src/broker/publisher.c | 2 +- src/broker/test/overlay.c | 16 +- src/cmd/flux-start.c | 2 +- src/common/libflux/disconnect.c | 2 +- src/common/libflux/event.c | 2 +- src/common/libflux/handle.c | 2 +- src/common/libflux/message.c | 44 ++-- src/common/libflux/message.h | 22 +- src/common/libflux/msg_handler.c | 4 +- src/common/libflux/request.c | 2 +- src/common/libflux/response.c | 2 +- src/common/libflux/test/disconnect.c | 4 +- src/common/libflux/test/dispatch.c | 10 +- src/common/libflux/test/message.c | 240 +++++++++++----------- src/common/libflux/test/rpc.c | 2 +- src/common/librouter/router.c | 8 +- src/common/librouter/servhash.c | 2 +- src/common/librouter/test/usock_service.c | 2 +- src/common/librouter/usock_service.c | 16 +- src/common/libsubprocess/server.c | 2 +- src/common/libterminus/pty.c | 4 +- src/common/libterminus/terminus.c | 2 +- src/common/libtestutil/util.c | 6 +- src/modules/barrier/barrier.c | 4 +- src/modules/job-manager/alloc.c | 4 +- src/modules/job-manager/wait.c | 2 +- src/modules/kvs/kvs.c | 2 +- src/modules/kvs/test/kvssync.c | 6 +- src/modules/kvs/test/waitqueue.c | 6 +- 34 files changed, 238 insertions(+), 238 deletions(-) diff --git a/src/broker/broker.c b/src/broker/broker.c index 73ffaf71e0c1..e3176d3d5f0e 100644 --- a/src/broker/broker.c +++ b/src/broker/broker.c @@ -1081,7 +1081,7 @@ static void broker_disconnect_cb (flux_t *h, flux_msg_handler_t *mh, { const char *sender; - if ((sender = flux_msg_get_route_first (msg))) + if ((sender = flux_msg_route_first (msg))) exec_terminate_subprocesses_by_uuid (h, sender); /* no response */ } @@ -1095,7 +1095,7 @@ static void broker_sub_cb (flux_t *h, flux_msg_handler_t *mh, if (flux_request_unpack (msg, NULL, "{ s:s }", "topic", &topic) < 0) goto error; - if (!(uuid = flux_msg_get_route_first (msg))) { + if (!(uuid = flux_msg_route_first (msg))) { errno = EPROTO; goto error; } @@ -1122,7 +1122,7 @@ static void broker_unsub_cb (flux_t *h, flux_msg_handler_t *mh, if (flux_request_unpack (msg, NULL, "{ s:s }", "topic", &topic) < 0) goto error; - if (!(uuid = flux_msg_get_route_first (msg))) { + if (!(uuid = flux_msg_route_first (msg))) { errno = EPROTO; goto error; } @@ -1182,7 +1182,7 @@ static void service_add_cb (flux_t *h, flux_msg_handler_t *w, goto error; if (service_allow (cred, name) < 0) goto error; - if (!(sender = flux_msg_get_route_first (msg))) { + if (!(sender = flux_msg_route_first (msg))) { errno = EPROTO; goto error; } @@ -1214,7 +1214,7 @@ static void service_remove_cb (flux_t *h, flux_msg_handler_t *w, goto error; if (service_allow (cred, name) < 0) goto error; - if (!(sender = flux_msg_get_route_first (msg))) { + if (!(sender = flux_msg_route_first (msg))) { errno = EPROTO; goto error; } @@ -1468,7 +1468,7 @@ static void module_cb (module_t *p, void *arg) (void)broker_response_sendmsg (ctx, msg); break; case FLUX_MSGTYPE_REQUEST: - count = flux_msg_get_route_count (msg); + count = flux_msg_route_count (msg); /* Requests originated by the broker module will have a route * count of 1. Ensure that, when the module is unloaded, a * disconnect message is sent to all services used by broker module. @@ -1693,7 +1693,7 @@ static int broker_response_sendmsg (broker_ctx_t *ctx, const flux_msg_t *msg) int rc; const char *uuid; - if (!(uuid = flux_msg_get_route_last (msg))) + if (!(uuid = flux_msg_route_last (msg))) rc = flux_requeue (ctx->h, msg, FLUX_RQ_TAIL); else if (overlay_uuid_is_parent (ctx->overlay, uuid)) rc = overlay_sendmsg (ctx->overlay, msg, OVERLAY_UPSTREAM); diff --git a/src/broker/log.c b/src/broker/log.c index 14328a0e52b9..298a132a666d 100644 --- a/src/broker/log.c +++ b/src/broker/log.c @@ -598,7 +598,7 @@ static int cmp_sender (const flux_msg_t *msg, const char *uuid) { const char *sender; - if (!(sender = flux_msg_get_route_first (msg))) + if (!(sender = flux_msg_route_first (msg))) return 0; if (!sender || strcmp (sender, uuid) != 0) return 0; @@ -614,7 +614,7 @@ static void disconnect_request_cb (flux_t *h, flux_msg_handler_t *mh, zlist_t *tmp = NULL; assert (logbuf->magic == LOGBUF_MAGIC); - if (!(sender = flux_msg_get_route_first (msg))) + if (!(sender = flux_msg_route_first (msg))) goto done; msgp = zlist_first (logbuf->followers); while (msgp) { diff --git a/src/broker/module.c b/src/broker/module.c index 73b9f2a2b24c..61826db6028f 100644 --- a/src/broker/module.c +++ b/src/broker/module.c @@ -259,12 +259,12 @@ flux_msg_t *module_recvmsg (module_t *p) goto error; switch (type) { case FLUX_MSGTYPE_RESPONSE: - if (flux_msg_delete_route_last (msg) < 0) + if (flux_msg_route_delete_last (msg) < 0) goto error; break; case FLUX_MSGTYPE_REQUEST: case FLUX_MSGTYPE_EVENT: - if (flux_msg_push_route (msg, p->uuid_str) < 0) + if (flux_msg_route_push (msg, p->uuid_str) < 0) goto error; break; default: @@ -312,7 +312,7 @@ int module_sendmsg (module_t *p, const flux_msg_t *msg) case FLUX_MSGTYPE_REQUEST: { /* simulate DEALER socket */ if (!(cpy = flux_msg_copy (msg, true))) goto done; - if (flux_msg_push_route (cpy, p->modhash->uuid_str) < 0) + if (flux_msg_route_push (cpy, p->modhash->uuid_str) < 0) goto done; if (flux_msg_sendzsock (p->sock, cpy) < 0) goto done; @@ -321,7 +321,7 @@ int module_sendmsg (module_t *p, const flux_msg_t *msg) case FLUX_MSGTYPE_RESPONSE: { /* simulate ROUTER socket */ if (!(cpy = flux_msg_copy (msg, true))) goto done; - if (flux_msg_delete_route_last (cpy) < 0) + if (flux_msg_route_delete_last (cpy) < 0) goto done; if (flux_msg_sendzsock (p->sock, cpy) < 0) goto done; @@ -345,7 +345,7 @@ int module_response_sendmsg (modhash_t *mh, const flux_msg_t *msg) if (!msg) return 0; - if (!(uuid = flux_msg_get_route_last (msg))) { + if (!(uuid = flux_msg_route_last (msg))) { errno = EPROTO; return -1; } diff --git a/src/broker/overlay.c b/src/broker/overlay.c index dd6cd603a4ab..e1d47cb4dff7 100644 --- a/src/broker/overlay.c +++ b/src/broker/overlay.c @@ -359,7 +359,7 @@ static int overlay_keepalive_parent (struct overlay *ov, int status) if (ov->parent.zsock) { if (!(msg = flux_keepalive_encode (0, status))) return -1; - flux_msg_enable_route (msg); + flux_msg_route_enable (msg); if (overlay_sendmsg_parent (ov, msg) < 0) goto error; flux_msg_destroy (msg); @@ -405,9 +405,9 @@ int overlay_sendmsg (struct overlay *ov, } if (!(cpy = flux_msg_copy (msg, true))) goto error; - if (flux_msg_push_route (cpy, ov->uuid) < 0) + if (flux_msg_route_push (cpy, ov->uuid) < 0) goto error; - if (flux_msg_push_route (cpy, child->uuid) < 0) + if (flux_msg_route_push (cpy, child->uuid) < 0) goto error; msg = cpy; where = OVERLAY_DOWNSTREAM; @@ -430,7 +430,7 @@ int overlay_sendmsg (struct overlay *ov, */ if (where == OVERLAY_ANY) { if (ov->rank > 0 - && (uuid = flux_msg_get_route_last (msg)) != NULL + && (uuid = flux_msg_route_last (msg)) != NULL && !strcmp (uuid, ov->parent.uuid)) where = OVERLAY_UPSTREAM; else @@ -453,7 +453,7 @@ int overlay_sendmsg (struct overlay *ov, if (!(flags & FLUX_MSGFLAG_ROUTE)) { if (!(cpy = flux_msg_copy (msg, true))) goto error; - flux_msg_enable_route (cpy); + flux_msg_route_enable (cpy); msg = cpy; } if (overlay_sendmsg_parent (ov, msg) < 0) @@ -511,8 +511,8 @@ static int overlay_mcast_child_one (struct overlay *ov, if (!(cpy = flux_msg_copy (msg, true))) return -1; - flux_msg_enable_route (cpy); - if (flux_msg_push_route (cpy, child->uuid) < 0) + flux_msg_route_enable (cpy); + if (flux_msg_route_push (cpy, child->uuid) < 0) goto done; if (overlay_sendmsg_child (ov, cpy) < 0) goto done; @@ -568,7 +568,7 @@ static void child_cb (flux_reactor_t *r, flux_watcher_t *w, if (!(msg = flux_msg_recvzsock (ov->bind_zsock))) return; if (flux_msg_get_type (msg, &type) < 0 - || !(sender = flux_msg_get_route_last (msg))) + || !(sender = flux_msg_route_last (msg))) goto drop; if (!(child = child_lookup (ov, sender)) || !child->connected) { if (type == FLUX_MSGTYPE_REQUEST @@ -597,8 +597,8 @@ static void child_cb (flux_reactor_t *r, flux_watcher_t *w, * were a request, but the effect we want for responses is to have * a route popped off at each router hop. */ - (void)flux_msg_delete_route_last (msg); // child id from ROUTER - (void)flux_msg_delete_route_last (msg); // my id + (void)flux_msg_route_delete_last (msg); // child id from ROUTER + (void)flux_msg_route_delete_last (msg); // my id break; case FLUX_MSGTYPE_EVENT: break; @@ -640,7 +640,7 @@ static void parent_cb (flux_reactor_t *r, flux_watcher_t *w, goto handled; } if (type == FLUX_MSGTYPE_EVENT) - flux_msg_disable_route (msg); + flux_msg_route_disable (msg); ov->recv_cb (msg, OVERLAY_UPSTREAM, ov->recv_arg); handled: flux_msg_destroy (msg); diff --git a/src/broker/ping.c b/src/broker/ping.c index d6921c9b7ba6..e2405854decf 100644 --- a/src/broker/ping.c +++ b/src/broker/ping.c @@ -76,7 +76,7 @@ static void ping_request_cb (flux_t *h, flux_msg_handler_t *mh, * That identity is passed in to ping_initialize() as the uuid. * Tack it onto the route string. */ - if (!(route_str = flux_msg_get_route_string (msg))) + if (!(route_str = flux_msg_route_string (msg))) goto error; new_size = strlen (route_str) + strlen (p->uuid) + 2; if (!(new_str = realloc (route_str, new_size))) @@ -120,7 +120,7 @@ int ping_initialize (flux_t *h, const char *service, const char *uuid) goto error; /* The uuid is tacked onto the route string constructed for * ping responses. Truncate the uuid to 8 chars to match policy - * of flux_msg_get_route_string(). + * of flux_msg_route_string(). */ if (!(p->uuid = strdup (uuid))) goto error; diff --git a/src/broker/publisher.c b/src/broker/publisher.c index 83af881ae896..01d79ce6b99d 100644 --- a/src/broker/publisher.c +++ b/src/broker/publisher.c @@ -131,7 +131,7 @@ int publisher_send (struct publisher *pub, const flux_msg_t *msg) if (!(cpy = flux_msg_copy (msg, true))) return -1; - flux_msg_disable_route (cpy); + flux_msg_route_disable (cpy); if (flux_msg_set_seq (cpy, ++pub->seq) < 0) goto error_restore_seq; send_event (pub, cpy); diff --git a/src/broker/test/overlay.c b/src/broker/test/overlay.c index 95edf95938dc..12d18a56b756 100644 --- a/src/broker/test/overlay.c +++ b/src/broker/test/overlay.c @@ -309,7 +309,7 @@ void trio (flux_t *h) "%s: request was received by overlay", ctx[0]->name); ok (flux_msg_get_topic (rmsg, &topic) == 0 && !strcmp (topic, "meep"), "%s: received message has expected topic", ctx[0]->name); - ok ((sender = flux_msg_get_route_first (rmsg)) != NULL + ok ((sender = flux_msg_route_first (rmsg)) != NULL && !strcmp (sender, ctx[1]->uuid), "%s: received message sender is rank 1", ctx[0]->name); @@ -330,7 +330,7 @@ void trio (flux_t *h) "%s: request was received by overlay", ctx[1]->name); ok (flux_msg_get_topic (rmsg, &topic) == 0 && !strcmp (topic, "errr"), "%s: request has expected topic", ctx[1]->name); - ok ((sender = flux_msg_get_route_first (rmsg)) != NULL + ok ((sender = flux_msg_route_first (rmsg)) != NULL && !strcmp (sender, ctx[0]->uuid), "%s: request sender is rank 0", ctx[1]->name); @@ -338,8 +338,8 @@ void trio (flux_t *h) */ if (!(msg = flux_response_encode ("m000", NULL))) BAIL_OUT ("flux_response_encode failed"); - if (flux_msg_push_route (msg, ctx[0]->uuid) < 0) - BAIL_OUT ("flux_msg_push_route failed"); + if (flux_msg_route_push (msg, ctx[0]->uuid) < 0) + BAIL_OUT ("flux_msg_route_push failed"); ok (overlay_sendmsg (ctx[1]->ov, msg, OVERLAY_ANY) == 0, "%s: overlay_sendmsg response where=ANY works", ctx[1]->name); flux_msg_decref (msg); @@ -349,7 +349,7 @@ void trio (flux_t *h) "%s: response was received by overlay", ctx[0]->name); ok (flux_msg_get_topic (rmsg, &topic) == 0 && !strcmp (topic, "m000"), "%s: received message has expected topic", ctx[0]->name); - ok (flux_msg_get_route_count (rmsg) == 0, + ok (flux_msg_route_count (rmsg) == 0, "%s: received message has no routes", ctx[0]->name); /* Event 1->0 @@ -371,8 +371,8 @@ void trio (flux_t *h) */ if (!(msg = flux_response_encode ("moop", NULL))) BAIL_OUT ("flux_response_encode failed"); - if (flux_msg_push_route (msg, ctx[1]->uuid) < 0) - BAIL_OUT ("flux_msg_push_route failed"); + if (flux_msg_route_push (msg, ctx[1]->uuid) < 0) + BAIL_OUT ("flux_msg_route_push failed"); ok (overlay_sendmsg (ctx[0]->ov, msg, OVERLAY_ANY) == 0, "%s: overlay_sendmsg response where=ANY works", ctx[0]->name); flux_msg_decref (msg); @@ -382,7 +382,7 @@ void trio (flux_t *h) "%s: response was received by overlay", ctx[1]->name); ok (flux_msg_get_topic (rmsg, &topic) == 0 && !strcmp (topic, "moop"), "%s: response has expected topic", ctx[1]->name); - ok (flux_msg_get_route_count (rmsg) == 0, + ok (flux_msg_route_count (rmsg) == 0, "%s: response has no routes", ctx[1]->name); /* Event 0->1 diff --git a/src/cmd/flux-start.c b/src/cmd/flux-start.c index c6d80377116b..d8910c4a9c05 100644 --- a/src/cmd/flux-start.c +++ b/src/cmd/flux-start.c @@ -862,7 +862,7 @@ void disconnect_cb (flux_t *h, { const char *uuid; - if (!(uuid = flux_msg_get_route_first (msg))) + if (!(uuid = flux_msg_route_first (msg))) return; if (ctx.verbose >= 1) log_msg ("disconnect from %.5s", uuid); diff --git a/src/common/libflux/disconnect.c b/src/common/libflux/disconnect.c index 0b2b369950c1..8e6ecf8ea96f 100644 --- a/src/common/libflux/disconnect.c +++ b/src/common/libflux/disconnect.c @@ -21,7 +21,7 @@ bool flux_disconnect_match (const flux_msg_t *msg1, const flux_msg_t *msg2) struct flux_msg_cred cred; uint32_t userid; - if (!flux_msg_match_route_first (msg1, msg2)) + if (!flux_msg_route_match_first (msg1, msg2)) return false; if (flux_msg_get_cred (msg1, &cred) < 0) diff --git a/src/common/libflux/event.c b/src/common/libflux/event.c index 18a8c5b58a5d..d7b2e551f41a 100644 --- a/src/common/libflux/event.c +++ b/src/common/libflux/event.c @@ -135,7 +135,7 @@ static flux_msg_t *flux_event_create (const char *topic) goto error; if (flux_msg_set_topic (msg, topic) < 0) goto error; - flux_msg_enable_route (msg); + flux_msg_route_enable (msg); return msg; error: flux_msg_destroy (msg); diff --git a/src/common/libflux/handle.c b/src/common/libflux/handle.c index 4f8118c74426..853679e6a6e9 100644 --- a/src/common/libflux/handle.c +++ b/src/common/libflux/handle.c @@ -703,7 +703,7 @@ flux_msg_t *flux_recv (flux_t *h, struct flux_match match, int flags) cali_begin_string (h->prof.msg_match_glob, match.topic_glob ? match.topic_glob : "NONE"); const char *sender; - sender = flux_msg_get_route_first (msg); + sender = flux_msg_route_first (msg); if (sender) cali_begin_string (h->prof.msg_sender, sender); profiling_msg_snapshot (h, msg, flags, "recv"); diff --git a/src/common/libflux/message.c b/src/common/libflux/message.c index b30279c11a04..d07f6c55b522 100644 --- a/src/common/libflux/message.c +++ b/src/common/libflux/message.c @@ -199,7 +199,7 @@ void flux_msg_destroy (flux_msg_t *msg) { if (msg && --msg->refcount == 0) { int saved_errno = errno; - flux_msg_clear_route (msg); + flux_msg_route_clear (msg); free (msg->topic); free (msg->payload); json_decref (msg->json); @@ -869,7 +869,7 @@ bool flux_msg_cmp_matchtag (const flux_msg_t *msg, uint32_t matchtag) { uint32_t tag; - if (flux_msg_get_route_count (msg) > 0) + if (flux_msg_route_count (msg) > 0) return false; /* don't match in foreign matchtag domain */ if (flux_msg_get_matchtag (msg, &tag) < 0) return false; @@ -922,22 +922,22 @@ bool flux_msg_cmp (const flux_msg_t *msg, struct flux_match match) return true; } -void flux_msg_enable_route (flux_msg_t *msg) +void flux_msg_route_enable (flux_msg_t *msg) { if (!msg || (msg->flags & FLUX_MSGFLAG_ROUTE)) return; (void) flux_msg_set_flags (msg, msg->flags | FLUX_MSGFLAG_ROUTE); } -void flux_msg_disable_route (flux_msg_t *msg) +void flux_msg_route_disable (flux_msg_t *msg) { if (!msg || (!(msg->flags & FLUX_MSGFLAG_ROUTE))) return; - flux_msg_clear_route (msg); + flux_msg_route_clear (msg); (void) flux_msg_set_flags (msg, msg->flags & ~(uint8_t)FLUX_MSGFLAG_ROUTE); } -void flux_msg_clear_route (flux_msg_t *msg) +void flux_msg_route_clear (flux_msg_t *msg) { struct route_id *r; if (!msg || (!(msg->flags & FLUX_MSGFLAG_ROUTE))) @@ -948,7 +948,7 @@ void flux_msg_clear_route (flux_msg_t *msg) msg->routes_len = 0; } -int flux_msg_push_route (flux_msg_t *msg, const char *id) +int flux_msg_route_push (flux_msg_t *msg, const char *id) { struct route_id *r; if (!msg || !id) { @@ -966,7 +966,7 @@ int flux_msg_push_route (flux_msg_t *msg, const char *id) return 0; } -int flux_msg_delete_route_last (flux_msg_t *msg) +int flux_msg_route_delete_last (flux_msg_t *msg) { struct route_id *r; if (!msg) { @@ -985,7 +985,7 @@ int flux_msg_delete_route_last (flux_msg_t *msg) } /* replaces flux_msg_nexthop */ -const char *flux_msg_get_route_last (const flux_msg_t *msg) +const char *flux_msg_route_last (const flux_msg_t *msg) { struct route_id *r; @@ -997,7 +997,7 @@ const char *flux_msg_get_route_last (const flux_msg_t *msg) } /* replaces flux_msg_sender */ -const char *flux_msg_get_route_first (const flux_msg_t *msg) +const char *flux_msg_route_first (const flux_msg_t *msg) { struct route_id *r; @@ -1008,7 +1008,7 @@ const char *flux_msg_get_route_first (const flux_msg_t *msg) return NULL; } -int flux_msg_get_route_count (const flux_msg_t *msg) +int flux_msg_route_count (const flux_msg_t *msg) { if (!msg) { errno = EINVAL; @@ -1023,7 +1023,7 @@ int flux_msg_get_route_count (const flux_msg_t *msg) /* Get sum of size in bytes of route frames */ -static int flux_msg_get_route_size (const flux_msg_t *msg) +static int flux_msg_route_size (const flux_msg_t *msg) { struct route_id *r = NULL; int size = 0; @@ -1038,7 +1038,7 @@ static int flux_msg_get_route_size (const flux_msg_t *msg) return size; } -char *flux_msg_get_route_string (const flux_msg_t *msg) +char *flux_msg_route_string (const flux_msg_t *msg) { struct route_id *r = NULL; int hops, len; @@ -1052,8 +1052,8 @@ char *flux_msg_get_route_string (const flux_msg_t *msg) errno = EPROTO; return NULL; } - if ((hops = flux_msg_get_route_count (msg)) < 0 - || (len = flux_msg_get_route_size (msg)) < 0) + if ((hops = flux_msg_route_count (msg)) < 0 + || (len = flux_msg_route_size (msg)) < 0) return NULL; if (!(cp = buf = malloc (len + hops + 1))) return NULL; @@ -1395,10 +1395,10 @@ flux_msg_t *flux_msg_copy (const flux_msg_t *msg, bool payload) cpy->aux1 = msg->aux1; cpy->aux2 = msg->aux2; - if (flux_msg_get_route_count (msg) > 0) { + if (flux_msg_route_count (msg) > 0) { struct route_id *r = NULL; list_for_each_rev (&msg->routes, r, route_id_node) { - if (flux_msg_push_route (cpy, r->id) < 0) + if (flux_msg_route_push (cpy, r->id) < 0) goto error; } } @@ -1595,9 +1595,9 @@ void flux_msg_fprint_ts (FILE *f, const flux_msg_t *msg, double timestamp) } /* Route stack */ - hops = flux_msg_get_route_count (msg); /* -1 if no route stack */ + hops = flux_msg_route_count (msg); /* -1 if no route stack */ if (hops > 0) { - char *rte = flux_msg_get_route_string (msg); + char *rte = flux_msg_route_string (msg); assert (rte != NULL); fprintf (f, "%s |%s|\n", prefix, rte); free (rte); @@ -1789,14 +1789,14 @@ int flux_match_asprintf (struct flux_match *m, const char *topic_glob_fmt, ...) return res; } -bool flux_msg_match_route_first (const flux_msg_t *msg1, const flux_msg_t *msg2) +bool flux_msg_route_match_first (const flux_msg_t *msg1, const flux_msg_t *msg2) { const char *id1; const char *id2; - if (!(id1 = flux_msg_get_route_first (msg1))) + if (!(id1 = flux_msg_route_first (msg1))) return false; - if (!(id2 = flux_msg_get_route_first (msg2))) + if (!(id2 = flux_msg_route_first (msg2))) return false; if (strcmp (id1, id2)) return false; diff --git a/src/common/libflux/message.h b/src/common/libflux/message.h index 4fe3dc8639b3..85966a1d033b 100644 --- a/src/common/libflux/message.h +++ b/src/common/libflux/message.h @@ -310,63 +310,63 @@ const char *flux_msg_typestr (int type); /* Enable routes on a message by setting FLUX_MSGFLAG_ROUTE. This * function is a no-op if the flag is already set. */ -void flux_msg_enable_route (flux_msg_t *msg); +void flux_msg_route_enable (flux_msg_t *msg); /* Disable routes on a message by clearing the FLUX_MSGFLAG_ROUTE * flag. In addition, clear all presently stored routes. This * function is a no-op if the flag is already set. */ -void flux_msg_disable_route (flux_msg_t *msg); +void flux_msg_route_disable (flux_msg_t *msg); /* Clear all routes stored in a message. This function is a no-op if * routes are not enabled. */ -void flux_msg_clear_route (flux_msg_t *msg); +void flux_msg_route_clear (flux_msg_t *msg); /* Push a route frame onto the message (mimic what dealer socket does). * 'id' is copied internally. * Returns 0 on success, -1 with errno set (e.g. EINVAL) on failure. */ -int flux_msg_push_route (flux_msg_t *msg, const char *id); +int flux_msg_route_push (flux_msg_t *msg, const char *id); /* Delete last route frame off the message. Effectively performs the - * "opposite" of flux_msg_push_route(). + * "opposite" of flux_msg_route_push(). * * Returns 0 on success, -1 with errno set (e.g. EPROTO) on failure. */ -int flux_msg_delete_route_last (flux_msg_t *msg); +int flux_msg_route_delete_last (flux_msg_t *msg); /* Return the first route (e.g. first pushed route) or NULL if there * are no routes. * For requests, this is the sender; for responses, this is the recipient. * Returns route id on success, NULL for no route or error. */ -const char *flux_msg_get_route_first (const flux_msg_t *msg); +const char *flux_msg_route_first (const flux_msg_t *msg); /* Return the last route (e.g. most recent pushed route) or NULL if there * are no routes. * For requests, this is the last hop; for responses: this is the next hop. * Returns route id on success, NULL for no route or error. */ -const char *flux_msg_get_route_last (const flux_msg_t *msg); +const char *flux_msg_route_last (const flux_msg_t *msg); /* Return the number of route frames in the message. * It is an EPROTO error if there is no route stack. * Returns 0 on success, -1 with errno set (e.g. EPROTO) on failure. */ -int flux_msg_get_route_count (const flux_msg_t *msg); +int flux_msg_route_count (const flux_msg_t *msg); /* Return a string representing the route stack in message. * Return NULL if routes are not enabled; empty string if * the route stack contains no route frames). * Caller must free the returned string. */ -char *flux_msg_get_route_string (const flux_msg_t *msg); +char *flux_msg_route_string (const flux_msg_t *msg); /* Return true if messages have the same first routing frame. * (For requests, the sender) */ -bool flux_msg_match_route_first (const flux_msg_t *msg1, +bool flux_msg_route_match_first (const flux_msg_t *msg1, const flux_msg_t *msg2); #ifdef __cplusplus diff --git a/src/common/libflux/msg_handler.c b/src/common/libflux/msg_handler.c index 9db51dae74f0..dd15892015fc 100644 --- a/src/common/libflux/msg_handler.c +++ b/src/common/libflux/msg_handler.c @@ -361,7 +361,7 @@ static bool dispatch_message (struct dispatch *d, /* rpc response w/matchtag */ if (type == FLUX_MSGTYPE_RESPONSE) { uint32_t matchtag; - if (flux_msg_get_route_count (msg) == 0 + if (flux_msg_route_count (msg) == 0 && flux_msg_get_matchtag (msg, &matchtag) == 0 && matchtag != FLUX_MATCHTAG_NONE && (mh = zhashx_lookup (d->handlers_rpc, &matchtag)) @@ -409,7 +409,7 @@ static void handle_late_response (struct dispatch *d, const flux_msg_t *msg) if (flux_msg_get_matchtag (msg, &matchtag) < 0) return; - if (flux_msg_get_route_count (msg) != 0) + if (flux_msg_route_count (msg) != 0) return; // foreign matchtag domain (or error getting count) if (matchtag == FLUX_MATCHTAG_NONE) return; // no matchtag was allocated diff --git a/src/common/libflux/request.c b/src/common/libflux/request.c index 08703d00634e..346d29796b85 100644 --- a/src/common/libflux/request.c +++ b/src/common/libflux/request.c @@ -133,7 +133,7 @@ static flux_msg_t *request_encode (const char *topic) goto error; if (flux_msg_set_topic (msg, topic) < 0) goto error; - flux_msg_enable_route (msg); + flux_msg_route_enable (msg); return msg; error: flux_msg_destroy (msg); diff --git a/src/common/libflux/response.c b/src/common/libflux/response.c index b459410a5dff..a265d17844ef 100644 --- a/src/common/libflux/response.c +++ b/src/common/libflux/response.c @@ -139,7 +139,7 @@ static flux_msg_t *response_encode (const char *topic, int errnum) goto error; if (flux_msg_set_topic (msg, topic) < 0) goto error; - flux_msg_enable_route (msg); + flux_msg_route_enable (msg); if (flux_msg_set_errnum (msg, errnum) < 0) goto error; return msg; diff --git a/src/common/libflux/test/disconnect.c b/src/common/libflux/test/disconnect.c index 807cae976410..c98183c7e919 100644 --- a/src/common/libflux/test/disconnect.c +++ b/src/common/libflux/test/disconnect.c @@ -29,7 +29,7 @@ flux_msg_t *create_request (int sender, if (!(msg = flux_request_encode ("foo", NULL))) return NULL; snprintf (id, sizeof (id), "%d", sender); - if (flux_msg_push_route (msg, id) < 0) + if (flux_msg_route_push (msg, id) < 0) return NULL; if (flux_msg_set_rolemask (msg, rolemask) < 0) return NULL; @@ -51,7 +51,7 @@ flux_msg_t *create_cancel (int sender, if (!(msg = flux_request_encode ("foo", NULL))) return NULL; snprintf (id, sizeof (id), "%d", sender); - if (flux_msg_push_route (msg, id) < 0) + if (flux_msg_route_push (msg, id) < 0) return NULL; if (flux_msg_set_rolemask (msg, rolemask) < 0) return NULL; diff --git a/src/common/libflux/test/dispatch.c b/src/common/libflux/test/dispatch.c index 7a0c8c9dad06..9532a6d8ed54 100644 --- a/src/common/libflux/test/dispatch.c +++ b/src/common/libflux/test/dispatch.c @@ -114,8 +114,8 @@ void test_fastpath (flux_t *h) ok (cb_called == 1, "message handler was called after being started"); - flux_msg_enable_route (msg); - ok (flux_msg_push_route (msg, "myuuid") == 0, + flux_msg_route_enable (msg); + ok (flux_msg_route_push (msg, "myuuid") == 0, "added route to message"); ok (flux_send (h, msg, 0) == 0, "sent response message on loop connector"); @@ -351,9 +351,9 @@ void test_response_with_routes (flux_t *h) "foo.bar RPC response created"); if (flux_msg_set_matchtag (msg, mtag) < 0) BAIL_OUT ("flux_msg_set_matchtag failed"); - flux_msg_enable_route (msg); - if (flux_msg_push_route (msg, "9") < 0) - BAIL_OUT ("flux_msg_push_route failed"); + flux_msg_route_enable (msg); + if (flux_msg_route_push (msg, "9") < 0) + BAIL_OUT ("flux_msg_route_push failed"); /* register RPC response handler */ match.matchtag = mtag; diff --git a/src/common/libflux/test/message.c b/src/common/libflux/test/message.c index a05882e0f35c..6a137fee3dd8 100644 --- a/src/common/libflux/test/message.c +++ b/src/common/libflux/test/message.c @@ -250,57 +250,57 @@ void check_cornercase (void) ok (flux_msg_get_matchtag (evt, &tag) < 0 && errno == EPROTO, "flux_msg_get_matchtag fails with EPROTO on msg != req/rsp type"); - lives_ok ({flux_msg_enable_route (NULL);}, - "flux_msg_enable_route msg=NULL doesnt crash"); - lives_ok ({flux_msg_disable_route (NULL);}, - "flux_msg_disable_route msg=NULL doesnt crash"); - lives_ok ({flux_msg_clear_route (NULL);}, - "flux_msg_clear_route msg=NULL doesnt crash"); + lives_ok ({flux_msg_route_enable (NULL);}, + "flux_msg_route_enable msg=NULL doesnt crash"); + lives_ok ({flux_msg_route_disable (NULL);}, + "flux_msg_route_disable msg=NULL doesnt crash"); + lives_ok ({flux_msg_route_clear (NULL);}, + "flux_msg_route_clear msg=NULL doesnt crash"); errno = 0; - ok (flux_msg_push_route (NULL, "foo") == -1 && errno == EINVAL, - "flux_msg_push_route returns -1 errno EINVAL on msg = NULL"); + ok (flux_msg_route_push (NULL, "foo") == -1 && errno == EINVAL, + "flux_msg_route_push returns -1 errno EINVAL on msg = NULL"); errno = 0; - ok (flux_msg_push_route (msg, NULL) == -1 && errno == EINVAL, - "flux_msg_push_route returns -1 errno EINVAL on id = NULL"); + ok (flux_msg_route_push (msg, NULL) == -1 && errno == EINVAL, + "flux_msg_route_push returns -1 errno EINVAL on id = NULL"); errno = 0; - ok (flux_msg_push_route (msg, "foo") == -1 && errno == EPROTO, - "flux_msg_push_route returns -1 errno EPROTO on msg w/o routes enabled"); + ok (flux_msg_route_push (msg, "foo") == -1 && errno == EPROTO, + "flux_msg_route_push returns -1 errno EPROTO on msg w/o routes enabled"); errno = 0; - ok (flux_msg_delete_route_last (NULL) == -1 && errno == EINVAL, - "flux_msg_delete_route_last returns -1 errno EINVAL on id = NULL"); + ok (flux_msg_route_delete_last (NULL) == -1 && errno == EINVAL, + "flux_msg_route_delete_last returns -1 errno EINVAL on id = NULL"); errno = 0; - ok (flux_msg_delete_route_last (msg) == -1 && errno == EPROTO, - "flux_msg_delete_route_last returns -1 errno EPROTO on msg " + ok (flux_msg_route_delete_last (msg) == -1 && errno == EPROTO, + "flux_msg_route_delete_last returns -1 errno EPROTO on msg " "w/o routes enabled"); - ok (flux_msg_get_route_first (NULL) == NULL, - "flux_msg_get_route_first returns NULL on msg = NULL"); - ok (flux_msg_get_route_first (msg) == NULL, - "flux_msg_get_route_first returns NULL on msg w/o routes enabled"); - ok (flux_msg_get_route_last (NULL) == NULL, - "flux_msg_get_route_last returns NULL on msg = NULL"); - ok (flux_msg_get_route_last (msg) == NULL, - "flux_msg_get_route_last returns NULL on msg w/o routes enabled"); - errno = 0; - ok ((flux_msg_get_route_count (NULL) == -1 && errno == EINVAL), - "flux_msg_get_route_count returns -1 errno EINVAL on msg = NULL"); - errno = 0; - ok ((flux_msg_get_route_count (msg) == -1 && errno == EPROTO), - "flux_msg_get_route_count returns -1 errno EPROTO on msg " + ok (flux_msg_route_first (NULL) == NULL, + "flux_msg_route_first returns NULL on msg = NULL"); + ok (flux_msg_route_first (msg) == NULL, + "flux_msg_route_first returns NULL on msg w/o routes enabled"); + ok (flux_msg_route_last (NULL) == NULL, + "flux_msg_route_last returns NULL on msg = NULL"); + ok (flux_msg_route_last (msg) == NULL, + "flux_msg_route_last returns NULL on msg w/o routes enabled"); + errno = 0; + ok ((flux_msg_route_count (NULL) == -1 && errno == EINVAL), + "flux_msg_route_count returns -1 errno EINVAL on msg = NULL"); + errno = 0; + ok ((flux_msg_route_count (msg) == -1 && errno == EPROTO), + "flux_msg_route_count returns -1 errno EPROTO on msg " "w/o routes enabled"); errno = 0; - ok ((flux_msg_get_route_string (NULL) == NULL && errno == EINVAL), - "flux_msg_get_route_string returns NULL errno EINVAL on msg = NULL"); + ok ((flux_msg_route_string (NULL) == NULL && errno == EINVAL), + "flux_msg_route_string returns NULL errno EINVAL on msg = NULL"); errno = 0; - ok ((flux_msg_get_route_string (msg) == NULL && errno == EPROTO), - "flux_msg_get_route_string returns NULL errno EPROTO on msg " + ok ((flux_msg_route_string (msg) == NULL && errno == EPROTO), + "flux_msg_route_string returns NULL errno EPROTO on msg " "w/o routes enabled"); flux_msg_destroy (msg); } -/* flux_msg_get_route_first, flux_msg_get_route_last, - * flux_msg_get_route_count on message with variable number of +/* flux_msg_route_first, flux_msg_route_last, + * flux_msg_route_count on message with variable number of * routing frames */ void check_routes (void) @@ -313,86 +313,86 @@ void check_routes (void) && flux_msg_frames (msg) == 1, "flux_msg_create works and creates msg with 1 frame"); - flux_msg_clear_route (msg); + flux_msg_route_clear (msg); ok (flux_msg_frames (msg) == 1, - "flux_msg_clear_route works, is no-op on msg w/o routes enabled"); - flux_msg_disable_route (msg); + "flux_msg_route_clear works, is no-op on msg w/o routes enabled"); + flux_msg_route_disable (msg); ok (flux_msg_frames (msg) == 1, - "flux_msg_disable_route works, is no-op on msg w/o routes enabled"); - flux_msg_enable_route (msg); + "flux_msg_route_disable works, is no-op on msg w/o routes enabled"); + flux_msg_route_enable (msg); ok (flux_msg_frames (msg) == 2, - "flux_msg_enable_route works, adds one frame on msg w/ routes enabled"); - ok ((flux_msg_get_route_count (msg) == 0), - "flux_msg_get_route_count returns 0 on msg w/o routes"); - - ok ((route = flux_msg_get_route_first (msg)) == NULL, - "flux_msg_get_route_first returns NULL on msg w/o routes"); - ok ((route = flux_msg_get_route_last (msg)) == NULL, - "flux_msg_get_route_last returns NULL on msg w/o routes"); - ok (flux_msg_push_route (msg, "sender") == 0 && flux_msg_frames (msg) == 3, - "flux_msg_push_route works and adds a frame"); - ok ((flux_msg_get_route_count (msg) == 1), - "flux_msg_get_route_count returns 1 on msg w/ id1"); - - ok ((route = flux_msg_get_route_first (msg)) != NULL, - "flux_msg_get_route_first works"); + "flux_msg_route_enable works, adds one frame on msg w/ routes enabled"); + ok ((flux_msg_route_count (msg) == 0), + "flux_msg_route_count returns 0 on msg w/o routes"); + + ok ((route = flux_msg_route_first (msg)) == NULL, + "flux_msg_route_first returns NULL on msg w/o routes"); + ok ((route = flux_msg_route_last (msg)) == NULL, + "flux_msg_route_last returns NULL on msg w/o routes"); + ok (flux_msg_route_push (msg, "sender") == 0 && flux_msg_frames (msg) == 3, + "flux_msg_route_push works and adds a frame"); + ok ((flux_msg_route_count (msg) == 1), + "flux_msg_route_count returns 1 on msg w/ id1"); + + ok ((route = flux_msg_route_first (msg)) != NULL, + "flux_msg_route_first works"); like (route, "sender", - "flux_msg_get_route_first returns id on msg w/ id1"); + "flux_msg_route_first returns id on msg w/ id1"); - ok ((route = flux_msg_get_route_last (msg)) != NULL, - "flux_msg_get_route_last works"); + ok ((route = flux_msg_route_last (msg)) != NULL, + "flux_msg_route_last works"); like (route, "sender", - "flux_msg_get_route_last returns id on msg w/ id1"); + "flux_msg_route_last returns id on msg w/ id1"); - ok ((s = flux_msg_get_route_string (msg)) != NULL, - "flux_msg_get_route_string works"); + ok ((s = flux_msg_route_string (msg)) != NULL, + "flux_msg_route_string works"); like (s, "sender", - "flux_msg_get_route_string returns correct string on msg w/ id1"); + "flux_msg_route_string returns correct string on msg w/ id1"); free (s); - ok (flux_msg_push_route (msg, "router") == 0 && flux_msg_frames (msg) == 4, - "flux_msg_push_route works and adds a frame"); - ok ((flux_msg_get_route_count (msg) == 2), - "flux_msg_get_route_count returns 2 on msg w/ id1+id2"); + ok (flux_msg_route_push (msg, "router") == 0 && flux_msg_frames (msg) == 4, + "flux_msg_route_push works and adds a frame"); + ok ((flux_msg_route_count (msg) == 2), + "flux_msg_route_count returns 2 on msg w/ id1+id2"); - ok ((route = flux_msg_get_route_first (msg)) != NULL, - "flux_msg_get_route_first works"); + ok ((route = flux_msg_route_first (msg)) != NULL, + "flux_msg_route_first works"); like (route, "sender", - "flux_msg_get_route_first returns id1 on msg w/ id1+id2"); + "flux_msg_route_first returns id1 on msg w/ id1+id2"); - ok ((route = flux_msg_get_route_last (msg)) != NULL, - "flux_msg_get_route_last works"); + ok ((route = flux_msg_route_last (msg)) != NULL, + "flux_msg_route_last works"); like (route, "router", - "flux_msg_get_route_last returns id2 on message with id1+id2"); + "flux_msg_route_last returns id2 on message with id1+id2"); - ok ((s = flux_msg_get_route_string (msg)) != NULL, - "flux_msg_get_route_string works"); + ok ((s = flux_msg_route_string (msg)) != NULL, + "flux_msg_route_string works"); like (s, "sender!router", - "flux_msg_get_route_string returns correct string on msg w/ id1+id2"); + "flux_msg_route_string returns correct string on msg w/ id1+id2"); free (s); - ok (flux_msg_delete_route_last (msg) == 0 && flux_msg_frames (msg) == 3, - "flux_msg_delete_route_last works and removed a frame"); - ok (flux_msg_get_route_count (msg) == 1, - "flux_msg_get_route_count returns 1 on message w/ id1"); + ok (flux_msg_route_delete_last (msg) == 0 && flux_msg_frames (msg) == 3, + "flux_msg_route_delete_last works and removed a frame"); + ok (flux_msg_route_count (msg) == 1, + "flux_msg_route_count returns 1 on message w/ id1"); - flux_msg_clear_route (msg); - ok (flux_msg_get_route_count (msg) == 0, - "flux_msg_clear_route clear routing frames"); + flux_msg_route_clear (msg); + ok (flux_msg_route_count (msg) == 0, + "flux_msg_route_clear clear routing frames"); ok (flux_msg_frames (msg) == 2, - "flux_msg_clear_route did not disable routing frames"); + "flux_msg_route_clear did not disable routing frames"); - ok (flux_msg_push_route (msg, "foobar") == 0 && flux_msg_frames (msg) == 3, - "flux_msg_push_route works and adds a frame after flux_msg_clear_route()"); - ok ((flux_msg_get_route_count (msg) == 1), - "flux_msg_get_route_count returns 1 on msg w/ id1"); + ok (flux_msg_route_push (msg, "foobar") == 0 && flux_msg_frames (msg) == 3, + "flux_msg_route_push works and adds a frame after flux_msg_route_clear()"); + ok ((flux_msg_route_count (msg) == 1), + "flux_msg_route_count returns 1 on msg w/ id1"); - flux_msg_disable_route (msg); + flux_msg_route_disable (msg); ok (flux_msg_frames (msg) == 1, - "flux_msg_disable_route clear routing frames"); + "flux_msg_route_disable clear routing frames"); - ok (flux_msg_push_route (msg, "boobar") < 0 && errno == EPROTO, - "flux_msg_push_route fails with EPROTO after flux_msg_disable_route()"); + ok (flux_msg_route_push (msg, "boobar") < 0 && errno == EPROTO, + "flux_msg_route_push fails with EPROTO after flux_msg_route_disable()"); flux_msg_destroy (msg); } @@ -413,9 +413,9 @@ void check_topic (void) like (s, "blorg", "and we got back the topic string we set"); - flux_msg_enable_route (msg); - ok (flux_msg_push_route (msg, "id1") == 0, - "flux_msg_push_route works"); + flux_msg_route_enable (msg); + ok (flux_msg_route_push (msg, "id1") == 0, + "flux_msg_route_push works"); ok (flux_msg_get_topic (msg, &s) == 0, "flux_msg_get_topic still works, with routes"); like (s, "blorg", @@ -641,11 +641,11 @@ void check_payload (void) ok (flux_msg_set_topic (msg, NULL) == 0 && flux_msg_frames (msg) == 2, "flux_msg_set_topic NULL works"); - flux_msg_enable_route (msg); + flux_msg_route_enable (msg); ok (flux_msg_frames (msg) == 3, - "flux_msg_enable_route works"); - ok (flux_msg_push_route (msg, "id1") == 0 && flux_msg_frames (msg) == 4, - "flux_msg_push_route works"); + "flux_msg_route_enable works"); + ok (flux_msg_route_push (msg, "id1") == 0 && flux_msg_frames (msg) == 4, + "flux_msg_route_push works"); len = 0; buf = NULL; errno = 0; ok (flux_msg_get_payload (msg, &buf, &len) == 0 @@ -1040,17 +1040,17 @@ void check_copy (void) type = -1; ok (flux_msg_get_type (cpy, &type) == 0 && type == FLUX_MSGTYPE_KEEPALIVE && !flux_msg_has_payload (cpy) - && flux_msg_get_route_count (cpy) < 0 + && flux_msg_route_count (cpy) < 0 && flux_msg_get_topic (cpy, &topic) < 0, "copy is keepalive: no routes, topic, or payload"); flux_msg_destroy (cpy); ok ((msg = flux_msg_create (FLUX_MSGTYPE_REQUEST)) != NULL, "created request"); - flux_msg_enable_route (msg); - ok (flux_msg_push_route (msg, "first") == 0, + flux_msg_route_enable (msg); + ok (flux_msg_route_push (msg, "first") == 0, "added route 1"); - ok (flux_msg_push_route (msg, "second") == 0, + ok (flux_msg_route_push (msg, "second") == 0, "added route 2"); ok (flux_msg_set_topic (msg, "foo") == 0, "set topic string"); @@ -1063,23 +1063,23 @@ void check_copy (void) && flux_msg_has_payload (cpy) && flux_msg_get_payload (cpy, &cpybuf, &cpylen) == 0 && cpylen == sizeof (buf) && memcmp (cpybuf, buf, cpylen) == 0 - && flux_msg_get_route_count (cpy) == 2 + && flux_msg_route_count (cpy) == 2 && flux_msg_get_topic (cpy, &topic) == 0 && !strcmp (topic,"foo"), "copy is request: w/routes, topic, and payload"); - ok ((s = flux_msg_get_route_last (cpy)) != NULL, - "flux_msg_get_route_last gets route from copy"); + ok ((s = flux_msg_route_last (cpy)) != NULL, + "flux_msg_route_last gets route from copy"); like (s, "second", - "flux_msg_get_route_last returns correct second route"); - ok (flux_msg_delete_route_last (cpy) == 0, - "flux_msg_delete_route_last removes second route"); + "flux_msg_route_last returns correct second route"); + ok (flux_msg_route_delete_last (cpy) == 0, + "flux_msg_route_delete_last removes second route"); - ok ((s = flux_msg_get_route_last (cpy)) != NULL, - "flux_msg_get_route_last pops route from copy"); + ok ((s = flux_msg_route_last (cpy)) != NULL, + "flux_msg_route_last pops route from copy"); like (s, "first", - "flux_msg_get_route_last returns correct first route"); - ok (flux_msg_delete_route_last (cpy) == 0, - "flux_msg_delete_route_last removes first route"); + "flux_msg_route_last returns correct first route"); + ok (flux_msg_route_delete_last (cpy) == 0, + "flux_msg_route_delete_last removes first route"); flux_msg_destroy (cpy); @@ -1088,7 +1088,7 @@ void check_copy (void) type = -1; ok (flux_msg_get_type (cpy, &type) == 0 && type == FLUX_MSGTYPE_REQUEST && !flux_msg_has_payload (cpy) - && flux_msg_get_route_count (cpy) == 2 + && flux_msg_route_count (cpy) == 2 && flux_msg_get_topic (cpy, &topic) == 0 && !strcmp (topic,"foo"), "copy is request: w/routes, topic, and no payload"); flux_msg_destroy (cpy); @@ -1123,8 +1123,8 @@ void check_print (void) "created test message"); ok (flux_msg_set_topic (msg, "foo.bar") == 0, "set topic string"); - flux_msg_enable_route (msg); - ok (flux_msg_push_route (msg, "id1") == 0, + flux_msg_route_enable (msg); + ok (flux_msg_route_push (msg, "id1") == 0, "added one route"); ok (flux_msg_set_payload (msg, buf, strlen (buf)) == 0, "added payload"); @@ -1176,7 +1176,7 @@ void check_print (void) ok ((msg = flux_msg_create (FLUX_MSGTYPE_RESPONSE)) != NULL, "created test message"); - flux_msg_enable_route (msg); + flux_msg_route_enable (msg); lives_ok ({flux_msg_fprint (f, msg);}, "flux_msg_fprint doesn't segfault on response with empty route stack"); flux_msg_destroy (msg); @@ -1242,10 +1242,10 @@ void check_flags (void) && (flags & FLUX_MSGFLAG_PAYLOAD), "flux_msg_set_payload sets FLUX_MSGFLAG_PAYLOAD"); - flux_msg_enable_route (msg); + flux_msg_route_enable (msg); ok (flux_msg_get_flags (msg, &flags) == 0 && (flags & FLUX_MSGFLAG_ROUTE), - "flux_msg_enable_route sets FLUX_MSGFLAG_ROUTE"); + "flux_msg_route_enable sets FLUX_MSGFLAG_ROUTE"); flux_msg_destroy (msg); } diff --git a/src/common/libflux/test/rpc.c b/src/common/libflux/test/rpc.c index a5e6d6ab8bae..0d16347222ba 100644 --- a/src/common/libflux/test/rpc.c +++ b/src/common/libflux/test/rpc.c @@ -316,7 +316,7 @@ void test_service (flux_t *h) && (cred.rolemask & FLUX_ROLE_OWNER), "response has cred.userid=UID, cred.rolemask including OWNER"); errno = 0; - rc = flux_msg_get_route_count (msg); + rc = flux_msg_route_count (msg); ok ((rc == -1 && errno == EINVAL) || (rc == 0), "response has no residual route stack"); flux_future_destroy (r); diff --git a/src/common/librouter/router.c b/src/common/librouter/router.c index c178e25bcbc1..b0ee6615bd16 100644 --- a/src/common/librouter/router.c +++ b/src/common/librouter/router.c @@ -188,8 +188,8 @@ void router_entry_recv (struct router_entry *entry, flux_msg_t *msg) service_remove_request (entry, msg); break; } - flux_msg_enable_route (msg); - if (flux_msg_push_route (msg, entry->uuid) < 0) + flux_msg_route_enable (msg); + if (flux_msg_route_push (msg, entry->uuid) < 0) return; if (disconnect_arm (entry->dcon, msg) < 0) return; @@ -378,7 +378,7 @@ static void response_cb (flux_t *h, if (!(cpy = flux_msg_copy (msg, true))) goto error; - if (!(uuid = flux_msg_get_route_last (cpy))) { // may set uuid=NULL no routes + if (!(uuid = flux_msg_route_last (cpy))) { // may set uuid=NULL no routes errno = EINVAL; goto error; } @@ -386,7 +386,7 @@ static void response_cb (flux_t *h, errno = EHOSTUNREACH; goto error; } - if (flux_msg_delete_route_last (cpy) < 0) + if (flux_msg_route_delete_last (cpy) < 0) goto error; if (entry->send (cpy, entry->arg) < 0) { flux_log_error (h, "router: response > client=%.5s", entry->uuid); diff --git a/src/common/librouter/servhash.c b/src/common/librouter/servhash.c index 17e8fc060d6d..d9914a75818d 100644 --- a/src/common/librouter/servhash.c +++ b/src/common/librouter/servhash.c @@ -67,7 +67,7 @@ static flux_msg_t *request_copy_clear_routes (const flux_msg_t *msg) flux_msg_t *cpy; if (!(cpy = flux_msg_copy (msg, true))) return NULL; - flux_msg_clear_route (cpy); + flux_msg_route_clear (cpy); return cpy; } diff --git a/src/common/librouter/test/usock_service.c b/src/common/librouter/test/usock_service.c index a909e18dff67..90a6f02f1b5b 100644 --- a/src/common/librouter/test/usock_service.c +++ b/src/common/librouter/test/usock_service.c @@ -64,7 +64,7 @@ void disconnect_cb (flux_t *h, void *arg) { const char *uuid; - if ((uuid = flux_msg_get_route_first (msg))) + if ((uuid = flux_msg_route_first (msg))) diag ("disconnect from %.5s", uuid); flux_reactor_stop (flux_get_reactor (h)); } diff --git a/src/common/librouter/usock_service.c b/src/common/librouter/usock_service.c index d61f49d2f1d8..bc8d8a3e2c55 100644 --- a/src/common/librouter/usock_service.c +++ b/src/common/librouter/usock_service.c @@ -49,15 +49,15 @@ static void notify_disconnect (struct service *ss, const char *uuid) { flux_msg_t *msg; - /* flux_msg_enable_route() returns void. To avoid creating an + /* flux_msg_route_enable() returns void. To avoid creating an * extra branch, call with C trick to avoid breaking up single if * statement into multiple. */ if (!(msg = flux_request_encode ("disconnect", NULL)) || flux_msg_set_noresponse (msg) < 0 - || (flux_msg_enable_route (msg), false) + || (flux_msg_route_enable (msg), false) || flux_msg_set_cred (msg, ss->cred) < 0 - || flux_msg_push_route (msg, uuid) < 0 + || flux_msg_route_push (msg, uuid) < 0 || flux_requeue (ss->h, msg, FLUX_RQ_TAIL) < 0) { if (ss->verbose) log_msg ("error notifying server of %.5s disconnect", uuid); @@ -91,15 +91,15 @@ static void service_recv (struct usock_conn *uconn, flux_msg_t *msg, void *arg) struct service *ss = arg; int type = 0; - /* flux_msg_enable_route() returns void. To avoid creating an + /* flux_msg_route_enable() returns void. To avoid creating an * extra branch, call with C trick to avoid breaking up single if * statement into multiple. */ if (flux_msg_get_type (msg, &type) < 0 || type != FLUX_MSGTYPE_REQUEST - || (flux_msg_enable_route (msg), false) + || (flux_msg_route_enable (msg), false) || flux_msg_set_cred (msg, ss->cred) < 0 - || flux_msg_push_route (msg, uuid) < 0 + || flux_msg_route_push (msg, uuid) < 0 || flux_requeue (ss->h, msg, FLUX_RQ_TAIL) < 0) goto drop; return; @@ -151,7 +151,7 @@ static int service_handle_send (void *impl, const flux_msg_t *msg, int flags) } if (!(cpy = flux_msg_copy (msg, true))) return -1; - if (!(uuid = flux_msg_get_route_last (cpy))) { + if (!(uuid = flux_msg_route_last (cpy))) { errno = EPROTO; goto error; } @@ -161,7 +161,7 @@ static int service_handle_send (void *impl, const flux_msg_t *msg, int flags) errno = ENOENT; goto error; } - if (flux_msg_delete_route_last (cpy) < 0) + if (flux_msg_route_delete_last (cpy) < 0) goto error; if (usock_conn_send (uconn, cpy) < 0) goto error; diff --git a/src/common/libsubprocess/server.c b/src/common/libsubprocess/server.c index 346bbb7ea65a..33915434eea7 100644 --- a/src/common/libsubprocess/server.c +++ b/src/common/libsubprocess/server.c @@ -530,7 +530,7 @@ const char *subprocess_sender (flux_subprocess_t *p) struct rexec *rex = flux_subprocess_aux_get (p, auxkey); const char *sender; - if (!rex || !(sender = flux_msg_get_route_first (rex->msg))) + if (!rex || !(sender = flux_msg_route_first (rex->msg))) return NULL; return sender; diff --git a/src/common/libterminus/pty.c b/src/common/libterminus/pty.c index fb0400ca264f..27d16cb8b0a1 100644 --- a/src/common/libterminus/pty.c +++ b/src/common/libterminus/pty.c @@ -102,7 +102,7 @@ static struct pty_client *pty_client_create (const flux_msg_t *msg) if (!(c = calloc (1, sizeof (*c)))) return NULL; - if (!(uuid = flux_msg_get_route_first (msg))) { + if (!(uuid = flux_msg_route_first (msg))) { errno = EPROTO; goto error; } @@ -133,7 +133,7 @@ static struct pty_client *pty_client_find_sender (struct flux_pty *pty, struct pty_client *c = NULL; const char *uuid; - if (!(uuid = flux_msg_get_route_first (msg))) { + if (!(uuid = flux_msg_route_first (msg))) { llog_error (pty, "flux_msg_get_route_first: uuid is NULL!"); return NULL; } diff --git a/src/common/libterminus/terminus.c b/src/common/libterminus/terminus.c index 18426ddd1400..17a618f481a3 100644 --- a/src/common/libterminus/terminus.c +++ b/src/common/libterminus/terminus.c @@ -758,7 +758,7 @@ static void disconnect_cb (flux_t *h, struct terminus_session *s; const char *sender; - if (!(sender = flux_msg_get_route_first (msg))) { + if (!(sender = flux_msg_route_first (msg))) { llog_error (ts, "flux_msg_get_route_first: uuid is NULL!"); return; } diff --git a/src/common/libtestutil/util.c b/src/common/libtestutil/util.c index 80f7c583e790..f9edd856afc1 100644 --- a/src/common/libtestutil/util.c +++ b/src/common/libtestutil/util.c @@ -231,12 +231,12 @@ static int test_connector_send (void *impl, const flux_msg_t *msg, int flags) goto error; switch (type) { case FLUX_MSGTYPE_REQUEST: - flux_msg_enable_route (cpy); - if (flux_msg_push_route (cpy, "test") < 0) + flux_msg_route_enable (cpy); + if (flux_msg_route_push (cpy, "test") < 0) goto error; break; case FLUX_MSGTYPE_RESPONSE: - if (flux_msg_delete_route_last (cpy) < 0) + if (flux_msg_route_delete_last (cpy) < 0) goto error; break; } diff --git a/src/modules/barrier/barrier.c b/src/modules/barrier/barrier.c index f2aae68bbf3a..5c35d1edbcbe 100644 --- a/src/modules/barrier/barrier.c +++ b/src/modules/barrier/barrier.c @@ -329,7 +329,7 @@ static void enter_request_cb (flux_t *h, flux_msg_handler_t *mh, "name", &name, "nprocs", &nprocs) < 0) goto error; - if (!(sender = flux_msg_get_route_first (msg))) { + if (!(sender = flux_msg_route_first (msg))) { errno = EPROTO; goto error; } @@ -367,7 +367,7 @@ static void disconnect_request_cb (flux_t *h, flux_msg_handler_t *mh, if (flux_msg_get_cred (msg, &cred) < 0) goto error; - if (!(sender = flux_msg_get_route_first (msg))) { + if (!(sender = flux_msg_route_first (msg))) { errno = EPROTO; goto error; } diff --git a/src/modules/job-manager/alloc.c b/src/modules/job-manager/alloc.c index 22d20298d8b8..9e3726328098 100644 --- a/src/modules/job-manager/alloc.c +++ b/src/modules/job-manager/alloc.c @@ -420,7 +420,7 @@ static void ready_cb (flux_t *h, flux_msg_handler_t *mh, errno = EPROTO; goto error; } - if (!(sender = flux_msg_get_route_first (msg))) { + if (!(sender = flux_msg_route_first (msg))) { flux_log (h, LOG_ERR, "%s: flux_msg_get_route_first: sender is NULL", __FUNCTION__); goto error; @@ -774,7 +774,7 @@ void alloc_disconnect_rpc (flux_t *h, if (alloc->sched_sender) { const char *sender; - if ((sender = flux_msg_get_route_first (msg)) + if ((sender = flux_msg_route_first (msg)) && !strcmp (sender, alloc->sched_sender)) interface_teardown (ctx->alloc, "disconnect", 0); } diff --git a/src/modules/job-manager/wait.c b/src/modules/job-manager/wait.c index db5479e61370..58ea42050829 100644 --- a/src/modules/job-manager/wait.c +++ b/src/modules/job-manager/wait.c @@ -307,7 +307,7 @@ void wait_disconnect_rpc (flux_t *h, job = zhashx_first (ctx->active_jobs); while (job && wait->waiters > 0) { if (job->waiter) { - if (flux_msg_match_route_first (job->waiter, msg)) { + if (flux_msg_route_match_first (job->waiter, msg)) { flux_msg_decref (job->waiter); job->waiter = NULL; wait->waiters--; diff --git a/src/modules/kvs/kvs.c b/src/modules/kvs/kvs.c index 9cd30da9754f..65d840f34f3a 100644 --- a/src/modules/kvs/kvs.c +++ b/src/modules/kvs/kvs.c @@ -2061,7 +2061,7 @@ static void setroot_event_cb (flux_t *h, flux_msg_handler_t *mh, static bool disconnect_cmp (const flux_msg_t *msg, void *arg) { flux_msg_t *msgreq = arg; - return flux_msg_match_route_first (msgreq, msg); + return flux_msg_route_match_first (msgreq, msg); } static int disconnect_request_root_cb (struct kvsroot *root, void *arg) diff --git a/src/modules/kvs/test/kvssync.c b/src/modules/kvs/test/kvssync.c index 8b8026c8acad..877713e9fe39 100644 --- a/src/modules/kvs/test/kvssync.c +++ b/src/modules/kvs/test/kvssync.c @@ -167,7 +167,7 @@ bool msgcmp (const flux_msg_t *msg, void *arg) { const char *id; bool match = false; - if ((id = flux_msg_get_route_first (msg)) + if ((id = flux_msg_route_first (msg)) && (!strcmp (id, "1") || !strcmp (id, "2") || !strcmp (id, "3") @@ -213,8 +213,8 @@ void basic_remove_tests (void) snprintf (s, sizeof (s), "%d", i); if (!(msg = flux_msg_create (FLUX_MSGTYPE_REQUEST))) break; - flux_msg_enable_route (msg); - if (flux_msg_push_route (msg, s) < 0) + flux_msg_route_enable (msg); + if (flux_msg_route_push (msg, s) < 0) break; ok (!kvssync_add (root, cb, NULL, NULL, msg, NULL, i), "kvssync_add w/ seq = %d works", i); diff --git a/src/modules/kvs/test/waitqueue.c b/src/modules/kvs/test/waitqueue.c index 851bca14b74e..7f473eb37047 100644 --- a/src/modules/kvs/test/waitqueue.c +++ b/src/modules/kvs/test/waitqueue.c @@ -45,7 +45,7 @@ bool msgcmp (const flux_msg_t *msg, void *arg) { const char *id; bool match = false; - if ((id = flux_msg_get_route_first (msg)) + if ((id = flux_msg_route_first (msg)) && (!strcmp (id, "19") || !strcmp (id, "18") || !strcmp (id, "17"))) match = true; return match; @@ -255,8 +255,8 @@ int main (int argc, char *argv[]) snprintf (s, sizeof (s), "%d", i); if (!(msg = flux_msg_create (FLUX_MSGTYPE_REQUEST))) break; - flux_msg_enable_route (msg); - if (flux_msg_push_route (msg, s) < 0) + flux_msg_route_enable (msg); + if (flux_msg_route_push (msg, s) < 0) break; if (!(w = wait_create_msg_handler (NULL, NULL, msg, &count, msghand))) break;