More jthreads.

[stg.git] / projects / stargazer / plugins / capture / ether_linux / ether_cap.h

diff --git a/projects/stargazer/plugins/capture/ether_linux/ether_cap.h b/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
index 5bb938feb507a5f10b540cd7aa8355c1d8e0dc6d..d50923d6572be158c1c713c076338cef04b11f64 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
+++ b/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
@@ -23,36 +23,39 @@
 * Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
 */
 
-#ifndef ETHER_CAP_H
-#define ETHER_CAP_H
-
-#include <pthread.h>
-
-#include <string>
+#pragma once
 
 #include "stg/plugin.h"
 #include "stg/module_settings.h"
 #include "stg/logger.h"
 
-class USERS;
-class TARIFFS;
-class ADMINS;
-class TRAFFCOUNTER;
-class SETTINGS;
+#include <string>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#include <jthread.hpp>
+#pragma GCC diagnostic pop
+
+namespace STG
+{
+
+struct Users;
+struct Tariffs;
+struct Admins;
+struct TraffCounter;
+struct Settings;
 
-class TRAFFCOUNTER;
+}
 
 //-----------------------------------------------------------------------------
-class ETHER_CAP : public PLUGIN {
+class ETHER_CAP : public STG::Plugin {
 public:
     ETHER_CAP();
-    virtual ~ETHER_CAP() {}
 
-    void                SetTraffcounter(TRAFFCOUNTER * tc) { traffCnt = tc; }
+    void                SetTraffcounter(STG::TraffCounter * tc) { traffCnt = tc; }
 
     int                 Start();
     int                 Stop();
-    int                 Reload(const MODULE_SETTINGS & /*ms*/) { return 0; }
+    int                 Reload(const STG::ModuleSettings & /*ms*/) { return 0; }
     bool                IsRunning() { return isRunning; }
 
     int                 ParseSettings() { return 0; }
@@ -65,22 +68,18 @@ private:
     ETHER_CAP(const ETHER_CAP & rvalue);
     ETHER_CAP & operator=(const ETHER_CAP & rvalue);
 
-    static void *       Run(void *);
+    void                Run(std::stop_token token);
     int                 EthCapOpen();
     int                 EthCapClose();
     int                 EthCapRead(void * buffer, int blen, char ** iface);
 
     mutable std::string errorStr;
 
-    pthread_t           thread;
-    bool                nonstop;
+    std::jthread        m_thread;
     bool                isRunning;
     int                 capSock;
 
-    TRAFFCOUNTER *      traffCnt;
+    STG::TraffCounter *      traffCnt;
 
-    PLUGIN_LOGGER       logger;
+    STG::PluginLogger       logger;
 };
-//-----------------------------------------------------------------------------
-
-#endif