X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=10780cbffe1a9026e1729423c0e98bfe1dddeabd;hp=1dd24664970e2a1a73768f696411889f12c3f0c9;hb=96c5cc23d6d1e8ecfb6eacee7eaf19efe51e89bc;hpb=1beeb3913ee5d0e03805e55300720d267a6a51e0 diff --git a/vss.c b/vss.c index 1dd24664..10780cbf 100644 --- a/vss.c +++ b/vss.c @@ -209,7 +209,7 @@ static int need_audio_header(struct fec_client *fc, struct vss_task *vsst) return 0; if (!vsst->header_len) return 0; - if (fc->group.num && tv_diff(&fc->next_header_time, now, NULL) < 0) + if (fc->group.num && tv_diff(&fc->next_header_time, now, NULL) > 0) return 0; tv_add(now, &vsst->header_interval, &fc->next_header_time); return 1; @@ -340,8 +340,9 @@ static int compute_next_fec_slice(struct fec_client *fc, struct vss_task *vsst) { if (fc->first_stream_chunk < 0 || fc->current_slice_num == fc->fcp->slices_per_group + fc->num_extra_slices) { - if (!setup_next_fec_group(fc, vsst)) - return 0; + int ret = setup_next_fec_group(fc, vsst); + if (ret <= 0) + return ret; } write_fec_header(fc, vsst); fec_encode(fc->parms, fc->src_data, fc->enc_buf + FEC_HEADER_SIZE, @@ -457,6 +458,24 @@ static void compute_slice_timeout(struct timeval *timeout) } } +static void set_eof_barrier(struct vss_task *vsst) +{ + struct fec_client *fc; + struct timeval timeout = mmd->afd.afhi.eof_tv, + *chunk_tv = vss_chunk_time(); + + if (!chunk_tv) + goto out; + list_for_each_entry(fc, &fec_client_list, node) { + struct timeval group_duration; + tv_scale(fc->group.num_chunks, chunk_tv, &group_duration); + if (tv_diff(&timeout, &group_duration, NULL) < 0) + timeout = group_duration; + } +out: + tv_add(now, &timeout, &vsst->eof_barrier); +} + /** * Check if vss status flag \a P (playing) is set. * @@ -568,12 +587,11 @@ static struct timeval *vss_compute_timeout(struct vss_task *vsst) static void vss_eof(struct vss_task *vsst) { - mmd->stream_start = *now; if (!vsst->map) return; 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); + set_eof_barrier(vsst); para_munmap(vsst->map, mmd->size); vsst->map = NULL; mmd->chunks_sent = 0; @@ -623,10 +641,7 @@ static int need_to_request_new_audio_file(struct vss_task *vsst) } /** - * Compute the timeout for para_server's main select-loop. - * - * This function gets called from para_server to determine the timeout value - * for its main select loop. + * Compute the timeout for the main select-loop of the scheduler. * * \param s Pointer to the server scheduler. * \param t Pointer to the vss task structure. @@ -652,16 +667,18 @@ static void vss_pre_select(struct sched *s, struct task *t) senders[i].shutdown_clients(); list_for_each_entry_safe(fc, tmp, &fec_client_list, node) fc->first_stream_chunk = -1; + mmd->stream_start.tv_sec = 0; + mmd->stream_start.tv_usec = 0; } if (vss_next()) vss_eof(vsst); else if (vss_paused()) { if (mmd->chunks_sent) - tv_add(&mmd->afd.afhi.eof_tv, now, &vsst->eof_barrier); + set_eof_barrier(vsst); mmd->chunks_sent = 0; } else if (vss_repos()) { tv_add(now, &vsst->announce_tv, &vsst->data_send_barrier); - tv_add(&mmd->afd.afhi.eof_tv, now, &vsst->eof_barrier); + set_eof_barrier(vsst); mmd->chunks_sent = 0; mmd->current_chunk = mmd->repos_request; mmd->new_vss_status_flags &= ~VSS_REPOS; @@ -708,9 +725,9 @@ static int recv_afs_msg(int afs_socket, int *fd, uint32_t *code, uint32_t *data) for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) - continue; + continue; if ((cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int) != 1) - continue; + continue; *fd = *(int *)CMSG_DATA(cmsg); } return 1; @@ -723,7 +740,6 @@ static void recv_afs_result(struct vss_task *vsst) struct stat statbuf; vsst->afsss = AFS_SOCKET_READY; - mmd->afd.afhi.chunk_table = NULL; ret = recv_afs_msg(vsst->afs_socket, &passed_fd, &afs_code, &afs_data); if (ret < 0) goto err; @@ -735,6 +751,7 @@ static void recv_afs_result(struct vss_task *vsst) if (passed_fd < 0) goto err; shmid = afs_data; + free(mmd->afd.afhi.info_string); ret = load_afd(shmid, &mmd->afd); if (ret < 0) goto err; @@ -780,7 +797,7 @@ err: */ static void vss_send(struct vss_task *vsst) { - int i; + int i, sent_something = 0; struct timeval due; struct fec_client *fc, *tmp_fc; @@ -791,8 +808,22 @@ static void vss_send(struct vss_task *vsst) if (chk_barrier("data send", &vsst->data_send_barrier, &due, 1) < 0) return; + list_for_each_entry_safe(fc, tmp_fc, &fec_client_list, node) { + if (!next_slice_is_due(fc, NULL)) + continue; + if (compute_next_fec_slice(fc, vsst) <= 0) + continue; + PARA_DEBUG_LOG("sending %d:%d (%u bytes)\n", fc->group.num, + fc->current_slice_num, fc->fcp->max_slice_bytes); + fc->fcp->send((char *)fc->enc_buf, + fc->fcp->max_slice_bytes, + fc->fcp->private_data); + fc->current_slice_num++; + sent_something = 1; + } if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */ - mmd->new_vss_status_flags |= VSS_NEXT; + if (!sent_something) + mmd->new_vss_status_flags |= VSS_NEXT; return; } compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv, @@ -824,18 +855,6 @@ static void vss_send(struct vss_task *vsst) mmd->chunks_sent++; mmd->current_chunk++; } - list_for_each_entry_safe(fc, tmp_fc, &fec_client_list, node) { - if (!next_slice_is_due(fc, NULL)) - continue; - if (!compute_next_fec_slice(fc, vsst)) - continue; - PARA_DEBUG_LOG("sending %d:%d (%u bytes)\n", fc->group.num, - fc->current_slice_num, fc->fcp->max_slice_bytes); - fc->fcp->send((char *)fc->enc_buf, - fc->fcp->max_slice_bytes, - fc->fcp->private_data); - fc->current_slice_num++; - } } static void vss_post_select(struct sched *s, struct task *t) @@ -858,7 +877,10 @@ static void vss_post_select(struct sched *s, struct task *t) } else if (FD_ISSET(vsst->afs_socket, &s->wfds)) { PARA_NOTICE_LOG("requesting new fd from afs\n"); ret = send_buffer(vsst->afs_socket, "new"); - vsst->afsss = AFS_SOCKET_AFD_PENDING; + if (ret < 0) + PARA_CRIT_LOG("%s\n", para_strerror(-ret)); + else + vsst->afsss = AFS_SOCKET_AFD_PENDING; } for (i = 0; senders[i].name; i++) { if (!senders[i].post_select)