port r15806 from 1.1: move _STARPU_TRACE_JOB_POP call to common starpu_push_task_end place

src/core/sched_policy.c

@@ -554,6 +554,7 @@ int _starpu_push_task_to_workers(struct starpu_task *task)
  */
 int starpu_push_task_end(struct starpu_task *task)
 {
+	_STARPU_TRACE_JOB_POP(task, task->priority > 0);
 	_starpu_profiling_set_task_push_end_time(task);
 	task->scheduled = 1;
 	return 0;

src/sched_policies/deque_modeling_policy_data_aware.c

@@ -173,8 +173,6 @@ static struct starpu_task *_starpu_fifo_pop_first_ready_task(struct _starpu_fifo
 		}
 
 		starpu_task_list_erase(&fifo_queue->taskq, task);
-
-		_STARPU_TRACE_JOB_POP(task, 0);
 	}
 
 	return task;

src/sched_policies/deque_queues.c

@@ -77,7 +77,6 @@ struct starpu_task *_starpu_deque_pop_task(struct _starpu_deque_jobq *deque_queu
 		{
 			j->nimpl = nimpl;
 			j = _starpu_job_list_pop_front(&deque_queue->jobq);
-			_STARPU_TRACE_JOB_POP(j, 0);
 			return j->task;
 		}
 	}

src/sched_policies/eager_central_priority_policy.c

@@ -238,7 +238,6 @@ static struct starpu_task *_starpu_priority_pop_task(unsigned sched_ctx_id)
 					chosen_task = task;
 					taskq->ntasks[priolevel]--;
 					taskq->total_ntasks--;
-					_STARPU_TRACE_JOB_POP(task, 0);
 					break;
 				}
 				else

src/sched_policies/fifo_queues.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010-2014  Université de Bordeaux
+ * Copyright (C) 2010-2015  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2013  CNRS
  * Copyright (C) 2011  Télécom-SudParis
  *
@@ -228,7 +228,6 @@ struct starpu_task *_starpu_fifo_pop_task(struct _starpu_fifo_taskq *fifo_queue,
 			starpu_task_set_implementation(task, nimpl);
 			starpu_task_list_erase(&fifo_queue->taskq, task);
 			fifo_queue->ntasks--;
-			_STARPU_TRACE_JOB_POP(task, 0);
 			return task;
 		}
 	}
@@ -247,7 +246,6 @@ struct starpu_task *_starpu_fifo_pop_local_task(struct _starpu_fifo_taskq *fifo_
 	{
 		task = starpu_task_list_pop_front(&fifo_queue->taskq);
 		fifo_queue->ntasks--;
-		_STARPU_TRACE_JOB_POP(task, 0);
 	}
 
 	return task;

src/sched_policies/stack_queues.c

@@ -92,8 +92,6 @@ struct _starpu_job *_starpu_stack_pop_task(struct _starpu_stack_jobq *stack_queu
 		STARPU_ASSERT(j);
 		stack_queue->njobs--;
 
-		_STARPU_TRACE_JOB_POP(j, 0);
-
 		/* we are sure that we got it now, so at worst, some people thought
 		 * there remained some work and will soon discover it is not true */
 		STARPU_PTHREAD_MUTEX_LOCK(sched_mutex);