shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-10 01:17:44 +03:00
Code

core/manager: split out creation of serialization fd out to a helper

Browse Source 
There is a slight change in behaviour: the user manager for root will create a
temporary file in /run/systemd, not /tmp. I don't think this matters, but
simplifies implementation.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-02-11 18:33:16 -05:00
parent 18f71a3c81
commit 504afd7c34
4 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/basic/fileio.c
View File

@ -1342,6 +1342,25 @@ int open_tmpfile_linkable(const char *target, int flags, char **ret_path) {
return fd;
}
int open_serialization_fd(const char *ident) {
int fd = -1;
fd = memfd_create(ident, MFD_CLOEXEC);
if (fd < 0) {
const char *path;
path = getpid() == 1 ? "/run/systemd" : "/tmp";
fd = open_tmpfile_unlinkable(path, O_RDWR|O_CLOEXEC);
if (fd < 0)
return fd;
log_debug("Serializing %s to %s.", ident, path);
} else
log_debug("Serializing %s to memfd.", ident);
return fd;
}
int link_tmpfile(int fd, const char *path, const char *target) {
assert(fd >= 0);

1
src/basic/fileio.h
View File

@ -84,6 +84,7 @@ int fputs_with_space(FILE *f, const char *s, const char *separator, bool *space)
int open_tmpfile_unlinkable(const char *directory, int flags);
int open_tmpfile_linkable(const char *target, int flags, char **ret_path);
int open_serialization_fd(const char *ident);
int link_tmpfile(int fd, const char *path, const char *target);

17
src/core/manager.c
View File

@ -2437,22 +2437,14 @@ void manager_send_unit_plymouth(Manager *m, Unit *u) {
}
int manager_open_serialization(Manager *m, FILE **_f) {
int fd = -1;
int fd;
FILE *f;
assert(_f);
fd = memfd_create("systemd-serialization", MFD_CLOEXEC);
if (fd < 0) {
const char *path;
path = MANAGER_IS_SYSTEM(m) ? "/run/systemd" : "/tmp";
fd = open_tmpfile_unlinkable(path, O_RDWR|O_CLOEXEC);
if (fd < 0)
return -errno;
log_debug("Serializing state to %s.", path);
} else
log_debug("Serializing state to memfd.");
fd = open_serialization_fd("systemd-state");
if (fd < 0)
return fd;
f = fdopen(fd, "w+");
if (!f) {
@ -2461,7 +2453,6 @@ int manager_open_serialization(Manager *m, FILE **_f) {
}
*_f = f;
return 0;
}

10
src/test/test-fd-util.c
View File

@ -94,10 +94,20 @@ static void test_same_fd(void) {
assert_se(same_fd(b, a) == 0);
}
static void test_open_serialization_fd(void) {
_cleanup_close_ int fd = -1;
fd = open_serialization_fd("test");
assert_se(fd >= 0);
write(fd, "test\n", 5);
}
int main(int argc, char *argv[]) {
test_close_many();
test_close_nointr();
test_same_fd();
test_open_serialization_fd();
return 0;
}