@@ -3,6 +3,7 @@ #include <sys/mount.h> #include <sys/time.h> #include <sys/sysctl.h> +#include <sys/dkstat.h> #include <err.h> #include <stdio.h> @@ -97,7 +98,7 @@ PyObject *get_boottime(PyObject *self, PyObject *args){ mib[1] = KERN_BOOTTIME; size = sizeof(boottime); - if (sysctl(mib, 2, &boottime, &size, NULL, 0) == -1){ + if (sysctl(mib, 2, &boottime, &size, NULL, 0) < 0){ PyErr_SetFromErrno(OException); return NULL; } @@ -105,11 +106,37 @@ PyObject *get_boottime(PyObject *self, PyObject *args){ } +PyObject *get_cpustats(PyObject *self, PyObject *args){ + PyObject *cpudict; + size_t size; + int mib[2]; + long cp_time[CPUSTATES]; + + size = sizeof(cp_time); + mib[0] = CTL_KERN; + mib[1] = KERN_CPTIME; + + if (sysctl(mib, 2, cp_time, &size, NULL, 0) < 0){ + bzero(cp_time, sizeof(cp_time)); + PyErr_SetFromErrno(OException); + return NULL; + } + + cpudict = Py_BuildValue("{s:l}", "user", cp_time[CP_USER]); + stealingSetItem(cpudict, "nice", PyLong_FromLong(cp_time[CP_NICE])); + stealingSetItem(cpudict, "sys", PyLong_FromLong(cp_time[CP_SYS])); + stealingSetItem(cpudict, "intr", PyLong_FromLong(cp_time[CP_INTR])); + stealingSetItem(cpudict, "idle", PyLong_FromLong(cp_time[CP_IDLE])); + return cpudict; +} + + static PyMethodDef SystemMethods[] = { {"get_hostname", get_hostname, METH_VARARGS, "Get hostname."}, {"set_hostname", set_hostname, METH_VARARGS, "Set hostname."}, {"get_mntinfo", get_mntinfo, METH_VARARGS, "Get mount info."}, {"get_boottime", get_boottime, METH_VARARGS, "Get boot time."}, + {"get_cpustats", get_cpustats, METH_VARARGS, "Get CPU stats."}, {NULL, NULL, 0, NULL} /* Sentinel */ }; openbsd/_system.c @@ -46,6 +46,11 @@ class System(object): def boottime(self): return datetime.datetime.fromtimestamp(_system.get_boottime()) + @property + def cpustats(self): + dct = _system.get_cpustats() + return dct + def _gethostname(self): return _system.get_hostname() def _sethostname(self, hostname): openbsd/system.py @@ -19,6 +19,9 @@ class uSystem(libpry.AutoTree): def test_boottime(self): assert self.s.boottime + def test_cpustats(self): + assert self.s.cpustats + if os.geteuid() == 0: def test_sethostname(self): test/test_system.py 088a20fa470760c13ed4d8689e9021de481c07f4 Dave Harrison dave@nullcube.com http://github.com/cortesi/pyopenbsd/commit/e049a5129e3260875764cca2e4d87afde5e113cb e049a5129e3260875764cca2e4d87afde5e113cb 2008-12-01T04:27:22-08:00 2008-12-01T04:27:22-08:00 Add ability to collect cpu stats 4e9ea1ca5f81f6c394d323cc2016098863df5043 Dave Harrison dave@nullcube.com