broker: drop overlay_msg_is_local()

Problem: overlay_msg_is_local() is no longer used with the advent
of flux_msg_is_local().

Drop the internal broker function overlay_msg_is_local(), and convert
its unit tests to use flux_msg_is_local().

Author: garlick

src/broker/overlay.c

@@ -454,14 +454,6 @@ static struct child *child_lookup (struct overlay *ov, const char *id)
     return NULL;
 }
 
-bool overlay_msg_is_local (const flux_msg_t *msg)
-{
-    /*  Return true only if msg is non-NULL and the message does not
-     *  have the overlay supplied "remote" tag.
-     */
-    return (msg && flux_msg_aux_get (msg, "overlay::remote") == NULL);
-}
-
 /* Lookup (direct) child peer by rank.
  * Returns NULL on lookup failure.
  */
@@ -899,13 +891,6 @@ static void child_cb (flux_reactor_t *r, flux_watcher_t *w,
         logdrop (ov, OVERLAY_DOWNSTREAM, msg, "failed to clear local role");
         goto done;
     }
-    /* Flag this message as remotely received. This allows efficient
-     * operation of the overlay_msg_is_local() function.
-     */
-    if (flux_msg_aux_set (msg, "overlay::remote", int2ptr (1), NULL) < 0) {
-        logdrop (ov, OVERLAY_DOWNSTREAM, msg, "failed to tag msg as remote");
-        goto done;
-    }
     if (flux_msg_get_type (msg, &type) < 0
         || !(uuid = flux_msg_route_last (msg))) {
         logdrop (ov, OVERLAY_DOWNSTREAM, msg, "malformed message");
@@ -1012,13 +997,6 @@ static void parent_cb (flux_reactor_t *r, flux_watcher_t *w,
         logdrop (ov, OVERLAY_UPSTREAM, msg, "failed to clear local role");
         goto done;
     }
-    /* Flag this message as remotely received. This allows efficient
-     * operation of the overlay_msg_is_local() function.
-     */
-    if (flux_msg_aux_set (msg, "overlay::remote", int2ptr (1), NULL) < 0) {
-        logdrop (ov, OVERLAY_UPSTREAM, msg, "failed to tag msg as remote");
-        goto done;
-    }
     if (flux_msg_get_type (msg, &type) < 0) {
         logdrop (ov, OVERLAY_UPSTREAM, msg, "malformed message");
         goto done;

src/broker/overlay.h

@@ -142,11 +142,6 @@ int overlay_set_monitor_cb (struct overlay *ov,
  */
 int overlay_register_attrs (struct overlay *overlay);
 
-/* Return true if this message was routed locally, i.e. wasn't delivered
- *  via an overlay parent or child.
- */
-bool overlay_msg_is_local (const flux_msg_t *msg);
-
 /* Stop allowing new connections from downstream peers.
  */
 void overlay_shutdown (struct overlay *overlay);

src/broker/test/overlay.c

@@ -330,8 +330,8 @@ void trio (flux_t *h)
     rmsg = recvmsg_timeout (ctx[0], 5);
     ok (rmsg != NULL,
         "%s: request was received by overlay", ctx[0]->name);
-    ok (!overlay_msg_is_local (rmsg),
-        "%s: overlay_msg_is_local fails on parent from child",
+    ok (!flux_msg_is_local (rmsg),
+        "%s: flux_msg_is_local fails on parent from child",
         ctx[1]->name);
     ok (flux_msg_get_topic (rmsg, &topic) == 0 && !strcmp (topic, "meep"),
         "%s: received message has expected topic", ctx[0]->name);
@@ -354,8 +354,8 @@ void trio (flux_t *h)
     rmsg = recvmsg_timeout (ctx[1], 5);
     ok (rmsg != NULL,
         "%s: request was received by overlay", ctx[1]->name);
-    ok (!overlay_msg_is_local (rmsg),
-        "%s: overlay_msg_is_local fails on child from parent",
+    ok (!flux_msg_is_local (rmsg),
+        "%s: flux_msg_is_local fails on child from parent",
         ctx[1]->name);
     ok (flux_msg_get_topic (rmsg, &topic) == 0 && !strcmp (topic, "errr"),
         "%s: request has expected topic", ctx[1]->name);
@@ -376,8 +376,8 @@ void trio (flux_t *h)
     rmsg = recvmsg_timeout (ctx[0], 5);
     ok (rmsg != NULL,
         "%s: response was received by overlay", ctx[0]->name);
-    ok (!overlay_msg_is_local (rmsg),
-        "%s: overlay_msg_is_local returns false for response from child");
+    ok (!flux_msg_is_local (rmsg),
+        "%s: flux_msg_is_local returns false for response from child");
     ok (flux_msg_get_topic (rmsg, &topic) == 0 && !strcmp (topic, "m000"),
         "%s: received message has expected topic", ctx[0]->name);
     ok (flux_msg_route_count (rmsg) == 0,
@@ -396,8 +396,8 @@ void trio (flux_t *h)
         "%s: event was received by overlay", ctx[0]->name);
     ok (flux_msg_get_topic (rmsg, &topic) == 0 && !strcmp (topic, "eeek"),
         "%s: received message has expected topic", ctx[0]->name);
-    ok (!overlay_msg_is_local (rmsg),
-        "%s: overlay_msg_is_local returns false for event from child");
+    ok (!flux_msg_is_local (rmsg),
+        "%s: flux_msg_is_local returns false for event from child");
 
     /* Response 0->1
      */
@@ -664,8 +664,8 @@ void wrongness (flux_t *h)
     ok (overlay_bind (ov, "ipc://@foobar") < 0 && errno == EINVAL,
         "overlay_bind fails if called before rank is known");
 
-    ok (!overlay_msg_is_local (NULL),
-        "overlay_msg_is_local (NULL) returns false");
+    ok (!flux_msg_is_local (NULL),
+        "flux_msg_is_local (NULL) returns false");
 
     overlay_destroy (ov);
     attr_destroy (attrs);