tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sptr to uptr in worker/server

Browse Source 
Reviewers: buda, mferencevic

Reviewed By: mferencevic

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D543
This commit is contained in:
Mislav Bradac 2017-07-12 13:16:17 +02:00
parent d35b27bf66
commit aac5205802
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/communication/server.hpp
View File

@ -61,7 +61,7 @@ class Server
workers_.reserve(n);
for (size_t i = 0; i < n; ++i) {
workers_.push_back(
std::make_shared<Worker<Session, OutputStream, Socket>>(
std::make_unique<Worker<Session, OutputStream, Socket>>(
dbms_, query_engine_));
workers_.back()->Start(alive_);
}
@ -91,7 +91,7 @@ class Server
if (UNLIKELY(!workers_[idx_]->Accept(socket_))) return;
idx_ = idx_ == (int)workers_.size() - 1 ? 0 : idx_ + 1;
idx_ = idx_ == static_cast<int>(workers_.size()) - 1 ? 0 : idx_ + 1;
}
void OnWaitTimeout() {}
@ -103,7 +103,7 @@ class Server
}
template <class... Args>
void OnExceptionEvent(Event &event, Args &&... args) {
void OnExceptionEvent(Event &, Args &&...) {
// TODO: Do something about it
DLOG(WARNING) << "epoll exception";
}
@ -113,7 +113,7 @@ class Server
void OnErrorEvent(Event &event) { close(event.data.fd); }
private:
std::vector<typename Worker<Session, OutputStream, Socket>::sptr> workers_;
std::vector<typename Worker<Session, OutputStream, Socket>::uptr> workers_;
std::atomic<bool> alive_{true};
int idx_{0};

4
src/communication/worker.hpp
View File

@ -42,7 +42,7 @@ class Worker
using StreamBuffer = io::network::StreamBuffer;
public:
using sptr = std::shared_ptr<Worker<Session, OutputStream, Socket>>;
using uptr = std::unique_ptr<Worker<Session, OutputStream, Socket>>;
Worker(Dbms &dbms, QueryEngine<OutputStream> &query_engine)
: dbms_(dbms), query_engine_(query_engine) {}
@ -86,7 +86,7 @@ class Worker
}
template <class... Args>
void OnException(Session &session, Args &&... args) {
void OnException(Session &, Args &&...) {
LOG(ERROR) << "Error occured in this session";
// TODO: Do something about it

2
src/memgraph_bolt.cpp
View File

@ -62,7 +62,7 @@ void load_config(int &argc, char **&argv) {
char **custom_argv = new char *[custom_argc];
custom_argv[0] = strdup(std::string("memgraph").c_str());
for (int i = 0; i < (int)flagfile_arguments.size(); ++i) {
for (int i = 0; i < static_cast<int>(flagfile_arguments.size()); ++i) {
custom_argv[i + 1] = strdup(flagfile_arguments[i].c_str());
}