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

Timestamp:

Apr 26, 2017, 2:15:50 PM (6 years ago)

Author:

alain

Message:

Various bugs.

File:

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

trunk/kernel/mm/kcm.h

@@ -39 +39 @@
  * contain one single object.
  * The various KCM allocators themselves are not statically allocated in the cluster
- * manager, but are dynamically allocated when required, using the specific KCM 
+ * manager, but are dynamically allocated when required, using the embedded KCM 
  * allocator defined in the cluster manager, to allocate the other ones...
  ***************************************************************************************/
@@ -64 +64 @@
 /****************************************************************************************
  * This structure defines a KCM-page descriptor.
- * A KCM-page can contain several blocks.
- * This descriptor is stored in the first block slot.
+ * A KCM-page can contain up to (CONFIG_PPM_PAGE_SIZE / CONFIG_CACHE_LINE_SIZE) blocks.
+ * This kcm page descriptor is stored in the first slot of the page.
  ***************************************************************************************/
 
 typedef struct kcm_page_s
 {
-        BITMAP          ( bitmap , 16 );       /*! at most 16 blocks in a page (1 if free) */
-        uint8_t       * blk_tbl;               /*! pointer on first free block in page     */
+        BITMAP          ( bitmap , CONFIG_KCM_BLOCKS_MAX );
+        uint8_t       * base;                  /*! pointer on first block in page          */
         kcm_t         * kcm;                   /*! owner KCM allocator                     */
-        uint8_t         unused;                /*! first free block index in page          */
+        list_entry_t    list;                  /*! [active / busy / free] list member      */
+        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                 */
-        list_entry_t    list;                  /*! [active / busy / free] list member      */
-        page_t        * page;                  /*! pointer on the physical page descriptor */
+        uint8_t         unused;                /*!                                         */
 } 
 kcm_page_t;
@@ -88 +88 @@
  * @ type     : KCM allocator type.
  ***************************************************************************************/
-error_t kcm_init( kcm_t       * kcm,
-                          uint32_t      type );
+void kcm_init( kcm_t    * kcm,
+                   uint32_t   type );
 
 /****************************************************************************************
@@ -96 +96 @@
  * @ kcm      : pointer on KCM manager to destroy.
  ***************************************************************************************/
-void kcm_destroy( kcm_t       * kcm );
+void kcm_destroy( kcm_t  * kcm );
 
 /****************************************************************************************
@@ -102 +102 @@
  * The object size must be smaller than one page size.
  ****************************************************************************************
- * @ kcm     :  pointer on the selected KCM allocator
+ * @ kcm      :  pointer on the selected KCM allocator
+ * @ return pointer on allocated block if success / return NULL if failure
  ***************************************************************************************/
 void * kcm_alloc( kcm_t * kcm );