gossipd: remove broadcast map altogether.

This clarifies things a fair bit: we simply add and remove from the
gossip_store directly.

Before this series: (--disable-developer, -Og)
    store_load_msec:20669-20902(20822.2+/-82)
    vsz_kb:439704-439712(439706+/-3.2)
    listnodes_sec:0.890000-1.000000(0.92+/-0.04)
    listchannels_sec:11.960000-13.380000(12.576+/-0.49)
    routing_sec:3.070000-5.970000(4.814+/-1.2)
    peer_write_all_sec:28.490000-30.580000(29.532+/-0.78)

After: (--disable-developer, -Og)
    store_load_msec:19722-20124(19921.6+/-1.4e+02)
    vsz_kb:288320
    listnodes_sec:0.860000-0.980000(0.912+/-0.056)
    listchannels_sec:10.790000-12.260000(11.65+/-0.5)
    routing_sec:2.540000-4.950000(4.262+/-0.88)
    peer_write_all_sec:17.570000-19.500000(18.048+/-0.73)

Signed-off-by: Rusty Russell <[email protected]>

gossipd/Makefile

@@ -12,13 +12,13 @@ LIGHTNINGD_GOSSIP_CONTROL_SRC := gossipd/gen_gossip_wire.c
 LIGHTNINGD_GOSSIP_CONTROL_OBJS := $(LIGHTNINGD_GOSSIP_CONTROL_SRC:.c=.o)
 
 # gossipd needs these:
-LIGHTNINGD_GOSSIP_HEADERS := gossipd/gen_gossip_wire.h \
+LIGHTNINGD_GOSSIP_HEADERS_WSRC := gossipd/gen_gossip_wire.h \
 	gossipd/gen_gossip_peerd_wire.h \
 	gossipd/gen_gossip_store.h			\
 	gossipd/gossip_store.h				\
-	gossipd/routing.h				\
-	gossipd/broadcast.h
-LIGHTNINGD_GOSSIP_SRC := $(LIGHTNINGD_GOSSIP_HEADERS:.h=.c) gossipd/gossipd.c
+	gossipd/routing.h
+LIGHTNINGD_GOSSIP_HEADERS := $(LIGHTNINGD_GOSSIP_HEADERS_WSRC) gossipd/broadcast.h
+LIGHTNINGD_GOSSIP_SRC := $(LIGHTNINGD_GOSSIP_HEADERS_WSRC:.h=.c) gossipd/gossipd.c
 LIGHTNINGD_GOSSIP_OBJS := $(LIGHTNINGD_GOSSIP_SRC:.c=.o)
 
 # Make sure these depend on everything.

gossipd/broadcast.h

@@ -2,15 +2,10 @@
 #define LIGHTNING_GOSSIPD_BROADCAST_H
 #include "config.h"
 
-#include <ccan/intmap/intmap.h>
 #include <ccan/list/list.h>
 #include <ccan/short_types/short_types.h>
 #include <ccan/tal/tal.h>
 
-/* Common functionality to implement staggered broadcasts with replacement. */
-
-struct routing_state;
-
 /* This is nested inside a node, chan or half_chan; rewriting the store can
  * cause it to change! */
 struct broadcastable {
@@ -20,64 +15,8 @@ struct broadcastable {
 	u32 timestamp;
 };
 
-struct broadcast_state {
-	UINTMAP(struct broadcastable *) broadcasts;
-	size_t count;
-	struct gossip_store *gs;
-	struct list_head *peers;
-};
-
 static inline void broadcastable_init(struct broadcastable *bcast)
 {
 	bcast->index = 0;
 }
-
-struct broadcast_state *new_broadcast_state(struct routing_state *rstate,
-					    struct gossip_store *gs,
-					    struct list_head *peers);
-
-/**
- * Append a queued message for broadcast.
- * @bstate: the broadcast state, will be replaced if we compact the store.
- * @msg: the message to append.
- * @addendum: an extra message (for GOSSIP_STORE_CHANNEL_AMOUNT after announce)
- * @bcast: broadcast location.
- *
- * If @bcast.index is 0, it is written into the store and set.
- * @bcast.timestamp must be set, and non-zero.
- */
-void insert_broadcast(struct broadcast_state **bstate,
-		      const u8 *msg,
-		      const u8 *addendum,
-		      struct broadcastable *bcast);
-
-/* Add to broadcast, but not store: for gossip store compaction. */
-void insert_broadcast_nostore(struct broadcast_state *bstate,
-			      struct broadcastable *bcast);
-
-/* Delete a broadcast: not usually needed, since destructor does it */
-void broadcast_del(struct broadcast_state *bstate,
-		   struct broadcastable *bcast);
-
-/* Return the next broadcastable entry; doesn't load it. */
-struct broadcastable *next_broadcast_raw(struct broadcast_state *bstate,
-					 u32 *last_index);
-
-/* Return the broadcast with index >= *last_index, timestamp >= min and <= max
- * and update *last_index.
- * There's no broadcast with index 0. */
-struct broadcastable *next_broadcast(struct broadcast_state *bstate,
-				     u32 timestamp_min, u32 timestamp_max,
-				     u32 *last_index);
-
-/* index of last entry. */
-u64 broadcast_final_index(const struct broadcast_state *bstate);
-
-/* Returns b if all OK, otherwise aborts if abortstr non-NULL, otherwise returns
- * NULL. */
-struct broadcast_state *broadcast_state_check(struct broadcast_state *b,
-					      const char *abortstr);
-
-/* Callback for after we compacted the store */
-void update_peers_broadcast_index(struct list_head *peers, u32 offset);
 #endif /* LIGHTNING_GOSSIPD_BROADCAST_H */