При роботі з повідомленнями прибрано зайві блокування і перевірки

[stg.git] / projects / stargazer / user.cpp

diff --git a/projects/stargazer/user.cpp b/projects/stargazer/user.cpp
index 50046fa5ce686ff1c4863de76a679671a66adb38..b68c632ab91fd3b93491bb6c5e404cd71919a104 100644 (file)
--- a/projects/stargazer/user.cpp
+++ b/projects/stargazer/user.cpp
@@ -1153,7 +1153,19 @@ int USER::AddMessage(STG_MSG * msg)
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 

-if (SendMessage(*msg) == 0)
+if (SendMessage(*msg))
+    {
+    if (store->AddMessage(msg, login))
+        {
+        errorStr = store->GetStrError();
+        STG_LOGGER & WriteServLog = GetStgLogger();
+        WriteServLog("Error adding message %s", errorStr.c_str());
+        WriteServLog("%s", store->GetStrError().c_str());
+        return -1;
+        }
+    messages.push_back(*msg);
+    }
+else

     {
     if (msg->header.repeat > 0)
         {
     {
     if (msg->header.repeat > 0)
         {


@@ -1175,46 +1187,26 @@ if (SendMessage(*msg) == 0)
         messages.push_back(*msg);
         }
     }
         messages.push_back(*msg);
         }
     }

-else
-    {
-    if (store->AddMessage(msg, login))
-        {
-        errorStr = store->GetStrError();
-        STG_LOGGER & WriteServLog = GetStgLogger();
-        WriteServLog("Error adding message %s", errorStr.c_str());
-        WriteServLog("%s", store->GetStrError().c_str());
-        return -1;
-        }
-    messages.push_back(*msg);
-    }

 return 0;
 }
 //-----------------------------------------------------------------------------
 int USER::SendMessage(const STG_MSG & msg)
 {
 return 0;
 }
 //-----------------------------------------------------------------------------
 int USER::SendMessage(const STG_MSG & msg)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-
-if (authorizedBy.empty())
-    {
-    return -1;
-    }
-
+// No lock `cause we are already locked from caller

 int ret = -1;
 int ret = -1;

-set<const BASE_AUTH*>::iterator it;
-
-it = authorizedBy.begin();
+set<const BASE_AUTH*>::iterator it(authorizedBy.begin());

 while (it != authorizedBy.end())
     {
 while (it != authorizedBy.end())
     {

-    if ((*it)->SendMessage(msg, currIP) == 0)
+    if (!(*it++)->SendMessage(msg, currIP))

         ret = 0;
         ret = 0;

-    ++it;

     }
 return ret;
 }
 //-----------------------------------------------------------------------------
 int USER::ScanMessage()
 {
     }
 return ret;
 }
 //-----------------------------------------------------------------------------
 int USER::ScanMessage()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+// No lock `cause we are already locked from caller
+// We need not check for the authorizedBy `cause it has already checked by caller

 
 /*vector<STG_MSG_HDR> hdrsList;
 
 
 /*vector<STG_MSG_HDR> hdrsList;
 


@@ -1268,7 +1260,7 @@ while (it != messages.end())
     {
     if (SendMessage(*it))
         {
     {
     if (SendMessage(*it))
         {

-        break;
+        return -1;

         }
     it->header.repeat--;
     if (it->header.repeat < 0)
         }
     it->header.repeat--;
     if (it->header.repeat < 0)