X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.h;h=0da3fd6948b38b6805f7076e4eeebc83e4ed68cf;hp=dc49ef956e69779f518ad235c6c25e76b1761498;hb=8d00849555d99c5434610753ad0e4cc93fb7bb64;hpb=56955f95584f51709320262f7d2e0ea79301d346 diff --git a/recv.h b/recv.h index dc49ef95..0da3fd69 100644 --- a/recv.h +++ b/recv.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 Andre Noll + * Copyright (C) 2005-2010 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -12,18 +12,14 @@ struct receiver_node { /** Points to the corresponding receiver. */ struct receiver *receiver; - /** The output buffer. */ - char *buf; - /** The amount of bytes in \a buf. */ - size_t loaded; /** Receiver-specific data. */ void *private_data; - /** Pointer to the error member of the consumer. */ - int *output_error; /** Pointer to the configuration data for this instance. */ void *conf; /** The task associated with this instance. */ struct task task; + /** The receiver node is always the root of the buffer tree. */ + struct btr_node *btrn; }; /** @@ -54,6 +50,7 @@ struct receiver { * \a argc and \a argv. */ void *(*parse_config)(int argc, char **argv); + void (*free_config)(void *conf); /** * Open one instance of the receiver. * @@ -75,12 +72,6 @@ struct receiver { * \sa receiver_node. */ void (*close)(struct receiver_node *rn); - /** - * Deactivate the receiver. - * - * Clean up what init has allocated. - */ - void (*shutdown)(void); /** * Add file descriptors to fd_sets and compute timeout for select(2). * @@ -134,3 +125,4 @@ extern struct receiver receivers[]; void recv_init(void); void *check_receiver_arg(char *ra, int *receiver_num); void print_receiver_helps(int detailed); +int generic_recv_pre_select(struct sched *s, struct task *t);