shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-09-12 01:44:46 +03:00
Code Activity

create udevdb files only if somehting interesting happened

Browse Source 
Device nodes created with the default rule, without any symlink or option
are no longer saved to the udevdb. This saves us ~3 MB RAM for pretty much
useless files on tmpfs.
Note: HAL needs a fix to handle this correctly. It's already available on
the list.

Signed-off-by: Kay Sievers <kay.sievers@suse.de>
This commit is contained in:
Kay Sievers
2005-07-05 22:40:42 +02:00
parent 8bd41f36f7
commit 25103c4849
2 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
udev_db.c
View File

@@ -68,10 +68,18 @@ int udev_db_add_device(struct udevice *udev)
if (udev->test_run) if (udev->test_run)
return 0; return 0;
/* don't write anything if udev created only the node with the
* kernel name without any interesting data to remember
*/
if (strcmp(udev->name, udev->kernel_name) == 0 &&
list_empty(&udev->symlink_list) && list_empty(&udev->env_list) &&
!udev->partitions && !udev->ignore_remove) {
dbg("nothing interesting to store in udevdb, skip");
goto exit;
}
get_db_filename(udev->devpath, filename, sizeof(filename)); get_db_filename(udev->devpath, filename, sizeof(filename));
create_path(filename); create_path(filename);
f = fopen(filename, "w"); f = fopen(filename, "w");
if (f == NULL) { if (f == NULL) {
err("unable to create db file '%s'", filename); err("unable to create db file '%s'", filename);
@@ -84,12 +92,15 @@ int udev_db_add_device(struct udevice *udev)
list_for_each_entry(name_loop, &udev->symlink_list, node) list_for_each_entry(name_loop, &udev->symlink_list, node)
fprintf(f, "S:%s\n", name_loop->name); fprintf(f, "S:%s\n", name_loop->name);
fprintf(f, "M:%u:%u\n", major(udev->devt), minor(udev->devt)); fprintf(f, "M:%u:%u\n", major(udev->devt), minor(udev->devt));
fprintf(f, "A:%u\n", udev->partitions); if (udev->partitions)
fprintf(f, "R:%u\n", udev->ignore_remove); fprintf(f, "A:%u\n", udev->partitions);
if (udev->ignore_remove)
fprintf(f, "R:%u\n", udev->ignore_remove);
list_for_each_entry(name_loop, &udev->env_list, node) list_for_each_entry(name_loop, &udev->env_list, node)
fprintf(f, "E:%s\n", name_loop->name); fprintf(f, "E:%s\n", name_loop->name);
fclose(f); fclose(f);
exit:
return 0; return 0;
} }

21
udev_remove.c
View File

@@ -143,18 +143,17 @@ int udev_remove_device(struct udevice *udev)
if (udev->type != DEV_BLOCK && udev->type != DEV_CLASS) if (udev->type != DEV_BLOCK && udev->type != DEV_CLASS)
return 0; return 0;
/* remove node only if we can find it in our database */ if (udev_db_get_device(udev, udev->devpath) == 0) {
if (udev_db_get_device(udev, udev->devpath) != 0) { if (udev->ignore_remove) {
dbg("'%s' not found in database, ignore event", udev->name); dbg("remove event for '%s' requested to be ignored by rule", udev->name);
return -1; return 0;
}
dbg("remove name='%s'", udev->name);
udev_db_delete_device(udev);
} else {
dbg("'%s' not found in database, using kernel name '%s'", udev->devpath, udev->kernel_name);
strlcpy(udev->name, udev->kernel_name, sizeof(udev->name));
} }
if (udev->ignore_remove) {
dbg("remove event for '%s' requested to be ignored by rule", udev->name);
return 0;
}
dbg("remove name='%s'", udev->name);
udev_db_delete_device(udev);
/* use full path to the environment */ /* use full path to the environment */
snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name); snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
udev->devname[sizeof(udev->devname)-1] = '\0'; udev->devname[sizeof(udev->devname)-1] = '\0';