dirkmueller/systemd
SHA256
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=614
This commit is contained in:
Dr. Werner Fink 2014-05-02 10:15:38 +00:00 committed by Git OBS Bridge
parent d07503cb51
commit bd8a742761
5 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
shut-up-annoying-assertion-monotonic-clock-message.patch Normal file
View File

@ -0,0 +1,38 @@
Stop flooding the kernel's message ring buffer with useless
messages on dual_timestamp_is_set is failed. This is a backport
from upstream code.
---
src/libsystemd/sd-event/sd-event.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--- systemd-210/src/libsystemd/sd-event/sd-event.c
+++ systemd-210/src/libsystemd/sd-event/sd-event.c 2014-05-02 10:01:23.366235185 +0000
@@ -2191,9 +2191,12 @@ _public_ int sd_event_exit(sd_event *e,
_public_ int sd_event_get_now_realtime(sd_event *e, uint64_t *usec) {
assert_return(e, -EINVAL);
assert_return(usec, -EINVAL);
- assert_return(dual_timestamp_is_set(&e->timestamp), -ENODATA);
assert_return(!event_pid_changed(e), -ECHILD);
+ /* If we haven't run yet, just get the actual time */
+ if (!dual_timestamp_is_set(&e->timestamp))
+ return -ENODATA;
+
*usec = e->timestamp.realtime;
return 0;
}
@@ -2201,9 +2204,12 @@ _public_ int sd_event_get_now_realtime(s
_public_ int sd_event_get_now_monotonic(sd_event *e, uint64_t *usec) {
assert_return(e, -EINVAL);
assert_return(usec, -EINVAL);
- assert_return(dual_timestamp_is_set(&e->timestamp), -ENODATA);
assert_return(!event_pid_changed(e), -ECHILD);
+ /* If we haven't run yet, just get the actual time */
+ if (!dual_timestamp_is_set(&e->timestamp))
+ return -ENODATA;
+
*usec = e->timestamp.monotonic;
return 0;
}

7
systemd-mini.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri May 2 10:12:26 UTC 2014 - werner@suse.de
- Add patch shut-up-annoying-assertion-monotonic-clock-message.patch
to avoid annyoing messages on failing dual_timestamp_is_set in the
kernel's message ring buffer
-------------------------------------------------------------------
Wed Apr 30 12:14:32 UTC 2014 - werner@suse.de

3
systemd-mini.spec
View File

@ -397,6 +397,8 @@ Patch201: 0003-delta-do-not-use-unicode-chars-in-C-locale.patch
Patch202: 0004-implement-a-union-to-pad-out-file_handle.patch
# PATCH-FIX-SUSE System fails to boot if nfs mounts get added to fstab (bnc#874665)
Patch203: respect-nfs-bg-option.patch
# PATCH-FIX-UPSTREAM Stop useless messages on dual_timestamp_is_set is failed.
Patch204: shut-up-annoying-assertion-monotonic-clock-message.patch
# UDEV PATCHES
# ============
@ -781,6 +783,7 @@ cp %{SOURCE7} m4/
%patch201 -p0
%patch202 -p0
%patch203 -p1
%patch204 -p1
# udev patches
%patch1001 -p1

7
systemd.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri May 2 10:12:26 UTC 2014 - werner@suse.de
- Add patch shut-up-annoying-assertion-monotonic-clock-message.patch
to avoid annyoing messages on failing dual_timestamp_is_set in the
kernel's message ring buffer
-------------------------------------------------------------------
Wed Apr 30 12:14:32 UTC 2014 - werner@suse.de

3
systemd.spec
View File

@ -392,6 +392,8 @@ Patch201: 0003-delta-do-not-use-unicode-chars-in-C-locale.patch
Patch202: 0004-implement-a-union-to-pad-out-file_handle.patch
# PATCH-FIX-SUSE System fails to boot if nfs mounts get added to fstab (bnc#874665)
Patch203: respect-nfs-bg-option.patch
# PATCH-FIX-UPSTREAM Stop useless messages on dual_timestamp_is_set is failed.
Patch204: shut-up-annoying-assertion-monotonic-clock-message.patch
# UDEV PATCHES
# ============
@ -776,6 +778,7 @@ cp %{SOURCE7} m4/
%patch201 -p0
%patch202 -p0
%patch203 -p1
%patch204 -p1
# udev patches
%patch1001 -p1