From 7a11f5417b612241a69f9afa20b219c4a9d1dc6d Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 31 Jul 2017 15:31:38 -0700 Subject: [PATCH] base: Give more information when setting up asynchronous IO fails. When asynchronous IO fails, gem5 currently just says it failed and quits, and doesn't give any more information about which step failed, or what specifically about it failed. This change adds two helpers which will attempt the fcntl, check for error conditions, and in the event of a failure, include a message describing the error code and what the arguments to fcntl were. Change-Id: I316478172ab2aefd3788279dbc12744791385cd5 Reviewed-on: https://gem5-review.googlesource.com/4320 Reviewed-by: Andreas Sandberg Maintainer: Gabe Black --- src/base/pollevent.cc | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/src/base/pollevent.cc b/src/base/pollevent.cc index 30edb65b6..79814e077 100644 --- a/src/base/pollevent.cc +++ b/src/base/pollevent.cc @@ -41,7 +41,9 @@ #include #include +#include #include +#include #include "base/misc.hh" #include "base/types.hh" @@ -200,25 +202,43 @@ PollQueue::service() } } +template +static int fcntlHelper(int fd, int cmd, ArgT arg) +{ + int retval = fcntl(fd, cmd, arg); + if (retval == -1) { + char *errstr = strerror(errno); + panic("fcntl(%d, %d, %s): \"%s\" when setting up async IO.\n", + errstr, fd, cmd, arg); + } + return retval; +} + +static int fcntlHelper(int fd, int cmd) +{ + int retval = fcntl(fd, cmd); + if (retval == -1) { + char *errstr = strerror(errno); + panic("fcntl(%d, %d): \"%s\" when setting up async IO.\n", + errstr, fd, cmd); + } + return retval; +} + void PollQueue::setupAsyncIO(int fd, bool set) { - int flags = fcntl(fd, F_GETFL); - if (flags == -1) - panic("Could not set up async IO"); + int flags = fcntlHelper(fd, F_GETFL); if (set) flags |= FASYNC; else flags &= ~(FASYNC); - if (set) { - if (fcntl(fd, F_SETOWN, getpid()) == -1) - panic("Could not set up async IO"); - } + if (set) + fcntlHelper(fd, F_SETOWN, getpid()); - if (fcntl(fd, F_SETFL, flags) == -1) - panic("Could not set up async IO"); + fcntlHelper(fd, F_SETFL, flags); // The file descriptor might already have events pending. We won't // see them if they occurred before we set the FASYNC -- 2.30.2