Changeset cefb126 in mainline for kernel/generic/src/debug/debug.c

Timestamp:

2010-07-02T14:19:30Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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:

• kernel/generic/src/debug/debug.c (moved) (moved from kernel/test/synch/rwlock2.c ) (2 diffs)

kernel/generic/src/debug/debug.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2010 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#include <test.h>
-#include <arch.h>
-#include <atomic.h>
+/** @addtogroup genericdebug
+ * @{
+ */
+
+/**
+ * @file
+ * @brief Kernel instrumentation functions.
+ */
+
+#ifdef CONFIG_TRACE
+
+#include <debug.h>
+#include <symtab.h>
+#include <errno.h>
 #include <print.h>
-#include <proc/thread.h>
 
-#include <synch/rwlock.h>
-
-#define READERS  50
-#define WRITERS  50
-
-static rwlock_t rwlock;
-
-static void writer(void *arg)
+void __cyg_profile_func_enter(void *fn, void *call_site)
 {
-        TPRINTF("Trying to lock rwlock for writing....\n");
+        const char *fn_sym = symtab_fmt_name_lookup((uintptr_t) fn);
         
-        rwlock_write_lock(&rwlock);
-        rwlock_write_unlock(&rwlock);
+        const char *call_site_sym;
+        uintptr_t call_site_off;
         
-        TPRINTF("Trying to lock rwlock for reading....\n");
-        
-        rwlock_read_lock(&rwlock);
-        rwlock_read_unlock(&rwlock);
+        if (symtab_name_lookup((uintptr_t) call_site, &call_site_sym,
+            &call_site_off) == EOK)
+                printf("%s+%" PRIp "->%s\n", call_site_sym, call_site_off,
+                    fn_sym);
+        else
+                printf("->%s\n", fn_sym);
 }
 
-const char *test_rwlock2(void)
+void __cyg_profile_func_exit(void *fn, void *call_site)
 {
-        thread_t *thrd;
+        const char *fn_sym = symtab_fmt_name_lookup((uintptr_t) fn);
         
-        rwlock_initialize(&rwlock);
+        const char *call_site_sym;
+        uintptr_t call_site_off;
         
-        rwlock_read_lock(&rwlock);
-        rwlock_read_lock(&rwlock);
-        rwlock_read_lock(&rwlock);
-        rwlock_read_lock(&rwlock);
-        
-        thrd = thread_create(writer, NULL, TASK, 0, "writer", false);
-        if (thrd)
-                thread_ready(thrd);
+        if (symtab_name_lookup((uintptr_t) call_site, &call_site_sym,
+            &call_site_off) == EOK)
+                printf("%s+%" PRIp "<-%s\n", call_site_sym, call_site_off,
+                    fn_sym);
         else
-                return "Could not create thread";
-        
-        thread_sleep(1);
-        
-        rwlock_read_unlock(&rwlock);
-        rwlock_read_unlock(&rwlock);
-        rwlock_read_unlock(&rwlock);
-        rwlock_read_unlock(&rwlock);
-        
-        thread_join(thrd);
-        thread_detach(thrd);
-        
-        return NULL;
+                printf("<-%s\n", fn_sym);
 }
+
+#endif /* CONFIG_TRACE */
+
+/** @}
+ */