Changeset de33dab in mainline for uspace/tester

Timestamp:

2007-04-09T13:53:57Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

183788f1

Parents:

d0b1443

Message:

Revert some of the changes introduced in revision 2209.
I think it is not correct to remove serialization of pseudo threads in printf_core.c.
With thread-level futex serialization, several pseudo threads running in one thread could easily deadlock
the task.

Add a dedicated futex serialization to thread1.c test only.

Location:

uspace/tester

Files:

• fault/fault1.c (modified) (1 diff)
• fault/fault2.c (modified) (1 diff)
• thread/thread1.c (modified) (4 diffs)

uspace/tester/fault/fault1.c

@@ -34 +34 @@
         ((int *)(0))[1] = 0;
         
-        return "Written to NULL";
+        return "Survived write to NULL";
 }

uspace/tester/fault/fault2.c

@@ -37 +37 @@
         var1 = *((int *) (((char *) (&var)) + 1));
         
-        return "Done unaligned read";
+        return "Survived unaligned read";
 }

uspace/tester/thread/thread1.c

@@ -34 +34 @@
 #include <stdio.h>
 #include <unistd.h>
+#include <futex.h>
 #include "../tester.h"
 
@@ -40 +41 @@
 static bool sh_quiet;
 
+static atomic_t srlz = FUTEX_INITIALIZER;
+
 static void threadtest(void *data)
 {
@@ -45 +48 @@
 
         while (atomic_get(&finish)) {
-                if (!sh_quiet)
+                if (!sh_quiet) {
+                        futex_down(&srlz);
                         printf("%llu ", thread_get_id());
+                        futex_up(&srlz);
+                }
                 usleep(100000);
         }
@@ -69 +75 @@
         }
         
-        if (!quiet)
+        if (!quiet) {
+                futex_down(&srlz);
                 printf("Running threads for 10 seconds...\n");
+                futex_up(&srlz);
+        }
         sleep(10);