81575 2012-03-19 15:51:06 -0700 WTR - log the pid of a crashing WebProcess 2012-03-21 16:29:42 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 71380 1 dpranke dpranke abarth ap aroben darin eric mrobinson ossy sam oldest_to_newest 582356 0 dpranke 2012-03-19 15:51:06 -0700 WTR - log the pid of a crashing WebProcess 582357 1 132692 dpranke 2012-03-19 15:51:33 -0700 Created attachment 132692 Patch 582364 2 dpranke 2012-03-19 15:54:40 -0700 n order to make sure we get the right crash reports when running run-webkit-tests in parallel, we need WTR to log the pid of the WebProcess that crashes when it crashes (see bug 71380 for context). This patch is almost certainly not the right way to fix this, but I thought I'd post it to get feedback on what the right way is ... presumably I need to add a forwarding header for WKPagePrivateMac.h somewhere? Do we want to make this a generic function, since presumably we need the same functionality on the other ports? 582698 3 132692 ap 2012-03-19 20:41:52 -0700 Comment on attachment 132692 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=132692&action=review > This patch is almost certainly not the right way to fix this Is your concern only about the style of include? It's wrong indeed, suggestion below. I don't see anything else that would stand out as wrong here. > Do we want to make this a generic function, since presumably we need the same functionality on the other ports? It's best to factor out a universal solution when there is practical need for it. Otherwise, we risk creating a wrong design, or just over-engineering things. > Tools/WebKitTestRunner/TestController.cpp:43 > +#include "../../Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h" I think that this should work: #include <WebKit2/WKPagePrivateMac.h> > Tools/WebKitTestRunner/TestController.cpp:497 > - if (!resetStateToConsistentValues()) { > + if (!resetStateToConsistentValues()) { Wrong indentation. > Tools/WebKitTestRunner/TestController.cpp:499 > + int pid = WKPageGetProcessIdentifier(m_mainWebView->page()); This function returns pid_t, which is a platform dependent type. I'd use this type for the variable, and cast to long inside printf. > Tools/WebKitTestRunner/TestController.cpp:814 > + int pid = WKPageGetProcessIdentifier(m_mainWebView->page()); Same comment about return type. 583393 4 dpranke 2012-03-20 13:11:18 -0700 (In reply to comment #3) > (From update of attachment 132692 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=132692&action=review > > > This patch is almost certainly not the right way to fix this > > Is your concern only about the style of include? It's wrong indeed, suggestion below. I don't see anything else that would stand out as wrong here. > Mostly I was thinking that getting the subprocess pid is likely to be needed by every WTR implementation and so maybe it should in a generic header and not a platform-specific header. I'm happy to land this as-is and change it down the road as other WK2 ports want the same functionality, though. > > Do we want to make this a generic function, since presumably we need the same functionality on the other ports? > > It's best to factor out a universal solution when there is practical need for it. Otherwise, we risk creating a wrong design, or just over-engineering things. > Sure. > > Tools/WebKitTestRunner/TestController.cpp:43 > > +#include "../../Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h" > > I think that this should work: > > #include <WebKit2/WKPagePrivateMac.h> > Will give it a try. > > Tools/WebKitTestRunner/TestController.cpp:497 > > - if (!resetStateToConsistentValues()) { > > + if (!resetStateToConsistentValues()) { > > Wrong indentation. > Will fix. > > Tools/WebKitTestRunner/TestController.cpp:499 > > + int pid = WKPageGetProcessIdentifier(m_mainWebView->page()); > > This function returns pid_t, which is a platform dependent type. I'd use this type for the variable, and cast to long inside printf. > Will fix. Not sure how I missed that :(. Thanks for the review! 583612 5 132926 dpranke 2012-03-20 16:45:47 -0700 Created attachment 132926 patch for landing 583617 6 132926 ap 2012-03-20 16:54:52 -0700 Comment on attachment 132926 patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=132926&action=review > Tools/WebKitTestRunner/TestController.cpp:39 > +#include <signal.h> Why do you need signal.h? 583634 7 132926 dpranke 2012-03-20 17:07:05 -0700 Comment on attachment 132926 patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=132926&action=review >> Tools/WebKitTestRunner/TestController.cpp:39 >> +#include <signal.h> > > Why do you need signal.h? Whoops. I don't; I thought I had removed that :( 584748 8 dpranke 2012-03-21 16:29:42 -0700 Committed r111619: <http://trac.webkit.org/changeset/111619> 132692 2012-03-19 15:51:33 -0700 2012-03-20 16:45:43 -0700 Patch bug-81575-20120319155132.patch text/plain 4939 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMjYxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGIzMGY0YTViN2QxYmFjYTE1MGM0Y2Q4NWU5YThiNzE4 MjlhMzU4Ny4uMjE4MjJlMzgxNzczOTRhY2Y2NjE5NGJhY2JhMTVlMGVjYWU5M2M0YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIw IEBACiAyMDEyLTAzLTE5ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIFdUUiAtIGxvZyB0aGUgcGlkIG9mIGEgY3Jhc2hpbmcgV2ViUHJvY2VzcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE1NzUKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5u ZXIvVGVzdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RSOjpleGNlZWRlZERhdGFiYXNlUXVv dGEpOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6Y3JlYXRlT3RoZXJQYWdlKToKKyAg ICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OmluaXRpYWxpemUpOgorICAgICAgICAoV1RSOjpU ZXN0Q29udHJvbGxlcjo6cmVzZXRTdGF0ZVRvQ29uc2lzdGVudFZhbHVlcyk6CisgICAgICAgIChX VFI6OlRlc3RDb250cm9sbGVyOjpydW5UZXN0KToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xs ZXI6OnByb2Nlc3NEaWRDcmFzaCk6CisKKzIwMTItMDMtMTkgIERpcmsgUHJhbmtlICA8ZHByYW5r ZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgTlJXVCBydW5zIHNvbWUgdGVzdHMgdGhhdCBhcmUg c2tpcHBlZCB3aXRoIC1pIGNvbW1hbmQgbGluZSBvcHRpb24KICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxNTM1CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9UZXN0Q29udHJvbGxlci5jcHAKaW5kZXggZmY5YjBiN2QzMjIwMjFjY2VhZjk3NjkyYzUyMzgy ZTA4ZjE0MDM4ZS4uNzBkNGNiYzNmMjdiN2M5ZmM0YTk3M2NiNWUxZjdjM2I1NGUzMjllZiAxMDA2 NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKKysrIGIv VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKQEAgLTM2LDggKzM2LDEz IEBACiAjaW5jbHVkZSA8V2ViS2l0Mi9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5oPgogI2luY2x1ZGUg PFdlYktpdDIvV0tSZXRhaW5QdHIuaD4KICNpbmNsdWRlIDxjc3RkaW8+CisjaW5jbHVkZSA8c2ln bmFsLmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KIAorI2lmIFBMQVRGT1JNKE1BQykK KyNpbmNsdWRlICIuLi8uLi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvbWFjL1dLUGFn ZVByaXZhdGVNYWMuaCIKKyNlbmRpZgorCiAjaWYgUExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShR VCkgfHwgUExBVEZPUk0oR1RLKQogI2luY2x1ZGUgIkV2ZW50U2VuZGVyUHJveHkuaCIKICNlbmRp ZgpAQCAtMTI1LDcgKzEzMCw3IEBAIHN0YXRpYyBib29sIHJ1bkJlZm9yZVVubG9hZENvbmZpcm1Q YW5lbChXS1BhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgbWVzc2FnZSwgV0tGCiAKIHN0YXRpYyB1 bnNpZ25lZCBsb25nIGxvbmcgZXhjZWVkZWREYXRhYmFzZVF1b3RhKFdLUGFnZVJlZiwgV0tGcmFt ZVJlZiwgV0tTZWN1cml0eU9yaWdpblJlZiwgV0tTdHJpbmdSZWYsIFdLU3RyaW5nUmVmLCB1bnNp Z25lZCBsb25nIGxvbmcsIHVuc2lnbmVkIGxvbmcgbG9uZywgdW5zaWduZWQgbG9uZyBsb25nLCB1 bnNpZ25lZCBsb25nIGxvbmcsIGNvbnN0IHZvaWQqKQogewotICAgIHN0YXRpYyBjb25zdCB1bnNp Z25lZCBsb25nIGxvbmcgZGVmYXVsdFF1b3RhID0gNSAqIDEwMjQgKiAxMDI0OyAgICAKKyAgICBz dGF0aWMgY29uc3QgdW5zaWduZWQgbG9uZyBsb25nIGRlZmF1bHRRdW90YSA9IDUgKiAxMDI0ICog MTAyNDsKICAgICByZXR1cm4gZGVmYXVsdFF1b3RhOwogfQogCkBAIC0xNzMsNyArMTc4LDcgQEAg V0tQYWdlUmVmIFRlc3RDb250cm9sbGVyOjpjcmVhdGVPdGhlclBhZ2UoV0tQYWdlUmVmIG9sZFBh Z2UsIFdLVVJMUmVxdWVzdFJlZiwgV0sKICAgICAgICAgMCwgLy8gdGFrZUZvY3VzCiAgICAgICAg IGZvY3VzLAogICAgICAgICB1bmZvY3VzLAotICAgICAgICAwLCAvLyBydW5KYXZhU2NyaXB0QWxl cnQgICAgICAgIAorICAgICAgICAwLCAvLyBydW5KYXZhU2NyaXB0QWxlcnQKICAgICAgICAgMCwg Ly8gcnVuSmF2YVNjcmlwdENvbmZpcm0KICAgICAgICAgMCwgLy8gcnVuSmF2YVNjcmlwdFByb21w dAogICAgICAgICAwLCAvLyBzZXRTdGF0dXNUZXh0CkBAIC0zMzcsNyArMzQyLDcgQEAgdm9pZCBU ZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6ZShpbnQgYXJnYywgY29uc3QgY2hhciogYXJndltdKQog ICAgICAgICAwLCAvLyB0YWtlRm9jdXMKICAgICAgICAgMCwgLy8gZm9jdXMKICAgICAgICAgMCwg Ly8gdW5mb2N1cwotICAgICAgICAwLCAvLyBydW5KYXZhU2NyaXB0QWxlcnQgICAgICAgIAorICAg ICAgICAwLCAvLyBydW5KYXZhU2NyaXB0QWxlcnQKICAgICAgICAgMCwgLy8gcnVuSmF2YVNjcmlw dENvbmZpcm0KICAgICAgICAgMCwgLy8gcnVuSmF2YVNjcmlwdFByb21wdAogICAgICAgICAwLCAv LyBzZXRTdGF0dXNUZXh0CkBAIC00MDQsNyArNDA5LDcgQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6 aW5pdGlhbGl6ZShpbnQgYXJnYywgY29uc3QgY2hhciogYXJndltdKQogICAgICAgICAwLCAvLyBk aWRDaGFuZ2VCYWNrRm9yd2FyZExpc3QKICAgICAgICAgMCwgLy8gc2hvdWxkR29Ub0JhY2tGb3J3 YXJkTGlzdEl0ZW0KICAgICAgICAgMCwgLy8gZGlkUnVuSW5zZWN1cmVDb250ZW50Rm9yRnJhbWUK LSAgICAgICAgMCwgLy8gZGlkRGV0ZWN0WFNTRm9yRnJhbWUgCisgICAgICAgIDAsIC8vIGRpZERl dGVjdFhTU0ZvckZyYW1lCiAgICAgICAgIDAsIC8vIGRpZE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0 eUxheW91dAogICAgICAgICAwLCAvLyB3aWxsR29Ub0JhY2tGb3J3YXJkTGlzdEl0ZW0KICAgICB9 OwpAQCAtNDE0LDcgKzQxOSw3IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OmluaXRpYWxpemUoaW50 IGFyZ2MsIGNvbnN0IGNoYXIqIGFyZ3ZbXSkKIGJvb2wgVGVzdENvbnRyb2xsZXI6OnJlc2V0U3Rh dGVUb0NvbnNpc3RlbnRWYWx1ZXMoKQogewogICAgIG1fc3RhdGUgPSBSZXNldHRpbmc7Ci0gICAg CisKICAgICBtX2JlZm9yZVVubG9hZFJldHVyblZhbHVlID0gdHJ1ZTsKIAogICAgIFdLUmV0YWlu UHRyPFdLU3RyaW5nUmVmPiBtZXNzYWdlTmFtZSA9IGFkb3B0V0soV0tTdHJpbmdDcmVhdGVXaXRo VVRGOENTdHJpbmcoIlJlc2V0IikpOwpAQCAtNDg5LDggKzQ5NCwxMyBAQCBib29sIFRlc3RDb250 cm9sbGVyOjpyZXNldFN0YXRlVG9Db25zaXN0ZW50VmFsdWVzKCkKIAogYm9vbCBUZXN0Q29udHJv bGxlcjo6cnVuVGVzdChjb25zdCBjaGFyKiB0ZXN0KQogewotICAgIGlmICghcmVzZXRTdGF0ZVRv Q29uc2lzdGVudFZhbHVlcygpKSB7CisgICAgIGlmICghcmVzZXRTdGF0ZVRvQ29uc2lzdGVudFZh bHVlcygpKSB7CisjaWYgUExBVEZPUk0oTUFDKQorICAgICAgICBpbnQgcGlkID0gV0tQYWdlR2V0 UHJvY2Vzc0lkZW50aWZpZXIobV9tYWluV2ViVmlldy0+cGFnZSgpKTsKKyAgICAgICAgZnByaW50 ZihzdGRlcnIsICIjQ1JBU0hFRCAtIFdlYlByb2Nlc3MgKHBpZCAlZClcbiIsIHBpZCk7CisjZWxz ZQogICAgICAgICBmcHV0cygiI0NSQVNIRUQgLSBXZWJQcm9jZXNzXG4iLCBzdGRlcnIpOworI2Vu ZGlmCiAgICAgICAgIGZmbHVzaChzdGRlcnIpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg fQpAQCAtNTA4LDcgKzUxOCw3IEBAIGJvb2wgVGVzdENvbnRyb2xsZXI6OnJ1blRlc3QoY29uc3Qg Y2hhciogdGVzdCkKICAgICBtX2N1cnJlbnRJbnZvY2F0aW9uID0gYWRvcHRQdHIobmV3IFRlc3RJ bnZvY2F0aW9uKHBhdGhPclVSTCkpOwogICAgIG1fY3VycmVudEludm9jYXRpb24tPnNldFNraXBQ aXhlbFRlc3RPcHRpb24obV9za2lwUGl4ZWxUZXN0T3B0aW9uKTsKICAgICBpZiAobV9kdW1wUGl4 ZWxzKQotICAgICAgICBtX2N1cnJlbnRJbnZvY2F0aW9uLT5zZXRJc1BpeGVsVGVzdChleHBlY3Rl ZFBpeGVsSGFzaCk7ICAgIAorICAgICAgICBtX2N1cnJlbnRJbnZvY2F0aW9uLT5zZXRJc1BpeGVs VGVzdChleHBlY3RlZFBpeGVsSGFzaCk7CiAKICAgICBtX2N1cnJlbnRJbnZvY2F0aW9uLT5pbnZv a2UoKTsKICAgICBtX2N1cnJlbnRJbnZvY2F0aW9uLmNsZWFyKCk7CkBAIC04MDAsNyArODEwLDEy IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OnByb2Nlc3NEaWRDcmFzaCgpCiAgICAgLy8gVGhpcyBm dW5jdGlvbiBjYW4gYmUgY2FsbGVkIG11bHRpcGxlIHRpbWVzIHdoZW4gY3Jhc2ggbG9ncyBhcmUg YmVpbmcgc2F2ZWQgb24gV2luZG93cywgc28KICAgICAvLyBlbnN1cmUgd2Ugb25seSBwcmludCB0 aGUgY3Jhc2hlZCBtZXNzYWdlIG9uY2UuCiAgICAgaWYgKCFtX2RpZFByaW50V2ViUHJvY2Vzc0Ny YXNoZWRNZXNzYWdlKSB7CisjaWYgUExBVEZPUk0oTUFDKQorICAgICAgICBpbnQgcGlkID0gV0tQ YWdlR2V0UHJvY2Vzc0lkZW50aWZpZXIobV9tYWluV2ViVmlldy0+cGFnZSgpKTsKKyAgICAgICAg ZnByaW50ZihzdGRlcnIsICIjQ1JBU0hFRCAtIFdlYlByb2Nlc3MgKHBpZCAlZClcbiIsIHBpZCk7 CisjZWxzZQogICAgICAgICBmcHV0cygiI0NSQVNIRUQgLSBXZWJQcm9jZXNzXG4iLCBzdGRlcnIp OworI2VuZGlmCiAgICAgICAgIGZmbHVzaChzdGRlcnIpOwogICAgICAgICBtX2RpZFByaW50V2Vi UHJvY2Vzc0NyYXNoZWRNZXNzYWdlID0gdHJ1ZTsKICAgICB9Cg== 132926 2012-03-20 16:45:47 -0700 2012-03-20 17:07:04 -0700 patch for landing bug-81575-20120320164546.patch text/plain 4951 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNDY2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMmEyZGY3MDY4NDZlODNlZTZlMjIwMzgwMWNlMGRkMmU1 MGVhOTI2ZS4uYzg0ODg2ZmJlOWRlNjI0Y2Y4OTY4ZWIzODhhMDNmMWIxN2U1NmNmOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIw IEBACiAyMDEyLTAzLTIwICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIFdUUiAtIGxvZyB0aGUgcGlkIG9mIGEgY3Jhc2hpbmcgV2ViUHJvY2VzcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE1NzUKKworICAgICAg ICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292LgorCisgICAgICAgICogV2ViS2l0VGVz dFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXVFI6OmV4Y2VlZGVkRGF0YWJh c2VRdW90YSk6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpjcmVhdGVPdGhlclBhZ2Up OgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChX VFI6OlRlc3RDb250cm9sbGVyOjpyZXNldFN0YXRlVG9Db25zaXN0ZW50VmFsdWVzKToKKyAgICAg ICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OnJ1blRlc3QpOgorICAgICAgICAoV1RSOjpUZXN0Q29u dHJvbGxlcjo6cHJvY2Vzc0RpZENyYXNoKToKKworMjAxMi0wMy0yMCAgRGlyayBQcmFua2UgIDxk cHJhbmtlQGNocm9taXVtLm9yZz4KKwogICAgICAgICB3ZWJraXRweTogZ2V0IFNlcnZlclByb2Nl c3Mgb3V0IG9mIHRoZSByZXBvcnRjcmFzaCBidXNpbmVzcwogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE2MDAKIApkaWZmIC0tZ2l0IGEvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVy L1Rlc3RDb250cm9sbGVyLmNwcAppbmRleCBmZjliMGI3ZDMyMjAyMWNjZWFmOTc2OTJjNTIzODJl MDhmMTQwMzhlLi42NWE2MWY1MDYzYjIxZGJhNGQwNDljMzZlMTQyZTkzNzVlNmM0YjY2IDEwMDY0 NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAorKysgYi9U b29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcApAQCAtMzYsOCArMzYsMTMg QEAKICNpbmNsdWRlIDxXZWJLaXQyL1dLUHJlZmVyZW5jZXNQcml2YXRlLmg+CiAjaW5jbHVkZSA8 V2ViS2l0Mi9XS1JldGFpblB0ci5oPgogI2luY2x1ZGUgPGNzdGRpbz4KKyNpbmNsdWRlIDxzaWdu YWwuaD4KICNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgogCisjaWYgUExBVEZPUk0oTUFDKQor I2luY2x1ZGUgPFdlYktpdDIvV0tQYWdlUHJpdmF0ZU1hYy5oPgorI2VuZGlmCisKICNpZiBQTEFU Rk9STShNQUMpIHx8IFBMQVRGT1JNKFFUKSB8fCBQTEFURk9STShHVEspCiAjaW5jbHVkZSAiRXZl bnRTZW5kZXJQcm94eS5oIgogI2VuZGlmCkBAIC0xMjUsNyArMTMwLDcgQEAgc3RhdGljIGJvb2wg cnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiBt ZXNzYWdlLCBXS0YKIAogc3RhdGljIHVuc2lnbmVkIGxvbmcgbG9uZyBleGNlZWRlZERhdGFiYXNl UXVvdGEoV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCBXS1NlY3VyaXR5T3JpZ2luUmVmLCBXS1N0cmlu Z1JlZiwgV0tTdHJpbmdSZWYsIHVuc2lnbmVkIGxvbmcgbG9uZywgdW5zaWduZWQgbG9uZyBsb25n LCB1bnNpZ25lZCBsb25nIGxvbmcsIHVuc2lnbmVkIGxvbmcgbG9uZywgY29uc3Qgdm9pZCopCiB7 Ci0gICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIGxvbmcgbG9uZyBkZWZhdWx0UXVvdGEgPSA1ICog MTAyNCAqIDEwMjQ7ICAgIAorICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBsb25nIGxvbmcgZGVm YXVsdFF1b3RhID0gNSAqIDEwMjQgKiAxMDI0OwogICAgIHJldHVybiBkZWZhdWx0UXVvdGE7CiB9 CiAKQEAgLTE3Myw3ICsxNzgsNyBAQCBXS1BhZ2VSZWYgVGVzdENvbnRyb2xsZXI6OmNyZWF0ZU90 aGVyUGFnZShXS1BhZ2VSZWYgb2xkUGFnZSwgV0tVUkxSZXF1ZXN0UmVmLCBXSwogICAgICAgICAw LCAvLyB0YWtlRm9jdXMKICAgICAgICAgZm9jdXMsCiAgICAgICAgIHVuZm9jdXMsCi0gICAgICAg IDAsIC8vIHJ1bkphdmFTY3JpcHRBbGVydCAgICAgICAgCisgICAgICAgIDAsIC8vIHJ1bkphdmFT Y3JpcHRBbGVydAogICAgICAgICAwLCAvLyBydW5KYXZhU2NyaXB0Q29uZmlybQogICAgICAgICAw LCAvLyBydW5KYXZhU2NyaXB0UHJvbXB0CiAgICAgICAgIDAsIC8vIHNldFN0YXR1c1RleHQKQEAg LTMzNyw3ICszNDIsNyBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjppbml0aWFsaXplKGludCBhcmdj LCBjb25zdCBjaGFyKiBhcmd2W10pCiAgICAgICAgIDAsIC8vIHRha2VGb2N1cwogICAgICAgICAw LCAvLyBmb2N1cwogICAgICAgICAwLCAvLyB1bmZvY3VzCi0gICAgICAgIDAsIC8vIHJ1bkphdmFT Y3JpcHRBbGVydCAgICAgICAgCisgICAgICAgIDAsIC8vIHJ1bkphdmFTY3JpcHRBbGVydAogICAg ICAgICAwLCAvLyBydW5KYXZhU2NyaXB0Q29uZmlybQogICAgICAgICAwLCAvLyBydW5KYXZhU2Ny aXB0UHJvbXB0CiAgICAgICAgIDAsIC8vIHNldFN0YXR1c1RleHQKQEAgLTQwNCw3ICs0MDksNyBA QCB2b2lkIFRlc3RDb250cm9sbGVyOjppbml0aWFsaXplKGludCBhcmdjLCBjb25zdCBjaGFyKiBh cmd2W10pCiAgICAgICAgIDAsIC8vIGRpZENoYW5nZUJhY2tGb3J3YXJkTGlzdAogICAgICAgICAw LCAvLyBzaG91bGRHb1RvQmFja0ZvcndhcmRMaXN0SXRlbQogICAgICAgICAwLCAvLyBkaWRSdW5J bnNlY3VyZUNvbnRlbnRGb3JGcmFtZQotICAgICAgICAwLCAvLyBkaWREZXRlY3RYU1NGb3JGcmFt ZSAKKyAgICAgICAgMCwgLy8gZGlkRGV0ZWN0WFNTRm9yRnJhbWUKICAgICAgICAgMCwgLy8gZGlk TmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0CiAgICAgICAgIDAsIC8vIHdpbGxHb1RvQmFj a0ZvcndhcmRMaXN0SXRlbQogICAgIH07CkBAIC00MTQsNyArNDE5LDcgQEAgdm9pZCBUZXN0Q29u dHJvbGxlcjo6aW5pdGlhbGl6ZShpbnQgYXJnYywgY29uc3QgY2hhciogYXJndltdKQogYm9vbCBU ZXN0Q29udHJvbGxlcjo6cmVzZXRTdGF0ZVRvQ29uc2lzdGVudFZhbHVlcygpCiB7CiAgICAgbV9z dGF0ZSA9IFJlc2V0dGluZzsKLSAgICAKKwogICAgIG1fYmVmb3JlVW5sb2FkUmV0dXJuVmFsdWUg PSB0cnVlOwogCiAgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IG1lc3NhZ2VOYW1lID0gYWRv cHRXSyhXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZygiUmVzZXQiKSk7CkBAIC00ODksOCAr NDk0LDEzIEBAIGJvb2wgVGVzdENvbnRyb2xsZXI6OnJlc2V0U3RhdGVUb0NvbnNpc3RlbnRWYWx1 ZXMoKQogCiBib29sIFRlc3RDb250cm9sbGVyOjpydW5UZXN0KGNvbnN0IGNoYXIqIHRlc3QpCiB7 Ci0gICAgaWYgKCFyZXNldFN0YXRlVG9Db25zaXN0ZW50VmFsdWVzKCkpIHsKKyAgICAgaWYgKCFy ZXNldFN0YXRlVG9Db25zaXN0ZW50VmFsdWVzKCkpIHsKKyNpZiBQTEFURk9STShNQUMpCisgICAg ICAgICBwaWRfdCBwaWQgPSBXS1BhZ2VHZXRQcm9jZXNzSWRlbnRpZmllcihtX21haW5XZWJWaWV3 LT5wYWdlKCkpOworICAgICAgICAgZnByaW50ZihzdGRlcnIsICIjQ1JBU0hFRCAtIFdlYlByb2Nl c3MgKHBpZCAlbGQpXG4iLCBzdGF0aWNfY2FzdDxsb25nPihwaWQpKTsKKyNlbHNlCiAgICAgICAg IGZwdXRzKCIjQ1JBU0hFRCAtIFdlYlByb2Nlc3NcbiIsIHN0ZGVycik7CisjZW5kaWYKICAgICAg ICAgZmZsdXNoKHN0ZGVycik7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CkBAIC01MDgs NyArNTE4LDcgQEAgYm9vbCBUZXN0Q29udHJvbGxlcjo6cnVuVGVzdChjb25zdCBjaGFyKiB0ZXN0 KQogICAgIG1fY3VycmVudEludm9jYXRpb24gPSBhZG9wdFB0cihuZXcgVGVzdEludm9jYXRpb24o cGF0aE9yVVJMKSk7CiAgICAgbV9jdXJyZW50SW52b2NhdGlvbi0+c2V0U2tpcFBpeGVsVGVzdE9w dGlvbihtX3NraXBQaXhlbFRlc3RPcHRpb24pOwogICAgIGlmIChtX2R1bXBQaXhlbHMpCi0gICAg ICAgIG1fY3VycmVudEludm9jYXRpb24tPnNldElzUGl4ZWxUZXN0KGV4cGVjdGVkUGl4ZWxIYXNo KTsgICAgCisgICAgICAgIG1fY3VycmVudEludm9jYXRpb24tPnNldElzUGl4ZWxUZXN0KGV4cGVj dGVkUGl4ZWxIYXNoKTsKIAogICAgIG1fY3VycmVudEludm9jYXRpb24tPmludm9rZSgpOwogICAg IG1fY3VycmVudEludm9jYXRpb24uY2xlYXIoKTsKQEAgLTgwMCw3ICs4MTAsMTIgQEAgdm9pZCBU ZXN0Q29udHJvbGxlcjo6cHJvY2Vzc0RpZENyYXNoKCkKICAgICAvLyBUaGlzIGZ1bmN0aW9uIGNh biBiZSBjYWxsZWQgbXVsdGlwbGUgdGltZXMgd2hlbiBjcmFzaCBsb2dzIGFyZSBiZWluZyBzYXZl ZCBvbiBXaW5kb3dzLCBzbwogICAgIC8vIGVuc3VyZSB3ZSBvbmx5IHByaW50IHRoZSBjcmFzaGVk IG1lc3NhZ2Ugb25jZS4KICAgICBpZiAoIW1fZGlkUHJpbnRXZWJQcm9jZXNzQ3Jhc2hlZE1lc3Nh Z2UpIHsKKyNpZiBQTEFURk9STShNQUMpCisgICAgICAgIHBpZF90IHBpZCA9IFdLUGFnZUdldFBy b2Nlc3NJZGVudGlmaWVyKG1fbWFpbldlYlZpZXctPnBhZ2UoKSk7CisgICAgICAgIGZwcmludGYo c3RkZXJyLCAiI0NSQVNIRUQgLSBXZWJQcm9jZXNzIChwaWQgJWxkKVxuIiwgc3RhdGljX2Nhc3Q8 bG9uZz4ocGlkKSk7CisjZWxzZQogICAgICAgICBmcHV0cygiI0NSQVNIRUQgLSBXZWJQcm9jZXNz XG4iLCBzdGRlcnIpOworI2VuZGlmCiAgICAgICAgIGZmbHVzaChzdGRlcnIpOwogICAgICAgICBt X2RpZFByaW50V2ViUHJvY2Vzc0NyYXNoZWRNZXNzYWdlID0gdHJ1ZTsKICAgICB9Cg==