X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=vss.c;h=49fd7ae2a38b21339d424e52623cd5e425132681;hb=742c8b3f79a59278ced71e1855da1846b157b494;hp=d2fbfb3424162afdab808d52bf40c33c83e61295;hpb=e854df2fe2cfb3ae90a439828fc13cc0fc470aa9;p=paraslash.git

diff --git a/vss.c b/vss.c
index d2fbfb34..49fd7ae2 100644
--- a/vss.c
+++ b/vss.c
@@ -43,7 +43,7 @@ const struct sender * const senders[] = {
 enum afs_socket_status {
 	/** Socket is inactive. */
 	AFS_SOCKET_READY,
-	/** Socket fd was included in the write fd set for select(). */
+	/** Socket fd was monitored for writing. */
 	AFS_SOCKET_CHECK_FOR_WRITE,
 	/** vss wrote a request to the socket and waits for reply from afs. */
 	AFS_SOCKET_AFD_PENDING
@@ -827,7 +827,7 @@ static void vss_compute_timeout(struct sched *s, struct vss_task *vsst)
 	if (sched_request_barrier(&vsst->data_send_barrier, s) == 1)
 		return;
 	/*
-	 * Compute the select timeout as the minimal time until the next
+	 * Compute the I/O timeout as the minimal time until the next
 	 * chunk/slice is due for any client.
 	 */
 	compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv,
@@ -899,10 +899,10 @@ 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;