Skip to content

Commit 600acf2

Browse files
committed
gui: fix cpu timers
1 parent f86cd78 commit 600acf2

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/disco/gui/fd_gui.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1654,13 +1654,13 @@ fd_gui_handle_slot_end( fd_gui_t * gui,
16541654
fd_rng_t rng[ 1 ];
16551655
fd_rng_new( rng, 0UL, 0UL);
16561656

1657-
#define DOWNSAMPLE( a, a_start, a_end, a_capacity, b, b_sz, elt_sz ) (__extension__({ \
1657+
#define DOWNSAMPLE( a, a_start, a_end, a_capacity, b, b_sz ) (__extension__({ \
16581658
ulong __cnt = 0UL; \
16591659
ulong __a_sz = (fd_ulong_if( a_end<a_start, a_end+a_capacity, a_end )-a_start); \
16601660
if( FD_UNLIKELY( __a_sz && b_sz ) ) { \
16611661
for( ulong a_idx=0UL; a_idx<__a_sz && __cnt<b_sz; a_idx++ ) { \
16621662
if( FD_UNLIKELY( fd_rng_float_robust( rng ) > (float)(b_sz-__cnt) / (float)(__a_sz-__cnt) ) ) continue; \
1663-
fd_memcpy( (uchar *)b+(elt_sz*__cnt), (uchar *)a+(elt_sz*((a_start+a_idx)%a_capacity)), elt_sz ); \
1663+
fd_memcpy( b[ __cnt ], a[ ((a_start+a_idx)%a_capacity) ], sizeof(b[ __cnt ]) ); \
16641664
__cnt++; \
16651665
} \
16661666
} \
@@ -1672,17 +1672,15 @@ fd_gui_handle_slot_end( fd_gui_t * gui,
16721672
gui->summary.tile_timers_snap_idx,
16731673
FD_GUI_TILE_TIMER_SNAP_CNT,
16741674
lslot->tile_timers,
1675-
FD_GUI_TILE_TIMER_LEADER_DOWNSAMPLE_CNT,
1676-
sizeof(fd_gui_tile_timers_t) );
1675+
FD_GUI_TILE_TIMER_LEADER_DOWNSAMPLE_CNT );
16771676

16781677
lslot->scheduler_counts_sample_cnt = DOWNSAMPLE(
16791678
gui->summary.scheduler_counts_snap,
16801679
gui->summary.scheduler_counts_snap_idx_slot_start,
16811680
gui->summary.scheduler_counts_snap_idx,
16821681
FD_GUI_SCHEDULER_COUNT_SNAP_CNT,
16831682
lslot->scheduler_counts,
1684-
FD_GUI_SCHEDULER_COUNT_LEADER_DOWNSAMPLE_CNT,
1685-
sizeof(fd_gui_scheduler_counts_t) );
1683+
FD_GUI_SCHEDULER_COUNT_LEADER_DOWNSAMPLE_CNT );
16861684
#undef DOWNSAMPLE
16871685
}
16881686

0 commit comments

Comments
 (0)