lock

5 files changed, 12 insertions, 12 deletions

diff --git a/libclapi/cl_context.c b/libclapi/cl_context.c
index abd0ee1a..2e6073da 100644
--- a/libclapi/cl_context.c
+++ b/libclapi/cl_context.c
@@ -169,8 +169,8 @@ static void cl_context_delete(cl_context ctx)
 
   assert(ctx);
 
-  pthread_mutex_destroy(&ctx->lock);
-  pthread_cond_destroy(&ctx->cond);
+  CL_MUTEX_DESTROY(&ctx->lock);
+  CL_COND_DESTROY(&ctx->cond);
   /* delete  refs to devices. */
   for (i = 0; i < ctx->device_num; i++) {
     cl_release_device_id(ctx->devices[i]);
diff --git a/libclapi/cl_event.c b/libclapi/cl_event.c
index ffb58df2..171a966d 100644
--- a/libclapi/cl_event.c
+++ b/libclapi/cl_event.c
@@ -80,7 +80,7 @@ cl_int cl_event_set_status(cl_event event, cl_int status)
   CL_MUTEX_LOCK(&event->ctx->lock);
 
   /* First notify the one wait on context. */
-  pthread_cond_broadcast(&event->ctx->cond);
+  CL_COND_BROADCAST(&event->ctx->cond);
 
   /*Then, we need to notify all the queue attached to the context, ref them temporary. */
   queue_num = 0;
@@ -223,7 +223,7 @@ static cl_event cl_event_new(cl_context ctx, cl_command_queue queue,
     cl_retain_event(e->wait_events[i]);
   }
 
-  pthread_mutex_init(&e->lock, NULL);
+  CL_MUTEX_INIT(&e->lock);
   e->magic = CL_MAGIC_EVENT_HEADER;
   cl_ref_set_val(&e->ref_n, 1);
 
@@ -286,7 +286,7 @@ static void cl_event_delete(cl_event e)
     }
   }
 
-  pthread_mutex_destroy(&e->lock);
+  CL_MUTEX_DESTROY(&e->lock);
   e->magic = CL_MAGIC_DEAD_HEADER;
   CL_FREE(e);
 }
@@ -789,7 +789,7 @@ static cl_int cl_event_wait_for_events(cl_uint num_events, const cl_event *event
     } else {
       /* user event can also have change it status, but because we hold context->lock, the
         signal should not be broadcasted. */
-      pthread_cond_wait(&new_list[0]->ctx->cond, &new_list[0]->ctx->lock);
+      CL_COND_WAIT(&new_list[0]->ctx->cond, &new_list[0]->ctx->lock);
     }
   }
   CL_MUTEX_UNLOCK(&new_list[0]->ctx->lock);// Add the event should have same context.
diff --git a/libclapi/cl_kernel.c b/libclapi/cl_kernel.c
index 7398621b..0f110bef 100644
--- a/libclapi/cl_kernel.c
+++ b/libclapi/cl_kernel.c
@@ -135,7 +135,7 @@ static cl_kernel cl_kernel_new(cl_program p, const char* name)
 
   cl_ref_set_val(&k->ref_n, 1);
   k->magic = CL_MAGIC_KERNEL_HEADER;
-  pthread_mutex_init(&k->lock, NULL);
+  CL_MUTEX_INIT(&k->lock);
 
   cl_retain_program(p);
   k->program = p;
@@ -186,7 +186,7 @@ static void cl_kernel_delete(cl_kernel k)
     CL_FREE(k->pdata);
   }
 
-  pthread_mutex_destroy(&k->lock);
+  CL_MUTEX_DESTROY(&k->lock);
   k->magic = CL_MAGIC_DEAD_HEADER; /* For safety */
   CL_FREE(k);
 }
diff --git a/libclapi/cl_mem.c b/libclapi/cl_mem.c
index f94a525f..f74b0911 100644
--- a/libclapi/cl_mem.c
+++ b/libclapi/cl_mem.c
@@ -157,7 +157,7 @@ LOCAL cl_mem cl_mem_new(cl_mem_object_type type, cl_context ctx, cl_mem_flags fl
   mem->magic = CL_MAGIC_MEM_HEADER;
   mem->flags = flags;
   mem->size = sz;
-  pthread_mutex_init(&mem->lock, NULL);
+  CL_MUTEX_INIT(&mem->lock);
 
   cl_retain_context(ctx);
   mem->ctx = ctx;
@@ -201,7 +201,7 @@ static void cl_mem_delete(cl_mem mem)
     }
   }
 
-  pthread_mutex_destroy(&mem->lock);
+  CL_MUTEX_DESTROY(&mem->lock);
 
   if (mem->ctx->device_num > 1) {
     CL_FREE(mem->pdata);
diff --git a/libclapi/cl_program.c b/libclapi/cl_program.c
index 4bcb65cb..af63c02f 100644
--- a/libclapi/cl_program.c
+++ b/libclapi/cl_program.c
@@ -106,7 +106,7 @@ static void cl_program_delete(cl_program p)
     CL_FREE(p->pdata);
   }
 
-  pthread_mutex_destroy(&p->lock);
+  CL_MUTEX_DESTROY(&p->lock);
   p->magic = CL_MAGIC_DEAD_HEADER; /* For safety */
   CL_FREE(p);
 }
@@ -160,7 +160,7 @@ static cl_program cl_program_new(cl_context ctx)
   cl_ref_set_val(&p->ref_n, 1);
   p->magic = CL_MAGIC_PROGRAM_HEADER;
   p->ctx = ctx;
-  pthread_mutex_init(&p->lock, NULL);
+  CL_MUTEX_INIT(&p->lock);
 
   /* The queue also belongs to its context */
   cl_retain_context(ctx);