aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-20 23:54:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

utils: remove tal_tmpctx altogether, use global.

Browse Source 
In particular, we now only free tmpctx at the end of main().

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-03-15 16:40:20 +10:30
parent 40fe5b7bac
commit 0a6e3d1e13
45 changed files with 115 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
gossipd/routing.c
View File

@@ -893,7 +893,6 @@ u8 *handle_channel_update(struct routing_state *rstate, const u8 *update)
u64 htlc_minimum_msat;
u32 fee_base_msat;
u32 fee_proportional_millionths;
const tal_t *tmpctx = tal_tmpctx(rstate);
struct bitcoin_blkid chain_hash;
struct chan *chan;
u8 direction;
@@ -909,7 +908,6 @@ u8 *handle_channel_update(struct routing_state *rstate, const u8 *update)
err = towire_errorfmt(rstate, NULL,
"Malformed channel_update %s",
tal_hex(tmpctx, serialized));
tal_free(tmpctx);
return err;
}
direction = flags & 0x1;
@@ -923,7 +921,6 @@ u8 *handle_channel_update(struct routing_state *rstate, const u8 *update)
status_trace("Received channel_update for unknown chain %s",
type_to_string(tmpctx, struct bitcoin_blkid,
&chain_hash));
tal_free(tmpctx);
return NULL;
}
@@ -937,7 +934,6 @@ u8 *handle_channel_update(struct routing_state *rstate, const u8 *update)
if (pending) {
update_pending(pending,
timestamp, serialized, direction);
tal_free(tmpctx);
return NULL;
}
@@ -945,7 +941,6 @@ u8 *handle_channel_update(struct routing_state *rstate, const u8 *update)
SUPERVERBOSE("Ignoring update for unknown channel %s",
type_to_string(tmpctx, struct short_channel_id,
&short_channel_id));
tal_free(tmpctx);
return NULL;
}
}
@@ -954,7 +949,6 @@ u8 *handle_channel_update(struct routing_state *rstate, const u8 *update)
if (c->last_timestamp >= timestamp) {
SUPERVERBOSE("Ignoring outdated update.");
tal_free(tmpctx);
return NULL;
}
@@ -970,7 +964,6 @@ u8 *handle_channel_update(struct routing_state *rstate, const u8 *update)
* - MUST NOT process the message further.
* - SHOULD fail the connection.
*/
tal_free(tmpctx);
return err;
}
@@ -992,7 +985,6 @@ u8 *handle_channel_update(struct routing_state *rstate, const u8 *update)
&chan->half[direction].channel_update_msgidx,
take(serialized));
tal_free(tmpctx);
return NULL;
}
@@ -1041,7 +1033,6 @@ u8 *handle_node_announcement(struct routing_state *rstate, const u8 *node_ann)
u8 rgb_color[3];
u8 alias[32];
u8 *features, *addresses;
const tal_t *tmpctx = tal_tmpctx(rstate);
struct wireaddr *wireaddrs;
struct pending_node_announce *pna;
size_t len = tal_len(node_ann);
@@ -1060,7 +1051,6 @@ u8 *handle_node_announcement(struct routing_state *rstate, const u8 *node_ann)
u8 *err = towire_errorfmt(rstate, NULL,
"Malformed node_announcement %s",
tal_hex(tmpctx, node_ann));
tal_free(tmpctx);
return err;
}
@@ -1074,7 +1064,6 @@ u8 *handle_node_announcement(struct routing_state *rstate, const u8 *node_ann)
status_trace("Ignoring node announcement for node %s, unsupported features %s.",
type_to_string(tmpctx, struct pubkey, &node_id),
tal_hex(tmpctx, features));
tal_free(tmpctx);
return NULL;
}
@@ -1099,7 +1088,6 @@ u8 *handle_node_announcement(struct routing_state *rstate, const u8 *node_ann)
struct sha256_double,
&hash),
tal_hex(tmpctx, node_ann));
tal_free(tmpctx);
return err;
}
@@ -1115,7 +1103,6 @@ u8 *handle_node_announcement(struct routing_state *rstate, const u8 *node_ann)
"Malformed wireaddrs %s in %s.",
tal_hex(tmpctx, wireaddrs),
tal_hex(tmpctx, node_ann));
tal_free(tmpctx);
return err;
}
@@ -1135,7 +1122,6 @@ u8 *handle_node_announcement(struct routing_state *rstate, const u8 *node_ann)
tal_free(pna->node_announcement);
pna->node_announcement = tal_dup_arr(pna, u8, node_ann, tal_len(node_ann), 0);
}
tal_free(tmpctx);
return NULL;
}
@@ -1151,11 +1137,9 @@ u8 *handle_node_announcement(struct routing_state *rstate, const u8 *node_ann)
"node %s preceded by at least "
"channel_announcement?",
type_to_string(tmpctx, struct pubkey, &node_id));
tal_free(tmpctx);
return NULL;
} else if (node->last_timestamp >= timestamp) {
SUPERVERBOSE("Ignoring node announcement, it's outdated.");
tal_free(tmpctx);
return NULL;
}
@@ -1174,11 +1158,10 @@ u8 *handle_node_announcement(struct routing_state *rstate, const u8 *node_ann)
replace_broadcast(node, rstate->broadcasts,
&node->node_announce_msgidx,
take(serialized));
tal_free(tmpctx);
return NULL;
}
struct route_hop *get_route(tal_t *ctx, struct routing_state *rstate,
struct route_hop *get_route(const tal_t *ctx, struct routing_state *rstate,
const struct pubkey *source,
const struct pubkey *destination,
const u32 msatoshi, double riskfactor,
@@ -1258,7 +1241,6 @@ void routing_failure(struct routing_state *rstate,
enum onion_type failcode,
const u8 *channel_update)
{
const tal_t *tmpctx = tal_tmpctx(rstate);
struct node *node;
int i;
time_t now = time_now().ts.tv_sec;
@@ -1277,7 +1259,7 @@ void routing_failure(struct routing_state *rstate,
erring_node_pubkey));
/* No node, so no channel, so any channel_update
* can also be ignored. */
goto out;
return;
}
/* BOLT #4:
@@ -1325,12 +1307,12 @@ void routing_failure(struct routing_state *rstate,
/* Suppress UNUSUAL log if local failure */
if (structeq(&erring_node_pubkey->pubkey,
&rstate->local_id.pubkey))
goto out;
return;
status_unusual("routing_failure: "
"UPDATE bit set, no channel_update. "
"failcode: 0x%04x",
(int) failcode);
goto out;
return;
}
err = handle_channel_update(rstate, channel_update);
if (err) {
@@ -1338,7 +1320,7 @@ void routing_failure(struct routing_state *rstate,
"bad channel_update %s",
sanitize_error(err, err, NULL));
tal_free(err);
goto out;
return;
}
} else {
if (tal_len(channel_update) != 0)
@@ -1347,15 +1329,11 @@ void routing_failure(struct routing_state *rstate,
"failcode: 0x%04x",
(int) failcode);
}
out:
tal_free(tmpctx);
}
void mark_channel_unroutable(struct routing_state *rstate,
const struct short_channel_id *channel)
{
const tal_t *tmpctx = tal_tmpctx(rstate);
struct chan *chan;
time_t now = time_now().ts.tv_sec;
const char *scid = type_to_string(tmpctx, struct short_channel_id,
@@ -1369,12 +1347,10 @@ void mark_channel_unroutable(struct routing_state *rstate,
status_unusual("mark_channel_unroutable: "
"channel %s not in routemap",
scid);
tal_free(tmpctx);
return;
}
chan->half[0].unroutable_until = now + 20;
chan->half[1].unroutable_until = now + 20;
tal_free(tmpctx);
}
void route_prune(struct routing_state *rstate)
@@ -1382,7 +1358,7 @@ void route_prune(struct routing_state *rstate)
u64 now = time_now().ts.tv_sec;
/* Anything below this highwater mark ought to be pruned */
const s64 highwater = now - rstate->prune_timeout;
const tal_t *pruned = tal_tmpctx(rstate);
const tal_t *pruned = tal(NULL, char);
struct chan *chan;
u64 idx;