alloc

1 files changed, 28 insertions, 28 deletions

diff --git a/libclapi/cl_event.c b/libclapi/cl_event.c
index 638ef99a..a83d19eb 100644
--- a/libclapi/cl_event.c
+++ b/libclapi/cl_event.c
@@ -95,7 +95,7 @@ cl_int cl_event_set_status(cl_event event, cl_int status)
     pthread_mutex_unlock(&event->ctx->lock);
     return CL_SUCCESS;
   }
-  queue_array = cl_calloc(queue_num, sizeof(void*));
+  queue_array = CL_CALLOC(queue_num, sizeof(void*));
   if (queue_array == NULL) {
     pthread_mutex_unlock(&event->ctx->lock);
     return CL_OUT_OF_HOST_MEMORY;
@@ -124,7 +124,7 @@ cl_int cl_event_set_status(cl_event event, cl_int status)
   }
 
   if (queue_array)
-    cl_free(queue_array);
+    CL_FREE(queue_array);
 
   return CL_SUCCESS;
 }
@@ -173,7 +173,7 @@ static cl_event cl_event_new(cl_context ctx, cl_command_queue queue,
   cl_bool find = CL_FALSE;
 
   if (num_events) {
-    new_list = CALLOC_ARRAY(cl_event, num_events);
+    new_list = CL_CALLOC(num_events, sizeof(cl_event));
     if (new_list == NULL) {
       return NULL;
     }
@@ -200,7 +200,7 @@ static cl_event cl_event_new(cl_context ctx, cl_command_queue queue,
     }
 
     if (new_num != num_events) {
-      new_list = cl_realloc(new_list, new_num*sizeof(cl_event));
+      new_list = CL_REALLOC(new_list, new_num*sizeof(cl_event));
       if (new_list) {
         return NULL;
       }
@@ -210,10 +210,10 @@ static cl_event cl_event_new(cl_context ctx, cl_command_queue queue,
     assert(new_list);
   }
 
-  e = CALLOC(struct _cl_event);
+  e = CL_CALLOC(1, sizeof(_cl_event));
   if (e == NULL) {
     if (new_list)
-      cl_free(new_list);
+      CL_FREE(new_list);
     return NULL;
   }
   e->wait_events = new_list;
@@ -273,7 +273,7 @@ static void cl_event_delete(cl_event e)
     for (i = 0; i < e->wait_event_num; i++) {
       cl_release_event(e->wait_events[i]);
     }
-    cl_free(e->wait_events);
+    CL_FREE(e->wait_events);
   }
 
   if (e->user_cb) {
@@ -281,13 +281,13 @@ static void cl_event_delete(cl_event e)
     while (e->user_cb) {
       cb = e->user_cb;
       e->user_cb = cb->next;
-      cl_free(cb);
+      CL_FREE(cb);
     }
   }
 
   pthread_mutex_destroy(&e->lock);
   e->magic = CL_MAGIC_DEAD_HEADER;
-  cl_free(e);
+  CL_FREE(e);
 }
 
 LOCAL void cl_release_event(cl_event e)
@@ -371,7 +371,7 @@ static cl_event* cl_expand_marker_and_barrier_event(cl_uint num_events, const cl
     return (cl_event *)event_list;
   }
 
-  new_list = cl_malloc(total_num*sizeof(cl_event));
+  new_list = CL_MALLOC(total_num*sizeof(cl_event));
   if (UNLIKELY(new_list == NULL)) {
     return NULL;
   }
@@ -456,7 +456,7 @@ LOCAL cl_event* cl_check_context_barrier_events(cl_context context, cl_int* even
     context->barrier_events = NULL;
     context->barrier_events_num = 0;
   } else if (new_num != context->barrier_events_num) { // Need to shrink.
-    new_list = cl_malloc(sizeof(cl_event)*new_num);
+    new_list = CL_MALLOC(sizeof(cl_event)*new_num);
     if (new_list == NULL) {
       pthread_mutex_unlock(&context->lock);
       if (err)
@@ -486,7 +486,7 @@ LOCAL cl_event* cl_check_context_barrier_events(cl_context context, cl_int* even
     e_num = e_num + context->barrier_events[i]->wait_event_num;
   }
   if (e_num) {
-    e_list = cl_malloc(sizeof(cl_event)*e_num);
+    e_list = CL_MALLOC(sizeof(cl_event)*e_num);
     if (e_list == NULL) {
       pthread_mutex_unlock(&context->lock);
       if (err)
@@ -517,7 +517,7 @@ LOCAL cl_event* cl_check_context_barrier_events(cl_context context, cl_int* even
       cl_release_event(old_list[i]);
     }
 
-    cl_free(old_list);
+    CL_FREE(old_list);
   }
 
   if (event_num)
@@ -566,9 +566,9 @@ LOCAL cl_event cl_create_event(cl_context context, cl_command_queue queue, cl_bo
   }
 
   if (barrier_list)
-    cl_free(barrier_list);
+    CL_FREE(barrier_list);
   if (new_list && new_list != event_list)
-    cl_free(new_list);
+    CL_FREE(new_list);
 
   if (errcode_ret)
     *errcode_ret = err;
@@ -576,9 +576,9 @@ LOCAL cl_event cl_create_event(cl_context context, cl_command_queue queue, cl_bo
 
 error:
   if (barrier_list)
-    cl_free(barrier_list);
+    CL_FREE(barrier_list);
   if (new_list && new_list != event_list)
-    cl_free(new_list);
+    CL_FREE(new_list);
   if (e)
     cl_event_delete(e);
   if (errcode_ret)
@@ -595,7 +595,7 @@ static cl_int cl_event_set_callback(cl_event event , cl_int exec_type,
   cl_int err = CL_SUCCESS;
   cl_event_user_cb cb;
   cl_bool exec_imm = CL_FALSE;
-  TRY_ALLOC(cb, CALLOC(struct _cl_event_user_cb));
+  TRY_ALLOC(cb, CL_CALLOC(1, sizeof(_cl_event_user_cb)));
 
   cb->pfn_notify = pfn_notify;
   cb->user_data = user_data;
@@ -614,7 +614,7 @@ static cl_int cl_event_set_callback(cl_event event , cl_int exec_type,
   pthread_mutex_unlock(&event->lock);
 
   if (exec_imm) {
-    cl_free(cb);
+    CL_FREE(cb);
   }
 
 exit:
@@ -622,7 +622,7 @@ exit:
 
 error:
   err = CL_OUT_OF_HOST_MEMORY;
-  cl_free(cb);
+  CL_FREE(cb);
   goto exit;
 };
 
@@ -646,7 +646,7 @@ static cl_int cl_enqueue_marker_or_barrier_with_waitlist(cl_command_queue queue,
     }
 
     if (num_events) {
-      ctx_event_list = cl_calloc(num_events, sizeof(cl_event));
+      ctx_event_list = CL_CALLOC(num_events, sizeof(cl_event));
       if (ctx_event_list == NULL) {
         pthread_mutex_unlock(&queue->ctx->lock);
         err = CL_OUT_OF_HOST_MEMORY;
@@ -689,14 +689,14 @@ static cl_int cl_enqueue_marker_or_barrier_with_waitlist(cl_command_queue queue,
     goto error;
 
   if (ctx_event_list)
-    cl_free(ctx_event_list);
+    CL_FREE(ctx_event_list);
 
   if (is_barrier) {
     SET_BARRIER_EVENT(e);
     pthread_mutex_lock(&queue->ctx->lock);
 
     queue->ctx->barrier_events_num++;
-    queue->ctx->barrier_events = cl_realloc(queue->ctx->barrier_events,
+    queue->ctx->barrier_events = CL_REALLOC(queue->ctx->barrier_events,
                                             sizeof(cl_event)*queue->ctx->barrier_events_num);
     if (queue->ctx->barrier_events == NULL) {
       pthread_mutex_unlock(&queue->ctx->lock);
@@ -723,7 +723,7 @@ error:
   if (e)
     cl_release_event(e);
   if (ctx_event_list)
-    cl_free(ctx_event_list);
+    CL_FREE(ctx_event_list);
   return err;
 }
 
@@ -793,16 +793,16 @@ static cl_int cl_event_wait_for_events(cl_uint num_events, const cl_event *event
   }
   pthread_mutex_unlock(&new_list[0]->ctx->lock);// Add the event should have same context.
   if (barrier_list)
-    cl_free(barrier_list);
+    CL_FREE(barrier_list);
   if (new_list && new_list != event_wait_list)
-    cl_free(new_list);
+    CL_FREE(new_list);
   return CL_SUCCESS;
 
 error:
   if (barrier_list)
-    cl_free(barrier_list);
+    CL_FREE(barrier_list);
   if (new_list && new_list != event_wait_list)
-    cl_free(new_list);
+    CL_FREE(new_list);
   return err;
 }