strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

wsd: Save -> Upload in StorageManager

Browse source 
We use download/upload in the storage
and load/save elsewhere, to avoid confusion.

This renames 'save' to 'upload' in the storage
for consistency.

Change-Id: I9ac991c2b52e2586b97c58db02110ff04bfd17d3
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
This commit is contained in:
Ashod Nakashian 2021-02-14 09:31:38 -05:00 committed by Ashod Nakashian
parent 81da7c7bff
commit a350dad19b
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wsd/DocumentBroker.cpp
View file

@ -1025,7 +1025,7 @@ void DocumentBroker::uploadToStorageInternal(const std::string& sessionId, bool
if (!success && result == "unmodified" && !isRename && !force)
{
LOG_DBG("Skipped uploading as document [" << _docKey << "] was not modified.");
_storageManager.markLastSaveTime(); // Mark that the storage is up-to-date.
_storageManager.markLastUploadTime(); // Mark that the storage is up-to-date.
broadcastSaveResult(true, "unmodified");
_poll->wakeup();
return;
@ -1120,7 +1120,7 @@ void DocumentBroker::handleUploadToStorageResponse(const StorageUploadDetails& d
{
// Saved and stored; update flags.
_saveManager.setLastModifiedTime(details.newFileModifiedTime);
_storageManager.markLastSaveTime();
_storageManager.markLastUploadTime();
// Save the storage timestamp.
_storageManager.setLastModifiedTime(_storage->getFileInfo().getModifiedTime());
@ -1367,7 +1367,7 @@ bool DocumentBroker::autoSave(const bool force, const bool dontSaveIfUnmodified)
const std::chrono::milliseconds inactivityTimeMs
= std::chrono::duration_cast<std::chrono::milliseconds>(now - _lastActivityTime);
const auto timeSinceLastSaveMs = std::chrono::duration_cast<std::chrono::milliseconds>(
now - _storageManager.getLastSaveTime());
now - _storageManager.getLastUploadTime());
LOG_TRC("Time since last save of docKey [" << _docKey << "] is " << timeSinceLastSaveMs
<< " and most recent activity was "
<< inactivityTimeMs << " ago.");
@ -2617,7 +2617,7 @@ void DocumentBroker::dumpState(std::ostream& os)
os << "\n doc id: " << _docId;
os << "\n num sessions: " << _sessions.size();
os << "\n thread start: " << Util::getSteadyClockAsString(_threadStart);
os << "\n last saved: " << Util::getSteadyClockAsString(_storageManager.getLastSaveTime());
os << "\n last saved: " << Util::getSteadyClockAsString(_storageManager.getLastUploadTime());
os << "\n last save request: "
<< Util::getSteadyClockAsString(_saveManager.lastSaveRequestTime());
os << "\n last save response: "

18
wsd/DocumentBroker.hpp
View file

@ -722,13 +722,16 @@ private:
{
public:
StorageManager()
: _lastSaveTime(RequestManager::now())
: _lastUploadTime(RequestManager::now())
, _lastUploadedFileModifiedTime(std::chrono::system_clock::now())
{
}
/// Marks the last time we attempted to save and upload, regardless of outcome, to now.
void markLastSaveTime() { _lastSaveTime = RequestManager::now(); }
/// Marks the last time we attempted to upload, regardless of outcome, to now.
void markLastUploadTime() { _lastUploadTime = RequestManager::now(); }
// Gets the last time we attempted to upload.
std::chrono::steady_clock::time_point getLastUploadTime() const { return _lastUploadTime; }
/// Returns whether the last upload was successful or not.
bool lastUploadSuccessful() const { return _request.lastRequestSuccessful(); }
@ -736,9 +739,6 @@ private:
/// Sets whether the last upload was successful or not.
void setLastUploadResult(bool success) { _request.setLastRequestResult(success); }
// Gets the last time we attempted to save.
std::chrono::steady_clock::time_point getLastSaveTime() const { return _lastSaveTime; }
/// Get the modified-timestamp of the local file on disk we last uploaded.
std::chrono::system_clock::time_point getLastUploadedFileModifiedTime() const
{
@ -767,14 +767,14 @@ private:
/// Request tracking logic.
RequestManager _request;
/// The last time we tried saving and uploading, regardless of
/// whether the document was modified and a newer version saved
/// The last time we tried uploading, regardless of whether the
/// document was modified and a newer version saved
/// and uploaded or not. In effect, this tracks the time we
/// synchronized with Storage (i.e. the last time we either uploaded
/// or had nothing new to upload). It is redundant as it is
/// equivalent to the larger of 'Last Save Response Time' and
/// 'Last Storage Response Time', and should be removed.
std::chrono::steady_clock::time_point _lastSaveTime;
std::chrono::steady_clock::time_point _lastUploadTime;
/// The modified-timestamp of the local file on disk we uploaded last.
std::chrono::system_clock::time_point _lastUploadedFileModifiedTime;