Changeset aee6c73 in mainline for uspace/app

Timestamp:

2011-03-26T17:19:28Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

0368669c, cee51fd

Parents:

f3da9b2 (diff), c9f5e238 (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 from development

Location:

uspace/app

Files:

• init/init.c (modified) (1 diff)
• klog/klog.c (modified) (3 diffs)

uspace/app/init/init.c

@@ -313 +313 @@
         getterm("term/vc5", "/app/bdsh", false);
         getterm("term/vc6", "/app/klog", false);
+
+#ifdef CONFIG_DEVMAN_EARLY_LAUNCH
+        spawn("/srv/devman");
+#else
         getterm("term/vc7", "/srv/devman", false);
-        
+#endif
+
         return 0;
 }

uspace/app/klog/klog.c

@@ -44 +44 @@
 #include <io/klog.h>
 #include <sysinfo.h>
+#include <fibril_synch.h>
 
 #define NAME       "klog"
@@ -54 +55 @@
 static FILE *log;
 
+/* Serialize the output a bit. This will not avoid messed-up log completely
+   but chances for are pretty high (experimentally confirmed). */
+static FIBRIL_MUTEX_INITIALIZE(log_mutex);
+
 static void interrupt_received(ipc_callid_t callid, ipc_call_t *call)
 {
+        fibril_mutex_lock(&log_mutex);
+        
         size_t klog_start = (size_t) IPC_GET_ARG1(*call);
         size_t klog_len = (size_t) IPC_GET_ARG2(*call);
@@ -74 +81 @@
                 fsync(fileno(log));
         }
+        
+        fibril_mutex_unlock(&log_mutex);
 }