Changeset 46c20c8 in mainline for kernel/test/synch

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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.

Location:

kernel/test/synch

Files:

• rwlock1.c (deleted)
• rwlock1.def (deleted)
• rwlock2.def (deleted)
• rwlock3.c (deleted)
• rwlock3.def (deleted)
• rwlock4.c (deleted)
• rwlock4.def (deleted)
• rwlock5.c (deleted)
• rwlock5.def (deleted)
• semaphore1.c (modified) (3 diffs)
• semaphore2.c (modified) (2 diffs)

kernel/test/synch/semaphore1.c

@@ -70 +70 @@
 }
 
-char *test_semaphore1(void)
+const char *test_semaphore1(void)
 {
         int i, j, k;
-        int consumers, producers;
+        atomic_count_t consumers;
+        atomic_count_t producers;
         
         waitq_initialize(&can_start);
@@ -87 +88 @@
                 producers = (4 - i) * PRODUCERS;
                 
-                TPRINTF("Creating %d consumers and %d producers...", consumers, producers);
+                TPRINTF("Creating %" PRIua " consumers and %" PRIua " producers...",
+                    consumers, producers);
                 
                 for (j = 0; j < (CONSUMERS + PRODUCERS) / 2; j++) {
@@ -112 +114 @@
                 
                 while ((items_consumed.count != consumers) || (items_produced.count != producers)) {
-                        TPRINTF("%d consumers remaining, %d producers remaining\n", consumers - items_consumed.count, producers - items_produced.count);
+                        TPRINTF("%" PRIua " consumers remaining, %" PRIua " producers remaining\n",
+                            consumers - items_consumed.count, producers - items_produced.count);
                         thread_sleep(1);
                 }

kernel/test/synch/semaphore2.c

@@ -32 +32 @@
 #include <print.h>
 #include <proc/thread.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/context.h>
 
@@ -82 +82 @@
 }
 
-char *test_semaphore2(void)
+const char *test_semaphore2(void)
 {
         uint32_t i, k;