diff options
| author | Kay Sievers <kay@vrfy.org> | 2014-07-30 09:31:38 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-07-30 09:31:38 -0400 |
| commit | 471a5f341168cff3f07474b7c4a88779bdd8ca1d (patch) | |
| tree | 80b5c3a53c25f451220a1cfef1e4dec467719b35 /src/udev/udev.h | |
| parent | babb0ec5865658d920ef0bb07c89a3122beb8ec2 (diff) | |
udev: unify event timeout handling
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
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 86a9ea6809..ddd7104a97 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 */ |