X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=98965efd386a14b5fd95361c9f6878fb959af128;hp=3db8bb446f447dbe4e2441af67f6c5944eb15ac8;hb=2b471378b49c04db7bb84d1e75db981f91ad93db;hpb=43ae54ccb178332180b2e79ee0d6e1a15570de0b diff --git a/vss.c b/vss.c index 3db8bb44..98965efd 100644 --- a/vss.c +++ b/vss.c @@ -1,10 +1,10 @@ /* - * Copyright (C) 1997-2007 Andre Noll + * Copyright (C) 1997-2008 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ -/** \file vss.c the virtual streaming system +/** \file vss.c The virtual streaming system. * * This contains the audio streaming code of para_server which is independent * of the current audio format, audio file selector and of the activated @@ -25,26 +25,64 @@ #include "net.h" #include "server.cmdline.h" #include "vss.h" +#include "list.h" #include "send.h" #include "ipc.h" #include "fd.h" -extern const char *status_item_list[]; +extern struct misc_meta_data *mmd; -static struct timeval announce_tv; -static struct timeval data_send_barrier; -static struct timeval eof_barrier; -static struct timeval autoplay_barrier; +extern void dccp_send_init(struct sender *); +extern void http_send_init(struct sender *); +extern void ortp_send_init(struct sender *); + +/** the list of supported senders */ +struct sender senders[] = { + { + .name = "http", + .init = http_send_init, + }, + { + .name = "dccp", + .init = dccp_send_init, + }, +#ifdef HAVE_ORTP + { + .name = "ortp", + .init = ortp_send_init, + }, +#endif + { + .name = NULL, + } +}; -extern struct misc_meta_data *mmd; -extern struct sender senders[]; +/** The possible states of the afs socket. See \ref afs_socket. */ +enum afs_socket_status { + /** Socket is inactive. */ + AFS_SOCKET_READY, + /** Socket fd was included in the write fd set for select(). */ + AFS_SOCKET_CHECK_FOR_WRITE, + /** vss wrote a request to the socket and waits for afs to reply. */ + AFS_SOCKET_AFD_PENDING +}; static char *map; +struct vss_task { + struct timeval announce_tv; + struct timeval data_send_barrier; + struct timeval eof_barrier; + struct timeval autoplay_barrier; + enum afs_socket_status afsss; +}; + +static struct vss_task vss_task_struct, *vsst = &vss_task_struct; + /** - * check if vss status flag \a P (playing) is set + * Check if vss status flag \a P (playing) is set. * - * \return greater than zero if playing, zero otherwise. + * \return Greater than zero if playing, zero otherwise. * */ unsigned int vss_playing(void) @@ -53,9 +91,9 @@ unsigned int vss_playing(void) } /** - * check if \a N (next) status flag is set + * Check if the \a N (next) status flag is set. * - * \return greater than zero if set, zero if not. + * \return Greater than zero if set, zero if not. * */ unsigned int vss_next(void) @@ -64,9 +102,9 @@ unsigned int vss_next(void) } /** - * check if a reposition request is pending + * Check if a reposition request is pending. * - * \return greater than zero if true, zero otherwise. + * \return Greater than zero if true, zero otherwise. * */ unsigned int vss_repos(void) @@ -75,9 +113,9 @@ unsigned int vss_repos(void) } /** - * check if the vss is currently paused + * Check if the vss is currently paused. * - * \return greater than zero if paused, zero otherwise. + * \return Greater than zero if paused, zero otherwise. * */ unsigned int vss_paused(void) @@ -87,10 +125,41 @@ unsigned int vss_paused(void) } /** - * initialize the virtual streaming system + * Check if the vss is currently stopped. + * + * \return Greater than zero if paused, zero otherwise. + * + */ +unsigned int vss_stopped(void) +{ + return (mmd->new_vss_status_flags & VSS_NEXT) + && !(mmd->new_vss_status_flags & VSS_PLAYING); +} + +/** + * Get the data of the given chunk. + * + * \param chunk_num The number of the desired chunk. + * \param buf Chunk data. + * \param len Chunk length in bytes. + * + * \return Standard. + */ +int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len) +{ + if (!map || !vss_playing()) + return -E_CHUNK; + if (chunk_num >= mmd->afd.afhi.chunks_total) + return -E_CHUNK; + afh_get_chunk(chunk_num, &mmd->afd.afhi, map, buf, len); + return 1; +} + +/** + * Initialize the virtual streaming system. * - * Call the init functions of all supported audio format handlers and - * initialize all supported senders. + * This also initializes all supported senders and starts streaming + * if the --autoplay command line flag was given. */ void vss_init(void) { @@ -100,21 +169,22 @@ void vss_init(void) conf.announce_time_arg : 300, autoplay_delay = conf.autoplay_delay_arg > 0? conf.autoplay_delay_arg : 0; - ms2tv(announce_time, &announce_tv); - PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&announce_tv)); + ms2tv(announce_time, &vsst->announce_tv); + PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&vsst->announce_tv)); for (i = 0; senders[i].name; i++) { PARA_NOTICE_LOG("initializing %s sender\n", senders[i].name); senders[i].init(&senders[i]); } free(hn); free(home); + mmd->sender_cmd_data.cmd_num = -1; if (conf.autoplay_given) { struct timeval now, tmp; mmd->vss_status_flags |= VSS_PLAYING; mmd->new_vss_status_flags |= VSS_PLAYING; gettimeofday(&now, NULL); ms2tv(autoplay_delay, &tmp); - tv_add(&now, &tmp, &autoplay_barrier); + tv_add(&now, &tmp, &vsst->autoplay_barrier); } } @@ -132,14 +202,6 @@ static int chk_barrier(const char *bname, const struct timeval *now, return -1; } -static void vss_next_chunk_time(struct timeval *due) -{ - struct timeval tmp; - - tv_scale(mmd->chunks_sent, &mmd->afi.chunk_tv, &tmp); - tv_add(&tmp, &mmd->stream_start, due); -} - /* * != NULL: timeout for next chunk * NULL: nothing to do @@ -149,26 +211,26 @@ static struct timeval *vss_compute_timeout(void) static struct timeval the_timeout; struct timeval now, next_chunk; - if (vss_next() && mmd->audio_format >= 0) { + if (vss_next() && map) { /* only sleep a bit, nec*/ the_timeout.tv_sec = 0; the_timeout.tv_usec = 100; return &the_timeout; } gettimeofday(&now, NULL); - if (chk_barrier("autoplay_delay", &now, &autoplay_barrier, + if (chk_barrier("autoplay_delay", &now, &vsst->autoplay_barrier, &the_timeout, 1) < 0) return &the_timeout; - if (chk_barrier("eof", &now, &eof_barrier, &the_timeout, 1) < 0) + if (chk_barrier("eof", &now, &vsst->eof_barrier, &the_timeout, 1) < 0) return &the_timeout; - if (chk_barrier("data send", &now, &data_send_barrier, + if (chk_barrier("data send", &now, &vsst->data_send_barrier, &the_timeout, 1) < 0) return &the_timeout; - if (mmd->audio_format < 0 || !vss_playing() || !map) + if (!vss_playing() || !map) return NULL; - vss_next_chunk_time(&next_chunk); - if (chk_barrier(audio_format_name(mmd->audio_format), &now, &next_chunk, - &the_timeout, 0) < 0) + compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv, + &mmd->stream_start, &next_chunk); + if (chk_barrier("chunk", &now, &next_chunk, &the_timeout, 0) < 0) return &the_timeout; /* chunk is due or bof */ the_timeout.tv_sec = 0; @@ -179,34 +241,28 @@ static struct timeval *vss_compute_timeout(void) static void vss_eof(void) { struct timeval now; - int i; char *tmp; - PARA_NOTICE_LOG("EOF\n"); - if (!map) { - for (i = 0; senders[i].name; i++) - senders[i].shutdown_clients(); + if (!map) return; - } + if (mmd->new_vss_status_flags & VSS_NOMORE) + mmd->new_vss_status_flags = VSS_NEXT; gettimeofday(&now, NULL); - tv_add(&mmd->afi.eof_tv, &now, &eof_barrier); - munmap(map, mmd->size); + tv_add(&mmd->afd.afhi.eof_tv, &now, &vsst->eof_barrier); + para_munmap(map, mmd->size); map = NULL; - mmd->audio_format = -1; mmd->chunks_sent = 0; mmd->offset = 0; - mmd->afi.seconds_total = 0; - free(mmd->afi.chunk_table); - mmd->afi.chunk_table = NULL; - tmp = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_INFO1], - status_item_list[SI_AUDIO_INFO2], status_item_list[SI_AUDIO_INFO3]); - strcpy(mmd->afi.info_string, tmp); - free(tmp); - tmp = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_DBINFO1], - status_item_list[SI_DBINFO2], status_item_list[SI_DBINFO3]); - strcpy(mmd->selector_info, tmp); + mmd->afd.afhi.seconds_total = 0; + free(mmd->afd.afhi.chunk_table); + mmd->afd.afhi.chunk_table = NULL; + tmp = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_FILE_INFO], + status_item_list[SI_TAGINFO1], status_item_list[SI_TAGINFO2]); + strncpy(mmd->afd.afhi.info_string, tmp, sizeof(mmd->afd.afhi.info_string)); + mmd->afd.afhi.info_string[sizeof(mmd->afd.afhi.info_string) - 1] = '\0'; + make_empty_status_items(mmd->afd.verbose_ls_output); free(tmp); - mmd->filename[0] = '\0'; + mmd->mtime = 0; mmd->size = 0; mmd->events++; } @@ -214,25 +270,20 @@ static void vss_eof(void) /** * Get the header of the current audio file. * - * \param header_len the length of the header is stored here - * - * \return a pointer to a buffer containing the header, or NULL, if no audio - * file is selected or if the current audio format does not need special header - * treamtment. + * \param buf The length of the header is stored here. + * \param len Points to a buffer containing the header on return. * + * \sa afh_get_header. */ -char *vss_get_header(size_t *header_len) +void vss_get_header(char **buf, size_t *len) { - if (mmd->audio_format < 0 || !map || !mmd->afi.header_len) - return NULL; - *header_len = mmd->afi.header_len; - return map + mmd->afi.header_offset; + afh_get_header(&mmd->afd.afhi, map, buf, len); } /** - * get the list of all supported audio formats + * Get the list of all supported audio formats. * - * \return a space separated list of all supported audio formats + * \return Aa space separated list of all supported audio formats * It is not allocated at runtime, i.e. there is no need to free * the returned string in the caller. */ @@ -242,25 +293,30 @@ const char *supported_audio_formats(void) } /** - * get the chunk time of the current audio file + * Get the chunk time of the current audio file. * - * \return a pointer to a struct containing the chunk time, or NULL, + * \return A pointer to a struct containing the chunk time, or NULL, * if currently no audio file is selected. */ struct timeval *vss_chunk_time(void) { - if (mmd->audio_format < 0) + if (!map) return NULL; - return &mmd->afi.chunk_tv; + return &mmd->afd.afhi.chunk_tv; } -enum afs_socket_status { - AFS_SOCKET_READY, - AFS_SOCKET_CHECK_FOR_WRITE, - AFS_SOCKET_AFD_PENDING -}; - -static enum afs_socket_status afsss; +static int need_to_request_new_audio_file(void) +{ + if (map) /* have audio file */ + return 0; + if (!vss_playing()) /* don't need one */ + return 0; + if (mmd->new_vss_status_flags & VSS_NOMORE) + return 0; + if (vsst->afsss == AFS_SOCKET_AFD_PENDING) /* already requested one */ + return 0; + return 1; +} /** * Compute the timeout for para_server's main select-loop. @@ -268,6 +324,10 @@ static enum afs_socket_status afsss; * This function gets called from para_server to determine the timeout value * for its main select loop. * + * \param rfds The set of file descriptors to be checked for reading. + * \param wfds The set of file descriptors to be checked for writing. + * \param max_fileno The highest-numbered file descriptor. + * * Before the timeout is computed, the current vss status flags are evaluated * and acted upon by calling appropriate functions from the lower layers. * Possible actions include @@ -282,49 +342,40 @@ static enum afs_socket_status afsss; struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno) { int i; - struct timeval *tv; + struct timeval now; - para_fd_set(afs_socket, rfds, max_fileno); - if (!map) - for (i = 0; senders[i].name; i++) - senders[i].shutdown_clients(); - else { - if (vss_next()) { - vss_eof(); - return vss_compute_timeout(); - } - } - if (vss_paused() || vss_repos()) { + if (!map || vss_next() || vss_paused() || vss_repos()) for (i = 0; senders[i].name; i++) senders[i].shutdown_clients(); - if (map) { - struct timeval now; + if (vss_next()) + vss_eof(); + else if (vss_paused()) { + if (mmd->chunks_sent) { gettimeofday(&now, NULL); - if (!vss_paused() || mmd->chunks_sent) - tv_add(&mmd->afi.eof_tv, &now, &eof_barrier); - if (vss_repos()) - tv_add(&now, &announce_tv, &data_send_barrier); - if (mmd->new_vss_status_flags & VSS_NOMORE) - mmd->new_vss_status_flags = VSS_NEXT; + tv_add(&mmd->afd.afhi.eof_tv, &now, &vsst->eof_barrier); } mmd->chunks_sent = 0; - } - if (vss_repos()) { - mmd->new_vss_status_flags &= ~(VSS_REPOS); + } else if (vss_repos()) { + gettimeofday(&now, NULL); + tv_add(&now, &vsst->announce_tv, &vsst->data_send_barrier); + tv_add(&mmd->afd.afhi.eof_tv, &now, &vsst->eof_barrier); + mmd->chunks_sent = 0; mmd->current_chunk = mmd->repos_request; + mmd->new_vss_status_flags &= ~VSS_REPOS; } - tv = vss_compute_timeout(); - if (tv) - return tv; - if (!map && vss_playing() && - !(mmd->new_vss_status_flags & VSS_NOMORE)) { - PARA_DEBUG_LOG("%s", "ready and playing, but no audio file\n"); - if (afsss == AFS_SOCKET_READY) { - para_fd_set(afs_socket, wfds, max_fileno); - afsss = AFS_SOCKET_CHECK_FOR_WRITE; - } + + if (need_to_request_new_audio_file()) { + PARA_DEBUG_LOG("ready and playing, but no audio file\n"); + para_fd_set(afs_socket, wfds, max_fileno); + vsst->afsss = AFS_SOCKET_CHECK_FOR_WRITE; + } else + para_fd_set(afs_socket, rfds, max_fileno); + for (i = 0; senders[i].name; i++) { + if (!senders[i].pre_select) + continue; + senders[i].pre_select(max_fileno, rfds, wfds); } - return tv; + return vss_compute_timeout(); } static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data) @@ -335,6 +386,7 @@ static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data) struct iovec iov; int ret = 0; + *fd = -1; iov.iov_base = buf; iov.iov_len = sizeof(buf); msg.msg_iov = &iov; @@ -345,11 +397,11 @@ static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data) ret = recvmsg(afs_socket, &msg, 0); if (ret < 0) return -ERRNO_TO_PARA_ERROR(errno); + vsst->afsss = AFS_SOCKET_READY; if (iov.iov_len != sizeof(buf)) - return -E_SHORT_AFS_READ; + return -E_AFS_SHORT_READ; *code = *(uint32_t*)buf; *data = *(uint32_t*)(buf + 4); - cmsg = CMSG_FIRSTHDR(&msg); for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) @@ -363,28 +415,27 @@ static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data) static void recv_afs_result(void) { - int ret, passed_fd = -1, shmid; + int ret, passed_fd, shmid; uint32_t afs_code = 0, afs_data = 0; struct stat statbuf; struct timeval now; - PARA_NOTICE_LOG("recv\n"); + mmd->afd.afhi.chunk_table = NULL; ret = recv_afs_msg(&passed_fd, &afs_code, &afs_data); if (ret < 0) goto err; - PARA_NOTICE_LOG("got the fd: %d, code: %u, shmid: %u\n", - passed_fd, afs_code, afs_data); - ret = -E_BAD_AFS_CODE; + PARA_DEBUG_LOG("fd: %d, code: %u, shmid: %u\n", passed_fd, afs_code, + afs_data); + ret = -E_NOFD; if (afs_code != NEXT_AUDIO_FILE) goto err; - afsss = AFS_SOCKET_READY; + if (passed_fd < 0) + goto err; shmid = afs_data; ret = load_afd(shmid, &mmd->afd); if (ret < 0) goto err; shm_destroy(shmid); - PARA_NOTICE_LOG("next audio file: %s (%lu chunks)\n", mmd->afd.path, - mmd->afd.afhi.chunks_total); ret = fstat(passed_fd, &statbuf); if (ret < 0) { PARA_ERROR_LOG("fstat error:\n"); @@ -396,115 +447,99 @@ static void recv_afs_result(void) map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE, passed_fd, 0); close(passed_fd); - strcpy(mmd->filename, mmd->afd.path); /* FIXME: check length */ - mmd->afi.header_len = 0; /* default: no header */ - mmd->audio_format = mmd->afd.afsi.audio_format_id; mmd->chunks_sent = 0; mmd->current_chunk = 0; mmd->offset = 0; mmd->events++; mmd->num_played++; - mmd->afi = mmd->afd.afhi; mmd->new_vss_status_flags &= (~VSS_NEXT); gettimeofday(&now, NULL); - tv_add(&now, &announce_tv, &data_send_barrier); + tv_add(&now, &vsst->announce_tv, &vsst->data_send_barrier); return; err: + free(mmd->afd.afhi.chunk_table); if (passed_fd >= 0) close(passed_fd); - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); -} - -void vss_post_select(fd_set *rfds, fd_set *wfds) -{ - int ret; - - if (FD_ISSET(afs_socket, rfds)) - recv_afs_result(); - if (afsss != AFS_SOCKET_CHECK_FOR_WRITE || !FD_ISSET(afs_socket, wfds)) - return; - PARA_NOTICE_LOG("requesting new socket\n"); - ret = send_buffer(afs_socket, "new"); - afsss = AFS_SOCKET_AFD_PENDING; -} - -static void get_chunk(long unsigned chunk_num, char **buf, size_t *len) -{ - size_t pos = mmd->afi.chunk_table[chunk_num]; - *buf = map + pos; - *len = mmd->afi.chunk_table[chunk_num + 1] - pos; - - if (chunk_num + 5 > mmd->afd.afhi.chunks_total) - PARA_NOTICE_LOG("chunk %lu/%lu\n, len: %zu\n", chunk_num, - mmd->afd.afhi.chunks_total, *len); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); + mmd->new_vss_status_flags = VSS_NEXT; } /** - * Get the data of the given chunk. - * - * \param chunk_num The number of the desired chunk. - * \param buf Chunk data. - * \param len Chunk length in bytes. - * - * \return Positive on success, negative on errors. - */ -int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len) -{ - if (mmd->audio_format < 0 || !map || !vss_playing()) - return -E_CHUNK; - if (chunk_num >= mmd->afi.chunks_total) - return -E_CHUNK; - get_chunk(chunk_num, buf, len); - return 1; -} - -/** - * main sending function + * Main sending function. * - * This function gets called from para_server as soon as the next chunk of - * data should be pushed out. It first calls the read_chunk() function of - * the current audio format handler to obtain a pointer to the data to be - * sent out as well as its length. This information is then passed to each - * supported sender's send() function which does the actual sending. + * This function gets called from para_server as soon as the next chunk of data + * should be pushed out. It obtains a pointer to the data to be sent out as + * well as its length from mmd->afd.afhi. This information is then passed to + * each supported sender's send() function which is supposed to send out the data + * to all connected clients. */ -void vss_send_chunk(void) +static void vss_send_chunk(void) { int i; struct timeval now, due; char *buf; size_t len; - if (mmd->audio_format < 0 || !map || !vss_playing()) + if (!map || !vss_playing()) return; gettimeofday(&now, NULL); - vss_next_chunk_time(&due); + compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv, + &mmd->stream_start, &due); if (tv_diff(&due, &now, NULL) > 0) return; - if (chk_barrier("eof", &now, &eof_barrier, &due, 1) < 0) + if (chk_barrier("eof", &now, &vsst->eof_barrier, &due, 1) < 0) return; - if (chk_barrier("data send", &now, &data_send_barrier, + if (chk_barrier("data send", &now, &vsst->data_send_barrier, &due, 1) < 0) return; mmd->new_vss_status_flags &= ~VSS_REPOS; - if (mmd->current_chunk >= mmd->afi.chunks_total) { /* eof */ + if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */ mmd->new_vss_status_flags |= VSS_NEXT; - return vss_eof(); + return; } /* * We call the send function also in case of empty chunks as they - * might have still some data queued which can be sent in this case. - */ + * might have still some data queued which can be sent in this case. + */ if (!mmd->chunks_sent) { struct timeval tmp; gettimeofday(&mmd->stream_start, NULL); - tv_scale(mmd->current_chunk, &mmd->afi.chunk_tv, &tmp); + tv_scale(mmd->current_chunk, &mmd->afd.afhi.chunk_tv, &tmp); mmd->offset = tv2ms(&tmp); mmd->events++; } - get_chunk(mmd->current_chunk, &buf, &len); + afh_get_chunk(mmd->current_chunk, &mmd->afd.afhi, map, &buf, &len); for (i = 0; senders[i].name; i++) senders[i].send(mmd->current_chunk, mmd->chunks_sent, buf, len); mmd->new_vss_status_flags |= VSS_PLAYING; mmd->chunks_sent++; mmd->current_chunk++; } + +void vss_post_select(fd_set *rfds, fd_set *wfds) +{ + int ret, i; + + if (mmd->sender_cmd_data.cmd_num >= 0) { + int num = mmd->sender_cmd_data.cmd_num, + s = mmd->sender_cmd_data.sender_num; + + if (senders[s].client_cmds[num]) + senders[s].client_cmds[num](&mmd->sender_cmd_data); + mmd->sender_cmd_data.cmd_num = -1; + } + if (vsst->afsss != AFS_SOCKET_CHECK_FOR_WRITE) { + if (FD_ISSET(afs_socket, rfds)) + recv_afs_result(); + } else if (FD_ISSET(afs_socket, wfds)) { + PARA_NOTICE_LOG("requesting new fd from afs\n"); + ret = send_buffer(afs_socket, "new"); + vsst->afsss = AFS_SOCKET_AFD_PENDING; + } + for (i = 0; senders[i].name; i++) { + if (!senders[i].post_select) + continue; + senders[i].post_select(rfds, wfds); + } + vss_send_chunk(); +}