1
0
Fork 0
This commit is contained in:
Jan Steemann 2016-04-22 15:51:03 +02:00
parent 943611143b
commit 38e543e0a8
11 changed files with 15 additions and 11 deletions

View File

@ -41,7 +41,7 @@ class Agent : public arangodb::Thread {
public:
/// @brief Construct with program options
Agent(config_t const&);
explicit Agent(config_t const&);
/// @brief Clean up
~Agent();

View File

@ -70,6 +70,8 @@ void Constituent::configure(Agent* agent) {
// Default ctor
Constituent::Constituent()
: Thread("Constituent"),
_vocbase(nullptr),
_queryRegistry(nullptr),
_term(0),
_leaderID((std::numeric_limits<uint32_t>::max)()),
_id(0),

View File

@ -35,7 +35,7 @@ class NotifyCallback : public arangodb::ClusterCommCallback {
public:
NotifyCallback(std::function<void(bool)>);
explicit NotifyCallback(std::function<void(bool)>);
virtual bool operator()(arangodb::ClusterCommResult*) override final;

View File

@ -38,7 +38,7 @@ class Dispatcher;
class RestShardHandler : public RestBaseHandler {
public:
RestShardHandler(HttpRequest* request);
explicit RestShardHandler(HttpRequest* request);
public:
bool isDirect() const override;

View File

@ -39,7 +39,7 @@ class ServerJob : public arangodb::rest::Job {
ServerJob& operator=(ServerJob const&) = delete;
public:
ServerJob(HeartbeatThread* heartbeat);
explicit ServerJob(HeartbeatThread* heartbeat);
~ServerJob();
public:

View File

@ -35,7 +35,7 @@ namespace arangodb {
class RestQueryHandler : public RestVocbaseBaseHandler {
public:
RestQueryHandler(HttpRequest*);
explicit RestQueryHandler(HttpRequest*);
public:
bool isDirect() const override;

View File

@ -37,7 +37,7 @@ namespace arangodb {
class RestShutdownHandler : public RestBaseHandler {
public:
RestShutdownHandler(HttpRequest*);
explicit RestShutdownHandler(HttpRequest*);
public:
bool isDirect() const override;

View File

@ -36,6 +36,7 @@ AffinityFeature::AffinityFeature(
application_features::ApplicationServer* server)
: ApplicationFeature(server, "Affinity"),
_threadAffinity(0),
_n(0),
_nd(0),
_ns(0) {
startsAfter("Logger");

View File

@ -28,6 +28,7 @@
#include <stdio.h>
#endif
#include "ApplicationFeatures/ApplicationServer.h"
#include "Logger/LogAppender.h"
#include "ProgramOptions/ProgramOptions.h"
#include "ProgramOptions/Section.h"
@ -67,9 +68,8 @@ void SchedulerFeature::collectOptions(
"number of threads for I/O scheduler",
new UInt64Parameter(&_nrSchedulerThreads));
std::unordered_set<uint64_t> backends = {0, 1, 2, 3, 4};
#ifndef _WIN32
std::unordered_set<uint64_t> backends = {0, 1, 2, 3, 4};
options->addHiddenOption(
"--scheduler.backend", "1: select, 2: poll, 4: epoll",
new DiscreteValuesParameter<UInt64Parameter>(&_backend, backends));
@ -209,8 +209,8 @@ bool CtrlHandler(DWORD eventType) {
if (!seen) {
LOG(INFO) << "" << shutdownMessage << ", beginning shut down sequence";
if (SchedulerFeature::SCHEDULER != nullptr) {
SchedulerFeature::SCHEDULER->server()->beginShutdown();
if (application_features::ApplicationServer::server != nullptr) {
application_features::ApplicationServer::server->beginShutdown();
}
seen = true;

View File

@ -2130,6 +2130,7 @@ TRI_vocbase_operationmode_e TRI_GetOperationModeServer() { return Mode; }
TRI_server_t::TRI_server_t()
: _databasesLists(new DatabasesLists()),
_databaseManagerStarted(false),
_indexPool(nullptr),
_queryRegistry(nullptr),
_basePath(nullptr),
@ -2137,6 +2138,7 @@ TRI_server_t::TRI_server_t()
_lockFilename(nullptr),
_serverIdFilename(nullptr),
_disableReplicationAppliers(false),
_disableCompactor(false),
_iterateMarkersOnOpen(false),
_hasCreatedSystemDatabase(false),
_initialized(false) {}

View File

@ -53,7 +53,6 @@ Endpoint::Endpoint(DomainType domainType, EndpointType type,
std::string Endpoint::uriForm (std::string const& endpoint) {
static std::string illegal;
std::string unified = unifiedForm(endpoint);
if (StringUtils::isPrefix(endpoint, "http+tcp://")) {
return "http://" + endpoint.substr(11);