X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=f225aa74568fb057058cea5d3590aae0ffeffaf1;hp=4a1db40d716c9022c7a38e0653ee50a515a53e4f;hb=ee7c57f8dc4edfdc91f2f8657b6429d90ab13e79;hpb=9d24300965cbcdfddb9f63b6bc8018da50d7d8e1 diff --git a/vss.c b/vss.c index 4a1db40d..f225aa74 100644 --- a/vss.c +++ b/vss.c @@ -1024,7 +1024,8 @@ err: */ static void vss_send(struct vss_task *vsst) { - int i, fec_active = 0; + int i; + bool fec_active = false; struct timeval due; struct fec_client *fc, *tmp_fc; @@ -1032,14 +1033,13 @@ static void vss_send(struct vss_task *vsst) return; if (chk_barrier("eof", &vsst->eof_barrier, &due, 1) < 0) return; - if (chk_barrier("data send", &vsst->data_send_barrier, - &due, 1) < 0) + 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->state == FEC_STATE_DISABLED) continue; if (!next_slice_is_due(fc, NULL)) { - fec_active = 1; + fec_active = true; continue; } if (compute_next_fec_slice(fc, vsst) <= 0) @@ -1049,7 +1049,7 @@ static void vss_send(struct vss_task *vsst) fc->current_slice_num++; fc->fcp->send_fec(fc->sc, (char *)fc->enc_buf, fc->group.slice_bytes + FEC_HEADER_SIZE); - fec_active = 1; + fec_active = true; } if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */ if (!fec_active) @@ -1067,37 +1067,17 @@ static void vss_send(struct vss_task *vsst) mmd->events++; set_mmd_offset(); } - /* - * 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. - */ vss_get_chunk(mmd->current_chunk, vsst, &buf, &len); for (i = 0; senders[i].name; i++) { + /* + * We call ->send() even if len is zero because senders + * might have data queued which can be sent now. + */ if (!senders[i].send) continue; senders[i].send(mmd->current_chunk, mmd->chunks_sent, buf, len, vsst->header_buf, vsst->header_len); } - /* - * Prefault next chunk(s) - * - * If the backing device of the memory-mapped audio file is - * slow and read-ahead is turned off or prevented for some - * reason, e.g. due to memory pressure, it may take much longer - * than the chunk interval to get the next chunk on the wire, - * causing buffer underruns on the client side. Mapping the - * file with MAP_POPULATE seems to help a bit, but it does not - * eliminate the delays completely. Moreover, it is supported - * only on Linux. So we do our own read-ahead here. - */ - if (mmd->current_chunk > 0) { /* chunk 0 might be on the heap */ - buf += len; - for (i = 0; i < 5 && buf < vsst->map + vsst->mapsize; i++) { - __a_unused volatile char x = *buf; - buf += 4096; - } - } mmd->chunks_sent++; mmd->current_chunk++; } @@ -1178,11 +1158,10 @@ static int vss_post_select(struct sched *s, void *context) * This also initializes all supported senders and starts streaming * if the --autoplay command line flag was given. */ -void init_vss_task(int afs_socket, struct sched *s) +void vss_init(int afs_socket, struct sched *s) { static struct vss_task vss_task_struct, *vsst = &vss_task_struct; int i; - char *hn = para_hostname(), *home = para_homedir(); long unsigned announce_time = OPT_UINT32_VAL(ANNOUNCE_TIME), autoplay_delay = OPT_UINT32_VAL(AUTOPLAY_DELAY); vsst->header_interval.tv_sec = 5; /* should this be configurable? */ @@ -1194,8 +1173,6 @@ void init_vss_task(int afs_socket, struct sched *s) 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 (OPT_GIVEN(AUTOPLAY)) { struct timeval tmp;