chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: expose architecture as a bus property, so that we can easily query it remotely
[elogind.git]
/
src
/
core
/
unit.h
diff --git
a/src/core/unit.h
b/src/core/unit.h
index 299ded66ac128e94e50fe2a064f507cfb70fefb0..34afe93e655bf98d6194f6c48b82f30083eaba9b 100644
(file)
--- a/
src/core/unit.h
+++ b/
src/core/unit.h
@@
-177,7
+177,8
@@
struct Unit {
/* Counterparts in the cgroup filesystem */
char *cgroup_path;
/* Counterparts in the cgroup filesystem */
char *cgroup_path;
- CGroupControllerMask cgroup_mask;
+ CGroupControllerMask cgroup_realized_mask;
+ CGroupControllerMask cgroup_subtree_mask;
CGroupControllerMask cgroup_members_mask;
UnitRef slice;
CGroupControllerMask cgroup_members_mask;
UnitRef slice;
@@
-203,6
+204,11
@@
struct Unit {
/* CGroup realize members queue */
LIST_FIELDS(Unit, cgroup_queue);
/* CGroup realize members queue */
LIST_FIELDS(Unit, cgroup_queue);
+ /* PIDs we keep an eye on. Note that a unit might have many
+ * more, but these are the ones we care enough about to
+ * process SIGCHLD for */
+ Set *pids;
+
/* Used during GC sweeps */
unsigned gc_marker;
/* Used during GC sweeps */
unsigned gc_marker;
@@
-261,6
+267,8
@@
struct Unit {
bool in_audit:1;
bool cgroup_realized:1;
bool in_audit:1;
bool cgroup_realized:1;
+ bool cgroup_members_mask_valid:1;
+ bool cgroup_subtree_mask_valid:1;
};
struct UnitStatusMessageFormats {
};
struct UnitStatusMessageFormats {
@@
-276,14
+284,15
@@
typedef enum UnitSetPropertiesMode {
} UnitSetPropertiesMode;
#include "service.h"
} UnitSetPropertiesMode;
#include "service.h"
-#include "timer.h"
#include "socket.h"
#include "socket.h"
+#include "busname.h"
#include "target.h"
#include "target.h"
+#include "snapshot.h"
#include "device.h"
#include "mount.h"
#include "automount.h"
#include "device.h"
#include "mount.h"
#include "automount.h"
-#include "snapshot.h"
#include "swap.h"
#include "swap.h"
+#include "timer.h"
#include "path.h"
#include "slice.h"
#include "scope.h"
#include "path.h"
#include "slice.h"
#include "scope.h"
@@
-409,6
+418,8
@@
struct UnitVTable {
/* Called whenever CLOCK_REALTIME made a jump */
void (*time_change)(Unit *u);
/* Called whenever CLOCK_REALTIME made a jump */
void (*time_change)(Unit *u);
+ int (*get_timeout)(Unit *u, uint64_t *timeout);
+
/* This is called for each unit type and should be used to
* enumerate existing devices and load them. However,
* everything that is loaded here should still stay in
/* This is called for each unit type and should be used to
* enumerate existing devices and load them. However,
* everything that is loaded here should still stay in
@@
-425,9
+436,6
@@
struct UnitVTable {
/* The bus vtable */
const sd_bus_vtable *bus_vtable;
/* 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;
/* The strings to print in status messages */
UnitStatusMessageFormats status_message_formats;
@@
-462,15
+470,16
@@
extern const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX];
#define UNIT_TRIGGER(u) ((Unit*) set_first((u)->dependencies[UNIT_TRIGGERS]))
#define UNIT_TRIGGER(u) ((Unit*) set_first((u)->dependencies[UNIT_TRIGGERS]))
-DEFINE_CAST(SOCKET, Socket);
-DEFINE_CAST(TIMER, Timer);
DEFINE_CAST(SERVICE, Service);
DEFINE_CAST(SERVICE, Service);
+DEFINE_CAST(SOCKET, Socket);
+DEFINE_CAST(BUSNAME, BusName);
DEFINE_CAST(TARGET, Target);
DEFINE_CAST(TARGET, Target);
+DEFINE_CAST(SNAPSHOT, Snapshot);
DEFINE_CAST(DEVICE, Device);
DEFINE_CAST(MOUNT, Mount);
DEFINE_CAST(AUTOMOUNT, Automount);
DEFINE_CAST(DEVICE, Device);
DEFINE_CAST(MOUNT, Mount);
DEFINE_CAST(AUTOMOUNT, Automount);
-DEFINE_CAST(SNAPSHOT, Snapshot);
DEFINE_CAST(SWAP, Swap);
DEFINE_CAST(SWAP, Swap);
+DEFINE_CAST(TIMER, Timer);
DEFINE_CAST(PATH, Path);
DEFINE_CAST(SLICE, Slice);
DEFINE_CAST(SCOPE, Scope);
DEFINE_CAST(PATH, Path);
DEFINE_CAST(SLICE, Slice);
DEFINE_CAST(SCOPE, Scope);
@@
-537,6
+546,10
@@
void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
int unit_watch_pid(Unit *u, pid_t pid);
void unit_unwatch_pid(Unit *u, pid_t pid);
int unit_watch_pid(Unit *u, pid_t pid);
void unit_unwatch_pid(Unit *u, pid_t pid);
+int unit_watch_all_pids(Unit *u);
+void unit_unwatch_all_pids(Unit *u);
+
+void unit_tidy_watch_pids(Unit *u, pid_t except1, pid_t except2);
int unit_watch_bus_name(Unit *u, const char *name);
void unit_unwatch_bus_name(Unit *u, const char *name);
int unit_watch_bus_name(Unit *u, const char *name);
void unit_unwatch_bus_name(Unit *u, const char *name);
@@
-589,7
+602,8
@@
void unit_ref_unset(UnitRef *ref);
#define UNIT_DEREF(ref) ((ref).unit)
#define UNIT_ISSET(ref) (!!(ref).unit)
#define UNIT_DEREF(ref) ((ref).unit)
#define UNIT_ISSET(ref) (!!(ref).unit)
-int unit_exec_context_defaults(Unit *u, ExecContext *c);
+int unit_exec_context_patch_defaults(Unit *u, ExecContext *c);
+int unit_cgroup_context_init_defaults(Unit *u, CGroupContext *c);
ExecContext *unit_get_exec_context(Unit *u) _pure_;
KillContext *unit_get_kill_context(Unit *u) _pure_;
ExecContext *unit_get_exec_context(Unit *u) _pure_;
KillContext *unit_get_kill_context(Unit *u) _pure_;