Browse Source

src/ : repalce calls to assert() by calls to STARPU_ASSERT().

Done using the following Coccinelle script :

@@
@@
-assert(
+STARPU_ASSERT(
...)
Cyril Roelandt 13 years ago
parent
commit
99465346a7

+ 1 - 1
src/common/htable32.c

@@ -76,7 +76,7 @@ void *_starpu_htbl_insert_32(struct starpu_htbl32_node **htbl, uint32_t key, voi
 		{
 			/* TODO pad to change that 1 into 16 ? */
 			*current_htbl_ptr = (struct starpu_htbl32_node*)calloc(sizeof(struct starpu_htbl32_node), 1);
-			assert(*current_htbl_ptr);
+			STARPU_ASSERT(*current_htbl_ptr);
 		}
 
 		/* 0000000000001111

+ 1 - 1
src/core/dependencies/htable.c

@@ -69,7 +69,7 @@ void *_starpu_htbl_insert_tag(struct _starpu_htbl_node **htbl, starpu_tag_t tag,
 		{
 			/* TODO pad to change that 1 into 16 ? */
 			*current_htbl_ptr = (struct _starpu_htbl_node *) calloc(1, sizeof(struct _starpu_htbl_node));
-			assert(*current_htbl_ptr);
+			STARPU_ASSERT(*current_htbl_ptr);
 
 			if (previous_htbl_ptr)
 				previous_htbl_ptr->nentries++;

+ 5 - 5
src/core/perfmodel/perfmodel_bus.c

@@ -114,7 +114,7 @@ static void measure_bandwidth_between_host_and_dev_on_cpu_with_cuda(int dev, int
 	/* Allocate a buffer on the device */
 	unsigned char *d_buffer;
 	cudaMalloc((void **)&d_buffer, size);
-	assert(d_buffer);
+	STARPU_ASSERT(d_buffer);
 
 	/* hack to avoid third party libs to rebind threads */
 	_starpu_bind_thread_on_cpu(config, cpu);
@@ -122,7 +122,7 @@ static void measure_bandwidth_between_host_and_dev_on_cpu_with_cuda(int dev, int
 	/* Allocate a buffer on the host */
 	unsigned char *h_buffer;
 	cures = cudaHostAlloc((void **)&h_buffer, size, 0);
-	assert(cures == cudaSuccess);
+	STARPU_ASSERT(cures == cudaSuccess);
 
 	/* hack to avoid third party libs to rebind threads */
 	_starpu_bind_thread_on_cpu(config, cpu);
@@ -191,7 +191,7 @@ static void measure_bandwidth_between_dev_and_dev_cuda(int src, int dst)
 	/* Allocate a buffer on the device */
 	unsigned char *s_buffer;
 	cudaMalloc((void **)&s_buffer, size);
-	assert(s_buffer);
+	STARPU_ASSERT(s_buffer);
 	cudaMemset(s_buffer, 0, size);
 
 	/* Initiliaze CUDA context on the destination */
@@ -200,7 +200,7 @@ static void measure_bandwidth_between_dev_and_dev_cuda(int src, int dst)
 	/* Allocate a buffer on the device */
 	unsigned char *d_buffer;
 	cudaMalloc((void **)&d_buffer, size);
-	assert(d_buffer);
+	STARPU_ASSERT(d_buffer);
 	cudaMemset(d_buffer, 0, size);
 
 	unsigned iter;
@@ -267,7 +267,7 @@ static void measure_bandwidth_between_host_and_dev_on_cpu_with_opencl(int dev, i
         /* Allocate a buffer on the host */
 	unsigned char *h_buffer;
         h_buffer = malloc(size);
-	assert(h_buffer);
+	STARPU_ASSERT(h_buffer);
 
 	/* hack to avoid third party libs to rebind threads */
 	_starpu_bind_thread_on_cpu(config, cpu);

+ 2 - 2
src/core/task.c

@@ -303,11 +303,11 @@ int starpu_task_submit(struct starpu_task *task)
                 }
 
 		/* Check buffers */
-		assert(task->cl->nbuffers <= STARPU_NMAXBUFS);
+		STARPU_ASSERT(task->cl->nbuffers <= STARPU_NMAXBUFS);
 		for (i = 0; i < task->cl->nbuffers; i++)
 		{
 			/* Make sure handles are not partitioned */
-			assert(task->buffers[i].handle->nchildren == 0);
+			STARPU_ASSERT(task->buffers[i].handle->nchildren == 0);
 		}
 
 		/* In case we require that a task should be explicitely

+ 4 - 4
src/datawizard/interfaces/bcsr_interface.c

@@ -331,7 +331,7 @@ static ssize_t allocate_bcsr_buffer_on_node(void *data_interface_, uint32_t dst_
 		}
 #endif
 		default:
-			assert(0);
+			STARPU_ASSERT(0);
 	}
 
 	/* allocation succeeded */
@@ -361,7 +361,7 @@ fail_rowptr:
 			break;
 #endif
 		default:
-			assert(0);
+			STARPU_ASSERT(0);
 	}
 
 fail_colind:
@@ -380,7 +380,7 @@ fail_colind:
 			break;
 #endif
 		default:
-			assert(0);
+			STARPU_ASSERT(0);
 	}
 
 fail_nzval:
@@ -416,7 +416,7 @@ static void free_bcsr_buffer_on_node(void *data_interface, uint32_t node)
 			break;
 #endif
 		default:
-			assert(0);
+			STARPU_ASSERT(0);
 	}
 }
 

+ 2 - 2
src/datawizard/interfaces/block_interface.c

