Showing the changes to libraries/networking/src/ThreadedAssignment.cpp (1 of 16 files). Show all
Unified · Split
| @@ -26,7 +26,14 @@ ThreadedAssignment::ThreadedAssignment(const QByteArray& packet) : · 25 unmodified lines | ||
| 26 | 26 | |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | +ThreadedAssignment::~ThreadedAssignment() { | |
| 30 | + // setFinished(true); | |
| 31 | +} | |
| 32 | + | |
| 29 | 33 | void ThreadedAssignment::setFinished(bool isFinished) { |
| 34 | + | |
| 35 | + qDebug() << "------------- ThreadedAssignment::setFinished" << isFinished << " -------------------"; | |
| 36 | + | |
| 30 | 37 | _isFinished = isFinished; |
| 31 | 38 | |
| 32 | 39 | if (_isFinished) { |
| @@ -50,8 +57,10 @@ void ThreadedAssignment::setFinished(bool isFinished) { · 17 unmodified lines | ||
| 50 | 57 | |
| 51 | 58 | if (_datagramProcessingThread) { |
| 52 | 59 | // tell the datagram processing thread to quit and wait until it is done, then return the node socket to the NodeList |
| 60 | + qDebug() << "stopping datagramProcessingThread..."; | |
| 53 | 61 | _datagramProcessingThread->quit(); |
| 54 | 62 | _datagramProcessingThread->wait(); |
| 63 | + qDebug() << "done stopping datagramProcessingThread."; | |
| 55 | 64 | |
| 56 | 65 | // set node socket parent back to NodeList |
| 57 | 66 | nodeList->getNodeSocket().setParent(nodeList.data()); |
| @@ -64,6 +73,15 @@ void ThreadedAssignment::setFinished(bool isFinished) { · 6 unmodified lines | ||
| 64 | 73 | } |
| 65 | 74 | } |
| 66 | 75 | |
| 76 | + | |
| 77 | +// void ThreadedAssignment::stop() { | |
| 78 | +// setFinished(true); | |
| 79 | +// qDebug() << "ThreadedAssignment::stop"; | |
| 80 | +// QThread *thisThread = QThread::currentThread(); | |
| 81 | +// thisThread->quit(); | |
| 82 | +// } | |
| 83 | + | |
| 84 | + | |
| 67 | 85 | void ThreadedAssignment::commonInit(const QString& targetName, NodeType_t nodeType, bool shouldSendStats) { |
| 68 | 86 | // change the logging target name while the assignment is running |
| 69 | 87 | LogHandler::getInstance().setTargetName(targetName); |