summaryrefslogtreecommitdiffstats
path: root/vespalib
diff options
context:
space:
mode:
authorHaavard <havardpe@yahoo-inc.com>2017-02-07 12:06:22 +0000
committerHaavard <havardpe@yahoo-inc.com>2017-02-07 12:06:22 +0000
commit0b08740980e043b4dea1cdbe3cc74acadec7adb8 (patch)
tree8383be115e705368d7626fbebe2940a3b53a8bf3 /vespalib
parent2287c89dfd47bb9c97f8b70470159d0a60fbefaa (diff)
use mapped file input
Diffstat (limited to 'vespalib')
-rw-r--r--vespalib/src/tests/tutorial/make_tutorial.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/vespalib/src/tests/tutorial/make_tutorial.cpp b/vespalib/src/tests/tutorial/make_tutorial.cpp
index 1d4c3596661..9720eeed178 100644
--- a/vespalib/src/tests/tutorial/make_tutorial.cpp
+++ b/vespalib/src/tests/tutorial/make_tutorial.cpp
@@ -6,21 +6,16 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
+#include <vespa/vespalib/io/mapped_file_input.h>
using namespace vespalib;
std::string readFile(const std::string &filename) {
TEST_STATE(filename.c_str());
- std::string ret;
- struct stat info;
- int fd = open(filename.c_str(), O_RDONLY);
- ASSERT_TRUE(fd >= 0 && fstat(fd, &info) == 0);
- char *data = (char*)(mmap(0, info.st_size, PROT_READ, MAP_SHARED, fd, 0));
- ASSERT_NOT_EQUAL(data, MAP_FAILED);
- ret = std::string(data, info.st_size);
- munmap(data, info.st_size);
- close(fd);
- return ret;
+ MappedFileInput file(filename);
+ ASSERT_TRUE(file.valid());
+ Memory data = file.get();
+ return std::string(data.data, data.size);
}
std::string runCommand(const std::string &cmd) {