Changeset 36d852c in mainline

Timestamp:

2007-12-23T19:45:30Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

654b7db

Parents:

5c786d1

Message:

Rename IPC_M_DATA_SEND to IPC_M_DATA_WRITE. Now, when we also add
IPC_M_DATA_READ, it will not clash and cause confusion with userspace wrappers
such as ipc_data_receive(). Rename the forementioned wrappers to
ipc_data_write_send(), ipc_data_write_receive() and ipc_data_write_deliver().

Files:

• kernel/generic/include/ipc/ipc.h (modified) (1 diff)
• kernel/generic/src/ipc/sysipc.c (modified) (5 diffs)
• uspace/app/tester/devmap/devmap1.c (modified) (9 diffs)
• uspace/app/tester/vfs/vfs1.c (modified) (2 diffs)
• uspace/lib/libc/generic/ipc.c (modified) (5 diffs)
• uspace/lib/libc/include/ipc/ipc.h (modified) (1 diff)
• uspace/lib/libfs/libfs.c (modified) (1 diff)
• uspace/srv/devmap/devmap.c (modified) (7 diffs)
• uspace/srv/vfs/vfs_mount.c (modified) (4 diffs)
• uspace/srv/vfs/vfs_open.c (modified) (2 diffs)
• uspace/srv/vfs/vfs_register.c (modified) (2 diffs)

kernel/generic/include/ipc/ipc.h

@@ -185 +185 @@
  * - ARG3 - final size of data to be copied
  */
-#define IPC_M_DATA_SEND         6
+#define IPC_M_DATA_WRITE        6
+
+/** Receive data from another address space over IPC.
+ * - ARG1 - destination virtual address in the source address space
+ * - ARG2 - size of data to be received, may be cropped by the recipient 
+ *
+ * on answer, the recipient must set:
+ *
+ * - ARG1 - source virtual address in the destination address space
+ * - ARG2 - final size of data to be copied
+ */
+#define IPC_M_DATA_READ         7
 
 /* Well-known methods */

kernel/generic/src/ipc/sysipc.c

@@ -50 +50 @@
 #include <print.h>
 
-/** Maximum buffer size allowed for IPC_M_DATA_SEND requests. */
-#define DATA_SEND_LIMIT         (64 * 1024)
+/**
+ * Maximum buffer size allowed for IPC_M_DATA_WRITE and IPC_M_DATA_READ
+ * requests.
+ */
+#define DATA_XFER_LIMIT         (64 * 1024)
 
 #define GET_CHECK_PHONE(phone, phoneid, err) \
@@ -112 +115 @@
         case IPC_M_AS_AREA_SEND:
         case IPC_M_AS_AREA_RECV:
-        case IPC_M_DATA_SEND:
+        case IPC_M_DATA_WRITE:
+        case IPC_M_DATA_READ:
                 return 1;
                 break;
@@ -140 +144 @@
         case IPC_M_AS_AREA_SEND:
         case IPC_M_AS_AREA_RECV:
-        case IPC_M_DATA_SEND:
+        case IPC_M_DATA_WRITE:
+        case IPC_M_DATA_READ:
                 return 1;
         default:
@@ -231 +236 @@
                         IPC_SET_RETVAL(answer->data, rc);
                 }
