MXS-2008 Provide single entrypoint for initializing maxbase

Everything of maxbase can now be initialized by a call to

    maxbase_init();

(from a C-program) or

    maxbase::init();

from a C++-program and finalized with calls to either
maxbase_finish() or maxbase::finish(). Creating an instance
maxbase::MaxBase will take care of both operations.
This commit is contained in:
Johan Wikman
2018-08-20 14:29:22 +03:00
parent 88f1795412
commit e852dcacdd
9 changed files with 324 additions and 36 deletions

View File

@ -3,6 +3,7 @@ add_library(maxbase STATIC
eventcount.cc
log.cc
logger.cc
maxbase.cc
messagequeue.cc
semaphore.cc
stopwatch.cc

View File

@ -500,6 +500,11 @@ void mxb_log_finish(void)
this_unit.context_provider = nullptr;
}
bool mxb_log_inited()
{
return this_unit.sLogger && this_unit.sMessage_registry;
}
void mxb_log_set_augmentation(int bits)
{
this_unit.augmentation = bits & MXB_LOG_AUGMENTATION_MASK;

View File

@ -0,0 +1,155 @@
/*
* Copyright (c) 2016 MariaDB Corporation Ab
*
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2022-01-01
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General
* Public License.
*/
#include <maxbase/maxbase.hh>
#include <maxbase/log.hh>
#include <maxbase/messagequeue.hh>
#include <maxbase/worker.hh>
namespace
{
using namespace maxbase;
typedef bool (*init_function_t)();
typedef void (*finish_function_t)();
#define MAXBASE_COMPONENT(X) { &X::init, &X::finish }
struct maxbase_component_t
{
init_function_t init;
finish_function_t finish;
};
const maxbase_component_t maxbase_components[] =
{
MAXBASE_COMPONENT(MessageQueue),
MAXBASE_COMPONENT(Worker),
};
const int N_COMPONENTS = sizeof(maxbase_components)/sizeof(maxbase_components[0]);
}
namespace maxbase
{
MaxBase::MaxBase(const char* zIdent,
const char* zLogdir,
const char* zFilename,
mxb_log_target_t target,
mxb_log_context_provider_t context_provider)
: m_log_inited(false)
{
const char* zMessage = nullptr;
if (maxbase::init())
{
m_log_inited = mxb_log_init(zIdent, zLogdir, zFilename, target, context_provider);
if (!m_log_inited)
{
zMessage =
"The initialization of the MaxScale base library succeeded, but the "
"initialization of the MaxScale log failed.";
}
}
else
{
zMessage = "The initialization of the MaxScale base library failed.";
}
if (zMessage)
{
throw std::runtime_error(zMessage);
}
}
bool init()
{
bool rv = false;
bool log_exists = mxb_log_inited();
bool log_inited_locally = false;
if (!log_exists)
{
// We temporarily initialize a log logging to stdout, so that it is possible
// to log in the initialization functions. This should always succeed.
log_inited_locally = mxb_log_init(MXB_LOG_TARGET_STDOUT);
if (log_inited_locally)
{
log_exists = true;
}
else
{
// Out of luck, just write to stderr.
fprintf(stderr, "MaxScale: Fatal error, could not initialize a temporary log.\n");
}
}
if (log_exists)
{
int i;
for (i = 0; i < N_COMPONENTS; ++i)
{
if (!maxbase_components[i].init())
{
break;
}
}
if (i == N_COMPONENTS)
{
rv = true;
}
else if (i != 0)
{
// We need to finalize in reverse order the components that
// successfully were initialized.
for (int j = i - 1; j >= 0; --j)
{
maxbase_components[j].finish();
}
}
}
if (log_inited_locally)
{
// Finalize the temporary log.
mxb_log_finish();
}
return rv;
}
void finish()
{
for (int i = N_COMPONENTS - 1; i >= 0; --i)
{
maxbase_components[i].finish();
}
}
}
bool maxbase_init()
{
return maxbase::init();
}
void maxbase_finish()
{
return maxbase::finish();
}

View File

@ -13,7 +13,7 @@
#include <iostream>
#include <maxbase/assert.h>
#include <maxbase/log.hh>
#include <maxbase/maxbase.hh>
#include <maxbase/worker.hh>
using namespace maxbase;
@ -123,10 +123,7 @@ int run()
int main()
{
mxb::Log log(MXB_LOG_TARGET_STDOUT);
maxbase::MessageQueue::init();
maxbase::Worker::init();
mxb::MaxBase mxb(MXB_LOG_TARGET_STDOUT);
return run();
}