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.68 by tdb, Thu Apr 8 14:30:43 2004 UTC vs.
Revision 1.70 by tdb, Sun Jun 20 20:32:24 2004 UTC

# Line 122 | Line 122 | sg_fs_stats *sg_get_fs_stats(int *entries){
122   #endif
123   #ifdef ALLBSD
124          int nummnt;
125 + #ifdef HAVE_STATVFS
126 +        struct statvfs *mp;
127 + #else
128          struct statfs *mp;
129   #endif
130 + #endif
131  
132   #ifdef ALLBSD
133          nummnt=getmntinfo(&mp , MNT_LOCAL);
# Line 410 | Line 414 | sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
414                  rbytes = stats[i].dk_rbytes;
415                  wbytes = stats[i].dk_wbytes;
416   #else
417 <                /* Before 1.7, NetBSD merged reads and writes. */
417 >                /* Before 2.0, NetBSD merged reads and writes. */
418                  rbytes = wbytes = stats[i].dk_bytes;
419   #endif
420   #else
421 + #ifdef HAVE_DS_RBYTES
422 +                rbytes = stats[i].ds_rbytes;
423 +                wbytes = stats[i].ds_wbytes;
424 + #else
425 +                /* Before 3.5, OpenBSD merged reads and writes */
426                  rbytes = wbytes = stats[i].ds_bytes;
427 + #endif
428   #endif
429  
430                  /* Don't keep stats for disks that have never been used. */

Diff Legend

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