Changeset 567 for trunk/kernel/mm/khm.h

Timestamp:

Oct 5, 2018, 12:01:52 AM (6 years ago)

Author:

alain

Message:

Complete restructuration of kernel locks.

File:

• trunk/kernel/mm/khm.h (modified) (3 diffs)

trunk/kernel/mm/khm.h

@@ -1 +1 @@
 /*
- * khm.h - kernel heap manager used for variable size memory allocation.
+ * khm.h - Kernel Heap Manager definition.
  *
  * Authors  Ghassan Almaless (2008,2009,2010,2011,2012)
- *          Mohamed Lamine Karaoui (2015)
- *          Alain Greiner (2016)
+ *          Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -29 +28 @@
 #include <kernel_config.h>
 #include <hal_kernel_types.h>
-#include <spinlock.h>
+#include <busylock.h>
 
 /*******************************************************************************************
  * This structure defines a Kernel Heap Manager (KHM) in a given cluster.
- * It is used to allocate memory objects, that are not
- * enough replicated to justify a dedicated KCM allocator.
+ * It is used to allocate memory objects, that are not enough replicated to justify
+ * a dedicated KCM allocator.
  ******************************************************************************************/
 
 typedef struct khm_s
 {
-        spinlock_t lock;           /*! lock protecting exclusive access to heap               */
+        busylock_t lock;           /*! lock protecting KHM allocator                          */
         intptr_t   base;           /*! heap base address                                      */
         uint32_t   size;           /*! heap size (bytes)                                      */
@@ -54 +53 @@
 typedef struct khm_block_s
 {
-        uint32_t   busy:1;         /*! free block if zero                                     */
-        uint32_t   size:31;        /*! size coded on 31 bits                                  */
+        uint32_t   busy;           /*! free block if zero                                     */
+        uint32_t   size;           /*! block size                                                   */
 }
 khm_block_t;