diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2014-04-09 22:15:57 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2014-04-09 22:15:57 +0000 |
| commit | dc4ba0969146c6c4a82b1dace6bd9b11b818bcc9 (patch) | |
| tree | f29918fdcab9a801685ebe6a6a7b5446c9cc69ba /bin/bbackupd/BackupClientDirectoryRecord.cpp | |
| parent | 06af9253bc5df053dbe2208cbc724853294020a3 (diff) | |
Poll command socket regularly during file uploads.
Makes the daemon responsive to polling and commands, even during a file
upload operation.
Diffstat (limited to 'bin/bbackupd/BackupClientDirectoryRecord.cpp')
| -rw-r--r-- | bin/bbackupd/BackupClientDirectoryRecord.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/bin/bbackupd/BackupClientDirectoryRecord.cpp b/bin/bbackupd/BackupClientDirectoryRecord.cpp index f2f1f455..4a7eb5a5 100644 --- a/bin/bbackupd/BackupClientDirectoryRecord.cpp +++ b/bin/bbackupd/BackupClientDirectoryRecord.cpp @@ -1707,7 +1707,8 @@ int64_t BackupClientDirectoryRecord::UploadFile( connection.GetTimeout(), &rContext, // DiffTimer implementation 0 /* not interested in the modification time */, - &isCompletelyDifferent); + &isCompletelyDifferent, + rParams.mpBackgroundTask); if(isCompletelyDifferent) { @@ -1727,7 +1728,8 @@ int64_t BackupClientDirectoryRecord::UploadFile( apStreamToUpload = BackupStoreFile::EncodeFile( rFilename, mObjectID, /* containing directory */ rStoreFilename, NULL, &rParams, - &(rParams.mrRunStatusProvider)); + &(rParams.mrRunStatusProvider), + rParams.mpBackgroundTask); } rContext.SetNiceMode(true); @@ -1842,7 +1844,8 @@ BackupClientDirectoryRecord::SyncParams::SyncParams( RunStatusProvider &rRunStatusProvider, SysadminNotifier &rSysadminNotifier, ProgressNotifier &rProgressNotifier, - BackupClientContext &rContext) + BackupClientContext &rContext, + BackgroundTask *pBackgroundTask) : mSyncPeriodStart(0), mSyncPeriodEnd(0), mMaxUploadWait(0), @@ -1856,7 +1859,8 @@ BackupClientDirectoryRecord::SyncParams::SyncParams( mReadErrorsOnFilesystemObjects(false), mMaxUploadRate(0), mUploadAfterThisTimeInTheFuture(99999999999999999LL), - mHaveLoggedWarningAboutFutureFileTimes(false) + mHaveLoggedWarningAboutFutureFileTimes(false), + mpBackgroundTask(pBackgroundTask) { } |