X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=2a78332f2133c854937b4be239990cc6a3e1caf8;hp=40c75952570eb60c09ddf7904eda43cc37f90108;hb=7e58bd75a29d2d4e1d184191c2500b6aa7a7ad8a;hpb=3392bf543022cae60dad0ed76486b574a76b1d66 diff --git a/audiod.c b/audiod.c index 40c75952..2a78332f 100644 --- a/audiod.c +++ b/audiod.c @@ -1,25 +1,15 @@ /* - * Copyright (C) 2005-2006 Andre Noll + * Copyright (C) 2005-2007 Andre Noll * - * 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 - * (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. - * - * 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, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file audiod.c the paraslash's audio daemon */ +#include +#include #include "para.h" - +#include "error.h" #include "audiod.cmdline.h" #include "list.h" #include "sched.h" @@ -36,7 +26,7 @@ #include "fd.h" #include "write.h" #include "write_common.h" -#include "error.h" +#include "signal.h" /** define the array of error lists needed by para_audiod */ INIT_AUDIOD_ERRLISTS; @@ -65,12 +55,28 @@ struct audio_format_info { struct timeval restart_barrier; }; +/** + * para_audiod uses \p MAX_STREAM_SLOTS different slots, each of which may + * be associated with a receiver/filter/writer triple. This array holds all + * information on the status of these slots. + * + * \sa struct slot_info + * */ struct slot_info slot[MAX_STREAM_SLOTS]; +/** + * the current mode of operation of which can be changed by the on/off/cycle + * commands. It is either, AUDIOD_OFF, AUDIOD_ON or AUDIOD_STANDBY. + */ int audiod_status = AUDIOD_ON; +/** + * the gengetopt args_info struct that holds information on all command line + * arguments + */ struct audiod_args_info conf; + static char *socket_name; static FILE *logfile; static struct audio_format_info afi[NUM_AUDIO_FORMATS]; @@ -78,6 +84,12 @@ static struct audio_format_info afi[NUM_AUDIO_FORMATS]; static struct signal_task signal_task_struct, *sig_task = &signal_task_struct; static struct status_task status_task_struct; + +/** + * the task that calls the status command of para_server + * + * \sa struct status_task + */ struct status_task *stat_task = &status_task_struct; static struct timeval initial_delay_barrier; @@ -93,18 +105,6 @@ struct command_task { struct task task; }; -/** - * task for signal handling - */ -struct signal_task { - /** the signal pipe */ - int fd; - /** the number of the most recent signal */ - int signum; - /** the associated task structure */ - struct task task; -}; - /** iterate over all supported audio formats */ #define FOR_EACH_AUDIO_FORMAT(af) for (af = 0; af < NUM_AUDIO_FORMATS; af++) @@ -124,8 +124,11 @@ int get_audio_format_num(char *name) return -E_UNSUPPORTED_AUDIO_FORMAT; } -/* - * log function. first argument is loglevel. +/** + * the log function of para_audiod + * + * \param ll loglevel + * \param fmt the format string */ void para_log(int ll, const char* fmt,...) { @@ -154,14 +157,14 @@ void para_log(int ll, const char* fmt,...) static char *configfile_exists(void) { - static char *config_file; - - if (!config_file) { - char *home = para_homedir(); - config_file = make_message("%s/.paraslash/audiod.conf", home); - free(home); - } - return file_exists(config_file)? config_file : NULL; + char *home = para_homedir(); + char *config_file = make_message("%s/.paraslash/audiod.conf", + home); + free(home); + if (file_exists(config_file)) + return config_file; + free(config_file); + return NULL; } static void setup_signal_handling(void) @@ -242,43 +245,6 @@ static int get_empty_slot(void) return -E_NO_MORE_SLOTS; } -static void close_stat_pipe(void) -{ - int i; - - if (!stat_task->pcd) - return; - client_close(stat_task->pcd); - stat_task->pcd = NULL; - for (i = 0; i < NUM_STAT_ITEMS; i++) { - free(stat_task->stat_item_values[i]); - stat_task->stat_item_values[i] = NULL; - } - dump_empty_status(); - stat_task->length_seconds = 0; - stat_task->offset_seconds = 0; - audiod_status_dump(); - stat_task->playing = 0; - stat_task->stat_item_values[SI_STATUS_BAR] = make_message( - "%s:no connection to para_server\n", - status_item_list[SI_STATUS_BAR]); - stat_client_write(stat_task->stat_item_values[SI_STATUS_BAR], - SI_STATUS_BAR); - if (stat_task->clock_diff_count) { - stat_task->clock_diff_barrier.tv_sec = now->tv_sec + 1; - stat_task->clock_diff_barrier.tv_usec = now->tv_usec; - } -} - -void __noreturn clean_exit(int status, const char *msg) -{ - PARA_EMERG_LOG("%s\n", msg); - if (socket_name) - unlink(socket_name); - close_stat_pipe(); - exit(status); -} - /** * get the number of filters * @@ -478,14 +444,16 @@ static int open_current_receiver(struct sched *s) return open_receiver(i) < 0? 0 : 1; } -static void compute_time_diff(const struct timeval *status_time) +static unsigned compute_time_diff(const struct timeval *status_time) { struct timeval tmp, diff; - static int count; + static unsigned count; int sign, sa_time_diff_sign = stat_task->sa_time_diff_sign; const struct timeval max_deviation = {0, 500 * 1000}; const int time_smooth = 5; + if (!status_time) + return count; sign = tv_diff(status_time, now, &diff); // PARA_NOTICE_LOG("%s: sign = %i, sa_time_diff_sign = %i\n", __func__, // sign, sa_time_diff_sign); @@ -493,7 +461,7 @@ static void compute_time_diff(const struct timeval *status_time) sa_time_diff_sign = sign; stat_task->sa_time_diff = diff; count++; - return; + goto out; } if (count > 5) { int s = tv_diff(&diff, &stat_task->sa_time_diff, &tmp); @@ -513,9 +481,12 @@ static void compute_time_diff(const struct timeval *status_time) sa_time_diff_sign ? "+" : "-", tv2ms(&stat_task->sa_time_diff) ); +out: + stat_task->sa_time_diff_sign = sa_time_diff_sign; + return count; } -static void check_stat_line(char *line) +static int check_stat_line(char *line, __a_unused void *data) { int itemnum; size_t ilen = 0; @@ -524,14 +495,14 @@ static void check_stat_line(char *line) // PARA_INFO_LOG("line: %s\n", line); if (!line) - return; + return 1; itemnum = stat_line_valid(line); if (itemnum < 0) { PARA_WARNING_LOG("invalid status line: %s\n", line); - return; + return 1; } if (stat_task->clock_diff_count && itemnum != SI_CURRENT_TIME) - return; + return 1; tmp = make_message("%s\n", line); stat_client_write(tmp, itemnum); free(tmp); @@ -555,13 +526,15 @@ static void check_stat_line(char *line) delay.tv_usec = (conf.stream_delay_arg % 1000) * 1000; stat_task->server_stream_start.tv_sec = sec; stat_task->server_stream_start.tv_usec = usec; - if (stat_task->sa_time_diff_sign < 0) - tv_add(&stat_task->server_stream_start, - &stat_task->sa_time_diff, &a_start); - else - tv_diff(&stat_task->server_stream_start, - &stat_task->sa_time_diff, &a_start); - tv_add(&a_start, &delay, &initial_delay_barrier); + if (compute_time_diff(NULL) > 2) { + if (stat_task->sa_time_diff_sign < 0) + tv_add(&stat_task->server_stream_start, + &stat_task->sa_time_diff, &a_start); + else + tv_diff(&stat_task->server_stream_start, + &stat_task->sa_time_diff, &a_start); + tv_add(&a_start, &delay, &initial_delay_barrier); + } } break; case SI_CURRENT_TIME: @@ -573,18 +546,7 @@ static void check_stat_line(char *line) stat_task->clock_diff_count--; break; } -} - -static void handle_signal(int sig) -{ - switch (sig) { - case SIGINT: - case SIGTERM: - case SIGHUP: - PARA_EMERG_LOG("terminating on signal %d\n", sig); - clean_exit(EXIT_FAILURE, "caught deadly signal"); - return; - } + return 1; } static void try_to_close_slot(int slot_num) @@ -609,7 +571,7 @@ static void try_to_close_slot(int slot_num) /* * Check if any receivers/filters/writers need to be started and do so if - * neccessary. Since the pre_select function didn't have a chance yet to put + * necessary. Since the pre_select function didn't have a chance yet to put * file descriptors into the fd sets given by s, make the upcoming select() * return immediately to avoid a long timeout in case we started something. */ @@ -652,7 +614,7 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t) s->timeout = min_delay; continue; } - PARA_INFO_LOG("inital delay: %lu ms left\n", tv2ms(&diff)); + PARA_INFO_LOG("initial delay: %lu ms left\n", tv2ms(&diff)); if (tv_diff(&s->timeout, &diff, NULL) > 0) { s->timeout = diff; } @@ -894,14 +856,14 @@ static int audiod_get_socket(void) PARA_NOTICE_LOG("local socket: %s\n", socket_name); if (conf.force_given) unlink(socket_name); - fd = create_pf_socket(socket_name, &unix_addr, + fd = create_local_socket(socket_name, &unix_addr, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH); if (fd < 0) { - PARA_EMERG_LOG("%s", "can not connect to socket\n"); + PARA_EMERG_LOG("can not connect to socket\n"); exit(EXIT_FAILURE); /* do not unlink socket */ } if (listen(fd , 5) < 0) { - PARA_EMERG_LOG("%s", "can not listen on socket\n"); + PARA_EMERG_LOG("can not listen on socket\n"); exit(EXIT_FAILURE); /* do not unlink socket */ } mark_fd_nonblock(fd); @@ -912,10 +874,13 @@ static void signal_event_handler(struct task *t) { struct signal_task *st = t->private_data; - if (t->ret != -E_SIGNAL_CAUGHT) - PARA_ERROR_LOG("%s (ignored)\n", PARA_STRERROR(-t->ret)); - else - handle_signal(st->signum); + switch (st->signum) { + case SIGINT: + case SIGTERM: + case SIGHUP: + PARA_EMERG_LOG("terminating on signal %d\n", st->signum); + clean_exit(EXIT_FAILURE, "caught deadly signal"); + } } static void signal_pre_select(struct sched *s, struct task *t) @@ -975,36 +940,83 @@ static void init_command_task(struct command_task *ct) sprintf(ct->task.status, "command task"); } -static void client_task_event_handler(__a_unused struct task *t) +static void close_stat_pipe(void) { - struct private_client_data *pcd = t->private_data; - if (t->ret == -E_HANDSHAKE_COMPLETE) + int i; + + if (!stat_task->pcd) return; - unregister_task(t); - pcd->eof = 1; + client_close(stat_task->pcd); + stat_task->pcd = NULL; + for (i = 0; i < NUM_STAT_ITEMS; i++) { + free(stat_task->stat_item_values[i]); + stat_task->stat_item_values[i] = NULL; + } + dump_empty_status(); + stat_task->length_seconds = 0; + stat_task->offset_seconds = 0; + audiod_status_dump(); + stat_task->playing = 0; + stat_task->stat_item_values[SI_STATUS_BAR] = make_message( + "%s:no connection to para_server\n", + status_item_list[SI_STATUS_BAR]); + stat_client_write(stat_task->stat_item_values[SI_STATUS_BAR], + SI_STATUS_BAR); + if (stat_task->clock_diff_count) { + stat_task->clock_diff_barrier.tv_sec = now->tv_sec + 1; + stat_task->clock_diff_barrier.tv_usec = now->tv_usec; + } } -static void status_event_handler(__a_unused struct task *t) +/** + * close the connection to para_server and exit + * + * \param status the exit status which is passed to exit(3) + * \param msg the log message + * + * Log \a msg with loglevel \p EMERG, close the connection to para_server if + * open, and call \p exit(status). \a status should be either EXIT_SUCCESS or + * EXIT_FAILURE. + * + * \sa exit(3) + */ +void __noreturn clean_exit(int status, const char *msg) +{ + PARA_EMERG_LOG("%s\n", msg); + if (socket_name) + unlink(socket_name); + close_stat_pipe(); + exit(status); +} + +/* avoid busy loop if server is down */ +static void set_stat_task_restart_barrier(void) +{ + struct timeval delay = {5, 0}; + tv_add(now, &delay, &stat_task->restart_barrier); +} + +static void client_task_event_handler(__a_unused struct task *t) { - struct timeval delay = {1, 0}; int i; - struct status_task *st = t->private_data; - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret)); + if (t->ret == -E_HANDSHAKE_COMPLETE) + return; + unregister_task(t); close_stat_pipe(); - /* avoid busy loop if server is down */ - tv_add(now, &delay, &st->restart_barrier); + if (t->ret != -E_SERVER_EOF) + stat_task->clock_diff_count = conf.clock_diff_count_arg; + set_stat_task_restart_barrier(); FOR_EACH_AUDIO_FORMAT(i) - afi[i].restart_barrier = st->restart_barrier; + afi[i].restart_barrier = stat_task->restart_barrier; } static void status_pre_select(struct sched *s, struct task *t) { struct status_task *st = t->private_data; + int ret; - t->ret = 1; - if (st->pcd && (audiod_status == AUDIOD_OFF || st->pcd->eof)) - close_stat_pipe(); + t->ret = 1; /* always successful */ if (st->pcd || audiod_status == AUDIOD_OFF) return; if (!st->clock_diff_count && tv_diff(now, &st->restart_barrier, NULL) @@ -1016,18 +1028,15 @@ static void status_pre_select(struct sched *s, struct task *t) if (tv_diff(now, &st->clock_diff_barrier, NULL) < 0) return; PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count); - t->ret = client_parse_config(argc, argv, &st->pcd); + ret = client_open(argc, argv, &st->pcd); } else { char *argv[] = {"audiod", "stat", NULL}; int argc = 2; - t->ret = client_parse_config(argc, argv, &st->pcd); + ret = client_open(argc, argv, &st->pcd); } - - if (t->ret < 0) - return; - t->ret = client_open(st->pcd); - if (t->ret < 0) + set_stat_task_restart_barrier(); + if (ret < 0) return; st->pcd->task.event_handler = client_task_event_handler; s->timeout.tv_sec = 0; @@ -1042,8 +1051,14 @@ static void status_post_select(__a_unused struct sched *s, struct task *t) t->ret = 1; if (!st->pcd || st->pcd->status != CL_RECEIVING) return; + if (st->pcd && audiod_status == AUDIOD_OFF) { + unregister_task(&st->pcd->task); + close_stat_pipe(); + st->clock_diff_count = conf.clock_diff_count_arg; + return; + } bytes_left = for_each_line(st->pcd->buf, st->pcd->loaded, - &check_stat_line); + &check_stat_line, NULL); if (st->pcd->loaded != bytes_left) { st->last_status_read = *now; st->pcd->loaded = bytes_left; @@ -1060,7 +1075,6 @@ static void init_status_task(struct status_task *st) memset(st, 0, sizeof(struct status_task)); st->task.pre_select = status_pre_select; st->task.post_select = status_post_select; - st->task.event_handler = status_event_handler; st->task.private_data = st; st->sa_time_diff_sign = 1; st->clock_diff_count = conf.clock_diff_count_arg; @@ -1084,9 +1098,19 @@ static void set_initial_status(void) PARA_WARNING_LOG("%s", "invalid mode\n"); } +/** + * the main function of para_audiod + * + * \param argc usual argument count + * \param argv usual argument vector + * + * \return EXIT_SUCCESS or EXIT_FAILURE + * + * \sa para_audiod(1) + * */ int main(int argc, char *argv[]) { - char *cf; + char *config_file; int ret, i; struct sched s; struct command_task command_task_struct, *cmd_task = &command_task_struct; @@ -1094,13 +1118,22 @@ int main(int argc, char *argv[]) valid_fd_012(); audiod_cmdline_parser(argc, argv, &conf); + HANDLE_VERSION_FLAG("audiod", conf); para_drop_privileges(conf.user_arg, conf.group_arg); - cf = configfile_exists(); - if (cf) { - if (audiod_cmdline_parser_configfile(cf, &conf, 0, 0, 0)) { + config_file = configfile_exists(); + if (config_file) { + struct audiod_cmdline_parser_params params = { + .override = 0, + .initialize = 0, + .check_required = 0, + .check_ambiguity = 0 + + }; + if (audiod_cmdline_parser_config_file(config_file, &conf, ¶ms)) { PARA_EMERG_LOG("%s", "parse error in config file\n"); exit(EXIT_FAILURE); } + free(config_file); } if (conf.logfile_given) logfile = open_log(conf.logfile_arg);