Mercurial > hg > orthanc
diff Core/JobsEngine/Operations/SequenceOfOperationsJob.cpp @ 3851:6498739a3c3c
refactoring: TimeoutDicomConnectionManager is now only used by Lua
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 20 Apr 2020 16:46:44 +0200 |
parents | d729d6e8b484 |
children |
line wrap: on
line diff
--- a/Core/JobsEngine/Operations/SequenceOfOperationsJob.cpp Mon Apr 20 14:45:21 2020 +0200 +++ b/Core/JobsEngine/Operations/SequenceOfOperationsJob.cpp Mon Apr 20 16:46:44 2020 +0200 @@ -43,7 +43,6 @@ { static const char* CURRENT = "Current"; static const char* DESCRIPTION = "Description"; - static const char* DICOM_TIMEOUT = "DicomTimeout"; static const char* NEXT_OPERATIONS = "Next"; static const char* OPERATION = "Operation"; static const char* OPERATIONS = "Operations"; @@ -127,7 +126,7 @@ return currentInput_ >= originalInputs_->GetSize() + workInputs_->GetSize(); } - void Step(TimeoutDicomConnectionManager& connectionManager) + void Step() { if (IsDone()) { @@ -146,7 +145,7 @@ } JobOperationValues outputs; - operation_->Apply(outputs, *input, connectionManager); + operation_->Apply(outputs, *input); if (!nextOperations_.empty()) { @@ -254,12 +253,6 @@ } - void SequenceOfOperationsJob::Lock::SetDicomAssociationTimeout(unsigned int timeout) - { - that_.connectionManager_.SetTimeout(timeout); - } - - size_t SequenceOfOperationsJob::Lock::AddOperation(IJobOperation* operation) { if (IsDone()) @@ -341,7 +334,6 @@ (*it)->SignalDone(*this); } - connectionManager_.Close(); return JobStepResult::Success(); } else @@ -360,11 +352,9 @@ if (current_ < operations_.size()) { - operations_[current_]->Step(connectionManager_); + operations_[current_]->Step(); } - connectionManager_.CheckTimeout(); - return JobStepResult::Continue(); } @@ -383,13 +373,6 @@ } - void SequenceOfOperationsJob::Stop(JobStopReason reason) - { - boost::mutex::scoped_lock lock(mutex_); - connectionManager_.Close(); - } - - float SequenceOfOperationsJob::GetProgress() { boost::mutex::scoped_lock lock(mutex_); @@ -420,7 +403,6 @@ value[DESCRIPTION] = description_; value[TRAILING_TIMEOUT] = static_cast<unsigned int>(trailingTimeout_.total_milliseconds()); - value[DICOM_TIMEOUT] = connectionManager_.GetTimeout(); value[CURRENT] = static_cast<unsigned int>(current_); Json::Value tmp = Json::arrayValue; @@ -454,8 +436,6 @@ description_ = SerializationToolbox::ReadString(serialized, DESCRIPTION); trailingTimeout_ = boost::posix_time::milliseconds (SerializationToolbox::ReadUnsignedInteger(serialized, TRAILING_TIMEOUT)); - connectionManager_.SetTimeout - (SerializationToolbox::ReadUnsignedInteger(serialized, DICOM_TIMEOUT)); current_ = SerializationToolbox::ReadUnsignedInteger(serialized, CURRENT); const Json::Value& ops = serialized[OPERATIONS];