Changeset 04803bf in mainline for uspace/lib/c/generic/io/vprintf.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/lib/c/generic/io/vprintf.c (moved) (moved from uspace/lib/libc/generic/io/vprintf.c ) (3 diffs)

uspace/lib/c/generic/io/vprintf.c

@@ -37 +37 @@
 #include <unistd.h>
 #include <io/printf_core.h>
-#include <futex.h>
+#include <fibril_synch.h>
 #include <async.h>
-#include <string.h>
+#include <str.h>
 
-static atomic_t printf_futex = FUTEX_INITIALIZER;
+static FIBRIL_MUTEX_INITIALIZE(printf_mutex);
 
 static int vprintf_str_write(const char *str, size_t size, void *stream)
@@ -76 +76 @@
 int vfprintf(FILE *stream, const char *fmt, va_list ap)
 {
-        struct printf_spec ps = {
+        printf_spec_t ps = {
                 vprintf_str_write,
                 vprintf_wstr_write,
@@ -85 +85 @@
          * Prevent other threads to execute printf_core()
          */
-        futex_down(&printf_futex);
-        
-        /*
-         * Prevent other fibrils of the same thread
-         * to execute printf_core()
-         */
-        async_serialize_start();
+        fibril_mutex_lock(&printf_mutex);
         
         int ret = printf_core(fmt, &ps, ap);
         
-        async_serialize_end();
-        futex_up(&printf_futex);
+        fibril_mutex_unlock(&printf_mutex);
         
         return ret;