X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=898180c013a4845481bbfd48782fa9168f8e9048;hp=1a038f060bd1f0e2ecfd842e9f08fd7f704f70e2;hb=9b565c60fd159e12d255bb18db9dbff066deebea;hpb=9609fd30e0d3db45ede3ab5c6bc3a77c15b6aef8

diff --git a/vss.c b/vss.c
index 1a038f06..898180c0 100644
--- a/vss.c
+++ b/vss.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -290,19 +290,20 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
 		g->num = 0;
 		g->start = *now;
 	} else {
+		struct timeval tmp;
+		if (g->first_chunk + g->num_chunks >= mmd->afd.afhi.chunks_total)
+			return 0;
 		/*
 		 * Start and duration of this group depend only on the previous
 		 * group. Compute the new group start as g->start += g->duration.
 		 */
-		struct timeval tmp = g->start;
+		tmp = g->start;
 		tv_add(&tmp, &g->duration, &g->start);
 		k = fc->fcp->data_slices_per_group + fc->num_extra_slices;
 		set_group_timing(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)) {
 		ret = num_slices(vsst->header_len, fc, &g->num_header_slices);
 		if (ret < 0)
@@ -780,16 +781,20 @@ static int recv_afs_msg(int afs_socket, int *fd, uint32_t *code, uint32_t *data)
 	return 1;
 }
 
-static void recv_afs_result(struct vss_task *vsst)
+static void recv_afs_result(struct vss_task *vsst, fd_set *rfds)
 {
 	int ret, passed_fd, shmid;
 	uint32_t afs_code = 0, afs_data = 0;
 	struct stat statbuf;
 
-	vsst->afsss = AFS_SOCKET_READY;
+	if (!FD_ISSET(vsst->afs_socket, rfds))
+		return;
 	ret = recv_afs_msg(vsst->afs_socket, &passed_fd, &afs_code, &afs_data);
+	if (ret == -ERRNO_TO_PARA_ERROR(EAGAIN))
+		return;
 	if (ret < 0)
 		goto err;
+	vsst->afsss = AFS_SOCKET_READY;
 	PARA_DEBUG_LOG("fd: %d, code: %u, shmid: %u\n", passed_fd, afs_code,
 		afs_data);
 	ret = -E_NOFD;
@@ -919,10 +924,9 @@ static void vss_post_select(struct sched *s, struct task *t)
 			senders[sender_num].client_cmds[num](&mmd->sender_cmd_data);
 		mmd->sender_cmd_data.cmd_num = -1;
 	}
-	if (vsst->afsss != AFS_SOCKET_CHECK_FOR_WRITE) {
-		if (FD_ISSET(vsst->afs_socket, &s->rfds))
-			recv_afs_result(vsst);
-	} else if (FD_ISSET(vsst->afs_socket, &s->wfds)) {
+	if (vsst->afsss != AFS_SOCKET_CHECK_FOR_WRITE)
+		recv_afs_result(vsst, &s->rfds);
+	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");
 		if (ret < 0)