Commit a2a068fc authored by Marc Vef's avatar Marc Vef
Browse files

functionality stripped away so that adafs_low compiles

parent 82e54cdc

lfs/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ find_package(FUSE3 REQUIRED) 
find_package(Boost 1.56.0 COMPONENTS system filesystem serialization)



include_directories(${FUSE3_INCLUDE_DIR} include/)

set(SOURCE_FILES src/main.cpp src/main.h src/fuse_ops.h src/util.cpp src/classes/metadata.h src/classes/metadata.cpp src/adafs_ops/metadata_ops.h src/adafs_ops/metadata_ops.cpp src/adafs_ops/dentry_ops.cpp src/adafs_ops/dentry_ops.h src/configure.h src/fuse_ops/file.cpp src/fuse_ops/directory.cpp src/fuse_ops/access.cpp src/fuse_ops/sync.cpp src/adafs_ops/access.cpp src/adafs_ops/access.h src/fuse_ops/fs.cpp src/fuse_ops/io.cpp src/adafs_ops/io.cpp src/adafs_ops/io.h)

set(SOURCE_FILES src/main.cpp src/main.h src/fuse_ops.h src/classes/metadata.h src/classes/metadata.cpp)

add_executable(adafs ${SOURCE_FILES} src/main.cpp)

target_link_libraries(adafs ${FUSE3_LIBRARIES} -lpthread -lboost_system -lboost_filesystem -lboost_serialization -pg)
 
 No newline at end of file

lfs/src/classes/metadata.cpp

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ Metadata::Metadata(mode_t mode, fuse_req_t& req) : 
        size_(0),

        blocks_(0) {

    init_ACM_time();

    inode_no_ = util::generate_inode_no();

//    inode_no_ = util::generate_inode_no();

}



void Metadata::init_ACM_time() {

lfs/src/main.cpp

+28 −30
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ static struct adafs_data *adafs_data(fuse_req_t req) { 


static struct fuse_lowlevel_ops adafs_ops;







using namespace std;



/**
@@ -65,34 +63,34 @@ int main(int argc, char* argv[]) { 
//    init_adafs_ops(&adafs_ops);



    // create the private data struct

    auto a_data = make_shared<adafs_data>();

    //set the logger and initialize it with spdlog

    a_data->logger = spdlog::basic_logger_mt("basic_logger", "adafs.log");

#if defined(LOG_DEBUG)

    spdlog::set_level(spdlog::level::debug);

    a_data->logger->flush_on(spdlog::level::debug);

#elif defined(LOG_INFO)

    spdlog::set_level(spdlog::level::info);

    a_data->logger->flush_on(spdlog::level::info);

#else

    spdlog::set_level(spdlog::level::off);

#endif

    //extract the rootdir from argv and put it into rootdir of adafs_data

    a_data->rootdir = string(realpath(argv[argc - 2], NULL));

    argv[argc - 2] = argv[argc - 1];

    argv[argc - 1] = NULL;

    argc--;

    //set all paths

    a_data->inode_path = a_data->rootdir + "/meta/inodes"s;

    a_data->dentry_path = a_data->rootdir + "/meta/dentries"s;

    a_data->chunk_path = a_data->rootdir + "/data/chunks"s;

    a_data->mgmt_path = a_data->rootdir + "/mgmt"s;

    //print version

    cout << "Fuse library version: "s + to_string(FUSE_MAJOR_VERSION) + to_string(FUSE_MINOR_VERSION) << endl;

    //init fuse and give the private data struct for further reference.

    cout << "initializing fuse..." << endl;

//    auto err = fuse_main(argc, argv, &adafs_ops, a_data.get());

    cout << "about to close fuse" << endl;

//    auto a_data = make_shared<adafs_data>();

//    //set the logger and initialize it with spdlog

//    a_data->logger = spdlog::basic_logger_mt("basic_logger", "adafs.log");

//#if defined(LOG_DEBUG)

//    spdlog::set_level(spdlog::level::debug);

//    a_data->logger->flush_on(spdlog::level::debug);

//#elif defined(LOG_INFO)

//    spdlog::set_level(spdlog::level::info);

//    a_data->logger->flush_on(spdlog::level::info);

//#else

//    spdlog::set_level(spdlog::level::off);

//#endif

//    //extract the rootdir from argv and put it into rootdir of adafs_data

//    a_data->rootdir = string(realpath(argv[argc - 2], NULL));

//    argv[argc - 2] = argv[argc - 1];

//    argv[argc - 1] = NULL;

//    argc--;

//    //set all paths

//    a_data->inode_path = a_data->rootdir + "/meta/inodes"s;

//    a_data->dentry_path = a_data->rootdir + "/meta/dentries"s;

//    a_data->chunk_path = a_data->rootdir + "/data/chunks"s;

//    a_data->mgmt_path = a_data->rootdir + "/mgmt"s;

//    //print version

//    cout << "Fuse library version: "s + to_string(FUSE_MAJOR_VERSION) + to_string(FUSE_MINOR_VERSION) << endl;

//    //init fuse and give the private data struct for further reference.

//    cout << "initializing fuse..." << endl;

////    auto err = fuse_main(argc, argv, &adafs_ops, a_data.get());

//    cout << "about to close fuse" << endl;



    return 0;

}

lfs/src/main.h

+11 −11
Original line number Diff line number Diff line
@@ -45,16 +45,16 @@ struct adafs_data { 


#define ADAFS_ROOT_INODE 1



namespace util {

    boost::filesystem::path adafs_fullpath(const std::string& path);



    int init_inode_no();



    ino_t generate_inode_no();



    int read_inode_cnt();



    int write_inode_cnt();

}

//namespace util {

//    boost::filesystem::path adafs_fullpath(const std::string& path);

//

//    int init_inode_no();

//

//    ino_t generate_inode_no();

//

//    int read_inode_cnt();

//

//    int write_inode_cnt();

//}



#endif //MAIN_H