Changeset 936835e in mainline for uspace/srv

Timestamp:

2010-03-07T15:35:32Z (16 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

Location:

uspace/srv/net

Files:

• socket/socket_client.c (modified) (2 diffs)
• tl/icmp/icmp.c (modified) (5 diffs)
• tl/udp/udp.c (modified) (7 diffs)

uspace/srv/net/socket/socket_client.c

@@ -580 +580 @@
                 fibril_rwlock_write_unlock(&socket_globals.lock);
                 fibril_condvar_wait(&socket->accept_signal, &socket->accept_lock);
+                // drop the accept lock to avoid deadlock
+                fibril_mutex_unlock(&socket->accept_lock);
                 fibril_rwlock_write_lock(&socket_globals.lock);
+                fibril_mutex_lock(&socket->accept_lock);
         }
         -- socket->blocked;
@@ -801 +804 @@
                 fibril_rwlock_read_unlock(&socket_globals.lock);
                 fibril_condvar_wait(&socket->receive_signal, &socket->receive_lock);
+                // drop the receive lock to avoid deadlock
+                fibril_mutex_unlock(&socket->receive_lock);
                 fibril_rwlock_read_lock(&socket_globals.lock);
+                fibril_mutex_lock(&socket->receive_lock);
         }
         -- socket->blocked;

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;
 }

uspace/srv/net/tl/udp/udp.c

@@ -418 +418 @@
         struct sockaddr * addr;
         size_t addrlen;
-        fibril_rwlock_t lock;
         ipc_call_t answer;
         int answer_count;
@@ -433 +432 @@
 
         socket_cores_initialize(&local_sockets);
-        fibril_rwlock_initialize(&lock);
 
         while(keep_on_going){
@@ -453 +451 @@
                                 break;
                         case NET_SOCKET:
-                                fibril_rwlock_write_lock(&lock);
                                 *SOCKET_SET_SOCKET_ID(answer) = SOCKET_GET_SOCKET_ID(call);
                                 res = socket_create(&local_sockets, app_phone, NULL, SOCKET_SET_SOCKET_ID(answer));
-                                fibril_rwlock_write_unlock(&lock);
                                 if(res == EOK){
                                         if(tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, DEVICE_INVALID_ID, &packet_dimension) == EOK){
@@ -469 +465 @@
                                 res = data_receive((void **) &addr, &addrlen);
                                 if(res == EOK){
-                                        fibril_rwlock_read_lock(&lock);
                                         fibril_rwlock_write_lock(&udp_globals.lock);
                                         res = socket_bind(&local_sockets, &udp_globals.sockets, SOCKET_GET_SOCKET_ID(call), addr, addrlen, UDP_FREE_PORTS_START, UDP_FREE_PORTS_END, udp_globals.last_used_port);
                                         fibril_rwlock_write_unlock(&udp_globals.lock);
-                                        fibril_rwlock_read_unlock(&lock);
                                         free(addr);
                                 }
@@ -480 +474 @@
                                 res = data_receive((void **) &addr, &addrlen);
                                 if(res == EOK){
-                                        fibril_rwlock_read_lock(&lock);
                                         fibril_rwlock_write_lock(&udp_globals.lock);
                                         res = udp_sendto_message(&local_sockets, SOCKET_GET_SOCKET_ID(call), addr, addrlen, SOCKET_GET_DATA_FRAGMENTS(call), SOCKET_SET_DATA_FRAGMENT_SIZE(answer), SOCKET_GET_FLAGS(call));
@@ -488 +481 @@
                                                 answer_count = 2;
                                         }
-                                        fibril_rwlock_read_unlock(&lock);
                                         free(addr);
                                 }
                                 break;
                         case NET_SOCKET_RECVFROM:
-                                fibril_rwlock_read_lock(&lock);
                                 fibril_rwlock_write_lock(&udp_globals.lock);
                                 res = udp_recvfrom_message(&local_sockets, SOCKET_GET_SOCKET_ID(call), SOCKET_GET_FLAGS(call), &addrlen);
                                 fibril_rwlock_write_unlock(&udp_globals.lock);
-                                fibril_rwlock_read_unlock(&lock);
                                 if(res > 0){
                                         *SOCKET_SET_READ_DATA_LENGTH(answer) = res;
@@ -506 +496 @@
                                 break;
                         case NET_SOCKET_CLOSE:
-                                fibril_rwlock_write_lock(&lock);
                                 fibril_rwlock_write_lock(&udp_globals.lock);
                                 res = socket_destroy(udp_globals.net_phone, SOCKET_GET_SOCKET_ID(call), &local_sockets, &udp_globals.sockets, NULL);
                                 fibril_rwlock_write_unlock(&udp_globals.lock);
-                                fibril_rwlock_write_unlock(&lock);
                                 break;
                         case NET_SOCKET_GETSOCKOPT: