Changeset 15e54f5 in mainline

Timestamp:

2011-06-09T15:11:30Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e6211f8

Parents:

4a4c8bcf

Message:

fix deadlock in client part of devman protocol

File:

• uspace/lib/c/generic/devman.c (modified) (3 diffs)

uspace/lib/c/generic/devman.c

@@ -231 +231 @@
         }
         
-        async_wait_for(req, &retval);
-        if (retval != EOK) {
-                devman_exchange_end(exch);
-                
-                if (funh != NULL)
-                        *funh = -1;
-                
-                return retval;
-        }
-        
-        if (funh != NULL)
-                *funh = (int) IPC_GET_ARG1(answer);
-        
         link_t *link = match_ids->ids.next;
         match_id_t *match_id = NULL;
@@ -250 +237 @@
                 match_id = list_get_instance(link, match_id_t, link);
                 
-                ipc_call_t answer;
-                aid_t req = async_send_1(exch, DEVMAN_ADD_MATCH_ID,
-                    match_id->score, &answer);
+                ipc_call_t answer2;
+                aid_t req2 = async_send_1(exch, DEVMAN_ADD_MATCH_ID,
+                    match_id->score, &answer2);
                 retval = async_data_write_start(exch, match_id->id,
                     str_size(match_id->id));
+                if (retval != EOK) {
+                        devman_exchange_end(exch);
+                        async_wait_for(req2, NULL);
+                        async_wait_for(req, NULL);
+                        return retval;
+                }
+                
+                async_wait_for(req2, &retval);
                 if (retval != EOK) {
                         devman_exchange_end(exch);
@@ -261 +256 @@
                 }
                 
-                async_wait_for(req, &retval);
-                if (retval != EOK) {
-                        devman_exchange_end(exch);
-                        return retval;
-                }
-                
                 link = link->next;
         }
         
         devman_exchange_end(exch);
-        return EOK;
+        
+        async_wait_for(req, &retval);
+        if (retval != EOK) {
+                if (funh != NULL)
+                        *funh = (int) IPC_GET_ARG1(answer);
+        } else {
+                if (funh != NULL)
+                        *funh = -1;
+        }
+        
+        return retval;
 }