Merge lp:~schnetter/pocl/main into lp:~pocl/pocl/trunk

[Erik Schnetter]

I corrected the memory allocation/freeing errors for programs and kernels.

=== modified file 'lib/CL/clCreateKernel.c'
--- lib/CL/clCreateKernel.c	2011-12-08 02:44:08 +0000
+++ lib/CL/clCreateKernel.c	2011-12-14 19:00:42 +0000
@@ -22,6 +22,7 @@
 */
 
 #include "pocl_cl.h"
+#include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -111,7 +112,7 @@
       POCL_ERROR(CL_OUT_OF_HOST_MEMORY);
     }
 
-  kernel->function_name = kernel_name;
+  kernel->function_name = strdup(kernel_name);
   kernel->num_args = *(cl_uint *) lt_dlsym(dlhandle, "_num_args");
   kernel->reference_count = 1;
   kernel->context = program->context;

=== modified file 'lib/CL/clReleaseKernel.c'
--- lib/CL/clReleaseKernel.c	2011-12-08 02:44:08 +0000
+++ lib/CL/clReleaseKernel.c	2011-12-14 19:00:42 +0000
@@ -26,11 +26,29 @@
 CL_API_ENTRY cl_int CL_API_CALL
 clReleaseKernel(cl_kernel kernel) CL_API_SUFFIX__VERSION_1_0
 {
-  /* TODO: Remove kernel from the program's linked list of kernels! */
-  /* TODO: Deallocate kernel arguments! */
-  /* In the mean time, we better don't free the kernel, but just make
-     it unusable... */
-  /*free(kernel);*/
-  memset(kernel, -1, sizeof *kernel);
+  cl_kernel *pk;
+
+  if (kernel->program != NULL)
+    {
+      /* Find the kernel in the program's linked list of kernels */
+      for (pk=&kernel->program->kernels; *pk != NULL; pk = &(*pk)->next)
+        {
+          if (*pk == kernel) break;
+        }
+      if (*pk == NULL)
+        {
+          /* The kernel is not on the kernel's program's linked list
+             of kernels -- something is wrong */
+          return CL_INVALID_VALUE;
+        }
+      
+      /* Remove the kernel from the program's linked list of
+         kernels */
+      *pk = (*pk)->next;
+    }
+
+  free((char*)kernel->function_name);
+  free(kernel);
+
   return CL_SUCCESS;
 }

=== modified file 'lib/CL/clReleaseProgram.c'
--- lib/CL/clReleaseProgram.c	2011-10-14 10:31:27 +0000
+++ lib/CL/clReleaseProgram.c	2011-12-14 19:00:42 +0000
@@ -26,6 +26,17 @@
 CL_API_ENTRY cl_int CL_API_CALL
 clReleaseProgram(cl_program program) CL_API_SUFFIX__VERSION_1_0
 {
+  cl_kernel k;
+
+  /* Mark all kernels as having no program */
+  for (k=program->kernels; k!=NULL; k=k->next)
+    {
+      k->program = NULL;
+    }
+
+  free(program->source);
+  free(program->binary);
   free(program);
+
   return CL_SUCCESS;
 }