[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[py-rrdtool-cvs] [Commit] py-rrdtool/src _rrdtoolmodule.c
|
From: |
Hye-Shik Chang <address@hidden> |
|
Subject: |
[py-rrdtool-cvs] [Commit] py-rrdtool/src _rrdtoolmodule.c |
|
Date: |
Wed, 08 Jan 2003 15:29:34 -0500 |
perky 03/01/08 15:29:29
Modified: src _rrdtoolmodule.c
Log:
Minor style fixes
Revision Changes Path
1.11 +90 -89 py-rrdtool/src/_rrdtoolmodule.c
Index: _rrdtoolmodule.c
===================================================================
RCS file: /cvsroot/py-rrdtool/py-rrdtool/src/_rrdtoolmodule.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- _rrdtoolmodule.c 8 Jan 2003 19:43:06 -0000 1.10
+++ _rrdtoolmodule.c 8 Jan 2003 20:29:29 -0000 1.11
@@ -4,10 +4,10 @@
* RRDTool Python binding
*
* Author : Hye-Shik Chang <address@hidden>
- * Date : $Date: 2003/01/08 19:43:06 $
+ * Date : $Date: 2003/01/08 20:29:29 $
* Created : 23 May 2002
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
*
==========================================================================
* This file is part of py-rrdtool.
@@ -28,8 +28,7 @@
*
*/
-static char *version =
-"$Id: _rrdtoolmodule.c,v 1.10 2003/01/08 19:43:06 perky Exp $";
+static char *__version__ = "$Revision: 1.11 $";
#include "Python.h"
#include "rrd.h"
@@ -40,18 +39,18 @@
static int
create_args(char *command, PyObject *args, int *argc, char ***argv)
{
- PyObject *o;
- int size, i;
+ PyObject *o;
+ int size, i;
- size = PyTuple_Size(args);
- *argv = PyMem_New(char*, size+1);
+ size = PyTuple_Size(args);
+ *argv = PyMem_New(char *, size + 1);
if (*argv == NULL)
return -1;
for (i = 0; i < size; i++) {
o = PyTuple_GET_ITEM(args, i);
if (PyString_Check(o))
- (*argv)[i+1] = PyString_AS_STRING(o);
+ (*argv)[i + 1] = PyString_AS_STRING(o);
else {
PyMem_Del(*argv);
PyErr_Format(PyExc_TypeError, "argument %d must be string", i);
@@ -83,9 +82,9 @@
static PyObject *
PyRRD_create(PyObject *self, PyObject *args)
{
- int argc;
- char **argv;
- PyObject *r;
+ PyObject *r;
+ char **argv;
+ int argc;
if (create_args("create", args, &argc, &argv) < 0)
return NULL;
@@ -104,16 +103,16 @@
}
static char PyRRD_update__doc__[] =
-"update(args..): Store a new set of values into the rrd\n\
- update filename [--template|-t ds-name[:ds-name]...] \
-N|timestamp:value[:value...] [timestamp:value[:value...] ...]";
+"update(args..): Store a new set of values into the rrd\n"
+" update filename [--template|-t ds-name[:ds-name]...] "
+"N|timestamp:value[:value...] [timestamp:value[:value...] ...]";
static PyObject *
PyRRD_update(PyObject *self, PyObject *args)
{
- int argc;
- char **argv;
- PyObject *r;
+ PyObject *r;
+ char **argv;
+ int argc;
if (create_args("update", args, &argc, &argv) < 0)
return NULL;
@@ -132,35 +131,36 @@
}
static char PyRRD_fetch__doc__[] =
-"fetch(args..): fetch data from an rrd.\n\
- fetch filename CF [--resolution|-r resolution] \
-[--start|-s start] [--end|-e end]";
+"fetch(args..): fetch data from an rrd.\n"
+" fetch filename CF [--resolution|-r resolution] "
+"[--start|-s start] [--end|-e end]";
static PyObject *
PyRRD_fetch(PyObject *self, PyObject *args)
{
- int argc;
- char **argv;
- PyObject *r;
-
- time_t start, end;
- unsigned long step, ds_cnt;
- rrd_value_t *data, *datai;
- char **ds_namv;
+ PyObject *r;
+ rrd_value_t *data, *datai;
+ unsigned long step, ds_cnt;
+ time_t start, end;
+ int argc;
+ char **argv, **ds_namv;
if (create_args("fetch", args, &argc, &argv) < 0)
return NULL;
- if (rrd_fetch(argc, argv, &start, &end, &step, &ds_cnt, &ds_namv, &data)
== -1) {
+ if (rrd_fetch(argc, argv, &start, &end, &step,
+ &ds_cnt, &ds_namv, &data) == -1) {
PyErr_SetString(ErrorObject, rrd_get_error());
rrd_clear_error();
r = NULL;
} else {
- PyObject *range_tup, *dsnam_tup, *data_list, *t;
- int i, j, row = ((end - start)/step + 1);
- rrd_value_t dv;
/* Return :
((start, end, step), (name1, name2, ...), [(data1, data2, ..),
...]) */
+ PyObject *range_tup, *dsnam_tup, *data_list, *t;
+ int i, j, row;
+ rrd_value_t dv;
+
+ row = ((end - start) / step + 1);
r = PyTuple_New(3);
range_tup = PyTuple_New(3);
@@ -182,6 +182,7 @@
for (i = 0; i < row; i ++) {
t = PyTuple_New(ds_cnt);
PyList_SET_ITEM(data_list, i, t);
+
for (j = 0; j < ds_cnt; j++) {
dv = *(datai++);
if (isnan(dv)) {
@@ -204,33 +205,33 @@
}
static char PyRRD_graph__doc__[] =
-"graph(args..): Create a graph based on data from one or several RRD\n\
- graph filename [-s|--start seconds] \
-[-e|--end seconds] [-x|--x-grid x-axis grid and label] \
-[-y|--y-grid y-axis grid and label] [--alt-y-grid] [--alt-y-mrtg] \
-[--alt-autoscale] [--alt-autoscale-max] [--units-exponent] value \
-[-v|--vertical-label text] [-w|--width pixels] [-h|--height pixels] \
-[-i|--interlaced] \
-[-f|--imginfo formatstring] [-a|--imgformat GIF|PNG|GD] \
-[-B|--background value] [-O|--overlay value] \
-[-U|--unit value] [-z|--lazy] [-o|--logarithmic] \
-[-u|--upper-limit value] [-l|--lower-limit value] \
-[-g|--no-legend] [-r|--rigid] [--step value] \
-[-b|--base value] [-c|--color COLORTAG#rrggbb] \
-[-t|--title title] [DEF:vname=rrd:ds-name:CF] \
-[CDEF:vname=rpn-expression] [PRINT:vname:CF:format] \
-[GPRINT:vname:CF:format] [COMMENT:text] \
-[HRULE:value#rrggbb[:legend]] [VRULE:time#rrggbb[:legend]] \
-[LINE{1|2|3}:vname[#rrggbb[:legend]]] \
-[AREA:vname[#rrggbb[:legend]]] \
-[STACK:vname[#rrggbb[:legend]]]";
+"graph(args..): Create a graph based on data from one or several RRD\n"
+" graph filename [-s|--start seconds] "
+"[-e|--end seconds] [-x|--x-grid x-axis grid and label] "
+"[-y|--y-grid y-axis grid and label] [--alt-y-grid] [--alt-y-mrtg] "
+"[--alt-autoscale] [--alt-autoscale-max] [--units-exponent] value "
+"[-v|--vertical-label text] [-w|--width pixels] [-h|--height pixels] "
+"[-i|--interlaced] "
+"[-f|--imginfo formatstring] [-a|--imgformat GIF|PNG|GD] "
+"[-B|--background value] [-O|--overlay value] "
+"[-U|--unit value] [-z|--lazy] [-o|--logarithmic] "
+"[-u|--upper-limit value] [-l|--lower-limit value] "
+"[-g|--no-legend] [-r|--rigid] [--step value] "
+"[-b|--base value] [-c|--color COLORTAG#rrggbb] "
+"[-t|--title title] [DEF:vname=rrd:ds-name:CF] "
+"[CDEF:vname=rpn-expression] [PRINT:vname:CF:format] "
+"[GPRINT:vname:CF:format] [COMMENT:text] "
+"[HRULE:value#rrggbb[:legend]] [VRULE:time#rrggbb[:legend]] "
+"[LINE{1|2|3}:vname[#rrggbb[:legend]]] "
+"[AREA:vname[#rrggbb[:legend]]] "
+"[STACK:vname[#rrggbb[:legend]]]";
static PyObject *
PyRRD_graph(PyObject *self, PyObject *args)
{
- int argc, xsize, ysize, i;
- char **argv, **calcpr;
- PyObject *r;
+ PyObject *r;
+ char **argv, **calcpr;
+ int argc, xsize, ysize, i;
if (create_args("graph", args, &argc, &argv) < 0)
return NULL;
@@ -246,7 +247,9 @@
PyTuple_SET_ITEM(r, 1, PyInt_FromLong((long)ysize));
if (calcpr) {
- PyObject *e = PyList_New(0), *t;
+ PyObject *e, *t;
+
+ e = PyList_New(0);
PyTuple_SET_ITEM(r, 2, e);
for(i = 0; calcpr[i]; i++) {
@@ -267,17 +270,17 @@
}
static char PyRRD_tune__doc__[] =
-"tune(args...): Modify some basic properties of a Round Robin Database\n\
- tune filename [--heartbeat|-h ds-name:heartbeat] \
-[--minimum|-i ds-name:min] [--maximum|-a ds-name:max] \
-[--data-source-type|-d ds-name:DST] [--data-source-rename|-r
old-name:new-name]";
+"tune(args...): Modify some basic properties of a Round Robin Database\n"
+" tune filename [--heartbeat|-h ds-name:heartbeat] "
+"[--minimum|-i ds-name:min] [--maximum|-a ds-name:max] "
+"[--data-source-type|-d ds-name:DST] [--data-source-rename|-r
old-name:new-name]";
static PyObject *
PyRRD_tune(PyObject *self, PyObject *args)
{
- int argc;
- char **argv;
- PyObject *r;
+ PyObject *r;
+ char **argv;
+ int argc;
if (create_args("tune", args, &argc, &argv) < 0)
return NULL;
@@ -301,10 +304,9 @@
static PyObject *
PyRRD_last(PyObject *self, PyObject *args)
{
- int argc;
- char **argv;
- int ts;
- PyObject *r;
+ PyObject *r;
+ int argc, ts;
+ char **argv;
if (create_args("last", args, &argc, &argv) < 0)
return NULL;
@@ -321,16 +323,15 @@
}
static char PyRRD_resize__doc__[] =
-"resize(args...): alters the size of an RRA.\n\
- resize filename rra-num GROW|SHRINK rows";
+"resize(args...): alters the size of an RRA.\n"
+" resize filename rra-num GROW|SHRINK rows";
static PyObject *
PyRRD_resize(PyObject *self, PyObject *args)
{
- int argc;
- char **argv;
- int ts;
- PyObject *r;
+ PyObject *r;
+ char **argv;
+ int argc, ts;
if (create_args("resize", args, &argc, &argv) < 0)
return NULL;
@@ -354,11 +355,11 @@
static PyObject *
PyRRD_info(PyObject *self, PyObject *args)
{
- PyObject *r, *t, *ds;
- rrd_t rrd;
- FILE *in_file;
- char *filename;
- int i, j;
+ PyObject *r, *t, *ds;
+ rrd_t rrd;
+ FILE *in_file;
+ char *filename;
+ int i, j;
if (! PyArg_ParseTuple(args, "s:info", &filename))
return NULL;
@@ -398,7 +399,7 @@
Py_DECREF(ds);
for (i = 0; i < rrd.stat_head->ds_cnt; i++) {
- PyObject *d;
+ PyObject *d;
d = PyDict_New();
PyDict_SetItemString(ds, rrd.ds_def[i].ds_nam, d);
@@ -419,7 +420,7 @@
Py_DECREF(ds);
for (i = 0; i < rrd.stat_head->rra_cnt; i++) {
- PyObject *d, *cdp;
+ PyObject *d, *cdp;
d = PyDict_New();
PyList_SET_ITEM(ds, i, d);
@@ -434,7 +435,7 @@
Py_DECREF(cdp);
for (j = 0; j < rrd.stat_head->ds_cnt; j++) {
- PyObject *cdd;
+ PyObject *cdd;
cdd = PyDict_New();
PyList_SET_ITEM(cdp, j, cdd);
@@ -479,7 +480,7 @@
void
init_rrdtool(void)
{
- PyObject *m, *d, *t;
+ PyObject *m, *d, *t;
/* Create the module and add the functions */
m = Py_InitModule("_rrdtool", _rrdtool_methods);
@@ -487,16 +488,16 @@
/* Add some symbolic constants to the module */
d = PyModule_GetDict(m);
- SET_STRCONSTANT(d, version);
-/* SET_INTCONSTANT(d, ABSOLUTE_TIME);
- SET_INTCONSTANT(d, RELATIVE_TO_START_TIME);
- SET_INTCONSTANT(d, RELATIVE_TO_END_TIME); */
-
+ SET_STRCONSTANT(d, __version__);
ErrorObject = PyErr_NewException("_rrdtool.error", NULL, NULL);
PyDict_SetItemString(d, "error", ErrorObject);
- Py_DECREF(ErrorObject);
/* Check for errors */
if (PyErr_Occurred())
Py_FatalError("can't initialize the _rrdtool module");
}
+
+/*
+ * $Id: _rrdtoolmodule.c,v 1.11 2003/01/08 20:29:29 perky Exp $
+ * ex: ts=8 sts=4 et
+ */