From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13702 invoked by alias); 8 Nov 2016 15:49:03 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 39874 Received: (qmail 16633 invoked from network); 8 Nov 2016 15:49:03 -0000 X-Qmail-Scanner-Diagnostics: from out4-smtp.messagingengine.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(66.111.4.28):SA:0(0.0/5.0):. Processed in 0.13632 secs); 08 Nov 2016 15:49:03 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: d.s@daniel.shahaf.name X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: none (ns1.primenet.com.au: domain at daniel.shahaf.name does not designate permitted sender hosts) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=bVQwJNxPefr+DxH ObsEtgsOO8Rc=; b=QInFw7Admgt98yc9a7y9izvr/Hjpa0ug7RS/c05y2ATmGYq /QKO+tUEtYhdXWFA+QxqAWxfL3y7TRz0+hra7jsRABVNPbTcfVxAZUQF9i/1ft2X 6Cl3GjY5WNHfrmHlczcNxuoi3s3DVLC1bQfPTEkudLpdV94GPND7ZrI/Oqyg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=smtpout; bh=bVQwJNxPefr+Dx HObsEtgsOO8Rc=; b=MLVhB3t+YAcEdhz5EWn/jTQXh6syY0/q4+GiYfsA02RvXO 2ytNpLMU5cqbc0GvIncMlpe6RkeiJws10LGQdD5oM1jyY1zHk6xnH4Fa2cIuXCvB NYAmZuK+Q3lqLGLRjcW5Fivs7PMAsv8WVH5Vmb7jd2TJ8pXxjNJYmjwF3RuvE= X-ME-Sender: X-Sasl-enc: 96/Y7Dw+BJrOUsiVZDadMvHRHGJJAlCQcxwJK/ZXiFgy 1478620139 Date: Tue, 8 Nov 2016 15:46:40 +0000 From: Daniel Shahaf To: Sebastian Gniazdowski Cc: zsh-workers@zsh.org Subject: Re: [PATCH] Mild setarrvalue() optimization Message-ID: <20161108154640.GB21983@fujitsu.shahaf.local2> References: <1478600824.1774565.780940761.5A517B9E@webmail.messagingengine.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1478600824.1774565.780940761.5A517B9E@webmail.messagingengine.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sebastian Gniazdowski wrote on Tue, Nov 08, 2016 at 02:27:04 -0800: > there's freearray() at end of setarrvalue(). It can be replaced with > free() if ownership of all strings will be given away: I see this has been applied. s/calloc/malloc/ should save a few more milliseconds. Also reduce code duplication. Cheers, Daniel diff --git a/Src/params.c b/Src/params.c index 19a8c29..9f449c5 100644 --- a/Src/params.c +++ b/Src/params.c @@ -2651,8 +2651,8 @@ setarrvalue(Value v, char **val) if (v->end <= pre_assignment_length) post_assignment_length += pre_assignment_length - v->end + 1; - p = new = (char **) zshcalloc(sizeof(char *) - * (post_assignment_length + 1)); + p = new = (char **) zalloc(sizeof(char *) + * (post_assignment_length + 1)); for (i = 0; i < v->start; i++) *p++ = i < pre_assignment_length ? ztrdup(*q++) : ztrdup(""); diff --git a/Src/mem.c b/Src/mem.c index 8c7eb80..0ac4009 100644 --- a/Src/mem.c +++ b/Src/mem.c @@ -976,18 +976,8 @@ zalloc(size_t size) mod_export void * zshcalloc(size_t size) { - void *ptr; - - if (!size) - size = 1; - queue_signals(); - if (!(ptr = (void *) malloc(size))) { - zerr("fatal error: out of memory"); - exit(1); - } - unqueue_signals(); + void *ptr = zalloc(size); memset(ptr, 0, size); - return ptr; }