Changeset aa85487 in mainline for kernel/test/synch

Timestamp:

2010-03-07T15:11:56Z (16 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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, revision 308

Location:

kernel/test/synch

Files:

• rwlock1.c (modified) (1 diff)
• rwlock2.c (modified) (1 diff)
• rwlock3.c (modified) (1 diff)
• rwlock4.c (modified) (1 diff)
• rwlock5.c (modified) (1 diff)
• semaphore1.c (modified) (1 diff)
• semaphore2.c (modified) (1 diff)

kernel/test/synch/rwlock1.c

@@ -41 +41 @@
 static rwlock_t rwlock;
 
-char *test_rwlock1(void)
+const char *test_rwlock1(void)
 {
         rwlock_initialize(&rwlock);

kernel/test/synch/rwlock2.c

@@ -53 +53 @@
 }
 
-char *test_rwlock2(void)
+const char *test_rwlock2(void)
 {
         thread_t *thrd;

kernel/test/synch/rwlock3.c

@@ -60 +60 @@
 }
 
-char *test_rwlock3(void)
+const char *test_rwlock3(void)
 {
         int i;

kernel/test/synch/rwlock4.c

@@ -132 +132 @@
 }
 
-char *test_rwlock4(void)
+const char *test_rwlock4(void)
 {
         context_t ctx;

kernel/test/synch/rwlock5.c

@@ -67 +67 @@
 }
 
-char *test_rwlock5(void)
+const char *test_rwlock5(void)
 {
         int i, j, k;
-        long readers, writers;
+        atomic_count_t readers;
+        atomic_count_t writers;
         
         waitq_initialize(&can_start);

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);

kernel/test/synch/semaphore2.c

@@ -82 +82 @@
 }
 
-char *test_semaphore2(void)
+const char *test_semaphore2(void)
 {
         uint32_t i, k;