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: reenable id change subscriptions
[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 9515e8f05fd7b44fa3c56a817a3b4e212146ef0b..0a825d7b8eab08768947a2eff77d773460e9b43d 100644
(file)
--- a/
src/libsystemd-bus/bus-kernel.h
+++ b/
src/libsystemd-bus/bus-kernel.h
@@
-26,10
+26,10
@@
#define KDBUS_ITEM_NEXT(item) \
(typeof(item))(((uint8_t *)item) + ALIGN8((item)->size))
#define KDBUS_ITEM_NEXT(item) \
(typeof(item))(((uint8_t *)item) + ALIGN8((item)->size))
-#define KDBUS_ITEM_FOREACH(
item, head)
\
- for (
item = (head)->items;
\
- (uint8_t *)(
item) < (uint8_t *)(head) + (head)->size;
\
-
item = KDBUS_ITEM_NEXT(item
))
+#define KDBUS_ITEM_FOREACH(
part, head, first)
\
+ for (
part = (head)->first;
\
+ (uint8_t *)(
part) < (uint8_t *)(head) + (head)->size;
\
+
part = KDBUS_ITEM_NEXT(part
))
#define KDBUS_ITEM_HEADER_SIZE offsetof(struct kdbus_item, data)
#define KDBUS_ITEM_SIZE(s) ALIGN8((s) + KDBUS_ITEM_HEADER_SIZE)
#define KDBUS_ITEM_HEADER_SIZE offsetof(struct kdbus_item, data)
#define KDBUS_ITEM_SIZE(s) ALIGN8((s) + KDBUS_ITEM_HEADER_SIZE)
@@
-42,7
+42,7
@@
/* This determines at which minimum size we prefer sending memfds over
* sending vectors */
/* This determines at which minimum size we prefer sending memfds over
* sending vectors */
-#define MEMFD_MIN_SIZE (
96
*1024)
+#define MEMFD_MIN_SIZE (
128
*1024)
/* The size of the per-connection memory pool that we set up and where
* the kernel places our incoming messages */
/* The size of the per-connection memory pool that we set up and where
* the kernel places our incoming messages */
@@
-51,20
+51,27
@@
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, 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);
int bus_kernel_parse_unique_name(const char *s, uint64_t *id);
void bus_kernel_flush_memfd(sd_bus *bus);
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);