Skip to content

fix(run-queue): catch exceptions from parse_args and handle_event #154

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

Open
yuKing123-king wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(run-queue): catch exceptions from parse_args and handle_event #154

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
33 changes: 23 additions & 10 deletions observe/run-queue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ struct BpfData
char comm[16];
};

static run_queue_bpf *obj;
static run_queue_bpf *obj = NULL;
static int log_map_fd;
static struct ring_buffer *rb = NULL;
static int filter_fd;
Expand Down Expand Up @@ -287,14 +287,20 @@ static int handle_event(void *ctx, void *data, size_t data_sz)
const struct BpfData *log = (const struct BpfData *)data; // Cast data to
// BpfData
// structure
auto it = runqueques.find(log->cpu);
if (it == runqueques.end())
try{
auto it = runqueques.find(log->cpu);
if (it == runqueques.end())
{
runqueques[log->cpu] = std::vector<struct BpfData>();
}

runqueques[log->cpu].push_back(*log);
}
catch (const std::bad_alloc &e)
{
runqueques[log->cpu] = std::vector<struct BpfData>();
pr_error("handle_event OOM: %s\n", e.what());
return -1;
}

runqueques[log->cpu].push_back(*log);

return 0;
}

Expand Down Expand Up @@ -375,11 +381,18 @@ int main(int argc, char *args[])
exit(EXIT_FAILURE);
}
ssize_t rd_sz = 0;

parse_args(argc, args); // Parse command line arguments
int key = 0; // Key for BPF map
try
{
parse_args(argc, args); // Parse command line arguments
}
catch(const std::exception& e)
{
fprintf(stderr, "run-queue: %s\n", e.what());
goto cleanup;
}
register_signal(); // Register signal handler

int key = 0; // Key for BPF map
obj = run_queue_bpf::open_and_load(); // Load BPF program
if (!obj)
{
Expand Down
Loading