--- projects/pystatgrab/_statgrab.pyx	2004/02/06 14:10:08	1.1
+++ projects/pystatgrab/_statgrab.pyx	2004/02/09 23:07:25	1.3
@@ -1,5 +1,24 @@
-# TODO: return values more the python way - like os.stat
-#       deal with failures better (return nothing, or raise error?)
+#
+# i-scream central monitoring system
+# http://www.i-scream.org
+# Copyright (C) 2000-2004 i-scream
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# $Id: _statgrab.pyx,v 1.3 2004/02/09 23:07:25 tdb Exp $
+#
 
 ctypedef long time_t
 
@@ -106,104 +125,156 @@ cdef extern from "statgrab.h":
     cdef extern int statgrab_drop_privileges()
 
 
+class Result:
+    def __init__(self, attrs):
+        self.attrs = attrs
+        for attr in attrs:
+            setattr(self, attr, attrs[attr])
+    def __getitem__(self, item):
+        return getattr(self, item)
+    def __repr__(self):
+        return str(self.attrs)
+
+class StatgrabException:
+    def __init__(self, value):
+        self.value = value
+    def __str__(self):
+        return repr(self.value)
+
+
 def py_get_cpu_totals():
     cdef cpu_states_t *s
     s = get_cpu_totals()
-    return {'user': s.user,
-            'kernel': s.kernel,
-            'idle': s.idle,
-            'iowait': s.iowait,
-            'swap': s.swap,
-            'nice': s.nice,
-            'total': s.total,
-            'systime': s.systime,
-           }
+    if s == NULL:
+        raise StatgrabException, 'get_cpu_totals() returned NULL'
+    return Result(
+        {'user': s.user,
+         'kernel': s.kernel,
+         'idle': s.idle,
+         'iowait': s.iowait,
+         'swap': s.swap,
+         'nice': s.nice,
+         'total': s.total,
+         'systime': s.systime,
+        }
+    )
 
 def py_get_cpu_diff():
     cdef cpu_states_t *s
     s = get_cpu_diff()
-    return {'user': s.user,
-            'kernel': s.kernel,
-            'idle': s.idle,
-            'iowait': s.iowait,
-            'swap': s.swap,
-            'nice': s.nice,
-            'total': s.total,
-            'systime': s.systime,
-           }
+    if s == NULL:
+        raise StatgrabException, 'get_cpu_diff() returned NULL'
+    return Result(
+        {'user': s.user,
+         'kernel': s.kernel,
+         'idle': s.idle,
+         'iowait': s.iowait,
+         'swap': s.swap,
+         'nice': s.nice,
+         'total': s.total,
+         'systime': s.systime,
+        }
+    )
 
 def py_cpu_percent_usage():
     cdef cpu_percent_t *s
     s = cpu_percent_usage()
-    return {'user': s.user,
-            'kernel': s.kernel,
-            'idle': s.idle,
-            'iowait': s.iowait,
-            'swap': s.swap,
-            'nice': s.nice,
-            'time_taken': s.time_taken,
-           }
+    if s == NULL:
+        raise StatgrabException, 'cpu_percent_usage() returned NULL'
+    return Result(
+        {'user': s.user,
+         'kernel': s.kernel,
+         'idle': s.idle,
+         'iowait': s.iowait,
+         'swap': s.swap,
+         'nice': s.nice,
+         'time_taken': s.time_taken,
+        }
+    )
 
 def py_get_memory_stats():
     cdef mem_stat_t *s
     s = get_memory_stats()
-    return {'total': s.total,
-            'used': s.used,
-            'free': s.free,
-            'cache': s.cache,
-           }
+    if s == NULL:
+        raise StatgrabException, 'get_memory_stats() returned NULL'
+    return Result(
+        {'total': s.total,
+         'used': s.used,
+         'free': s.free,
+         'cache': s.cache,
+        }
+    )
 
 def py_get_load_stats():
     cdef load_stat_t *s
     s = get_load_stats()
-    return {'min1': s.min1,
-            'min5': s.min5,
-            'min15': s.min15,
-           }
+    if s == NULL:
+        raise StatgrabException, 'get_load_stats() returned NULL'
+    return Result(
+        {'min1': s.min1,
+         'min5': s.min5,
+         'min15': s.min15,
+        }
+    )
 
 def py_get_user_stats():
     cdef user_stat_t *s
     s = get_user_stats()
-    return {'name_list': s.name_list,
-            'num_entries': s.num_entries,
-           }
+    if s == NULL:
+        raise StatgrabException, 'get_user_stats() returned NULL'
+    return Result(
+        {'name_list': s.name_list,
+         'num_entries': s.num_entries,
+        }
+    )
 
 def py_get_swap_stats():
     cdef swap_stat_t *s
     s = get_swap_stats()
-    return {'total': s.total,
-            'used': s.used,
-            'free': s.free,
-           }
+    if s == NULL:
+        raise StatgrabException, 'get_swap_stats() returned NULL'
+    return Result(
+        {'total': s.total,
+         'used': s.used,
+         'free': s.free,
+        }
+    )
 
 def py_get_general_stats():
     cdef general_stat_t *s
     s = get_general_stats()
-    return {'os_name': s.os_name,
-            'os_release': s.os_release,
-            'os_version': s.os_version,
-            'platform': s.platform,
-            'hostname': s.hostname,
-            'uptime': s.uptime,
-           }
+    if s == NULL:
+        raise StatgrabException, 'get_general_stats() returned NULL'
+    return Result(
+        {'os_name': s.os_name,
+         'os_release': s.os_release,
+         'os_version': s.os_version,
+         'platform': s.platform,
+         'hostname': s.hostname,
+         'uptime': s.uptime,
+        }
+    )
 
 def py_get_disk_stats():
     cdef disk_stat_t *s
     cdef int entries
     s = get_disk_stats(&entries)
+    if s == NULL:
+        raise StatgrabException, 'get_disk_stats() returned NULL'
     list = [entries]
     for i from 0 <= i < entries:
-        list.append({'device_name': s.device_name,
-                     'fs_type': s.fs_type,
-                     'mnt_point': s.mnt_point,
-                     'size': s.size,
-                     'used': s.used,
-                     'avail': s.avail,
-                     'total_inodes': s.total_inodes,
-                     'used_inodes': s.used_inodes,
-                     'free_inodes': s.free_inodes,
-                    },
-                   )
+        list.append(Result(
+            {'device_name': s.device_name,
+             'fs_type': s.fs_type,
+             'mnt_point': s.mnt_point,
+             'size': s.size,
+             'used': s.used,
+             'avail': s.avail,
+             'total_inodes': s.total_inodes,
+             'used_inodes': s.used_inodes,
+             'free_inodes': s.free_inodes,
+            }
+        ))
         s = s + 1
     return list
 
@@ -211,14 +282,17 @@ def py_get_diskio_stats():
     cdef diskio_stat_t *s
     cdef int entries
     s = get_diskio_stats(&entries)
+    if s == NULL:
+        raise StatgrabException, 'get_diskio_stats() returned NULL'
     list = [entries]
     for i from 0 <= i < entries:
-        list.append({'disk_name': s.disk_name,
-                     'read_bytes': s.read_bytes,
-                     'write_bytes': s.write_bytes,
-                     'systime': s.systime,
-                    },
-                   )
+        list.append(Result(
+            {'disk_name': s.disk_name,
+             'read_bytes': s.read_bytes,
+             'write_bytes': s.write_bytes,
+             'systime': s.systime,
+            }
+        ))
         s = s + 1
     return list
 
@@ -226,39 +300,49 @@ def py_get_diskio_stats_diff():
     cdef diskio_stat_t *s
     cdef int entries
     s = get_diskio_stats_diff(&entries)
+    if s == NULL:
+        raise StatgrabException, 'get_diskio_stats_diff() returned NULL'
     list = [entries]
     for i from 0 <= i < entries:
-        list.append({'disk_name': s.disk_name,
-                     'read_bytes': s.read_bytes,
-                     'write_bytes': s.write_bytes,
-                     'systime': s.systime,
-                    },
-                   )
+        list.append(Result(
+            {'disk_name': s.disk_name,
+             'read_bytes': s.read_bytes,
+             'write_bytes': s.write_bytes,
+             'systime': s.systime,
+            }
+        ))
         s = s + 1
     return list
 
 def py_get_process_stats():
     cdef process_stat_t *s
     s = get_process_stats()
-    return {'total': s.total,
-            'running': s.running,
-            'sleeping': s.sleeping,
-            'stopped': s.stopped,
-            'zombie': s.zombie,
-           }
+    if s == NULL:
+        raise StatgrabException, 'get_process_stats() returned NULL'
+    return Result(
+        {'total': s.total,
+         'running': s.running,
+         'sleeping': s.sleeping,
+         'stopped': s.stopped,
+         'zombie': s.zombie,
+        }
+    )
 
 def py_get_network_stats():
     cdef network_stat_t *s
     cdef int entries
     s = get_network_stats(&entries)
+    if s == NULL:
+        raise StatgrabException, 'get_network_stats() returned NULL'
     list = [entries]
     for i from 0 <= i < entries:
-        list.append({'interface_name': s.interface_name,
-                     'tx': s.tx,
-                     'rx': s.rx,
-                     'systime': s.systime,
-                    },
-                   )
+        list.append(Result(
+            {'interface_name': s.interface_name,
+             'tx': s.tx,
+             'rx': s.rx,
+             'systime': s.systime,
+            }
+        ))
         s = s + 1
     return list
 
@@ -266,30 +350,41 @@ def py_get_network_stats_diff():
     cdef network_stat_t *s
     cdef int entries
     s = get_network_stats_diff(&entries)
+    if s == NULL:
+        raise StatgrabException, 'get_network_stats_diff() returned NULL'
     list = [entries]
     for i from 0 <= i < entries:
-        list.append({'interface_name': s.interface_name,
-                     'tx': s.tx,
-                     'rx': s.rx,
-                     'systime': s.systime,
-                    },
-                   )
+        list.append(Result(
+            {'interface_name': s.interface_name,
+             'tx': s.tx,
+             'rx': s.rx,
+             'systime': s.systime,
+            }
+        ))
         s = s + 1
     return list
 
 def py_get_page_stats():
     cdef page_stat_t *s
     s = get_page_stats()
-    return {'pages_pagein': s.pages_pagein,
-            'pages_pageout': s.pages_pageout,
-           }
+    if s == NULL:
+        raise StatgrabException, 'get_page_stats() returned NULL'
+    return Result(
+        {'pages_pagein': s.pages_pagein,
+         'pages_pageout': s.pages_pageout,
+        }
+    )
 
 def py_get_page_stats_diff():
     cdef page_stat_t *s
     s = get_page_stats_diff()
-    return {'pages_pagein': s.pages_pagein,
-            'pages_pageout': s.pages_pageout,
-           }
+    if s == NULL:
+        raise StatgrabException, 'get_page_stats_diff() returned NULL'
+    return Result(
+        {'pages_pagein': s.pages_pagein,
+         'pages_pageout': s.pages_pageout,
+        }
+    )
 
 def py_statgrab_init():
     return statgrab_init()