Changeset 257feec in mainline for uspace/srv/net/tcp/sock.c

Timestamp:

2013-06-27T12:48:32Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

9f391e9

Parents:

679ee84

Message:

cstyle (no change in functionality)

File:

• uspace/srv/net/tcp/sock.c (modified) (9 diffs)

uspace/srv/net/tcp/sock.c

@@ -429 +429 @@
 
         fibril_mutex_unlock(&socket->lock);
-
+        
         switch (trc) {
         case TCP_EOK:
@@ -440 +440 @@
                 assert(false);
         }
-
+        
         if (rc == EOK)
                 fibril_add_ready(socket->recv_fibril);
-
+        
         async_answer_0(callid, rc);
 }
@@ -687 +687 @@
         socket = (tcp_sockdata_t *)sock_core->specific_data;
         fibril_mutex_lock(&socket->lock);
-
+        
         if (socket->conn == NULL) {
                 fibril_mutex_unlock(&socket->lock);
@@ -703 +703 @@
                     &socket->recv_buffer_lock);
         }
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Got data in sock recv_buffer");
 
@@ -723 +723 @@
                 assert(false);
         }
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "**** recv result -> %d", rc);
+        
         if (rc != EOK) {
                 fibril_mutex_unlock(&socket->recv_buffer_lock);
@@ -769 +770 @@
                 }
         }
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "data read receive");
         if (!async_data_read_receive(&rcallid, &length)) {
@@ -777 +778 @@
                 return;
         }
-
+        
         if (length > data_len)
                 length = data_len;
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "data read finalize");
         rc = async_data_read_finalize(rcallid, socket->recv_buffer, length);
-
+        
         socket->recv_buffer_used -= length;
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_recvfrom: %zu left in buffer",
@@ -792 +793 @@
                 tcp_sock_notify_data(socket->sock_core);
         }
-
+        
         fibril_condvar_broadcast(&socket->recv_buffer_cv);
 
@@ -800 +801 @@
         SOCKET_SET_READ_DATA_LENGTH(answer, length);
         async_answer_1(callid, EOK, IPC_GET_ARG1(answer));
-
+        
         fibril_mutex_unlock(&socket->recv_buffer_lock);
         fibril_mutex_unlock(&socket->lock);