GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r698:076c09acb9f6

Update networkcontroller for abort mechanism

perrinel -

r698:076c09acb9f6

parent child

Context file:

r698:076c09acb9f6

core/src/Network/NetworkController.cpp +28 -19

                  QMutex m_WorkingMutex;
                  QReadWriteLock m_Lock;
-                 std::unordered_map<QNetworkReply *, QUuid> m_NetworkReplyToVariableId;
+                 std::unordered_map<QNetworkReply *, QUuid> m_NetworkReplyToId;
                  std::unique_ptr<QNetworkAccessManager> m_AccessManager{nullptr};
              };
                  // Store the couple reply id
                  impl->lockWrite();
-                 impl->m_NetworkReplyToVariableId[reply] = identifier;
+                 impl->m_NetworkReplyToId[reply] = identifier;
+                 qCDebug(LOG_NetworkController()) << tr("Store for reply: ") << identifier;
                  impl->unlock();
                  auto onReplyFinished = [request, reply, this, identifier, callback]() {
                      qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyFinished")
                                                       << QThread::currentThread() << request.get() << reply;
                      impl->lockRead();
-                     auto it = impl->m_NetworkReplyToVariableId.find(reply);
+                     auto it = impl->m_NetworkReplyToId.find(reply);
                      impl->unlock();
-                     if (it != impl->m_NetworkReplyToVariableId.cend()) {
+                     if (it != impl->m_NetworkReplyToId.cend()) {
                          impl->lockWrite();
-                         impl->m_NetworkReplyToVariableId.erase(reply);
+                         qCDebug(LOG_NetworkController()) << tr("Remove for reply: ")
+                                                         << impl->m_NetworkReplyToId[reply];
+                         impl->m_NetworkReplyToId.erase(reply);
                          impl->unlock();
                          // Deletes reply
                          callback(reply, identifier);
                  auto onReplyProgress = [reply, request, this](qint64 bytesRead, qint64 totalBytes) {
-                     double progress = (bytesRead * 100.0) / totalBytes;
-                     qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyProgress") << progress
-                                                      << QThread::currentThread() << request.get() << reply;
-                     impl->lockRead();
-                     auto it = impl->m_NetworkReplyToVariableId.find(reply);
-                     impl->unlock();
-                     if (it != impl->m_NetworkReplyToVariableId.cend()) {
-                         emit this->replyDownloadProgress(it->second, request, progress);
+                     // NOTE: a totalbytes of 0 can happened when a request has been aborted
+                     if (totalBytes > 0) {
+                         double progress = (bytesRead * 100.0) / totalBytes;
+                         qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyProgress") << progress
+                                                         << QThread::currentThread() << request.get() << reply
+                                                         << bytesRead << totalBytes;
+                         impl->lockRead();
+                         auto it = impl->m_NetworkReplyToId.find(reply);
+                         impl->unlock();
+                         if (it != impl->m_NetworkReplyToId.cend()) {
            


        

    

      

  

      
          

              

                    
                        
                        note
                    

              
          
          
              
  

  
    
  
  

  

    
        perrinel
    
  

          

          
              Thu, 21 Sep 2017 14:44:48
          


          

              
                
              

          

                    
                    

            
              
              

                
                    Comment #2229
                    
                

                      
                      
                        Edit
                      
                      
                        Delete
                      
              
            

            |
                 
                 

          
      
      
          ok
+                             emit this->replyDownloadProgress(it->second, request, progress);
+                         }
+                         qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyProgress END")
+                                                          << QThread::currentThread() << reply;
                      }
-                     qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyProgress END")
-                                                      << QThread::currentThread() << reply;
                  };
              {
                  auto findReply = [identifier](const auto &entry) { return identifier == entry.second; };
                  qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyCanceled")
-                                                  << QThread::currentThread();
+                                                 << QThread::currentThread() << identifier;
                  impl->lockRead();
-                 auto end = impl->m_NetworkReplyToVariableId.cend();
-                 auto it = std::find_if(impl->m_NetworkReplyToVariableId.cbegin(), end, findReply);
+                 auto end = impl->m_NetworkReplyToId.cend();
+                 auto it = std::find_if(impl->m_NetworkReplyToId.cbegin(), end, findReply);
                  impl->unlock();
                  if (it != end) {
+                     qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyCanceled ABORT DONE")
+                                                     << QThread::currentThread() << identifier;
                      it->first->abort();
                  }
                  qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyCanceled END")
-                                                  << QThread::currentThread();
+                                                 << QThread::currentThread();
              }
              void NetworkController::waitForFinish()

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