Date: Fri, 24 May 2002 01:33:32 -0700 (PDT) From: Jonathan Mini <mini@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 11824 for review Message-ID: <200205240833.g4O8XWI26514@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11824 Change 11824 by mini@mini_stylus on 2002/05/24 01:33:30 Since CURSIG isn't a macro, change its name to cursig. We're already modifying all references to it anyways. Suggested by: peter Affected files ... ... //depot/projects/kse/sys/kern/kern_condvar.c#35 edit ... //depot/projects/kse/sys/kern/kern_sig.c#52 edit ... //depot/projects/kse/sys/kern/kern_synch.c#62 edit ... //depot/projects/kse/sys/kern/subr_trap.c#56 edit ... //depot/projects/kse/sys/sys/signalvar.h#12 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_condvar.c#35 (text+ko) ==== @@ -167,17 +167,17 @@ /* * We put ourselves on the sleep queue and start our timeout before - * calling CURSIG, as we could stop there, and a wakeup or a SIGCONT (or + * calling cursig, as we could stop there, and a wakeup or a SIGCONT (or * both) could occur while we were stopped. A SIGCONT would cause us to * be marked as TDS_SLP without resuming us, thus we must be ready for - * sleep when CURSIG is called. If the wakeup happens while we're - * stopped, td->td_wchan will be 0 upon return from CURSIG. + * sleep when cursig is called. If the wakeup happens while we're + * stopped, td->td_wchan will be 0 upon return from cursig. */ td->td_flags |= TDF_SINTR; mtx_unlock_spin(&sched_lock); p = td->td_proc; PROC_LOCK(p); - sig = CURSIG(td); /* XXXKSE */ + sig = cursig(td); /* XXXKSE */ if (thread_suspend_check(1)) sig = SIGSTOP; mtx_lock_spin(&sched_lock); @@ -321,7 +321,7 @@ PROC_LOCK(p); if (sig == 0) - sig = CURSIG(td); /* XXXKSE */ + sig = cursig(td); /* XXXKSE */ if (sig != 0) { if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig)) rval = EINTR; @@ -481,7 +481,7 @@ PROC_LOCK(p); if (sig == 0) - sig = CURSIG(td); + sig = cursig(td); if (sig != 0) { if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig)) rval = EINTR; ==== //depot/projects/kse/sys/kern/kern_sig.c#52 (text+ko) ==== @@ -172,7 +172,7 @@ * MP SAFE. */ int -CURSIG(struct thread *td) +cursig(struct thread *td) { struct proc *p = td->td_proc; @@ -1578,10 +1578,10 @@ * Stop signals with default action are processed immediately, then cleared; * they aren't returned. This is checked after each entry to the system for * a syscall or trap (though this can usually be done without calling issignal - * by checking the pending signal masks in the CURSIG macro.) The normal call + * by checking the pending signal masks in cursig.) The normal call * sequence is * - * while (sig = CURSIG(curthread)) + * while (sig = cursig(curthread)) * postsig(sig); */ int ==== //depot/projects/kse/sys/kern/kern_synch.c#62 (text+ko) ==== @@ -512,8 +512,8 @@ * before calling thread_suspend_check, as we could stop there, and * a wakeup or a SIGCONT (or both) could occur while we were stopped. * without resuming us, thus we must be ready for sleep - * when CURSIG is called. If the wakeup happens while we're - * stopped, td->td_wchan will be 0 upon return from CURSIG. + * when cursig is called. If the wakeup happens while we're + * stopped, td->td_wchan will be 0 upon return from cursig. */ if (catch) { CTR3(KTR_PROC, "msleep caught: thread %p (pid %d, %s)", td, @@ -521,7 +521,7 @@ td->td_flags |= TDF_SINTR; mtx_unlock_spin(&sched_lock); PROC_LOCK(p); - sig = CURSIG(td); + sig = cursig(td); if (thread_suspend_check(1)) { sig = EINTR; rval = EINTR; @@ -568,8 +568,8 @@ if (rval == 0 && catch) { PROC_LOCK(p); - /* XXX: shouldn't we always be calling CURSIG() */ - if (sig != 0 || (sig = CURSIG(td))) { + /* XXX: shouldn't we always be calling cursig() */ + if (sig != 0 || (sig = cursig(td))) { if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig)) rval = EINTR; else ==== //depot/projects/kse/sys/kern/subr_trap.c#56 (text+ko) ==== @@ -350,7 +350,7 @@ if (sflag & PS_NEEDSIGCHK) { mtx_lock(&Giant); PROC_LOCK(p); - while ((sig = CURSIG(td)) != 0) + while ((sig = cursig(td)) != 0) postsig(sig); PROC_UNLOCK(p); mtx_unlock(&Giant); ==== //depot/projects/kse/sys/sys/signalvar.h#12 (text+ko) ==== @@ -234,7 +234,7 @@ /* * Machine-independent functions: */ -int CURSIG(struct thread *td); +int cursig(struct thread *td); void execsigs(struct proc *p); void gsignal(int pgid, int sig); int issignal(struct thread *p); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205240833.g4O8XWI26514>