X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=vss.c;h=acac159537171c95560e5582dfef538554f04f23;hb=1d8ea0d046caf28d138fe510e2b3e2f20609071a;hp=89e06c92beb5b934b567cc48b93a91081d433931;hpb=c8862b9e246b4ef6ff1fe103946e18cf2537ecde;p=paraslash.git

diff --git a/vss.c b/vss.c
index 89e06c92..acac1595 100644
--- a/vss.c
+++ b/vss.c
@@ -25,6 +25,7 @@
 #include "net.h"
 #include "server.cmdline.h"
 #include "vss.h"
+#include "list.h"
 #include "send.h"
 #include "ipc.h"
 #include "fd.h"
@@ -142,14 +143,6 @@ static int chk_barrier(const char *bname, const struct timeval *now,
 	return -1;
 }
 
-static void vss_next_chunk_time(struct timeval *due)
-{
-	struct timeval tmp;
-
-	tv_scale(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv, &tmp);
-	tv_add(&tmp, &mmd->stream_start, due);
-}
-
 /*
  * != NULL: timeout for next chunk
  * NULL: nothing to do
@@ -176,7 +169,8 @@ static struct timeval *vss_compute_timeout(void)
 		return &the_timeout;
 	if (!vss_playing() || !map)
 		return NULL;
-	vss_next_chunk_time(&next_chunk);
+	compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv,
+		&mmd->stream_start, &next_chunk);
 	if (chk_barrier("chunk", &now, &next_chunk, &the_timeout, 0) < 0)
 		return &the_timeout;
 	/* chunk is due or bof */
