Changeset e6e5f4e in mainline

Timestamp:

2013-03-24T16:35:07Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6ec1d48

Parents:

2ba4d45

Message:

libhound: Fix context registration.

Location:

uspace/lib/hound

Files:

• include/hound/protocol.h (modified) (1 diff)
• src/protocol.c (modified) (3 diffs)

uspace/lib/hound/include/hound/protocol.h

@@ -105 +105 @@
 } hound_server_iface_t;
 
-void hound_service_set_server_iface(hound_server_iface_t *iface);
+void hound_service_set_server_iface(const hound_server_iface_t *iface);
 
 void hound_connection_handler(ipc_callid_t iid, ipc_call_t *icall, void *arg);

uspace/lib/hound/src/protocol.c

@@ -84 +84 @@
         assert(sess);
         assert(name);
+        ipc_call_t call;
         async_exch_t *exch = async_exchange_begin(sess);
-        sysarg_t id;
-        int ret =
-            async_req_1_1(exch, IPC_M_HOUND_CONTEXT_REGISTER, record, &id);
+        aid_t mid =
+            async_send_1(exch, IPC_M_HOUND_CONTEXT_REGISTER, record, &call);
+        int ret = mid ? EOK : EPARTY;
+
         if (ret == EOK)
                 ret = async_data_write_start(exch, name, str_size(name));
+        else
+                async_forget(mid);
+
+        if (ret == EOK)
+                async_wait_for(mid, (sysarg_t *)&ret);
+
         async_exchange_end(exch);
-        return ret == EOK ? (hound_context_id_t)id : ret;
+        return ret == EOK ? (hound_context_id_t)IPC_GET_ARG1(call) : ret;
 }
 
@@ -244 +252 @@
 static const hound_server_iface_t *server_iface;
 
-void hound_service_set_server_iface(hound_server_iface_t *iface)
+void hound_service_set_server_iface(const hound_server_iface_t *iface)
 {
         server_iface = iface;
@@ -282 +290 @@
                                 free(name);
                                 async_answer_0(callid, ret);
-                                break;
-                        }
-                        async_answer_1(callid, EOK, id);
+                        } else {
+                                async_answer_1(callid, EOK, id);
+                        }
+                        break;
                 }
                 case IPC_M_HOUND_CONTEXT_UNREGISTER: {