Skip to content

Commit 7ec3b2e

Browse files
jherrera-jumpjherrera-jump
committed
gui: new boot screen
1 parent 3c8a2a9 commit 7ec3b2e

24 files changed

+1565
-268
lines changed

‎book/api/metrics-generated.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -497,17 +497,6 @@
497497

498498
</div>
499499

500-
## Storei Tile
501-
502-
<div class="metrics">
503-
504-
| Metric | Type | Description |
505-
|--------|------|-------------|
506-
| <span class="metrics-name">storei_&#8203;first_&#8203;turbine_&#8203;slot</span> | gauge | |
507-
| <span class="metrics-name">storei_&#8203;current_&#8203;turbine_&#8203;slot</span> | gauge | |
508-
509-
</div>
510-
511500
## Gossip Tile
512501

513502
<div class="metrics">

‎book/api/websocket.md

Lines changed: 456 additions & 0 deletions
Large diffs are not rendered by default.

‎src/app/firedancer/topology.c

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "../../disco/net/fd_net_tile.h"
88
#include "../../disco/quic/fd_tpu.h"
99
#include "../../disco/tiles.h"
10+
#include "../../disco/plugin/fd_plugin.h"
1011
#include "../../disco/topo/fd_topob.h"
1112
#include "../../disco/topo/fd_cpu_topo.h"
1213
#include "../../util/pod/fd_pod_format.h"
@@ -778,19 +779,19 @@ fd_topo_initialize( config_t * config ) {
778779
fd_topob_wksp( topo, "plugin_out" );
779780
fd_topob_wksp( topo, "plugin" );
780781

781-
/**/ fd_topob_link( topo, "plugin_out", "plugin_out", 128UL, 8UL+40200UL*(58UL+12UL*34UL), 1UL );
782-
/**/ fd_topob_link( topo, "replay_plugi", "plugin_in", 128UL, 4098*8UL, 1UL );
783-
/**/ fd_topob_link( topo, "votes_plugin", "plugin_in", 128UL, 8UL+40200UL*(58UL+12UL*34UL), 1UL );
782+
/**/ fd_topob_link( topo, "plugin_out", "plugin_out", 128UL, 8UL+40200UL*(58UL+12UL*34UL), 1UL );
783+
/**/ fd_topob_link( topo, "replay_plugi", "plugin_in", 128UL, 4098*8UL, 1UL );
784+
/**/ fd_topob_link( topo, "snaprd_plugi", "plugin_in", 128UL, sizeof(fd_restore_snapshot_update_t), 1UL );
784785

785786
/**/ fd_topob_tile( topo, "plugin", "plugin", "metric_in", tile_to_cpu[ topo->tile_cnt ], 0, 0 );
786787

787788
/**/ fd_topob_tile_out( topo, "replay", 0UL, "replay_plugi", 0UL );
788-
/**/ fd_topob_tile_out( topo, "replay", 0UL, "votes_plugin", 0UL );
789-
/**/ fd_topob_tile_out( topo, "plugin", 0UL, "plugin_out", 0UL );
789+
/**/ fd_topob_tile_out( topo, "plugin", 0UL, "plugin_out", 0UL );
790+
/**/ fd_topob_tile_out( topo, "snaprd", 0UL, "snaprd_plugi", 0UL );
790791

791792
/**/ fd_topob_tile_in( topo, "plugin", 0UL, "metric_in", "replay_plugi", 0UL, FD_TOPOB_RELIABLE, FD_TOPOB_POLLED );
792793
/**/ fd_topob_tile_in( topo, "plugin", 0UL, "metric_in", "stake_out", 0UL, FD_TOPOB_RELIABLE, FD_TOPOB_POLLED );
793-
/**/ fd_topob_tile_in( topo, "plugin", 0UL, "metric_in", "votes_plugin", 0UL, FD_TOPOB_RELIABLE, FD_TOPOB_POLLED );
794+
/**/ fd_topob_tile_in( topo, "plugin", 0UL, "metric_in", "snaprd_plugi", 0UL, FD_TOPOB_RELIABLE, FD_TOPOB_POLLED );
794795
}
795796

