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

rename method to add assignments back to queue

Browse source
This commit is contained in:
Stephen Birarda 2013-10-18 10:44:39 -07:00
parent 0d69349ba9
commit 7ca0a26c18
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
domain-server/src/DomainServer.cpp
View file

@ -202,12 +202,12 @@ void DomainServer::civetwebUploadHandler(struct mg_connection *connection, const
domainServerInstance->_assignmentQueueMutex.unlock(); domainServerInstance->_assignmentQueueMutex.unlock();
} }
void DomainServer::addDeletedAssignmentBackToQueue(Assignment* deletedAssignment) { void DomainServer::addReleasedAssignmentBackToQueue(Assignment* releasedAssignment) {
qDebug() << "Adding assignment" << *deletedAssignment << " back to queue.\n"; qDebug() << "Adding assignment" << *releasedAssignment << " back to queue.\n";
// find this assignment in the static file // find this assignment in the static file
for (int i = 0; i < MAX_STATIC_ASSIGNMENT_FILE_ASSIGNMENTS; i++) { for (int i = 0; i < MAX_STATIC_ASSIGNMENT_FILE_ASSIGNMENTS; i++) {
if (_staticAssignments[i].getUUID() == deletedAssignment->getUUID()) { if (_staticAssignments[i].getUUID() == releasedAssignment->getUUID()) {
// reset the UUID on the static assignment // reset the UUID on the static assignment
_staticAssignments[i].resetUUID(); _staticAssignments[i].resetUUID();
@ -232,7 +232,7 @@ void DomainServer::nodeKilled(Node* node) {
if (node->getLinkedData()) { if (node->getLinkedData()) {
Assignment* nodeAssignment = (Assignment*) node->getLinkedData(); Assignment* nodeAssignment = (Assignment*) node->getLinkedData();
addDeletedAssignmentBackToQueue(nodeAssignment); addReleasedAssignmentBackToQueue(nodeAssignment);
} }
} }

2
domain-server/src/DomainServer.h
View file

@ -47,7 +47,7 @@ private:
void removeAssignmentFromQueue(Assignment* removableAssignment); void removeAssignmentFromQueue(Assignment* removableAssignment);
bool checkInWithUUIDMatchesExistingNode(sockaddr* nodePublicSocket, sockaddr* nodeLocalSocket, const QUuid& checkInUUI); bool checkInWithUUIDMatchesExistingNode(sockaddr* nodePublicSocket, sockaddr* nodeLocalSocket, const QUuid& checkInUUI);
void possiblyAddStaticAssignmentsBackToQueueAfterRestart(timeval* startTime); void possiblyAddStaticAssignmentsBackToQueueAfterRestart(timeval* startTime);
void addDeletedAssignmentBackToQueue(Assignment* deletedAssignment); void addReleasedAssignmentBackToQueue(Assignment* releasedAssignment);
void cleanup(); void cleanup();