From: "Gabriel F. T. Gomes" <gabriel@inconstante.net.br>
To: <libc-alpha@sourceware.org>
Subject: [PATCH v2 15/30] ldbl-128ibm-compat: Add syslog functions
Date: Fri, 25 Oct 2019 15:35:00 -0000 [thread overview]
Message-ID: <20191025153410.15405-16-gabriel@inconstante.net.br> (raw)
In-Reply-To: <20191025153410.15405-1-gabriel@inconstante.net.br>
From: "Gabriel F. T. Gomes" <gabrielftg@linux.ibm.com>
Changes since v1:
- Moved the test to a container, which stopped messages being written
to the system log.
Comment from v1:
I'm using 'syslog (LOG_DEBUG, etc.);' and support_capture_subprocess in
the test case, which I believe will not print to the console, but I'm
not sure if changing some system setting to high verbosity will disturb
people's lives. Please advise. :)
-- 8< --
Similarly to __vfprintf_internal and __vfscanf_internal, the internal
implementation of syslog functions (__vsyslog_internal) takes a
'mode_flags' parameter used to select the format of long double
parameters. This patch adds variants of the syslog functions that set
'mode_flags' to PRINTF_LDBL_USES_FLOAT128, thus enabling the correct
printing of long double values on powerpc64le, when long double has IEEE
binary128 format (-mabi=ieeelongdouble).
Tested for powerpc64le.
---
sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 11 ++-
sysdeps/ieee754/ldbl-128ibm-compat/Versions | 5 ++
.../ldbl-128ibm-compat/ieee128-syslog.c | 65 ++++++++++++++++++
.../test-syslog-chk-ibm128.c | 1 +
.../test-syslog-chk-ieee128.c | 1 +
.../test-syslog-chk-ldbl-compat.c | 6 ++
.../ldbl-128ibm-compat/test-syslog-ibm128.c | 1 +
.../ldbl-128ibm-compat/test-syslog-ieee128.c | 1 +
.../test-syslog-ldbl-compat-template.c | 67 +++++++++++++++++++
.../test-syslog-ldbl-compat.c | 6 ++
10 files changed, 163 insertions(+), 1 deletion(-)
create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/ieee128-syslog.c
create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-chk-ibm128.c
create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-chk-ieee128.c
create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-chk-ldbl-compat.c
create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ibm128.c
create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ieee128.c
create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat-template.c
create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat.c
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
index 9e8237d075..d774c3b1d7 100644
--- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
@@ -244,7 +244,8 @@ endif
ifeq ($(subdir),misc)
ldbl-extra-routines += err \
- error
+ error \
+ syslog
tests-internal += tst-ibm128-warn tst-ieee128-warn
tests-internal += tst-ibm128-error tst-ieee128-error
@@ -260,6 +261,14 @@ CFLAGS-tst-ibm128-error.c += -mabi=ibmlongdouble -Wno-psabi
CFLAGS-tst-ieee128-warn.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi
CFLAGS-tst-ieee128-error.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi
+
+tests-container += test-syslog-ieee128 test-syslog-ibm128
+CFLAGS-test-syslog-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi
+CFLAGS-test-syslog-ibm128.c += -mabi=ibmlongdouble -Wno-psabi
+
+tests-container += test-syslog-chk-ieee128 test-syslog-chk-ibm128
+CFLAGS-test-syslog-chk-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi
+CFLAGS-test-syslog-chk-ibm128.c += -mabi=ibmlongdouble -Wno-psabi
endif
# Add IEEE binary128 files as make targets.
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Versions b/sysdeps/ieee754/ldbl-128ibm-compat/Versions
index f59dfb59fe..b7aa9f7993 100644
--- a/sysdeps/ieee754/ldbl-128ibm-compat/Versions
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/Versions
@@ -170,6 +170,11 @@ libc {
__obstack_printf_chkieee128;
__obstack_vprintf_chkieee128;
+ __syslogieee128;
+ __vsyslogieee128;
+ __syslog_chkieee128;
+ __vsyslog_chkieee128;
+
__fscanfieee128;
__scanfieee128;
__sscanfieee128;
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-syslog.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-syslog.c
new file mode 100644
index 0000000000..fa16cc9aaf
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-syslog.c
@@ -0,0 +1,65 @@
+/* Wrapper for syslog. IEEE128 version.
+ Copyright (C) 2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <stdarg.h>
+#include <libioP.h>
+#include <syslog.h>
+
+void
+___ieee128_syslog (int pri, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start (ap, fmt);
+ __vsyslog_internal (pri, fmt, ap, PRINTF_LDBL_USES_FLOAT128);
+ va_end (ap);
+}
+strong_alias (___ieee128_syslog, __syslogieee128)
+
+void
+___ieee128_vsyslog (int pri, const char *fmt, va_list ap)
+{
+ __vsyslog_internal (pri, fmt, ap, PRINTF_LDBL_USES_FLOAT128);
+}
+strong_alias (___ieee128_vsyslog, __vsyslogieee128)
+
+void
+___ieee128_syslog_chk (int pri, int flag, const char *fmt, ...)
+{
+ va_list ap;
+
+ unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
+ if (flag > 0)
+ mode |= PRINTF_FORTIFY;
+
+ va_start (ap, fmt);
+ __vsyslog_internal (pri, fmt, ap, mode);
+ va_end (ap);
+}
+strong_alias (___ieee128_syslog_chk, __syslog_chkieee128)
+
+void
+___ieee128_vsyslog_chk (int pri, int flag, const char *fmt, va_list ap)
+{
+ unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
+ if (flag > 0)
+ mode |= PRINTF_FORTIFY;
+
+ __vsyslog_internal (pri, fmt, ap, mode);
+}
+strong_alias (___ieee128_vsyslog_chk, __vsyslog_chkieee128)
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-chk-ibm128.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-chk-ibm128.c
new file mode 100644
index 0000000000..bf42582687
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-chk-ibm128.c
@@ -0,0 +1 @@
+#include <test-syslog-chk-ldbl-compat.c>
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-chk-ieee128.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-chk-ieee128.c
new file mode 100644
index 0000000000..bf42582687
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-chk-ieee128.c
@@ -0,0 +1 @@
+#include <test-syslog-chk-ldbl-compat.c>
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-chk-ldbl-compat.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-chk-ldbl-compat.c
new file mode 100644
index 0000000000..513b2d2064
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-chk-ldbl-compat.c
@@ -0,0 +1,6 @@
+#define _FORTIFY_SOURCE 2
+#define SYSLOG_FUNCTION __syslog_chk
+#define SYSLOG_FUNCTION_PARAMS (LOG_DEBUG, 1, "%Lf\n", ld)
+#define VSYSLOG_FUNCTION __vsyslog_chk
+#define VSYSLOG_FUNCTION_PARAMS (LOG_DEBUG, 1, "%Lf\n", ap)
+#include <test-syslog-ldbl-compat-template.c>
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ibm128.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ibm128.c
new file mode 100644
index 0000000000..8e64440e8c
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ibm128.c
@@ -0,0 +1 @@
+#include <test-syslog-ldbl-compat.c>
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ieee128.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ieee128.c
new file mode 100644
index 0000000000..8e64440e8c
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ieee128.c
@@ -0,0 +1 @@
+#include <test-syslog-ldbl-compat.c>
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat-template.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat-template.c
new file mode 100644
index 0000000000..11454a2245
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat-template.c
@@ -0,0 +1,67 @@
+/* Test for the long double variants of *syslog* functions.
+ Copyright (C) 2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <syslog.h>
+
+#include <support/capture_subprocess.h>
+#include <support/check.h>
+
+static void
+do_test_one_call (void *last, ...)
+{
+ long double ld = -1;
+ va_list ap;
+
+ /* Make syslog functions write to stderr with LOG_PERROR, so that it
+ can be captured by support_capture_subprocess and verified. */
+ openlog ("test-syslog", LOG_PERROR, LOG_USER);
+
+ /* Call syslog functions that take a format string. */
+ SYSLOG_FUNCTION SYSLOG_FUNCTION_PARAMS;
+ va_start (ap, last);
+ VSYSLOG_FUNCTION VSYSLOG_FUNCTION_PARAMS;
+ va_end (ap);
+}
+
+static void
+do_test_call (void)
+{
+ long double ld = -1;
+ do_test_one_call (NULL, ld);
+}
+
+static int
+do_test (void)
+{
+ struct support_capture_subprocess result;
+ result = support_capture_subprocess ((void *) &do_test_call, NULL);
+
+ do_test_call ();
+
+ /* Compare against the expected output. */
+ const char *expected =
+ "test-syslog: -1.000000\n"
+ "test-syslog: -1.000000\n";
+ TEST_COMPARE_STRING (expected, result.err.buffer);
+
+ return 0;
+}
+
+#include <support/test-driver.c>
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat.c
new file mode 100644
index 0000000000..ff0c0a5813
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat.c
@@ -0,0 +1,6 @@
+#define _FORTIFY_SOURCE 0
+#define SYSLOG_FUNCTION syslog
+#define SYSLOG_FUNCTION_PARAMS (LOG_DEBUG, "%Lf\n", ld)
+#define VSYSLOG_FUNCTION vsyslog
+#define VSYSLOG_FUNCTION_PARAMS (LOG_DEBUG, "%Lf\n", ap)
+#include <test-syslog-ldbl-compat-template.c>
--
2.21.0
next prev parent reply other threads:[~2019-10-25 15:35 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 15:34 [PATCH v2 00/30] Add IEEE long double <-> string functions for powerpc64le Gabriel F. T. Gomes
2019-10-25 15:34 ` [PATCH v2 02/30] ldbl-128ibm-compat: Add wide character printing functions Gabriel F. T. Gomes
2019-11-04 15:08 ` Paul E Murphy
2019-11-04 18:10 ` Gabriel F. T. Gomes
2019-11-04 20:11 ` Paul E Murphy
2019-10-25 15:34 ` [PATCH v2 03/30] ldbl-128ibm-compat: Add regular character, fortified " Gabriel F. T. Gomes
2019-11-04 15:43 ` Paul E Murphy
2019-11-05 19:37 ` Gabriel F. T. Gomes
2019-11-08 16:44 ` Paul E Murphy
2019-10-25 15:34 ` [PATCH v2 01/30] ldbl-128ibm-compat: Add regular character " Gabriel F. T. Gomes
2019-10-29 15:42 ` Paul E Murphy
2019-10-30 16:10 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` [PATCH v2 10/30] ldbl-128ibm-compat: Add err.h functions Gabriel F. T. Gomes
2019-11-08 20:22 ` Paul E Murphy
2019-11-13 14:24 ` Gabriel F. T. Gomes
2019-11-27 19:11 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` [PATCH v2 05/30] ldbl-128ibm-compat: Test double values Gabriel F. T. Gomes
2019-11-04 16:16 ` Paul E Murphy
2019-10-25 15:35 ` [PATCH v2 07/30] ldbl-128ibm-compat: Add regular character scanning functions Gabriel F. T. Gomes
2019-11-14 21:36 ` Paul E Murphy
2019-10-25 15:35 ` [PATCH v2 08/30] ldbl-128ibm-compat: Add wide " Gabriel F. T. Gomes
2019-11-04 17:47 ` Paul E Murphy
2019-11-11 14:33 ` Gabriel F. T. Gomes
2019-11-22 22:34 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` [PATCH v2 14/30] ldbl-128ibm-compat: Add obstack printing functions Gabriel F. T. Gomes
2019-11-08 23:42 ` Paul E Murphy
2019-11-27 19:11 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` [PATCH v2 09/30] ldbl-128ibm-compat: Add argp_error and argp_failure Gabriel F. T. Gomes
2019-11-08 19:58 ` Paul E Murphy
2019-10-25 15:35 ` [PATCH v2 06/30] ldbl-128ibm-compat: Test positional arguments Gabriel F. T. Gomes
2019-11-04 16:55 ` Paul E Murphy
2019-11-06 17:28 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` [PATCH v2 13/30] ldbl-128ibm-compat: Add ISO C99 versions of scanf functions Gabriel F. T. Gomes
2019-11-08 23:26 ` Paul E Murphy
2019-11-21 13:44 ` Gabriel F. T. Gomes
2019-11-22 22:49 ` Gabriel F. T. Gomes
2019-11-27 19:13 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` Gabriel F. T. Gomes [this message]
2019-11-14 17:47 ` [PATCH v2 15/30] ldbl-128ibm-compat: Add syslog functions Paul E Murphy
2019-11-14 18:25 ` Florian Weimer
2019-11-27 19:12 ` Gabriel F. T. Gomes
2019-10-25 15:35 ` [PATCH v2 11/30] ldbl-128ibm-compat: Add error.h functions Gabriel F. T. Gomes
2019-11-08 22:21 ` Paul E Murphy
2019-10-25 15:36 ` [PATCH v2 04/30] ldbl-128ibm-compat: Add wide character, fortified printing functions Gabriel F. T. Gomes
2019-11-04 16:10 ` Paul E Murphy
2019-10-25 15:36 ` [PATCH v2 23/30] Refactor *cvt functions implementation (5/5) Gabriel F. T. Gomes
2019-11-14 23:12 ` Paul E Murphy
2019-11-27 17:42 ` Gabriel F. T. Gomes
2019-10-25 15:36 ` [PATCH v2 16/30] ldbl-128ibm-compat: Add strfmon_l with IEEE long double format Gabriel F. T. Gomes
2019-11-14 18:03 ` Paul E Murphy
2019-11-27 17:43 ` Gabriel F. T. Gomes
2019-12-03 16:57 ` Gabriel F. T. Gomes
2019-10-25 15:36 ` [PATCH v2 22/30] Refactor *cvt functions implementation (4/5) Gabriel F. T. Gomes
2019-10-25 15:36 ` [PATCH v2 21/30] Refactor *cvt functions implementation (3/5) Gabriel F. T. Gomes
2019-10-25 15:36 ` [PATCH v2 19/30] Refactor *cvt functions implementation (1/5) Gabriel F. T. Gomes
2019-10-25 15:36 ` [PATCH v2 12/30] ldbl-128ibm-compat: Reuse tests for err.h and error.h functions Gabriel F. T. Gomes
2019-11-08 22:25 ` Paul E Murphy
2019-10-25 15:36 ` [PATCH v2 18/30] ldbl-128ibm-compat: Add tests for strfroml, strtold, and wcstold Gabriel F. T. Gomes
2019-11-14 18:26 ` Paul E Murphy
2019-11-27 17:47 ` Gabriel F. T. Gomes
2019-12-03 16:58 ` Gabriel F. T. Gomes
2019-10-25 15:36 ` [PATCH v2 20/30] Refactor *cvt functions implementation (2/5) Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 17/30] ldbl-128ibm-compat: Add tests for strfmon and strfmon_l Gabriel F. T. Gomes
2019-11-14 18:11 ` Paul E Murphy
2019-12-03 16:58 ` Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 25/30] Do not redirect calls to __GI_* symbols, when redirecting to *ieee128 Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 24/30] ldbl-128ibm-compat: Add *cvt functions Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 28/30] ldbl-128ibm-compat: Do not mix -mabi=*longdouble and -mlong-double-128 Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 27/30] Avoid compat symbols for totalorder in powerpc64le IEEE long double Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 26/30] ldbl-128ibm-compat: Compiler flags for stdio functions Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 30/30] RFC: powerpc64le: Enable support for IEEE long double Gabriel F. T. Gomes
2019-10-25 15:37 ` [PATCH v2 29/30] powerpc64le: Require a compiler with -mno-gnu-attribute Gabriel F. T. Gomes
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=20191025153410.15405-16-gabriel@inconstante.net.br \
--to=gabriel@inconstante.net.br \
--cc=libc-alpha@sourceware.org \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).