Module Name: src
Committed By: christos
Date: Mon Nov 27 00:25:46 UTC 2017
Modified Files:
src/usr.bin/config: defs.h main.c sem.c
Log Message:
use a reference count to avoid deleting psrefs still in use.
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/usr.bin/config/defs.h
cvs rdiff -u -r1.95 -r1.96 src/usr.bin/config/main.c
cvs rdiff -u -r1.81 -r1.82 src/usr.bin/config/sem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.101 src/usr.bin/config/defs.h:1.102
--- src/usr.bin/config/defs.h:1.101 Sat Nov 18 13:44:20 2017
+++ src/usr.bin/config/defs.h Sun Nov 26 19:25:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.101 2017/11/18 18:44:20 christos Exp $ */
+/* $NetBSD: defs.h,v 1.102 2017/11/27 00:25:46 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -234,9 +234,9 @@ struct pspec {
struct devbase *p_atdev; /* optional parent device base */
int p_atunit; /* optional parent device unit */
struct nvlist *p_devs; /* children using it */
- struct deva *p_deva; /* attribute */
int p_inst; /* parent spec instance */
int p_active; /* parent spec is actively used */
+ int p_ref; /* refcount */
};
/*
Index: src/usr.bin/config/main.c
diff -u src/usr.bin/config/main.c:1.95 src/usr.bin/config/main.c:1.96
--- src/usr.bin/config/main.c:1.95 Fri Nov 24 18:42:36 2017
+++ src/usr.bin/config/main.c Sun Nov 26 19:25:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.95 2017/11/24 23:42:36 christos Exp $ */
+/* $NetBSD: main.c,v 1.96 2017/11/27 00:25:46 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.95 2017/11/24 23:42:36 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.96 2017/11/27 00:25:46 christos Exp $");
#ifndef MAKE_BOOTSTRAP
#include <sys/cdefs.h>
@@ -1959,8 +1959,11 @@ do_kill_orphans(struct devbase *d, struc
continue;
}
j->i_active = active = state;
- if (p != NULL)
- p->p_active = state;
+ if (p != NULL) {
+ if (state == DEVI_ACTIVE ||
+ --p->p_ref == 0)
+ p->p_active = state;
+ }
if (state == DEVI_IGNORED) {
CFGDBG(5,
"`%s' at '%s' ignored",
Index: src/usr.bin/config/sem.c
diff -u src/usr.bin/config/sem.c:1.81 src/usr.bin/config/sem.c:1.82
--- src/usr.bin/config/sem.c:1.81 Fri Nov 24 13:45:59 2017
+++ src/usr.bin/config/sem.c Sun Nov 26 19:25:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sem.c,v 1.81 2017/11/24 18:45:59 christos Exp $ */
+/* $NetBSD: sem.c,v 1.82 2017/11/27 00:25:46 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: sem.c,v 1.81 2017/11/24 18:45:59 christos Exp $");
+__RCSID("$NetBSD: sem.c,v 1.82 2017/11/27 00:25:46 christos Exp $");
#include <sys/param.h>
#include <ctype.h>
@@ -79,8 +79,7 @@ static int has_errobj(struct attrlist *,
static struct nvlist *addtoattr(struct nvlist *, struct devbase *);
static int resolve(struct nvlist **, const char *, const char *,
struct nvlist *, int);
-static struct pspec *getpspec(struct attr *, struct devbase *, int,
- struct deva *);
+static struct pspec *getpspec(struct attr *, struct devbase *, int, int);
static struct devi *newdevi(const char *, int, struct devbase *d);
static struct devi *getdevi(const char *);
static void remove_devi(struct devi *);
@@ -1296,7 +1295,7 @@ adddev(const char *name, const char *at,
* XXX: This creates multiple pspecs that look the
* same in the config file and could be merged.
*/
- p = getpspec(attr, ab, atunit, iba);
+ p = getpspec(attr, ab, atunit, first);
p->p_devs = newnv(NULL, NULL, i, 0, p->p_devs);
} else
p = NULL;
@@ -1907,17 +1906,23 @@ fixdevis(void)
* Look up a parent spec, creating a new one if it does not exist.
*/
static struct pspec *
-getpspec(struct attr *attr, struct devbase *ab, int atunit, struct deva *da)
+getpspec(struct attr *attr, struct devbase *ab, int atunit, int first)
{
struct pspec *p;
int inst = npspecs;
+ int ref = 1;
TAILQ_FOREACH(p, &allpspecs, p_list) {
if (p->p_iattr == attr && p->p_atdev == ab &&
p->p_atunit == atunit) {
- if (p->p_deva == da)
- return (p);
- inst = p->p_inst;
+ p->p_ref++;
+ if (first)
+ return p;
+ else {
+ inst = p->p_inst;
+ ref = p->p_ref;
+ }
+
}
}
@@ -1929,8 +1934,8 @@ getpspec(struct attr *attr, struct devba
p->p_inst = inst;
if (inst == npspecs)
npspecs++;
- p->p_deva = da;
p->p_active = 0;
+ p->p_ref = ref;
TAILQ_INSERT_TAIL(&allpspecs, p, p_list);
