X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=f69225ea1ee5927d5d327f418db4cbf7e31cc8bc;hp=f225aa74568fb057058cea5d3590aae0ffeffaf1;hb=da13797a119f8ce621a67145ca1c7acb8d338a3c;hpb=a61e862450dc1e74394bf5bbf7002d9947f98d31

diff --git a/vss.c b/vss.c
index f225aa74..f69225ea 100644
--- a/vss.c
+++ b/vss.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file vss.c The virtual streaming system.
  *
@@ -349,7 +345,7 @@ static int initialize_fec_client(struct fec_client *fc, struct vss_task *vsst)
 	return 1;
 }
 
-static void vss_get_chunk(int chunk_num, struct vss_task *vsst,
+static int vss_get_chunk(int chunk_num, struct vss_task *vsst,
 		char **buf, size_t *sz)
 {
 	int ret;
@@ -366,31 +362,32 @@ static void vss_get_chunk(int chunk_num, struct vss_task *vsst,
 		assert(vsst->header_buf);
 		*buf = vsst->header_buf; /* stripped header */
 		*sz = vsst->header_len;
-		return;
+		return 0;
 	}
 	ret = afh_get_chunk(chunk_num, &mmd->afd.afhi,
 		mmd->afd.audio_format_id, vsst->map, vsst->mapsize,
 		(const char **)buf, sz, &vsst->afh_context);
 	if (ret < 0) {
-		PARA_WARNING_LOG("could not get chunk %d: %s\n",
-			chunk_num, para_strerror(-ret));
 		*buf = NULL;
 		*sz = 0;
 	}
+	return ret;
 }
 
-static void compute_group_size(struct vss_task *vsst, struct fec_group *g,
+static int compute_group_size(struct vss_task *vsst, struct fec_group *g,
 		int max_bytes)
 {
 	char *buf;
 	size_t len;
-	int i, max_chunks = PARA_MAX(1LU, 150 / tv2ms(vss_chunk_time()));
+	int ret, i, max_chunks = PARA_MAX(1LU, 150 / tv2ms(vss_chunk_time()));
 
 	if (g->first_chunk == 0) {
 		g->num_chunks = 1;
-		vss_get_chunk(0, vsst, &buf, &len);
+		ret = vss_get_chunk(0, vsst, &buf, &len);
+		if (ret < 0)
+			 return ret;
 		g->bytes = len;
-		return;
+		return 0;
 	}
 
 	g->num_chunks = 0;
@@ -408,7 +405,9 @@ static void compute_group_size(struct vss_task *vsst, struct fec_group *g,
 			break;
 		if (chunk_num >= mmd->afd.afhi.chunks_total) /* eof */
 			break;
-		vss_get_chunk(chunk_num, vsst, &buf, &len);
+		ret = vss_get_chunk(chunk_num, vsst, &buf, &len);
+		if (ret < 0)
+			 return ret;
 		if (g->bytes + len > max_bytes)
 			break;
 		/* Include this chunk */
@@ -416,6 +415,7 @@ static void compute_group_size(struct vss_task *vsst, struct fec_group *g,
 		g->num_chunks++;
 	}
 	assert(g->num_chunks);
+	return 1;
 }
 
 /*
@@ -477,7 +477,9 @@ static int compute_slice_size(struct fec_client *fc, struct vss_task *vsst)
 	if (!need_audio_header(fc, vsst)) {
 		max_group_bytes = k * max_slice_bytes;
 		g->num_header_slices = 0;
-		compute_group_size(vsst, g, max_group_bytes);
+		ret = compute_group_size(vsst, g, max_group_bytes);
+		if (ret < 0)
+			return ret;
 		g->slice_bytes = DIV_ROUND_UP(g->bytes, k);
 		if (g->slice_bytes == 0)
 			g->slice_bytes = 1;
@@ -493,7 +495,9 @@ static int compute_slice_size(struct fec_client *fc, struct vss_task *vsst)
 	h = vsst->header_len;
 	max_group_bytes = (k - num_slices(h, max_slice_bytes, n - k))
 		* max_slice_bytes;
-	compute_group_size(vsst, g, max_group_bytes);
+	ret = compute_group_size(vsst, g, max_group_bytes);
+	if (ret < 0)
+		return ret;
 	d = g->bytes;
 	if (d == 0) {
 		g->slice_bytes = DIV_ROUND_UP(h, k);
@@ -600,7 +604,9 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
 	 * Setup data slices. Note that for ogg streams chunk 0 points to a
 	 * buffer on the heap rather than to the mapped audio file.
 	 */
-	vss_get_chunk(g->first_chunk, vsst, &buf, &len);
+	ret = vss_get_chunk(g->first_chunk, vsst, &buf, &len);
+	if (ret < 0)
+		return ret;
 	for (p = buf; i < g->num_header_slices + data_slices; i++) {
 		if (p + g->slice_bytes > buf + g->bytes) {
 			/*
@@ -991,7 +997,7 @@ static void recv_afs_result(struct vss_task *vsst, fd_set *rfds)
 		goto err;
 	}
 	ret = para_mmap(statbuf.st_size, PROT_READ, MAP_PRIVATE | MAP_POPULATE,
-		passed_fd, 0, &vsst->map);
+		passed_fd, &vsst->map);
 	if (ret < 0)
 		goto err;
 	vsst->mapsize = statbuf.st_size;
@@ -1024,10 +1030,12 @@ err:
  */
 static void vss_send(struct vss_task *vsst)
 {
-	int i;
+	int i, ret;
 	bool fec_active = false;
 	struct timeval due;
 	struct fec_client *fc, *tmp_fc;
+	char *buf;
+	size_t len;
 
 	if (!vsst->map || !vss_playing())
 		return;
@@ -1058,29 +1066,31 @@ static void vss_send(struct vss_task *vsst)
 	}
 	compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv,
 		&mmd->stream_start, &due);
-	if (tv_diff(&due, now, NULL) <= 0) {
-		char *buf;
-		size_t len;
-
-		if (!mmd->chunks_sent) {
-			mmd->stream_start = *now;
-			mmd->events++;
-			set_mmd_offset();
-		}
-		vss_get_chunk(mmd->current_chunk, vsst, &buf, &len);
+	if (tv_diff(&due, now, NULL) > 0)
+		return;
+	if (!mmd->chunks_sent) {
+		mmd->stream_start = *now;
+		mmd->events++;
+		set_mmd_offset();
+	}
+	ret = vss_get_chunk(mmd->current_chunk, vsst, &buf, &len);
+	if (ret < 0) {
+		PARA_ERROR_LOG("could not get chunk %lu: %s\n",
+			mmd->current_chunk, para_strerror(-ret));
+	} else {
+		/*
+		 * We call ->send() even if len is zero because senders might
+		 * have data queued which can be sent now.
+		 */
 		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);
 		}
-		mmd->chunks_sent++;
-		mmd->current_chunk++;
 	}
+	mmd->chunks_sent++;
+	mmd->current_chunk++;
 }
 
 static int vss_post_select(struct sched *s, void *context)
@@ -1184,7 +1194,7 @@ void vss_init(int afs_socket, struct sched *s)
 			&vsst->data_send_barrier);
 	}
 	vsst->task = task_register(&(struct task_info) {
-		.name = "vss task",
+		.name = "vss",
 		.pre_select = vss_pre_select,
 		.post_select = vss_post_select,
 		.context = vsst,