#include <structmember.h>
#include <datetime.h>
+#if PY_MAJOR_VERSION >=3
+# define unicode_FromStringAndSize PyUnicode_FromStringAndSize
+# define unicode_FromString PyUnicode_FromString
+# define long_FromLong PyLong_FromLong
+# define long_FromSize_t PyLong_FromSize_t
+# define long_Check PyLong_Check
+# define long_AsLong PyLong_AsLong
+#else
+/* Python 3 type naming convention is used */
+# define unicode_FromStringAndSize PyString_FromStringAndSize
+# define unicode_FromString PyString_FromString
+# define long_FromLong PyInt_FromLong
+# define long_FromSize_t PyInt_FromSize_t
+# define long_Check PyInt_Check
+# define long_AsLong PyInt_AsLong
+#endif
+
typedef struct {
PyObject_HEAD
sd_journal *j;
static int
Journal_init(Journal *self, PyObject *args, PyObject *keywds)
{
- int flags=SD_JOURNAL_LOCAL_ONLY;
- char *path=NULL;
+ int flags = SD_JOURNAL_LOCAL_ONLY, r;
+ char *path = NULL;
- static char *kwlist[] = {"flags", "path", NULL};
- if (! PyArg_ParseTupleAndKeywords(args, keywds, "|iz", kwlist,
- &flags, &path))
+ static const char* const kwlist[] = {"flags", "path", NULL};
+ if (!PyArg_ParseTupleAndKeywords(args, keywds, "|iz", (char**) kwlist,
+ &flags, &path))
return 1;
- int r;
Py_BEGIN_ALLOW_THREADS
- if (path) {
+ if (path)
r = sd_journal_open_directory(&self->j, path, 0);
- }else{
+ else
r = sd_journal_open(&self->j, flags);
- }
Py_END_ALLOW_THREADS
return set_error(r, path, "Invalid flags or path");
static PyObject *
Journal_get_next(Journal *self, PyObject *args)
{
- int64_t skip=1LL;
+ PyObject *dict;
+ const void *msg;
+ size_t msg_len;
+ const char *delim_ptr;
+ PyObject *key, *value, *cur_value, *tmp_list;
+
+ int64_t skip = 1LL, r = -EINVAL;
if (! PyArg_ParseTuple(args, "|L", &skip))
return NULL;
if (skip == 0LL) {
- PyErr_SetString(PyExc_ValueError, "Skip number must positive/negative integer");
+ PyErr_SetString(PyExc_ValueError, "skip must be nonzero");
return NULL;
}
- int r = -EINVAL;
Py_BEGIN_ALLOW_THREADS
- if (skip == 1LL) {
+ if (skip == 1LL)
r = sd_journal_next(self->j);
- }else if (skip == -1LL) {
+ else if (skip == -1LL)
r = sd_journal_previous(self->j);
- }else if (skip > 1LL) {
+ else if (skip > 1LL)
r = sd_journal_next_skip(self->j, skip);
- }else if (skip < -1LL) {
+ else if (skip < -1LL)
r = sd_journal_previous_skip(self->j, -skip);
- }
Py_END_ALLOW_THREADS
set_error(r, NULL, NULL);
else if (r == 0) /* EOF */
return PyDict_New();
- PyObject *dict;
dict = PyDict_New();
- const void *msg;
- size_t msg_len;
- const char *delim_ptr;
- PyObject *key, *value, *cur_value, *tmp_list;
-
SD_JOURNAL_FOREACH_DATA(self->j, msg, msg_len) {
delim_ptr = memchr(msg, '=', msg_len);
-#if PY_MAJOR_VERSION >=3
- key = PyUnicode_FromStringAndSize(msg, delim_ptr - (const char*) msg);
-#else
- key = PyString_FromStringAndSize(msg, delim_ptr - (const char*) msg);
-#endif
+ key = unicode_FromStringAndSize(msg, delim_ptr - (const char*) msg);
value = PyBytes_FromStringAndSize(delim_ptr + 1, (const char*) msg + msg_len - (delim_ptr + 1) );
if (PyDict_Contains(dict, key)) {
cur_value = PyDict_GetItem(dict, key);
Py_DECREF(value);
}
- uint64_t realtime;
- if (sd_journal_get_realtime_usec(self->j, &realtime) == 0) {
- char realtime_str[20];
- sprintf(realtime_str, "%llu", (long long unsigned) realtime);
-
-#if PY_MAJOR_VERSION >=3
- key = PyUnicode_FromString("__REALTIME_TIMESTAMP");
-#else
- key = PyString_FromString("__REALTIME_TIMESTAMP");
-#endif
- value = PyBytes_FromString(realtime_str);
- PyDict_SetItem(dict, key, value);
- Py_DECREF(key);
- Py_DECREF(value);
+ {
+ uint64_t realtime;
+ if (sd_journal_get_realtime_usec(self->j, &realtime) == 0) {
+ char realtime_str[20];
+ sprintf(realtime_str, "%llu", (long long unsigned) realtime);
+ key = unicode_FromString("__REALTIME_TIMESTAMP");
+ value = PyBytes_FromString(realtime_str);
+ PyDict_SetItem(dict, key, value);
+ Py_DECREF(key);
+ Py_DECREF(value);
+ }
}
- sd_id128_t sd_id;
- uint64_t monotonic;
- if (sd_journal_get_monotonic_usec(self->j, &monotonic, &sd_id) == 0) {
- char monotonic_str[20];
- sprintf(monotonic_str, "%llu", (long long unsigned) monotonic);
-#if PY_MAJOR_VERSION >=3
- key = PyUnicode_FromString("__MONOTONIC_TIMESTAMP");
-#else
- key = PyString_FromString("__MONOTONIC_TIMESTAMP");
-#endif
- value = PyBytes_FromString(monotonic_str);
+ {
+ sd_id128_t sd_id;
+ uint64_t monotonic;
+ if (sd_journal_get_monotonic_usec(self->j, &monotonic, &sd_id) == 0) {
+ char monotonic_str[20];
+ sprintf(monotonic_str, "%llu", (long long unsigned) monotonic);
+ key = unicode_FromString("__MONOTONIC_TIMESTAMP");
+ value = PyBytes_FromString(monotonic_str);
- PyDict_SetItem(dict, key, value);
- Py_DECREF(key);
- Py_DECREF(value);
+ PyDict_SetItem(dict, key, value);
+ Py_DECREF(key);
+ Py_DECREF(value);
+ }
}
- char *cursor;
- if (sd_journal_get_cursor(self->j, &cursor) > 0) { //Should return 0...
-#if PY_MAJOR_VERSION >=3
- key = PyUnicode_FromString("__CURSOR");
-#else
- key = PyString_FromString("__CURSOR");
-#endif
- value = PyBytes_FromString(cursor);
- PyDict_SetItem(dict, key, value);
- free(cursor);
- Py_DECREF(key);
- Py_DECREF(value);
+ {
+ char *cursor;
+ if (sd_journal_get_cursor(self->j, &cursor) > 0) { //Should return 0...
+ key = unicode_FromString("__CURSOR");
+ value = PyBytes_FromString(cursor);
+ PyDict_SetItem(dict, key, value);
+ free(cursor);
+ Py_DECREF(key);
+ Py_DECREF(value);
+ }
}
return dict;
if (! PyArg_ParseTuple(args, "|L", &skip))
return NULL;
- return PyObject_CallMethod((PyObject *)self, "get_next", "L", -skip);
+ return PyObject_CallMethod((PyObject *)self, (char*) "get_next",
+ (char*) "L", -skip);
}
PyDoc_STRVAR(Journal_add_match__doc__,
Journal_add_match(Journal *self, PyObject *args, PyObject *keywds)
{
char *match;
- int match_len;
- if (! PyArg_ParseTuple(args, "s#", &match, &match_len))
+ int match_len, r;
+ if (!PyArg_ParseTuple(args, "s#", &match, &match_len))
return NULL;
- int r;
r = sd_journal_add_match(self->j, match, match_len);
set_error(r, NULL, "Invalid match");
if (r < 0)
Journal_seek(Journal *self, PyObject *args, PyObject *keywds)
{
int64_t offset;
- int whence=SEEK_SET;
- static char *kwlist[] = {"offset", "whence", NULL};
+ int whence = SEEK_SET;
+ PyObject *result = NULL;
- if (! PyArg_ParseTupleAndKeywords(args, keywds, "L|i", kwlist,
- &offset, &whence))
+ static const char* const kwlist[] = {"offset", "whence", NULL};
+ if (!PyArg_ParseTupleAndKeywords(args, keywds, "L|i", (char**) kwlist,
+ &offset, &whence))
return NULL;
- PyObject *result=NULL;
- if (whence == SEEK_SET){
+ switch(whence) {
+ case SEEK_SET: {
int r;
Py_BEGIN_ALLOW_THREADS
r = sd_journal_seek_head(self->j);
if (set_error(r, NULL, NULL))
return NULL;
- if (offset > 0LL) {
- result = PyObject_CallMethod((PyObject *)self, "get_next", "L", offset);
- }
- }else if (whence == SEEK_CUR){
- result = PyObject_CallMethod((PyObject *)self, "get_next", "L", offset);
- }else if (whence == SEEK_END){
+ if (offset > 0LL)
+ result = PyObject_CallMethod((PyObject *)self, (char*) "get_next",
+ (char*) "L", offset);
+ break;
+ }
+ case SEEK_CUR:
+ result = PyObject_CallMethod((PyObject *)self, (char*) "get_next",
+ (char*) "L", offset);
+ break;
+ case SEEK_END: {
int r;
Py_BEGIN_ALLOW_THREADS
r = sd_journal_seek_tail(self->j);
if (set_error(r, NULL, NULL))
return NULL;
- if (offset < 0LL) {
- result = PyObject_CallMethod((PyObject *)self, "get_next", "L", offset);
- }else{
- result = PyObject_CallMethod((PyObject *)self, "get_next", "L", -1LL);
- }
- }else{
+ result = PyObject_CallMethod((PyObject *)self, (char*) "get_next",
+ (char*) "L", offset < 0LL ? offset : -1LL);
+ break;
+ }
+ default:
PyErr_SetString(PyExc_ValueError, "Invalid value for whence");
}
Journal_seek_realtime(Journal *self, PyObject *args)
{
double timedouble;
- if (! PyArg_ParseTuple(args, "d", &timedouble))
+ uint64_t timestamp;
+ int r;
+
+ if (!PyArg_ParseTuple(args, "d", &timedouble))
return NULL;
- uint64_t timestamp;
timestamp = (uint64_t) (timedouble * 1.0E6);
-
if ((int64_t) timestamp < 0LL) {
- PyErr_SetString(PyExc_ValueError, "Time must be positive integer");
+ PyErr_SetString(PyExc_ValueError, "Time must be a positive integer");
return NULL;
}
- int r;
Py_BEGIN_ALLOW_THREADS
r = sd_journal_seek_realtime_usec(self->j, timestamp);
Py_END_ALLOW_THREADS
{
double timedouble;
char *bootid=NULL;
+ uint64_t timestamp;
+ sd_id128_t sd_id;
+ int r;
+
if (! PyArg_ParseTuple(args, "d|z", &timedouble, &bootid))
return NULL;
- uint64_t timestamp;
timestamp = (uint64_t) (timedouble * 1.0E6);
if ((int64_t) timestamp < 0LL) {
return NULL;
}
- sd_id128_t sd_id;
- int r;
if (bootid) {
r = sd_id128_from_string(bootid, &sd_id);
if (set_error(r, NULL, "Invalid bootid"))
static PyObject *
Journal_wait(Journal *self, PyObject *args, PyObject *keywds)
{
- int64_t timeout=0LL;
- if (! PyArg_ParseTuple(args, "|L", &timeout))
+ int r;
+ int64_t timeout = 0LL;
+
+ if (!PyArg_ParseTuple(args, "|L", &timeout))
return NULL;
- int r;
Py_BEGIN_ALLOW_THREADS
r = sd_journal_wait(self->j, timeout ==0 ? (uint64_t) -1 : timeout * 1E6);
Py_END_ALLOW_THREADS
if (set_error(r, NULL, NULL))
return NULL;
-#if PY_MAJOR_VERSION >=3
- return PyLong_FromLong(r);
-#else
- return PyInt_FromLong(r);
-#endif
+ return long_FromLong(r);
}
PyDoc_STRVAR(Journal_seek_cursor__doc__,
Journal_seek_cursor(Journal *self, PyObject *args)
{
const char *cursor;
+ int r;
+
if (! PyArg_ParseTuple(args, "s", &cursor))
return NULL;
- int r;
Py_BEGIN_ALLOW_THREADS
r = sd_journal_seek_cursor(self->j, cursor);
Py_END_ALLOW_THREADS
PyObject *dict;
Py_ssize_t dict_size;
- dict = PyObject_CallMethod(self, "get_next", "");
+ dict = PyObject_CallMethod(self, (char*) "get_next", (char*) "");
if (PyErr_Occurred())
return NULL;
dict_size = PyDict_Size(dict);
Journal_query_unique(Journal *self, PyObject *args)
{
char *query;
+ int r;
+ const void *uniq;
+ size_t uniq_len;
+ PyObject *value_set, *key, *value;
+
if (! PyArg_ParseTuple(args, "s", &query))
return NULL;
- int r;
Py_BEGIN_ALLOW_THREADS
r = sd_journal_query_unique(self->j, query);
Py_END_ALLOW_THREADS
if (set_error(r, NULL, "Invalid field name"))
return NULL;
- const void *uniq;
- size_t uniq_len;
- const char *delim_ptr;
- PyObject *value_set, *key, *value;
value_set = PySet_New(0);
-
-#if PY_MAJOR_VERSION >=3
- key = PyUnicode_FromString(query);
-#else
- key = PyString_FromString(query);
-#endif
+ key = unicode_FromString(query);
SD_JOURNAL_FOREACH_UNIQUE(self->j, uniq, uniq_len) {
+ const char *delim_ptr;
+
delim_ptr = memchr(uniq, '=', uniq_len);
value = PyBytes_FromStringAndSize(delim_ptr + 1, (const char*) uniq + uniq_len - (delim_ptr + 1));
PySet_Add(value_set, value);
Journal_get_data_threshold(Journal *self, void *closure)
{
size_t cvalue;
- PyObject *value;
int r;
r = sd_journal_get_data_threshold(self->j, &cvalue);
if (set_error(r, NULL, NULL))
return NULL;
-#if PY_MAJOR_VERSION >=3
- value = PyLong_FromSize_t(cvalue);
-#else
- value = PyInt_FromSize_t(cvalue);
-#endif
- return value;
+ return long_FromSize_t(cvalue);
}
static int
Journal_set_data_threshold(Journal *self, PyObject *value, void *closure)
{
+ int r;
if (value == NULL) {
PyErr_SetString(PyExc_TypeError, "Cannot delete data threshold");
return -1;
}
-#if PY_MAJOR_VERSION >=3
- if (! PyLong_Check(value)){
-#else
- if (! PyInt_Check(value)){
-#endif
- PyErr_SetString(PyExc_TypeError, "Data threshold must be int");
+ if (!long_Check(value)){
+ PyErr_SetString(PyExc_TypeError, "Data threshold must be an int");
return -1;
}
- int r;
-#if PY_MAJOR_VERSION >=3
- r = sd_journal_set_data_threshold(self->j, (size_t) PyLong_AsLong(value));
-#else
- r = sd_journal_set_data_threshold(self->j, (size_t) PyInt_AsLong(value));
-#endif
+ r = sd_journal_set_data_threshold(self->j, (size_t) long_AsLong(value));
return set_error(r, NULL, NULL);
}
static PyGetSetDef Journal_getseters[] = {
- {"data_threshold",
- (getter)Journal_get_data_threshold,
- (setter)Journal_set_data_threshold,
- "data threshold",
- NULL},
+ {(char*) "data_threshold",
+ (getter)Journal_get_data_threshold,
+ (setter)Journal_set_data_threshold,
+ (char*) "data threshold",
+ NULL},
{NULL}
};
};
#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+
PyMODINIT_FUNC
#if PY_MAJOR_VERSION >= 3
PyInit__reader(void)
#else
-init_reader(void)
+init_reader(void)
#endif
{
PyObject* m;
return m;
#endif
}
+
+#pragma GCC diagnostic pop
~ianmdlvl / elogind.git / blobdiff