separate cr.h and add DUMP_TESTING macro for required places

Author: Yifei-Liu

ckpt_restore_test.sh

@@ -11,3 +11,10 @@ sudo umount -l /mnt/test-verifs2
 sudo rm -rf /mnt/test-verifs2/*
 sudo umount -l /mnt/test-verifs1
 sudo rm -rf /mnt/test-verifs1/*
+sudo rm -r /mnt/test-verifs2
+sudo rm -r /mnt/test-verifs1
+sudo mkdir /mnt/test-verifs2
+sudo mkdir /mnt/test-verifs1
+sudo chown yifei:yifei /mnt/test-verifs2
+sudo chown yifei:yifei /mnt/test-verifs1
+

src/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.2)
 set(CMAKE_BUILD_TYPE Debug)
 # preprocessor for verifying Checkpoint/Restore APIs
 #add_definitions(-DDUMP_TESTING)
-add_executable(fuse-cpp-ramfs main.cpp directory.cpp inode.cpp symlink.cpp file.cpp util.cpp fuse_cpp_ramfs.cpp special_inode.cpp cr.cpp)
+add_executable(fuse-cpp-ramfs main.cpp directory.cpp inode.cpp symlink.cpp file.cpp util.cpp fuse_cpp_ramfs.cpp special_inode.cpp cr_util.cpp)
 add_executable(ckpt ckpt.cpp testops.cpp)
 add_executable(restore restore.cpp testops.cpp)
 set_property(TARGET fuse-cpp-ramfs PROPERTY CXX_STANDARD 17)

src/cr.h

@@ -0,0 +1,22 @@
+#ifndef cr_h
+#define cr_h
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <sys/ioctl.h>
+
+#define VERIFS2_IOC_CODE    '1'
+#define VERIFS2_IOC_NO(x)   (VERIFS2_IOC_CODE + (x))
+#define VERIFS2_IOC(n)      _IO(VERIFS2_IOC_CODE, VERIFS2_IOC_NO(n))
+#define VERIFS2_GET_IOC(n, type)  _IOR(VERIFS2_IOC_CODE, VERIFS2_IOC_NO(n), type)
+#define VERIFS2_SET_IOC(n, type)  _IOW(VERIFS2_IOC_CODE, VERIFS2_IOC_NO(n), type)
+
+#define VERIFS2_CHECKPOINT  VERIFS2_IOC(1)
+#define VERIFS2_RESTORE     VERIFS2_IOC(2)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

src/cr.hpp

@@ -2,15 +2,16 @@
 #include <vector>
 #include <cstdint>
 #include <cerrno>
-#include "cr.hpp"
+#include "cr_util.hpp"
 
-#define PRINT_CLASS(x) std::cout << "Class Name: " << typeid(x).name() << std::endl
+#ifdef DUMP_TESTING
 #define PRINT_VAL(x) std::cout << #x" : " << x << std::endl
 
 bool isExistInDeleted(fuse_ino_t curr_ino, std::queue<fuse_ino_t> DeletedInodes);
 void print_ino_queue(std::queue<fuse_ino_t> DeletedInodes);
+#endif
 
-std::unordered_map<uint64_t, std::tuple<std::vector <Inode *>, std::queue<fuse_ino_t>, struct statvfs> > state_pool;
+std::unordered_map<uint64_t, verifs2_state > state_pool;
 
 int insert_state(uint64_t key, 
                   std::tuple<std::vector <Inode *>, std::queue<fuse_ino_t>, 
@@ -25,14 +26,13 @@ int insert_state(uint64_t key,
   return 0;
 }
 
-std::tuple<std::vector <Inode *>, std::queue<fuse_ino_t>, struct statvfs> 
-find_state(uint64_t key)
+verifs2_state find_state(uint64_t key)
 {
   auto it = state_pool.find(key);
   if (it == state_pool.end()) {
     std::queue<fuse_ino_t> empty_queue;
     struct statvfs empty_statvfs = {};
-    return std::tuple<std::vector <Inode *>, std::queue<fuse_ino_t>, struct statvfs>{std::vector <Inode *>(), empty_queue, empty_statvfs};
+    return verifs2_state{std::vector <Inode *>(), empty_queue, empty_statvfs};
   } else {
     return it->second;
   }
@@ -48,6 +48,7 @@ int remove_state(uint64_t key)
   return 0;
 }
 
+#ifdef DUMP_TESTING
 /* Dump functionalites to verify Checkpoint/Restore APIs */
 
 void dump_File(File* file)
