Changeset 368ee04 in mainline for uspace/app/tester/mm/pager1.c


Ignore:
Timestamp:
2017-04-05T18:10:39Z (7 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
93ad8166
Parents:
39f892a9 (diff), 2166728 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

  • relativization of the API,
  • client-side roots,
  • server-side mounts,
  • inbox for passing arbitrary files from parent to child,
  • some streamlining and cleanup.

Additional changes include:

  • addressing issues introduced by the above changes,
  • client-side I/O cursors (file positions),
  • all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
  • removal of some POSIX-ish headers and definitions,
  • additional cleanup.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/tester/mm/pager1.c

    r39f892a9 r368ee04  
    2828
    2929#include <stdio.h>
    30 #include <unistd.h>
    31 #include <fcntl.h>
     30#include <vfs/vfs.h>
    3231#include <stdlib.h>
    3332#include <malloc.h>
    … …  
    4847        TPRINTF("Creating temporary file...\n");
    4948
    50         fd = open(TEST_FILE, O_CREAT);
     49        fd = vfs_lookup_open(TEST_FILE, WALK_REGULAR | WALK_MAY_CREATE,
     50            MODE_READ | MODE_WRITE);
    5151        if (fd < 0)
    5252                return NULL;
    53         (void) unlink(TEST_FILE);
    54         if (write(fd, text, sizeof(text)) != sizeof(text)) {
    55                 close(fd);
     53        (void) vfs_unlink_path(TEST_FILE);
     54
     55        if (vfs_write(fd, (aoff64_t []) {0}, text, sizeof(text)) < 0) {
     56                vfs_put(fd);
    5657                return NULL;
    5758        }
    … …  
    6465
    6566        if (!vfs_pager_sess) {
    66                 close(fd);
     67                vfs_put(fd);
    6768                return NULL;
    6869        }
    … …  
    7374            AS_AREA_READ | AS_AREA_CACHEABLE, vfs_pager_sess, fd, 0, 0);
    7475        if (result == AS_MAP_FAILED) {
    75                 close(fd);
     76                vfs_put(fd);
    7677                return NULL;
    7778        }
    … …  
    101102
    102103        as_area_destroy(buffer);       
    103         close(fd);
     104        vfs_put(fd);
    104105       
    105106        return NULL;
Note: See TracChangeset for help on using the changeset viewer.