make send_callback_request() and friends take a result handler.

[paraslash.git] / afs.h

diff --git a/afs.h b/afs.h
index e30978b7e479e0b2695ac7c878d7cace331fd749..569798457b1338bd3261883557549a0b0129de02 100644 (file)
--- 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,11 +110,10 @@ 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. */
        char verbose_ls_output[VERBOSE_LS_OUTPUT_SIZE];
@@ -161,21 +160,35 @@ struct pattern_match_data {
 };
 
 /* afs */
+/**
+ * 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 int callback_function(const struct osl_object *, struct osl_object *);
+typedef int callback_result_handler(struct osl_object *result, void *private);
+int send_result(struct osl_object *result, void *private_result_data);
+
 __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 */
@@ -260,7 +273,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, \