ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/libstatgrab/src/libstatgrab/disk_stats.c
(Generate patch)

Comparing projects/libstatgrab/src/libstatgrab/disk_stats.c (file contents):
Revision 1.67 by ats, Thu Apr 8 13:44:44 2004 UTC vs.
Revision 1.69 by tdb, Sun Jun 20 17:00:25 2004 UTC

# Line 344 | Line 344 | sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
344  
345          size = sizeof(diskcount);
346          if (sysctl(mib, MIBSIZE, &diskcount, &size, NULL, 0) < 0) {
347 <                sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKCOUNT");
347 >                sg_set_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKCOUNT");
348                  return NULL;
349          }
350  
# Line 352 | Line 352 | sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
352          mib[1] = HW_DISKNAMES;
353  
354          if (sysctl(mib, MIBSIZE, NULL, &size, NULL, 0) < 0) {
355 <                sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKNAMES");
355 >                sg_set_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKNAMES");
356                  return NULL;
357          }
358  
# Line 362 | Line 362 | sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
362          }
363  
364          if (sysctl(mib, MIBSIZE, disknames, &size, NULL, 0) < 0) {
365 <                sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKNAMES");
365 >                sg_set_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKNAMES");
366                  return NULL;
367          }
368  
# Line 381 | Line 381 | sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
381   #endif
382  
383          if (sysctl(mib, MIBSIZE, NULL, &size, NULL, 0) < 0) {
384 <                sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKSTATS");
384 >                sg_set_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKSTATS");
385                  return NULL;
386          }
387  
# Line 397 | Line 397 | sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
397          }
398  
399          if (sysctl(mib, MIBSIZE, stats, &size, NULL, 0) < 0) {
400 <                sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKSTATS");
400 >                sg_set_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKSTATS");
401                  return NULL;
402          }
403  
# Line 410 | Line 410 | sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
410                  rbytes = stats[i].dk_rbytes;
411                  wbytes = stats[i].dk_wbytes;
412   #else
413 <                /* Before 1.7, NetBSD merged reads and writes. */
413 >                /* Before 2.0, NetBSD merged reads and writes. */
414                  rbytes = wbytes = stats[i].dk_bytes;
415   #endif
416   #else
417 + #ifdef HAVE_DS_RBYTES
418 +                rbytes = stats[i].ds_rbytes;
419 +                wbytes = stats[i].ds_wbytes;
420 + #else
421 +                /* Before 3.5, OpenBSD merged reads and writes */
422                  rbytes = wbytes = stats[i].ds_bytes;
423 + #endif
424   #endif
425  
426                  /* Don't keep stats for disks that have never been used. */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines