Skip to content

Commit e3f3194

Browse files
committed
fix(reasm): slot mr removal
1 parent 8bb37a4 commit e3f3194

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/discof/reasm/fd_reasm.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,8 @@ fd_reasm_publish( fd_reasm_t * reasm, fd_hash_t const * merkle_root ) {
422422
}
423423
child = pool_ele( pool, child->sibling ); /* right-sibling */
424424
}
425-
slot_mr_remove( reasm->slot_mr, slot_mr_query( reasm->slot_mr, head->slot, NULL ) /* cannot be NULL*/ );
425+
slot_mr_t * slot_mr = slot_mr_query( reasm->slot_mr, head->slot, NULL );
426+
if( FD_UNLIKELY( slot_mr ) ) slot_mr_remove( reasm->slot_mr, slot_mr ); /* only first FEC */
426427

427428
fd_reasm_fec_t * next = pool_ele( pool, head->next ); /* pophead */
428429
pool_ele_release( pool, head ); /* release */

src/discof/repair/fd_repair_tile.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
#include "../reasm/fd_reasm.h"
6767

6868
#define LOGGING 1
69-
#define DEBUG_LOGGING 1
69+
#define DEBUG_LOGGING 0
7070

7171
#define IN_KIND_CONTACT (0)
7272
#define IN_KIND_NET (1)
@@ -1085,7 +1085,7 @@ during_housekeeping( fd_repair_tile_ctx_t * ctx ) {
10851085

10861086
# if DEBUG_LOGGING
10871087
long now = fd_log_wallclock();
1088-
if( FD_UNLIKELY( now - ctx->tsprint > (long)5e9 ) ) {
1088+
if( FD_UNLIKELY( now - ctx->tsprint > (long)30e9 ) ) {
10891089
fd_forest_print( ctx->forest );
10901090
fd_reasm_print( ctx->reasm );
10911091
ctx->tsprint = fd_log_wallclock();

0 commit comments

Comments
 (0)