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

- Retire some unused ithread priorities: PI_TTYHIGH, PI_TAPE, and

Browse Source 
PI_DISKLOW.  While here, rename PI_TTYLOW to PI_TTY.
- Add a macro PI_SWI() that takes a SWI_* constant as an argument and
  returns the suitable thread priority.
This commit is contained in:
jhb 2011-01-11 22:15:30 +00:00
parent 624ce4a8a0
commit b8525325b4
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/kern/kern_intr.c
View File

@ -130,22 +130,18 @@ intr_priority(enum intr_type flags)
INTR_TYPE_CAM | INTR_TYPE_MISC | INTR_TYPE_CLK | INTR_TYPE_AV); INTR_TYPE_CAM | INTR_TYPE_MISC | INTR_TYPE_CLK | INTR_TYPE_AV);
switch (flags) { switch (flags) {
case INTR_TYPE_TTY: case INTR_TYPE_TTY:
pri = PI_TTYLOW; pri = PI_TTY;
break; break;
case INTR_TYPE_BIO: case INTR_TYPE_BIO:
/*
* XXX We need to refine this. BSD/OS distinguishes
* between tape and disk priorities.
*/
pri = PI_DISK; pri = PI_DISK;
break; break;
case INTR_TYPE_NET: case INTR_TYPE_NET:
pri = PI_NET; pri = PI_NET;
break; break;
case INTR_TYPE_CAM: case INTR_TYPE_CAM:
pri = PI_DISK; /* XXX or PI_CAM? */ pri = PI_DISK;
break; break;
case INTR_TYPE_AV: /* Audio/video */ case INTR_TYPE_AV:
pri = PI_AV; pri = PI_AV;
break; break;
case INTR_TYPE_CLK: case INTR_TYPE_CLK:
@ -1082,7 +1078,7 @@ swi_add(struct intr_event **eventp, const char *name, driver_intr_t handler,
*eventp = ie; *eventp = ie;
} }
error = intr_event_add_handler(ie, name, NULL, handler, arg, error = intr_event_add_handler(ie, name, NULL, handler, arg,
(pri * RQ_PPQ) + PI_SOFT, flags, cookiep); PI_SWI(pri), flags, cookiep);
if (error) if (error)
return (error); return (error);
if (pri == SWI_CLOCK) { if (pri == SWI_CLOCK) {
@ -1656,18 +1652,13 @@ db_dump_intrhand(struct intr_handler *ih)
case PI_AV: case PI_AV:
db_printf("AV "); db_printf("AV ");
break; break;
case PI_TTYHIGH: case PI_TTY:
case PI_TTYLOW:
db_printf("TTY "); db_printf("TTY ");
break; break;
case PI_TAPE:
db_printf("TAPE");
break;
case PI_NET: case PI_NET:
db_printf("NET "); db_printf("NET ");
break; break;
case PI_DISK: case PI_DISK:
case PI_DISKLOW:
db_printf("DISK"); db_printf("DISK");
break; break;
case PI_DULL: case PI_DULL:

14
sys/sys/priority.h
View File

@ -85,14 +85,12 @@
#define PI_REALTIME (PRI_MIN_ITHD + 0) #define PI_REALTIME (PRI_MIN_ITHD + 0)
#define PI_AV (PRI_MIN_ITHD + 4) #define PI_AV (PRI_MIN_ITHD + 4)
#define PI_TTYHIGH (PRI_MIN_ITHD + 8) #define PI_NET (PRI_MIN_ITHD + 8)
#define PI_TAPE (PRI_MIN_ITHD + 12) #define PI_DISK (PRI_MIN_ITHD + 12)
#define PI_NET (PRI_MIN_ITHD + 16) #define PI_TTY (PRI_MIN_ITHD + 16)
#define PI_DISK (PRI_MIN_ITHD + 20) #define PI_DULL (PRI_MIN_ITHD + 20)
#define PI_TTYLOW (PRI_MIN_ITHD + 24) #define PI_SOFT (PRI_MIN_ITHD + 24)
#define PI_DISKLOW (PRI_MIN_ITHD + 28) #define PI_SWI(x) (PI_SOFT + (x) * RQ_PPQ)
#define PI_DULL (PRI_MIN_ITHD + 32)
#define PI_SOFT (PRI_MIN_ITHD + 36)
#define PRI_MIN_KERN (64) #define PRI_MIN_KERN (64)
#define PRI_MAX_KERN (PRI_MIN_REALTIME - 1) #define PRI_MAX_KERN (PRI_MIN_REALTIME - 1)