gui: add end slot reason, blockhash

Author: jherrera-jump

book/api/websocket.md

@@ -2051,6 +2051,8 @@ explicitly mentioned, skipped slots are not included.
             "max_total_microblocks": 32768
         },
         "scheduler_stats": {
+            "end_slot_reason": "timeout",
+            "block_hash": "9cjSTpZ82xeHouc3sDEzsQ8yZHKjvc8o46EstxfrprD1",
             "slot_schedule_counts": [123, 123, 123, 123, 123, 123, 123],
             "end_slot_schedule_counts": [0, 10, 0, 0, 0, 0, 0],
             "pending_smallest_cost": 3000,
@@ -2190,6 +2192,8 @@ explicitly mentioned, skipped slots are not included.
 **`SlotScheduleStats`**
 | Field                        | Type              | Description |
 |------------------------------|-------------------|-------------|
+| block_hash                   | `string`          | The final POH hash in the block as a base58 encoded string |
+| end_slot_reason              | `string`          | The reason pack ended packing for this leader slot. One of `"timeout"`, `"microblock_limit"`, or `"leader_switch"` |
 | slot_schedule_counts         | `number[]`        | `slot_schedule_counts[i]` is the number of transactions across the leader slot that had `["success", "fail_taken", "fail_fast_path", "fail_byte_limit", "fail_write_cost", "fail_slow_path", "fail_defer_skip"][i]` as the outcome after being scheduled. "success" means the transaction was successfully scheduled to a bank. "fail_cu_limit" means Pack skipped the transaction because it would have exceeded the block CU limit. "fail_fast_path" means Pack skipped the transaction because of account conflicts using the fast bitvector check. "fail_byte_limit" means Pack skipped the transaction because it would have exceeded the block data size limit. "fail_write_cost" means Pack skipped the transaction because it would have caused a writable account to exceed the per-account block write cost limit. "fail_slow_path" means Pack skipped the transaction because of account conflicts using the full slow check. "fail_defer_skip" means Pack skipped the transaction it previously exceeded the per-account block write cost limit too many times |
 | end_slot_schedule_counts     | `number[]`        | `end_slot_schedule_counts` has the same meaning as `slot_schedule_counts` except only transactions that occur after the last successfully scheduled transaction in the slot are counted |
 | pending_smallest_cost        | `number`          | The cost in compute units of the smallest eligible non-vote transaction in pack's transaction buffer at the end of the slot.  If the buffer is empty, then this is `null` |

src/disco/gui/fd_gui.c

@@ -1498,6 +1498,7 @@ fd_gui_clear_slot( fd_gui_t *      gui,
     fd_gui_leader_slot_t * lslot = gui->leader_slots[ slot->leader_history_idx % FD_GUI_LEADER_CNT ];
 
     lslot->slot                        = _slot;
+    memset( lslot->block_hash.uc, 0, sizeof(fd_hash_t) );
     lslot->leader_start_time           = LONG_MAX;
     lslot->leader_end_time             = LONG_MAX;
     lslot->tile_timers_sample_cnt      = 0UL;
@@ -2563,6 +2564,7 @@ fd_gui_handle_tower_update( fd_gui_t *                   gui,
 void
 fd_gui_handle_replay_update( fd_gui_t *                gui,
                              fd_gui_slot_completed_t * slot_completed,
+                             fd_hash_t const *         block_hash,
                              long                      now ) {
   (void)now;
 
@@ -2580,6 +2582,11 @@ fd_gui_handle_replay_update( fd_gui_t *                gui,
     slot = fd_gui_clear_slot( gui, slot_completed->slot, slot_completed->parent_slot );
   }
 
+  if( FD_UNLIKELY( slot->mine ) ) {
+    fd_gui_leader_slot_t * lslot = fd_gui_get_leader_slot( gui, slot->slot );
+    if( FD_LIKELY( lslot ) ) fd_memcpy( lslot->block_hash.uc, block_hash->uc, sizeof(fd_hash_t) );
+  }
+
   slot->completed_time    = slot_completed->completed_time;
   slot->parent_slot       = slot_completed->parent_slot;
   slot->max_compute_units = fd_uint_if( slot_completed->max_compute_units==UINT_MAX, slot->max_compute_units, slot_completed->max_compute_units );

src/disco/gui/fd_gui.h

@@ -259,6 +259,7 @@ typedef struct fd_gui_scheduler_counts fd_gui_scheduler_counts_t;
 
 struct fd_gui_leader_slot {
   ulong slot;
+  fd_hash_t block_hash;
   long  leader_start_time; /* UNIX timestamp of when we first became leader in this slot */
   long  leader_end_time;   /* UNIX timestamp of when we stopped being leader in this slot */
 
@@ -856,6 +857,7 @@ fd_gui_handle_tower_update( fd_gui_t *                   gui,
 void
 fd_gui_handle_replay_update( fd_gui_t *                gui,
                              fd_gui_slot_completed_t * slot_completed,
+                             fd_hash_t const *         block_hash,
                              long                      now );
 
 void

src/disco/gui/fd_gui_printf.c

@@ -1552,6 +1552,25 @@ fd_gui_printf_slot_transactions_request( fd_gui_t * gui,
         jsonp_close_object( gui->http );
 
         jsonp_open_object( gui->http, "scheduler_stats" );
+          char block_hash_base58[ FD_BASE58_ENCODED_32_SZ ];
+          fd_base58_encode_32( lslot->block_hash.uc, NULL, block_hash_base58 );
+          jsonp_string( gui->http, "block_hash", block_hash_base58 );
+
+          switch( lslot->scheduler_stats->end_slot_reason ) {
+            case FD_PACK_END_SLOT_REASON_TIME: {
+              jsonp_string( gui->http, "end_slot_reason", "timeout" );
+              break;
+            }
+            case FD_PACK_END_SLOT_REASON_MICROBLOCK: {
+              jsonp_string( gui->http, "end_slot_reason", "microblock_limit" );
+              break;
+            }
+            case FD_PACK_END_SLOT_REASON_LEADER_SWITCH: {
+              jsonp_string( gui->http, "end_slot_reason", "leader_switch" );
+              break;
+            }
+            default: FD_LOG_ERR(( "unreachable" ));
+          }
           jsonp_open_array( gui->http, "slot_schedule_counts" );
             for( ulong i = 0; i<FD_METRICS_COUNTER_PACK_TRANSACTION_SCHEDULE_CNT; i++ ) jsonp_ulong( gui->http, NULL, lslot->scheduler_stats->block_results[ i ] );
           jsonp_close_array( gui->http );

src/disco/gui/fd_gui_tile.c

@@ -417,7 +417,7 @@ after_frag( fd_gui_ctx_t *      ctx,
         fd_gui_peers_handle_vote_update( ctx->peers, ctx->peers->votes, vote_count, fd_clock_now( ctx->clock ), ctx->gui->ipinfo.country_code );
 
         /* update slot data */
-        fd_gui_handle_replay_update( ctx->gui, &slot_completed, fd_clock_now( ctx->clock ) );
+        fd_gui_handle_replay_update( ctx->gui, &slot_completed, &replay->block_hash, fd_clock_now( ctx->clock ) );
 
       } else if( FD_UNLIKELY( sig==REPLAY_SIG_BECAME_LEADER ) ) {
         fd_became_leader_t * became_leader = (fd_became_leader_t *)src;

src/disco/pack/fd_pack_tile.c

@@ -397,8 +397,9 @@ log_end_block_metrics( fd_pack_ctx_t * ctx,
 }
 
 static inline void
-get_done_packing( fd_pack_ctx_t * ctx, fd_done_packing_t * done_packing ) {
+get_done_packing( fd_pack_ctx_t * ctx, fd_done_packing_t * done_packing, int reason ) {
     done_packing->microblocks_in_slot = ctx->slot_microblock_cnt;
+    done_packing->end_slot_reason = reason;
     fd_pack_get_block_limits( ctx->pack, done_packing->limits_usage, done_packing->limits );
 
 #define DELTA( mem, m ) (fd_metrics_tl[ MIDX(COUNTER, PACK, TRANSACTION_SCHEDULE_##m) ] - ctx->mem->sched_results[ FD_METRICS_ENUM_PACK_TXN_SCHEDULE_V_##m##_IDX ])
@@ -574,7 +575,7 @@ after_credit( fd_pack_ctx_t *     ctx,
     *charge_busy = 1;
 
     fd_done_packing_t * done_packing = fd_chunk_to_laddr( ctx->poh_out_mem, ctx->poh_out_chunk );
-    get_done_packing( ctx, done_packing ); /* needs to be called before fd_pack_end_block */
+    get_done_packing( ctx, done_packing, FD_PACK_END_SLOT_REASON_TIME ); /* needs to be called before fd_pack_end_block */
     fd_pack_end_block( ctx->pack );
     fd_pack_get_top_writers( ctx->pack, done_packing->limits_usage->top_writers ); /* needs to be called after fd_pack_end_block */
 
@@ -813,7 +814,7 @@ after_credit( fd_pack_ctx_t *     ctx,
     FD_MCNT_INC( PACK, MICROBLOCK_PER_BLOCK_LIMIT, 1UL );
 
     fd_done_packing_t * done_packing = fd_chunk_to_laddr( ctx->poh_out_mem, ctx->poh_out_chunk );
-    get_done_packing( ctx, done_packing );
+    get_done_packing( ctx, done_packing, FD_PACK_END_SLOT_REASON_MICROBLOCK );
     fd_pack_end_block( ctx->pack );
     fd_pack_get_top_writers( ctx->pack, done_packing->limits_usage->top_writers );
 
@@ -1027,7 +1028,7 @@ after_frag( fd_pack_ctx_t *     ctx,
 
     if( FD_UNLIKELY( ctx->leader_slot!=ULONG_MAX ) ) {
       fd_done_packing_t * done_packing = fd_chunk_to_laddr( ctx->poh_out_mem, ctx->poh_out_chunk );
-      get_done_packing( ctx, done_packing );
+      get_done_packing( ctx, done_packing, FD_PACK_END_SLOT_REASON_LEADER_SWITCH );
       fd_pack_end_block( ctx->pack );
       fd_pack_get_top_writers( ctx->pack, done_packing->limits_usage->top_writers );
 

src/disco/tiles.h

@@ -149,6 +149,10 @@ struct fd_microblock_trailer {
 };
 typedef struct fd_microblock_trailer fd_microblock_trailer_t;
 
+#define FD_PACK_END_SLOT_REASON_TIME          (1)
+#define FD_PACK_END_SLOT_REASON_MICROBLOCK    (2)
+#define FD_PACK_END_SLOT_REASON_LEADER_SWITCH (3)
+
 struct fd_done_packing {
   ulong microblocks_in_slot;
 
@@ -160,6 +164,8 @@ struct fd_done_packing {
 
   fd_pack_smallest_t pending_smallest[ 1 ];
   fd_pack_smallest_t pending_votes_smallest[ 1 ];
+
+  int end_slot_reason;
 };
 typedef struct fd_done_packing fd_done_packing_t;