Changeset b678410 in mainline for uspace/lib/c/generic/assert.c

Timestamp:

2011-04-27T20:01:13Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a6dffb8

Parents:

628d548 (diff), 933cadf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/c/generic/assert.c (moved) (moved from kernel/generic/src/proc/tasklet.c ) (2 diffs)

uspace/lib/c/generic/assert.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2007 Jan Hudecek
- * Copyright (c) 2008 Martin Decky
+ * Copyright (c) 2011 Martin Decky
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @addtogroup genericproc
+/** @addtogroup libc
  * @{
  */
-/** @file tasklet.c
- *  @brief Tasklet implementation
- */
 
-#include <proc/tasklet.h>
-#include <synch/spinlock.h>
-#include <mm/slab.h>
-#include <config.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stacktrace.h>
 
-/** Spinlock protecting list of tasklets */
-SPINLOCK_INITIALIZE(tasklet_lock);
-
-/** Array of tasklet lists for every CPU */
-tasklet_descriptor_t **tasklet_list;
-
-void tasklet_init(void)
+void assert_abort(const char *cond, const char *file, unsigned int line)
 {
-        unsigned int i;
-        
-        tasklet_list = malloc(sizeof(tasklet_descriptor_t *) * config.cpu_count, 0);
-        if (!tasklet_list)
-                panic("Error initializing tasklets.");
-        
-        for (i = 0; i < config.cpu_count; i++)
-                tasklet_list[i] = NULL;
-        
-        spinlock_initialize(&tasklet_lock, "tasklet_lock");
+        printf("Assertion failed (%s) in file \"%s\", line %u.\n",
+            cond, file, line);
+        stacktrace_print();
+        abort();
 }
-
 
 /** @}