Commit 4e29fb70 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

sched: Rename sched_info_{queued,dequeued} 



For consistency, rename {queued,dequeued} to {enqueue,dequeue}.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarRik van Riel <riel@surriel.com>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarBalbir Singh <bsingharora@gmail.com>
Link: https://lkml.kernel.org/r/20210505111525.061402904@infradead.org
parent 4b7a08a0

kernel/sched/core.c

+2 −2
Original line number Diff line number Diff line
@@ -1595,7 +1595,7 @@ static inline void enqueue_task(struct rq *rq, struct task_struct *p, int flags) 
		update_rq_clock(rq);



	if (!(flags & ENQUEUE_RESTORE)) {

		sched_info_queued(rq, p);

		sched_info_enqueue(rq, p);

		psi_enqueue(p, flags & ENQUEUE_WAKEUP);

	}
@@ -1609,7 +1609,7 @@ static inline void dequeue_task(struct rq *rq, struct task_struct *p, int flags) 
		update_rq_clock(rq);



	if (!(flags & DEQUEUE_SAVE)) {

		sched_info_dequeued(rq, p);

		sched_info_dequeue(rq, p);

		psi_dequeue(p, flags & DEQUEUE_SLEEP);

	}

kernel/sched/stats.h

+10 −10
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ rq_sched_info_depart(struct rq *rq, unsigned long long delta) 
}



static inline void

rq_sched_info_dequeued(struct rq *rq, unsigned long long delta)

rq_sched_info_dequeue(struct rq *rq, unsigned long long delta)

{

	if (rq)

		rq->rq_sched_info.run_delay += delta;
@@ -42,7 +42,7 @@ rq_sched_info_dequeued(struct rq *rq, unsigned long long delta) 


#else /* !CONFIG_SCHEDSTATS: */

static inline void rq_sched_info_arrive  (struct rq *rq, unsigned long long delta) { }

static inline void rq_sched_info_dequeued(struct rq *rq, unsigned long long delta) { }

static inline void rq_sched_info_dequeue(struct rq *rq, unsigned long long delta) { }

static inline void rq_sched_info_depart  (struct rq *rq, unsigned long long delta) { }

# define   schedstat_enabled()		0

# define __schedstat_inc(var)		do { } while (0)
@@ -161,7 +161,7 @@ static inline void sched_info_reset_dequeued(struct task_struct *t) 
 * from dequeue_task() to account for possible rq->clock skew across CPUs. The

 * delta taken on each CPU would annul the skew.

 */

static inline void sched_info_dequeued(struct rq *rq, struct task_struct *t)

static inline void sched_info_dequeue(struct rq *rq, struct task_struct *t)

{

	unsigned long long now = rq_clock(rq), delta = 0;
@@ -172,7 +172,7 @@ static inline void sched_info_dequeued(struct rq *rq, struct task_struct *t) 
	sched_info_reset_dequeued(t);

	t->sched_info.run_delay += delta;



	rq_sched_info_dequeued(rq, delta);

	rq_sched_info_dequeue(rq, delta);

}



/*
@@ -197,9 +197,9 @@ static void sched_info_arrive(struct rq *rq, struct task_struct *t) 
/*

 * This function is only called from enqueue_task(), but also only updates

 * the timestamp if it is already not set.  It's assumed that

 * sched_info_dequeued() will clear that stamp when appropriate.

 * sched_info_dequeue() will clear that stamp when appropriate.

 */

static inline void sched_info_queued(struct rq *rq, struct task_struct *t)

static inline void sched_info_enqueue(struct rq *rq, struct task_struct *t)

{

	if (sched_info_on()) {

		if (!t->sched_info.last_queued)
@@ -212,7 +212,7 @@ static inline void sched_info_queued(struct rq *rq, struct task_struct *t) 
 * due, typically, to expiring its time slice (this may also be called when

 * switching to the idle task).  Now we can calculate how long we ran.

 * Also, if the process is still in the TASK_RUNNING state, call

 * sched_info_queued() to mark that it has now again started waiting on

 * sched_info_enqueue() to mark that it has now again started waiting on

 * the runqueue.

 */

static inline void sched_info_depart(struct rq *rq, struct task_struct *t)
@@ -222,7 +222,7 @@ static inline void sched_info_depart(struct rq *rq, struct task_struct *t) 
	rq_sched_info_depart(rq, delta);



	if (t->state == TASK_RUNNING)

		sched_info_queued(rq, t);

		sched_info_enqueue(rq, t);

}



/*
@@ -253,9 +253,9 @@ sched_info_switch(struct rq *rq, struct task_struct *prev, struct task_struct *n 
}



#else /* !CONFIG_SCHED_INFO: */

# define sched_info_queued(rq, t)	do { } while (0)

# define sched_info_enqueue(rq, t)	do { } while (0)

# define sched_info_reset_dequeued(t)	do { } while (0)

# define sched_info_dequeued(rq, t)	do { } while (0)

# define sched_info_dequeue(rq, t)	do { } while (0)

# define sched_info_depart(rq, t)	do { } while (0)

# define sched_info_arrive(rq, next)	do { } while (0)

# define sched_info_switch(rq, t, next)	do { } while (0)