shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-11 09:18:07 +03:00
Code

add flag for reading of precompiled rules

Browse Source 
Rules can be precompiled and stored on disk for initramfs, to avoid
parsing the rules with every event again and again. Also the OWNER and
GROUP names are already resolved to numerical values in the compiled
rules. This flag is used for the upcoming move of the rules parsing
into udevd:
  If the real root is mounted udevd is started and parses the rules
  only once. The event processes will inherit the already parsed rules
  from the daemon, so we want to ignore any precompiled rules and
  use the real rules files and watch the filesystem for changes to
  reload the rules automatically.

Signed-off-by: Kay Sievers <kay.sievers@suse.de>
This commit is contained in:
Kay Sievers 2005-08-08 17:43:42 +02:00
parent 63cc8f0491
commit bfd1294892
6 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
udev.c
View File

@ -115,7 +115,7 @@ int main(int argc, char *argv[], char *envp[])
}
udev_init_device(&udev, devpath, subsystem, action);
udev_rules_init(&rules, 0);
udev_rules_init(&rules, 1, 0);
retval = udev_process_event(&rules, &udev);

2
udev_rules.h
View File

@ -104,7 +104,7 @@ struct udev_rules {
int resolve_names;
};
extern int udev_rules_init(struct udev_rules *rules, int resolve_names);
extern int udev_rules_init(struct udev_rules *rules, int read_compiled, int resolve_names);
extern void udev_rules_close(struct udev_rules *rules);
extern void udev_apply_format(struct udevice *udev, char *string, size_t maxsize,

17
udev_rules_parse.c
View File

@ -607,7 +607,7 @@ static int rules_map(struct udev_rules *rules, const char *filename)
return 0;
}
int udev_rules_init(struct udev_rules *rules, int resolve_names)
int udev_rules_init(struct udev_rules *rules, int read_compiled, int resolve_names)
{
char comp[PATH_SIZE];
struct stat stats;
@ -617,14 +617,17 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
rules->resolve_names = resolve_names;
/* check for precompiled rules */
strlcpy(comp, udev_rules_filename, sizeof(comp));
strlcat(comp, ".compiled", sizeof(comp));
if (stat(comp, &stats) == 0) {
dbg("map compiled rules '%s'", comp);
if (rules_map(rules, comp) == 0)
return 0;
if (read_compiled) {
strlcpy(comp, udev_rules_filename, sizeof(comp));
strlcat(comp, ".compiled", sizeof(comp));
if (stat(comp, &stats) == 0) {
dbg("map compiled rules '%s'", comp);
if (rules_map(rules, comp) == 0)
return 0;
}
}
/* parse rules file or all matching files in directory */
if (stat(udev_rules_filename, &stats) != 0)
return -1;

2
udevrulescompile.c
View File

@ -69,7 +69,7 @@ int main(int argc, char *argv[], char *envp[])
unlink(comp);
unlink(comp_tmp);
udev_rules_init(&rules, 1);
udev_rules_init(&rules, 0, 1);
f = fopen(comp_tmp, "w");
if (f == NULL) {

2
udevstart.c
View File

@ -367,7 +367,7 @@ int main(int argc, char *argv[], char *envp[])
/* trigger timeout to prevent hanging processes */
alarm(UDEV_ALARM_TIMEOUT);
udev_rules_init(&rules, 1);
udev_rules_init(&rules, 0, 1);
udev_scan_block();
udev_scan_class();

2
udevtest.c
View File

@ -92,7 +92,7 @@ int main(int argc, char *argv[], char *envp[])
info("looking at device '%s' from subsystem '%s'", devpath, subsystem);
/* initialize the naming deamon */
udev_rules_init(&rules, 0);
udev_rules_init(&rules, 0, 0);
/* fill in values and test_run flag*/
udev_init_device(&udev, devpath, subsystem, "add");