HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/SciQLOPCore Commit - r28:a05b0ab23493

Removed old IDataProvider interface, added small tweak in downloader...

jeandet -

r28:a05b0ab23493

parent child

Context file:

r28:a05b0ab23493

include/Data/IDataProvider.h +2 -59

               *
               * A data provider is an entity that generates data and returns it according to various parameters
               * (time interval, product to retrieve the data, etc.)
+              * Since its client mihgt use it from different threads it has to be either stateless  and/or thread safe
               *
               * @sa IDataSeries
               */
                  virtual ~IDataProvider() noexcept = default;
                  virtual std::shared_ptr<IDataProvider> clone() const = 0;
-                 DEPRECATE(
-                 /**
-                  * @brief requestDataLoading provide datas for the data identified by acqIdentifier and
-                  * parameters
-                  */
-                         virtual void requestDataLoading(QUuid acqIdentifier, const DataProviderParameters &parameters)
-                           = 0;
+                 )
                  // Synchronous call -> asyncGetData may be written for asynchronous get
-                 virtual IDataSeries* getData(const DataProviderParameters &parameters)
+                 {
-                     Q_UNUSED(parameters);
-                     return nullptr;
+                 }
-                 DEPRECATE(
-                 /**
-                  * @brief requestDataAborting stop data loading of the data identified by acqIdentifier
-                  */
-                         virtual void requestDataAborting(QUuid acqIdentifier) = 0;
+                 )
-                 virtual void abort(QUuid requestID){Q_UNUSED(requestID);}
+                 virtual IDataSeries* getData(const DataProviderParameters &parameters) = 0;
              signals:
-                 DEPRECATE(
-                 /**
-                  * @brief dataProvided send dataSeries under dateTime and that corresponds of the data
-                  * identified by acqIdentifier
-                  */
-                         void dataProvided(QUuid acqIdentifier, std::shared_ptr<IDataSeries> dateSeriesAcquired,
-                                           const DateTimeRange &dataRangeAcquired);
+                 )
-                 void finished(QUuid requestID, std::shared_ptr<IDataSeries> dataSerie,
-                               const DateTimeRange &range);
-                 DEPRECATE(
-                 /**
-                  * @brief dataProvidedProgress notify the progression of the data identifier by acqIdentifier
-                  */
-                         void dataProvidedProgress(QUuid acqIdentifier, double progress);
+                 )
                  void progress(QUuid requestID, double progress);
-                 DEPRECATE(
-                 /**
-                  * @brief dataProvidedFailed notify that data acquisition has failed
-                  */
-                         void dataProvidedFailed(QUuid acqIdentifier);
+                 )
-                 void failed(QUuid requestID);
-                 /**
-                  * @brief requestConstructed send a request for the data identified by acqIdentifier
-                  * @callback is the methode call by the reply of the request when it is finished.
-                  */
-                 DEPRECATE(
-                         void requestConstructed(std::shared_ptr<QNetworkRequest> request, QUuid acqIdentifier,
-                                                   std::function<void(QNetworkReply *, QUuid)> callback);
+                 )
              };
              // Required for using shared_ptr in signals/slots

include/Variable/private/VCTransaction.h +3 -1

                      std::vector<IDataSeries*> data;
                      for(auto range:_ranges)
                      {
-                         data.push_back(_provider->getData(DataProviderParameters{{range}, _variable->metadata()}));
+                         auto ds = _provider->getData(DataProviderParameters{{range}, _variable->metadata()});
+                         if(ds)
+                             data.push_back(ds);
                      }
                      _variable->updateData(data, _range, _cacheRange, true);
                      emit transactionComplete();

src/Network/Downloader.cpp +4 0

              #include <QPair>
              #include <QCoreApplication>
              #include <QReadWriteLock>
+             #include <QThread>
              class Downloader::p_Downloader
              {
                      QNetworkRequest request = buildRequest(url, user, passwd);
                      QNetworkReply *reply = manager.get(request);
                      while (!reply->isFinished())
+                     {
                          QCoreApplication::processEvents();
+                         QThread::usleep(10000);
+                     }
                      QVariant status_code = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
                      Response resp = Response(reply->readAll(), status_code.toInt());
                      delete reply;

src/Variable/VariableController2.cpp +6 -8

                      QMap<QUuid,std::shared_ptr<VariableSynchronizationGroup2>> _synchronizationGroups;
                      QReadWriteLock _lock{QReadWriteLock::Recursive};
                  }_maps;
-                 QThreadPool _ThreadPool;
+                 QThreadPool* _ThreadPool;
                  VCTransactionsQueues _transactions;
                  std::unique_ptr<VariableCacheStrategy> _cacheStrategy;
                                              this->_transactionComplete(groupID, transaction);
                                          }
                                  );
-                                 _ThreadPool.start(exe);
+                                 _ThreadPool->start(exe);
                              }
                          }
                      }
                      :_cacheStrategy(VariableCacheStrategyFactory::createCacheStrategy(CacheStrategy::SingleThreshold))
                  {
                      Q_UNUSED(parent);
-                     this->_ThreadPool.setMaxThreadCount(32);
+                     this->_ThreadPool = new QThreadPool();
+                     this->_ThreadPool->setMaxThreadCount(32);
                  }
                  /*
                  */
                  ~VariableController2Private()
                  {
-                     while (this->_ThreadPool.activeThreadCount())
+                     {
-                         this->_ThreadPool.waitForDone(100);
+                     }
+                     delete this->_ThreadPool;
                  }
                  std::shared_ptr<Variable> createVariable(const QString &name, const QVariantHash &metadata, std::shared_ptr<IDataProvider> provider)
                  auto var =  impl->createVariable(name, metadata, provider);
                  emit variableAdded(var);
                  if(!DateTimeRangeHelper::hasnan(range))
-                     impl->changeRange(var,range);
+                     impl->asyncChangeRange(var,range);
                  else
                      SCIQLOP_ERROR(VariableController2, "Creating a variable with default constructed DateTimeRange is an error");
                  return var;

tests/TestUtils/TestProviders.h 0 -13

                      return serie;
                  }
-                 void requestDataLoading(QUuid acqIdentifier, const DataProviderParameters &parameters) override
+                 {
-                     Q_UNUSED(acqIdentifier)
-                     Q_UNUSED(parameters)
+                 }
-                 void requestDataAborting(QUuid acqIdentifier) override
+                 {
-                     Q_UNUSED(acqIdentifier)
+                 }
              };

General Comments 0

Write
Preview

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

No TODOs yet

	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