GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r694:34234d13df5c

request is now passed by shared pointer instead of const &

perrinel -

r694:34234d13df5c

parent child

Context file:

r694:34234d13df5c

core/include/Data/IDataProvider.h +1 -1

                  * @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.
                  */
-                void requestConstructed(const QNetworkRequest &request, QUuid acqIdentifier,
+                void requestConstructed(std::shared_ptr<QNetworkRequest> request, QUuid acqIdentifier,
                                         std::function<void(QNetworkReply *, QUuid)> callback);
             };

core/include/Network/NetworkController.h +6 -2

             #include <QObject>
             #include <QUuid>
+            #include <Common/MetaTypes.h>
             #include <Common/spimpl.h>
             #include <functional>
             public slots:
                 /// Execute request and call callback when the reply is finished. Identifier is attached to the
                 /// callback
-                void onProcessRequested(const QNetworkRequest &request, QUuid identifier,
+                void onProcessRequested(std::shared_ptr<QNetworkRequest> request, QUuid identifier,
                                         std::function<void(QNetworkReply *, QUuid)> callback);
                 /// Cancel the request of identifier
                 void onReplyCanceled(QUuid identifier);
             signals:
                 void replyFinished(QNetworkReply *reply, QUuid identifier);
-                void replyDownloadProgress(QUuid identifier, const QNetworkRequest &networkRequest,
+                void replyDownloadProgress(QUuid identifier, std::shared_ptr<QNetworkRequest> networkRequest,
                                            double progress);
             private:
                 spimpl::unique_impl_ptr<NetworkControllerPrivate> impl;
             };
+            SCIQLOP_REGISTER_META_TYPE(NETWORKREQUEST_REGISTRY, std::shared_ptr<QNetworkRequest>)
             #endif // SCIQLOP_NETWORKCONTROLLER_H

core/src/Network/NetworkController.cpp +7 -8

             {
             }
-            void NetworkController::onProcessRequested(const QNetworkRequest &request, QUuid identifier,
+            void NetworkController::onProcessRequested(std::shared_ptr<QNetworkRequest> request,
+                                                       QUuid identifier,
                                                        std::function<void(QNetworkReply *, QUuid)> callback)
             {
-                qCDebug(LOG_NetworkController()) << tr("NetworkController registered")
+                qCDebug(LOG_NetworkController()) << tr("NetworkController onProcessRequested")
-                                                 << QThread::currentThread()->objectName();
+                                                 << QThread::currentThread()->objectName() << &request;
-                auto reply = impl->m_AccessManager->get(request);
+                auto reply = impl->m_AccessManager->get(*request);
                 // Store the couple reply id
                 impl->lockWrite();
                 auto onReplyFinished = [request, reply, this, identifier, callback]() {
                     qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyFinished")
-                                                     << QThread::currentThread() << reply;
+                                                     << QThread::currentThread() << request.get() << reply;
                     impl->lockRead();
                     auto it = impl->m_NetworkReplyToVariableId.find(reply);
                     impl->unlock();
                         // Deletes reply
                         callback(reply, identifier);
                         reply->deleteLater();
-                        emit this->replyDownloadProgress(identifier, request, 0);
                     }
                     qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyFinished END")
                     double progress = (bytesRead * 100.0) / totalBytes;
                     qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyProgress") << progress
-                                                     << QThread::currentThread() << reply;
+                                                     << QThread::currentThread() << request.get() << reply;
                     impl->lockRead();
                     auto it = impl->m_NetworkReplyToVariableId.find(reply);
                     impl->unlock();

core/src/Variable/VariableAcquisitionWorker.cpp +2 -32

@@ -117,20 +117,6 void VariableAcquisitionWorker::onVariableRetrieveDataInProgress(QUuid acqIdenti
117	= std::isnan(progress) ? 0.0 : (progress * currentPartSize) / 100.0;	117	= std::isnan(progress) ? 0.0 : (progress * currentPartSize) / 100.0;
118	auto currentAlreadyProgress = aIdToARit->second.m_Progression * currentPartSize;	118	auto currentAlreadyProgress = aIdToARit->second.m_Progression * currentPartSize;
119		119
120	qCInfo(LOG_VariableAcquisitionWorker()) << tr("TORM: progress :") << progress;
121	qCInfo(LOG_VariableAcquisitionWorker()) << tr("TORM: onVariableRetrieveDataInProgress A:")
122	<< aIdToARit->second.m_Progression
123	<< aIdToARit->second.m_Size;
124	qCInfo(LOG_VariableAcquisitionWorker()) << tr("TORM: onVariableRetrieveDataInProgress B:")
125	<< currentPartSize;
126	qCInfo(LOG_VariableAcquisitionWorker()) << tr("TORM: onVariableRetrieveDataInProgress C:")
127	<< currentPartProgress;
128	qCInfo(LOG_VariableAcquisitionWorker()) << tr("TORM: onVariableRetrieveDataInProgress D:")
129	<< currentAlreadyProgress;
130	qCInfo(LOG_VariableAcquisitionWorker()) << tr("TORM: onVariableRetrieveDataInProgress E:")
131	<< currentAlreadyProgress + currentPartProgress
132	<< "\n";
133
134	auto finalProgression = currentAlreadyProgress + currentPartProgress;	120	auto finalProgression = currentAlreadyProgress + currentPartProgress;
135	emit variableRequestInProgress(aIdToARit->second.m_vIdentifier, finalProgression);	121	emit variableRequestInProgress(aIdToARit->second.m_vIdentifier, finalProgression);
136		122
@@ -145,8 +131,8 void VariableAcquisitionWorker::onVariableDataAcquired(QUuid acqIdentifier,
145	std::shared_ptr<IDataSeries> dataSeries,	131	std::shared_ptr<IDataSeries> dataSeries,
146	SqpRange dataRangeAcquired)	132	SqpRange dataRangeAcquired)
147	{	133	{
148	qC~~Info~~(LOG_VariableAcquisitionWorker()) << tr("TORM: onVariableDataAcquired on range ")	134	qCDebug(LOG_VariableAcquisitionWorker()) << tr("TORM: onVariableDataAcquired on range ")
149	<< acqIdentifier << dataRangeAcquired;	135	<< acqIdentifier << dataRangeAcquired;
150	impl->lockWrite();	136	impl->lockWrite();
151	auto aIdToARit = impl->m_AcqIdentifierToAcqRequestMap.find(acqIdentifier);	137	auto aIdToARit = impl->m_AcqIdentifierToAcqRequestMap.find(acqIdentifier);
152	if (aIdToARit != impl->m_AcqIdentifierToAcqRequestMap.cend()) {	138	if (aIdToARit != impl->m_AcqIdentifierToAcqRequestMap.cend()) {
@@ -269,19 +255,3 void VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate::removeVariable
269	m_VIdentifierToCurrrentAcqIdNextIdPairMap.erase(vIdentifier);	255	m_VIdentifierToCurrrentAcqIdNextIdPairMap.erase(vIdentifier);
270	unlock();	256	unlock();
271	}	257	}
272
273	//void VariableAcquisitionWorker::onExecuteRequest(QUuid acqIdentifier)
274	//{
275	// qCDebug(LOG_VariableAcquisitionWorker()) << tr("onExecuteRequest") << QThread::currentThread();
276	// impl->lockRead();
277	// auto it = impl->m_AcqIdentifierToAcqRequestMap.find(acqIdentifier);
278	// if (it != impl->m_AcqIdentifierToAcqRequestMap.cend()) {
279	// auto request = it->second;
280	// impl->unlock();
281	// request.m_Provider->requestDataLoading(acqIdentifier, request.m_DataProviderParameters);
282	// }
283	// else {
284	// impl->unlock();
285	// // TODO log no acqIdentifier recognized
286	// }
287	//}

core/src/Variable/VariableController.cpp +3 -2

             void VariableController::onVariableRetrieveDataInProgress(QUuid identifier, double progress)
             {
-                qCInfo(LOG_VariableController()) << "TORM: ariableController::onVariableRetrieveDataInProgress"
+                qCDebug(LOG_VariableController())
-                                                 << QThread::currentThread()->objectName() << progress;
+                    << "TORM: variableController::onVariableRetrieveDataInProgress"
+                    << QThread::currentThread()->objectName() << progress;
                 if (auto var = impl->findVariable(identifier)) {
                     impl->m_VariableModel->setDataProgress(var, progress);
                 }

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