diff options
author | grog <grog@FreeBSD.org> | 1999-04-10 08:11:21 +0000 |
---|---|---|
committer | grog <grog@FreeBSD.org> | 1999-04-10 08:11:21 +0000 |
commit | 3053fd36c3930abc3f05b75691681bfd3828dd76 (patch) | |
tree | 7a5aeea0f8cb4afd8388376aeeeaef091c7a5bf8 /sys/dev/vinum/vinumlock.c | |
parent | ab82ea34909e9ba7e0754a45c2287d23adb55484 (diff) | |
download | FreeBSD-src-3053fd36c3930abc3f05b75691681bfd3828dd76.zip FreeBSD-src-3053fd36c3930abc3f05b75691681bfd3828dd76.tar.gz |
lockdrive: Add debug calls to catch occasional deadlocks on drives.
The problem is probably gone, but the debug checks remain
for a while.
Diffstat (limited to 'sys/dev/vinum/vinumlock.c')
-rw-r--r-- | sys/dev/vinum/vinumlock.c | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/sys/dev/vinum/vinumlock.c b/sys/dev/vinum/vinumlock.c index d0d47f1..a28012b 100644 --- a/sys/dev/vinum/vinumlock.c +++ b/sys/dev/vinum/vinumlock.c @@ -20,7 +20,7 @@ * 4. Neither the name of the Company nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * This software is provided ``as is'', and any express or implied * warranties, including, but not limited to, the implied warranties of * merchantability and fitness for a particular purpose are disclaimed. @@ -33,7 +33,7 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumlock.c,v 1.8 1999/01/14 02:52:13 grog Exp grog $ + * $Id: vinumlock.c,v 1.9 1999/03/13 03:26:00 grog Exp grog $ */ #define REALLYKERNEL @@ -43,21 +43,36 @@ /* * Lock routines. Currently, we lock either an individual volume * or the global configuration. I don't think tsleep and - * wakeup are SMP safe. FIXME XXX + * wakeup are SMP safe. FIXME XXX */ /* Lock a drive, wait if it's in use */ +#if VINUMDEBUG +int +lockdrive(struct drive *drive, char *file, int line) +#else int lockdrive(struct drive *drive) +#endif { int error; /* XXX get rid of drive->flags |= VF_LOCKING; */ if ((drive->flags & VF_LOCKED) /* it's locked */ &&(drive->pid == curproc->p_pid)) { /* by us! */ +#ifdef VINUMDEBUG + log(LOG_WARNING, + "vinum lockdrive: already locking %s from %s:%d, called from %s:%d\n", + drive->label.name, + drive->lockfilename, + drive->lockline, + basename(file), + line); +#else log(LOG_WARNING, "vinum lockdrive: already locking %s\n", drive->label.name); +#endif return 0; } while ((drive->flags & VF_LOCKED) != 0) { @@ -66,7 +81,7 @@ lockdrive(struct drive *drive) * since the drive structure can move, and the unlock * function can be called after killing the drive. * Solve this by waiting on this function; the number - * of conflicts is negligible + * of conflicts is negligible. */ if ((error = tsleep(&lockdrive, PRIBIO | PCATCH, @@ -76,6 +91,11 @@ lockdrive(struct drive *drive) } drive->flags |= VF_LOCKED; drive->pid = curproc->p_pid; /* it's a panic error if curproc is null */ +#ifdef VINUMDEBUG + bcopy(basename(file), drive->lockfilename, 15); + drive->lockfilename[15] = '\0'; /* truncate if necessary */ + drive->lockline = line; +#endif return 0; } @@ -100,7 +120,7 @@ lockvol(struct volume *vol) * It would seem to make more sense to sleep on * the address 'vol'. Unfortuntaly we can't * guarantee that this address won't change due to - * table expansion. The address we choose won't change. + * table expansion. The address we choose won't change. */ if ((error = tsleep(&vinum_conf.volume + vol->devno, PRIBIO | PCATCH, @@ -135,7 +155,7 @@ lockplex(struct plex *plex) * It would seem to make more sense to sleep on * the address 'plex'. Unfortunately we can't * guarantee that this address won't change due to - * table expansion. The address we choose won't change. + * table expansion. The address we choose won't change. */ if ((error = tsleep(&vinum_conf.plex + plex->sdnos[0], PRIBIO | PCATCH, |