Merge commit 'b1e548b96a0a7fbe37ca269ca56fc97444acb2f1' as 'deps/ox'

deps/ox/src/ox/fs/test/CMakeLists.txt

@@ -0,0 +1,45 @@
+cmake_minimum_required(VERSION 2.8)
+
+add_executable(
+	FileStoreFormat
+		filestore_format.cpp
+)
+
+add_executable(
+	FileSystemFormat
+		filesystem_format.cpp
+)
+
+add_executable(
+	FileStoreIO
+		filestoreio.cpp
+)
+
+add_executable(
+	FSTests
+		tests.cpp
+)
+
+target_link_libraries(FileStoreFormat OxFS OxStd)
+target_link_libraries(FileSystemFormat OxFS OxStd)
+target_link_libraries(FileStoreIO OxFS OxStd)
+target_link_libraries(FSTests OxFS OxStd)
+
+add_test("FileStoreFormat" FileStoreFormat)
+add_test("FileSystemFormat" FileSystemFormat)
+add_test("FileStoreIO" FileStoreIO)
+add_test("Test\\ PathIterator::next1" FSTests PathIterator::next1)
+add_test("Test\\ PathIterator::next2" FSTests PathIterator::next2)
+add_test("Test\\ PathIterator::next3" FSTests PathIterator::next3)
+add_test("Test\\ PathIterator::next4" FSTests PathIterator::next4)
+add_test("Test\\ PathIterator::next5" FSTests PathIterator::next5)
+
+add_test("Test\\ PathIterator::dirPath" FSTests PathIterator::dirPath)
+add_test("Test\\ PathIterator::fileName" FSTests PathIterator::fileName)
+
+add_test("Test\\ FileSystem32::findInodeOf\\ /" FSTests "FileSystem32::findInodeOf /")
+add_test("Test\\ FileSystem32::write\\(string\\)" FSTests "FileSystem32::write(string)")
+add_test("Test\\ FileSystem32::rmDirectoryEntry\\(string\\)" FSTests "FileSystem32::rmDirectoryEntry(string)")
+add_test("Test\\ FileSystem32::remove\\(string,\\ true\\)" FSTests "FileSystem32::remove(string, true)")
+add_test("Test\\ FileSystem32::move" FSTests "FileSystem32::move")
+add_test("Test\\ FileSystem32::stripDirectories" FSTests "FileSystem32::stripDirectories")

deps/ox/src/ox/fs/test/filestore_format.cpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#include <ox/fs/filestore.hpp>
+
+using namespace ox::fs;
+
+int main() {
+	const auto size = 65535;
+	uint8_t volume[size];
+	uint32_t err = 0;
+	FileStore32::format(volume, size);
+	return err;
+}

deps/ox/src/ox/fs/test/filestoreio.cpp

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#include <stdio.h>
+#include <ox/std/std.hpp>
+#include <ox/fs/filestore.hpp>
+
+using namespace ox::fs;
+using namespace ox::std;
+
+template<typename FileStore>
+int test() {
+	const uint16_t size = ~0;
+	uint8_t volume[size];
+	char out[6];
+	typename FileStore::FsSize_t outSize;
+	FileStore::format(volume, size);
+	FileStore *fs = (FileStore*) volume;
+
+	if (fs->write(1, (void*) "Hello", 6) ||
+		 fs->read(1, (char*) out, &outSize) ||
+		 ox_strcmp("Hello", out)) {
+		printf("Failure 1\n");
+		return 1;
+	}
+
+	if (fs->write(2, (void*) "World", 6) ||
+		 fs->read(2, (char*) out, &outSize) ||
+		 ox_strcmp("World", out)) {
+		printf("Failure 2\n");
+		return 2;
+	}
+
+	// make sure first value was not overwritten
+	if (fs->read(1, (char*) out, &outSize) ||
+		 ox_strcmp("Hello", out)) {
+		printf("Failure 3\n");
+		return 3;
+	}
+
+	if (fs->remove(1)) {
+		printf("Failure 4\n");
+		return 4;
+	}
+
+	// make sure inode is not found
+	if (fs->read(1, (char*) out, &outSize) == 0) {
+		printf("Failure 5\n");
+		return 5;
+	}
+
+	// make sure 2 is still available
+	if (fs->write(2, (void*) "World", 6) ||
+		 fs->read(2, (char*) out, &outSize) ||
+		 ox_strcmp("World", out)) {
+		printf("Failure 6\n");
+		return 6;
+	}
+
+	return 0;
+}
+
+int main() {
+	return test<FileStore16>() || test<FileStore32>() | test<FileStore64>();
+}

deps/ox/src/ox/fs/test/filesystem_format.cpp

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <ox/fs/filesystem.hpp>
+
+using namespace ox::fs;
+using namespace ox::std;
+
+template<typename FileSystem>
+int test() {
+	const uint16_t size = ~0;
+	uint8_t volume[size];
+	FileSystem::format(volume, size, true);
+	return 0;
+}
+
+int main() {
+	return test<FileSystem16>() | test<FileSystem32>() | test<FileSystem64>();
+}

