code format & add calloc

Author: userpro

README.md

@@ -21,10 +21,12 @@
 #include "memorypool.h"
 #include <stdio.h>
 
-struct TAT {
+struct TAT
+{
     int T_T;
 };
-mem_size_t max_mem = 2*GB + 500*MB + 500*KB;
+
+mem_size_t max_mem = 2*GB + 1000*MB + 1000*KB;
 mem_size_t mem_pool_size = 1*GB + 500*MB + 500*KB;
 
 int main()
@@ -33,6 +35,8 @@ int main()
     struct TAT *tat = (struct TAT *)MemoryPool_Alloc(mp, sizeof(struct TAT));
     tat->T_T = 2333;
     printf("%d\n", tat->T_T);
+    int *a = (int *)MemoryPool_Calloc(mp, sizeof(int));
+    printf("%d\n", *a);
     MemoryPool_Free(mp, tat);
     MemoryPool_Clear(mp);
     MemoryPool_Destroy(mp);
@@ -65,6 +69,7 @@ int main()
 ~~~c
 MemoryPool* MemoryPool_Init   (mem_size_t maxmempoolsize, mem_size_t mempoolsize, int thread_safe);
 void*       MemoryPool_Alloc  (MemoryPool *mp, mem_size_t wantsize);
+void*       MemoryPool_Calloc (MemoryPool *mp, mem_size_t wantsize);
 int         MemoryPool_Free   (MemoryPool *mp, void *p);
 MemoryPool* MemoryPool_Clear  (MemoryPool *mp);
 int         MemoryPool_Destroy(MemoryPool *mp);

example.c

@@ -15,6 +15,8 @@ int main()
     struct TAT *tat = (struct TAT *)MemoryPool_Alloc(mp, sizeof(struct TAT));
     tat->T_T = 2333;
     printf("%d\n", tat->T_T);
+    int *a = (int *)MemoryPool_Calloc(mp, sizeof(int));
+    printf("%d\n", *a);
     MemoryPool_Free(mp, tat);
     MemoryPool_Clear(mp);
     MemoryPool_Destroy(mp);

memorypool.c

@@ -1,5 +1,48 @@
 #include "memorypool.h"
 
+#define MP_CHUNKHEADER sizeof(struct _mp_chunk)
+#define MP_CHUNKEND    sizeof(struct _mp_chunk *)
+
+#define MP_LOCK(flag, lockobj) do { \
+    if (flag) pthread_mutex_lock(&lockobj->lock); \
+} while (0)
+#define MP_UNLOCK(flag, lockobj) do { \
+    if (flag) pthread_mutex_unlock(&lockobj->lock); \
+} while (0)
+
+#define MP_ALIGN_SIZE(_n) (_n + sizeof(long) - ((sizeof(long)-1)&_n))
+
+#define MP_INIT_MEMORY_STRUCT(mm, mem_sz) do { \
+    mm->mem_pool_size = mem_sz; \
+    mm->alloc_mem = 0; \
+    mm->alloc_prog_mem = 0; \
+    mm->free_list = (_MP_Chunk *)mm->start; \
+    mm->free_list->is_free = 1; \
+    mm->free_list->alloc_mem = mem_sz; \
+    mm->free_list->prev = NULL; \
+    mm->free_list->next = NULL; \
+    mm->alloc_list = NULL; \
+} while (0)
+
+#define MP_DLINKLIST_INS_FRT(head,x) do { \
+    x->prev = NULL; \
+    x->next = head; \
+    if (head) \
+        head->prev = x; \
+    head = x; \
+} while(0)
+
+#define MP_DLINKLIST_DEL(head,x) do { \
+    if (!x->prev) { \
+        head = x->next; \
+        if (x->next) x->next->prev = NULL; \
+    } else { \
+        x->prev->next = x->next; \
+        if (x->next) x->next->prev = x->prev; \
+    } \
+} while(0)
+
+
 void 
 get_memory_list_count(MemoryPool *mp, mem_size_t *mlist_len) {
     MP_LOCK(mp->thread_safe, mp);
@@ -211,6 +254,15 @@ MemoryPool_Alloc(MemoryPool *mp, mem_size_t wantsize)
     return NULL;
 }
 
