ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/pystatgrab/_statgrab.pyx
(Generate patch)

Comparing projects/pystatgrab/_statgrab.pyx (file contents):
Revision 1.5 by tdb, Fri Feb 13 00:16:20 2004 UTC vs.
Revision 1.10 by tdb, Sat Mar 20 21:29:59 2004 UTC

# Line 98 | Line 98 | cdef extern from "statgrab.h":
98          char *interface_name
99          long long tx
100          long long rx
101 +        long long ipackets
102 +        long long opackets
103 +        long long ierrors
104 +        long long oerrors
105 +        long long collisions
106          time_t systime
107  
108 <    ctypedef enum duplex:
108 >    ctypedef enum statgrab_duplex:
109          FULL_DUPLEX
110          HALF_DUPLEX
111 <        NO_DUPLEX
111 >        UNKNOWN_DUPLEX
112  
113      ctypedef struct network_iface_stat_t:
114          char *interface_name
115          int speed
116 <        duplex dup
116 >        statgrab_duplex dup
117 >        int up
118  
119      ctypedef struct page_stat_t:
120          long long pages_pagein
# Line 136 | Line 142 | cdef extern from "statgrab.h":
142      cdef extern int statgrab_drop_privileges()
143  
144  
145 + py_FULL_DUPLEX = FULL_DUPLEX
146 + py_HALF_DUPLEX = HALF_DUPLEX
147 + py_UNKNOWN_DUPLEX = UNKNOWN_DUPLEX
148 +
149 +
150   class Result:
151      def __init__(self, attrs):
152          self.attrs = attrs
# Line 272 | Line 283 | def py_get_disk_stats():
283      s = get_disk_stats(&entries)
284      if s == NULL:
285          raise StatgrabException, 'get_disk_stats() returned NULL'
286 <    list = [entries]
286 >    list = []
287      for i from 0 <= i < entries:
288          list.append(Result(
289              {'device_name': s.device_name,
# Line 295 | Line 306 | def py_get_diskio_stats():
306      s = get_diskio_stats(&entries)
307      if s == NULL:
308          raise StatgrabException, 'get_diskio_stats() returned NULL'
309 <    list = [entries]
309 >    list = []
310      for i from 0 <= i < entries:
311          list.append(Result(
312              {'disk_name': s.disk_name,
# Line 313 | Line 324 | def py_get_diskio_stats_diff():
324      s = get_diskio_stats_diff(&entries)
325      if s == NULL:
326          raise StatgrabException, 'get_diskio_stats_diff() returned NULL'
327 <    list = [entries]
327 >    list = []
328      for i from 0 <= i < entries:
329          list.append(Result(
330              {'disk_name': s.disk_name,
# Line 345 | Line 356 | def py_get_network_stats():
356      s = get_network_stats(&entries)
357      if s == NULL:
358          raise StatgrabException, 'get_network_stats() returned NULL'
359 <    list = [entries]
359 >    list = []
360      for i from 0 <= i < entries:
361          list.append(Result(
362              {'interface_name': s.interface_name,
363               'tx': s.tx,
364               'rx': s.rx,
365 +             'ipackets': s.ipackets,
366 +             'opackets': s.opackets,
367 +             'ierrors': s.ierrors,
368 +             'oerrors': s.oerrors,
369 +             'collisions': s.collisions,
370               'systime': s.systime,
371              }
372          ))
# Line 363 | Line 379 | def py_get_network_stats_diff():
379      s = get_network_stats_diff(&entries)
380      if s == NULL:
381          raise StatgrabException, 'get_network_stats_diff() returned NULL'
382 <    list = [entries]
382 >    list = []
383      for i from 0 <= i < entries:
384          list.append(Result(
385              {'interface_name': s.interface_name,
386               'tx': s.tx,
387               'rx': s.rx,
388 +             'ipackets': s.ipackets,
389 +             'opackets': s.opackets,
390 +             'ierrors': s.ierrors,
391 +             'oerrors': s.oerrors,
392 +             'collisions': s.collisions,
393               'systime': s.systime,
394              }
395          ))
# Line 381 | Line 402 | def py_get_network_iface_stats():
402      s = get_network_iface_stats(&entries)
403      if s == NULL:
404          raise StatgrabException, 'get_network_iface_stats() returned NULL'
405 <    list = [entries]
405 >    list = []
406      for i from 0 <= i < entries:
407          list.append(Result(
408              {'interface_name': s.interface_name,
409               'speed': s.speed,
410               'dup': s.dup,
411 +             'up' : s.up,
412              }
413          ))
414          s = s + 1
# Line 415 | Line 437 | def py_get_page_stats_diff():
437      )
438  
439   def py_statgrab_init():
440 <    return statgrab_init()
440 >    if statgrab_init() == 0:
441 >        return True
442 >    else:
443 >        return False
444  
445   def py_statgrab_drop_privileges():
446 <    return statgrab_drop_privileges()
446 >    if statgrab_drop_privileges() == 0:
447 >        return True
448 >    else:
449 >        return False

Diff Legend

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