gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix "Detect hang of McKernel in mcexec"

Browse Source 
1. Call exit() when detecting hang
2. Clean up error checks
This commit is contained in:
Masamichi Takagi
2018-06-01 14:18:00 +09:00
parent 09d0a59e22
commit 056fdb2633
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
executer/user/mcexec.c
View File

@ -1031,8 +1031,8 @@ static void *watchdog_thread_func(void *arg) {
int ret = 0; int ret = 0;
int evfd = -1; int evfd = -1;
int epfd = -1; int epfd = -1;
struct epoll_event event; struct epoll_event event_in;
struct epoll_event events[1]; struct epoll_event event_out;
if ((evfd = ihk_os_get_eventfd(0, IHK_OS_EVENTFD_TYPE_STATUS)) < 0) { if ((evfd = ihk_os_get_eventfd(0, IHK_OS_EVENTFD_TYPE_STATUS)) < 0) {
fprintf(stderr, "%s: Error: geteventfd failed (%d)\n", __FUNCTION__, evfd); fprintf(stderr, "%s: Error: geteventfd failed (%d)\n", __FUNCTION__, evfd);
@ -1044,28 +1044,30 @@ static void *watchdog_thread_func(void *arg) {
goto out; goto out;
} }
memset(&event, 0, sizeof(struct epoll_event)); memset(&event_in, 0, sizeof(struct epoll_event));
event.events = EPOLLIN; event_in.events = EPOLLIN;
event.data.fd = evfd; event_in.data.fd = evfd;
if ((ret = epoll_ctl(epfd, EPOLL_CTL_ADD, evfd, &event)) != 0) { if ((ret = epoll_ctl(epfd, EPOLL_CTL_ADD, evfd, &event_in)) != 0) {
fprintf(stderr, "%s: Error: epoll_ctl failed (%d)\n", __FUNCTION__, ret); fprintf(stderr, "%s: Error: epoll_ctl failed (%d)\n", __FUNCTION__, ret);
goto out; goto out;
} }
do { do {
int nfd = epoll_wait(epfd, events, 1, -1); int nfd = epoll_wait(epfd, &event_out, 1, -1);
if (nfd < 0) { if (nfd == -1) {
if (errno == EINTR) { if (errno == EINTR) {
continue; continue;
} else {
fprintf(stderr, "%s: Error: epoll_wait failed (%s)\n", __FUNCTION__, strerror(errno));
goto out;
} }
} else if (nfd > 1 || nfd == 0) { fprintf(stderr, "%s: Error: epoll_wait failed (%s)\n", __FUNCTION__, strerror(errno));
fprintf(stderr, "%s: Error: Invalid number (%d) of events\n", __FUNCTION__, nfd); goto out;
} else if (nfd == 0) {
fprintf(stderr, "%s: Error: epoll_wait timed out unexpectedly\n", __FUNCTION__);
goto out;
} else if (nfd > 1) {
fprintf(stderr, "%s: Error: Too many (%d) events\n", __FUNCTION__, nfd);
goto out; goto out;
} else { } else {
if (events[0].data.fd == evfd) { if (event_out.data.fd == evfd) {
uint64_t counter; uint64_t counter;
ssize_t nread = read(evfd, &counter, sizeof(counter)); ssize_t nread = read(evfd, &counter, sizeof(counter));
if (nread == 0) { if (nread == 0) {
@ -1076,9 +1078,11 @@ static void *watchdog_thread_func(void *arg) {
goto out; goto out;
} else { } else {
fprintf(stderr, "mcexec detected hang of McKernel\n"); fprintf(stderr, "mcexec detected hang of McKernel\n");
//syscall(SYS_exit_group, 99); exit(EXIT_FAILURE);
goto out;
} }
} else {
fprintf(stderr, "%s: Error: Unknown event (fd:%d)\n", __FUNCTION__, event_out.data.fd);
goto out;
} }
} }
} while (1); } while (1);