/*
* This file is part of DisOrder.
- * Copyright (C) 2004, 2005, 2007-2009 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007-2009, 2012 Richard Kettlewell
*
* 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
*/
#include "disorder-server.h"
-/** @brief Current AF_UNIX socket path */
-static const char *current_unix;
+/** @brief A unix domain socket */
+struct unix_socket {
+ const char *path;
+ int fd;
+};
-/** @brief Current AF_UNIX socket */
-static int current_unix_fd;
+struct unix_socket main_socket[1], priv_socket[1];
/** @brief TCP listener definition */
struct listener {
/** @brief Quit DisOrder */
void quit(ev_source *ev) {
- info("shutting down...");
+ disorder_info("shutting down...");
quitting(ev);
trackdb_close();
- trackdb_deinit();
- info("exiting");
+ trackdb_deinit(ev);
+ /* Shutdown subprocesses.
+ *
+ * Subprocesses that use ev_child:
+ * - the speaker
+ * - the current rescan
+ * - any decoders
+ * - ...and players
+ * - the track picker
+ * - mail sender
+ * - the deadlock manager
+ *
+ * Subprocesses that don't:
+ * - any normalizers
+ * These are not shut down currently.
+ */
+ ev_child_killall(ev);
+ disorder_info("exiting");
exit(0);
}
return sa;
}
-/** @brief Create and destroy sockets to set current configuration */
-static void reset_socket(ev_source *ev) {
- const char *new_unix;
- struct addrinfo *res, *r;
- struct listener *l, **ll;
+static void reset_unix_socket(ev_source *ev,
+ struct unix_socket *s,
+ const char *new_path,
+ int privileged) {
struct sockaddr_un sun;
-
- /* unix first */
- new_unix = config_get_file("socket");
- if(!current_unix || strcmp(current_unix, new_unix)) {
+ if(!s->path || strcmp(s->path, new_path)) {
/* either there was no socket, or there was but a different path */
- if(current_unix) {
+ if(s->path) {
/* stop the old one and remove it from the filesystem */
- server_stop(ev, current_unix_fd);
- if(unlink(current_unix) < 0)
- fatal(errno, "unlink %s", current_unix);
+ server_stop(ev, s->fd);
+ if(unlink(s->path) < 0)
+ disorder_fatal(errno, "unlink %s", s->path);
}
/* start the new one */
- if(strlen(new_unix) >= sizeof sun.sun_path)
- fatal(0, "socket path %s is too long", new_unix);
+ if(strlen(new_path) >= sizeof sun.sun_path)
+ disorder_fatal(0, "socket path %s is too long", new_path);
memset(&sun, 0, sizeof sun);
sun.sun_family = AF_UNIX;
- strcpy(sun.sun_path, new_unix);
- if(unlink(new_unix) < 0 && errno != ENOENT)
- fatal(errno, "unlink %s", new_unix);
- if((current_unix_fd = server_start(ev, PF_UNIX, sizeof sun,
- (const struct sockaddr *)&sun,
- new_unix)) >= 0) {
- current_unix = new_unix;
- if(chmod(new_unix, 0777) < 0)
- fatal(errno, "error calling chmod %s", new_unix);
+ strcpy(sun.sun_path, new_path);
+ if(unlink(new_path) < 0 && errno != ENOENT)
+ disorder_fatal(errno, "unlink %s", new_path);
+ if((s->fd = server_start(ev, PF_UNIX, sizeof sun,
+ (const struct sockaddr *)&sun,
+ new_path,
+ privileged)) >= 0) {
+ s->path = new_path;
+ if(chmod(new_path, 0777) < 0) /* TODO */
+ disorder_fatal(errno, "error calling chmod %s", new_path);
} else
- current_unix = 0;
+ s->path = 0;
}
+}
+
+/** @brief Create and destroy sockets to set current configuration */
+void reset_sockets(ev_source *ev) {
+ struct addrinfo *res, *r;
+ struct listener *l, **ll;
+ const char *private_dir = config_get_file("private");
+
+ /* create the private socket directory */
+ unlink(private_dir);
+ if(mkdir(private_dir, 0700) < 0 && errno != EEXIST)
+ disorder_fatal(errno, "error creating %s", private_dir);
+
+ /* unix first */
+ reset_unix_socket(ev, main_socket, config_get_file("socket"), 0);
+ reset_unix_socket(ev, priv_socket, config_get_file("private/socket"), 1);
/* get the new listen config */
if(config->listen.af != -1)
if(!l) {
/* Didn't find a match, need a new listener */
int fd = server_start(ev, r->ai_family, r->ai_addrlen, r->ai_addr,
- format_sockaddr(r->ai_addr));
+ format_sockaddr(r->ai_addr), 0);
if(fd >= 0) {
l = xmalloc(sizeof *l);
l->next = listeners;
}
/** @brief Reconfigure the server
- * @param reload 0 at startup, 1 for a reload
+ * @param ev Event loop
+ * @param flags Flags
+ * @return As config_read(); 0 on success, -1 if could not (re-)read config
*/
-int reconfigure(ev_source *ev, int reload) {
+int reconfigure(ev_source *ev, unsigned flags) {
int need_another_rescan = 0;
int ret = 0;
- D(("reconfigure(%d)", reload));
+ D(("reconfigure(%x)", flags));
/* Deconfigure the old audio API if there is one */
if(api) {
if(api->close_mixer)
api->close_mixer();
api = NULL;
}
- if(reload) {
+ if(flags & RECONFIGURE_RELOADING) {
/* If there's a rescan in progress, cancel it but remember to start a fresh
- * one after the reload */
+ * one after the reload. */
need_another_rescan = trackdb_rescan_cancel();
- /* Close the track database */
- trackdb_close();
/* (Re-)read the configuration */
- if(config_read(1/*server*/))
+ if(config_read(1/*server*/, config))
ret = -1;
else {
/* Tell the speaker it needs to reload its config too. */
speaker_reload();
- info("%s: installed new configuration", configfile);
+ disorder_info("%s: installed new configuration", configfile);
}
- /* Re-open track database. We don't attempt to support database version
- * upgrade at this point - the software hasn't changed, after all. */
- trackdb_open(TRACKDB_NO_UPGRADE);
- } else
- /* We only allow for upgrade at startup */
- trackdb_open(TRACKDB_CAN_UPGRADE);
+ }
/* New audio API */
api = uaudio_find(config->api);
if(api->configure)
/* If we interrupted a rescan of all the tracks, start a new one */
if(need_another_rescan)
trackdb_rescan(ev, 1/*check*/, 0, 0);
- /* Arrange timeouts for schedule actions */
- schedule_init(ev);
- /* TODO what about leftover callbacks from before the reload? */
- if(!ret) {
- /* Read the queue back in */
- queue_read();
- recent_read();
- /* Reset sockets */
- reset_socket(ev);
+ if(!ret && !(flags & RECONFIGURE_FIRST)) {
+ /* Open/close sockets */
+ reset_sockets(ev);
}
- /* TODO we need a careful think about what you can and cannot change with a
- * reload.
- *
- * For instance saving and restoring the queue limits what we can usefuly
- * keep in the queue data structure. As a general rule, long-term state
- * ought to be off-limits. So 'home directory' will have to stay where it
- * is. (This actually means the AF_UNIX socket will never be re-opened.)
- *
- * Players certainly ought to be reconfigurable but this raises the ugly
- * question of what to do about already-started background decoders.
- *
- * The audio API is easy to do for the server but a pain for the speaker.
- *
- * These two points suggest a general approach: if things that affect the
- * speaker change, we could just restart it and any extant background
- * decoders, at the next track change. This would generate a bit of a gap
- * but presumably reconfiguration is a rare event so this might be
- * acceptable.
- */
return ret;
}
~mdw / disorder / blobdiff