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

* Used partition_id, disk_job_id and disk_system_id instead of uint32.

Browse Source 
* Replaced uint32 for indices and counts with int32.
* Some additions to BDiskDeviceRoster and BDiskDeviceJob.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3453 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2003-06-09 23:02:16 +00:00
parent 0be20072c4
commit bef8916ea6
8 changed files with 75 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/storage/DiskDevice.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
void Unset(); void Unset();
bool IsModified() const; bool IsModified() const;
uint32 CommitModifications(bool synchronously = true, status_t CommitModifications(bool synchronously = true,
BMessenger progressMessenger = BMessenger(), BMessenger progressMessenger = BMessenger(),
bool receiveCompleteProgressUpdates = true, bool receiveCompleteProgressUpdates = true,
BMessage *template = NULL); BMessage *template = NULL);
headers/private/storage/DiskDeviceJob.h
+24 -7
View File
@@ -29,21 +29,38 @@ enum {
B_DISK_DEVICE_JOB_CANCELED, B_DISK_DEVICE_JOB_CANCELED,
}; };
// disk device job progress info
struct disk_device_progress_info {
int32 task_count;
int32 completed_tasks;
float current_task_progress;
char current_task_description[256];
};
// disk device job cancel properties
enum {
B_DISK_DEVICE_JOB_CAN_CANCEL = 0x01,
B_DISK_DEVICE_JOB_STOP_ON_CANCEL = 0x02,
B_DISK_DEVICE_JOB_REVERSE_ON_CANCEL = 0x04,
};
class BDiskDeviceJob { class BDiskDeviceJob {
public: public:
uint32 ID() const; disk_job_id ID() const;
uint32 Type() const; uint32 Type() const;
float Progress() const; // [0.0, 1.0] float Progress() const; // [0.0, 1.0]
uint32 Status() const; uint32 Status() const;
const char *Description() const; const char *Description() const;
status_t GetProgressInfo(disk_devive_progress_info *info) const;
uint32 CancelProperties() const;
BPartition* Partition() const; partition_id PartitionID() const;
private: private:
uint32 fJobID; disk_job_id fJobID;
uint32 fType; uint32 fType;
uint32 fPartitionID; partition_id fPartitionID;
uint32 fStatus; BString fDescription;
BString fDescription;
}; };
#endif // _DISK_DEVICE_JOB_H #endif // _DISK_DEVICE_JOB_H
headers/private/storage/DiskDeviceList.h
+4 -4
View File
@@ -28,8 +28,8 @@ public:
bool Lock(); bool Lock();
void Unlock(); void Unlock();
uint32 CountDevices() const; int32 CountDevices() const;
BDiskDevice *DeviceAt(uint32 index) const; BDiskDevice *DeviceAt(int32 index) const;
BDiskDevice *VisitEachDevice(BDiskDeviceVisitor *visitor); BDiskDevice *VisitEachDevice(BDiskDeviceVisitor *visitor);
BPartition *VisitEachPartition(BDiskDeviceVisitor *visitor); BPartition *VisitEachPartition(BDiskDeviceVisitor *visitor);
@@ -39,8 +39,8 @@ public:
BPartition *VisitEachMountablePartition(BDiskDeviceVisitor *visitor); BPartition *VisitEachMountablePartition(BDiskDeviceVisitor *visitor);
BPartition *VisitEachInitializablePartition(BDiskDeviceVisitor *visitor); BPartition *VisitEachInitializablePartition(BDiskDeviceVisitor *visitor);
BDiskDevice *DeviceWithID(uint32 id) const; BDiskDevice *DeviceWithID(partition_id id) const;
BPartition *PartitionWithID(uint32 id) const; BPartition *PartitionWithID(partition_id id) const;
virtual void MountPointMoved(BPartition *partition); virtual void MountPointMoved(BPartition *partition);
virtual void PartitionMounted(BPartition *partition); virtual void PartitionMounted(BPartition *partition);
headers/private/storage/DiskDevicePrivate.h
+2 -2
View File
@@ -36,13 +36,13 @@ private:
// IDFinderVisitor // IDFinderVisitor
class IDFinderVisitor : public BDiskDeviceVisitor { class IDFinderVisitor : public BDiskDeviceVisitor {
public: public:
IDFinderVisitor(uint32 id); IDFinderVisitor(partition_id id);
virtual bool Visit(BDiskDevice *device); virtual bool Visit(BDiskDevice *device);
virtual bool Visit(BPartition *partition); virtual bool Visit(BPartition *partition);
private: private:
uint32 fID; partition_id fID;
}; };
status_t get_disk_device_messenger(BMessenger *messenger); status_t get_disk_device_messenger(BMessenger *messenger);
headers/private/storage/DiskDeviceRoster.h
+21 -9
View File
@@ -98,6 +98,12 @@ public:
status_t GetNextActiveJob(BDiskDeviceJob *job); status_t GetNextActiveJob(BDiskDeviceJob *job);
status_t RewindActiveJobs(); status_t RewindActiveJobs();
partition_id RegisterDeviceFile(const char *filename);
// publishes: /dev/disk/virtual/files/<disk device ID>/raw
status_t UnregisterDeviceFile(const char *filename);
status_t UnregisterDeviceFile(partition_id device);
// TODO: Add the respective syscalls. Also for Get{Device,Partition}ForPath()
bool VisitEachDevice(BDiskDeviceVisitor *visitor, bool VisitEachDevice(BDiskDeviceVisitor *visitor,
BDiskDevice *device = NULL); BDiskDevice *device = NULL);
bool VisitEachPartition(BDiskDeviceVisitor *visitor, bool VisitEachPartition(BDiskDeviceVisitor *visitor,
@@ -118,10 +124,16 @@ public:
BDiskDevice *device = NULL, BDiskDevice *device = NULL,
BPartition **partition = NULL); BPartition **partition = NULL);
status_t GetDeviceWithID(uint32 id, BDiskDevice *device) const; status_t GetDeviceWithID(partition_id id, BDiskDevice *device) const;
status_t GetPartitionWithID(uint32 id, BDiskDevice *device, status_t GetPartitionWithID(partition_id id, BDiskDevice *device,
BPartition **partition) const; BPartition **partition) const;
partition_id GetDeviceForPath(const char *filename, BDiskDevice *device,
bool registerIfFile = false);
partition_id GetPartitionForPath(const char *filename, BDiskDevice *device,
BPartition **partition,
bool registerIfFile = false);
status_t StartWatching(BMessenger target, status_t StartWatching(BMessenger target,
uint32 eventMask = B_DEVICE_REQUEST_ALL); uint32 eventMask = B_DEVICE_REQUEST_ALL);
status_t StartWatchingJob(BDiskDeviceJob *job, BMessenger target, status_t StartWatchingJob(BDiskDeviceJob *job, BMessenger target,
@@ -129,19 +141,19 @@ public:
status_t StopWatching(BMessenger target); status_t StopWatching(BMessenger target);
private: private:
status_t _GetObjectWithID(const char *fieldName, uint32 id, status_t _GetObjectWithID(const char *fieldName, partition_id id,
BDiskDevice *device) const; BDiskDevice *device) const;
// TODO: Introduce iterators instead of these functions. // TODO: Introduce iterators instead of these functions.
static status_t _GetNextAddOn(BDirectory **directory, uint32 *index, static status_t _GetNextAddOn(BDirectory **directory, int32 *index,
const char *subdir, const char *subdir,
BPrivate::AddOnImage *image); BPrivate::AddOnImage *image);
static status_t _GetNextAddOn(BDirectory *directory, static status_t _GetNextAddOn(BDirectory *directory,
BPrivate::AddOnImage *image); BPrivate::AddOnImage *image);
static status_t _GetNextAddOnDir(BPath *path, uint32 *index, static status_t _GetNextAddOnDir(BPath *path, int32 *index,
const char *subdir); const char *subdir);
static status_t _GetNextAddOnDir(BDirectory **directory, uint32 *index, static status_t _GetNextAddOnDir(BDirectory **directory, int32 *index,
const char *subdir); const char *subdir);
static status_t _LoadPartitionAddOn(const char *partitioningSystem, static status_t _LoadPartitionAddOn(const char *partitioningSystem,
@@ -150,11 +162,11 @@ private:
private: private:
BMessenger fManager; BMessenger fManager;
uint32 fCookie; int32 fCookie;
BDirectory *fPartitionAddOnDir; BDirectory *fPartitionAddOnDir;
BDirectory *fFSAddOnDir; BDirectory *fFSAddOnDir;
uint32 fPartitionAddOnDirIndex; int32 fPartitionAddOnDirIndex;
uint32 fFSAddOnDirIndex; int32 fFSAddOnDirIndex;
}; };
#endif // _DISK_DEVICE_ROSTER_H #endif // _DISK_DEVICE_ROSTER_H
headers/private/storage/DiskSystem.h
+1
View File
@@ -8,6 +8,7 @@
class BDiskSystem { class BDiskSystem {
public: public:
const char *ShortName() const;
const char *Name() const; const char *Name() const;
bool SupportsDefragmenting(BPartition *partition, bool *whileMounted) const; bool SupportsDefragmenting(BPartition *partition, bool *whileMounted) const;
headers/private/storage/Partition.h
+14 -11
View File
@@ -24,7 +24,7 @@ public:
off_t Offset() const; // 0 for devices off_t Offset() const; // 0 for devices
off_t Size() const; off_t Size() const;
uint32 BlockSize() const; uint32 BlockSize() const;
uint32 Index() const; // 0 for devices int32 Index() const; // 0 for devices
uint32 Status() const; uint32 Status() const;
bool IsMountable() const; bool IsMountable() const;
@@ -35,9 +35,10 @@ public:
bool IsMounted() const; bool IsMounted() const;
const char* Name() const; const char* Name() const;
const char* ContentName() const;
const char* Type() const; // See DiskDeviceTypes.h const char* Type() const; // See DiskDeviceTypes.h
const char* ContentType() const; // See DiskDeviceTypes.h const char* ContentType() const; // See DiskDeviceTypes.h
uint32 UniqueID() const; partition_id UniqueID() const;
uint32 Flags() const; uint32 Flags() const;
status_t GetPath(BPath *path) const; status_t GetPath(BPath *path) const;
@@ -49,10 +50,10 @@ public:
// Hierarchy Info // Hierarchy Info
BDiskDevice* Device() const; BDiskDevice *Device() const;
BPartition* Parent() const; BPartition *Parent() const;
BPartition* ChildAt(uint32 index) const; BPartition *ChildAt(int32 index) const;
uint32 CountChildren() const; int32 CountChildren() const;
BPartitioningInfo* GetPartitioningInfo() const; BPartitioningInfo* GetPartitioningInfo() const;
@@ -85,6 +86,8 @@ public:
BDiskScannerParameterEditor **contentEditor); BDiskScannerParameterEditor **contentEditor);
status_t SetParameters(const char *parameters, const char *contentParameters); status_t SetParameters(const char *parameters, const char *contentParameters);
// TODO: Add name/content name editing methods, Also in BDiskSystem.
bool CanInitialize(const char *diskSystem) const; bool CanInitialize(const char *diskSystem) const;
status_t GetInitializationParameterEditor(const char *system, status_t GetInitializationParameterEditor(const char *system,
BDiskScannerParameterEditor **editor) const; BDiskScannerParameterEditor **editor) const;
@@ -101,14 +104,14 @@ public:
status_t CreateChild(off_t start, off_t size, const char *parameters, status_t CreateChild(off_t start, off_t size, const char *parameters,
BPartition** child = NULL); BPartition** child = NULL);
bool CanDeleteChild(uint32 index) const; bool CanDeleteChild(int32 index) const;
status_t DeleteChild(uint32 index); status_t DeleteChild(int32 index);
protected: protected:
off_t fOffset; off_t fOffset;
off_t fSize; off_t fSize;
uint32 fBlockSize; uint32 fBlockSize;
uint32 fIndex; int32 fIndex;
uint32 fStatus; uint32 fStatus;
bool fIsMountable; bool fIsMountable;
@@ -122,12 +125,12 @@ protected:
char fType[B_FILE_NAME_LENGTH]; char fType[B_FILE_NAME_LENGTH];
char fContentType[B_FILE_NAME_LENGTH]; char fContentType[B_FILE_NAME_LENGTH];
uint32 fUniqueID; partition_id fUniqueID;
uint32 fFlags; uint32 fFlags;
BObjectList<BPartition> fChildren; BObjectList<BPartition> fChildren;
uint32 fChangeCounter; int32 fChangeCounter;
} }
#endif // _PARTITION_H #endif // _PARTITION_H
headers/private/storage/PartitioningInfo.h
+8 -6
View File
@@ -10,14 +10,16 @@ class BPartition;
class BPartitioningInfo { class BPartitioningInfo {
public: public:
status_t GetPartitionableSpaceAt(uint32 index, off_t *Offset, off_t *Size) const; status_t GetPartitionableSpaceAt(int32 index, off_t *offset,
uint32 CountPartitionableSpaces() const; off_t *size) const;
int32 CountPartitionableSpaces() const;
BPartition *Parent() const; // needed?
BPartition* Parent() const;
private: private:
off_t *fOffsetArray; off_t *fOffsetArray;
off_t *fSizeArray; off_t *fSizeArray;
uint32 fCount; int32 fCount;
}; };
#endif // _PARTITIONING_INFO_H #endif // _PARTITIONING_INFO_H