[LTP] [PATCH 2/2] Reimplement TST_SAFE_TIMERFD_*() using TST_ASSERT_SYSCALL*()
Martin Doucha
mdoucha@suse.cz
Thu Mar 5 15:36:58 CET 2020
Example usage of the TST_ASSERT_SYSCALL*() macros.
Signed-off-by: Martin Doucha <mdoucha@suse.cz>
---
lib/tst_safe_timerfd.c | 35 ++++++-----------------------------
1 file changed, 6 insertions(+), 29 deletions(-)
diff --git a/lib/tst_safe_timerfd.c b/lib/tst_safe_timerfd.c
index ffe7b2ef7..18da82184 100644
--- a/lib/tst_safe_timerfd.c
+++ b/lib/tst_safe_timerfd.c
@@ -9,34 +9,18 @@
#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 < 0) {
- tst_brk(TTYPE | TERRNO, "%s:%d timerfd_create(%s) failed",
- file, lineno, tst_clock_name(clockid));
- }
-
- return fd;
+ return TST_ASSERT_SYSCALL_FD_IMPL(timerfd_create(clockid, flags), file,
+ lineno);
}
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 != 0) {
- tst_brk(TTYPE | TERRNO, "%s:%d timerfd_gettime() failed",
- file, lineno);
- }
-
- return rval;
+ return TST_ASSERT_SYSCALL_IMPL(timerfd_gettime(fd, curr_value), file,
+ lineno);
}
int safe_timerfd_settime(const char *file, const int lineno,
@@ -44,13 +28,6 @@ int safe_timerfd_settime(const char *file, const int lineno,
const struct itimerspec *new_value,
struct itimerspec *old_value)
{
- int rval;
-
- rval = timerfd_settime(fd, flags, new_value, old_value);
- if (rval != 0) {
- tst_brk(TTYPE | TERRNO, "%s:%d timerfd_settime() failed",
- file, lineno);
- }
-
- return rval;
+ return TST_ASSERT_SYSCALL_IMPL(timerfd_settime(fd, flags, new_value,
+ old_value), file, lineno);
}
--
2.25.1
More information about the ltp
mailing list