Give device names to ithreads p_comm and evcounters to softintr.

Concatenate all device names in the ithread's process name, this is
useful for debugging and/or profiling.

Also put event counters on software interrupts, I can't recall how
many times I wanted to know this.

A ps auxkl might show the following now:

root      6034  0.0  0.0      0      0 ??  DK     2:01AM    0:04.97 (softclock)          0     0   0 -18   0 intr
root     24717  0.0  0.0      0      0 ??  DK     2:01AM    0:01.06 (softnet)            0     0   0 -18   0 intr
root     25481  0.0  0.0      0      0 ??  DK     2:01AM    0:01.08 (ehci0,mpi0)         0     0   0 -18   0 intr
root     23688  0.0  0.0      0      0 ??  DK     2:01AM    0:01.02 (em0)                0     0   0 -18   0 intr
....

Author: haesbaert

sys/dev/ic/com.c

@@ -1822,7 +1822,7 @@ com_attach_subr(struct com_softc *sc)
 
 	timeout_set(&sc->sc_diag_tmo, comdiag, sc);
 	timeout_set(&sc->sc_dtr_tmo, com_raisedtr, sc);
-	sc->sc_si = softintr_establish(IPL_TTY, comsoft, sc);
+	sc->sc_si = softintr_establish(IPL_TTY, comsoft, sc, "softcom");
 	if (sc->sc_si == NULL)
 		panic("%s: can't establish soft interrupt",
 		    sc->sc_dev.dv_xname);

sys/dev/usb/usb.c

@@ -197,7 +197,7 @@ usb_attach(struct device *parent, struct device *self, void *aux)
 	    USB_TASK_TYPE_EXPLORE);
 
 	sc->sc_bus->soft = softintr_establish(IPL_SOFTNET,
-	    sc->sc_bus->methods->soft_intr, sc->sc_bus);
+	    sc->sc_bus->methods->soft_intr, sc->sc_bus, "softusb");
 
 	if (!usb_attach_roothub(sc)) {
 		struct usbd_device *dev = sc->sc_bus->root_hub;

sys/kern/kern_clock.c

@@ -112,7 +112,8 @@ initclocks(void)
 {
 	int i;
 
-	softclock_si = softintr_establish(IPL_SOFTCLOCK, softclock, NULL);
+	softclock_si = softintr_establish(IPL_SOFTCLOCK, softclock, NULL,
+	    "softclock");
 
 	/*
 	 * Set divisors to 1 (normal case) and let the machine-specific

sys/kern/kern_ithread.c

@@ -166,23 +166,23 @@ void
 ithread_forkall(void)
 {
 	struct intrsource *is;
-	static int softs;
+	struct intrhand *ih;
 	char name[MAXCOMLEN+1];
 
 	TAILQ_FOREACH(is, &ithreads, entry) {
 		DPRINTF(1, "ithread forking intrsource pin %d\n", is->is_pin);
-
-		if (is->is_pic == &softintr_pic) {
-			snprintf(name, sizeof name, "ithread soft %d",
-			    softs++);
-			if (kthread_create(ithread, is, &is->is_proc, name))
-				panic("ithread_forkall");
-		} else {
-			snprintf(name, sizeof name, "ithread pin %d",
-			    is->is_pin);
-			if (kthread_create(ithread, is, &is->is_proc, name))
-				panic("ithread_forkall");
+		for (ih = is->is_handlers; ih != NULL; ih = ih->ih_next) {
+			KASSERT(ih->ih_count.ec_name != NULL);
+			if (ih == is->is_handlers) {
+				strlcpy(name, ih->ih_count.ec_name,
+				    sizeof(name));
+				continue;
+			}
+			strlcat(name, ",", sizeof(name));
+			strlcat(name, ih->ih_count.ec_name, sizeof(name));
 		}
+		if (kthread_create(ithread, is, &is->is_proc, name))
+			panic("ithread_forkall");
 	}
 }
 

sys/kern/kern_softintr.c

@@ -31,7 +31,8 @@
  * SCHED_LOCK, which is totally unacceptable in the future.
  */
 void *
-softintr_establish(int level, int (*handler)(void *), void *arg)
+softintr_establish(int level, int (*handler)(void *), void *arg,
+    const char *name)
 {
 	struct intrsource *is;
 	struct intrhand *ih;
@@ -57,6 +58,7 @@ softintr_establish(int level, int (*handler)(void *), void *arg)
 	/* Just prepend it */
 	ih->ih_next = is->is_handlers;
 	is->is_handlers = ih;
+	evcount_attach(&ih->ih_count, name, &ih->ih_irq);
 
 	ithread_register(is);
 

sys/net/netisr.c

@@ -81,5 +81,5 @@ netintr(void *unused) /* ARGSUSED */
 void
 netisr_init(void)
 {
-	netisr_intr = softintr_establish(IPL_SOFTNET, netintr, NULL);
+	netisr_intr = softintr_establish(IPL_SOFTNET, netintr, NULL, "softnet");
 }

sys/net/pipex.c

@@ -149,7 +149,7 @@ pipex_init(void)
 	IFQ_SET_MAXLEN(&pipexinq, IFQ_MAXLEN);
 	IFQ_SET_MAXLEN(&pipexoutq, IFQ_MAXLEN);
         pipex_softintr =
-	    softintr_establish(IPL_SOFTNET, pipex_softintr_handler, NULL);
+	    softintr_establish(IPL_SOFTNET, pipex_softintr_handler, NULL, "pipex");
 }
 
 void

sys/sys/softintr.h

@@ -26,7 +26,7 @@
  * Generic software interrupt support for all platforms.
  */
 
-void	*softintr_establish(int, int (*)(void *), void *);
+void	*softintr_establish(int, int (*)(void *), void *, const char *);
 void	softintr_disestablish(void *);
 void	softintr_init(void);
 void	softintr_dispatch(int);