X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=send.h;h=f6aafbb41a2bf9b089f2ddcc9968278dea734fa1;hp=8f7005cdaa78f0909808932e602fc7de7945dd52;hb=HEAD;hpb=0c7c4d80673854527ce3c3786dd581169565b5e6

diff --git a/send.h b/send.h
index 8f7005cd..3407bc5c 100644
--- a/send.h
+++ b/send.h
@@ -76,27 +76,10 @@ struct sender {
 	void (*send)(long unsigned current_chunk, long unsigned chunks_sent,
 		const char *buf, size_t len, const char *header_buf,
 		size_t header_len);
-	/**
-	 * Add file descriptors to fd_sets.
-	 *
-	 * The pre_select function of each supported sender is called just before
-	 * para_server enters its main select loop. Each sender may add its own
-	 * file descriptors to the \a rfds or the \a wfds set.
-	 *
-	 * If a file descriptor was added, \a max_fileno must be increased by
-	 * this function, if necessary.
-	 *
-	 * \sa select(2).
-	 */
-	void (*pre_select)(int *max_fileno, fd_set *rfds, fd_set *wfds);
-	/**
-	 * Handle the file descriptors which are ready for I/O.
-	 *
-	 * If the pre_select hook added one ore more file descriptors to the
-	 * read or write set, this is the hook to check the result and do any
-	 * I/O on those descriptors which are ready for reading/writing.
-	 */
-	void (*post_select)(fd_set *rfds, fd_set *wfds);
+	/** Ask the scheduler to monitor file descriptors. */
+	void (*pre_monitor)(struct sched *s);
+	/** Perform I/O on the file descriptors which are ready. */
+	void (*post_monitor)(struct sched *s);
 	/**
 	 * Terminate all connected clients.
 	 *
@@ -212,7 +195,8 @@ void init_sender_status(struct sender_status *ss,
 		const struct lls_opt_result *acl_opt_result,
 		const struct lls_opt_result *listen_address_opt_result,
 		int default_port, int max_clients, int default_deny);
-char *generic_sender_status(struct sender_status *ss, const char *name);
+void free_sender_status(const struct sender_status *ss);
+__malloc char *generic_sender_status(struct sender_status *ss, const char *name);
 void generic_com_allow(struct sender_command_data *scd,
 		struct sender_status *ss);
 void generic_com_deny(struct sender_command_data *scd,
@@ -220,7 +204,7 @@ void generic_com_deny(struct sender_command_data *scd,
 void generic_com_on(struct sender_status *ss, unsigned protocol);
 void generic_acl_deplete(struct list_head *acl);
 void generic_com_off(struct sender_status *ss);
-char *generic_sender_help(void);
-struct sender_client *accept_sender_client(struct sender_status *ss, fd_set *rfds);
+__malloc char *generic_sender_help(void);
+struct sender_client *accept_sender_client(struct sender_status *ss);
 int send_queued_chunks(int fd, struct chunk_queue *cq);
 int parse_fec_url(const char *arg, struct sender_command_data *scd);