summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/kern_mutex.c26
-rw-r--r--sys/kern/kern_proc.c12
-rw-r--r--sys/kern/kern_synch.c2
-rw-r--r--sys/kern/subr_turnstile.c26
-rw-r--r--sys/kern/tty.c6
5 files changed, 36 insertions, 36 deletions
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
index 6becc78..e60d805 100644
--- a/sys/kern/kern_mutex.c
+++ b/sys/kern/kern_mutex.c
@@ -163,7 +163,7 @@ propagate_priority(struct thread *td)
/*
* If we aren't blocked on a mutex, we should be.
*/
- KASSERT(TD_ON_MUTEX(td), (
+ KASSERT(TD_ON_LOCK(td), (
"process %d(%s):%d holds %s but isn't blocked on a mutex\n",
td->td_proc->p_pid, td->td_proc->p_comm, td->td_state,
m->mtx_object.lo_name));
@@ -182,7 +182,7 @@ propagate_priority(struct thread *td)
continue;
}
- td1 = TAILQ_PREV(td, threadqueue, td_blkq);
+ td1 = TAILQ_PREV(td, threadqueue, td_lockq);
if (td1->td_priority <= pri) {
continue;
}
@@ -194,15 +194,15 @@ propagate_priority(struct thread *td)
* thread in the chain has a lower priority and that
* td1 will thus not be NULL after the loop.
*/
- TAILQ_REMOVE(&m->mtx_blocked, td, td_blkq);
- TAILQ_FOREACH(td1, &m->mtx_blocked, td_blkq) {
+ TAILQ_REMOVE(&m->mtx_blocked, td, td_lockq);
+ TAILQ_FOREACH(td1, &m->mtx_blocked, td_lockq) {
MPASS(td1->td_proc->p_magic == P_MAGIC);
if (td1->td_priority > pri)
break;
}
MPASS(td1 != NULL);
- TAILQ_INSERT_BEFORE(td1, td, td_blkq);
+ TAILQ_INSERT_BEFORE(td1, td, td_lockq);
CTR4(KTR_LOCK,
"propagate_priority: p %p moved before %p on [%p] %s",
td, td1, m, m->mtx_object.lo_name);
@@ -591,15 +591,15 @@ _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
if (TAILQ_EMPTY(&m->mtx_blocked)) {
td1 = mtx_owner(m);
LIST_INSERT_HEAD(&td1->td_contested, m, mtx_contested);
- TAILQ_INSERT_TAIL(&m->mtx_blocked, td, td_blkq);
+ TAILQ_INSERT_TAIL(&m->mtx_blocked, td, td_lockq);
} else {
- TAILQ_FOREACH(td1, &m->mtx_blocked, td_blkq)
+ TAILQ_FOREACH(td1, &m->mtx_blocked, td_lockq)
if (td1->td_priority > td->td_priority)
break;
if (td1)
- TAILQ_INSERT_BEFORE(td1, td, td_blkq);
+ TAILQ_INSERT_BEFORE(td1, td, td_lockq);
else
- TAILQ_INSERT_TAIL(&m->mtx_blocked, td, td_blkq);
+ TAILQ_INSERT_TAIL(&m->mtx_blocked, td, td_lockq);
}
#ifdef KTR
if (!cont_logged) {
@@ -616,8 +616,8 @@ _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
* Save who we're blocked on.
*/
td->td_blocked = m;
- td->td_mtxname = m->mtx_object.lo_name;
- TD_SET_MUTEX(td);
+ td->td_lockname = m->mtx_object.lo_name;
+ TD_SET_LOCK(td);
propagate_priority(td);
if (LOCK_LOG_TEST(&m->mtx_object, opts))
@@ -735,7 +735,7 @@ _mtx_unlock_sleep(struct mtx *m, int opts, const char *file, int line)
MPASS(td->td_proc->p_magic == P_MAGIC);
MPASS(td1->td_proc->p_magic == P_MAGIC);
- TAILQ_REMOVE(&m->mtx_blocked, td1, td_blkq);
+ TAILQ_REMOVE(&m->mtx_blocked, td1, td_lockq);
if (TAILQ_EMPTY(&m->mtx_blocked)) {
LIST_REMOVE(m, mtx_contested);
@@ -761,7 +761,7 @@ _mtx_unlock_sleep(struct mtx *m, int opts, const char *file, int line)
m, td1);
td1->td_blocked = NULL;
- TD_CLR_MUTEX(td1);
+ TD_CLR_LOCK(td1);
if (!TD_CAN_RUN(td1)) {
mtx_unlock_spin(&sched_lock);
return;
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 81c5c7b..bd613c45 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -927,10 +927,10 @@ fill_kinfo_proc(p, kp)
strncpy(kp->ki_wmesg, td->td_wmesg,
sizeof(kp->ki_wmesg) - 1);
}
- if (TD_ON_MUTEX(td)) {
- kp->ki_kiflag |= KI_MTXBLOCK;
- strncpy(kp->ki_mtxname, td->td_mtxname,
- sizeof(kp->ki_mtxname) - 1);
+ if (TD_ON_LOCK(td)) {
+ kp->ki_kiflag |= KI_LOCKBLOCK;
+ strncpy(kp->ki_lockname, td->td_lockname,
+ sizeof(kp->ki_lockname) - 1);
}
}
@@ -943,8 +943,8 @@ fill_kinfo_proc(p, kp)
kp->ki_stat = SSTOP;
} else if (TD_IS_SLEEPING(td)) {
kp->ki_stat = SSLEEP;
- } else if (TD_ON_MUTEX(td)) {
- kp->ki_stat = SMTX;
+ } else if (TD_ON_LOCK(td)) {
+ kp->ki_stat = SLOCK;
} else {
kp->ki_stat = SWAIT;
}
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index d46ef12..83f3d28 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -759,7 +759,7 @@ mi_switch(void)
KASSERT((ke->ke_state == KES_THREAD), ("mi_switch: kse state?"));
KASSERT(!TD_ON_RUNQ(td), ("mi_switch: called by old code"));
#ifdef INVARIANTS
- if (!TD_ON_MUTEX(td) &&
+ if (!TD_ON_LOCK(td) &&
!TD_ON_RUNQ(td) &&
!TD_IS_RUNNING(td))
mtx_assert(&Giant, MA_NOTOWNED);
diff --git a/sys/kern/subr_turnstile.c b/sys/kern/subr_turnstile.c
index 6becc78..e60d805 100644
--- a/sys/kern/subr_turnstile.c
+++ b/sys/kern/subr_turnstile.c
@@ -163,7 +163,7 @@ propagate_priority(struct thread *td)
/*
* If we aren't blocked on a mutex, we should be.
*/
- KASSERT(TD_ON_MUTEX(td), (
+ KASSERT(TD_ON_LOCK(td), (
"process %d(%s):%d holds %s but isn't blocked on a mutex\n",
td->td_proc->p_pid, td->td_proc->p_comm, td->td_state,
m->mtx_object.lo_name));
@@ -182,7 +182,7 @@ propagate_priority(struct thread *td)
continue;
}
- td1 = TAILQ_PREV(td, threadqueue, td_blkq);
+ td1 = TAILQ_PREV(td, threadqueue, td_lockq);
if (td1->td_priority <= pri) {
continue;
}
@@ -194,15 +194,15 @@ propagate_priority(struct thread *td)
* thread in the chain has a lower priority and that
* td1 will thus not be NULL after the loop.
*/
- TAILQ_REMOVE(&m->mtx_blocked, td, td_blkq);
- TAILQ_FOREACH(td1, &m->mtx_blocked, td_blkq) {
+ TAILQ_REMOVE(&m->mtx_blocked, td, td_lockq);
+ TAILQ_FOREACH(td1, &m->mtx_blocked, td_lockq) {
MPASS(td1->td_proc->p_magic == P_MAGIC);
if (td1->td_priority > pri)
break;
}
MPASS(td1 != NULL);
- TAILQ_INSERT_BEFORE(td1, td, td_blkq);
+ TAILQ_INSERT_BEFORE(td1, td, td_lockq);
CTR4(KTR_LOCK,
"propagate_priority: p %p moved before %p on [%p] %s",
td, td1, m, m->mtx_object.lo_name);
@@ -591,15 +591,15 @@ _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
if (TAILQ_EMPTY(&m->mtx_blocked)) {
td1 = mtx_owner(m);
LIST_INSERT_HEAD(&td1->td_contested, m, mtx_contested);
- TAILQ_INSERT_TAIL(&m->mtx_blocked, td, td_blkq);
+ TAILQ_INSERT_TAIL(&m->mtx_blocked, td, td_lockq);
} else {
- TAILQ_FOREACH(td1, &m->mtx_blocked, td_blkq)
+ TAILQ_FOREACH(td1, &m->mtx_blocked, td_lockq)
if (td1->td_priority > td->td_priority)
break;
if (td1)
- TAILQ_INSERT_BEFORE(td1, td, td_blkq);
+ TAILQ_INSERT_BEFORE(td1, td, td_lockq);
else
- TAILQ_INSERT_TAIL(&m->mtx_blocked, td, td_blkq);
+ TAILQ_INSERT_TAIL(&m->mtx_blocked, td, td_lockq);
}
#ifdef KTR
if (!cont_logged) {
@@ -616,8 +616,8 @@ _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
* Save who we're blocked on.
*/
td->td_blocked = m;
- td->td_mtxname = m->mtx_object.lo_name;
- TD_SET_MUTEX(td);
+ td->td_lockname = m->mtx_object.lo_name;
+ TD_SET_LOCK(td);
propagate_priority(td);
if (LOCK_LOG_TEST(&m->mtx_object, opts))
@@ -735,7 +735,7 @@ _mtx_unlock_sleep(struct mtx *m, int opts, const char *file, int line)
MPASS(td->td_proc->p_magic == P_MAGIC);
MPASS(td1->td_proc->p_magic == P_MAGIC);
- TAILQ_REMOVE(&m->mtx_blocked, td1, td_blkq);
+ TAILQ_REMOVE(&m->mtx_blocked, td1, td_lockq);
if (TAILQ_EMPTY(&m->mtx_blocked)) {
LIST_REMOVE(m, mtx_contested);
@@ -761,7 +761,7 @@ _mtx_unlock_sleep(struct mtx *m, int opts, const char *file, int line)
m, td1);
td1->td_blocked = NULL;
- TD_CLR_MUTEX(td1);
+ TD_CLR_LOCK(td1);
if (!TD_CAN_RUN(td1)) {
mtx_unlock_spin(&sched_lock);
return;
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index c075a47..717b123 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -2399,8 +2399,8 @@ ttyinfo(struct tty *tp)
if (TD_ON_RUNQ(td) ||
(TD_IS_RUNNING(td))) {
stmp = "running";
- } else if (TD_ON_MUTEX(td)) {
- stmp = td->td_mtxname;
+ } else if (TD_ON_LOCK(td)) {
+ stmp = td->td_lockname;
} else if (td->td_wmesg) {
stmp = td->td_wmesg;
} else {
@@ -2425,7 +2425,7 @@ ttyinfo(struct tty *tp)
ttyprintf(tp, " cmd: %s %d [%s%s] ", pick->p_comm,
pick->p_pid,
- TD_ON_MUTEX(td) ? "*" : "",
+ TD_ON_LOCK(td) ? "*" : "",
stmp);
/* Print user time. */
OpenPOWER on IntegriCloud