X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fswap.h;h=f2ae49b1dec7c3b40ab55c9f0890686dfd426de7;hb=a4297f08ed774ed6d980b6cadaf844bfb2c7a403;hp=62d08da30b81f5649e4af04d1254d875df650894;hpb=b30e2f4c18ad81b04e4314fd191a5d458553773c;p=elogind.git
diff --git a/src/core/swap.h b/src/core/swap.h
index 62d08da30..f2ae49b1d 100644
--- a/src/core/swap.h
+++ b/src/core/swap.h
@@ -1,7 +1,6 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef fooswaphfoo
-#define fooswaphfoo
+#pragma once
/***
This file is part of systemd.
@@ -10,26 +9,29 @@
Copyright 2010 Maarten Lankhorst
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
***/
+#include
+
typedef struct Swap Swap;
#include "unit.h"
typedef enum SwapState {
SWAP_DEAD,
- SWAP_ACTIVATING,
+ SWAP_ACTIVATING, /* /sbin/swapon is running, but the swap not yet enabled. */
+ SWAP_ACTIVATING_DONE, /* /sbin/swapon is running, and the swap is done. */
SWAP_ACTIVE,
SWAP_DEACTIVATING,
SWAP_ACTIVATING_SIGTERM,
@@ -48,14 +50,6 @@ typedef enum SwapExecCommand {
_SWAP_EXEC_COMMAND_INVALID = -1
} SwapExecCommand;
-typedef struct SwapParameters {
- char *what;
- int priority;
- bool noauto:1;
- bool nofail:1;
- bool handle:1;
-} SwapParameters;
-
typedef enum SwapResult {
SWAP_SUCCESS,
SWAP_FAILURE_RESOURCES,
@@ -67,16 +61,26 @@ typedef enum SwapResult {
_SWAP_RESULT_INVALID = -1
} SwapResult;
+typedef struct SwapParameters {
+ char *what;
+ int priority;
+ bool noauto:1;
+ bool nofail:1;
+} SwapParameters;
+
struct Swap {
Unit meta;
char *what;
- SwapParameters parameters_etc_fstab;
+ /* If the device has already shown up, this is the device
+ * node, which might be different from what, due to
+ * symlinks */
+ char *devnode;
+
SwapParameters parameters_proc_swaps;
SwapParameters parameters_fragment;
- bool from_etc_fstab:1;
bool from_proc_swaps:1;
bool from_fragment:1;
@@ -91,6 +95,10 @@ struct Swap {
ExecCommand exec_command[_SWAP_EXEC_COMMAND_MAX];
ExecContext exec_context;
+ KillContext kill_context;
+ CGroupContext cgroup_context;
+
+ ExecRuntime *exec_runtime;
SwapState state, deserialized_state;
@@ -98,31 +106,25 @@ struct Swap {
SwapExecCommand control_command_id;
pid_t control_pid;
- Watch timer_watch;
+ sd_event_source *timer_event_source;
/* In order to be able to distinguish dependencies on
different device nodes we might end up creating multiple
devices for the same swap. We chain them up here. */
- LIST_FIELDS(struct Swap, same_proc_swaps);
+ LIST_FIELDS(struct Swap, same_devnode);
};
extern const UnitVTable swap_vtable;
-int swap_add_one(Manager *m, const char *what, const char *what_proc_swaps, int prio, bool no_auto, bool no_fail, bool handle, bool set_flags);
-
-int swap_add_one_mount_link(Swap *s, Mount *m);
-
-int swap_dispatch_reload(Manager *m);
-int swap_fd_event(Manager *m, int events);
-
-const char* swap_state_to_string(SwapState i);
-SwapState swap_state_from_string(const char *s);
+int swap_process_new_device(Manager *m, struct udev_device *dev);
+int swap_process_removed_device(Manager *m, struct udev_device *dev);
-const char* swap_exec_command_to_string(SwapExecCommand i);
-SwapExecCommand swap_exec_command_from_string(const char *s);
+const char* swap_state_to_string(SwapState i) _const_;
+SwapState swap_state_from_string(const char *s) _pure_;
-const char* swap_result_to_string(SwapResult i);
-SwapResult swap_result_from_string(const char *s);
+const char* swap_exec_command_to_string(SwapExecCommand i) _const_;
+SwapExecCommand swap_exec_command_from_string(const char *s) _pure_;
-#endif
+const char* swap_result_to_string(SwapResult i) _const_;
+SwapResult swap_result_from_string(const char *s) _pure_;