return;
va_start(args, format);
- vsyslog(priority, format, args);
- va_end(args);
-
if (verbose) {
- va_start(args, format);
+ printf("[%d] ", (int) getpid());
vprintf(format, args);
- va_end(args);
printf("\n");
- }
+ } else
+ vsyslog(priority, format, args);
+ va_end(args);
}
#endif
return -1;
strlcpy(udev->action, msg->action, sizeof(udev->action));
sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem, msg->driver);
+ udev->devpath_old = msg->devpath_old;
udev->devt = msg->devt;
retval = udev_device_event(&rules, udev);
/* run programs collected by RUN-key*/
- if (retval == 0 && !udev->ignore_device && udev_run) {
- struct name_entry *name_loop;
-
- dbg("executing run list");
- list_for_each_entry(name_loop, &udev->run_list, node) {
- if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
- pass_env_to_socket(&name_loop->name[strlen("socket:")], udev->dev->devpath, udev->action);
- else {
- char program[PATH_SIZE];
-
- strlcpy(program, name_loop->name, sizeof(program));
- udev_rules_apply_format(udev, program, sizeof(program));
- if (run_program(program, udev->dev->subsystem, NULL, 0, NULL,
- (udev_log_priority >= LOG_INFO)))
- retval = -1;
- }
- }
- }
+ if (retval == 0 && !udev->ignore_device && udev_run)
+ retval = udev_rules_run(udev);
udev_device_cleanup(udev);
return retval;
char filename[PATH_SIZE];
char filename_failed[PATH_SIZE];
size_t start;
- struct udevd_uevent_msg *loop_msg;
- int fd;
- /* add location of queue files */
- strlcpy(filename, udev_root, sizeof(filename));
- strlcat(filename, "/", sizeof(filename));
- start = strlcat(filename, EVENT_QUEUE_DIR"/", sizeof(filename));
- strlcat(filename, msg->devpath, sizeof(filename));
- path_encode(&filename[start], sizeof(filename) - start);
+ /* location of queue file */
+ snprintf(filename, sizeof(filename), "%s/"EVENT_QUEUE_DIR"/%llu", udev_root, msg->seqnum);
- /* add location of failed files */
+ /* location of failed file */
strlcpy(filename_failed, udev_root, sizeof(filename_failed));
strlcat(filename_failed, "/", sizeof(filename_failed));
start = strlcat(filename_failed, EVENT_FAILED_DIR"/", sizeof(filename_failed));
strlcat(filename_failed, msg->devpath, sizeof(filename_failed));
- path_encode(&filename_failed[start], sizeof(filename) - start);
+ path_encode(&filename_failed[start], sizeof(filename_failed) - start);
switch (state) {
case EVENT_QUEUED:
unlink(filename_failed);
delete_path(filename_failed);
+
create_path(filename);
- fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
- if (fd > 0)
- close(fd);
- return;
+ symlink(msg->devpath, filename);
+ break;
case EVENT_FINISHED:
- case EVENT_FAILED:
- unlink(filename_failed);
- delete_path(filename_failed);
-
- /* don't remove, if events for the same path are still pending */
- list_for_each_entry(loop_msg, &running_list, node)
- if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
- return;
-
- list_for_each_entry(loop_msg, &exec_list, node)
- if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
- return;
-
- /* move failed events to the failed directory */
- if (state == EVENT_FAILED) {
- create_path(filename_failed);
- rename(filename, filename_failed);
+ if (msg->devpath_old != NULL) {
+ /* "move" event - rename failed file to current name, do not delete failed */
+ char filename_failed_old[PATH_SIZE];
+
+ strlcpy(filename_failed_old, udev_root, sizeof(filename_failed_old));
+ strlcat(filename_failed_old, "/", sizeof(filename_failed_old));
+ start = strlcat(filename_failed_old, EVENT_FAILED_DIR"/", sizeof(filename_failed_old));
+ strlcat(filename_failed_old, msg->devpath_old, sizeof(filename_failed_old));
+ path_encode(&filename_failed_old[start], sizeof(filename) - start);
+
+ if (rename(filename_failed_old, filename_failed) == 0)
+ info("renamed devpath, moved failed state of '%s' to %s'",
+ msg->devpath_old, msg->devpath);
} else {
- unlink(filename);
+ unlink(filename_failed);
+ delete_path(filename_failed);
}
- /* clean up the queue directory */
+ unlink(filename);
delete_path(filename);
+ break;
+ case EVENT_FAILED:
+ /* move failed event to the failed directory */
+ create_path(filename_failed);
+ rename(filename, filename_failed);
- return;
+ /* clean up possibly empty queue directory */
+ delete_path(filename);
+ break;
}
+
+ return;
}
static void msg_queue_delete(struct udevd_uevent_msg *msg)
{
list_del(&msg->node);
- /* mark as failed, if add event returns non-zero */
+ /* mark as failed, if "add" event returns non-zero */
if (msg->exitstatus && strcmp(msg->action, "add") == 0)
export_event_state(msg, EVENT_FAILED);
else
setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY);
retval = udev_event_process(msg);
- info("seq %llu finished", msg->seqnum);
+ info("seq %llu finished with %i", msg->seqnum, retval);
logging_close();
if (retval)
}
export_event_state(msg, EVENT_QUEUED);
+ info("seq %llu queued, '%s' '%s'", msg->seqnum, msg->action, msg->subsystem);
/* run one event after the other in debug mode */
if (debug_trace) {
static int mem_size_mb(void)
{
- int f;
- char buf[8192];
- long int len;
- const char *pos;
- long int memsize;
-
- f = open("/proc/meminfo", O_RDONLY);
- if (f == -1)
- return -1;
+ FILE* f;
+ char buf[4096];
+ long int memsize = -1;
- len = read(f, buf, sizeof(buf)-1);
- close(f);
-
- if (len <= 0)
+ f = fopen("/proc/meminfo", "r");
+ if (f == NULL)
return -1;
- buf[len] = '\0';
- pos = strstr(buf, "MemTotal: ");
- if (pos == NULL)
- return -1;
+ while (fgets(buf, sizeof(buf), f) != NULL) {
+ long int value;
- if (sscanf(pos, "MemTotal: %ld kB", &memsize) != 1)
- return -1;
+ if (sscanf(buf, "MemTotal: %ld kB", &value) == 1) {
+ memsize = value / 1024;
+ break;
+ }
+ }
- return memsize / 1024;
+ fclose(f);
+ return memsize;
}
static int cpu_count(void)
{
- int f;
- char buf[65536];
- int len;
- const char *pos;
+ FILE* f;
+ char buf[4096];
int count = 0;
- f = open("/proc/stat", O_RDONLY);
- if (f == -1)
- return -1;
-
- len = read(f, buf, sizeof(buf)-1);
- close(f);
- if (len <= 0)
- return -1;
- buf[len] = '\0';
-
- pos = strstr(buf, "cpu");
- if (pos == NULL)
+ f = fopen("/proc/stat", "r");
+ if (f == NULL)
return -1;
- while (pos != NULL) {
- if (strncmp(pos, "cpu", 3) == 0 &&isdigit(pos[3]))
+ while (fgets(buf, sizeof(buf), f) != NULL) {
+ if (strncmp(buf, "cpu", 3) == 0 && isdigit(buf[3]))
count++;
- pos = strstr(&pos[3], "cpu");
}
+ fclose(f);
if (count == 0)
return -1;
return count;
static int running_processes(void)
{
- int f;
- char buf[32768];
- int len;
- int running;
- const char *pos;
+ FILE* f;
+ char buf[4096];
+ int running = -1;
- f = open("/proc/stat", O_RDONLY);
- if (f == -1)
+ f = fopen("/proc/stat", "r");
+ if (f == NULL)
return -1;
- len = read(f, buf, sizeof(buf)-1);
- close(f);
- if (len <= 0)
- return -1;
- buf[len] = '\0';
-
- pos = strstr(buf, "procs_running ");
- if (pos == NULL)
- return -1;
+ while (fgets(buf, sizeof(buf), f) != NULL) {
+ int value;
- if (sscanf(pos, "procs_running %u", &running) != 1)
- return -1;
+ if (sscanf(buf, "procs_running %u", &value) == 1) {
+ running = value;
+ break;
+ }
+ }
+ fclose(f);
return running;
}
if (loop_msg->seqnum >= msg->seqnum)
break;
+ /* check our old name */
+ if (msg->devpath_old != NULL)
+ if (strcmp(loop_msg->devpath , msg->devpath_old) == 0)
+ return 2;
+
/* check identical, parent, or child device event */
if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) {
dbg("%llu, device event still pending %llu (%s)",
msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
- return 2;
+ return 3;
}
/* check physical device event (special case of parent) */
if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) {
dbg("%llu, physical device event still pending %llu (%s)",
msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
- return 3;
+ return 4;
}
}
- /* check runing-queue for still running events */
+ /* check run queue for still running events */
list_for_each_entry(loop_msg, &running_list, node) {
if (limit && childs_count++ > limit) {
dbg("%llu, maximum number (%i) of childs reached", msg->seqnum, childs_count);
return 1;
}
+ /* check our old name */
+ if (msg->devpath_old != NULL)
+ if (strcmp(loop_msg->devpath , msg->devpath_old) == 0)
+ return 2;
+
/* check identical, parent, or child device event */
if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) {
dbg("%llu, device event still running %llu (%s)",
msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
- return 2;
+ return 3;
}
/* check physical device event (special case of parent) */
if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) {
dbg("%llu, physical device event still running %llu (%s)",
msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
- return 3;
+ return 4;
}
}
return 0;
msg->driver = &key[7];
else if (strncmp(key, "SEQNUM=", 7) == 0)
msg->seqnum = strtoull(&key[7], NULL, 10);
+ else if (strncmp(key, "DEVPATH_OLD=", 12) == 0)
+ msg->devpath_old = &key[12];
else if (strncmp(key, "PHYSDEVPATH=", 12) == 0)
msg->physdevpath = &key[12];
else if (strncmp(key, "PHYSDEVDRIVER=", 14) == 0)
selinux_init();
dbg("version %s", UDEV_VERSION);
- /* parse commandline options */
while (1) {
option = getopt_long(argc, argv, "dtvhV", options, NULL);
if (option == -1)
/* watch rules directory */
inotify_fd = inotify_init();
- if (inotify_fd >= 0)
+ if (inotify_fd >= 0) {
+ char filename[PATH_MAX];
+
inotify_add_watch(inotify_fd, udev_rules_dir, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
- else if (errno == ENOSYS)
- err("the kernel does not support inotify, udevd can't monitor configuration file changes");
+
+ /* watch dynamic rules directory */
+ strlcpy(filename, udev_root, sizeof(filename));
+ strlcat(filename, "/"RULES_DYN_DIR, sizeof(filename));
+ inotify_add_watch(inotify_fd, filename, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+ } else if (errno == ENOSYS)
+ err("the kernel does not support inotify, udevd can't monitor rules file changes");
else
err("inotify_init failed: %s", strerror(errno));
int nbytes;
/* discard all possible events, we can just reload the config */
- if ((ioctl(inotify_fd, FIONREAD, &nbytes) == 0) && nbytes) {
+ if ((ioctl(inotify_fd, FIONREAD, &nbytes) == 0) && nbytes > 0) {
char *buf;
reload_config = 1;
buf = malloc(nbytes);
- if (!buf) {
+ if (buf == NULL) {
err("error getting buffer for inotify, disable watching");
close(inotify_fd);
inotify_fd = -1;
~ianmdlvl / elogind.git / blobdiff