X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.h;h=d01f0cfb77cc17eaff5e5618cb734f54a6f9fa5e;hp=569798457b1338bd3261883557549a0b0129de02;hb=3dca24604449f268274e8458fbd5447e55dd7cc8;hpb=0a3b9b83c371c71e41ba8470affef0fa0a7fba08;ds=inline diff --git a/afs.h b/afs.h index 56979845..d01f0cfb 100644 --- a/afs.h +++ b/afs.h @@ -159,7 +159,7 @@ struct pattern_match_data { int (*action)(struct osl_table *table, struct osl_row *row, const char *name, void *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. @@ -168,9 +168,18 @@ struct pattern_match_data { * * \sa send_callback_request(). */ -typedef int callback_function(const struct osl_object *, struct osl_object *); +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 *private_result_data); +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, @@ -224,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)))