pEp.foundation
/
pEpJSONServerAdapter
10
2
Fork 4
Code Issues 1 Pull Requests Releases 1 Wiki Activity

be more robust and don't crash on shutdown()

JSON-15
Roker 2016-12-13 15:36:22 +01:00
parent 4e08182310
commit cacc637826
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/json-adapter.cc
View File

@ -418,7 +418,6 @@ auto ThreadDeleter = [](std::thread* t)
session_registry.erase( q );
}
t->join();
delete t;
};
@ -632,7 +631,8 @@ JsonAdapter::JsonAdapter(const std::string& address, unsigned start_port, unsign
JsonAdapter::~JsonAdapter()
{
stopSync();
stopSync();
shutdown(nullptr);
delete i;
}
@ -714,7 +714,7 @@ try_next_port:
//event_base_loop(i->eventBase.get(), EVLOOP_NO_EXIT_ON_EMPTY);
// for libevent 2.0:
event_base_loop(i->eventBase.get(), 0);
event_base_loop(i->eventBase.get(), EVLOOP_NONBLOCK);
std::this_thread::sleep_for(std::chrono::milliseconds(333));
Log() << "\r" << ++numnum << ". ";
}
@ -745,7 +745,11 @@ try_next_port:
}
i->threads.push_back(std::move(thread));
}
Log() << "All " << SrvThreadCount << " thread(s) started.\n";
Log() << "All " << SrvThreadCount << " thread(s) started:\n";
for(const auto& t:i->threads)
{
Log() << "\tthread_id()=" << t->get_id() << ".\n";
}
}
catch (std::exception const &e)
{
@ -756,12 +760,21 @@ catch (std::exception const &e)
void JsonAdapter::shutdown(timeval* t)
{
Log() << "JS::shutdown() was called.\n";
i->running = false;
const int ret = event_base_loopexit(i->eventBase.get(), t);
if(ret!=0)
{
throw std::runtime_error("JsonAdapter::shutdown() failed.");
}
Log() << "JS::shutdown(): event_base loop is finished.\n";
Log() << "\t there are " << i->threads.size() << " threads remaining in the threadpool.\n";
for(const auto& t : i->threads)
{
Log() << "\t\tjoin() on id=" << t->get_id() << "....\n";
t->join();
}
i->threads.clear();
}

4
server/json-adapter.hh
View File

@ -14,7 +14,7 @@ public:
// throws std::runtime_error if no port cannot be bound.
JsonAdapter(const std::string& address, unsigned start_port, unsigned end_port, bool chatty);
// calls abort() on the instance if it is still running().
// calls shutdown() on the instance if it is still running().
virtual ~JsonAdapter();
// don't allow copies
@ -32,7 +32,7 @@ public:
void shutdown(struct timeval* tv);
// exit immediately or after the currently processed event has been finished.
void abort();
//void abort();
// returns "true" after run() was called, until shutdown() or abort() is called.
bool running() const;