X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=6fd8eef15a5b3c5f0c07c16795155daa63691ddc;hp=a1f1d62169d7a24a3be814a284df87c56032f3a9;hb=6d5a56308a3a833b08ae0e3692b794fb6122ea60;hpb=cd4b294da6f6802d9918c8fe5bcecb8a2a2363c3 diff --git a/audiod.c b/audiod.c index a1f1d621..6fd8eef1 100644 --- a/audiod.c +++ b/audiod.c @@ -1,13 +1,15 @@ /* - * Copyright (C) 2005-2007 Andre Noll + * Copyright (C) 2005-2008 Andre Noll * * 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" @@ -24,7 +26,6 @@ #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 */ @@ -32,7 +33,7 @@ INIT_AUDIOD_ERRLISTS; /** define the array containing all supported audio formats */ const char *audio_formats[] = {AUDIOD_AUDIO_FORMAT_ARRAY NULL}; -/** defines how to handle one supported audio format */ +/** Defines how audiod handles one supported audio format. */ struct audio_format_info { /** pointer to the receiver for this audio format */ struct receiver *receiver; @@ -104,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++) @@ -129,6 +118,9 @@ struct signal_task { int get_audio_format_num(char *name) { int i; + + while (para_isspace(*name)) + name++; FOR_EACH_AUDIO_FORMAT(i) if (!strcmp(name, audio_formats[i])) return i; @@ -152,6 +144,8 @@ void para_log(int ll, const char* fmt,...) if (ll < conf.loglevel_arg) return; + if (!logfile && conf.daemon_given) + return; if (!hostname) hostname = para_hostname(); outfd = logfile? logfile : stderr; @@ -168,14 +162,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) @@ -205,34 +199,34 @@ static void close_receiver(int slot_num) if (s->format < 0 || !s->receiver_node) return; a = &afi[s->format]; - PARA_NOTICE_LOG("closing %s receiver in slot %d (eof = %d)\n", - audio_formats[s->format] , slot_num, s->receiver_node->eof); + PARA_NOTICE_LOG("closing %s receiver in slot %d\n", + audio_formats[s->format], slot_num); a->receiver->close(s->receiver_node); free(s->receiver_node); s->receiver_node = NULL; } -static void kill_all_decoders(void) +static void kill_all_decoders(int error) { int i; FOR_EACH_SLOT(i) { struct slot_info *s = &slot[i]; - if (s->wng && !s->wng->eof) { + if (s->wng && !s->wng->error) { PARA_INFO_LOG("unregistering writer node group in slot %d\n", i); wng_unregister(s->wng); - s->wng->eof = 1; + s->wng->error = error; } - if (s->fc && !s->fc->eof) { + if (s->fc && !s->fc->error) { PARA_INFO_LOG("unregistering filter chain in slot %d\n", i); unregister_task(&s->fc->task); - s->fc->eof = 1; + s->fc->error = error; } - if (s->receiver_node && !s->receiver_node->eof) { + if (s->receiver_node && !s->receiver_node->error) { PARA_INFO_LOG("unregistering receiver_node in slot %d\n", i); unregister_task(&s->receiver_node->task); - s->receiver_node->eof = 1; + s->receiver_node->error = error; } } } @@ -272,9 +266,9 @@ int num_filters(int audio_format_num) static void filter_event_handler(struct task *t) { - PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret)); + PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret)); struct filter_chain *fc = t->private_data; - fc->eof = 1; + fc->error = t->ret; unregister_task(t); } @@ -293,13 +287,13 @@ static void open_filters(int slot_num) INIT_LIST_HEAD(&s->fc->filters); s->fc->inbuf = s->receiver_node->buf; s->fc->in_loaded = &s->receiver_node->loaded; - s->fc->input_eof = &s->receiver_node->eof; + s->fc->input_error = &s->receiver_node->error; s->fc->task.pre_select = filter_pre_select; s->fc->task.event_handler = filter_event_handler; s->fc->task.private_data = s->fc; - s->fc->eof = 0; + s->fc->error = 0; - s->receiver_node->output_eof = &s->fc->eof; + s->receiver_node->output_error = &s->fc->error; sprintf(s->fc->task.status, "filter chain"); for (i = 0; i < nf; i++) { struct filter_node *fn = para_calloc(sizeof(struct filter_node)); @@ -322,8 +316,8 @@ static void wng_event_handler(struct task *t) { struct writer_node_group *wng = t->private_data; - PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret)); - wng->eof = 1; + PARA_INFO_LOG("%s\n", para_strerror(-t->ret)); + wng->error = t->ret; wng_unregister(wng); } @@ -341,15 +335,15 @@ static void open_writers(int slot_num) if (s->fc) { s->wng->buf = s->fc->outbuf; s->wng->loaded = s->fc->out_loaded; - s->wng->input_eof = &s->fc->eof; + s->wng->input_error = &s->fc->error; s->wng->channels = &s->fc->channels; s->wng->samplerate = &s->fc->samplerate; - s->fc->output_eof = &s->wng->eof; + s->fc->output_error = &s->wng->error; PARA_INFO_LOG("samplerate: %d\n", *s->wng->samplerate); } else { s->wng->buf = s->receiver_node->buf; s->wng->loaded = &s->receiver_node->loaded; - s->wng->input_eof = &s->receiver_node->eof; + s->wng->input_error = &s->receiver_node->error; } s->wng->task.event_handler = wng_event_handler; for (i = 0; i < a->num_writers; i++) { @@ -358,7 +352,7 @@ static void open_writers(int slot_num) } ret = wng_open(s->wng); if (ret < 0) { - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); return; } s->wstime = *now; @@ -368,16 +362,19 @@ static void open_writers(int slot_num) static void rn_event_handler(struct task *t) { struct receiver_node *rn = t->private_data; - const struct timeval restart_delay = {0, 10 * 1000}; int i; - PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret)); + PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret)); unregister_task(t); - rn->eof = 1; + rn->error = t->ret; /* set restart barrier */ FOR_EACH_SLOT(i) { + struct timeval restart_delay = {0, 10 * 1000}; if (slot[i].receiver_node != rn) continue; + if (rn->error != -E_RECV_EOF) + /* don't reconnect immediately on errors */ + restart_delay.tv_sec = 5; tv_add(now, &restart_delay, &afi[slot[i].format].restart_barrier); } } @@ -416,7 +413,7 @@ static int open_receiver(int format) register_task(&rn->task); return 1; err: - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); tv_add(now, &restart_delay, &afi[format].restart_barrier); return ret; } @@ -428,7 +425,7 @@ static int receiver_running(int format) FOR_EACH_SLOT(i) { struct slot_info *s = &slot[i]; if (s->format == format && s->receiver_node - && !s->receiver_node->eof) + && !s->receiver_node->error) return 1; } return 0; @@ -436,23 +433,18 @@ static int receiver_running(int format) static int open_current_receiver(struct sched *s) { - int i; struct timeval diff; - char *audio_format = stat_task->stat_item_values[SI_FORMAT]; + int cafn = stat_task->current_audio_format_num; - if (!audio_format || !stat_task->pcd) - return 0; - i = get_audio_format_num(audio_format + strlen( - status_item_list[SI_FORMAT]) + 1); - if (i < 0) + if (cafn < 0 || !stat_task->pcd) return 0; - if (receiver_running(i)) + if (receiver_running(cafn)) return 0; - if (tv_diff(now, &afi[i].restart_barrier, &diff) < 0) { + if (tv_diff(now, &afi[cafn].restart_barrier, &diff) < 0) { s->timeout = diff; return 0; } - return open_receiver(i) < 0? 0 : 1; + return open_receiver(cafn) < 0? 0 : 1; } static unsigned compute_time_diff(const struct timeval *status_time) @@ -497,7 +489,7 @@ out: 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; @@ -506,14 +498,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); @@ -527,7 +519,7 @@ static void check_stat_line(char *line) case SI_OFFSET: stat_task->offset_seconds = atoi(line + ilen + 1); break; - case SI_LENGTH: + case SI_SECONDS_TOTAL: stat_task->length_seconds = atoi(line + ilen + 1); break; case SI_STREAM_START: @@ -556,7 +548,11 @@ static void check_stat_line(char *line) if (stat_task->clock_diff_count) stat_task->clock_diff_count--; break; + case SI_FORMAT: + stat_task->current_audio_format_num = get_audio_format_num( + line + ilen + 1); } + return 1; } static void try_to_close_slot(int slot_num) @@ -565,13 +561,13 @@ static void try_to_close_slot(int slot_num) if (s->format < 0) return; - if (s->receiver_node && !s->receiver_node->eof) + if (s->receiver_node && !s->receiver_node->error) return; - if (s->fc && !s->fc->eof) + if (s->fc && !s->fc->error) return; - if (s->wng && !s->wng->eof) + if (s->wng && !s->wng->error) return; - PARA_INFO_LOG("closing slot %d \n", slot_num); + PARA_INFO_LOG("closing slot %d\n", slot_num); wng_close(s->wng); close_filters(s->fc); free(s->fc); @@ -581,7 +577,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. */ @@ -592,7 +588,7 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t) t->ret = 1; if (audiod_status != AUDIOD_ON || !stat_task->playing) - return kill_all_decoders(); + return kill_all_decoders(-E_NOT_PLAYING); if (open_current_receiver(s)) s->timeout = min_delay; FOR_EACH_SLOT(i) { @@ -605,6 +601,8 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t) a = &afi[sl->format]; if (!sl->receiver_node) continue; + if ((!a->num_filters || sl->fc) && sl->wng) + continue; /* everything already started */ if (!a->num_filters) { if (sl->receiver_node->loaded && !sl->wng) { open_writers(i); @@ -617,7 +615,7 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t) s->timeout = min_delay; continue; } - if (!sl->fc || !*sl->fc->out_loaded || sl->wng) + if (sl->wng || !sl->fc || !*sl->fc->out_loaded) continue; if (tv_diff(now, &initial_delay_barrier, &diff) > 0) { open_writers(i); @@ -850,10 +848,11 @@ static int init_stream_io(void) return 1; } +/* does not unlink socket on errors */ static int audiod_get_socket(void) { struct sockaddr_un unix_addr; - int fd; + int ret, fd; if (conf.socket_given) socket_name = para_strdup(conf.socket_arg); @@ -866,18 +865,22 @@ static int audiod_get_socket(void) PARA_NOTICE_LOG("local socket: %s\n", socket_name); if (conf.force_given) unlink(socket_name); - 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"); - exit(EXIT_FAILURE); /* do not unlink socket */ - } + ret = create_local_socket(socket_name, &unix_addr, + S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH); + if (ret < 0) + goto err; + fd = ret; if (listen(fd , 5) < 0) { - PARA_EMERG_LOG("%s", "can not listen on socket\n"); - exit(EXIT_FAILURE); /* do not unlink socket */ + ret = -ERRNO_TO_PARA_ERROR(errno); + goto err; } - mark_fd_nonblock(fd); + ret = mark_fd_nonblocking(fd); + if (ret < 0) + goto err; return fd; +err: + PARA_EMERG_LOG("%s\n", para_strerror(-ret)); + exit(EXIT_FAILURE); } static void signal_event_handler(struct task *t) @@ -937,7 +940,7 @@ static void command_post_select(struct sched *s, struct task *t) return; ret = handle_connect(ct->fd); if (ret < 0) - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); } static void init_command_task(struct command_task *ct) @@ -958,7 +961,7 @@ static void close_stat_pipe(void) return; client_close(stat_task->pcd); stat_task->pcd = NULL; - for (i = 0; i < NUM_STAT_ITEMS; i++) { + FOR_EACH_STATUS_ITEM(i) { free(stat_task->stat_item_values[i]); stat_task->stat_item_values[i] = NULL; } @@ -967,11 +970,11 @@ static void close_stat_pipe(void) 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); + stat_task->stat_item_values[SI_BASENAME] = make_message( + "%s: no connection to para_server\n", + status_item_list[SI_BASENAME]); + stat_client_write(stat_task->stat_item_values[SI_BASENAME], + SI_BASENAME); 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; @@ -1068,7 +1071,7 @@ static void status_post_select(__a_unused struct sched *s, struct task *t) 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; @@ -1088,6 +1091,7 @@ static void init_status_task(struct status_task *st) st->task.private_data = st; st->sa_time_diff_sign = 1; st->clock_diff_count = conf.clock_diff_count_arg; + st->current_audio_format_num = -1; sprintf(st->task.status, "status task"); } @@ -1105,7 +1109,7 @@ static void set_initial_status(void) return; } if (strcmp(conf.mode_arg, "on")) - PARA_WARNING_LOG("%s", "invalid mode\n"); + PARA_WARNING_LOG("invalid mode\n"); } /** @@ -1120,7 +1124,7 @@ static void set_initial_status(void) * */ 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; @@ -1130,8 +1134,8 @@ int main(int argc, char *argv[]) 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) { + config_file = configfile_exists(); + if (config_file) { struct audiod_cmdline_parser_params params = { .override = 0, .initialize = 0, @@ -1139,17 +1143,18 @@ int main(int argc, char *argv[]) .check_ambiguity = 0 }; - if (audiod_cmdline_parser_config_file(cf, &conf, ¶ms)) { - PARA_EMERG_LOG("%s", "parse error in config file\n"); + if (audiod_cmdline_parser_config_file(config_file, &conf, ¶ms)) { + PARA_EMERG_LOG("parse error in config file\n"); exit(EXIT_FAILURE); } + free(config_file); } if (conf.logfile_given) logfile = open_log(conf.logfile_arg); log_welcome("para_audiod", conf.loglevel_arg); i = init_stream_io(); if (i < 0) { - PARA_EMERG_LOG("init stream io error: %s\n", PARA_STRERROR(-i)); + PARA_EMERG_LOG("init stream io error: %s\n", para_strerror(-i)); exit(EXIT_FAILURE); } server_uptime(UPTIME_SET); @@ -1174,8 +1179,8 @@ int main(int argc, char *argv[]) register_task(audiod_task); s.default_timeout.tv_sec = 0; s.default_timeout.tv_usec = 99 * 1000; - ret = sched(&s); + ret = schedule(&s); - PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_EMERG_LOG("%s\n", para_strerror(-ret)); return EXIT_FAILURE; }