diff options
| -rw-r--r-- | man/systemd-system.conf.xml | 2 | ||||
| -rw-r--r-- | man/systemd.resource-control.xml | 4 | ||||
| -rw-r--r-- | src/basic/psi-util.h | 4 | ||||
| -rw-r--r-- | src/libsystemd/sd-event/sd-event.c | 4 | ||||
| -rwxr-xr-x | test/units/testsuite-79.sh | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 829b4be0ed..554d0fbd45 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -565,7 +565,7 @@ <varname>MemoryPressureWatch=</varname> and <varname>MemoryPressureThresholdSec=</varname> settings. See <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry> - for details. Defaults to <literal>auto</literal> and <literal>100ms</literal>, respectively. This + for details. Defaults to <literal>auto</literal> and <literal>200ms</literal>, respectively. This also sets the memory pressure monitoring threshold for the service manager itself.</para></listitem> </varlistentry> </variablelist> diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml index d18fd9a94c..21e4342165 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -1332,10 +1332,10 @@ DeviceAllow=/dev/loop-control <listitem><para>Sets the memory pressure threshold time for memory pressure monitor as configured via <varname>MemoryPressureWatch=</varname>. Specifies the maximum allocation latency before a memory - pressure event is signalled to the service, per 1s window. If not specified defaults to the + pressure event is signalled to the service, per 2s window. If not specified defaults to the <varname>DefaultMemoryPressureThresholdSec=</varname> setting in <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> - (which in turn defaults to 100ms). The specified value expects a time unit such as + (which in turn defaults to 200ms). The specified value expects a time unit such as <literal>ms</literal> or <literal>µs</literal>, see <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry> for details on the permitted syntax.</para></listitem> diff --git a/src/basic/psi-util.h b/src/basic/psi-util.h index 558a130996..bf8f4fe51c 100644 --- a/src/basic/psi-util.h +++ b/src/basic/psi-util.h @@ -31,5 +31,5 @@ int is_pressure_supported(void); /* Default parameters for memory pressure watch logic in sd-event and PID 1 */ #define MEMORY_PRESSURE_DEFAULT_TYPE "some" -#define MEMORY_PRESSURE_DEFAULT_THRESHOLD_USEC (100 * USEC_PER_MSEC) -#define MEMORY_PRESSURE_DEFAULT_WINDOW_USEC USEC_PER_SEC +#define MEMORY_PRESSURE_DEFAULT_THRESHOLD_USEC (200 * USEC_PER_MSEC) +#define MEMORY_PRESSURE_DEFAULT_WINDOW_USEC (2 * USEC_PER_SEC) diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index 413ac16aa2..f11f35ef6e 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -2005,7 +2005,9 @@ _public_ int sd_event_add_memory_pressure( * some 100000 1000000 * full 100000 1000000 * - * We'll default to the middle level that both agree on */ + * We'll default to the middle level that both agree on. Except we do it on a 2s window + * (i.e. 200ms per 2s, rather than 100ms per 1s), because that's the window duration the + * kernel will allow us to do unprivileged, also in the future. */ if (asprintf((char**) &write_buffer, "%s " USEC_FMT " " USEC_FMT, MEMORY_PRESSURE_DEFAULT_TYPE, diff --git a/test/units/testsuite-79.sh b/test/units/testsuite-79.sh index b11923bc07..cced3205c5 100755 --- a/test/units/testsuite-79.sh +++ b/test/units/testsuite-79.sh @@ -43,7 +43,7 @@ test -w "$MEMORY_PRESSURE_WATCH" ls -al "$MEMORY_PRESSURE_WATCH" -EXPECTED="$(echo -n -e "some 123000 1000000\x00" | base64)" +EXPECTED="$(echo -n -e "some 123000 2000000\x00" | base64)" test "$EXPECTED" = "$MEMORY_PRESSURE_WRITE" |