Fix occasional crash on second and more reload in SMUX plugin

[stg.git] / projects / rscriptd / listener.cpp

diff --git a/projects/rscriptd/listener.cpp b/projects/rscriptd/listener.cpp
index 82dd631855d3272b5890b7c7309a207f9483dc8d..730426744e50508556802c06d7bddcb81be91022 100644 (file)
--- a/projects/rscriptd/listener.cpp
+++ b/projects/rscriptd/listener.cpp
@@ -33,10 +33,10 @@
 #include <sstream>
 #include <algorithm>
 
 #include <sstream>
 #include <algorithm>
 

+#include "stg/scriptexecuter.h"
+#include "stg/locker.h"
+#include "stg/common.h"

 #include "listener.h"
 #include "listener.h"

-#include "script_executer.h"
-#include "stg_locker.h"
-#include "common.h"

 
 void InitEncrypt(BLOWFISH_CTX * ctx, const std::string & password);
 void Decrypt(BLOWFISH_CTX * ctx, char * dst, const char * src, int len8);
 
 void InitEncrypt(BLOWFISH_CTX * ctx, const std::string & password);
 void Decrypt(BLOWFISH_CTX * ctx, char * dst, const char * src, int len8);


@@ -102,14 +102,16 @@ running = false;
 
 printfd(__FILE__, "LISTENER::Stop()\n");
 
 
 printfd(__FILE__, "LISTENER::Stop()\n");
 

