History

cleanup memory leaks and timing on assignment threading

Stephen Birarda committed 12 years ago

Commit 02732e91 parent 330eff73 files · +78 −45Browse files

Showing the changes to assignment-client/src/AssignmentClient.cpp (1 of 3 files). Show all

Unified · Split

assignment-client/src/AssignmentClient.cpp+2−3
@@ -93,13 +93,13 @@ void AssignmentClient::readPendingDatagrams() { · 92 unmodified lines
93 nodeList->getDomainIP().toString().toStdString().c_str());93 nodeList->getDomainIP().toString().toStdString().c_str());
94 94
95 // start the deployed assignment95 // start the deployed assignment
96 QThread *workerThread = new QThread(this);96 QThread* workerThread = new QThread(this);
97 97
98 connect(workerThread, SIGNAL(started()), _currentAssignment, SLOT(setup()));98 connect(workerThread, SIGNAL(started()), _currentAssignment, SLOT(setup()));
99 99
100 connect(_currentAssignment, SIGNAL(finished()), this, SLOT(assignmentCompleted()));100 connect(_currentAssignment, SIGNAL(finished()), this, SLOT(assignmentCompleted()));
101 connect(_currentAssignment, SIGNAL(finished()), workerThread, SLOT(quit()));101 connect(_currentAssignment, SIGNAL(finished()), workerThread, SLOT(quit()));
102 connect(workerThread, SIGNAL(finished()), _currentAssignment, SLOT(deleteLater()));102 connect(_currentAssignment, SIGNAL(finished()), _currentAssignment, SLOT(deleteLater()));
103 connect(workerThread, SIGNAL(finished()), workerThread, SLOT(deleteLater()));103 connect(workerThread, SIGNAL(finished()), workerThread, SLOT(deleteLater()));
104 104
105 _currentAssignment->moveToThread(workerThread);105 _currentAssignment->moveToThread(workerThread);
@@ -129,7 +129,6 @@ void AssignmentClient::assignmentCompleted() { · 23 unmodified lines
129 129
130 qDebug("Assignment finished or never started - waiting for new assignment\n");130 qDebug("Assignment finished or never started - waiting for new assignment\n");
131 131
132 // the _currentAssignment is being deleted, set our pointer to NULL
133 _currentAssignment = NULL;132 _currentAssignment = NULL;
134 133
135 NodeList* nodeList = NodeList::getInstance();134 NodeList* nodeList = NodeList::getInstance();