@@ -188,14 +182,8 @@ static struct timeval *vss_compute_timeout(void)
 static void vss_eof(void)
 {
 	struct timeval now;
-	int i;
 	char *tmp;
 
-	if (!map) {
-		for (i = 0; senders[i].name; i++)
-			senders[i].shutdown_clients();
-		return;
-	}
 	if (mmd->new_vss_status_flags & VSS_NOMORE)
 		mmd->new_vss_status_flags = VSS_NEXT;
 	gettimeofday(&now, NULL);
@@ -221,19 +209,14 @@ static void vss_eof(void)
 /**
  * Get the header of the current audio file.
  *
- * \param header_len The length of the header is stored here.
- *
- * \return A pointer to a buffer containing the header, or NULL, if no audio
- * file is selected or if the current audio format does not need special header
- * treamtment.
+ * \param buf The length of the header is stored here.
+ * \param len Points to a buffer containing the header on return.
  *
+ * \sa afh_get_header.
  */
-char *vss_get_header(size_t *header_len)
+void vss_get_header(char **buf, size_t *len)
 {
-	if (!map || !mmd->afd.afhi.header_len)
-		return NULL;
-	*header_len = mmd->afd.afhi.header_len;
-	return map + mmd->afd.afhi.header_offset;
+	afh_get_header(&mmd->afd.afhi, map, buf, len);
 }
 
 /**
@@ -273,6 +256,19 @@ enum afs_socket_status {
 
 static enum afs_socket_status afsss;
 
+static int need_to_request_new_audio_file(void)
+{
+	if (map) /* have audio file */
+		return 0;
+	if (!vss_playing()) /* don't need one */
+		return 0;
+	if (mmd->new_vss_status_flags & VSS_NOMORE)
+		return 0;
+	if (afsss == AFS_SOCKET_AFD_PENDING) /* already requested one */
+		return 0;
+	return 1;
+}
+
 /**
  * Compute the timeout for para_server's main select-loop.
  *
@@ -297,48 +293,39 @@ static enum afs_socket_status afsss;
 struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno)
 {
 	int i;
-	struct timeval *tv;
+	struct timeval now;
 
-	para_fd_set(afs_socket, rfds, max_fileno);
-	if (!map)
+	if (!map || vss_next() || vss_paused() || vss_repos())
 		for (i = 0; senders[i].name; i++)
 			senders[i].shutdown_clients();
-	else {
-		if (vss_next()) {
-			vss_eof();
-			return vss_compute_timeout();
-		}
+	if (vss_next()) {
+		vss_eof();
+		goto out;
 	}
-	if (vss_paused() || vss_repos()) {
-		for (i = 0; senders[i].name; i++)
-			senders[i].shutdown_clients();
-		if (map) {
-			struct timeval now;
+	if (vss_paused()) {
+		if (mmd->chunks_sent) {
 			gettimeofday(&now, NULL);
-			if (!vss_paused() || mmd->chunks_sent)
-				tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
-			if (vss_repos())
-				tv_add(&now, &announce_tv, &data_send_barrier);
+			tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
 		}
 		mmd->chunks_sent = 0;
+		goto out;
 	}
 	if (vss_repos()) {
-		mmd->new_vss_status_flags &= ~(VSS_REPOS);
+		gettimeofday(&now, NULL);
+		tv_add(&now, &announce_tv, &data_send_barrier);
+		tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
+		mmd->chunks_sent = 0;
 		mmd->current_chunk = mmd->repos_request;
+		mmd->new_vss_status_flags &= ~VSS_REPOS;
 	}
-	tv = vss_compute_timeout();
-	if (tv)
-		return tv;
-	if (!map && vss_playing() &&
-			!(mmd->new_vss_status_flags & VSS_NOMORE)) {
-		if (afsss == AFS_SOCKET_READY ||
-				afsss == AFS_SOCKET_CHECK_FOR_WRITE) {
-			PARA_DEBUG_LOG("ready and playing, but no audio file\n");
-			para_fd_set(afs_socket, wfds, max_fileno);
-			afsss = AFS_SOCKET_CHECK_FOR_WRITE;
-		}
-	}
-	return tv;
+out:
+	if (need_to_request_new_audio_file()) {
+		PARA_DEBUG_LOG("ready and playing, but no audio file\n");
+		para_fd_set(afs_socket, wfds, max_fileno);
+		afsss = AFS_SOCKET_CHECK_FOR_WRITE;
+	} else
+		para_fd_set(afs_socket, rfds, max_fileno);
+	return vss_compute_timeout();
 }
 
 static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data)
@@ -362,7 +349,7 @@ static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data)
 		return -ERRNO_TO_PARA_ERROR(errno);
 	afsss = AFS_SOCKET_READY;
 	if (iov.iov_len != sizeof(buf))
-		return -E_SHORT_AFS_READ;
+		return -E_AFS_SHORT_READ;
 	*code = *(uint32_t*)buf;
 	*data =  *(uint32_t*)(buf + 4);
 	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
@@ -383,6 +370,7 @@ static void recv_afs_result(void)
 	struct stat statbuf;
 	struct timeval now;
 
+	mmd->afd.afhi.chunk_table = NULL;
 	ret = recv_afs_msg(&passed_fd, &afs_code, &afs_data);
 	if (ret < 0)
 		goto err;
@@ -419,6 +407,7 @@ static void recv_afs_result(void)
 	tv_add(&now, &announce_tv, &data_send_barrier);
 	return;
 err:
+	free(mmd->afd.afhi.chunk_table);
 	if (passed_fd >= 0)
 		close(passed_fd);
 	PARA_ERROR_LOG("%s\n", para_strerror(-ret));
@@ -429,22 +418,18 @@ void vss_post_select(fd_set *rfds, fd_set *wfds)
 {
 	int ret;
 
-	if (FD_ISSET(afs_socket, rfds))
-		recv_afs_result();
-	if (afsss != AFS_SOCKET_CHECK_FOR_WRITE || !FD_ISSET(afs_socket, wfds))
+	if (afsss != AFS_SOCKET_CHECK_FOR_WRITE) {
+		if (FD_ISSET(afs_socket, rfds))
+			recv_afs_result();
+		return;
+	}
+	if (!FD_ISSET(afs_socket, wfds))
 		return;
 	PARA_NOTICE_LOG("requesting new fd from afs\n");
 	ret = send_buffer(afs_socket, "new");
 	afsss = AFS_SOCKET_AFD_PENDING;
 }
 
-static void get_chunk(long unsigned chunk_num, char **buf, size_t *len)
-{
-	size_t pos = mmd->afd.afhi.chunk_table[chunk_num];
-	*buf = map + pos;
-	*len = mmd->afd.afhi.chunk_table[chunk_num + 1] - pos;
-}
-
 /**
  * Get the data of the given chunk.
  *
@@ -460,7 +445,7 @@ int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len)
 		return -E_CHUNK;
 	if (chunk_num >= mmd->afd.afhi.chunks_total)
 		return -E_CHUNK;
-	get_chunk(chunk_num, buf, len);
+	afh_get_chunk(chunk_num, &mmd->afd.afhi, map, buf, len);
 	return 1;
 }
 
@@ -483,7 +468,8 @@ void vss_send_chunk(void)
 	if (!map || !vss_playing())
 		return;
 	gettimeofday(&now, NULL);
-	vss_next_chunk_time(&due);
+	compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv,
+		&mmd->stream_start, &due);
 	if (tv_diff(&due, &now, NULL) > 0)
 		return;
 	if (chk_barrier("eof", &now, &eof_barrier, &due, 1) < 0)
@@ -494,12 +480,12 @@ void vss_send_chunk(void)
 	mmd->new_vss_status_flags &= ~VSS_REPOS;
 	if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */
 		mmd->new_vss_status_flags |= VSS_NEXT;
-		return vss_eof();
+		return;
 	}
 	/*
 	 * 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.
-  	 */
+	 * might have still some data queued which can be sent in this case.
+	 */
 	if (!mmd->chunks_sent) {
 		struct timeval tmp;
 		gettimeofday(&mmd->stream_start, NULL);
@@ -507,7 +493,7 @@ void vss_send_chunk(void)
 		mmd->offset = tv2ms(&tmp);
 		mmd->events++;
 	}
-	get_chunk(mmd->current_chunk, &buf, &len);
+	afh_get_chunk(mmd->current_chunk, &mmd->afd.afhi, map, &buf, &len);
 	for (i = 0; senders[i].name; i++)
 		senders[i].send(mmd->current_chunk, mmd->chunks_sent, buf, len);
 	mmd->new_vss_status_flags |= VSS_PLAYING;