-usleep(500000);
+struct timespec ts = {0, 500000000};
+nanosleep(&ts, NULL);

 
 if (!processorStopped)
     {
     //5 seconds to thread stops itself
     for (int i = 0; i < 25 && !processorStopped; i++)
         {
 
 if (!processorStopped)
     {
     //5 seconds to thread stops itself
     for (int i = 0; i < 25 && !processorStopped; i++)
         {

-        usleep(200000);
+        struct timespec ts = {0, 200000000};
+        nanosleep(&ts, NULL);

         }
 
     //after 5 seconds waiting thread still running. now killing it
         }
 
     //after 5 seconds waiting thread still running. now killing it


@@ -130,7 +132,8 @@ if (!receiverStopped)
     //5 seconds to thread stops itself
     for (int i = 0; i < 25 && !receiverStopped; i++)
         {
     //5 seconds to thread stops itself
     for (int i = 0; i < 25 && !receiverStopped; i++)
         {

-        usleep(200000);
+        struct timespec ts = {0, 200000000};
+        nanosleep(&ts, NULL);

         }
 
     //after 5 seconds waiting thread still running. now killing it
         }
 
     //after 5 seconds waiting thread still running. now killing it


@@ -162,6 +165,10 @@ return false;
 //-----------------------------------------------------------------------------
 void * LISTENER::Run(void * d)
 {
 //-----------------------------------------------------------------------------
 void * LISTENER::Run(void * d)
 {

+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+

 LISTENER * listener = static_cast<LISTENER *>(d);
 
 listener->Runner();
 LISTENER * listener = static_cast<LISTENER *>(d);
 
 listener->Runner();


@@ -183,6 +190,10 @@ receiverStopped = true;
 //-----------------------------------------------------------------------------
 void * LISTENER::RunProcessor(void * d)
 {
 //-----------------------------------------------------------------------------
 void * LISTENER::RunProcessor(void * d)
 {

+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+

 LISTENER * listener = static_cast<LISTENER *>(d);
 
 listener->ProcessorRunner();
 LISTENER * listener = static_cast<LISTENER *>(d);
 
 listener->ProcessorRunner();


@@ -196,7 +207,8 @@ processorStopped = false;
 
 while (running)
     {
 
 while (running)
     {

-    usleep(500000);
+    struct timespec ts = {0, 500000000};
+    nanosleep(&ts, NULL);

     if (!pending.empty())
         ProcessPending();
     ProcessTimeouts();
     if (!pending.empty())
         ProcessPending();
     ProcessTimeouts();


@@ -331,16 +343,10 @@ return false;
 //-----------------------------------------------------------------------------
 void LISTENER::ProcessPending()
 {
 //-----------------------------------------------------------------------------
 void LISTENER::ProcessPending()
 {

-std::list<PendingData> localPending;
-
-    {
-    STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-    printfd(__FILE__, "Pending data size: %d\n", pending.size());
-    localPending.swap(pending);
-    }
-
-std::list<PendingData>::iterator it(localPending.begin());
-while (it != localPending.end())
+std::list<PendingData>::iterator it(pending.begin());
+size_t count = 0;
+printfd(__FILE__, "Pending: %d\n", pending.size());
+while (it != pending.end() && count < 256)

     {
     std::vector<AliveData>::iterator uit(
             std::lower_bound(
     {
     std::vector<AliveData>::iterator uit(
             std::lower_bound(


@@ -381,7 +387,10 @@ while (it != localPending.end())
             }
         }
     ++it;
             }
         }
     ++it;

+    ++count;

     }
     }

+STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+pending.erase(pending.begin(), it);

 }
 //-----------------------------------------------------------------------------
 void LISTENER::ProcessTimeouts()
 }
 //-----------------------------------------------------------------------------
 void LISTENER::ProcessTimeouts()


@@ -413,7 +422,7 @@ bool LISTENER::Connect(const UserData & data) const
 printfd(__FILE__, "Connect %s\n", data.login.c_str());
 if (access(scriptOnConnect.c_str(), X_OK) == 0)
     {
 printfd(__FILE__, "Connect %s\n", data.login.c_str());
 if (access(scriptOnConnect.c_str(), X_OK) == 0)
     {

-    if (ScriptExec(scriptOnConnect + " " + data.params))
+    if (ScriptExec((scriptOnConnect + " " + data.params).c_str()))

         {
         WriteServLog("Script %s cannot be executed for an unknown reason.", scriptOnConnect.c_str());
         return true;
         {
         WriteServLog("Script %s cannot be executed for an unknown reason.", scriptOnConnect.c_str());
         return true;


@@ -432,7 +441,7 @@ bool LISTENER::Disconnect(const UserData & data) const
 printfd(__FILE__, "Disconnect %s\n", data.login.c_str());
 if (access(scriptOnDisconnect.c_str(), X_OK) == 0)
     {
 printfd(__FILE__, "Disconnect %s\n", data.login.c_str());
 if (access(scriptOnDisconnect.c_str(), X_OK) == 0)
     {

-    if (ScriptExec(scriptOnDisconnect + " " + data.params))
+    if (ScriptExec((scriptOnDisconnect + " " + data.params).c_str()))

         {
         WriteServLog("Script %s cannot be executed for an unknown reson.", scriptOnDisconnect.c_str());
         return true;
         {
         WriteServLog("Script %s cannot be executed for an unknown reson.", scriptOnDisconnect.c_str());
         return true;


@@ -459,34 +468,6 @@ if (strncmp((char *)header.protoVer, "02", RS_PROTO_VER_LEN))
 return false;
 }
 //-----------------------------------------------------------------------------
 return false;
 }
 //-----------------------------------------------------------------------------

-bool LISTENER::WaitPackets(int sd) const
-{
-fd_set rfds;
-FD_ZERO(&rfds);
-FD_SET(sd, &rfds);
-
-struct timeval tv;
-tv.tv_sec = 0;
-tv.tv_usec = 500000;
-
-int res = select(sd + 1, &rfds, NULL, NULL, &tv);
-if (res == -1) // Error
-    {
-    if (errno != EINTR)
-        {
-        printfd(__FILE__, "Error on select: '%s'\n", strerror(errno));
-        }
-    return false;
-    }
-
-if (res == 0) // Timeout
-    {
-    return false;
-    }
-
-return true;
-}
-//-----------------------------------------------------------------------------

 inline
 void InitEncrypt(BLOWFISH_CTX * ctx, const std::string & password)
 {
 inline
 void InitEncrypt(BLOWFISH_CTX * ctx, const std::string & password)
 {