merge trunk

src/datawizard/user_interactions.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009-2017  Université de Bordeaux
- * Copyright (C) 2010, 2011, 2012, 2013, 2015, 2016  CNRS
+ * Copyright (C) 2010, 2011, 2012, 2013, 2015, 2016, 2017  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -29,7 +29,8 @@ static void _starpu_data_check_initialized(starpu_data_handle_t handle, enum sta
 	if (!(mode & STARPU_R))
 		return;
 
-	if (!handle->initialized && handle->init_cl) {
+	if (!handle->initialized && handle->init_cl)
+	{
 		int ret = starpu_task_insert(handle->init_cl, STARPU_W, handle, 0);
 		STARPU_ASSERT(ret == 0);
 	}

tests/datawizard/redux_acquire.c

@@ -38,6 +38,7 @@ static struct starpu_codelet init_codelet =
 	.modes = {STARPU_W},
 	.name = "init_codelet"
 };
+
 static struct starpu_codelet redux_codelet =
 {
 	.cpu_funcs = {redux_cpu_func},
@@ -46,7 +47,8 @@ static struct starpu_codelet redux_codelet =
 	.name = "redux_codelet"
 };
 
-static void check_dot(void *dot_handle) {
+static void check_dot(void *dot_handle)
+{
 	long int *x = starpu_data_get_local_ptr(dot_handle);
 	STARPU_ASSERT_MSG(*x == 42, "Incorrect value %ld", *x);
 	starpu_data_release(dot_handle);