156002 2016-03-29 19:45:38 -0700 Remove unused ScriptProfiler.Samples.totalTime 2016-03-30 17:40:42 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck joepeck bburg ggaren joepeck saam timothy oldest_to_newest 1178925 0 joepeck 2016-03-29 19:45:38 -0700 * SUMMARY Remove unused ScriptProfiler.Samples.totalTime. We don't use the ScriptProfiler's concept of totalExecutionTime. So lets just remove it. 1178927 1 275167 joepeck 2016-03-29 19:47:36 -0700 Created attachment 275167 [PATCH] Proposed Fix 1178962 2 275167 saam 2016-03-29 21:34:14 -0700 Comment on attachment 275167 [PATCH] Proposed Fix r=me 1179255 3 joepeck 2016-03-30 17:40:42 -0700 <http://trac.webkit.org/changeset/198867> 275167 2016-03-29 19:47:36 -0700 2016-03-29 21:34:14 -0700 [PATCH] Proposed Fix rm-totalExecutionTime.patch text/plain 9610 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDZhNjZhOTcuLmI5NTFjYzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE2LTAzLTI5ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgUmVtb3ZlIHVudXNlZCBTY3JpcHRQ cm9maWxlci5TYW1wbGVzLnRvdGFsVGltZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTU2MDAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclNjcmlwdFByb2Zp bGVyQWdlbnQuY3BwOgorICAgICAgICAoSW5zcGVjdG9yOjpidWlsZFNhbXBsZXMpOgorICAgICAg ICAoSW5zcGVjdG9yOjpJbnNwZWN0b3JTY3JpcHRQcm9maWxlckFnZW50Ojp0cmFja2luZ0NvbXBs ZXRlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvcHJvdG9jb2wvU2NyaXB0UHJvZmlsZXIuanNvbjoK KyAgICAgICAgUmVtb3ZlIHRvdGFsVGltZS4KKworICAgICAgICAqIHJ1bnRpbWUvU2FtcGxpbmdQ cm9maWxlci5jcHA6CisgICAgICAgIChKU0M6OlNhbXBsaW5nUHJvZmlsZXI6OlNhbXBsaW5nUHJv ZmlsZXIpOiBEZWxldGVkLgorICAgICAgICAqIHJ1bnRpbWUvU2FtcGxpbmdQcm9maWxlci5oOgor ICAgICAgICAoSlNDOjpTYW1wbGluZ1Byb2ZpbGVyOjp0b3RhbFRpbWUpOiBEZWxldGVkLgorICAg ICAgICBSZW1vdmUgbm93IHVudXNlZCBtX3RvdGFsVGltZS4KKworMjAxNi0wMy0yOSAgSm9zZXBo IFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIEpTQzo6RGVidWdnZXIg Y2xlYW51cCBhZnRlciByZWNlbnQgY2hhbmdlcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1OTgyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclNjcmlwdFByb2ZpbGVyQWdlbnQuY3Bw IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yU2NyaXB0 UHJvZmlsZXJBZ2VudC5jcHAKaW5kZXggOGM0ZmQxMi4uMDhlN2UzMCAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yU2NyaXB0UHJvZmls ZXJBZ2VudC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9hZ2VudHMv SW5zcGVjdG9yU2NyaXB0UHJvZmlsZXJBZ2VudC5jcHAKQEAgLTE1Nyw3ICsxNTcsNyBAQCB2b2lk IEluc3BlY3RvclNjcmlwdFByb2ZpbGVyQWdlbnQ6OmFkZEV2ZW50KGRvdWJsZSBzdGFydFRpbWUs IGRvdWJsZSBlbmRUaW1lLCBQcgogfQogCiAjaWYgRU5BQkxFKFNBTVBMSU5HX1BST0ZJTEVSKQot c3RhdGljIFJlZjxQcm90b2NvbDo6U2NyaXB0UHJvZmlsZXI6OlNhbXBsZXM+IGJ1aWxkU2FtcGxl cyhWTSYgdm0sIFZlY3RvcjxTYW1wbGluZ1Byb2ZpbGVyOjpTdGFja1RyYWNlPiYmIHNhbXBsaW5n UHJvZmlsZXJTdGFja1RyYWNlcywgZG91YmxlIHRvdGFsVGltZSkKK3N0YXRpYyBSZWY8UHJvdG9j b2w6OlNjcmlwdFByb2ZpbGVyOjpTYW1wbGVzPiBidWlsZFNhbXBsZXMoVk0mIHZtLCBWZWN0b3I8 U2FtcGxpbmdQcm9maWxlcjo6U3RhY2tUcmFjZT4mJiBzYW1wbGluZ1Byb2ZpbGVyU3RhY2tUcmFj ZXMpCiB7CiAgICAgUmVmPFByb3RvY29sOjpBcnJheTxQcm90b2NvbDo6U2NyaXB0UHJvZmlsZXI6 OlN0YWNrVHJhY2U+PiBzdGFja1RyYWNlcyA9IFByb3RvY29sOjpBcnJheTxQcm90b2NvbDo6U2Ny aXB0UHJvZmlsZXI6OlN0YWNrVHJhY2U+OjpjcmVhdGUoKTsKICAgICBmb3IgKFNhbXBsaW5nUHJv ZmlsZXI6OlN0YWNrVHJhY2UmIHN0YWNrVHJhY2UgOiBzYW1wbGluZ1Byb2ZpbGVyU3RhY2tUcmFj ZXMpIHsKQEAgLTE5MCw3ICsxOTAsNiBAQCBzdGF0aWMgUmVmPFByb3RvY29sOjpTY3JpcHRQcm9m aWxlcjo6U2FtcGxlcz4gYnVpbGRTYW1wbGVzKFZNJiB2bSwgVmVjdG9yPFNhbXBsaQogCiAgICAg cmV0dXJuIFByb3RvY29sOjpTY3JpcHRQcm9maWxlcjo6U2FtcGxlczo6Y3JlYXRlKCkKICAgICAg ICAgLnNldFN0YWNrVHJhY2VzKFdURk1vdmUoc3RhY2tUcmFjZXMpKQotICAgICAgICAuc2V0VG90 YWxUaW1lKHRvdGFsVGltZSkKICAgICAgICAgLnJlbGVhc2UoKTsKIH0KICNlbmRpZiAvLyBFTkFC TEUoU0FNUExJTkdfUFJPRklMRVIpCkBAIC0yMDUsNyArMjA0LDcgQEAgdm9pZCBJbnNwZWN0b3JT Y3JpcHRQcm9maWxlckFnZW50Ojp0cmFja2luZ0NvbXBsZXRlKCkKICAgICAgICAgTG9ja0hvbGRl ciBsb2NrZXIoc2FtcGxpbmdQcm9maWxlci0+Z2V0TG9jaygpKTsKICAgICAgICAgc2FtcGxpbmdQ cm9maWxlci0+c3RvcChsb2NrZXIpOwogICAgICAgICBWZWN0b3I8U2FtcGxpbmdQcm9maWxlcjo6 U3RhY2tUcmFjZT4gc3RhY2tUcmFjZXMgPSBzYW1wbGluZ1Byb2ZpbGVyLT5yZWxlYXNlU3RhY2tU cmFjZXMobG9ja2VyKTsKLSAgICAgICAgUmVmPFByb3RvY29sOjpTY3JpcHRQcm9maWxlcjo6U2Ft cGxlcz4gc2FtcGxlcyA9IGJ1aWxkU2FtcGxlcyhtX2Vudmlyb25tZW50LnNjcmlwdERlYnVnU2Vy dmVyKCkudm0oKSwgV1RGTW92ZShzdGFja1RyYWNlcyksIHNhbXBsaW5nUHJvZmlsZXItPnRvdGFs VGltZShsb2NrZXIpKTsKKyAgICAgICAgUmVmPFByb3RvY29sOjpTY3JpcHRQcm9maWxlcjo6U2Ft cGxlcz4gc2FtcGxlcyA9IGJ1aWxkU2FtcGxlcyhtX2Vudmlyb25tZW50LnNjcmlwdERlYnVnU2Vy dmVyKCkudm0oKSwgV1RGTW92ZShzdGFja1RyYWNlcykpOwogCiAgICAgICAgIGxvY2tlci51bmxv Y2tFYXJseSgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9y L3Byb3RvY29sL1NjcmlwdFByb2ZpbGVyLmpzb24gYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5z cGVjdG9yL3Byb3RvY29sL1NjcmlwdFByb2ZpbGVyLmpzb24KaW5kZXggYzU2ZGE3MC4uOTc4ZDdm ZiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9T Y3JpcHRQcm9maWxlci5qc29uCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Iv cHJvdG9jb2wvU2NyaXB0UHJvZmlsZXIuanNvbgpAQCAtNDgsNyArNDgsNiBAQAogICAgICAgICAg ICAgImlkIjogIlNhbXBsZXMiLAogICAgICAgICAgICAgInR5cGUiOiAib2JqZWN0IiwKICAgICAg ICAgICAgICJwcm9wZXJ0aWVzIjogWwotICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidG90YWxU aW1lIiwgInR5cGUiOiAibnVtYmVyIiwgImRlc2NyaXB0aW9uIjogIlRvdGFsIGV4ZWN1dGlvbiB0 aW1lIG9mIHRoZSBwcm9maWxlcidzIGRhdGEuIChOb3RlOiBub3QgdG90YWwgZWxhcHNlZCB0aW1l LikiIH0sCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzdGFja1RyYWNlcyIsICJ0eXBlIjog ImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiI6ICJTdGFja1RyYWNlIiB9IH0KICAgICAgICAgICAg IF0KICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv U2FtcGxpbmdQcm9maWxlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TYW1w bGluZ1Byb2ZpbGVyLmNwcAppbmRleCBkY2I5MDU2Li42MDk4MmRhYSAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2FtcGxpbmdQcm9maWxlci5jcHAKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2FtcGxpbmdQcm9maWxlci5jcHAKQEAgLTE4Niw3 ICsxODYsNiBAQCBTYW1wbGluZ1Byb2ZpbGVyOjpTYW1wbGluZ1Byb2ZpbGVyKFZNJiB2bSwgUmVm UHRyPFN0b3B3YXRjaD4mJiBzdG9wd2F0Y2gpCiAgICAgOiBtX3ZtKHZtKQogICAgICwgbV9zdG9w d2F0Y2goV1RGTW92ZShzdG9wd2F0Y2gpKQogICAgICwgbV90aW1pbmdJbnRlcnZhbChzdGQ6OmNo cm9ubzo6bWljcm9zZWNvbmRzKDEwMDApKQotICAgICwgbV90b3RhbFRpbWUoMCkKICAgICAsIG1f dGltZXJRdWV1ZShXb3JrUXVldWU6OmNyZWF0ZSgianNjLnNhbXBsaW5nLXByb2ZpbGVyLnF1ZXVl IiwgV29ya1F1ZXVlOjpUeXBlOjpTZXJpYWwsIFdvcmtRdWV1ZTo6UU9TOjpVc2VySW50ZXJhY3Rp dmUpKQogICAgICwgbV9qc2NFeGVjdXRpb25UaHJlYWQobnVsbHB0cikKICAgICAsIG1faXNBY3Rp dmUoZmFsc2UpCkBAIC0yNzgsOCArMjc3LDYgQEAgU2FtcGxpbmdQcm9maWxlcjo6U2FtcGxpbmdQ cm9maWxlcihWTSYgdm0sIFJlZlB0cjxTdG9wd2F0Y2g+JiYgc3RvcHdhdGNoKQogCiAgICAgICAg ICAgICAgICAgICAgIGlmIChkaWRSdW5PdXRPZlZlY3RvclNwYWNlKQogICAgICAgICAgICAgICAg ICAgICAgICAgbV9jdXJyZW50RnJhbWVzLmdyb3cobV9jdXJyZW50RnJhbWVzLnNpemUoKSAqIDEu MjUpOwotCi0gICAgICAgICAgICAgICAgICAgIG1fdG90YWxUaW1lICs9IG5vd1RpbWUgLSBtX2xh c3RUaW1lOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgfQpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2FtcGxpbmdQcm9maWxlci5o IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2FtcGxpbmdQcm9maWxlci5oCmluZGV4 IGJkOWQ5NDIuLjA5NzMyN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL1NhbXBsaW5nUHJvZmlsZXIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9TYW1wbGluZ1Byb2ZpbGVyLmgKQEAgLTEzNiw3ICsxMzYsNiBAQCBwdWJsaWM6CiAgICAgSlNf RVhQT1JUX1BSSVZBVEUgdm9pZCBub3RpY2VDdXJyZW50VGhyZWFkQXNKU0NFeGVjdXRpb25UaHJl YWQoKTsKICAgICB2b2lkIG5vdGljZUN1cnJlbnRUaHJlYWRBc0pTQ0V4ZWN1dGlvblRocmVhZChj b25zdCBMb2NrSG9sZGVyJik7CiAgICAgdm9pZCBwcm9jZXNzVW52ZXJpZmllZFN0YWNrVHJhY2Vz KCk7IC8vIFlvdSBzaG91bGQgY2FsbCB0aGlzIG9ubHkgYWZ0ZXIgYWNxdWlyaW5nIHRoZSBsb2Nr LgotICAgIGRvdWJsZSB0b3RhbFRpbWUoY29uc3QgTG9ja0hvbGRlciYpIHsgcmV0dXJuIG1fdG90 YWxUaW1lOyB9CiAgICAgdm9pZCBzZXRTdG9wV2F0Y2goY29uc3QgTG9ja0hvbGRlciYsIFJlZjxT dG9wd2F0Y2g+JiYgc3RvcHdhdGNoKSB7IG1fc3RvcHdhdGNoID0gV1RGTW92ZShzdG9wd2F0Y2gp OyB9CiAKIHByaXZhdGU6CkBAIC0xNTEsNyArMTUwLDYgQEAgcHJpdmF0ZToKICAgICBWZWN0b3I8 VW5wcm9jZXNzZWRTdGFja1RyYWNlPiBtX3VucHJvY2Vzc2VkU3RhY2tUcmFjZXM7CiAgICAgc3Rk OjpjaHJvbm86Om1pY3Jvc2Vjb25kcyBtX3RpbWluZ0ludGVydmFsOwogICAgIGRvdWJsZSBtX2xh c3RUaW1lOwotICAgIGRvdWJsZSBtX3RvdGFsVGltZTsKICAgICBSZWY8V29ya1F1ZXVlPiBtX3Rp bWVyUXVldWU7CiAgICAgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBtX2hhbmRsZXI7CiAgICAgTG9j ayBtX2xvY2s7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIv U291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAwNmJmNzU1Li40N2Y0NzJmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMCBAQAogMjAxNi0wMy0yOSAgSm9z ZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCisgICAgICAgIFJlbW92ZSB1bnVz ZWQgU2NyaXB0UHJvZmlsZXIuU2FtcGxlcy50b3RhbFRpbWUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjAwMgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9U aW1lbGluZU1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2Vy LnByb3RvdHlwZS5zY3JpcHRQcm9maWxlclRyYWNraW5nQ29tcGxldGVkKToKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL01vZGVscy9DYWxsaW5nQ29udGV4dFRyZWUuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuQ2FsbGluZ0NvbnRleHRUcmVlLnByb3RvdHlwZS5nZXQgdG90YWxFeGVjdXRpb25U aW1lKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5DYWxsaW5nQ29udGV4dFRyZWUu cHJvdG90eXBlLnJlc2V0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5DYWxsaW5n Q29udGV4dFRyZWUucHJvdG90eXBlLmluY3JlYXNlRXhlY3V0aW9uVGltZSk6IERlbGV0ZWQuCisg ICAgICAgIFJlbW92ZSB1bnVzZWQgdG90YWxFeGVjdXRpb25UaW1lLgorCisyMDE2LTAzLTI5ICBK b3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogQ2FsY3VsYXRlIG1vcmUgYWNjdXJhdGUgdGltZSBwZXItc2FtcGxlIGluc3RlYWQgb2Yg YXNzdW1pbmcgMW1zCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNTU5NjEKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI1NDA0NTA1PgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxp bmVNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCmluZGV4IGNiYWY0ZmMuLjdiZDEwMDcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVs aW5lTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9D b250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKQEAgLTc3Myw3ICs3NzMsNyBAQCBXZWJJbnNw ZWN0b3IuVGltZWxpbmVNYW5hZ2VyID0gY2xhc3MgVGltZWxpbmVNYW5hZ2VyIGV4dGVuZHMgV2Vi SW5zcGVjdG9yLk9iamVjdAogICAgICAgICBjb25zb2xlLmFzc2VydCghdGhpcy5fd2ViVGltZWxp bmVTY3JpcHRSZWNvcmRzRXhwZWN0aW5nU2NyaXB0UHJvZmlsZXJFdmVudHMgfHwgdGhpcy5fc2Ny aXB0UHJvZmlsZXJSZWNvcmRzLmxlbmd0aCA+PSB0aGlzLl93ZWJUaW1lbGluZVNjcmlwdFJlY29y ZHNFeHBlY3RpbmdTY3JpcHRQcm9maWxlckV2ZW50cy5sZW5ndGgpOwogCiAgICAgICAgIGlmIChz YW1wbGVzKSB7Ci0gICAgICAgICAgICBsZXQge3RvdGFsVGltZTogdG90YWxFeGVjdXRpb25UaW1l LCBzdGFja1RyYWNlc30gPSBzYW1wbGVzOworICAgICAgICAgICAgbGV0IHtzdGFja1RyYWNlc30g PSBzYW1wbGVzOwogICAgICAgICAgICAgbGV0IHRvcERvd25DYWxsaW5nQ29udGV4dFRyZWUgPSB0 aGlzLmFjdGl2ZVJlY29yZGluZy50b3BEb3duQ2FsbGluZ0NvbnRleHRUcmVlOwogICAgICAgICAg ICAgbGV0IGJvdHRvbVVwQ2FsbGluZ0NvbnRleHRUcmVlID0gdGhpcy5hY3RpdmVSZWNvcmRpbmcu Ym90dG9tVXBDYWxsaW5nQ29udGV4dFRyZWU7CiAKQEAgLTgwOSw5ICs4MDksNiBAQCBXZWJJbnNw ZWN0b3IuVGltZWxpbmVNYW5hZ2VyID0gY2xhc3MgVGltZWxpbmVNYW5hZ2VyIGV4dGVuZHMgV2Vi SW5zcGVjdG9yLk9iamVjdAogICAgICAgICAgICAgaWYgKHRpbWVzdGFtcEluZGV4IDwgdGltZXN0 YW1wQ291bnQpCiAgICAgICAgICAgICAgICAgc2FtcGxlRHVyYXRpb25zLmZpbGwoZGVmYXVsdER1 cmF0aW9uLCBzYW1wbGVEdXJhdGlvbkluZGV4KTsKIAotICAgICAgICAgICAgdG9wRG93bkNhbGxp bmdDb250ZXh0VHJlZS5pbmNyZWFzZUV4ZWN1dGlvblRpbWUodG90YWxFeGVjdXRpb25UaW1lKTsK LSAgICAgICAgICAgIGJvdHRvbVVwQ2FsbGluZ0NvbnRleHRUcmVlLmluY3JlYXNlRXhlY3V0aW9u VGltZSh0b3RhbEV4ZWN1dGlvblRpbWUpOwotCiAgICAgICAgICAgICBmb3IgKGxldCBpID0gMDsg aSA8IHN0YWNrVHJhY2VzLmxlbmd0aDsgaSsrKSB7CiAgICAgICAgICAgICAgICAgdG9wRG93bkNh bGxpbmdDb250ZXh0VHJlZS51cGRhdGVUcmVlV2l0aFN0YWNrVHJhY2Uoc3RhY2tUcmFjZXNbaV0s IHNhbXBsZUR1cmF0aW9uc1tpXSk7CiAgICAgICAgICAgICAgICAgYm90dG9tVXBDYWxsaW5nQ29u dGV4dFRyZWUudXBkYXRlVHJlZVdpdGhTdGFja1RyYWNlKHN0YWNrVHJhY2VzW2ldLCBzYW1wbGVE dXJhdGlvbnNbaV0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvTW9kZWxzL0NhbGxpbmdDb250ZXh0VHJlZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9DYWxsaW5nQ29udGV4dFRyZWUuanMKaW5kZXggZmY2YzIx YS4uNTdhZjlhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvTW9kZWxzL0NhbGxpbmdDb250ZXh0VHJlZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ2FsbGluZ0NvbnRleHRUcmVlLmpzCkBAIC0zNywxMyAr MzcsMTEgQEAgV2ViSW5zcGVjdG9yLkNhbGxpbmdDb250ZXh0VHJlZSA9IGNsYXNzIENhbGxpbmdD b250ZXh0VHJlZSBleHRlbmRzIFdlYkluc3BlY3Rvci4KICAgICAvLyBQdWJsaWMKIAogICAgIGdl dCB0eXBlKCkgeyByZXR1cm4gdGhpcy5fdHlwZTsgfQotICAgIGdldCB0b3RhbEV4ZWN1dGlvblRp bWUoKSB7IHJldHVybiB0aGlzLl90b3RhbEV4ZWN1dGlvblRpbWU7IH0KICAgICBnZXQgdG90YWxO dW1iZXJPZlNhbXBsZXMoKSB7IHJldHVybiB0aGlzLl90b3RhbE51bWJlck9mU2FtcGxlczsgfQog CiAgICAgcmVzZXQoKQogICAgIHsKICAgICAgICAgdGhpcy5fcm9vdCA9IG5ldyBXZWJJbnNwZWN0 b3IuQ0NUTm9kZSgtMSwgLTEsIC0xLCAiPHJvb3Q+IiwgbnVsbCk7Ci0gICAgICAgIHRoaXMuX3Rv dGFsRXhlY3V0aW9uVGltZSA9IDA7CiAgICAgICAgIHRoaXMuX3RvdGFsTnVtYmVyT2ZTYW1wbGVz ID0gMDsKICAgICB9CiAKQEAgLTUyLDExICs1MCw2IEBAIFdlYkluc3BlY3Rvci5DYWxsaW5nQ29u dGV4dFRyZWUgPSBjbGFzcyBDYWxsaW5nQ29udGV4dFRyZWUgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu CiAgICAgICAgIHJldHVybiB0aGlzLl9yb290LmZpbHRlcmVkVGltZXN0YW1wc0FuZER1cmF0aW9u KHN0YXJ0VGltZSwgZW5kVGltZSkuZHVyYXRpb247CiAgICAgfQogCi0gICAgaW5jcmVhc2VFeGVj dXRpb25UaW1lKGV4ZWN1dGlvblRpbWUpCi0gICAgewotICAgICAgICB0aGlzLl90b3RhbEV4ZWN1 dGlvblRpbWUgKz0gZXhlY3V0aW9uVGltZTsKLSAgICB9Ci0KICAgICB1cGRhdGVUcmVlV2l0aFN0 YWNrVHJhY2Uoe3RpbWVzdGFtcCwgc3RhY2tGcmFtZXN9LCBkdXJhdGlvbikKICAgICB7CiAgICAg ICAgIHRoaXMuX3RvdGFsTnVtYmVyT2ZTYW1wbGVzKys7Cg==