X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Fcommon%2Finclude%2Frte_eal.h;h=faa27f95d32a7ecdffd3fea7b2c6a9030ab55e70;hb=e9d48c0072d36eb6423b45fba4ec49d0def6c36f;hp=58fa1cc9ad5c6f9745f8524e128e8906c4c9de14;hpb=af75078fece3615088e561357c1e97603e43a5fe;p=dpdk.git diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h index 58fa1cc9ad..faa27f95d3 100644 --- a/lib/librte_eal/common/include/rte_eal.h +++ b/lib/librte_eal/common/include/rte_eal.h @@ -1,36 +1,34 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2012 Intel Corporation. All rights reserved. + * 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 + * 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 + * * 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 - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived + * * 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 - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * 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 + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * version: DPDK.L.1.2.3-3 */ #ifndef _RTE_EAL_H_ @@ -42,9 +40,7 @@ * EAL Configuration API */ -#include -#include -#include +#include #ifdef __cplusplus extern "C" { @@ -72,23 +68,6 @@ enum rte_proc_type_t { RTE_PROC_INVALID }; -/** - * the structure for the memory configuration for the RTE. - * Used by the rte_config structure. It is separated out, as for multi-process - * support, the memory details should be shared across instances - */ -struct rte_mem_config { - /* memory topology */ - uint32_t nchannel; /**< Number of channels (0 if unknown). */ - uint32_t nrank; /**< Number of ranks (0 if unknown). */ - - /* memory segments and zones */ - struct rte_memseg memseg[RTE_MAX_MEMSEG]; /**< Physmem descriptors. */ - struct rte_memzone memzone[RTE_MAX_MEMZONE]; /**< Memzone descriptors. */ - - struct rte_tailq_head tailq_head[RTE_MAX_TAILQ]; /**< Tailqs for objects */ -} __attribute__((__packed__)); - /** * The global RTE configuration structure. */ @@ -104,6 +83,9 @@ struct rte_config { /** Primary or secondary configuration */ enum rte_proc_type_t process_type; + /** A set of general status flags */ + unsigned flags; + /** * Pointer to memory configuration, which may be shared across multiple * Intel DPDK instances @@ -111,6 +93,9 @@ struct rte_config { struct rte_mem_config *mem_config; } __attribute__((__packed__)); +/* Flag definitions for rte_config flags */ +#define EAL_FLG_HIGH_IOPL 1 /**< indicates high IO privilage in a linux env */ + /** * Get the global configuration structure. * @@ -166,7 +151,107 @@ enum rte_proc_type_t rte_eal_process_type(void); * - On failure, a negative error value. */ int rte_eal_init(int argc, char **argv); +/** + * Usage function typedef used by the application usage function. + * + * Use this function typedef to define and call rte_set_applcation_usage_hook() + * routine. + */ +typedef void (*rte_usage_hook_t)(const char * prgname); + +/** + * Add application usage routine callout from the eal_usage() routine. + * + * This function allows the application to include its usage message + * in the EAL system usage message. The routine rte_set_application_usage_hook() + * needs to be called before the rte_eal_init() routine in the application. + * + * This routine is optional for the application and will behave as if the set + * routine was never called as the default behavior. + * + * @param func + * The func argument is a function pointer to the application usage routine. + * Called function is defined using rte_usage_hook_t typedef, which is of + * the form void rte_usage_func(const char * prgname). + * + * Calling this routine with a NULL value will reset the usage hook routine and + * return the current value, which could be NULL. + * @return + * - Returns the current value of the rte_application_usage pointer to allow + * the caller to daisy chain the usage routines if needing more then one. + */ +rte_usage_hook_t +rte_set_application_usage_hook( rte_usage_hook_t usage_func ); + +/** + * macro to get the lock of tailq in mem_config + */ +#define RTE_EAL_TAILQ_RWLOCK (&rte_eal_get_configuration()->mem_config->qlock) + +/** + * macro to get the multiple lock of mempool shared by mutiple-instance + */ +#define RTE_EAL_MEMPOOL_RWLOCK (&rte_eal_get_configuration()->mem_config->mplock) + + +/** + * Utility macro to do a thread-safe tailq 'INSERT' of rte_mem_config + * + * @param idx + * a kind of tailq define in enum rte_tailq_t + * + * @param type + * type of list(tailq head) + * + * @param elm + * The element will be added into the list + * + */ +#define RTE_EAL_TAILQ_INSERT_TAIL(idx, type, elm) do { \ + struct type *list; \ + list = RTE_TAILQ_LOOKUP_BY_IDX(idx, type); \ + rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK); \ + TAILQ_INSERT_TAIL(list, elm, next); \ + rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK); \ +} while (0) + +/** + * Utility macro to do a thread-safe tailq 'REMOVE' of rte_mem_config + * + * @param idx + * a kind of tailq define in enum rte_tailq_t + * + * @param type + * type of list(tailq head) + * + * @param elm + * The element will be remove from the list + * + */ +#define RTE_EAL_TAILQ_REMOVE(idx, type, elm) do { \ + struct type *list; \ + list = RTE_TAILQ_LOOKUP_BY_IDX(idx, type); \ + rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK); \ + TAILQ_REMOVE(list, elm, next); \ + rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK); \ +} while (0) \ + + +/** + * macro to check TAILQ exist + * + * @param idx + * a kind of tailq define in enum rte_tailq_t + * + */ +#define RTE_EAL_TAILQ_EXIST_CHECK(idx) do { \ + if (RTE_TAILQ_LOOKUP_BY_IDX(idx, rte_tailq_head) == NULL){ \ + rte_errno = E_RTE_NO_TAILQ; \ + return NULL; \ + } \ +} while(0) + #ifdef __cplusplus } #endif