@@ -348,7 +348,7 @@ static ssize_t allocate_block_buffer_on_node(void *data_interface_, uint32_t dst
 			}
 #endif
 		default:
-			assert(0);
+			STARPU_ASSERT(0);
 	}
 
 	if (!fail)
@@ -400,7 +400,7 @@ static void free_block_buffer_on_node(void *data_interface, uint32_t node)
                         break;
 #endif
 		default:
-			assert(0);
+			STARPU_ASSERT(0);
 	}
 }
 

+ 4 - 4
src/datawizard/interfaces/csr_interface.c

@@ -305,7 +305,7 @@ static ssize_t allocate_csr_buffer_on_node(void *data_interface_, uint32_t dst_n
 			}
 #endif
 		default:
-			assert(0);
+			STARPU_ASSERT(0);
 	}
 
 	/* allocation succeeded */
@@ -335,7 +335,7 @@ fail_rowptr:
 			break;
 #endif
 		default:
-			assert(0);
+			STARPU_ASSERT(0);
 	}
 
 fail_colind:
@@ -354,7 +354,7 @@ fail_colind:
 			break;
 #endif
 		default:
-			assert(0);
+			STARPU_ASSERT(0);
 	}
 
 fail_nzval:
@@ -390,7 +390,7 @@ static void free_csr_buffer_on_node(void *data_interface, uint32_t node)
 			break;
 #endif
 		default:
-			assert(0);
+			STARPU_ASSERT(0);
 	}
 }
 

+ 2 - 2
src/datawizard/interfaces/matrix_interface.c

@@ -327,7 +327,7 @@ static ssize_t allocate_matrix_buffer_on_node(void *data_interface_, uint32_t ds
 			}
 #endif
 		default:
-			assert(0);
+			STARPU_ASSERT(0);
 	}
 
 	if (!fail)
@@ -378,7 +378,7 @@ static void free_matrix_buffer_on_node(void *data_interface, uint32_t node)
                         break;
 #endif
 		default:
-			assert(0);
+			STARPU_ASSERT(0);
 	}
 }
 

+ 2 - 2
src/datawizard/interfaces/variable_interface.c

@@ -247,7 +247,7 @@ static ssize_t allocate_variable_buffer_on_node(void *data_interface_, uint32_t
 			}
 #endif
 		default:
-			assert(0);
+			STARPU_ASSERT(0);
 	}
 
 	if (fail)
@@ -281,7 +281,7 @@ static void free_variable_buffer_on_node(void *data_interface, uint32_t node)
                         break;
 #endif
 		default:
-			assert(0);
+			STARPU_ASSERT(0);
 	}
 }
 

+ 2 - 2
src/datawizard/interfaces/vector_interface.c

@@ -282,7 +282,7 @@ static ssize_t allocate_vector_buffer_on_node(void *data_interface_, uint32_t ds
 			}
 #endif
 		default:
-			assert(0);
+			STARPU_ASSERT(0);
 	}
 
 	if (fail)
@@ -325,7 +325,7 @@ static void free_vector_buffer_on_node(void *data_interface, uint32_t node)
                         break;
 #endif
 		default:
-			assert(0);
+			STARPU_ASSERT(0);
 	}
 }
 

+ 1 - 1
src/drivers/cpu/driver_cpu.c

@@ -192,7 +192,7 @@ void *_starpu_cpu_worker(void *arg)
 					_starpu_push_task(j, 0);
 					continue;
 				default:
-					assert(0);
+					STARPU_ASSERT(0);
 			}
 		}
 

+ 4 - 4
src/drivers/cuda/driver_cuda.c

@@ -169,7 +169,7 @@ unsigned _starpu_get_cuda_device_count(void)
 void _starpu_init_cuda(void)
 {
 	ncudagpus = _starpu_get_cuda_device_count();
-	assert(ncudagpus <= STARPU_MAXCUDADEVS);
+	STARPU_ASSERT(ncudagpus <= STARPU_MAXCUDADEVS);
 }
 
 static int execute_job_on_cuda(struct _starpu_job *j, struct _starpu_worker *args)
@@ -335,7 +335,7 @@ void *_starpu_cuda_worker(void *arg)
 					STARPU_ABORT();
 					continue;
 				default:
-					assert(0);
+					STARPU_ASSERT(0);
 			}
 		}
 
@@ -392,12 +392,12 @@ void starpu_cublas_report_error(const char *func, const char *file, int line, cu
 			break;
 	}
 	printf("oops in %s (%s:%u)... %s \n", func, file, line, errormsg);
-	assert(0);
+	STARPU_ASSERT(0);
 }
 
 void starpu_cuda_report_error(const char *func, const char *file, int line, cudaError_t status)
 {
 	const char *errormsg = cudaGetErrorString(status);
 	printf("oops in %s (%s:%u)... %s \n", func, file, line, errormsg);
-	assert(0);
+	STARPU_ASSERT(0);
 }

+ 1 - 1
src/drivers/opencl/driver_opencl.c

@@ -524,7 +524,7 @@ void *_starpu_opencl_worker(void *arg)
 					STARPU_ABORT();
 					continue;
 				default:
-					assert(0);
+					STARPU_ASSERT(0);
 			}
 		}
 

+ 1 - 1
src/util/starpu_insert_task.c

@@ -41,7 +41,7 @@ void starpu_unpack_cl_args(void *_cl_arg, ...)
 	unsigned current_arg_offset = 0;
 	va_list varg_list;
 
-	assert(cl_arg);
+	STARPU_ASSERT(cl_arg);
 	va_start(varg_list, _cl_arg);
 
 	/* We fill the different pointers with the appropriate arguments */