ViewVC Help

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

root/i-scream/projects/pystatgrab/_statgrab.pyx

Comparing projects/pystatgrab/_statgrab.pyx (file contents):
Revision 1.1 by tdb, Fri Feb 6 14:10:08 2004 UTC vs.
Revision 1.18 by ats, Wed Sep 14 18:15:44 2005 UTC

#	Line 1 | Line 1
1	<	# TODO: return values more the python way - like os.stat
2	<	#       deal with failures better (return nothing, or raise error?)
1	>	#
2	>	# i-scream pystatgrab
3	>	# http://www.i-scream.org/pystatgrab/
4	>	# Copyright (C) 2000-2004 i-scream
5	>	#
6	>	# This program is free software; you can redistribute it and/or
7	>	# modify it under the terms of the GNU General Public License
8	>	# as published by the Free Software Foundation; either version 2
9	>	# of the License, or (at your option) any later version.
10	>	#
11	>	# This program is distributed in the hope that it will be useful,
12	>	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	>	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14	>	# GNU General Public License for more details.
15	>	#
16	>	# You should have received a copy of the GNU General Public License
17	>	# along with this program; if not, write to the Free Software
18	>	# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
19	>	#
20	>	# $Id$
21	>	#
22
23		ctypedef long time_t
24	+	ctypedef int pid_t
25	+	ctypedef int uid_t
26	+	ctypedef int gid_t
27
28		cdef extern from "statgrab.h":
29	<	ctypedef struct cpu_states_t:
29	>	cdef extern int sg_init()
30	>	cdef extern int sg_drop_privileges()
31	>
32	>	ctypedef enum sg_error:
33	>	SG_ERROR_NONE = 0
34	>	SG_ERROR_ASPRINTF
35	>	SG_ERROR_DEVSTAT_GETDEVS
36	>	SG_ERROR_DEVSTAT_SELECTDEVS
37	>	SG_ERROR_ENOENT
38	>	SG_ERROR_GETIFADDRS
39	>	SG_ERROR_GETMNTINFO
40	>	SG_ERROR_GETPAGESIZE
41	>	SG_ERROR_KSTAT_DATA_LOOKUP
42	>	SG_ERROR_KSTAT_LOOKUP
43	>	SG_ERROR_KSTAT_OPEN
44	>	SG_ERROR_KSTAT_READ
45	>	SG_ERROR_KVM_GETSWAPINFO
46	>	SG_ERROR_KVM_OPENFILES
47	>	SG_ERROR_MALLOC
48	>	SG_ERROR_OPEN
49	>	SG_ERROR_OPENDIR
50	>	SG_ERROR_PARSE
51	>	SG_ERROR_SETEGID
52	>	SG_ERROR_SETEUID
53	>	SG_ERROR_SETMNTENT
54	>	SG_ERROR_SOCKET
55	>	SG_ERROR_SWAPCTL
56	>	SG_ERROR_SYSCONF
57	>	SG_ERROR_SYSCTL
58	>	SG_ERROR_SYSCTLBYNAME
59	>	SG_ERROR_SYSCTLNAMETOMIB
60	>	SG_ERROR_UNAME
61	>	SG_ERROR_UNSUPPORTED
62	>	SG_ERROR_XSW_VER_MISMATCH
63	>
64	>	cdef extern void sg_set_error(sg_error code, char *arg)
65	>	cdef extern void sg_set_error_with_errno(sg_error code, char *arg)
66	>	cdef extern sg_error sg_get_error()
67	>	cdef extern char *sg_get_error_arg()
68	>	cdef extern int sg_get_error_errno()
69	>	cdef extern char *sg_str_error(sg_error code)
70	>
71	>	ctypedef struct sg_host_info:
72	>	char *os_name
73	>	char *os_release
74	>	char *os_version
75	>	char *platform
76	>	char *hostname
77	>	time_t uptime
78	>
79	>	cdef extern sg_host_info *sg_get_host_info()
80	>
81	>	ctypedef struct sg_cpu_stats:
82		long long user
83		long long kernel
84		long long idle
#	Line 14 | Line 88 | cdef extern from "statgrab.h":
88		long long total
89		time_t systime
90
91	<	ctypedef struct cpu_percent_t:
91	>	cdef extern sg_cpu_stats *sg_get_cpu_stats()
92	>	cdef extern sg_cpu_stats *sg_get_cpu_stats_diff()
93	>
94	>	ctypedef struct sg_cpu_percents:
95		float user
96		float kernel
97		float idle
#	Line 23 | Line 100 | cdef extern from "statgrab.h":
100		float nice
101		time_t time_taken
102
103	<	ctypedef struct mem_stat_t:
103	>	cdef extern sg_cpu_percents *sg_get_cpu_percents()
104	>
105	>	ctypedef struct sg_mem_stats:
106		long long total
107		long long free
108		long long used
109		long long cache
110
111	<	ctypedef struct load_stat_t:
111	>	cdef extern sg_mem_stats *sg_get_mem_stats()
112	>
113	>	ctypedef struct sg_load_stats:
114		double min1
115		double min5
116		double min15
117
118	<	ctypedef struct user_stat_t:
118	>	cdef extern sg_load_stats *sg_get_load_stats()
119	>
120	>	ctypedef struct sg_user_stats:
121		char *name_list
122		int num_entries
123
124	<	ctypedef struct swap_stat_t:
124	>	cdef extern sg_user_stats *sg_get_user_stats()
125	>
126	>	ctypedef struct sg_swap_stats:
127		long long total
128		long long used
129		long long free
130
131	<	ctypedef struct general_stat_t:
47	<	char *os_name
48	<	char *os_release
49	<	char *os_version
50	<	char *platform
51	<	char *hostname
52	<	time_t uptime
131	>	cdef extern sg_swap_stats *sg_get_swap_stats()
132
133	<	ctypedef struct disk_stat_t:
133	>	ctypedef struct sg_fs_stats:
134		char *device_name
135		char *fs_type
136		char *mnt_point
#	Line 61 | Line 140 | cdef extern from "statgrab.h":
140		long long total_inodes
141		long long used_inodes
142		long long free_inodes
143	+	long long avail_inodes
144	+	long long io_size
145	+	long long block_size
146	+	long long total_blocks
147	+	long long free_blocks
148	+	long long used_blocks
149	+	long long avail_blocks
150
151	<	ctypedef struct diskio_stat_t:
151	>	cdef extern sg_fs_stats *sg_get_fs_stats(int *entries)
152	>
153	>	ctypedef struct sg_disk_io_stats:
154		char *disk_name
155		long long read_bytes
156		long long write_bytes
157		time_t systime
158
159	<	ctypedef struct process_stat_t:
160	<	int total
73	<	int running
74	<	int sleeping
75	<	int stopped
76	<	int zombie
159	>	cdef extern sg_disk_io_stats *sg_get_disk_io_stats(int *entries)
160	>	cdef extern sg_disk_io_stats *sg_get_disk_io_stats_diff(int *entries)
161
162	<	ctypedef struct network_stat_t:
162	>	ctypedef struct sg_network_io_stats:
163		char *interface_name
164		long long tx
165		long long rx
166	+	long long ipackets
167	+	long long opackets
168	+	long long ierrors
169	+	long long oerrors
170	+	long long collisions
171		time_t systime
172
173	<	ctypedef struct page_stat_t:
173	>	cdef extern sg_network_io_stats *sg_get_network_io_stats(int *entries)
174	>	cdef extern sg_network_io_stats *sg_get_network_io_stats_diff(int *entries)
175	>
176	>	ctypedef enum sg_iface_duplex:
177	>	SG_IFACE_DUPLEX_FULL
178	>	SG_IFACE_DUPLEX_HALF
179	>	SG_IFACE_DUPLEX_UNKNOWN
180	>
181	>	ctypedef struct sg_network_iface_stats:
182	>	char *interface_name
183	>	int speed
184	>	sg_iface_duplex duplex
185	>	int up
186	>
187	>	cdef extern sg_network_iface_stats *sg_get_network_iface_stats(int *entries)
188	>
189	>	ctypedef struct sg_page_stats:
190		long long pages_pagein
191		long long pages_pageout
192		time_t systime
193
194	<	cdef extern cpu_states_t *get_cpu_totals()
195	<	cdef extern cpu_states_t *get_cpu_diff()
91	<	cdef extern cpu_percent_t *cpu_percent_usage()
92	<	cdef extern mem_stat_t *get_memory_stats()
93	<	cdef extern load_stat_t *get_load_stats()
94	<	cdef extern user_stat_t *get_user_stats()
95	<	cdef extern swap_stat_t *get_swap_stats()
96	<	cdef extern general_stat_t *get_general_stats()
97	<	cdef extern disk_stat_t *get_disk_stats(int *entries)
98	<	cdef extern diskio_stat_t *get_diskio_stats(int *entries)
99	<	cdef extern diskio_stat_t *get_diskio_stats_diff(int *entries)
100	<	cdef extern process_stat_t *get_process_stats()
101	<	cdef extern network_stat_t *get_network_stats(int *entries)
102	<	cdef extern network_stat_t *get_network_stats_diff(int *entries)
103	<	cdef extern page_stat_t *get_page_stats()
104	<	cdef extern page_stat_t *get_page_stats_diff()
105	<	cdef extern int statgrab_init()
106	<	cdef extern int statgrab_drop_privileges()
194	>	cdef extern sg_page_stats *sg_get_page_stats()
195	>	cdef extern sg_page_stats *sg_get_page_stats_diff()
196
197	+	ctypedef enum sg_process_state:
198	+	SG_PROCESS_STATE_RUNNING
199	+	SG_PROCESS_STATE_SLEEPING
200	+	SG_PROCESS_STATE_STOPPED
201	+	SG_PROCESS_STATE_ZOMBIE
202	+	SG_PROCESS_STATE_UNKNOWN
203
204	<	def py_get_cpu_totals():
205	<	cdef cpu_states_t *s
206	<	s = get_cpu_totals()
207	<	return {'user': s.user,
208	<	'kernel': s.kernel,
209	<	'idle': s.idle,
210	<	'iowait': s.iowait,
211	<	'swap': s.swap,
212	<	'nice': s.nice,
213	<	'total': s.total,
214	<	'systime': s.systime,
215	<	}
204	>	ctypedef struct sg_process_stats:
205	>	char *process_name
206	>	char *proctitle
207	>	pid_t pid
208	>	pid_t parent
209	>	pid_t pgid
210	>	uid_t uid
211	>	uid_t euid
212	>	gid_t gid
213	>	gid_t egid
214	>	unsigned long long proc_size
215	>	unsigned long long proc_resident
216	>	time_t time_spent
217	>	double cpu_percent
218	>	int nice
219	>	sg_process_state state
220
221	<	def py_get_cpu_diff():
123	<	cdef cpu_states_t *s
124	<	s = get_cpu_diff()
125	<	return {'user': s.user,
126	<	'kernel': s.kernel,
127	<	'idle': s.idle,
128	<	'iowait': s.iowait,
129	<	'swap': s.swap,
130	<	'nice': s.nice,
131	<	'total': s.total,
132	<	'systime': s.systime,
133	<	}
221	>	cdef extern sg_process_stats *sg_get_process_stats(int *entries)
222
223	<	def py_cpu_percent_usage():
224	<	cdef cpu_percent_t *s
225	<	s = cpu_percent_usage()
226	<	return {'user': s.user,
227	<	'kernel': s.kernel,
228	<	'idle': s.idle,
141	<	'iowait': s.iowait,
142	<	'swap': s.swap,
143	<	'nice': s.nice,
144	<	'time_taken': s.time_taken,
145	<	}
223	>	ctypedef struct sg_process_count:
224	>	int total
225	>	int running
226	>	int sleeping
227	>	int stopped
228	>	int zombie
229
230	<	def py_get_memory_stats():
148	<	cdef mem_stat_t *s
149	<	s = get_memory_stats()
150	<	return {'total': s.total,
151	<	'used': s.used,
152	<	'free': s.free,
153	<	'cache': s.cache,
154	<	}
230	>	cdef extern sg_process_count *sg_get_process_count()
231
156	–	def py_get_load_stats():
157	–	cdef load_stat_t *s
158	–	s = get_load_stats()
159	–	return {'min1': s.min1,
160	–	'min5': s.min5,
161	–	'min15': s.min15,
162	–	}
232
233	<	def py_get_user_stats():
234	<	cdef user_stat_t *s
235	<	s = get_user_stats()
236	<	return {'name_list': s.name_list,
237	<	'num_entries': s.num_entries,
238	<	}
233	>	py_SG_ERROR_NONE = SG_ERROR_NONE
234	>	py_SG_ERROR_ASPRINTF = SG_ERROR_ASPRINTF
235	>	py_SG_ERROR_DEVSTAT_GETDEVS = SG_ERROR_DEVSTAT_GETDEVS
236	>	py_SG_ERROR_DEVSTAT_SELECTDEVS = SG_ERROR_DEVSTAT_SELECTDEVS
237	>	py_SG_ERROR_ENOENT = SG_ERROR_ENOENT
238	>	py_SG_ERROR_GETIFADDRS = SG_ERROR_GETIFADDRS
239	>	py_SG_ERROR_GETMNTINFO = SG_ERROR_GETMNTINFO
240	>	py_SG_ERROR_GETPAGESIZE = SG_ERROR_GETPAGESIZE
241	>	py_SG_ERROR_KSTAT_DATA_LOOKUP = SG_ERROR_KSTAT_DATA_LOOKUP
242	>	py_SG_ERROR_KSTAT_LOOKUP = SG_ERROR_KSTAT_LOOKUP
243	>	py_SG_ERROR_KSTAT_OPEN = SG_ERROR_KSTAT_OPEN
244	>	py_SG_ERROR_KSTAT_READ = SG_ERROR_KSTAT_READ
245	>	py_SG_ERROR_KVM_GETSWAPINFO = SG_ERROR_KVM_GETSWAPINFO
246	>	py_SG_ERROR_KVM_OPENFILES = SG_ERROR_KVM_OPENFILES
247	>	py_SG_ERROR_MALLOC = SG_ERROR_MALLOC
248	>	py_SG_ERROR_OPEN = SG_ERROR_OPEN
249	>	py_SG_ERROR_OPENDIR = SG_ERROR_OPENDIR
250	>	py_SG_ERROR_PARSE = SG_ERROR_PARSE
251	>	py_SG_ERROR_SETEGID = SG_ERROR_SETEGID
252	>	py_SG_ERROR_SETEUID = SG_ERROR_SETEUID
253	>	py_SG_ERROR_SETMNTENT = SG_ERROR_SETMNTENT
254	>	py_SG_ERROR_SOCKET = SG_ERROR_SOCKET
255	>	py_SG_ERROR_SWAPCTL = SG_ERROR_SWAPCTL
256	>	py_SG_ERROR_SYSCONF = SG_ERROR_SYSCONF
257	>	py_SG_ERROR_SYSCTL = SG_ERROR_SYSCTL
258	>	py_SG_ERROR_SYSCTLBYNAME = SG_ERROR_SYSCTLBYNAME
259	>	py_SG_ERROR_SYSCTLNAMETOMIB = SG_ERROR_SYSCTLNAMETOMIB
260	>	py_SG_ERROR_UNAME = SG_ERROR_UNAME
261	>	py_SG_ERROR_UNSUPPORTED = SG_ERROR_UNSUPPORTED
262	>	py_SG_ERROR_XSW_VER_MISMATCH = SG_ERROR_XSW_VER_MISMATCH
263
264	<	def py_get_swap_stats():
265	<	cdef swap_stat_t *s
266	<	s = get_swap_stats()
174	<	return {'total': s.total,
175	<	'used': s.used,
176	<	'free': s.free,
177	<	}
264	>	py_SG_IFACE_DUPLEX_FULL = SG_IFACE_DUPLEX_FULL
265	>	py_SG_IFACE_DUPLEX_HALF = SG_IFACE_DUPLEX_HALF
266	>	py_SG_IFACE_DUPLEX_UNKNOWN = SG_IFACE_DUPLEX_UNKNOWN
267
268	<	def py_get_general_stats():
269	<	cdef general_stat_t *s
270	<	s = get_general_stats()
271	<	return {'os_name': s.os_name,
272	<	'os_release': s.os_release,
184	<	'os_version': s.os_version,
185	<	'platform': s.platform,
186	<	'hostname': s.hostname,
187	<	'uptime': s.uptime,
188	<	}
268	>	py_SG_PROCESS_STATE_RUNNING = SG_PROCESS_STATE_RUNNING
269	>	py_SG_PROCESS_STATE_SLEEPING = SG_PROCESS_STATE_SLEEPING
270	>	py_SG_PROCESS_STATE_STOPPED = SG_PROCESS_STATE_STOPPED
271	>	py_SG_PROCESS_STATE_ZOMBIE = SG_PROCESS_STATE_ZOMBIE
272	>	py_SG_PROCESS_STATE_UNKNOWN = SG_PROCESS_STATE_UNKNOWN
273
274	<	def py_get_disk_stats():
275	<	cdef disk_stat_t *s
274	>
275	>	class Result:
276	>	def __init__(self, attrs):
277	>	self.attrs = attrs
278	>	for attr in attrs:
279	>	setattr(self, attr, attrs[attr])
280	>	def __getitem__(self, item):
281	>	return getattr(self, item)
282	>	def __repr__(self):
283	>	return str(self.attrs)
284	>
285	>	class StatgrabException(Exception):
286	>	def __init__(self, value):
287	>	self.value = value
288	>	def __str__(self):
289	>	return repr(self.value)
290	>
291	>
292	>	def py_sg_init():
293	>	if sg_init() == 0:
294	>	return True
295	>	else:
296	>	return False
297	>
298	>	def py_sg_drop_privileges():
299	>	if sg_drop_privileges() == 0:
300	>	return True
301	>	else:
302	>	return False
303	>
304	>	def py_sg_set_error(code, arg):
305	>	sg_set_error(code, arg)
306	>
307	>	def py_sg_set_error_with_errno(code, arg):
308	>	sg_set_error_with_errno(code, arg)
309	>
310	>	def py_sg_get_error():
311	>	cdef sg_error s
312	>	s = sg_get_error()
313	>	return s
314	>
315	>	def py_sg_get_error_arg():
316	>	s = sg_get_error_arg()
317	>	return s
318	>
319	>	def py_sg_get_error_errno():
320	>	s = sg_get_error_errno()
321	>	return s
322	>
323	>	def py_sg_str_error(code):
324	>	s = sg_str_error(code)
325	>	return s
326	>
327	>	def py_sg_get_host_info():
328	>	cdef sg_host_info *s
329	>	s = sg_get_host_info()
330	>	if s == NULL:
331	>	raise StatgrabException, 'sg_get_host_info() returned NULL'
332	>	return Result(
333	>	{'os_name': s.os_name,
334	>	'os_release': s.os_release,
335	>	'os_version': s.os_version,
336	>	'platform': s.platform,
337	>	'hostname': s.hostname,
338	>	'uptime': s.uptime,
339	>	}
340	>	)
341	>
342	>	def py_sg_get_cpu_stats():
343	>	cdef sg_cpu_stats *s
344	>	s = sg_get_cpu_stats()
345	>	if s == NULL:
346	>	raise StatgrabException, 'sg_get_cpu_stats() returned NULL'
347	>	return Result(
348	>	{'user': s.user,
349	>	'kernel': s.kernel,
350	>	'idle': s.idle,
351	>	'iowait': s.iowait,
352	>	'swap': s.swap,
353	>	'nice': s.nice,
354	>	'total': s.total,
355	>	'systime': s.systime,
356	>	}
357	>	)
358	>
359	>	def py_sg_get_cpu_stats_diff():
360	>	cdef sg_cpu_stats *s
361	>	s = sg_get_cpu_stats_diff()
362	>	if s == NULL:
363	>	raise StatgrabException, 'sg_get_cpu_stats_diff() returned NULL'
364	>	return Result(
365	>	{'user': s.user,
366	>	'kernel': s.kernel,
367	>	'idle': s.idle,
368	>	'iowait': s.iowait,
369	>	'swap': s.swap,
370	>	'nice': s.nice,
371	>	'total': s.total,
372	>	'systime': s.systime,
373	>	}
374	>	)
375	>
376	>	def py_sg_get_cpu_percents():
377	>	cdef sg_cpu_percents *s
378	>	s = sg_get_cpu_percents()
379	>	if s == NULL:
380	>	raise StatgrabException, 'sg_get_cpu_percents() returned NULL'
381	>	return Result(
382	>	{'user': s.user,
383	>	'kernel': s.kernel,
384	>	'idle': s.idle,
385	>	'iowait': s.iowait,
386	>	'swap': s.swap,
387	>	'nice': s.nice,
388	>	'time_taken': s.time_taken,
389	>	}
390	>	)
391	>
392	>	def py_sg_get_mem_stats():
393	>	cdef sg_mem_stats *s
394	>	s = sg_get_mem_stats()
395	>	if s == NULL:
396	>	raise StatgrabException, 'sg_get_mem_stats() returned NULL'
397	>	return Result(
398	>	{'total': s.total,
399	>	'used': s.used,
400	>	'free': s.free,
401	>	'cache': s.cache,
402	>	}
403	>	)
404	>
405	>	def py_sg_get_load_stats():
406	>	cdef sg_load_stats *s
407	>	s = sg_get_load_stats()
408	>	if s == NULL:
409	>	raise StatgrabException, 'sg_get_load_stats() returned NULL'
410	>	return Result(
411	>	{'min1': s.min1,
412	>	'min5': s.min5,
413	>	'min15': s.min15,
414	>	}
415	>	)
416	>
417	>	def py_sg_get_user_stats():
418	>	cdef sg_user_stats *s
419	>	s = sg_get_user_stats()
420	>	if s == NULL:
421	>	raise StatgrabException, 'sg_get_user_stats() returned NULL'
422	>	return Result(
423	>	{'name_list': s.name_list,
424	>	'num_entries': s.num_entries,
425	>	}
426	>	)
427	>
428	>	def py_sg_get_swap_stats():
429	>	cdef sg_swap_stats *s
430	>	s = sg_get_swap_stats()
431	>	if s == NULL:
432	>	raise StatgrabException, 'sg_get_swap_stats() returned NULL'
433	>	return Result(
434	>	{'total': s.total,
435	>	'used': s.used,
436	>	'free': s.free,
437	>	}
438	>	)
439	>
440	>	def py_sg_get_fs_stats():
441	>	cdef sg_fs_stats *s
442		cdef int entries
443	<	s = get_disk_stats(&entries)
444	<	list = [entries]
443	>	s = sg_get_fs_stats(&entries)
444	>	if s == NULL:
445	>	raise StatgrabException, 'sg_get_fs_stats() returned NULL'
446	>	list = []
447		for i from 0 <= i < entries:
448	<	list.append({'device_name': s.device_name,
449	<	'fs_type': s.fs_type,
450	<	'mnt_point': s.mnt_point,
451	<	'size': s.size,
452	<	'used': s.used,
453	<	'avail': s.avail,
454	<	'total_inodes': s.total_inodes,
455	<	'used_inodes': s.used_inodes,
456	<	'free_inodes': s.free_inodes,
457	<	},
458	<	)
448	>	list.append(Result(
449	>	{'device_name': s.device_name,
450	>	'fs_type': s.fs_type,
451	>	'mnt_point': s.mnt_point,
452	>	'size': s.size,
453	>	'used': s.used,
454	>	'avail': s.avail,
455	>	'total_inodes': s.total_inodes,
456	>	'used_inodes': s.used_inodes,
457	>	'free_inodes': s.free_inodes,
458	>	'avail_inodes': s.avail_inodes,
459	>	'io_size': s.io_size,
460	>	'block_size': s.block_size,
461	>	'total_blocks': s.total_blocks,
462	>	'free_blocks': s.free_blocks,
463	>	'used_blocks': s.used_blocks,
464	>	'avail_blocks': s.avail_blocks,
465	>	}
466	>	))
467		s = s + 1
468		return list
469
470	<	def py_get_diskio_stats():
471	<	cdef diskio_stat_t *s
470	>	def py_sg_get_disk_io_stats():
471	>	cdef sg_disk_io_stats *s
472		cdef int entries
473	<	s = get_diskio_stats(&entries)
474	<	list = [entries]
473	>	s = sg_get_disk_io_stats(&entries)
474	>	if s == NULL:
475	>	raise StatgrabException, 'sg_get_disk_io_stats() returned NULL'
476	>	list = []
477		for i from 0 <= i < entries:
478	<	list.append({'disk_name': s.disk_name,
479	<	'read_bytes': s.read_bytes,
480	<	'write_bytes': s.write_bytes,
481	<	'systime': s.systime,
482	<	},
483	<	)
478	>	list.append(Result(
479	>	{'disk_name': s.disk_name,
480	>	'read_bytes': s.read_bytes,
481	>	'write_bytes': s.write_bytes,
482	>	'systime': s.systime,
483	>	}
484	>	))
485		s = s + 1
486		return list
487
488	<	def py_get_diskio_stats_diff():
489	<	cdef diskio_stat_t *s
488	>	def py_sg_get_disk_io_stats_diff():
489	>	cdef sg_disk_io_stats *s
490		cdef int entries
491	<	s = get_diskio_stats_diff(&entries)
492	<	list = [entries]
491	>	s = sg_get_disk_io_stats_diff(&entries)
492	>	if s == NULL:
493	>	raise StatgrabException, 'sg_get_disk_io_stats_diff() returned NULL'
494	>	list = []
495		for i from 0 <= i < entries:
496	<	list.append({'disk_name': s.disk_name,
497	<	'read_bytes': s.read_bytes,
498	<	'write_bytes': s.write_bytes,
499	<	'systime': s.systime,
500	<	},
501	<	)
496	>	list.append(Result(
497	>	{'disk_name': s.disk_name,
498	>	'read_bytes': s.read_bytes,
499	>	'write_bytes': s.write_bytes,
500	>	'systime': s.systime,
501	>	}
502	>	))
503		s = s + 1
504		return list
505
506	<	def py_get_process_stats():
507	<	cdef process_stat_t *s
508	<	s = get_process_stats()
509	<	return {'total': s.total,
510	<	'running': s.running,
511	<	'sleeping': s.sleeping,
512	<	'stopped': s.stopped,
513	<	'zombie': s.zombie,
514	<	}
506	>	def py_sg_get_network_io_stats():
507	>	cdef sg_network_io_stats *s
508	>	cdef int entries
509	>	s = sg_get_network_io_stats(&entries)
510	>	if s == NULL:
511	>	raise StatgrabException, 'sg_get_network_io_stats() returned NULL'
512	>	list = []
513	>	for i from 0 <= i < entries:
514	>	list.append(Result(
515	>	{'interface_name': s.interface_name,
516	>	'tx': s.tx,
517	>	'rx': s.rx,
518	>	'ipackets': s.ipackets,
519	>	'opackets': s.opackets,
520	>	'ierrors': s.ierrors,
521	>	'oerrors': s.oerrors,
522	>	'collisions': s.collisions,
523	>	'systime': s.systime,
524	>	}
525	>	))
526	>	s = s + 1
527	>	return list
528
529	<	def py_get_network_stats():
530	<	cdef network_stat_t *s
529	>	def py_sg_get_network_io_stats_diff():
530	>	cdef sg_network_io_stats *s
531		cdef int entries
532	<	s = get_network_stats(&entries)
533	<	list = [entries]
532	>	s = sg_get_network_io_stats_diff(&entries)
533	>	if s == NULL:
534	>	raise StatgrabException, 'sg_get_network_io_stats_diff() returned NULL'
535	>	list = []
536		for i from 0 <= i < entries:
537	<	list.append({'interface_name': s.interface_name,
538	<	'tx': s.tx,
539	<	'rx': s.rx,
540	<	'systime': s.systime,
541	<	},
542	<	)
537	>	list.append(Result(
538	>	{'interface_name': s.interface_name,
539	>	'tx': s.tx,
540	>	'rx': s.rx,
541	>	'ipackets': s.ipackets,
542	>	'opackets': s.opackets,
543	>	'ierrors': s.ierrors,
544	>	'oerrors': s.oerrors,
545	>	'collisions': s.collisions,
546	>	'systime': s.systime,
547	>	}
548	>	))
549		s = s + 1
550		return list
551
552	<	def py_get_network_stats_diff():
553	<	cdef network_stat_t *s
552	>	def py_sg_get_network_iface_stats():
553	>	cdef sg_network_iface_stats *s
554		cdef int entries
555	<	s = get_network_stats_diff(&entries)
556	<	list = [entries]
555	>	s = sg_get_network_iface_stats(&entries)
556	>	if s == NULL:
557	>	raise StatgrabException, 'sg_get_network_iface_stats() returned NULL'
558	>	list = []
559		for i from 0 <= i < entries:
560	<	list.append({'interface_name': s.interface_name,
561	<	'tx': s.tx,
562	<	'rx': s.rx,
563	<	'systime': s.systime,
564	<	},
565	<	)
560	>	list.append(Result(
561	>	{'interface_name': s.interface_name,
562	>	'speed': s.speed,
563	>	'duplex': s.duplex,
564	>	'up' : s.up,
565	>	}
566	>	))
567		s = s + 1
568		return list
569
570	<	def py_get_page_stats():
571	<	cdef page_stat_t *s
572	<	s = get_page_stats()
573	<	return {'pages_pagein': s.pages_pagein,
574	<	'pages_pageout': s.pages_pageout,
575	<	}
570	>	def py_sg_get_page_stats():
571	>	cdef sg_page_stats *s
572	>	s = sg_get_page_stats()
573	>	if s == NULL:
574	>	raise StatgrabException, 'sg_get_page_stats() returned NULL'
575	>	return Result(
576	>	{'pages_pagein': s.pages_pagein,
577	>	'pages_pageout': s.pages_pageout,
578	>	}
579	>	)
580
581	<	def py_get_page_stats_diff():
582	<	cdef page_stat_t *s
583	<	s = get_page_stats_diff()
584	<	return {'pages_pagein': s.pages_pagein,
585	<	'pages_pageout': s.pages_pageout,
586	<	}
581	>	def py_sg_get_page_stats_diff():
582	>	cdef sg_page_stats *s
583	>	s = sg_get_page_stats_diff()
584	>	if s == NULL:
585	>	raise StatgrabException, 'sg_get_page_stats_diff() returned NULL'
586	>	return Result(
587	>	{'pages_pagein': s.pages_pagein,
588	>	'pages_pageout': s.pages_pageout,
589	>	}
590	>	)
591
592	<	def py_statgrab_init():
593	<	return statgrab_init()
592	>	def py_sg_get_process_stats():
593	>	cdef sg_process_stats *s
594	>	cdef int entries
595	>	s = sg_get_process_stats(&entries)
596	>	if s == NULL:
597	>	raise StatgrabException, 'sg_get_process_stats() returned NULL'
598	>	list = []
599	>	for i from 0 <= i < entries:
600	>	if s.process_name is NULL:
601	>	process_name = ''
602	>	else:
603	>	process_name = s.process_name
604	>	if s.proctitle is NULL:
605	>	proctitle = ''
606	>	else:
607	>	proctitle = s.proctitle
608	>	list.append(Result(
609	>	{'process_name': process_name,
610	>	'proctitle' : proctitle,
611	>	'pid' : s.pid,
612	>	'parent' : s.parent,
613	>	'pgid' : s.pgid,
614	>	'uid' : s.uid,
615	>	'euid' : s.euid,
616	>	'gid' : s.gid,
617	>	'egid' : s.egid,
618	>	'proc_size' : s.proc_size,
619	>	'proc_resident' : s.proc_resident,
620	>	'time_spent' : s.time_spent,
621	>	'cpu_percent' : s.cpu_percent,
622	>	'nice' : s.nice,
623	>	'state' : s.state,
624	>	}
625	>	))
626	>	s = s + 1
627	>	return list
628
629	<	def py_statgrab_drop_privileges():
630	<	return statgrab_drop_privileges()
629	>	def py_sg_get_process_count():
630	>	cdef sg_process_count *s
631	>	s = sg_get_process_count()
632	>	if s == NULL:
633	>	raise StatgrabException, 'sg_get_process_count() returned NULL'
634	>	return Result(
635	>	{'total': s.total,
636	>	'running': s.running,
637	>	'sleeping': s.sleeping,
638	>	'stopped': s.stopped,
639	>	'zombie': s.zombie,
640	>	}
641	>	)

Diff Legend

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