[CMakeLists.txt 和其他文件更新]: 引入新依赖并优化目录监控功能

RealChuan · RealChuan · commit f7337da2b559 · 2024-12-25T09:57:54.000+08:00
- 添加了新的子目录`MonitorDir_EFSW`，用于实现基于`efsw`的目录监控功能。
- 在`MonitorDir_EFSW`目录下创建了`CMakeLists.txt`和`main.cc`文件，实现了一个简单的目录监控示例。
- 更新了`README.md`文件，添加了对新目录监控示例的介绍，并调整了其他部分的编号和内容。
- 在`vcpkg.json`中添加了`efsw`作为依赖项，以确保可以通过vcpkg管理这些依赖。
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,14 +16,26 @@ find_package(unofficial-breakpad CONFIG REQUIRED)
 if(unofficial-breakpad_FOUND)
   message(STATUS "found unofficial-breakpad")
 endif()
-find_package(glog CONFIG REQUIRED)
-if(glog_FOUND)
-  message(STATUS "found glog")
-endif()
 find_package(benchmark CONFIG REQUIRED)
 if(benchmark_FOUND)
   message(STATUS "found benchmark")
 endif()
+find_package(crashpad CONFIG REQUIRED)
+if(crashpad_FOUND)
+  message(STATUS "found crashpad")
+endif()
+find_package(CURL CONFIG REQUIRED)
+if(CURL_FOUND)
+  message(STATUS "found CURL")
+endif()
+find_package(efsw CONFIG REQUIRED)
+if(efsw_FOUND)
+  message(STATUS "found efsw")
+endif()
+find_package(glog CONFIG REQUIRED)
+if(glog_FOUND)
+  message(STATUS "found glog")
+endif()
 find_package(GTest CONFIG REQUIRED)
 if(GTest_FOUND)
   message(STATUS "found GTest")
@@ -32,14 +44,6 @@ find_package(OpenSSL REQUIRED)
 if(OpenSSL_FOUND)
   message(STATUS "found OpenSSL")
 endif()
-find_package(CURL CONFIG REQUIRED)
-if(CURL_FOUND)
-  message(STATUS "found CURL")
-endif()
-find_package(crashpad CONFIG REQUIRED)
-if(crashpad_FOUND)
-  message(STATUS "found crashpad")
-endif()
 find_package(Threads REQUIRED)
 if(Threads_FOUND)
   message(STATUS "found Threads")
@@ -61,6 +65,7 @@ add_subdirectory(Glog)
 add_subdirectory(LinkedList)
 add_subdirectory(Memcpy)
 add_subdirectory(MonitorDir)
+add_subdirectory(MonitorDir_EFSW)
 add_subdirectory(Mutex)
 add_subdirectory(OpenSSL)
 add_subdirectory(Thread)
