More std::jthread stuff.

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

diff --git a/projects/stargazer/corps_impl.cpp b/projects/stargazer/corps_impl.cpp
index 098acacac1b9f7ec6761d19751b1431b321e3c6d..b41b4559e66aef6386a3234577fe6e230751f2d0 100644 (file)
--- a/projects/stargazer/corps_impl.cpp
+++ b/projects/stargazer/corps_impl.cpp
@@ -21,35 +21,32 @@
 #include "corps_impl.h"
 
 #include "stg/admin.h"
 #include "corps_impl.h"
 
 #include "stg/admin.h"

+#include "stg/admin_conf.h"
+#include "stg/store.h"

 #include "stg/common.h"
 
 #include "stg/common.h"
 

-#include <cerrno>
-#include <cassert>

 #include <algorithm>
 #include <algorithm>

+#include <cassert>
+
+using STG::CorporationsImpl;

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-CORPORATIONS_IMPL::CORPORATIONS_IMPL(STORE * st)
-    : CORPORATIONS(),
-      data(),
-      store(st),
-      WriteServLog(GetStgLogger()),
-      searchDescriptors(),
-      handle(0),
-      mutex(),
-      strError()
+CorporationsImpl::CorporationsImpl(Store * st)
+    : store(st),
+      WriteServLog(Logger::get()),
+      handle(0)

 {
 {

-pthread_mutex_init(&mutex, NULL);

 Read();
 }
 //-----------------------------------------------------------------------------
 Read();
 }
 //-----------------------------------------------------------------------------

