BUG: Fix crash when stopping jobs

.gitignore

@@ -7,6 +7,8 @@
 
 # Exclude QtCreator files ...
 CMakeLists.txt.user*
+CMakeCache.txt
+CMakeFiles/cmake.check_cache
 
 # ignore ctags file
 tags

Libs/Core/ctkJobScheduler.cpp

@@ -56,7 +56,7 @@ void ctkJobSchedulerPrivate::init()
                    this, SLOT(onQueueJobsInThreadPool()));
 
   this->ThreadPool = QSharedPointer<QThreadPool>(new QThreadPool());
-  this->ThreadPool->setMaxThreadCount(10);
+  this->ThreadPool->setMaxThreadCount(20);
 }
 
 //------------------------------------------------------------------------------
@@ -69,7 +69,7 @@ void ctkJobSchedulerPrivate::onQueueJobsInThreadPool()
     return;
     }
 
-  this->QueueMutex.tryLock();
+  this->QueueMutex.lock();
   foreach (QThread::Priority priority, (QList<QThread::Priority>()
                                         << QThread::Priority::HighestPriority
                                         << QThread::Priority::HighPriority
@@ -135,7 +135,7 @@ bool ctkJobSchedulerPrivate::insertJob(QSharedPointer<ctkAbstractJob> job)
   QObject::connect(job.data(), SIGNAL(progressJobDetail(QVariant)),
                    q, SIGNAL(progressJobDetail(QVariant)));
 
-  this->QueueMutex.tryLock();
+  this->QueueMutex.lock();
   this->JobsQueue.insert(job->jobUID(), job);
   this->QueueMutex.unlock();
 
@@ -165,7 +165,7 @@ bool ctkJobSchedulerPrivate::removeJob(const QString& jobUID)
     .arg(jobUID)
     .arg(QString::number(reinterpret_cast<quint64>(QThread::currentThreadId()), 16)));
 
-  this->QueueMutex.tryLock();
+  this->QueueMutex.lock();
   QSharedPointer<ctkAbstractJob> job = this->JobsQueue.value(jobUID);
   if (!job)
   {
@@ -192,7 +192,7 @@ void ctkJobSchedulerPrivate::removeJobs(const QStringList &jobUIDs)
   Q_Q(ctkJobScheduler);
 
   QList<QVariant> datas;
-  this->QueueMutex.tryLock();
+  this->QueueMutex.lock();
   foreach (QString jobUID, jobUIDs)
   {
     QSharedPointer<ctkAbstractJob> job = this->JobsQueue.value(jobUID);
@@ -285,7 +285,7 @@ ctkJobScheduler::~ctkJobScheduler()
 int ctkJobScheduler::numberOfJobs()
 {
   Q_D(ctkJobScheduler);
-  d->QueueMutex.tryLock();
+  d->QueueMutex.lock();
   int numberOfJobs = d->JobsQueue.count();
   d->QueueMutex.unlock();
   return numberOfJobs;
@@ -296,7 +296,7 @@ int ctkJobScheduler::numberOfPersistentJobs()
 {
   Q_D(ctkJobScheduler);
   int numberOfPersistentJobs = 0;
-  d->QueueMutex.tryLock();
+  d->QueueMutex.lock();
   foreach (QSharedPointer<ctkAbstractJob> job, d->JobsQueue)
   {
     if (job->isPersistent())
@@ -344,7 +344,7 @@ QSharedPointer<ctkAbstractJob> ctkJobScheduler::getJobSharedByUID(const QString&
 {
   Q_D(ctkJobScheduler);
 
-  d->QueueMutex.tryLock();
+  d->QueueMutex.lock();
   QMap<QString, QSharedPointer<ctkAbstractJob>>::iterator it = d->JobsQueue.find(jobUID);
   if (it == d->JobsQueue.end())
   {
@@ -397,7 +397,7 @@ void ctkJobScheduler::stopAllJobs(bool stopPersistentJobs)
   Q_D(ctkJobScheduler);
 
   QStringList initializedStoppedJobsUIDs;
-  d->QueueMutex.tryLock();
+  d->QueueMutex.lock();
   // Stops jobs without a worker (in waiting, still in main thread).
   foreach (QSharedPointer<ctkAbstractJob> job, d->JobsQueue)
   {
@@ -470,7 +470,7 @@ void ctkJobScheduler::stopJobsByJobUIDs(const QStringList &jobUIDs)
   }
 
   QStringList initializedStoppedJobsUIDs;
-  d->QueueMutex.tryLock();
+  d->QueueMutex.lock();
   // Stops jobs without a worker (in waiting, still in main thread)
   foreach (QSharedPointer<ctkAbstractJob> job, d->JobsQueue)
   {

Libs/Core/ctkJobScheduler.h

@@ -79,7 +79,7 @@ class CTK_CORE_EXPORT ctkJobScheduler : public QObject
 
   ///@{
   /// Maximum number of concurrent QThreads spawned by the threadPool in the Job pool
-  /// default: 10
+  /// default: 20
   int maximumThreadCount() const;
   void setMaximumThreadCount(int maximumThreadCount);
   ///@}

Libs/DICOM/Core/ctkDICOMEcho.cpp

@@ -48,7 +48,7 @@ class ctkDICOMEchoPrivate
   QString CalledAETitle;
   QString Host;
   int Port;
-  DcmSCU SCU;
+  DcmSCU *SCU;
 };
 
 //------------------------------------------------------------------------------
@@ -63,8 +63,9 @@ ctkDICOMEchoPrivate::ctkDICOMEchoPrivate()
   this->Host = "";
   this->Port = 80;
 
-  this->SCU.setACSETimeout(3);
-  this->SCU.setConnectionTimeout(3);
+  this->SCU = new DcmSCU();
+  this->SCU->setACSETimeout(3);
+  this->SCU->setConnectionTimeout(3);
 }
 
 //------------------------------------------------------------------------------
@@ -77,7 +78,7 @@ ctkDICOMEcho::ctkDICOMEcho(QObject* parentObject)
 {
   Q_D(ctkDICOMEcho);
 
-  d->SCU.setVerbosePCMode(false);
+  d->SCU->setVerbosePCMode(false);
 }
 
 //------------------------------------------------------------------------------
@@ -157,25 +158,25 @@ int ctkDICOMEcho::port() const
 void ctkDICOMEcho::setConnectionTimeout(int timeout)
 {
   Q_D(ctkDICOMEcho);
-  d->SCU.setACSETimeout(timeout);
-  d->SCU.setConnectionTimeout(timeout);
+  d->SCU->setACSETimeout(timeout);
+  d->SCU->setConnectionTimeout(timeout);
 }
 
 //-----------------------------------------------------------------------------
 int ctkDICOMEcho::connectionTimeout() const
 {
   Q_D(const ctkDICOMEcho);
-  return d->SCU.getConnectionTimeout();
+  return d->SCU->getConnectionTimeout();
 }
 
 //------------------------------------------------------------------------------
 bool ctkDICOMEcho::echo()
 {
   Q_D(ctkDICOMEcho);
 
-  d->SCU.setPeerAETitle(OFString(this->calledAETitle().toStdString().c_str()));
-  d->SCU.setPeerHostName(OFString(this->host().toStdString().c_str()));
-  d->SCU.setPeerPort(this->port());
+  d->SCU->setPeerAETitle(OFString(this->calledAETitle().toStdString().c_str()));
+  d->SCU->setPeerHostName(OFString(this->host().toStdString().c_str()));
+  d->SCU->setPeerPort(this->port());
 
   logger.debug("Setting Transfer Syntaxes");
 
@@ -184,15 +185,15 @@ bool ctkDICOMEcho::echo()
   transferSyntaxes.push_back(UID_BigEndianExplicitTransferSyntax);
   transferSyntaxes.push_back(UID_LittleEndianImplicitTransferSyntax);
 
-  d->SCU.addPresentationContext(UID_VerificationSOPClass, transferSyntaxes);
-  if (!d->SCU.initNetwork().good())
+  d->SCU->addPresentationContext(UID_VerificationSOPClass, transferSyntaxes);
+  if (!d->SCU->initNetwork().good())
   {
     logger.error("Error initializing the network");
     return false;
   }
   logger.debug("Negotiating Association");
 
-  OFCondition result = d->SCU.negotiateAssociation();
+  OFCondition result = d->SCU->negotiateAssociation();
   if (result.bad())
   {
     logger.error("Error negotiating the association: " + QString(result.text()));
@@ -201,26 +202,15 @@ bool ctkDICOMEcho::echo()
 
   logger.info("Seding Echo");
   // Issue ECHO request and let scu find presentation context itself (0)
-  OFCondition status = d->SCU.sendECHORequest(0);
+  OFCondition status = d->SCU->sendECHORequest(0);
   if (!status.good())
   {
     logger.error("Echo failed");
-    d->SCU.releaseAssociation();
+    d->SCU->releaseAssociation();
     return false;
   }
 
-  d->SCU.releaseAssociation();
+  d->SCU->releaseAssociation();
 
   return true;
 }
-
-//------------------------------------------------------------------------------
-void ctkDICOMEcho::cancel()
-{
-  Q_D(ctkDICOMEcho);
-
-  if (d->SCU.isConnected())
-  {
-    d->SCU.releaseAssociation();
-  }
-}

Libs/DICOM/Core/ctkDICOMEcho.h

@@ -89,9 +89,6 @@ class CTK_DICOM_CORE_EXPORT ctkDICOMEcho : public QObject
   /// Echo connection.
   Q_INVOKABLE bool echo();
 
-  /// Cancel the current operation
-  Q_INVOKABLE void cancel();
-
 protected:
   QScopedPointer<ctkDICOMEchoPrivate> d_ptr;