Merge branch 'preload_includes_cleanup' into 'master' (e5483d49) · Commits · hpc / gekkofs

ifs/include/daemon/adafs_ops/metadentry.hpp

+1 −0

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

		#include <daemon/adafs_daemon.hpp>
		#include <daemon/classes/metadata.hpp>
		#include <preload/preload_util.hpp>

		int create_node(const std::string& path, const uid_t uid, const gid_t gid, mode_t mode);

+2 −0

Original line number	Diff line number	Diff line
		#ifndef IFS_GLOBAL_DEFS_HPP
		#define IFS_GLOBAL_DEFS_HPP

		#include <type_traits> //underlying_type

		// These constexpr set the RPC's identity and which handler the receiver end should use
		namespace hg_tag {
		constexpr auto fs_config = "ipc_srv_fs_config";

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@
		#define IFS_PASSTHROUGH_HPP

		#include <preload/preload.hpp>
		#include <iostream>

		// function pointer for preloading
		extern void* libc;

+2 −22

Original line number	Diff line number	Diff line

		#ifndef IOINTERCEPT_PRELOAD_HPP
		#define IOINTERCEPT_PRELOAD_HPP

		#include <memory>
		#include <map>
		#include <mutex>
		#include <iostream>
		#include <sys/statfs.h>
		#include <cstdio>
		#include <cstdint>
		#include <fcntl.h>
		#include <cerrno>
		#include <unistd.h>

		#include <global/configure.hpp>
		#include <global/global_defs.hpp>

		extern "C" {
		#include <abt.h>
		#include <mercury.h>
		#include <margo.h>
		}

		#include <preload/preload_util.hpp>
		#include <preload/preload_context.hpp>


		#define EUNKNOWN (-1)

		#define CTX PreloadContext::getInstance()
		@@ -37,4 +16,5 @@ void init_preload() __attribute__((constructor));

		void destroy_preload() __attribute__((destructor));


		#endif //IOINTERCEPT_PRELOAD_HPP

+5 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,11 @@
		#include <preload/preload.hpp>
		// third party libs
		#include <string>
		#include <iostream>

		extern "C" {
		#include <margo.h>
		}

		// TODO singleton this stuff away
		// The contents of FsConfig or only set once when set up