Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 10:44:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix cleanup of finished assignment

Browse source
This commit is contained in:
Stephen Birarda 2013-12-02 16:45:13 -08:00
parent 1e279cf99c
commit 113ef1b386
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
assignment-client/src/AssignmentClient.cpp
View file

@ -29,6 +29,9 @@ AssignmentClient::AssignmentClient(int &argc, char **argv,
_requestAssignment(Assignment::RequestCommand, requestAssignmentType, requestAssignmentPool), _requestAssignment(Assignment::RequestCommand, requestAssignmentType, requestAssignmentPool),
_currentAssignment(NULL) _currentAssignment(NULL)
{ {
// register meta type is required for queued invoke method on Assignment subclasses
qRegisterMetaType<HifiSockAddr>("HifiSockAddr");
// set the logging target to the the CHILD_TARGET_NAME // set the logging target to the the CHILD_TARGET_NAME
Logging::setTargetName(ASSIGNMENT_CLIENT_TARGET_NAME); Logging::setTargetName(ASSIGNMENT_CLIENT_TARGET_NAME);
@ -93,9 +96,12 @@ void AssignmentClient::readPendingDatagrams() {
QThread *workerThread = new QThread(this); QThread *workerThread = new QThread(this);
connect(workerThread, SIGNAL(started()), _currentAssignment, SLOT(run())); connect(workerThread, SIGNAL(started()), _currentAssignment, SLOT(run()));
connect(_currentAssignment, SIGNAL(finished()), this, SLOT(assignmentCompleted()));
connect(_currentAssignment, SIGNAL(finished()), workerThread, SLOT(quit())); connect(_currentAssignment, SIGNAL(finished()), workerThread, SLOT(quit()));
connect(_currentAssignment, SIGNAL(finished()), _currentAssignment, SLOT(deleteLater())); connect(workerThread, SIGNAL(finished()), _currentAssignment, SLOT(deleteLater()));
connect(_currentAssignment, SIGNAL(finished()), workerThread, SLOT(deleteLater())); connect(workerThread, SIGNAL(finished()), workerThread, SLOT(deleteLater()));
_currentAssignment->moveToThread(workerThread); _currentAssignment->moveToThread(workerThread);
// Starts an event loop, and emits workerThread->started() // Starts an event loop, and emits workerThread->started()
@ -105,9 +111,6 @@ void AssignmentClient::readPendingDatagrams() {
} }
} }
} else if (_currentAssignment) { } else if (_currentAssignment) {
qRegisterMetaType<HifiSockAddr>("HifiSockAddr");
// have the threaded current assignment handle this datagram // have the threaded current assignment handle this datagram
QMetaObject::invokeMethod(_currentAssignment, "processDatagram", Qt::QueuedConnection, QMetaObject::invokeMethod(_currentAssignment, "processDatagram", Qt::QueuedConnection,
Q_ARG(const QByteArray&, QByteArray((char*) packetData, receivedBytes)), Q_ARG(const QByteArray&, QByteArray((char*) packetData, receivedBytes)),
@ -121,6 +124,9 @@ void AssignmentClient::readPendingDatagrams() {
} }
void AssignmentClient::assignmentCompleted() { void AssignmentClient::assignmentCompleted() {
// reset the logging target to the the CHILD_TARGET_NAME
Logging::setTargetName(ASSIGNMENT_CLIENT_TARGET_NAME);
qDebug("Assignment finished or never started - waiting for new assignment\n"); qDebug("Assignment finished or never started - waiting for new assignment\n");
// the _currentAssignment is being deleted, set our pointer to NULL // the _currentAssignment is being deleted, set our pointer to NULL
@ -131,7 +137,4 @@ void AssignmentClient::assignmentCompleted() {
// reset our NodeList by switching back to unassigned and clearing the list // reset our NodeList by switching back to unassigned and clearing the list
nodeList->setOwnerType(NODE_TYPE_UNASSIGNED); nodeList->setOwnerType(NODE_TYPE_UNASSIGNED);
nodeList->reset(); nodeList->reset();
// reset the logging target to the the CHILD_TARGET_NAME
Logging::setTargetName(ASSIGNMENT_CLIENT_TARGET_NAME);
} }