X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.h;h=d01f0cfb77cc17eaff5e5618cb734f54a6f9fa5e;hp=977fc40b6591dd778294ce7a796a6edcb4746f18;hb=2ef1e962280493eee9092da3122760805b793112;hpb=7d912dbad687503f2a8d4895b0e48b4584b4940b

diff --git a/afs.h b/afs.h
index 977fc40b..d01f0cfb 100644
--- a/afs.h
+++ b/afs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -66,7 +66,7 @@ struct rmatt_event_data {
 
 
 struct afsi_change_event_data {
-	const struct osl_row *aft_row;
+	struct osl_row *aft_row;
 	struct afs_info *old_afsi;
 };
 
@@ -110,17 +110,16 @@ struct ls_data {
 int make_status_items(struct ls_data *d, struct para_buffer *pb);
 void make_empty_status_items(char *buf);
 
+/** At most that many bytes will be passed from afs to para_server. */
 #define VERBOSE_LS_OUTPUT_SIZE 4096
 
-/*
- * Data about the current audio file, passed from afs to server.
- */
+/** Data about the current audio file, passed from afs to server. */
 struct audio_file_data {
-	/* Same info as ls -lv -p <current audio file>. */
+	/** Same info as ls -lv -p current audio_file. */
 	char verbose_ls_output[VERBOSE_LS_OUTPUT_SIZE];
-	/* The open file descriptor to the current audio file. */
+	/** The open file descriptor to the current audio file. */
 	int fd;
-	/* Vss needs this for streaming. */
+	/** Vss needs this for streaming. */
 	struct afh_info afhi;
 };
 
@@ -160,22 +159,45 @@ struct pattern_match_data {
 	int (*action)(struct osl_table *table, struct osl_row *row, const char *name, void *data);
 };
 
-/* afs */
-typedef int callback_function(const struct osl_object *, struct osl_object *);
+
+/**
+ * Afs command handlers run as a process which is not related to the afs
+ * process, i.e. they can not change the address space of afs directly.
+ * Therefore afs commands typically consist of two functions: The command
+ * handler and the corresponding callback function that runs in afs context.
+ *
+ * \sa send_callback_request().
+ */
+typedef void callback_function(int fd, const struct osl_object *);
+
+/**
+ * Callbacks send chunks to data back to the command handler. Pointers to
+ * this type of function are used by \ref send_callback_request and friends
+ * to deal with the data in the command handler process.
+ *
+ * \sa \ref send_callback_request().
+ */
+typedef int callback_result_handler(struct osl_object *result, void *private);
+int send_result(struct osl_object *result, void *fd_ptr);
+int pass_buffer_as_shm(char *buf, size_t size, void *fd_ptr);
+
 __noreturn void afs_init(uint32_t cookie, int socket_fd);
 void afs_event(enum afs_events event, struct para_buffer *pb,
 	void *data);
 int send_callback_request(callback_function *f, struct osl_object *query,
-	struct osl_object *result);
-int send_standard_callback_request(int argc, char * const * const argv,
-		callback_function *f, struct osl_object *result);
+		callback_result_handler *result_handler,
+		void *private_result_data);
 int send_option_arg_callback_request(struct osl_object *options,
-	int argc, char * const * const argv, callback_function *f,
-	struct osl_object *result);
+		int argc,  char * const * const argv, callback_function *f,
+		callback_result_handler *result_handler,
+		void *private_result_data);
+int send_standard_callback_request(int argc,  char * const * const argv,
+		callback_function *f, callback_result_handler *result_handler,
+		void *private_result_data);
 int stdin_command(int fd, struct osl_object *arg_obj, callback_function *f,
-		unsigned max_len, struct osl_object *result);
+		unsigned max_len, callback_result_handler *result_handler,
+		void *private_result_data);
 int string_compare(const struct osl_object *obj1, const struct osl_object *obj2);
-int close_audio_file(struct audio_file_data *afd);
 int for_each_matching_row(struct pattern_match_data *pmd);
 
 /* score */
@@ -211,21 +233,19 @@ int get_afsi_of_path(const char *path, struct afs_info *afsi);
 int get_audio_file_path_of_row(const struct osl_row *row, char **path);
 int get_afsi_object_of_row(const struct osl_row *row, struct osl_object *obj);
 int audio_file_loop(void *private_data, osl_rbtree_loop_func *func);
-int aft_check_callback(const struct osl_object *query, struct osl_object *result);
+void aft_check_callback(int fd, __a_unused const struct osl_object *query);
 
 /* mood */
 int change_current_mood(char *mood_name);
 void close_current_mood(void);
 int reload_current_mood(void);
-int mood_check_callback(__a_unused const struct osl_object *query,
-	struct osl_object *result);
+void mood_check_callback(int fd, __a_unused const struct osl_object *query);
 
 
 /* playlist */
 int playlist_open(char *name);
 void playlist_close(void);
-int playlist_check_callback(__a_unused const struct osl_object *query,
-	struct osl_object *result);
+void playlist_check_callback(int fd, __a_unused const struct osl_object *query);
 
 /** evaluates to 1 if x < y, to -1 if x > y and to 0 if x == y */
 #define NUM_COMPARE(x, y) ((int)((x) < (y)) - (int)((x) > (y)))
@@ -260,7 +280,7 @@ enum blob_table_columns {
 	NUM_BLOB_COLUMNS
 };
 
-/** Define an osl table decription for a blob table. */
+/** Define an osl table description for a blob table. */
 #define DEFINE_BLOB_TABLE_DESC(table_name) \
 	struct osl_table_description table_name ## _table_desc = { \
 		.name = #table_name, \