796797
fd_topob_wksp( topo, "writ_repl" );
@@ -800,8 +801,9 @@ fd_topo_initialize( config_t * config ) {
800801

801802
if( FD_LIKELY( config->tiles.gui.enabled ) ) {
802803
fd_topob_wksp( topo, "gui" );
803-
/**/ fd_topob_tile( topo, "gui", "gui", "metric_in", tile_to_cpu[ topo->tile_cnt ], 0, 1 );
804-
/**/ fd_topob_tile_in( topo, "gui", 0UL, "metric_in", "plugin_out", 0UL, FD_TOPOB_RELIABLE, FD_TOPOB_POLLED );
804+
/**/ fd_topob_tile( topo, "gui", "gui", "metric_in", tile_to_cpu[ topo->tile_cnt ], 0, 1 );
805+
/**/ fd_topob_tile_in( topo, "gui", 0UL, "metric_in", "plugin_out", 0UL, FD_TOPOB_RELIABLE, FD_TOPOB_POLLED );
806+
FOR(shred_tile_cnt) fd_topob_tile_in( topo, "gui", 0UL, "metric_in", "shred_repair", i, FD_TOPOB_RELIABLE, FD_TOPOB_POLLED );
805807
}
806808

807809
FOR(net_tile_cnt) fd_topos_net_tile_finish( topo, i );

‎src/disco/fd_disco_base.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -250,20 +250,21 @@ FD_FN_CONST static inline uint fd_disco_shred_repair_shred_sig_data_cnt ( ulo
250250
251251
*/
252252
FD_FN_CONST static inline ulong
253-
fd_disco_shred_repair_fec_sig( ulong slot, uint fec_set_idx, uint data_cnt, int is_slot_complete, int is_batch_complete ) {
253+
fd_disco_shred_repair_fec_sig( ulong slot, uint fec_set_idx, int is_slot_complete ) {
254254
ulong slot_ul = fd_ulong_min( slot, (ulong)UINT_MAX );
255255
ulong fec_set_idx_ul = fd_ulong_min( (ulong)fec_set_idx, (ulong)FD_SHRED_BLK_MAX );
256-
ulong data_cnt_ul = fd_ulong_min( (ulong)data_cnt, (ulong)FD_SHRED_BLK_MAX );
256+
// ulong data_cnt_ul = fd_ulong_min( (ulong)data_cnt, (ulong)FD_SHRED_BLK_MAX );
257257
ulong is_slot_complete_ul = !!is_slot_complete;
258-
ulong is_batch_complete_ul = !!is_batch_complete;
259-
return slot_ul << 32 | fec_set_idx_ul << 17 | data_cnt_ul << 2 | is_slot_complete_ul << 1 | is_batch_complete_ul;
258+
// ulong is_batch_complete_ul = !!is_batch_complete;
259+
return slot_ul << 32 | fec_set_idx_ul << 17 | is_slot_complete_ul << 16 | USHORT_MAX; // data_cnt_ul << 2 | is_slot_complete_ul << 1 | is_batch_complete_ul;
260260
}
261261

262262
FD_FN_CONST static inline ulong fd_disco_shred_repair_fec_sig_slot ( ulong sig ) { return fd_ulong_extract ( sig, 32, 63 ); }
263263
FD_FN_CONST static inline uint fd_disco_shred_repair_fec_sig_fec_set_idx ( ulong sig ) { return (uint) fd_ulong_extract ( sig, 17, 31 ); }
264-
FD_FN_CONST static inline uint fd_disco_shred_repair_fec_sig_data_cnt ( ulong sig ) { return (uint) fd_ulong_extract ( sig, 2, 16 ); }
265-
FD_FN_CONST static inline int fd_disco_shred_repair_fec_sig_is_slot_complete ( ulong sig ) { return fd_ulong_extract_bit( sig, 1 ); }
266-
FD_FN_CONST static inline int fd_disco_shred_repair_fec_sig_is_batch_complete( ulong sig ) { return fd_ulong_extract_bit( sig, 0 ); }
264+
// FD_FN_CONST static inline uint fd_disco_shred_repair_fec_sig_data_cnt ( ulong sig ) { return (uint) fd_ulong_extract ( sig, 2, 16 ); }
265+
FD_FN_CONST static inline int fd_disco_shred_repair_fec_sig_is_slot_complete ( ulong sig ) { return fd_ulong_extract_bit( sig, 16 ); }
266+
// FD_FN_CONST static inline int fd_disco_shred_repair_fec_sig_is_batch_complete( ulong sig ) { return fd_ulong_extract_bit( sig, 0 ); }
267+
FD_FN_CONST static inline int fd_disco_shred_repair_is_fec_completes ( ulong sig ) { return fd_ulong_extract_lsb( sig, 16 )==USHORT_MAX; }
267268

268269
/* Exclusively used for force completion messages */
269270

0 commit comments

Comments
 (0)