This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
[glibc/gabriel/powerpc-ieee128-printscan] ldbl-128ibm-compat: Add syslog functions
- From: Gabriel F.T.Gomes <gftg at sourceware dot org>
- To: glibc-cvs at sourceware dot org
- Date: 9 Aug 2019 18:36:35 -0000
- Subject: [glibc/gabriel/powerpc-ieee128-printscan] ldbl-128ibm-compat: Add syslog functions
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=296b3a21b08dd8c239b59d79e848c6437c545bf2
commit 296b3a21b08dd8c239b59d79e848c6437c545bf2
Author: Gabriel F. T. Gomes <gabrielftg@linux.ibm.com>
Date: Thu Jul 11 11:47:51 2019 -0300
ldbl-128ibm-compat: Add syslog functions
I'm using 'syslog (LOG_DEBUG, etc.);' 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
[subdir == misc] (ldbl-extra-routines): Add syslog.
[subdir == misc] (tests-internal): Add test-syslog-ieee128,
test-syslog-ibm128, test-syslog-chk-ieee128, test-syslog-chk-ibm128.
[subdir == misc] (CFLAGS-test-syslog-ieee128.c)
(CFLAGS-test-syslog-ibm128.c, CFLAGS-test-syslog-chk-ieee128.c)
(CFLAGS-test-syslog-chk-ibm128.c): New variables.
[subdir == misc] (tests-special): Add
$(objpfx)test-syslog-ieee128.out,
$(objpfx)test-syslog-ibm128.out,
$(objpfx)test-syslog-chk-ieee128.out, and
$(objpfx)test-syslog-chk-ibm128.out.
[subdir == misc] ($(objpfx)test-syslog-ieee128.out)
($(objpfx)test-syslog-ibm128.out)
($(objpfx)test-syslog-chk-ieee128.out)
($(objpfx)test-syslog-chk-ibm128.out): New build and run rules.
* sysdeps/ieee754/ldbl-128ibm-compat/Versions (libc): Add
__syslogieee128, __vsyslogieee128, __syslog_chkieee128, and
__vsyslog_chkieee128.
* sysdeps/ieee754/ldbl-128ibm-compat/ieee128-syslog.c:
New file.
* sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-chk-ibm128.c:
Likewise.
* sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-chk-ieee128.c:
Likewise.
* sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-chk-ldbl-compat.c:
Likewise.
* sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ibm128.c:
Likewise.
* sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ieee128.c:
Likewise.
* sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat-template.c:
Likewise.
* sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat.c:
Likewise.
* sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat.sh:
Likewise.
Diff:
---
sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 43 +++++++++++++-
sysdeps/ieee754/ldbl-128ibm-compat/Versions | 5 ++
.../ieee754/ldbl-128ibm-compat/ieee128-syslog.c | 65 ++++++++++++++++++++++
.../ldbl-128ibm-compat/test-syslog-chk-ibm128.c | 1 +
.../ldbl-128ibm-compat/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 | 50 +++++++++++++++++
.../ldbl-128ibm-compat/test-syslog-ldbl-compat.c | 6 ++
.../ldbl-128ibm-compat/test-syslog-ldbl-compat.sh | 42 ++++++++++++++
11 files changed, 220 insertions(+), 1 deletion(-)
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
index e8940f5..99a0c02 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,46 @@ 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-internal += 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-internal += 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
+
+ifeq ($(run-built-tests),yes)
+tests-special += $(objpfx)test-syslog-ieee128.out
+tests-special += $(objpfx)test-syslog-ibm128.out
+
+tests-special += $(objpfx)test-syslog-chk-ieee128.out
+tests-special += $(objpfx)test-syslog-chk-ibm128.out
+endif
+
+$(objpfx)test-syslog-ieee128.out: \
+ ../sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat.sh \
+ $(objpfx)test-syslog-ieee128
+ $(SHELL) $^ '$(test-program-prefix)' $@; \
+ $(evaluate-test)
+
+$(objpfx)test-syslog-ibm128.out: \
+ ../sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat.sh \
+ $(objpfx)test-syslog-ibm128
+ $(SHELL) $^ '$(test-program-prefix)' $@; \
+ $(evaluate-test)
+
+$(objpfx)test-syslog-chk-ieee128.out: \
+ ../sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat.sh \
+ $(objpfx)test-syslog-chk-ieee128
+ $(SHELL) $^ '$(test-program-prefix)' $@; \
+ $(evaluate-test)
+
+$(objpfx)test-syslog-chk-ibm128.out: \
+ ../sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat.sh \
+ $(objpfx)test-syslog-chk-ibm128
+ $(SHELL) $^ '$(test-program-prefix)' $@; \
+ $(evaluate-test)
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 f59dfb5..b7aa9f7 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 0000000..fa16cc9
--- /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 0000000..bf42582
--- /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 0000000..bf42582
--- /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 0000000..513b2d2
--- /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 0000000..8e64440
--- /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 0000000..8e64440
--- /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 0000000..fe9ecc5
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat-template.c
@@ -0,0 +1,50 @@
+/* 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/check.h>
+
+static void
+do_test_call (void *last, ...)
+{
+ long double ld = -1;
+ va_list ap;
+
+ /* Make syslog functions write to stderr with LOG_PERROR. */
+ openlog ("test-syslog", LOG_PERROR | LOG_ODELAY, 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 int
+do_test (void)
+{
+ long double ld = -1;
+ do_test_call (NULL, ld);
+
+ 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 0000000..ff0c0a5
--- /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>
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat.sh b/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat.sh
new file mode 100644
index 0000000..263c763
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-syslog-ldbl-compat.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+# Testing of *syslog*. IEEE binary128 for powerpc64le 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/>.
+
+set -e
+
+test_program=$1; shift
+test_program_prefix=$1; shift
+test_program_output=$1; shift
+
+status=0
+
+${test_program_prefix} \
+ ${test_program} \
+ 2> ${test_program_output} || status=1
+
+cat <<'EOF' |
+test-syslog: -1.000000
+test-syslog: -1.000000
+EOF
+cmp - ${test_program_output} > /dev/null 2>&1 ||
+{
+ status=1
+ echo "*** output comparison failed"
+}
+
+exit $status