* */
struct slot_info slot[MAX_STREAM_SLOTS];
+/** The vss status flags audiod is interested in. */
+enum vss_status_flags {
+ /** Whether the 'N' flag is set. */
+ VSS_STATUS_FLAG_NEXT = 1,
+ /** The 'P' flag is set. */
+ VSS_STATUS_FLAG_PLAYING = 2,
+};
+
+/**
+ * The task for obtaining para_server's status (para_client stat).
+ *
+ * \sa struct task, struct sched.
+ */
+struct status_task {
+ /** The associated task structure of audiod. */
+ struct task task;
+ /** Client data associated with the stat task. */
+ struct client_task *ct;
+ /** Do not restart client command until this time. */
+ struct timeval restart_barrier;
+ /** Last time we received status data from para_server. */
+ struct timeval last_status_read;
+ /** The offset value announced by para_server. */
+ int offset_seconds;
+ /** The length of the current audio file as announced by para_server. */
+ int length_seconds;
+ /** The start of the current stream from the view of para_server. */
+ struct timeval server_stream_start;
+ /** The average time deviation between para_server and para_audiod. */
+ struct timeval sa_time_diff;
+ /** Whether client time is ahead of server time. */
+ int sa_time_diff_sign;
+ /** The 'P' and the 'N' flags as announced by para_server. */
+ enum vss_status_flags vss_status;
+ /** Number of times the clock difference is to be checked. */
+ unsigned clock_diff_count;
+ /** When to start the next check for clock difference. */
+ struct timeval clock_diff_barrier;
+ /** Number of the audio format as announced by para_server. */
+ int current_audio_format_num;
+};
/** The array of status items sent by para_server. */
char *stat_item_values[NUM_STAT_ITEMS] = {NULL};
int total = 0, use_server_time = 1,
length_seconds = stat_task->length_seconds;
- if (!stat_task->playing) {
+ if (!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING)) {
if (length_seconds)
return NULL;
return make_message("%s:\n", status_item_list[SI_PLAY_TIME]);
static void parse_config_or_die(void)
{
+ int ret;
char *config_file;
struct audiod_cmdline_parser_params params = {
.override = 0,
config_file = make_message("%s/.paraslash/audiod.conf", home);
free(home);
}
- if (conf.config_file_given && !file_exists(config_file)) {
+ ret = file_exists(config_file);
+ if (conf.config_file_given && !ret) {
PARA_EMERG_LOG("can not read config file %s\n", config_file);
goto err;
}
- if (audiod_cmdline_parser_config_file(config_file, &conf, ¶ms)) {
- PARA_EMERG_LOG("parse error in config file\n");
- goto err;
- }
+ if (ret)
+ audiod_cmdline_parser_config_file(config_file, &conf, ¶ms);
free(config_file);
daemon_set_loglevel(conf.loglevel_arg);
return;
return ret;
}
+/* return: 0: Not running, 1: Running, -1: Running but eof (or error) */
static int receiver_running(int format)
{
- int i;
+ int i, ret = 0;
FOR_EACH_SLOT(i) {
struct slot_info *s = &slot[i];
- if (s->format == format && s->receiver_node)
+ if (s->format != format)
+ continue;
+ if (!s->receiver_node)
+ continue;
+ if (s->receiver_node->task.error >= 0)
return 1;
+ ret = -1;
}
- return 0;
+ return ret;
}
-static int open_current_receiver(struct sched *s)
+static void open_current_receiver(struct sched *s)
{
struct timeval diff;
- int cafn = stat_task->current_audio_format_num;
+ int ret, cafn = stat_task->current_audio_format_num;
if (cafn < 0 || !stat_task->ct)
- return 0;
- if (receiver_running(cafn))
- return 0;
+ return;
+ /* Do nothing if the 'N' flag is set or the 'P' flag is unset */
+ if (stat_task->vss_status != VSS_STATUS_FLAG_PLAYING)
+ return;
+ ret = receiver_running(cafn);
+ if (ret > 0) /* already running and not eof */
+ return;
+ if (ret < 0) { /* eof */
+ /*
+ * para_server uses a zero start time during the announcement
+ * period, i.e. before it sends the first chunk. Wait until
+ * this period begins to avoid restarting the receiver that
+ * belongs to the file just completed.
+ */
+ if (stat_task->server_stream_start.tv_sec)
+ return;
+ }
if (tv_diff(now, &afi[cafn].restart_barrier, &diff) < 0) {
+ /* avoid busy loop */
s->timeout = diff;
- return 0;
+ return;
}
- return open_receiver(cafn) < 0? 0 : 1;
+ /* start a new receiver */
+ open_receiver(cafn);
}
static unsigned compute_time_diff(const struct timeval *status_time)
stat_item_values[itemnum] = para_strdup(line);
ilen = strlen(status_item_list[itemnum]);
switch (itemnum) {
- case SI_STATUS:
- stat_task->playing = strstr(line, "playing")? 1 : 0;
- PARA_INFO_LOG("stat task playing: %d\n", stat_task->playing);
+ case SI_STATUS_FLAGS:
+ stat_task->vss_status = 0;
+ if (strchr(line, 'N'))
+ stat_task->vss_status |= VSS_STATUS_FLAG_NEXT;
+ if (strchr(line, 'P'))
+ stat_task->vss_status |= VSS_STATUS_FLAG_PLAYING;
break;
case SI_OFFSET:
stat_task->offset_seconds = atoi(line + ilen + 1);
return filter_num;
}
-static int init_writers(void)
+static int parse_writer_args(void)
{
int i, ret, nw;
char *cmd;
struct audio_format_info *a;
- init_supported_writers();
nw = PARA_MAX(1U, conf.writer_given);
PARA_INFO_LOG("maximal number of writers: %d\n", nw);
FOR_EACH_AUDIO_FORMAT(i) {
return ret;
}
-static int init_receivers(void)
+static int parse_receiver_args(void)
{
int i, ret, receiver_num;
char *cmd = NULL;
struct audio_format_info *a;
- for (i = 0; receivers[i].name; i++) {
- PARA_INFO_LOG("initializing %s receiver\n", receivers[i].name);
- receivers[i].init(&receivers[i]);
- }
for (i = conf.receiver_given - 1; i >= 0; i--) {
char *arg = conf.receiver_arg[i];
char *recv_arg = strchr(arg, ':');
return ret;
}
-static int init_filters(void)
+static int parse_filter_args(void)
{
int i, ret, nf;
- filter_init(filters);
nf = PARA_MAX(1U, conf.filter_given);
PARA_INFO_LOG("maximal number of filters: %d\n", nf);
FOR_EACH_AUDIO_FORMAT(i) {
return ret;
}
-static int init_stream_io(void)
+static int parse_stream_args(void)
{
int ret;
- ret = init_writers();
+ ret = parse_receiver_args();
if (ret < 0)
return ret;
- ret = init_receivers();
+ ret = parse_filter_args();
if (ret < 0)
return ret;
- ret = init_filters();
+ ret = parse_writer_args();
if (ret < 0)
return ret;
return 1;
dump_empty_status();
stat_task->length_seconds = 0;
stat_task->offset_seconds = 0;
+ stat_task->vss_status = 0;
audiod_status_dump();
- stat_task->playing = 0;
}
/**
FOR_EACH_SLOT(i)
try_to_close_slot(i);
- if (audiod_status != AUDIOD_ON || !stat_task->playing)
+ if (audiod_status != AUDIOD_ON ||
+ !(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
return kill_all_decoders(-E_NOT_PLAYING);
open_current_receiver(s);
FOR_EACH_SLOT(i) {
int argc = 3;
PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count);
st->clock_diff_count--;
- client_open(argc, argv, &st->ct);
+ client_open(argc, argv, &st->ct, NULL);
set_stat_task_restart_barrier(2);
} else {
char *argv[] = {"audiod", "stat", NULL};
int argc = 2;
- client_open(argc, argv, &st->ct);
+ client_open(argc, argv, &st->ct, NULL);
set_stat_task_restart_barrier(5);
}
free(stat_item_values[SI_BASENAME]);
};
valid_fd_012();
- audiod_cmdline_parser_ext(argc, argv, &conf, ¶ms);
+ if (audiod_cmdline_parser_ext(argc, argv, &conf, ¶ms))
+ exit(EXIT_FAILURE);
HANDLE_VERSION_FLAG("audiod", conf);
- drop_privileges_or_die(conf.user_arg, conf.group_arg);
- parse_config_or_die();
+ /* init receivers/filters/writers early to make help work */
+ recv_init();
+ filter_init();
+ writer_init();
if (conf.help_given || conf.detailed_help_given)
print_help_and_die();
+ drop_privileges_or_die(conf.user_arg, conf.group_arg);
+ parse_config_or_die();
+ init_colors_or_die();
daemon_set_flag(DF_LOG_TIME);
daemon_set_flag(DF_LOG_HOSTNAME);
daemon_set_flag(DF_LOG_LL);
daemon_set_logfile(conf.logfile_arg);
daemon_open_log_or_die();
}
- init_colors_or_die();
- i = init_stream_io();
- if (i < 0) {
- PARA_EMERG_LOG("init stream io error: %s\n", para_strerror(-i));
+ ret = parse_stream_args();
+ if (ret < 0) {
+ PARA_EMERG_LOG("%s\n", para_strerror(-ret));
exit(EXIT_FAILURE);
}
log_welcome("para_audiod");
projects / paraslash.git / blobdiff