-int CORPORATIONS_IMPL::Add(const CORP_CONF & corp, const ADMIN * admin)
+int CorporationsImpl::Add(const CorpConf & corp, const Admin * admin)

 {
 {

-STG_LOCKER lock(&mutex);
-const PRIV * priv = admin->GetPriv();
+std::lock_guard<std::mutex> lock(mutex);
+const auto& priv = admin->priv();

 
 

-if (!priv->corpChg)
+if (!priv.corpChg)

     {
     {

-    std::string s = admin->GetLogStr() + " Add corporation \'" + corp.name + "\'. Access denied.";
+    std::string s = admin->logStr() + " Add corporation \'" + corp.name + "\'. Access denied.";

     strError = "Access denied.";
     WriteServLog(s.c_str());
     return -1;
     strError = "Access denied.";
     WriteServLog(s.c_str());
     return -1;


@@ -60,7 +57,7 @@ crp_iter si(find(data.begin(), data.end(), corp));
 if (si != data.end())
     {
     strError = "Corporation \'" + corp.name + "\' cannot not be added. Corporation already exist.";
 if (si != data.end())
     {
     strError = "Corporation \'" + corp.name + "\' cannot not be added. Corporation already exist.";

-    WriteServLog("%s %s", admin->GetLogStr().c_str(), strError.c_str());
+    WriteServLog("%s %s", admin->logStr().c_str(), strError.c_str());

 
     return -1;
     }
 
     return -1;
     }


@@ -70,35 +67,35 @@ data.push_back(corp);
 if (store->AddCorp(corp.name) == 0)
     {
     WriteServLog("%s Corporation \'%s\' added.",
 if (store->AddCorp(corp.name) == 0)
     {
     WriteServLog("%s Corporation \'%s\' added.",

-                 admin->GetLogStr().c_str(), corp.name.c_str());
+                 admin->logStr().c_str(), corp.name.c_str());

     return 0;
     }
 
 strError = "Corporation \'" + corp.name + "\' was not added. Error: " + store->GetStrError();
     return 0;
     }
 
 strError = "Corporation \'" + corp.name + "\' was not added. Error: " + store->GetStrError();

-WriteServLog("%s %s", admin->GetLogStr().c_str(), strError.c_str());
+WriteServLog("%s %s", admin->logStr().c_str(), strError.c_str());

 
 return -1;
 }
 //-----------------------------------------------------------------------------
 
 return -1;
 }
 //-----------------------------------------------------------------------------

-int CORPORATIONS_IMPL::Del(const std::string & name, const ADMIN * admin)
+int CorporationsImpl::Del(const std::string & name, const Admin * admin)

 {
 {

-STG_LOCKER lock(&mutex);
-const PRIV * priv = admin->GetPriv();
+std::lock_guard<std::mutex> lock(mutex);
+const auto& priv = admin->priv();

 
 

-if (!priv->corpChg)
+if (!priv.corpChg)

     {
     {

-    std::string s = admin->GetLogStr() + " Delete corporation \'" + name + "\'. Access denied.";
+    std::string s = admin->logStr() + " Delete corporation \'" + name + "\'. Access denied.";

     strError = "Access denied.";
     WriteServLog(s.c_str());
     return -1;
     }
 
     strError = "Access denied.";
     WriteServLog(s.c_str());
     return -1;
     }
 

-crp_iter si(find(data.begin(), data.end(), CORP_CONF(name)));
+crp_iter si(find(data.begin(), data.end(), CorpConf(name)));

 
 if (si == data.end())
     {
     strError = "Corporation \'" + name + "\' cannot be deleted. Corporation does not exist.";
 
 if (si == data.end())
     {
     strError = "Corporation \'" + name + "\' cannot be deleted. Corporation does not exist.";

-    WriteServLog("%s %s", admin->GetLogStr().c_str(), strError.c_str());
+    WriteServLog("%s %s", admin->logStr().c_str(), strError.c_str());

     return -1;
     }
 
     return -1;
     }
 


@@ -111,27 +108,27 @@ while (csi != searchDescriptors.end())
     ++csi;
     }
 
     ++csi;
     }
 

-data.remove(*si);
+data.erase(si);

 if (store->DelCorp(name) < 0)
     {
     strError = "Corporation \'" + name + "\' was not deleted. Error: " + store->GetStrError();
 if (store->DelCorp(name) < 0)
     {
     strError = "Corporation \'" + name + "\' was not deleted. Error: " + store->GetStrError();

-    WriteServLog("%s %s", admin->GetLogStr().c_str(), strError.c_str());
+    WriteServLog("%s %s", admin->logStr().c_str(), strError.c_str());

 
     return -1;
     }
 
 
     return -1;
     }
 

-WriteServLog("%s Corporation \'%s\' deleted.", admin->GetLogStr().c_str(), name.c_str());
+WriteServLog("%s Corporation \'%s\' deleted.", admin->logStr().c_str(), name.c_str());

 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-int CORPORATIONS_IMPL::Change(const CORP_CONF & corp, const ADMIN * admin)
+int CorporationsImpl::Change(const CorpConf & corp, const Admin * admin)

 {
 {

-STG_LOCKER lock(&mutex);
-const PRIV * priv = admin->GetPriv();
+std::lock_guard<std::mutex> lock(mutex);
+const auto& priv = admin->priv();

 
 

-if (!priv->corpChg)
+if (!priv.corpChg)

     {
     {

-    std::string s = admin->GetLogStr() + " Change corporation \'" + corp.name + "\'. Access denied.";
+    std::string s = admin->logStr() + " Change corporation \'" + corp.name + "\'. Access denied.";

     strError = "Access denied.";
     WriteServLog(s.c_str());
     return -1;
     strError = "Access denied.";
     WriteServLog(s.c_str());
     return -1;


@@ -142,7 +139,7 @@ crp_iter si(find(data.begin(), data.end(), corp));
 if (si == data.end())
     {
     strError = "Corporation \'" + corp.name + "\' cannot be changed " + ". Corporation does not exist.";
 if (si == data.end())
     {
     strError = "Corporation \'" + corp.name + "\' cannot be changed " + ". Corporation does not exist.";

-    WriteServLog("%s %s", admin->GetLogStr().c_str(), strError.c_str());
+    WriteServLog("%s %s", admin->logStr().c_str(), strError.c_str());

     return -1;
     }
 
     return -1;
     }
 


@@ -155,14 +152,14 @@ if (store->SaveCorp(corp))
     }
 
 WriteServLog("%s Corporation \'%s\' changed.",
     }
 
 WriteServLog("%s Corporation \'%s\' changed.",

-             admin->GetLogStr().c_str(), corp.name.c_str());
+             admin->logStr().c_str(), corp.name.c_str());

 
 return 0;
 }
 //-----------------------------------------------------------------------------
 
 return 0;
 }
 //-----------------------------------------------------------------------------

-bool CORPORATIONS_IMPL::Read()
+bool CorporationsImpl::Read()

 {
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(mutex);

 std::vector<std::string> corpsList;
 if (store->GetCorpsList(&corpsList) < 0)
     {
 std::vector<std::string> corpsList;
 if (store->GetCorpsList(&corpsList) < 0)
     {


@@ -172,7 +169,7 @@ if (store->GetCorpsList(&corpsList) < 0)
 
 for (size_t i = 0; i < corpsList.size(); i++)
     {
 
 for (size_t i = 0; i < corpsList.size(); i++)
     {

-    CORP_CONF corp;
+    CorpConf corp;

 
     if (store->RestoreCorp(&corp, corpsList[i]))
         {
 
     if (store->RestoreCorp(&corp, corpsList[i]))
         {


@@ -185,15 +182,15 @@ for (size_t i = 0; i < corpsList.size(); i++)
 return false;
 }
 //-----------------------------------------------------------------------------
 return false;
 }
 //-----------------------------------------------------------------------------

-bool CORPORATIONS_IMPL::Find(const std::string & name, CORP_CONF * corp)
+bool CorporationsImpl::Find(const std::string & name, CorpConf * corp)

 {
 assert(corp != NULL && "Pointer to corporation is not null");
 
 {
 assert(corp != NULL && "Pointer to corporation is not null");
 

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(mutex);

 if (data.empty())
     return false;
 
 if (data.empty())
     return false;
 

-crp_iter si(find(data.begin(), data.end(), CORP_CONF(name)));
+crp_iter si(find(data.begin(), data.end(), CorpConf(name)));

 
 if (si != data.end())
     {
 
 if (si != data.end())
     {


@@ -204,16 +201,16 @@ if (si != data.end())
 return true;
 }
 //-----------------------------------------------------------------------------
 return true;
 }
 //-----------------------------------------------------------------------------

-bool CORPORATIONS_IMPL::Exists(const std::string & name) const
+bool CorporationsImpl::Exists(const std::string & name) const

 {
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(mutex);

 if (data.empty())
     {
 if (data.empty())
     {

-    printfd(__FILE__, "no admin in system!\n");
+    printfd(__FILE__, "no corporations in system!\n");

     return true;
     }
 
     return true;
     }
 

-const_crp_iter si(find(data.begin(), data.end(), CORP_CONF(name)));
+const_crp_iter si(find(data.begin(), data.end(), CorpConf(name)));

 
 if (si != data.end())
     return true;
 
 if (si != data.end())
     return true;


@@ -221,17 +218,17 @@ if (si != data.end())
 return false;
 }
 //-----------------------------------------------------------------------------
 return false;
 }
 //-----------------------------------------------------------------------------

-int CORPORATIONS_IMPL::OpenSearch() const
+int CorporationsImpl::OpenSearch() const

 {
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(mutex);

 handle++;
 searchDescriptors[handle] = data.begin();
 return handle;
 }
 //-----------------------------------------------------------------------------
 handle++;
 searchDescriptors[handle] = data.begin();
 return handle;
 }
 //-----------------------------------------------------------------------------

-int CORPORATIONS_IMPL::SearchNext(int h, CORP_CONF * corp) const
+int CorporationsImpl::SearchNext(int h, CorpConf * corp) const

 {
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(mutex);

 if (searchDescriptors.find(h) == searchDescriptors.end())
     {
     WriteServLog("CORPORATIONS. Incorrect search handle.");
 if (searchDescriptors.find(h) == searchDescriptors.end())
     {
     WriteServLog("CORPORATIONS. Incorrect search handle.");


@@ -246,9 +243,9 @@ if (searchDescriptors[h] == data.end())
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-int CORPORATIONS_IMPL::CloseSearch(int h) const
+int CorporationsImpl::CloseSearch(int h) const

 {
 {

-STG_LOCKER lock(&mutex);
+std::lock_guard<std::mutex> lock(mutex);

 if (searchDescriptors.find(h) != searchDescriptors.end())
     {
     searchDescriptors.erase(searchDescriptors.find(h));
 if (searchDescriptors.find(h) != searchDescriptors.end())
     {
     searchDescriptors.erase(searchDescriptors.find(h));