X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Funit.h;h=5b4f86c58470d96efd7ee4f9b4de2b4130275a19;hp=6dd750f8c2102ac667808622e221360064a848e5;hb=92c1622e14dd99890928b1a1596e4a670b31a7ff;hpb=a57f7e2c828b852eb32fd810dcea041bb2975501 diff --git a/src/core/unit.h b/src/core/unit.h index 6dd750f8c..5b4f86c58 100644 --- a/src/core/unit.h +++ b/src/core/unit.h @@ -32,6 +32,7 @@ typedef enum UnitDependency UnitDependency; typedef struct UnitRef UnitRef; typedef struct UnitStatusMessageFormats UnitStatusMessageFormats; +#include "sd-event.h" #include "set.h" #include "util.h" #include "list.h" @@ -174,6 +175,7 @@ struct Unit { /* Counterparts in the cgroup filesystem */ char *cgroup_path; CGroupControllerMask cgroup_mask; + CGroupControllerMask cgroup_members_mask; UnitRef slice; @@ -295,6 +297,10 @@ struct UnitVTable { * CGroupContext is found, if the unit type has that */ size_t cgroup_context_offset; + /* If greater than 0, the offset into the object where + * KillContext is found, if the unit type has that */ + size_t kill_context_offset; + /* The name of the configuration file section with the private settings of this unit*/ const char *private_section; @@ -327,7 +333,7 @@ struct UnitVTable { int (*stop)(Unit *u); int (*reload)(Unit *u); - int (*kill)(Unit *u, KillWho w, int signo, DBusError *error); + int (*kill)(Unit *u, KillWho w, int signo, sd_bus_error *error); bool (*can_reload)(Unit *u); @@ -359,9 +365,8 @@ struct UnitVTable { /* Return true when this unit is suitable for snapshotting */ bool (*check_snapshot)(Unit *u); - void (*fd_event)(Unit *u, int fd, uint32_t events, Watch *w); + /* Invoked on every child that died */ void (*sigchld_event)(Unit *u, pid_t pid, int code, int status); - void (*timer_event)(Unit *u, uint64_t n_elapsed, Watch *w); /* Reset failed state if we are in failed state */ void (*reset_failed)(Unit *u); @@ -377,14 +382,8 @@ struct UnitVTable { * goes away. */ void (*bus_name_owner_change)(Unit *u, const char *name, const char *old_owner, const char *new_owner); - /* Called whenever a bus PID lookup finishes */ - void (*bus_query_pid_done)(Unit *u, const char *name, pid_t pid); - - /* Called for each message received on the bus */ - DBusHandlerResult (*bus_message_handler)(Unit *u, DBusConnection *c, DBusMessage *message); - /* Called for each property that is being set */ - int (*bus_set_property)(Unit *u, const char *name, DBusMessageIter *i, UnitSetPropertiesMode mode, DBusError *error); + int (*bus_set_property)(Unit *u, const char *name, sd_bus_message *message, UnitSetPropertiesMode mode, sd_bus_error *error); /* Called after at least one property got changed to apply the necessary change */ int (*bus_commit_properties)(Unit *u); @@ -412,14 +411,16 @@ struct UnitVTable { /* Type specific cleanups. */ void (*shutdown)(Manager *m); - /* When sending out PropertiesChanged signal, which properties - * shall be invalidated? This is a NUL separated list of - * strings, to minimize relocations a little. */ - const char *bus_invalidating_properties; - /* The interface name */ const char *bus_interface; + /* The bus vtable */ + const sd_bus_vtable *bus_vtable; + + /* strv list of changing properties */ + const char * const * const bus_changing_properties; + + /* The strings to print in status messages */ UnitStatusMessageFormats status_message_formats; /* Can units of this type have multiple names? */ @@ -521,20 +522,14 @@ int unit_start(Unit *u); int unit_stop(Unit *u); int unit_reload(Unit *u); -int unit_kill(Unit *u, KillWho w, int signo, DBusError *error); -int unit_kill_common(Unit *u, KillWho who, int signo, pid_t main_pid, pid_t control_pid, DBusError *error); +int unit_kill(Unit *u, KillWho w, int signo, sd_bus_error *error); +int unit_kill_common(Unit *u, KillWho who, int signo, pid_t main_pid, pid_t control_pid, sd_bus_error *error); void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_success); -int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w); -void unit_unwatch_fd(Unit *u, Watch *w); - int unit_watch_pid(Unit *u, pid_t pid); void unit_unwatch_pid(Unit *u, pid_t pid); -int unit_watch_timer(Unit *u, clockid_t, bool relative, usec_t usec, Watch *w); -void unit_unwatch_timer(Unit *u, Watch *w); - int unit_watch_bus_name(Unit *u, const char *name); void unit_unwatch_bus_name(Unit *u, const char *name); @@ -545,11 +540,10 @@ int set_unit_path(const char *p); char *unit_dbus_path(Unit *u); int unit_load_related_unit(Unit *u, const char *type, Unit **_found); -int unit_get_related_unit(Unit *u, const char *type, Unit **_found); bool unit_can_serialize(Unit *u) _pure_; int unit_serialize(Unit *u, FILE *f, FDSet *fds, bool serialize_jobs); -void unit_serialize_item_format(Unit *u, FILE *f, const char *key, const char *value, ...) _printf_attr_(4,5); +void unit_serialize_item_format(Unit *u, FILE *f, const char *key, const char *value, ...) _printf_(4,5); void unit_serialize_item(Unit *u, FILE *f, const char *key, const char *value); int unit_deserialize(Unit *u, FILE *f, FDSet *fds); @@ -557,7 +551,7 @@ int unit_add_node_link(Unit *u, const char *what, bool wants); int unit_coldplug(Unit *u); -void unit_status_printf(Unit *u, const char *status, const char *unit_status_msg_format) _printf_attr_(3, 0); +void unit_status_printf(Unit *u, const char *status, const char *unit_status_msg_format) _printf_(3, 0); bool unit_need_daemon_reload(Unit *u); @@ -580,8 +574,6 @@ int unit_following_set(Unit *u, Set **s); void unit_start_on_failure(Unit *u); void unit_trigger_notify(Unit *u); -bool unit_condition_test(Unit *u); - UnitFileState unit_get_unit_file_state(Unit *u); Unit* unit_ref_set(UnitRef *ref, Unit *u); @@ -590,18 +582,17 @@ void unit_ref_unset(UnitRef *ref); #define UNIT_DEREF(ref) ((ref).unit) #define UNIT_ISSET(ref) (!!(ref).unit) -int unit_add_mount_links(Unit *u); - int unit_exec_context_defaults(Unit *u, ExecContext *c); ExecContext *unit_get_exec_context(Unit *u) _pure_; +KillContext *unit_get_kill_context(Unit *u) _pure_; CGroupContext *unit_get_cgroup_context(Unit *u) _pure_; int unit_write_drop_in(Unit *u, UnitSetPropertiesMode mode, const char *name, const char *data); -int unit_write_drop_in_format(Unit *u, UnitSetPropertiesMode mode, const char *name, const char *format, ...) _printf_attr_(4,5); +int unit_write_drop_in_format(Unit *u, UnitSetPropertiesMode mode, const char *name, const char *format, ...) _printf_(4,5); int unit_write_drop_in_private(Unit *u, UnitSetPropertiesMode mode, const char *name, const char *data); -int unit_write_drop_in_private_format(Unit *u, UnitSetPropertiesMode mode, const char *name, const char *format, ...) _printf_attr_(4,5); +int unit_write_drop_in_private_format(Unit *u, UnitSetPropertiesMode mode, const char *name, const char *format, ...) _printf_(4,5); int unit_remove_drop_in(Unit *u, UnitSetPropertiesMode mode, const char *name);