97852 2012-09-27 20:29:20 -0700 Remove unused features and reduce code duplications in PerfTestRunner 2012-09-28 13:36:22 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 97833 1 rniwa rniwa eric haraken morrita ojan oldest_to_newest 730192 0 rniwa 2012-09-27 20:29:20 -0700 Remove unused features and reduce code duplications in PerfTestRunner 730197 1 166132 rniwa 2012-09-27 20:40:28 -0700 Created attachment 166132 Patch 730206 2 166132 haraken 2012-09-27 20:50:49 -0700 Comment on attachment 166132 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166132&action=review > PerformanceTests/ChangeLog:9 > + - Remove PerfTestRunner.log since it's never used. Nit: PerfTestRunner.info? > PerformanceTests/resources/runner.js:190 > + return returnValue; > + } > > - var mallocMemoryStats = PerfTestRunner.computeStatistics([PerfTestRunner.getUsedMallocHeap()], "bytes"); > - PerfTestRunner.printStatistics(mallocMemoryStats, "Malloc:"); > + return end - start; Is this correct? This function sometimes returns returnValue and sometimes returns end-start. 730208 3 166132 rniwa 2012-09-27 20:55:33 -0700 Comment on attachment 166132 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166132&action=review >> PerformanceTests/ChangeLog:9 >> + - Remove PerfTestRunner.log since it's never used. > > Nit: PerfTestRunner.info? Right. >> PerformanceTests/resources/runner.js:190 >> + return end - start; > > Is this correct? This function sometimes returns returnValue and sometimes returns end-start. Yes. When test.run returns a number, we use that value instead (see dom-perf.js for example). 730209 4 166136 rniwa 2012-09-27 20:56:15 -0700 Created attachment 166136 Fixed a typo in ChangeLog 730217 5 166136 haraken 2012-09-27 21:08:20 -0700 Comment on attachment 166136 Fixed a typo in ChangeLog Looks OK 730955 6 rniwa 2012-09-28 13:36:15 -0700 Landed in http://trac.webkit.org/changeset/129847 and http://trac.webkit.org/changeset/129858. 166132 2012-09-27 20:40:28 -0700 2012-09-27 20:56:13 -0700 Patch bug-97852-20120927203945.patch text/plain 8357 rniwa SW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1h bmNlVGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMjk4NDIpCisrKyBQZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA5LTI3ICBS eW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbW92ZSB1bnVzZWQg ZmVhdHVyZXMgYW5kIHJlZHVjZSBjb2RlIGR1cGxpY2F0aW9ucyBpbiBQZXJmVGVzdFJ1bm5lcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTc4NTIKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWRlIHRoZSBm b2xsb3dpbmcgcmVmYWN0b3JpbmcgY2hhbmdlczoKKyAgICAgICAgLSBSZW1vdmUgUGVyZlRlc3RS dW5uZXIubG9nIHNpbmNlIGl0J3MgbmV2ZXIgdXNlZC4KKyAgICAgICAgLSBNb3ZlZCB0aGUganMg aGVhcC9tYWxsb2MgcmVsYXRlZCBmdW5jdGlvbnMgdXAgdG8gd2hlcmUgdGhleSBiZWxvbmcuCisg ICAgICAgIC0gTW92ZWQgdGhlIGluaXRpYWxpemF0aW9uIG9mIF9jYWxsc1Blckl0ZXJhdGlvbiwg X3Rlc3QsIGFuZCAtZGVzY3JpcHRpb24gaW50byBfc3RhcnQsCisgICAgICAgICAgYW5kIHN0b3Bw ZWQgaW5pdGlhbGl6aW5nIF9ydW5GdW5jdGlvbiBhbmQgX2RvbmVGdW5jdGlvbiBzaW5jZSBib3Ro IHRlc3QgdGltZXMgbm93CisgICAgICAgICAgdXNlIF90ZXN0IG9iamVjdC4KKyAgICAgICAgLSBN YWRlIF9tZWFzdXJlVGltZU9uY2UgYW5kIF9tZWFzdXJlUnVuc1BlclNlY29uZE9uY2UgcmV0dXJu IHRoZSBtZWFzdXJlZCB2YWx1ZQorICAgICAgICAgIGluc3RlYWQgb2YgY2FsbGluZyBpZ25vcmVX YXJtVXBBbmRMb2cgYW5kIF9ydW5Mb29wIHRvIHNoYXJlIHRoZSBjb2RlOyB0aGV5J3JlIG5vdwor ICAgICAgICAgIGNhbGxlZCBpbiBfbWVhc3VyZVJ1bnNQZXJTZWNvbmRPbmNlLgorCisgICAgICAg ICogcmVzb3VyY2VzL3J1bm5lci5qczoKKyAgICAgICAgKFBlcmZUZXN0UnVubmVyLnN0b3JlSGVh cFJlc3VsdHMpOiBNb3ZlZC4KKyAgICAgICAgKFBlcmZUZXN0UnVubmVyLmdldFVzZWRNYWxsb2NI ZWFwKTogTW92ZWQuCisgICAgICAgIChQZXJmVGVzdFJ1bm5lci5nZXRVc2VkSlNIZWFwKTogTW92 ZWQuCisgICAgICAgIChQZXJmVGVzdFJ1bm5lci5nZXRBbmRQcmludE1lbW9yeVN0YXRpc3RpY3Mp OiBNb3ZlZC4KKyAgICAgICAgKFBlcmZUZXN0UnVubmVyLl9zY2hlZHVsZU5leHRNZWFzdXJlbWVu dE9yTm90aWZ5RG9uZSk6IFJlbmFtZWQgZnJvbSBfcnVuTG9vcC4gQ2FsbHMKKyAgICAgICAgaWdu b3JlV2FybVVwQW5kTG9nIGFuZCBzY2hlZHVsZXMgdGhlIG5leHQgY2FsbC4KKyAgICAgICAgKFBl cmZUZXN0UnVubmVyLl9tZWFzdXJlVGltZU9uY2UpOiBSZW5hbWVkIGZyb20gX3J1bm5lci4KKyAg ICAgICAgKFBlcmZUZXN0UnVubmVyLl9zdGFydCk6IFJlbmFtZWQgZnJvbSBpbml0QW5kU3RhcnRM b29wLgorICAgICAgICAoUGVyZlRlc3RSdW5uZXIubWVhc3VyZVRpbWUpOgorICAgICAgICAoUGVy ZlRlc3RSdW5uZXIucnVuUGVyU2Vjb25kKToKKyAgICAgICAgKFBlcmZUZXN0UnVubmVyLl9tZWFz dXJlUnVuc1BlclNlY29uZE9uY2UpOiBSZW5hbWVkIGZyb20gX21lYXN1cmVSdW5zUGVyU2Vjb25k T25jZS4KKyAgICAgICAgKFBlcmZUZXN0UnVubmVyLl9wZXJTZWNvbmRSdW5uZXJJdGVyYXRvcik6 CisKIDIwMTItMDktMjcgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgUGVyZlRlc3RSdW5uZXIucnVuIHNob3VsZCB0YWtlIGFuIG9iamVjdApJbmRleDogUGVyZm9y bWFuY2VUZXN0cy9yZXNvdXJjZXMvcnVubmVyLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1hbmNl VGVzdHMvcmVzb3VyY2VzL3J1bm5lci5qcwkocmV2aXNpb24gMTI5ODMwKQorKysgUGVyZm9ybWFu Y2VUZXN0cy9yZXNvdXJjZXMvcnVubmVyLmpzCSh3b3JraW5nIGNvcHkpCkBAIC00MywxMCArNDMs NiBAQCBQZXJmVGVzdFJ1bm5lci5sb2cgPSBmdW5jdGlvbiAodGV4dCkgewogICAgIHdpbmRvdy5z Y3JvbGxUbygwLCBkb2N1bWVudC5ib2R5LmhlaWdodCk7CiB9CiAKLVBlcmZUZXN0UnVubmVyLmlu Zm8gPSBmdW5jdGlvbiAodGV4dCkgewotICAgIHRoaXMubG9nKCJJbmZvOiAiICsgdGV4dCk7Ci19 Ci0KIFBlcmZUZXN0UnVubmVyLmxvZ0luZm8gPSBmdW5jdGlvbiAodGV4dCkgewogICAgIGlmICgh d2luZG93LnRlc3RSdW5uZXIpCiAgICAgICAgIHRoaXMubG9nKHRleHQpOwpAQCAtMTA5LDYgKzEw NSwzMiBAQCBQZXJmVGVzdFJ1bm5lci5wcmludFN0YXRpc3RpY3MgPSBmdW5jdGlvCiAgICAgdGhp cy5sb2coIm1heCAiICsgc3RhdGlzdGljcy5tYXggKyAiICIgKyBzdGF0aXN0aWNzLnVuaXQpOwog fQogCitQZXJmVGVzdFJ1bm5lci5zdG9yZUhlYXBSZXN1bHRzID0gZnVuY3Rpb24oKSB7CisgICAg aWYgKCF3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICByZXR1cm47CisgICAgdGhpcy5fanNIZWFw UmVzdWx0cy5wdXNoKHRoaXMuZ2V0VXNlZEpTSGVhcCgpKTsKKyAgICB0aGlzLl9tYWxsb2NIZWFw UmVzdWx0cy5wdXNoKHRoaXMuZ2V0VXNlZE1hbGxvY0hlYXAoKSk7Cit9CisKK1BlcmZUZXN0UnVu bmVyLmdldFVzZWRNYWxsb2NIZWFwID0gZnVuY3Rpb24oKSB7CisgICAgdmFyIHN0YXRzID0gd2lu ZG93LmludGVybmFscy5tYWxsb2NTdGF0aXN0aWNzKCk7CisgICAgcmV0dXJuIHN0YXRzLmNvbW1p dHRlZFZNQnl0ZXMgLSBzdGF0cy5mcmVlTGlzdEJ5dGVzOworfQorCitQZXJmVGVzdFJ1bm5lci5n ZXRVc2VkSlNIZWFwID0gZnVuY3Rpb24oKSB7CisgICAgcmV0dXJuIGNvbnNvbGUubWVtb3J5LnVz ZWRKU0hlYXBTaXplOworfQorCitQZXJmVGVzdFJ1bm5lci5nZXRBbmRQcmludE1lbW9yeVN0YXRp c3RpY3MgPSBmdW5jdGlvbigpIHsKKyAgICBpZiAoIXdpbmRvdy5pbnRlcm5hbHMpCisgICAgICAg IHJldHVybjsKKyAgICB2YXIganNNZW1vcnlTdGF0cyA9IFBlcmZUZXN0UnVubmVyLmNvbXB1dGVT dGF0aXN0aWNzKFtQZXJmVGVzdFJ1bm5lci5nZXRVc2VkSlNIZWFwKCldLCAiYnl0ZXMiKTsKKyAg ICBQZXJmVGVzdFJ1bm5lci5wcmludFN0YXRpc3RpY3MoanNNZW1vcnlTdGF0cywgIkpTIEhlYXA6 Iik7CisKKyAgICB2YXIgbWFsbG9jTWVtb3J5U3RhdHMgPSBQZXJmVGVzdFJ1bm5lci5jb21wdXRl U3RhdGlzdGljcyhbUGVyZlRlc3RSdW5uZXIuZ2V0VXNlZE1hbGxvY0hlYXAoKV0sICJieXRlcyIp OworICAgIFBlcmZUZXN0UnVubmVyLnByaW50U3RhdGlzdGljcyhtYWxsb2NNZW1vcnlTdGF0cywg Ik1hbGxvYzoiKTsKK30KKwogUGVyZlRlc3RSdW5uZXIuZ2MgPSBmdW5jdGlvbiAoKSB7CiAgICAg aWYgKHdpbmRvdy5HQ0NvbnRyb2xsZXIpCiAgICAgICAgIHdpbmRvdy5HQ0NvbnRyb2xsZXIuY29s bGVjdCgpOwpAQCAtMTI1LDEwICsxNDcsMTQgQEAgUGVyZlRlc3RSdW5uZXIuZ2MgPSBmdW5jdGlv biAoKSB7CiAgICAgfQogfQogCi1QZXJmVGVzdFJ1bm5lci5fcnVuTG9vcCA9IGZ1bmN0aW9uICgp IHsKK1BlcmZUZXN0UnVubmVyLl9zY2hlZHVsZU5leHRNZWFzdXJlbWVudE9yTm90aWZ5RG9uZSA9 IGZ1bmN0aW9uICgpIHsKICAgICBpZiAodGhpcy5fY29tcGxldGVkUnVucyA8IHRoaXMuX3J1bkNv dW50KSB7CiAgICAgICAgIHRoaXMuZ2MoKTsKLSAgICAgICAgd2luZG93LnNldFRpbWVvdXQoZnVu Y3Rpb24gKCkgeyBQZXJmVGVzdFJ1bm5lci5fcnVubmVyKCk7IH0sIDApOworICAgICAgICB3aW5k b3cuc2V0VGltZW91dChmdW5jdGlvbiAoKSB7CisgICAgICAgICAgICB2YXIgbWVhc3VyZWRWYWx1 ZSA9IFBlcmZUZXN0UnVubmVyLl9ydW5uZXIoKTsKKyAgICAgICAgICAgIFBlcmZUZXN0UnVubmVy Lmlnbm9yZVdhcm1VcEFuZExvZyhtZWFzdXJlZFZhbHVlKTsKKyAgICAgICAgICAgIFBlcmZUZXN0 UnVubmVyLl9zY2hlZHVsZU5leHRNZWFzdXJlbWVudE9yTm90aWZ5RG9uZSgpOworICAgICAgICB9 LCAwKTsKICAgICB9IGVsc2UgewogICAgICAgICBpZiAodGhpcy5fZGVzY3JpcHRpb24pCiAgICAg ICAgICAgICB0aGlzLmxvZygiRGVzY3JpcHRpb246ICIgKyB0aGlzLl9kZXNjcmlwdGlvbik7CkBA IC0xNDMsNTIgKzE2OSwyNSBAQCBQZXJmVGVzdFJ1bm5lci5fcnVuTG9vcCA9IGZ1bmN0aW9uICgp IHsKICAgICAgICAgICAgIHZhciBzZWxmID0gdGhpczsKICAgICAgICAgICAgIGxvZ0xpbmVzLmZv ckVhY2goZnVuY3Rpb24odGV4dCkgeyBzZWxmLmxvZyh0ZXh0KTsgfSk7CiAgICAgICAgIH0KLSAg ICAgICAgdGhpcy5fZG9uZUZ1bmN0aW9uKCk7CisgICAgICAgIGlmICh0aGlzLl90ZXN0LmRvbmUp CisgICAgICAgICAgICB0aGlzLl90ZXN0LmRvbmUoKTsKICAgICAgICAgaWYgKHdpbmRvdy50ZXN0 UnVubmVyKQogICAgICAgICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CiAgICAgfQogfQog Ci1QZXJmVGVzdFJ1bm5lci5fcnVubmVyID0gZnVuY3Rpb24gKCkgeworUGVyZlRlc3RSdW5uZXIu X21lYXN1cmVUaW1lT25jZSA9IGZ1bmN0aW9uICgpIHsKICAgICB2YXIgc3RhcnQgPSB0aGlzLm5v dygpOwotICAgIHZhciByZXR1cm5WYWx1ZSA9IHRoaXMuX3J1bkZ1bmN0aW9uLmNhbGwod2luZG93 KTsKKyAgICB2YXIgcmV0dXJuVmFsdWUgPSB0aGlzLl90ZXN0LnJ1bi5jYWxsKHdpbmRvdyk7CiAg ICAgdmFyIGVuZCA9IHRoaXMubm93KCk7CiAKICAgICBpZiAocmV0dXJuVmFsdWUgLSAwID09PSBy ZXR1cm5WYWx1ZSkgewogICAgICAgICBpZiAocmV0dXJuVmFsdWUgPD0gMCkKICAgICAgICAgICAg IHRoaXMubG9nKCJydW5GdW5jdGlvbiByZXR1cm5lZCBhIG5vbi1wb3NpdGl2ZSB2YWx1ZTogIiAr IHJldHVyblZhbHVlKTsKLSAgICAgICAgdGltZSA9IHJldHVyblZhbHVlOwotICAgIH0gZWxzZQot ICAgICAgICB0aW1lID0gZW5kIC0gc3RhcnQ7Ci0KLSAgICB0aGlzLmlnbm9yZVdhcm1VcEFuZExv Zyh0aW1lKTsKLSAgICB0aGlzLl9ydW5Mb29wKCk7Ci19Ci0KLVBlcmZUZXN0UnVubmVyLnN0b3Jl SGVhcFJlc3VsdHMgPSBmdW5jdGlvbigpIHsKLSAgICBpZiAoIXdpbmRvdy5pbnRlcm5hbHMpCi0g ICAgICAgIHJldHVybjsKLSAgICB0aGlzLl9qc0hlYXBSZXN1bHRzLnB1c2godGhpcy5nZXRVc2Vk SlNIZWFwKCkpOwotICAgIHRoaXMuX21hbGxvY0hlYXBSZXN1bHRzLnB1c2godGhpcy5nZXRVc2Vk TWFsbG9jSGVhcCgpKTsKLX0KLQotUGVyZlRlc3RSdW5uZXIuZ2V0VXNlZE1hbGxvY0hlYXAgPSBm dW5jdGlvbigpIHsKLSAgICB2YXIgc3RhdHMgPSB3aW5kb3cuaW50ZXJuYWxzLm1hbGxvY1N0YXRp c3RpY3MoKTsKLSAgICByZXR1cm4gc3RhdHMuY29tbWl0dGVkVk1CeXRlcyAtIHN0YXRzLmZyZWVM aXN0Qnl0ZXM7Ci19Ci0KLVBlcmZUZXN0UnVubmVyLmdldFVzZWRKU0hlYXAgPSBmdW5jdGlvbigp IHsKLSAgICByZXR1cm4gY29uc29sZS5tZW1vcnkudXNlZEpTSGVhcFNpemU7Ci19Ci0KLVBlcmZU ZXN0UnVubmVyLmdldEFuZFByaW50TWVtb3J5U3RhdGlzdGljcyA9IGZ1bmN0aW9uKCkgewotICAg IGlmICghd2luZG93LmludGVybmFscykKLSAgICAgICAgcmV0dXJuOwotICAgIHZhciBqc01lbW9y eVN0YXRzID0gUGVyZlRlc3RSdW5uZXIuY29tcHV0ZVN0YXRpc3RpY3MoW1BlcmZUZXN0UnVubmVy LmdldFVzZWRKU0hlYXAoKV0sICJieXRlcyIpOwotICAgIFBlcmZUZXN0UnVubmVyLnByaW50U3Rh dGlzdGljcyhqc01lbW9yeVN0YXRzLCAiSlMgSGVhcDoiKTsKKyAgICAgICAgcmV0dXJuIHJldHVy blZhbHVlOworICAgIH0KIAotICAgIHZhciBtYWxsb2NNZW1vcnlTdGF0cyA9IFBlcmZUZXN0UnVu bmVyLmNvbXB1dGVTdGF0aXN0aWNzKFtQZXJmVGVzdFJ1bm5lci5nZXRVc2VkTWFsbG9jSGVhcCgp XSwgImJ5dGVzIik7Ci0gICAgUGVyZlRlc3RSdW5uZXIucHJpbnRTdGF0aXN0aWNzKG1hbGxvY01l bW9yeVN0YXRzLCAiTWFsbG9jOiIpOworICAgIHJldHVybiBlbmQgLSBzdGFydDsKIH0KIAogUGVy ZlRlc3RSdW5uZXIuaWdub3JlV2FybVVwQW5kTG9nID0gZnVuY3Rpb24gKHJlc3VsdCkgewpAQCAt MjA0LDQyICsyMDMsMzYgQEAgUGVyZlRlc3RSdW5uZXIuaWdub3JlV2FybVVwQW5kTG9nID0gZnVu YwogICAgIH0KIH0KIAotUGVyZlRlc3RSdW5uZXIuaW5pdEFuZFN0YXJ0TG9vcCA9IGZ1bmN0aW9u KCkgeworUGVyZlRlc3RSdW5uZXIuX3N0YXJ0ID0gZnVuY3Rpb24odGVzdCkgeworICAgIHRoaXMu X2Rlc2NyaXB0aW9uID0gdGVzdC5kZXNjcmlwdGlvbiB8fCAiIjsKICAgICB0aGlzLl9jb21wbGV0 ZWRSdW5zID0gLTE7Ci0gICAgdGhpcy5jdXN0b21SdW5GdW5jdGlvbiA9IG51bGw7CisgICAgdGhp cy5fY2FsbHNQZXJJdGVyYXRpb24gPSAxOworICAgIHRoaXMuX3Rlc3QgPSB0ZXN0OworCiAgICAg dGhpcy5fcmVzdWx0cyA9IFtdOwogICAgIHRoaXMuX2pzSGVhcFJlc3VsdHMgPSBbXTsKICAgICB0 aGlzLl9tYWxsb2NIZWFwUmVzdWx0cyA9IFtdOworCiAgICAgdGhpcy5fbG9nTGluZXMgPSB3aW5k b3cudGVzdFJ1bm5lciA/IFtdIDogbnVsbDsKICAgICB0aGlzLmxvZygiUnVubmluZyAiICsgdGhp cy5fcnVuQ291bnQgKyAiIHRpbWVzIik7Ci0gICAgdGhpcy5fcnVuTG9vcCgpOworICAgIHRoaXMu X3NjaGVkdWxlTmV4dE1lYXN1cmVtZW50T3JOb3RpZnlEb25lKCk7CiB9CiAKIFBlcmZUZXN0UnVu bmVyLm1lYXN1cmVUaW1lID0gZnVuY3Rpb24gKHRlc3QpIHsKLSAgICB0aGlzLl9ydW5GdW5jdGlv biA9IHRlc3QucnVuOwotICAgIHRoaXMuX2RvbmVGdW5jdGlvbiA9IHRlc3QuZG9uZSB8fCBmdW5j dGlvbiAoKSB7fTsKLSAgICB0aGlzLl9kZXNjcmlwdGlvbiA9IHRlc3QuZGVzY3JpcHRpb24gfHwg IiI7CiAgICAgdGhpcy5fcnVuQ291bnQgPSB0ZXN0LnJ1bkNvdW50IHx8IDIwOwotICAgIHRoaXMu X2NhbGxzUGVySXRlcmF0aW9uID0gMTsKICAgICB0aGlzLnVuaXQgPSAnbXMnOwotCi0gICAgdGhp cy5fdGVzdCA9IHRlc3Q7Ci0gICAgdGhpcy5pbml0QW5kU3RhcnRMb29wKCk7CisgICAgdGhpcy5f cnVubmVyID0gdGhpcy5fbWVhc3VyZVRpbWVPbmNlOworICAgIHRoaXMuX3N0YXJ0KHRlc3QpOwog fQogCiBQZXJmVGVzdFJ1bm5lci5ydW5QZXJTZWNvbmQgPSBmdW5jdGlvbiAodGVzdCkgewotICAg IHRoaXMuX2RvbmVGdW5jdGlvbiA9IHRlc3QuZG9uZSB8fCBmdW5jdGlvbiAoKSB7fTsKLSAgICB0 aGlzLl9kZXNjcmlwdGlvbiA9IHRlc3QuZGVzY3JpcHRpb24gfHwgIiI7CiAgICAgdGhpcy5fcnVu Q291bnQgPSAyMDsKLSAgICB0aGlzLl9jYWxsc1Blckl0ZXJhdGlvbiA9IDE7CiAgICAgdGhpcy51 bml0ID0gJ3J1bnMvcyc7Ci0KLSAgICB0aGlzLl90ZXN0ID0gdGVzdDsKLSAgICB0aGlzLl9ydW5u ZXIgPSB0aGlzLl9wZXJTZWNvbmRSdW5uZXI7Ci0gICAgdGhpcy5pbml0QW5kU3RhcnRMb29wKCk7 CisgICAgdGhpcy5fcnVubmVyID0gdGhpcy5fbWVhc3VyZVJ1bnNQZXJTZWNvbmRPbmNlOworICAg IHRoaXMuX3N0YXJ0KHRlc3QpOwogfQogCi1QZXJmVGVzdFJ1bm5lci5fcGVyU2Vjb25kUnVubmVy ID0gZnVuY3Rpb24gKCkgeworUGVyZlRlc3RSdW5uZXIuX21lYXN1cmVSdW5zUGVyU2Vjb25kT25j ZSA9IGZ1bmN0aW9uICgpIHsKICAgICB2YXIgdGltZVRvUnVuID0gdGhpcy5fdGVzdC50aW1lVG9S dW4gfHwgNzUwOwogICAgIHZhciB0b3RhbFRpbWUgPSAwOwogICAgIHZhciBpID0gMDsKQEAgLTI1 NiwxNCArMjQ5LDEzIEBAIFBlcmZUZXN0UnVubmVyLl9wZXJTZWNvbmRSdW5uZXIgPSBmdW5jdGkK ICAgICB9CiAgICAgdGhpcy5fY2FsbHNQZXJJdGVyYXRpb24gPSBjYWxsc1Blckl0ZXJhdGlvbjsK IAotICAgIHRoaXMuaWdub3JlV2FybVVwQW5kTG9nKGkgKiAxMDAwIC8gdG90YWxUaW1lKTsKLSAg ICB0aGlzLl9ydW5Mb29wKCk7CisgICAgcmV0dXJuIGkgKiAxMDAwIC8gdG90YWxUaW1lOwogfQog CiBQZXJmVGVzdFJ1bm5lci5fcGVyU2Vjb25kUnVubmVySXRlcmF0b3IgPSBmdW5jdGlvbiAoY2Fs bHNQZXJJdGVyYXRpb24pIHsKICAgICB2YXIgc3RhcnRUaW1lID0gdGhpcy5ub3coKTsKICAgICBm b3IgKHZhciBpID0gMDsgaSA8IGNhbGxzUGVySXRlcmF0aW9uOyBpKyspCi0gICAgICAgIHRoaXMu X3Rlc3QucnVuKCk7CisgICAgICAgIHRoaXMuX3Rlc3QucnVuLmNhbGwod2luZG93KTsKICAgICBy ZXR1cm4gdGhpcy5ub3coKSAtIHN0YXJ0VGltZTsKIH0KIAo= 166136 2012-09-27 20:56:15 -0700 2012-09-27 21:08:20 -0700 Fixed a typo in ChangeLog bug-97852-20120927205533.patch text/plain 8358 rniwa SW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1h bmNlVGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMjk4NDIpCisrKyBQZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA5LTI3ICBS eW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbW92ZSB1bnVzZWQg ZmVhdHVyZXMgYW5kIHJlZHVjZSBjb2RlIGR1cGxpY2F0aW9ucyBpbiBQZXJmVGVzdFJ1bm5lcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTc4NTIKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWRlIHRoZSBm b2xsb3dpbmcgcmVmYWN0b3JpbmcgY2hhbmdlczoKKyAgICAgICAgLSBSZW1vdmUgUGVyZlRlc3RS dW5uZXIuaW5mbyBzaW5jZSBpdCdzIG5ldmVyIHVzZWQuCisgICAgICAgIC0gTW92ZWQgdGhlIGpz IGhlYXAvbWFsbG9jIHJlbGF0ZWQgZnVuY3Rpb25zIHVwIHRvIHdoZXJlIHRoZXkgYmVsb25nLgor ICAgICAgICAtIE1vdmVkIHRoZSBpbml0aWFsaXphdGlvbiBvZiBfY2FsbHNQZXJJdGVyYXRpb24s IF90ZXN0LCBhbmQgLWRlc2NyaXB0aW9uIGludG8gX3N0YXJ0LAorICAgICAgICAgIGFuZCBzdG9w cGVkIGluaXRpYWxpemluZyBfcnVuRnVuY3Rpb24gYW5kIF9kb25lRnVuY3Rpb24gc2luY2UgYm90 aCB0ZXN0IHRpbWVzIG5vdworICAgICAgICAgIHVzZSBfdGVzdCBvYmplY3QuCisgICAgICAgIC0g TWFkZSBfbWVhc3VyZVRpbWVPbmNlIGFuZCBfbWVhc3VyZVJ1bnNQZXJTZWNvbmRPbmNlIHJldHVy biB0aGUgbWVhc3VyZWQgdmFsdWUKKyAgICAgICAgICBpbnN0ZWFkIG9mIGNhbGxpbmcgaWdub3Jl V2FybVVwQW5kTG9nIGFuZCBfcnVuTG9vcCB0byBzaGFyZSB0aGUgY29kZTsgdGhleSdyZSBub3cK KyAgICAgICAgICBjYWxsZWQgaW4gX21lYXN1cmVSdW5zUGVyU2Vjb25kT25jZS4KKworICAgICAg ICAqIHJlc291cmNlcy9ydW5uZXIuanM6CisgICAgICAgIChQZXJmVGVzdFJ1bm5lci5zdG9yZUhl YXBSZXN1bHRzKTogTW92ZWQuCisgICAgICAgIChQZXJmVGVzdFJ1bm5lci5nZXRVc2VkTWFsbG9j SGVhcCk6IE1vdmVkLgorICAgICAgICAoUGVyZlRlc3RSdW5uZXIuZ2V0VXNlZEpTSGVhcCk6IE1v dmVkLgorICAgICAgICAoUGVyZlRlc3RSdW5uZXIuZ2V0QW5kUHJpbnRNZW1vcnlTdGF0aXN0aWNz KTogTW92ZWQuCisgICAgICAgIChQZXJmVGVzdFJ1bm5lci5fc2NoZWR1bGVOZXh0TWVhc3VyZW1l bnRPck5vdGlmeURvbmUpOiBSZW5hbWVkIGZyb20gX3J1bkxvb3AuIENhbGxzCisgICAgICAgIGln bm9yZVdhcm1VcEFuZExvZyBhbmQgc2NoZWR1bGVzIHRoZSBuZXh0IGNhbGwuCisgICAgICAgIChQ ZXJmVGVzdFJ1bm5lci5fbWVhc3VyZVRpbWVPbmNlKTogUmVuYW1lZCBmcm9tIF9ydW5uZXIuCisg ICAgICAgIChQZXJmVGVzdFJ1bm5lci5fc3RhcnQpOiBSZW5hbWVkIGZyb20gaW5pdEFuZFN0YXJ0 TG9vcC4KKyAgICAgICAgKFBlcmZUZXN0UnVubmVyLm1lYXN1cmVUaW1lKToKKyAgICAgICAgKFBl cmZUZXN0UnVubmVyLnJ1blBlclNlY29uZCk6CisgICAgICAgIChQZXJmVGVzdFJ1bm5lci5fbWVh c3VyZVJ1bnNQZXJTZWNvbmRPbmNlKTogUmVuYW1lZCBmcm9tIF9tZWFzdXJlUnVuc1BlclNlY29u ZE9uY2UuCisgICAgICAgIChQZXJmVGVzdFJ1bm5lci5fcGVyU2Vjb25kUnVubmVySXRlcmF0b3Ip OgorCiAyMDEyLTA5LTI3ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFBlcmZUZXN0UnVubmVyLnJ1biBzaG91bGQgdGFrZSBhbiBvYmplY3QKSW5kZXg6IFBlcmZv cm1hbmNlVGVzdHMvcmVzb3VyY2VzL3J1bm5lci5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBQZXJmb3JtYW5j ZVRlc3RzL3Jlc291cmNlcy9ydW5uZXIuanMJKHJldmlzaW9uIDEyOTgzMCkKKysrIFBlcmZvcm1h bmNlVGVzdHMvcmVzb3VyY2VzL3J1bm5lci5qcwkod29ya2luZyBjb3B5KQpAQCAtNDMsMTAgKzQz LDYgQEAgUGVyZlRlc3RSdW5uZXIubG9nID0gZnVuY3Rpb24gKHRleHQpIHsKICAgICB3aW5kb3cu c2Nyb2xsVG8oMCwgZG9jdW1lbnQuYm9keS5oZWlnaHQpOwogfQogCi1QZXJmVGVzdFJ1bm5lci5p bmZvID0gZnVuY3Rpb24gKHRleHQpIHsKLSAgICB0aGlzLmxvZygiSW5mbzogIiArIHRleHQpOwot fQotCiBQZXJmVGVzdFJ1bm5lci5sb2dJbmZvID0gZnVuY3Rpb24gKHRleHQpIHsKICAgICBpZiAo IXdpbmRvdy50ZXN0UnVubmVyKQogICAgICAgICB0aGlzLmxvZyh0ZXh0KTsKQEAgLTEwOSw2ICsx MDUsMzIgQEAgUGVyZlRlc3RSdW5uZXIucHJpbnRTdGF0aXN0aWNzID0gZnVuY3RpbwogICAgIHRo aXMubG9nKCJtYXggIiArIHN0YXRpc3RpY3MubWF4ICsgIiAiICsgc3RhdGlzdGljcy51bml0KTsK IH0KIAorUGVyZlRlc3RSdW5uZXIuc3RvcmVIZWFwUmVzdWx0cyA9IGZ1bmN0aW9uKCkgeworICAg IGlmICghd2luZG93LmludGVybmFscykKKyAgICAgICAgcmV0dXJuOworICAgIHRoaXMuX2pzSGVh cFJlc3VsdHMucHVzaCh0aGlzLmdldFVzZWRKU0hlYXAoKSk7CisgICAgdGhpcy5fbWFsbG9jSGVh cFJlc3VsdHMucHVzaCh0aGlzLmdldFVzZWRNYWxsb2NIZWFwKCkpOworfQorCitQZXJmVGVzdFJ1 bm5lci5nZXRVc2VkTWFsbG9jSGVhcCA9IGZ1bmN0aW9uKCkgeworICAgIHZhciBzdGF0cyA9IHdp bmRvdy5pbnRlcm5hbHMubWFsbG9jU3RhdGlzdGljcygpOworICAgIHJldHVybiBzdGF0cy5jb21t aXR0ZWRWTUJ5dGVzIC0gc3RhdHMuZnJlZUxpc3RCeXRlczsKK30KKworUGVyZlRlc3RSdW5uZXIu Z2V0VXNlZEpTSGVhcCA9IGZ1bmN0aW9uKCkgeworICAgIHJldHVybiBjb25zb2xlLm1lbW9yeS51 c2VkSlNIZWFwU2l6ZTsKK30KKworUGVyZlRlc3RSdW5uZXIuZ2V0QW5kUHJpbnRNZW1vcnlTdGF0 aXN0aWNzID0gZnVuY3Rpb24oKSB7CisgICAgaWYgKCF3aW5kb3cuaW50ZXJuYWxzKQorICAgICAg ICByZXR1cm47CisgICAgdmFyIGpzTWVtb3J5U3RhdHMgPSBQZXJmVGVzdFJ1bm5lci5jb21wdXRl U3RhdGlzdGljcyhbUGVyZlRlc3RSdW5uZXIuZ2V0VXNlZEpTSGVhcCgpXSwgImJ5dGVzIik7Cisg ICAgUGVyZlRlc3RSdW5uZXIucHJpbnRTdGF0aXN0aWNzKGpzTWVtb3J5U3RhdHMsICJKUyBIZWFw OiIpOworCisgICAgdmFyIG1hbGxvY01lbW9yeVN0YXRzID0gUGVyZlRlc3RSdW5uZXIuY29tcHV0 ZVN0YXRpc3RpY3MoW1BlcmZUZXN0UnVubmVyLmdldFVzZWRNYWxsb2NIZWFwKCldLCAiYnl0ZXMi KTsKKyAgICBQZXJmVGVzdFJ1bm5lci5wcmludFN0YXRpc3RpY3MobWFsbG9jTWVtb3J5U3RhdHMs ICJNYWxsb2M6Iik7Cit9CisKIFBlcmZUZXN0UnVubmVyLmdjID0gZnVuY3Rpb24gKCkgewogICAg IGlmICh3aW5kb3cuR0NDb250cm9sbGVyKQogICAgICAgICB3aW5kb3cuR0NDb250cm9sbGVyLmNv bGxlY3QoKTsKQEAgLTEyNSwxMCArMTQ3LDE0IEBAIFBlcmZUZXN0UnVubmVyLmdjID0gZnVuY3Rp b24gKCkgewogICAgIH0KIH0KIAotUGVyZlRlc3RSdW5uZXIuX3J1bkxvb3AgPSBmdW5jdGlvbiAo KSB7CitQZXJmVGVzdFJ1bm5lci5fc2NoZWR1bGVOZXh0TWVhc3VyZW1lbnRPck5vdGlmeURvbmUg PSBmdW5jdGlvbiAoKSB7CiAgICAgaWYgKHRoaXMuX2NvbXBsZXRlZFJ1bnMgPCB0aGlzLl9ydW5D b3VudCkgewogICAgICAgICB0aGlzLmdjKCk7Ci0gICAgICAgIHdpbmRvdy5zZXRUaW1lb3V0KGZ1 bmN0aW9uICgpIHsgUGVyZlRlc3RSdW5uZXIuX3J1bm5lcigpOyB9LCAwKTsKKyAgICAgICAgd2lu ZG93LnNldFRpbWVvdXQoZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgdmFyIG1lYXN1cmVkVmFs dWUgPSBQZXJmVGVzdFJ1bm5lci5fcnVubmVyKCk7CisgICAgICAgICAgICBQZXJmVGVzdFJ1bm5l ci5pZ25vcmVXYXJtVXBBbmRMb2cobWVhc3VyZWRWYWx1ZSk7CisgICAgICAgICAgICBQZXJmVGVz dFJ1bm5lci5fc2NoZWR1bGVOZXh0TWVhc3VyZW1lbnRPck5vdGlmeURvbmUoKTsKKyAgICAgICAg fSwgMCk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgaWYgKHRoaXMuX2Rlc2NyaXB0aW9uKQogICAg ICAgICAgICAgdGhpcy5sb2coIkRlc2NyaXB0aW9uOiAiICsgdGhpcy5fZGVzY3JpcHRpb24pOwpA QCAtMTQzLDUyICsxNjksMjUgQEAgUGVyZlRlc3RSdW5uZXIuX3J1bkxvb3AgPSBmdW5jdGlvbiAo KSB7CiAgICAgICAgICAgICB2YXIgc2VsZiA9IHRoaXM7CiAgICAgICAgICAgICBsb2dMaW5lcy5m b3JFYWNoKGZ1bmN0aW9uKHRleHQpIHsgc2VsZi5sb2codGV4dCk7IH0pOwogICAgICAgICB9Ci0g ICAgICAgIHRoaXMuX2RvbmVGdW5jdGlvbigpOworICAgICAgICBpZiAodGhpcy5fdGVzdC5kb25l KQorICAgICAgICAgICAgdGhpcy5fdGVzdC5kb25lKCk7CiAgICAgICAgIGlmICh3aW5kb3cudGVz dFJ1bm5lcikKICAgICAgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOwogICAgIH0KIH0K IAotUGVyZlRlc3RSdW5uZXIuX3J1bm5lciA9IGZ1bmN0aW9uICgpIHsKK1BlcmZUZXN0UnVubmVy Ll9tZWFzdXJlVGltZU9uY2UgPSBmdW5jdGlvbiAoKSB7CiAgICAgdmFyIHN0YXJ0ID0gdGhpcy5u b3coKTsKLSAgICB2YXIgcmV0dXJuVmFsdWUgPSB0aGlzLl9ydW5GdW5jdGlvbi5jYWxsKHdpbmRv dyk7CisgICAgdmFyIHJldHVyblZhbHVlID0gdGhpcy5fdGVzdC5ydW4uY2FsbCh3aW5kb3cpOwog ICAgIHZhciBlbmQgPSB0aGlzLm5vdygpOwogCiAgICAgaWYgKHJldHVyblZhbHVlIC0gMCA9PT0g cmV0dXJuVmFsdWUpIHsKICAgICAgICAgaWYgKHJldHVyblZhbHVlIDw9IDApCiAgICAgICAgICAg ICB0aGlzLmxvZygicnVuRnVuY3Rpb24gcmV0dXJuZWQgYSBub24tcG9zaXRpdmUgdmFsdWU6ICIg KyByZXR1cm5WYWx1ZSk7Ci0gICAgICAgIHRpbWUgPSByZXR1cm5WYWx1ZTsKLSAgICB9IGVsc2UK LSAgICAgICAgdGltZSA9IGVuZCAtIHN0YXJ0OwotCi0gICAgdGhpcy5pZ25vcmVXYXJtVXBBbmRM b2codGltZSk7Ci0gICAgdGhpcy5fcnVuTG9vcCgpOwotfQotCi1QZXJmVGVzdFJ1bm5lci5zdG9y ZUhlYXBSZXN1bHRzID0gZnVuY3Rpb24oKSB7Ci0gICAgaWYgKCF3aW5kb3cuaW50ZXJuYWxzKQot ICAgICAgICByZXR1cm47Ci0gICAgdGhpcy5fanNIZWFwUmVzdWx0cy5wdXNoKHRoaXMuZ2V0VXNl ZEpTSGVhcCgpKTsKLSAgICB0aGlzLl9tYWxsb2NIZWFwUmVzdWx0cy5wdXNoKHRoaXMuZ2V0VXNl ZE1hbGxvY0hlYXAoKSk7Ci19Ci0KLVBlcmZUZXN0UnVubmVyLmdldFVzZWRNYWxsb2NIZWFwID0g ZnVuY3Rpb24oKSB7Ci0gICAgdmFyIHN0YXRzID0gd2luZG93LmludGVybmFscy5tYWxsb2NTdGF0 aXN0aWNzKCk7Ci0gICAgcmV0dXJuIHN0YXRzLmNvbW1pdHRlZFZNQnl0ZXMgLSBzdGF0cy5mcmVl TGlzdEJ5dGVzOwotfQotCi1QZXJmVGVzdFJ1bm5lci5nZXRVc2VkSlNIZWFwID0gZnVuY3Rpb24o KSB7Ci0gICAgcmV0dXJuIGNvbnNvbGUubWVtb3J5LnVzZWRKU0hlYXBTaXplOwotfQotCi1QZXJm VGVzdFJ1bm5lci5nZXRBbmRQcmludE1lbW9yeVN0YXRpc3RpY3MgPSBmdW5jdGlvbigpIHsKLSAg ICBpZiAoIXdpbmRvdy5pbnRlcm5hbHMpCi0gICAgICAgIHJldHVybjsKLSAgICB2YXIganNNZW1v cnlTdGF0cyA9IFBlcmZUZXN0UnVubmVyLmNvbXB1dGVTdGF0aXN0aWNzKFtQZXJmVGVzdFJ1bm5l ci5nZXRVc2VkSlNIZWFwKCldLCAiYnl0ZXMiKTsKLSAgICBQZXJmVGVzdFJ1bm5lci5wcmludFN0 YXRpc3RpY3MoanNNZW1vcnlTdGF0cywgIkpTIEhlYXA6Iik7CisgICAgICAgIHJldHVybiByZXR1 cm5WYWx1ZTsKKyAgICB9CiAKLSAgICB2YXIgbWFsbG9jTWVtb3J5U3RhdHMgPSBQZXJmVGVzdFJ1 bm5lci5jb21wdXRlU3RhdGlzdGljcyhbUGVyZlRlc3RSdW5uZXIuZ2V0VXNlZE1hbGxvY0hlYXAo KV0sICJieXRlcyIpOwotICAgIFBlcmZUZXN0UnVubmVyLnByaW50U3RhdGlzdGljcyhtYWxsb2NN ZW1vcnlTdGF0cywgIk1hbGxvYzoiKTsKKyAgICByZXR1cm4gZW5kIC0gc3RhcnQ7CiB9CiAKIFBl cmZUZXN0UnVubmVyLmlnbm9yZVdhcm1VcEFuZExvZyA9IGZ1bmN0aW9uIChyZXN1bHQpIHsKQEAg LTIwNCw0MiArMjAzLDM2IEBAIFBlcmZUZXN0UnVubmVyLmlnbm9yZVdhcm1VcEFuZExvZyA9IGZ1 bmMKICAgICB9CiB9CiAKLVBlcmZUZXN0UnVubmVyLmluaXRBbmRTdGFydExvb3AgPSBmdW5jdGlv bigpIHsKK1BlcmZUZXN0UnVubmVyLl9zdGFydCA9IGZ1bmN0aW9uKHRlc3QpIHsKKyAgICB0aGlz Ll9kZXNjcmlwdGlvbiA9IHRlc3QuZGVzY3JpcHRpb24gfHwgIiI7CiAgICAgdGhpcy5fY29tcGxl dGVkUnVucyA9IC0xOwotICAgIHRoaXMuY3VzdG9tUnVuRnVuY3Rpb24gPSBudWxsOworICAgIHRo aXMuX2NhbGxzUGVySXRlcmF0aW9uID0gMTsKKyAgICB0aGlzLl90ZXN0ID0gdGVzdDsKKwogICAg IHRoaXMuX3Jlc3VsdHMgPSBbXTsKICAgICB0aGlzLl9qc0hlYXBSZXN1bHRzID0gW107CiAgICAg dGhpcy5fbWFsbG9jSGVhcFJlc3VsdHMgPSBbXTsKKwogICAgIHRoaXMuX2xvZ0xpbmVzID0gd2lu ZG93LnRlc3RSdW5uZXIgPyBbXSA6IG51bGw7CiAgICAgdGhpcy5sb2coIlJ1bm5pbmcgIiArIHRo aXMuX3J1bkNvdW50ICsgIiB0aW1lcyIpOwotICAgIHRoaXMuX3J1bkxvb3AoKTsKKyAgICB0aGlz Ll9zY2hlZHVsZU5leHRNZWFzdXJlbWVudE9yTm90aWZ5RG9uZSgpOwogfQogCiBQZXJmVGVzdFJ1 bm5lci5tZWFzdXJlVGltZSA9IGZ1bmN0aW9uICh0ZXN0KSB7Ci0gICAgdGhpcy5fcnVuRnVuY3Rp b24gPSB0ZXN0LnJ1bjsKLSAgICB0aGlzLl9kb25lRnVuY3Rpb24gPSB0ZXN0LmRvbmUgfHwgZnVu Y3Rpb24gKCkge307Ci0gICAgdGhpcy5fZGVzY3JpcHRpb24gPSB0ZXN0LmRlc2NyaXB0aW9uIHx8 ICIiOwogICAgIHRoaXMuX3J1bkNvdW50ID0gdGVzdC5ydW5Db3VudCB8fCAyMDsKLSAgICB0aGlz Ll9jYWxsc1Blckl0ZXJhdGlvbiA9IDE7CiAgICAgdGhpcy51bml0ID0gJ21zJzsKLQotICAgIHRo aXMuX3Rlc3QgPSB0ZXN0OwotICAgIHRoaXMuaW5pdEFuZFN0YXJ0TG9vcCgpOworICAgIHRoaXMu X3J1bm5lciA9IHRoaXMuX21lYXN1cmVUaW1lT25jZTsKKyAgICB0aGlzLl9zdGFydCh0ZXN0KTsK IH0KIAogUGVyZlRlc3RSdW5uZXIucnVuUGVyU2Vjb25kID0gZnVuY3Rpb24gKHRlc3QpIHsKLSAg ICB0aGlzLl9kb25lRnVuY3Rpb24gPSB0ZXN0LmRvbmUgfHwgZnVuY3Rpb24gKCkge307Ci0gICAg dGhpcy5fZGVzY3JpcHRpb24gPSB0ZXN0LmRlc2NyaXB0aW9uIHx8ICIiOwogICAgIHRoaXMuX3J1 bkNvdW50ID0gMjA7Ci0gICAgdGhpcy5fY2FsbHNQZXJJdGVyYXRpb24gPSAxOwogICAgIHRoaXMu dW5pdCA9ICdydW5zL3MnOwotCi0gICAgdGhpcy5fdGVzdCA9IHRlc3Q7Ci0gICAgdGhpcy5fcnVu bmVyID0gdGhpcy5fcGVyU2Vjb25kUnVubmVyOwotICAgIHRoaXMuaW5pdEFuZFN0YXJ0TG9vcCgp OworICAgIHRoaXMuX3J1bm5lciA9IHRoaXMuX21lYXN1cmVSdW5zUGVyU2Vjb25kT25jZTsKKyAg ICB0aGlzLl9zdGFydCh0ZXN0KTsKIH0KIAotUGVyZlRlc3RSdW5uZXIuX3BlclNlY29uZFJ1bm5l ciA9IGZ1bmN0aW9uICgpIHsKK1BlcmZUZXN0UnVubmVyLl9tZWFzdXJlUnVuc1BlclNlY29uZE9u Y2UgPSBmdW5jdGlvbiAoKSB7CiAgICAgdmFyIHRpbWVUb1J1biA9IHRoaXMuX3Rlc3QudGltZVRv UnVuIHx8IDc1MDsKICAgICB2YXIgdG90YWxUaW1lID0gMDsKICAgICB2YXIgaSA9IDA7CkBAIC0y NTYsMTQgKzI0OSwxMyBAQCBQZXJmVGVzdFJ1bm5lci5fcGVyU2Vjb25kUnVubmVyID0gZnVuY3Rp CiAgICAgfQogICAgIHRoaXMuX2NhbGxzUGVySXRlcmF0aW9uID0gY2FsbHNQZXJJdGVyYXRpb247 CiAKLSAgICB0aGlzLmlnbm9yZVdhcm1VcEFuZExvZyhpICogMTAwMCAvIHRvdGFsVGltZSk7Ci0g ICAgdGhpcy5fcnVuTG9vcCgpOworICAgIHJldHVybiBpICogMTAwMCAvIHRvdGFsVGltZTsKIH0K IAogUGVyZlRlc3RSdW5uZXIuX3BlclNlY29uZFJ1bm5lckl0ZXJhdG9yID0gZnVuY3Rpb24gKGNh bGxzUGVySXRlcmF0aW9uKSB7CiAgICAgdmFyIHN0YXJ0VGltZSA9IHRoaXMubm93KCk7CiAgICAg Zm9yICh2YXIgaSA9IDA7IGkgPCBjYWxsc1Blckl0ZXJhdGlvbjsgaSsrKQotICAgICAgICB0aGlz Ll90ZXN0LnJ1bigpOworICAgICAgICB0aGlzLl90ZXN0LnJ1bi5jYWxsKHdpbmRvdyk7CiAgICAg cmV0dXJuIHRoaXMubm93KCkgLSBzdGFydFRpbWU7CiB9CiAK