askrene: make children use child_log() instead of rq_log.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Author: rustyrussell

plugins/askrene/askrene.c

@@ -314,12 +314,6 @@ const char *rq_log(const tal_t *ctx,
 	msg = tal_vfmt(ctx, fmt, args);
 	va_end(args);
 
-	/* FIXME: This is a hack! */
-	if (am_child) {
-		child_log(tmpctx, level, "%s", msg);
-		return msg;
-	}
-
 	plugin_notify_message(rq->cmd, level, "%s", msg);
 
 	/* Notifications already get logged at debug. Otherwise reduce

plugins/askrene/child/entry.c

@@ -14,9 +14,6 @@
 #include <plugins/askrene/child/mcf.h>
 #include <unistd.h>
 
-/* Temporary hack */
-bool am_child = false;
-
 /* A single route. */
 struct route {
 	/* Actual path to take */
@@ -177,7 +174,6 @@ int fork_router_child(struct route_query *rq,
 	close(logfds[0]);
 	close(replyfds[0]);
 	set_child_log_fd(logfds[1]);
-	am_child = true;
 	if (single_path) {
 		err = single_path_routes(rq, rq, deadline, srcnode, dstnode,
 					 amount, maxfee, finalcltv,

plugins/askrene/child/entry.h

@@ -22,7 +22,4 @@ int fork_router_child(struct route_query *rq,
 		      struct json_filter *cmd_filter,
 		      int *log_fd,
 		      int *child_pid);
-
-/* FIXME: Remove this */
-extern bool am_child;
 #endif /* LIGHTNING_PLUGINS_ASKRENE_CHILD_ENTRY_H */

plugins/askrene/child/explain_failure.c

@@ -4,6 +4,7 @@
 #include <common/gossmap.h>
 #include <common/route.h>
 #include <plugins/askrene/askrene.h>
+#include <plugins/askrene/child/child_log.h>
 #include <plugins/askrene/child/explain_failure.h>
 #include <plugins/askrene/layer.h>
 #include <plugins/askrene/reserve.h>
@@ -133,33 +134,33 @@ static const char *check_capacity(const tal_t *ctx,
 
 	node_stats(rq, node, node_direction, &stats);
 	if (amount_msat_greater(amount, stats.total.capacity)) {
-		return rq_log(ctx, rq, LOG_DBG,
-			      NO_USABLE_PATHS_STRING
-			      "  Total %s capacity is only %s"
-			      " (in %zu channels).",
-			      name,
-			      fmt_amount_msat(tmpctx, stats.total.capacity),
-			      stats.total.num_channels);
+		return child_log(ctx, LOG_DBG,
+				 NO_USABLE_PATHS_STRING
+				 "  Total %s capacity is only %s"
+				 " (in %zu channels).",
+				 name,
+				 fmt_amount_msat(tmpctx, stats.total.capacity),
+				 stats.total.num_channels);
 	}
 	if (amount_msat_greater(amount, stats.gossip_known.capacity)) {
-		return rq_log(ctx, rq, LOG_DBG,
-			      NO_USABLE_PATHS_STRING
-			      "  Missing gossip for %s: only known %zu/%zu channels, leaving capacity only %s of %s.",
-			      name,
-			      stats.gossip_known.num_channels,
-			      stats.total.num_channels,
-			      fmt_amount_msat(tmpctx, stats.gossip_known.capacity),
-			      fmt_amount_msat(tmpctx, stats.total.capacity));
+		return child_log(ctx, LOG_DBG,
+				 NO_USABLE_PATHS_STRING
+				 "  Missing gossip for %s: only known %zu/%zu channels, leaving capacity only %s of %s.",
+				 name,
+				 stats.gossip_known.num_channels,
+				 stats.total.num_channels,
+				 fmt_amount_msat(tmpctx, stats.gossip_known.capacity),
+				 fmt_amount_msat(tmpctx, stats.total.capacity));
 	}
 	if (amount_msat_greater(amount, stats.enabled.capacity)) {
-		return rq_log(ctx, rq, LOG_DBG,
-			      NO_USABLE_PATHS_STRING
+		return child_log(ctx, LOG_DBG,
+				 NO_USABLE_PATHS_STRING
 			      "  The %s has disabled %zu of %zu channels, leaving capacity only %s of %s.",
-			      name,
-			      stats.total.num_channels - stats.enabled.num_channels,
-			      stats.total.num_channels,
-			      fmt_amount_msat(tmpctx, stats.enabled.capacity),
-			      fmt_amount_msat(tmpctx, stats.total.capacity));
+				 name,
+				 stats.total.num_channels - stats.enabled.num_channels,
+				 stats.total.num_channels,
+				 fmt_amount_msat(tmpctx, stats.enabled.capacity),
+				 fmt_amount_msat(tmpctx, stats.total.capacity));
 	}
 	return NULL;
 }
@@ -236,7 +237,7 @@ const char *explain_failure(const tal_t *ctx,
 	hops = route_from_dijkstra(tmpctx, rq->gossmap, dij, srcnode,
 				   AMOUNT_MSAT(0), 0);
 	if (!hops)
-		return rq_log(ctx, rq, LOG_INFORM,
+		return child_log(ctx, LOG_INFORM,
 			      "There is no connection between source and destination at all");
 
 	/* Description of shortest path */
@@ -282,16 +283,16 @@ const char *explain_failure(const tal_t *ctx,
 		else
 			continue;
 
-		return rq_log(ctx, rq, LOG_INFORM,
-			      NO_USABLE_PATHS_STRING
-			      "  The shortest path is %s, but %s %s",
-			      path,
-			      fmt_short_channel_id_dir(tmpctx, &scidd),
-			      explanation);
+		return child_log(ctx, LOG_INFORM,
+				 NO_USABLE_PATHS_STRING
+				 "  The shortest path is %s, but %s %s",
+				 path,
+				 fmt_short_channel_id_dir(tmpctx, &scidd),
+				 explanation);
 	}
 
-	return rq_log(ctx, rq, LOG_BROKEN,
-		       "Actually, I'm not sure why we didn't find the"
-		       " obvious route %s: perhaps this is a bug?",
-		       path);
+	return child_log(ctx, LOG_BROKEN,
+			 "Actually, I'm not sure why we didn't find the"
+			 " obvious route %s: perhaps this is a bug?",
+			 path);
 }

plugins/askrene/child/flow.c

@@ -6,6 +6,7 @@
 #include <common/overflows.h>
 #include <math.h>
 #include <plugins/askrene/askrene.h>
+#include <plugins/askrene/child/child_log.h>
 #include <plugins/askrene/child/flow.h>
 #include <plugins/libplugin.h>
 #include <stdio.h>
@@ -17,16 +18,15 @@
 #endif
 
 /* How much do we deliver to destination using this set of routes */
-struct amount_msat flowset_delivers(struct plugin *plugin,
-				    struct flow **flows)
+struct amount_msat flowset_delivers(struct flow **flows)
 {
 	struct amount_msat final = AMOUNT_MSAT(0);
 	for (size_t i = 0; i < tal_count(flows); i++) {
 		if (!amount_msat_accumulate(&final, flows[i]->delivers)) {
-			plugin_err(plugin, "Could not add flowsat %s to %s (%zu/%zu)",
-				   fmt_amount_msat(tmpctx, flows[i]->delivers),
-				   fmt_amount_msat(tmpctx, final),
-				   i, tal_count(flows));
+			child_err("Could not add flowsat %s to %s (%zu/%zu)",
+				  fmt_amount_msat(tmpctx, flows[i]->delivers),
+				  fmt_amount_msat(tmpctx, final),
+				  i, tal_count(flows));
 		}
 	}
 	return final;
@@ -68,7 +68,7 @@ static double edge_probability(const struct route_query *rq,
 	return 1.0 - amount_msat_ratio(numerator, denominator);
 }
 
-struct amount_msat flow_spend(struct plugin *plugin, const struct flow *flow)
+struct amount_msat flow_spend(const struct flow *flow)
 {
 	const size_t pathlen = tal_count(flow->path);
 	struct amount_msat spend = flow->delivers;
@@ -77,38 +77,38 @@ struct amount_msat flow_spend(struct plugin *plugin, const struct flow *flow)
 		const struct half_chan *h = flow_edge(flow, i);
 		if (!amount_msat_add_fee(&spend, h->base_fee,
 					 h->proportional_fee)) {
-			plugin_err(plugin, "Could not add fee %u/%u to amount %s in %i/%zu",
-				   h->base_fee, h->proportional_fee,
-				   fmt_amount_msat(tmpctx, spend),
-				   i, pathlen);
+			child_err("Could not add fee %u/%u to amount %s in %i/%zu",
+				  h->base_fee, h->proportional_fee,
+				  fmt_amount_msat(tmpctx, spend),
+				  i, pathlen);
 		}
 	}
 
 	return spend;
 }
 
-struct amount_msat flow_fee(struct plugin *plugin, const struct flow *flow)
+struct amount_msat flow_fee(const struct flow *flow)
 {
-	struct amount_msat spend = flow_spend(plugin, flow);
+	struct amount_msat spend = flow_spend(flow);
 	struct amount_msat fee;
 	if (!amount_msat_sub(&fee, spend, flow->delivers)) {
-		plugin_err(plugin, "Could not subtract %s from %s for fee",
-				   fmt_amount_msat(tmpctx, flow->delivers),
-				   fmt_amount_msat(tmpctx, spend));
+		child_err("Could not subtract %s from %s for fee",
+			  fmt_amount_msat(tmpctx, flow->delivers),
+			  fmt_amount_msat(tmpctx, spend));
 	}
 
 	return fee;
 }
 
-struct amount_msat flowset_fee(struct plugin *plugin, struct flow **flows)
+struct amount_msat flowset_fee(struct flow **flows)
 {
 	struct amount_msat fee = AMOUNT_MSAT(0);
 	for (size_t i = 0; i < tal_count(flows); i++) {
-		struct amount_msat this_fee = flow_fee(plugin, flows[i]);
+		struct amount_msat this_fee = flow_fee(flows[i]);
 		if (!amount_msat_accumulate(&fee, this_fee)) {
-			plugin_err(plugin, "Could not add %s to %s for flowset fee",
-				   fmt_amount_msat(tmpctx, this_fee),
-				   fmt_amount_msat(tmpctx, fee));
+			child_err("Could not add %s to %s for flowset fee",
+				  fmt_amount_msat(tmpctx, this_fee),
+				  fmt_amount_msat(tmpctx, fee));
 		}
 	}
 	return fee;
@@ -144,10 +144,10 @@ double flow_probability(const struct flow *flow,
 
 		if (!amount_msat_add_fee(&spend, h->base_fee,
 					 h->proportional_fee)) {
-			plugin_err(rq->plugin, "Could not add fee %u/%u to amount %s in %i/%zu",
-				   h->base_fee, h->proportional_fee,
-				   fmt_amount_msat(tmpctx, spend),
-				   i, pathlen);
+			child_err("Could not add fee %u/%u to amount %s in %i/%zu",
+				  h->base_fee, h->proportional_fee,
+				  fmt_amount_msat(tmpctx, spend),
+				  i, pathlen);
 		}
 	}
 

plugins/askrene/child/flow.h

@@ -40,17 +40,16 @@ double flow_probability(const struct flow *flow,
 			const struct route_query *rq);
 
 /* How much do we need to send to make this flow arrive. */
-struct amount_msat flow_spend(struct plugin *plugin, const struct flow *flow);
+struct amount_msat flow_spend(const struct flow *flow);
 
 /* How much do we pay in fees to make this flow arrive. */
-struct amount_msat flow_fee(struct plugin *plugin, const struct flow *flow);
+struct amount_msat flow_fee(const struct flow *flow);
 
 /* What fee to we pay for this entire flow set? */
-struct amount_msat flowset_fee(struct plugin *plugin, struct flow **flows);
+struct amount_msat flowset_fee(struct flow **flows);
 
 /* How much does this entire flowset deliver? */
-struct amount_msat flowset_delivers(struct plugin *plugin,
-				    struct flow **flows);
+struct amount_msat flowset_delivers(struct flow **flows);
 
 /* How much CLTV does this flow require? */
 u64 flow_delay(const struct flow *flow);