projects
/
qemu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/nchip/public_html/qemu into garage-push
[qemu]
/
module.c
diff --git
a/module.c
b/module.c
index
113eeef
..
3729283
100644
(file)
--- a/
module.c
+++ b/
module.c
@@
-22,44
+22,36
@@
typedef struct ModuleEntry
TAILQ_ENTRY(ModuleEntry) node;
} ModuleEntry;
TAILQ_ENTRY(ModuleEntry) node;
} ModuleEntry;
-typedef struct ModuleTypeList
-{
- module_init_type type;
- TAILQ_HEAD(, ModuleEntry) entry_list;
- TAILQ_ENTRY(ModuleTypeList) node;
-} ModuleTypeList;
+typedef TAILQ_HEAD(, ModuleEntry) ModuleTypeList;
-static TAILQ_HEAD(, ModuleTypeList) init_type_list;
+static ModuleTypeList init_type_list[MODULE_INIT_MAX];
-static ModuleTypeList *find_type_or_alloc(module_init_type type, int alloc)
+static void init_types(void)
{
{
- ModuleTypeList *n;
+ static int inited;
+ int i;
- TAILQ_FOREACH(n, &init_type_list, node) {
- if (type >= n->type)
- break;
+ if (inited) {
+ return;
}
}
- if (!n || n->type != type) {
- ModuleTypeList *o;
+ for (i = 0; i < MODULE_INIT_MAX; i++) {
+ TAILQ_INIT(&init_type_list[i]);
+ }
- if (!alloc)
- return NULL;
+ inited = 1;
+}
- o = qemu_mallocz(sizeof(*o));
- o->type = type;
- TAILQ_INIT(&o->entry_list);
- if (n) {
- TAILQ_INSERT_AFTER(&init_type_list, n, o, node);
- } else {
- TAILQ_INSERT_HEAD(&init_type_list, o, node);
- }
+static ModuleTypeList *find_type(module_init_type type)
+{
+ ModuleTypeList *l;
- n = o;
- }
+ init_types();
+
+ l = &init_type_list[type];
- return n;
+ return l;
}
void register_module_init(void (*fn)(void), module_init_type type)
}
void register_module_init(void (*fn)(void), module_init_type type)
@@
-70,9
+62,9
@@
void register_module_init(void (*fn)(void), module_init_type type)
e = qemu_mallocz(sizeof(*e));
e->init = fn;
e = qemu_mallocz(sizeof(*e));
e->init = fn;
- l = find_type_or_alloc(type, 1);
+ l = find_type(type);
- TAILQ_INSERT_TAIL(&l->entry_list, e, node);
+ TAILQ_INSERT_TAIL(l, e, node);
}
void module_call_init(module_init_type type)
}
void module_call_init(module_init_type type)
@@
-80,12
+72,9
@@
void module_call_init(module_init_type type)
ModuleTypeList *l;
ModuleEntry *e;
ModuleTypeList *l;
ModuleEntry *e;
- l = find_type_or_alloc(type, 0);
- if (!l) {
- return;
- }
+ l = find_type(type);
- TAILQ_FOREACH(e, &l->entry_list, node) {
+ TAILQ_FOREACH(e, l, node) {
e->init();
}
}
e->init();
}
}