Browse Source

Make disk aio take asynchronous_copy_disable flag into account

Samuel Thibault 12 years ago
parent
commit
a0d8553193
1 changed files with 2 additions and 2 deletions
  1. 2 2
      src/datawizard/copy_driver.c

+ 2 - 2
src/datawizard/copy_driver.c

@@ -401,7 +401,7 @@ static int copy_data_1_to_1_generic(starpu_data_handle_t handle,
 #endif
 
 	case _STARPU_MEMORY_NODE_TUPLE(STARPU_CPU_RAM,STARPU_DISK_RAM):
-		if(copy_methods->any_to_any)
+		if(copy_methods->any_to_any || starpu_asynchronous_copy_disabled())
 			ret = copy_methods->any_to_any(src_interface, src_node, dst_interface, dst_node, req ? &req->async_channel : NULL);
 
 		else
@@ -418,7 +418,7 @@ static int copy_data_1_to_1_generic(starpu_data_handle_t handle,
 		break;
 		
 	case _STARPU_MEMORY_NODE_TUPLE(STARPU_DISK_RAM,STARPU_CPU_RAM):
-		if(copy_methods->any_to_any) 
+		if(copy_methods->any_to_any || starpu_asynchronous_copy_disabled()) 
 			ret = copy_methods->any_to_any(src_interface, src_node, dst_interface, dst_node, req ? &req->async_channel : NULL);
 		else
 		{