X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=1be4cd15d1db262dd5f79a43b19e7bba09f2087a;hp=826191bc100d5fb36bb9d0ed3482ff2dce36b21d;hb=3f885cd259fef0d8522bfc358defdc2345c5923a;hpb=dda5531a160fe43b35c8da5f6a149e4f9c561877;ds=sidebyside diff --git a/vss.c b/vss.c index 826191bc..1be4cd15 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,12 +25,11 @@ #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[]; - static struct timeval announce_tv; static struct timeval data_send_barrier; static struct timeval eof_barrier; @@ -42,9 +41,9 @@ extern struct sender senders[]; static char *map; /** - * 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 +52,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 +63,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 +74,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 +86,22 @@ 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. * - * Call the init functions of all supported audio format handlers and - * initialize all supported senders. + */ +unsigned int vss_stopped(void) +{ + return (mmd->new_vss_status_flags & VSS_NEXT) + && !(mmd->new_vss_status_flags & VSS_PLAYING); +} + +/** + * Initialize the virtual streaming system. + * + * This also initializes all supported senders and starts streaming + * if the --autoplay command line flag was given. */ void vss_init(void) { @@ -132,14 +143,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->afd.afhi.chunk_tv, &tmp); - tv_add(&tmp, &mmd->stream_start, due); -} - /* * != NULL: timeout for next chunk * NULL: nothing to do @@ -166,9 +169,9 @@ static struct timeval *vss_compute_timeout(void) return &the_timeout; if (!vss_playing() || !map) return NULL; - vss_next_chunk_time(&next_chunk); - if (chk_barrier(audio_format_name(mmd->afd.afsi.audio_format_id), - &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; @@ -182,12 +185,13 @@ static void vss_eof(void) int i; char *tmp; - PARA_NOTICE_LOG("EOF\n"); if (!map) { for (i = 0; senders[i].name; i++) senders[i].shutdown_clients(); return; } + if (mmd->new_vss_status_flags & VSS_NOMORE) + mmd->new_vss_status_flags = VSS_NEXT; gettimeofday(&now, NULL); tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier); munmap(map, mmd->size); @@ -197,15 +201,13 @@ static void vss_eof(void) 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_INFO1], - status_item_list[SI_AUDIO_INFO2], status_item_list[SI_AUDIO_INFO3]); - strcpy(mmd->afd.afhi.info_string, tmp); + 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->afd.path[0] = '\0'; - mmd->afd.afsi.lyrics_id = 0; - mmd->afd.afsi.image_id = 0; mmd->mtime = 0; - mmd->afd.attributes_string[0] = '\0'; mmd->size = 0; mmd->events++; } @@ -213,25 +215,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 (!map || !mmd->afd.afhi.header_len) - return NULL; - *header_len = mmd->afd.afhi.header_len; - return map + mmd->afd.afhi.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. */ @@ -241,9 +238,9 @@ 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) @@ -253,9 +250,13 @@ struct timeval *vss_chunk_time(void) return &mmd->afd.afhi.chunk_tv; } +/** 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 }; @@ -267,6 +268,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 @@ -303,8 +308,6 @@ struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno) tv_add(&mmd->afd.afhi.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; } mmd->chunks_sent = 0; } @@ -317,8 +320,9 @@ struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno) 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) { + if (afsss == AFS_SOCKET_READY || + afsss == AFS_SOCKET_CHECK_FOR_WRITE) { + PARA_DEBUG_LOG("ready and playing, but no audio file\n"); para_fd_set(afs_socket, wfds, max_fileno); afsss = AFS_SOCKET_CHECK_FOR_WRITE; } @@ -334,6 +338,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; @@ -344,11 +349,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); + 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) @@ -362,28 +367,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"); @@ -395,7 +399,6 @@ static void recv_afs_result(void) map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE, passed_fd, 0); close(passed_fd); - mmd->afd.afhi.header_len = 0; /* default: no header */ mmd->chunks_sent = 0; mmd->current_chunk = 0; mmd->offset = 0; @@ -406,9 +409,11 @@ static void recv_afs_result(void) tv_add(&now, &announce_tv, &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)); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); + mmd->new_vss_status_flags = VSS_NEXT; } void vss_post_select(fd_set *rfds, fd_set *wfds) @@ -419,22 +424,10 @@ void vss_post_select(fd_set *rfds, fd_set *wfds) recv_afs_result(); if (afsss != AFS_SOCKET_CHECK_FOR_WRITE || !FD_ISSET(afs_socket, wfds)) return; - PARA_NOTICE_LOG("requesting new socket\n"); + PARA_NOTICE_LOG("requesting new fd from afs\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->afd.afhi.chunk_table[chunk_num]; - *buf = map + pos; - *len = mmd->afd.afhi.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); -} - /** * Get the data of the given chunk. * @@ -442,7 +435,7 @@ static void get_chunk(long unsigned chunk_num, char **buf, size_t *len) * \param buf Chunk data. * \param len Chunk length in bytes. * - * \return Positive on success, negative on errors. + * \return Standard. */ int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len) { @@ -450,18 +443,18 @@ int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len) return -E_CHUNK; if (chunk_num >= mmd->afd.afhi.chunks_total) return -E_CHUNK; - get_chunk(chunk_num, buf, len); + afh_get_chunk(chunk_num, &mmd->afd.afhi, map, 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) { @@ -473,7 +466,8 @@ void vss_send_chunk(void) 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) @@ -488,8 +482,8 @@ void vss_send_chunk(void) } /* * 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); @@ -497,7 +491,7 @@ void vss_send_chunk(void) 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;