Changes in uspace/srv/net/tl/icmp/icmp.c [b48ebd19:aadf01e] in mainline

File:

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

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

@@ -41 +41 @@
 #include <fibril_synch.h>
 #include <stdint.h>
-#include <string.h>
 
 #include <ipc/ipc.h>
@@ -176 +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 occurs.
+ *  Blocks the caller until the reply or the timeout occurres.
  *  @param[in] id The message identifier.
  *  @param[in] sequence The message sequence parameter.
@@ -222 +221 @@
 
 /** Tries to set the pending reply result as the received message type.
- *  If the reply data is not present, the reply timed out and the other fibril
- *  is already awake.
+ *  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.
  *  Releases the packet.
  *  @param[in] packet The received reply message.
@@ -335 +334 @@
         }
 
-        // unlock the globals so that we can wait for the reply
+        // unlock the globals and wait for a reply
         fibril_rwlock_write_unlock(&icmp_globals.lock);
 
@@ -341 +340 @@
         icmp_send_packet(ICMP_ECHO, 0, packet, header, 0, ttl, tos, dont_fragment);
 
-        // wait for the reply
+        // wait for a 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;
-        }
-
-        // drop the reply mutex before locking the globals again
-        fibril_mutex_unlock(&reply->mutex);
-        fibril_rwlock_write_lock(&icmp_globals.lock);
+
+                // release the reply structure
+                fibril_mutex_unlock(&reply->mutex);
+        }
 
         // destroy the reply structure
@@ -635 +636 @@
                 // set the result
                 reply->result = type;
-                // notify the waiting fibril
+                // notify the main fibril
                 fibril_condvar_signal(&reply->condvar);
-        }
-        fibril_rwlock_write_unlock(&icmp_globals.lock);
+        }else{
+                // unlock only if no reply
+                fibril_rwlock_write_unlock(&icmp_globals.lock);
+        }
         return EOK;
 }