From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yiannis Marangos Subject: [PATCH v8 1/2] Add xpread() Date: Thu, 10 Apr 2014 21:54:12 +0300 Message-ID: <1397156052-1247-1-git-send-email-yiannis.marangos@gmail.com> References: <1397081197-14803-1-git-send-email-yiannis.marangos@gmail.com> Cc: Yiannis Marangos To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Apr 10 20:54:35 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WYK7O-0005Ew-M2 for gcvg-git-2@plane.gmane.org; Thu, 10 Apr 2014 20:54:35 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753375AbaDJSy2 (ORCPT ); Thu, 10 Apr 2014 14:54:28 -0400 Received: from mail-ee0-f49.google.com ([74.125.83.49]:56469 "EHLO mail-ee0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964944AbaDJSyZ (ORCPT ); Thu, 10 Apr 2014 14:54:25 -0400 Received: by mail-ee0-f49.google.com with SMTP id c41so3329125eek.8 for ; Thu, 10 Apr 2014 11:54:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DCjxdDjSa904Iy8FcthHDea1t8I8XkWJSl9VmaaENzg=; b=Baqa4kYInnnhFrt31WLgNVxK6bB9C/0gYUV5xgE1xrq7c+LptDAosa8vBPuO/yXvH1 PuDxzWKpX/x1hiFplRtBiKIfps2lYQtPjRbWUkw2LP2tROQiytiWcgL/niGyLokmNj7T 0bE6sJsKu78HW7vmConVZVML2AZHbEmhlaCx6+EVcGlxovx7MzuFRs4Fht7rRG0PkYw5 rabHu/Zrelie0jQ/REK3McWmvO5dUTE2E3VXhMjtl6YGXlY8vheYt3gosmyAuBsc2UaX YZJ6EcOodylgCEIhqVd5P8YJtuw103iSPp3ObBG29jckisnjOP5F1c+R2ifuVMBq1jne 8LQQ== X-Received: by 10.15.53.69 with SMTP id q45mr22796495eew.22.1397156064102; Thu, 10 Apr 2014 11:54:24 -0700 (PDT) Received: from abyss.hitronhub.home ([46.251.117.183]) by mx.google.com with ESMTPSA id t50sm11857171eev.28.2014.04.10.11.54.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Apr 2014 11:54:23 -0700 (PDT) X-Mailer: git-send-email 1.9.1 In-Reply-To: <1397081197-14803-1-git-send-email-yiannis.marangos@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: xpread() pay attention to EAGAIN/EINTR, so it will resume automatically on interrupted call. Signed-off-by: Yiannis Marangos --- This is actually the 2nd version of this commit but before I emailed it as version 7 because it's a dependency of [PATCH v7 2/2]. Is this the correct way to introduce a new descendant commit? Sorry, It's my first time that I use mailing lists for contribution. Version 8 removes xpwrite() builtin/index-pack.c | 2 +- compat/mmap.c | 4 +--- git-compat-util.h | 1 + wrapper.c | 18 ++++++++++++++++++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/builtin/index-pack.c b/builtin/index-pack.c index b9f6e12..1bac0f5 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -542,7 +542,7 @@ static void *unpack_data(struct object_entry *obj, do { ssize_t n = (len < 64*1024) ? len : 64*1024; - n = pread(pack_fd, inbuf, n, from); + n = xpread(pack_fd, inbuf, n, from); if (n < 0) die_errno(_("cannot pread pack file")); if (!n) diff --git a/compat/mmap.c b/compat/mmap.c index c9d46d1..7f662fe 100644 --- a/compat/mmap.c +++ b/compat/mmap.c @@ -14,7 +14,7 @@ void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t of } while (n < length) { - ssize_t count = pread(fd, (char *)start + n, length - n, offset + n); + ssize_t count = xpread(fd, (char *)start + n, length - n, offset + n); if (count == 0) { memset((char *)start+n, 0, length-n); @@ -22,8 +22,6 @@ void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t of } if (count < 0) { - if (errno == EAGAIN || errno == EINTR) - continue; free(start); errno = EACCES; return MAP_FAILED; diff --git a/git-compat-util.h b/git-compat-util.h index f6d3a46..e6a4159 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -531,6 +531,7 @@ extern void *xcalloc(size_t nmemb, size_t size); extern void *xmmap(void *start, size_t length, int prot, int flags, int fd, off_t offset); extern ssize_t xread(int fd, void *buf, size_t len); extern ssize_t xwrite(int fd, const void *buf, size_t len); +extern ssize_t xpread(int fd, void *buf, size_t len, off_t offset); extern int xdup(int fd); extern FILE *xfdopen(int fd, const char *mode); extern int xmkstemp(char *template); diff --git a/wrapper.c b/wrapper.c index 0cc5636..cf71817 100644 --- a/wrapper.c +++ b/wrapper.c @@ -174,6 +174,24 @@ ssize_t xwrite(int fd, const void *buf, size_t len) } } +/* + * xpread() is the same as pread(), but it automatically restarts pread() + * operations with a recoverable error (EAGAIN and EINTR). xpread() DOES + * NOT GUARANTEE that "len" bytes is read even if the data is available. + */ +ssize_t xpread(int fd, void *buf, size_t len, off_t offset) +{ + ssize_t nr; + if (len > MAX_IO_SIZE) + len = MAX_IO_SIZE; + while (1) { + nr = pread(fd, buf, len, offset); + if ((nr < 0) && (errno == EAGAIN || errno == EINTR)) + continue; + return nr; + } +} + ssize_t read_in_full(int fd, void *buf, size_t count) { char *p = buf; -- 1.9.1