chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: export bus address also when compiled without kdbus
[elogind.git]
/
src
/
libsystemd-bus
/
bus-kernel.h
diff --git
a/src/libsystemd-bus/bus-kernel.h
b/src/libsystemd-bus/bus-kernel.h
index 4b63108e8afd2802480ba1d7d0633b21857b191e..2aba0bbe0a04dda3668d7bf1a8970e2b9fd36c6e 100644
(file)
--- a/
src/libsystemd-bus/bus-kernel.h
+++ b/
src/libsystemd-bus/bus-kernel.h
@@
-21,18
+21,20
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include <stdbool.h>
+
#include "sd-bus.h"
#include "sd-bus.h"
-#define KDBUS_
PART
_NEXT(item) \
+#define KDBUS_
ITEM
_NEXT(item) \
(typeof(item))(((uint8_t *)item) + ALIGN8((item)->size))
(typeof(item))(((uint8_t *)item) + ALIGN8((item)->size))
-#define KDBUS_
PART
_FOREACH(part, head, first) \
+#define KDBUS_
ITEM
_FOREACH(part, head, first) \
for (part = (head)->first; \
(uint8_t *)(part) < (uint8_t *)(head) + (head)->size; \
for (part = (head)->first; \
(uint8_t *)(part) < (uint8_t *)(head) + (head)->size; \
- part = KDBUS_
PART
_NEXT(part))
+ part = KDBUS_
ITEM
_NEXT(part))
-#define KDBUS_
PART
_HEADER_SIZE offsetof(struct kdbus_item, data)
-#define KDBUS_ITEM_SIZE(s) ALIGN8((s) + KDBUS_
PART
_HEADER_SIZE)
+#define KDBUS_
ITEM
_HEADER_SIZE offsetof(struct kdbus_item, data)
+#define KDBUS_ITEM_SIZE(s) ALIGN8((s) + KDBUS_
ITEM
_HEADER_SIZE)
#define MEMFD_CACHE_MAX 32
#define MEMFD_CACHE_MAX 32
@@
-51,19
+53,23
@@
struct memfd_cache {
int fd;
void *address;
struct memfd_cache {
int fd;
void *address;
- size_t size;
+ size_t mapped;
+ size_t allocated;
};
int bus_kernel_connect(sd_bus *b);
int bus_kernel_take_fd(sd_bus *b);
int bus_kernel_write_message(sd_bus *bus, sd_bus_message *m);
};
int bus_kernel_connect(sd_bus *b);
int bus_kernel_take_fd(sd_bus *b);
int bus_kernel_write_message(sd_bus *bus, sd_bus_message *m);
-int bus_kernel_read_message(sd_bus *bus
, sd_bus_message **m
);
+int bus_kernel_read_message(sd_bus *bus);
-int bus_kernel_create(const char *name, char **s);
+int bus_kernel_create_bus(const char *name, bool world, char **s);
+int bus_kernel_create_namespace(const char *name, char **s);
+int bus_kernel_create_starter(const char *bus, const char *name);
+int bus_kernel_create_monitor(const char *bus);
-int bus_kernel_pop_memfd(sd_bus *bus, void **address, size_t *
size
);
-void bus_kernel_push_memfd(sd_bus *bus, int fd, void *address, size_t
size
);
+int bus_kernel_pop_memfd(sd_bus *bus, void **address, size_t *
mapped, size_t *allocated
);
+void bus_kernel_push_memfd(sd_bus *bus, int fd, void *address, size_t
mapped, size_t allocated
);
void bus_kernel_flush_memfd(sd_bus *bus);
void bus_kernel_flush_memfd(sd_bus *bus);
@@
-71,3
+77,5
@@
int bus_kernel_parse_unique_name(const char *s, uint64_t *id);
int kdbus_translate_request_name_flags(uint64_t sd_bus_flags, uint64_t *kdbus_flags);
int kdbus_translate_attach_flags(uint64_t sd_bus_flags, uint64_t *kdbus_flags);
int kdbus_translate_request_name_flags(uint64_t sd_bus_flags, uint64_t *kdbus_flags);
int kdbus_translate_attach_flags(uint64_t sd_bus_flags, uint64_t *kdbus_flags);
+
+int bus_kernel_try_close(sd_bus *bus);