Add memory-allocator-independent util_mutex_ API

Add memory-allocator-independent util_mutex_ API:
- util_mutex_get_size()
- util_mutex_init()
- util_mutex_destroy_not_free()

Signed-off-by: Lukasz Dorau <[email protected]>

Author: ldorau

src/utils/utils_concurrency.h

@@ -27,7 +27,10 @@ struct os_mutex_t;
 
 typedef struct os_mutex_t os_mutex_t;
 
+size_t util_mutex_get_size(void);
+os_mutex_t *util_mutex_init(void *ptr);
 os_mutex_t *util_mutex_create(void);
+void util_mutex_destroy_not_free(os_mutex_t *m);
 void util_mutex_destroy(os_mutex_t *mutex);
 int util_mutex_lock(os_mutex_t *mutex);
 int util_mutex_unlock(os_mutex_t *mutex);

src/utils/utils_posix_concurrency.c

@@ -12,16 +12,26 @@
 
 #include "utils_concurrency.h"
 
-os_mutex_t *util_mutex_create(void) {
-    pthread_mutex_t *mutex = (pthread_mutex_t *)malloc(sizeof(pthread_mutex_t));
+size_t util_mutex_get_size(void) { return sizeof(pthread_mutex_t); }
+
+os_mutex_t *util_mutex_init(void *ptr) {
+    pthread_mutex_t *mutex = (pthread_mutex_t *)ptr;
     int ret = pthread_mutex_init(mutex, NULL);
     return ret == 0 ? ((os_mutex_t *)mutex) : NULL;
 }
 
-void util_mutex_destroy(os_mutex_t *m) {
+os_mutex_t *util_mutex_create(void) {
+    return util_mutex_init(malloc(util_mutex_get_size()));
+}
+
+void util_mutex_destroy_not_free(os_mutex_t *m) {
     pthread_mutex_t *mutex = (pthread_mutex_t *)m;
     int ret = pthread_mutex_destroy(mutex);
     (void)ret; // TODO: add logging
+}
+
+void util_mutex_destroy(os_mutex_t *m) {
+    util_mutex_destroy_not_free(m);
     free(m);
 }
 

src/utils/utils_windows_concurrency.c

@@ -13,18 +13,27 @@ typedef struct {
     CRITICAL_SECTION lock;
 } internal_os_mutex_t;
 
-os_mutex_t *util_mutex_create(void) {
-    internal_os_mutex_t *mutex_internal =
-        (internal_os_mutex_t *)calloc(1, sizeof(internal_os_mutex_t));
+size_t util_mutex_get_size(void) { return sizeof(internal_os_mutex_t); }
+
+os_mutex_t *util_mutex_init(void *ptr) {
+    internal_os_mutex_t *mutex_internal = (internal_os_mutex_t *)ptr;
     InitializeCriticalSection(&mutex_internal->lock);
     return (os_mutex_t *)mutex_internal;
 }
 
-void util_mutex_destroy(os_mutex_t *mutex) {
+os_mutex_t *util_mutex_create(void) {
+    return util_mutex_init(calloc(1, util_mutex_get_size()));
+}
+
+void util_mutex_destroy_not_free(os_mutex_t *mutex) {
     internal_os_mutex_t *mutex_internal = (internal_os_mutex_t *)mutex;
     DeleteCriticalSection(&mutex_internal->lock);
 }
 
+void util_mutex_destroy(os_mutex_t *mutex) {
+    util_mutex_destroy_not_free(mutex);
+}
+
 int util_mutex_lock(os_mutex_t *mutex) {
     internal_os_mutex_t *mutex_internal = (internal_os_mutex_t *)mutex;
     EnterCriticalSection(&mutex_internal->lock);