Changeset e8d3c6f5 in mainline

Timestamp:

2018-01-13T00:38:49Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

36f0738

Parents:

9ba415e

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-12 23:46:12)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-13 00:38:49)

Message:

Align <assert.h> with standards, remove it from libposix,
and do not let malloc() use printf() with corrupted heap.

Location:

uspace/lib

Files:

• c/generic/assert.c (modified) (1 diff)
• c/generic/malloc.c (modified) (2 diffs)
• c/include/assert.h (modified) (2 diffs)
• posix/include/posix/assert.h (deleted)
• posix/source/fnmatch.c (modified) (1 diff)
• posix/source/pwd.c (modified) (1 diff)
• posix/source/stdio.c (modified) (1 diff)
• posix/source/stdio/scanf.c (modified) (1 diff)
• posix/source/stdlib/strtold.c (modified) (1 diff)
• posix/source/string.c (modified) (1 diff)
• posix/source/sys/wait.c (modified) (1 diff)
• posix/source/time.c (modified) (1 diff)

uspace/lib/c/generic/assert.c

@@ -41 +41 @@
 static atomic_t failed_asserts = {0};
 
-void assert_abort(const char *cond, const char *file, unsigned int line)
+void __helenos_assert_quick_abort(const char *cond, const char *file, unsigned int line)
+{
+        /*
+         * Send the message safely to kio. Nested asserts should not occur.
+         */
+        kio_printf("Assertion failed (%s) in file \"%s\", line %u.\n",
+            cond, file, line);
+        
+        /* Sometimes we know in advance that regular printf() would likely fail. */
+        abort();
+}
+
+void __helenos_assert_abort(const char *cond, const char *file, unsigned int line)
 {
         /*

uspace/lib/c/generic/malloc.c

@@ -33 +33 @@
 /** @file
  */
+
+#define _HELENOS_SOURCE
 
 #include <malloc.h>
@@ -196 +198 @@
 static futex_t malloc_futex = FUTEX_INITIALIZER;
 
-#ifndef NDEBUG
-
-#define malloc_assert(expr) \
-        do { \
-                if (!(expr)) {\
-                        heap_unlock(); \
-                        assert_abort(#expr, __FILE__, __LINE__); \
-                } \
-        } while (0)
-
-#else /* NDEBUG */
-
-#define malloc_assert(expr)
-
-#endif /* NDEBUG */
-
+#define malloc_assert(expr) safe_assert(expr)
 
 #ifdef FUTEX_UPGRADABLE

uspace/lib/c/include/assert.h

@@ -34 +34 @@
  */
 
+// XXX: The definition of `assert()` is not guarded.
+// One must not use `#pragma once` in this header.
+// This is in accordance with the C standard.
+
 #ifndef LIBC_ASSERT_H_
 #define LIBC_ASSERT_H_
 
 #define static_assert(expr)     _Static_assert(expr, "")
+
+extern void __helenos_assert_abort(const char *, const char *, unsigned int)
+    __attribute__((noreturn));
+
+extern void __helenos_assert_quick_abort(const char *, const char *, unsigned int)
+    __attribute__((noreturn));
+
+#endif
 
 /** Debugging assert macro
@@ -49 +61 @@
  */
 
+#undef assert
+
 #ifndef NDEBUG
+        #define assert(expr) ((expr) ? (void) 0 : __helenos_assert_abort(#expr, __FILE__, __LINE__))
+#else
+        #define assert(expr) ((void) 0)
+#endif
 
-#define assert(expr) \
-        do { \
-                if (!(expr)) \
-                        assert_abort(#expr, __FILE__, __LINE__); \
-        } while (0)
+#ifdef _HELENOS_SOURCE
 
-#else /* NDEBUG */
+#undef safe_assert
 
-#define assert(expr)
+#ifndef NDEBUG
+        #define safe_assert(expr) ((expr) ? (void) 0 : __helenos_assert_quick_abort(#expr, __FILE__, __LINE__))
+#else
+        #define safe_assert(expr) ((void) 0)
+#endif
 
-#endif /* NDEBUG */
-
-extern void assert_abort(const char *, const char *, unsigned int)
-    __attribute__((noreturn));
-
-#endif
+#endif /* _HELENOS_SOURCE */
 
 /** @}

uspace/lib/posix/source/fnmatch.c

@@ -49 +49 @@
 #include "posix/string.h"
 #include "posix/stdlib.h"
-#include "posix/assert.h"
+#include <assert.h>
 
 #include "internal/common.h"

uspace/lib/posix/source/pwd.c

@@ -40 +40 @@
 #include "posix/string.h"
 #include <errno.h>
-#include "posix/assert.h"
+#include <assert.h>
 
 static bool entry_read = false;

uspace/lib/posix/source/stdio.c

@@ -40 +40 @@
 #include "posix/stdio.h"
 
-#include "posix/assert.h"
+#include <assert.h>
 
 #include <errno.h>

uspace/lib/posix/source/stdio/scanf.c

@@ -36 +36 @@
 #define __POSIX_DEF__(x) posix_##x
 
-#include "posix/assert.h"
+#include <assert.h>
 
 #include <errno.h>

uspace/lib/posix/source/stdlib/strtold.c

@@ -40 +40 @@
 #include "posix/stdlib.h"
 
-#include "posix/assert.h"
+#include <assert.h>
 #include "posix/ctype.h"
 #include "posix/stdint.h"

uspace/lib/posix/source/string.c

@@ -40 +40 @@
 #include "posix/string.h"
 
-#include "posix/assert.h"
+#include <assert.h>
 
 #include <errno.h>

uspace/lib/posix/source/sys/wait.c

@@ -41 +41 @@
 
 #include "libc/task.h"
-#include "posix/assert.h"
+#include <assert.h>
 
 #include <errno.h>

uspace/lib/posix/source/time.c

@@ -45 +45 @@
 
 #include "posix/signal.h"
-#include "posix/assert.h"
+#include <assert.h>
 
 #include "libc/async.h"