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

@@ -27,6 +27,7 DEPRECATE(
27	*	27	*
28	* A data provider is an entity that generates data and returns it according to various parameters	28	* A data provider is an entity that generates data and returns it according to various parameters
29	* (time interval, product to retrieve the data, etc.)	29	* (time interval, product to retrieve the data, etc.)
		30	* Since its client mihgt use it from different threads it has to be either stateless and/or thread safe
30	*	31	*
31	* @sa IDataSeries	32	* @sa IDataSeries
32	*/	33	*/
@@ -37,71 +38,13 public:
37	virtual ~IDataProvider() noexcept = default;	38	virtual ~IDataProvider() noexcept = default;
38	virtual std::shared_ptr<IDataProvider> clone() const = 0;	39	virtual std::shared_ptr<IDataProvider> clone() const = 0;
39		40
40	DEPRECATE(
41	/**
42	* @brief requestDataLoading provide datas for the data identified by acqIdentifier and
43	* parameters
44	*/
45	virtual void requestDataLoading(QUuid acqIdentifier, const DataProviderParameters &parameters)
46	= 0;
47	)
48
49	// Synchronous call -> asyncGetData may be written for asynchronous get	41	// Synchronous call -> asyncGetData may be written for asynchronous get
50	virtual IDataSeries* getData(const DataProviderParameters &parameters)	42	virtual IDataSeries* getData(const DataProviderParameters &parameters) = 0;
51	{
52	Q_UNUSED(parameters);
53	return nullptr;
54	}
55
56
57	DEPRECATE(
58	/**
59	* @brief requestDataAborting stop data loading of the data identified by acqIdentifier
60	*/
61	virtual void requestDataAborting(QUuid acqIdentifier) = 0;
62	)
63
64	virtual void abort(QUuid requestID){Q_UNUSED(requestID);}
65		43
66	signals:	44	signals:
67	DEPRECATE(
68	/**
69	* @brief dataProvided send dataSeries under dateTime and that corresponds of the data
70	* identified by acqIdentifier
71	*/
72	void dataProvided(QUuid acqIdentifier, std::shared_ptr<IDataSeries> dateSeriesAcquired,
73	const DateTimeRange &dataRangeAcquired);
74	)
75
76	void finished(QUuid requestID, std::shared_ptr<IDataSeries> dataSerie,
77	const DateTimeRange &range);
78
79	DEPRECATE(
80	/**
81	* @brief dataProvidedProgress notify the progression of the data identifier by acqIdentifier
82	*/
83	void dataProvidedProgress(QUuid acqIdentifier, double progress);
84	)
85		45
86	void progress(QUuid requestID, double progress);	46	void progress(QUuid requestID, double progress);
87		47
88	DEPRECATE(
89	/**
90	* @brief dataProvidedFailed notify that data acquisition has failed
91	*/
92	void dataProvidedFailed(QUuid acqIdentifier);
93	)
94
95	void failed(QUuid requestID);
96
97	/**
98	* @brief requestConstructed send a request for the data identified by acqIdentifier
99	* @callback is the methode call by the reply of the request when it is finished.
100	*/
101	DEPRECATE(
102	void requestConstructed(std::shared_ptr<QNetworkRequest> request, QUuid acqIdentifier,
103	std::function<void(QNetworkReply *, QUuid)> callback);
104	)
105	};	48	};
106		49
107	// Required for using shared_ptr in signals/slots	50	// 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())
+                    delete this->_ThreadPool;
-                        this->_ThreadPool.waitForDone(100);
                 }
                 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

@@ -42,19 +42,6 public:
42	return serie;	42	return serie;
43	}	43	}
44		44
45
46
47	void requestDataLoading(QUuid acqIdentifier, const DataProviderParameters &parameters) override
48	{
49	Q_UNUSED(acqIdentifier)
50	Q_UNUSED(parameters)
51	}
52
53	void requestDataAborting(QUuid acqIdentifier) override
54	{
55	Q_UNUSED(acqIdentifier)
56	}
57
58	};	45	};
59		46
60		47

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