diff options
| author | Jaegeuk Kim <jaegeuk@google.com> | 2020-08-02 21:00:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-02 21:00:55 +0000 |
| commit | edd921b2f5231540aa0c5651a8bf20ad0f220cb0 (patch) | |
| tree | c234cf58b59611749bece0aac2debfcbcf20c174 /tools | |
| parent | de45b069558847b928e70fc4137f208276d9413d (diff) | |
| parent | 85f312952f50e7e4c2e37466f5469442e6e6c317 (diff) | |
| download | f2fs-tools-edd921b2f5231540aa0c5651a8bf20ad0f220cb0.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into aosp am: 0fad5b2f5f am: a9c4957ad1 am: cc021d623e am: 4ddd4f2889 am: 85f312952f
Original change: https://android-review.googlesource.com/c/platform/external/f2fs-tools/+/1384036
Change-Id: Ib90617c1ad6abb692b1ca24639b5d26bf519cc4b
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/f2fs_io/f2fs_io.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/tools/f2fs_io/f2fs_io.c b/tools/f2fs_io/f2fs_io.c index 30544c1..6266454 100644 --- a/tools/f2fs_io/f2fs_io.c +++ b/tools/f2fs_io/f2fs_io.c @@ -489,15 +489,18 @@ static void do_write(int argc, char **argv, const struct cmd_desc *cmd) "IO can be\n" \ " buffered : buffered IO\n" \ " dio : direct IO\n" \ +" mmap : mmap IO\n" \ static void do_read(int argc, char **argv, const struct cmd_desc *cmd) { u64 buf_size = 0, ret = 0, read_cnt = 0; u64 offset; char *buf = NULL; + char *data; char *print_buf = NULL; unsigned bs, count, i, print_bytes; int flags = 0; + int do_mmap = 0; int fd; if (argc != 7) { @@ -518,6 +521,8 @@ static void do_read(int argc, char **argv, const struct cmd_desc *cmd) count = atoi(argv[3]); if (!strcmp(argv[4], "dio")) flags |= O_DIRECT; + else if (!strcmp(argv[4], "mmap")) + do_mmap = 1; else if (strcmp(argv[4], "buffered")) die("Wrong IO type"); @@ -529,8 +534,20 @@ static void do_read(int argc, char **argv, const struct cmd_desc *cmd) fd = xopen(argv[6], O_RDONLY | flags, 0); + if (do_mmap) { + data = mmap(NULL, count * buf_size, PROT_READ, + MAP_SHARED, fd, offset); + if (data == MAP_FAILED) + die("Mmap failed"); + } + for (i = 0; i < count; i++) { - ret = pread(fd, buf, buf_size, offset + buf_size * i); + if (do_mmap) { + memcpy(buf, data + offset + buf_size * i, buf_size); + ret = buf_size; + } else { + ret = pread(fd, buf, buf_size, offset + buf_size * i); + } if (ret != buf_size) break; |