update copyright date to 2013

[dpdk.git] / lib / librte_eal / common / include / rte_eal.h

diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h
index d90847b..2445f6b 100644 (file)
--- a/lib/librte_eal/common/include/rte_eal.h
+++ b/lib/librte_eal/common/include/rte_eal.h
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  * 
- *   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
  *   All rights reserved.
  * 
  *   Redistribution and use in source and binary forms, with or without 
@@ -41,9 +41,7 @@
  * EAL Configuration API
  */
 
-#include <rte_tailq.h>
-#include <rte_memory.h>
-#include <rte_memzone.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -71,23 +69,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.
  */
@@ -166,6 +147,75 @@ enum rte_proc_type_t rte_eal_process_type(void);
  */
 int rte_eal_init(int argc, char **argv);
 
+/**
+ * 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