Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uses KPath now, which significantly reduces the stack footprint.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9552 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2004-10-27 21:59:05 +00:00
parent 1766c66484
commit 8ece359269
1 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/kernel/core/disk_device_manager/KDiskDeviceManager.cpp
View File

@ -30,6 +30,7 @@
#include "KPartition.h" #include "KPartition.h"
#include "KPartitioningSystem.h" #include "KPartitioningSystem.h"
#include "KPartitionVisitor.h" #include "KPartitionVisitor.h"
#include "KPath.h"
#include "KShadowPartition.h" #include "KShadowPartition.h"
// debugging // debugging
@ -154,17 +155,23 @@ KDiskDeviceManager::KDiskDeviceManager()
size_t partitioningPrefixLength = strlen(kPartitioningSystemPrefix); size_t partitioningPrefixLength = strlen(kPartitioningSystemPrefix);
while (true) { while (true) {
char name[B_PATH_NAME_LENGTH]; KPath name;
size_t nameLength = sizeof(name); if (name.InitCheck() != B_OK)
if (get_next_loaded_module_name(&cookie, name, &nameLength) != B_OK)
break; break;
size_t nameLength = name.BufferSize();
if (get_next_loaded_module_name(&cookie, name.LockBuffer(),
&nameLength) != B_OK) {
break;
}
name.UnlockBuffer();
if (!strncmp(name, kPartitioningSystemPrefix, partitioningPrefixLength)) { if (!strncmp(name.Path(), kPartitioningSystemPrefix,
DBG(OUT("partitioning system: %s\n", name)); partitioningPrefixLength)) {
_AddPartitioningSystem(name); DBG(OUT("partitioning system: %s\n", name.Path()));
} else if (is_fs_disk_device(name)) { _AddPartitioningSystem(name.Path());
DBG(OUT("file system: %s\n", name)); } else if (is_fs_disk_device(name.Path())) {
_AddFileSystem(name); DBG(OUT("file system: %s\n", name.Path()));
_AddFileSystem(name.Path());
} }
} }
@ -306,18 +313,22 @@ KDiskDeviceManager::FindDevice(partition_id id, bool deviceOnly)
return NULL; return NULL;
} }
//#include "AutoDeleter.h"
// FindPartition // FindPartition
KPartition * KPartition *
KDiskDeviceManager::FindPartition(const char *path, bool noShadow) KDiskDeviceManager::FindPartition(const char *path, bool noShadow)
{ {
// TODO: Optimize! // TODO: Optimize!
KPath partitionPath;
if (partitionPath.InitCheck() != B_OK)
return NULL;
for (PartitionMap::Iterator it = fPartitions->Begin(); for (PartitionMap::Iterator it = fPartitions->Begin();
it != fPartitions->End(); it != fPartitions->End();
++it) { ++it) {
KPartition *partition = it->Value(); KPartition *partition = it->Value();
char partitionPath[B_PATH_NAME_LENGTH]; if (partition->GetPath(&partitionPath) == B_OK
if (partition->GetPath(partitionPath) == B_OK && partitionPath == path) {
&& !strcmp(path, partitionPath)) {
if (noShadow && partition->IsShadowPartition()) if (noShadow && partition->IsShadowPartition())
return partition->PhysicalPartition(); return partition->PhysicalPartition();
return partition; return partition;
@ -690,6 +701,9 @@ KDiskDeviceManager::NextJob(int32 *cookie)
} }
// AddJobQueue // AddJobQueue
/*!
The device must be write locked, the manager must be locked.
*/
status_t status_t
KDiskDeviceManager::AddJobQueue(KDiskDeviceJobQueue *jobQueue) KDiskDeviceManager::AddJobQueue(KDiskDeviceJobQueue *jobQueue)
{ {
@ -1008,6 +1022,9 @@ KDiskDeviceManager::_RemoveJobQueue(KDiskDeviceJobQueue *jobQueue)
} }
// _UpdateBusyPartitions // _UpdateBusyPartitions
/*!
The device must be write locked, the manager must be locked.
*/
status_t status_t
KDiskDeviceManager::_UpdateBusyPartitions(KDiskDevice *device) KDiskDeviceManager::_UpdateBusyPartitions(KDiskDevice *device)
{ {
@ -1096,10 +1113,12 @@ KDiskDeviceManager::_UpdateJobStatus(KDiskDeviceJob *job, uint32 status,
status_t status_t
KDiskDeviceManager::_Scan(const char *path) KDiskDeviceManager::_Scan(const char *path)
{ {
DBG(OUT("KDiskDeviceManager::_Scan(%s)\n", path));
status_t error = B_OK; status_t error = B_OK;
struct stat st; struct stat st;
if (lstat(path, &st) < 0) if (lstat(path, &st) < 0) {
return errno; return errno;
}
if (S_ISDIR(st.st_mode)) { if (S_ISDIR(st.st_mode)) {
// a directory: iterate through its contents // a directory: iterate through its contents
DIR *dir = opendir(path); DIR *dir = opendir(path);
@ -1109,11 +1128,12 @@ KDiskDeviceManager::_Scan(const char *path)
// skip "." and ".." // skip "." and ".."
if (!strcmp(entry->d_name, ".") || !strcmp(entry->d_name, "..")) if (!strcmp(entry->d_name, ".") || !strcmp(entry->d_name, ".."))
continue; continue;
if (strlen(path) + strlen(entry->d_name) + 1 >= B_PATH_NAME_LENGTH) KPath entryPath;
if (entryPath.SetPath(path) != B_OK
|| entryPath.Append(entry->d_name) != B_OK) {
continue; continue;
char entryPath[B_PATH_NAME_LENGTH]; }
sprintf(entryPath, "%s/%s", path, entry->d_name); _Scan(entryPath.Path());
_Scan(entryPath);
} }
closedir(dir); closedir(dir);
} else { } else {
@ -1141,6 +1161,9 @@ DBG(OUT(" found device: %s\n", path));
} }
// _ScanPartition // _ScanPartition
/*!
The device must be write locked, the manager must be locked.
*/
status_t status_t
KDiskDeviceManager::_ScanPartition(KPartition *partition) KDiskDeviceManager::_ScanPartition(KPartition *partition)
{ {