From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:59681) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9ScC-0003xN-Dw for qemu-devel@nongnu.org; Mon, 11 Apr 2011 21:42:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q9MW0-0005s8-1F for qemu-devel@nongnu.org; Mon, 11 Apr 2011 15:11:12 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:36504) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9MVz-0005rp-F8 for qemu-devel@nongnu.org; Mon, 11 Apr 2011 15:11:11 -0400 From: Herve Poussineau Date: Mon, 11 Apr 2011 19:10:54 +0000 Message-Id: <1302549054-2248-4-git-send-email-hpoussin@reactos.org> In-Reply-To: <1302549054-2248-3-git-send-email-hpoussin@reactos.org> References: <1302549054-2248-1-git-send-email-hpoussin@reactos.org> <1302549054-2248-2-git-send-email-hpoussin@reactos.org> <1302549054-2248-3-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 3/3] slirp: improve TFTP performance List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?utf-8?q?Herv=E9=20Poussineau?= From: Herv=E9 Poussineau When transfering a file, keep it open during the whole transfer, instead of opening/closing it for each block. Signed-off-by: Herv=E9 Poussineau --- slirp/tftp.c | 20 ++++++++++++-------- slirp/tftp.h | 1 + 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/slirp/tftp.c b/slirp/tftp.c index 7e63269..48748f1 100644 --- a/slirp/tftp.c +++ b/slirp/tftp.c @@ -37,6 +37,10 @@ static inline void tftp_session_update(struct tftp_ses= sion *spt) =20 static void tftp_session_terminate(struct tftp_session *spt) { + if (spt->fd >=3D 0) { + close(spt->fd); + spt->fd =3D -1; + } qemu_free(spt->filename); spt->slirp =3D NULL; } @@ -54,7 +58,7 @@ static int tftp_session_allocate(Slirp *slirp, struct t= ftp_t *tp) =20 /* sessions time out after 5 inactive seconds */ if ((int)(curtime - spt->timestamp) > 5000) { - qemu_free(spt->filename); + tftp_session_terminate(spt); goto found; } } @@ -64,6 +68,7 @@ static int tftp_session_allocate(Slirp *slirp, struct t= ftp_t *tp) found: memset(spt, 0, sizeof(*spt)); memcpy(&spt->client_ip, &tp->ip.ip_src, sizeof(spt->client_ip)); + spt->fd =3D -1; spt->client_port =3D tp->udp.uh_sport; spt->slirp =3D slirp; =20 @@ -95,23 +100,22 @@ static int tftp_session_find(Slirp *slirp, struct tf= tp_t *tp) static int tftp_read_data(struct tftp_session *spt, uint32_t block_nr, uint8_t *buf, int len) { - int fd; int bytes_read =3D 0; =20 - fd =3D open(spt->filename, O_RDONLY | O_BINARY); + if (spt->fd < 0) { + spt->fd =3D open(spt->filename, O_RDONLY | O_BINARY); + } =20 - if (fd < 0) { + if (spt->fd < 0) { return -1; } =20 if (len) { - lseek(fd, block_nr * 512, SEEK_SET); + lseek(spt->fd, block_nr * 512, SEEK_SET); =20 - bytes_read =3D read(fd, buf, len); + bytes_read =3D read(spt->fd, buf, len); } =20 - close(fd); - return bytes_read; } =20 diff --git a/slirp/tftp.h b/slirp/tftp.h index 471f22e..51704e4 100644 --- a/slirp/tftp.h +++ b/slirp/tftp.h @@ -33,6 +33,7 @@ struct tftp_t { struct tftp_session { Slirp *slirp; char *filename; + int fd; =20 struct in_addr client_ip; uint16_t client_port; --=20 1.6.0.2.GIT