d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make a putc()/b_to_q() to a clist that hasn't had cblocks reserved

Browse Source 
non-fatal.  I've make it return an appropriate error to the caller instead
of panic()ing.

Handling an error condition is inherently more friendly than exploding
the kernel.. :-)  The new behavior is a little closer to traditional
clists, potentially making porting a little simpler.

Suggested by: bde (many months ago, I've been using this for a while..)
This commit is contained in:
peter 1995-10-31 19:00:00 +00:00
parent 9ee584cede
commit 6b6349e583
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/kern/subr_clist.c
View File

@ -6,7 +6,7 @@
* of this software, nor does the author assume any responsibility
* for damages incurred with its use.
*
* $Id: tty_subr.c,v 1.13 1995/09/09 18:10:10 davidg Exp $
* $Id: tty_subr.c,v 1.14 1995/10/25 17:59:58 bde Exp $
*/
/*
@ -349,8 +349,13 @@ putc(chr, clistp)
s = spltty();
if (clistp->c_cl == NULL) {
if (clistp->c_cbreserved < 1)
panic("putc to a clist with no reserved cblocks");
if (clistp->c_cbreserved < 1) {
splx(s);
#ifdef DIAGNOSTIC
printf("putc to a clist with no reserved cblocks");
#endif
return (-1);
}
cblockp = cblock_alloc();
clistp->c_cbcount = 1;
clistp->c_cf = clistp->c_cl = cblockp->c_info;
@ -425,8 +430,13 @@ b_to_q(src, amount, clistp)
* then get one.
*/
if (clistp->c_cl == NULL) {
if (clistp->c_cbreserved < 1)
panic("b_to_q to a clist with no reserved cblocks");
if (clistp->c_cbreserved < 1) {
splx(s);
#ifdef DIAGNOSTIC
printf("b_to_q to a clist with no reserved cblocks");
#endif
return (amount);
}
cblockp = cblock_alloc();
clistp->c_cbcount = 1;
clistp->c_cf = clistp->c_cl = cblockp->c_info;

20
sys/kern/tty_subr.c
View File

@ -6,7 +6,7 @@
* of this software, nor does the author assume any responsibility
* for damages incurred with its use.
*
* $Id: tty_subr.c,v 1.13 1995/09/09 18:10:10 davidg Exp $
* $Id: tty_subr.c,v 1.14 1995/10/25 17:59:58 bde Exp $
*/
/*
@ -349,8 +349,13 @@ putc(chr, clistp)
s = spltty();
if (clistp->c_cl == NULL) {
if (clistp->c_cbreserved < 1)
panic("putc to a clist with no reserved cblocks");
if (clistp->c_cbreserved < 1) {
splx(s);
#ifdef DIAGNOSTIC
printf("putc to a clist with no reserved cblocks");
#endif
return (-1);
}
cblockp = cblock_alloc();
clistp->c_cbcount = 1;
clistp->c_cf = clistp->c_cl = cblockp->c_info;
@ -425,8 +430,13 @@ b_to_q(src, amount, clistp)
* then get one.
*/
if (clistp->c_cl == NULL) {
if (clistp->c_cbreserved < 1)
panic("b_to_q to a clist with no reserved cblocks");
if (clistp->c_cbreserved < 1) {
splx(s);
#ifdef DIAGNOSTIC
printf("b_to_q to a clist with no reserved cblocks");
#endif
return (amount);
}
cblockp = cblock_alloc();
clistp->c_cbcount = 1;
clistp->c_cf = clistp->c_cl = cblockp->c_info;