[glibc] 01/01: hurd-i386: Fix recording profiling from ext2fs
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch sid
in repository glibc.
commit 5e3a1620fe4871e988700b9aa1fa39ba493034ca
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Apr 18 23:04:23 2016 +0000
hurd-i386: Fix recording profiling from ext2fs
---
debian/changelog | 2 ++
.../patches/hurd-i386/unsubmitted-prof-eintr.diff | 22 ++++++++++++++++++++++
debian/patches/series.hurd-i386 | 1 +
3 files changed, 25 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index b70e822..d3dbf34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ glibc (2.22-7) UNRELEASED; urgency=medium
[ Samuel Thibault ]
* hurd-i386/submitted-auxv.diff: Update from upstream commit into
cvs-auxv.diff.
+ * hurd-i386/unsubmitted-prof-eintr.diff: Fix recording profiling from
+ ext2fs.
-- Aurelien Jarno <aurel32@debian.org> Sat, 09 Apr 2016 16:23:55 +0200
diff --git a/debian/patches/hurd-i386/unsubmitted-prof-eintr.diff b/debian/patches/hurd-i386/unsubmitted-prof-eintr.diff
new file mode 100644
index 0000000..630f1b6
--- /dev/null
+++ b/debian/patches/hurd-i386/unsubmitted-prof-eintr.diff
@@ -0,0 +1,22 @@
+When profiling ext2fs, the shutdown stops all RPC, which thus interrupts this
+open, and we have to retry here.
+
+TODO: is open really supposed to expose such EINTR? Should the generic gmon
+loop around EINTR (since there might be signals happening indeed)
+
+Index: glibc-2.22/gmon/gmon.c
+===================================================================
+--- glibc-2.22.orig/gmon/gmon.c
++++ glibc-2.22/gmon/gmon.c
+@@ -357,8 +357,11 @@ write_gmon (void)
+
+ if (fd == -1)
+ {
++ do
+ fd = open_not_cancel ("gmon.out", O_CREAT|O_TRUNC|O_WRONLY|O_NOFOLLOW,
+ 0666);
++ while (fd < 0 && errno == EINTR);
++
+ if (fd < 0)
+ {
+ char buf[300];
diff --git a/debian/patches/series.hurd-i386 b/debian/patches/series.hurd-i386
index 9aa13cf..d4fc9e7 100644
--- a/debian/patches/series.hurd-i386
+++ b/debian/patches/series.hurd-i386
@@ -13,3 +13,4 @@ hurd-i386/submitted-handle-eprototype.diff
hurd-i386/local-no-bootstrap-fs-access.diff
hurd-i386/unsubmitted-timer_routines.diff
hurd-i386/local-versions-hack.diff
+hurd-i386/unsubmitted-prof-eintr.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: