mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-24 21:34:08 +03:00
sd-daemon: split off sd_readahead() since it is not a feature of systemd itself but of an auxiliary tool
This commit is contained in:
Lennart Poettering
parent
a55da3cd5e
commit
d0b4880988
@ -310,7 +310,9 @@ dist_doc_DATA = \
|
||||
LICENSE \
|
||||
DISTRO_PORTING \
|
||||
src/sd-daemon.h \
|
||||
src/sd-daemon.c
|
||||
src/sd-daemon.c \
|
||||
src/sd-readahead.h \
|
||||
src/sd-readahead.c
|
||||
|
||||
pkgconfigdata_DATA = \
|
||||
systemd.pc
|
||||
@ -419,6 +421,7 @@ EXTRA_DIST += \
|
||||
src/linux/fanotify.h \
|
||||
src/initreq.h \
|
||||
src/sd-daemon.h \
|
||||
src/sd-readahead.h \
|
||||
src/special.h \
|
||||
src/dbus-common.h \
|
||||
src/bus-errors.h \
|
||||
@ -708,7 +711,8 @@ systemctl_LDADD = \
|
||||
|
||||
systemd_notify_SOURCES = \
|
||||
src/notify.c \
|
||||
src/sd-daemon.c
|
||||
src/sd-daemon.c \
|
||||
src/sd-readahead.c
|
||||
|
||||
systemd_notify_LDADD = \
|
||||
libsystemd-basic.la
|
||||
|
||||
@ -433,41 +433,3 @@ int sd_booted(void) {
|
||||
return a.st_dev != b.st_dev;
|
||||
#endif
|
||||
}
|
||||
|
||||
static int touch(const char *path) {
|
||||
|
||||
#if !defined(DISABLE_SYSTEMD) && defined(__linux__)
|
||||
int fd;
|
||||
|
||||
mkdir("/dev/.systemd", 0755);
|
||||
mkdir("/dev/.systemd/readahead", 0755);
|
||||
|
||||
if ((fd = open(path, O_WRONLY|O_CREAT|O_CLOEXEC|O_NOCTTY, 0666)) < 0)
|
||||
return -errno;
|
||||
|
||||
for (;;) {
|
||||
if (close(fd) >= 0)
|
||||
break;
|
||||
|
||||
if (errno != -EINTR)
|
||||
return -errno;
|
||||
}
|
||||
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
int sd_readahead(const char *action) {
|
||||
|
||||
if (!action)
|
||||
return -EINVAL;
|
||||
|
||||
if (strcmp(action, "cancel") == 0)
|
||||
return touch("/dev/.systemd/readahead/cancel");
|
||||
else if (strcmp(action, "done") == 0)
|
||||
return touch("/dev/.systemd/readahead/done");
|
||||
else if (strcmp(action, "noreplay") == 0)
|
||||
return touch("/dev/.systemd/readahead/noreplay");
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@ -67,17 +67,21 @@ extern "C" {
|
||||
See sd-daemon(7) for more information.
|
||||
*/
|
||||
|
||||
#ifndef _sd_printf_attr_
|
||||
#if __GNUC__ >= 4
|
||||
#define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
|
||||
#else
|
||||
#define _sd_printf_attr_(a,b)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef _sd_hidden_
|
||||
#if (__GNUC__ >= 4) && !defined(SD_EXPORT_SYMBOLS)
|
||||
#define _sd_hidden_ __attribute__ ((visibility("hidden")))
|
||||
#else
|
||||
#define _sd_hidden_
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
Log levels for usage on stderr:
|
||||
@ -254,16 +258,6 @@ int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(
|
||||
*/
|
||||
int sd_booted(void) _sd_hidden_;
|
||||
|
||||
/*
|
||||
Controls ongoing disk read-ahead operations during boot-up. The argument
|
||||
must be a string, and either "cancel", "done" or "noreplay".
|
||||
|
||||
cancel = terminate read-ahead data collection, drop collected information
|
||||
done = terminate read-ahead data collection, keep collected information
|
||||
noreplay = terminate read-ahead replay
|
||||
*/
|
||||
int sd_readahead(const char *action);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
76
src/sd-readahead.c
Normal file
76
src/sd-readahead.c
Normal file
@ -0,0 +1,76 @@
|
||||
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
|
||||
/***
|
||||
Copyright 2010 Lennart Poettering
|
||||
|
||||
Permission is hereby granted, free of charge, to any person
|
||||
obtaining a copy of this software and associated documentation files
|
||||
(the "Software"), to deal in the Software without restriction,
|
||||
including without limitation the rights to use, copy, modify, merge,
|
||||
publish, distribute, sublicense, and/or sell copies of the Software,
|
||||
and to permit persons to whom the Software is furnished to do so,
|
||||
subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be
|
||||
included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
||||
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
***/
|
||||
|
||||
#ifndef _GNU_SOURCE
|
||||
#define _GNU_SOURCE
|
||||
#endif
|
||||
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "sd-readahead.h"
|
||||
|
||||
static int touch(const char *path) {
|
||||
|
||||
#if !defined(DISABLE_SYSTEMD) && defined(__linux__)
|
||||
int fd;
|
||||
|
||||
mkdir("/dev/.systemd", 0755);
|
||||
mkdir("/dev/.systemd/readahead", 0755);
|
||||
|
||||
if ((fd = open(path, O_WRONLY|O_CREAT|O_CLOEXEC|O_NOCTTY, 0666)) < 0)
|
||||
return -errno;
|
||||
|
||||
for (;;) {
|
||||
if (close(fd) >= 0)
|
||||
break;
|
||||
|
||||
if (errno != -EINTR)
|
||||
return -errno;
|
||||
}
|
||||
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
int sd_readahead(const char *action) {
|
||||
|
||||
if (!action)
|
||||
return -EINVAL;
|
||||
|
||||
if (strcmp(action, "cancel") == 0)
|
||||
return touch("/dev/.systemd/readahead/cancel");
|
||||
else if (strcmp(action, "done") == 0)
|
||||
return touch("/dev/.systemd/readahead/done");
|
||||
else if (strcmp(action, "noreplay") == 0)
|
||||
return touch("/dev/.systemd/readahead/noreplay");
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
81
src/sd-readahead.h
Normal file
81
src/sd-readahead.h
Normal file
@ -0,0 +1,81 @@
|
||||
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
|
||||
#ifndef foosdreadaheadhfoo
|
||||
#define foosdreadaheadhfoo
|
||||
|
||||
/***
|
||||
Copyright 2010 Lennart Poettering
|
||||
|
||||
Permission is hereby granted, free of charge, to any person
|
||||
obtaining a copy of this software and associated documentation files
|
||||
(the "Software"), to deal in the Software without restriction,
|
||||
including without limitation the rights to use, copy, modify, merge,
|
||||
publish, distribute, sublicense, and/or sell copies of the Software,
|
||||
and to permit persons to whom the Software is furnished to do so,
|
||||
subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be
|
||||
included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
||||
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
***/
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/*
|
||||
Reference implementation of a few boot readahead related
|
||||
interfaces. These interfaces are trivial to implement. To simplify
|
||||
porting we provide this reference implementation. Applications are
|
||||
welcome to reimplement the algorithms described here if they do not
|
||||
want to include these two source files.
|
||||
|
||||
You may compile this with -DDISABLE_SYSTEMD to disable systemd
|
||||
support. This makes all calls NOPs.
|
||||
|
||||
Since this is drop-in code we don't want any of our symbols to be
|
||||
exported in any case. Hence we declare hidden visibility for all of
|
||||
them.
|
||||
|
||||
You may find an up-to-date version of these source files online:
|
||||
|
||||
http://cgit.freedesktop.org/systemd/plain/src/sd-readahead.h
|
||||
http://cgit.freedesktop.org/systemd/plain/src/sd-readahead.c
|
||||
|
||||
This should compile on non-Linux systems, too, but all functions
|
||||
will become NOPs.
|
||||
|
||||
See sd-readahead(7) for more information.
|
||||
*/
|
||||
|
||||
#ifndef _sd_hidden_
|
||||
#if (__GNUC__ >= 4) && !defined(SD_EXPORT_SYMBOLS)
|
||||
#define _sd_hidden_ __attribute__ ((visibility("hidden")))
|
||||
#else
|
||||
#define _sd_hidden_
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
Controls ongoing disk read-ahead operations during boot-up. The argument
|
||||
must be a string, and either "cancel", "done" or "noreplay".
|
||||
|
||||
cancel = terminate read-ahead data collection, drop collected information
|
||||
done = terminate read-ahead data collection, keep collected information
|
||||
noreplay = terminate read-ahead replay
|
||||
*/
|
||||
int sd_readahead(const char *action) _sd_hidden_;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user