X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Fcommon%2Finclude%2Frte_tailq.h;h=df11183ea356610212ac7832d34fa1c2e0eacfaf;hb=873a61c7526be06f45d8d709a7c56d10cc06ab34;hp=0ddcc110e2925ccf9cfd93b1137d806f85f3e7a2;hpb=86d5de5c46fc0d4b0cf418e7e5480a9438de1d29;p=dpdk.git diff --git a/lib/librte_eal/common/include/rte_tailq.h b/lib/librte_eal/common/include/rte_tailq.h index 0ddcc110e2..df11183ea3 100644 --- a/lib/librte_eal/common/include/rte_tailq.h +++ b/lib/librte_eal/common/include/rte_tailq.h @@ -1,13 +1,13 @@ /*- * BSD LICENSE - * + * * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright @@ -17,7 +17,7 @@ * * Neither the name of Intel Corporation nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -46,13 +46,15 @@ extern "C" { #include #include +#include /** dummy structure type used by the rte_tailq APIs */ -struct rte_dummy { - TAILQ_ENTRY(rte_dummy) next; /**< Pointer entries for a tailq list */ +struct rte_tailq_entry { + TAILQ_ENTRY(rte_tailq_entry) next; /**< Pointer entries for a tailq list */ + void *data; /**< Pointer to the data referenced by this tailq entry */ }; /** dummy */ -TAILQ_HEAD(rte_dummy_head, rte_dummy); +TAILQ_HEAD(rte_tailq_entry_head, rte_tailq_entry); #define RTE_TAILQ_NAMESIZE 32 @@ -65,47 +67,25 @@ TAILQ_HEAD(rte_dummy_head, rte_dummy); * a multi-process app to find already-created elements in shared memory. */ struct rte_tailq_head { - struct rte_dummy_head tailq_head; /**< NOTE: must be first element */ + struct rte_tailq_entry_head tailq_head; /**< NOTE: must be first element */ + char name[RTE_TAILQ_NAMESIZE]; }; -/** - * Utility macro to make reserving a tailqueue for a particular struct easier. - * - * @param name - * The name to be given to the tailq - used by lookup to find it later - * - * @param struct_name - * The name of the list type we are using. (Generally this is the same as the - * first parameter passed to TAILQ_HEAD macro) - * - * @return - * The return value from rte_eal_tailq_reserve, typecast to the appropriate - * structure pointer type. - * NULL on error, since the tailq_head is the first - * element in the rte_tailq_head structure. - */ -#define RTE_TAILQ_RESERVE(name, struct_name) \ - (struct struct_name *)(&rte_eal_tailq_reserve(name)->tailq_head) +struct rte_tailq_elem { + /** + * Reference to head in shared mem, updated at init time by + * rte_eal_tailqs_init() + */ + struct rte_tailq_head *head; + TAILQ_ENTRY(rte_tailq_elem) next; + const char name[RTE_TAILQ_NAMESIZE]; +}; /** - * Utility macro to make reserving a tailqueue for a particular struct easier. - * - * @param idx - * The tailq idx defined in rte_tail_t to be given to the tail queue. - * - used by lookup to find it later - * - * @param struct_name - * The name of the list type we are using. (Generally this is the same as the - * first parameter passed to TAILQ_HEAD macro) - * - * @return - * The return value from rte_eal_tailq_reserve, typecast to the appropriate - * structure pointer type. - * NULL on error, since the tailq_head is the first - * element in the rte_tailq_head structure. + * Return the first tailq entry casted to the right struct. */ -#define RTE_TAILQ_RESERVE_BY_IDX(idx, struct_name) \ - (struct struct_name *)(&rte_eal_tailq_reserve_by_idx(idx)->tailq_head) +#define RTE_TAILQ_CAST(tailq_entry, struct_name) \ + (struct struct_name *)&(tailq_entry)->tailq_head /** * Utility macro to make looking up a tailqueue for a particular struct easier. @@ -124,7 +104,7 @@ struct rte_tailq_head { * element in the rte_tailq_head structure. */ #define RTE_TAILQ_LOOKUP(name, struct_name) \ - (struct struct_name *)(&rte_eal_tailq_lookup(name)->tailq_head) + RTE_TAILQ_CAST(rte_eal_tailq_lookup(name), struct_name) /** * Utility macro to make looking up a tailqueue for a particular struct easier. @@ -143,31 +123,7 @@ struct rte_tailq_head { * element in the rte_tailq_head structure. */ #define RTE_TAILQ_LOOKUP_BY_IDX(idx, struct_name) \ - (struct struct_name *)(&rte_eal_tailq_lookup_by_idx(idx)->tailq_head) - -/** - * Reserve a slot in the tailq list for a particular tailq header - * Note: this function, along with rte_tailq_lookup, is not multi-thread safe, - * and both these functions should only be called from a single thread at a time - * - * @param name - * The name to be given to the tail queue. - * @return - * A pointer to the newly reserved tailq entry - */ -struct rte_tailq_head *rte_eal_tailq_reserve(const char *name); - -/** - * Reserve a slot in the tailq list for a particular tailq header - * Note: this function, along with rte_tailq_lookup, is not multi-thread safe, - * and both these functions should only be called from a single thread at a time - * - * @param idx - * The tailq idx defined in rte_tail_t to be given to the tail queue. - * @return - * A pointer to the newly reserved tailq entry - */ -struct rte_tailq_head *rte_eal_tailq_reserve_by_idx(const unsigned idx); + RTE_TAILQ_CAST(rte_eal_tailq_lookup_by_idx(idx), struct_name) /** * Dump tail queues to the console. @@ -180,10 +136,10 @@ void rte_dump_tailq(FILE *f); /** * Lookup for a tail queue. * - * Get a pointer to a tail queue header of an already reserved tail + * Get a pointer to a tail queue header of a tail * queue identified by the name given as an argument. - * Note: this function, along with rte_tailq_reserve, is not multi-thread safe, - * and both these functions should only be called from a single thread at a time + * Note: this function is not multi-thread safe, and should only be called from + * a single thread at a time * * @param name * The name of the queue. @@ -195,10 +151,10 @@ struct rte_tailq_head *rte_eal_tailq_lookup(const char *name); /** * Lookup for a tail queue. * - * Get a pointer to a tail queue header of an already reserved tail + * Get a pointer to a tail queue header of a tail * queue identified by the name given as an argument. - * Note: this function, along with rte_tailq_reserve, is not multi-thread safe, - * and both these functions should only be called from a single thread at a time + * Note: this function is not multi-thread safe, and should only be called from + * a single thread at a time * * @param idx * The tailq idx defined in rte_tail_t to be given to the tail queue. @@ -207,6 +163,32 @@ struct rte_tailq_head *rte_eal_tailq_lookup(const char *name); */ struct rte_tailq_head *rte_eal_tailq_lookup_by_idx(const unsigned idx); +/** + * Register a tail queue. + * + * Register a tail queue from shared memory. + * This function is mainly used by EAL_REGISTER_TAILQ macro which is used to + * register tailq from the different dpdk libraries. Since this macro is a + * constructor, the function has no access to dpdk shared memory, so the + * registered tailq can not be used before call to rte_eal_init() which calls + * rte_eal_tailqs_init(). + * + * @param t + * The tailq element which contains the name of the tailq you want to + * create (/retrieve when in secondary process). + * @return + * 0 on success or -1 in case of an error. + */ +int rte_eal_tailq_register(struct rte_tailq_elem *t); + +#define EAL_REGISTER_TAILQ(t) \ +void tailqinitfn_ ##t(void); \ +void __attribute__((constructor, used)) tailqinitfn_ ##t(void) \ +{ \ + if (rte_eal_tailq_register(&t) < 0) \ + rte_panic("Cannot initialize tailq: %s\n", t.name); \ +} + #ifdef __cplusplus } #endif