浏览代码

fix all bug

Corentin Salingue 12 年之前
父节点
当前提交
792e96b06f
共有 4 个文件被更改,包括 6 次插入5 次删除
  1. 2 1
      src/core/disk_ops/disk_unistd.c
  2. 1 0
      src/core/task.c
  3. 2 2
      src/datawizard/malloc.c
  4. 1 2
      tests/disk/disk_compute.c

+ 2 - 1
src/core/disk_ops/disk_unistd.c

@@ -159,6 +159,7 @@ starpu_unistd_read (void *base STARPU_ATTRIBUTE_UNUSED, void *obj, void *buf, of
 
 
 	STARPU_ASSERT_MSG((((uintptr_t) buf) % getpagesize()) == 0, "You have to use starpu_malloc function");
 	STARPU_ASSERT_MSG((((uintptr_t) buf) % getpagesize()) == 0, "You have to use starpu_malloc function");
 
 
+printf("read \n");
 	ssize_t nb = read(tmp->descriptor, buf, size);
 	ssize_t nb = read(tmp->descriptor, buf, size);
 	STARPU_ASSERT_MSG(res >= 0, "Starpu Disk unistd read failed");
 	STARPU_ASSERT_MSG(res >= 0, "Starpu Disk unistd read failed");
 	
 	
@@ -178,7 +179,7 @@ starpu_unistd_write (void *base STARPU_ATTRIBUTE_UNUSED, void *obj, const void *
 	STARPU_ASSERT_MSG((size % getpagesize()) == 0, "You can only write a multiple of page size %u Bytes (Here %u)", getpagesize(), (int) size);
 	STARPU_ASSERT_MSG((size % getpagesize()) == 0, "You can only write a multiple of page size %u Bytes (Here %u)", getpagesize(), (int) size);
 
 
 	STARPU_ASSERT_MSG((((uintptr_t)buf) % getpagesize()) == 0, "You have to use starpu_malloc function");
 	STARPU_ASSERT_MSG((((uintptr_t)buf) % getpagesize()) == 0, "You have to use starpu_malloc function");
-	
+printf("write \n");	
 	ssize_t nb = write (tmp->descriptor, buf, size);
 	ssize_t nb = write (tmp->descriptor, buf, size);
 	STARPU_ASSERT_MSG(res >= 0, "Starpu Disk unistd write failed");
 	STARPU_ASSERT_MSG(res >= 0, "Starpu Disk unistd write failed");
 
 

+ 1 - 0
src/core/task.c

@@ -527,6 +527,7 @@ int _starpu_task_submit_internally(struct starpu_task *task)
 {
 {
 	struct _starpu_job *j = _starpu_get_job_associated_to_task(task);
 	struct _starpu_job *j = _starpu_get_job_associated_to_task(task);
 	j->internal = 1;
 	j->internal = 1;
+
 	return starpu_task_submit(task);
 	return starpu_task_submit(task);
 }
 }
 
 

+ 2 - 2
src/datawizard/malloc.c

@@ -370,7 +370,7 @@ starpu_malloc_on_node(unsigned dst_node, size_t size)
 	{
 	{
 		case STARPU_CPU_RAM:
 		case STARPU_CPU_RAM:
 		{
 		{
-			addr = (uintptr_t)starpu_malloc((void**) &addr, size);
+			starpu_malloc((void**) &addr, size);
 			break;
 			break;
 		}
 		}
 #if defined(STARPU_USE_CUDA) || defined(STARPU_SIMGRID)
 #if defined(STARPU_USE_CUDA) || defined(STARPU_SIMGRID)
@@ -462,7 +462,7 @@ starpu_free_on_node(unsigned dst_node, uintptr_t addr, size_t size)
 	switch(kind)
 	switch(kind)
 	{
 	{
 		case STARPU_CPU_RAM:
 		case STARPU_CPU_RAM:
-			free((void*)addr);
+			starpu_free((void*)addr);
 			break;
 			break;
 #if defined(STARPU_USE_CUDA) || defined(STARPU_SIMGRID)
 #if defined(STARPU_USE_CUDA) || defined(STARPU_SIMGRID)
 		case STARPU_CUDA_RAM:
 		case STARPU_CUDA_RAM:

+ 1 - 2
tests/disk/disk_compute.c

@@ -61,7 +61,7 @@ int main(int argc, char **argv)
 
 
 
 
 	/* register a disk */
 	/* register a disk */
-	int new_dd = starpu_disk_register(&starpu_disk_unistd_ops, (void *) base, 1024*1024*1);
+	int new_dd = starpu_disk_register(&starpu_disk_stdio_ops, (void *) base, 1024*1024*1);
 	/* can't write on /tmp/ */
 	/* can't write on /tmp/ */
 	if (new_dd == -ENOENT) goto enoent;
 	if (new_dd == -ENOENT) goto enoent;
 	
 	
@@ -122,7 +122,6 @@ int main(int argc, char **argv)
 	void * data = starpu_disk_open(dd, (void *) name_file_start, NX*sizeof(int));
 	void * data = starpu_disk_open(dd, (void *) name_file_start, NX*sizeof(int));
 	void * data_result = starpu_disk_open(dd, (void *) name_file_end, NX*sizeof(int));
 	void * data_result = starpu_disk_open(dd, (void *) name_file_end, NX*sizeof(int));
 
 
-
 	starpu_data_handle_t vector_handleA, vector_handleC;
 	starpu_data_handle_t vector_handleA, vector_handleC;
 
 
 	/* register vector in starpu */
 	/* register vector in starpu */