X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=55eaf2eb0525d402dad6d3b47afb3e8b0241dad3;hp=f1bb57983609ad60c20cb03ba73b3a1e518e9cd3;hb=ac4e01ba1a2f302bf31dd511a7aff8da78660b15;hpb=e5de57de1b8bf1df96c152fc92f5a49f75d6d96c

diff --git a/vss.c b/vss.c
index f1bb5798..55eaf2eb 100644
--- a/vss.c
+++ b/vss.c
@@ -40,24 +40,9 @@ extern void dccp_send_init(struct sender *);
 extern void http_send_init(struct sender *);
 extern void udp_send_init(struct sender *);
 
-/** The list of supported senders. */
-struct sender senders[] = {
-	{
-		.name = "http",
-		.init = http_send_init,
-	},
-	{
-		.name = "dccp",
-		.init = dccp_send_init,
-	},
-	{
-		.name = "udp",
-		.init = udp_send_init,
-	},
-	{
-		.name = NULL,
-	}
-};
+extern const struct sender udp_sender, dccp_sender, http_sender;
+const struct sender * const senders[] = {
+	&http_sender, &dccp_sender, &udp_sender, NULL};
 
 /** The possible states of the afs socket. */
 enum afs_socket_status {
@@ -918,10 +903,10 @@ static void vss_pre_select(struct sched *s, void *context)
 		vsst->afsss = AFS_SOCKET_CHECK_FOR_WRITE;
 	} else
 		para_fd_set(vsst->afs_socket, &s->rfds, &s->max_fileno);
-	for (i = 0; senders[i].name; i++) {
-		if (!senders[i].pre_select)
+	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->max_fileno, &s->rfds, &s->wfds);
 	}
 	vss_compute_timeout(s, vsst);
 }
@@ -997,7 +982,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;
@@ -1082,10 +1067,10 @@ static void vss_send(struct vss_task *vsst)
 		 * 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++) {
-			if (!senders[i].send)
+		FOR_EACH_SENDER(i) {
+			if (!senders[i]->send)
 				continue;
-			senders[i].send(mmd->current_chunk, mmd->chunks_sent,
+			senders[i]->send(mmd->current_chunk, mmd->chunks_sent,
 				buf, len, vsst->header_buf, vsst->header_len);
 		}
 	}
@@ -1098,12 +1083,15 @@ static int vss_post_select(struct sched *s, void *context)
 	int ret, i;
 	struct vss_task *vsst = context;
 
+	ret = task_get_notification(vsst->task);
+	if (ret < 0)
+		return ret;
 	if (!vsst->map || vss_next() || vss_paused() || vss_repos()) {
 		/* shut down senders and fec clients */
 		struct fec_client *fc, *tmp;
-		for (i = 0; senders[i].name; i++)
-			if (senders[i].shutdown_clients)
-				senders[i].shutdown_clients();
+		FOR_EACH_SENDER(i)
+			if (senders[i]->shutdown_clients)
+				senders[i]->shutdown_clients();
 		list_for_each_entry_safe(fc, tmp, &fec_client_list, node)
 			fc->state = FEC_STATE_NONE;
 		mmd->stream_start.tv_sec = 0;
@@ -1129,8 +1117,8 @@ static int vss_post_select(struct sched *s, void *context)
 		int num = mmd->sender_cmd_data.cmd_num,
 			sender_num = mmd->sender_cmd_data.sender_num;
 
-		if (senders[sender_num].client_cmds[num]) {
-			ret = senders[sender_num].client_cmds[num]
+		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));
@@ -1147,10 +1135,10 @@ static int vss_post_select(struct sched *s, void *context)
 		else
 			vsst->afsss = AFS_SOCKET_AFD_PENDING;
 	}
-	for (i = 0; senders[i].name; i++) {
-		if (!senders[i].post_select)
+	FOR_EACH_SENDER(i) {
+		if (!senders[i]->post_select)
 			continue;
-		senders[i].post_select(&s->rfds, &s->wfds);
+		senders[i]->post_select(&s->rfds, &s->wfds);
 	}
 	if ((vss_playing() && !(mmd->vss_status_flags & VSS_PLAYING)) ||
 			(vss_next() && vss_playing()))
@@ -1179,9 +1167,9 @@ void vss_init(int afs_socket, struct sched *s)
 	ms2tv(announce_time, &vsst->announce_tv);
 	PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&vsst->announce_tv));
 	INIT_LIST_HEAD(&fec_client_list);
-	for (i = 0; senders[i].name; i++) {
-		PARA_NOTICE_LOG("initializing %s sender\n", senders[i].name);
-		senders[i].init(&senders[i]);
+	FOR_EACH_SENDER(i) {
+		PARA_NOTICE_LOG("initializing %s sender\n", senders[i]->name);
+		senders[i]->init();
 	}
 	mmd->sender_cmd_data.cmd_num = -1;
 	if (OPT_GIVEN(AUTOPLAY)) {
@@ -1194,9 +1182,26 @@ 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,
 	}, s);
 }
+
+/**
+ * Turn off the virtual streaming system.
+ *
+ * This is only executed on exit. It calls the ->shutdowwn method of all senders.
+ */
+void vss_shutdown(void)
+{
+	int i;
+
+	FOR_EACH_SENDER(i) {
+		if (!senders[i]->shutdown)
+			continue;
+		PARA_NOTICE_LOG("shutting down %s sender\n", senders[i]->name);
+		senders[i]->shutdown();
+	}
+}