X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/7378b5081fde6f48140327d5c072a8231934f027..ad7a78bb23ebbc99787a4ffb770b6d89953d9cc8:/server/disorderd.c
diff --git a/server/disorderd.c b/server/disorderd.c
index 01d4efe..2342c3c 100644
--- a/server/disorderd.c
+++ b/server/disorderd.c
@@ -2,62 +2,23 @@
* This file is part of DisOrder.
* Copyright (C) 2004-2008 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"
-#include "version.h"
+/** @file server/disorderd.c
+ * @brief Main DisOrder server
+ */
+#include "disorder-server.h"
static ev_source *ev;
@@ -138,7 +99,7 @@ static int periodic_callback(ev_source *ev_,
}
/** @brief Create a periodic action
- * @param ev Event loop
+ * @param ev_ Event loop
* @param callback Callback function
* @param period Interval between calls in seconds
* @param immediate If true, call @p callback straight away
@@ -160,7 +121,7 @@ static void create_periodic(ev_source *ev_,
}
static void periodic_rescan(ev_source *ev_) {
- trackdb_rescan(ev_, 1/*check*/);
+ trackdb_rescan(ev_, 1/*check*/, 0, 0);
}
static void periodic_database_gc(ev_source attribute((unused)) *ev_) {
@@ -171,7 +132,7 @@ 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(!mixer_control(-1/*as configured*/, &l, &r, 0)) {
if(l != volume_left || r != volume_right) {
volume_left = l;
volume_right = r;
@@ -213,6 +174,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();
@@ -247,6 +209,18 @@ int main(int argc, char **argv) {
srand(time(0)); /* don't start the same every time */
/* gcrypt initialization */
gcry_control(GCRYCTL_INIT_SECMEM, 1);
+ /* 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");
@@ -304,8 +278,8 @@ int main(int argc, char **argv) {
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 ten seconds */
- create_periodic(ev, periodic_add_random, 10, 1);
+ /* 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 */