@@ -191,3 +192,4 @@ int dump_state_pool()
   return ret;
 }
 
+#endif

src/cr.cpp src/cr_util.cpp

@@ -0,0 +1,28 @@
+#ifndef cr_util_hpp
+#define cr_util_hpp
+
+#include "inode.hpp"
+#include "file.hpp"
+#include "directory.hpp"
+#include "special_inode.hpp"
+#include "symlink.hpp"
+
+typedef std::tuple<std::vector <Inode *>, std::queue<fuse_ino_t>, struct statvfs> verifs2_state;
+
+int insert_state(uint64_t key, verifs2_state fs_states_vec);
+verifs2_state find_state(uint64_t key);
+int remove_state(uint64_t key);
+
+#ifdef DUMP_TESTING
+void dump_File(File* file);
+void dump_Directory(Directory* dir);
+void dump_SpecialInode(SpecialInode* sinode);
+void dump_SymLink(SymLink* symlink);
+int dump_inodes_verifs2(std::vector<Inode *> Inodes, std::queue<fuse_ino_t> DeletedInodes, 
+                        std::string info);
+int dump_state_pool();
+bool isExistInDeleted(fuse_ino_t curr_ino, std::queue<fuse_ino_t> DeletedInodes);
+void print_ino_queue(std::queue<fuse_ino_t> DeletedInodes);
+#endif
+
+#endif

src/cr_util.hpp

@@ -56,8 +56,9 @@ class Directory : public Inode {
     const std::map<std::string, fuse_ino_t> &Children() { return m_children; }
 
     std::shared_mutex& DirLock() { return childrenRwSem; }
-
+    #ifdef DUMP_TESTING
     friend void dump_Directory(Directory* dir);
+    #endif
 };
 
 #endif /* directory_hpp */

src/directory.hpp

@@ -30,7 +30,9 @@ class File : public Inode {
     int FileTruncate(size_t newSize);
 
     friend class FuseRamFs;
+    #ifdef DUMP_TESTING
     friend void dump_File(File* file);
+    #endif
 //    size_t Size();
 };
 

src/file.hpp

@@ -233,7 +233,7 @@ int FuseRamFs::restore(uint64_t key)
         return ret;
     }
     #endif
-    std::tuple<std::vector <Inode *>, std::queue<fuse_ino_t>, struct statvfs> stored_states = find_state(key);
+    verifs2_state stored_states = find_state(key);
 
     std::vector <Inode *> stored_files = std::get<0>(stored_states);
     std::queue<fuse_ino_t> stored_DeletedInodes = std::get<1>(stored_states);

src/fuse_cpp_ramfs.cpp

@@ -7,7 +7,8 @@
 
 #include "common.h"
 #include "inode.hpp"
-#include "cr.hpp"
+#include "cr_util.hpp"
+#include "cr.h"
 
 class Directory;
 

src/fuse_cpp_ramfs.hpp

@@ -29,7 +29,9 @@ class SpecialInode : public Inode {
     int ReadAndReply(fuse_req_t req, size_t size, off_t off);
 
     enum SpecialInodeTypes Type();
+    #ifdef DUMP_TESTING
     friend void dump_SpecialInode(SpecialInode* sinode);
+    #endif
 };
 
 #endif /* special_inode_hpp */

src/special_inode.hpp

@@ -26,7 +26,9 @@ class SymLink : public Inode {
 
 
     const std::string &Link() { return m_link; }
+    #ifdef DUMP_TESTING
     friend void dump_SymLink(SymLink* m_link);
+    #endif
 };
 
 #endif /* symlink_hpp */