Changeset 50 for trunk/kernel/mm/kcm.h

Timestamp:

Jun 26, 2017, 3:15:11 PM (6 years ago)

Author:

alain

Message:

bloup

File:

• trunk/kernel/mm/kcm.h (modified) (4 diffs)

trunk/kernel/mm/kcm.h

@@ -36 +36 @@
  * This structure defines a generic Kernel Cache Manager, that is a block allocator,
  * for fixed size objects. It exists a specific KCM allocator for each object type.
- * The actual allocated block size is the smallest multiple of 64 bytes that can
- * contain one single object.
+ * The actual allocated block size is the smallest multiple of the KCM slot, that
+ * contain one single object. The KCM slot is typically 64 bytes, as it must be large
+ * enough to store the kcm_page descriptor, defined below.
  * The various KCM allocators themselves are not statically allocated in the cluster
  * manager, but are dynamically allocated when required, using the embedded KCM
@@ -46 +47 @@
 {
         spinlock_t           lock;             /*! protect exclusive access to allocator   */
-        uint32_t             block_size;       /*! actual block size (bytes)               */
-        uint32_t             blocks_nr;        /*! number of blocks per page               */
+        uint32_t             block_size;       /*! rounded block size (bytes)              */
+        uint32_t             blocks_nr;        /*! max number of blocks per page           */
 
         list_entry_t         active_root;      /*! root of active pages list               */
@@ -64 +65 @@
 /****************************************************************************************
  * This structure defines a KCM-page descriptor.
- * A KCM-page can contain up to (CONFIG_PPM_PAGE_SIZE / CONFIG_CACHE_LINE_SIZE) blocks.
+ * A KCM-page contains at most (CONFIG_PPM_PAGE_SIZE / CONFIG_KCM_SLOT_SIZE) blocks.
  * This kcm page descriptor is stored in the first slot of the page.
  ***************************************************************************************/
@@ -70 +71 @@
 typedef struct kcm_page_s
 {
-        uint32_t        bitmap[BITMAP_SIZE(CONFIG_KCM_BLOCKS_MAX)];
-        uint8_t       * base;                  /*! pointer on first block in page          */
-        kcm_t         * kcm;                   /*! owner KCM allocator                     */
+        uint32_t        bitmap[2];             /*! at most 64 blocks in a single page      */
         list_entry_t    list;                  /*! [active / busy / free] list member      */
+    kcm_t         * kcm;                   /*! pointer on kcm allocator                */  
         page_t        * page;                  /*! pointer on the physical page descriptor */
-        uint8_t         refcount;              /*! number of allocated blocks              */
-        uint8_t         busy;                  /*! page busy if non zero                   */
-        uint8_t         active;                /*! page active if non zero                 */
-        uint8_t         unused;                /*!                                         */
+        uint32_t        count;                 /*! number of allocated blocks              */
+        uint32_t        busy;                  /*! page busy if non zero                   */
+        uint32_t        active;                /*! page active if non zero                 */
 }
 kcm_page_t;