update copyright date to 2013

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

diff --git a/lib/librte_eal/common/include/rte_eal_memconfig.h b/lib/librte_eal/common/include/rte_eal_memconfig.h
index a4cd4c8..3bb85e2 100644 (file)
--- a/lib/librte_eal/common/include/rte_eal_memconfig.h
+++ b/lib/librte_eal/common/include/rte_eal_memconfig.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 
@@ -38,29 +38,69 @@
 #include <rte_tailq.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
+#include <rte_malloc_heap.h>
+#include <rte_rwlock.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/**
+ * Index type of tailq_head
+ */ 
+enum rte_tailq_t {
+#define rte_tailq_elem(idx, name)     idx,
+#define rte_tailq_end(idx)            idx
+#include <rte_tailq_elem.h>
+};
+
 /**
  * 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 {
+       volatile uint32_t magic;   /**< Magic number - Sanity check. */
+
        /* memory topology */
        uint32_t nchannel;    /**< Number of channels (0 if unknown). */
        uint32_t nrank;       /**< Number of ranks (0 if unknown). */
 
+       /** 
+        * current lock nest order
+        *  - qlock->mlock (ring/hash/lpm)
+        *  - mplock->qlock->mlock (mempool)
+        * Notice:
+        *  *ALWAYS* obtain qlock first if having to obtain both qlock and mlock
+        */
+       rte_rwlock_t mlock;   /**< only used by memzone LIB for thread-safe. */
+       rte_rwlock_t qlock;   /**< used for tailq operation for thread safe. */
+       rte_rwlock_t mplock;  /**< only used by mempool LIB for thread-safe. */
+
+       uint32_t memzone_idx; /**< Index of memzone */
+
        /* memory segments and zones */
        struct rte_memseg memseg[RTE_MAX_MEMSEG];    /**< Physmem descriptors. */
        struct rte_memzone memzone[RTE_MAX_MEMZONE]; /**< Memzone descriptors. */
 
+       /* Runtime Physmem descriptors. */
+       struct rte_memseg free_memseg[RTE_MAX_MEMSEG];
+
        struct rte_tailq_head tailq_head[RTE_MAX_TAILQ]; /**< Tailqs for objects */
+
+       /* Heaps of Malloc per socket */
+       struct malloc_heap malloc_heaps[RTE_MAX_NUMA_NODES];
 } __attribute__((__packed__));
 
 
+inline static void
+rte_eal_mcfg_wait_complete(struct rte_mem_config* mcfg)
+{
+       /* wait until shared mem_config finish initialising */
+       while(mcfg->magic != RTE_MAGIC)
+               rte_pause();
+}
+
 #ifdef __cplusplus
 }
 #endif