-        } else if (IPC_GET_METHOD(*olddata) == IPC_M_DATA_SEND) {
+        } else if (IPC_GET_METHOD(*olddata) == IPC_M_DATA_WRITE) {
                 if (!IPC_GET_RETVAL(answer->data)) {
                         int rc;
@@ -281 +286 @@
                 IPC_SET_ARG2(call->data, size);
                 break;
-        case IPC_M_DATA_SEND:
+        case IPC_M_DATA_WRITE:
                 src = IPC_GET_ARG2(call->data);
                 size = IPC_GET_ARG3(call->data);
                 
-                if ((size <= 0) || (size > DATA_SEND_LIMIT))
+                if ((size <= 0) || (size > DATA_XFER_LIMIT))
                         return ELIMIT;
                 

uspace/app/tester/devmap/devmap1.c

@@ -50 +50 @@
         int retval;
         
-        printf("connected: method=%u arg1=%u, arg2=%u arg3=%u.\n", IPC_GET_METHOD(*icall), 
-                IPC_GET_ARG1(*icall), IPC_GET_ARG2(*icall), IPC_GET_ARG3(*icall));
+        printf("connected: method=%u arg1=%u, arg2=%u arg3=%u.\n",
+            IPC_GET_METHOD(*icall), IPC_GET_ARG1(*icall), IPC_GET_ARG2(*icall),
+            IPC_GET_ARG3(*icall));
 
         printf("driver_client_connection.\n");
@@ -60 +61 @@
                 callid = async_get_call(&call);
                 retval = EOK;
-                printf("method=%u arg1=%u, arg2=%u arg3=%u.\n", IPC_GET_METHOD(call), 
-                        IPC_GET_ARG1(call), IPC_GET_ARG2(call), IPC_GET_ARG3(call));
+                printf("method=%u arg1=%u, arg2=%u arg3=%u.\n",
+                    IPC_GET_METHOD(call), IPC_GET_ARG1(call),
+                    IPC_GET_ARG2(call), IPC_GET_ARG3(call));
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
@@ -67 +69 @@
                         return;
                 default:
-                        printf("Unknown device method %u.\n", IPC_GET_METHOD(call));
+                        printf("Unknown device method %u.\n",
+                            IPC_GET_METHOD(call));
                         retval = ENOENT;
                 }
@@ -82 +85 @@
         handle = (int)arg;
 
-        device_phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, \
-                DEVMAP_CONNECT_TO_DEVICE, handle);
+        device_phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP,
+            DEVMAP_CONNECT_TO_DEVICE, handle);
 
         if (device_phone < 0) {
-                printf("Failed to connect to devmap as client (handle = %u).\n", 
-                        handle);
+                printf("Failed to connect to devmap as client (handle = %u).\n",
+                    handle);
                 return -1;
         }
@@ -130 +133 @@
         ipcarg_t callback_phonehash;
 
-        phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP,
-                DEVMAP_DRIVER, 0);
+        phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, DEVMAP_DRIVER, 0);
 
         while (phone < 0) {
                 usleep(100000);
                 phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP,
-                        DEVMAP_DRIVER, 0);
+                    DEVMAP_DRIVER, 0);
         }
         
         req = async_send_2(phone, DEVMAP_DRIVER_REGISTER, 0, 0, &answer);
 
-        retval = ipc_data_send(phone, (char *)name, strlen(name) + 1); 
+        retval = ipc_data_write_send(phone, (char *)name, strlen(name) + 1); 
 
         if (retval != EOK) {
@@ -171 +173 @@
         ipc_call_t answer;
 
-        req = async_send_2(driver_phone, DEVMAP_DEVICE_GET_HANDLE, 0, 0, &answer);
-
-        retval = ipc_data_send(driver_phone, name, strlen(name) + 1); 
+        req = async_send_2(driver_phone, DEVMAP_DEVICE_GET_HANDLE, 0, 0,
+            &answer);
+
+        retval = ipc_data_write_send(driver_phone, name, strlen(name) + 1); 
 
         if (retval != EOK) {
@@ -192 +195 @@
                         *handle = (int) IPC_GET_ARG1(answer);
                 }
-                printf("Device '%s' has handle %u.\n", name, (int) IPC_GET_ARG1(answer));
+                printf("Device '%s' has handle %u.\n", name,
+                    (int) IPC_GET_ARG1(answer));
         } else {
                 printf("Failed to get handle for device '%s'.\n", name);
@@ -213 +217 @@
         req = async_send_2(driver_phone, DEVMAP_DEVICE_REGISTER, 0, 0, &answer);
 
-        retval = ipc_data_send(driver_phone, (char *)name, strlen(name) + 1); 
+        retval = ipc_data_write_send(driver_phone, (char *)name,
+            strlen(name) + 1); 
 
         if (retval != EOK) {
@@ -232 +237 @@
                         *handle = (int) IPC_GET_ARG1(answer);
                 }
-                printf("Device registered with handle %u.\n", (int) IPC_GET_ARG1(answer));
+                printf("Device registered with handle %u.\n",
+                    (int) IPC_GET_ARG1(answer));
         }
 

uspace/app/tester/vfs/vfs1.c

@@ -54 +54 @@
         aid_t req;
         req = async_send_1(vfs_phone, VFS_MOUNT, TMPFS_DEVHANDLE, NULL);
