Changeset 215e375 in mainline for uspace/srv

Timestamp:

2007-12-31T17:23:20Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f57f8ea

Parents:

27d293a

Message:

The IPC_M_SHARE_* and IPC_M_DATA_* calls pass through 3 stages. Rename the send,
receive and deliver wrappers to names ending with 'start', 'receive' and
'finalize', respectively. This should make it clearer for dummies.

Location:

uspace/srv

Files:

• console/console.c (modified) (1 diff)
• console/gcons.c (modified) (2 diffs)
• devmap/devmap.c (modified) (3 diffs)
• fs/tmpfs/tmpfs_ops.c (modified) (3 diffs)
• rd/rd.c (modified) (1 diff)
• vfs/vfs_mount.c (modified) (2 diffs)
• vfs/vfs_open.c (modified) (1 diff)
• vfs/vfs_register.c (modified) (2 diffs)

uspace/srv/console/console.c

@@ -538 +538 @@
             PROTO_READ | PROTO_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
         if (!interbuffer) {
-                if (ipc_share_out_send(fb_info.phone, interbuffer,
+                if (ipc_share_out_start(fb_info.phone, interbuffer,
                     AS_AREA_READ) != EOK) {
                         munmap(interbuffer,

uspace/srv/console/gcons.c

@@ -326 +326 @@
         if (rc)
                 goto exit;
-        rc = ipc_share_out_send(fbphone, shm, PROTO_READ);
+        rc = ipc_share_out_start(fbphone, shm, PROTO_READ);
         if (rc)
                 goto drop;
@@ -387 +387 @@
         if (rc)
                 goto exit;
-        rc = ipc_share_out_send(fbphone, shm, PROTO_READ);
+        rc = ipc_share_out_start(fbphone, shm, PROTO_READ);
         if (rc)
                 goto drop;

uspace/srv/devmap/devmap.c

@@ -234 +234 @@
          * Send confirmation to sender and get data into buffer.
          */
-        if (EOK != ipc_data_write_deliver(callid, driver->name, name_size)) {
+        if (EOK != ipc_data_write_finalize(callid, driver->name, name_size)) {
                 printf("Cannot read driver name.\n");
                 free(driver->name);
@@ -395 +395 @@
         }
         
-        ipc_data_write_deliver(callid, device->name, size);
+        ipc_data_write_finalize(callid, device->name, size);
         device->name[size] = 0;
 
@@ -514 +514 @@
          * Send confirmation to sender and get data into buffer.
          */
-        if (EOK != (retval = ipc_data_write_deliver(callid, name, name_size))) {
+        if (EOK != (retval = ipc_data_write_finalize(callid, name,
+            name_size))) {
                 ipc_answer_0(iid, EREFUSED);
                 return;

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -308 +308 @@
 
         size_t bytes = max(0, min(dentry->size - pos, len));
-        (void) ipc_data_read_deliver(callid, dentry->data + pos, bytes);
+        (void) ipc_data_read_finalize(callid, dentry->data + pos, bytes);
 
         /*
@@ -350 +350 @@
         if (pos + len <= dentry->size) {
                 /* The file size is not changing. */
-                (void) ipc_data_write_deliver(callid, dentry->data + pos, len);
+                (void) ipc_data_write_finalize(callid, dentry->data + pos, len);
                 ipc_answer_1(rid, EOK, len);
                 return;
@@ -370 +370 @@
         dentry->size += delta;
         dentry->data = newdata;
-        (void) ipc_data_write_deliver(callid, dentry->data + pos, len);
+        (void) ipc_data_write_finalize(callid, dentry->data + pos, len);
         ipc_answer_1(rid, EOK, len);
 }

uspace/srv/rd/rd.c

@@ -111 +111 @@
                          * block.
                          */
-                        (void) ipc_share_out_deliver(callid, fs_va);
+                        (void) ipc_share_out_finalize(callid, fs_va);
                 } else {
                         /*

uspace/srv/vfs/vfs_mount.c

@@ -107 +107 @@
          */
         char fs_name[FS_NAME_MAXLEN + 1];
-        (void) ipc_data_write_deliver(callid, fs_name, size);
+        (void) ipc_data_write_finalize(callid, fs_name, size);
         fs_name[size] = '\0';
         
@@ -151 +151 @@
          * Deliver the mount point.
          */
-        (void) ipc_data_write_deliver(callid, buf, size);
+        (void) ipc_data_write_finalize(callid, buf, size);
 
         /*

uspace/srv/vfs/vfs_open.c

@@ -83 +83 @@
 
         int rc;
-        if ((rc = ipc_data_write_deliver(callid, path, size))) {
+        if ((rc = ipc_data_write_finalize(callid, path, size))) {
                 ipc_answer_0(rid, rc);
                 free(path);

uspace/srv/vfs/vfs_register.c

@@ -206 +206 @@
         futex_initialize(&fs_info->phone_futex, 1);
                 
-        rc = ipc_data_write_deliver(callid, &fs_info->vfs_info, size);
+        rc = ipc_data_write_finalize(callid, &fs_info->vfs_info, size);
         if (rc != EOK) {
                 dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n",
@@ -300 +300 @@
          * Commit to read-only sharing the PLB with the client.
          */
-        (void) ipc_share_in_deliver(callid, plb,
+        (void) ipc_share_in_finalize(callid, plb,
             AS_AREA_READ | AS_AREA_CACHEABLE);