From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 27691 invoked from network); 28 Apr 2022 18:52:16 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 28 Apr 2022 18:52:16 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1651171936; b=Bo1XnSC5c2YpvmsBxw409Ks+rnbm5FjDN9SIzL3sCwbrhB9yPGiTyGrytdjS+ErrTIXTtbcej4 TOav/6t3278UnfP2zKXdeDW/Nhjuoq5O6sg5oAXvDLbwQXkreOkj4oTNSnxqLIjh6lz87E2Mqm pATcuxZtKsM0DDtdv+PpC7W6fRmESSB2W7lOl23KerGKN4iTQikCs6eAUYqwFDXFbaHjpO+F6P 7wWguQFVV6/JeVrc0zRz3/DkXwNw9BQ2Sg9ruidoJj9fSnxypfa6fxfWgMdZiE5Ygf/riQm6mp TtDqe4L8jwejv2/BJfaogv8svi5tmNmfW30cWijpqSDWcA==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (snd00013-bg.im.kddi.ne.jp) smtp.remote-ip=27.86.113.13; dmarc=none header.from=kba.biglobe.ne.jp; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1651171936; bh=2KPa5Q+keMyooX6BTTyk5lN5R9zO8r2GD1cpl7Squ9M=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Message-ID:In-Reply-To:To:References:Date:Subject: MIME-Version:Content-Transfer-Encoding:Content-Type:From:DKIM-Signature; b=e/K8oXyzBNG1/dHX24n+5KnwKg28oMvMdNFgFhyTANVaKZknNfNcHx6wR0RkUwdfiw0jZe6L7X OXbNafPxnFePA1uULg2Z/SUFrSdpztS1/VSZ44+Pg7HklRlsJskg53DMegot8IyVj37EKuXN3s X1c3EuFDPXNcDW7ipiooMG2ZF+Gr4RJgPDrUEht547SyCr0yLHmZEWefbeUT2j7AJ3NF6+JPdd qWRekTTl77YrZ7EbX8N+Lf2wmJWEYOPuFk8WIIJGdzxUXP5Zgzw1wgjBqyxl45FQl0Z5mPAz06 7TaJmLivrBPyqBjOXSWIbmeNc96i2XMa8TJpBJAiUfKHMg==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Message-Id:In-Reply-To:To:References: Date:Subject:Mime-Version:Content-Transfer-Encoding:Content-Type:From: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=97jFmgEgEvkfvw8Efruepq0qPVmMQW4mMOQKRVXcxqU=; b=T0/drqD9q5knaKuk9JnJz1iCWM vQMhm8I98KOEJsd914UVBIC1CfKCknh0T+wnqRN/IxApKLv6c/EGY55kFjcsunUinMa+KLrRn72zI uhkc/JLmnncasw/dtGwwvXfC5iK9zqEzS4VuukhrLPj/RVS1eCSJYTU9U4VwsRFLs6HZeYy/p27SO Cdx8BZxWZ8ao3/ffmHsheVfkqnMsLhHviK7g8QhIlNjQ1aioIgUpFlt+wCS5cDQ7Gwq6sLZ1qfacI sd6UwQ5EVNTKBOFQVd3p69bOzks7d1xhlfb4kcfKwLja6JsXyocpfHtbuYQi/sMMidoYfF2jqMQJs pSNJG45g==; Received: from authenticated user by zero.zsh.org with local id 1nk9FM-000NZY-KK; Thu, 28 Apr 2022 18:52:12 +0000 Authentication-Results: zsh.org; iprev=pass (snd00013-bg.im.kddi.ne.jp) smtp.remote-ip=27.86.113.13; dmarc=none header.from=kba.biglobe.ne.jp; arc=none Received: from snd00013-bg.im.kddi.ne.jp ([27.86.113.13]:38433 helo=dfmta0014.biglobe.ne.jp) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1nk9Em-000NG4-DT; Thu, 28 Apr 2022 18:51:38 +0000 Received: from mail.biglobe.ne.jp by omta0014.biglobe.ne.jp with ESMTP id <20220428185130021.ULFA.61979.mail.biglobe.ne.jp@biglobe.ne.jp> for ; Fri, 29 Apr 2022 03:51:30 +0900 From: "Jun. T" Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Mac OS X Mail 15.0 \(3693.60.0.1.1\)) Subject: Re: ZSH performance regression in 5.8.1.2-test Date: Fri, 29 Apr 2022 03:51:28 +0900 References: <20220425192036.p6awbyro2a2lp7bq@chazelas.org> To: zsh-workers@zsh.org In-Reply-To: Message-Id: X-Mailer: Apple Mail (2.3693.60.0.1.1) X-Biglobe-Sender: takimoto-j@kba.biglobe.ne.jp X-Seq: 50133 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: > 2022/04/28 4:54, Jordan Patterson wrote: > > I needed to add a mode argument to the open in your lseek > configure check. Added S_IRUSR to open(), and include for it. I reproduce the whole patch here for convenience. Tested on Fedora-35, macOS, FreeBSD and Cygwin. diff --git a/Src/input.c b/Src/input.c index c59232681..9898a7177 100644 --- a/Src/input.c +++ b/Src/input.c @@ -217,12 +217,34 @@ shinbufrestore(void) static int shingetchar(void) { - int nread; + int nread, rsize = isset(SHINSTDIN) ? 1 : SHINBUFSIZE; if (shinbufptr < shinbufendptr) return STOUC(*shinbufptr++); shinbufreset(); +#ifdef USE_LSEEK + if (rsize == 1 && lseek(SHIN, 0, SEEK_CUR) != (off_t)-1) + rsize = SHINBUFSIZE; + if (rsize > 1) { + do { + errno = 0; + nread = read(SHIN, shinbuffer, rsize); + } while (nread < 0 && errno == EINTR); + if (nread <= 0) + return -1; + if (isset(SHINSTDIN) && + (shinbufendptr = memchr(shinbuffer, '\n', nread))) { + shinbufendptr++; + rsize = (shinbufendptr - shinbuffer); + if (nread > rsize && + lseek(SHIN, -(nread - rsize), SEEK_CUR) < 0) + zerr("lseek(%d, %d): %e", SHIN, -(nread - rsize), errno); + } else + shinbufendptr = shinbuffer + nread; + return STOUC(*shinbufptr++); + } +#endif for (;;) { errno = 0; nread = read(SHIN, shinbufendptr, 1); diff --git a/configure.ac b/configure.ac index 8bba78c56..c72148d06 100644 --- a/configure.ac +++ b/configure.ac @@ -2209,6 +2209,65 @@ if test x$zsh_cv_sys_fifo = xyes; then AC_DEFINE(HAVE_FIFOS) fi +dnl ----------- +dnl check that lseek() correctly reports seekability. +dnl ----------- +AC_CACHE_CHECK(if lseek() correctly reports seekability, +zsh_cv_sys_lseek, +[AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include +#include +#include +#include +#include +#include +int main() { + int pipefd[2], fd; + off_t ret; + char* tmpfile = "seekfiletest.tmp"; + if ((fd = open(tmpfile, O_CREAT, S_IRUSR)) < 0) { + fprintf(stderr, "creating file failed\n"); + return 1; + } + ret = lseek(fd, 0, SEEK_CUR); + close(fd); + unlink(tmpfile); + if (ret == (off_t)-1) { + fprintf(stderr, "lseek on regular file failed\n"); + return 1; + } + if (pipe(pipefd) < 0) { + fprintf(stderr, "creating pipe failed\n"); + return 1; + } + write(pipefd[1], "abcdefgh", 8); + ret = lseek(pipefd[0], 0, SEEK_CUR); + close(pipefd[0]); + close(pipefd[1]); + if (ret != (off_t)-1) { + fprintf(stderr, "lseek on pipe succeeded\n"); + return 1; + } + if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { + fprintf(stderr, "creating UNIX domain socket failed\n"); + return 1; + } + ret = lseek(fd, 0, SEEK_CUR); + close(fd); + if (ret != (off_t)-1) { + fprintf(stderr, "lseek on UNIX domain socket succeeded\n"); + return 1; + } + return 0; +} +]])],[zsh_cv_sys_lseek=yes],[zsh_cv_sys_lseek=no],[zsh_cv_sys_lseek=yes]) +]) +AH_TEMPLATE([USE_LSEEK], +[Define to 1 if lseek() can be used for SHIN.]) +if test x$zsh_cv_sys_lseek = xyes; then + AC_DEFINE(USE_LSEEK) +fi + dnl ----------- dnl test for whether link() works dnl for instance, BeOS R4.51 doesn't support hard links yet