GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r701:87c4dffdd5b8

Fix progression bug when aborting a request for Amda plugin

perrinel -

r701:87c4dffdd5b8

parent child

Context file:

r701:87c4dffdd5b8

core/src/Variable/VariableAcquisitionWorker.cpp +7 -28

             void VariableAcquisitionWorker::abortProgressRequested(QUuid vIdentifier)
             {
-                // TODO
                 impl->lockRead();
                 auto it = impl->m_VIdentifierToCurrrentAcqIdNextIdPairMap.find(vIdentifier);
             void VariableAcquisitionWorker::onVariableRetrieveDataInProgress(QUuid acqIdentifier,
                                                                              double progress)
             {
+                qCDebug(LOG_VariableAcquisitionWorker()) << tr("TORM: onVariableRetrieveDataInProgress ")
+                                                         << acqIdentifier << progress;
                 impl->lockRead();
                 auto aIdToARit = impl->m_AcqIdentifierToAcqRequestMap.find(acqIdentifier);
                 if (aIdToARit != impl->m_AcqIdentifierToAcqRequestMap.cend()) {
                     auto finalProgression = currentAlreadyProgress + currentPartProgress;
                     emit variableRequestInProgress(aIdToARit->second.m_vIdentifier, finalProgression);
+                    qCDebug(LOG_VariableAcquisitionWorker())
+                        << tr("TORM: onVariableRetrieveDataInProgress ") << aIdToARit->second.m_vIdentifier
+                        << currentPartSize << currentAlreadyProgress << currentPartProgress << finalProgression;
                     if (finalProgression == 100.0) {
                         emit variableRequestInProgress(aIdToARit->second.m_vIdentifier, 0.0);
                     }
                                               acqRequest.m_CacheRangeRequested, aIdToADPVit->second);
                         }
-                        // Execute the next one
+                        // Update to the next request
-                        auto it
+                        impl->updateToNextRequest(acqRequest.m_vIdentifier);
-                            = impl->m_VIdentifierToCurrrentAcqIdNextIdPairMap.find(acqRequest.m_vIdentifier);
-                        if (it != impl->m_VIdentifierToCurrrentAcqIdNextIdPairMap.cend()) {
-                            if (it->second.second.isNull()) {
-                                // There is no next request, we can remove the variable request
-                                impl->removeVariableRequest(acqRequest.m_vIdentifier);
-                            else {
-                                auto acqIdentifierToRemove = it->second.first;
-                                // Move the next request to the current request
-                                it->second.first = it->second.second;
-                                it->second.second = QUuid();
-                                // Remove AcquisitionRequest and results;
-                                impl->m_AcqIdentifierToAcqRequestMap.erase(acqIdentifierToRemove);
-                                impl->m_AcqIdentifierToAcqDataPacketVectorMap.erase(acqIdentifierToRemove);
-                                // Execute the current request
-                                QMetaObject::invokeMethod(this, "onExecuteRequest", Qt::QueuedConnection,
-                                                          Q_ARG(QUuid, it->second.first));
-                        else {
-                            qCCritical(LOG_VariableAcquisitionWorker())
-                                << tr("Impossible to execute the acquisition on an unfound variable ");
                     }
                 }
                 else {

plugins/amda/src/AmdaProvider.cpp +14 -5

                                                        std::shared_ptr<QNetworkRequest> networkRequest,
                                                        double progress)
             {
-                qCDebug(LOG_AmdaProvider()) << tr("onReplyDownloadProgress") << acqIdentifier
+                qCInfo(LOG_AmdaProvider()) << tr("onReplyDownloadProgress") << acqIdentifier
-                                            << networkRequest.get() << progress;
+                                           << networkRequest.get() << progress;
                 auto acqIdToRequestProgressMapIt = m_AcqIdToRequestProgressMap.find(acqIdentifier);
                 if (acqIdToRequestProgressMapIt != m_AcqIdToRequestProgressMap.end()) {
                         requestProgressMapIt->second = progress;
                     }
                     else {
-                        qCCritical(LOG_AmdaProvider()) << tr("Can't retrieve Request in progress")
+                        // This case can happened when a progression is send after the request has been
-                                                       << acqIdentifier << networkRequest.get() << progress;
+                        // finished.
+                        // Generaly the case when aborting a request
+                        qCWarning(LOG_AmdaProvider()) << tr("Can't retrieve Request in progress")
+                                                      << acqIdentifier << networkRequest.get() << progress;
                     }
                 }
                     emit dataProvidedProgress(acqIdentifier, finalProgress);
                 }
                 else {
-                    emit dataProvidedProgress(acqIdentifier, 0.0);
+                    // This case can happened when a progression is send after the request has been finished.
+                    // Generaly the case when aborting a request
+                    emit dataProvidedProgress(acqIdentifier, 100.0);
                 }
             }
                                 /// @todo ALX : debug
                             }
                         }
+                        qCDebug(LOG_AmdaProvider()) << tr("acquisition requests erase because of finishing")
+                                                    << dataId;
                         m_AcqIdToRequestProgressMap.erase(dataId);
                     }
                               }
                           }
                           else {
+                              qCDebug(LOG_AmdaProvider())
+                                  << tr("acquisition requests erase because of aborting") << dataId;
                               m_AcqIdToRequestProgressMap.erase(dataId);
                           }
                       };

General Comments 2

perrinel

|

Pull request updated. Auto status change to "Under Review"

Changed commits:
  * 2 added
  * 0 removed

Changed files:
  * A core/include/Variable/VariableAcquisitionWorker.h
  * M core/include/Data/IDataProvider.h
  * M core/include/Variable/VariableController.h
  * M core/src/Network/NetworkController.cpp
  * M core/src/Variable/VariableAcquisitionWorker.cpp
  * M core/src/Variable/VariableController.cpp
  * M plugins/amda/src/AmdaProvider.cpp

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages