GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r823:5251097ccf22

Improve acquisition robustness

perrinel -

r823:5251097ccf22 feature/fixAcquis...

parent child

Context file:

r823:5251097ccf22

core/src/Variable/VariableController.cpp +12 -24

                 void processRequest(std::shared_ptr<Variable> var, const SqpRange &rangeRequested,
                                     QUuid varRequestId);
-                QVector<SqpRange> provideNotInCacheDateTimeList(std::shared_ptr<Variable> variable,
-                                                                const SqpRange &dateTime);
                 std::shared_ptr<Variable> findVariable(QUuid vIdentifier);
                 std::shared_ptr<IDataSeries>
                 retrieveDataSeries(const QVector<AcquisitionDataPacket> acqDataPacketVector);
                     auto varStrategyRangesRequested
                         = m_VariableCacheStrategy->computeRange(oldRange, rangeRequested);
-                    auto notInCacheRangeList = QVector<SqpRange>{varStrategyRangesRequested.second};
+                    auto notInCacheRangeList
-                    auto inCacheRangeList = QVector<SqpRange>{};
+                        = Variable::provideNotInCacheRangeList(oldRange, varStrategyRangesRequested.second);
-                    if (m_VarIdToVarRequestIdQueueMap.find(varId) == m_VarIdToVarRequestIdQueueMap.cend()) {
+                    auto inCacheRangeList
-                        notInCacheRangeList
+                        = Variable::provideInCacheRangeList(oldRange, varStrategyRangesRequested.second);
-                            = var->provideNotInCacheRangeList(varStrategyRangesRequested.second);
-                        inCacheRangeList = var->provideInCacheRangeList(varStrategyRangesRequested.second);
                     if (!notInCacheRangeList.empty()) {
                         varRequest.m_RangeRequested = varStrategyRangesRequested.first;
                                 var->setRange(varRequest.m_RangeRequested);
                                 var->setCacheRange(varRequest.m_CacheRangeRequested);
                                 qCDebug(LOG_VariableController()) << tr("1: onDataProvided")
-                                                                  << varRequest.m_RangeRequested;
+                                                                  << varRequest.m_RangeRequested
-                                qCDebug(LOG_VariableController()) << tr("2: onDataProvided")
                                                                   << varRequest.m_CacheRangeRequested;
+                                qCDebug(LOG_VariableController()) << tr("2: onDataProvided var points before")
+                                                                  << var->nbPoints()
+                                                                  << varRequest.m_DataSeries->nbPoints();
                                 var->mergeDataSeries(varRequest.m_DataSeries);
-                                qCDebug(LOG_VariableController()) << tr("3: onDataProvided");
+                                qCDebug(LOG_VariableController()) << tr("3: onDataProvided var points after")
+                                                                  << var->nbPoints();
-                                /// @todo MPL: confirm
-                                // Variable update is notified only if there is no pending request for it
-                                //                    if
-                                //                    (m_VarIdToVarRequestIdQueueMap.count(varIdToVarRequestMapIt->first)
-                                //                    == 0) {
                                 emit var->updated();
-                                //                    }
                             }
                             else {
                                 qCCritical(LOG_VariableController())
                                     << tr("Impossible to update data to a null variable");
                             }
                         }
                         // cleaning varRequestId
                         qCDebug(LOG_VariableController()) << tr("0: erase REQUEST in  MAP ?")
                                                           << m_VarRequestIdToVarIdVarRequestMap.size();
                         std::remove(varRequestIdQueue.begin(), varRequestIdQueue.end(), varRequestId),
                         varRequestIdQueue.end());
                     if (varRequestIdQueue.empty()) {
-                        qCCritical(LOG_VariableController())
-                            << tr("VariableControllerPrivate::cancelVariableRequest")
-                            << varIdToVarRequestIdQueueMapIt->first;
                         varIdToVarRequestIdQueueMapIt
                             = m_VarIdToVarRequestIdQueueMap.erase(varIdToVarRequestIdQueueMapIt);
+                        // Recompute if there is any next request based on the removed request.
                     }
                     else {
                         ++varIdToVarRequestIdQueueMapIt;

plugins/mockplugin/src/CosinusProvider.cpp +1 -3

                 for (const auto &dateTime : qAsConst(times)) {
                     if (m_VariableToEnableProvider[acqIdentifier]) {
                         auto scalarSeries = this->retrieveData(acqIdentifier, dateTime, parameters.m_Data);
-                        qCCritical(LOG_CosinusProvider()) << "TORM: CosinusProvider::dataProvided";
                         emit dataProvided(acqIdentifier, scalarSeries, dateTime);
                     }
                 }
             void CosinusProvider::requestDataAborting(QUuid acqIdentifier)
             {
-                // TODO: Add Mutex
                 qCDebug(LOG_CosinusProvider()) << "CosinusProvider::requestDataAborting" << acqIdentifier
                                                << QThread::currentThread()->objectName();
                 auto it = m_VariableToEnableProvider.find(acqIdentifier);
                     it.value() = false;
                 }
                 else {
-                    qCWarning(LOG_CosinusProvider())
+                    qCDebug(LOG_CosinusProvider())
                         << tr("Aborting progression of inexistant identifier detected !!!");
                 }
             }

General Comments 3

perrinel

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

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