ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/libstatgrab/src/libstatgrab/disk_stats.c

Comparing projects/libstatgrab/src/libstatgrab/disk_stats.c (file contents):
Revision 1.66 by tdb, Wed Apr 7 19:26:16 2004 UTC vs.
Revision 1.69 by tdb, Sun Jun 20 17:00:25 2004 UTC

#	Line 253 | Line 253 | sg_fs_stats *sg_get_fs_stats(int *entries){
253
254		}
255
256	+	int sg_fs_compare_device_name(const void *va, const void *vb) {
257	+	const sg_fs_stats *a = (const sg_fs_stats *)va;
258	+	const sg_fs_stats *b = (const sg_fs_stats *)vb;
259	+
260	+	return strcmp(a->device_name, b->device_name);
261	+	}
262	+
263	+	int sg_fs_compare_mnt_point(const void *va, const void *vb) {
264	+	const sg_fs_stats *a = (const sg_fs_stats *)va;
265	+	const sg_fs_stats *b = (const sg_fs_stats *)vb;
266	+
267	+	return strcmp(a->mnt_point, b->mnt_point);
268	+	}
269	+
270		static void diskio_stat_init(sg_disk_io_stats *d) {
271		d->disk_name = NULL;
272		}
#	Line 330 | 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 338 | 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 348 | 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 367 | 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 383 | 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 396 | 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. */
427		if (rbytes == 0 && wbytes == 0) {
#	Line 749 | Line 769 | sg_disk_io_stats *sg_get_disk_io_stats_diff(int *entri
769
770		*entries = diff_count;
771		return diff;
772	+	}
773	+
774	+	int sg_disk_io_compare_name(const void *va, const void *vb) {
775	+	const sg_disk_io_stats *a = (const sg_disk_io_stats *)va;
776	+	const sg_disk_io_stats *b = (const sg_disk_io_stats *)vb;
777	+
778	+	return strcmp(a->disk_name, b->disk_name);
779		}
780

Diff Legend

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