+void * 
+MemoryPool_Calloc (MemoryPool *mp, mem_size_t wantsize) {
+    char *m = (char *)MemoryPool_Alloc(mp, wantsize);
+    if (!m) return NULL;
+    _MP_Chunk *ck = (_MP_Chunk *)(m - MP_CHUNKHEADER);
+    memset((void *)m, ck->alloc_mem - MP_CHUNKHEADER - MP_CHUNKEND, 0);
+    return m;
+}
+
 int 
 MemoryPool_Free(MemoryPool *mp, void *p)
 {
@@ -312,3 +364,11 @@ get_mempool_prog_usage(MemoryPool *mp) {
     return (float)get_prog_memory(mp) / mp->total_mem_pool_size;
 }
 
+#undef MP_CHUNKHEADER
+#undef MP_CHUNKEND
+#undef MP_LOCK
+#undef MP_UNLOCK
+#undef MP_ALIGN_SIZE
+#undef MP_INIT_MEMORY_STRUCT
+#undef MP_DLINKLIST_INS_FRT
+#undef MP_DLINKLIST_DEL

memorypool.h

@@ -1,55 +1,14 @@
 #ifndef _Z_MEMORYPOOL_H_
 #define _Z_MEMORYPOOL_H_
 #include <stdlib.h>
+#include <string.h>
 #include <pthread.h>
 
 #define mem_size_t  unsigned long long
-#define MP_CHUNKHEADER sizeof(struct _mp_chunk)
-#define MP_CHUNKEND    sizeof(struct _mp_chunk *)
-
 #define KB (mem_size_t)(1 << 10)
 #define MB (mem_size_t)(1 << 20)
 #define GB (mem_size_t)(1 << 30)
 
-#define MP_LOCK(flag, lockobj) do { \
-    if (flag) pthread_mutex_lock(&lockobj->lock); \
-} while (0)
-#define MP_UNLOCK(flag, lockobj) do { \
-    if (flag) pthread_mutex_unlock(&lockobj->lock); \
-} while (0)
-
-#define MP_ALIGN_SIZE(_n) (_n + sizeof(long) - ((sizeof(long)-1)&_n))
-
-#define MP_INIT_MEMORY_STRUCT(mm, mem_sz) do { \
-    mm->mem_pool_size = mem_sz; \
-    mm->alloc_mem = 0; \
-    mm->alloc_prog_mem = 0; \
-    mm->free_list = (_MP_Chunk *)mm->start; \
-    mm->free_list->is_free = 1; \
-    mm->free_list->alloc_mem = mem_sz; \
-    mm->free_list->prev = NULL; \
-    mm->free_list->next = NULL; \
-    mm->alloc_list = NULL; \
-} while (0)
-
-#define MP_DLINKLIST_INS_FRT(head,x) do { \
-    x->prev = NULL; \
-    x->next = head; \
-    if (head) \
-        head->prev = x; \
-    head = x; \
-} while(0)
-
-#define MP_DLINKLIST_DEL(head,x) do { \
-    if (!x->prev) { \
-        head = x->next; \
-        if (x->next) x->next->prev = NULL; \
-    } else { \
-        x->prev->next = x->next; \
-        if (x->next) x->next->prev = x->prev; \
-    } \
-} while(0)
-
 typedef struct _mp_chunk
 {
     mem_size_t alloc_mem;
@@ -95,6 +54,7 @@ int  get_memory_id(_MP_Memory *mm);
 
 MemoryPool* MemoryPool_Init   (mem_size_t maxmempoolsize, mem_size_t mempoolsize, int thread_safe);
 void*       MemoryPool_Alloc  (MemoryPool *mp, mem_size_t wantsize);
+void*       MemoryPool_Calloc (MemoryPool *mp, mem_size_t wantsize);
 int         MemoryPool_Free   (MemoryPool *mp, void *p);
 MemoryPool* MemoryPool_Clear  (MemoryPool *mp);
 int         MemoryPool_Destroy(MemoryPool *mp);