[src/netbsd-1-5]: src/sys Pullup from trunk [approved by thorpej]:

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/43bb7fe9a99b
branches:  netbsd-1-5
changeset: 488428:43bb7fe9a99b
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Tue Jul 04 16:05:32 2000 +0000

description:
Pullup from trunk [approved by thorpej]:

change tablefull() to accept one more parameter - optional hint

use that to inform about way to raise current limit when we reach maximum
number of processes, descriptors or vnodes

diffstat:

 sys/kern/kern_descrip.c |   4 ++--
 sys/kern/kern_fork.c    |   4 ++--
 sys/kern/subr_prf.c     |  11 +++++++----
 sys/kern/vfs_subr.c     |   4 ++--
 sys/sys/systm.h         |   4 ++--
 5 files changed, 15 insertions(+), 12 deletions(-)

diffs (98 lines):

diff -r d651dfba17c1 -r 43bb7fe9a99b sys/kern/kern_descrip.c
--- a/sys/kern/kern_descrip.c   Tue Jul 04 04:22:05 2000 +0000
+++ b/sys/kern/kern_descrip.c   Tue Jul 04 16:05:32 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_descrip.c,v 1.67 2000/05/26 23:10:36 sommerfeld Exp $     */
+/*     $NetBSD: kern_descrip.c,v 1.67.4.1 2000/07/04 16:05:33 jdolecek Exp $   */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -693,7 +693,7 @@
        if ((error = fdalloc(p, 0, &i)) != 0)
                return (error);
        if (nfiles >= maxfiles) {
-               tablefull("file");
+               tablefull("file", "increase kern.maxfiles or MAXFILES");
                return (ENFILE);
        }
        /*
diff -r d651dfba17c1 -r 43bb7fe9a99b sys/kern/kern_fork.c
--- a/sys/kern/kern_fork.c      Tue Jul 04 04:22:05 2000 +0000
+++ b/sys/kern/kern_fork.c      Tue Jul 04 16:05:32 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_fork.c,v 1.66 2000/05/31 05:02:32 thorpej Exp $   */
+/*     $NetBSD: kern_fork.c,v 1.66.2.1 2000/07/04 16:05:34 jdolecek Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -142,7 +142,7 @@
        uid = p1->p_cred->p_ruid;
        if (__predict_false((nprocs >= maxproc - 1 && uid != 0) ||
                            nprocs >= maxproc)) {
-               tablefull("proc");
+               tablefull("proc", "increase kern.maxproc or NPROC");
                return (EAGAIN);
        }
 
diff -r d651dfba17c1 -r 43bb7fe9a99b sys/kern/subr_prf.c
--- a/sys/kern/subr_prf.c       Tue Jul 04 04:22:05 2000 +0000
+++ b/sys/kern/subr_prf.c       Tue Jul 04 16:05:32 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_prf.c,v 1.74 2000/06/10 18:44:44 sommerfeld Exp $ */
+/*     $NetBSD: subr_prf.c,v 1.74.2.1 2000/07/04 16:05:34 jdolecek Exp $       */
 
 /*-
  * Copyright (c) 1986, 1988, 1991, 1993
@@ -167,10 +167,13 @@
  */
 
 void
-tablefull(tab)
-       const char *tab;
+tablefull(tab, hint)
+       const char *tab, *hint;
 {
-       log(LOG_ERR, "%s: table is full\n", tab);
+       if (hint)
+               log(LOG_ERR, "%s: table is full - %s\n", tab, hint);
+       else
+               log(LOG_ERR, "%s: table is full\n", tab);
 }
 
 /*
diff -r d651dfba17c1 -r 43bb7fe9a99b sys/kern/vfs_subr.c
--- a/sys/kern/vfs_subr.c       Tue Jul 04 04:22:05 2000 +0000
+++ b/sys/kern/vfs_subr.c       Tue Jul 04 16:05:32 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_subr.c,v 1.128.2.1 2000/07/03 17:36:02 fvdl Exp $  */
+/*     $NetBSD: vfs_subr.c,v 1.128.2.2 2000/07/04 16:05:34 jdolecek Exp $      */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -492,7 +492,7 @@
                        simple_unlock(&vnode_free_list_slock);
                        if (mp && error != EDEADLK)
                                vfs_unbusy(mp);
-                       tablefull("vnode");
+                       tablefull("vnode", "increase kern.maxvnodes or NVNODE");
                        *vpp = 0;
                        return (ENFILE);
                }
diff -r d651dfba17c1 -r 43bb7fe9a99b sys/sys/systm.h
--- a/sys/sys/systm.h   Tue Jul 04 04:22:05 2000 +0000
+++ b/sys/sys/systm.h   Tue Jul 04 16:05:32 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: systm.h,v 1.111 2000/06/10 18:44:45 sommerfeld Exp $   */
+/*     $NetBSD: systm.h,v 1.111.2.1 2000/07/04 16:05:32 jdolecek Exp $ */
 
 /*-
  * Copyright (c) 1982, 1988, 1991, 1993
@@ -199,7 +199,7 @@
 int    humanize_number __P((char *, size_t, u_int64_t, const char *, int));
 int    format_bytes __P((char *, size_t, u_int64_t));
 
-void   tablefull __P((const char *));
+void   tablefull __P((const char *, const char *));
 
 int    kcopy __P((const void *, void *, size_t));