Merge branch 'papi_starpu' of gitlab.inria.fr:starpu/starpu into papi_starpu

tests/perfmodels/test_papi.c

@@ -70,12 +70,19 @@ static struct starpu_perfmodel my_perfmodel=
         .symbol = "my_perfmodel",
 };
 
+static struct starpu_perfmodel energy_model=
+{
+        .type = STARPU_HISTORY_BASED,
+        .symbol = "energy_model",
+};
+
+
 static struct starpu_codelet memset_cl=
 {
         .cpu_funcs = {memset0_cpu, memset_cpu},
         .cpu_funcs_name = {"memset0_cpu", "memset_cpu"},
         .model = &my_perfmodel,
-        .energy_model = &my_perfmodel,
+        .energy_model = &energy_model,
         .nbuffers = 1,
         .modes = {STARPU_W}
 };
@@ -162,7 +169,7 @@ int main(int argc, char **argv)
 
         /* Stop counting and store the values into the array */
 
-         if ( (retval = starpu_energy_stop(&my_perfmodel, task, 0, ntasks)) != 0)
+         if ( (retval = starpu_energy_stop(&energy_model, task, 0, ntasks)) != 0)
 
                 ERROR_RETURN(retval);