#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;
} Journal;
static PyTypeObject JournalType;
+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;
+}
+
static void
Journal_dealloc(Journal* self)
{
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;
+ char *path = NULL;
- static char *kwlist[] = {"flags", "path", NULL};
- if (! PyArg_ParseTupleAndKeywords(args, keywds, "|is", 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;
r = sd_journal_open(&self->j, flags);
}
Py_END_ALLOW_THREADS
- if (r < 0) {
- errno = -r;
- PyObject *errtype = r == -EINVAL ? PyExc_ValueError :
- r == -ENOMEM ? PyExc_MemoryError :
- PyExc_OSError;
- PyErr_SetFromErrnoWithFilename(errtype, path);
- return -1;
- }
- return 0;
+ return set_error(r, path, "Invalid flags or path");
}
PyDoc_STRVAR(Journal_get_next__doc__,
}
Py_END_ALLOW_THREADS
- if (r < 0) {
- errno = -r;
- PyErr_SetFromErrno(PyExc_OSError);
+ 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();
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);
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
+ key = unicode_FromString("__REALTIME_TIMESTAMP");
value = PyBytes_FromString(realtime_str);
PyDict_SetItem(dict, key, value);
Py_DECREF(key);
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
+ key = unicode_FromString("__MONOTONIC_TIMESTAMP");
value = PyBytes_FromString(monotonic_str);
PyDict_SetItem(dict, key, 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
+ key = unicode_FromString("__CURSOR");
value = PyBytes_FromString(cursor);
PyDict_SetItem(dict, key, value);
free(cursor);
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_match(match) -> 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"
+"fields 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\".");
+"Match is string of form \"field=value\".");
static PyObject *
Journal_add_match(Journal *self, PyObject *args, PyObject *keywds)
{
int r;
r = sd_journal_add_match(self->j, match, match_len);
- if (r < 0) {
- errno = -r;
- PyObject *errtype = r == -EINVAL ? PyExc_ValueError :
- r == -ENOMEM ? PyExc_MemoryError :
- PyExc_OSError;
- PyErr_SetFromErrno(errtype);
- return NULL;
- }
+ set_error(r, NULL, "Invalid match");
+ if (r < 0)
+ return NULL;
Py_RETURN_NONE;
}
{
int r;
r = sd_journal_add_disjunction(self->j);
- if (r < 0) {
- errno = -r;
- PyObject *errtype = r == -ENOMEM ? PyExc_MemoryError :
- PyExc_OSError;
- PyErr_SetFromErrno(errtype);
+ set_error(r, NULL, NULL);
+ if (r < 0)
return NULL;
- }
Py_RETURN_NONE;
}
{
int64_t offset;
int whence=SEEK_SET;
- static char *kwlist[] = {"offset", "whence", 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;
Py_BEGIN_ALLOW_THREADS
r = sd_journal_seek_head(self->j);
Py_END_ALLOW_THREADS
- if (r < 0) {
- errno = -r;
- PyErr_SetFromErrno(PyExc_OSError);
+ if (set_error(r, NULL, NULL))
return NULL;
- }
+
if (offset > 0LL) {
- result = PyObject_CallMethod((PyObject *)self, "get_next", "L", offset);
+ result = PyObject_CallMethod((PyObject *)self, (char*) "get_next",
+ (char*) "L", offset);
}
}else if (whence == SEEK_CUR){
- result = PyObject_CallMethod((PyObject *)self, "get_next", "L", offset);
+ result = PyObject_CallMethod((PyObject *)self, (char*) "get_next",
+ (char*) "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) {
- errno = -r;
- PyErr_SetFromErrno(PyExc_OSError);
+ if (set_error(r, NULL, NULL))
return NULL;
- }
+
if (offset < 0LL) {
- result = PyObject_CallMethod((PyObject *)self, "get_next", "L", offset);
+ result = PyObject_CallMethod((PyObject *)self, (char*) "get_next",
+ (char*) "L", offset);
}else{
- result = PyObject_CallMethod((PyObject *)self, "get_next", "L", -1LL);
+ result = PyObject_CallMethod((PyObject *)self, (char*) "get_next",
+ (char*) "L", -1LL);
}
}else{
PyErr_SetString(PyExc_ValueError, "Invalid value for whence");
}
- if (result)
- Py_DECREF(result);
+ Py_XDECREF(result);
if (PyErr_Occurred())
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.");
+"`realtime` can must be an integer unix timestamp.");
static PyObject *
Journal_seek_realtime(Journal *self, PyObject *args)
{
- uint64_t timestamp;
- if (! PyArg_ParseTuple(args, "K", ×tamp))
+ double timedouble;
+ 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");
return NULL;
Py_BEGIN_ALLOW_THREADS
r = sd_journal_seek_realtime_usec(self->j, timestamp);
Py_END_ALLOW_THREADS
- if (r < 0) {
- errno = -r;
- PyErr_SetFromErrno(PyExc_OSError);
+ 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"
+"`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 *
int r;
if (bootid) {
r = sd_id128_from_string(bootid, &sd_id);
- if (r == -EINVAL) {
- PyErr_SetString(PyExc_ValueError, "Invalid bootid");
- return NULL;
- }else if (r < 0) {
- errno = -r;
- PyErr_SetFromErrno(PyExc_OSError);
+ if (set_error(r, NULL, "Invalid bootid"))
return NULL;
- }
- }else{
+ } else {
+ Py_BEGIN_ALLOW_THREADS
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) {
- errno = -r;
- PyErr_SetFromErrno(PyExc_OSError);
+ 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);
Py_END_ALLOW_THREADS
- if (r < 0) {
- errno = -r;
- PyErr_SetFromErrno(PyExc_OSError);
+ 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"
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
- if ( timeout == 0LL) {
- r = sd_journal_wait(self->j, (uint64_t) -1);
- }else{
- r = sd_journal_wait(self->j, timeout * 1E6);
- }
+ r = sd_journal_wait(self->j, timeout ==0 ? (uint64_t) -1 : timeout * 1E6);
Py_END_ALLOW_THREADS
- if (r < 0) {
- errno = -r;
- PyObject *errtype = r == -ENOMEM ? PyExc_MemoryError :
- PyExc_OSError;
- PyErr_SetFromErrno(errtype);
+ 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__,
Py_BEGIN_ALLOW_THREADS
r = sd_journal_seek_cursor(self->j, cursor);
Py_END_ALLOW_THREADS
- if (r < 0) {
- errno = -r;
- PyObject *errtype = r == -EINVAL ? PyExc_ValueError :
- r == -ENOMEM ? PyExc_MemoryError :
- PyExc_OSError;
- PyErr_SetFromErrno(errtype);
+ if (set_error(r, NULL, "Invalid cursor"))
return NULL;
- }
Py_RETURN_NONE;
}
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;
}
}
-#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"
Py_BEGIN_ALLOW_THREADS
r = sd_journal_query_unique(self->j, query);
Py_END_ALLOW_THREADS
- if (r < 0) {
- errno = -r;
- PyObject *errtype = r == -EINVAL ? PyExc_ValueError :
- r == -ENOMEM ? PyExc_MemoryError :
- PyExc_OSError;
- PyErr_SetFromErrno(errtype);
+ 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) {
delim_ptr = memchr(uniq, '=', uniq_len);
Py_DECREF(key);
return value_set;
}
-#endif //def SD_JOURNAL_FOREACH_UNIQUE
static PyObject *
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 (r < 0) {
- errno = -r;
- PyErr_SetFromErrno(PyExc_OSError);
+ 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
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
+ if (!long_Check(value)){
PyErr_SetString(PyExc_TypeError, "Data threshold must be 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
- if (r < 0) {
- errno = -r;
- PyErr_SetFromErrno(PyExc_OSError);
- 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},
+ {(char*) "data_threshold",
+ (getter)Journal_get_data_threshold,
+ (setter)Journal_set_data_threshold,
+ (char*) "data threshold",
+ NULL},
{NULL}
};
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
{NULL} /* Sentinel */
};
static PyTypeObject JournalType = {
PyVarObject_HEAD_INIT(NULL, 0)
- "_reader.Journal", /*tp_name*/
+ "_reader._Journal", /*tp_name*/
sizeof(Journal), /*tp_basicsize*/
0, /*tp_itemsize*/
(destructor)Journal_dealloc, /*tp_dealloc*/
};
#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