More std::jthread stuff.

[stg.git] / libs / pinger / include / stg / pinger.h

diff --git a/libs/pinger/include/stg/pinger.h b/libs/pinger/include/stg/pinger.h
index 26f5f4b382a38febac600ec589ff5fbd290bab57..d3b7a99c9a20522798934ba6a6f7cc231ae67085 100644 (file)
--- a/libs/pinger/include/stg/pinger.h
+++ b/libs/pinger/include/stg/pinger.h
@@ -4,13 +4,17 @@
  $Author: nobunaga $
  */
 
-#ifndef PINGER_H
-#define PINGER_H
+#pragma once
 
-#include <ctime>
 #include <string>
-#include <list>
 #include <map>
+#include <mutex>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#include <jthread.hpp>
+#pragma GCC diagnostic pop
+#include <ctime>
+#include <cstdint>
 
 #ifdef LINUX
 #include <sys/types.h>
@@ -27,26 +31,24 @@
 #include <arpa/inet.h>
 #endif
 
-#include <cstdint>
-
 //-----------------------------------------------------------------------------
 struct ICMP_HDR
 {
-uint8_t       type;
-uint8_t       code;
-uint16_t      checksum;
-union
+    uint8_t       type;
+    uint8_t       code;
+    uint16_t      checksum;
+    union
     {
-    struct
+        struct
         {
-        uint16_t    id;
-        uint16_t    sequence;
+            uint16_t    id;
+            uint16_t    sequence;
         } echo;
-    uint32_t  gateway;
-    struct
+        uint32_t  gateway;
+        struct
         {
-        uint16_t    unused;
-        uint16_t    mtu;
+            uint16_t    unused;
+            uint16_t    mtu;
         } frag;
     } un;
 };
@@ -68,8 +70,8 @@ struct IP_HDR
 //-----------------------------------------------------------------------------
 struct PING_IP_TIME
 {
-uint32_t    ip;
-time_t      pingTime;
+    uint32_t    ip;
+    time_t      pingTime;
 };
 //-----------------------------------------------------------------------------
 
@@ -83,53 +85,44 @@ struct PING_MESSAGE
 //-----------------------------------------------------------------------------
 class STG_PINGER
 {
-public:
-    typedef std::multimap<uint32_t, time_t> PingIPs;
-    typedef PingIPs::size_type SizeType;
-
-            explicit STG_PINGER(time_t delay = 15);
-            ~STG_PINGER();
-
-    int     Start();
-    int     Stop();
-    void    AddIP(uint32_t ip);
-    void    DelIP(uint32_t ip);
-    SizeType GetPingIPNum() const { return pingIP.size(); }
-    void    PrintAllIP();
-    int     GetIPTime(uint32_t ip, time_t * t) const;
-    void    SetDelayTime(time_t d) { delay = d; }
-    time_t  GetDelayTime() const { return delay; }
-    const std::string & GetStrError() const { return errorStr; }
-
-private:
-    uint16_t    PingCheckSum(void * data, int len);
-    int         SendPing(uint32_t ip);
-    uint32_t    RecvPing();
-    void        RealAddIP();
-    void        RealDelIP();
-
-    static void * RunSendPing(void * d);
-    static void * RunRecvPing(void * d);
-
-    time_t      delay;
-    bool        nonstop;
-    bool        isRunningRecver;
-    bool        isRunningSender;
-    int         sendSocket;
-    int         recvSocket;
-    pthread_t   sendThread;
-    pthread_t   recvThread;
-
-    PING_MESSAGE pmSend;
-    uint32_t    pid;
-
-    std::string errorStr;
-
-    std::multimap<uint32_t, time_t> pingIP;
-    std::list<uint32_t>          ipToAdd;
-    std::list<uint32_t>          ipToDel;
-
-    mutable pthread_mutex_t mutex;
+    public:
+        using PingIPs = std::multimap<uint32_t, time_t>;
+
+                explicit STG_PINGER(unsigned delay = 15);
+
+        bool    Start();
+        bool    Stop();
+        void    AddIP(uint32_t ip);
+        void    DelIP(uint32_t ip);
+        auto    GetPingIPNum() const { std::lock_guard lock(m_mutex); return m_pingIPs.size(); }
+        void    PrintAllIP();
+        bool    GetIPTime(uint32_t ip, time_t& t) const;
+        void    SetDelayTime(unsigned d) { m_delay = d; }
+        unsigned GetDelayTime() const { return m_delay; }
+        const std::string& GetStrError() const { return m_errorStr; }
+
+    private:
+        uint16_t    PingCheckSum(const void* data, int len);
+        bool        SendPing(uint32_t ip);
+        uint32_t    RecvPing();
+
+        void RunSendPing(std::stop_token token);
+        void RunRecvPing(std::stop_token token);
+
+        mutable std::mutex m_mutex;
+
+        unsigned    m_delay;
+        bool        m_isRunningRecver;
+        bool        m_isRunningSender;
+        int         m_sendSocket;
+        int         m_recvSocket;
+        std::jthread m_sendThread;
+        std::jthread m_recvThread;
+
+        PING_MESSAGE m_pmSend;
+        uint32_t    m_pid;
+
+        std::string m_errorStr;
+
+        PingIPs m_pingIPs;
 };
-//-----------------------------------------------------------------------------
-#endif