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

tsan fixes on ubuntu xenial (what travis run)

Browse Source
This commit is contained in:
Benjamin Sergeant
2019-04-29 19:29:27 -07:00
parent 6d310d417a
commit ad8b344298
6 changed files with 156 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ixwebsocket/IXDNSLookup.h
View File

@ -39,11 +39,20 @@ namespace ix
struct addrinfo* resolveBlocking(std::string& errMsg,
const CancellationRequest& isCancellationRequested);
static struct addrinfo* getAddrInfo(std::string hostname,
static struct addrinfo* getAddrInfo(const std::string& hostname,
int port,
std::string& errMsg);
void run(uint64_t id, std::string hostname, int port); // thread runner
void run(uint64_t id, const std::string& hostname, int port); // thread runner
void setHostname(const std::string& hostname);
const std::string& getHostname();
void setErrMsg(const std::string& errMsg);
const std::string& getErrMsg();
void setRes(struct addrinfo* addr);
struct addrinfo* getRes();
void setErrMsg(const std::string& errMsg);
const std::string& getErrMsg();
@ -52,7 +61,9 @@ namespace ix
struct addrinfo* getRes();
std::string _hostname;
std::mutex _hostnameMutex;
int _port;
int64_t _wait;
struct addrinfo* _res;