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.15 by tdb, Tue Aug 24 20:43:47 2004 UTC vs.
Revision 1.18 by ats, Wed Sep 14 18:15:44 2005 UTC

# Line 140 | 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      cdef extern sg_fs_stats *sg_get_fs_stats(int *entries)
152  
# Line 174 | Line 181 | cdef extern from "statgrab.h":
181      ctypedef struct sg_network_iface_stats:
182          char *interface_name
183          int speed
184 <        sg_iface_duplex dup
184 >        sg_iface_duplex duplex
185          int up
186  
187      cdef extern sg_network_iface_stats *sg_get_network_iface_stats(int *entries)
# Line 448 | Line 455 | def py_sg_get_fs_stats():
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
# Line 546 | Line 560 | def py_sg_get_network_iface_stats():
560          list.append(Result(
561              {'interface_name': s.interface_name,
562               'speed': s.speed,
563 <             'dup': s.dup,
563 >             'duplex': s.duplex,
564               'up' : s.up,
565              }
566          ))
# Line 583 | Line 597 | def py_sg_get_process_stats():
597          raise StatgrabException, 'sg_get_process_stats() returned NULL'
598      list = []
599      for i from 0 <= i < entries:
600 <        if s.process_name == NULL:
601 <            s.process_name = ''
602 <        if s.proctitle == NULL:
603 <            s.proctitle = ''
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': s.process_name,
610 <             'proctitle' : s.proctitle,
609 >            {'process_name': process_name,
610 >             'proctitle' : proctitle,
611               'pid' : s.pid,
612               'parent' : s.parent,
613               'pgid' : s.pgid,

Diff Legend

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