X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=7b84dcf5db24dcf3128be1e5453a45f01913f94f;hp=3c566227f0925006a0501ec0ec2e8e5d48dd21bc;hb=2fff03e8e4644cdf18780f920285e70ebf192af0;hpb=9207a81bf1bb5b6bd4db7e2640994e0cfc5f9a3f diff --git a/vss.c b/vss.c index 3c566227..7b84dcf5 100644 --- a/vss.c +++ b/vss.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2007 Andre Noll + * Copyright (C) 1997-2008 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -25,6 +25,7 @@ #include "net.h" #include "server.cmdline.h" #include "vss.h" +#include "list.h" #include "send.h" #include "ipc.h" #include "fd.h" @@ -35,7 +36,33 @@ static struct timeval eof_barrier; static struct timeval autoplay_barrier; extern struct misc_meta_data *mmd; -extern struct sender senders[]; + +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, + } +}; + + static char *map; @@ -84,6 +111,37 @@ unsigned int vss_paused(void) && !(mmd->new_vss_status_flags & VSS_PLAYING); } +/** + * 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. * @@ -106,6 +164,7 @@ void vss_init(void) } 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; @@ -130,14 +189,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 @@ -164,7 +215,8 @@ static struct timeval *vss_compute_timeout(void) return &the_timeout; if (!vss_playing() || !map) return NULL; - vss_next_chunk_time(&next_chunk); + 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 */ @@ -176,17 +228,15 @@ static struct timeval *vss_compute_timeout(void) static void vss_eof(void) { struct timeval now; - int i; char *tmp; - 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->afd.afhi.eof_tv, &now, &eof_barrier); - munmap(map, mmd->size); + para_munmap(map, mmd->size); map = NULL; mmd->chunks_sent = 0; mmd->offset = 0; @@ -194,9 +244,10 @@ static void vss_eof(void) 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_TAG_INFO1], status_item_list[SI_TAG_INFO2]); + 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->mtime = 0; mmd->size = 0; @@ -206,19 +257,14 @@ 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); } /** @@ -246,14 +292,31 @@ 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 }; 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 (afsss == AFS_SOCKET_AFD_PENDING) /* already requested one */ + return 0; + return 1; +} + /** * Compute the timeout for para_server's main select-loop. * @@ -278,50 +341,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->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; + tv_add(&mmd->afd.afhi.eof_tv, &now, &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, &announce_tv, &data_send_barrier); + tv_add(&mmd->afd.afhi.eof_tv, &now, &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)) { - 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; - } + + 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); + 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) @@ -332,6 +385,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; @@ -342,8 +396,9 @@ 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); for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { @@ -359,20 +414,22 @@ 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; + mmd->afd.afhi.chunk_table = NULL; ret = recv_afs_msg(&passed_fd, &afs_code, &afs_data); if (ret < 0) goto err; - PARA_DEBUG_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) @@ -399,48 +456,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)); -} - -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 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; -} - -/** - * 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; - get_chunk(chunk_num, buf, len); - return 1; + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); + mmd->new_vss_status_flags = VSS_NEXT; } /** @@ -452,7 +472,7 @@ int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len) * 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; @@ -462,7 +482,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) @@ -473,12 +494,12 @@ void vss_send_chunk(void) mmd->new_vss_status_flags &= ~VSS_REPOS; 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); @@ -486,10 +507,38 @@ 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; 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 (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"); + 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(); +}