Changeset 6d74977 in mainline

Timestamp:

2013-04-05T15:38:16Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

02ead2e

Parents:

1f440f5f

Message:

libhound: fix data transfer answers

finalize answers EOK for us so postpone real answer until next request

File:

• uspace/lib/hound/src/protocol.c (modified) (6 diffs)

uspace/lib/hound/src/protocol.c

@@ -486 +486 @@
         ipc_call_t call;
         size_t size = 0;
+        int ret_answer = EOK;
         while (async_data_write_receive_call(&callid, &call, &size)
             || (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN)) {
@@ -495 +496 @@
                         continue;
                 }
+                if (ret_answer != EOK) {
+                        async_answer_0(callid, ret_answer);
+                        continue;
+                }
                 char *buffer = malloc(size);
                 if (!buffer) {
@@ -500 +505 @@
                         continue;
                 }
-                int ret = async_data_write_finalize(callid, buffer, size);
+                const int ret = async_data_write_finalize(callid, buffer, size);
                 if (ret == EOK) {
-                        ret = server_iface->stream_data_write(
+                        ret_answer = server_iface->stream_data_write(
                             stream, buffer, size);
                 }
-                async_answer_0(callid, ret);
         }
         const int ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT
@@ -519 +523 @@
         ipc_call_t call;
         size_t size = 0;
+        int ret_answer = EOK;
         while (async_data_read_receive_call(&callid, &call, &size)
             || (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN)) {
@@ -528 +533 @@
                         continue;
                 }
+                if (ret_answer != EOK) {
+                        async_answer_0(callid, ret_answer);
+                        continue;
+                }
                 char *buffer = malloc(size);
                 if (!buffer) {
@@ -535 +544 @@
                 int ret = server_iface->stream_data_read(stream, buffer, size);
                 if (ret == EOK) {
-                        ret = async_data_read_finalize(callid, buffer, size);
-                }
-                async_answer_0(callid, ret);
+                        ret_answer =
+                            async_data_read_finalize(callid, buffer, size);
+                }
         }
         const int ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT