Changeset 46b881c in mainline for uspace/app/trace

Timestamp:

2011-01-29T11:36:41Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0b6931a, 8add9ca5

Parents:

e26a4633 (diff), ffa2c8ef (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:

IPC/async: strictly isolate the use of low-level IPC methods (ipc_*) and async framework methods (async_*) in user code, do not allow a mixture of both in a single source file

Benefits for future plans

• The async framework could use different communication style under the hood, but keeping the same high-level API
• The async framework can be integrated more tightly with sessions without potential problems of intermixing session-aware async methods with session-unaware low-level methods in user code
• The async_serialize_start()/_end() can be deprecated more easily

Location:

uspace/app/trace

Files:

• ipc_desc.c (modified) (1 diff)
• ipcp.h (modified) (1 diff)
• proto.c (modified) (1 diff)
• proto.h (modified) (1 diff)
• trace.c (modified) (3 diffs)

uspace/app/trace/ipc_desc.c

@@ -33 +33 @@
  */
 
+#include <ipc/common.h>
 #include <stdlib.h>
-#include <ipc/ipc.h>
 #include "ipc_desc.h"
 

uspace/app/trace/ipcp.h

@@ -36 +36 @@
 #define IPCP_H_
 
-#include <ipc/ipc.h>
 #include "proto.h"
 

uspace/app/trace/proto.c

@@ -35 +35 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <ipc/ipc.h>
 #include <adt/hash_table.h>
 

uspace/app/trace/proto.h

@@ -36 +36 @@
 #define PROTO_H_
 
+#include <ipc/common.h>
 #include <adt/hash_table.h>
-#include <ipc/ipc.h>
 #include "trace.h"
 

uspace/app/trace/trace.c

@@ -36 +36 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <ipc/ipc.h>
 #include <fibril.h>
 #include <errno.h>
@@ -149 +148 @@
         int rc;
 
-        rc = ipc_connect_kbox(task_id);
+        rc = async_connect_kbox(task_id);
 
         if (rc == ENOTSUP) {
@@ -745 +744 @@
         abort_trace = true;
         udebug_end(phoneid);
-        ipc_hangup(phoneid);
+        async_hangup(phoneid);
 
         ipcp_cleanup();