Adding in boost::asio support
main starts a thread that keep a global io_service object running and makes sure it is stopped when everything else is stopped.
This commit is contained in:
parent
a6755c20f2
commit
4beea05ba6
7 changed files with 50 additions and 9 deletions
|
|
@ -4,12 +4,13 @@
|
|||
# include <winsock2.h>
|
||||
#endif
|
||||
#include <memory>
|
||||
#include "GlobalIoService.h"
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
|
||||
/* Use the MAKEWORD(lowbyte, highbyte) macro declared in Windef.h */
|
||||
#ifdef _WIN32
|
||||
#ifdef WIN32
|
||||
WORD wVersionRequested = MAKEWORD(2, 2);
|
||||
WSADATA wsaData;
|
||||
int err = WSAStartup(wVersionRequested, &wsaData);
|
||||
|
|
@ -20,16 +21,27 @@ int main(int argc, char *argv[])
|
|||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
QApplication a(argc, argv);
|
||||
|
||||
QCoreApplication::setOrganizationName("pglab");
|
||||
QCoreApplication::setOrganizationDomain("eelkeklein.nl");
|
||||
QCoreApplication::setApplicationName("pglab");
|
||||
|
||||
auto master_controller = std::make_unique<MasterController>();
|
||||
master_controller->init();
|
||||
int result = a.exec();
|
||||
#ifdef _WIN32
|
||||
std::thread asio_service_thread;
|
||||
int result = -1;
|
||||
{
|
||||
auto ios = getGlobalAsioIoService();
|
||||
boost::asio::io_service::work work(*ios); // Prevent service from running out of work so run doesn't return
|
||||
asio_service_thread = std::thread([ios](){ ios->run(); });
|
||||
|
||||
// make sure the io_service is stopped before we wait on the future
|
||||
auto master_controller = std::make_unique<MasterController>();
|
||||
master_controller->init();
|
||||
result = a.exec();
|
||||
}
|
||||
asio_service_thread.join();
|
||||
#ifdef WIN32
|
||||
WSACleanup();
|
||||
#endif
|
||||
return result;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue