X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=625fabe766bb7707ac2a35125f7af0ce250f1cae;hp=3632cf54557350f35dc19ec8a2ce07ce9a6d5c0f;hb=71c6743e00d5741dc8eb60594575339543be0bcf;hpb=bd28ec9a64884d70917c4fdea1a3a70c91758f83 diff --git a/vss.c b/vss.c index 3632cf54..625fabe7 100644 --- a/vss.c +++ b/vss.c @@ -1032,8 +1032,7 @@ 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) @@ -1046,9 +1045,9 @@ static void vss_send(struct vss_task *vsst) continue; PARA_DEBUG_LOG("sending %u:%u (%u bytes)\n", fc->group.num, fc->current_slice_num, fc->group.slice_bytes); + fc->current_slice_num++; fc->fcp->send_fec(fc->sc, (char *)fc->enc_buf, fc->group.slice_bytes + FEC_HEADER_SIZE); - fc->current_slice_num++; fec_active = 1; } if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */ @@ -1067,13 +1066,12 @@ 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,