Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: make monitor more readable #3702

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: make monitor more readable #3702

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
84fd7c0
fix: make monitor more readable
anoushk1234 Dec 17, 2024
67e0461
Update src/app/fdctl/monitor/monitor.c
anoushk1234 Dec 20, 2024
ee87073
move key event logic to monitor.c
anoushk1234 Jan 7, 2025
f88cf8d
remove helper function
anoushk1234 Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions src/app/fdctl/monitor/monitor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#include <signal.h>
#include <sys/syscall.h>
#include <linux/capability.h>
#include <termios.h>
#include <fcntl.h>

void
monitor_cmd_args( int * pargc,
Expand Down Expand Up @@ -293,8 +295,20 @@ run_monitor( config_t * const config,
if( FD_UNLIKELY( (ulong)n>=buf_sz ) ) FD_LOG_ERR(( "snprintf truncated" )); \
buf += n; buf_sz -= (ulong)n; \
} while(0)

ulong line_count = 0;
int monitor_pane = 0;
/* Disables character echo and canonical mode since we want the input to be processes immediately.*/
struct termios terminal_config;
if( FD_UNLIKELY( 0!=tcgetattr(STDIN_FILENO, &terminal_config) ) ) FD_LOG_ERR(( "tcgetattr failed" ));

terminal_config.c_lflag &= (tcflag_t)~(ICANON | ECHO);
if( FD_UNLIKELY( 0!=tcsetattr(STDIN_FILENO, TCSANOW, &terminal_config) ) ) FD_LOG_ERR(( "tcsetattr failed" ));

/* Terminal also set to non blocking in case the user doesn't send any input. */
int terminal_flag = fcntl(STDIN_FILENO, F_GETFL, 0);
if( FD_UNLIKELY( -1==terminal_flag ) ) FD_LOG_ERR(( "fcntl get flag failed" ));
if( FD_UNLIKELY( -1==fcntl(STDIN_FILENO, F_SETFL, terminal_flag | O_NONBLOCK) ) ) FD_LOG_ERR(( "fcntl set flag failed" ));

for(;;) {
/* Wait a somewhat randomized amount and then make a diagnostic
snapshot */
Expand All @@ -310,8 +324,9 @@ run_monitor( config_t * const config,
char * buf = buffer;
ulong buf_sz = FD_MONITOR_TEXT_BUF_SZ;


/* move to beginning of line, n lines ago */
PRINT( "\033[%luF", line_count );
PRINT( "\033[2J\033[%luF", line_count );

/* drain any firedancer log messages into the terminal */
if( FD_UNLIKELY( drain_output_fd >= 0 ) ) drain_to_buffer( &buf, &buf_sz, drain_output_fd );
Expand All @@ -324,11 +339,13 @@ run_monitor( config_t * const config,

char * mon_start = buf;
if( FD_UNLIKELY( drain_output_fd >= 0 ) ) PRINT( TEXT_NEWLINE );
if( FD_UNLIKELY(getchar() == '\t') ) monitor_pane = !monitor_pane;

long dt = now-then;

char now_cstr[ FD_LOG_WALLCLOCK_CSTR_BUF_SZ ];
PRINT( "snapshot for %s" TEXT_NEWLINE, fd_log_wallclock_cstr( now, now_cstr ) );
if( !monitor_pane ){
PRINT( "snapshot for %s | Use TAB to switch panes" TEXT_NEWLINE, fd_log_wallclock_cstr( now, now_cstr ) );
PRINT( " tile | pid | stale | heart | nivcsw | nvcsw | in backp | backp cnt | %% hkeep | %% wait | %% backp | %% finish" TEXT_NEWLINE );
PRINT( "---------+---------+------------+-------+---------------------+---------------------+----------+---------------------+----------+----------+----------+----------" TEXT_NEWLINE );
for( ulong tile_idx=0UL; tile_idx<topo->tile_cnt; tile_idx++ ) {
Expand Down Expand Up @@ -361,7 +378,7 @@ run_monitor( config_t * const config,
PRINT( " | " ); printf_pct( &buf, &buf_sz, cur_processing_ticks, prv_processing_ticks, 0., tile_total_ticks( cur ), tile_total_ticks( prv ), DBL_MIN );
PRINT( TEXT_NEWLINE );
}
PRINT( TEXT_NEWLINE );
} else {
PRINT( " link | tot TPS | tot bps | uniq TPS | uniq bps | ha tr%% | uniq bw%% | filt tr%% | filt bw%% | ovrnp cnt | ovrnr cnt | slow cnt | tx seq" TEXT_NEWLINE );
PRINT( "------------------+----------+----------+----------+----------+----------+----------+----------+----------+---------------------+---------------------+---------------------+-------------------" TEXT_NEWLINE );

Expand Down Expand Up @@ -404,7 +421,8 @@ run_monitor( config_t * const config,
}
}


}
fd_log_sleep(dt);
if( FD_UNLIKELY( with_sankey ) ) {
/* We only need to count from one of the benchs, since they both receive
all of the transactions. */
Expand Down Expand Up @@ -573,7 +591,6 @@ monitor_cmd_fn( args_t * args,
uint drain_output_fd = args->monitor.drain_output_fd >= 0 ? (uint)args->monitor.drain_output_fd : (uint)-1;
populate_sock_filter_policy_monitor( 128UL, seccomp_filter, (uint)fd_log_private_logfile_fd(), drain_output_fd );

if( FD_UNLIKELY( close( STDIN_FILENO ) ) ) FD_LOG_ERR(( "close(0) failed (%i-%s)", errno, fd_io_strerror( errno ) ));
if( FD_UNLIKELY( close( config->log.lock_fd ) ) ) FD_LOG_ERR(( "close() failed (%i-%s)", errno, fd_io_strerror( errno ) ));

if( FD_LIKELY( config->development.sandbox ) ) {
Expand Down