localhorst/reHDD
1
0
Fork 1
Code Issues 8 Pull Requests 1 Releases 10 Wiki Activity

make members atomic

Browse Source
This commit is contained in:
Hendrik Schutter
2025-12-10 20:40:48 +01:00
parent acc05dac8b
commit a4f15460d3
8 changed files with 52 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/reHDD.cpp
View File

@ -133,7 +133,7 @@ void reHDD::ThreadCheckFrozenDrives()
mxDrives.lock();
for (auto it = begin(listDrives); it != end(listDrives); ++it)
{
if (it->state == Drive::SHRED_ACTIVE)
if (it->state == Drive::TaskState::SHRED_ACTIVE)
{
it->checkFrozenDrive();
}
@ -175,9 +175,9 @@ void reHDD::ThreadUserInput()
if (tmpSelectedDrive != nullptr)
{
if (tmpSelectedDrive->state == Drive::NONE)
if (tmpSelectedDrive->state == Drive::TaskState::NONE)
{
tmpSelectedDrive->state = Drive::DELETE_SELECTED;
tmpSelectedDrive->state = Drive::TaskState::DELETE_SELECTED;
}
}
@ -187,9 +187,9 @@ void reHDD::ThreadUserInput()
// cout << "Shred" << endl;
if (tmpSelectedDrive != nullptr)
{
if (tmpSelectedDrive->state == Drive::NONE)
if (tmpSelectedDrive->state == Drive::TaskState::NONE)
{
tmpSelectedDrive->state = Drive::SHRED_SELECTED;
tmpSelectedDrive->state = Drive::TaskState::SHRED_SELECTED;
}
}
ui->updateTUI(&listDrives, u16SelectedEntry);
@ -302,7 +302,7 @@ void reHDD::filterNewDrives(list<Drive> *plistOldDrives, list<Drive> *plistNewDr
{
// cout << "offline drive found: " << itOld->getPath() << endl;
Logger::logThis()->warning("Mark offline drive found: " + itOld->getPath());
itOld->state = Drive::NONE; // clear state --> shred task will terminate
itOld->state = Drive::TaskState::NONE; // clear state --> shred task will terminate
}
}
@ -340,26 +340,26 @@ void reHDD::searchDrives(std::list<Drive> *plistDrives)
continue;
Drive tmpDrive("/dev/" + devName);
tmpDrive.state = Drive::NONE;
tmpDrive.state = Drive::TaskState::NONE;
tmpDrive.bIsOffline = false;
// Set connection type
if (transport == "sata")
tmpDrive.connectionType = Drive::SATA;
tmpDrive.connectionType = Drive::ConnectionType::SATA;
else if (transport == "usb")
tmpDrive.connectionType = Drive::USB;
tmpDrive.connectionType = Drive::ConnectionType::USB;
else if (transport == "nvme")
tmpDrive.connectionType = Drive::NVME;
tmpDrive.connectionType = Drive::ConnectionType::NVME;
else
tmpDrive.connectionType = Drive::UNKNOWN;
tmpDrive.connectionType = Drive::ConnectionType::UNKNOWN;
plistDrives->push_back(tmpDrive);
Logger::logThis()->info(
"Drive found: " + tmpDrive.getPath() +
" (type: " +
(tmpDrive.connectionType == Drive::USB ? "USB" : tmpDrive.connectionType == Drive::SATA ? "SATA"
: tmpDrive.connectionType == Drive::NVME ? "NVME"
(tmpDrive.connectionType == Drive::ConnectionType::USB ? "USB" : tmpDrive.connectionType == Drive::ConnectionType::SATA ? "SATA"
: tmpDrive.connectionType == Drive::ConnectionType::NVME ? "NVME"
: "UNKNOWN") +
")");
}
@ -478,7 +478,7 @@ void reHDD::startShredAllDrives(list<Drive> *plistDrives)
mxDrives.lock();
for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
{
if (it->state == Drive::NONE)
if (it->state == Drive::TaskState::NONE)
{
Drive *pTmpDrive = iterator_to_pointer<Drive, std::list<Drive>::iterator>(it);
#ifdef LOG_LEVEL_HIGH
@ -505,9 +505,9 @@ void reHDD::stopShredAllDrives(list<Drive> *plistDrives)
for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
{
if (it->state == Drive::SHRED_ACTIVE || it->state == Drive::DELETE_ACTIVE)
if (it->state == Drive::TaskState::SHRED_ACTIVE || it->state == Drive::TaskState::DELETE_ACTIVE)
{
it->state = Drive::NONE;
it->state = Drive::TaskState::NONE;
Logger::logThis()->info("Abort-Shred-Signal for: " + it->getModelName() + "-" + it->getSerial());
// task for drive is running --> remove selection
}
@ -566,7 +566,7 @@ void reHDD::updateShredMetrics(list<Drive> *plistDrives)
list<Drive>::iterator it;
for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
{
if (it->state == Drive::SHRED_ACTIVE)
if (it->state == Drive::TaskState::SHRED_ACTIVE)
{
Drive *pTmpDrive = iterator_to_pointer<Drive, std::list<Drive>::iterator>(it);
// set metrics for calculating shred speed
@ -675,9 +675,9 @@ void reHDD::handleAbort()
Drive *tmpSelectedDrive = getSelectedDrive();
if (tmpSelectedDrive != nullptr)
{
if (tmpSelectedDrive->state == Drive::SHRED_ACTIVE || tmpSelectedDrive->state == Drive::DELETE_ACTIVE)
if (tmpSelectedDrive->state == Drive::TaskState::SHRED_ACTIVE || tmpSelectedDrive->state == Drive::TaskState::DELETE_ACTIVE)
{
tmpSelectedDrive->state = Drive::NONE;
tmpSelectedDrive->state = Drive::TaskState::NONE;
Logger::logThis()->info("Abort-Shred-Signal for: " + tmpSelectedDrive->getModelName() + "-" + tmpSelectedDrive->getSerial());
// task for drive is running --> remove selection
}