database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

[MCOL-5109] Make a singleton from ServicePrimProc.

Browse Source 
This patch makes a singleton from ServicePrimProc.
This commit is contained in:
Denis Khalikov
2022-06-01 19:54:21 +03:00
parent 94ca6fdd34
commit 467fe0b401
13 changed files with 206 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
primitives/primproc/primproc.cpp
View File

@ -76,57 +76,6 @@ using namespace idbdatafile;
#include "service.h"
#include "serviceexemgr.h"
class Opt
{
public:
int m_debug;
bool m_fg;
Opt(int argc, char* argv[]) : m_debug(0), m_fg(false)
{
int c;
while ((c = getopt(argc, argv, "df")) != EOF)
{
switch (c)
{
case 'd': m_debug++; break;
case 'f': m_fg = true; break;
case '?':
default: break;
}
}
}
};
class ServicePrimProc : public Service, public Opt
{
public:
ServicePrimProc(const Opt& opt) : Service("PrimProc"), Opt(opt)
{
}
void LogErrno() override
{
cerr << strerror(errno) << endl;
}
void ParentLogChildMessage(const std::string& str) override
{
cout << str << endl;
}
int Child() override;
int Run()
{
return m_fg ? Child() : RunForking();
}
std::atomic_flag& getStartupRaceFlag()
{
return startupRaceFlag_;
}
private:
// Since C++20 flag's init value is false.
std::atomic_flag startupRaceFlag_{false};
};
namespace primitiveprocessor
{
extern uint32_t BPPCount;
@ -335,6 +284,15 @@ void* waitForSIGUSR1(void* p)
} // namespace
ServicePrimProc* ServicePrimProc::fInstance = nullptr;
ServicePrimProc* ServicePrimProc::instance()
{
if (!fInstance)
fInstance = new ServicePrimProc();
return fInstance;
}
int ServicePrimProc::Child()
{
Config* cf = Config::makeConfig();
@ -764,6 +722,9 @@ int ServicePrimProc::Child()
}
#endif
primServerThreadPool = server.getProcessorThreadPool();
OOBThreadPool = server.getOOBThreadPool();
server.start(this, startupRaceLock);
cerr << "server.start() exited!" << endl;
@ -783,5 +744,6 @@ int main(int argc, char** argv)
// Initialize the charset library
MY_INIT(argv[0]);
return ServicePrimProc(opt).Run();
ServicePrimProc::instance()->setOpt(opt);
return ServicePrimProc::instance()->Run();
}