X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=5de9c6be1779855b00a4698b6638aa4d67072305;hp=f872fec8b2f5c3ffdb250ad0b06ace34a2a5a904;hb=345e7b4adce741621a412c3845712e8540b572ad;hpb=40cbbb95e256e63e1e6958e9034311d4904604af diff --git a/recv.c b/recv.c index f872fec8..5de9c6be 100644 --- a/recv.c +++ b/recv.c @@ -1,163 +1,92 @@ /* - * Copyright (C) 2005-2006 Andre Noll + * Copyright (C) 2005-2009 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. */ -#include "para.h" +/** \file recv.c the stand-alone audio stream receiver */ + +#include +#include + +#include "para.h" #include "list.h" #include "sched.h" +#include "ggo.h" #include "recv.h" #include "recv.cmdline.h" #include "fd.h" +#include "string.h" #include "error.h" #include "stdout.h" -struct gengetopt_args_info conf; +/** the gengetopt args info struct */ +struct recv_args_info conf; + +static int loglevel; +/** Always log to stderr. */ +INIT_STDERR_LOGGING(loglevel); +/** init array of error codes used by para_recv */ INIT_RECV_ERRLISTS; -__printf_2_3 void para_log(int ll, const char* fmt,...) +__noreturn static void print_help_and_die(void) { - va_list argp; - - /* ignore log message if loglevel is not high enough */ - if (ll < conf.loglevel_arg) - return; - va_start(argp, fmt); - vfprintf(stderr, fmt, argp); - va_end(argp); + int d = conf.detailed_help_given; + const char **p = d? recv_args_info_detailed_help + : recv_args_info_help; + + printf_or_die("%s\n\n", RECV_CMDLINE_PARSER_PACKAGE "-" + RECV_CMDLINE_PARSER_VERSION); + printf_or_die("%s\n\n", recv_args_info_usage); + for (; *p; p++) + printf_or_die("%s\n", *p); + print_receiver_helps(d); + exit(0); } static void *parse_config(int argc, char *argv[], int *receiver_num) { - int i; - - if (cmdline_parser(argc, argv, &conf)) + if (recv_cmdline_parser(argc, argv, &conf)) return NULL; - if (conf.list_receivers_given) { - printf("available receivers: "); - for (i = 0; receivers[i].name; i++) - printf("%s%s", i? " " : "", receivers[i].name); - printf("\nTry\n\tpara_recv -r ' -h'\n" - "for help on .\n"); - exit(EXIT_SUCCESS); - } + HANDLE_VERSION_FLAG("recv", conf); + if (conf.help_given || conf.detailed_help_given) + print_help_and_die(); return check_receiver_arg(conf.receiver_arg, receiver_num); } -#if 0 -int main(int argc, char *argv[]) -{ - int ret, eof = 0, max, r_opened = 0, receiver_num; - struct timeval timeout; - struct receiver *r = NULL; - fd_set rfds, wfds; - struct receiver_node rn; - - memset(&rn, 0, sizeof(struct receiver_node)); - for (ret = 0; receivers[ret].name; ret++) - receivers[ret].init(&receivers[ret]); - ret = -E_RECV_SYNTAX; - rn.conf = parse_config(argc, argv, &receiver_num); - if (!rn.conf) { - PARA_EMERG_LOG("%s", "parse failed\n"); - goto out; - } - r = &receivers[receiver_num]; - rn.receiver = r; - ret = r->open(&rn); - if (ret < 0) - goto out; - r_opened = 1; -recv: - FD_ZERO(&rfds); - FD_ZERO(&wfds); - timeout.tv_sec = 0; - timeout.tv_usec = 999 * 1000; - max = -1; - ret = r->pre_select(&rn, &rfds, &wfds, &timeout); - max = PARA_MAX(max, ret); - - PARA_DEBUG_LOG("timeout: %lums, max: %d\n", tv2ms(&timeout), max); - ret = para_select(max + 1, &rfds, &wfds, &timeout); - if (ret < 0) { - ret = -E_RECV_SELECT; - goto out; - } - ret = r->post_select(&rn, ret, &rfds, &wfds); - if (ret < 0) - goto out; - if (!ret) - eof = 1; - if (!rn.loaded) { - if (eof) - goto out; - goto recv; - } - ret = write(STDOUT_FILENO, rn.buf, rn.loaded); - PARA_DEBUG_LOG("wrote %d/%zd\n", ret, rn.loaded); - if (ret < 0) { - ret = -E_WRITE_STDOUT; - goto out; - } - if (ret != rn.loaded) { - PARA_INFO_LOG("short write %d/%zd\n", ret, rn.loaded); - memmove(rn.buf, rn.buf + ret, rn.loaded - ret); - } - rn.loaded -= ret; - if (rn.loaded || !eof) - goto recv; -out: - if (r_opened) - r->close(&rn); - if (r) - r->shutdown(); - if (ret < 0) - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); - return ret; -} -#endif - -void rn_event_handler(struct task *t) -{ - PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret)); - unregister_task(t); -} - +/** + * the main function of para_recv + * + * \param argc number of arguments + * \param argv vector of arguments + * + * para_recv uses the specified receiver to receive an audio stream sent by + * para_server. The received data is written to stdout. + * + * \return \a EXIT_SUCCESS on success, \a EXIT_FAILURE on errors. + */ int main(int argc, char *argv[]) { int ret, r_opened = 0, receiver_num; - struct receiver *r = NULL; + struct receiver *r = NULL; struct receiver_node rn; struct stdout_task sot; - struct sched s; + static struct sched s; - init_sched(); s.default_timeout.tv_sec = 1; s.default_timeout.tv_usec = 0; + memset(&sot, 0, sizeof(struct stdout_task)); memset(&rn, 0, sizeof(struct receiver_node)); - for (ret = 0; receivers[ret].name; ret++) - receivers[ret].init(&receivers[ret]); + recv_init(); ret = -E_RECV_SYNTAX; rn.conf = parse_config(argc, argv, &receiver_num); if (!rn.conf) { - PARA_EMERG_LOG("%s", "parse failed\n"); + PARA_EMERG_LOG("parse failed\n"); goto out; } + loglevel = get_loglevel_by_name(conf.loglevel_arg); r = &receivers[receiver_num]; rn.receiver = r; ret = r->open(&rn); @@ -166,27 +95,23 @@ int main(int argc, char *argv[]) r_opened = 1; stdout_set_defaults(&sot); - sot.buf = rn.buf; + sot.bufp = &rn.buf; sot.loaded = &rn.loaded; - sot.eof = &rn.eof; + sot.input_error = &rn.task.error; register_task(&sot.task); - rn.task.private_data = &rn; rn.task.pre_select = r->pre_select; rn.task.post_select = r->post_select; - rn.task.event_handler = rn_event_handler; - rn.task.flags = 0; sprintf(rn.task.status, "receiver node"); register_task(&rn.task); - - ret = sched(&s); + ret = schedule(&s); out: if (r_opened) r->close(&rn); if (r) r->shutdown(); if (ret < 0) - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); - return ret; + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); + return ret < 0? EXIT_FAILURE : EXIT_SUCCESS; }