-/*
-_reader - Python module that reads systemd journal similar to journalctl
-Copyright (C) 2012 Steven Hiscocks
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-#include <systemd/sd-journal.h>
+/*-*- Mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2013 Steven Hiscocks, Zbigniew Jędrzejewski-Szmek
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
#include <Python.h>
#include <structmember.h>
#include <datetime.h>
+#include <stdio.h>
+
+#include <systemd/sd-journal.h>
+
+#include "pyutil.h"
+#include "macro.h"
+#include "util.h"
typedef struct {
PyObject_HEAD
sd_journal *j;
-} Journal;
-static PyTypeObject JournalType;
+} Reader;
+static PyTypeObject ReaderType;
+
+static int set_error(int r, const char* path, const char* invalid_message) {
+ if (r >= 0)
+ return r;
+ if (r == -EINVAL && invalid_message)
+ PyErr_SetString(PyExc_ValueError, invalid_message);
+ else if (r == -ENOMEM)
+ PyErr_SetString(PyExc_MemoryError, "Not enough memory");
+ else {
+ errno = -r;
+ PyErr_SetFromErrnoWithFilename(PyExc_OSError, path);
+ }
+ return -1;
+}
+
+#if PY_MAJOR_VERSION >= 3
+static PyTypeObject MonotonicType;
+
+PyDoc_STRVAR(MonotonicType__doc__,
+ "A tuple of (timestamp, bootid) for holding monotonic timestamps");
+
+static PyStructSequence_Field MonotonicType_fields[] = {
+ {(char*) "timestamp", (char*) "Time"},
+ {(char*) "bootid", (char*) "Unique identifier of the boot"},
+ {NULL, NULL}
+};
-static void
-Journal_dealloc(Journal* self)
+static PyStructSequence_Desc Monotonic_desc = {
+ (char*) "journal.Monotonic",
+ MonotonicType__doc__,
+ MonotonicType_fields,
+ 2,
+};
+#endif
+
+static void Reader_dealloc(Reader* self)
{
sd_journal_close(self->j);
Py_TYPE(self)->tp_free((PyObject*)self);
}
-PyDoc_STRVAR(Journal__doc__,
-"Journal([flags][,path]) -> ...\n"
-"Journal instance\n\n"
-"Returns instance of Journal, which allows filtering and return\n"
-"of journal entries.\n"
-"Argument `flags` sets open flags of the journal, which can be one\n"
-"of, or ORed combination of constants: LOCAL_ONLY (default) opens\n"
-"journal on local machine only; RUNTIME_ONLY opens only\n"
-"volatile journal files; and SYSTEM_ONLY opens only\n"
-"journal files of system services and the kernel.\n"
-"Argument `path` is the directory of journal files. Note that\n"
-"currently flags are ignored when `path` is present as they are\n"
-" not relevant.");
-static int
-Journal_init(Journal *self, PyObject *args, PyObject *keywds)
+PyDoc_STRVAR(Reader__doc__,
+ "Reader([flags | path]) -> ...\n\n"
+ "Reader allows filtering and retrieval of Journal entries.\n"
+ "Note: this is a low-level interface, and probably not what you\n"
+ "want, use systemd.journal.Reader instead.\n\n"
+ "Argument `flags` sets open flags of the journal, which can be one\n"
+ "of, or ORed combination of constants: LOCAL_ONLY (default) opens\n"
+ "journal on local machine only; RUNTIME_ONLY opens only\n"
+ "volatile journal files; and SYSTEM_ONLY opens only\n"
+ "journal files of system services and the kernel.\n\n"
+ "Argument `path` is the directory of journal files. Note that\n"
+ "`flags` and `path` are exclusive.\n");
+static int Reader_init(Reader *self, PyObject *args, PyObject *keywds)
{
- int flags=SD_JOURNAL_LOCAL_ONLY;
- char *path=NULL;
+ int flags = 0, r;
+ char *path = NULL;
+
+ static const char* const kwlist[] = {"flags", "path", NULL};
+ if (!PyArg_ParseTupleAndKeywords(args, keywds, "|iz", (char**) kwlist,
+ &flags, &path))
+ return -1;
- static char *kwlist[] = {"flags", NULL};
- if (! PyArg_ParseTupleAndKeywords(args, keywds, "|is", kwlist,
- &flags, &path))
- return 1;
+ if (!flags)
+ flags = SD_JOURNAL_LOCAL_ONLY;
+ else
+ if (path) {
+ PyErr_SetString(PyExc_ValueError, "cannot use both flags and path");
+ return -1;
+ }
- int r;
- if (path) {
+ Py_BEGIN_ALLOW_THREADS
+ if (path)
r = sd_journal_open_directory(&self->j, path, 0);
- }else{
- Py_BEGIN_ALLOW_THREADS
+ else
r = sd_journal_open(&self->j, flags);
- Py_END_ALLOW_THREADS
- }
- if (r == -EINVAL) {
- PyErr_SetString(PyExc_ValueError, "Invalid flags or path");
- return -1;
- }else if (r == -ENOMEM) {
- PyErr_SetString(PyExc_MemoryError, "Not enough memory");
- return 1;
- }else if (r < 0) {
- PyErr_SetString(PyExc_RuntimeError, "Error opening journal");
- return 1;
- }
+ Py_END_ALLOW_THREADS
- return 0;
+ return set_error(r, path, "Invalid flags or path");
}
-PyDoc_STRVAR(Journal_get_next__doc__,
-"get_next([skip]) -> dict\n\n"
-"Return dictionary of the next log entry. Optional skip value will\n"
-"return the `skip`th log entry.");
-static PyObject *
-Journal_get_next(Journal *self, PyObject *args)
+PyDoc_STRVAR(Reader_fileno__doc__,
+ "fileno() -> int\n\n"
+ "Get a file descriptor to poll for changes in the journal.\n"
+ "This method invokes sd_journal_get_fd().\n"
+ "See man:sd_journal_get_fd(3).");
+static PyObject* Reader_fileno(Reader *self, PyObject *args)
{
- int64_t skip=1LL;
- if (! PyArg_ParseTuple(args, "|L", &skip))
+ int r;
+ r = sd_journal_get_fd(self->j);
+ set_error(r, NULL, NULL);
+ if (r < 0)
return NULL;
+ return long_FromLong(r);
+}
+PyDoc_STRVAR(Reader_reliable_fd__doc__,
+ "reliable_fd() -> bool\n\n"
+ "Returns True iff the journal can be polled reliably.\n"
+ "This method invokes sd_journal_reliable_fd().\n"
+ "See man:sd_journal_reliable_fd(3).");
+static PyObject* Reader_reliable_fd(Reader *self, PyObject *args)
+{
int r;
- if (skip == 1LL) {
- Py_BEGIN_ALLOW_THREADS
+ r = sd_journal_reliable_fd(self->j);
+ set_error(r, NULL, NULL);
+ if (r < 0)
+ return NULL;
+ return PyBool_FromLong(r);
+}
+
+PyDoc_STRVAR(Reader_close__doc__,
+ "close() -> None\n\n"
+ "Free resources allocated by this Reader object.\n"
+ "This method invokes sd_journal_close().\n"
+ "See man:sd_journal_close(3).");
+static PyObject* Reader_close(Reader *self, PyObject *args)
+{
+ assert(self);
+ assert(!args);
+
+ sd_journal_close(self->j);
+ self->j = NULL;
+ Py_RETURN_NONE;
+}
+
+PyDoc_STRVAR(Reader___enter____doc__,
+ "__enter__() -> self\n\n"
+ "Part of the context manager protocol.\n"
+ "Returns self.\n");
+static PyObject* Reader___enter__(PyObject *self, PyObject *args)
+{
+ assert(self);
+ assert(!args);
+
+ Py_INCREF(self);
+ return self;
+}
+
+PyDoc_STRVAR(Reader___exit____doc__,
+ "__exit__(type, value, traceback) -> None\n\n"
+ "Part of the context manager protocol.\n"
+ "Closes the journal.\n");
+static PyObject* Reader___exit__(Reader *self, PyObject *args)
+{
+ assert(self);
+
+ sd_journal_close(self->j);
+ self->j = NULL;
+ Py_RETURN_NONE;
+}
+
+PyDoc_STRVAR(Reader_get_next__doc__,
+ "get_next([skip]) -> dict\n\n"
+ "Return dictionary of the next log entry. Optional skip value will\n"
+ "return the `skip`\\-th log entry.");
+static PyObject* Reader_get_next(Reader *self, PyObject *args)
+{
+ PyObject *dict;
+ const void *msg;
+ size_t msg_len;
+ int64_t skip = 1LL;
+ int r;
+
+ if (!PyArg_ParseTuple(args, "|L", &skip))
+ return NULL;
+
+ if (skip == 0LL) {
+ PyErr_SetString(PyExc_ValueError, "skip must be nonzero");
+ return NULL;
+ }
+
+ Py_BEGIN_ALLOW_THREADS
+ if (skip == 1LL)
r = sd_journal_next(self->j);
- Py_END_ALLOW_THREADS
- }else if (skip == -1LL) {
- Py_BEGIN_ALLOW_THREADS
+ else if (skip == -1LL)
r = sd_journal_previous(self->j);
- Py_END_ALLOW_THREADS
- }else if (skip > 1LL) {
- Py_BEGIN_ALLOW_THREADS
+ else if (skip > 1LL)
r = sd_journal_next_skip(self->j, skip);
- Py_END_ALLOW_THREADS
- }else if (skip < -1LL) {
- Py_BEGIN_ALLOW_THREADS
+ else if (skip < -1LL)
r = sd_journal_previous_skip(self->j, -skip);
- Py_END_ALLOW_THREADS
- }else{
- PyErr_SetString(PyExc_ValueError, "Skip number must positive/negative integer");
- return NULL;
- }
+ else
+ assert_not_reached("should not be here");
+ Py_END_ALLOW_THREADS
- if (r < 0) {
- PyErr_SetString(PyExc_RuntimeError, "Error getting next message");
+ set_error(r, NULL, NULL);
+ if (r < 0)
return NULL;
- }else if ( r == 0) { //EOF
+ 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;
+ if (!dict)
+ return NULL;
SD_JOURNAL_FOREACH_DATA(self->j, msg, msg_len) {
+ PyObject _cleanup_Py_DECREF_ *key = NULL, *value = NULL;
+ const char *delim_ptr;
+
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
- value = PyBytes_FromStringAndSize(delim_ptr + 1, (const char*) msg + msg_len - (delim_ptr + 1) );
+ if (!delim_ptr) {
+ PyErr_SetString(PyExc_OSError,
+ "journal gave us a field without '='");
+ goto error;
+ }
+
+ key = unicode_FromStringAndSize(msg, delim_ptr - (const char*) msg);
+ if (!key)
+ goto error;
+
+ value = PyBytes_FromStringAndSize(
+ delim_ptr + 1,
+ (const char*) msg + msg_len - (delim_ptr + 1) );
+ if (!value)
+ goto error;
+
if (PyDict_Contains(dict, key)) {
- cur_value = PyDict_GetItem(dict, key);
+ PyObject *cur_value = PyDict_GetItem(dict, key);
+
if (PyList_CheckExact(cur_value)) {
- PyList_Append(cur_value, value);
- }else{
- tmp_list = PyList_New(0);
- PyList_Append(tmp_list, cur_value);
- PyList_Append(tmp_list, value);
- PyDict_SetItem(dict, key, tmp_list);
- Py_DECREF(tmp_list);
+ r = PyList_Append(cur_value, value);
+ if (r < 0)
+ goto error;
+ } else {
+ PyObject _cleanup_Py_DECREF_ *tmp_list = PyList_New(0);
+ if (!tmp_list)
+ goto error;
+
+ r = PyList_Append(tmp_list, cur_value);
+ if (r < 0)
+ goto error;
+
+ r = PyList_Append(tmp_list, value);
+ if (r < 0)
+ goto error;
+
+ r = PyDict_SetItem(dict, key, tmp_list);
+ if (r < 0)
+ goto error;
}
- }else{
- PyDict_SetItem(dict, key, value);
+ } else {
+ r = PyDict_SetItem(dict, key, value);
+ if (r < 0)
+ goto error;
}
- 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);
+ {
+ PyObject _cleanup_Py_DECREF_ *key = NULL, *value = NULL;
+ uint64_t 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);
+ r = sd_journal_get_realtime_usec(self->j, &realtime);
+ if (set_error(r, NULL, NULL))
+ goto error;
+
+ key = unicode_FromString("__REALTIME_TIMESTAMP");
+ if (!key)
+ goto error;
+
+ assert_cc(sizeof(unsigned long long) == sizeof(realtime));
+ value = PyLong_FromUnsignedLongLong(realtime);
+ if (!value)
+ goto error;
+
+ if (PyDict_SetItem(dict, key, value))
+ goto error;
}
- 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");
+ {
+ PyObject _cleanup_Py_DECREF_
+ *key = NULL, *timestamp = NULL, *bytes = NULL, *value = NULL;
+ sd_id128_t id;
+ uint64_t monotonic;
+
+ r = sd_journal_get_monotonic_usec(self->j, &monotonic, &id);
+ if (set_error(r, NULL, NULL))
+ goto error;
+
+ assert_cc(sizeof(unsigned long long) == sizeof(monotonic));
+ key = unicode_FromString("__MONOTONIC_TIMESTAMP");
+ timestamp = PyLong_FromUnsignedLongLong(monotonic);
+ bytes = PyBytes_FromStringAndSize((const char*) &id.bytes, sizeof(id.bytes));
+#if PY_MAJOR_VERSION >= 3
+ value = PyStructSequence_New(&MonotonicType);
#else
- key = PyString_FromString("__MONOTONIC_TIMESTAMP");
+ value = PyTuple_New(2);
#endif
- value = PyBytes_FromString(monotonic_str);
+ if (!key || !timestamp || !bytes || !value)
+ goto error;
- PyDict_SetItem(dict, key, value);
- Py_DECREF(key);
- Py_DECREF(value);
- }
+ Py_INCREF(timestamp);
+ Py_INCREF(bytes);
- char *cursor;
- if (sd_journal_get_cursor(self->j, &cursor) > 0) { //Should return 0...
-#if PY_MAJOR_VERSION >=3
- key = PyUnicode_FromString("__CURSOR");
+#if PY_MAJOR_VERSION >= 3
+ PyStructSequence_SET_ITEM(value, 0, timestamp);
+ PyStructSequence_SET_ITEM(value, 1, bytes);
#else
- key = PyString_FromString("__CURSOR");
+ PyTuple_SET_ITEM(value, 0, timestamp);
+ PyTuple_SET_ITEM(value, 1, bytes);
#endif
+
+ if (PyDict_SetItem(dict, key, value))
+ goto error;
+ }
+
+ {
+ PyObject _cleanup_Py_DECREF_ *key = NULL, *value = NULL;
+ char _cleanup_free_ *cursor = NULL;
+
+ r = sd_journal_get_cursor(self->j, &cursor);
+ if (set_error(r, NULL, NULL))
+ goto error;
+
+ key = unicode_FromString("__CURSOR");
+ if (!key)
+ goto error;
+
value = PyBytes_FromString(cursor);
- PyDict_SetItem(dict, key, value);
- free(cursor);
- Py_DECREF(key);
- Py_DECREF(value);
+ if (!value)
+ goto error;
+
+ if (PyDict_SetItem(dict, key, value))
+ goto error;
}
return dict;
+error:
+ Py_DECREF(dict);
+ return NULL;
}
-PyDoc_STRVAR(Journal_get_previous__doc__,
-"get_previous([skip]) -> dict\n\n"
-"Return dictionary of the previous log entry. Optional skip value\n"
-"will return the -`skip`th log entry. Equivalent to get_next(-skip).");
-static PyObject *
-Journal_get_previous(Journal *self, PyObject *args)
+PyDoc_STRVAR(Reader_get_previous__doc__,
+ "get_previous([skip]) -> dict\n\n"
+ "Return dictionary of the previous log entry. Optional skip value\n"
+ "will return the -`skip`\\-th log entry. Equivalent to get_next(-skip).");
+static PyObject* Reader_get_previous(Reader *self, PyObject *args)
{
- int64_t skip=1LL;
- if (! PyArg_ParseTuple(args, "|L", &skip))
+ int64_t skip = 1LL;
+ 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__,
-"add_match(match, ..., field=value, ...) -> None\n\n"
-"Add a match to filter journal log entries. All matches of different\n"
-"field are combined in logical AND, and matches of the same field\n"
-"are automatically combined in logical OR.\n"
-"Matches can be passed as strings \"field=value\", or keyword\n"
-"arguments field=\"value\".");
-static PyObject *
-Journal_add_match(Journal *self, PyObject *args, PyObject *keywds)
+PyDoc_STRVAR(Reader_add_match__doc__,
+ "add_match(match) -> None\n\n"
+ "Add a match to filter journal log entries. All matches of different\n"
+ "fields are combined with logical AND, and matches of the same field\n"
+ "are automatically combined with logical OR.\n"
+ "Match is a string of the form \"FIELD=value\".");
+static PyObject* Reader_add_match(Reader *self, PyObject *args, PyObject *keywds)
{
- Py_ssize_t arg_match_len;
- char *arg_match;
- int i, r;
- for (i = 0; i < PySequence_Size(args); i++) {
-#if PY_MAJOR_VERSION >=3
- PyObject *arg;
- arg = PySequence_Fast_GET_ITEM(args, i);
- if (PyUnicode_Check(arg)) {
-#if PY_MINOR_VERSION >=3
- arg_match = PyUnicode_AsUTF8AndSize(arg, &arg_match_len);
-#else
- PyObject *temp;
- temp = PyUnicode_AsUTF8String(arg);
- PyBytes_AsStringAndSize(temp, &arg_match, &arg_match_len);
- Py_DECREF(temp);
-#endif
- }else if (PyBytes_Check(arg)) {
- PyBytes_AsStringAndSize(arg, &arg_match, &arg_match_len);
- }else{
- PyErr_SetString(PyExc_TypeError, "expected bytes or string");
- }
-#else
- PyString_AsStringAndSize(PySequence_Fast_GET_ITEM(args, i), &arg_match, &arg_match_len);
-#endif
- if (PyErr_Occurred())
- return NULL;
- r = sd_journal_add_match(self->j, arg_match, arg_match_len);
- if (r == -EINVAL) {
- PyErr_SetString(PyExc_ValueError, "Invalid match");
- return NULL;
- }else if (r == -ENOMEM) {
- PyErr_SetString(PyExc_MemoryError, "Not enough memory");
- return NULL;
- }else if (r < 0) {
- PyErr_SetString(PyExc_RuntimeError, "Error adding match");
- return NULL;
- }
- }
-
- if (! keywds)
- Py_RETURN_NONE;
-
- PyObject *key, *value;
- Py_ssize_t pos=0, match_key_len, match_value_len;
- int match_len;
- char *match_key, *match_value;
- void *match;
- while (PyDict_Next(keywds, &pos, &key, &value)) {
-#if PY_MAJOR_VERSION >=3
- if (PyUnicode_Check(key)) {
-#if PY_MINOR_VERSION >=3
- match_key = PyUnicode_AsUTF8AndSize(key, &match_key_len);
-#else
- PyObject *temp2;
- temp2 = PyUnicode_AsUTF8String(key);
- PyBytes_AsStringAndSize(temp2, &match_key, &match_key_len);
- Py_DECREF(temp2);
-#endif
- }else if (PyBytes_Check(key)) {
- PyBytes_AsStringAndSize(key, &match_key, &match_key_len);
- }else{
- PyErr_SetString(PyExc_TypeError, "expected bytes or string");
- }
- if (PyUnicode_Check(value)) {
-#if PY_MINOR_VERSION >=3
- match_value = PyUnicode_AsUTF8AndSize(value, &match_value_len);
-#else
- PyObject *temp3;
- temp3 = PyUnicode_AsUTF8String(value);
- PyBytes_AsStringAndSize(temp3, &match_value, &match_value_len);
- Py_DECREF(temp3);
-#endif
- }else if (PyBytes_Check(value)) {
- PyBytes_AsStringAndSize(value, &match_value, &match_value_len);
- }else{
- PyErr_SetString(PyExc_TypeError, "expected bytes or string");
- }
-#else
- PyString_AsStringAndSize(key, &match_key, &match_key_len);
- PyString_AsStringAndSize(value, &match_value, &match_value_len);
-#endif
- if (PyErr_Occurred())
- return NULL;
-
- match_len = match_key_len + 1 + match_value_len;
- match = malloc(match_len);
- memcpy(match, match_key, match_key_len);
- memcpy(match + match_key_len, "=", 1);
- memcpy(match + match_key_len + 1, match_value, match_value_len);
+ char *match;
+ int match_len, r;
+ if (!PyArg_ParseTuple(args, "s#", &match, &match_len))
+ return NULL;
- r = sd_journal_add_match(self->j, match, match_len);
- free(match);
- if (r == -EINVAL) {
- PyErr_SetString(PyExc_ValueError, "Invalid match");
- return NULL;
- }else if (r == -ENOMEM) {
- PyErr_SetString(PyExc_MemoryError, "Not enough memory");
- return NULL;
- }else if (r < 0) {
- PyErr_SetString(PyExc_RuntimeError, "Error adding match");
+ r = sd_journal_add_match(self->j, match, match_len);
+ set_error(r, NULL, "Invalid match");
+ if (r < 0)
return NULL;
- }
- }
Py_RETURN_NONE;
}
-PyDoc_STRVAR(Journal_add_disjunction__doc__,
-"add_disjunction() -> None\n\n"
-"Once called, all matches before and after are combined in logical\n"
-"OR.");
-static PyObject *
-Journal_add_disjunction(Journal *self, PyObject *args)
+PyDoc_STRVAR(Reader_add_disjunction__doc__,
+ "add_disjunction() -> None\n\n"
+ "Inserts a logical OR between matches added before and afterwards.");
+static PyObject* Reader_add_disjunction(Reader *self, PyObject *args)
{
int r;
r = sd_journal_add_disjunction(self->j);
- if (r == -ENOMEM) {
- PyErr_SetString(PyExc_MemoryError, "Not enough memory");
- return NULL;
- }else if (r < 0) {
- PyErr_SetString(PyExc_RuntimeError, "Error adding disjunction");
+ set_error(r, NULL, NULL);
+ if (r < 0)
return NULL;
- }
Py_RETURN_NONE;
}
-PyDoc_STRVAR(Journal_flush_matches__doc__,
-"flush_matches() -> None\n\n"
-"Clears all current match filters.");
-static PyObject *
-Journal_flush_matches(Journal *self, PyObject *args)
+PyDoc_STRVAR(Reader_flush_matches__doc__,
+ "flush_matches() -> None\n\n"
+ "Clear all current match filters.");
+static PyObject* Reader_flush_matches(Reader *self, PyObject *args)
{
sd_journal_flush_matches(self->j);
Py_RETURN_NONE;
}
-PyDoc_STRVAR(Journal_seek__doc__,
-"seek(offset[, whence]) -> None\n\n"
-"Seek through journal by `offset` number of entries. Argument\n"
-"`whence` defines what the offset is relative to:\n"
-"os.SEEK_SET (default) from first match in journal;\n"
-"os.SEEK_CUR from current position in journal;\n"
-"and os.SEEK_END is from last match in journal.");
-static PyObject *
-Journal_seek(Journal *self, PyObject *args, PyObject *keywds)
+PyDoc_STRVAR(Reader_seek_head__doc__,
+ "seek_head() -> None\n\n"
+ "Jump to the beginning of the journal.\n"
+ "This method invokes sd_journal_seek_head().\n"
+ "See man:sd_journal_seek_head(3).");
+static PyObject* Reader_seek_head(Reader *self, PyObject *args)
{
- int64_t offset;
- int whence=SEEK_SET;
- static char *kwlist[] = {"offset", "whence", NULL};
-
- if (! PyArg_ParseTupleAndKeywords(args, keywds, "L|i", kwlist,
- &offset, &whence))
+ int r;
+ Py_BEGIN_ALLOW_THREADS
+ r = sd_journal_seek_head(self->j);
+ Py_END_ALLOW_THREADS
+ if (set_error(r, NULL, NULL))
return NULL;
+ Py_RETURN_NONE;
+}
- PyObject *arg;
- if (whence == SEEK_SET){
- int r;
- Py_BEGIN_ALLOW_THREADS
- r = sd_journal_seek_head(self->j);
- Py_END_ALLOW_THREADS
- if (r < 0) {
- PyErr_SetString(PyExc_RuntimeError, "Error seeking to head");
- return NULL;
- }
- if (offset > 0LL) {
- Py_DECREF(PyObject_CallMethod((PyObject *)self, "get_next", "L", offset));
- }
- }else if (whence == SEEK_CUR){
- Py_DECREF(PyObject_CallMethod((PyObject *)self, "get_next", "L", offset));
- }else if (whence == SEEK_END){
- int r;
- Py_BEGIN_ALLOW_THREADS
- r = sd_journal_seek_tail(self->j);
- Py_END_ALLOW_THREADS
- if (r < 0) {
- PyErr_SetString(PyExc_RuntimeError, "Error seeking to tail");
- return NULL;
- }
- Py_DECREF(PyObject_CallMethod((PyObject *)self, "get_next", "L", -1LL));
- if (offset < 0LL) {
- Py_DECREF(PyObject_CallMethod((PyObject *)self, "get_next", "L", offset));
- }
- }else{
- PyErr_SetString(PyExc_ValueError, "Invalid value for whence");
+PyDoc_STRVAR(Reader_seek_tail__doc__,
+ "seek_tail() -> None\n\n"
+ "Jump to the end of the journal.\n"
+ "This method invokes sd_journal_seek_tail().\n"
+ "See man:sd_journal_seek_tail(3).");
+static PyObject* Reader_seek_tail(Reader *self, PyObject *args)
+{
+ int r;
+ Py_BEGIN_ALLOW_THREADS
+ r = sd_journal_seek_tail(self->j);
+ Py_END_ALLOW_THREADS
+ if (set_error(r, NULL, NULL))
return NULL;
- }
Py_RETURN_NONE;
}
-PyDoc_STRVAR(Journal_seek_realtime__doc__,
-"seek_realtime(realtime) -> None\n\n"
-"Seek to nearest matching journal entry to `realtime`. Argument\n"
-"`realtime` can be an integer unix timestamp in usecs or a "
-"datetime instance.");
-static PyObject *
-Journal_seek_realtime(Journal *self, PyObject *args)
+PyDoc_STRVAR(Reader_seek_realtime__doc__,
+ "seek_realtime(realtime) -> None\n\n"
+ "Seek to nearest matching journal entry to `realtime`. Argument\n"
+ "`realtime` can must be an integer unix timestamp.");
+static PyObject* Reader_seek_realtime(Reader *self, PyObject *args)
{
- PyObject *arg;
- if (! PyArg_ParseTuple(args, "O", &arg))
+ double timedouble;
+ uint64_t timestamp;
+ int r;
+
+ if (!PyArg_ParseTuple(args, "d", &timedouble))
return NULL;
- uint64_t timestamp=-1LL;
- if (PyDateTime_Check(arg)) {
- PyObject *temp;
- char *timestamp_str;
- temp = PyObject_CallMethod(arg, "strftime", "s", "%s%f");
-#if PY_MAJOR_VERSION >=3
- PyObject *temp2;
- temp2 = PyUnicode_AsUTF8String(temp);
- timestamp_str = PyBytes_AsString(temp2);
- Py_DECREF(temp2);
-#else
- timestamp_str = PyString_AsString(temp);
-#endif
- Py_DECREF(temp);
- timestamp = strtoull(timestamp_str, NULL, 10);
- }else if (PyLong_Check(arg)) {
- timestamp = PyLong_AsUnsignedLongLong(arg);
-#if PY_MAJOR_VERSION <3
- }else if (PyInt_Check(arg)) {
- timestamp = PyInt_AsUnsignedLongLongMask(arg);
-#endif
- }
+ timestamp = (uint64_t) (timedouble * 1.0E6);
if ((int64_t) timestamp < 0LL) {
- PyErr_SetString(PyExc_ValueError, "Time must be positive integer or datetime instance");
+ 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
- if (r < 0) {
- PyErr_SetString(PyExc_RuntimeError, "Error seek to time");
+ if (set_error(r, NULL, NULL))
return NULL;
- }
Py_RETURN_NONE;
}
-PyDoc_STRVAR(Journal_seek_monotonic__doc__,
-"seek_monotonic(monotonic[, bootid]) -> None\n\n"
-"Seek to nearest matching journal entry to `monotonic`. Argument\n"
-"`monotonic` is an timestamp from boot in secs, or a\n"
-"timedelta instance.\n"
-"Argument `bootid` is a string representing which boot the\n"
-"monotonic time is reference to. Defaults to current bootid.");
-static PyObject *
-Journal_seek_monotonic(Journal *self, PyObject *args)
+PyDoc_STRVAR(Reader_seek_monotonic__doc__,
+ "seek_monotonic(monotonic[, bootid]) -> None\n\n"
+ "Seek to nearest matching journal entry to `monotonic`. Argument\n"
+ "`monotonic` is an timestamp from boot in seconds.\n"
+ "Argument `bootid` is a string representing which boot the\n"
+ "monotonic time is reference to. Defaults to current bootid.");
+static PyObject* Reader_seek_monotonic(Reader *self, PyObject *args)
{
- PyObject *arg;
- char *bootid=NULL;
- if (! PyArg_ParseTuple(args, "O|s", &arg, &bootid))
- return NULL;
+ double timedouble;
+ char *bootid = NULL;
+ uint64_t timestamp;
+ sd_id128_t id;
+ int r;
- uint64_t timestamp=-1LL;
- if PyDelta_Check(arg) {
- PyObject *temp;
- temp = PyObject_CallMethod(arg, "total_seconds", NULL);
- timestamp = (uint64_t) (PyFloat_AsDouble(temp) * 1E6);
- Py_DECREF(temp);
- }else if (PyFloat_Check(arg)) {
- timestamp = (uint64_t) (PyFloat_AsDouble(arg) * 1E6);
- }else if (PyLong_Check(arg)) {
- timestamp = PyLong_AsUnsignedLongLong(arg) * (uint64_t) 1E6;
-#if PY_MAJOR_VERSION <3
- }else if (PyInt_Check(arg)) {
- timestamp = PyInt_AsUnsignedLongLongMask(arg) * (uint64_t) 1E6;
-#endif
+ if (!PyArg_ParseTuple(args, "d|z", &timedouble, &bootid))
+ return NULL;
- }
+ timestamp = (uint64_t) (timedouble * 1.0E6);
if ((int64_t) timestamp < 0LL) {
- PyErr_SetString(PyExc_ValueError, "Time must be positive number or timedelta instance");
+ PyErr_SetString(PyExc_ValueError, "Time must be positive number");
return NULL;
}
- sd_id128_t sd_id;
- int r;
if (bootid) {
- r = sd_id128_from_string(bootid, &sd_id);
- if (r == -EINVAL) {
- PyErr_SetString(PyExc_ValueError, "Invalid bootid");
+ r = sd_id128_from_string(bootid, &id);
+ if (set_error(r, NULL, "Invalid bootid"))
return NULL;
- } else if (r < 0) {
- PyErr_SetString(PyExc_RuntimeError, "Error processing bootid");
- return NULL;
- }
- }else{
- r = sd_id128_get_boot(&sd_id);
- if (r == -EIO) {
- PyErr_SetString(PyExc_IOError, "Error getting current boot ID");
- return NULL;
- } else if (r < 0) {
- PyErr_SetString(PyExc_RuntimeError, "Error getting current boot ID");
+ } else {
+ Py_BEGIN_ALLOW_THREADS
+ r = sd_id128_get_boot(&id);
+ Py_END_ALLOW_THREADS
+ if (set_error(r, NULL, NULL))
return NULL;
- }
}
Py_BEGIN_ALLOW_THREADS
- r = sd_journal_seek_monotonic_usec(self->j, sd_id, timestamp);
+ r = sd_journal_seek_monotonic_usec(self->j, id, timestamp);
Py_END_ALLOW_THREADS
- if (r < 0) {
- PyErr_SetString(PyExc_RuntimeError, "Error seek to time");
+ if (set_error(r, NULL, NULL))
return NULL;
- }
Py_RETURN_NONE;
}
-
-PyDoc_STRVAR(Journal_wait__doc__,
-"wait([timeout]) -> Change state (integer)\n\n"
-"Waits until there is a change in the journal. Argument `timeout`\n"
-"is the maximum number of seconds to wait before returning\n"
-"regardless if journal has changed. If `timeout` is not given or is\n"
-"0, then it will block forever.\n"
-"Will return constants: NOP if no change; APPEND if new\n"
-"entries have been added to the end of the journal; and\n"
-"INVALIDATE if journal files have been added or removed.");
-static PyObject *
-Journal_wait(Journal *self, PyObject *args, PyObject *keywds)
+
+PyDoc_STRVAR(Reader_wait__doc__,
+ "wait([timeout]) -> state change (integer)\n\n"
+ "Wait for a change in the journal. Argument `timeout` specifies\n"
+ "the maximum number of seconds to wait before returning\n"
+ "regardless of wheter the journal has changed. If `timeout` is not given\n"
+ "or is 0, then block forever.\n"
+ "Will return constants: NOP if no change; APPEND if new\n"
+ "entries have been added to the end of the journal; and\n"
+ "INVALIDATE if journal files have been added or removed.");
+static PyObject* Reader_wait(Reader *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;
- if ( timeout == 0LL) {
- Py_BEGIN_ALLOW_THREADS
- r = sd_journal_wait(self->j, (uint64_t) -1);
- Py_END_ALLOW_THREADS
- }else{
- Py_BEGIN_ALLOW_THREADS
- r = sd_journal_wait(self->j, timeout * 1E6);
- Py_END_ALLOW_THREADS
- }
-#if PY_MAJOR_VERSION >=3
- return PyLong_FromLong(r);
-#else
- return PyInt_FromLong(r);
-#endif
+ 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) < 0)
+ return NULL;
+
+ return long_FromLong(r);
}
-PyDoc_STRVAR(Journal_seek_cursor__doc__,
-"seek_cursor(cursor) -> None\n\n"
-"Seeks to journal entry by given unique reference `cursor`.");
-static PyObject *
-Journal_seek_cursor(Journal *self, PyObject *args)
+PyDoc_STRVAR(Reader_seek_cursor__doc__,
+ "seek_cursor(cursor) -> None\n\n"
+ "Seek to journal entry by given unique reference `cursor`.");
+static PyObject* Reader_seek_cursor(Reader *self, PyObject *args)
{
const char *cursor;
- if (! PyArg_ParseTuple(args, "s", &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
- if (r == -EINVAL) {
- PyErr_SetString(PyExc_ValueError, "Invalid cursor");
- return NULL;
- }else if (r == -ENOMEM) {
- PyErr_SetString(PyExc_MemoryError, "Not enough memory");
- return NULL;
- }else if (r < 0) {
- PyErr_SetString(PyExc_RuntimeError, "Error seeking to cursor");
+ if (set_error(r, NULL, "Invalid cursor"))
return NULL;
- }
Py_RETURN_NONE;
}
-static PyObject *
-Journal_iter(PyObject *self)
+static PyObject* Reader_iter(PyObject *self)
{
Py_INCREF(self);
return self;
}
-static PyObject *
-Journal_iternext(PyObject *self)
+static PyObject* Reader_iternext(PyObject *self)
{
- PyObject *dict, *arg;
+ 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);
if ((int64_t) dict_size > 0LL) {
return dict;
- }else{
+ } else {
Py_DECREF(dict);
PyErr_SetNone(PyExc_StopIteration);
return NULL;
}
}
-#ifdef SD_JOURNAL_FOREACH_UNIQUE
-PyDoc_STRVAR(Journal_query_unique__doc__,
-"query_unique(field) -> a set of values\n\n"
-"Returns a set of unique values in journal for given `field`.\n"
-"Note this does not respect any journal matches.");
-static PyObject *
-Journal_query_unique(Journal *self, PyObject *args)
+PyDoc_STRVAR(Reader_query_unique__doc__,
+ "query_unique(field) -> a set of values\n\n"
+ "Return a set of unique values appearing in journal for the\n"
+ "given `field`. Note this does not respect any journal matches.");
+static PyObject* Reader_query_unique(Reader *self, PyObject *args)
{
char *query;
- if (! PyArg_ParseTuple(args, "s", &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 (r == -EINVAL) {
- PyErr_SetString(PyExc_ValueError, "Invalid field name");
- return NULL;
- } else if (r == -ENOMEM) {
- PyErr_SetString(PyExc_MemoryError, "Not enough memory");
- return NULL;
- } else if (r < 0) {
- PyErr_SetString(PyExc_RuntimeError, "Error querying journal");
+ 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));
+ value = PyBytes_FromStringAndSize(
+ delim_ptr + 1,
+ (const char*) uniq + uniq_len - (delim_ptr + 1));
PySet_Add(value_set, value);
Py_DECREF(value);
}
Py_DECREF(key);
return value_set;
}
-#endif //def SD_JOURNAL_FOREACH_UNIQUE
-static PyObject *
-Journal_get_data_threshold(Journal *self, void *closure)
+PyDoc_STRVAR(data_threshold__doc__,
+ "Threshold for field size truncation in bytes.\n\n"
+ "Fields longer than this will be truncated to the threshold size.\n"
+ "Defaults to 64Kb.");
+
+static PyObject* Reader_get_data_threshold(Reader *self, void *closure)
{
size_t cvalue;
- PyObject *value;
int r;
r = sd_journal_get_data_threshold(self->j, &cvalue);
- if (r < 0){
- PyErr_SetString(PyExc_RuntimeError, "Error getting data threshold");
+ 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)
+static int Reader_set_data_threshold(Reader *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");
+ PyErr_SetString(PyExc_AttributeError, "Cannot delete data threshold");
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
- if (r < 0){
- PyErr_SetString(PyExc_RuntimeError, "Error setting data threshold");
+ if (!long_Check(value)){
+ PyErr_SetString(PyExc_TypeError, "Data threshold must be an int");
return -1;
}
- return 0;
+ 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},
+PyDoc_STRVAR(closed__doc__,
+ "True iff journal is closed");
+static PyObject* Reader_get_closed(Reader *self, void *closure)
+{
+ return PyBool_FromLong(self->j == NULL);
+}
+
+static PyGetSetDef Reader_getsetters[] = {
+ {(char*) "data_threshold",
+ (getter) Reader_get_data_threshold,
+ (setter) Reader_set_data_threshold,
+ (char*) data_threshold__doc__,
+ NULL},
+ {(char*) "closed",
+ (getter) Reader_get_closed,
+ NULL,
+ (char*) closed__doc__,
+ NULL},
{NULL}
};
-static PyMethodDef Journal_methods[] = {
- {"get_next", (PyCFunction)Journal_get_next, METH_VARARGS,
- Journal_get_next__doc__},
- {"get_previous", (PyCFunction)Journal_get_previous, METH_VARARGS,
- Journal_get_previous__doc__},
- {"add_match", (PyCFunction)Journal_add_match, METH_VARARGS|METH_KEYWORDS,
- Journal_add_match__doc__},
- {"add_disjunction", (PyCFunction)Journal_add_disjunction, METH_NOARGS,
- Journal_add_disjunction__doc__},
- {"flush_matches", (PyCFunction)Journal_flush_matches, METH_NOARGS,
- Journal_flush_matches__doc__},
- {"seek", (PyCFunction)Journal_seek, METH_VARARGS | METH_KEYWORDS,
- Journal_seek__doc__},
- {"seek_realtime", (PyCFunction)Journal_seek_realtime, METH_VARARGS,
- Journal_seek_realtime__doc__},
- {"seek_monotonic", (PyCFunction)Journal_seek_monotonic, METH_VARARGS,
- Journal_seek_monotonic__doc__},
- {"wait", (PyCFunction)Journal_wait, METH_VARARGS,
- Journal_wait__doc__},
- {"seek_cursor", (PyCFunction)Journal_seek_cursor, METH_VARARGS,
- Journal_seek_cursor__doc__},
-#ifdef SD_JOURNAL_FOREACH_UNIQUE
- {"query_unique", (PyCFunction)Journal_query_unique, METH_VARARGS,
- Journal_query_unique__doc__},
-#endif
+static PyMethodDef Reader_methods[] = {
+ {"fileno", (PyCFunction) Reader_fileno, METH_NOARGS, Reader_fileno__doc__},
+ {"reliable_fd", (PyCFunction) Reader_reliable_fd, METH_NOARGS, Reader_reliable_fd__doc__},
+ {"close", (PyCFunction) Reader_close, METH_NOARGS, Reader_close__doc__},
+ {"__enter__", (PyCFunction) Reader___enter__, METH_NOARGS, Reader___enter____doc__},
+ {"__exit__", (PyCFunction) Reader___exit__, METH_VARARGS, Reader___exit____doc__},
+ {"close", (PyCFunction) Reader_close, METH_NOARGS, Reader_close__doc__},
+ {"get_next", (PyCFunction) Reader_get_next, METH_VARARGS, Reader_get_next__doc__},
+ {"get_previous", (PyCFunction) Reader_get_previous, METH_VARARGS, Reader_get_previous__doc__},
+ {"add_match", (PyCFunction) Reader_add_match, METH_VARARGS|METH_KEYWORDS, Reader_add_match__doc__},
+ {"add_disjunction", (PyCFunction) Reader_add_disjunction, METH_NOARGS, Reader_add_disjunction__doc__},
+ {"flush_matches", (PyCFunction) Reader_flush_matches, METH_NOARGS, Reader_flush_matches__doc__},
+ {"seek_head", (PyCFunction) Reader_seek_head, METH_NOARGS, Reader_seek_head__doc__},
+ {"seek_tail", (PyCFunction) Reader_seek_tail, METH_NOARGS, Reader_seek_tail__doc__},
+ {"seek_realtime", (PyCFunction) Reader_seek_realtime, METH_VARARGS, Reader_seek_realtime__doc__},
+ {"seek_monotonic", (PyCFunction) Reader_seek_monotonic, METH_VARARGS, Reader_seek_monotonic__doc__},
+ {"wait", (PyCFunction) Reader_wait, METH_VARARGS, Reader_wait__doc__},
+ {"seek_cursor", (PyCFunction) Reader_seek_cursor, METH_VARARGS, Reader_seek_cursor__doc__},
+ {"query_unique", (PyCFunction) Reader_query_unique, METH_VARARGS, Reader_query_unique__doc__},
{NULL} /* Sentinel */
};
-static PyTypeObject JournalType = {
+static PyTypeObject ReaderType = {
PyVarObject_HEAD_INIT(NULL, 0)
- "_reader.Journal", /*tp_name*/
- sizeof(Journal), /*tp_basicsize*/
- 0, /*tp_itemsize*/
- (destructor)Journal_dealloc, /*tp_dealloc*/
- 0, /*tp_print*/
- 0, /*tp_getattr*/
- 0, /*tp_setattr*/
- 0, /*tp_compare*/
- 0, /*tp_repr*/
- 0, /*tp_as_number*/
- 0, /*tp_as_sequence*/
- 0, /*tp_as_mapping*/
- 0, /*tp_hash */
- 0, /*tp_call*/
- 0, /*tp_str*/
- 0, /*tp_getattro*/
- 0, /*tp_setattro*/
- 0, /*tp_as_buffer*/
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,/*tp_flags*/
- Journal__doc__, /* tp_doc */
- 0, /* tp_traverse */
- 0, /* tp_clear */
- 0, /* tp_richcompare */
- 0, /* tp_weaklistoffset */
- Journal_iter, /* tp_iter */
- Journal_iternext, /* tp_iternext */
- Journal_methods, /* tp_methods */
- 0, /* tp_members */
- Journal_getseters, /* tp_getset */
- 0, /* tp_base */
- 0, /* tp_dict */
- 0, /* tp_descr_get */
- 0, /* tp_descr_set */
- 0, /* tp_dictoffset */
- (initproc)Journal_init, /* tp_init */
- 0, /* tp_alloc */
- PyType_GenericNew, /* tp_new */
+ "_reader._Reader", /*tp_name*/
+ sizeof(Reader), /*tp_basicsize*/
+ 0, /*tp_itemsize*/
+ (destructor)Reader_dealloc, /*tp_dealloc*/
+ 0, /*tp_print*/
+ 0, /*tp_getattr*/
+ 0, /*tp_setattr*/
+ 0, /*tp_compare*/
+ 0, /*tp_repr*/
+ 0, /*tp_as_number*/
+ 0, /*tp_as_sequence*/
+ 0, /*tp_as_mapping*/
+ 0, /*tp_hash */
+ 0, /*tp_call*/
+ 0, /*tp_str*/
+ 0, /*tp_getattro*/
+ 0, /*tp_setattro*/
+ 0, /*tp_as_buffer*/
+ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
+ Reader__doc__, /* tp_doc */
+ 0, /* tp_traverse */
+ 0, /* tp_clear */
+ 0, /* tp_richcompare */
+ 0, /* tp_weaklistoffset */
+ Reader_iter, /* tp_iter */
+ Reader_iternext, /* tp_iternext */
+ Reader_methods, /* tp_methods */
+ 0, /* tp_members */
+ Reader_getsetters, /* tp_getset */
+ 0, /* tp_base */
+ 0, /* tp_dict */
+ 0, /* tp_descr_get */
+ 0, /* tp_descr_set */
+ 0, /* tp_dictoffset */
+ (initproc) Reader_init, /* tp_init */
+ 0, /* tp_alloc */
+ PyType_GenericNew, /* tp_new */
};
+#define SUMMARY \
+ "Module that reads the systemd journal similar to journalctl."
+
#if PY_MAJOR_VERSION >= 3
static PyModuleDef _reader_module = {
PyModuleDef_HEAD_INIT,
"_reader",
- "Module that reads systemd journal similar to journalctl.",
+ SUMMARY,
-1,
NULL, NULL, NULL, NULL, NULL
};
#endif
+#if PY_MAJOR_VERSION >= 3
+static bool initialized = false;
+#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;
PyDateTime_IMPORT;
- if (PyType_Ready(&JournalType) < 0)
+ if (PyType_Ready(&ReaderType) < 0)
#if PY_MAJOR_VERSION >= 3
return NULL;
#else
m = PyModule_Create(&_reader_module);
if (m == NULL)
return NULL;
+
+ if (!initialized) {
+ PyStructSequence_InitType(&MonotonicType, &Monotonic_desc);
+ initialized = true;
+ }
#else
- m = Py_InitModule3("_reader", NULL,
- "Module that reads systemd journal similar to journalctl.");
+ m = Py_InitModule3("_reader", NULL, SUMMARY);
if (m == NULL)
return;
#endif
- Py_INCREF(&JournalType);
- PyModule_AddObject(m, "_Journal", (PyObject *)&JournalType);
- PyModule_AddIntConstant(m, "NOP", SD_JOURNAL_NOP);
- PyModule_AddIntConstant(m, "APPEND", SD_JOURNAL_APPEND);
- PyModule_AddIntConstant(m, "INVALIDATE", SD_JOURNAL_INVALIDATE);
- PyModule_AddIntConstant(m, "LOCAL_ONLY", SD_JOURNAL_LOCAL_ONLY);
- PyModule_AddIntConstant(m, "RUNTIME_ONLY", SD_JOURNAL_RUNTIME_ONLY);
- PyModule_AddIntConstant(m, "SYSTEM_ONLY", SD_JOURNAL_SYSTEM_ONLY);
+ Py_INCREF(&ReaderType);
+#if PY_MAJOR_VERSION >= 3
+ Py_INCREF(&MonotonicType);
+#endif
+ if (PyModule_AddObject(m, "_Reader", (PyObject *) &ReaderType) ||
+#if PY_MAJOR_VERSION >= 3
+ PyModule_AddObject(m, "Monotonic", (PyObject*) &MonotonicType) ||
+#endif
+ PyModule_AddIntConstant(m, "NOP", SD_JOURNAL_NOP) ||
+ PyModule_AddIntConstant(m, "APPEND", SD_JOURNAL_APPEND) ||
+ PyModule_AddIntConstant(m, "INVALIDATE", SD_JOURNAL_INVALIDATE) ||
+ PyModule_AddIntConstant(m, "LOCAL_ONLY", SD_JOURNAL_LOCAL_ONLY) ||
+ PyModule_AddIntConstant(m, "RUNTIME_ONLY", SD_JOURNAL_RUNTIME_ONLY) ||
+ PyModule_AddIntConstant(m, "SYSTEM_ONLY", SD_JOURNAL_SYSTEM_ONLY)) {
+#if PY_MAJOR_VERSION >= 3
+ Py_DECREF(m);
+ return NULL;
+#endif
+ }
#if PY_MAJOR_VERSION >= 3
return m;
#endif
}
+
+#pragma GCC diagnostic pop