openat and statat support relative paths (d5850fad) · Commits · hpc / gekkofs

ifs/include/preload/open_file_map.hpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,10 @@
		#include <memory>
		#include <atomic>

		/* Forward declaration */
		class OpenDir;


		enum class OpenFile_flags {
		append = 0,
		creat,
		@@ -79,6 +83,8 @@ public:

		std::shared_ptr<OpenFile> get(int fd);

		std::shared_ptr<OpenDir> get_dir(int dirfd);

		bool exist(int fd);

		int add(std::shared_ptr<OpenFile>);

ifs/src/preload/intcp_functions.cpp

+60 −17

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@
		#include <preload/adafs_functions.hpp>
		#include <preload/intcp_functions.hpp>
		#include <preload/open_dir.hpp>
		#include <global/path_util.hpp>


		using namespace std;
		@@ -49,7 +50,7 @@ int open64(const char* path, int flags, ...) {
		return open(path, flags \| O_LARGEFILE, mode);
		}

		int openat(int dirfd, const char *path, int flags, ...) {
		int openat(int dirfd, const char *cpath, int flags, ...) {
		init_passthrough_if_needed();

		mode_t mode = 0;
		@@ -61,20 +62,34 @@ int openat(int dirfd, const char *path, int flags, ...) {
		}

		if(CTX->initialized()) {
		std::string path(cpath);
		CTX->log()->trace("{}() called with path {}", __func__, path);
		std::string rel_path(path);
		if (CTX->relativize_path(rel_path)) {
		return adafs_open(rel_path, mode, flags);
		}

		if (CTX->file_map()->exist(dirfd)) {
		CTX->log()->error("{}() called with relative path: NOT SUPPORTED", __func__);
		errno = ENOTSUP;
		if(is_relative_path(path)) {
		if(!(CTX->file_map()->exist(dirfd))) {
		goto passthrough;
		}
		auto dir = CTX->file_map()->get_dir(dirfd);
		if(dir == nullptr) {
		CTX->log()->error("{}() dirfd is not a directory ", __func__);
		errno = ENOTDIR;
		return -1;
		}
		if(has_trailing_slash(path)){
		path.pop_back();
		}
		return adafs_open(dir->path() + '/' + path, mode, flags);
		} else {
		// Path is absolute
		assert(is_absolute_path(path));

		return (reinterpret_cast<decltype(&openat)>(libc_openat))(dirfd, path, flags, mode);
		if (CTX->relativize_path(path)) {
		return adafs_open(path, mode, flags);
		}
		}
		}
		passthrough:
		return (reinterpret_cast<decltype(&openat)>(libc_openat))(dirfd, cpath, flags, mode);
		}

		int openat64(int dirfd, const char *path, int flags, ...) {
		@@ -441,16 +456,44 @@ int __fxstat(int ver, int fd, struct stat* buf) __THROW {
		return (reinterpret_cast<decltype(&__fxstat)>(libc___fxstat))(ver, fd, buf);
		}

		int __fxstatat(int ver, int dirfd, const char * path, struct stat * buf, int flags) {
		int __fxstatat(int ver, int dirfd, const char * cpath, struct stat * buf, int flags) {
		init_passthrough_if_needed();
		if(CTX->initialized()) {
		CTX->log()->trace("{}() called with path '{}'", __func__, path);
		std::string rel_path(path);
		if (CTX->relativize_path(rel_path)) {
		return adafs_stat(rel_path, buf);
		std::string path(cpath);
		CTX->log()->trace("{}() called with path '{}' and fd {}", __func__, path, dirfd);
		if(flags & AT_EMPTY_PATH) {
		CTX->log()->error("{}() AT_EMPTY_PATH flag not supported", __func__);
		errno = ENOTSUP;
		return -1;
		}

		if(is_relative_path(path)) {
		if((dirfd == AT_FDCWD) \|\| !CTX->file_map()->exist(dirfd)) {
		goto passthrough;
		}

		auto dir = CTX->file_map()->get_dir(dirfd);
		if(dir == nullptr) {
		CTX->log()->error("{}() dirfd is not a directory ", __func__);
		errno = ENOTDIR;
		return -1;
		}
		if(has_trailing_slash(path)){
		path.pop_back();
		}
		return adafs_stat(dir->path() + '/' + path, buf);

		} else {
		// Path is absolute
		assert(is_absolute_path(path));

		if (CTX->relativize_path(path)) {
		return adafs_stat(path, buf);
		}
		}
		}
		return (reinterpret_cast<decltype(&__fxstatat)>(libc___fxstatat))(ver, dirfd, path, buf, flags);
		passthrough:
		return (reinterpret_cast<decltype(&__fxstatat)>(libc___fxstatat))(ver, dirfd, cpath, buf, flags);
		}

		int __fxstatat64(int ver, int dirfd, const char * path, struct stat64 * buf, int flags) {

ifs/src/preload/open_file_map.cpp

+10 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@

		#include <global/global_defs.hpp>
		#include <preload/open_file_map.hpp>
		#include <preload/open_dir.hpp>
		#include <preload/preload.hpp>

		using namespace std;
		@@ -73,6 +74,15 @@ shared_ptr<OpenFile> OpenFileMap::get(int fd) {
		}
		}

		shared_ptr<OpenDir> OpenFileMap::get_dir(int dirfd) {
		auto f = get(dirfd);
		if(f == nullptr){
		return nullptr;
		}
		auto open_dir = static_pointer_cast<OpenDir>(f);
		// If open_file is not an OpenDir we are returning nullptr
		return open_dir;
		}

		bool OpenFileMap::exist(const int fd) {
		lock_guard<recursive_mutex> lock(files_mutex_);