/** @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);
}
}
/** @brief Create and destroy sockets to set current configuration */
-static void reset_socket(ev_source *ev) {
+void reset_sockets(ev_source *ev) {
const char *new_unix;
struct addrinfo *res, *r;
struct listener *l, **ll;
/* 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);
+ disorder_fatal(errno, "unlink %s", current_unix);
}
/* start the new one */
if(strlen(new_unix) >= sizeof sun.sun_path)
- fatal(0, "socket path %s is too long", new_unix);
+ disorder_fatal(0, "socket path %s is too long", new_unix);
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);
+ disorder_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);
+ disorder_fatal(errno, "error calling chmod %s", new_unix);
} else
current_unix = 0;
}
}
/** @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. */
need_another_rescan = trackdb_rescan_cancel();
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);
}
}
/* New audio API */
/* If we interrupted a rescan of all the tracks, start a new one */
if(need_another_rescan)
trackdb_rescan(ev, 1/*check*/, 0, 0);
- if(!ret) {
- /* Reset sockets */
- reset_socket(ev);
+ if(!ret && !(flags & RECONFIGURE_FIRST)) {
+ /* Open/close sockets */
+ reset_sockets(ev);
}
return ret;
}