From e09aacd35fed5cf8c9cc7441eab4578e70bdb04b Mon Sep 17 00:00:00 2001 From: Trey Blancher Date: Thu, 31 Aug 2023 22:53:49 -0400 Subject: [PATCH] Set tracking window to 5s, rearranged code so it's alphabetical (IO before MEM) --- monitor.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/monitor.c b/monitor.c index 09a74ee..a84845b 100644 --- a/monitor.c +++ b/monitor.c @@ -6,9 +6,9 @@ #include #include -#define CPU_TRACKING_WINDOW_SECS 1 -#define IO_TRACKING_WINDOW_SECS 1 -#define MEM_TRACKING_WINDOW_SECS 1 +#define CPU_TRACKING_WINDOW_SECS 5 +#define IO_TRACKING_WINDOW_SECS 5 +#define MEM_TRACKING_WINDOW_SECS 5 #define CPU_TRIGGER_THRESHOLD_MS 1000 #define IO_TRIGGER_THRESHOLD_MS 1000 #define MEM_TRIGGER_THRESHOLD_MS 1000 @@ -51,12 +51,13 @@ void setup_polling() { fds[FD_IO_IDX].fd = open(IO_PRESSURE_FILE, O_RDWR | O_NONBLOCK); if (fds[FD_IO_IDX].fd < 0) fatal_error("open(): " IO_PRESSURE_FILE); + /* Let's setup our MEM PSI trigger */ fds[FD_MEM_IDX].fd = open(MEM_PRESSURE_FILE, O_RDWR | O_NONBLOCK); if (fds[FD_MEM_IDX].fd < 0) fatal_error("open(): " MEM_PRESSURE_FILE); - fds[FD_CPU_IDX].events = fds[FD_MEM_IDX].events = fds[FD_IO_IDX].events = POLLPRI; + fds[FD_CPU_IDX].events = fds[FD_IO_IDX].events = fds[FD_MEM_IDX].events = POLLPRI; char trigger[128]; @@ -66,17 +67,17 @@ void setup_polling() { if (write(fds[FD_CPU_IDX].fd, trigger, strlen(trigger) + 1) < 0) fatal_error("write(): " CPU_PRESSURE_FILE); - snprintf(trigger, 128, "some %d %d", MEM_TRIGGER_THRESHOLD_MS * 1000, MEM_TRACKING_WINDOW_SECS * 1000000); - printf("Trigger: %s\n", trigger); - fflush(stdout); - if (write(fds[FD_MEM_IDX].fd, trigger, strlen(trigger) + 1) < 0) - fatal_error("write(): " MEM_PRESSURE_FILE); - snprintf(trigger, 128, "some %d %d", IO_TRIGGER_THRESHOLD_MS * 1000, IO_TRACKING_WINDOW_SECS * 1000000); printf("Trigger: %s\n", trigger); fflush(stdout); if (write(fds[FD_IO_IDX].fd, trigger, strlen(trigger) + 1) < 0) fatal_error("write(): " IO_PRESSURE_FILE); + + snprintf(trigger, 128, "some %d %d", MEM_TRIGGER_THRESHOLD_MS * 1000, MEM_TRACKING_WINDOW_SECS * 1000000); + printf("Trigger: %s\n", trigger); + fflush(stdout); + if (write(fds[FD_MEM_IDX].fd, trigger, strlen(trigger) + 1) < 0) + fatal_error("write(): " MEM_PRESSURE_FILE); } @@ -114,12 +115,12 @@ void wait_for_notification() { printf("CPU PSI event %d triggered.\n", cpu_event_counter++); fflush(stdout); } - else if (i == FD_MEM_IDX) { - printf("MEM PSI event %d triggered.\n", mem_event_counter++); + else if (i == FD_IO_IDX) { + printf("IO PSI event %d triggered.\n", mem_event_counter++); fflush(stdout); } else { - printf("IO PSI event %d triggered.\n", io_event_counter++); + printf("MEM PSI event %d triggered.\n", io_event_counter++); fflush(stdout); } } else {