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

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/generic

Files:

• generic.c (modified) (8 diffs)
• packet_remote.c (modified) (7 diffs)

uspace/lib/net/generic/generic.c

@@ -37 +37 @@
 #include <generic.h>
 #include <async.h>
+#include <async_obsolete.h>
 #include <ipc/services.h>
 #include <net/device.h>
@@ -56 +57 @@
     int state, services_t target)
 {
-        async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
+        async_obsolete_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
             (sysarg_t) state, target);
         
@@ -78 +79 @@
     int arg2, services_t service)
 {
-        return (int) async_req_3_0(phone, (sysarg_t) message,
+        return (int) async_obsolete_req_3_0(phone, (sysarg_t) message,
             (sysarg_t) device_id, (sysarg_t) arg2, (sysarg_t) service);
 }
@@ -107 +108 @@
 
         /* Request the address */
-        message_id = async_send_1(phone, (sysarg_t) message,
+        message_id = async_obsolete_send_1(phone, (sysarg_t) message,
             (sysarg_t) device_id, NULL);
         string = measured_strings_return(phone, address, data, 1);
@@ -145 +146 @@
         sysarg_t suffix;
         
-        sysarg_t result = async_req_1_4(phone, (sysarg_t) message,
+        sysarg_t result = async_obsolete_req_1_4(phone, (sysarg_t) message,
             (sysarg_t) device_id, &addr_len, &prefix, &content, &suffix);
         
@@ -172 +173 @@
 {
         if (error) {
-                async_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id,
+                async_obsolete_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id,
                     (sysarg_t) packet_id, (sysarg_t) target, (sysarg_t) error);
         } else {
-                async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
+                async_obsolete_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
                     (sysarg_t) packet_id, (sysarg_t) target);
         }
@@ -198 +199 @@
 {
         if (error) {
-                async_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id,
+                async_obsolete_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id,
                     (sysarg_t) packet_id, (sysarg_t) sender, (sysarg_t) error);
         } else {
-                async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
+                async_obsolete_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
                     (sysarg_t) packet_id, (sysarg_t) sender);
         }
@@ -243 +244 @@
 
         /* Request the translation */
-        message_id = async_send_3(phone, (sysarg_t) message,
+        message_id = async_obsolete_send_3(phone, (sysarg_t) message,
             (sysarg_t) device_id, (sysarg_t) count, (sysarg_t) service, NULL);
         measured_strings_send(phone, configuration, count);

uspace/lib/net/generic/packet_remote.c

@@ -37 +37 @@
 
 #include <async.h>
+#include <async_obsolete.h>
 #include <errno.h>
 #include <ipc/packet.h>
@@ -59 +60 @@
  * @return EOK on success.
  * @return Other error codes as defined for the pm_add() function.
- * @return Other error codes as defined for the async_share_in_start() function.
+ * @return Other error codes as defined for the async_obsolete_share_in_start() function.
  *
  */
@@ -69 +70 @@
         int rc;
         
-        message = async_send_1(phone, NET_PACKET_GET, packet_id, &answer);
+        message = async_obsolete_send_1(phone, NET_PACKET_GET, packet_id, &answer);
 
         *packet = (packet_t *) as_get_mappable_page(size);
-        rc = async_share_in_start_0_0(phone, *packet, size);
+        rc = async_obsolete_share_in_start_0_0(phone, *packet, size);
         if (rc != EOK) {
                 munmap(*packet, size);
@@ -117 +118 @@
                 sysarg_t size;
                 
-                rc = async_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id,
+                rc = async_obsolete_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id,
                     &size);
                 if (rc != EOK)
@@ -154 +155 @@
         int rc;
         
-        rc = async_req_4_2(phone, NET_PACKET_CREATE_4, max_content, addr_len,
+        rc = async_obsolete_req_4_2(phone, NET_PACKET_CREATE_4, max_content, addr_len,
             max_prefix, max_suffix, &packet_id, &size);
         if (rc != EOK)
@@ -185 +186 @@
         int rc;
         
-        rc = async_req_1_2(phone, NET_PACKET_CREATE_1, content, &packet_id,
+        rc = async_obsolete_req_1_2(phone, NET_PACKET_CREATE_1, content, &packet_id,
             &size);
         if (rc != EOK)
@@ -212 +213 @@
 void pq_release_remote(int phone, packet_id_t packet_id)
 {
-        async_msg_1(phone, NET_PACKET_RELEASE, packet_id);
+        async_obsolete_msg_1(phone, NET_PACKET_RELEASE, packet_id);
 }