X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=aae601d14153d6973a8a86f8f8a93e69cd6c8bbd;hp=a8486bbd9e86e64b6734117386ab5fcca83bd26a;hb=ddd7cd853044105f329a2c70cce2d8f1470f559e;hpb=183093903e2d40114ec81f9263126d5c6def12d5 diff --git a/vss.c b/vss.c index a8486bbd..aae601d1 100644 --- a/vss.c +++ b/vss.c @@ -124,13 +124,15 @@ struct fec_group { /** The group duration divided by the number of slices. */ struct timeval slice_duration; /** Group contains the audio file header that occupies that many slices. */ - unsigned num_header_slices; + uint8_t num_header_slices; }; /** * Describes one connected FEC client. */ struct fec_client { + /** If negative, this client is temporarily disabled. */ + int error; /** Parameters requested by the client. */ struct fec_client_parms *fcp; /** Used by the core FEC code. */ @@ -209,21 +211,41 @@ 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; } -static uint8_t num_slices(long unsigned bytes, struct fec_client *fc) +static int num_slices(long unsigned bytes, struct fec_client *fc, uint8_t *result) { - uint16_t m = fc->fcp->max_slice_bytes - FEC_HEADER_SIZE; - return (bytes + m - 1) / m; + unsigned long m = fc->fcp->max_slice_bytes - FEC_HEADER_SIZE; + unsigned rv, redundant_slices = fc->fcp->slices_per_group + - fc->fcp->data_slices_per_group; + + if (!m) + return -E_BAD_CT; + rv = (bytes + m - 1) / m; + if (rv + redundant_slices > 255) + return -E_BAD_CT; + *result = rv; + return 1; +} + +static void set_slice_duration(struct fec_client *fc, struct fec_group *g) +{ + struct timeval group_duration, *chunk_tv = vss_chunk_time(); + + tv_scale(g->num_chunks, chunk_tv, &group_duration); + tv_divide(fc->fcp->slices_per_group + fc->num_extra_slices, + &group_duration, &g->slice_duration); + PARA_DEBUG_LOG("durations (group/chunk/slice): %lu/%lu/%lu\n", + tv2ms(&group_duration), tv2ms(chunk_tv), tv2ms(&g->slice_duration)); } static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst) { - int i, k, data_slices; + int ret, i, k, data_slices; size_t len; const char *buf, *start_buf; struct timeval tmp, *chunk_tv = vss_chunk_time(); @@ -236,12 +258,15 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst) if (fc->first_stream_chunk < 0) { uint32_t largest = afh_get_largest_chunk_size(&mmd->afd.afhi) + vsst->header_len; - uint8_t needed = num_slices(largest, fc), want; + uint8_t needed, want; + + ret = num_slices(largest, fc, &needed); + if (ret < 0) + return ret; if (needed > fc->fcp->data_slices_per_group) PARA_WARNING_LOG("fec parms insufficient for this audio file\n"); want = PARA_MAX(needed, fc->fcp->data_slices_per_group); if (want != k) { - int ret; fec_free(fc->parms); fc->src_data = para_realloc(fc->src_data, want * sizeof(char *)); ret = fec_new(want, want + fc->fcp->slices_per_group @@ -261,14 +286,18 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst) g->first_chunk = mmd->current_chunk; g->num = 0; } else { + /* use duration of the previous group for the timing of this group */ + set_slice_duration(fc, g); g->first_chunk += g->num_chunks; g->num++; } if (g->first_chunk >= mmd->afd.afhi.chunks_total) return 0; - if (need_audio_header(fc, vsst)) - g->num_header_slices = num_slices(vsst->header_len, fc); - else + if (need_audio_header(fc, vsst)) { + ret = num_slices(vsst->header_len, fc, &g->num_header_slices); + if (ret < 0) + return ret; + } else g->num_header_slices = 0; afh_get_chunk(g->first_chunk, &mmd->afd.afhi, vsst->map, &start_buf, &len); @@ -285,6 +314,8 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst) g->num_chunks = i - g->first_chunk; assert(g->num_chunks); fc->current_slice_num = 0; + if (g->num == 0) + set_slice_duration(fc, g); /* setup header slices */ buf = vsst->header_buf; @@ -316,32 +347,37 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst) for (; i < k; i++) fc->src_data[i] = (const unsigned char *)buf; } - - /* setup group timing */ - tv_scale(g->first_chunk - fc->first_stream_chunk, chunk_tv, &tmp); - tv_add(&fc->stream_start, &tmp, &g->start); - if (g->num) /* quick hack to avoid buffer underruns */ - g->start.tv_sec--; - tv_scale(g->num_chunks, chunk_tv, &tmp); /* group duration */ - tv_divide(fc->fcp->slices_per_group + fc->num_extra_slices, - &tmp, &g->slice_duration); - - PARA_DEBUG_LOG("FEC group %d: %d chunks (%d - %d), %d header slices, %d data slices\n", + PARA_DEBUG_LOG("FEC group %d: %d chunks (%d - %d), " + "%d header slices, %d data slices\n", g->num, g->num_chunks, g->first_chunk, g->first_chunk + g->num_chunks - 1, g->num_header_slices, data_slices ); - PARA_DEBUG_LOG("durations (group/chunk/slice): %lu/%lu/%lu\n", - tv2ms(&tmp), tv2ms(chunk_tv), tv2ms(&g->slice_duration)); + /* set group start */ + if (g->num != 0 && vsst->header_len != 0 && fc->first_stream_chunk == 0) + /* chunk #0 is the audio file header */ + tv_scale(g->first_chunk - 1, chunk_tv, &tmp); + else + tv_scale(g->first_chunk - fc->first_stream_chunk, + chunk_tv, &tmp); + tv_add(&fc->stream_start, &tmp, &g->start); return 1; } static int compute_next_fec_slice(struct fec_client *fc, struct vss_task *vsst) { + assert(fc->error >= 0); 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)) + int ret = setup_next_fec_group(fc, vsst); + if (ret == 0) return 0; + if (ret < 0) { + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); + PARA_ERROR_LOG("FEC client temporarily disabled\n"); + fc->error = ret; + return fc->error; + } } write_fec_header(fc, vsst); fec_encode(fc->parms, fc->src_data, fc->enc_buf + FEC_HEADER_SIZE, @@ -446,6 +482,8 @@ static void compute_slice_timeout(struct timeval *timeout) list_for_each_entry(fc, &fec_client_list, node) { struct timeval diff; + if (fc->error < 0) + continue; if (next_slice_is_due(fc, &diff)) { timeout->tv_sec = 0; timeout->tv_usec = 0; @@ -457,6 +495,27 @@ 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; + + if (fc->error < 0) + continue; + 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 +627,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 +681,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. @@ -650,18 +705,22 @@ static void vss_pre_select(struct sched *s, struct task *t) for (i = 0; senders[i].name; i++) if (senders[i].shutdown_clients) senders[i].shutdown_clients(); - list_for_each_entry_safe(fc, tmp, &fec_client_list, node) + list_for_each_entry_safe(fc, tmp, &fec_client_list, node) { fc->first_stream_chunk = -1; + fc->error = 0; + } + 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; @@ -723,7 +782,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 +793,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 +839,7 @@ err: */ static void vss_send(struct vss_task *vsst) { - int i; + int i, fec_active = 0; struct timeval due; struct fec_client *fc, *tmp_fc; @@ -791,8 +850,26 @@ 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 (fc->error < 0) + continue; + if (!next_slice_is_due(fc, NULL)) { + fec_active = 1; + 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++; + fec_active = 1; + } if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */ - mmd->new_vss_status_flags |= VSS_NEXT; + if (!fec_active) + mmd->new_vss_status_flags |= VSS_NEXT; return; } compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv, @@ -824,18 +901,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 +923,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)