Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 08:30:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

use node->trylock() in VoxelSendThread() to handle shutdown race condition

Browse source
This commit is contained in:
ZappoMan 2013-11-13 15:11:43 -08:00
parent 52d86a8619
commit 3d20152c36
2 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/shared/src/Node.h
View file

@ -71,6 +71,9 @@ public:
void setPingMs(int pingMs) { _pingMs = pingMs; } void setPingMs(int pingMs) { _pingMs = pingMs; }
void lock() { pthread_mutex_lock(&_mutex); } void lock() { pthread_mutex_lock(&_mutex); }
/// returns false if lock failed, true if you got the lock
bool trylock() { return (pthread_mutex_trylock(&_mutex) == 0); }
void unlock() { pthread_mutex_unlock(&_mutex); } void unlock() { pthread_mutex_unlock(&_mutex); }
static void printLog(Node const&); static void printLog(Node const&);

50
libraries/voxel-server-library/src/VoxelSendThread.cpp
View file

@ -31,39 +31,47 @@ bool VoxelSendThread::process() {
Node* node = NodeList::getInstance()->nodeWithUUID(_nodeUUID); Node* node = NodeList::getInstance()->nodeWithUUID(_nodeUUID);
if (node) { if (node) {
node->lock(); // make sure the node list doesn't kill our node while we're using it // make sure the node list doesn't kill our node while we're using it
VoxelNodeData* nodeData = NULL; if (node->trylock()) {
VoxelNodeData* nodeData = NULL;
nodeData = (VoxelNodeData*) node->getLinkedData(); nodeData = (VoxelNodeData*) node->getLinkedData();
int packetsSent = 0; int packetsSent = 0;
// Sometimes the node data has not yet been linked, in which case we can't really do anything // Sometimes the node data has not yet been linked, in which case we can't really do anything
if (nodeData) { if (nodeData) {
bool viewFrustumChanged = nodeData->updateCurrentViewFrustum(); bool viewFrustumChanged = nodeData->updateCurrentViewFrustum();
if (_myServer->wantsDebugVoxelSending()) { if (_myServer->wantsDebugVoxelSending()) {
printf("nodeData->updateCurrentViewFrustum() changed=%s\n", debug::valueOf(viewFrustumChanged)); printf("nodeData->updateCurrentViewFrustum() changed=%s\n", debug::valueOf(viewFrustumChanged));
}
packetsSent = deepestLevelVoxelDistributor(node, nodeData, viewFrustumChanged);
} }
packetsSent = deepestLevelVoxelDistributor(node, nodeData, viewFrustumChanged);
}
node->unlock(); // we're done with this node for now. node->unlock(); // we're done with this node for now.
} else {
qDebug("VoxelSendThread::process() failed to lock node...isStillRunning()=%s\n",
debug::valueOf(isStillRunning()));
}
} }
} else { } else {
if (_myServer->wantsDebugVoxelSending()) { if (_myServer->wantsDebugVoxelSending()) {
qDebug("VoxelSendThread::process() waiting for isInitialLoadComplete()\n"); qDebug("VoxelSendThread::process() waiting for isInitialLoadComplete()\n");
} }
} }
// dynamically sleep until we need to fire off the next set of voxels // Only sleep if we're still running...
int elapsed = (usecTimestampNow() - start); if (isStillRunning()) {
int usecToSleep = VOXEL_SEND_INTERVAL_USECS - elapsed; // dynamically sleep until we need to fire off the next set of voxels
int elapsed = (usecTimestampNow() - start);
int usecToSleep = VOXEL_SEND_INTERVAL_USECS - elapsed;
if (usecToSleep > 0) { if (usecToSleep > 0) {
usleep(usecToSleep); usleep(usecToSleep);
} else { } else {
if (_myServer->wantsDebugVoxelSending()) { if (_myServer->wantsDebugVoxelSending()) {
std::cout << "Last send took too much time, not sleeping!\n"; std::cout << "Last send took too much time, not sleeping!\n";
}
} }
} }