Changeset 79ae36dd in mainline for uspace/srv/net/tl/tcp/tcp.c

Timestamp:

2011-06-08T19:01:55Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0eff68e

Parents:

764d71e

Message:

new async framework with integrated exchange tracking

• strict isolation between low-level IPC and high-level async framework with integrated exchange tracking
  • each IPC connection is represented by an async_sess_t structure
  • each IPC exchange is represented by an async_exch_t structure
  • exchange management is either based on atomic messages (EXCHANGE_ATOMIC), locking (EXCHANGE_SERIALIZE) or connection cloning (EXCHANGE_CLONE)
• async_obsolete: temporary compatibility layer to keep old async clients working (several pieces of code are currently broken, but only non-essential functionality)
• IPC_M_PHONE_HANGUP is now method no. 0 (for elegant boolean evaluation)
• IPC_M_DEBUG_ALL has been renamed to IPC_M_DEBUG
• IPC_M_PING has been removed (VFS protocol now has VFS_IN_PING)
• console routines in libc have been rewritten for better abstraction
• additional use for libc-private header files (FILE structure opaque to the client)
• various cstyle changes (typos, indentation, missing externs in header files, improved comments, etc.)

File:

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

uspace/srv/net/tl/tcp/tcp.c

@@ -38 +38 @@
 #include <assert.h>
 #include <async.h>
+#include <async_obsolete.h>
 #include <fibril_synch.h>
 #include <malloc.h>
@@ -72 +73 @@
 #include "tcp.h"
 #include "tcp_header.h"
+
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
 
 /** TCP module name. */
@@ -799 +803 @@
 
         /* Notify the destination socket */
-        async_msg_5(socket->phone, NET_SOCKET_RECEIVED,
+        async_obsolete_msg_5(socket->phone, NET_SOCKET_RECEIVED,
             (sysarg_t) socket->socket_id,
             ((packet_dimension->content < socket_data->data_fragment_size) ?
@@ -820 +824 @@
 
         /* Notify the destination socket */
-        async_msg_5(socket->phone, NET_SOCKET_RECEIVED,
+        async_obsolete_msg_5(socket->phone, NET_SOCKET_RECEIVED,
             (sysarg_t) socket->socket_id,
             0, 0, 0,
@@ -1078 +1082 @@
                 if (rc == EOK) {
                         /* Notify the destination socket */
-                        async_msg_5(socket->phone, NET_SOCKET_ACCEPTED,
+                        async_obsolete_msg_5(socket->phone, NET_SOCKET_ACCEPTED,
                             (sysarg_t) listening_socket->socket_id,
                             socket_data->data_fragment_size, TCP_HEADER_SIZE,
@@ -1269 +1273 @@
 {
         int res;
-        bool keep_on_going = true;
         socket_cores_t local_sockets;
         int app_phone = IPC_GET_PHONE(call);
@@ -1293 +1296 @@
         fibril_rwlock_initialize(&lock);
 
-        while (keep_on_going) {
+        while (true) {
 
                 /* Answer the call */
@@ -1301 +1304 @@
                 /* Get the next call */
                 callid = async_get_call(&call);
+                
+                if (!IPC_GET_IMETHOD(call)) {
+                        res = EHANGUP;
+                        break;
+                }
 
                 /* Process the call */
                 switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
-                        keep_on_going = false;
-                        res = EHANGUP;
-                        break;
-
                 case NET_SOCKET:
                         socket_data =
@@ -1506 +1509 @@
 
         /* Release the application phone */
-        async_hangup(app_phone);
+        async_obsolete_hangup(app_phone);
 
         printf("release\n");