X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/ffac51d73ab97c4c9c1e6c43b18d54d716000bf6..37f29ce96baac1d999dab119d671bb7dff6793e8:/server/disorderd.c diff --git a/server/disorderd.c b/server/disorderd.c index 15e3572..31b70a4 100644 --- a/server/disorderd.c +++ b/server/disorderd.c @@ -1,69 +1,27 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell + * Copyright (C) 2004-2009 Richard Kettlewell * - * This program is free software; you can redistribute it and/or modify + * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program 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 - * General Public License for more details. - * + * This program 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 General Public License for more details. + * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * along with this program. If not, see . */ - -#include -#include "types.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "daemonize.h" -#include "event.h" -#include "log.h" -#include "configuration.h" -#include "rights.h" -#include "trackdb.h" -#include "queue.h" -#include "mem.h" -#include "play.h" -#include "server.h" -#include "state.h" -#include "syscalls.h" -#include "defs.h" -#include "user.h" -#include "mixer.h" -#include "eventlog.h" -#include "printf.h" +/** @file server/disorderd.c + * @brief Main DisOrder server + */ +#include "disorder-server.h" static ev_source *ev; -static void rescan_after(long offset); -static void dbgc_after(long offset); -static void volumecheck_after(long offset); - static const struct option options[] = { { "help", no_argument, 0, 'h' }, { "version", no_argument, 0, 'V' }, @@ -93,19 +51,14 @@ static void help(void) { exit(0); } -/* display version number and terminate */ -static void version(void) { - xprintf("%s", disorder_version_string); - xfclose(stdout); - exit(0); -} +/* signals ------------------------------------------------------------------ */ /* SIGHUP callback */ static int handle_sighup(ev_source attribute((unused)) *ev_, int attribute((unused)) sig, void attribute((unused)) *u) { info("received SIGHUP"); - reconfigure(ev, 1); + reconfigure(ev, RECONFIGURE_RELOADING); return 0; } @@ -125,45 +78,62 @@ static int handle_sigterm(ev_source attribute((unused)) *ev_, quit(ev); } -static int rescan_again(ev_source *ev_, - const struct timeval attribute((unused)) *now, - void attribute((unused)) *u) { - trackdb_rescan(ev_, 1/*check*/); - rescan_after(86400); - return 0; -} +/* periodic actions --------------------------------------------------------- */ -static void rescan_after(long offset) { +struct periodic_data { + void (*callback)(ev_source *); + int period; +}; + +static int periodic_callback(ev_source *ev_, + const struct timeval attribute((unused)) *now, + void *u) { struct timeval w; + struct periodic_data *const pd = u; + pd->callback(ev_); gettimeofday(&w, 0); - w.tv_sec += offset; - ev_timeout(ev, 0, &w, rescan_again, 0); -} - -static int dbgc_again(ev_source attribute((unused)) *ev_, - const struct timeval attribute((unused)) *now, - void attribute((unused)) *u) { - trackdb_gc(); - dbgc_after(60); + w.tv_sec += pd->period; + ev_timeout(ev, 0, &w, periodic_callback, pd); return 0; } -static void dbgc_after(long offset) { +/** @brief Create a periodic action + * @param ev_ Event loop + * @param callback Callback function + * @param period Interval between calls in seconds + * @param immediate If true, call @p callback straight away + */ +static void create_periodic(ev_source *ev_, + void (*callback)(ev_source *), + int period, + int immediate) { struct timeval w; + struct periodic_data *const pd = xmalloc(sizeof *pd); + pd->callback = callback; + pd->period = period; + if(immediate) + callback(ev_); gettimeofday(&w, 0); - w.tv_sec += offset; - ev_timeout(ev, 0, &w, dbgc_again, 0); + w.tv_sec += period; + ev_timeout(ev_, 0, &w, periodic_callback, pd); } -static int volumecheck_again(ev_source attribute((unused)) *ev_, - const struct timeval attribute((unused)) *now, - void attribute((unused)) *u) { +static void periodic_rescan(ev_source *ev_) { + trackdb_rescan(ev_, 1/*check*/, 0, 0); +} + +static void periodic_database_gc(ev_source attribute((unused)) *ev_) { + trackdb_gc(); +} + +static void periodic_volume_check(ev_source attribute((unused)) *ev_) { int l, r; char lb[32], rb[32]; - if(!mixer_control(&l, &r, 0)) { + if(api && api->get_volume) { + api->get_volume(&l, &r); if(l != volume_left || r != volume_right) { volume_left = l; volume_right = r; @@ -172,16 +142,14 @@ static int volumecheck_again(ev_source attribute((unused)) *ev_, eventlog("volume", lb, rb, (char *)0); } } - volumecheck_after(60); - return 0; } -static void volumecheck_after(long offset) { - struct timeval w; +static void periodic_play_check(ev_source *ev_) { + play(ev_); +} - gettimeofday(&w, 0); - w.tv_sec += offset; - ev_timeout(ev, 0, &w, volumecheck_again, 0); +static void periodic_add_random(ev_source *ev_) { + add_random_track(ev_); } /* We fix the path to include the bindir and sbindir we were installed into */ @@ -207,6 +175,7 @@ static void fix_path(void) { int main(int argc, char **argv) { int n, background = 1, logsyslog = 0; const char *pidfile = 0; + struct rlimit rl[1]; set_progname(argv); mem_init(); @@ -217,7 +186,7 @@ int main(int argc, char **argv) { while((n = getopt_long(argc, argv, "hVc:dfP:Ns", options, 0)) >= 0) { switch(n) { case 'h': help(); - case 'V': version(); + case 'V': version("disorderd"); case 'c': configfile = optarg; break; case 'd': debugging = 1; break; case 'f': background = 0; break; @@ -240,12 +209,28 @@ int main(int argc, char **argv) { fix_path(); srand(time(0)); /* don't start the same every time */ /* gcrypt initialization */ + if(!gcry_check_version(NULL)) + disorder_fatal(0, "gcry_check_version failed"); gcry_control(GCRYCTL_INIT_SECMEM, 1); + gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); + /* make sure we can't have more than FD_SETSIZE files open (event.c does + * check but this provides an additional line of defence) */ + if(getrlimit(RLIMIT_NOFILE, rl) < 0) + fatal(errno, "getrlimit RLIMIT_NOFILE"); + if(rl->rlim_cur > FD_SETSIZE) { + rl->rlim_cur = FD_SETSIZE; + if(setrlimit(RLIMIT_NOFILE, rl) < 0) + fatal(errno, "setrlimit to reduce RLIMIT_NOFILE to %lu", + (unsigned long)rl->rlim_cur); + info("set RLIM_NOFILE to %lu", (unsigned long)rl->rlim_cur); + } else + info("RLIM_NOFILE is %lu", (unsigned long)rl->rlim_cur); /* create event loop */ ev = ev_new(); if(ev_child_setup(ev)) fatal(0, "ev_child_setup failed"); /* read config */ - if(config_read(1)) + config_uaudio_apis = uaudio_apis; + if(config_read(1, NULL)) fatal(0, "cannot read configuration"); /* make sure the home directory exists and has suitable permissions */ make_home(); @@ -259,7 +244,7 @@ int main(int argc, char **argv) { /* make sure we're not root, whatever the config says */ if(getuid() == 0 || geteuid() == 0) fatal(0, "do not run as root"); /* open a lockfile - we only want one copy of the server to run at once. */ - if(config->lock) { + if(1) { const char *lockfile; int lockfd; struct flock lock; @@ -277,12 +262,24 @@ int main(int argc, char **argv) { /* initialize database environment */ trackdb_init(TRACKDB_NORMAL_RECOVER|TRACKDB_MAY_CREATE); trackdb_master(ev); - /* install new config (calls trackdb_open()) */ - reconfigure(ev, 0); + /* install new config; don't create socket */ + if(reconfigure(ev, RECONFIGURE_FIRST)) + fatal(0, "failed to read configuration"); + /* Open the database */ + trackdb_open(TRACKDB_CAN_UPGRADE); + /* load the queue and recently-played list */ + queue_read(); + recent_read(); + /* Arrange timeouts for schedule actions */ + schedule_init(ev); /* pull in old users */ trackdb_old_users(); /* create a root login */ trackdb_create_root(); + /* create sockets */ + reset_sockets(ev); + /* check for change to database parameters */ + dbparams_check(); /* re-read config if we receive a SIGHUP */ if(ev_signal(ev, SIGHUP, handle_sighup, 0)) fatal(0, "ev_signal failed"); /* exit on SIGINT/SIGTERM */ @@ -290,24 +287,16 @@ int main(int argc, char **argv) { if(ev_signal(ev, SIGTERM, handle_sigterm, 0)) fatal(0, "ev_signal failed"); /* ignore SIGPIPE */ signal(SIGPIPE, SIG_IGN); - /* Start a rescan straight away if this is a new installation. This rescan - * blocks; the point is that when it is finished we are in a good position to - * choose a random track. */ - if(!trackdb_existing_database) { - trackdb_rescan(0/*ev*/, 0/*check*/); - /* No ev -> the rescan will block. Since we called reconfigure() already - * any clients will also be forced to block. */ - } - /* Start a second rescan, with length checking enabled, immediately after - * startup. */ - rescan_after(1); - /* periodically tidy up the database */ - dbgc_after(60); - /* periodically check the volume */ - volumecheck_again(0, 0, 0); - /* set initial state */ - add_random_track(); - play(ev); + /* Rescan immediately and then daily */ + create_periodic(ev, periodic_rescan, 86400, 1/*immediate*/); + /* Tidy up the database once a minute */ + create_periodic(ev, periodic_database_gc, 60, 0); + /* Check the volume immediately and then once a minute */ + create_periodic(ev, periodic_volume_check, 60, 1); + /* Check for a playable track once a second */ + create_periodic(ev, periodic_play_check, 1, 0); + /* Try adding a random track immediately and once every two seconds */ + create_periodic(ev, periodic_add_random, 2, 1); /* enter the event loop */ n = ev_run(ev); /* if we exit the event loop, something must have gone wrong */