faults-handler: move fht_worker from main

Author: nunom27

lazyfs/include/faults_handler.hpp

@@ -1,13 +1,17 @@
 #ifndef FAULTS_HANDLER_HPP
 #define FAULTS_HANDLER_HPP
 
+#include "cache/config/config.hpp"
+#include "faults/faults.hpp"
+#include "lazyfs/lazyfs.hpp"
 #include <string>
 #include <vector>
 
+#define MAX_READ_CHUNK 100
 
 /**
  * @brief Parses a clear-cache command string.
- * 
+ *
  * @param command_str the command string to parse
  * @param crash_timing reference to the crash timing
  * @param crash_operation reference to the crash operation
@@ -19,11 +23,11 @@ bool parse_crash(std::string command_str, std::string &crash_timing, std::string
 
 /**
  * @brief Parses a torn-op command string.
- * 
+ *
  * @param command_str the command string to parse
  * @param file reference to the file path
  * @param parts reference to the parts of the write
- * @param parts_bytes reference to parts of the write  
+ * @param parts_bytes reference to parts of the write
  * @param persist reference to which parts to persist
  * @param ret reference to if the operation should return before crashing
  * @return true if parsing was successful, false otherwise
@@ -32,7 +36,7 @@ bool parse_torn_op(std::string command_str, std::string &file, std::string &part
 
 /**
  * @brief Parses a torn-seq command string.
- * 
+ *
  * @param command_str the command string to parse
  * @param file reference to the file path
  * @param op reference to the operation type
@@ -44,16 +48,16 @@ bool parse_torn_seq(std::string command_str, std::string &file, std::string &op,
 
 /**
  * @brief Parses a snapshot command string.
- * 
+ *
  * @param command_str the command string to parse
  * @param files reference to the files to include in the snapshot
  * @param files_rgx reference to the regex for files to include in the snapshot
  * @param save reference to the path where the snapshot should be saved
  * @return true if parsing was successful, false otherwise
 */
-bool parse_snapshot (std::string command_str, 
+bool parse_snapshot (std::string command_str,
                      std::string& files,
-                     std::regex&  files_rgx, 
+                     std::regex&  files_rgx,
                      std::string& save);
 
 
@@ -62,7 +66,6 @@ bool parse_snapshot (std::string command_str,
  */
 FaultParamsMap parse_fault_command (const std::string command_str);
 
-
-
+void fht_worker (lazyfs::LazyFS* filesystem, cache::config::Config* std_config);
 
 #endif // FAULTS_HANDLER_HPP

lazyfs/include/lazyfs/lazyfs.hpp

@@ -66,7 +66,7 @@ class Write {
     /**
      * @brief Destroy the Write object
      *
-     */   
+     */
     ~Write ();
 
 };
@@ -95,24 +95,18 @@ class LazyFS : public Fusepp::Fuse<LazyFS> {
      */
     std::thread* faults_handler_thread;
 
-    /**
-     * @brief Faults handler method to run inside the thread.
-     *
-     */
-    void (*fht_worker) (LazyFS* filesystem);
-
     /**
      * @brief Faults programmed in the configuration file.
      */
-    unordered_map<string,vector<faults::Fault*>>* faults; 
+    unordered_map<string,vector<faults::Fault*>>* faults;
 
     /**
      * @brief FUSE mount directory.
      */
     string mount_dir;
 
     /**
-     * @brief FUSE root directory. 
+     * @brief FUSE root directory.
      */
     string root_dir;
 
@@ -174,7 +168,7 @@ class LazyFS : public Fusepp::Fuse<LazyFS> {
                                                             "link",
                                                             "symlink"};
     */
-   
+
     /**
      * @brief Map of operations that have two paths
      *
@@ -201,7 +195,6 @@ class LazyFS : public Fusepp::Fuse<LazyFS> {
     LazyFS (Cache* cache,
             cache::config::Config* config,
             std::thread* faults_handler_thread,
-            void (*fht_worker) (LazyFS* filesystem),
             unordered_map<string,vector<faults::Fault*>>* faults,
             string mount_dir,
             string root_dir);
@@ -219,7 +212,7 @@ class LazyFS : public Fusepp::Fuse<LazyFS> {
 
     /**
      * @brief Fifo: (fault) Clear the cached contents
-     * 
+     *
      * @param lock_needed Indicates if the cache_command_lock should be locked. When this function is called inside a filesystem operation, it should be false, because all filesystem operations are already locked. When called from the fault handler, it should be true.
      */
     void command_fault_clear_cache (bool lock_needed = true);
@@ -229,22 +222,22 @@ class LazyFS : public Fusepp::Fuse<LazyFS> {
     /**
      * @brief Fifo: (fault) Persist the cached pages requested.
      * Only use after obtaining lock on cache_command_lock.
-     * 
+     *
      * @param sync_pages The sync-pages fault to be injected.
      */
   void command_fault_sync_pages (faults::SyncPagesF &sync_pages);
 
     /**
      * @brief Fifo: (info) Display the cache usage
-     * 
+     *
      * @param lock_needed Indicates if the cache_command_lock should be locked. When this function is called inside a filesystem operation, it should be false, because all filesystem operations are already locked. When called from the fault handler, it should be true.
      *
      */
     void command_display_cache_usage (bool lock_needed = true);
 
     /**
      * @brief Fifo: (sync) Sync all cached data with the underlying FS
-     * 
+     *
      * @param lock_needed Indicates if the cache_command_lock should be locked. When this function is called inside a filesystem operation, it should be false, because all filesystem operations are already locked. When called from the fault handler, it should be true.
      *
      */
@@ -267,7 +260,7 @@ class LazyFS : public Fusepp::Fuse<LazyFS> {
 
     /**
      * @brief Checks if a programmed reorder fault for the given path and operation exists. If so, updates the counter and returns the fault.
-     * @param path Path of the file 
+     * @param path Path of the file
      * @param op Operation ('write','fsync',...)
      * @return Pointer to the ReorderF object
     */
@@ -291,7 +284,7 @@ class LazyFS : public Fusepp::Fuse<LazyFS> {
     void restart_counter(string path, string op);
 
     /**
-     * @brief Checks the existence of a pending write (a write that could be persisted if it is followed by another one) and deletes it if it exists. 
+     * @brief Checks the existence of a pending write (a write that could be persisted if it is followed by another one) and deletes it if it exists.
      * @param path Path of the file
      */
     bool check_and_delete_pendingwrite(const char* path);
@@ -419,15 +412,15 @@ class LazyFS : public Fusepp::Fuse<LazyFS> {
                           string crash_operation,
                           string crash_regex_from,
                           string crash_regex_to);
-    
+
 
   void add_sync_pages_fault(const FaultParamsMap& params_map);
 
     /**
      * @brief Adds a torn-seq fault to the faults map. Returns a vector with errors if any.
-     * 
+     *
      * @param path path of the fault
-     * @param op system call 
+     * @param op system call
      * @param persist which parts of the write to persist
      * @param ret_ if the current system call is finished before crashing
      * @return errors
@@ -436,7 +429,7 @@ class LazyFS : public Fusepp::Fuse<LazyFS> {
 
     /**
      * @brief Adds a torn-op fault to the faults map. Returns a vector with errors if any.
-     * 
+     *
      * @param path path of the fault
      * @param parts which parts of the write to persist
      * @param parts_bytes division of the write in bytes