diff --git a/MonitorDir_EFSW/CMakeLists.txt b/MonitorDir_EFSW/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_executable(monitor_dir_efsw main.cc)
+target_link_libraries(monitor_dir_efsw PRIVATE efsw::efsw)
diff --git a/MonitorDir_EFSW/main.cc b/MonitorDir_EFSW/main.cc
@@ -0,0 +1,110 @@
+#include <efsw/efsw.hpp>
+
+#include <filesystem>
+#include <iostream>
+#include <signal.h>
+#include <thread>
+
+bool STOP = false;
+
+void sigend(int)
+{
+    std::cout << std::endl << "Bye bye" << std::endl;
+    STOP = true;
+}
+
+std::string getActionName(efsw::Action action)
+{
+    switch (action) {
+    case efsw::Actions::Add: return "Add";
+    case efsw::Actions::Modified: return "Modified";
+    case efsw::Actions::Delete: return "Delete";
+    case efsw::Actions::Moved: return "Moved";
+    default: break;
+    }
+    return "Bad Action";
+}
+
+efsw::WatchID handleWatchID(efsw::WatchID watchid)
+{
+    switch (watchid) {
+    case efsw::Errors::FileNotFound:
+    case efsw::Errors::FileRepeated:
+    case efsw::Errors::FileOutOfScope:
+    case efsw::Errors::FileRemote:
+    case efsw::Errors::WatcherFailed:
+    case efsw::Errors::Unspecified: {
+        std::cout << efsw::Errors::Log::getLastErrorLog().c_str() << std::endl;
+        break;
+    }
+    default: {
+        std::cout << "Added WatchID: " << watchid << std::endl;
+    }
+    }
+    return watchid;
+}
+
+/// Processes a file action
+class UpdateListener : public efsw::FileWatchListener
+{
+public:
+    UpdateListener() {}
+
+    void handleFileAction(efsw::WatchID watchid,
+                          const std::string &dir,
+                          const std::string &filename,
+                          efsw::Action action,
+                          std::string oldFilename = "") override
+    {
+        std::cout << "Watch ID " << watchid << " DIR ("
+                  << dir + ") FILE ("
+                         + (oldFilename.empty() ? "" : "from file " + oldFilename + " to ")
+                         + filename + ") has event "
+                  << getActionName(action) << std::endl;
+    }
+};
+
+int main(int argc, char **argv)
+{
+    signal(SIGABRT, sigend);
+    signal(SIGINT, sigend);
+    signal(SIGTERM, sigend);
+
+    std::cout << "Press ^C to exit demo" << std::endl;
+
+    bool useGeneric = false;
+    auto filepath = std::filesystem::current_path().parent_path().parent_path();
+    std::cout << filepath << std::endl;
+
+    auto *ul = new UpdateListener;
+
+    /// create the file watcher object
+    efsw::FileWatcher fileWatcher(useGeneric);
+
+    fileWatcher.followSymlinks(false);
+    fileWatcher.allowOutOfScopeLinks(false);
+
+    /// starts watching
+    fileWatcher.watch();
+
+    /// add a watch to the system
+    handleWatchID(fileWatcher.addWatch((filepath / "bin-64").string(), ul, true));
+
+    /// adds another watch after started watching...
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+
+    efsw::WatchID watchID = handleWatchID(
+        fileWatcher.addWatch((filepath / "build").string(), ul, true));
+
+    /// delete the watch
+    if (watchID > 0) {
+        std::this_thread::sleep_for(std::chrono::seconds(1));
+        fileWatcher.removeWatch(watchID);
+    }
+
+    while (!STOP) {
+        std::this_thread::sleep_for(std::chrono::seconds(1));
+    }
+
+    return 0;
+}
diff --git a/README.md b/README.md
@@ -34,8 +34,9 @@
     1. `fanotify`中使用`global`模式，在`fanotify_mark`中加入`FAN_MARK_FILESYSTEM`（需要`CAP_SYS_ADMIN`能力，即root权限）这个`flag`，可以所有在指定文件系统上的事件都会被监控，然后可以根据指定的监控的文件夹目录过滤需要的事件，这个功能比`inotify`更强大；
        1. 获取事件发生文件所在的上级路径中，使用了`open_by_handle_at`这个方法，普通用户下会出现`Operation not permitted`错误，也需要`CAP_SYS_ADMIN`能力，即root权限;
        2. 建议使用root权限运行，如果一定要在普通用户下运行，还是建议使用`inotify`而不是`fanotify`，反正在打开一个监控文件描述符（`fd`）的情况下，都无法实现`subtree`监控;
-23. [Mutex](/Mutex/mutex.hpp)——使用std::atomic_flag实现的简单互斥锁和自旋锁；
-24. [OpenSSL](/OpenSSL)——openssl的一些例子；
+23. [MonitorDir_EFSW](/MonitorDir_EFSW/main.cc)——使用efsw实现的目录监控的简单例子;
+24. [Mutex](/Mutex/mutex.hpp)——使用std::atomic_flag实现的简单互斥锁和自旋锁；
+25. [OpenSSL](/OpenSSL)——openssl的一些例子；
     1. [aes](/OpenSSL/openssl_aes.cc)——aes加解密的例子；
     2. [base64](/OpenSSL/openssl_base64.cc)——base64编解码的例子；
     3. [hash](/OpenSSL/openssl_hash.cc)——sha256的例子；
@@ -45,10 +46,10 @@
     7. [sm4](/OpenSSL/openssl_sm4.cc)——sm4加解密的例子；
     8. [x509](/OpenSSL/openssl_x509.cc)——x509证书的例子；
     9. [bash](/OpenSSL/openssl_bash.sh)——openssl命令行的例子；
-25. [Server](/Server)——linux server的一些例子；
+26. [Server](/Server)——linux server的一些例子；
     1. [server_epoll](/Server/server_epoll.cc)——epoll的例子；
     2. [server_poll](/Server/server_poll.cc)——poll的例子；
     3. [server_select](/Server/server_select.cc)——select的例子；
-26. [Thread](/Thread/)——基于std::thread实现的线程类，包括线程池；
+27. [Thread](/Thread/)——基于std::thread实现的线程类，包括线程池；
     1. [Thread](/Thread/thread.hpp)——线程类；
     2. [ThreadPool](/Thread/threadpool.hpp)——线程池；
diff --git a/vcpkg.json b/vcpkg.json
@@ -4,11 +4,12 @@
   "version": "0.0.1",
   "description": "manifest",
   "dependencies": [
-    "glog",
     "breakpad",
     "benchmark",
-    "gtest",
     "crashpad",
+    "efsw",
+    "glog",
+    "gtest",
     {
       "name": "openssl",
       "features": [
@@ -27,4 +28,4 @@
     }
   ],
   "builtin-baseline": "b545373a9a536dc559dac8583467a21497a0e897"
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+add_executable(monitor_dir_efsw main.cc)`
	`2`	`+target_link_libraries(monitor_dir_efsw PRIVATE efsw::efsw)`