[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commits] r24510 - in /fsf/trunk/libc: ChangeLog NEWS benchtests/Makefile benchtests/bench-strtod.c elf/dl-object.c nscd/nscd_getserv_r.c



Author: eglibc
Date: Tue Nov 12 00:02:07 2013
New Revision: 24510

Log:
Import glibc-mainline for 2013-11-12

Added:
    fsf/trunk/libc/benchtests/bench-strtod.c
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/benchtests/Makefile
    fsf/trunk/libc/elf/dl-object.c
    fsf/trunk/libc/nscd/nscd_getserv_r.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Nov 12 00:02:07 2013
@@ -1,3 +1,20 @@
+2013-11-11  Jan Kratochvil  <jan.kratochvil@xxxxxxxxxx>
+
+	[BZ #387]
+	* elf/dl-object.c (_dl_new_object): Initialize L_NAME from NEWNAME if
+	it is empty.
+
+2013-11-11  Adhemerval Zanella  <azanella@xxxxxxxxxxxxxxxxxx>
+
+        * benchtests/Makefile: Add bench-strtod.
+        * benchtests/bench-strtod.c: New file: strtod benchtest
+
+2013-11-11  Andreas Schwab  <schwab@xxxxxxx>
+
+	[BZ #16153]
+	* nscd/nscd_getserv_r.c (__nscd_getservbyport_r): Don't include
+	terminating NUL in key length.
+
 2013-11-08  Adhemerval Zanella  <azanella@xxxxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/powerpc/bits/libc-vdso.h (VDSO_IFUNC_RET):

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Tue Nov 12 00:02:07 2013
@@ -9,7 +9,7 @@
 
 * The following bugs are resolved with this release:
 
-  156, 431, 832, 2801, 7003, 9954, 10278, 11087, 13028, 13982, 13985,
+  156, 387, 431, 832, 2801, 7003, 9954, 10278, 11087, 13028, 13982, 13985,
   14029, 14155, 14547, 14699, 14752, 14876, 14910, 15048, 15218, 15277,
   15308, 15362, 15374, 15400, 15427, 15522, 15531, 15532, 15608, 15609,
   15610, 15632, 15640, 15670, 15672, 15680, 15681, 15723, 15734, 15735,
@@ -17,7 +17,7 @@
   15844, 15847, 15849, 15855, 15856, 15857, 15859, 15867, 15886, 15887,
   15890, 15892, 15893, 15895, 15897, 15905, 15909, 15917, 15919, 15921,
   15923, 15939, 15948, 15963, 15966, 15985, 15988, 16032, 16034, 16036,
-  16037, 16041, 16071, 16072, 16074, 16078, 16112.
+  16037, 16041, 16071, 16072, 16074, 16078, 16112, 16153.
 
 * CVE-2012-4412 The strcoll implementation caches indices and rules for
   large collation sequences to optimize multiple passes.  This cache

Modified: fsf/trunk/libc/benchtests/Makefile
==============================================================================
--- fsf/trunk/libc/benchtests/Makefile (original)
+++ fsf/trunk/libc/benchtests/Makefile Tue Nov 12 00:02:07 2013
@@ -32,7 +32,9 @@
 string-bench-ifunc := $(addsuffix -ifunc, $(string-bench))
 string-bench-all := $(string-bench) $(string-bench-ifunc)
 
-benchset := $(string-bench-all)
+stdlib-bench := strtod
+
+benchset := $(string-bench-all) $(stdlib-bench)
 
 LDLIBS-bench-acos = -lm
 LDLIBS-bench-acosh = -lm

Added: fsf/trunk/libc/benchtests/bench-strtod.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strtod.c (added)
+++ fsf/trunk/libc/benchtests/bench-strtod.c Tue Nov 12 00:02:07 2013
@@ -1,0 +1,117 @@
+/* Measure strtod implementation.
+   Copyright (C) 2013 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/>.  */
+
+#define TEST_MAIN
+#define TEST_NAME "strtod"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "bench-timing.h"
+
+#undef INNER_LOOP_ITERS
+#define INNER_LOOP_ITERS 65536
+
+static const char *inputs[] =
+{
+  "1e308",
+  "100000000e300",
+  "0x1p1023",
+  "0x1000p1011",
+  "0x1p1020",
+  "0x0.00001p1040" "1e-307",
+  "0.000001e-301",
+  "0.0000001e-300",
+  "0.00000001e-299",
+  "1000000e-313",
+  "10000000e-314",
+  "100000000e-315",
+  "0x1p-1021",
+  "0x1000p-1033",
+  "0x10000p-1037",
+  "0x0.001p-1009",
+  "0x0.0001p-1005",
+  "12.345",
+  "12.345e19",
+  "-.1e+9",
+  ".125",
+  "1e20",
+  "0e-19",
+  "4\00012",
+  "5.9e-76",
+  "0x1.4p+3",
+  "0xAp0",
+  "0x0Ap0",
+  "0x0A",
+  "0xA0",
+  "0x0.A0p8",
+  "0x0.50p9",
+  "0x0.28p10",
+  "0x0.14p11",
+  "0x0.0A0p12",
+  "0x0.050p13",
+  "0x0.028p14",
+  "0x0.014p15",
+  "0x00.00A0p16",
+  "0x00.0050p17",
+  "0x00.0028p18",
+  "0x00.0014p19",
+  "0x1p-1023",
+  "0x0.8p-1022",
+  "Inf",
+  "-Inf",
+  "+InFiNiTy",
+  "0x80000Ap-23",
+  "1e-324",
+  "0x100000000000008p0",
+  "0x100000000000008.p0",
+  "0x100000000000008.00p0",
+  "0x10000000000000800p0",
+  "0x10000000000000801p0",
+  NULL
+};
+
+int
+do_bench (void)
+{
+  const size_t iters = INNER_LOOP_ITERS;
+  timing_t res __attribute__ ((unused));
+
+  TIMING_INIT (res);
+
+  for (size_t i = 0; inputs[i] != NULL; ++i)
+    {
+      char *ep;
+      timing_t start, stop, cur;
+
+      printf ("Input %-24s:", inputs[i]);
+      TIMING_NOW (start);
+      for (size_t j = 0; j < iters; ++j)
+	strtod (inputs[i], &ep);
+      TIMING_NOW (stop);
+
+      TIMING_DIFF (cur, start, stop);
+      TIMING_PRINT_MEAN ((double) cur, (double) iters);
+      putchar ('\n');
+    }
+
+  return 0;
+}
+
+#define TEST_FUNCTION do_bench ()
+
+#include "../test-skeleton.c"

Modified: fsf/trunk/libc/elf/dl-object.c
==============================================================================
--- fsf/trunk/libc/elf/dl-object.c (original)
+++ fsf/trunk/libc/elf/dl-object.c Tue Nov 12 00:02:07 2013
@@ -88,7 +88,13 @@
   /* newname->next = NULL;	We use calloc therefore not necessary.  */
   newname->dont_free = 1;
 
-  new->l_name = realname;
+  /* When we create the executable link map, or a VDSO link map, we start
+     with "" for the l_name. In these cases "" points to ld.so rodata
+     and won't get dumped during core file generation. Therefore to assist
+     gdb and to create more self-contained core files we adjust l_name to
+     point at the newly allocated copy (which will get dumped) instead of
+     the ld.so rodata copy.  */
+  new->l_name = *realname ? realname : (char *) newname->name + libname_len - 1;
   new->l_type = type;
   /* If we set the bit now since we know it is never used we avoid
      dirtying the cache line later.  */

Modified: fsf/trunk/libc/nscd/nscd_getserv_r.c
==============================================================================
--- fsf/trunk/libc/nscd/nscd_getserv_r.c (original)
+++ fsf/trunk/libc/nscd/nscd_getserv_r.c Tue Nov 12 00:02:07 2013
@@ -54,7 +54,7 @@
   portstr[sizeof (portstr) - 1] = '\0';
   char *cp = _itoa_word (port, portstr + sizeof (portstr) - 1, 10, 0);
 
-  return nscd_getserv_r (cp, portstr + sizeof (portstr) - cp, proto,
+  return nscd_getserv_r (cp, portstr + sizeof (portstr) - 1 - cp, proto,
 			 GETSERVBYPORT, result_buf, buf, buflen, result);
 }
 

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits