merge fix

include/starpu_perfmodel.h

@@ -202,25 +202,14 @@ enum starpu_perf_archtype starpu_worker_get_perf_archtype(int workerid);
 int starpu_perfmodel_load_symbol(const char *symbol, struct starpu_perfmodel *model);
 void starpu_perfmodel_debugfilepath(struct starpu_perfmodel *model, enum starpu_perf_archtype arch, char *path, size_t maxlen, unsigned nimpl);
 void starpu_perfmodel_get_arch_name(enum starpu_perf_archtype arch, char *archname, size_t maxlen, unsigned nimpl);
-<<<<<<< .working
-double starpu_history_based_job_expected_perf(struct starpu_perfmodel *model, enum starpu_perf_archtype arch, uint32_t footprint);
-int starpu_perfmodel_list(FILE *output);
-void starpu_perfmodel_print(struct starpu_perfmodel *model, enum starpu_perf_archtype arch, unsigned nimpl, char *parameter, uint32_t *footprint, FILE *output);
-int starpu_perfmodel_print_all(struct starpu_perfmodel *model, char *arch, char *parameter, uint32_t *footprint, FILE *output);
-=======
->>>>>>> .merge-right.r7640
 
-<<<<<<< .working
-void starpu_perfmodel_update_history(struct starpu_perfmodel *model, struct starpu_task *task, enum starpu_perf_archtype arch, unsigned cpuid, unsigned nimpl, double measured);
-
-=======
+double starpu_history_based_job_expected_perf(struct starpu_perfmodel *model, enum starpu_perf_archtype arch, uint32_t footprint);
 int starpu_perfmodel_list(FILE *output);
 void starpu_perfmodel_print(struct starpu_perfmodel *model, enum starpu_perf_archtype arch, unsigned nimpl, char *parameter, uint32_t *footprint, FILE *output);
 int starpu_perfmodel_print_all(struct starpu_perfmodel *model, char *arch, char *parameter, uint32_t *footprint, FILE *output);
 
 void starpu_perfmodel_update_history(struct starpu_perfmodel *model, struct starpu_task *task, enum starpu_perf_archtype arch, unsigned cpuid, unsigned nimpl, double measured);
 
->>>>>>> .merge-right.r7640
 void starpu_bus_print_bandwidth(FILE *f);
 void starpu_bus_print_affinity(FILE *f);
 

include/starpu_task.h

@@ -241,7 +241,6 @@ struct starpu_task
 	.predicted = -1.0,				\
 	.predicted_transfer = -1.0,			\
 	.starpu_private = NULL,				\
-<<<<<<< .working
 	.magic = 42,                  			\
 	.sched_ctx = 0,					\
 	.control_task = 0,				\
@@ -250,10 +249,6 @@ struct starpu_task
 	.already_pushed = 0,				\
 		.scheduled = 0				\
 }
-=======
-	.magic = 42                  			\
-}
->>>>>>> .merge-right.r7640
 
 /*
  * handle task dependencies: it is possible to associate a task with a unique

include/starpu_util.h

@@ -250,8 +250,6 @@ void starpu_execute_on_specific_workers(void (*func)(void*), void * arg, unsigne
  * copied, and it is given the callback_arg pointer as argument.*/
 int starpu_data_cpy(starpu_data_handle_t dst_handle, starpu_data_handle_t src_handle, int asynchronous, void (*callback_func)(void*), void *callback_arg);
 
-<<<<<<< .working
-<<<<<<< .working
 /* Constants used by the starpu_insert_task helper to determine the different types of argument */
 #define STARPU_VALUE		(1<<4)	/* Pointer to a constant value */
 #define STARPU_CALLBACK		(1<<5)	/* Callback function */
@@ -274,10 +272,6 @@ void starpu_codelet_unpack_args(void *cl_arg, ...);
  * given to a codelet and later unpacked with starpu_codelet_unpack_args */
 void starpu_codelet_pack_args(char **arg_buffer, size_t *arg_buffer_size, ...);
 
-=======
->>>>>>> .merge-right.r7640
-=======
->>>>>>> .merge-right.r7640
 #ifdef __cplusplus
 }
 #endif

src/common/fxt.h

@@ -205,26 +205,10 @@ do {									\
 	if (model_name)                                                 \
 	{								\
 		/* we include the symbol name */			\
-<<<<<<< .working
-<<<<<<< .working
 		_STARPU_FUT_DO_PROBE4STR(_STARPU_FUT_START_CODELET_BODY, (job), ((job)->task)->sched_ctx, syscall(SYS_gettid), 1, model_name); \
-=======
-		_STARPU_FUT_DO_PROBE3STR(_STARPU_FUT_START_CODELET_BODY, (job), _starpu_gettid(), 1, model_name); \
->>>>>>> .merge-right.r7640
-=======
-		_STARPU_FUT_DO_PROBE3STR(_STARPU_FUT_START_CODELET_BODY, (job), _starpu_gettid(), 1, model_name); \
->>>>>>> .merge-right.r7640
 	}								\
 	else {                                                          \
-<<<<<<< .working
-<<<<<<< .working
 		FUT_DO_PROBE4(_STARPU_FUT_START_CODELET_BODY, (job), ((job)->task)->sched_ctx, syscall(SYS_gettid), 0); \
-=======
-		FUT_DO_PROBE3(_STARPU_FUT_START_CODELET_BODY, (job), _starpu_gettid(), 0); \
->>>>>>> .merge-right.r7640
-=======
-		FUT_DO_PROBE3(_STARPU_FUT_START_CODELET_BODY, (job), _starpu_gettid(), 0); \
->>>>>>> .merge-right.r7640
 	}								\
 } while(0);
 
@@ -423,4 +407,3 @@ do {										\
 #endif // STARPU_USE_FXT
 
 #endif // __FXT_H__
-