X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=vss.c;h=fce5281b5d3f750592016839bd14649452a93011;hb=bb899fb1a0c279a2890ff30d11bf7aec50fb92ed;hp=9e2e32ca3b3bd7979b3c564ff1959dcbe7560446;hpb=d511199b1f1f91cc53e31637bb801e5c2425829e;p=paraslash.git

diff --git a/vss.c b/vss.c
index 9e2e32ca..fce5281b 100644
--- a/vss.c
+++ b/vss.c
@@ -28,8 +28,8 @@
 #include "net.h"
 #include "server.h"
 #include "list.h"
-#include "send.h"
 #include "sched.h"
+#include "send.h"
 #include "vss.h"
 #include "ipc.h"
 #include "fd.h"
@@ -348,7 +348,7 @@ static int initialize_fec_client(struct fec_client *fc, struct vss_task *vsst)
 }
 
 static int vss_get_chunk(int chunk_num, struct vss_task *vsst,
-		char **buf, size_t *sz)
+		char **buf, uint32_t *len)
 {
 	int ret;
 
@@ -363,15 +363,15 @@ static int vss_get_chunk(int chunk_num, struct vss_task *vsst,
 	if (chunk_num == 0 && vsst->header_len > 0) {
 		assert(vsst->header_buf);
 		*buf = vsst->header_buf; /* stripped header */
-		*sz = vsst->header_len;
+		*len = vsst->header_len;
 		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);
+		(const char **)buf, len, &vsst->afh_context);
 	if (ret < 0) {
 		*buf = NULL;
-		*sz = 0;
+		*len = 0;
 	}
 	return ret;
 }
@@ -380,7 +380,7 @@ static int compute_group_size(struct vss_task *vsst, struct fec_group *g,
 		int max_bytes)
 {
 	char *buf;
-	size_t len;
+	uint32_t len;
 	int ret, i, max_chunks = PARA_MAX(1LU, 150 / tv2ms(vss_chunk_time()));
 
 	if (g->first_chunk == 0) {
@@ -587,7 +587,7 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
 	slice_copied = 0;
 	for (c = g->first_chunk; c < g->first_chunk + g->num_chunks; c++) {
 		char *buf;
-		size_t src_len;
+		uint32_t src_len;
 		ret = vss_get_chunk(c, vsst, &buf, &src_len);
 		if (ret < 0)
 			return ret;
@@ -845,7 +845,6 @@ static void vss_compute_timeout(struct sched *s, struct vss_task *vsst)
 
 static void vss_eof(struct vss_task *vsst)
 {
-
 	if (!vsst->map)
 		return;
 	if (mmd->new_vss_status_flags & VSS_NOMORE)
@@ -856,8 +855,8 @@ static void vss_eof(struct vss_task *vsst)
 	para_munmap(vsst->map, vsst->mapsize);
 	vsst->map = NULL;
 	mmd->chunks_sent = 0;
-	//mmd->offset = 0;
 	mmd->afd.afhi.seconds_total = 0;
+	mmd->afd.afhi.chunks_total = 0;
 	mmd->afd.afhi.chunk_tv.tv_sec = 0;
 	mmd->afd.afhi.chunk_tv.tv_usec = 0;
 	free(mmd->afd.afhi.chunk_table);
@@ -900,14 +899,14 @@ static void vss_pre_select(struct sched *s, void *context)
 
 	if (need_to_request_new_audio_file(vsst)) {
 		PARA_DEBUG_LOG("ready and playing, but no audio file\n");
-		para_fd_set(vsst->afs_socket, &s->wfds, &s->max_fileno);
+		sched_monitor_writefd(vsst->afs_socket, s);
 		vsst->afsss = AFS_SOCKET_CHECK_FOR_WRITE;
 	} else
-		para_fd_set(vsst->afs_socket, &s->rfds, &s->max_fileno);
+		sched_monitor_readfd(vsst->afs_socket, s);
 	FOR_EACH_SENDER(i) {
 		if (!senders[i]->pre_select)
 			continue;
-		senders[i]->pre_select(&s->max_fileno, &s->rfds, &s->wfds);
+		senders[i]->pre_select(s);
 	}
 	vss_compute_timeout(s, vsst);
 }
@@ -951,13 +950,13 @@ static int recv_afs_msg(int afs_socket, int *fd, uint32_t *code, uint32_t *data)
 #define MAP_POPULATE 0
 #endif
 
-static void recv_afs_result(struct vss_task *vsst, fd_set *rfds)
+static void recv_afs_result(struct vss_task *vsst, const struct sched *s)
 {
 	int ret, passed_fd, shmid;
 	uint32_t afs_code = 0, afs_data = 0;
 	struct stat statbuf;
 
-	if (!FD_ISSET(vsst->afs_socket, rfds))
+	if (!sched_read_ok(vsst->afs_socket, s))
 		return;
 	ret = recv_afs_msg(vsst->afs_socket, &passed_fd, &afs_code, &afs_data);
 	if (ret == -ERRNO_TO_PARA_ERROR(EAGAIN))
@@ -1030,7 +1029,7 @@ static void vss_send(struct vss_task *vsst)
 	struct timeval due;
 	struct fec_client *fc, *tmp_fc;
 	char *buf;
-	size_t len;
+	uint32_t len;
 
 	if (!vsst->map || !vss_playing())
 		return;
@@ -1138,9 +1137,9 @@ static int vss_post_select(struct sched *s, void *context)
 		mmd->sender_cmd_data.cmd_num = -1;
 	}
 	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");
+		recv_afs_result(vsst, s);
+	else if (sched_write_ok(vsst->afs_socket, s)) {
+		PARA_INFO_LOG("requesting new fd from afs\n");
 		ret = write_buffer(vsst->afs_socket, "new");
 		if (ret < 0)
 			PARA_CRIT_LOG("%s\n", para_strerror(-ret));
@@ -1150,7 +1149,7 @@ static int vss_post_select(struct sched *s, void *context)
 	FOR_EACH_SENDER(i) {
 		if (!senders[i]->post_select)
 			continue;
-		senders[i]->post_select(&s->rfds, &s->wfds);
+		senders[i]->post_select(s);
 	}
 	if ((vss_playing() && !(mmd->vss_status_flags & VSS_PLAYING)) ||
 			(vss_next() && vss_playing()))
@@ -1209,11 +1208,14 @@ void vss_init(int afs_socket, struct sched *s)
 void vss_shutdown(void)
 {
 	int i;
+	bool is_command_handler = process_is_command_handler();
 
 	FOR_EACH_SENDER(i) {
 		if (!senders[i]->shutdown)
 			continue;
-		PARA_NOTICE_LOG("shutting down %s sender\n", senders[i]->name);
+		if (!is_command_handler)
+			PARA_NOTICE_LOG("shutting down %s sender\n",
+				senders[i]->name);
 		senders[i]->shutdown();
 	}
 }