Changeset 215e375 in mainline


Ignore:
Timestamp:
2007-12-31T17:23:20Z (17 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
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/klog/klog.c

    r27d293a r215e375  
    6464       
    6565        mapping = as_get_mappable_page(PAGE_SIZE);
    66         res = ipc_share_in_send_1_0(PHONE_NS, mapping, PAGE_SIZE,
     66        res = ipc_share_in_start_1_0(PHONE_NS, mapping, PAGE_SIZE,
    6767            SERVICE_MEM_KLOG);
    6868        if (res) {

  • uspace/app/tester/devmap/devmap1.c

    r27d293a r215e375  
    143143        req = async_send_2(phone, DEVMAP_DRIVER_REGISTER, 0, 0, &answer);
    144144
    145         retval = ipc_data_write_send(phone, (char *)name, strlen(name) + 1);
     145        retval = ipc_data_write_start(phone, (char *)name, strlen(name) + 1);
    146146
    147147        if (retval != EOK) {
    … …  
    176176            &answer);
    177177
    178         retval = ipc_data_write_send(driver_phone, name, strlen(name) + 1);
     178        retval = ipc_data_write_start(driver_phone, name, strlen(name) + 1);
    179179
    180180        if (retval != EOK) {
    … …  
    217217        req = async_send_2(driver_phone, DEVMAP_DEVICE_REGISTER, 0, 0, &answer);
    218218
    219         retval = ipc_data_write_send(driver_phone, (char *)name,
     219        retval = ipc_data_write_start(driver_phone, (char *)name,
    220220            strlen(name) + 1);
    221221

  • uspace/lib/libc/generic/ipc.c

    r27d293a r215e375  
    678678 * @return              Zero on success or a negative error code from errno.h.
    679679 */
    680 int ipc_share_in_send(int phoneid, void *dst, size_t size, ipcarg_t arg,
     680int ipc_share_in_start(int phoneid, void *dst, size_t size, ipcarg_t arg,
    681681    int *flags)
    682682{
    … …  
    728728 * @return              Zero on success or a value from @ref errno.h on failure.
    729729 */
    730 int ipc_share_in_deliver(ipc_callid_t callid, void *src, int flags)
     730int ipc_share_in_finalize(ipc_callid_t callid, void *src, int flags)
    731731{
    732732        return ipc_answer_2(callid, EOK, (ipcarg_t) src, (ipcarg_t) flags);
    … …  
    741741 * @return              Zero on success or a negative error code from errno.h.
    742742 */
    743 int ipc_share_out_send(int phoneid, void *src, int flags)
     743int ipc_share_out_start(int phoneid, void *src, int flags)
    744744{
    745745        return ipc_call_sync_3_0(phoneid, IPC_M_SHARE_OUT, (ipcarg_t) src, 0,
    … …  
    788788 * @return              Zero on success or a value from @ref errno.h on failure.
    789789 */
    790 int ipc_share_out_deliver(ipc_callid_t callid, void *dst)
     790int ipc_share_out_finalize(ipc_callid_t callid, void *dst)
    791791{
    792792        return ipc_answer_1(callid, EOK, (ipcarg_t) dst);
    … …  
    802802 * @return              Zero on success or a negative error code from errno.h.
    803803 */
    804 int ipc_data_read_send(int phoneid, void *dst, size_t size)
     804int ipc_data_read_start(int phoneid, void *dst, size_t size)
    805805{
    806806        return ipc_call_sync_2_0(phoneid, IPC_M_DATA_READ, (ipcarg_t) dst,
    … …  
    848848 * @return              Zero on success or a value from @ref errno.h on failure.
    849849 */
    850 int ipc_data_read_deliver(ipc_callid_t callid, void *src, size_t size)
     850int ipc_data_read_finalize(ipc_callid_t callid, void *src, size_t size)
    851851{
    852852        return ipc_answer_2(callid, EOK, (ipcarg_t) src, (ipcarg_t) size);
    … …  
    861861 * @return              Zero on success or a negative error code from errno.h.
    862862 */
    863 int ipc_data_write_send(int phoneid, void *src, size_t size)
     863int ipc_data_write_start(int phoneid, void *src, size_t size)
    864864{
    865865        return ipc_call_sync_2_0(phoneid, IPC_M_DATA_WRITE, (ipcarg_t) src,
    … …  
    906906 * @return              Zero on success or a value from @ref errno.h on failure.
    907907 */
    908 int ipc_data_write_deliver(ipc_callid_t callid, void *dst, size_t size)
     908int ipc_data_write_finalize(ipc_callid_t callid, void *dst, size_t size)
    909909{
    910910        return ipc_answer_2(callid, EOK, (ipcarg_t) dst, (ipcarg_t) size);

  • uspace/lib/libc/generic/time.c

    r27d293a r215e375  
    142142                mapping = as_get_mappable_page(PAGE_SIZE);
    143143                /* Get the mapping of kernel clock */
    144                 res = ipc_share_in_send_1_1(PHONE_NS, mapping, PAGE_SIZE,
     144                res = ipc_share_in_start_1_1(PHONE_NS, mapping, PAGE_SIZE,
    145145                    SERVICE_MEM_REALTIME, &rights);
    146146                if (res) {

  • uspace/lib/libc/generic/vfs.c

    r27d293a r215e375  
    7474        }
    7575        req = async_send_1(vfs_phone, VFS_MOUNT, dev_handle, NULL);
    76         rc = ipc_data_write_send(vfs_phone, (void *)fs_name, strlen(fs_name));
     76        rc = ipc_data_write_start(vfs_phone, (void *)fs_name, strlen(fs_name));
    7777        if (rc != EOK) {
    7878                async_wait_for(req, NULL);
    … …  
    8181                return (int) rc;
    8282        }
    83         rc = ipc_data_write_send(vfs_phone, (void *)mp, strlen(mp));
     83        rc = ipc_data_write_start(vfs_phone, (void *)mp, strlen(mp));
    8484        if (rc != EOK) {
    8585                async_wait_for(req, NULL);
    … …  
    113113        }
    114114        req = async_send_2(vfs_phone, VFS_OPEN, oflag, 0, &answer);
    115         rc = ipc_data_write_send(vfs_phone, name, strlen(name));
     115        rc = ipc_data_write_start(vfs_phone, name, strlen(name));
    116116        if (rc != EOK) {
    117117                async_wait_for(req, NULL);
    … …  
    144144        }
    145145        req = async_send_1(vfs_phone, VFS_READ, fildes, &answer);
    146         if (ipc_data_read_send(vfs_phone, (void *)buf, nbyte) != EOK) {
     146        if (ipc_data_read_start(vfs_phone, (void *)buf, nbyte) != EOK) {
    147147                async_wait_for(req, NULL);
    148148                async_serialize_end();
    … …  
    174174        }
    175175        req = async_send_1(vfs_phone, VFS_WRITE, fildes, &answer);
    176         if (ipc_data_write_send(vfs_phone, (void *)buf, nbyte) != EOK) {
     176        if (ipc_data_write_start(vfs_phone, (void *)buf, nbyte) != EOK) {
    177177                async_wait_for(req, NULL);
    178178                async_serialize_end();

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

    r27d293a r215e375  
    264264
    265265/*
    266  * User-friendly wrappers for ipc_share_in_send().
    267  */
    268 #define ipc_share_in_send_0_0(phoneid, dst, size) \
    269     ipc_share_in_send((phoneid), (dst), (size), 0, NULL)
    270 #define ipc_share_in_send_0_1(phoneid, dst, size, flags) \
    271     ipc_share_in_send((phoneid), (dst), (size), 0, (flags))
    272 #define ipc_share_in_send_1_0(phoneid, dst, size, arg) \
    273     ipc_share_in_send((phoneid), (dst), (size), (arg), NULL)
    274 #define ipc_share_in_send_1_1(phoneid, dst, size, arg, flags) \
    275     ipc_share_in_send((phoneid), (dst), (size), (arg), (flags))
    276 
    277 extern int ipc_share_in_send(int phoneid, void *dst, size_t size, ipcarg_t arg,
     266 * User-friendly wrappers for ipc_share_in_start().
     267 */
     268#define ipc_share_in_start_0_0(phoneid, dst, size) \
     269    ipc_share_in_start((phoneid), (dst), (size), 0, NULL)
     270#define ipc_share_in_start_0_1(phoneid, dst, size, flags) \
     271    ipc_share_in_start((phoneid), (dst), (size), 0, (flags))
     272#define ipc_share_in_start_1_0(phoneid, dst, size, arg) \
     273    ipc_share_in_start((phoneid), (dst), (size), (arg), NULL)
     274#define ipc_share_in_start_1_1(phoneid, dst, size, arg, flags) \
     275    ipc_share_in_start((phoneid), (dst), (size), (arg), (flags))
     276
     277extern int ipc_share_in_start(int phoneid, void *dst, size_t size, ipcarg_t arg,
    278278    int *flags);
    279279extern int ipc_share_in_receive(ipc_callid_t *callid, size_t *size);
    280 extern int ipc_share_in_deliver(ipc_callid_t callid, void *src, int flags);
    281 extern int ipc_share_out_send(int phoneid, void *src, int flags);
     280extern int ipc_share_in_finalize(ipc_callid_t callid, void *src, int flags);
     281extern int ipc_share_out_start(int phoneid, void *src, int flags);
    282282extern int ipc_share_out_receive(ipc_callid_t *callid, size_t *size, int *flags);
    283 extern int ipc_share_out_deliver(ipc_callid_t callid, void *dst);
    284 extern int ipc_data_read_send(int phoneid, void *dst, size_t size);
     283extern int ipc_share_out_finalize(ipc_callid_t callid, void *dst);
     284extern int ipc_data_read_start(int phoneid, void *dst, size_t size);
    285285extern int ipc_data_read_receive(ipc_callid_t *callid, size_t *size);
    286 extern int ipc_data_read_deliver(ipc_callid_t callid, void *src, size_t size);
    287 extern int ipc_data_write_send(int phoneid, void *src, size_t size);
     286extern int ipc_data_read_finalize(ipc_callid_t callid, void *src, size_t size);
     287extern int ipc_data_write_start(int phoneid, void *src, size_t size);
    288288extern int ipc_data_write_receive(ipc_callid_t *callid, size_t *size);
    289 extern int ipc_data_write_deliver(ipc_callid_t callid, void *dst, size_t size);
     289extern int ipc_data_write_finalize(ipc_callid_t callid, void *dst, size_t size);
    290290
    291291#endif

  • uspace/lib/libfs/libfs.c

    r27d293a r215e375  
    7272         * Send our VFS info structure to VFS.
    7373         */
    74         int rc = ipc_data_write_send(vfs_phone, info, sizeof(*info));
     74        int rc = ipc_data_write_start(vfs_phone, info, sizeof(*info));
    7575        if (rc != EOK) {
    7676                async_wait_for(req, NULL);
    … …  
    9595         * Request sharing the Path Lookup Buffer with VFS.
    9696         */
    97         rc = ipc_share_in_send_0_0(vfs_phone, reg->plb_ro, PLB_SIZE);
     97        rc = ipc_share_in_start_0_0(vfs_phone, reg->plb_ro, PLB_SIZE);
    9898        if (rc) {
    9999                async_wait_for(req, NULL);

  • uspace/srv/console/console.c

    r27d293a r215e375  
    538538            PROTO_READ | PROTO_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
    539539        if (!interbuffer) {
    540                 if (ipc_share_out_send(fb_info.phone, interbuffer,
     540                if (ipc_share_out_start(fb_info.phone, interbuffer,
    541541                    AS_AREA_READ) != EOK) {
    542542                        munmap(interbuffer,

  • uspace/srv/console/gcons.c

    r27d293a r215e375  
    326326        if (rc)
    327327                goto exit;
    328         rc = ipc_share_out_send(fbphone, shm, PROTO_READ);
     328        rc = ipc_share_out_start(fbphone, shm, PROTO_READ);
    329329        if (rc)
    330330                goto drop;
    … …  
    387387        if (rc)
    388388                goto exit;
    389         rc = ipc_share_out_send(fbphone, shm, PROTO_READ);
     389        rc = ipc_share_out_start(fbphone, shm, PROTO_READ);
    390390        if (rc)
    391391                goto drop;

  • uspace/srv/devmap/devmap.c

    r27d293a r215e375  
    234234         * Send confirmation to sender and get data into buffer.
    235235         */
    236         if (EOK != ipc_data_write_deliver(callid, driver->name, name_size)) {
     236        if (EOK != ipc_data_write_finalize(callid, driver->name, name_size)) {
    237237                printf("Cannot read driver name.\n");
    238238                free(driver->name);
    … …  
    395395        }
    396396       
    397         ipc_data_write_deliver(callid, device->name, size);
     397        ipc_data_write_finalize(callid, device->name, size);
    398398        device->name[size] = 0;
    399399
    … …  
    514514         * Send confirmation to sender and get data into buffer.
    515515         */
    516         if (EOK != (retval = ipc_data_write_deliver(callid, name, name_size))) {
     516        if (EOK != (retval = ipc_data_write_finalize(callid, name,
     517            name_size))) {
    517518                ipc_answer_0(iid, EREFUSED);
    518519                return;

  • uspace/srv/fs/tmpfs/tmpfs_ops.c

    r27d293a r215e375  
    308308
    309309        size_t bytes = max(0, min(dentry->size - pos, len));
    310         (void) ipc_data_read_deliver(callid, dentry->data + pos, bytes);
     310        (void) ipc_data_read_finalize(callid, dentry->data + pos, bytes);
    311311
    312312        /*
    … …  
    350350        if (pos + len <= dentry->size) {
    351351                /* The file size is not changing. */
    352                 (void) ipc_data_write_deliver(callid, dentry->data + pos, len);
     352                (void) ipc_data_write_finalize(callid, dentry->data + pos, len);
    353353                ipc_answer_1(rid, EOK, len);
    354354                return;
    … …  
    370370        dentry->size += delta;
    371371        dentry->data = newdata;
    372         (void) ipc_data_write_deliver(callid, dentry->data + pos, len);
     372        (void) ipc_data_write_finalize(callid, dentry->data + pos, len);
    373373        ipc_answer_1(rid, EOK, len);
    374374}

  • uspace/srv/rd/rd.c

    r27d293a r215e375  
    111111                         * block.
    112112                         */
    113                         (void) ipc_share_out_deliver(callid, fs_va);
     113                        (void) ipc_share_out_finalize(callid, fs_va);
    114114                } else {
    115115                        /*

  • uspace/srv/vfs/vfs_mount.c

    r27d293a r215e375  
    107107         */
    108108        char fs_name[FS_NAME_MAXLEN + 1];
    109         (void) ipc_data_write_deliver(callid, fs_name, size);
     109        (void) ipc_data_write_finalize(callid, fs_name, size);
    110110        fs_name[size] = '\0';
    111111       
    … …  
    151151         * Deliver the mount point.
    152152         */
    153         (void) ipc_data_write_deliver(callid, buf, size);
     153        (void) ipc_data_write_finalize(callid, buf, size);
    154154
    155155        /*

  • uspace/srv/vfs/vfs_open.c

    r27d293a r215e375  
    8383
    8484        int rc;
    85         if ((rc = ipc_data_write_deliver(callid, path, size))) {
     85        if ((rc = ipc_data_write_finalize(callid, path, size))) {
    8686                ipc_answer_0(rid, rc);
    8787                free(path);

  • uspace/srv/vfs/vfs_register.c

    r27d293a r215e375  
    206206        futex_initialize(&fs_info->phone_futex, 1);
    207207               
    208         rc = ipc_data_write_deliver(callid, &fs_info->vfs_info, size);
     208        rc = ipc_data_write_finalize(callid, &fs_info->vfs_info, size);
    209209        if (rc != EOK) {
    210210                dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n",
    … …  
    300300         * Commit to read-only sharing the PLB with the client.
    301301         */
    302         (void) ipc_share_in_deliver(callid, plb,
     302        (void) ipc_share_in_finalize(callid, plb,
    303303            AS_AREA_READ | AS_AREA_CACHEABLE);
    304304
Note: See TracChangeset for help on using the changeset viewer.