Include <signal.h> in sysdeps/nptl/allocrtsig.c

[platform/upstream/glibc.git] / assert / assert.c

diff --git a/assert/assert.c b/assert/assert.c
index 332ff7e..21563f6 100644 (file)
--- a/assert/assert.c
+++ b/assert/assert.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1994-1996,1998,2001,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2015 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
@@ -12,66 +12,75 @@
    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, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <assert.h>
+#include <atomic.h>
+#include <ldsodefs.h>
 #include <libintl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sysdep.h>
 #include <unistd.h>
+#include <sys/mman.h>
 
 
 extern const char *__progname;
 
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-# include <libio/iolibio.h>
-# define fflush(s) INTUSE(_IO_fflush) (s)
-#endif
+#include <wchar.h>
+#include <libio/iolibio.h>
+#define fflush(s) _IO_fflush (s)
 
 /* This function, when passed a string containing an asserted
    expression, a filename, and a line number, prints a message
    on the standard error stream of the form:
-       a.c:10: foobar: Assertion `a == b' failed.
+       a.c:10: foobar: Assertion `a == b' failed.
    It then aborts program execution via a call to `abort'.  */
 
 #ifdef FATAL_PREPARE_INCLUDE
 # include FATAL_PREPARE_INCLUDE
 #endif
 
-#undef __assert_fail
+
 void
-__assert_fail (const char *assertion, const char *file, unsigned int line,
-              const char *function)
+__assert_fail_base (const char *fmt, const char *assertion, const char *file,
+                   unsigned int line, const char *function)
 {
-  char *buf;
+  char *str;
 
 #ifdef FATAL_PREPARE
   FATAL_PREPARE;
 #endif
 
-  if (__asprintf (&buf, _("%s%s%s:%u: %s%sAssertion `%s' failed.\n"),
+  int total;
+  if (__asprintf (&str, fmt,
                  __progname, __progname[0] ? ": " : "",
                  file, line,
                  function ? function : "", function ? ": " : "",
-                 assertion) >= 0)
+                 assertion, &total) >= 0)
     {
       /* Print the message.  */
-#ifdef USE_IN_LIBIO
-      if (_IO_fwide (stderr, 0) > 0)
-       (void) __fwprintf (stderr, L"%s", buf);
-      else
-#endif
-       (void) fputs (buf, stderr);
-
+      (void) __fxprintf (NULL, "%s", str);
       (void) fflush (stderr);
 
-      /* We have to free the buffer since the application might catch the
-        SIGABRT.  */
-      free (buf);
+      total = (total + 1 + GLRO(dl_pagesize) - 1) & ~(GLRO(dl_pagesize) - 1);
+      struct abort_msg_s *buf = __mmap (NULL, total, PROT_READ | PROT_WRITE,
+                                       MAP_ANON | MAP_PRIVATE, -1, 0);
+      if (__glibc_likely (buf != MAP_FAILED))
+       {
+         buf->size = total;
+         strcpy (buf->msg, str);
+
+         /* We have to free the old buffer since the application might
+            catch the SIGABRT signal.  */
+         struct abort_msg_s *old = atomic_exchange_acq (&__abort_msg, buf);
+
+         if (old != NULL)
+           __munmap (old, old->size);
+       }
+
+      free (str);
     }
   else
     {
@@ -82,4 +91,14 @@ __assert_fail (const char *assertion, const char *file, unsigned int line,
 
   abort ();
 }
-INTDEF(__assert_fail)
+
+
+#undef __assert_fail
+void
+__assert_fail (const char *assertion, const char *file, unsigned int line,
+              const char *function)
+{
+  __assert_fail_base (_("%s%s%s:%u: %s%sAssertion `%s' failed.\n%n"),
+                     assertion, file, line, function);
+}
+hidden_def(__assert_fail)