GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r827:83da67fa98c8

Remove regression for aborting request during processRequest method

perrinel -

r827:83da67fa98c8

parent child

Context file:

r827:83da67fa98c8

core/src/Variable/VariableAcquisitionWorker.cpp +1 0

                      // remove old acqIdentifier from the worker
                      impl->cancelVarRequest(varRequestIdCanceled);
+                     //        impl->m_AcqIdentifierToAcqRequestMap.erase(oldAcqId);
                  }
                  else {
                      // First request for the variable, it must be stored and executed

core/src/Variable/VariableController.cpp +13 -11

                  std::map<QUuid, std::deque<QUuid> > m_VarIdToVarRequestIdQueueMap;
                  VariableController *q;
              };
                      // Associate the provider
                      impl->m_VariableToProviderMap[newVariable] = provider;
-                     qCInfo(LOG_VariableController()) << "createVariable: " << identifier;
                      impl->m_VariableToIdentifierMap[newVariable] = identifier;
                      auto varRequestId = QUuid::createUuid();
+                     qCInfo(LOG_VariableController()) << "createVariable: " << identifier << varRequestId;
                      impl->processRequest(newVariable, range, varRequestId);
                      impl->updateVariableRequest(varRequestId);
                                                    << QThread::currentThread()->objectName() << varRequestId;
                  for (const auto &var : variables) {
-                     qCDebug(LOG_VariableController()) << "processRequest for" << var->name() << varRequestId;
+                     qCInfo(LOG_VariableController()) << "processRequest for" << var->name() << varRequestId;
                      impl->processRequest(var, range, varRequestId);
                  }
                              // Don't process already processed var
                              if (!variables.contains(var)) {
                                  if (var != nullptr) {
-                                     qCDebug(LOG_VariableController()) << "processRequest synchro for"
-                                                                       << var->name();
+                                     qCInfo(LOG_VariableController()) << "processRequest synchro for"
+                                                                      << var->name() << varRequestId;
                                      auto vSyncRangeRequested = computeSynchroRangeRequested(
                                          var->range(), range, groupIdToOldRangeMap.at(gId));
                                      qCDebug(LOG_VariableController()) << "synchro RR" << vSyncRangeRequested;
                                  DataProviderParameters{std::move(notInCacheRangeList), var->metadata()},
                                  varProvider);
-                             if (!varRequestIdCanceled.isNull()) {
-                                 qCInfo(LOG_VariableAcquisitionWorker()) << tr("varRequestIdCanceled: ")
-                                                                         << varRequestIdCanceled;
-                                 // cancelVariableRequest(varRequestIdCanceled);
-                                 abortVariableRequest(varRequestIdCanceled);
+                             }
                          }
                          else {
                              qCCritical(LOG_VariableController())
                  if (varRequestIdToVarIdVarRequestMapIt != m_VarRequestIdToVarIdVarRequestMap.cend()) {
                      varRequestIdsMap = varRequestIdToVarIdVarRequestMapIt->second;
                  }
+                 qCCritical(LOG_VariableController())
+                     << tr("abortVariableRequest : varRequestId and count of aborting") << varRequestId
+                     << varRequestIdsMap.size();
                  auto nextUuidToRemove = QSet<QUuid>{};
                  auto varIdEnd = varRequestIdsMap.end();
                                      }
                                  }
+                                 qCCritical(LOG_VariableController()) << tr("remove the request : aborting")
+                                                                      << currentVarId;
                                  varReqIdQueueIt = varRequestIdQueue.erase(varReqIdQueueIt);
                                  // break is necessary here, we don"t need to iterate on the dequeue anymore and
                                  // the iteration is broken because of the erase
                  }
                  if (varRequestIdToVarIdVarRequestMapIt != m_VarRequestIdToVarIdVarRequestMap.cend()) {
+                     qCCritical(LOG_VariableController()) << tr("remove the varRequestId");
                      m_VarRequestIdToVarIdVarRequestMap.erase(varRequestIdToVarIdVarRequestMapIt);
                  }
                  for (auto nextVarRequestIdToRm : nextUuidToRemove) {
+                     qCCritical(LOG_VariableController()) << tr("Cancel automaticaly the next request:")
+                                                          << nextVarRequestIdToRm;
                      abortVariableRequest(nextVarRequestIdToRm);
                  }
              }

General Comments 3

perrinel

|

Auto status change to "Under Review"

perrinel

|

Merge lasted acquisition developpement on main Sciqlop branch

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