diff options
| author | Kay Sievers <kay@vrfy.org> | 2014-07-29 15:18:27 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2014-07-29 15:18:27 +0200 |
| commit | dd5eddd28a74a49607a8fffcaf960040dba98479 (patch) | |
| tree | c2f6f64a9db3c6a2223d119faffae48a1f998d5b /src/udev/udev.h | |
| parent | 9719859c07aa13539ed2cd4b31972cd30f678543 (diff) | |
udev: unify event timeout handling
Diffstat (limited to 'src/udev/udev.h')
| -rw-r--r-- | src/udev/udev.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/udev/udev.h b/src/udev/udev.h index 62538bcb8d..4aca70bef4 100644 --- a/src/udev/udev.h +++ b/src/udev/udev.h @@ -43,7 +43,6 @@ struct udev_event { struct udev_list run_list; int exec_delay; usec_t birth_usec; - usec_t timeout_usec; int fd_signal; unsigned int builtin_run; unsigned int builtin_ret; @@ -72,7 +71,7 @@ struct udev_rules; struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names); struct udev_rules *udev_rules_unref(struct udev_rules *rules); bool udev_rules_check_timestamp(struct udev_rules *rules); -int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event, const sigset_t *sigmask); +int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event, usec_t timeout_usec, const sigset_t *sigmask); int udev_rules_apply_static_dev_perms(struct udev_rules *rules); /* udev-event.c */ @@ -82,10 +81,11 @@ size_t udev_event_apply_format(struct udev_event *event, const char *src, char * int udev_event_apply_subsys_kernel(struct udev_event *event, const char *string, char *result, size_t maxsize, int read_value); int udev_event_spawn(struct udev_event *event, + usec_t timeout_usec, const char *cmd, char **envp, const sigset_t *sigmask, char *result, size_t ressize); -void udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules, const sigset_t *sigset); -void udev_event_execute_run(struct udev_event *event, const sigset_t *sigset); +void udev_event_execute_rules(struct udev_event *event, usec_t timeout_usec, struct udev_rules *rules, const sigset_t *sigset); +void udev_event_execute_run(struct udev_event *event, usec_t timeout_usec, const sigset_t *sigset); int udev_build_argv(struct udev *udev, char *cmd, int *argc, char *argv[]); /* udev-watch.c */ |