-        if (ipc_data_send(vfs_phone, fs_name, strlen(fs_name)) != EOK) {
+        if (ipc_data_write_send(vfs_phone, fs_name, strlen(fs_name)) != EOK) {
                 async_wait_for(req, &rc);
                 return "Could not send fs_name to VFS.\n";
         }
-        if (ipc_data_send(vfs_phone, mp, strlen(mp)) != EOK) {
+        if (ipc_data_write_send(vfs_phone, mp, strlen(mp)) != EOK) {
                 async_wait_for(req, &rc);
                 return "Could not send mp to VFS.\n";
@@ -71 +71 @@
         ipc_call_t answer;
         req = async_send_2(vfs_phone, VFS_OPEN, 0, 0, &answer);
-        if (ipc_data_send(vfs_phone, path, strlen(path)) != EOK) {
+        if (ipc_data_write_send(vfs_phone, path, strlen(path)) != EOK) {
                 async_wait_for(req, &rc);
                 return "Could not send path to VFS.\n";

uspace/lib/libc/generic/ipc.c

@@ -667 +667 @@
 }
 
-/** Wrapper for making IPC_M_DATA_SEND calls.
+/** Wrapper for making IPC_M_DATA_WRITE calls.
  *
  * @param phoneid       Phone that will be used to contact the receiving side.
@@ -675 +675 @@
  * @return              Zero on success or a negative error code from errno.h.
  */
-int ipc_data_send(int phoneid, void *src, size_t size)
-{
-        return ipc_call_sync_3_0(phoneid, IPC_M_DATA_SEND, 0, (ipcarg_t) src,
+int ipc_data_write_send(int phoneid, void *src, size_t size)
+{
+        return ipc_call_sync_3_0(phoneid, IPC_M_DATA_WRITE, 0, (ipcarg_t) src,
             (ipcarg_t) size);
 }
 
-/** Wrapper for receiving the IPC_M_DATA_SEND calls.
- *
- * This wrapper only makes it more comfortable to receive IPC_M_DATA_SEND calls
+/** Wrapper for receiving the IPC_M_DATA_WRITE calls.
+ *
+ * This wrapper only makes it more comfortable to receive IPC_M_DATA_WRITE calls
  * so that the user doesn't have to remember the meaning of each IPC argument.
  *
  * So far, this wrapper is to be used from within a connection fibril.
  *
- * @param callid        Storage where the hash of the IPC_M_DATA_SEND call will
+ * @param callid        Storage where the hash of the IPC_M_DATA_WRITE call will
  *                      be stored.
  * @param dst           Storage where the suggested destination address will
@@ -697 +697 @@
  * @return              Non-zero on success, zero on failure.
  */
-int ipc_data_receive(ipc_callid_t *callid, void **dst, size_t *size)
+int ipc_data_write_receive(ipc_callid_t *callid, void **dst, size_t *size)
 {
         ipc_call_t data;
@@ -704 +704 @@
 
         *callid = async_get_call(&data);
-        if (IPC_GET_METHOD(data) != IPC_M_DATA_SEND)
+        if (IPC_GET_METHOD(data) != IPC_M_DATA_WRITE)
                 return 0;
         if (dst)
@@ -713 +713 @@
 }
 
-/** Wrapper for answering the IPC_M_DATA_SEND calls.
- *
- * This wrapper only makes it more comfortable to answer IPC_M_DATA_SEND calls
+/** Wrapper for answering the IPC_M_DATA_WRITE calls.
+ *
+ * This wrapper only makes it more comfortable to answer IPC_M_DATA_WRITE calls
  * so that the user doesn't have to remember the meaning of each IPC argument.
  *
- * @param callid        Hash of the IPC_M_DATA_SEND call to answer.
- * @param dst           Final destination address for the IPC_M_DATA_SEND call.
- * @param size          Final size for the IPC_M_DATA_SEND call.
+ * @param callid        Hash of the IPC_M_DATA_WRITE call to answer.
+ * @param dst           Final destination address for the IPC_M_DATA_WRITE call.
+ * @param size          Final size for the IPC_M_DATA_WRITE call.
  *
  * @return              Zero on success or a value from @ref errno.h on failure.
  */
-ipcarg_t ipc_data_deliver(ipc_callid_t callid, void *dst, size_t size)
+ipcarg_t ipc_data_write_deliver(ipc_callid_t callid, void *dst, size_t size)
 {
         return ipc_answer_3(callid, EOK, (ipcarg_t) dst, 0, (ipcarg_t) size);

uspace/lib/libc/include/ipc/ipc.h

@@ -261 +261 @@
 extern int ipc_forward_fast(ipc_callid_t callid, int phoneid, int method,
     ipcarg_t arg1, ipcarg_t arg2, int mode);
-extern int ipc_data_send(int phoneid, void *src, size_t size);
-extern int ipc_data_receive(ipc_callid_t *callid, void **dst, size_t *size);
-extern ipcarg_t ipc_data_deliver(ipc_callid_t callid, void *dst, size_t size);
+extern int ipc_data_write_send(int phoneid, void *src, size_t size);
+extern int ipc_data_write_receive(ipc_callid_t *callid, void **dst,
+    size_t *size);
+extern ipcarg_t ipc_data_write_deliver(ipc_callid_t callid, void *dst,
+    size_t size);
 
 #endif

uspace/lib/libfs/libfs.c

@@ -72 +72 @@
          * Send our VFS info structure to VFS.
          */
-        int rc = ipc_data_send(vfs_phone, info, sizeof(*info)); 
+        int rc = ipc_data_write_send(vfs_phone, info, sizeof(*info)); 
         if (rc != EOK) {
                 async_wait_for(req, NULL);

uspace/srv/devmap/devmap.c

@@ -203 +203 @@
          * Get driver name
          */
-        if (!ipc_data_receive(&callid, NULL, &name_size)) {
+        if (!ipc_data_write_receive(&callid, NULL, &name_size)) {
                 printf("Unexpected request.\n");
                 free(driver);
@@ -234 +234 @@
          * Send confirmation to sender and get data into buffer.
          */
-        if (EOK != ipc_data_deliver(callid, driver->name, name_size)) {
+        if (EOK != ipc_data_write_deliver(callid, driver->name, name_size)) {
                 printf("Cannot read driver name.\n");
                 free(driver->name);
@@ -369 +369 @@
         
         /* Get device name */
-        if (!ipc_data_receive(&callid, NULL, &size)) {
+        if (!ipc_data_write_receive(&callid, NULL, &size)) {
                 free(device);
                 printf("Cannot read device name.\n");
@@ -395 +395 @@
         }
         
-        ipc_data_deliver(callid, device->name, size);
+        ipc_data_write_deliver(callid, device->name, size);
         device->name[size] = 0;
 
@@ -490 +490 @@
          * read the name itself until the buffer is allocated).
          */
-        if (!ipc_data_receive(&callid, NULL, &name_size)) {
+        if (!ipc_data_write_receive(&callid, NULL, &name_size)) {
                 ipc_answer_0(callid, EREFUSED);
                 ipc_answer_0(iid, EREFUSED);
@@ -514 +514 @@
          * Send confirmation to sender and get data into buffer.
          */
-        if (EOK != (retval = ipc_data_deliver(callid, name, name_size))) {
+        if (EOK != (retval = ipc_data_write_deliver(callid, name, name_size))) {
                 ipc_answer_0(iid, EREFUSED);
                 return;
@@ -567 +567 @@
         sending must be initiated by client
 
-        int rc = ipc_data_send(phone, device->name, name_size); 
+        int rc = ipc_data_write_send(phone, device->name, name_size); 
         if (rc != EOK) {
                 async_wait_for(req, NULL);

uspace/srv/vfs/vfs_mount.c

@@ -87 +87 @@
          * system.
          */
-        if (!ipc_data_receive(&callid, NULL, &size)) {
+        if (!ipc_data_write_receive(&callid, NULL, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -107 +107 @@
          */
         char fs_name[FS_NAME_MAXLEN + 1];
-        (void) ipc_data_deliver(callid, fs_name, size);
+        (void) ipc_data_write_deliver(callid, fs_name, size);
         fs_name[size] = '\0';
         
@@ -123 +123 @@
          * Now, we want the client to send us the mount point.
          */
-        if (!ipc_data_receive(&callid, NULL, &size)) {
+        if (!ipc_data_write_receive(&callid, NULL, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -151 +151 @@
          * Deliver the mount point.
          */
-        (void) ipc_data_deliver(callid, buf, size);
+        (void) ipc_data_write_deliver(callid, buf, size);
 
         /*

uspace/srv/vfs/vfs_open.c

@@ -62 +62 @@
         ipc_callid_t callid;
 
-        if (!ipc_data_receive(&callid, NULL, &size)) {
+        if (!ipc_data_write_receive(&callid, NULL, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -83 +83 @@
 
         int rc;
-        if ((rc = ipc_data_deliver(callid, path, size))) {
+        if ((rc = ipc_data_write_deliver(callid, path, size))) {
                 ipc_answer_0(rid, rc);
                 free(path);

uspace/srv/vfs/vfs_register.c

@@ -165 +165 @@
          * VFS info structure from the client FS.
          */
-        if (!ipc_data_receive(&callid, NULL, &size)) {
+        if (!ipc_data_write_receive(&callid, NULL, &size)) {
                 /*
                  * The client doesn't obey the same protocol as we do.
@@ -206 +206 @@
         futex_initialize(&fs_info->phone_futex, 1);
                 
-        rc = ipc_data_deliver(callid, &fs_info->vfs_info, size);
+        rc = ipc_data_write_deliver(callid, &fs_info->vfs_info, size);
         if (rc != EOK) {
                 dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n",