On Fri, May 20, 2011 at 6:16 AM, Michal Schmidt <mschm...@redhat.com> wrote:
> On 05/19/2011 06:09 PM, Gustavo Sverzut Barbieri wrote:
>>
>> If you happen to use icecream, give a try to the attached patch to
>> their SVN (svn://anonsvn.kde.org/home/kde/trunk/icecream revision
>> 1232790)
>
> You have in daemon/icecream.conf:
> ICECREAM_CONF=""
>
> But in daemon/icecream.service.in you use a different name:
> ExecStart=@sbindir@/iceccd $ICECREAM_OPTS
>
> After fixing this, the daemon works fine here.
> I have not tested the scheduler yet.
Ooops! Fixed and the new patch contains some extra controls I've
discussed with Lennart in icecream.service:
Restart=on-abort
Nice=5
OOMScoreAdjust=500
CPUSchedulingPolicy=batch
This will be nicer with the actual users of the machine, killing
iceccd before most stuff on out-of-memory conditions, schedule it as a
batch work to not interfere with interactive tasks and restart if it
crashed (maybe due the above settings). Of course, if there are no
other users and the machine is used exclusively as an icecream node it
should not impact as everybody will have the same values :-)
I really would like to set the capabilities to reduce the harm that
such thing could make, but as it's a trial and error process, I can't
do it now :-/
Anyway, consider the new patch!
--
Gustavo Sverzut Barbieri
http://profusion.mobi embedded systems
--------------------------------------
MSN: barbi...@gmail.com
Skype: gsbarbieri
Mobile: +55 (19) 9225-2202
Adds socket activation support to icecream.
This patch allows icecream to be executed from a superserver (inetd,
xinetd, systemd), receiving a prepared file descriptor that can be
accept()ed for new connections.
Although it uses parts of sd-daemon.[ch] by systemd project, it is not
dependent on this project and the same code will work with
inetd/xinetd, so no need to disable it at compile time.
If --with-systemdunitsdir=PATH is provided or 'pkg-config systemd'
find where it is installed, systemd units are installed alongside with
a configuration file. These are references and likely
distributions/packagers will provide defaults like "-u icecream" if
that is the case. Maybe it should also set scheduler priorities in the
icecream.service file. (See 'man systemd.exec', particularly
Limit*, CapabilityBoundingSet, Capabilities, ReadWriteDirectories,
ReadOnlyDirectories and InaccessibleDirectories).
More information at http://0pointer.de/blog/projects/socket-activation.html
By: Gustavo Sverzut Barbieri <barbi...@profusion.mobi>
Index: daemon/icecream.conf
===================================================================
--- daemon/icecream.conf (revision 0)
+++ daemon/icecream.conf (revision 0)
@@ -0,0 +1,15 @@
+# see iceccd --help
+# [-n <netname>]
+# [-m <max_processes>]
+# [--no-remote]
+# [-w]
+# [-l logfile]
+# [-s <schedulerhost>]
+# [-v[v[v]]]
+# [-r|--run-as-user]
+# [-b <env-basedir>]
+# [-u|--nobody-uid <nobody_uid>]
+# [--cache-limit <MB>]
+# [-N <node_name>]
+# do not use -d (--daemonize) options here.
+ICECREAM_CONF=""
Index: daemon/icecream.socket
===================================================================
--- daemon/icecream.socket (revision 0)
+++ daemon/icecream.socket (revision 0)
@@ -0,0 +1,8 @@
+[Unit]
+Description=Icecream Socket
+
+[Socket]
+ListenStream=10245
+
+[Install]
+WantedBy=sockets.target
Index: daemon/main.cpp
===================================================================
--- daemon/main.cpp (revision 1232790)
+++ daemon/main.cpp (working copy)
@@ -94,6 +94,7 @@
#include "load.h"
#include "environment.h"
#include "platform.h"
+#include "sd-daemon.h"
const int PORT = 10245;
static std::string pidFilePath;
@@ -1673,9 +1674,17 @@
for (list<string>::const_iterator it = nl.begin(); it != nl.end(); ++it)
trace() << *it << endl;
- d.listen_fd = setup_listen_fd();
- if ( d.listen_fd == -1 ) // error
+ int listen_fds = sd_listen_fds(1);
+ if ( listen_fds == 1 )
+ d.listen_fd = SD_LISTEN_FDS_START;
+ else if ( listen_fds == 0 ) {
+ d.listen_fd = setup_listen_fd();
+ if ( d.listen_fd == -1 ) // error
+ return 1;
+ } else {
+ log_error() << "listening on too many file descriptors, only one was expected" << endl;
return 1;
+ }
return d.working_loop();
}
Index: daemon/Makefile.am
===================================================================
--- daemon/Makefile.am (revision 1232790)
+++ daemon/Makefile.am (working copy)
@@ -6,3 +6,17 @@
iceccd_LDADD = ../services/libicecc.la $(LIB_KINFO)
noinst_HEADERS = environment.h load.h ncpus.h serve.h workit.h
+if SYSTEMD
+systemdunitdir = @SYSTEMD_UNITDIR@
+systemdunit_DATA = icecream.service icecream.socket
+sysconf_DATA = icecream.conf
+
+icecream.service: icecream.service.in Makefile
+ rm -f $@
+ sed \
+ -e 's:[@]sbindir[@]:$(sbindir):g' \
+ -e 's:[@]sysconfdir[@]:$(sysconfdir):g' \
+ $< >$@
+endif
+
+EXTRA_DIST = icecream.service.in icecream.conf icecream.socket
Index: daemon/icecream.service.in
===================================================================
--- daemon/icecream.service.in (revision 0)
+++ daemon/icecream.service.in (revision 0)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Distributed compiling of C(++) code across network
+
+[Service]
+EnvironmentFile=-@sysconfdir@/icecream.conf
+ExecStart=@sbindir@/iceccd $ICECREAM_CONF
+Restart=on-abort
+Nice=5
+OOMScoreAdjust=500
+CPUSchedulingPolicy=batch
+
+[Install]
+WantedBy=multi-user.target
Index: services/sd-daemon.c
===================================================================
--- services/sd-daemon.c (revision 0)
+++ services/sd-daemon.c (revision 0)
@@ -0,0 +1,437 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ Copyright 2010 Lennart Poettering
+
+ 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.
+***/
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/fcntl.h>
+#include <netinet/in.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <limits.h>
+
+#include "sd-daemon.h"
+
+int sd_listen_fds(int unset_environment) {
+
+#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
+ return 0;
+#else
+ int r, fd;
+ const char *e;
+ char *p = NULL;
+ unsigned long l;
+
+ if (!(e = getenv("LISTEN_PID"))) {
+ r = 0;
+ goto finish;
+ }
+
+ errno = 0;
+ l = strtoul(e, &p, 10);
+
+ if (errno != 0) {
+ r = -errno;
+ goto finish;
+ }
+
+ if (!p || *p || l <= 0) {
+ r = -EINVAL;
+ goto finish;
+ }
+
+ /* Is this for us? */
+ if (getpid() != (pid_t) l) {
+ r = 0;
+ goto finish;
+ }
+
+ if (!(e = getenv("LISTEN_FDS"))) {
+ r = 0;
+ goto finish;
+ }
+
+ errno = 0;
+ l = strtoul(e, &p, 10);
+
+ if (errno != 0) {
+ r = -errno;
+ goto finish;
+ }
+
+ if (!p || *p) {
+ r = -EINVAL;
+ goto finish;
+ }
+
+ for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + (int) l; fd ++) {
+ int flags;
+
+ if ((flags = fcntl(fd, F_GETFD)) < 0) {
+ r = -errno;
+ goto finish;
+ }
+
+ if (flags & FD_CLOEXEC)
+ continue;
+
+ if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) < 0) {
+ r = -errno;
+ goto finish;
+ }
+ }
+
+ r = (int) l;
+
+finish:
+ if (unset_environment) {
+ unsetenv("LISTEN_PID");
+ unsetenv("LISTEN_FDS");
+ }
+
+ return r;
+#endif
+}
+
+int sd_is_fifo(int fd, const char *path) {
+ struct stat st_fd;
+
+ if (fd < 0)
+ return -EINVAL;
+
+ memset(&st_fd, 0, sizeof(st_fd));
+ if (fstat(fd, &st_fd) < 0)
+ return -errno;
+
+ if (!S_ISFIFO(st_fd.st_mode))
+ return 0;
+
+ if (path) {
+ struct stat st_path;
+
+ memset(&st_path, 0, sizeof(st_path));
+ if (stat(path, &st_path) < 0) {
+
+ if (errno == ENOENT || errno == ENOTDIR)
+ return 0;
+
+ return -errno;
+ }
+
+ return
+ st_path.st_dev == st_fd.st_dev &&
+ st_path.st_ino == st_fd.st_ino;
+ }
+
+ return 1;
+}
+
+static int sd_is_socket_internal(int fd, int type, int listening) {
+ struct stat st_fd;
+
+ if (fd < 0 || type < 0)
+ return -EINVAL;
+
+ if (fstat(fd, &st_fd) < 0)
+ return -errno;
+
+ if (!S_ISSOCK(st_fd.st_mode))
+ return 0;
+
+ if (type != 0) {
+ int other_type = 0;
+ socklen_t l = sizeof(other_type);
+
+ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &other_type, &l) < 0)
+ return -errno;
+
+ if (l != sizeof(other_type))
+ return -EINVAL;
+
+ if (other_type != type)
+ return 0;
+ }
+
+ if (listening >= 0) {
+ int accepting = 0;
+ socklen_t l = sizeof(accepting);
+
+ if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &accepting, &l) < 0)
+ return -errno;
+
+ if (l != sizeof(accepting))
+ return -EINVAL;
+
+ if (!accepting != !listening)
+ return 0;
+ }
+
+ return 1;
+}
+
+union sockaddr_union {
+ struct sockaddr sa;
+ struct sockaddr_in in4;
+ struct sockaddr_in6 in6;
+ struct sockaddr_un un;
+ struct sockaddr_storage storage;
+};
+
+int sd_is_socket(int fd, int family, int type, int listening) {
+ int r;
+
+ if (family < 0)
+ return -EINVAL;
+
+ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)
+ return r;
+
+ if (family > 0) {
+ union sockaddr_union sockaddr;
+ socklen_t l;
+
+ memset(&sockaddr, 0, sizeof(sockaddr));
+ l = sizeof(sockaddr);
+
+ if (getsockname(fd, &sockaddr.sa, &l) < 0)
+ return -errno;
+
+ if (l < sizeof(sa_family_t))
+ return -EINVAL;
+
+ return sockaddr.sa.sa_family == family;
+ }
+
+ return 1;
+}
+
+int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) {
+ union sockaddr_union sockaddr;
+ socklen_t l;
+ int r;
+
+ if (family != 0 && family != AF_INET && family != AF_INET6)
+ return -EINVAL;
+
+ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)
+ return r;
+
+ memset(&sockaddr, 0, sizeof(sockaddr));
+ l = sizeof(sockaddr);
+
+ if (getsockname(fd, &sockaddr.sa, &l) < 0)
+ return -errno;
+
+ if (l < sizeof(sa_family_t))
+ return -EINVAL;
+
+ if (sockaddr.sa.sa_family != AF_INET &&
+ sockaddr.sa.sa_family != AF_INET6)
+ return 0;
+
+ if (family > 0)
+ if (sockaddr.sa.sa_family != family)
+ return 0;
+
+ if (port > 0) {
+ if (sockaddr.sa.sa_family == AF_INET) {
+ if (l < sizeof(struct sockaddr_in))
+ return -EINVAL;
+
+ return htons(port) == sockaddr.in4.sin_port;
+ } else {
+ if (l < sizeof(struct sockaddr_in6))
+ return -EINVAL;
+
+ return htons(port) == sockaddr.in6.sin6_port;
+ }
+ }
+
+ return 1;
+}
+
+int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) {
+ union sockaddr_union sockaddr;
+ socklen_t l;
+ int r;
+
+ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)
+ return r;
+
+ memset(&sockaddr, 0, sizeof(sockaddr));
+ l = sizeof(sockaddr);
+
+ if (getsockname(fd, &sockaddr.sa, &l) < 0)
+ return -errno;
+
+ if (l < sizeof(sa_family_t))
+ return -EINVAL;
+
+ if (sockaddr.sa.sa_family != AF_UNIX)
+ return 0;
+
+ if (path) {
+ if (length <= 0)
+ length = strlen(path);
+
+ if (length <= 0)
+ /* Unnamed socket */
+ return l == offsetof(struct sockaddr_un, sun_path);
+
+ if (path[0])
+ /* Normal path socket */
+ return
+ (l >= offsetof(struct sockaddr_un, sun_path) + length + 1) &&
+ memcmp(path, sockaddr.un.sun_path, length+1) == 0;
+ else
+ /* Abstract namespace socket */
+ return
+ (l == offsetof(struct sockaddr_un, sun_path) + length) &&
+ memcmp(path, sockaddr.un.sun_path, length) == 0;
+ }
+
+ return 1;
+}
+
+int sd_notify(int unset_environment, const char *state) {
+#if defined(DISABLE_SYSTEMD) || !defined(__linux__) || !defined(SOCK_CLOEXEC)
+ return 0;
+#else
+ int fd = -1, r;
+ struct msghdr msghdr;
+ struct iovec iovec;
+ union sockaddr_union sockaddr;
+ const char *e;
+
+ if (!state) {
+ r = -EINVAL;
+ goto finish;
+ }
+
+ if (!(e = getenv("NOTIFY_SOCKET")))
+ return 0;
+
+ /* Must be an abstract socket, or an absolute path */
+ if ((e[0] != '@' && e[0] != '/') || e[1] == 0) {
+ r = -EINVAL;
+ goto finish;
+ }
+
+ if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) {
+ r = -errno;
+ goto finish;
+ }
+
+ memset(&sockaddr, 0, sizeof(sockaddr));
+ sockaddr.sa.sa_family = AF_UNIX;
+ strncpy(sockaddr.un.sun_path, e, sizeof(sockaddr.un.sun_path));
+
+ if (sockaddr.un.sun_path[0] == '@')
+ sockaddr.un.sun_path[0] = 0;
+
+ memset(&iovec, 0, sizeof(iovec));
+ iovec.iov_base = (char*) state;
+ iovec.iov_len = strlen(state);
+
+ memset(&msghdr, 0, sizeof(msghdr));
+ msghdr.msg_name = &sockaddr;
+ msghdr.msg_namelen = offsetof(struct sockaddr_un, sun_path) + strlen(e);
+
+ if (msghdr.msg_namelen > sizeof(struct sockaddr_un))
+ msghdr.msg_namelen = sizeof(struct sockaddr_un);
+
+ msghdr.msg_iov = &iovec;
+ msghdr.msg_iovlen = 1;
+
+ if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) {
+ r = -errno;
+ goto finish;
+ }
+
+ r = 1;
+
+finish:
+ if (unset_environment)
+ unsetenv("NOTIFY_SOCKET");
+
+ if (fd >= 0)
+ close(fd);
+
+ return r;
+#endif
+}
+
+int sd_notifyf(int unset_environment, const char *format, ...) {
+#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
+ return 0;
+#else
+ va_list ap;
+ char *p = NULL;
+ int r;
+
+ va_start(ap, format);
+ r = vasprintf(&p, format, ap);
+ va_end(ap);
+
+ if (r < 0 || !p)
+ return -ENOMEM;
+
+ r = sd_notify(unset_environment, p);
+ free(p);
+
+ return r;
+#endif
+}
+
+int sd_booted(void) {
+#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
+ return 0;
+#else
+
+ struct stat a, b;
+
+ /* We simply test whether the systemd cgroup hierarchy is
+ * mounted */
+
+ if (lstat("/sys/fs/cgroup", &a) < 0)
+ return 0;
+
+ if (lstat("/sys/fs/cgroup/systemd", &b) < 0)
+ return 0;
+
+ return a.st_dev != b.st_dev;
+#endif
+}
Index: services/icecream-scheduler.service.in
===================================================================
--- services/icecream-scheduler.service.in (revision 0)
+++ services/icecream-scheduler.service.in (revision 0)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Icecream Scheduler
+
+[Service]
+EnvironmentFile=-@sysconfdir@/icecream-scheduler.conf
+ExecStart=@sbindir@/scheduler $ICECREAM_SCHEDULER_CONF
+
+[Install]
+WantedBy=multi-user.target
Index: services/sd-daemon.h
===================================================================
--- services/sd-daemon.h (revision 0)
+++ services/sd-daemon.h (revision 0)
@@ -0,0 +1,265 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#ifndef foosddaemonhfoo
+#define foosddaemonhfoo
+
+/***
+ Copyright 2010 Lennart Poettering
+
+ 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 <sys/types.h>
+#include <inttypes.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ Reference implementation of a few systemd related interfaces for
+ writing daemons. These interfaces are trivial to implement. To
+ simplify porting we provide this reference implementation.
+ Applications are welcome to reimplement the algorithms described
+ here if they do not want to include these two source files.
+
+ The following functionality is provided:
+
+ - Support for logging with log levels on stderr
+ - File descriptor passing for socket-based activation
+ - Daemon startup and status notification
+ - Detection of systemd boots
+
+ You may compile this with -DDISABLE_SYSTEMD to disable systemd
+ support. This makes all those calls NOPs that are directly related to
+ systemd (i.e. only sd_is_xxx() will stay useful).
+
+ Since this is drop-in code we don't want any of our symbols to be
+ exported in any case. Hence we declare hidden visibility for all of
+ them.
+
+ You may find an up-to-date version of these source files online:
+
+ http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h
+ http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c
+
+ This should compile on non-Linux systems, too, but with the
+ exception of the sd_is_xxx() calls all functions will become NOPs.
+
+ See sd-daemon(7) for more information.
+*/
+
+#ifndef _sd_printf_attr_
+#if __GNUC__ >= 4
+#define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
+#else
+#define _sd_printf_attr_(a,b)
+#endif
+#endif
+
+#ifndef _sd_hidden_
+#if (__GNUC__ >= 4) && !defined(SD_EXPORT_SYMBOLS)
+#define _sd_hidden_ __attribute__ ((visibility("hidden")))
+#else
+#define _sd_hidden_
+#endif
+#endif
+
+/*
+ Log levels for usage on stderr:
+
+ fprintf(stderr, SD_NOTICE "Hello World!\n");
+
+ This is similar to printk() usage in the kernel.
+*/
+#define SD_EMERG "<0>" /* system is unusable */
+#define SD_ALERT "<1>" /* action must be taken immediately */
+#define SD_CRIT "<2>" /* critical conditions */
+#define SD_ERR "<3>" /* error conditions */
+#define SD_WARNING "<4>" /* warning conditions */
+#define SD_NOTICE "<5>" /* normal but significant condition */
+#define SD_INFO "<6>" /* informational */
+#define SD_DEBUG "<7>" /* debug-level messages */
+
+/* The first passed file descriptor is fd 3 */
+#define SD_LISTEN_FDS_START 3
+
+/*
+ Returns how many file descriptors have been passed, or a negative
+ errno code on failure. Optionally, removes the $LISTEN_FDS and
+ $LISTEN_PID file descriptors from the environment (recommended, but
+ problematic in threaded environments). If r is the return value of
+ this function you'll find the file descriptors passed as fds
+ SD_LISTEN_FDS_START to SD_LISTEN_FDS_START+r-1. Returns a negative
+ errno style error code on failure. This function call ensures that
+ the FD_CLOEXEC flag is set for the passed file descriptors, to make
+ sure they are not passed on to child processes. If FD_CLOEXEC shall
+ not be set, the caller needs to unset it after this call for all file
+ descriptors that are used.
+
+ See sd_listen_fds(3) for more information.
+*/
+int sd_listen_fds(int unset_environment) _sd_hidden_;
+
+/*
+ Helper call for identifying a passed file descriptor. Returns 1 if
+ the file descriptor is a FIFO in the file system stored under the
+ specified path, 0 otherwise. If path is NULL a path name check will
+ not be done and the call only verifies if the file descriptor
+ refers to a FIFO. Returns a negative errno style error code on
+ failure.
+
+ See sd_is_fifo(3) for more information.
+*/
+int sd_is_fifo(int fd, const char *path) _sd_hidden_;
+
+/*
+ Helper call for identifying a passed file descriptor. Returns 1 if
+ the file descriptor is a socket of the specified family (AF_INET,
+ ...) and type (SOCK_DGRAM, SOCK_STREAM, ...), 0 otherwise. If
+ family is 0 a socket family check will not be done. If type is 0 a
+ socket type check will not be done and the call only verifies if
+ the file descriptor refers to a socket. If listening is > 0 it is
+ verified that the socket is in listening mode. (i.e. listen() has
+ been called) If listening is == 0 it is verified that the socket is
+ not in listening mode. If listening is < 0 no listening mode check
+ is done. Returns a negative errno style error code on failure.
+
+ See sd_is_socket(3) for more information.
+*/
+int sd_is_socket(int fd, int family, int type, int listening) _sd_hidden_;
+
+/*
+ Helper call for identifying a passed file descriptor. Returns 1 if
+ the file descriptor is an Internet socket, of the specified family
+ (either AF_INET or AF_INET6) and the specified type (SOCK_DGRAM,
+ SOCK_STREAM, ...), 0 otherwise. If version is 0 a protocol version
+ check is not done. If type is 0 a socket type check will not be
+ done. If port is 0 a socket port check will not be done. The
+ listening flag is used the same way as in sd_is_socket(). Returns a
+ negative errno style error code on failure.
+
+ See sd_is_socket_inet(3) for more information.
+*/
+int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) _sd_hidden_;
+
+/*
+ Helper call for identifying a passed file descriptor. Returns 1 if
+ the file descriptor is an AF_UNIX socket of the specified type
+ (SOCK_DGRAM, SOCK_STREAM, ...) and path, 0 otherwise. If type is 0
+ a socket type check will not be done. If path is NULL a socket path
+ check will not be done. For normal AF_UNIX sockets set length to
+ 0. For abstract namespace sockets set length to the length of the
+ socket name (including the initial 0 byte), and pass the full
+ socket path in path (including the initial 0 byte). The listening
+ flag is used the same way as in sd_is_socket(). Returns a negative
+ errno style error code on failure.
+
+ See sd_is_socket_unix(3) for more information.
+*/
+int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) _sd_hidden_;
+
+/*
+ Informs systemd about changed daemon state. This takes a number of
+ newline separated environment-style variable assignments in a
+ string. The following variables are known:
+
+ READY=1 Tells systemd that daemon startup is finished (only
+ relevant for services of Type=notify). The passed
+ argument is a boolean "1" or "0". Since there is
+ little value in signaling non-readiness the only
+ value daemons should send is "READY=1".
+
+ STATUS=... Passes a single-line status string back to systemd
+ that describes the daemon state. This is free-from
+ and can be used for various purposes: general state
+ feedback, fsck-like programs could pass completion
+ percentages and failing programs could pass a human
+ readable error message. Example: "STATUS=Completed
+ 66% of file system check..."
+
+ ERRNO=... If a daemon fails, the errno-style error code,
+ formatted as string. Example: "ERRNO=2" for ENOENT.
+
+ BUSERROR=... If a daemon fails, the D-Bus error-style error
+ code. Example: "BUSERROR=org.freedesktop.DBus.Error.TimedOut"
+
+ MAINPID=... The main pid of a daemon, in case systemd did not
+ fork off the process itself. Example: "MAINPID=4711"
+
+ Daemons can choose to send additional variables. However, it is
+ recommended to prefix variable names not listed above with X_.
+
+ Returns a negative errno-style error code on failure. Returns > 0
+ if systemd could be notified, 0 if it couldn't possibly because
+ systemd is not running.
+
+ Example: When a daemon finished starting up, it could issue this
+ call to notify systemd about it:
+
+ sd_notify(0, "READY=1");
+
+ See sd_notifyf() for more complete examples.
+
+ See sd_notify(3) for more information.
+*/
+int sd_notify(int unset_environment, const char *state) _sd_hidden_;
+
+/*
+ Similar to sd_notify() but takes a format string.
+
+ Example 1: A daemon could send the following after initialization:
+
+ sd_notifyf(0, "READY=1\n"
+ "STATUS=Processing requests...\n"
+ "MAINPID=%lu",
+ (unsigned long) getpid());
+
+ Example 2: A daemon could send the following shortly before
+ exiting, on failure:
+
+ sd_notifyf(0, "STATUS=Failed to start up: %s\n"
+ "ERRNO=%i",
+ strerror(errno),
+ errno);
+
+ See sd_notifyf(3) for more information.
+*/
+int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(2,3) _sd_hidden_;
+
+/*
+ Returns > 0 if the system was booted with systemd. Returns < 0 on
+ error. Returns 0 if the system was not booted with systemd. Note
+ that all of the functions above handle non-systemd boots just
+ fine. You should NOT protect them with a call to this function. Also
+ note that this function checks whether the system, not the user
+ session is controlled by systemd. However the functions above work
+ for both user and system services.
+
+ See sd_booted(3) for more information.
+*/
+int sd_booted(void) _sd_hidden_;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Index: services/scheduler.cpp
===================================================================
--- services/scheduler.cpp (revision 1232790)
+++ services/scheduler.cpp (working copy)
@@ -51,6 +51,7 @@
#include "job.h"
#include "config.h"
#include "bench.h"
+#include "sd-daemon.h"
#define DEBUG_SCHEDULER 0
@@ -1941,15 +1942,44 @@
if ( detach )
daemon( 0, 0 );
- listen_fd = open_tcp_listener (port);
- if (listen_fd < 0)
+ int listened_fds = sd_listen_fds(1);
+ if (listened_fds == 3)
+ {
+ listen_fd = SD_LISTEN_FDS_START;
+ text_fd = SD_LISTEN_FDS_START + 1;
+ broad_fd = SD_LISTEN_FDS_START + 2;
+
+ if (!sd_is_socket_inet(listen_fd, 0, SOCK_STREAM, 0, port)
+ || !sd_is_socket_inet(text_fd, 0, SOCK_STREAM, 0, port + 1)
+ || !sd_is_socket_inet(broad_fd, 0, SOCK_DGRAM, 0, 8765))
+ {
+ log_error() << "incorrect file descriptors received to be listened." << endl;
+ return 1;
+ }
+
+ int optval = 1;
+ if (setsockopt(broad_fd, SOL_SOCKET, SO_BROADCAST, &optval, sizeof(optval)) < 0)
+ {
+ log_perror("setsockopt()");
+ return 1;
+ }
+ }
+ else if (listened_fds == 0)
+ {
+ listen_fd = open_tcp_listener (port);
+ if (listen_fd < 0)
+ return 1;
+ text_fd = open_tcp_listener (port + 1);
+ if (text_fd < 0)
+ return 1;
+ broad_fd = open_broad_listener ();
+ if (broad_fd < 0)
+ return 1;
+ }
+ else {
+ log_error() << "expected 3 file descriptors to be listened" << endl;
return 1;
- text_fd = open_tcp_listener (port + 1);
- if (text_fd < 0)
- return 1;
- broad_fd = open_broad_listener ();
- if (broad_fd < 0)
- return 1;
+ }
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
{
Index: services/icecream-scheduler.conf
===================================================================
--- services/icecream-scheduler.conf (revision 0)
+++ services/icecream-scheduler.conf (revision 0)
@@ -0,0 +1,6 @@
+# see scheduler --help
+# [-n|--netname <name>]
+# [-l|--log-file <file>]
+# [-v[v[v]]]
+# do not use -d (--daemonize) or -p (--port) options here.
+ICECREAM_SCHEDULER_CONF=""
Index: services/Makefile.am
===================================================================
--- services/Makefile.am (revision 1232790)
+++ services/Makefile.am (working copy)
@@ -2,13 +2,13 @@
lib_LTLIBRARIES = libicecc.la
-libicecc_la_SOURCES = job.cpp comm.cpp getifaddrs.cpp logging.cpp tempfile.c platform.cpp
+libicecc_la_SOURCES = job.cpp comm.cpp getifaddrs.cpp logging.cpp tempfile.c platform.cpp sd-daemon.c
libicecc_la_LIBADD = ../minilzo/libminilzo.la -ldl
libicecc_la_CFLAGS = -fPIC -DPIC
libicecc_la_CXXFLAGS = -fPIC -DPIC
ice_HEADERS = job.h comm.h
-noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h
+noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h sd-daemon.h
icedir = $(includedir)/icecc
sbin_PROGRAMS = scheduler
@@ -18,3 +18,17 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = icecc.pc
+if SYSTEMD
+systemdunitdir = @SYSTEMD_UNITDIR@
+systemdunit_DATA = icecream-scheduler.service icecream-scheduler.socket
+sysconf_DATA = icecream-scheduler.conf
+
+icecream-scheduler.service: icecream-scheduler.service.in Makefile
+ rm -f $@
+ sed \
+ -e 's:[@]sbindir[@]:$(sbindir):g' \
+ -e 's:[@]sysconfdir[@]:$(sysconfdir):g' \
+ $< >$@
+endif
+
+EXTRA_DIST = icecream-scheduler.service.in icecream-scheduler.conf icecream-scheduler.socket
Index: services/icecream-scheduler.socket
===================================================================
--- services/icecream-scheduler.socket (revision 0)
+++ services/icecream-scheduler.socket (revision 0)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Icecream Scheduler Socket
+
+[Socket]
+# keep this order.
+ListenStream=8765
+ListenStream=8766
+ListenDatagram=8765
+
+[Install]
+WantedBy=sockets.target
Index: configure.in
===================================================================
--- configure.in (revision 1232790)
+++ configure.in (working copy)
@@ -27,7 +27,17 @@
AC_DISABLE_SHARED
AC_ENABLE_STATIC
AC_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG
+AC_ARG_WITH([systemdunitdir], AC_HELP_STRING([--with-systemdunitdir=DIR],
+ [path to systemd service directory]), [path_systemdunit=${withval}],
+ [path_systemdunit="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"])
+if (test -n "${path_systemdunit}"); then
+ SYSTEMD_UNITDIR="${path_systemdunit}"
+ AC_SUBST(SYSTEMD_UNITDIR)
+fi
+AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
+
########################################################################
### Checks for header files
@@ -246,6 +256,9 @@
KDE_EXPAND_MAKEVAR(mybindir, bindir)
AC_DEFINE_UNQUOTED(BINDIR, "$mybindir", [Where to look for icecc])
+KDE_EXPAND_MAKEVAR(mybindir, sbindir)
+AC_DEFINE_UNQUOTED(SBINDIR, "$mysbindir", [Where to look for iceccd])
+
myopkglibdir='${libdir}/'"$PACKAGE"
KDE_EXPAND_MAKEVAR(mypkglibdir, myopkglibdir)
AC_DEFINE_UNQUOTED(PLIBDIR, "$mypkglibdir", [Where to look for icecc-create-env])
_______________________________________________
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
