Commit 539e0a4d authored by Zbigniew Jędrzejewski-Szmek's avatar Zbigniew Jędrzejewski-Szmek
Browse files

systemd-python: add wrappers for easy functions in sd-login

sd_get_uids, sd_get_seats, sd_get_sessions, and sd_get_machine_names.
parent 5afbe712
......@@ -3698,7 +3698,8 @@ pkgpyexec_LTLIBRARIES = \
_journal.la \
id128.la \
_daemon.la \
_reader.la
_reader.la \
login.la
_journal_la_SOURCES = \
src/python-systemd/_journal.c
......@@ -3784,6 +3785,29 @@ _reader_la_LIBADD = \
libsystemd-shared.la \
libsystemd-daemon-internal.la
login_la_SOURCES = \
src/python-systemd/login.c \
src/python-systemd/pyutil.c \
src/python-systemd/pyutil.h
login_la_CFLAGS = \
$(AM_CFLAGS) \
-fvisibility=default \
$(PYTHON_CFLAGS)
login_la_LDFLAGS = \
$(AM_LDFLAGS) \
-shared \
-module \
-avoid-version
login_la_LIBADD = \
$(PYTHON_LIBS) \
libsystemd-journal.la \
libsystemd-login.la \
libsystemd-shared.la \
libsystemd-daemon-internal.la
dist_pkgpyexec_PYTHON = \
src/python-systemd/journal.py \
src/python-systemd/daemon.py \
......
......@@ -213,19 +213,7 @@ static PyObject* Reader_get_timeout_ms(Reader *self, PyObject *args)
if (r < 0)
return NULL;
if (t == (uint64_t) -1)
return PyLong_FromLong(-1);
else {
struct timespec ts;
uint64_t n;
int msec;
clock_gettime(CLOCK_MONOTONIC, &ts);
n = (uint64_t) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
msec = t > n ? (int) ((t - n + 999) / 1000) : 0;
return PyLong_FromLong(msec);
}
return absolute_timeout(t);
}
......
......@@ -14,6 +14,7 @@ Contents:
journal
id128
daemon
login
Indices and tables
==================
......
`systemd.login` module
=======================
.. automodule:: systemd.login
:members:
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
Copyright 2013 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
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/>.
***/
#define PY_SSIZE_T_CLEAN
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wredundant-decls"
#include <Python.h>
#pragma GCC diagnostic pop
#include "systemd/sd-login.h"
#include "pyutil.h"
#include "util.h"
#include "strv.h"
PyDoc_STRVAR(module__doc__,
"Python interface to the libsystemd-login library."
);
#define helper(name) \
static PyObject* name(PyObject *self, PyObject *args) { \
_cleanup_strv_free_ char **list = NULL; \
int r; \
PyObject *ans; \
\
assert(args == NULL); \
\
r = sd_get_##name(&list); \
if (r < 0) { \
errno = -r; \
return PyErr_SetFromErrno(PyExc_IOError); \
} \
\
ans = PyList_New(r); \
if (!ans) \
return NULL; \
\
for (r--; r >= 0; r--) { \
PyObject *s = unicode_FromString(list[r]); \
if (!s) { \
Py_DECREF(ans); \
return NULL; \
} \
\
PyList_SetItem(ans, r, s); \
} \
\
return ans; \
}
helper(seats)
helper(sessions)
helper(machine_names)
#undef helper
static PyObject* uids(PyObject *self, PyObject *args) {
_cleanup_free_ uid_t *list = NULL;
int r;
PyObject *ans;
assert(args == NULL);
r = sd_get_uids(&list);
if (r < 0) {
errno = -r;
return PyErr_SetFromErrno(PyExc_IOError);
}
ans = PyList_New(r);
if (!ans)
return NULL;
for (r--; r >= 0; r--) {
PyObject *s = long_FromLong(list[r]);
if (!s) {
Py_DECREF(ans);
return NULL;
}
PyList_SetItem(ans, r, s);
}
return ans;
}
PyDoc_STRVAR(seats__doc__,
"seats() -> list\n\n"
"Returns a list of currently available local seats.\n"
"Wraps sd_get_seats(3)."
);
PyDoc_STRVAR(sessions__doc__,
"sessions() -> list\n\n"
"Returns a list of current login sessions.\n"
"Wraps sd_get_sessions(3)."
);
PyDoc_STRVAR(machine_names__doc__,
"machine_names() -> list\n\n"
"Returns a list of currently running virtual machines\n"
"and containers on the system.\n"
"Wraps sd_get_machine_names(3)."
);
PyDoc_STRVAR(uids__doc__,
"uids() -> list\n\n"
"Returns a list of uids of users who currently have login sessions.\n"
"Wraps sd_get_uids(3)."
);
static PyMethodDef methods[] = {
{ "seats", seats, METH_NOARGS, seats__doc__},
{ "sessions", sessions, METH_NOARGS, sessions__doc__},
{ "machine_names", machine_names, METH_NOARGS, machine_names__doc__},
{ "uids", uids, METH_NOARGS, uids__doc__},
{} /* Sentinel */
};
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
#if PY_MAJOR_VERSION < 3
PyMODINIT_FUNC initlogin(void) {
PyObject *m;
m = Py_InitModule3("login", methods, module__doc__);
if (m == NULL)
return;
PyModule_AddStringConstant(m, "__version__", PACKAGE_VERSION);
}
#else
static struct PyModuleDef module = {
PyModuleDef_HEAD_INIT,
"login", /* name of module */
module__doc__, /* module documentation, may be NULL */
-1, /* size of per-interpreter state of the module */
methods
};
PyMODINIT_FUNC PyInit_login(void) {
PyObject *m;
m = PyModule_Create(&module);
if (m == NULL)
return NULL;
if (PyModule_AddStringConstant(m, "__version__", PACKAGE_VERSION)) {
Py_DECREF(m);
return NULL;
}
return m;
}
#endif
#pragma GCC diagnostic pop
......@@ -28,3 +28,19 @@ void cleanup_Py_DECREFp(PyObject **p) {
Py_DECREF(*p);
}
PyObject* absolute_timeout(uint64_t t) {
if (t == (uint64_t) -1)
return PyLong_FromLong(-1);
else {
struct timespec ts;
uint64_t n;
int msec;
clock_gettime(CLOCK_MONOTONIC, &ts);
n = (uint64_t) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
msec = t > n ? (int) ((t - n + 999) / 1000) : 0;
return PyLong_FromLong(msec);
}
}
......@@ -27,6 +27,7 @@
#endif
void cleanup_Py_DECREFp(PyObject **p);
PyObject* absolute_timeout(uint64_t t);
#define _cleanup_Py_DECREF_ __attribute__((cleanup(cleanup_Py_DECREFp)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment