mirror of
https://github.com/troglobit/finit.git
synced 2026-10-01 05:22:48 +07:00
Due to time constraints I had to revert the new libev backend to the
service, I/O and signals monitor. Employed instead is the tried and
tested signals based service monitor, with a small extension for an
additional I/O monitor using poll() for the I/O plugins to use.
Tried restoring the startx finit.conf directive on top of the service
implementation. However, it's currently not usable to run /usr/bin/startx
for any other user than root. I recommend using the examples/finit.conf
and run /usr/sbin/gdm instead.
finit.c:
New run_loop() function, replaces libev ev_run().
helpers.c:
Refactor start_process() into svc_start().
plugin.c:
Add fds[] array for use in the io_monitor() called by the
new run_loop().
signal.c:
Ignore SIGCHLD. Handled by waitpid() in svc_monitor() now,
which is called by the new run_loop().
svc.c:
svc_register(): Optional @username parsing for the command line.
svc_monitor(): Replaced libev callback with waitpid()
svc_start(): Refactored to use most of helpers.c:start_process()
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
223 lines
4.9 KiB
C
223 lines
4.9 KiB
C
/* Plugin based services architecture for finit
|
|
*
|
|
* Copyright (c) 2012 Joachim Nilsson <troglobit@gmail.com>
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include <errno.h>
|
|
#include <dlfcn.h> /* dlopen() et al */
|
|
#include <dirent.h> /* readdir() et al */
|
|
#include <poll.h>
|
|
#include <string.h>
|
|
#include <sys/queue.h> /* BSD sys/queue.h API */
|
|
|
|
#include "finit.h"
|
|
#include "private.h"
|
|
#include "helpers.h"
|
|
#include "plugin.h"
|
|
#include "svc.h"
|
|
|
|
#define is_io_plugin(p) ((p)->io.cb && (p)->io.fd >= 0)
|
|
|
|
static size_t num_fds = 0;
|
|
static struct pollfd fds[MAX_NUM_FDS];
|
|
static LIST_HEAD(, plugin) plugins = LIST_HEAD_INITIALIZER();
|
|
|
|
int plugin_register(plugin_t *plugin)
|
|
{
|
|
int inuse = 0;
|
|
|
|
if (!plugin) {
|
|
errno = EINVAL;
|
|
return 1;
|
|
}
|
|
|
|
if (!plugin->name) {
|
|
Dl_info info;
|
|
|
|
if (!dladdr(plugin, &info) || !info.dli_fname)
|
|
plugin->name = "unknown";
|
|
else
|
|
plugin->name = (char *)info.dli_fname;
|
|
}
|
|
|
|
if (is_io_plugin(plugin)) {
|
|
if (num_fds + 1 >= MAX_NUM_FDS) {
|
|
num_fds = MAX_NUM_SVC;
|
|
errno = ENOMEM;
|
|
return 1;
|
|
}
|
|
num_fds++;
|
|
inuse++;
|
|
}
|
|
|
|
if (plugin->svc.cb) {
|
|
svc_t *svc = svc_find_by_name(plugin->name);
|
|
|
|
if (svc) {
|
|
plugin->svc.id = svc_id(svc);
|
|
svc->plugin = &plugin->svc;
|
|
inuse++;
|
|
}
|
|
}
|
|
|
|
if (!inuse) {
|
|
_e("No service \"%s\" loaded, skipping plugin.", basename(plugin->name));
|
|
return 1;
|
|
}
|
|
|
|
LIST_INSERT_HEAD(&plugins, plugin, link);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int plugin_unregister(plugin_t *plugin)
|
|
{
|
|
LIST_REMOVE(plugin, link);
|
|
|
|
/* XXX: Unfinished, add cleanup code here! */
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Private daemon API *******************************************************/
|
|
void run_hooks(hook_point_t no)
|
|
{
|
|
plugin_t *p;
|
|
|
|
PLUGIN_ITERATOR(p) {
|
|
if (p->hook[no].cb) {
|
|
_d("Calling %s hook n:o %d from runloop...", basename(p->name), no);
|
|
p->hook[no].cb(p->hook[no].arg);
|
|
}
|
|
}
|
|
}
|
|
|
|
void run_services(void)
|
|
{
|
|
plugin_t *p;
|
|
|
|
PLUGIN_ITERATOR(p) {
|
|
if (p->svc.cb) {
|
|
_d("Calling svc %s from runloop...", basename(p->name));
|
|
p->svc.cb(p->svc.arg, 0);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Generic libev I/O callback, looks up correct plugin and calls its callback */
|
|
static void generic_io_cb(int fd, int events)
|
|
{
|
|
plugin_t *p;
|
|
|
|
/* Find matching plugin, pick first matching fd */
|
|
PLUGIN_ITERATOR(p) {
|
|
if (is_io_plugin(p) && p->io.fd == fd) {
|
|
_d("Calling I/O %s from runloop...", basename(p->name));
|
|
p->io.cb(p->io.arg, fd, events);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
void io_monitor(void)
|
|
{
|
|
int ret;
|
|
size_t i;
|
|
|
|
while ((ret = poll(fds, num_fds, 500))) {
|
|
if (-1 == ret) {
|
|
if (EINTR == errno)
|
|
continue;
|
|
|
|
_e("Failed polling I/O plugin descriptors, error %d: %s",
|
|
errno, strerror(errno));
|
|
break;
|
|
}
|
|
|
|
/* Traverse all I/O fds and run callbacks */
|
|
for (i = 0; i < num_fds; i++) {
|
|
if (fds[i].revents)
|
|
generic_io_cb(fds[i].fd, fds[i].revents);
|
|
}
|
|
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* Setup any I/O callbacks for plugins that use them */
|
|
static void init_plugins(void)
|
|
{
|
|
int i = 0;
|
|
plugin_t *p;
|
|
|
|
PLUGIN_ITERATOR(p) {
|
|
if (is_io_plugin(p)) {
|
|
_d("Initializing plugin %s for I/O", basename(p->name));
|
|
fds[i].revents = 0;
|
|
fds[i].events = p->io.flags;
|
|
fds[num_fds++].fd = p->io.fd;
|
|
}
|
|
}
|
|
}
|
|
|
|
int load_plugins(char *path)
|
|
{
|
|
DIR *dp = opendir(path);
|
|
struct dirent *entry;
|
|
|
|
if (!dp) {
|
|
_e("Failed, cannot open plugin directory %s: %s", path, strerror(errno));
|
|
return 1;
|
|
}
|
|
|
|
while ((entry = readdir(dp))) {
|
|
char *ext = entry->d_name + strlen(entry->d_name) - 3;
|
|
|
|
if (!strcmp(ext, ".so")) {
|
|
void *handle;
|
|
char filename[1024];
|
|
|
|
snprintf(filename, sizeof(filename), "%s/%s", path, entry->d_name);
|
|
print_descr(" Loading plugin ", basename(filename));
|
|
handle = dlopen(filename, RTLD_LAZY);
|
|
if (!handle) {
|
|
_d("Failed loading plugin %s: %s", filename, dlerror());
|
|
print_result(1);
|
|
return 1;
|
|
}
|
|
print_result(0);
|
|
}
|
|
}
|
|
|
|
closedir(dp);
|
|
init_plugins();
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* Local Variables:
|
|
* version-control: t
|
|
* indent-tabs-mode: t
|
|
* c-file-style: "linux"
|
|
* End:
|
|
*/
|