diff --git a/common/gossmap.c b/common/gossmap.c index 685bdd4a1..c0ea7e6ca 100644 --- a/common/gossmap.c +++ b/common/gossmap.c @@ -1868,17 +1868,3 @@ void gossmap_disable_mmap(struct gossmap *map) munmap(map->mmap, map->map_size); map->mmap = NULL; } - -const u8 *gossmap_fetch_tail(const tal_t *ctx, const struct gossmap *map) -{ - size_t len; - u8 *p; - - /* Shouldn't happen... */ - if (map->map_end > map->map_size) - return NULL; - len = map->map_size - map->map_end; - p = tal_arr(ctx, u8, len); - map_copy(map, map->map_size, p, len); - return p; -} diff --git a/common/gossmap.h b/common/gossmap.h index a7c005861..ef3b71a6d 100644 --- a/common/gossmap.h +++ b/common/gossmap.h @@ -308,7 +308,4 @@ u64 gossmap_lengths(const struct gossmap *map, u64 *total); /* Debugging: connectd wants to enumerate fds */ int gossmap_fd(const struct gossmap *map); - -/* Fetch unprocessed part of gossmap */ -const u8 *gossmap_fetch_tail(const tal_t *ctx, const struct gossmap *map); #endif /* LIGHTNING_COMMON_GOSSMAP_H */ diff --git a/gossipd/gossmap_manage.c b/gossipd/gossmap_manage.c index 29b0a8db1..ed24fe9a6 100644 --- a/gossipd/gossmap_manage.c +++ b/gossipd/gossmap_manage.c @@ -1434,20 +1434,15 @@ struct gossmap *gossmap_manage_get_gossmap(struct gossmap_manage *gm) " used=%"PRIu64" seen=%"PRIu64" written=%"PRIu64, map_used, map_size, written_len); } else if (map_size != map_used) { - const u8 *remainder_fd, *remainder_mmap; + const u8 *remainder_fd; - /* Sigh. Did gossmap see something different (via mmap) - * from what we see via read? It's possible it's caught up - * now, but just in case, log BOTH */ - remainder_mmap = gossmap_fetch_tail(tmpctx, gm->raw_gossmap); remainder_fd = fetch_tail_fd(tmpctx, gossmap_fd(gm->raw_gossmap), map_used, map_size); status_failed(STATUS_FAIL_INTERNAL_ERROR, "Gossmap failed to process entire gossip_store: " - "at %"PRIu64" of %"PRIu64" remaining_mmap=%s remaining_fd=%s", + "at %"PRIu64" of %"PRIu64" remaining_fd=%s", map_used, map_size, - tal_hex(tmpctx, remainder_mmap), tal_hex(tmpctx, remainder_fd)); }