i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some fixes concerning job queue handling.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4845 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2003-09-28 19:30:57 +00:00
parent 70f0555bce
commit bce1e50726
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/disk_device_manager/KDiskDeviceManager.cpp
+13 -2
View File
@@ -951,6 +951,7 @@ KDiskDeviceManager::_RemoveJobQueue(KDiskDeviceJobQueue *jobQueue)
KDiskDeviceJob *job = jobQueue->JobAt(i); KDiskDeviceJob *job = jobQueue->JobAt(i);
fJobs->Remove(job->ID()); fJobs->Remove(job->ID());
} }
fJobQueues->Erase(it);
return true; return true;
} }
@@ -981,7 +982,7 @@ KDiskDeviceManager::_UpdateBusyPartitions(KDiskDevice *device)
for (int32 i = jobQueue->ActiveJobIndex(); for (int32 i = jobQueue->ActiveJobIndex();
KDiskDeviceJob *job = jobQueue->JobAt(i); i++) { KDiskDeviceJob *job = jobQueue->JobAt(i); i++) {
if (job->Status() != B_DISK_DEVICE_JOB_IN_PROGRESS if (job->Status() != B_DISK_DEVICE_JOB_IN_PROGRESS
&& job->Status() == B_DISK_DEVICE_JOB_SCHEDULED) { && job->Status() != B_DISK_DEVICE_JOB_SCHEDULED) {
continue; continue;
} }
KPartition *partition = FindPartition(job->ScopeID()); KPartition *partition = FindPartition(job->ScopeID());
@@ -992,10 +993,20 @@ KDiskDeviceManager::_UpdateBusyPartitions(KDiskDevice *device)
shadow->AddFlags(B_PARTITION_BUSY); shadow->AddFlags(B_PARTITION_BUSY);
} }
} }
// mark all anscestors of busy partitions descendant busy // mark all anscestors of busy partitions descendant busy and all
// descendants busy
struct MarkBusyVisitor : KPartitionVisitor { struct MarkBusyVisitor : KPartitionVisitor {
virtual bool VisitPre(KPartition *partition)
{
// parent busy => child busy
if (partition->Parent() && partition->Parent()->IsBusy())
partition->Parent()->AddFlags(B_PARTITION_BUSY);
return false;
}
virtual bool VisitPost(KPartition *partition) virtual bool VisitPost(KPartition *partition)
{ {
// child [descendant] busy => parent descendant busy
if ((partition->IsBusy() || partition->IsDescendantBusy()) if ((partition->IsBusy() || partition->IsDescendantBusy())
&& partition->Parent()) { && partition->Parent()) {
partition->Parent()->AddFlags( partition->Parent()->AddFlags(