bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move FreeBSD sigar_disk_usage_get related code where it belongs

This commit is contained in:
Doug MacEachern 2009-07-01 14:59:08 -07:00
parent d3d35e937f
commit 2b00bad1c1
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/os/darwin/darwin_sigar.c
View File

@ -2192,8 +2192,22 @@ int sigar_disk_usage_get(sigar_t *sigar, const char *name,
IOObjectRelease(service); IOObjectRelease(service);
IOObjectRelease(parent); IOObjectRelease(parent);
return SIGAR_OK;
#elif defined(__FreeBSD__)
/* XXX incomplete */
struct sigar_statfs buf;
if (sigar_statfs(name, &buf) < 0) {
return errno;
}
SIGAR_DISK_STATS_INIT(disk);
disk->reads = buf.f_syncreads + buf.f_asyncreads;
disk->writes = buf.f_syncwrites + buf.f_asyncwrites;
return SIGAR_OK; return SIGAR_OK;
#else #else
SIGAR_DISK_STATS_INIT(disk);
return SIGAR_ENOTIMPL; return SIGAR_ENOTIMPL;
#endif #endif
} }
@ -2210,17 +2224,7 @@ int sigar_file_system_usage_get(sigar_t *sigar,
fsusage->use_percent = sigar_file_system_usage_calc_used(sigar, fsusage); fsusage->use_percent = sigar_file_system_usage_calc_used(sigar, fsusage);
#if defined(__FreeBSD__)
fsusage->disk_reads = buf.f_syncreads + buf.f_asyncreads;
fsusage->disk_writes = buf.f_syncwrites + buf.f_asyncwrites;
fsusage->disk_read_bytes = SIGAR_FIELD_NOTIMPL;
fsusage->disk_write_bytes = SIGAR_FIELD_NOTIMPL;
fsusage->disk_queue = SIGAR_FIELD_NOTIMPL;
#elif defined(DARWIN)
sigar_disk_usage_get(sigar, dirname, &fsusage->disk); sigar_disk_usage_get(sigar, dirname, &fsusage->disk);
#else
SIGAR_DISK_STATS_INIT(&fsusage->disk);
#endif
return SIGAR_OK; return SIGAR_OK;
} }