kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DNSLookup: fix #8

Browse Source
This commit is contained in:
Benjamin Sergeant 2019-01-06 18:27:26 -08:00
parent 911f684e4d
commit bce3071a12
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ixwebsocket/IXDNSLookup.cpp
View File

@ -105,7 +105,7 @@ namespace ix
// Good resource on thread forced termination // Good resource on thread forced termination
// https://www.bo-yang.net/2017/11/19/cpp-kill-detached-thread // https://www.bo-yang.net/2017/11/19/cpp-kill-detached-thread
// //
_thread = std::thread(&DNSLookup::run, this, _hostname, _port); _thread = std::thread(&DNSLookup::run, this, _id, _hostname, _port);
_thread.detach(); _thread.detach();
std::unique_lock<std::mutex> lock(_conditionVariableMutex); std::unique_lock<std::mutex> lock(_conditionVariableMutex);
@ -138,11 +138,13 @@ namespace ix
return _res; return _res;
} }
void DNSLookup::run(const std::string& hostname, int port) // thread runner void DNSLookup::run(uint64_t id, const std::string& hostname, int port) // thread runner
{ {
uint64_t id = _id; // We don't want to read or write into members variables of an object that could be
// gone, so we use temporary variables (res) or we pass in by copy everything that
// getAddrInfo needs to work.
std::string errMsg; std::string errMsg;
_res = getAddrInfo(hostname, port, errMsg); struct addrinfo* res = getAddrInfo(hostname, port, errMsg);
// if this isn't an active job, and the control thread is gone // if this isn't an active job, and the control thread is gone
// there is not thing to do, and we don't want to touch the defunct // there is not thing to do, and we don't want to touch the defunct
@ -153,9 +155,10 @@ namespace ix
return; return;
} }
// Copy result into the member variables
_res = res;
_errMsg = errMsg; _errMsg = errMsg;
_condition.notify_one(); _condition.notify_one();
_done = true; _done = true;
} }
} }

2
ixwebsocket/IXDNSLookup.h
View File

@ -43,7 +43,7 @@ namespace ix
int port, int port,
std::string& errMsg); std::string& errMsg);
void run(const std::string& hostname, int port); // thread runner void run(uint64_t id, const std::string& hostname, int port); // thread runner
std::string _hostname; std::string _hostname;
int _port; int _port;