<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>218666</bug_id>
          
          <creation_ts>2020-11-06 11:59:21 -0800</creation_ts>
          <short_desc>Add total counts to sampling profiler dump</short_desc>
          <delta_ts>2020-11-09 13:19:19 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Keith Miller">keith_miller</reporter>
          <assigned_to name="Keith Miller">keith_miller</assigned_to>
          <cc>ews-watchlist</cc>
    
    <cc>mark.lam</cc>
    
    <cc>msaboff</cc>
    
    <cc>saam</cc>
    
    <cc>tzagallo</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>ysuzuki</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1705337</commentid>
    <comment_count>0</comment_count>
    <who name="Keith Miller">keith_miller</who>
    <bug_when>2020-11-06 11:59:21 -0800</bug_when>
    <thetext>Add total counts to sampling profiler dump</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1705338</commentid>
    <comment_count>1</comment_count>
      <attachid>413456</attachid>
    <who name="Keith Miller">keith_miller</who>
    <bug_when>2020-11-06 12:00:48 -0800</bug_when>
    <thetext>Created attachment 413456
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1705396</commentid>
    <comment_count>2</comment_count>
      <attachid>413456</attachid>
    <who name="Yusuke Suzuki">ysuzuki</who>
    <bug_when>2020-11-06 13:37:33 -0800</bug_when>
    <thetext>Comment on attachment 413456
Patch

r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1705489</commentid>
    <comment_count>3</comment_count>
      <attachid>413456</attachid>
    <who name="Mark Lam">mark.lam</who>
    <bug_when>2020-11-06 17:46:31 -0800</bug_when>
    <thetext>Comment on attachment 413456
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=413456&amp;action=review

&gt; Source/JavaScriptCore/runtime/SamplingProfiler.cpp:1026
&gt; +    size_t totalCount = 0;

Can you name this totalSamples instead?  The meaning of &quot;count&quot; is nebulous.  What you&apos;re really measuring is the number of samples processed.  So, let&apos;s call it that.

&gt; Source/JavaScriptCore/runtime/SamplingProfiler.cpp:1087
&gt; +    size_t totalCount = 0;

Ditto, name this totalSamples.

&gt; Source/JavaScriptCore/runtime/SamplingProfiler.cpp:1142
&gt; +        out.println(&quot;\n\nSampling rate: &quot;, m_timingInterval.microseconds(), &quot; microseconds. Total count: &quot;, totalCount);

/Total count:/Total Samples:/</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1705801</commentid>
    <comment_count>4</comment_count>
      <attachid>413456</attachid>
    <who name="Keith Miller">keith_miller</who>
    <bug_when>2020-11-09 11:57:17 -0800</bug_when>
    <thetext>Comment on attachment 413456
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=413456&amp;action=review

&gt;&gt; Source/JavaScriptCore/runtime/SamplingProfiler.cpp:1026
&gt;&gt; +    size_t totalCount = 0;
&gt; 
&gt; Can you name this totalSamples instead?  The meaning of &quot;count&quot; is nebulous.  What you&apos;re really measuring is the number of samples processed.  So, let&apos;s call it that.

Sure.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1705804</commentid>
    <comment_count>5</comment_count>
      <attachid>413614</attachid>
    <who name="Keith Miller">keith_miller</who>
    <bug_when>2020-11-09 12:02:38 -0800</bug_when>
    <thetext>Created attachment 413614
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1705847</commentid>
    <comment_count>6</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-11-09 13:18:30 -0800</bug_when>
    <thetext>Committed r269597: &lt;https://trac.webkit.org/changeset/269597&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 413614.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1705848</commentid>
    <comment_count>7</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-11-09 13:19:19 -0800</bug_when>
    <thetext>&lt;rdar://problem/71207171&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>413456</attachid>
            <date>2020-11-06 12:00:48 -0800</date>
            <delta_ts>2020-11-09 12:02:36 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-218666-20201106120047.patch</filename>
            <type>text/plain</type>
            <size>4349</size>
            <attacher name="Keith Miller">keith_miller</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NDM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0