deps/ox/src/ox/fs/test/tests.cpp

@@ -0,0 +1,310 @@
+/*
+ * Copyright 2015 - 2017 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <iostream>
+#include <assert.h>
+#include <map>
+#include <vector>
+#include <string>
+#include <ox/fs/filesystem.hpp>
+#include <ox/fs/pathiterator.hpp>
+#include <ox/std/std.hpp>
+
+using namespace std;
+using namespace ox::fs;
+
+map<string, int(*)(string)> tests = {
+	{
+		{
+			"PathIterator::next1",
+			[](string) {
+				int retval = 0;
+				string path = "/usr/share/charset.gbag";
+				PathIterator it(path.c_str(), path.size());
+				const auto buffSize = 1024;
+				char buff[buffSize];
+				assert(buffSize >= path.size());
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "usr") == 0);
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "share") == 0);
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "charset.gbag") == 0);
+				return retval;
+			}
+		},
+		{
+			"PathIterator::next2",
+			[](string) {
+				int retval = 0;
+				string path = "/usr/share/";
+				PathIterator it(path.c_str(), path.size());
+				const auto buffSize = 1024;
+				char buff[buffSize];
+				assert(buffSize >= path.size());
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "usr") == 0);
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "share") == 0);
+				return retval;
+			}
+		},
+		{
+			"PathIterator::next3",
+			[](string) {
+				int retval = 0;
+				string path = "/";
+				PathIterator it(path.c_str(), path.size());
+				const auto buffSize = 1024;
+				char buff[buffSize];
+				assert(buffSize >= path.size());
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "\0") == 0);
+				return retval;
+			}
+		},
+		{
+			"PathIterator::next4",
+			[](string) {
+				int retval = 0;
+				string path = "usr/share/charset.gbag";
+				PathIterator it(path.c_str(), path.size());
+				const auto buffSize = 1024;
+				char buff[buffSize];
+				assert(buffSize >= path.size());
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "usr") == 0);
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "share") == 0);
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "charset.gbag") == 0);
+				return retval;
+			}
+		},
+		{
+			"PathIterator::next5",
+			[](string) {
+				int retval = 0;
+				string path = "usr/share/";
+				PathIterator it(path.c_str(), path.size());
+				const auto buffSize = 1024;
+				char buff[buffSize];
+				assert(buffSize >= path.size());
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "usr") == 0);
+				retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "share") == 0);
+				return retval;
+			}
+		},
+		{
+			"PathIterator::dirPath",
+			[] (string) {
+				int retval = 0;
+				string path = "/usr/share/charset.gbag";
+				PathIterator it(path.c_str(), path.size());
+				const auto buffSize = 1024;
+				char buff[buffSize];
+				assert(buffSize >= path.size());
+				retval |= !(it.dirPath(buff, path.size()) == 0 && ox_strcmp(buff, "/usr/share/") == 0);
+				return retval;
+			}
+		},
+		{
+			"PathIterator::fileName",
+			[](string) {
+				int retval = 0;
+				string path = "/usr/share/charset.gbag";
+				PathIterator it(path.c_str(), path.size());
+				const auto buffSize = 1024;
+				char buff[buffSize];
+				assert(buffSize >= path.size());
+				retval |= !(it.fileName(buff, path.size()) == 0 && ox_strcmp(buff, "charset.gbag") == 0);
+				return retval;
+			}
+		},
+		{
+			"FileSystem32::findInodeOf /",
+			[](string) {
+				int retval = 0;
+				const auto size = 1024;
+				uint8_t buff[size];
+				FileSystem32::format(buff, (FileStore32::FsSize_t) size, true);
+				auto fs = (FileSystem32*) createFileSystem(buff, size);
+				retval |= !(fs->findInodeOf("/") == FileSystem32::INODE_ROOT_DIR);
+				delete fs;
+				return retval;
+			}
+		},
+		{
+			"FileSystem32::write(string)",
+			[](string) {
+				int retval = 0;
+				auto path = "/usr/share/test.txt";
+				auto dataIn = "test string";
+				auto dataOutLen = ox_strlen(dataIn) + 1;
+				auto dataOut = new char[dataOutLen];
+
+				const auto size = 1024 * 1024;
+				auto buff = new uint8_t[size];
+				FileSystem32::format(buff, (FileStore32::FsSize_t) size, true);
+				auto fs = (FileSystem32*) createFileSystem(buff, size);
+
+				retval |= fs->mkdir("/usr");
+				retval |= fs->mkdir("/usr/share");
+				retval |= fs->mkdir("/usr/lib");
+
+				retval |= fs->write(path, (void*) dataIn, ox_strlen(dataIn) + 1);
+				retval |= fs->read(path, dataOut, dataOutLen);
+				retval |= ox_strcmp(dataIn, dataOut) != 0;
+
+				delete fs;
+				delete []buff;
+				delete []dataOut;
+
+				return retval;
+			}
+		},
+		{
+			"FileSystem32::rmDirectoryEntry(string)",
+			[](string) {
+				int retval = 0;
+				auto path = "/usr/share/test.txt";
+				auto dataIn = "test string";
+				auto dataOutLen = ox_strlen(dataIn) + 1;
+				auto dataOut = new char[dataOutLen];
+
+				const auto size = 1024 * 1024 * 10;
+				auto buff = new uint8_t[size];
+				FileSystem32::format(buff, (FileStore32::FsSize_t) size, true);
+				auto fs = (FileSystem32*) createFileSystem(buff, size);
+
+				retval |= fs->mkdir("/usr");
+				retval |= fs->mkdir("/usr/share");
+
+				retval |= fs->write(path, (void*) dataIn, ox_strlen(dataIn) + 1);
+				retval |= fs->read(path, dataOut, dataOutLen);
+				retval |= ox_strcmp(dataIn, dataOut) != 0;
+
+				retval |= fs->rmDirectoryEntry(path);
+				// the lookup should fail
+				retval |= fs->read(path, dataOut, dataOutLen) == 0;
+
+				delete fs;
+				delete []buff;
+				delete []dataOut;
+
+				return retval;
+			}
+		},
+		{
+			"FileSystem32::remove(string, true)",
+			[](string) {
+				int retval = 0;
+				auto dataIn = "test string";
+				auto dataOutLen = 1024 * 64;
+				auto dataOut = new char[dataOutLen];
+				vector<uint64_t> inodes;
+
+				const auto size = 1024 * 1024;
+				auto buff = new uint8_t[size];
+				FileSystem32::format(buff, (FileStore32::FsSize_t) size, true);
+				auto fs = (FileSystem32*) createFileSystem(buff, size);
+
+				retval |= fs->mkdir("/usr");
+				retval |= fs->mkdir("/usr/share");
+				retval |= fs->write("/usr/share/test.txt", (void*) dataIn, ox_strlen(dataIn) + 1);
+
+				inodes.push_back(fs->stat("/usr").inode);
+				inodes.push_back(fs->stat("/usr/share").inode);
+				inodes.push_back(fs->stat("/usr/share/test.txt").inode);
+
+				retval |= fs->remove("/usr", true);
+
+				// the lookup should fail
+				for (auto inode : inodes) {
+					retval |= fs->read(inode, dataOut, dataOutLen) == 0;
+				}
+
+				delete fs;
+				delete []buff;
+				delete []dataOut;
+
+				return retval;
+			}
+		},
+		{
+			"FileSystem32::move",
+			[](string) {
+				int retval = 0;
+				auto dataIn = "test string";
+				auto dataOutLen = ox_strlen(dataIn) + 1;
+				auto dataOut = new char[dataOutLen];
+				vector<uint64_t> inodes;
+
+				const auto size = 1024 * 1024;
+				auto buff = new uint8_t[size];
+				FileSystem32::format(buff, (FileStore32::FsSize_t) size, true);
+				auto fs = (FileSystem32*) createFileSystem(buff, size);
+
+				retval |= fs->mkdir("/usr");
+				retval |= fs->mkdir("/usr/share");
+				retval |= fs->write("/usr/share/test.txt", (void*) dataIn, ox_strlen(dataIn) + 1);
+
+				retval |= fs->move("/usr/share", "/share");
+				retval |= fs->read("/share/test.txt", dataOut, dataOutLen);
+				retval |= !(ox_strcmp(dataIn, dataOut) == 0);
+
+				delete fs;
+				delete []buff;
+				delete []dataOut;
+
+				return retval;
+			}
+		},
+		{
+			"FileSystem32::stripDirectories",
+			[](string) {
+				int retval = 0;
+				auto dataIn = "test string";
+				auto dataOutLen = ox_strlen(dataIn) + 1;
+				auto dataOut = new char[dataOutLen];
+				vector<uint64_t> inodes;
+
+				const auto size = 1024 * 1024;
+				auto buff = new uint8_t[size];
+				FileSystem32::format(buff, (FileStore32::FsSize_t) size, true);
+				auto fs = (FileSystem32*) createFileSystem(buff, size);
+
+				retval |= fs->mkdir("/usr");
+				retval |= fs->mkdir("/usr/share");
+				retval |= fs->write("/usr/share/test.txt", (void*) dataIn, ox_strlen(dataIn) + 1);
+
+				auto inode = fs->stat("/usr/share/test.txt").inode;
+
+				retval |= fs->stripDirectories();
+
+				// make sure normal file is still there and the directories are gone
+				retval |= fs->read(inode, dataOut, dataOutLen);
+				retval |= !(ox_strcmp(dataIn, dataOut) == 0);
+				retval |= !(fs->stat("/usr").inode == 0);
+				retval |= !(fs->stat("/usr/share").inode == 0);
+
+				delete fs;
+				delete []buff;
+				delete []dataOut;
+
+				return retval;
+			}
+		},
+	},
+};
+
+int main(int argc, const char **args) {
+	int retval = -1;
+	if (argc > 1) {
+		auto testName = args[1];
+		string testArg = "";
+		if (args[2]) {
+			testArg = args[2];
+		}
+		if (tests.find(testName) != tests.end()) {
+			retval = tests[testName](testArg);
+		}
+	}
+	return retval;
+}