Changeset de33dab in mainline

Timestamp:

2007-04-09T13:53:57Z (18 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.

Files:

• kernel/generic/src/proc/thread.c (modified) (1 diff)
• uspace/libc/arch/sparc64/src/thread_entry.s (modified) (1 diff)
• uspace/libc/generic/io/printf_core.c (modified) (3 diffs)
• uspace/libc/generic/io/vprintf.c (modified) (2 diffs)
• uspace/tester/fault/fault1.c (modified) (1 diff)
• uspace/tester/fault/fault2.c (modified) (1 diff)
• uspace/tester/thread/thread1.c (modified) (4 diffs)

kernel/generic/src/proc/thread.c

@@ -661 +661 @@
                 if (uspace_thread_id != NULL)
                         return (unative_t) copy_to_uspace(uspace_thread_id, &t->tid,
-                        sizeof(t->tid));
+                            sizeof(t->tid));
                 else
                         return 0;

uspace/libc/arch/sparc64/src/thread_entry.s

@@ -35 +35 @@
 #
 __thread_entry:
-        sethi %hi(_gp), %l7     
+        sethi %hi(_gp), %l7
         call __thread_main              ! %o0 contains address of uarg
         or %l7, %lo(_gp), %l7

uspace/libc/generic/io/printf_core.c

@@ -41 +41 @@
 #include <ctype.h>
 #include <string.h>
+#include <async.h>      /* for pseudo thread serialization */
 
 #define __PRINTF_FLAG_PREFIX            0x00000001      /**< show prefixes 0x or 0*/
@@ -443 +444 @@
         int width, precision;
         uint64_t flags;
+        
+        /* Don't let other pseudo threads interfere. */
+        async_serialize_start();
         
         counter = 0;
@@ -675 +679 @@
         }
         
+        async_serialize_end();
         return counter;
 minus_out:
+        async_serialize_end();
         return -counter;
 }

uspace/libc/generic/io/vprintf.c

@@ -37 +37 @@
 #include <unistd.h>
 #include <io/printf_core.h>
-#include <futex.h>
-
-atomic_t printf_futex = FUTEX_INITIALIZER;
 
 static int vprintf_write(const char *str, size_t count, void *unused)
@@ -55 +52 @@
         struct printf_spec ps = {(int(*)(void *, size_t, void *)) vprintf_write, NULL};
         
-        futex_down(&printf_futex);
         int ret = printf_core(fmt, &ps, ap);
-        futex_up(&printf_futex);
         
         return ret;

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