Changeset 79ae36dd in mainline for uspace/lib/net/il

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.)

Location:

uspace/lib/net/il

Files:

• arp_remote.c (modified) (5 diffs)
• il_skel.c (modified) (2 diffs)
• ip_remote.c (modified) (4 diffs)

uspace/lib/net/il/arp_remote.c

@@ -40 +40 @@
 
 #include <async.h>
+#include <async_obsolete.h>
 #include <errno.h>
 #include <ipc/services.h>
@@ -68 +69 @@
 int arp_clean_cache_req(int arp_phone)
 {
-        return (int) async_req_0_0(arp_phone, NET_ARP_CLEAN_CACHE);
+        return (int) async_obsolete_req_0_0(arp_phone, NET_ARP_CLEAN_CACHE);
 }
 
@@ -87 +88 @@
         sysarg_t result;
 
-        message_id = async_send_2(arp_phone, NET_ARP_CLEAR_ADDRESS,
+        message_id = async_obsolete_send_2(arp_phone, NET_ARP_CLEAR_ADDRESS,
             (sysarg_t) device_id, protocol, NULL);
         measured_strings_send(arp_phone, address, 1);
@@ -104 +105 @@
 int arp_clear_device_req(int arp_phone, device_id_t device_id)
 {
-        return (int) async_req_1_0(arp_phone, NET_ARP_CLEAR_DEVICE,
+        return (int) async_obsolete_req_1_0(arp_phone, NET_ARP_CLEAR_DEVICE,
             (sysarg_t) device_id);
 }
@@ -137 +138 @@
         sysarg_t result;
 
-        message_id = async_send_3(arp_phone, NET_ARP_DEVICE,
+        message_id = async_obsolete_send_3(arp_phone, NET_ARP_DEVICE,
             (sysarg_t) device_id, protocol, netif, NULL);
         measured_strings_send(arp_phone, address, 1);

uspace/lib/net/il/il_skel.c

@@ -42 +42 @@
 #include <net/modules.h>
 
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
+
 /** Default thread for new connections.
  *
@@ -75 +78 @@
                  * result.
                  */
-                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
-                    (res == EHANGUP))
+                if ((!IPC_GET_IMETHOD(call)) || (res == EHANGUP))
                         return;
                 

uspace/lib/net/il/ip_remote.c

@@ -44 +44 @@
 #include <packet_client.h>
 #include <generic.h>
-
+#include <async_obsolete.h>
 #include <ipc/services.h>
 #include <ipc/il.h>
@@ -66 +66 @@
     in_addr_t address, in_addr_t netmask, in_addr_t gateway)
 {
-        return (int) async_req_4_0(ip_phone, NET_IP_ADD_ROUTE,
+        return (int) async_obsolete_req_4_0(ip_phone, NET_IP_ADD_ROUTE,
             (sysarg_t) device_id, (sysarg_t) gateway.s_addr,
             (sysarg_t) address.s_addr, (sysarg_t) netmask.s_addr);
@@ -150 +150 @@
         
         ipc_call_t answer;
-        aid_t message_id = async_send_1(ip_phone, NET_IP_GET_ROUTE,
+        aid_t message_id = async_obsolete_send_1(ip_phone, NET_IP_GET_ROUTE,
             (sysarg_t) protocol, &answer);
         
-        if ((async_data_write_start(ip_phone, destination, addrlen) == EOK) &&
-            (async_data_read_start(ip_phone, headerlen,
+        if ((async_obsolete_data_write_start(ip_phone, destination, addrlen) == EOK) &&
+            (async_obsolete_data_read_start(ip_phone, headerlen,
             sizeof(*headerlen)) == EOK) && (*headerlen > 0)) {
                 *header = malloc(*headerlen);
                 if (*header) {
-                        if (async_data_read_start(ip_phone, *header,
+                        if (async_obsolete_data_read_start(ip_phone, *header,
                             *headerlen) != EOK)
                                 free(*header);
@@ -243 +243 @@
     in_addr_t gateway)
 {
-        return (int) async_req_2_0(ip_phone, NET_IP_SET_GATEWAY,
+        return (int) async_obsolete_req_2_0(ip_phone, NET_IP_SET_GATEWAY,
             (sysarg_t) device_id, (sysarg_t) gateway.s_addr);
 }