From: Cyril Hrubis Date: Thu, 5 Mar 2020 11:28:52 +0100 Subject: [LTP] [PATCH 1/2] lib: Add safe timerfd macros In-Reply-To: <20200304183806.17672-1-pvorel@suse.cz> References: <20200304183806.17672-1-pvorel@suse.cz> Message-ID: <20200305102852.GB28363@rei> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ltp@lists.linux.it Hi! > include/tst_safe_timerfd.h | 32 +++++++++++++++++++++ > lib/tst_safe_timerfd.c | 59 ++++++++++++++++++++++++++++++++++++++ > 2 files changed, 91 insertions(+) > create mode 100644 include/tst_safe_timerfd.h > create mode 100644 lib/tst_safe_timerfd.c > > diff --git a/include/tst_safe_timerfd.h b/include/tst_safe_timerfd.h > new file mode 100644 > index 000000000..526f12838 > --- /dev/null > +++ b/include/tst_safe_timerfd.h > @@ -0,0 +1,32 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * Copyright (c) 2020 Petr Vorel > + */ > + > +#ifndef TST_SAFE_TIMERFD_H__ > +#define TST_SAFE_TIMERFD_H__ > + > +#include "lapi/timerfd.h" > + > +int safe_timerfd_create(const char *file, const int lineno, > + int clockid, int flags); > + > +#define SAFE_TIMERFD_CREATE(clockid, flags)\ > + safe_timerfd_create(__FILE__, __LINE__, (clockid), (flags)) > + > +int safe_timerfd_gettime(const char *file, const int lineno, > + int fd, struct itimerspec *curr_value); > + > +#define SAFE_TIMERFD_GETTIME(fd, curr_value)\ > + safe_timerfd_gettime(__FILE__, __LINE__, (fd), (curr_value)) > + > +int safe_timerfd_settime(const char *file, const int lineno, > + int fd, int flags, > + const struct itimerspec *new_value, > + struct itimerspec *old_value); > + > +#define SAFE_TIMERFD_SETTIME(fd, flags, new_value, old_value)\ > + safe_timerfd_settime(__FILE__, __LINE__, (fd), (flags), (new_value), \ > + (old_value)) > + > +#endif /* SAFE_TIMERFD_H__ */ > diff --git a/lib/tst_safe_timerfd.c b/lib/tst_safe_timerfd.c > new file mode 100644 > index 000000000..80de87ad3 > --- /dev/null > +++ b/lib/tst_safe_timerfd.c > @@ -0,0 +1,59 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * Copyright (c) 2020 Petr Vorel > + */ > + > +#include Errno is include in tst_test.h. > +#include "tst_safe_timerfd.h" > +#include "lapi/timerfd.h" > +#include "tst_clocks.h" > +#define TST_NO_DEFAULT_MAIN > +#include "tst_test.h" > + > +#define TTYPE (errno == ENOTSUP ? TCONF : TBROK) > + > +int safe_timerfd_create(const char *file, const int lineno, > + int clockid, int flags) > +{ > + int fd; > + > + fd = timerfd_create(clockid, flags); > + > + if (fd == -1) { See the other email about the return values. Other than that this looks good. > + tst_brk(TTYPE | TERRNO, "%s:%d timerfd_create(%s) failed", > + file, lineno, tst_clock_name(clockid)); > + } > + > + return fd; > +} > + > +int safe_timerfd_gettime(const char *file, const int lineno, > + int fd, struct itimerspec *curr_value) > +{ > + int rval; > + > + rval = timerfd_gettime(fd, curr_value); > + if (rval == -1) { > + tst_brk(TTYPE | TERRNO, "%s:%d timerfd_gettime() failed", > + file, lineno); > + } > + > + return rval; > +} > + > +int safe_timerfd_settime(const char *file, const int lineno, > + int fd, int flags, > + const struct itimerspec *new_value, > + struct itimerspec *old_value) > +{ > + int rval; > + > + rval = timerfd_settime(fd, flags, new_value, old_value); > + if (rval == -1) { > + tst_brk(TTYPE | TERRNO, "%s:%d timerfd_settime() failed", > + file, lineno); > + } > + > + return rval; > +} > -- > 2.25.1 > -- Cyril Hrubis chrubis@suse.cz