104163 2012-12-05 13:24:20 -0800 DFG profiler should display more information 2012-12-05 13:59:34 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fpizlo fpizlo barraclough oldest_to_newest 784057 0 fpizlo 2012-12-05 13:24:20 -0800 This is a task to flesh out display-profiler-output. 784061 1 177818 fpizlo 2012-12-05 13:25:36 -0800 Created attachment 177818 the patch 784091 2 fpizlo 2012-12-05 13:59:34 -0800 Landed in http://trac.webkit.org/changeset/136756 177818 2012-12-05 13:25:36 -0800 2012-12-05 13:40:02 -0800 the patch pbp.patch text/plain 16657 fpizlo SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEzNjc1MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDEyLTEyLTA1ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisK KyAgICAgICAgREZHIHByb2ZpbGVyIHNob3VsZCBkaXNwbGF5IG1vcmUgaW5mb3JtYXRpb24KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDE2MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIHRoZSBm b2xsb3dpbmc6CisgICAgICAgIAorICAgICAgICAtIERpc3Rpbmd1aXNoIGJldHdlZW4gc291cmNl IGNvdW50cyBhbmQgYnl0ZWNvZGUgY291bnRzLgorICAgICAgICAKKyAgICAgICAgLSBBZGQgYSAi ZnVsbCIgc3VtbWFyeSB2aWV3IHRoYXQgc2hvd3MgYm90aCBraW5kcyBvZiBjb3VudHMsIHBsdXMg aW5saW5lIGNvdW50cy4KKyAgICAgICAgCisgICAgICAgIC0gQWRkIGEgInNvdXJjZSIgY29tbWFu ZCB0byBzZWUgdGhlIHNvdXJjZS4KKyAgICAgICAgCisgICAgICAgIC0gQWRkIGEgImJ5dGVjb2Rl IiBjb21tYW5kIHRvIHNlZSB0aGUgYnl0ZWNvZGUgYW5kIGNvdW50cy4KKworICAgICAgICAqIFNj cmlwdHMvZGlzcGxheS1wcm9maWxlci1vdXRwdXQ6CisKIDIwMTItMTItMDUgIFlvbmcgTGkgIDx5 b2xpQHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEJ1aWxkIHdpdGggbGlianBlZ3R1 cmJvCkluZGV4OiBUb29scy9TY3JpcHRzL2Rpc3BsYXktcHJvZmlsZXItb3V0cHV0Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL1NjcmlwdHMvZGlzcGxheS1wcm9maWxlci1vdXRwdXQJKHJldmlzaW9uIDEz NjcyMCkKKysrIFRvb2xzL1NjcmlwdHMvZGlzcGxheS1wcm9maWxlci1vdXRwdXQJKHdvcmtpbmcg Y29weSkKQEAgLTI3LDE1ICsyNywxOSBAQCByZXF1aXJlICdydWJ5Z2VtcycKIAogcmVxdWlyZSAn anNvbicKIHJlcXVpcmUgJ3JlYWRsaW5lJworcmVxdWlyZSAnaGlnaGxpbmUnCiAKIGNsYXNzIEJ5 dGVjb2RlCi0gICAgYXR0cl9hY2Nlc3NvciA6Ynl0ZWNvZGVJbmRleCwgOm9wY29kZSwgOmRlc2Ny aXB0aW9uLCA6dG9wQ291bnRzCisgICAgYXR0cl9hY2Nlc3NvciA6Ynl0ZWNvZGVzLCA6Ynl0ZWNv ZGVJbmRleCwgOm9wY29kZSwgOmRlc2NyaXB0aW9uLCA6dG9wQ291bnRzLCA6Ym90dG9tQ291bnRz LCA6bWFjaGluZUlubGluZWVzCiAgICAgCi0gICAgZGVmIGluaXRpYWxpemUoYnl0ZWNvZGVJbmRl eCwgb3Bjb2RlLCBkZXNjcmlwdGlvbikKKyAgICBkZWYgaW5pdGlhbGl6ZShieXRlY29kZXMsIGJ5 dGVjb2RlSW5kZXgsIG9wY29kZSwgZGVzY3JpcHRpb24pCisgICAgICAgIEBieXRlY29kZXMgPSBi eXRlY29kZXMKICAgICAgICAgQGJ5dGVjb2RlSW5kZXggPSBieXRlY29kZUluZGV4CiAgICAgICAg IEBvcGNvZGUgPSBvcGNvZGUKICAgICAgICAgQGRlc2NyaXB0aW9uID0gZGVzY3JpcHRpb24KLSAg ICAgICAgQHRvcENvdW50cyA9IFtdCisgICAgICAgIEB0b3BDb3VudHMgPSBbXSAjICJzb3VyY2Ui IGNvdW50cworICAgICAgICBAYm90dG9tQ291bnRzID0ge30gIyAibWFjaGluZSIgY291bnRzLCBt YXBzIGNvbXBpbGF0aW9ucyB0byBjb3VudHMKKyAgICAgICAgQG1hY2hpbmVJbmxpbmVlcyA9IHt9 ICMgbWFwcyBteSBjb21waWxhdGlvbiB0byBhIHNldCBvZiBpbmxpbmVlcwogICAgIGVuZAogICAg IAogICAgIGRlZiBzaG91bGRIYXZlQ291bnRzPwpAQCAtNDYsNyArNTAsMTcgQEAgY2xhc3MgQnl0 ZWNvZGUKICAgICAgICAgQHRvcENvdW50cyA8PCBjb3VudAogICAgIGVuZAogICAgIAotICAgIGRl ZiB0b3RhbEV4ZWN1dGlvbkNvdW50CisgICAgZGVmIGFkZEJvdHRvbUNvdW50Rm9yQ29tcGlsYXRp b24oY291bnQsIGNvbXBpbGF0aW9uKQorICAgICAgICBAYm90dG9tQ291bnRzW2NvbXBpbGF0aW9u XSA9IFtdIHVubGVzcyBAYm90dG9tQ291bnRzW2NvbXBpbGF0aW9uXQorICAgICAgICBAYm90dG9t Q291bnRzW2NvbXBpbGF0aW9uXSA8PCBjb3VudAorICAgIGVuZAorICAgIAorICAgIGRlZiBhZGRN YWNoaW5lSW5saW5lZShjb21waWxhdGlvbiwgaW5saW5lZSkKKyAgICAgICAgQG1hY2hpbmVJbmxp bmVlc1tjb21waWxhdGlvbl0gPSB7fSB1bmxlc3MgQG1hY2hpbmVJbmxpbmVlc1tjb21waWxhdGlv bl0KKyAgICAgICAgQG1hY2hpbmVJbmxpbmVlc1tjb21waWxhdGlvbl1baW5saW5lZV0gPSB0cnVl CisgICAgZW5kCisgICAgCisgICAgZGVmIHRvdGFsVG9wRXhlY3V0aW9uQ291bnQKICAgICAgICAg c3VtID0gMAogICAgICAgICBAdG9wQ291bnRzLmVhY2ggewogICAgICAgICAgICAgfCB2YWx1ZSB8 CkBAIC01NSw3ICs2OSw3IEBAIGNsYXNzIEJ5dGVjb2RlCiAgICAgICAgIHN1bQogICAgIGVuZAog ICAgIAotICAgIGRlZiBleGVjdXRpb25Db3VudChlbmdpbmUpCisgICAgZGVmIHRvcEV4ZWN1dGlv bkNvdW50KGVuZ2luZSkKICAgICAgICAgc3VtID0gMAogICAgICAgICBAdG9wQ291bnRzLmVhY2gg ewogICAgICAgICAgICAgfCB2YWx1ZSB8CkBAIC02NSwyMSArNzksNTEgQEAgY2xhc3MgQnl0ZWNv ZGUKICAgICAgICAgfQogICAgICAgICBzdW0KICAgICBlbmQKKyAgICAKKyAgICBkZWYgdG90YWxC b3R0b21FeGVjdXRpb25Db3VudAorICAgICAgICBzdW0gPSAwCisgICAgICAgIEBib3R0b21Db3Vu dHMuZWFjaF92YWx1ZSB7CisgICAgICAgICAgICB8IGNvdW50cyB8CisgICAgICAgICAgICBtYXgg PSAwCisgICAgICAgICAgICBjb3VudHMuZWFjaCB7CisgICAgICAgICAgICAgICAgfCB2YWx1ZSB8 CisgICAgICAgICAgICAgICAgbWF4ID0gW21heCwgdmFsdWUuY291bnRdLm1heAorICAgICAgICAg ICAgfQorICAgICAgICAgICAgc3VtICs9IG1heAorICAgICAgICB9CisgICAgICAgIHN1bQorICAg IGVuZAorICAgIAorICAgIGRlZiBib3R0b21FeGVjdXRpb25Db3VudChlbmdpbmUpCisgICAgICAg IHN1bSA9IDAKKyAgICAgICAgQGJvdHRvbUNvdW50cy5lYWNoX3BhaXIgeworICAgICAgICAgICAg fCBjb21waWxhdGlvbiwgY291bnRzIHwKKyAgICAgICAgICAgIGlmIGNvbXBpbGF0aW9uLmVuZ2lu ZSA9PSBlbmdpbmUKKyAgICAgICAgICAgICAgICBtYXggPSAwCisgICAgICAgICAgICAgICAgY291 bnRzLmVhY2ggeworICAgICAgICAgICAgICAgICAgICB8IHZhbHVlIHwKKyAgICAgICAgICAgICAg ICAgICAgbWF4ID0gW21heCwgdmFsdWUuY291bnRdLm1heAorICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICAgICBzdW0gKz0gbWF4CisgICAgICAgICAgICBlbmQKKyAgICAgICAgfQorICAg ICAgICBzdW0KKyAgICBlbmQKIGVuZAogCiBjbGFzcyBCeXRlY29kZXMKLSAgICBhdHRyX2FjY2Vz c29yIDpoYXNoLCA6c291cmNlCi0gICAgaW5jbHVkZSBFbnVtZXJhYmxlCisgICAgYXR0cl9hY2Nl c3NvciA6Y29kZUhhc2gsIDpzb3VyY2UsIDptYWNoaW5lSW5saW5lU2l0ZXMKICAgICAKICAgICBk ZWYgaW5pdGlhbGl6ZShqc29uKQotICAgICAgICBAaGFzaCA9IGpzb25bImhhc2giXS50b19zCisg ICAgICAgIEBjb2RlSGFzaCA9IGpzb25bImhhc2giXS50b19zCiAgICAgICAgIEBzb3VyY2UgPSBq c29uWyJzb3VyY2VDb2RlIl0udG9fcwogICAgICAgICBAYnl0ZWNvZGUgPSB7fQogICAgICAgICBq c29uWyJieXRlY29kZSJdLmVhY2ggewogICAgICAgICAgICAgfCBzdWJKc29uIHwKICAgICAgICAg ICAgIGluZGV4ID0gc3ViSnNvblsiYnl0ZWNvZGVJbmRleCJdLnRvX2kKLSAgICAgICAgICAgIEBi eXRlY29kZVtpbmRleF0gPSBCeXRlY29kZS5uZXcoaW5kZXgsIHN1Ykpzb25bIm9wY29kZSJdLnRv X3MsIHN1Ykpzb25bImRlc2NyaXB0aW9uIl0udG9fcykKKyAgICAgICAgICAgIEBieXRlY29kZVtp bmRleF0gPSBCeXRlY29kZS5uZXcoc2VsZiwgaW5kZXgsIHN1Ykpzb25bIm9wY29kZSJdLnRvX3Ms IHN1Ykpzb25bImRlc2NyaXB0aW9uIl0udG9fcykKICAgICAgICAgfQorICAgICAgICBAbWFjaGlu ZUlubGluZVNpdGVzID0ge30gIyBtYXBzIGNvbXBpbGF0aW9uIHRvIGEgc2V0IG9mIG9yaWdpbnMK ICAgICBlbmQKICAgICAKICAgICBkZWYgZWFjaApAQCAtOTMsMjAgKzEzNyw2MSBAQCBjbGFzcyBC eXRlY29kZXMKICAgICAgICAgQGJ5dGVjb2RlW2J5dGVjb2RlSW5kZXhdCiAgICAgZW5kCiAgICAg Ci0gICAgZGVmIHRvdGFsTWF4RXhlY3V0aW9uQ291bnQKKyAgICBkZWYgYWRkTWFjaGluZUlubGlu ZVNpdGUoY29tcGlsYXRpb24sIG9yaWdpbikKKyAgICAgICAgQG1hY2hpbmVJbmxpbmVTaXRlc1tj b21waWxhdGlvbl0gPSB7fSB1bmxlc3MgQG1hY2hpbmVJbmxpbmVTaXRlc1tjb21waWxhdGlvbl0K KyAgICAgICAgQG1hY2hpbmVJbmxpbmVTaXRlc1tjb21waWxhdGlvbl1bb3JpZ2luXSA9IHRydWUK KyAgICBlbmQKKyAgICAKKyAgICBkZWYgdG90YWxNYWNoaW5lSW5saW5lU2l0ZXMKKyAgICAgICAg c3VtID0gMAorICAgICAgICBAbWFjaGluZUlubGluZVNpdGVzLmVhY2hfdmFsdWUgeworICAgICAg ICAgICAgfCBzZXQgfAorICAgICAgICAgICAgc3VtICs9IHNldC5zaXplCisgICAgICAgIH0KKyAg ICAgICAgc3VtCisgICAgZW5kCisgICAgCisgICAgZGVmIHNvdXJjZU1hY2hpbmVJbmxpbmVTaXRl cworICAgICAgICBzZXQgPSB7fQorICAgICAgICBAbWFjaGluZUlubGluZVNpdGVzLmVhY2hfdmFs dWUgeworICAgICAgICAgICAgfCBteVNldCB8CisgICAgICAgICAgICBzZXQubWVyZ2UhKG15U2V0 KQorICAgICAgICB9CisgICAgICAgIHNldC5zaXplCisgICAgZW5kCisgICAgCisgICAgZGVmIHRv dGFsTWF4VG9wRXhlY3V0aW9uQ291bnQKKyAgICAgICAgbWF4ID0gMAorICAgICAgICBAYnl0ZWNv ZGUuZWFjaF92YWx1ZSB7CisgICAgICAgICAgICB8IGJ5dGVjb2RlIHwKKyAgICAgICAgICAgIG1h eCA9IFttYXgsIGJ5dGVjb2RlLnRvdGFsVG9wRXhlY3V0aW9uQ291bnRdLm1heAorICAgICAgICB9 CisgICAgICAgIG1heAorICAgIGVuZAorICAgIAorICAgIGRlZiBtYXhUb3BFeGVjdXRpb25Db3Vu dChlbmdpbmUpCisgICAgICAgIG1heCA9IDAKKyAgICAgICAgQGJ5dGVjb2RlLmVhY2hfdmFsdWUg eworICAgICAgICAgICAgfCBieXRlY29kZSB8CisgICAgICAgICAgICBtYXggPSBbbWF4LCBieXRl Y29kZS50b3BFeGVjdXRpb25Db3VudChlbmdpbmUpXS5tYXgKKyAgICAgICAgfQorICAgICAgICBt YXgKKyAgICBlbmQKKyAgICAKKyAgICBkZWYgdG90YWxNYXhCb3R0b21FeGVjdXRpb25Db3VudAog ICAgICAgICBtYXggPSAwCiAgICAgICAgIEBieXRlY29kZS5lYWNoX3ZhbHVlIHsKICAgICAgICAg ICAgIHwgYnl0ZWNvZGUgfAotICAgICAgICAgICAgbWF4ID0gW21heCwgYnl0ZWNvZGUudG90YWxF eGVjdXRpb25Db3VudF0ubWF4CisgICAgICAgICAgICBtYXggPSBbbWF4LCBieXRlY29kZS50b3Rh bEJvdHRvbUV4ZWN1dGlvbkNvdW50XS5tYXgKICAgICAgICAgfQogICAgICAgICBtYXgKICAgICBl bmQKICAgICAKLSAgICBkZWYgbWF4RXhlY3V0aW9uQ291bnQoZW5naW5lKQorICAgIGRlZiBtYXhC b3R0b21FeGVjdXRpb25Db3VudChlbmdpbmUpCiAgICAgICAgIG1heCA9IDAKICAgICAgICAgQGJ5 dGVjb2RlLmVhY2hfdmFsdWUgewogICAgICAgICAgICAgfCBieXRlY29kZSB8Ci0gICAgICAgICAg ICBtYXggPSBbbWF4LCBieXRlY29kZS5leGVjdXRpb25Db3VudChlbmdpbmUpXS5tYXgKKyAgICAg ICAgICAgIG1heCA9IFttYXgsIGJ5dGVjb2RlLmJvdHRvbUV4ZWN1dGlvbkNvdW50KGVuZ2luZSld Lm1heAogICAgICAgICB9CiAgICAgICAgIG1heAogICAgIGVuZApAQCAtMTQ4LDYgKzIzMywxNSBA QCBjbGFzcyBDb21waWxhdGlvbgogICAgICAgICAgICAgfCBzdWJKc29uIHwKICAgICAgICAgICAg IENvbXBpbGVkQnl0ZWNvZGUubmV3KHN1Ykpzb24pCiAgICAgICAgIH0KKyAgICAgICAgQGRlc2Ny aXB0aW9ucy5lYWNoIHsKKyAgICAgICAgICAgIHwgZGVzY3JpcHRpb24gfAorICAgICAgICAgICAg bmV4dCBpZiBkZXNjcmlwdGlvbi5vcmlnaW4uZW1wdHk/CisgICAgICAgICAgICBkZXNjcmlwdGlv bi5vcmlnaW5bMS4uLTFdLmVhY2hfd2l0aF9pbmRleCB7CisgICAgICAgICAgICAgICAgfCBpbmxp bmVlLCBpbmRleCB8CisgICAgICAgICAgICAgICAgZGVzY3JpcHRpb24ub3JpZ2luWzBdLmFkZE1h Y2hpbmVJbmxpbmVlKHNlbGYsIGlubGluZWUuYnl0ZWNvZGVzKQorICAgICAgICAgICAgICAgIGlu bGluZWUuYnl0ZWNvZGVzLmFkZE1hY2hpbmVJbmxpbmVTaXRlKHNlbGYsIGRlc2NyaXB0aW9uLm9y aWdpblswLi4uaW5kZXhdKQorICAgICAgICAgICAgfQorICAgICAgICB9CiAgICAgICAgIEBjb3Vu dGVycyA9IHt9CiAgICAgICAgIGpzb25bImNvdW50ZXJzIl0uZWFjaCB7CiAgICAgICAgICAgICB8 IHN1Ykpzb24gfApAQCAtMTU1LDggKzI0OSwxMyBAQCBjbGFzcyBDb21waWxhdGlvbgogICAgICAg ICAgICAgY291bnRlciA9IEV4ZWN1dGlvbkNvdW50ZXIubmV3KG9yaWdpbiwgQGVuZ2luZSwgc3Vi SnNvblsiZXhlY3V0aW9uQ291bnQiXS50b19pKQogICAgICAgICAgICAgQGNvdW50ZXJzW29yaWdp bl0gPSBjb3VudGVyCiAgICAgICAgICAgICBvcmlnaW5bLTFdLmFkZFRvcENvdW50KGNvdW50ZXIp CisgICAgICAgICAgICBvcmlnaW5bMF0uYWRkQm90dG9tQ291bnRGb3JDb21waWxhdGlvbihjb3Vu dGVyLCBzZWxmKQogICAgICAgICB9CiAgICAgZW5kCisgICAgCisgICAgZGVmIGNvdW50ZXIob3Jp Z2luKQorICAgICAgICBAY291bnRlcnNbb3JpZ2luXQorICAgIGVuZAogZW5kCiAKICRqc29uID0g SlNPTjo6cGFyc2UoSU86OnJlYWQoQVJHVlswXSkpCkBAIC0yMDcsMTMgKzMwNiw3NSBAQCBkZWYg Z2V0SGFzaChoYXNoKQogICAgIGVuZAogZW5kCiAKLWRlZiBzb3VyY2VPbk9uZUxpbmUoc291cmNl KQotICAgIHNvdXJjZSA9IHNvdXJjZS5nc3ViKC9ccysvLCAnICcpCi0gICAgaWYgc291cmNlLnNp emUgPiA4MAotICAgICAgICBzb3VyY2VbMC4uNzddICsgIi4uLiIKK2RlZiBzb3VyY2VPbk9uZUxp bmUoc291cmNlLCBsaW1pdCkKKyAgICBzb3VyY2UuZ3N1YigvXHMrLywgJyAnKVswLi4ubGltaXRd CitlbmQKKworZGVmIHNjcmVlbldpZHRoCisgICAgSGlnaExpbmU6OlN5c3RlbUV4dGVuc2lvbnMu dGVybWluYWxfc2l6ZVswXQorZW5kCisKK2RlZiBzdW1tYXJ5KG1vZGUpCisgICAgcmVtYWluaW5n ID0gc2NyZWVuV2lkdGgKKyAgICAKKyAgICBoYXNoQ29scyA9IDExCisgICAgcmVtYWluaW5nIC09 IGhhc2hDb2xzICsgMQorICAgIAorICAgIGNvdW50Q29scyA9IDEwICogJGVuZ2luZXMuc2l6ZQor ICAgIHJlbWFpbmluZyAtPSBjb3VudENvbHMgKyAxCisgICAgCisgICAgaWYgbW9kZSA9PSA6ZnVs bAorICAgICAgICBtYWNoaW5lQ291bnRDb2xzID0gMTAgKiAkZW5naW5lcy5zaXplCisgICAgICAg IHJlbWFpbmluZyAtPSBtYWNoaW5lQ291bnRDb2xzICsgMQorICAgICAgICAKKyAgICAgICAgaW5s aW5lc0NvbHMgPSA5CisgICAgICAgIHJlbWFpbmluZyAtPSBpbmxpbmVzQ29scyArIDEKKyAgICBl bmQKKyAgICAKKyAgICBpZiByZW1haW5pbmcgPiAwCisgICAgICAgIHNvdXJjZUNvbHMgPSByZW1h aW5pbmcKICAgICBlbHNlCi0gICAgICAgIHNvdXJjZQorICAgICAgICBzb3VyY2VDb2xzID0gbmls CiAgICAgZW5kCisgICAgCisgICAgcHJpbnQoY2VudGVyKCJDb2RlQmxvY2siLCBoYXNoQ29scykg KyAiICIgKyBjZW50ZXIoIlNvdXJjZSBDb3VudHMiLCBjb3VudENvbHMpKQorICAgIGlmIG1vZGUg PT0gOmZ1bGwKKyAgICAgICAgcHJpbnQoIiAiICsgY2VudGVyKCJNYWNoaW5lIENvdW50cyIsIG1h Y2hpbmVDb3VudENvbHMpKQorICAgICAgICBwcmludCgiICIgKyBjZW50ZXIoIklubGluZXMiLCBp bmxpbmVzQ29scykpCisgICAgZW5kCisgICAgaWYgc291cmNlQ29scworICAgICAgICBwcmludCgi ICIgKyBjZW50ZXIoIlNvdXJjZSIsIHNvdXJjZUNvbHMpKQorICAgIGVuZAorICAgIHB1dHMKKyAg ICAKKyAgICBwcmludChjZW50ZXIoIiIsIGhhc2hDb2xzKSArICIgIiArIGNlbnRlcigiQmFzZS9E RkciLCBjb3VudENvbHMpKQorICAgIGlmIG1vZGUgPT0gOmZ1bGwKKyAgICAgICAgcHJpbnQoIiAi ICsgY2VudGVyKCJCYXNlL0RGRyIsIG1hY2hpbmVDb3VudENvbHMpKQorICAgICAgICBwcmludCgi ICIgKyBjZW50ZXIoIlNyYy9Ub3RhbCIsIGlubGluZXNDb2xzKSkKKyAgICBlbmQKKyAgICBwdXRz CisgICAgJGJ5dGVjb2Rlcy5zb3J0IHsKKyAgICAgICAgfCBhLCBiIHwKKyAgICAgICAgYi50b3Rh bE1heFRvcEV4ZWN1dGlvbkNvdW50IDw9PiBhLnRvdGFsTWF4VG9wRXhlY3V0aW9uQ291bnQKKyAg ICB9LmVhY2ggeworICAgICAgICB8IGJ5dGVjb2RlIHwKKyAgICAgICAgcHJpbnQoY2VudGVyKCIj IiArIGJ5dGVjb2RlLmNvZGVIYXNoLCBoYXNoQ29scykgKyAiICIgKworICAgICAgICAgICAgICBj ZW50ZXIoJGVuZ2luZXMubWFwIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICB8IGVuZ2luZSB8 CisgICAgICAgICAgICAgICAgICAgICAgICAgYnl0ZWNvZGUubWF4VG9wRXhlY3V0aW9uQ291bnQo ZW5naW5lKS50b19zCisgICAgICAgICAgICAgICAgICAgICB9LmpvaW4oIi8iKSwgY291bnRDb2xz KSkKKyAgICAgICAgaWYgbW9kZSA9PSA6ZnVsbAorICAgICAgICAgICAgcHJpbnQoIiAiICsgY2Vu dGVyKCRlbmdpbmVzLm1hcCB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwg ZW5naW5lIHwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYnl0ZWNvZGUubWF4 Qm90dG9tRXhlY3V0aW9uQ291bnQoZW5naW5lKS50b19zCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgfS5qb2luKCIvIiksIG1hY2hpbmVDb3VudENvbHMpKQorICAgICAgICAgICAgcHJp bnQoIiAiICsgY2VudGVyKGJ5dGVjb2RlLnNvdXJjZU1hY2hpbmVJbmxpbmVTaXRlcy50b19zICsg Ii8iICsgYnl0ZWNvZGUudG90YWxNYWNoaW5lSW5saW5lU2l0ZXMudG9fcywgaW5saW5lc0NvbHMp KQorICAgICAgICBlbmQKKyAgICAgICAgaWYgc291cmNlQ29scworICAgICAgICAgICAgcHJpbnQo IiAiICsgc291cmNlT25PbmVMaW5lKGJ5dGVjb2RlLnNvdXJjZSwgc291cmNlQ29scykpCisgICAg ICAgIGVuZAorICAgICAgICBwdXRzCisgICAgfQogZW5kCiAKIGRlZiBleGVjdXRlQ29tbWFuZCgq Y29tbWFuZEFycmF5KQpAQCAtMjIyLDQyICszODMsNzMgQEAgZGVmIGV4ZWN1dGVDb21tYW5kKCpj b21tYW5kQXJyYXkpCiAgICAgY2FzZSBjb21tYW5kCiAgICAgd2hlbiAiaGVscCIsICJoIiwgIj8i CiAgICAgICAgIHB1dHMgInN1bW1hcnkgKHMpICAgICBQcmludCBhIHN1bW1hcnkgb2YgY29kZSBi bG9jayBleGVjdXRpb24gcmF0ZXMuIgorICAgICAgICBwdXRzICJmdWxsIChmKSAgICAgICAgU2Ft ZSBhcyBzdW1tYXJ5LCBidXQgcHJpbnRzIG1vcmUgaW5mb3JtYXRpb24uIgorICAgICAgICBwdXRz ICJzb3VyY2UgICAgICAgICAgU2hvdyB0aGUgc291cmNlIGZvciBhIGNvZGUgYmxvY2suIgorICAg ICAgICBwdXRzICJieXRlY29kZSAoYikgICAgU2hvdyB0aGUgYnl0ZWNvZGUgZm9yIGEgY29kZSBi bG9jaywgd2l0aCBjb3VudHMuIgogICAgICAgICBwdXRzICJkaXNwbGF5IChkKSAgICAgRGlzcGxh eSBkZXRhaWxzIGZvciBhIGNvZGUgYmxvY2suIgogICAgICAgICBwdXRzICJoZWxwIChoKSAgICAg ICAgUHJpbnQgdGhpcyBtZXNzYWdlLiIKICAgICAgICAgcHV0cyAicXVpdCAocSkgICAgICAgIFF1 aXQuIgogICAgIHdoZW4gInF1aXQiLCAicSIsICJleGl0IgogICAgICAgICBleGl0IDAKICAgICB3 aGVuICJzdW1tYXJ5IiwgInMiCi0gICAgICAgIGhhc2hDb2xzID0gMTQKKyAgICAgICAgc3VtbWFy eSg6c3VtbWFyeSkKKyAgICB3aGVuICJmdWxsIiwgImYiCisgICAgICAgIHN1bW1hcnkoOmZ1bGwp CisgICAgd2hlbiAic291cmNlIgorICAgICAgICBpZiBhcmdzLmxlbmd0aCAhPSAxCisgICAgICAg ICAgICBwdXRzICJVc2FnZTogc291cmNlIDxjb2RlIGJsb2NrIGhhc2g+IgorICAgICAgICAgICAg cmV0dXJuCisgICAgICAgIGVuZAorICAgICAgICAkYnl0ZWNvZGVzLmVhY2ggeworICAgICAgICAg ICAgfCBieXRlY29kZSB8CisgICAgICAgICAgICBpZiBieXRlY29kZS5jb2RlSGFzaCA9PSBhcmdz WzBdCisgICAgICAgICAgICAgICAgcHV0cyBieXRlY29kZS5zb3VyY2UKKyAgICAgICAgICAgIGVu ZAorICAgICAgICB9CisgICAgd2hlbiAiYnl0ZWNvZGUiLCAiYiIKKyAgICAgICAgaWYgYXJncy5s ZW5ndGggIT0gMQorICAgICAgICAgICAgcHV0cyAiVXNhZ2U6IHNvdXJjZSA8Y29kZSBibG9jayBo YXNoPiIKKyAgICAgICAgICAgIHJldHVybgorICAgICAgICBlbmQKKyAgICAgICAgCisgICAgICAg IGhhc2ggPSBhcmdzWzBdCisgICAgICAgIAogICAgICAgICBjb3VudENvbHMgPSAxMCAqICRlbmdp bmVzLnNpemUKKyAgICAgICAgbWFjaGluZUNvbHMgPSAxMCAqICRlbmdpbmVzLnNpemUKKyAgICAg ICAgcGFkID0gMQorICAgICAgICB3aGlsZSAoY291bnRDb2xzICsgMSArIG1hY2hpbmVDb2xzICsg cGFkKSAlIDggIT0gMAorICAgICAgICAgICAgcGFkICs9IDEKKyAgICAgICAgZW5kCiAgICAgICAg IAotICAgICAgICBwdXRzKHJwYWQoIkNvZGVCbG9jayIsIGhhc2hDb2xzKSArICIgIiArIHJwYWQo JGVuZ2luZXMuam9pbigiLyIpICsgIiBDb3VudHMiLCBjb3VudENvbHMpICsgIiBTb3VyY2UiKQot ICAgICAgICAkYnl0ZWNvZGVzLnNvcnQgewotICAgICAgICAgICAgfCBhLCBiIHwKLSAgICAgICAg ICAgIGIudG90YWxNYXhFeGVjdXRpb25Db3VudCA8PT4gYS50b3RhbE1heEV4ZWN1dGlvbkNvdW50 Ci0gICAgICAgIH0uZWFjaCB7Ci0gICAgICAgICAgICB8IGJ5dGVjb2RlIHwKLSAgICAgICAgICAg IHB1dHMoY2VudGVyKCIjIiArIGJ5dGVjb2RlLmhhc2gsIGhhc2hDb2xzKSArICIgIiArCi0gICAg ICAgICAgICAgICAgIGNlbnRlcigkZW5naW5lcy5tYXAgewotICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHwgZW5naW5lIHwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBieXRlY29kZS5t YXhFeGVjdXRpb25Db3VudChlbmdpbmUpLnRvX3MKLSAgICAgICAgICAgICAgICAgICAgICAgIH0u am9pbigiLyIpLCBjb3VudENvbHMpICsgIiAiICsKLSAgICAgICAgICAgICAgICAgc291cmNlT25P bmVMaW5lKGJ5dGVjb2RlLnNvdXJjZSkpCisgICAgICAgIHB1dHMoY2VudGVyKCJTb3VyY2UgQ291 bnRzIiwgY291bnRDb2xzKSArICIgIiArIGNlbnRlcigiTWFjaGluZSBDb3VudHMiLCBtYWNoaW5l Q29scykgKworICAgICAgICAgICAgICgiICIgKiBwYWQpICsgY2VudGVyKCJCeXRlY29kZSBmb3Ig I3toYXNofSIsIHNjcmVlbldpZHRoIC0gcGFkIC0gY291bnRDb2xzIC0gMSAtIG1hY2hpbmVDb2xz KSkKKyAgICAgICAgcHV0cyhjZW50ZXIoIkJhc2UvREZHIiwgY291bnRDb2xzKSArICIgIiArIGNl bnRlcigiQmFzZS9ERkciLCBjb3VudENvbHMpKQorICAgICAgICAkYnl0ZWNvZGVzLmVhY2ggewor ICAgICAgICAgICAgfCBieXRlY29kZXMgfAorICAgICAgICAgICAgbmV4dCBpZiBieXRlY29kZXMu Y29kZUhhc2ggIT0gaGFzaAorICAgICAgICAgICAgYnl0ZWNvZGVzLmVhY2ggeworICAgICAgICAg ICAgICAgIHwgYnl0ZWNvZGUgfAorICAgICAgICAgICAgICAgIGlmIGJ5dGVjb2RlLnNob3VsZEhh dmVDb3VudHM/CisgICAgICAgICAgICAgICAgICAgIGNvdW50c1N0cmluZyA9ICRlbmdpbmVzLm1h cCB7CisgICAgICAgICAgICAgICAgICAgICAgICB8IG15RW5naW5lIHwKKyAgICAgICAgICAgICAg ICAgICAgICAgIGJ5dGVjb2RlLnRvcEV4ZWN1dGlvbkNvdW50KG15RW5naW5lKQorICAgICAgICAg ICAgICAgICAgICB9LmpvaW4oIi8iKQorICAgICAgICAgICAgICAgICAgICBtYWNoaW5lU3RyaW5n ID0gJGVuZ2luZXMubWFwIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHwgbXlFbmdpbmUgfAor ICAgICAgICAgICAgICAgICAgICAgICAgYnl0ZWNvZGUuYm90dG9tRXhlY3V0aW9uQ291bnQobXlF bmdpbmUpCisgICAgICAgICAgICAgICAgICAgIH0uam9pbigiLyIpCisgICAgICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgICAgICAgICBjb3VudHNTdHJpbmcgPSAiIgorICAgICAgICAgICAg ICAgICAgICBtYWNoaW5lU3RyaW5nID0gIiIKKyAgICAgICAgICAgICAgICBlbmQKKyAgICAgICAg ICAgICAgICBwdXRzKGNlbnRlcihjb3VudHNTdHJpbmcsIGNvdW50Q29scykgKyAiICIgKyBjZW50 ZXIobWFjaGluZVN0cmluZywgbWFjaGluZUNvbHMpICsgKCIgIiAqIHBhZCkgKyBieXRlY29kZS5k ZXNjcmlwdGlvbi5jaG9tcCkKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIHdoZW4gImRp c3BsYXkiLCAiZCIKICAgICAgICAgY2FzZSBhcmdzLmxlbmd0aAogICAgICAgICB3aGVuIDEKICAg ICAgICAgICAgIGhhc2ggPSBhcmdzWzBdCi0gICAgICAgICAgICBlbmdpbmUgPSAiQmFzZWxpbmUi Ci0gICAgICAgICAgICAkY29tcGlsYXRpb25zLmVhY2ggewotICAgICAgICAgICAgICAgIHwgY29t cGlsYXRpb24gfAotICAgICAgICAgICAgICAgIG5leHQgaWYgY29tcGlsYXRpb24uYnl0ZWNvZGUu aGFzaCAhPSBoYXNoCi0gICAgICAgICAgICAgICAgCi0gICAgICAgICAgICAgICAgaWYgY29tcGls YXRpb24uZW5naW5lID09ICJERkciCi0gICAgICAgICAgICAgICAgICAgIGVuZ2luZSA9ICJERkci Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFrCi0gICAgICAgICAgICAgICAgZW5kCi0gICAgICAg ICAgICB9CisgICAgICAgICAgICBlbmdpbmUgPSBuaWwKICAgICAgICAgd2hlbiAyCiAgICAgICAg ICAgICBpZiBtYXlCZUhhc2goYXJnc1swXSkKICAgICAgICAgICAgICAgICBoYXNoID0gYXJnc1sw XQpAQCAtMjcxLDM0ICs0NjMsNjMgQEAgZGVmIGV4ZWN1dGVDb21tYW5kKCpjb21tYW5kQXJyYXkp CiAgICAgICAgICAgICByZXR1cm4KICAgICAgICAgZW5kCiAgICAgICAgIAotICAgICAgICB1bmxl c3MgJGVuZ2luZXMuaW5kZXgoZW5naW5lKQotICAgICAgICAgICAgcHV0cyAiI3tlbmdpbmV9IGlz IG5vdCBhIHZhbGlkIGVuZ2luZSwgdHJ5ICN7JGVuZ2luZXMuam9pbignIG9yICcpfS4iCi0gICAg ICAgICAgICByZXR1cm4KKyAgICAgICAgaWYgZW5naW5lIGFuZCBub3QgJGVuZ2luZXMuaW5kZXgo ZW5naW5lKQorICAgICAgICAgICAgcGF0dGVybiA9IFJlZ2V4cC5uZXcoUmVnZXhwLmVzY2FwZShl bmdpbmUpLCAiaSIpCisgICAgICAgICAgICB0cnVlRW5naW5lID0gbmlsCisgICAgICAgICAgICAk ZW5naW5lcy5lYWNoIHsKKyAgICAgICAgICAgICAgICB8IG15RW5naW5lIHwKKyAgICAgICAgICAg ICAgICBpZiBteUVuZ2luZSA9fiBwYXR0ZXJuCisgICAgICAgICAgICAgICAgICAgIHRydWVFbmdp bmUgPSBteUVuZ2luZQorICAgICAgICAgICAgICAgICAgICBicmVhaworICAgICAgICAgICAgICAg IGVuZAorICAgICAgICAgICAgfQorICAgICAgICAgICAgdW5sZXNzIHRydWVFbmdpbmUKKyAgICAg ICAgICAgICAgICBwdXRzICIje2VuZ2luZX0gaXMgbm90IGEgdmFsaWQgZW5naW5lLCB0cnkgI3sk ZW5naW5lcy5qb2luKCcgb3IgJyl9LiIKKyAgICAgICAgICAgICAgICByZXR1cm4KKyAgICAgICAg ICAgIGVuZAorICAgICAgICAgICAgZW5naW5lID0gdHJ1ZUVuZ2luZQogICAgICAgICBlbmQKICAg ICAgICAgCi0gICAgICAgIGNvdW50Q29scyA9IDEwICogJGVuZ2luZXMuc2l6ZQorICAgICAgICBh Y3R1YWxDb3VudENvbHMgPSAxMworICAgICAgICBzb3VyY2VDb3VudENvbHMgPSAxMCAqICRlbmdp bmVzLnNpemUKKyAgICAgICAgCisgICAgICAgIGZpcnN0ID0gdHJ1ZQorICAgICAgICBjb3VudCA9 IDAKICAgICAgICAgJGNvbXBpbGF0aW9ucy5lYWNoIHsKICAgICAgICAgICAgIHwgY29tcGlsYXRp b24gfAotICAgICAgICAgICAgbmV4dCBpZiBjb21waWxhdGlvbi5ieXRlY29kZS5oYXNoICE9IGhh c2gKLSAgICAgICAgICAgIG5leHQgaWYgY29tcGlsYXRpb24uZW5naW5lICE9IGVuZ2luZQorICAg ICAgICAgICAgbmV4dCBpZiBjb21waWxhdGlvbi5ieXRlY29kZS5jb2RlSGFzaCAhPSBoYXNoCisK KyAgICAgICAgICAgIGNvdW50ICs9IDEKKworICAgICAgICAgICAgbmV4dCBpZiBlbmdpbmUgYW5k IGNvbXBpbGF0aW9uLmVuZ2luZSAhPSBlbmdpbmUKKyAgICAgICAgICAgIAorICAgICAgICAgICAg aWYgZmlyc3QKKyAgICAgICAgICAgICAgICBmaXJzdCA9IGZhbHNlCisgICAgICAgICAgICBlbHNl CisgICAgICAgICAgICAgICAgcHV0cworICAgICAgICAgICAgZW5kCiAgICAgICAgICAgICAKLSAg ICAgICAgICAgIHB1dHMocnBhZCgkZW5naW5lcy5qb2luKCIvIikgKyAiIENvdW50cyIsIGNvdW50 Q29scykgKyAiIERpc2Fzc2VtYmx5IGZvciAje2hhc2h9IGluICN7ZW5naW5lfSIpCisgICAgICAg ICAgICBwdXRzKCJDb21waWxhdGlvbiBcIyN7Y291bnR9OiIpCisgICAgICAgICAgICBwdXRzKGNl bnRlcigiQWN0dWFsIENvdW50cyIsIGFjdHVhbENvdW50Q29scykgKyAiICIgKyBjZW50ZXIoIlNv dXJjZSBDb3VudHMiLCBzb3VyY2VDb3VudENvbHMpICsgIiAiICsgY2VudGVyKCJEaXNhc3NlbWJs eSBpbiAje2NvbXBpbGF0aW9uLmVuZ2luZX0iLCBzY3JlZW5XaWR0aCAtIDEgLSBzb3VyY2VDb3Vu dENvbHMgLSAxIC0gYWN0dWFsQ291bnRDb2xzKSkKKyAgICAgICAgICAgIHB1dHMoKCIgIiAqIGFj dHVhbENvdW50Q29scykgKyAiICIgKyBjZW50ZXIoIkJhc2UvREZHIiwgc291cmNlQ291bnRDb2xz KSkKICAgICAgICAgICAgIGNvbXBpbGF0aW9uLmRlc2NyaXB0aW9ucy5lYWNoIHsKICAgICAgICAg ICAgICAgICB8IGRlc2NyaXB0aW9uIHwKICAgICAgICAgICAgICAgICAjIEZJWE1FOiBXZSBzaG91 bGQgaGF2ZSBhIGJldHRlciB3YXkgb2YgZGV0ZWN0aW5nIHRoaW5ncyBsaWtlIENvdW50RXhlY3V0 aW9uIG5vZGVzCiAgICAgICAgICAgICAgICAgIyBhbmQgc2xvdyBwYXRoIGVudHJpZXMgaW4gdGhl IGJhc2VsaW5lIEpJVC4KLSAgICAgICAgICAgICAgICBuZXh0IGlmIGRlc2NyaXB0aW9uLmRlc2Ny aXB0aW9uID1+IC9Db3VudEV4ZWN1dGlvblwoLyBhbmQgZW5naW5lID09ICJERkciCi0gICAgICAg ICAgICAgICAgaWYgZGVzY3JpcHRpb24ub3JpZ2luLmVtcHR5PyBvciBub3QgZGVzY3JpcHRpb24u b3JpZ2luWy0xXS5zaG91bGRIYXZlQ291bnRzPyBvciAoZW5naW5lID09ICJCYXNlbGluZSIgYW5k IGRlc2NyaXB0aW9uLmRlc2NyaXB0aW9uID1+IC9eXHMqXChTXCkvKQotICAgICAgICAgICAgICAg ICAgICBjb3VudHNTdHJpbmcgPSAiIgorICAgICAgICAgICAgICAgIG5leHQgaWYgZGVzY3JpcHRp b24uZGVzY3JpcHRpb24gPX4gL0NvdW50RXhlY3V0aW9uXCgvIGFuZCBjb21waWxhdGlvbi5lbmdp bmUgPT0gIkRGRyIKKyAgICAgICAgICAgICAgICBpZiBkZXNjcmlwdGlvbi5vcmlnaW4uZW1wdHk/ IG9yIG5vdCBkZXNjcmlwdGlvbi5vcmlnaW5bLTFdLnNob3VsZEhhdmVDb3VudHM/IG9yIChjb21w aWxhdGlvbi5lbmdpbmUgPT0gIkJhc2VsaW5lIiBhbmQgZGVzY3JpcHRpb24uZGVzY3JpcHRpb24g PX4gL15ccypcKFNcKS8pCisgICAgICAgICAgICAgICAgICAgIGFjdHVhbENvdW50c1N0cmluZyA9 ICIiCisgICAgICAgICAgICAgICAgICAgIHNvdXJjZUNvdW50c1N0cmluZyA9ICIiCiAgICAgICAg ICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICBjb3VudHNTdHJpbmcgPSAkZW5naW5l cy5tYXAgeworICAgICAgICAgICAgICAgICAgICBhY3R1YWxDb3VudHNTdHJpbmcgPSBjb21waWxh dGlvbi5jb3VudGVyKGRlc2NyaXB0aW9uLm9yaWdpbikuY291bnQudG9fcworICAgICAgICAgICAg ICAgICAgICBzb3VyY2VDb3VudHNTdHJpbmcgPSAkZW5naW5lcy5tYXAgewogICAgICAgICAgICAg ICAgICAgICAgICAgfCBteUVuZ2luZSB8Ci0gICAgICAgICAgICAgICAgICAgICAgICBkZXNjcmlw dGlvbi5vcmlnaW5bLTFdLmV4ZWN1dGlvbkNvdW50KG15RW5naW5lKQorICAgICAgICAgICAgICAg ICAgICAgICAgZGVzY3JpcHRpb24ub3JpZ2luWy0xXS50b3BFeGVjdXRpb25Db3VudChteUVuZ2lu ZSkKICAgICAgICAgICAgICAgICAgICAgfS5qb2luKCIvIikKICAgICAgICAgICAgICAgICBlbmQK ICAgICAgICAgICAgICAgICBkZXNjcmlwdGlvbi5kZXNjcmlwdGlvbi5zcGxpdCgiXG4iKS5lYWNo IHsKICAgICAgICAgICAgICAgICAgICAgfCBsaW5lIHwKLSAgICAgICAgICAgICAgICAgICAgcHV0 cyhjZW50ZXIoY291bnRzU3RyaW5nLCBjb3VudENvbHMpICsgIiAiICsgbGluZS5jaG9tcCkKKyAg ICAgICAgICAgICAgICAgICAgcHV0cyhjZW50ZXIoYWN0dWFsQ291bnRzU3RyaW5nLCBhY3R1YWxD b3VudENvbHMpICsgIiAiICsgY2VudGVyKHNvdXJjZUNvdW50c1N0cmluZywgc291cmNlQ291bnRD b2xzKSArICIgIiArIGxpbmUuY2hvbXApCiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAg fQogICAgICAgICB9Cg==