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.5 by tdb, Fri Feb 13 00:16:20 2004 UTC vs.
Revision 1.8 by tdb, Sat Feb 14 18:07:30 2004 UTC

#	Line 100 | Line 100 | cdef extern from "statgrab.h":
100		long long rx
101		time_t systime
102
103	<	ctypedef enum duplex:
103	>	ctypedef enum statgrab_duplex:
104		FULL_DUPLEX
105		HALF_DUPLEX
106	<	NO_DUPLEX
106	>	UNKNOWN_DUPLEX
107
108		ctypedef struct network_iface_stat_t:
109		char *interface_name
110		int speed
111	<	duplex dup
111	>	statgrab_duplex dup
112	>	int up
113
114		ctypedef struct page_stat_t:
115		long long pages_pagein
#	Line 136 | Line 137 | cdef extern from "statgrab.h":
137		cdef extern int statgrab_drop_privileges()
138
139
140	+	py_FULL_DUPLEX = FULL_DUPLEX
141	+	py_HALF_DUPLEX = HALF_DUPLEX
142	+	py_UNKNOWN_DUPLEX = UNKNOWN_DUPLEX
143	+
144	+
145		class Result:
146		def __init__(self, attrs):
147		self.attrs = attrs
#	Line 272 | Line 278 | def py_get_disk_stats():
278		s = get_disk_stats(&entries)
279		if s == NULL:
280		raise StatgrabException, 'get_disk_stats() returned NULL'
281	<	list = [entries]
281	>	list = []
282		for i from 0 <= i < entries:
283		list.append(Result(
284		{'device_name': s.device_name,
#	Line 295 | Line 301 | def py_get_diskio_stats():
301		s = get_diskio_stats(&entries)
302		if s == NULL:
303		raise StatgrabException, 'get_diskio_stats() returned NULL'
304	<	list = [entries]
304	>	list = []
305		for i from 0 <= i < entries:
306		list.append(Result(
307		{'disk_name': s.disk_name,
#	Line 313 | Line 319 | def py_get_diskio_stats_diff():
319		s = get_diskio_stats_diff(&entries)
320		if s == NULL:
321		raise StatgrabException, 'get_diskio_stats_diff() returned NULL'
322	<	list = [entries]
322	>	list = []
323		for i from 0 <= i < entries:
324		list.append(Result(
325		{'disk_name': s.disk_name,
#	Line 345 | Line 351 | def py_get_network_stats():
351		s = get_network_stats(&entries)
352		if s == NULL:
353		raise StatgrabException, 'get_network_stats() returned NULL'
354	<	list = [entries]
354	>	list = []
355		for i from 0 <= i < entries:
356		list.append(Result(
357		{'interface_name': s.interface_name,
#	Line 363 | Line 369 | def py_get_network_stats_diff():
369		s = get_network_stats_diff(&entries)
370		if s == NULL:
371		raise StatgrabException, 'get_network_stats_diff() returned NULL'
372	<	list = [entries]
372	>	list = []
373		for i from 0 <= i < entries:
374		list.append(Result(
375		{'interface_name': s.interface_name,
#	Line 381 | Line 387 | def py_get_network_iface_stats():
387		s = get_network_iface_stats(&entries)
388		if s == NULL:
389		raise StatgrabException, 'get_network_iface_stats() returned NULL'
390	<	list = [entries]
390	>	list = []
391		for i from 0 <= i < entries:
392		list.append(Result(
393		{'interface_name': s.interface_name,
394		'speed': s.speed,
395		'dup': s.dup,
396	+	'up' : s.up,
397		}
398		))
399		s = s + 1

Diff Legend

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