Page MenuHomeFreeBSD
Files F96423894

D41748.id126984.diff
No OneTemporary
Actions

D41748.id126984.diff
View Options

diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -165,7 +165,7 @@
/*
* The sysinit list itself. Items are removed as they are run.
*/
-static SLIST_HEAD(sysinitlist, sysinit) sysinit_list;
+static STAILQ_HEAD(sysinitlist, sysinit) sysinit_list;
/*
* Compare two sysinits; return -1, 0, or 1 if a comes before, at the same time
@@ -194,12 +194,12 @@
TSENTER();
TSENTER2("listify");
- SLIST_INIT(list);
+ STAILQ_INIT(list);
for (sipp = set; sipp < set_end; sipp++)
- SLIST_INSERT_HEAD(list, *sipp, next);
+ STAILQ_INSERT_TAIL(list, *sipp, next);
TSEXIT2("listify");
TSENTER2("mergesort");
- SLIST_MERGESORT(list, NULL, sysinit_compar, sysinit, next);
+ STAILQ_MERGESORT(list, NULL, sysinit_compar, sysinit, next);
TSEXIT2("mergesort");
TSEXIT();
}
@@ -218,9 +218,9 @@
sysinit_mklist(&new_list, set, set_end);
/* Merge the new list into the existing one. */
- TSENTER2("SLIST_MERGE");
- SLIST_MERGE(&sysinit_list, &new_list, NULL, sysinit_compar, sysinit, next);
- TSEXIT2("SLIST_MERGE");
+ TSENTER2("STAILQ_MERGE");
+ STAILQ_MERGE(&sysinit_list, &new_list, NULL, sysinit_compar, sysinit, next);
+ TSEXIT2("STAILQ_MERGE");
TSEXIT();
}
@@ -284,11 +284,11 @@
* Perform each system initialization task from the ordered list. Note
* that if sysinit_list is modified (e.g. by a KLD) we will nonetheless
* always perform the earlist-sorted sysinit at each step; using the
- * SLIST_FOREACH macro would result in items being skipped if inserted
+ * STAILQ_FOREACH macro would result in items being skipped if inserted
* earlier than the "current item".
*/
- while ((sip = SLIST_FIRST(&sysinit_list)) != NULL) {
- SLIST_REMOVE_HEAD(&sysinit_list, next);
+ while ((sip = STAILQ_FIRST(&sysinit_list)) != NULL) {
+ STAILQ_REMOVE_HEAD(&sysinit_list, next);
if (sip->subsystem == SI_SUB_DUMMY)
continue; /* skip dummy task(s)*/
@@ -904,7 +904,7 @@
db_printf("SYSINIT vs Name(Ptr)\n");
db_printf(" Subsystem Order\n");
db_printf(" Function(Name)(Arg)\n");
- SLIST_FOREACH(sip, &sysinit_list, next) {
+ STAILQ_FOREACH(sip, &sysinit_list, next) {
db_show_print_syinit(sip, true);
if (db_pager_quit)
break;
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -220,7 +220,7 @@
struct sysinit {
enum sysinit_sub_id subsystem; /* subsystem identifier*/
enum sysinit_elem_order order; /* init order within subsystem*/
- SLIST_ENTRY(sysinit) next; /* singly-linked list */
+ STAILQ_ENTRY(sysinit) next; /* singly-linked list */
sysinit_cfunc_t func; /* function */
const void *udata; /* multiplexer/argument */
};

File Metadata

Mime Type
text/plain
Expires
Wed, Sep 25, 9:57 PM (10 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
12792403
Default Alt Text
D41748.id126984.diff (2 KB)

Event Timeline