Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 17:24:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

avoid static variable thread issue by switching to member variables

Browse source
This commit is contained in:
Stephen Birarda 2013-07-11 13:02:25 -07:00
parent b201d13e31
commit a0226b2548
2 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libraries/shared/src/NodeList.cpp
View file

@ -63,7 +63,10 @@ NodeList::NodeList(char newOwnerType, unsigned int newSocketListenPort) :
_ownerType(newOwnerType),
_nodeTypesOfInterest(NULL),
_ownerID(UNKNOWN_NODE_ID),
_lastNodeID(0) {
_lastNodeID(0),
_printedDomainServerIP(false),
_checkInPacket(NULL),
_checkInPacketSize(0) {
pthread_mutex_init(&mutex, 0);
}
@ -218,7 +221,6 @@ void NodeList::setNodeTypesOfInterest(const char* nodeTypesOfInterest, int numNo
}
void NodeList::sendDomainServerCheckIn() {
static bool printedDomainServerIP = false;
// Lookup the IP address of the domain server if we need to
if (atoi(DOMAIN_IP) == 0) {
struct hostent* pHostInfo;
@ -230,26 +232,23 @@ void NodeList::sendDomainServerCheckIn() {
} else {
printLog("Failed domain server lookup\n");
}
} else if (!printedDomainServerIP) {
} else if (!_printedDomainServerIP) {
printLog("Domain Server IP: %s\n", DOMAIN_IP);
printedDomainServerIP = true;
_printedDomainServerIP = true;
}
// construct the DS check in packet if we need to
static unsigned char* checkInPacket = NULL;
static int checkInPacketSize = 0;
const int IP_ADDRESS_BYTES = 4;
if (!checkInPacket) {
// construct the DS check in packet if we need to
if (!_checkInPacket) {
int numBytesNodesOfInterest = _nodeTypesOfInterest ? strlen((char*) _nodeTypesOfInterest) : 0;
const int IP_ADDRESS_BYTES = 4;
// check in packet has header, node type, port, IP, node types of interest, null termination
int numPacketBytes = sizeof(PACKET_TYPE) + sizeof(PACKET_VERSION) + sizeof(NODE_TYPE) + sizeof(uint16_t) +
IP_ADDRESS_BYTES + numBytesNodesOfInterest + sizeof(unsigned char);
checkInPacket = new unsigned char[numPacketBytes];
unsigned char* packetPosition = checkInPacket;
_checkInPacket = new unsigned char[numPacketBytes];
unsigned char* packetPosition = _checkInPacket;
PACKET_TYPE nodePacketType = (memchr(SOLO_NODE_TYPES, _ownerType, sizeof(SOLO_NODE_TYPES)))
? PACKET_TYPE_DOMAIN_REPORT_FOR_DUTY
@ -260,7 +259,7 @@ void NodeList::sendDomainServerCheckIn() {
*(packetPosition++) = _ownerType;
packetPosition += packSocket(checkInPacket + numHeaderBytes + sizeof(NODE_TYPE),
packetPosition += packSocket(_checkInPacket + numHeaderBytes + sizeof(NODE_TYPE),
getLocalAddress(),
htons(_nodeSocket.getListeningPort()));
@ -275,7 +274,7 @@ void NodeList::sendDomainServerCheckIn() {
packetPosition += numBytesNodesOfInterest;
}
checkInPacketSize = packetPosition - checkInPacket;
_checkInPacketSize = packetPosition - _checkInPacket;
}
_nodeSocket.send(DOMAIN_IP, DOMAINSERVER_PORT, checkInPacket, checkInPacketSize);

4
libraries/shared/src/NodeList.h
View file

@ -113,6 +113,10 @@ private:
pthread_t checkInWithDomainServerThread;
pthread_mutex_t mutex;
bool _printedDomainServerIP;
unsigned char* _checkInPacket;
int _checkInPacketSize;
void handlePingReply(sockaddr *nodeAddress);
void timePingReply(sockaddr *nodeAddress, unsigned char *packetData);
};