X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=0eb235c72e711391beee1f417ca997e8c5d65870;hp=0b6735ba11014356aa44feb28cdef7b52de1181f;hb=f7feafeef70ad8f4e8c6fff715a2287f3240e759;hpb=b55f996a9d756a84b7fb880df6a9b917215ea058

diff --git a/vss.c b/vss.c
index 0b6735ba..0eb235c7 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)
@@ -636,7 +637,7 @@ static void vss_eof(struct vss_task *vsst)
 	para_munmap(vsst->map, mmd->size);
 	vsst->map = NULL;
 	mmd->chunks_sent = 0;
-	mmd->offset = 0;
+	//mmd->offset = 0;
 	mmd->afd.afhi.seconds_total = 0;
 	mmd->afd.afhi.chunk_tv.tv_sec = 0;
 	mmd->afd.afhi.chunk_tv.tv_usec = 0;
@@ -677,6 +678,13 @@ static int need_to_request_new_audio_file(struct vss_task *vsst)
 	return 1;
 }
 
+static void set_mmd_offset(void)
+{
+	struct timeval offset;
+	tv_scale(mmd->current_chunk, &mmd->afd.afhi.chunk_tv, &offset);
+	mmd->offset = tv2ms(&offset);
+}
+
 /**
  * Compute the timeout for the main select-loop of the scheduler.
  *
@@ -721,6 +729,7 @@ static void vss_pre_select(struct sched *s, struct task *t)
 		mmd->chunks_sent = 0;
 		mmd->current_chunk = mmd->repos_request;
 		mmd->new_vss_status_flags &= ~VSS_REPOS;
+		set_mmd_offset();
 	}
 	if (need_to_request_new_audio_file(vsst)) {
 		PARA_DEBUG_LOG("ready and playing, but no audio file\n");
@@ -772,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;
@@ -875,11 +888,9 @@ static void vss_send(struct vss_task *vsst)
 		size_t len;
 
 		if (!mmd->chunks_sent) {
-			struct timeval tmp;
 			mmd->stream_start = *now;
-			tv_scale(mmd->current_chunk, &mmd->afd.afhi.chunk_tv, &tmp);
-			mmd->offset = tv2ms(&tmp);
 			mmd->events++;
+			set_mmd_offset();
 		}
 		/*
 		 * We call the send function also in case of empty chunks as
@@ -909,14 +920,17 @@ static void vss_post_select(struct sched *s, struct task *t)
 		int num = mmd->sender_cmd_data.cmd_num,
 			sender_num = mmd->sender_cmd_data.sender_num;
 
-		if (senders[sender_num].client_cmds[num])
-			senders[sender_num].client_cmds[num](&mmd->sender_cmd_data);
+		if (senders[sender_num].client_cmds[num]) {
+			ret = senders[sender_num].client_cmds[num]
+				(&mmd->sender_cmd_data);
+			if (ret < 0)
+				PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+		}
 		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)