From: Nikita Yushchenko <nyushchenko@dev.rtsoft.ru>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH] safe_macros: make safe_pread() and safe_pwrite() inline
Date: Tue, 27 Sep 2016 14:58:53 +0300 [thread overview]
Message-ID: <1474977533-31114-1-git-send-email-nyushchenko@dev.rtsoft.ru> (raw)
In-Reply-To: <1364999776.1787180.1473072872777.JavaMail.zimbra@redhat.com>
These routines have an argument of type off_t, which has size dependent
on compile options on 32-bit builds. Thus having there rotines compiled
inside library cause ABI issues.
Signed-off-by: Nikita Yushchenko <nyushchenko@dev.rtsoft.ru>
---
include/old/safe_macros.h | 39 +++++++++++++++++++++++++++++++++++++++
include/safe_macros_fn.h | 8 --------
include/tst_safe_macros.h | 39 +++++++++++++++++++++++++++++++++++++++
lib/safe_macros.c | 32 --------------------------------
4 files changed, 78 insertions(+), 40 deletions(-)
diff --git a/include/old/safe_macros.h b/include/old/safe_macros.h
index 8ed2eb4..e3be1f2 100644
--- a/include/old/safe_macros.h
+++ b/include/old/safe_macros.h
@@ -70,6 +70,26 @@
safe_read(__FILE__, __LINE__, cleanup_fn, (len_strict), (fildes), \
(buf), (nbyte))
+/*
+ * inline function that uses off_t since sizeof(off_t) depends on compile flags
+ */
+static inline ssize_t safe_pread(const char *file, const int lineno,
+ void (*cleanup_fn)(void), char len_strict,
+ int fildes, void *buf, size_t nbyte, off_t offset)
+{
+ ssize_t rval;
+
+ rval = pread(fildes, buf, nbyte, offset);
+
+ if (rval == -1 || (len_strict && (size_t)rval != nbyte)) {
+ tst_brkm(TBROK | TERRNO, cleanup_fn,
+ "%s:%d: pread(%d,%p,%zu,%lld) failed, returned %zd",
+ file, lineno, fildes, buf, nbyte, (long long)offset,
+ rval);
+ }
+
+ return rval;
+}
#define SAFE_PREAD(cleanup_fn, len_strict, fildes, buf, nbyte, offset) \
safe_pread(__FILE__, __LINE__, cleanup_fn, (len_strict), (fildes), \
(buf), (nbyte), (offset))
@@ -112,6 +132,25 @@
safe_write(__FILE__, __LINE__, cleanup_fn, (len_strict), (fildes), \
(buf), (nbyte))
+/*
+ * inline function that uses off_t since sizeof(off_t) depends on compile flags
+ */
+static inline ssize_t safe_pwrite(const char *file, const int lineno,
+ void (*cleanup_fn)(void), char len_strict,
+ int fildes, const void *buf, size_t nbyte, off_t offset)
+{
+ ssize_t rval;
+
+ rval = pwrite(fildes, buf, nbyte, offset);
+ if (rval == -1 || (len_strict && (size_t)rval != nbyte)) {
+ tst_brkm(TBROK | TERRNO, cleanup_fn,
+ "%s:%d: pwrite(%d,%p,%zu,%lld) failed, returned %zd",
+ file, lineno, fildes, buf, nbyte, (long long)offset,
+ rval);
+ }
+
+ return rval;
+}
#define SAFE_PWRITE(cleanup_fn, len_strict, fildes, buf, nbyte, offset) \
safe_pwrite(__FILE__, __LINE__, cleanup_fn, (len_strict), (fildes), \
(buf), (nbyte), (offset))
diff --git a/include/safe_macros_fn.h b/include/safe_macros_fn.h
index 121a8fb..dcea775 100644
--- a/include/safe_macros_fn.h
+++ b/include/safe_macros_fn.h
@@ -71,10 +71,6 @@ ssize_t safe_read(const char *file, const int lineno,
void (*cleanup_fn)(void), char len_strict, int fildes,
void *buf, size_t nbyte);
-ssize_t safe_pread(const char *file, const int lineno,
- void (*cleanup_fn)(void), char len_strict,
- int fildes, void *buf, size_t nbyte, off_t offset);
-
int safe_setegid(const char *file, const int lineno,
void (*cleanup_fn)(void), gid_t egid);
@@ -118,10 +114,6 @@ ssize_t safe_write(const char *file, const int lineno,
void (cleanup_fn)(void), char len_strict, int fildes,
const void *buf, size_t nbyte);
-ssize_t safe_pwrite(const char *file, const int lineno,
- void (cleanup_fn)(void), char len_strict, int fildes,
- const void *buf, size_t nbyte, off_t offset);
-
long safe_strtol(const char *file, const int lineno,
void (cleanup_fn)(void), char *str, long min, long max);
diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h
index 3cf154e..ff4ef49 100644
--- a/include/tst_safe_macros.h
+++ b/include/tst_safe_macros.h
@@ -97,6 +97,26 @@ static inline int safe_dup(const char *file, const int lineno,
#define SAFE_READ(len_strict, fildes, buf, nbyte) \
safe_read(__FILE__, __LINE__, NULL, (len_strict), (fildes), (buf), (nbyte))
+/*
+ * inline function that uses off_t since sizeof(off_t) depends on compile flags
+ */
+static inline ssize_t safe_pread(const char *file, const int lineno,
+ void (*cleanup_fn)(void), char len_strict,
+ int fildes, void *buf, size_t nbyte, off_t offset)
+{
+ ssize_t rval;
+
+ rval = pread(fildes, buf, nbyte, offset);
+
+ if (rval == -1 || (len_strict && (size_t)rval != nbyte)) {
+ tst_brkm(TBROK | TERRNO, cleanup_fn,
+ "%s:%d: pread(%d,%p,%zu,%lld) failed, returned %zd",
+ file, lineno, fildes, buf, nbyte, (long long)offset,
+ rval);
+ }
+
+ return rval;
+}
#define SAFE_PREAD(len_strict, fildes, buf, nbyte, offset) \
safe_pread(__FILE__, __LINE__, NULL, (len_strict), (fildes), \
(buf), (nbyte), (offset))
@@ -170,6 +190,25 @@ static inline pid_t safe_getpgid(const char *file, const int lineno,
#define SAFE_WRITE(len_strict, fildes, buf, nbyte) \
safe_write(__FILE__, __LINE__, NULL, (len_strict), (fildes), (buf), (nbyte))
+/*
+ * inline function that uses off_t since sizeof(off_t) depends on compile flags
+ */
+static inline ssize_t safe_pwrite(const char *file, const int lineno,
+ void (*cleanup_fn)(void), char len_strict,
+ int fildes, const void *buf, size_t nbyte, off_t offset)
+{
+ ssize_t rval;
+
+ rval = pwrite(fildes, buf, nbyte, offset);
+ if (rval == -1 || (len_strict && (size_t)rval != nbyte)) {
+ tst_brkm(TBROK | TERRNO, cleanup_fn,
+ "%s:%d: pwrite(%d,%p,%zu,%lld) failed, returned %zd",
+ file, lineno, fildes, buf, nbyte, (long long)offset,
+ rval);
+ }
+
+ return rval;
+}
#define SAFE_PWRITE(len_strict, fildes, buf, nbyte, offset) \
safe_pwrite(__FILE__, __LINE__, NULL, (len_strict), (fildes), \
(buf), (nbyte), (offset))
diff --git a/lib/safe_macros.c b/lib/safe_macros.c
index 5a05c84..6c96091 100644
--- a/lib/safe_macros.c
+++ b/lib/safe_macros.c
@@ -252,22 +252,6 @@ ssize_t safe_read(const char *file, const int lineno, void (*cleanup_fn) (void),
return rval;
}
-ssize_t safe_pread(const char *file, const int lineno, void (*cleanup_fn)(void),
- char len_strict, int fildes, void *buf, size_t nbyte,
- off_t offset)
-{
- ssize_t rval;
-
- rval = pread(fildes, buf, nbyte, offset);
- if (rval == -1 || (len_strict && (size_t)rval != nbyte)) {
- tst_brkm(TBROK | TERRNO, cleanup_fn,
- "%s:%d: read(%d,%p,%zu,%ld) failed, returned %zd",
- file, lineno, fildes, buf, nbyte, offset, rval);
- }
-
- return rval;
-}
-
int safe_setegid(const char *file, const int lineno, void (*cleanup_fn) (void),
gid_t egid)
{
@@ -458,22 +442,6 @@ ssize_t safe_write(const char *file, const int lineno, void (cleanup_fn) (void),
return rval;
}
-ssize_t safe_pwrite(const char *file, const int lineno,
- void (cleanup_fn) (void), char len_strict, int fildes,
- const void *buf, size_t nbyte, off_t offset)
-{
- ssize_t rval;
-
- rval = pwrite(fildes, buf, nbyte, offset);
- if (rval == -1 || (len_strict && (size_t)rval != nbyte)) {
- tst_brkm(TBROK | TERRNO, cleanup_fn,
- "%s:%d: pwrite(%d,%p,%zu,%ld) failed",
- file, lineno, fildes, buf, rval, offset);
- }
-
- return rval;
-}
-
long safe_strtol(const char *file, const int lineno,
void (cleanup_fn) (void), char *str, long min, long max)
{
--
2.1.4
next prev parent reply other threads:[~2016-09-27 11:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-02 15:58 [LTP] reason of pwritev01_64 failure on 32-bit arm Nikita Yushchenko
2016-09-05 10:54 ` Jan Stancek
2016-09-27 11:58 ` Nikita Yushchenko [this message]
2016-09-27 12:56 ` [LTP] [PATCH] safe_macros: make safe_pread() and safe_pwrite() inline Cyril Hrubis
2016-11-26 8:30 ` Nikita Yushchenko
2016-11-28 15:45 ` Cyril Hrubis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1474977533-31114-1-git-send-email-nyushchenko@dev.rtsoft.ru \
--to=nyushchenko@dev.rtsoft.ru \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox