90408 2012-07-02 15:42:37 -0700 nrwt: moving child process logging code into manager_worker_broker 2012-07-03 16:11:45 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89725 90409 1 dpranke dpranke abarth eric ojan tony oldest_to_newest 661773 0 dpranke 2012-07-02 15:42:37 -0700 nrwt: moving child process logging code into manager_worker_broker 661776 1 150485 dpranke 2012-07-02 15:45:39 -0700 Created attachment 150485 Patch 662502 2 150485 ojan 2012-07-03 15:12:54 -0700 Comment on attachment 150485 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150485&action=review > Tools/ChangeLog:9 > + whether they're in the same process or different processses and processes 662547 3 dpranke 2012-07-03 16:11:45 -0700 Committed r121807: <http://trac.webkit.org/changeset/121807> 150485 2012-07-02 15:45:39 -0700 2012-07-03 15:12:54 -0700 Patch bug-90408-20120702154538.patch text/plain 11360 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxNTE0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDJlMjE2ZjgxNDRkNzNiNzQwZWE2MzMzM2U3NjIyNWIy Yzg4ZWFjMS4uYWQyMDFiYTAyMmYyZjM2ZjA4MWZlNjZjNDliYmQwMTQxNzJmZmUyOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQy IEBACisyMDEyLTA3LTAyICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIG5yd3Q6IG1vdmluZyBjaGlsZCBwcm9jZXNzIGxvZ2dpbmcgY29kZSBpbnRvIG1hbmFn ZXJfd29ya2VyX2Jyb2tlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTA0MDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBVc2VycyBvZiBtYW5hZ2VyX3dvcmtlcl9icm9rZXIgc2hvdWxkIG5vdCBoYXZlIHRv IGJlIGF3YXJlIG9mCisgICAgICAgIHdoZXRoZXIgdGhleSdyZSBpbiB0aGUgc2FtZSBwcm9jZXNz IG9yIGRpZmZlcmVudCBwcm9jZXNzc2VzIGFuZAorICAgICAgICBjb25maWd1cmUgbG9nZ2luZyB0 aGVtc2VsdmVzOyBtd2Igc2hvdWxkIGhpZGUgdGhpcyBjb21wbGV4aXR5LgorICAgICAgICBXZSBj YW4ndCBxdWl0ZSBkbyB0aGlzIGNvbXBsZXRlbHkvY29ycmVjdGx5IHlldCwgc2luY2UgdGhlCisg ICAgICAgIG1hbmFnZXIgZXhwZWN0cyB0byBnZXQgYSBsaXN0IG9mIG1lc3NhZ2VzIHRvIGxvZywg YnV0IHRoaXMKKyAgICAgICAgY2hhbmdlIGZpeGVzIHRoZSB3b3JrZXIgc2lkZSBvZiBpdCwgYXQg bGVhc3QuCisKKyAgICAgICAgVGhpcyBpcyBqdXN0IG1vdmluZyBjb2RlIGFyb3VuZCwgdGhlcmUg aXMgbm8gbmV3IGZ1bmN0aW9uYWxpdHkKKyAgICAgICAgYW5kIHRoaXMgc2hvdWxkIGJlIGNvdmVy ZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3dvcmtlcl9icm9rZXIucHk6CisgICAgICAgIChB YnN0cmFjdFdvcmtlci5fX2luaXRfXyk6CisgICAgICAgIChfV29ya2VyQ29ubmVjdGlvbi5fX2lu aXRfXyk6CisgICAgICAgIChfV29ya2VyQ29ubmVjdGlvbi5wb3N0X21lc3NhZ2UpOgorICAgICAg ICAoX1dvcmtlckNvbm5lY3Rpb24pOgorICAgICAgICAoX1dvcmtlckNvbm5lY3Rpb24uc2V0X3Vw X2xvZ2dpbmcpOgorICAgICAgICAoX1dvcmtlckNvbm5lY3Rpb24uY2xlYW5fdXBfbG9nZ2luZyk6 CisgICAgICAgIChfSW5saW5lV29ya2VyQ29ubmVjdGlvbi5ydW4pOgorICAgICAgICAoX011bHRp UHJvY2Vzc1dvcmtlckNvbm5lY3Rpb24ucnVuKToKKyAgICAgICAgKF9Xb3JrZXJMb2dIYW5kbGVy KToKKyAgICAgICAgKF9Xb3JrZXJMb2dIYW5kbGVyLl9faW5pdF9fKToKKyAgICAgICAgKF9Xb3Jr ZXJMb2dIYW5kbGVyLmVtaXQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL2NvbnRyb2xsZXJzL21hbmFnZXJfd29ya2VyX2Jyb2tlcl91bml0dGVzdC5weToKKyAgICAg ICAgKF9UZXN0V29ya2VyLnJ1bik6CisgICAgICAgIChfVGVzdHNNaXhpbi5oYW5kbGVfZG9uZSk6 CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvd29y a2VyLnB5OgorICAgICAgICAoV29ya2VyLl9faW5pdF9fKToKKyAgICAgICAgKFdvcmtlci5ydW4p OgorICAgICAgICAoV29ya2VyLl9ydW5fdGVzdCk6CisgICAgICAgIChXb3JrZXIuY2xlYW51cCk6 CisgICAgICAgIChXb3JrZXIucnVuX3NpbmdsZV90ZXN0KToKKwogMjAxMi0wNi0yOCAgRGlyayBQ cmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBucnd0OiByZW1vdmUgdGhl ICdnb29nbGUtY2hyb21lJyBwb3J0IGNvZGUKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXJfd29ya2VyX2Jyb2tlci5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXJf d29ya2VyX2Jyb2tlci5weQppbmRleCA5MjgxZjdkYmNkYjUwNWVlZmRhNjUyMmE2NTAwYmIxOTRm MTdlNmE5Li43OTBkZjkzMTMyMTcwYWVlOGUxNDBhNDM4OTJjNWQyMTRhNzhmM2U2IDEwMDc1NQot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5h Z2VyX3dvcmtlcl9icm9rZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl93b3JrZXJfYnJva2VyLnB5CkBAIC02OSwxMiArNjks MTQgQEAgaW1wb3J0IGNQaWNrbGUKIGltcG9ydCBsb2dnaW5nCiBpbXBvcnQgbXVsdGlwcm9jZXNz aW5nCiBpbXBvcnQgb3B0cGFyc2UKK2ltcG9ydCBvcwogaW1wb3J0IFF1ZXVlCiBpbXBvcnQgc3lz CiBpbXBvcnQgdHJhY2ViYWNrCiAKIAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtIGltcG9y dCBzdGFja191dGlscworZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMudmlld3MgaW1wb3J0IG1l dGVyZWRfc3RyZWFtCiAKIAogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQpAQCAt Mjc3LDYgKzI3OSw3IEBAIGNsYXNzIEFic3RyYWN0V29ya2VyKEJyb2tlckNsaWVudCk6CiAgICAg ICAgIHNlbGYuX25hbWUgPSAnd29ya2VyLyVkJyAlIHdvcmtlcl9udW1iZXIKICAgICAgICAgc2Vs Zi5fZG9uZSA9IEZhbHNlCiAgICAgICAgIHNlbGYuX2NhbmNlbGVkID0gRmFsc2UKKyAgICAgICAg c2VsZi5fb3B0aW9ucyA9IG9wdHBhcnNlLlZhbHVlcyh7J3ZlcmJvc2UnOiBGYWxzZX0pCiAKICAg ICBkZWYgbmFtZShzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX25hbWUKQEAgLTM2MSw2ICsz NjQsOSBAQCBjbGFzcyBfV29ya2VyQ29ubmVjdGlvbihfQnJva2VyQ29ubmVjdGlvbik6CiAgICAg ZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIGJyb2tlciwgd29ya2VyX2ZhY3RvcnksIHdvcmtlcl9u dW1iZXIpOgogICAgICAgICBzZWxmLl9jbGllbnQgPSB3b3JrZXJfZmFjdG9yeShzZWxmLCB3b3Jr ZXJfbnVtYmVyKQogICAgICAgICBzZWxmLl9ob3N0ID0gaG9zdAorICAgICAgICBzZWxmLl9sb2df bWVzc2FnZXMgPSBbXQorICAgICAgICBzZWxmLl9sb2dnZXIgPSBOb25lCisgICAgICAgIHNlbGYu X2xvZ19oYW5kbGVyID0gTm9uZQogICAgICAgICBfQnJva2VyQ29ubmVjdGlvbi5fX2luaXRfXyhz ZWxmLCBicm9rZXIsIHNlbGYuX2NsaWVudCwgQU5ZX1dPUktFUl9UT1BJQywgTUFOQUdFUl9UT1BJ QykKIAogICAgIGRlZiBuYW1lKHNlbGYpOgpAQCAtMzc4LDYgKzM4NCwzMyBAQCBjbGFzcyBfV29y a2VyQ29ubmVjdGlvbihfQnJva2VyQ29ubmVjdGlvbik6CiAgICAgZGVmIHlpZWxkX3RvX2Jyb2tl cihzZWxmKToKICAgICAgICAgcGFzcwogCisgICAgZGVmIHBvc3RfbWVzc2FnZShzZWxmLCAqYXJn cyk6CisgICAgICAgICMgRklYTUU6IFRoaXMgaXMgYSBoYWNrIHVudGlsIHdlIGNhbiByZW1vdmUg dGhlIGxvZ19tZXNzYWdlcyBhcmcgZnJvbSB0aGUgbWFuYWdlci4KKyAgICAgICAgaWYgYXJnc1sw XSBpbiAoJ2ZpbmlzaGVkX3Rlc3QnLCAnZG9uZScpOgorICAgICAgICAgICAgbG9nX21lc3NhZ2Vz ID0gc2VsZi5fbG9nX21lc3NhZ2VzCisgICAgICAgICAgICBzZWxmLl9sb2dfbWVzc2FnZXMgPSBb XQorICAgICAgICAgICAgYXJncyA9IGFyZ3MgKyB0dXBsZShbbG9nX21lc3NhZ2VzXSkKKyAgICAg ICAgc3VwZXIoX1dvcmtlckNvbm5lY3Rpb24sIHNlbGYpLnBvc3RfbWVzc2FnZSgqYXJncykKKwor ICAgIGRlZiBzZXRfdXBfbG9nZ2luZyhzZWxmKToKKyAgICAgICAgc2VsZi5fbG9nZ2VyID0gbG9n Z2luZy5yb290CisgICAgICAgICMgVGhlIHVuaXggbXVsdGlwcm9jZXNzaW5nIGltcGxlbWVudGF0 aW9uIGNsb25lcyB0aGUgTWV0ZXJlZFN0cmVhbSBsb2cgaGFuZGxlcgorICAgICAgICAjIGludG8g dGhlIGNoaWxkIHByb2Nlc3MsIHNvIHdlIG5lZWQgdG8gcmVtb3ZlIGl0IHRvIGF2b2lkIGR1cGxp Y2F0ZSBsb2dnaW5nLgorICAgICAgICBmb3IgaCBpbiBzZWxmLl9sb2dnZXIuaGFuZGxlcnM6Cisg ICAgICAgICAgICAjIGxvZyBoYW5kbGVycyBkb24ndCBoYXZlIG5hbWVzIHVudGlsIHB5dGhvbiAy LjcuCisgICAgICAgICAgICBpZiBnZXRhdHRyKGgsICduYW1lJywgJycpID09IG1ldGVyZWRfc3Ry ZWFtLkxPR19IQU5ETEVSX05BTUU6CisgICAgICAgICAgICAgICAgc2VsZi5fbG9nZ2VyLnJlbW92 ZUhhbmRsZXIoaCkKKyAgICAgICAgICAgICAgICBicmVhaworICAgICAgICBzZWxmLl9sb2dnZXIu c2V0TGV2ZWwobG9nZ2luZy5ERUJVRyBpZiBzZWxmLl9jbGllbnQuX29wdGlvbnMudmVyYm9zZSBl bHNlIGxvZ2dpbmcuSU5GTykKKyAgICAgICAgc2VsZi5fbG9nX2hhbmRsZXIgPSBfV29ya2VyTG9n SGFuZGxlcihzZWxmKQorICAgICAgICBzZWxmLl9sb2dnZXIuYWRkSGFuZGxlcihzZWxmLl9sb2df aGFuZGxlcikKKworICAgIGRlZiBjbGVhbl91cF9sb2dnaW5nKHNlbGYpOgorICAgICAgICBpZiBz ZWxmLl9sb2dfaGFuZGxlciBhbmQgc2VsZi5fbG9nZ2VyOgorICAgICAgICAgICAgc2VsZi5fbG9n Z2VyLnJlbW92ZUhhbmRsZXIoc2VsZi5fbG9nX2hhbmRsZXIpCisgICAgICAgIHNlbGYuX2xvZ19o YW5kbGVyID0gTm9uZQorICAgICAgICBzZWxmLl9sb2dnZXIgPSBOb25lCisKIAogY2xhc3MgX0lu bGluZVdvcmtlckNvbm5lY3Rpb24oX1dvcmtlckNvbm5lY3Rpb24pOgogICAgIGRlZiBfX2luaXRf XyhzZWxmLCBob3N0LCBicm9rZXIsIG1hbmFnZXJfY2xpZW50LCB3b3JrZXJfZmFjdG9yeSwgd29y a2VyX251bWJlcik6CkBAIC0zOTcsNyArNDMwLDcgQEAgY2xhc3MgX0lubGluZVdvcmtlckNvbm5l Y3Rpb24oX1dvcmtlckNvbm5lY3Rpb24pOgogICAgIGRlZiBydW4oc2VsZik6CiAgICAgICAgIHNl bGYuX2FsaXZlID0gVHJ1ZQogICAgICAgICB0cnk6Ci0gICAgICAgICAgICBzZWxmLl9jbGllbnQu cnVuKHNlbGYuX2hvc3QsIHNldF91cF9sb2dnaW5nPUZhbHNlKQorICAgICAgICAgICAgc2VsZi5f Y2xpZW50LnJ1bihzZWxmLl9ob3N0KQogICAgICAgICBmaW5hbGx5OgogICAgICAgICAgICAgc2Vs Zi5fYWxpdmUgPSBGYWxzZQogCkBAIC00MzksNSArNDcyLDE4IEBAIGNsYXNzIF9NdWx0aVByb2Nl c3NXb3JrZXJDb25uZWN0aW9uKF9Xb3JrZXJDb25uZWN0aW9uKToKICAgICAgICAgc2VsZi5fcHJv Yy5zdGFydCgpCiAKICAgICBkZWYgcnVuKHNlbGYpOgotICAgICAgICAjIEZJWE1FOiBzZXRfdXBf bG9nZ2luZyBzaG91bGRuJ3QgYmUgbmVlZGVkLgotICAgICAgICBzZWxmLl9jbGllbnQucnVuKHNl bGYuX2hvc3QsIHNldF91cF9sb2dnaW5nPVRydWUpCisgICAgICAgIHNlbGYuc2V0X3VwX2xvZ2dp bmcoKQorICAgICAgICB0cnk6CisgICAgICAgICAgICBzZWxmLl9jbGllbnQucnVuKHNlbGYuX2hv c3QpCisgICAgICAgIGZpbmFsbHk6CisgICAgICAgICAgICBzZWxmLmNsZWFuX3VwX2xvZ2dpbmco KQorCisKK2NsYXNzIF9Xb3JrZXJMb2dIYW5kbGVyKGxvZ2dpbmcuSGFuZGxlcik6CisgICAgZGVm IF9faW5pdF9fKHNlbGYsIHdvcmtlcik6CisgICAgICAgIGxvZ2dpbmcuSGFuZGxlci5fX2luaXRf XyhzZWxmKQorICAgICAgICBzZWxmLl93b3JrZXIgPSB3b3JrZXIKKyAgICAgICAgc2VsZi5fcGlk ID0gb3MuZ2V0cGlkKCkKKworICAgIGRlZiBlbWl0KHNlbGYsIHJlY29yZCk6CisgICAgICAgIHNl bGYuX3dvcmtlci5fbG9nX21lc3NhZ2VzLmFwcGVuZChyZWNvcmQpCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3dvcmtl cl9icm9rZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9jb250cm9sbGVycy9tYW5hZ2VyX3dvcmtlcl9icm9rZXJfdW5pdHRlc3QucHkKaW5kZXggNmZk YTE3MTcwZjVmMTllNTIwZGYxODkyOTU1YjJhYzMxN2MxYjU3MS4uZjhiZTA3YmFmMTA3NDQxYzcw NDY4YjM2Y2Y1NmM4ODFlZWU5NGJhMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl93b3JrZXJfYnJva2VyX3VuaXR0ZXN0 LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJz L21hbmFnZXJfd29ya2VyX2Jyb2tlcl91bml0dGVzdC5weQpAQCAtNjksNyArNjksNyBAQCBjbGFz cyBfVGVzdFdvcmtlcihtYW5hZ2VyX3dvcmtlcl9icm9rZXIuQWJzdHJhY3RXb3JrZXIpOgogICAg ICAgICBhc3NlcnQgYV9zdHIgPT0gImhlbGxvLCB3b3JsZCIKICAgICAgICAgc2VsZi5fd29ya2Vy X2Nvbm5lY3Rpb24ucG9zdF9tZXNzYWdlKCd0ZXN0JywgMiwgJ2hpLCAnICsgc2VsZi5fdGhpbmdf dG9fZ3JlZXQpCiAKLSAgICBkZWYgcnVuKHNlbGYsIGhvc3QsIHNldF91cF9sb2dnaW5nKToKKyAg ICBkZWYgcnVuKHNlbGYsIGhvc3QpOgogICAgICAgICBpZiBzZWxmLl9zdGFydGluZ19xdWV1ZToK ICAgICAgICAgICAgIHNlbGYuX3N0YXJ0aW5nX3F1ZXVlLnB1dCgnJykKIApAQCAtMTAyLDcgKzEw Miw3IEBAIGNsYXNzIF9UZXN0c01peGluKG9iamVjdCk6CiAgICAgZGVmIGlzX2RvbmUoc2VsZik6 CiAgICAgICAgIHJldHVybiBzZWxmLl9kb25lCiAKLSAgICBkZWYgaGFuZGxlX2RvbmUoc2VsZiwg c3JjKToKKyAgICBkZWYgaGFuZGxlX2RvbmUoc2VsZiwgc3JjLCBsb2dfbWVzc2FnZXMpOgogICAg ICAgICBzZWxmLl9kb25lID0gVHJ1ZQogCiAgICAgZGVmIGhhbmRsZV90ZXN0KHNlbGYsIHNyYywg YW5faW50LCBhX3N0cik6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9jb250cm9sbGVycy93b3JrZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9jb250cm9sbGVycy93b3JrZXIucHkKaW5kZXggYTg2MTFhODcyZTUyNzA1MzA3 NDEzNDA5ZWU5OWUwZWNiZTg3ZjVjMC4uMjJhOTZhYWU5NjI0OTAzMTZhMDkxYmM1YmMxODUwYmIy YzU0ZjUzMSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv Y29udHJvbGxlcnMvd29ya2VyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL2NvbnRyb2xsZXJzL3dvcmtlci5weQpAQCAtMjksOCArMjksNiBAQAogIiIiSGFuZGxl IG1lc3NhZ2VzIGZyb20gdGhlIE1hbmFnZXIgYW5kIGV4ZWN1dGVzIGFjdHVhbCB0ZXN0cy4iIiIK IAogaW1wb3J0IGxvZ2dpbmcKLWltcG9ydCBvcwotaW1wb3J0IHN5cwogaW1wb3J0IHRocmVhZGlu ZwogaW1wb3J0IHRpbWUKIApAQCAtMzksNyArMzcsNiBAQCBmcm9tIHdlYmtpdHB5LmxheW91dF90 ZXN0cy5jb250cm9sbGVycyBpbXBvcnQgbWFuYWdlcl93b3JrZXJfYnJva2VyCiBmcm9tIHdlYmtp dHB5LmxheW91dF90ZXN0cy5jb250cm9sbGVycyBpbXBvcnQgc2luZ2xlX3Rlc3RfcnVubmVyCiBm cm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMgaW1wb3J0IHRlc3RfZXhwZWN0YXRpb25z CiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMgaW1wb3J0IHRlc3RfcmVzdWx0cwot ZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMudmlld3MgaW1wb3J0IG1ldGVyZWRfc3RyZWFtCiAK IAogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQpAQCAtNTcsOSArNTQsNiBAQCBj bGFzcyBXb3JrZXIobWFuYWdlcl93b3JrZXJfYnJva2VyLkFic3RyYWN0V29ya2VyKToKICAgICAg ICAgc2VsZi5fZHJpdmVyID0gTm9uZQogICAgICAgICBzZWxmLl90ZXN0c19ydW5fZmlsZSA9IE5v bmUKICAgICAgICAgc2VsZi5fdGVzdHNfcnVuX2ZpbGVuYW1lID0gTm9uZQotICAgICAgICBzZWxm Ll9sb2dfbWVzc2FnZXMgPSBbXQotICAgICAgICBzZWxmLl9sb2dnZXIgPSBOb25lCi0gICAgICAg IHNlbGYuX2xvZ19oYW5kbGVyID0gTm9uZQogCiAgICAgZGVmIF9fZGVsX18oc2VsZik6CiAgICAg ICAgIHNlbGYuY2xlYW51cCgpCkBAIC03NiwyOSArNzAsMTAgQEAgY2xhc3MgV29ya2VyKG1hbmFn ZXJfd29ya2VyX2Jyb2tlci5BYnN0cmFjdFdvcmtlcik6CiAgICAgICAgIHRlc3RzX3J1bl9maWxl bmFtZSA9IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSwgInRl c3RzX3J1biVkLnR4dCIgJSBzZWxmLl93b3JrZXJfbnVtYmVyKQogICAgICAgICBzZWxmLl90ZXN0 c19ydW5fZmlsZSA9IHNlbGYuX2ZpbGVzeXN0ZW0ub3Blbl90ZXh0X2ZpbGVfZm9yX3dyaXRpbmco dGVzdHNfcnVuX2ZpbGVuYW1lKQogCi0gICAgZGVmIF9zZXRfdXBfbG9nZ2luZyhzZWxmKToKLSAg ICAgICAgc2VsZi5fbG9nZ2VyID0gbG9nZ2luZy5nZXRMb2dnZXIoKQotCi0gICAgICAgICMgVGhl IHVuaXggbXVsdGlwcm9jZXNzaW5nIGltcGxlbWVudGF0aW9uIGNsb25lcyB0aGUgTWV0ZXJlZFN0 cmVhbSBsb2cgaGFuZGxlcgotICAgICAgICAjIGludG8gdGhlIGNoaWxkIHByb2Nlc3MsIHNvIHdl IG5lZWQgdG8gcmVtb3ZlIGl0IHRvIGF2b2lkIGR1cGxpY2F0ZSBsb2dnaW5nLgotICAgICAgICBm b3IgaCBpbiBzZWxmLl9sb2dnZXIuaGFuZGxlcnM6Ci0gICAgICAgICAgICAjIGxvZyBoYW5kbGVy cyBkb24ndCBoYXZlIG5hbWVzIHVudGlsIHB5dGhvbiAyLjcuCi0gICAgICAgICAgICBpZiBnZXRh dHRyKGgsICduYW1lJywgJycpID09IG1ldGVyZWRfc3RyZWFtLkxPR19IQU5ETEVSX05BTUU6Ci0g ICAgICAgICAgICAgICAgc2VsZi5fbG9nZ2VyLnJlbW92ZUhhbmRsZXIoaCkKLSAgICAgICAgICAg ICAgICBicmVhawotCi0gICAgICAgIHNlbGYuX2xvZ2dlci5zZXRMZXZlbChsb2dnaW5nLkRFQlVH IGlmIHNlbGYuX29wdGlvbnMudmVyYm9zZSBlbHNlIGxvZ2dpbmcuSU5GTykKLSAgICAgICAgc2Vs Zi5fbG9nX2hhbmRsZXIgPSBfV29ya2VyTG9nSGFuZGxlcihzZWxmKQotICAgICAgICBzZWxmLl9s b2dnZXIuYWRkSGFuZGxlcihzZWxmLl9sb2dfaGFuZGxlcikKLQotICAgIGRlZiBydW4oc2VsZiwg aG9zdCwgc2V0X3VwX2xvZ2dpbmcpOgorICAgIGRlZiBydW4oc2VsZiwgaG9zdCk6CiAgICAgICAg IGlmIG5vdCBob3N0OgogICAgICAgICAgICAgaG9zdCA9IEhvc3QoKQogCi0gICAgICAgICMgRklY TUU6IHRoaXMgc2hvdWxkIG1vdmUgaW50byBtYW5hZ2VyX3dvcmtlcl9icm9rZXIucHkuCi0gICAg ICAgIGlmIHNldF91cF9sb2dnaW5nOgotICAgICAgICAgICAgc2VsZi5fc2V0X3VwX2xvZ2dpbmco KQotCiAgICAgICAgIG9wdGlvbnMgPSBzZWxmLl9vcHRpb25zCiAgICAgICAgIHNlbGYuX3BvcnQg PSBob3N0LnBvcnRfZmFjdG9yeS5nZXQob3B0aW9ucy5wbGF0Zm9ybSwgb3B0aW9ucykKIApAQCAt MTEwLDcgKzg1LDcgQEAgY2xhc3MgV29ya2VyKG1hbmFnZXJfd29ya2VyX2Jyb2tlci5BYnN0cmFj dFdvcmtlcik6CiAgICAgICAgICAgICBzZWxmLmtpbGxfZHJpdmVyKCkKICAgICAgICAgICAgIF9s b2cuZGVidWcoIiVzIGV4aXRpbmciICUgc2VsZi5fbmFtZSkKICAgICAgICAgICAgIHNlbGYuY2xl YW51cCgpCi0gICAgICAgICAgICBzZWxmLl93b3JrZXJfY29ubmVjdGlvbi5wb3N0X21lc3NhZ2Uo J2RvbmUnLCBzZWxmLl9sb2dfbWVzc2FnZXMpCisgICAgICAgICAgICBzZWxmLl93b3JrZXJfY29u bmVjdGlvbi5wb3N0X21lc3NhZ2UoJ2RvbmUnKQogCiAgICAgZGVmIGhhbmRsZV90ZXN0X2xpc3Qo c2VsZiwgc3JjLCBsaXN0X25hbWUsIHRlc3RfbGlzdCk6CiAgICAgICAgIHN0YXJ0X3RpbWUgPSB0 aW1lLnRpbWUoKQpAQCAtMTQ3LDkgKzEyMiw3IEBAIGNsYXNzIFdvcmtlcihtYW5hZ2VyX3dvcmtl cl9icm9rZXIuQWJzdHJhY3RXb3JrZXIpOgogICAgICAgICByZXN1bHQgPSBzZWxmLnJ1bl90ZXN0 X3dpdGhfdGltZW91dCh0ZXN0X2lucHV0LCB0ZXN0X3RpbWVvdXRfc2VjKQogCiAgICAgICAgIGVs YXBzZWRfdGltZSA9IHRpbWUudGltZSgpIC0gc3RhcnQKLSAgICAgICAgbG9nX21lc3NhZ2VzID0g c2VsZi5fbG9nX21lc3NhZ2VzCi0gICAgICAgIHNlbGYuX2xvZ19tZXNzYWdlcyA9IFtdCi0gICAg ICAgIHNlbGYuX3dvcmtlcl9jb25uZWN0aW9uLnBvc3RfbWVzc2FnZSgnZmluaXNoZWRfdGVzdCcs IHJlc3VsdCwgZWxhcHNlZF90aW1lLCBsb2dfbWVzc2FnZXMpCisgICAgICAgIHNlbGYuX3dvcmtl cl9jb25uZWN0aW9uLnBvc3RfbWVzc2FnZSgnZmluaXNoZWRfdGVzdCcsIHJlc3VsdCwgZWxhcHNl ZF90aW1lKQogCiAgICAgICAgIHNlbGYuY2xlYW5fdXBfYWZ0ZXJfdGVzdCh0ZXN0X2lucHV0LCBy ZXN1bHQpCiAKQEAgLTE1OSwxMCArMTMyLDYgQEAgY2xhc3MgV29ya2VyKG1hbmFnZXJfd29ya2Vy X2Jyb2tlci5BYnN0cmFjdFdvcmtlcik6CiAgICAgICAgIGlmIHNlbGYuX3Rlc3RzX3J1bl9maWxl OgogICAgICAgICAgICAgc2VsZi5fdGVzdHNfcnVuX2ZpbGUuY2xvc2UoKQogICAgICAgICAgICAg c2VsZi5fdGVzdHNfcnVuX2ZpbGUgPSBOb25lCi0gICAgICAgIGlmIHNlbGYuX2xvZ19oYW5kbGVy IGFuZCBzZWxmLl9sb2dnZXI6Ci0gICAgICAgICAgICBzZWxmLl9sb2dnZXIucmVtb3ZlSGFuZGxl cihzZWxmLl9sb2dfaGFuZGxlcikKLSAgICAgICAgc2VsZi5fbG9nX2hhbmRsZXIgPSBOb25lCi0g ICAgICAgIHNlbGYuX2xvZ2dlciA9IE5vbmUKIAogICAgIGRlZiB0aW1lb3V0KHNlbGYsIHRlc3Rf aW5wdXQpOgogICAgICAgICAiIiJDb21wdXRlIHRoZSBhcHByb3ByaWF0ZSB0aW1lb3V0IHZhbHVl IGZvciBhIHRlc3QuIiIiCkBAIC0yNzksMTMgKzI0OCwzIEBAIGNsYXNzIFdvcmtlcihtYW5hZ2Vy X3dvcmtlcl9icm9rZXIuQWJzdHJhY3RXb3JrZXIpOgogICAgIGRlZiBydW5fc2luZ2xlX3Rlc3Qo c2VsZiwgZHJpdmVyLCB0ZXN0X2lucHV0KToKICAgICAgICAgcmV0dXJuIHNpbmdsZV90ZXN0X3J1 bm5lci5ydW5fc2luZ2xlX3Rlc3Qoc2VsZi5fcG9ydCwgc2VsZi5fb3B0aW9ucywKICAgICAgICAg ICAgIHRlc3RfaW5wdXQsIGRyaXZlciwgc2VsZi5fbmFtZSkKLQotCi1jbGFzcyBfV29ya2VyTG9n SGFuZGxlcihsb2dnaW5nLkhhbmRsZXIpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCB3b3JrZXIp OgotICAgICAgICBsb2dnaW5nLkhhbmRsZXIuX19pbml0X18oc2VsZikKLSAgICAgICAgc2VsZi5f d29ya2VyID0gd29ya2VyCi0gICAgICAgIHNlbGYuX3BpZCA9IG9zLmdldHBpZCgpCi0KLSAgICBk ZWYgZW1pdChzZWxmLCByZWNvcmQpOgotICAgICAgICBzZWxmLl93b3JrZXIuX2xvZ19tZXNzYWdl cy5hcHBlbmQocmVjb3JkKQo=