ViewVC Help

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

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

Comparing projects/libstatgrab/src/libstatgrab/swap_stats.c (file contents):
Revision 1.20 by tdb, Wed Apr 7 21:08:40 2004 UTC vs.
Revision 1.21 by ats, Sun Jul 18 21:30:11 2004 UTC

#	Line 84 | Line 84 | sg_swap_stats *sg_get_swap_stats(){
84
85		#ifdef SOLARIS
86		if((pagesize=sysconf(_SC_PAGESIZE)) == -1){
87	<	sg_set_error(SG_ERROR_SYSCONF, "_SC_PAGESIZE");
87	>	sg_set_error_with_errno(SG_ERROR_SYSCONF, "_SC_PAGESIZE");
88		return NULL;
89		}
90		if (swapctl(SC_AINFO, &ai) == -1) {
91	<	sg_set_error(SG_ERROR_SWAPCTL, NULL);
91	>	sg_set_error_with_errno(SG_ERROR_SWAPCTL, NULL);
92		return NULL;
93		}
94		swap_stat.total = (long long)ai.ani_max * (long long)pagesize;
#	Line 97 | Line 97 | sg_swap_stats *sg_get_swap_stats(){
97		#endif
98		#if defined(LINUX) || defined(CYGWIN)
99		if ((f = fopen("/proc/meminfo", "r")) == NULL) {
100	<	sg_set_error(SG_ERROR_OPEN, "/proc/meminfo");
100	>	sg_set_error_with_errno(SG_ERROR_OPEN, "/proc/meminfo");
101		return NULL;
102		}
103
#	Line 126 | Line 126 | sg_swap_stats *sg_get_swap_stats(){
126
127		mibsize = sizeof mib / sizeof mib[0];
128		if (sysctlnametomib("vm.swap_info", mib, &mibsize) < 0) {
129	<	sg_set_error(SG_ERROR_SYSCTLNAMETOMIB, "vm.swap_info");
129	>	sg_set_error_with_errno(SG_ERROR_SYSCTLNAMETOMIB,
130	>	"vm.swap_info");
131		return NULL;
132		}
133		for (n = 0; ; ++n) {
#	Line 143 | Line 144 | sg_swap_stats *sg_get_swap_stats(){
144		swap_stat.used += (long long) xsw.xsw_used;
145		}
146		if (errno != ENOENT) {
147	<	sg_set_error(SG_ERROR_ENOENT, NULL);
147	>	sg_set_error_with_errno(SG_ERROR_SYSCTL, "vm.swap_info");
148		return NULL;
149		}
150		#else

Diff Legend

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