chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yay, we can start socket units
[elogind.git]
/
manager.h
diff --git
a/manager.h
b/manager.h
index a17a6c2f6d8f645abae07e805d8675020072af86..303201b74d910eceb2c841f0082c3da397b37458 100644
(file)
--- a/
manager.h
+++ b/
manager.h
@@
-8,7
+8,21
@@
#include <stdio.h>
typedef struct Manager Manager;
#include <stdio.h>
typedef struct Manager Manager;
-typedef enum ManagerEventType ManagerEventType;
+typedef enum WatchType WatchType;
+typedef struct Watch Watch;
+
+enum WatchType {
+ WATCH_INVALID,
+ WATCH_SIGNAL_FD,
+ WATCH_FD,
+ WATCH_TIMER
+};
+
+struct Watch {
+ int fd;
+ WatchType type;
+ union Unit *unit;
+};
#include "unit.h"
#include "job.h"
#include "unit.h"
#include "job.h"
@@
-16,12
+30,6
@@
typedef enum ManagerEventType ManagerEventType;
#include "list.h"
#include "set.h"
#include "list.h"
#include "set.h"
-enum ManagerEventType {
- MANAGER_SIGNAL,
- MANAGER_FD,
- MANAGER_TIMER
-};
-
struct Manager {
uint32_t current_job_id;
struct Manager {
uint32_t current_job_id;
@@
-49,7
+57,8
@@
struct Manager {
Hashmap *watch_pids; /* pid => Unit object n:1 */
int epoll_fd;
Hashmap *watch_pids; /* pid => Unit object n:1 */
int epoll_fd;
- int signal_fd;
+
+ Watch signal_watch;
};
Manager* manager_new(void);
};
Manager* manager_new(void);