Changeset 43114c5 in mainline for test/synch/rwlock4/test.c

Timestamp:

2005-04-09T18:22:53Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8262010

Parents:

e6ba9a3f

Message:

Introduce macros CPU, THREAD, TASK and use them to replace the→cpu, the→thread, the→task.
Later on, this will make it possible to reference *current* cpu, thread and/or task without the aid from virtual memory.

File:

• test/synch/rwlock4/test.c (modified) (5 diffs)

test/synch/rwlock4/test.c

@@ -74 +74 @@
 
         to = random(40000);
-        printf("cpu%d, tid %d w+ (%d)\n", the->cpu->id, the->thread->tid, to);
+        printf("cpu%d, tid %d w+ (%d)\n", CPU->id, THREAD->tid, to);
         rc = rwlock_write_lock_timeout(&rwlock, to);
         if (SYNCH_FAILED(rc)) {
-                printf("cpu%d, tid %d w!\n", the->cpu->id, the->thread->tid);
+                printf("cpu%d, tid %d w!\n", CPU->id, THREAD->tid);
                 return;
         };
-        printf("cpu%d, tid %d w=\n", the->cpu->id, the->thread->tid);
+        printf("cpu%d, tid %d w=\n", CPU->id, THREAD->tid);
 
         if (rwlock.readers_in) panic("Oops.");
@@ -87 +87 @@
 
         rwlock_write_unlock(&rwlock);
-        printf("cpu%d, tid %d w-\n", the->cpu->id, the->thread->tid);   
+        printf("cpu%d, tid %d w-\n", CPU->id, THREAD->tid);     
 }
 
@@ -96 +96 @@
         
         to = random(2000);
-        printf("cpu%d, tid %d r+ (%d)\n", the->cpu->id, the->thread->tid, to);
+        printf("cpu%d, tid %d r+ (%d)\n", CPU->id, THREAD->tid, to);
         rc = rwlock_read_lock_timeout(&rwlock, to);
         if (SYNCH_FAILED(rc)) {
-                printf("cpu%d, tid %d r!\n", the->cpu->id, the->thread->tid);
+                printf("cpu%d, tid %d r!\n", CPU->id, THREAD->tid);
                 return;
         }
-        printf("cpu%d, tid %d r=\n", the->cpu->id, the->thread->tid);
+        printf("cpu%d, tid %d r=\n", CPU->id, THREAD->tid);
         thread_usleep(30000);
         rwlock_read_unlock(&rwlock);
-        printf("cpu%d, tid %d r-\n", the->cpu->id, the->thread->tid);           
+        printf("cpu%d, tid %d r-\n", CPU->id, THREAD->tid);             
 }
 
@@ -135 +135 @@
                 printf("Creating %d readers\n", k);
                 for (i=0; i<k; i++) {
-                        thrd = thread_create(reader, NULL, the->task, 0);
+                        thrd = thread_create(reader, NULL, TASK, 0);
                         if (thrd)
                                 thread_ready(thrd);
@@ -145 +145 @@
                 printf("Creating %d writers\n", k);
                 for (i=0; i<k; i++) {
-                        thrd = thread_create(writer, NULL, the->task, 0);
+                        thrd = thread_create(writer, NULL, TASK, 0);
                         if (thrd)
                                 thread_ready(thrd);