update

Author: peng.li24

src/box.h

@@ -0,0 +1,57 @@
+#ifndef BOX_H
+#define BOX_H
+
+#include <stdint.h>
+#include <stddef.h>
+
+#include <block_malloc/block_malloc.h>
+#include "obj_usage.h"
+
+typedef struct
+{
+    #define BOX_MAGIC "box_malloc"
+    uint8_t magic[16]; // "box_malloc"
+    uint64_t boxhead_bytessize; // 伙伴系统的总size
+    uint64_t box_bytessize;  // 总内存大小，不可变，内存长度必须=16^n*x,n>=1，x=[1,15]
+    blocks_meta_t blocks;
+} box_meta_t;
+
+typedef enum
+{
+    BOX_UNUSED = 0,    // 未用（可以分配 obj、box）
+    BOX_FORMATTED = 1, // box 已格式化
+    OBJ_START = 2,     // obj_start
+    OBJ_CONTINUED = 3  // obj_continued
+} BoxState;
+
+typedef struct
+{
+    uint8_t state : 2;       // 0=未用（可以分配obj、box）,1=已格式化为box，2=obj
+    int8_t continue_max : 6; // 连续的最大空闲obj,[0~16]
+} __attribute__((packed)) box_child_t;
+
+typedef struct
+{
+    uint8_t state : 2;           // 0=未用（可以分配obj、box）,1=已格式化为box，2=obj
+    int8_t max_obj_capacity : 6; // 连续的最大空闲obj,[0~16]
+
+    // lock
+    atomic_int_fast64_t rw_lock;  // 0=无锁，1=读锁，2=写锁（简化实现）
+
+    // parent
+    int32_t parent; // parent_blockid
+
+    // box
+    uint8_t objlevel; //[0,16] boxlevel=本层的objlevel+1
+
+    // obj,childbox usage
+    uint8_t avliable_slot;            // 【2，16】
+    obj_usage child_max_obj_capacity; // 下层的最大对象容量
+    box_child_t used_slots[16];
+
+    // childbox
+    int32_t childs_blockid[16];
+
+} __attribute__((packed)) box_head_t; //
+
+#endif // BOX_H

src/box_malloc.c

@@ -7,83 +7,17 @@
 #include <block_malloc/block_malloc.h>
 
 #include <box_malloc/box_malloc.h>
-#include "obj_offset.h"
+#include "obj_usage.h"
 #include "logutil.h"
-
-static void rlock(atomic_int_fast64_t *lock) {
-    int_fast64_t expected = 0;
-    while (!atomic_compare_exchange_weak(lock, &expected, 1)) {
-        expected = 0;  // 重置 expected
-    }
-}
-
-static void runlock(atomic_int_fast64_t *lock) {
-    atomic_store(lock, 0);
-}
-
-static void lock(atomic_int_fast64_t *lock) {
-    int_fast64_t expected = 0;
-    while (!atomic_compare_exchange_weak(lock, &expected, 2)) {
-        expected = 0;
-    }
-}
-
-static void unlock(atomic_int_fast64_t *lock) {
-    atomic_store(lock, 0);
-}
-
-typedef struct
-{
-    #define BOX_MAGIC "box_malloc"
-    uint8_t magic[16]; // "box_malloc"
-    uint64_t boxhead_bytessize; // 伙伴系统的总size
-    uint64_t box_bytessize;  // 总内存大小，不可变，内存长度必须=16^n*x,n>=1，x=[1,15]
-    blocks_meta_t blocks;
-} box_meta_t;
+#include "lock.h"
+#include "box.h"
 
 static int check_magic(box_meta_t *meta) {
     if (memcmp(meta->magic, BOX_MAGIC, sizeof(meta->magic)) != 0) {
         return -1;
     }
     return 0;
 }
-typedef enum
-{
-    BOX_UNUSED = 0,    // 未用（可以分配 obj、box）
-    BOX_FORMATTED = 1, // box 已格式化
-    OBJ_START = 2,     // obj_start
-    OBJ_CONTINUED = 3  // obj_continued
-} BoxState;
-
-typedef struct
-{
-    uint8_t state : 2;       // 0=未用（可以分配obj、box）,1=已格式化为box，2=obj
-    int8_t continue_max : 6; // 连续的最大空闲obj,[0~16]
-} __attribute__((packed)) box_child_t;
-
-typedef struct
-{
-    uint8_t state : 2;           // 0=未用（可以分配obj、box）,1=已格式化为box，2=obj
-    int8_t max_obj_capacity : 6; // 连续的最大空闲obj,[0~16]
-
-    // lock
-    atomic_int_fast64_t rw_lock;  // 0=无锁，1=读锁，2=写锁（简化实现）
-
-    // parent
-    int32_t parent; // parent_blockid
-
-    // box
-    uint8_t objlevel; //[0,16] boxlevel=本层的objlevel+1
-
-    // obj,childbox usage
-    uint8_t avliable_slot;            // 【2，16】
-    obj_usage child_max_obj_capacity; // 下层的最大对象容量
-    box_child_t used_slots[16];
-
-    // childbox
-    int32_t childs_blockid[16];
-
-} __attribute__((packed)) box_head_t; //
 
 static void box_format(box_meta_t *meta, box_head_t *node, uint8_t objlevel, uint8_t avliable_slot, int32_t parent_id);
 

src/lock.h

@@ -0,0 +1,27 @@
+#ifndef LOCK_H
+#define LOCK_H
+
+#include <stdatomic.h>
+
+static void rlock(atomic_int_fast64_t *lock) {
+    int_fast64_t expected = 0;
+    while (!atomic_compare_exchange_weak(lock, &expected, 1)) {
+        expected = 0;  // 重置 expected
+    }
+}
+
+static void runlock(atomic_int_fast64_t *lock) {
+    atomic_store(lock, 0);
+}
+
+static void lock(atomic_int_fast64_t *lock) {
+    int_fast64_t expected = 0;
+    while (!atomic_compare_exchange_weak(lock, &expected, 2)) {
+        expected = 0;
+    }
+}
+
+static void unlock(atomic_int_fast64_t *lock) {
+    atomic_store(lock, 0);
+}
+#endif // LOCK_H

src/obj_offset.h src/obj_usage.hsrc/obj_offset.h renamed to src/obj_usage.h

@@ -1,3 +1,6 @@
+#ifndef OBJ_USAGE_H
+#define OBJ_USAGE_H
+
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -68,4 +71,6 @@ static uint64_t obj_offset(const obj_usage a)
     }
     offset *= (a.multiple);
     return offset;
-}
+}
+
+#endif // OBJ_USAGE_H