Changeset 936835e in mainline for uspace/srv/net/tl/icmp/icmp.c

Timestamp:

2010-03-07T15:35:32Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

836dd794

Parents:

aadf01e (diff), b5cbff4 (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 mainline changes, revision 311

File:

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

uspace/srv/net/tl/icmp/icmp.c

@@ -175 +175 @@
 /** Requests an echo message.
  *  Sends a packet with specified parameters to the target host and waits for the reply upto the given timeout.
- *  Blocks the caller until the reply or the timeout occurres.
+ *  Blocks the caller until the reply or the timeout occurs.
  *  @param[in] id The message identifier.
  *  @param[in] sequence The message sequence parameter.
@@ -221 +221 @@
 
 /** Tries to set the pending reply result as the received message type.
- *  If the reply data are still present, the reply timeouted and the parent fibril is awaken.
- *  The global lock is not released in this case to be reused by the parent fibril.
+ *  If the reply data is not present, the reply timed out and the other fibril
+ *  is already awake.
  *  Releases the packet.
  *  @param[in] packet The received reply message.
@@ -334 +334 @@
         }
 
-        // unlock the globals and wait for a reply
+        // unlock the globals so that we can wait for the reply
         fibril_rwlock_write_unlock(&icmp_globals.lock);
 
@@ -340 +340 @@
         icmp_send_packet(ICMP_ECHO, 0, packet, header, 0, ttl, tos, dont_fragment);
 
-        // wait for a reply
+        // wait for the reply
         // timeout in microseconds
         if(ERROR_OCCURRED(fibril_condvar_wait_timeout(&reply->condvar, &reply->mutex, timeout * 1000))){
                 result = ERROR_CODE;
-
-                // lock the globals again and clean up
-                fibril_rwlock_write_lock(&icmp_globals.lock);
         }else{
                 // read the result
                 result = reply->result;
-
-                // release the reply structure
-                fibril_mutex_unlock(&reply->mutex);
-        }
+        }
+
+        // drop the reply mutex before locking the globals again
+        fibril_mutex_unlock(&reply->mutex);
+        fibril_rwlock_write_lock(&icmp_globals.lock);
 
         // destroy the reply structure
@@ -636 +634 @@
                 // set the result
                 reply->result = type;
-                // notify the main fibril
+                // notify the waiting fibril
                 fibril_condvar_signal(&reply->condvar);
-        }else{
-                // unlock only if no reply
-                fibril_rwlock_write_unlock(&icmp_globals.lock);
-        }
+        }
+        fibril_rwlock_write_unlock(&icmp_globals.lock);
         return EOK;
 }