From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH 1/7] streaming: make streaming-write-entry to be more reusable Date: Wed, 7 Mar 2012 17:54:15 +0700 Message-ID: <1331117661-19378-2-git-send-email-pclouds@gmail.com> References: <7vty21twqc.fsf@alter.siamese.dyndns.org> <1331117661-19378-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Junio C Hamano , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Mar 07 11:53:12 2012 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 1S5EUX-0002li-Kd for gcvg-git-2@plane.gmane.org; Wed, 07 Mar 2012 11:53:10 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755252Ab2CGKxD convert rfc822-to-quoted-printable (ORCPT ); Wed, 7 Mar 2012 05:53:03 -0500 Received: from mail-pz0-f52.google.com ([209.85.210.52]:64743 "EHLO mail-pz0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752048Ab2CGKxA (ORCPT ); Wed, 7 Mar 2012 05:53:00 -0500 Received: by mail-pz0-f52.google.com with SMTP id p12so7761663dad.11 for ; Wed, 07 Mar 2012 02:53:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=+luZykEJFVchpD6dIgW78VBMGxcv75m1jb+4fXV2ajc=; b=txg3pjYGEg5UF6GpTKLsagoDIi0xSHathHmUH0G8JErclzxmZQ1w96IdPS+DJIxU6r TT/PDdeeDgWXdGmdwXwsUk9OXAJUf9RH4hyOxZp+k1YWA+Sn3a99UCZgNFYtwIn6WFon ZtHUMOAoWZaePRvAomq3AOAJsESKDpafV/pklZ8r4HICUNrmYZfSE1775ujY8xGAjHT9 rIyaFwMmioP9HGUdWTtuw8oPyfwnCiiYfzF7YiCob1uEdE4Rl7qX8I1AgK3/iUnzVrrI JQ0nZ3DdQGz1ceRlKSgFcJ3YCWyhjQczr8hu0lUUKsixdCwEDNs7dZ7aydNeu0sU3n56 37Cg== Received: by 10.68.233.168 with SMTP id tx8mr3034996pbc.72.1331117580539; Wed, 07 Mar 2012 02:53:00 -0800 (PST) Received: from tre ([115.74.59.10]) by mx.google.com with ESMTPS id g4sm588104pbs.17.2012.03.07.02.52.55 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Mar 2012 02:52:58 -0800 (PST) Received: by tre (sSMTP sendmail emulation); Wed, 07 Mar 2012 17:54:29 +0700 X-Mailer: git-send-email 1.7.8.36.g69ee2 In-Reply-To: <1331117661-19378-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: =46rom: Junio C Hamano The static function in entry.c takes a cache entry and streams its blob contents to a file in the working tree. Refactor the logic to a new AP= I function stream_blob_to_fd() that takes an object name and an open file descriptor, so that it can be reused by other callers. Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- entry.c | 53 +++++----------------------------------------------= -- streaming.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++= ++++ streaming.h | 2 ++ 3 files changed, 62 insertions(+), 48 deletions(-) diff --git a/entry.c b/entry.c index 852fea1..17a6bcc 100644 --- a/entry.c +++ b/entry.c @@ -120,58 +120,15 @@ static int streaming_write_entry(struct cache_ent= ry *ce, char *path, const struct checkout *state, int to_tempfile, int *fstat_done, struct stat *statbuf) { - struct git_istream *st; - enum object_type type; - unsigned long sz; int result =3D -1; - ssize_t kept =3D 0; - int fd =3D -1; - - st =3D open_istream(ce->sha1, &type, &sz, filter); - if (!st) - return -1; - if (type !=3D OBJ_BLOB) - goto close_and_exit; + int fd; =20 fd =3D open_output_fd(path, ce, to_tempfile); - if (fd < 0) - goto close_and_exit; - - for (;;) { - char buf[1024 * 16]; - ssize_t wrote, holeto; - ssize_t readlen =3D read_istream(st, buf, sizeof(buf)); - - if (!readlen) - break; - if (sizeof(buf) =3D=3D readlen) { - for (holeto =3D 0; holeto < readlen; holeto++) - if (buf[holeto]) - break; - if (readlen =3D=3D holeto) { - kept +=3D holeto; - continue; - } - } - - if (kept && lseek(fd, kept, SEEK_CUR) =3D=3D (off_t) -1) - goto close_and_exit; - else - kept =3D 0; - wrote =3D write_in_full(fd, buf, readlen); - - if (wrote !=3D readlen) - goto close_and_exit; - } - if (kept && (lseek(fd, kept - 1, SEEK_CUR) =3D=3D (off_t) -1 || - write(fd, "", 1) !=3D 1)) - goto close_and_exit; - *fstat_done =3D fstat_output(fd, state, statbuf); - -close_and_exit: - close_istream(st); - if (0 <=3D fd) + if (0 <=3D fd) { + result =3D stream_blob_to_fd(fd, ce->sha1, filter, 1); + *fstat_done =3D fstat_output(fd, state, statbuf); result =3D close(fd); + } if (result && 0 <=3D fd) unlink(path); return result; diff --git a/streaming.c b/streaming.c index 71072e1..7e7ee2b 100644 --- a/streaming.c +++ b/streaming.c @@ -489,3 +489,58 @@ static open_method_decl(incore) =20 return st->u.incore.buf ? 0 : -1; } + + +/**************************************************************** + * Users of streaming interface + ****************************************************************/ + +int stream_blob_to_fd(int fd, unsigned const char *sha1, struct stream= _filter *filter, + int can_seek) +{ + struct git_istream *st; + enum object_type type; + unsigned long sz; + ssize_t kept =3D 0; + int result =3D -1; + + st =3D open_istream(sha1, &type, &sz, filter); + if (!st) + return result; + if (type !=3D OBJ_BLOB) + goto close_and_exit; + for (;;) { + char buf[1024 * 16]; + ssize_t wrote, holeto; + ssize_t readlen =3D read_istream(st, buf, sizeof(buf)); + + if (!readlen) + break; + if (can_seek && sizeof(buf) =3D=3D readlen) { + for (holeto =3D 0; holeto < readlen; holeto++) + if (buf[holeto]) + break; + if (readlen =3D=3D holeto) { + kept +=3D holeto; + continue; + } + } + + if (kept && lseek(fd, kept, SEEK_CUR) =3D=3D (off_t) -1) + goto close_and_exit; + else + kept =3D 0; + wrote =3D write_in_full(fd, buf, readlen); + + if (wrote !=3D readlen) + goto close_and_exit; + } + if (kept && (lseek(fd, kept - 1, SEEK_CUR) =3D=3D (off_t) -1 || + write(fd, "", 1) !=3D 1)) + goto close_and_exit; + result =3D 0; + + close_and_exit: + close_istream(st); + return result; +} diff --git a/streaming.h b/streaming.h index 589e857..3e82770 100644 --- a/streaming.h +++ b/streaming.h @@ -12,4 +12,6 @@ extern struct git_istream *open_istream(const unsigne= d char *, enum object_type extern int close_istream(struct git_istream *); extern ssize_t read_istream(struct git_istream *, char *, size_t); =20 +extern int stream_blob_to_fd(int fd, const unsigned char *, struct str= eam_filter *, int can_seek); + #endif /* STREAMING_H */ --=20 1.7.8.36.g69ee2