[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeutils/ksim/monitors/disk
From:       Lauri Watts <lauri () kde ! org>
Date:       2003-05-31 23:03:47
[Download RAW message or body]

CVS commit by lauri: 

Fixes builds on FreeBSD on Alpha
Patch courtesy John Baldwin


  M +14 -4     ksimdisk.cpp   1.19


--- kdeutils/ksim/monitors/disk/ksimdisk.cpp  #1.18:1.19
@@ -250,4 +250,14 @@ void DiskView::updateData(DiskList &disk
 
 #ifdef Q_OS_FREEBSD
+#if __FreeBSD_version < 500107
+#define devstat_getdevs(fd, stats)      getdevs(stats)
+#define devstat_selectdevs              selectdevs
+#define bytes_read(dev)                 (dev).bytes_read
+#define bytes_written(dev)              (dev).bytes_written
+#else
+#define bytes_read(dev)                 (dev).bytes[DEVSTAT_READ]
+#define bytes_written(dev)              (dev).bytes[DEVSTAT_WRITE]
+#endif
+
   statinfo diskStats;
   bzero(&diskStats, sizeof(diskStats));
@@ -260,9 +270,9 @@ void DiskView::updateData(DiskList &disk
   device_selection *deviceSelect = 0;
 
-  if (getdevs(&diskStats) < 0)
+  if (devstat_getdevs(NULL, &diskStats) < 0)
     return;
 
   deviceAmount = diskStats.dinfo->numdevs;
-  if (selectdevs(&deviceSelect, &selected, &selections,
+  if (devstat_selectdevs(&deviceSelect, &selected, &selections,
      &generation, diskStats.dinfo->generation,
      diskStats.dinfo->devices, deviceAmount,
@@ -277,6 +287,6 @@ void DiskView::updateData(DiskList &disk
     device = diskStats.dinfo->devices[disk];
     blockSize = (device.block_size <= 0 ? 512 : device.block_size);
-    readBlocks = device.bytes_read / blockSize;
-    writeBlocks = device.bytes_written / blockSize;
+    readBlocks = bytes_read(device) / blockSize;
+    writeBlocks = bytes_written(device) / blockSize;
 
     DiskData diskData;


[prev in list] [next in list] [prev in thread] [next in thread]