Skip to content

Fix MMU cache statistics signal handling #114

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

Merged
jserv merged 1 commit into from
Nov 6, 2025
Merged

Fix MMU cache statistics signal handling #114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 20 additions & 7 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <getopt.h>
#include <inttypes.h>
#include <poll.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down Expand Up @@ -1007,7 +1008,6 @@ static int semu_step(emu_state_t *emu)
}

#ifdef MMU_CACHE_STATS
static vm_t *global_vm_for_signal = NULL;
static volatile sig_atomic_t signal_received = 0;

/* Forward declaration */
Expand Down Expand Up @@ -1152,11 +1152,11 @@ static int semu_run(emu_state_t *emu)

while (!emu->stopped) {
#ifdef MMU_CACHE_STATS
/* Check if signal received (SIGINT/SIGTERM) */
if (signal_received) {
print_mmu_cache_stats(&emu->vm);
return 0;
}
/* Check if signal received (SIGINT/SIGTERM).
* Break to cleanup resources, stats printed at end of main().
*/
if (signal_received)
break;
#endif
/* Only need fds for timer and UART (no coroutine I/O) */
size_t needed = 2;
Expand Down Expand Up @@ -1345,6 +1345,13 @@ static int semu_run(emu_state_t *emu)

/* Single-hart mode: use original scheduling */
while (!emu->stopped) {
#ifdef MMU_CACHE_STATS
/* Check if signal received (SIGINT/SIGTERM).
* Break to exit loop, stats printed at end of main().
*/
if (signal_received)
break;
#endif
#if SEMU_HAS(VIRTIONET)
int i = 0;
if (emu->vnet.peer.type == NETDEV_IMPL_user && boot_complete) {
Expand Down Expand Up @@ -1422,6 +1429,13 @@ static gdb_action_t semu_cont(void *args)
{
emu_state_t *emu = (emu_state_t *) args;
while (!semu_is_interrupt(emu)) {
#ifdef MMU_CACHE_STATS
/* Check if signal received (SIGINT/SIGTERM).
* Break to return control to gdbstub, stats printed at end of main().
*/
if (signal_received)
break;
#endif
semu_step(emu);
}

Expand Down Expand Up @@ -1507,7 +1521,6 @@ int main(int argc, char **argv)
return ret;

#ifdef MMU_CACHE_STATS
global_vm_for_signal = &emu.vm;
signal(SIGINT, signal_handler_stats);
signal(SIGTERM, signal_handler_stats);
#endif
Expand Down
Loading