6e5cb299dd
Basically, `devtools/reduce-includes.sh */*.c`. Build time from make clean (RUST=0) (includes building external libs): Before: real 0m38.944000-40.416000(40.1131+/-0.4)s user 3m6.790000-17.159000(15.0571+/-2.8)s sys 0m35.304000-37.336000(36.8942+/-0.57)s After: real 0m37.872000-39.974000(39.5466+/-0.59)s user 3m1.211000-14.968000(12.4556+/-3.9)s sys 0m35.008000-36.830000(36.4143+/-0.5)s Build time after touch config.vars (RUST=0): Before: real 0m19.831000-21.862000(21.5528+/-0.58)s user 2m15.361000-30.731000(28.4798+/-4.4)s sys 0m21.056000-22.339000(22.0346+/-0.35)s After: real 0m18.384000-21.307000(20.8605+/-0.92)s user 2m5.585000-26.843000(23.6017+/-6.7)s sys 0m19.650000-22.003000(21.4943+/-0.69)s Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
95 lines
2.4 KiB
C
95 lines
2.4 KiB
C
/* Tool we can use to convert our testing gossip_store files */
|
|
#include "config.h"
|
|
#include <ccan/err/err.h>
|
|
#include <ccan/read_write_all/read_write_all.h>
|
|
#include <common/gossip_store.h>
|
|
#include <common/utils.h>
|
|
#include <gossipd/gossip_store_wiregen.h>
|
|
#include <unistd.h>
|
|
#include <wire/peer_wire.h>
|
|
|
|
/* Current versions we support */
|
|
#define GSTORE_MAJOR 0
|
|
#define GSTORE_MINOR 15
|
|
|
|
/* Obsolete ZOMBIE bit */
|
|
#define GOSSIP_STORE_ZOMBIE_BIT_V13 0x1000U
|
|
|
|
static bool upgrade_field(u8 oldversion,
|
|
be16 *hdr_flags,
|
|
u8 **msg)
|
|
{
|
|
int type = fromwire_peektype(*msg);
|
|
|
|
switch (oldversion) {
|
|
case 10:
|
|
/* Remove old channel_update with no htlc_maximum_msat */
|
|
if (type == WIRE_CHANNEL_UPDATE
|
|
&& tal_bytelen(*msg) == 130) {
|
|
*msg = tal_free(*msg);
|
|
return true;
|
|
}
|
|
/* fall thru */
|
|
case 11:
|
|
case 12:
|
|
/* Remove private entries */
|
|
if (type == WIRE_GOSSIP_STORE_PRIVATE_CHANNEL_OBS) {
|
|
*msg = tal_free(*msg);
|
|
return true;
|
|
} else if (type == WIRE_GOSSIP_STORE_PRIVATE_UPDATE_OBS) {
|
|
*msg = tal_free(*msg);
|
|
return true;
|
|
}
|
|
/* fall thru */
|
|
case 13:
|
|
/* Discard any zombies */
|
|
if (be16_to_cpu(*hdr_flags) & GOSSIP_STORE_ZOMBIE_BIT_V13) {
|
|
*msg = tal_free(*msg);
|
|
return true;
|
|
}
|
|
case 14:
|
|
/* Add completed field */
|
|
*hdr_flags |= CPU_TO_BE16(GOSSIP_STORE_COMPLETED_BIT);
|
|
/* fall thru */
|
|
case 15:
|
|
/* Noop */
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
u8 oldversion, version;
|
|
struct gossip_hdr hdr;
|
|
|
|
setup_locale();
|
|
if (!read_all(STDIN_FILENO, &oldversion, sizeof(oldversion)))
|
|
errx(1, "Empty file");
|
|
|
|
if (GOSSIP_STORE_MAJOR_VERSION(oldversion) != GSTORE_MAJOR)
|
|
errx(1, "Unsupported major gossip_version %u (expected %u)",
|
|
GOSSIP_STORE_MAJOR_VERSION(oldversion), GSTORE_MAJOR);
|
|
|
|
version = ((GSTORE_MAJOR << 5) | GSTORE_MINOR);
|
|
if (!write_all(STDOUT_FILENO, &version, sizeof(version)))
|
|
err(1, "Write error");
|
|
|
|
while (read_all(STDIN_FILENO, &hdr, sizeof(hdr))) {
|
|
u8 *msg;
|
|
msg = tal_arr(NULL, u8, be16_to_cpu(hdr.len));
|
|
if (!read_all(STDIN_FILENO, msg, tal_bytelen(msg)))
|
|
err(1, "truncated file");
|
|
if (!upgrade_field(oldversion, &hdr.flags, &msg))
|
|
errx(1, "Cannot upgrade from version %u", oldversion);
|
|
if (msg) {
|
|
if (!write_all(STDOUT_FILENO, &hdr, sizeof(hdr))
|
|
|| !write_all(STDOUT_FILENO, msg, tal_bytelen(msg)))
|
|
err(1, "Write error");
|
|
tal_free(msg);
|
|
}
|
|
}
|
|
return 0;
|
|
}
|