Messages in this thread Patch in this message | | | From | Yuyang Du <> | Subject | [PATCH v2 15/19] locking/lockdep: Remove __cq_empty() | Date | Mon, 18 Mar 2019 16:57:29 +0800 |
| |
__cq_empty() can be embeded in __cq_dequeue(), removing it. We get slightly simpler code. No functional change.
Signed-off-by: Yuyang Du <duyuyang@gmail.com> --- kernel/locking/lockdep.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index a3fb112..ee8fe64 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -1297,11 +1297,6 @@ static inline void __cq_init(struct circular_queue *cq) lockdep_dependency_gen_id++; } -static inline int __cq_empty(struct circular_queue *cq) -{ - return (cq->front == cq->rear); -} - static inline int __cq_full(struct circular_queue *cq) { return ((cq->rear + 1) & CQ_MASK) == cq->front; @@ -1317,14 +1312,24 @@ static inline int __cq_enqueue(struct circular_queue *cq, struct lock_list *elem return 0; } -static inline int __cq_dequeue(struct circular_queue *cq, struct lock_list **elem) +/* + * Dequeue an element from the circular_queue, return the lock if the queue + * is not empty, or NULL if otherwise + */ +static inline struct lock_list * __cq_dequeue(struct circular_queue *cq) { - if (__cq_empty(cq)) - return -1; + struct lock_list * lock; - *elem = cq->element[cq->front]; + /* + * Is the circular_queue empty? + */ + if (cq->front == cq->rear) + return NULL; + + lock = cq->element[cq->front]; cq->front = (cq->front + 1) & CQ_MASK; - return 0; + + return lock; } static inline unsigned int __cq_get_elem_count(struct circular_queue *cq) @@ -1376,6 +1381,7 @@ static int __bfs(struct lock_list *source_entry, int forward) { struct lock_list *entry; + struct lock_list *lock; struct list_head *head; struct circular_queue *cq = &lock_cq; int ret = 1; @@ -1397,10 +1403,7 @@ static int __bfs(struct lock_list *source_entry, __cq_init(cq); __cq_enqueue(cq, source_entry); - while (!__cq_empty(cq)) { - struct lock_list *lock; - - __cq_dequeue(cq, &lock); + while ((lock = __cq_dequeue(cq))) { if (!lock->class) { ret = -2; -- 1.8.3.1
| |