From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29907 invoked by alias); 18 Nov 2016 12:20:25 -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: 39975 Received: (qmail 1396 invoked from network); 18 Nov 2016 12:20:25 -0000 X-Qmail-Scanner-Diagnostics: from new2-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.224):SA:0(-0.7/5.0):. Processed in 1.106356 secs); 18 Nov 2016 12:20:25 -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.7 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,SPF_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: psprint@fastmail.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at spf.messagingengine.com designates 66.111.4.224 as permitted sender) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=mesmtp; bh=mt3HTQM8f2e4/hxj07007VCdDO o=; b=K2Uzz8JAioQ/mf8hMg4l3oNx1qNyf5ua5vb8FFKybeYNqePzPTUT2AN7ib ota1dT16MJCWzSXI8xRnKLh82Bl62g65qs83hBM6+Xhnl02/o+e0IM1OxmWvV80W t+VpU+RvXuN3cKhzRMGg5xpbGXI9kItgH4EYnsZHwMVERirWs= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=smtpout; bh=mt 3HTQM8f2e4/hxj07007VCdDOo=; b=fxU6pcRi4DSQElG/wRoBEvzLitNQv+cJT6 DirrG6Fh3GFVlj7f93f15XspvxHJ9jc0JeMg31qqJjR1ID0XBi4O1RLp9ASsRvgN 8ZaMqh5pkbvv93ydBMI1qjGgZ1cqPTcYCUINII+6cPWcm/8+SCGnrECk1USX+pJu OW9ix1NHU= X-ME-Sender: Message-Id: <1479471620.1371132.792049209.295BE093@webmail.messagingengine.com> From: Sebastian Gniazdowski To: zsh-workers@zsh.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_147947162013711320" X-Mailer: MessagingEngine.com Webmail Interface - ajax-461bce03 Subject: Re: Possible huge setarrvalue optimization In-Reply-To: <1479461540.1340250.791913609.27FAD722@webmail.messagingengine.com> References: <1479449829.1305485.791811385.14DDFE28@webmail.messagingengine.com> <1479461540.1340250.791913609.27FAD722@webmail.messagingengine.com> Date: Fri, 18 Nov 2016 04:20:20 -0800 --_----------=_147947162013711320 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" OK, the patch should now be complete. There is condition whether to use all-duplicate code path: if (pre_assignment_length != post_assignment_length || v->pm->node.flags & (PM_SPECIAL|PM_UNIQUE)) { This covers special arrays and uniq arrays, that should be always calling setfn() to trigger side-effects. Other arrays use this code: /* v->start is 0-based */ p = old + v->start; for (r = val; *r;) { /* Free previous string */ zsfree(*p); /* Give away ownership of the string */ *p++ = *r++; } And it should be OK, zsfree() for non-special array should be always successful. -- Sebastian Gniazdowski psprint@fastmail.com --_----------=_147947162013711320 Content-Disposition: attachment; filename="array_big_opt2.diff" Content-Id: <1479471522.1370965.72178ef91862cbe56aa0412fa2534c75225e210f.67613F12@content.messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/plain; name="array_big_opt2.diff" ZGlmZiAtLWdpdCBhL1NyYy9wYXJhbXMuYyBiL1NyYy9wYXJhbXMuYwppbmRl eCBlZjcyY2JhLi5lYWM4Mzc1IDEwMDY0NAotLS0gYS9TcmMvcGFyYW1zLmMK KysrIGIvU3JjL3BhcmFtcy5jCkBAIC0yNjU0LDI0ICsyNjU0LDM2IEBAIHNl dGFycnZhbHVlKFZhbHVlIHYsIGNoYXIgKip2YWwpCiAJICAgIHYtPmVuZCA9 IHYtPnN0YXJ0OwogCiAJcG9zdF9hc3NpZ25tZW50X2xlbmd0aCA9IHYtPnN0 YXJ0ICsgYXJybGVuKHZhbCk7Ci0JaWYgKHYtPmVuZCA8PSBwcmVfYXNzaWdu bWVudF9sZW5ndGgpCi0JICAgIHBvc3RfYXNzaWdubWVudF9sZW5ndGggKz0g cHJlX2Fzc2lnbm1lbnRfbGVuZ3RoIC0gdi0+ZW5kICsgMTsKLQotCXAgPSBu ZXcgPSAoY2hhciAqKikgenNoY2FsbG9jKHNpemVvZihjaGFyICopCi0JCSAg ICAgICAgICAgICAgICAgICAgICAqIChwb3N0X2Fzc2lnbm1lbnRfbGVuZ3Ro ICsgMSkpOwotCi0JZm9yIChpID0gMDsgaSA8IHYtPnN0YXJ0OyBpKyspCi0J ICAgICpwKysgPSBpIDwgcHJlX2Fzc2lnbm1lbnRfbGVuZ3RoID8genRyZHVw KCpxKyspIDogenRyZHVwKCIiKTsKLQlmb3IgKHIgPSB2YWw7ICpyOykgewot ICAgICAgICAgICAgLyogR2l2ZSBhd2F5IG93bmVyc2hpcCBvZiB0aGUgc3Ry aW5nICovCi0JICAgICpwKysgPSAqcisrOwotCX0KLQlpZiAodi0+ZW5kIDwg cHJlX2Fzc2lnbm1lbnRfbGVuZ3RoKQotCSAgICBmb3IgKHEgPSBvbGQgKyB2 LT5lbmQ7ICpxOykKLQkJKnArKyA9IHp0cmR1cCgqcSsrKTsKLQkqcCA9IE5V TEw7CiAKLQl2LT5wbS0+Z3N1LmEtPnNldGZuKHYtPnBtLCBuZXcpOworCWlm ICh2LT5lbmQgPD0gcHJlX2Fzc2lnbm1lbnRfbGVuZ3RoKQorCSAgICBwb3N0 X2Fzc2lnbm1lbnRfbGVuZ3RoICs9IHByZV9hc3NpZ25tZW50X2xlbmd0aCAt IHYtPmVuZDsKKworICAgICAgICBpZiAocHJlX2Fzc2lnbm1lbnRfbGVuZ3Ro ICE9IHBvc3RfYXNzaWdubWVudF9sZW5ndGggfHwgdi0+cG0tPm5vZGUuZmxh Z3MgJiAoUE1fU1BFQ0lBTHxQTV9VTklRVUUpKSB7CisgICAgICAgICAgICBw ID0gbmV3ID0gKGNoYXIgKiopIHpzaGNhbGxvYyhzaXplb2YoY2hhciAqKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKiAo cG9zdF9hc3NpZ25tZW50X2xlbmd0aCArIDEpKTsKKworICAgICAgICAgICAg Zm9yIChpID0gMDsgaSA8IHYtPnN0YXJ0OyBpKyspCisgICAgICAgICAgICAg ICAgKnArKyA9IGkgPCBwcmVfYXNzaWdubWVudF9sZW5ndGggPyB6dHJkdXAo KnErKykgOiB6dHJkdXAoIiIpOworICAgICAgICAgICAgZm9yIChyID0gdmFs OyAqcjspIHsKKyAgICAgICAgICAgICAgICAvKiBHaXZlIGF3YXkgb3duZXJz aGlwIG9mIHRoZSBzdHJpbmcgKi8KKyAgICAgICAgICAgICAgICAqcCsrID0g KnIrKzsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmICh2LT5lbmQg PCBwcmVfYXNzaWdubWVudF9sZW5ndGgpCisgICAgICAgICAgICAgICAgZm9y IChxID0gb2xkICsgdi0+ZW5kOyAqcTspCisgICAgICAgICAgICAgICAgICAg ICpwKysgPSB6dHJkdXAoKnErKyk7CisgICAgICAgICAgICAqcCA9IE5VTEw7 CisKKyAgICAgICAgICAgIHYtPnBtLT5nc3UuYS0+c2V0Zm4odi0+cG0sIG5l dyk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAvKiB2LT5zdGFy dCBpcyAwLWJhc2VkICovCisgICAgICAgICAgICBwID0gb2xkICsgdi0+c3Rh cnQ7CisgICAgICAgICAgICBmb3IgKHIgPSB2YWw7ICpyOykgeworICAgICAg ICAgICAgICAgIC8qIEZyZWUgcHJldmlvdXMgc3RyaW5nICovCisgICAgICAg ICAgICAgICAgenNmcmVlKCpwKTsKKyAgICAgICAgICAgICAgICAvKiBHaXZl IGF3YXkgb3duZXJzaGlwIG9mIHRoZSBzdHJpbmcgKi8KKyAgICAgICAgICAg ICAgICAqcCsrID0gKnIrKzsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQog CiAgICAgICAgIC8qIE93bmVyc2hpcCBvZiBhbGwgc3RyaW5ncyBoYXMgYmVl bgogICAgICAgICAgKiBnaXZlbiBhd2F5LCBjYW4gcGxhaW5seSBmcmVlICov Cg== --_----------=_147947162013711320--