[Pkg-owncloud-commits] [owncloud-client] 55/333: Merge branch 'parallel_upload'

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit d4bd327fef80634729776a83a5e84cd8e0724804
Merge: 2de288c 496d900
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Feb 19 10:24:34 2014 +0100

    Merge branch 'parallel_upload'
    
    Conflicts:
    	src/mirall/csyncthread.cpp

 src/CMakeLists.txt                |    7 +
 src/creds/dummycredentials.cpp    |    2 +-
 src/creds/dummycredentials.h      |    3 +
 src/mirall/account.h              |    8 -
 src/mirall/csyncthread.cpp        |   46 +-
 src/mirall/csyncthread.h          |   40 +-
 src/mirall/filesystem.cpp         |  121 +++++
 src/mirall/filesystem.h           |   42 ++
 src/mirall/folder.cpp             |   37 +-
 src/mirall/folder.h               |    1 -
 src/mirall/owncloudpropagator.cpp | 1017 +++----------------------------------
 src/mirall/owncloudpropagator.h   |  127 +++--
 src/mirall/owncloudpropagator_p.h |  120 +----
 src/mirall/propagator_legacy.cpp  |  602 ++++++++++++++++++++++
 src/mirall/propagator_legacy.h    |   82 +++
 src/mirall/propagator_qnam.cpp    |  479 +++++++++++++++++
 src/mirall/propagator_qnam.h      |  136 +++++
 src/mirall/propagatorjobs.cpp     |  360 +++++++++++++
 src/mirall/propagatorjobs.h       |  119 +++++
 src/owncloudcmd/owncloudcmd.cpp   |   22 +-
 20 files changed, 2195 insertions(+), 1176 deletions(-)

diff --cc src/mirall/csyncthread.cpp
index c20d601,c8d1f68..7cd057e
--- a/src/mirall/csyncthread.cpp
+++ b/src/mirall/csyncthread.cpp
@@@ -406,26 -410,9 +410,26 @@@ void CSyncThread::handleSyncError(CSYN
      csync_commit(_csync_ctx);
      emit finished();
      _syncMutex.unlock();
-     thread()->quit();
+     _thread.quit();
  }
  
 +static void updater_progress_callback(CSYNC_PROGRESS *progress, void *userdata)
 +{
 +    static QElapsedTimer localTimer;
 +    static QElapsedTimer remoteTimer;
 +    if (progress->kind == CSYNC_NOTIFY_START_LOCAL_UPDATE) {
 +        localTimer.start();
 +    } else if (progress->kind == CSYNC_NOTIFY_FINISHED_LOCAL_UPDATE) {
 +        // There is also localTimer.nsecsElapsed()
 +        qDebug() << "Local Update took" << localTimer.elapsed() << "msec";
 +    } else if (progress->kind == CSYNC_NOTIFY_START_REMOTE_UPDATE) {
 +        remoteTimer.start();
 +    } else if (progress->kind == CSYNC_NOTIFY_FINISHED_REMOTE_UPDATE) {
 +        qDebug() << "Remote Update took" << remoteTimer.elapsed() << "msec";
 +    }
 +
 +}
 +
  void CSyncThread::startSync()
  {
      if (!_syncMutex.tryLock()) {
@@@ -510,14 -493,17 +510,20 @@@
  
      _syncTime.start();
  
 +    // Only used for the updater progress as we use the new propagator right now which does its own thing
 +    csync_set_progress_callback(_csync_ctx, updater_progress_callback);
 +
-     QElapsedTimer updateTime;
-     updateTime.start();
      qDebug() << "#### Update start #################################################### >>";
  
-     if( csync_update(_csync_ctx) < 0 ) {
+     UpdateJob *job = new UpdateJob(_csync_ctx);
+     job->moveToThread(&_thread);
+     connect(job, SIGNAL(finished(int)), this, SLOT(slotUpdateFinished(int)));
+     QMetaObject::invokeMethod(job, "start");
+ }
+ 
+ void CSyncThread::slotUpdateFinished(int updateResult)
+ {
+     if (updateResult < 0 ) {
          handleSyncError(_csync_ctx, "csync_update");
          return;
      }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git