瀏覽代碼

fix warnings

Samuel Thibault 7 年之前
父節點
當前提交
3261d2180f
共有 3 個文件被更改,包括 10 次插入10 次删除
  1. 2 2
      examples/dependency/sequential_consistency.c
  2. 5 5
      src/datawizard/filters.c
  3. 3 3
      src/util/starpu_task_insert_utils.c

+ 2 - 2
examples/dependency/sequential_consistency.c

@@ -55,7 +55,7 @@ void cpu_codeletA(void *descr[], void *args)
 	starpu_data_handle_t value_handle;
 	starpu_tag_t tagHoldC;
 	int ret;
-	char handle_sequential_consistency = 0;
+	unsigned char handle_sequential_consistency[] = {0};
 
 	FPRINTF(stderr, "[Task A] Value = %d\n", *val);
 
@@ -69,7 +69,7 @@ void cpu_codeletA(void *descr[], void *args)
 	ret = starpu_task_insert(&clB,
 				 STARPU_RW, value_handle,
 				 STARPU_CALLBACK_WITH_ARG, starpu_tag_notify_from_apps, tagHoldC,
-				 STARPU_HANDLES_SEQUENTIAL_CONSISTENCY, &handle_sequential_consistency,
+				 STARPU_HANDLES_SEQUENTIAL_CONSISTENCY, handle_sequential_consistency,
 				 STARPU_NAME, "taskB",
 				 0);
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_insert");

+ 5 - 5
src/datawizard/filters.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011                                     Antoine Lucas
  * Copyright (C) 2011-2012,2016-2017                      Inria
- * Copyright (C) 2008-2017                                Université de Bordeaux
+ * Copyright (C) 2008-2018                                Université de Bordeaux
  * Copyright (C) 2010                                     Mehdi Juhoor
  * Copyright (C) 2010-2013,2015-2018                      CNRS
  * Copyright (C) 2013                                     Thibaut Lambert
@@ -659,7 +659,7 @@ void starpu_data_partition_clean(starpu_data_handle_t root_handle, unsigned npar
 }
 
 static
-void _starpu_data_partition_submit(starpu_data_handle_t initial_handle, unsigned nparts, starpu_data_handle_t *children, char *handles_sequential_consistency)
+void _starpu_data_partition_submit(starpu_data_handle_t initial_handle, unsigned nparts, starpu_data_handle_t *children, unsigned char *handles_sequential_consistency)
 {
 	unsigned i;
 	STARPU_ASSERT_MSG(initial_handle->sequential_consistency, "partition planning is currently only supported for data with sequential consistency");
@@ -706,7 +706,7 @@ void _starpu_data_partition_submit(starpu_data_handle_t initial_handle, unsigned
 void starpu_data_partition_submit_sequential_consistency(starpu_data_handle_t initial_handle, unsigned nparts, starpu_data_handle_t *children, int sequential_consistency)
 {
 	unsigned i;
-	char handles_sequential_consistency[nparts+1];
+	unsigned char handles_sequential_consistency[nparts+1];
 	handles_sequential_consistency[0] = sequential_consistency;
 	for(i=1 ; i<nparts+1 ; i++) handles_sequential_consistency[i] = children[i-1]->sequential_consistency;
 
@@ -779,7 +779,7 @@ void starpu_data_partition_readwrite_upgrade_submit(starpu_data_handle_t initial
 	starpu_data_invalidate_submit(initial_handle);
 }
 
-void _starpu_data_unpartition_submit(starpu_data_handle_t initial_handle, unsigned nparts, starpu_data_handle_t *children, int gather_node, char *handles_sequential_consistency)
+void _starpu_data_unpartition_submit(starpu_data_handle_t initial_handle, unsigned nparts, starpu_data_handle_t *children, int gather_node, unsigned char *handles_sequential_consistency)
 {
 	unsigned i;
 	STARPU_ASSERT_MSG(initial_handle->sequential_consistency, "partition planning is currently only supported for data with sequential consistency");
@@ -854,7 +854,7 @@ void starpu_data_unpartition_submit(starpu_data_handle_t initial_handle, unsigne
 void starpu_data_unpartition_submit_sequential_consistency(starpu_data_handle_t initial_handle, unsigned nparts, starpu_data_handle_t *children, int gather_node, int sequential_consistency)
 {
 	unsigned i;
-	char handles_sequential_consistency[nparts+1];
+	unsigned char handles_sequential_consistency[nparts+1];
 	handles_sequential_consistency[0] = sequential_consistency;
 	for(i=1 ; i<nparts+1 ; i++) handles_sequential_consistency[i] = children[i-1]->sequential_consistency;
 	_starpu_data_unpartition_submit(initial_handle, nparts, children, gather_node, handles_sequential_consistency);

+ 3 - 3
src/util/starpu_task_insert_utils.c

@@ -202,7 +202,7 @@ int _starpu_codelet_pack_args(void **arg_buffer, size_t *arg_buffer_size, va_lis
                 }
 		else if (arg_type==STARPU_HANDLES_SEQUENTIAL_CONSISTENCY)
                 {
-                        (void)va_arg(varg_list, char *);
+                        (void)va_arg(varg_list, unsigned char *);
                 }
 		else
 		{
@@ -504,7 +504,7 @@ int _starpu_task_insert_create(struct starpu_codelet *cl, struct starpu_task *ta
                 }
 		else if (arg_type==STARPU_HANDLES_SEQUENTIAL_CONSISTENCY)
                 {
-                        task->handles_sequential_consistency = va_arg(varg_list, char *);
+                        task->handles_sequential_consistency = va_arg(varg_list, unsigned char *);
                 }
 		else
 		{
@@ -752,7 +752,7 @@ int _fstarpu_task_insert_create(struct starpu_codelet *cl, struct starpu_task *t
                 }
 		else if (arg_type==STARPU_HANDLES_SEQUENTIAL_CONSISTENCY)
                 {
-                        task->handles_sequential_consistency = (char *)arglist[arg_i];
+                        task->handles_sequential_consistency = (unsigned char *)arglist[arg_i];
                 }
 		else
 		{