Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/sessionmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
#include <QDateTime>
#include <QElapsedTimer>
#include <algorithm>
#include <cerrno>
#include <cstring>
#include <fcntl.h>
#include <unistd.h>

static constexpr int kMaxSessionCount = 100;
Expand Down Expand Up @@ -985,6 +988,16 @@ void SessionManager::saveSessionScrollback(SessionInfo &info)
::fsync(saveFile.handle());
if (saveFile.commit()) {
info.scrollbackDirty = false;
// fsync the parent directory so the rename's dirent update
// survives a power loss (file content is already durable).
int dirFd = ::open(scrollbackDir().toUtf8().constData(), O_RDONLY);
if (dirFd >= 0) {
if (::fsync(dirFd) != 0)
qWarning() << "Scrollback: dir fsync failed:" << std::strerror(errno);
::close(dirFd);
} else {
qWarning() << "Scrollback: dir fsync open failed:" << std::strerror(errno);
}
} else {
qWarning() << "Failed to commit scrollback:" << saveFile.errorString();
}
Expand Down
13 changes: 13 additions & 0 deletions src/settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

#include <QStandardPaths>
#include <QFile>
#include <QFileInfo>
#include <QDebug>

#include <cerrno>
#include <cstdio>
#include <cstring>
#include <fcntl.h>
#include <unistd.h>

Settings::Settings(QObject *parent)
Expand Down Expand Up @@ -89,6 +91,17 @@ void Settings::save()
qWarning() << "Settings: atomic save failed:" << std::strerror(errno);
QFile::remove(tmpPath);
m_settings.sync();
} else {
// fsync the parent directory so the rename's dirent update
// survives a power loss (file content is already durable).
int dirFd = ::open(QFileInfo(path).absolutePath().toUtf8().constData(), O_RDONLY);
if (dirFd >= 0) {
if (::fsync(dirFd) != 0)
qWarning() << "Settings: dir fsync failed:" << std::strerror(errno);
::close(dirFd);
} else {
qWarning() << "Settings: dir fsync open failed:" << std::strerror(errno);
}
}
} else {
m_settings.sync();
Expand Down
Loading