[haiku-commits] r37658 - haiku/trunk/src/tests/system/kernel/file_corruption/driver
- From: ingo_weinhold@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 21 Jul 2010 17:29:29 +0200 (CEST)
Author: bonefish
Date: 2010-07-21 17:29:29 +0200 (Wed, 21 Jul 2010)
New Revision: 37658
Changeset: http://dev.haiku-os.org/changeset/37658
Modified:
haiku/trunk/src/tests/system/kernel/file_corruption/driver/checksum_device.cpp
Log:
Added support for using underlying devices -- we need to get the size with
the B_GET_GEOMETRY ioctl instead.
Modified:
haiku/trunk/src/tests/system/kernel/file_corruption/driver/checksum_device.cpp
===================================================================
---
haiku/trunk/src/tests/system/kernel/file_corruption/driver/checksum_device.cpp
2010-07-21 15:28:30 UTC (rev 37657)
+++
haiku/trunk/src/tests/system/kernel/file_corruption/driver/checksum_device.cpp
2010-07-21 15:29:29 UTC (rev 37658)
@@ -326,7 +326,7 @@
status_t Init(const char* fileName)
{
- // open and stat file
+ // open file/device
fFD = open(fileName, O_RDWR | O_NOCACHE);
// TODO: The O_NOCACHE is a work-around for a page
writer problem.
// Since it collects pages for writing back without
regard for
@@ -336,11 +336,32 @@
if (fFD < 0)
return errno;
+ // get the size
struct stat st;
if (fstat(fFD, &st) < 0)
return errno;
- fFileSize = st.st_size / B_PAGE_SIZE * B_PAGE_SIZE;
+ switch (st.st_mode & S_IFMT) {
+ case S_IFREG:
+ fFileSize = st.st_size;
+ break;
+ case S_IFCHR:
+ case S_IFBLK:
+ {
+ device_geometry geometry;
+ if (ioctl(fFD, B_GET_GEOMETRY, &geometry,
sizeof(geometry)) < 0)
+ return errno;
+
+ fFileSize = (off_t)geometry.bytes_per_sector
+ * geometry.sectors_per_track
+ * geometry.cylinder_count *
geometry.head_count;
+ break;
+ }
+ default:
+ return B_BAD_VALUE;
+ }
+
+ fFileSize = fFileSize / B_PAGE_SIZE * B_PAGE_SIZE;
fDeviceSize = fFileSize / (B_PAGE_SIZE + kCheckSumLength) *
B_PAGE_SIZE;
// find a free slot
Other related posts:
- » [haiku-commits] r37658 - haiku/trunk/src/tests/system/kernel/file_corruption/driver - ingo_weinhold
