/** define the array containing all supported audio formats */
DEFINE_AUDIO_FORMAT_ARRAY;
-/**
- * the possible modes of operation
- *
- * - off: disconnect from para_server
- * - on: receive status information from para_server and play the audio stream
- * - sb: only receive status information but not the audio stream
-*/
-enum {AUDIOD_OFF, AUDIOD_ON, AUDIOD_STANDBY};
-
/** defines how to handle one supported audio format */
struct audio_format_info {
/** pointer to the receiver for this audio format */
struct timeval restart_barrier;
};
-/**
- * describes one instance of a receiver-filter-writer chain
- *
- * \sa receier_node, receiver, filter, filter_node, filter_chain, writer,
- * writer_node, writer_node_group.
- */
-struct slot_info {
- /** number of the audio format in this slot */
- int format;
- /** time of the last successful read from the receiver */
- struct timeval rtime;
- /** time the last write to the write fd happend */
- struct timeval wtime;
- /** writer start time */
- struct timeval wstime;
- /** the receiver info associated with this slot */
- struct receiver_node *receiver_node;
- /** the active filter chain */
- struct filter_chain *fc;
- /** the active writer node group */
- struct writer_node_group *wng;
-};
-static struct slot_info slot[MAX_STREAM_SLOTS];
-
-extern const char *status_item_list[NUM_STAT_ITEMS];
-
-static struct gengetopt_args_info conf;
-static struct timeval server_stream_start, sa_time_diff;
-static int playing, current_decoder = -1,
- audiod_status = AUDIOD_ON, offset_seconds, length_seconds,
- sa_time_diff_sign = 1;
-static char *af_status, /* the audio format announced in server status */
- *socket_name, *hostname;
-static char *stat_item_values[NUM_STAT_ITEMS];
+struct slot_info slot[MAX_STREAM_SLOTS];
+
+
+int audiod_status = AUDIOD_ON;
+
+struct gengetopt_args_info conf;
+static char *socket_name;
static FILE *logfile;
-static const struct timeval restart_delay = {0, 300 * 1000};
static struct audio_format_info afi[NUM_AUDIO_FORMATS];
-static struct timeval *now;
static struct signal_task signal_task_struct, *sig_task = &signal_task_struct;
-struct command_task {
- int fd;
- struct task task;
-};
-static struct command_task command_task_struct, *cmd_task = &command_task_struct;
+static struct status_task status_task_struct;
+struct status_task *stat_task = &status_task_struct;
-struct status_task {
+/**
+ * the task for handling audiod commands
+ *
+ * \sa struct task, struct sched
+ */
+struct command_task {
+ /** the local listening socket */
int fd;
+ /** the associated task structure */
struct task task;
- char buf[STRINGSIZE];
- unsigned loaded;
};
-static struct status_task status_task_struct, *stat_task = &status_task_struct;
-
-struct audiod_task {
- struct task task;
-};
-static struct audiod_task audiod_task_struct, *at = &audiod_task_struct;
struct signal_task {
int fd;
struct task task;
};
-
-/** defines one command of para_audiod */
-struct audiod_command {
- /** the name of the command */
- const char *name;
- /** pointer to the function that handles the command */
- int (*handler)(int, int, char**);
- int (*line_handler)(int, char*);
- /** one-line description of the command */
- const char *description;
- /** summary of the command line options */
- const char *synopsis;
- /** the long help text */
- const char *help;
-};
-static int com_grab(int, char *);
-static int com_cycle(int, int, char **);
-static int com_help(int, int, char **);
-static int com_off(int, int, char **);
-static int com_on(int, int, char **);
-static int com_sb(int, int, char **);
-static int com_stat(int, int, char **);
-static int com_term(int, int, char **);
-static struct audiod_command cmds[] = {
-{
-.name = "cycle",
-.handler = com_cycle,
-.description = "switch to next mode",
-.synopsis = "cycle",
-.help =
-
-"on -> standby -> off -> on\n"
-
-},
-{
-.name = "grab",
-.line_handler = com_grab,
-.description = "grab the audio stream",
-.synopsis = "-- grab [grab_options]",
-.help =
-
-"grab ('splice') the audio stream at any position in the filter \n"
-"chain and send that data back to the client. Try\n"
-"\t para_audioc -- grab -h\n"
-"for the list of available options.\n"
-},
-
-{
-.name = "help",
-.handler = com_help,
-.description = "display command list or help for given command",
-.synopsis = "help [command]",
-.help =
-
-"When I was younger, so much younger than today, I never needed\n"
-"anybody's help in any way. But now these days are gone, I'm not so\n"
-"self assured. Now I find I've changed my mind and opened up the doors.\n"
-"\n"
-" -- Beatles: Help\n"
-
-},
-{
-.name = "off",
-.handler = com_off,
-.description = "deactivate para_audiod",
-.synopsis = "off",
-.help =
-
-"Close connection to para_server and stop all decoders.\n"
-
-},
-{
-.name = "on",
-.handler = com_on,
-.description = "activate para_audiod",
-.synopsis = "on",
-.help =
-
-"Establish connection to para_server, retrieve para_server's current\n"
-"status. If playing, start corresponding decoder. Otherwise stop\n"
-"all decoders.\n"
-
-},
-{
-.name = "sb",
-.handler = com_sb,
-.description = "enter standby mode",
-.synopsis = "sb",
-.help =
-
-"Stop all decoders but leave connection to para_server open.\n"
-
-},
-{
-.name = "stat",
-.handler = com_stat,
-.description = "print status information",
-.synopsis = "stat [item1 ...]",
-.help =
-
-"Dump given status items (all if none given) to stdout.\n"
-
-},
-{
-.name = "term",
-.handler = com_term,
-.description = "terminate audiod",
-.synopsis = "term",
-.help =
-
-"Stop all decoders, shut down connection to para_server and exit.\n"
-
-},
-{
-.name = NULL,
-}
-};
-
-/** iterate over all slots */
-#define FOR_EACH_SLOT(_slot) for (_slot = 0; _slot < MAX_STREAM_SLOTS; _slot++)
/** iterate over all supported audio formats */
#define FOR_EACH_AUDIO_FORMAT(af) for (af = 0; af < NUM_AUDIO_FORMATS; af++)
-/** iterate over the array of all audiod commands */
-#define FOR_EACH_COMMAND(c) for (c = 0; cmds[c].name; c++)
/**
* get the audio format number
struct tm *tm;
time_t t1;
char str[MAXLINE] = "";
+ static char *hostname;
if (ll < conf.loglevel_arg)
return;
+ if (!hostname)
+ hostname = para_hostname();
outfd = logfile? logfile : stderr;
time(&t1);
tm = localtime(&t1);
va_end(argp);
}
-static int client_write(int fd, const char *buf)
-{
- size_t len = strlen(buf);
- return write(fd, buf, len) != len? -E_CLIENT_WRITE: 1;
-}
-
-static char *get_time_string(struct timeval *newest_stime)
-{
- struct timeval diff, adj_stream_start, tmp;
- int total = 0, use_server_time = 1;
-
- if (!playing) {
- if (length_seconds)
- return NULL;
- return make_message("%s:\n", status_item_list[SI_PLAY_TIME]);
- }
- if (audiod_status == AUDIOD_OFF)
- goto out;
- if (sa_time_diff_sign > 0)
- tv_diff(&server_stream_start, &sa_time_diff,
- &adj_stream_start);
- else
- tv_add(&server_stream_start, &sa_time_diff,
- &adj_stream_start);
- tmp = adj_stream_start;
- if (newest_stime && audiod_status == AUDIOD_ON) {
- tv_diff(newest_stime, &adj_stream_start, &diff);
- if (tv2ms(&diff) < 5000) {
- tmp = *newest_stime;
- use_server_time = 0;
- }
- }
- tv_diff(now, &tmp, &diff);
- total = diff.tv_sec + offset_seconds;
- if (total > length_seconds)
- total = length_seconds;
- if (total < 0)
- total = 0;
-out:
- return make_message(
- "%s:%s%d:%02d [%d:%02d] (%d%%/%d:%02d)\n",
- status_item_list[SI_PLAY_TIME],
- use_server_time? "~" : "",
- total / 60,
- total % 60,
- (length_seconds - total) / 60,
- (length_seconds - total) % 60,
- length_seconds? (total * 100 + length_seconds / 2) /
- length_seconds : 0,
- length_seconds / 60,
- length_seconds % 60
- );
-}
-
-__malloc static char *audiod_status_string(void)
-{
- const char *status = (audiod_status == AUDIOD_ON)?
- "on" : (audiod_status == AUDIOD_OFF)? "off": "sb";
- return make_message("%s:%s\n", status_item_list[SI_AUDIOD_STATUS], status);
-}
-
-static struct timeval *wstime(void)
-{
- int i;
- struct timeval *max = NULL;
- FOR_EACH_SLOT(i) {
- struct slot_info *s = &slot[i];
- if (!s->wng)
- continue;
- if (max && tv_diff(&s->wstime, max, NULL) <= 0)
- continue;
- max = &s->wstime;
- }
- return max;
-}
-__malloc static char *decoder_flags(void)
-{
- int i;
- char decoder_flags[MAX_STREAM_SLOTS + 1];
-
- FOR_EACH_SLOT(i) {
- struct slot_info *s = &slot[i];
- char flag = '0';
- if (s->receiver_node)
- flag += 1;
- if (s->wng)
- flag += 2;
- decoder_flags[i] = flag;
- }
- decoder_flags[MAX_STREAM_SLOTS] = '\0';
- return make_message("%s:%s\n", status_item_list[SI_DECODER_FLAGS],
- decoder_flags);
-}
-
static char *configfile_exists(void)
{
static char *config_file;
para_install_sighandler(SIGTERM);
para_install_sighandler(SIGCHLD);
para_install_sighandler(SIGHUP);
- signal(SIGPIPE, SIG_IGN);
-}
-
-static void audiod_status_dump(void)
-{
- static char *p_ts, *p_us, *p_as, *p_df;
- struct timeval *t = wstime();
- char *us, *tmp = get_time_string(t);
-
- if (tmp && (!p_ts || strcmp(tmp, p_ts)))
- stat_client_write(tmp, SI_PLAY_TIME);
- free(p_ts);
- p_ts = tmp;
-
- us = uptime_str();
- tmp = make_message("%s:%s\n", status_item_list[SI_AUDIOD_UPTIME], us);
- free(us);
- if (!p_us || strcmp(p_us, tmp))
- stat_client_write(tmp, SI_AUDIOD_UPTIME);
- free(p_us);
- p_us = tmp;
-
- tmp = audiod_status_string();
- if (!p_as || strcmp(p_as, tmp))
- stat_client_write(tmp, SI_AUDIOD_STATUS);
- free(p_as);
- p_as = tmp;
-
- tmp = decoder_flags();
- if (!p_df || strcmp(p_df, tmp))
- stat_client_write(tmp, SI_DECODER_FLAGS);
- free(p_df);
- p_df = tmp;
+ para_install_sighandler(SIGPIPE);
+// signal(SIGPIPE, SIG_IGN);
}
static void clear_slot(int slot_num)
{
struct slot_info *s = &slot[slot_num];
struct audio_format_info *a;
+ const struct timeval restart_delay = {0, 200 * 1000};
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);
- if (!s->receiver_node->eof)
- unregister_task(&s->receiver_node->task);
+// if (!s->receiver_node->eof)
+// unregister_task(&s->receiver_node->task);
a->receiver->close(s->receiver_node);
free(s->receiver_node);
s->receiver_node = NULL;
FOR_EACH_SLOT(i) {
struct slot_info *s = &slot[i];
- if (s->receiver_node)
+ if (s->wng && !s->wng->eof) {
+ PARA_INFO_LOG("unregistering writer node group in slot %d\n",
+ i);
+ wng_unregister(s->wng);
+ s->wng->eof = 1;
+ }
+ if (s->fc && !s->fc->eof) {
+ PARA_INFO_LOG("unregistering filter chain in slot %d\n", i);
+ unregister_task(&s->fc->task);
+ s->fc->eof = 1;
+ }
+ if (s->receiver_node && !s->receiver_node->eof) {
+ PARA_INFO_LOG("unregistering receiver_node in slot %d\n", i);
+ unregister_task(&s->receiver_node->task);
s->receiver_node->eof = 1;
+ }
}
}
close(stat_task->fd);
del_close_on_fork_list(stat_task->fd);
stat_task->fd = -1;
- kill_all_decoders();
+// kill_all_decoders();
for (i = 0; i < NUM_STAT_ITEMS; i++) {
- free(stat_item_values[i]);
- stat_item_values[i] = NULL;
+ free(stat_task->stat_item_values[i]);
+ stat_task->stat_item_values[i] = NULL;
}
dump_empty_status();
- length_seconds = 0;
- offset_seconds = 0;
+ stat_task->length_seconds = 0;
+ stat_task->offset_seconds = 0;
audiod_status_dump();
- playing = 0;
- stat_item_values[SI_STATUS_BAR] = make_message(
+ 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_item_values[SI_STATUS_BAR], SI_STATUS_BAR);
+ stat_client_write(stat_task->stat_item_values[SI_STATUS_BAR], SI_STATUS_BAR);
}
-static void __noreturn clean_exit(int status, const char *msg)
+void __noreturn clean_exit(int status, const char *msg)
{
PARA_EMERG_LOG("%s\n", msg);
- kill_all_decoders();
if (socket_name)
unlink(socket_name);
- if (stat_task->fd >= 0)
- close_stat_pipe();
+ close_stat_pipe();
exit(status);
}
static void filter_event_handler(struct task *t)
{
PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+ struct filter_chain *fc = t->private_data;
+ fc->eof = 1;
unregister_task(t);
}
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->task.pre_select = filter_pre_select;
s->fc->task.event_handler = filter_event_handler;
s->fc->task.private_data = s->fc;
- s->fc->task.flags = 0;
s->fc->eof = 0;
+
+ s->receiver_node->output_eof = &s->fc->eof;
sprintf(s->fc->task.status, "filter chain");
for (i = 0; i < nf; i++) {
struct filter_node *fn = para_calloc(sizeof(struct filter_node));
s->fc->out_loaded = &fn->loaded;
}
register_task(&s->fc->task);
-// PARA_DEBUG_LOG("output loaded for filter chain %p: %p\n", s->fc,
-// s->fc->out_loaded);
-}
-
-static struct filter_node *find_filter_node(int slot_num, int format, int filternum)
-{
- struct filter_node *fn;
- int i, j;
-
- FOR_EACH_SLOT(i) {
- struct slot_info *s = &slot[i];
- if (s->format < 0 || !s->fc)
- continue;
- if (slot_num >= 0 && slot_num != i)
- continue;
- if (format >= 0 && s->format != format)
- continue;
- if (num_filters(i) < filternum)
- continue;
- /* success */
- j = 1;
- list_for_each_entry(fn, &s->fc->filters, node)
- if (filternum <= 0 || j++ == filternum)
- break;
- return fn;
- }
- return NULL;
}
static void wng_event_handler(struct task *t)
{
- struct writer_node_group *g = t->private_data;
- int i;
+ struct writer_node_group *wng = t->private_data;
PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
- unregister_task(t);
- FOR_EACH_SLOT(i) {
- if (slot[i].wng != g)
- continue;
- wng_close(g);
- wng_destroy(g);
- slot[i].wng = NULL;
- }
+ wng->eof = 1;
+ wng_unregister(wng);
}
-static void open_writer(int slot_num)
+static void open_writers(int slot_num)
{
int ret, i;
struct slot_info *s = &slot[slot_num];
s->wng->buf = s->fc->outbuf;
s->wng->loaded = s->fc->out_loaded;
s->wng->input_eof = &s->fc->eof;
+ s->wng->channels = &s->fc->channels;
+ s->wng->samplerate = &s->fc->samplerate;
s->fc->output_eof = &s->wng->eof;
+ PARA_INFO_LOG("samplerate: %d\n", *s->wng->samplerate);
} else {
s->wng->buf = s->receiver_node->buf;
s->wng->loaded = &s->receiver_node->loaded;
for (i = 0; i < a->num_writers; i++) {
s->wng->writer_nodes[i].conf = a->writer_conf[i];
s->wng->writer_nodes[i].writer = a->writers[i];
- sprintf(s->wng->writer_nodes[i].task.status, "writer_ node");
}
ret = wng_open(s->wng);
+ if (ret < 0) {
+ PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+ return;
+ }
s->wstime = *now;
- current_decoder = slot_num;
activate_inactive_grab_clients(slot_num, s->format, &s->fc->filters);
}
static void rn_event_handler(struct task *t)
{
-// struct receiver_node *rn = t->private_data;
+ struct receiver_node *rn = t->private_data;
+
PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
unregister_task(t);
+ rn->eof = 1;
}
static void open_receiver(int format)
clean_exit(EXIT_FAILURE, PARA_STRERROR(-slot_num));
s = &slot[slot_num];
s->format = format;
- s->rtime = *now;
- s->wtime = s->rtime;
s->receiver_node = para_calloc(sizeof(struct receiver_node));
rn = s->receiver_node;
rn->receiver = a->receiver;
PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
audio_formats[s->format], a->receiver->name, slot_num);
rn->task.private_data = s->receiver_node;
- PARA_NOTICE_LOG("rn = %p\n", rn->task.private_data);
rn->task.pre_select = a->receiver->pre_select;
rn->task.post_select = a->receiver->post_select;
rn->task.event_handler = rn_event_handler;
- rn->task.flags = 0;
- sprintf(rn->task.status, "receiver node");
+ sprintf(rn->task.status, "%s receiver node", rn->receiver->name);
register_task(&rn->task);
}
-static int is_frozen(int format)
-{
- struct audio_format_info *a = &afi[format];
-
- return (tv_diff(now, &a->restart_barrier, NULL) > 0)? 0 : 1;
-}
-
-static void open_current_receiver(void)
+static int open_current_receiver(struct sched *s)
{
int i;
+ struct timeval diff;
- if (!af_status)
- return;
- i = get_audio_format_num(af_status);
+ if (!stat_task->af_status)
+ return 0;
+ i = get_audio_format_num(stat_task->af_status);
if (i < 0)
- return;
- if (decoder_running(i) || is_frozen(i))
- return;
+ return 0;
+ if (decoder_running(i))
+ return 0;
+ if (tv_diff(now, &afi[i].restart_barrier, &diff) < 0) {
+ s->timeout = diff;
+ return 0;
+ }
open_receiver(i);
+ return 1;
}
static void compute_time_diff(const struct timeval *status_time)
{
struct timeval tmp, diff;
static int count;
- int sign;
+ 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;
// sign, sa_time_diff_sign);
if (!count) {
sa_time_diff_sign = sign;
- sa_time_diff = diff;
+ stat_task->sa_time_diff = diff;
count++;
return;
}
if (count > 5) {
- int s = tv_diff(&diff, &sa_time_diff, &tmp);
+ int s = tv_diff(&diff, &stat_task->sa_time_diff, &tmp);
if (tv_diff(&max_deviation, &tmp, NULL) < 0)
PARA_WARNING_LOG("time diff jump: %lims\n",
s * tv2ms(&tmp));
}
count++;
sa_time_diff_sign = tv_convex_combination(
- sa_time_diff_sign * time_smooth, &sa_time_diff,
+ sa_time_diff_sign * time_smooth, &stat_task->sa_time_diff,
count > 10? sign : sign * time_smooth, &diff,
&tmp);
- sa_time_diff = tmp;
- PARA_INFO_LOG("time diff (cur/avg): %s%lums/%s%lums\n",
+ stat_task->sa_time_diff = tmp;
+ PARA_DEBUG_LOG("time diff (cur/avg): %s%lums/%s%lums\n",
sign > 0? "+" : "-",
tv2ms(&diff),
sa_time_diff_sign ? "+" : "-",
- tv2ms(&sa_time_diff)
+ tv2ms(&stat_task->sa_time_diff)
);
}
tmp = make_message("%s\n", line);
stat_client_write(tmp, itemnum);
free(tmp);
- free(stat_item_values[itemnum]);
- stat_item_values[itemnum] = para_strdup(line);
+ free(stat_task->stat_item_values[itemnum]);
+ stat_task->stat_item_values[itemnum] = para_strdup(line);
ilen = strlen(status_item_list[itemnum]);
switch (itemnum) {
case SI_STATUS:
- playing = strstr(line, "playing")? 1 : 0;
+ stat_task->playing = strstr(line, "playing")? 1 : 0;
break;
case SI_FORMAT:
- free(af_status);
- af_status = para_strdup(line + ilen + 1);
+ free(stat_task->af_status);
+ stat_task->af_status = para_strdup(line + ilen + 1);
break;
case SI_OFFSET:
- offset_seconds = atoi(line + ilen + 1);
+ stat_task->offset_seconds = atoi(line + ilen + 1);
break;
case SI_LENGTH:
- length_seconds = atoi(line + ilen + 1);
+ stat_task->length_seconds = atoi(line + ilen + 1);
break;
case SI_STREAM_START:
if (sscanf(line + ilen + 1, "%lu.%lu", &sec, &usec) == 2) {
- server_stream_start.tv_sec = sec;
- server_stream_start.tv_usec = usec;
+ stat_task->server_stream_start.tv_sec = sec;
+ stat_task->server_stream_start.tv_usec = usec;
}
break;
case SI_CURRENT_TIME:
}
}
-static void check_timeouts(void)
-{
-
- int slot_num, timeout = conf.stream_timeout_arg;
-
- FOR_EACH_SLOT(slot_num) {
- struct slot_info *s = &slot[slot_num];
- if (s->format < 0)
- continue;
- /* check read time */
- if (s->receiver_node &&
- now->tv_sec > s->rtime.tv_sec + timeout) {
- PARA_INFO_LOG("%s stream (slot %d) not ready\n",
- audio_formats[s->format], slot_num);
- s->receiver_node->eof = 1;
- }
- }
-}
-
-static void close_decoder_if_idle(int slot_num)
+static void try_to_close_slot(int slot_num)
{
struct slot_info *s = &slot[slot_num];
if (s->format < 0)
return;
- if (!s->fc)
+ if (s->receiver_node && !s->receiver_node->eof)
+ return;
+ if (s->fc && !s->fc->eof)
return;
- if (s->wng)
+ if (s->wng && !s->wng->eof)
return;
- PARA_INFO_LOG("closing all filters in slot %d (filter_chain %p)\n",
- slot_num, s->fc);
+ PARA_INFO_LOG("closing slot %d \n", slot_num);
+ wng_close(s->wng);
close_filters(s->fc);
free(s->fc);
close_receiver(slot_num);
clear_slot(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
+ * 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.
+ */
static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
{
int i;
+ struct timeval min_delay = {0, 1};
- now = &s->now;
- if (audiod_status != AUDIOD_ON)
- kill_all_decoders();
- else if (playing)
- open_current_receiver();
- check_timeouts();
+ t->ret = 1;
+ if (audiod_status != AUDIOD_ON || !stat_task->playing)
+ return kill_all_decoders();
+ if (open_current_receiver(s))
+ s->timeout = min_delay;
FOR_EACH_SLOT(i) {
- struct receiver_node *rn;
+ struct slot_info *sl = &slot[i];
+ struct audio_format_info *a;
- close_decoder_if_idle(i);
- if (slot[i].format < 0)
+ if (sl->format < 0)
+ continue;
+ a = &afi[sl->format];
+ if (!sl->receiver_node)
+ continue;
+ if (!a->num_filters) {
+ if (sl->receiver_node->loaded && !sl->wng) {
+ open_writers(i);
+ s->timeout = min_delay;
+ }
continue;
- rn = slot[i].receiver_node;
- if (rn && rn->loaded && !slot[i].wng) {
+ }
+ if (sl->receiver_node->loaded && !sl->fc) {
open_filters(i);
- open_writer(i);
+ s->timeout = min_delay;
+ continue;
+ }
+ if (sl->fc && *sl->fc->out_loaded && !sl->wng) {
+ open_writers(i);
+ s->timeout = min_delay;
}
}
}
-static void audiod_post_select(struct sched *s, __a_unused struct task *t)
+static void audiod_post_select(__a_unused struct sched *s,
+ __a_unused struct task *t)
{
int i;
- now = &s->now;
- FOR_EACH_SLOT(i) {
- struct receiver_node *rn = slot[i].receiver_node;
-
- if (rn && rn->loaded)
- slot[i].rtime = *now;
- }
+ /* save away the current time for other users */
+ t->ret = 1;
+ FOR_EACH_SLOT(i)
+ try_to_close_slot(i);
}
-static void init_audiod_task(struct audiod_task *at)
+static void init_audiod_task(struct task *t)
{
- at->task.pre_select = audiod_pre_select;
- at->task.post_select = audiod_post_select;
- at->task.private_data = at;
- at->task.flags = 0;
- sprintf(at->task.status, "audiod task");
+ t->pre_select = audiod_pre_select;
+ t->post_select = audiod_post_select;
+ t->event_handler = NULL;
+ t->private_data = t;
+ sprintf(t->status, "audiod task");
}
static int parse_stream_command(const char *txt, char **cmd)
ret = writer_num;
goto out;
}
- a->writers[nw] = &writers[ret];
+ a->writers[nw] = &writers[writer_num];
a->writer_conf[nw] = wconf;
PARA_INFO_LOG("%s writer #%d: %s\n", audio_formats[ret],
nw, writer_names[writer_num]);
return 1;
}
-static int dump_commands(int fd)
-{
- char *buf = para_strdup(""), *tmp = NULL;
- int i;
- ssize_t ret;
-
- FOR_EACH_COMMAND(i) {
- tmp = make_message("%s%s\t%s\n", buf, cmds[i].name,
- cmds[i].description);
- free(buf);
- buf = tmp;
- }
- ret = client_write(fd, buf);
- free(buf);
- return ret;
-}
-
-/*
- * command handlers don't close their fd on errors (ret < 0) so that
- * its caller can send an error message. Otherwise (ret >= 0) it's up
- * to each individual command to close the fd if necessary.
- */
-
-static int com_help(int fd, int argc, char **argv)
-{
- int i, ret;
- char *buf;
- const char *dflt = "No such command. Available commands:\n";
-
- if (argc < 2) {
- ret = dump_commands(fd);
- goto out;
- }
- FOR_EACH_COMMAND(i) {
- if (strcmp(cmds[i].name, argv[1]))
- continue;
- buf = make_message(
- "NAME\n\t%s -- %s\n"
- "SYNOPSIS\n\tpara_audioc %s\n"
- "DESCRIPTION\n%s\n",
- argv[1],
- cmds[i].description,
- cmds[i].synopsis,
- cmds[i].help
- );
- ret = client_write(fd, buf);
- free(buf);
- goto out;
- }
- ret = client_write(fd, dflt);
- if (ret > 0)
- ret = dump_commands(fd);
-out:
- if (ret >= 0)
- close(fd);
- return ret;
-}
-
-static int com_stat(int fd, __a_unused int argc, __a_unused char **argv)
-{
- int i, ret;
- char *buf = NULL;
- long unsigned mask = ~0LU;
-
- if (argc > 1) {
- mask = 0;
- for (i = 1; i < argc; i++) {
- ret = stat_item_valid(argv[i]);
- if (ret < 0)
- return ret;
- mask |= (1 << ret);
- }
- }
- PARA_INFO_LOG("mask: 0x%lx\n", mask);
- if (mask & (1 << SI_PLAY_TIME)) {
- struct timeval *t = wstime();
- char *ts = get_time_string(t);
- if (ts) {
- ret = client_write(fd, ts);
- if (ret < 0)
- goto out;
- free(ts);
- }
- }
- if (mask & (1 << SI_AUDIOD_UPTIME)) {
- char *tmp, *us = uptime_str();
- tmp = make_message("%s:%s\n",
- status_item_list[SI_AUDIOD_UPTIME], us);
- free(us);
- ret = client_write(fd, tmp);
- if (ret < 0)
- goto out;
- free(tmp);
- }
- if (mask & (1 << SI_AUDIOD_STATUS)) {
- char *s = audiod_status_string();
- ret = client_write(fd, s);
- if (ret < 0)
- goto out;
- free(s);
- }
- if (mask & (1 << SI_DECODER_FLAGS)) {
- char *df =decoder_flags();
- ret = client_write(fd, df);
- if (ret < 0)
- goto out;
- free(df);
- }
-
- for (i = 0; i < NUM_STAT_ITEMS; i++) {
- char *tmp, *v;
- if (!((1 << i) & mask))
- continue;
- v = stat_item_values[i];
- tmp = make_message("%s%s%s", buf? buf: "",
- v? v : "", v? "\n" : "");
- free(buf);
- buf = tmp;
- }
- ret = client_write(fd, buf);
-out:
- if (ret > 0)
- ret = stat_client_add(fd, mask);
- free(buf);
- return ret;
-}
-
-static int com_grab(int fd, char *cmdline)
-{
- struct grab_client *gc;
- struct filter_node *fn;
- int i, err;
- char *msg;
-
- gc = grab_client_new(fd, cmdline, &err);
- if (!gc)
- goto err_out;
- fn = find_filter_node(gc->conf->slot_arg, gc->audio_format_num, gc->conf->filter_num_arg);
- if (fn)
- activate_grab_client(gc, fn);
- return 1;
-err_out:
- if (err != -E_GC_HELP_GIVEN && err != -E_GC_VERSION_GIVEN)
- return err;
- if (err == -E_GC_HELP_GIVEN) {
- msg = make_message("%s\n\n", grab_client_args_info_usage);
- for (i = 0; grab_client_args_info_help[i]; i++) {
- char *tmp = make_message("%s%s\n", msg,
- grab_client_args_info_help[i]);
- free(msg);
- msg = tmp;
- }
- } else
- msg = make_message("%s %s\n",
- GRAB_CLIENT_CMDLINE_PARSER_PACKAGE,
- GRAB_CLIENT_CMDLINE_PARSER_VERSION);
- err = client_write(fd, msg);
- free(msg);
- if (err < 0)
- return err;
- close(fd);
- return 1;
-}
-
-static int __noreturn com_term(int fd, __a_unused int argc, __a_unused char **argv)
-{
- close(fd);
- clean_exit(EXIT_SUCCESS, "terminating on user request");
-}
-
-static int com_on(int fd, __a_unused int argc, __a_unused char **argv)
-{
- audiod_status = AUDIOD_ON;
- close(fd);
- return 1;
-}
-
-static int com_off(int fd, __a_unused int argc, __a_unused char **argv)
-{
- audiod_status = AUDIOD_OFF;
- close(fd);
- return 1;
-}
-
-static int com_sb(int fd, __a_unused int argc, __a_unused char **argv)
-{
- audiod_status = AUDIOD_STANDBY;
- close(fd);
- return 1;
-}
-
-static int com_cycle(int fd, int argc, char **argv)
-{
- switch (audiod_status) {
- case AUDIOD_ON:
- return com_sb(fd, argc, argv);
- break;
- case AUDIOD_OFF:
- return com_on(fd, argc, argv);
- break;
- case AUDIOD_STANDBY:
- return com_off(fd, argc, argv);
- break;
- }
- close(fd);
- return 1;
-}
-
-static int check_perms(uid_t uid)
-{
- int i;
-
- if (!conf.user_allow_given)
- return 1;
- for (i = 0; i < conf.user_allow_given; i++)
- if (uid == conf.user_allow_arg[i])
- return 1;
- return -E_UCRED_PERM;
-}
-
-static int handle_connect(void)
-{
- int i, argc, ret, clifd = -1;
- char *cmd = NULL, *p, *buf = para_calloc(MAXLINE), **argv = NULL;
- struct sockaddr_un unix_addr;
-
- ret = para_accept(cmd_task->fd, &unix_addr, sizeof(struct sockaddr_un));
- if (ret < 0)
- goto out;
- clifd = ret;
- ret = recv_cred_buffer(clifd, buf, MAXLINE - 1);
- if (ret < 0)
- goto out;
- PARA_INFO_LOG("connection from user %i, buf: %s\n", ret, buf);
- ret = check_perms(ret);
- if (ret < 0)
- goto out;
- ret = -E_INVALID_AUDIOD_CMD;
- cmd = para_strdup(buf);
- p = strchr(cmd, '\n');
- if (!p)
- p = "";
- else {
- *p = '\0';
- p++;
- }
- for (i = 0; cmds[i].name; i++) {
- int j;
- if (strcmp(cmds[i].name, cmd))
- continue;
- if (cmds[i].handler) {
- argc = split_args(buf, &argv, "\n");
- PARA_INFO_LOG("argv[0]: %s, argc= %d\n", argv[0], argc);
- ret = cmds[i].handler(clifd, argc, argv);
- goto out;
- }
- for (j = 0; p[j]; j++)
- if (p[j] == '\n')
- p[j] = ' ';
- PARA_INFO_LOG("cmd: %s, options: %s\n", cmd, p);
- ret = cmds[i].line_handler(clifd, p);
- goto out;
- }
- ret = -E_INVALID_AUDIOD_CMD; /* cmd not found */
-out:
- free(cmd);
- free(buf);
- free(argv);
- if (clifd > 0 && ret < 0 && ret != -E_CLIENT_WRITE) {
- char *tmp = make_message("%s\n", PARA_STRERROR(-ret));
- client_write(clifd, tmp);
- free(tmp);
- close(clifd);
- }
- return ret;
-}
-
-static void audiod_get_socket(void)
+static int audiod_get_socket(void)
{
struct sockaddr_un unix_addr;
+ int fd;
if (conf.socket_given)
socket_name = para_strdup(conf.socket_arg);
hn);
free(hn);
}
- PARA_NOTICE_LOG("connecting to local socket %s\n", socket_name);
+ PARA_NOTICE_LOG("local socket: %s\n", socket_name);
if (conf.force_given)
unlink(socket_name);
- cmd_task->fd = create_pf_socket(socket_name, &unix_addr,
+ fd = create_pf_socket(socket_name, &unix_addr,
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
- if (cmd_task->fd < 0) {
+ if (fd < 0) {
PARA_EMERG_LOG("%s", "can not connect to socket\n");
exit(EXIT_FAILURE); /* do not unlink socket */
}
- if (listen(cmd_task->fd , 5) < 0) {
+ if (listen(fd , 5) < 0) {
PARA_EMERG_LOG("%s", "can not listen on socket\n");
exit(EXIT_FAILURE); /* do not unlink socket */
}
- add_close_on_fork_list(cmd_task->fd);
+ add_close_on_fork_list(fd);
+ mark_fd_nonblock(fd);
+ return fd;
}
static int open_stat_pipe(void)
ret = fd[1];
PARA_NOTICE_LOG("stat pipe opened, fd %d\n", ret);
add_close_on_fork_list(ret);
+ mark_fd_nonblock(ret);
} else
clean_exit(EXIT_FAILURE, "failed to open status pipe");
return ret;
void signal_event_handler(struct task *t)
{
struct signal_task *st = t->private_data;
- handle_signal(st->signum);
+
+ if (t->ret != -E_SIGNAL_CAUGHT)
+ PARA_ERROR_LOG("%s (ignored)\n", PARA_STRERROR(-t->ret));
+ else
+ handle_signal(st->signum);
}
void signal_pre_select(struct sched *s, struct task *t)
st->task.pre_select = signal_pre_select;
st->task.post_select = signal_post_select;
st->task.private_data = st;
- st->task.flags = 0;
sprintf(st->task.status, "signal task");
}
static void command_pre_select(struct sched *s, struct task *t)
{
struct command_task *ct = t->private_data;
+ t->ret = 1;
para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
}
int ret;
struct command_task *ct = t->private_data;
+ t->ret = 1; /* always successful */
if (audiod_status != AUDIOD_OFF)
audiod_status_dump();
- t->ret = 1; /* always successful */
if (!FD_ISSET(ct->fd, &s->rfds))
return;
- ret = handle_connect();
+ ret = handle_connect(ct->fd);
if (ret < 0)
PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
}
{
ct->task.pre_select = command_pre_select;
ct->task.post_select = command_post_select;
+ ct->task.event_handler = NULL;
ct->task.private_data = ct;
- ct->task.flags = 0;
+ ct->fd = audiod_get_socket(); /* doesn't return on errors */
sprintf(ct->task.status, "command task");
}
+static void status_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));
+ close_stat_pipe();
+ /* avoid busy loop if server is down */
+ tv_add(now, &delay, &st->restart_barrier);
+ FOR_EACH_AUDIO_FORMAT(i)
+ afi[i].restart_barrier = st->restart_barrier;
+}
+
static void status_pre_select(struct sched *s, struct task *t)
{
struct status_task *st = t->private_data;
t->ret = 1;
if (st->fd >= 0 && audiod_status == AUDIOD_OFF)
close_stat_pipe();
- if (st->fd < 0 && audiod_status != AUDIOD_OFF) {
+ if (st->fd < 0 && audiod_status != AUDIOD_OFF
+ && tv_diff(now, &st->restart_barrier, NULL) > 0) {
st->fd = open_stat_pipe();
st->loaded = 0;
st->buf[0] = '\0';
static void status_post_select(struct sched *s, struct task *t)
{
struct status_task *st = t->private_data;
- int ret;
t->ret = 1;
if (st->fd < 0 || !FD_ISSET(st->fd, &s->rfds))
return;
- ret = read(st->fd, st->buf + st->loaded,
- STRINGSIZE - 1 - st->loaded);
- if (ret <= 0) {
- close_stat_pipe();
- /* avoid busy loop if server is down */
- while (sleep(1) > 0) /* FIXME */
- ; /* try again*/
- } else {
- st->buf[ret + st->loaded] = '\0';
- st->loaded = for_each_line(st->buf, ret + st->loaded,
- &check_stat_line);
+ t->ret = read(st->fd, st->buf + st->loaded, STRINGSIZE - 1 - st->loaded);
+ if (t->ret <= 0) {
+ if (!t->ret)
+ t->ret = -E_STATUS_EOF;
+ return;
}
+ st->buf[t->ret + st->loaded] = '\0';
+ st->loaded = for_each_line(st->buf, t->ret + st->loaded,
+ &check_stat_line);
}
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->task.flags = 0;
- st->loaded = 0;
st->fd = -1;
- st->buf[0] = '\0';
+ st->sa_time_diff_sign = 1;
sprintf(st->task.status, "status task");
}
char *cf;
int ret, i;
struct sched s;
-
- init_sched();
+ struct command_task command_task_struct, *cmd_task = &command_task_struct;
+ struct task audiod_task_struct, *audiod_task = &audiod_task_struct;
valid_fd_012();
- hostname = para_hostname();
cmdline_parser(argc, argv, &conf);
para_drop_privileges(conf.user_arg, conf.group_arg);
cf = configfile_exists();
clear_slot(i);
init_grabbing();
setup_signal_handling();
- if (conf.daemon_given)
- daemon_init();
- audiod_get_socket(); /* doesn't return on errors */
-
signal_setup_default(sig_task);
sig_task->task.event_handler = signal_event_handler;
init_status_task(stat_task);
init_command_task(cmd_task);
- init_audiod_task(at);
+ init_audiod_task(audiod_task);
+
+ if (conf.daemon_given)
+ daemon_init();
register_task(&sig_task->task);
register_task(&cmd_task->task);
register_task(&stat_task->task);
- register_task(&at->task);
- s.default_timeout.tv_sec = 0;
+ register_task(audiod_task);
+ s.default_timeout.tv_sec = 3;
s.default_timeout.tv_usec = 99 * 1000;
ret = sched(&s);
projects / paraslash.git / blobdiff