logind: use new udev_enumerate_add_match_parent() where applicable

[elogind.git] / src / logind.h

diff --git a/src/logind.h b/src/logind.h
index 95db35ddfda6ccefa8cf7c0ddb6b48199b255376..1f5f9fe4a6dba927dc55aee3039b60da6c4b855b 100644 (file)
--- a/src/logind.h
+++ b/src/logind.h
@@ -34,10 +34,11 @@
 
 /* TODO:
  *
- * recreate VTs when disallocated
- * PAM rewrite
  * spawn user systemd
- * dbus API
+ * direct client API
+ *
+ * udev:
+ * use sysfs in device hash table, not sysname, when fb driver is fixed
  *
  * non-local X11 server
  * reboot/shutdown halt management
@@ -63,9 +64,11 @@ struct Manager {
         LIST_HEAD(User, user_gc_queue);
 
         struct udev *udev;
-        struct udev_monitor *udev_monitor;
+        struct udev_monitor *udev_seat_monitor, *udev_vcsa_monitor;
+
+        int udev_seat_fd;
+        int udev_vcsa_fd;
 
-        int udev_fd;
         int console_active_fd;
         int bus_fd;
         int epoll_fd;
@@ -80,6 +83,19 @@ struct Manager {
         char **kill_only_users, **kill_exclude_users;
 
         bool kill_user_processes;
+
+        unsigned long session_counter;
+
+        Hashmap *cgroups;
+        Hashmap *fifo_fds;
+};
+
+enum {
+        FD_SEAT_UDEV,
+        FD_VCSA_UDEV,
+        FD_CONSOLE,
+        FD_BUS,
+        FD_FIFO_BASE
 };
 
 Manager *manager_new(void);
@@ -92,8 +108,9 @@ int manager_add_user(Manager *m, uid_t uid, gid_t gid, const char *name, User **
 int manager_add_user_by_name(Manager *m, const char *name, User **_user);
 int manager_add_user_by_uid(Manager *m, uid_t uid, User **_user);
 
-int manager_process_device(Manager *m, struct udev_device *d);
-int manager_dispatch_udev(Manager *m);
+int manager_process_seat_device(Manager *m, struct udev_device *d);
+int manager_dispatch_seat_udev(Manager *m);
+int manager_dispatch_vcsa_udev(Manager *m);
 int manager_dispatch_console(Manager *m);
 
 int manager_enumerate_devices(Manager *m);
@@ -105,10 +122,16 @@ int manager_startup(Manager *m);
 int manager_run(Manager *m);
 int manager_spawn_autovt(Manager *m, int vtnr);
 
-void manager_gc(Manager *m);
+void manager_cgroup_notify_empty(Manager *m, const char *cgroup);
+
+void manager_gc(Manager *m, bool drop_not_started);
 
-bool x11_display_is_local(const char *display);
+int manager_get_idle_hint(Manager *m, dual_timestamp *t);
 
 extern const DBusObjectPathVTable bus_manager_vtable;
 
+DBusHandlerResult bus_message_filter(DBusConnection *c, DBusMessage *message, void *userdata);
+
+int manager_send_changed(Manager *manager, const char *properties);
+
 #endif