Changeset 60ab6c3 in mainline for uspace/srv/net/modules.c

Timestamp:

2010-03-10T05:46:54Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5782081

Parents:

71b00dcc (diff), b48ebd19 (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 from lp:~lukasmejdrech/helenos/network.

File:

• uspace/srv/net/modules.c (modified) (5 diffs)

uspace/srv/net/modules.c

@@ -51 +51 @@
 
 void answer_call(ipc_callid_t callid, int result, ipc_call_t * answer, int answer_count){
+        // choose the most efficient answer function
         if(answer || (! answer_count)){
                 switch(answer_count){
@@ -86 +87 @@
         ipcarg_t phonehash;
 
+        // connect to the needed service
         phone = connect_to_service_timeout(need, timeout);
+        // if connected
         if(phone >= 0){
+                // request the bidirectional connection
                 if(ERROR_OCCURRED(ipc_connect_to_me(phone, arg1, arg2, arg3, &phonehash))){
                         ipc_hangup(phone);
@@ -102 +106 @@
 
 int connect_to_service_timeout(services_t need, suseconds_t timeout){
-        if (timeout <= 0)
+        int phone;
+
+        // if no timeout is set
+        if (timeout <= 0){
                 return async_connect_me_to_blocking(PHONE_NS, need, 0, 0);
-        
+        }
+
         while(true){
-                int phone;
+                phone = async_connect_me_to(PHONE_NS, need, 0, 0);
+                if((phone >= 0) || (phone != ENOENT)){
+                        return phone;
+                }
 
-                phone = async_connect_me_to(PHONE_NS, need, 0, 0);
-                if((phone >= 0) || (phone != ENOENT))
-                        return phone;
-        
-                timeout -= MODULE_WAIT_TIME;
+                // end if no time is left
                 if(timeout <= 0){
                         return ETIMEOUT;
                 }
 
-                usleep(MODULE_WAIT_TIME);
+                // wait the minimum of the module wait time and the timeout
+                usleep((timeout <= MODULE_WAIT_TIME) ? timeout : MODULE_WAIT_TIME);
+                timeout -= MODULE_WAIT_TIME;
         }
 }
@@ -129 +138 @@
                 return EBADMEM;
         }
+
+        // fetch the request
         if(! async_data_write_receive(&callid, length)){
                 return EINVAL;
         }
+
+        // allocate the buffer
         *data = malloc(*length);
         if(!(*data)){
                 return ENOMEM;
         }
+
+        // fetch the data
         if(ERROR_OCCURRED(async_data_write_finalize(callid, * data, * length))){
                 free(data);
@@ -147 +162 @@
         ipc_callid_t callid;
 
+        // fetch the request
         if(! async_data_read_receive(&callid, &length)){
                 return EINVAL;
         }
+
+        // check the requested data size
         if(length < data_length){
                 async_data_read_finalize(callid, data, length);
                 return EOVERFLOW;
         }
+
+        // send the data
         return async_data_read_finalize(callid, data, data_length);
 }
 
 void refresh_answer(ipc_call_t * answer, int * answer_count){
+
         if(answer_count){
                 *answer_count = 0;
         }
+
         if(answer){
                 IPC_SET_RETVAL(*answer, 0);