Changeset dd0c8a0 in mainline for uspace/app/trace/trace.c

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (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.

File:

• uspace/app/trace/trace.c (modified) (3 diffs)

uspace/app/trace/trace.c

@@ -565 +565 @@
 static int cev_fibril(void *arg)
 {
+        cons_event_t event;
+
         (void) arg;
         
@@ -575 +577 @@
                 fibril_mutex_unlock(&state_lock);
                 
-                if (!console_get_kbd_event(console, &cev))
+                if (!console_get_event(console, &event))
                         return -1;
                 
-                fibril_mutex_lock(&state_lock);
-                cev_valid = true;
-                fibril_condvar_broadcast(&state_cv);
-                fibril_mutex_unlock(&state_lock);
+                if (event.type == CEV_KEY) {
+                        fibril_mutex_lock(&state_lock);
+                        cev = event.ev.key;
+                        cev_valid = true;
+                        fibril_condvar_broadcast(&state_cv);
+                        fibril_mutex_unlock(&state_lock);
+                }
         }
 }
@@ -719 +724 @@
         o = oper_new("stat", 0, arg_def, V_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_STAT, o);
+        o = oper_new("statfs", 0, arg_def, V_ERRNO, 0, resp_def);
+        proto_add_oper(p, VFS_IN_STATFS, o);
 
         proto_register(SERVICE_VFS, p);