NTlkOWQzOGNhMDJiYjdmYTA3Y2MxMGI5YWZmYzdjMjIxMWJmZGE0Li45NTEyMGNkZDU1NWIwN2Qz
NzE5MTVmMDljYzI0NTA2MmU4MDliYzRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxNiBAQAorMjAyMC0xMS0wNiAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl
LmNvbT4KKworICAgICAgICBBZGQgdG90YWwgY291bnRzIHRvIHNhbXBsaW5nIHByb2ZpbGVyIGR1
bXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODY2
NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg
aXMgbmljZSBmb3IgY29tcHV0aW5nIHRoZSBhcHByb3hpbWF0ZSBwZXJjZW50YWdlIG9mIHRvdGFs
IHRpbWUgaW4gYSBmdW5jdGlvbi4KKworICAgICAgICAqIHJ1bnRpbWUvU2FtcGxpbmdQcm9maWxl
ci5jcHA6CisgICAgICAgIChKU0M6OlNhbXBsaW5nUHJvZmlsZXI6OnJlcG9ydFRvcEZ1bmN0aW9u
cyk6CisgICAgICAgIChKU0M6OlNhbXBsaW5nUHJvZmlsZXI6OnJlcG9ydFRvcEJ5dGVjb2Rlcyk6
CisKIDIwMjAtMTEtMDUgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAg
ICAgICBVbnJldmlld2VkLCBidWlsZCBmaXggZm9yIEFSTTY0RQpkaWZmIC0tZ2l0IGEvU291cmNl
L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2FtcGxpbmdQcm9maWxlci5jcHAgYi9Tb3VyY2UvSmF2
YVNjcmlwdENvcmUvcnVudGltZS9TYW1wbGluZ1Byb2ZpbGVyLmNwcAppbmRleCAyOTVhMjYxM2Y0
NzYyNTBhYzA4YzIwYzZiZWNkOWZjY2Y2OTY0Y2Y0Li4wZjRjYzYwMzExY2VlOWE4ZTY1YjFmN2Jh
NTVlM2Q2OTE0ZDMyOTRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt
ZS9TYW1wbGluZ1Byb2ZpbGVyLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt
ZS9TYW1wbGluZ1Byb2ZpbGVyLmNwcApAQCAtMTAyMyw3ICsxMDIzLDcgQEAgdm9pZCBTYW1wbGlu
Z1Byb2ZpbGVyOjpyZXBvcnRUb3BGdW5jdGlvbnMoUHJpbnRTdHJlYW0mIG91dCkKICAgICAgICAg
cHJvY2Vzc1VudmVyaWZpZWRTdGFja1RyYWNlcyhsb2NrZXIpOwogICAgIH0KIAotCisgICAgc2l6
ZV90IHRvdGFsQ291bnQgPSAwOwogICAgIEhhc2hNYXA8U3RyaW5nLCBzaXplX3Q+IGZ1bmN0aW9u
Q291bnRzOwogICAgIGZvciAoU3RhY2tUcmFjZSYgc3RhY2tUcmFjZSA6IG1fc3RhY2tUcmFjZXMp
IHsKICAgICAgICAgaWYgKCFzdGFja1RyYWNlLmZyYW1lcy5zaXplKCkpCkBAIC0xMDM5LDYgKzEw
MzksNyBAQCB2b2lkIFNhbXBsaW5nUHJvZmlsZXI6OnJlcG9ydFRvcEZ1bmN0aW9ucyhQcmludFN0
cmVhbSYgb3V0KQogICAgICAgICAgICAgaGFzaCA9ICI8bmlsPiJfczsKICAgICAgICAgU3RyaW5n
IGZyYW1lRGVzY3JpcHRpb24gPSBtYWtlU3RyaW5nKGZyYW1lLmRpc3BsYXlOYW1lKG1fdm0pLCAn
IycsIGhhc2gsICc6JywgZnJhbWUuc291cmNlSUQoKSk7CiAgICAgICAgIGZ1bmN0aW9uQ291bnRz
LmFkZChmcmFtZURlc2NyaXB0aW9uLCAwKS5pdGVyYXRvci0+dmFsdWUrKzsKKyAgICAgICAgdG90
YWxDb3VudCsrOwogICAgIH0KIAogICAgIGF1dG8gdGFrZU1heCA9IFsmXSAoKSAtPiBzdGQ6OnBh
aXI8U3RyaW5nLCBzaXplX3Q+IHsKQEAgLTEwNTYsMTQgKzEwNTcsMTQgQEAgdm9pZCBTYW1wbGlu
Z1Byb2ZpbGVyOjpyZXBvcnRUb3BGdW5jdGlvbnMoUHJpbnRTdHJlYW0mIG91dCkKICAgICB9Owog
CiAgICAgaWYgKE9wdGlvbnM6OnNhbXBsaW5nUHJvZmlsZXJUb3BGdW5jdGlvbnNDb3VudCgpKSB7
Ci0gICAgICAgIG91dC5wcmludCgiXG5cblNhbXBsaW5nIHJhdGU6ICIsIG1fdGltaW5nSW50ZXJ2
YWwubWljcm9zZWNvbmRzKCksICIgbWljcm9zZWNvbmRzXG4iKTsKLSAgICAgICAgb3V0LnByaW50
KCJUb3AgZnVuY3Rpb25zIGFzIDxudW1TYW1wbGVzICAnZnVuY3Rpb25OYW1lI2hhc2g6c291cmNl
SUQnPlxuIik7CisgICAgICAgIG91dC5wcmludGxuKCJcblxuU2FtcGxpbmcgcmF0ZTogIiwgbV90
aW1pbmdJbnRlcnZhbC5taWNyb3NlY29uZHMoKSwgIiBtaWNyb3NlY29uZHMuIFRvdGFsIHNhbXBs
ZXM6ICIsIHRvdGFsQ291bnQpOworICAgICAgICBvdXQucHJpbnRsbigiVG9wIGZ1bmN0aW9ucyBh
cyA8bnVtU2FtcGxlcyAgJ2Z1bmN0aW9uTmFtZSNoYXNoOnNvdXJjZUlEJz4iKTsKICAgICAgICAg
Zm9yIChzaXplX3QgaSA9IDA7IGkgPCBPcHRpb25zOjpzYW1wbGluZ1Byb2ZpbGVyVG9wRnVuY3Rp
b25zQ291bnQoKTsgaSsrKSB7CiAgICAgICAgICAgICBhdXRvIHBhaXIgPSB0YWtlTWF4KCk7CiAg
ICAgICAgICAgICBpZiAocGFpci5maXJzdC5pc0VtcHR5KCkpCiAgICAgICAgICAgICAgICAgYnJl
YWs7CiAgICAgICAgICAgICBvdXQucHJpbnRmKCIlNnp1ICIsIHBhaXIuc2Vjb25kKTsKLSAgICAg
ICAgICAgIG91dC5wcmludCgiICAgJyIsIHBhaXIuZmlyc3QsICInXG4iKTsKKyAgICAgICAgICAg
IG91dC5wcmludGxuKCIgICAnIiwgcGFpci5maXJzdCwgIiciKTsKICAgICAgICAgfQogICAgIH0K
IH0KQEAgLTEwODMsNiArMTA4NCw3IEBAIHZvaWQgU2FtcGxpbmdQcm9maWxlcjo6cmVwb3J0VG9w
Qnl0ZWNvZGVzKFByaW50U3RyZWFtJiBvdXQpCiAgICAgICAgIHByb2Nlc3NVbnZlcmlmaWVkU3Rh
Y2tUcmFjZXMobG9ja2VyKTsKICAgICB9CiAKKyAgICBzaXplX3QgdG90YWxDb3VudCA9IDA7CiAg
ICAgSGFzaE1hcDxTdHJpbmcsIHNpemVfdD4gYnl0ZWNvZGVDb3VudHM7CiAgICAgZm9yIChTdGFj
a1RyYWNlJiBzdGFja1RyYWNlIDogbV9zdGFja1RyYWNlcykgewogICAgICAgICBpZiAoIXN0YWNr
VHJhY2UuZnJhbWVzLnNpemUoKSkKQEAgLTExMTksNiArMTEyMSw3IEBAIHZvaWQgU2FtcGxpbmdQ
cm9maWxlcjo6cmVwb3J0VG9wQnl0ZWNvZGVzKFByaW50U3RyZWFtJiBvdXQpCiAgICAgICAgICAg
ICAgICAgbWFjaGluZUxvY2F0aW9uLT5zZWNvbmQtPmluZmVycmVkTmFtZSgpLmRhdGEoKSwgZGVz
Y3JpcHRpb25Gb3JMb2NhdGlvbihtYWNoaW5lTG9jYXRpb24tPmZpcnN0LCBXVEY6Om51bGxvcHQp
KTsKICAgICAgICAgfQogICAgICAgICBieXRlY29kZUNvdW50cy5hZGQoZnJhbWVEZXNjcmlwdGlv
biwgMCkuaXRlcmF0b3ItPnZhbHVlKys7CisgICAgICAgIHRvdGFsQ291bnQrKzsKICAgICB9CiAK
ICAgICBhdXRvIHRha2VNYXggPSBbJl0gKCkgLT4gc3RkOjpwYWlyPFN0cmluZywgc2l6ZV90PiB7
CkBAIC0xMTM2LDE0ICsxMTM5LDE0IEBAIHZvaWQgU2FtcGxpbmdQcm9maWxlcjo6cmVwb3J0VG9w
Qnl0ZWNvZGVzKFByaW50U3RyZWFtJiBvdXQpCiAgICAgfTsKIAogICAgIGlmIChPcHRpb25zOjpz
YW1wbGluZ1Byb2ZpbGVyVG9wQnl0ZWNvZGVzQ291bnQoKSkgewotICAgICAgICBvdXQucHJpbnQo
IlxuXG5TYW1wbGluZyByYXRlOiAiLCBtX3RpbWluZ0ludGVydmFsLm1pY3Jvc2Vjb25kcygpLCAi
IG1pY3Jvc2Vjb25kc1xuIik7Ci0gICAgICAgIG91dC5wcmludCgiSG90dGVzdCBieXRlY29kZXMg
YXMgPG51bVNhbXBsZXMgICAnZnVuY3Rpb25OYW1lI2hhc2g6SklUVHlwZTpieXRlY29kZUluZGV4
Jz5cbiIpOworICAgICAgICBvdXQucHJpbnRsbigiXG5cblNhbXBsaW5nIHJhdGU6ICIsIG1fdGlt
aW5nSW50ZXJ2YWwubWljcm9zZWNvbmRzKCksICIgbWljcm9zZWNvbmRzLiBUb3RhbCBjb3VudDog
IiwgdG90YWxDb3VudCk7CisgICAgICAgIG91dC5wcmludGxuKCJIb3R0ZXN0IGJ5dGVjb2RlcyBh
cyA8bnVtU2FtcGxlcyAgICdmdW5jdGlvbk5hbWUjaGFzaDpKSVRUeXBlOmJ5dGVjb2RlSW5kZXgn
PiIpOwogICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IE9wdGlvbnM6OnNhbXBsaW5nUHJv
ZmlsZXJUb3BCeXRlY29kZXNDb3VudCgpOyBpKyspIHsKICAgICAgICAgICAgIGF1dG8gcGFpciA9
IHRha2VNYXgoKTsKICAgICAgICAgICAgIGlmIChwYWlyLmZpcnN0LmlzRW1wdHkoKSkKICAgICAg
ICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIG91dC5wcmludGYoIiU2enUgIiwgcGFpci5z
ZWNvbmQpOwotICAgICAgICAgICAgb3V0LnByaW50KCIgICAnIiwgcGFpci5maXJzdCwgIidcbiIp
OworICAgICAgICAgICAgb3V0LnByaW50bG4oIiAgICciLCBwYWlyLmZpcnN0LCAiJyIpOwogICAg
ICAgICB9CiAgICAgfQogfQo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>413614</attachid>
            <date>2020-11-09 12:02:38 -0800</date>
            <delta_ts>2020-11-09 13:18:31 -0800</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-218666-20201109120237.patch</filename>
            <type>text/plain</type>
            <size>4382</size>
            <attacher name="Keith Miller">keith_miller</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw
dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0
YmIxMDEzNDk5NjlmNWRiNDM2ODJjZTUwNTI2YTYwMWI3YjcwZTA5Li40MzczYWYzYjM4MmJiNzQ1
MzJmMWNiMDZiN2FjZDlkNmY5N2E3M2EwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv
cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxNiBAQAorMjAyMC0xMS0wOSAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl
LmNvbT4KKworICAgICAgICBBZGQgdG90YWwgY291bnRzIHRvIHNhbXBsaW5nIHByb2ZpbGVyIGR1
bXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODY2
NgorCisgICAgICAgIFJldmlld2VkIGJ5IFl1c3VrZSBTdXp1a2kuCisKKyAgICAgICAgVGhpcyBp
cyBuaWNlIGZvciBjb21wdXRpbmcgdGhlIGFwcHJveGltYXRlIHBlcmNlbnRhZ2Ugb2YgdG90YWwg
dGltZSBpbiBhIGZ1bmN0aW9uLgorCisgICAgICAgICogcnVudGltZS9TYW1wbGluZ1Byb2ZpbGVy
LmNwcDoKKyAgICAgICAgKEpTQzo6U2FtcGxpbmdQcm9maWxlcjo6cmVwb3J0VG9wRnVuY3Rpb25z
KToKKyAgICAgICAgKEpTQzo6U2FtcGxpbmdQcm9maWxlcjo6cmVwb3J0VG9wQnl0ZWNvZGVzKToK
KwogMjAyMC0xMS0wOCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAg
ICAgIFtKU0NdIEFkZCBUaW1lWm9uZSByYW5nZSBjYWNoZSBvdmVyIElDVSBUaW1lWm9uZSBBUEkK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1NhbXBsaW5nUHJvZmls
ZXIuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2FtcGxpbmdQcm9maWxlci5j
cHAKaW5kZXggMjk1YTI2MTNmNDc2MjUwYWMwOGMyMGM2YmVjZDlmY2NmNjk2NGNmNC4uY2U4ZmNl
OTQ4MDkzMzIzYWY0NjgzNWFkYTQzMzI2ODhiODY2N2M2NyAxMDA2NDQKLS0tIGEvU291cmNlL0ph
dmFTY3JpcHRDb3JlL3J1bnRpbWUvU2FtcGxpbmdQcm9maWxlci5jcHAKKysrIGIvU291cmNlL0ph
dmFTY3JpcHRDb3JlL3J1bnRpbWUvU2FtcGxpbmdQcm9maWxlci5jcHAKQEAgLTEwMjMsNyArMTAy
Myw3IEBAIHZvaWQgU2FtcGxpbmdQcm9maWxlcjo6cmVwb3J0VG9wRnVuY3Rpb25zKFByaW50U3Ry
ZWFtJiBvdXQpCiAgICAgICAgIHByb2Nlc3NVbnZlcmlmaWVkU3RhY2tUcmFjZXMobG9ja2VyKTsK
ICAgICB9CiAKLQorICAgIHNpemVfdCB0b3RhbFNhbXBsZXMgPSAwOwogICAgIEhhc2hNYXA8U3Ry
aW5nLCBzaXplX3Q+IGZ1bmN0aW9uQ291bnRzOwogICAgIGZvciAoU3RhY2tUcmFjZSYgc3RhY2tU
cmFjZSA6IG1fc3RhY2tUcmFjZXMpIHsKICAgICAgICAgaWYgKCFzdGFja1RyYWNlLmZyYW1lcy5z
aXplKCkpCkBAIC0xMDM5LDYgKzEwMzksNyBAQCB2b2lkIFNhbXBsaW5nUHJvZmlsZXI6OnJlcG9y
dFRvcEZ1bmN0aW9ucyhQcmludFN0cmVhbSYgb3V0KQogICAgICAgICAgICAgaGFzaCA9ICI8bmls
PiJfczsKICAgICAgICAgU3RyaW5nIGZyYW1lRGVzY3JpcHRpb24gPSBtYWtlU3RyaW5nKGZyYW1l
LmRpc3BsYXlOYW1lKG1fdm0pLCAnIycsIGhhc2gsICc6JywgZnJhbWUuc291cmNlSUQoKSk7CiAg
ICAgICAgIGZ1bmN0aW9uQ291bnRzLmFkZChmcmFtZURlc2NyaXB0aW9uLCAwKS5pdGVyYXRvci0+
dmFsdWUrKzsKKyAgICAgICAgdG90YWxTYW1wbGVzKys7CiAgICAgfQogCiAgICAgYXV0byB0YWtl
TWF4ID0gWyZdICgpIC0+IHN0ZDo6cGFpcjxTdHJpbmcsIHNpemVfdD4gewpAQCAtMTA1NiwxNCAr
MTA1NywxNCBAQCB2b2lkIFNhbXBsaW5nUHJvZmlsZXI6OnJlcG9ydFRvcEZ1bmN0aW9ucyhQcmlu
dFN0cmVhbSYgb3V0KQogICAgIH07CiAKICAgICBpZiAoT3B0aW9uczo6c2FtcGxpbmdQcm9maWxl
clRvcEZ1bmN0aW9uc0NvdW50KCkpIHsKLSAgICAgICAgb3V0LnByaW50KCJcblxuU2FtcGxpbmcg
cmF0ZTogIiwgbV90aW1pbmdJbnRlcnZhbC5taWNyb3NlY29uZHMoKSwgIiBtaWNyb3NlY29uZHNc
biIpOwotICAgICAgICBvdXQucHJpbnQoIlRvcCBmdW5jdGlvbnMgYXMgPG51bVNhbXBsZXMgICdm
dW5jdGlvbk5hbWUjaGFzaDpzb3VyY2VJRCc+XG4iKTsKKyAgICAgICAgb3V0LnByaW50bG4oIlxu
XG5TYW1wbGluZyByYXRlOiAiLCBtX3RpbWluZ0ludGVydmFsLm1pY3Jvc2Vjb25kcygpLCAiIG1p
Y3Jvc2Vjb25kcy4gVG90YWwgc2FtcGxlczogIiwgdG90YWxTYW1wbGVzKTsKKyAgICAgICAgb3V0
LnByaW50bG4oIlRvcCBmdW5jdGlvbnMgYXMgPG51bVNhbXBsZXMgICdmdW5jdGlvbk5hbWUjaGFz
aDpzb3VyY2VJRCc+Iik7CiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgT3B0aW9uczo6
c2FtcGxpbmdQcm9maWxlclRvcEZ1bmN0aW9uc0NvdW50KCk7IGkrKykgewogICAgICAgICAgICAg
YXV0byBwYWlyID0gdGFrZU1heCgpOwogICAgICAgICAgICAgaWYgKHBhaXIuZmlyc3QuaXNFbXB0
eSgpKQogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgb3V0LnByaW50ZigiJTZ6
dSAiLCBwYWlyLnNlY29uZCk7Ci0gICAgICAgICAgICBvdXQucHJpbnQoIiAgICciLCBwYWlyLmZp
cnN0LCAiJ1xuIik7CisgICAgICAgICAgICBvdXQucHJpbnRsbigiICAgJyIsIHBhaXIuZmlyc3Qs
ICInIik7CiAgICAgICAgIH0KICAgICB9CiB9CkBAIC0xMDgzLDYgKzEwODQsNyBAQCB2b2lkIFNh
bXBsaW5nUHJvZmlsZXI6OnJlcG9ydFRvcEJ5dGVjb2RlcyhQcmludFN0cmVhbSYgb3V0KQogICAg
ICAgICBwcm9jZXNzVW52ZXJpZmllZFN0YWNrVHJhY2VzKGxvY2tlcik7CiAgICAgfQogCisgICAg
c2l6ZV90IHRvdGFsU2FtcGxlcyA9IDA7CiAgICAgSGFzaE1hcDxTdHJpbmcsIHNpemVfdD4gYnl0
ZWNvZGVDb3VudHM7CiAgICAgZm9yIChTdGFja1RyYWNlJiBzdGFja1RyYWNlIDogbV9zdGFja1Ry
YWNlcykgewogICAgICAgICBpZiAoIXN0YWNrVHJhY2UuZnJhbWVzLnNpemUoKSkKQEAgLTExMTks
NiArMTEyMSw3IEBAIHZvaWQgU2FtcGxpbmdQcm9maWxlcjo6cmVwb3J0VG9wQnl0ZWNvZGVzKFBy
aW50U3RyZWFtJiBvdXQpCiAgICAgICAgICAgICAgICAgbWFjaGluZUxvY2F0aW9uLT5zZWNvbmQt
PmluZmVycmVkTmFtZSgpLmRhdGEoKSwgZGVzY3JpcHRpb25Gb3JMb2NhdGlvbihtYWNoaW5lTG9j
YXRpb24tPmZpcnN0LCBXVEY6Om51bGxvcHQpKTsKICAgICAgICAgfQogICAgICAgICBieXRlY29k
ZUNvdW50cy5hZGQoZnJhbWVEZXNjcmlwdGlvbiwgMCkuaXRlcmF0b3ItPnZhbHVlKys7CisgICAg
ICAgIHRvdGFsU2FtcGxlcysrOwogICAgIH0KIAogICAgIGF1dG8gdGFrZU1heCA9IFsmXSAoKSAt
PiBzdGQ6OnBhaXI8U3RyaW5nLCBzaXplX3Q+IHsKQEAgLTExMzYsMTQgKzExMzksMTQgQEAgdm9p
ZCBTYW1wbGluZ1Byb2ZpbGVyOjpyZXBvcnRUb3BCeXRlY29kZXMoUHJpbnRTdHJlYW0mIG91dCkK
ICAgICB9OwogCiAgICAgaWYgKE9wdGlvbnM6OnNhbXBsaW5nUHJvZmlsZXJUb3BCeXRlY29kZXND
b3VudCgpKSB7Ci0gICAgICAgIG91dC5wcmludCgiXG5cblNhbXBsaW5nIHJhdGU6ICIsIG1fdGlt
aW5nSW50ZXJ2YWwubWljcm9zZWNvbmRzKCksICIgbWljcm9zZWNvbmRzXG4iKTsKLSAgICAgICAg
b3V0LnByaW50KCJIb3R0ZXN0IGJ5dGVjb2RlcyBhcyA8bnVtU2FtcGxlcyAgICdmdW5jdGlvbk5h
bWUjaGFzaDpKSVRUeXBlOmJ5dGVjb2RlSW5kZXgnPlxuIik7CisgICAgICAgIG91dC5wcmludGxu
KCJcblxuU2FtcGxpbmcgcmF0ZTogIiwgbV90aW1pbmdJbnRlcnZhbC5taWNyb3NlY29uZHMoKSwg
IiBtaWNyb3NlY29uZHMuIFRvdGFsIHNhbXBsZXM6ICIsIHRvdGFsU2FtcGxlcyk7CisgICAgICAg
IG91dC5wcmludGxuKCJIb3R0ZXN0IGJ5dGVjb2RlcyBhcyA8bnVtU2FtcGxlcyAgICdmdW5jdGlv
bk5hbWUjaGFzaDpKSVRUeXBlOmJ5dGVjb2RlSW5kZXgnPiIpOwogICAgICAgICBmb3IgKHNpemVf
dCBpID0gMDsgaSA8IE9wdGlvbnM6OnNhbXBsaW5nUHJvZmlsZXJUb3BCeXRlY29kZXNDb3VudCgp
OyBpKyspIHsKICAgICAgICAgICAgIGF1dG8gcGFpciA9IHRha2VNYXgoKTsKICAgICAgICAgICAg
IGlmIChwYWlyLmZpcnN0LmlzRW1wdHkoKSkKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAg
ICAgICAgIG91dC5wcmludGYoIiU2enUgIiwgcGFpci5zZWNvbmQpOwotICAgICAgICAgICAgb3V0
LnByaW50KCIgICAnIiwgcGFpci5maXJzdCwgIidcbiIpOworICAgICAgICAgICAgb3V0LnByaW50
bG4oIiAgICciLCBwYWlyLmZpcnN0LCAiJyIpOwogICAgICAgICB9CiAgICAgfQogfQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>