34833 2010-02-11 01:09:51 -0800 Chromium DevTools: Trying to generate heap snapshots fast will generate more than expected 2010-02-11 12:50:38 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 mnaganov mnaganov pfeldman oldest_to_newest 189622 0 mnaganov 2010-02-11 01:09:51 -0800 What steps will reproduce the problem? 1. Open a webpage say http://www.google.com 2. Open Inspector(Ctrl+Shift+I) 3. Go to Profiles tab 4. Hit 'Take a snapshot button' fast, say 5 times What is the expected output? To see 5 snapshots What do you see instead? Around 15 snapshots are being created 189631 1 48552 mnaganov 2010-02-11 01:51:40 -0800 Created attachment 48552 proposed fix 189632 2 48552 pfeldman 2010-02-11 01:58:38 -0800 Comment on attachment 48552 proposed fix Minor nits, otherwise r+. > + this.lastRequestedLogPosition_ = -1; this._lastRequestedLogPosition > + */ > +devtools.ProfilerAgent.prototype.getNextLogLines_ = function(immediately) > +{ "Next" does not sound well with plurals. "Further"? > + if (this.lastRequestedLogPosition_ == this.logPosition_) === Now that the files are upstream, please fix naming of private fields. 189636 3 48554 mnaganov 2010-02-11 02:17:28 -0800 Created attachment 48554 make privates naming consistent with WebKit style please don't put into cq, I'll commit myself 189637 4 mnaganov 2010-02-11 02:21:40 -0800 (In reply to comment #2) > (From update of attachment 48552 [details]) > Minor nits, otherwise r+. > > > + this.lastRequestedLogPosition_ = -1; > > this._lastRequestedLogPosition > > > + */ > > +devtools.ProfilerAgent.prototype.getNextLogLines_ = function(immediately) > > +{ > > "Next" does not sound well with plurals. "Further"? Google for "next lines". To me, it looks OK. > > > + if (this.lastRequestedLogPosition_ == this.logPosition_) > > === > > Now that the files are upstream, please fix naming of private fields. Fixed 189777 5 mnaganov 2010-02-11 12:50:38 -0800 Manually committed r54667: http://trac.webkit.org/changeset/54667 48552 2010-02-11 01:51:40 -0800 2010-02-11 02:17:28 -0800 proposed fix fix-34833-patch text/plain 3992 mnaganov ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDJmODhlNWEuLjgxNDU3NGYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDIwIEBACisyMDEwLTAyLTExICBNaWtoYWlsIE5hZ2Fub3YgIDxtbmFnYW5vdkBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0No cm9taXVtXSBJZ25vcmUgc3Vic2VxdWVudCByZXF1ZXN0cyBvZiB0aGUgc2FtZSBwcm9maWxlciBs b2cKKyAgICAgICAgY2h1bmtzLiBUaGlzIGVsaW1pbmF0ZXMgZW1pc3Npb24gb2Ygc2V2ZXJhbCBp bnN0YW5jZXMgZm9yIHRoZSBzYW1lCisgICAgICAgIGhlYXAgc25hcHNob3QuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0ODMzCisKKyAgICAgICAg KiBzcmMvanMvUHJvZmlsZXJBZ2VudC5qczoKKyAgICAgICAgKGRldnRvb2xzLlByb2ZpbGVyQWdl bnQpOgorICAgICAgICAoZGV2dG9vbHMuUHJvZmlsZXJBZ2VudC5wcm90b3R5cGUuZ2V0TmV4dExv Z0xpbmVzXyk6CisgICAgICAgIChkZXZ0b29scy5Qcm9maWxlckFnZW50LnByb3RvdHlwZS5zdGFy dFByb2ZpbGluZyk6CisgICAgICAgIChkZXZ0b29scy5Qcm9maWxlckFnZW50LnByb3RvdHlwZS5k aWRHZXRBY3RpdmVQcm9maWxlck1vZHVsZXNfKToKKyAgICAgICAgKGRldnRvb2xzLlByb2ZpbGVy QWdlbnQucHJvdG90eXBlLmRpZEdldExvZ0xpbmVzXyk6CisKIDIwMTAtMDItMTAgIEphbWVzIEhh d2tpbnMgIDxqaGF3a2luc0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJp YyBTZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL2pzL1Byb2ZpbGVyQWdl bnQuanMgYi9XZWJLaXQvY2hyb21pdW0vc3JjL2pzL1Byb2ZpbGVyQWdlbnQuanMKaW5kZXggNjEx Njg5ZS4uYmIxMGNjZSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9Qcm9maWxl ckFnZW50LmpzCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvanMvUHJvZmlsZXJBZ2VudC5qcwpA QCAtNjAsNiArNjAsMTIgQEAgZGV2dG9vbHMuUHJvZmlsZXJBZ2VudCA9IGZ1bmN0aW9uKCkKICAg ICB0aGlzLmxvZ1Bvc2l0aW9uXyA9IDA7CiAKICAgICAvKioKKyAgICAgKiBMYXN0IHJlcXVlc3Rl ZCBsb2cgcG9zaXRpb24uCisgICAgICogQHR5cGUge251bWJlcn0KKyAgICAgKi8KKyAgICB0aGlz Lmxhc3RSZXF1ZXN0ZWRMb2dQb3NpdGlvbl8gPSAtMTsKKworICAgIC8qKgogICAgICAqIFdoZXRo ZXIgbG9nIGNvbnRlbnRzIHJldHJpZXZhbCBtdXN0IGJlIGZvcmNlZCBuZXh0IHRpbWUuCiAgICAg ICogQHR5cGUge2Jvb2xlYW59CiAgICAgICovCkBAIC0xMzUsNiArMTQxLDIzIEBAIGRldnRvb2xz LlByb2ZpbGVyQWdlbnQucHJvdG90eXBlLmluaXRpYWxpemVQcm9maWxpbmcgPSBmdW5jdGlvbigp CiAKIAogLyoqCisgKiBSZXF1ZXN0cyB0aGUgbmV4dCBjaHVuayBvZiBsb2cgbGluZXMuCisgKiBA cGFyYW0ge2Jvb2xlYW59IGltbWVkaWF0ZWx5IERvIG5vdCBwb3N0cG9uZSB0aGUgcmVxdWVzdC4K KyAqIEBwcml2YXRlCisgKi8KK2RldnRvb2xzLlByb2ZpbGVyQWdlbnQucHJvdG90eXBlLmdldE5l eHRMb2dMaW5lc18gPSBmdW5jdGlvbihpbW1lZGlhdGVseSkKK3sKKyAgICBpZiAodGhpcy5sYXN0 UmVxdWVzdGVkTG9nUG9zaXRpb25fID09IHRoaXMubG9nUG9zaXRpb25fKQorICAgICAgICByZXR1 cm47CisgICAgdmFyIHBvcyA9IHRoaXMubGFzdFJlcXVlc3RlZExvZ1Bvc2l0aW9uXyA9IHRoaXMu bG9nUG9zaXRpb25fOworICAgIGlmIChpbW1lZGlhdGVseSkKKyAgICAgICAgUmVtb3RlUHJvZmls ZXJBZ2VudC5nZXRMb2dMaW5lcyhwb3MpOworICAgIGVsc2UKKyAgICAgICAgc2V0VGltZW91dChm dW5jdGlvbigpIHsgUmVtb3RlUHJvZmlsZXJBZ2VudC5nZXRMb2dMaW5lcyhwb3MpOyB9LCA1MDAp OyAgICAKK307CisKKworLyoqCiAgKiBTdGFydHMgcHJvZmlsaW5nLgogICogQHBhcmFtIHtudW1i ZXJ9IG1vZHVsZXMgTGlzdCBvZiBtb2R1bGVzIHRvIGVuYWJsZS4KICAqLwpAQCAtMTQ2LDkgKzE2 OSw4IEBAIGRldnRvb2xzLlByb2ZpbGVyQWdlbnQucHJvdG90eXBlLnN0YXJ0UHJvZmlsaW5nID0g ZnVuY3Rpb24obW9kdWxlcykKICAgICBkZXZ0b29scy5EZWJ1Z2dlckFnZW50LnNlbmRDb21tYW5k XyhjbWQpOwogICAgIFJlbW90ZURlYnVnZ2VyQWdlbnQucHJvY2Vzc0RlYnVnQ29tbWFuZHMoKTsK ICAgICBpZiAobW9kdWxlcyAmIGRldnRvb2xzLlByb2ZpbGVyQWdlbnQuUHJvZmlsZXJNb2R1bGVz LlBST0ZJTEVSX01PRFVMRV9IRUFQX1NOQVBTSE9UKSB7Ci0gICAgICAgIHZhciBwb3MgPSB0aGlz LmxvZ1Bvc2l0aW9uXzsKICAgICAgICAgLy8gQWN0aXZlIG1vZHVsZXMgd2lsbCBub3QgY2hhbmdl LCBpbnN0ZWFkLCBhIHNuYXBzaG90IHdpbGwgYmUgbG9nZ2VkLgotICAgICAgICBzZXRUaW1lb3V0 KGZ1bmN0aW9uKCkgeyBSZW1vdGVQcm9maWxlckFnZW50LmdldExvZ0xpbmVzKHBvcyk7IH0sIDUw MCk7CisgICAgICAgIHRoaXMuZ2V0TmV4dExvZ0xpbmVzXygpOwogICAgIH0KIH07CiAKQEAgLTE3 Nyw3ICsxOTksNyBAQCBkZXZ0b29scy5Qcm9maWxlckFnZW50LnByb3RvdHlwZS5kaWRHZXRBY3Rp dmVQcm9maWxlck1vZHVsZXNfID0gZnVuY3Rpb24obW9kdWxlcwogICAgIGlmICh0aGlzLmZvcmNl R2V0TG9nTGluZXNfIHx8IChtb2R1bGVzICE9PSBwcm9mTW9kdWxlTm9uZSAmJiB0aGlzLmFjdGl2 ZVByb2ZpbGVyTW9kdWxlc18gPT09IHByb2ZNb2R1bGVOb25lKSkgewogICAgICAgICB0aGlzLmZv cmNlR2V0TG9nTGluZXNfID0gZmFsc2U7CiAgICAgICAgIC8vIFN0YXJ0IHRvIHF1ZXJ5IGxvZyBk YXRhLgotICAgICAgICBSZW1vdGVQcm9maWxlckFnZW50LmdldExvZ0xpbmVzKHRoaXMubG9nUG9z aXRpb25fKTsKKyAgICAgICAgdGhpcy5nZXROZXh0TG9nTGluZXNfKHRydWUpOwogICAgIH0KICAg ICB0aGlzLmFjdGl2ZVByb2ZpbGVyTW9kdWxlc18gPSBtb2R1bGVzOwogICAgIC8vIFVwZGF0ZSBi dXR0b25zLgpAQCAtMTk1LDkgKzIxNywxMiBAQCBkZXZ0b29scy5Qcm9maWxlckFnZW50LnByb3Rv dHlwZS5kaWRHZXRMb2dMaW5lc18gPSBmdW5jdGlvbihwb3MsIGxvZykKICAgICB0aGlzLmxvZ1Bv c2l0aW9uXyA9IHBvczsKICAgICBpZiAobG9nLmxlbmd0aCA+IDApCiAgICAgICAgIHRoaXMucHJv ZmlsZXJQcm9jZXNzb3JfLnByb2Nlc3NMb2dDaHVuayhsb2cpOwotICAgIGVsc2UgaWYgKHRoaXMu YWN0aXZlUHJvZmlsZXJNb2R1bGVzXyA9PT0gZGV2dG9vbHMuUHJvZmlsZXJBZ2VudC5Qcm9maWxl ck1vZHVsZXMuUFJPRklMRVJfTU9EVUxFX05PTkUpIHsKLSAgICAgICAgLy8gTm8gbmV3IGRhdGEg YW5kIHByb2ZpbGluZyBpcyBzdG9wcGVkLS0tc3VzcGVuZCBsb2cgcmVhZGluZy4KLSAgICAgICAg cmV0dXJuOworICAgIGVsc2UgeworICAgICAgICAvLyBBbGxvdyByZS1yZWFkaW5nIGZyb20gdGhl IGxhc3QgcG9zaXRpb24uCisgICAgICAgIHRoaXMubGFzdFJlcXVlc3RlZExvZ1Bvc2l0aW9uXyA9 IHRoaXMubG9nUG9zaXRpb25fIC0gMTsKKyAgICAgICAgaWYgKHRoaXMuYWN0aXZlUHJvZmlsZXJN b2R1bGVzXyA9PT0gZGV2dG9vbHMuUHJvZmlsZXJBZ2VudC5Qcm9maWxlck1vZHVsZXMuUFJPRklM RVJfTU9EVUxFX05PTkUpCisgICAgICAgICAgICAvLyBObyBuZXcgZGF0YSBhbmQgcHJvZmlsaW5n IGlzIHN0b3BwZWQtLS1zdXNwZW5kIGxvZyByZWFkaW5nLgorICAgICAgICAgICAgcmV0dXJuOwog ICAgIH0KLSAgICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeyBSZW1vdGVQcm9maWxlckFnZW50Lmdl dExvZ0xpbmVzKHBvcyk7IH0sIDUwMCk7CisgICAgdGhpcy5nZXROZXh0TG9nTGluZXNfKCk7CiB9 Owo= 48554 2010-02-11 02:17:28 -0800 2010-02-11 10:12:30 -0800 make privates naming consistent with WebKit style fix-34833-patch text/plain 7332 mnaganov ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDJmODhlNWEuLjliYjU5OGYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDIxIEBACisyMDEwLTAyLTExICBNaWtoYWlsIE5hZ2Fub3YgIDxtbmFnYW5vdkBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0No cm9taXVtXSBJZ25vcmUgc3Vic2VxdWVudCByZXF1ZXN0cyBvZiB0aGUgc2FtZSBwcm9maWxlciBs b2cKKyAgICAgICAgY2h1bmtzLiBUaGlzIGVsaW1pbmF0ZXMgZW1pc3Npb24gb2Ygc2V2ZXJhbCBp bnN0YW5jZXMgZm9yIHRoZSBzYW1lCisgICAgICAgIGhlYXAgc25hcHNob3QuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0ODMzCisKKyAgICAgICAg KiBzcmMvanMvUHJvZmlsZXJBZ2VudC5qczoKKyAgICAgICAgKGRldnRvb2xzLlByb2ZpbGVyQWdl bnQpOgorICAgICAgICAoZGV2dG9vbHMuUHJvZmlsZXJBZ2VudC5wcm90b3R5cGUuaW5pdGlhbGl6 ZVByb2ZpbGluZyk6CisgICAgICAgIChkZXZ0b29scy5Qcm9maWxlckFnZW50LnByb3RvdHlwZS5f Z2V0TmV4dExvZ0xpbmVzKToKKyAgICAgICAgKGRldnRvb2xzLlByb2ZpbGVyQWdlbnQucHJvdG90 eXBlLnN0YXJ0UHJvZmlsaW5nKToKKyAgICAgICAgKGRldnRvb2xzLlByb2ZpbGVyQWdlbnQucHJv dG90eXBlLl9kaWRHZXRBY3RpdmVQcm9maWxlck1vZHVsZXMpOgorICAgICAgICAoZGV2dG9vbHMu UHJvZmlsZXJBZ2VudC5wcm90b3R5cGUuX2RpZEdldExvZ0xpbmVzKToKKwogMjAxMC0wMi0xMCAg SmFtZXMgSGF3a2lucyAgPGpoYXdraW5zQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvanMvUHJv ZmlsZXJBZ2VudC5qcyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvanMvUHJvZmlsZXJBZ2VudC5qcwpp bmRleCA2MTE2ODllLi5hMGMwZmVmIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL2pz L1Byb2ZpbGVyQWdlbnQuanMKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9Qcm9maWxlckFn ZW50LmpzCkBAIC0zMyw0MyArMzMsNDggQEAKICAqLwogCiAvKioKLSAqIEZJWE1FOiBjaGFuZ2Ug ZmllbGQgbmFtaW5nIHN0eWxlIHRvIHVzZSB0cmFpbGluZyB1bmRlcnNjb3JlLgogICogQGNvbnN0 cnVjdG9yCiAgKi8KIGRldnRvb2xzLlByb2ZpbGVyQWdlbnQgPSBmdW5jdGlvbigpCiB7Ci0gICAg UmVtb3RlUHJvZmlsZXJBZ2VudC5kaWRHZXRBY3RpdmVQcm9maWxlck1vZHVsZXMgPSB0aGlzLmRp ZEdldEFjdGl2ZVByb2ZpbGVyTW9kdWxlc18uYmluZCh0aGlzKTsKLSAgICBSZW1vdGVQcm9maWxl ckFnZW50LmRpZEdldExvZ0xpbmVzID0gdGhpcy5kaWRHZXRMb2dMaW5lc18uYmluZCh0aGlzKTsK KyAgICBSZW1vdGVQcm9maWxlckFnZW50LmRpZEdldEFjdGl2ZVByb2ZpbGVyTW9kdWxlcyA9IHRo aXMuX2RpZEdldEFjdGl2ZVByb2ZpbGVyTW9kdWxlcy5iaW5kKHRoaXMpOworICAgIFJlbW90ZVBy b2ZpbGVyQWdlbnQuZGlkR2V0TG9nTGluZXMgPSB0aGlzLl9kaWRHZXRMb2dMaW5lcy5iaW5kKHRo aXMpOwogCiAgICAgLyoqCiAgICAgICogQWN0aXZlIHByb2ZpbGVyIG1vZHVsZXMgZmxhZ3MuCiAg ICAgICogQHR5cGUge251bWJlcn0KICAgICAgKi8KLSAgICB0aGlzLmFjdGl2ZVByb2ZpbGVyTW9k dWxlc18gPSBkZXZ0b29scy5Qcm9maWxlckFnZW50LlByb2ZpbGVyTW9kdWxlcy5QUk9GSUxFUl9N T0RVTEVfTk9ORTsKKyAgICB0aGlzLl9hY3RpdmVQcm9maWxlck1vZHVsZXMgPSBkZXZ0b29scy5Q cm9maWxlckFnZW50LlByb2ZpbGVyTW9kdWxlcy5QUk9GSUxFUl9NT0RVTEVfTk9ORTsKIAogICAg IC8qKgogICAgICAqIEludGVydmFsIGZvciBwb2xsaW5nIHByb2ZpbGVyIHN0YXRlLgogICAgICAq IEB0eXBlIHtudW1iZXJ9CiAgICAgICovCi0gICAgdGhpcy5nZXRBY3RpdmVQcm9maWxlck1vZHVs ZXNJbnRlcnZhbF8gPSBudWxsOworICAgIHRoaXMuX2dldEFjdGl2ZVByb2ZpbGVyTW9kdWxlc0lu dGVydmFsID0gbnVsbDsKIAogICAgIC8qKgogICAgICAqIFByb2ZpbGVyIGxvZyBwb3NpdGlvbi4K ICAgICAgKiBAdHlwZSB7bnVtYmVyfQogICAgICAqLwotICAgIHRoaXMubG9nUG9zaXRpb25fID0g MDsKKyAgICB0aGlzLl9sb2dQb3NpdGlvbiA9IDA7CisKKyAgICAvKioKKyAgICAgKiBMYXN0IHJl cXVlc3RlZCBsb2cgcG9zaXRpb24uCisgICAgICogQHR5cGUge251bWJlcn0KKyAgICAgKi8KKyAg ICB0aGlzLl9sYXN0UmVxdWVzdGVkTG9nUG9zaXRpb24gPSAtMTsKIAogICAgIC8qKgogICAgICAq IFdoZXRoZXIgbG9nIGNvbnRlbnRzIHJldHJpZXZhbCBtdXN0IGJlIGZvcmNlZCBuZXh0IHRpbWUu CiAgICAgICogQHR5cGUge2Jvb2xlYW59CiAgICAgICovCi0gICAgdGhpcy5mb3JjZUdldExvZ0xp bmVzXyA9IGZhbHNlOworICAgIHRoaXMuX2ZvcmNlR2V0TG9nTGluZXMgPSBmYWxzZTsKIAogICAg IC8qKgogICAgICAqIFByb2ZpbGVyIHByb2Nlc3NvciBpbnN0YW5jZS4KICAgICAgKiBAdHlwZSB7 ZGV2dG9vbHMucHJvZmlsZXIuUHJvY2Vzc29yfQogICAgICAqLwotICAgIHRoaXMucHJvZmlsZXJQ cm9jZXNzb3JfID0gbmV3IGRldnRvb2xzLnByb2ZpbGVyLlByb2Nlc3NvcigpOworICAgIHRoaXMu X3Byb2ZpbGVyUHJvY2Vzc29yID0gbmV3IGRldnRvb2xzLnByb2ZpbGVyLlByb2Nlc3NvcigpOwog fTsKIAogCkBAIC05OCw3ICsxMDMsNyBAQCBkZXZ0b29scy5Qcm9maWxlckFnZW50LnByb3RvdHlw ZS5zZXR1cFByb2ZpbGVyUHJvY2Vzc29yQ2FsbGJhY2tzID0gZnVuY3Rpb24oKQogICAgICAgICAn JywgbnVsbCwgZmFsc2UpOwogICAgIHZhciBwcm9maWxlc1NpZGViYXIgPSBXZWJJbnNwZWN0b3Iu cGFuZWxzLnByb2ZpbGVzLmdldFByb2ZpbGVUeXBlKFdlYkluc3BlY3Rvci5DUFVQcm9maWxlVHlw ZS5UeXBlSWQpLnRyZWVFbGVtZW50OwogCi0gICAgdGhpcy5wcm9maWxlclByb2Nlc3Nvcl8uc2V0 Q2FsbGJhY2tzKAorICAgIHRoaXMuX3Byb2ZpbGVyUHJvY2Vzc29yLnNldENhbGxiYWNrcygKICAg ICAgICAgZnVuY3Rpb24gb25Qcm9maWxlUHJvY2Vzc2luZ1N0YXJ0ZWQoKSB7CiAgICAgICAgICAg ICAvLyBTZXQgdmlzdWFsbHkgZW1wdHkgc3RyaW5nLiBTdWJ0aXRsZSBoaWRpbmcgaXMgZG9uZSB2 aWEgc3R5bGVzCiAgICAgICAgICAgICAvLyBtYW5pcHVsYXRpb24gd2hpY2ggZG9lc24ndCBwbGF5 IHdlbGwgd2l0aCBkeW5hbWljIGFwcGVuZCAvIHJlbW92YWwuCkBAIC0xMjksOCArMTM0LDI1IEBA IGRldnRvb2xzLlByb2ZpbGVyQWdlbnQucHJvdG90eXBlLnNldHVwUHJvZmlsZXJQcm9jZXNzb3JD YWxsYmFja3MgPSBmdW5jdGlvbigpCiBkZXZ0b29scy5Qcm9maWxlckFnZW50LnByb3RvdHlwZS5p bml0aWFsaXplUHJvZmlsaW5nID0gZnVuY3Rpb24oKQogewogICAgIHRoaXMuc2V0dXBQcm9maWxl clByb2Nlc3NvckNhbGxiYWNrcygpOwotICAgIHRoaXMuZm9yY2VHZXRMb2dMaW5lc18gPSB0cnVl OwotICAgIHRoaXMuZ2V0QWN0aXZlUHJvZmlsZXJNb2R1bGVzSW50ZXJ2YWxfID0gc2V0SW50ZXJ2 YWwoZnVuY3Rpb24oKSB7IFJlbW90ZVByb2ZpbGVyQWdlbnQuZ2V0QWN0aXZlUHJvZmlsZXJNb2R1 bGVzKCk7IH0sIDEwMDApOworICAgIHRoaXMuX2ZvcmNlR2V0TG9nTGluZXMgPSB0cnVlOworICAg IHRoaXMuX2dldEFjdGl2ZVByb2ZpbGVyTW9kdWxlc0ludGVydmFsID0gc2V0SW50ZXJ2YWwoZnVu Y3Rpb24oKSB7IFJlbW90ZVByb2ZpbGVyQWdlbnQuZ2V0QWN0aXZlUHJvZmlsZXJNb2R1bGVzKCk7 IH0sIDEwMDApOworfTsKKworCisvKioKKyAqIFJlcXVlc3RzIHRoZSBuZXh0IGNodW5rIG9mIGxv ZyBsaW5lcy4KKyAqIEBwYXJhbSB7Ym9vbGVhbn0gaW1tZWRpYXRlbHkgRG8gbm90IHBvc3Rwb25l IHRoZSByZXF1ZXN0LgorICogQHByaXZhdGUKKyAqLworZGV2dG9vbHMuUHJvZmlsZXJBZ2VudC5w cm90b3R5cGUuX2dldE5leHRMb2dMaW5lcyA9IGZ1bmN0aW9uKGltbWVkaWF0ZWx5KQoreworICAg IGlmICh0aGlzLl9sYXN0UmVxdWVzdGVkTG9nUG9zaXRpb24gPT0gdGhpcy5fbG9nUG9zaXRpb24p CisgICAgICAgIHJldHVybjsKKyAgICB2YXIgcG9zID0gdGhpcy5fbGFzdFJlcXVlc3RlZExvZ1Bv c2l0aW9uID0gdGhpcy5fbG9nUG9zaXRpb247CisgICAgaWYgKGltbWVkaWF0ZWx5KQorICAgICAg ICBSZW1vdGVQcm9maWxlckFnZW50LmdldExvZ0xpbmVzKHBvcyk7CisgICAgZWxzZQorICAgICAg ICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeyBSZW1vdGVQcm9maWxlckFnZW50LmdldExvZ0xpbmVz KHBvcyk7IH0sIDUwMCk7ICAgIAogfTsKIAogCkBAIC0xNDYsOSArMTY4LDggQEAgZGV2dG9vbHMu UHJvZmlsZXJBZ2VudC5wcm90b3R5cGUuc3RhcnRQcm9maWxpbmcgPSBmdW5jdGlvbihtb2R1bGVz KQogICAgIGRldnRvb2xzLkRlYnVnZ2VyQWdlbnQuc2VuZENvbW1hbmRfKGNtZCk7CiAgICAgUmVt b3RlRGVidWdnZXJBZ2VudC5wcm9jZXNzRGVidWdDb21tYW5kcygpOwogICAgIGlmIChtb2R1bGVz ICYgZGV2dG9vbHMuUHJvZmlsZXJBZ2VudC5Qcm9maWxlck1vZHVsZXMuUFJPRklMRVJfTU9EVUxF X0hFQVBfU05BUFNIT1QpIHsKLSAgICAgICAgdmFyIHBvcyA9IHRoaXMubG9nUG9zaXRpb25fOwog ICAgICAgICAvLyBBY3RpdmUgbW9kdWxlcyB3aWxsIG5vdCBjaGFuZ2UsIGluc3RlYWQsIGEgc25h cHNob3Qgd2lsbCBiZSBsb2dnZWQuCi0gICAgICAgIHNldFRpbWVvdXQoZnVuY3Rpb24oKSB7IFJl bW90ZVByb2ZpbGVyQWdlbnQuZ2V0TG9nTGluZXMocG9zKTsgfSwgNTAwKTsKKyAgICAgICAgdGhp cy5fZ2V0TmV4dExvZ0xpbmVzKCk7CiAgICAgfQogfTsKIApAQCAtMTcwLDE2ICsxOTEsMTYgQEAg ZGV2dG9vbHMuUHJvZmlsZXJBZ2VudC5wcm90b3R5cGUuc3RvcFByb2ZpbGluZyA9IGZ1bmN0aW9u KG1vZHVsZXMpCiAgKiBIYW5kbGVzIGN1cnJlbnQgcHJvZmlsZXIgc3RhdHVzLgogICogQHBhcmFt IHtudW1iZXJ9IG1vZHVsZXMgTGlzdCBvZiBhY3RpdmUgKHN0YXJ0ZWQpIG1vZHVsZXMuCiAgKi8K LWRldnRvb2xzLlByb2ZpbGVyQWdlbnQucHJvdG90eXBlLmRpZEdldEFjdGl2ZVByb2ZpbGVyTW9k dWxlc18gPSBmdW5jdGlvbihtb2R1bGVzKQorZGV2dG9vbHMuUHJvZmlsZXJBZ2VudC5wcm90b3R5 cGUuX2RpZEdldEFjdGl2ZVByb2ZpbGVyTW9kdWxlcyA9IGZ1bmN0aW9uKG1vZHVsZXMpCiB7CiAg ICAgdmFyIHByb2ZNb2R1bGVzID0gZGV2dG9vbHMuUHJvZmlsZXJBZ2VudC5Qcm9maWxlck1vZHVs ZXM7CiAgICAgdmFyIHByb2ZNb2R1bGVOb25lID0gcHJvZk1vZHVsZXMuUFJPRklMRVJfTU9EVUxF X05PTkU7Ci0gICAgaWYgKHRoaXMuZm9yY2VHZXRMb2dMaW5lc18gfHwgKG1vZHVsZXMgIT09IHBy b2ZNb2R1bGVOb25lICYmIHRoaXMuYWN0aXZlUHJvZmlsZXJNb2R1bGVzXyA9PT0gcHJvZk1vZHVs ZU5vbmUpKSB7Ci0gICAgICAgIHRoaXMuZm9yY2VHZXRMb2dMaW5lc18gPSBmYWxzZTsKKyAgICBp ZiAodGhpcy5fZm9yY2VHZXRMb2dMaW5lcyB8fCAobW9kdWxlcyAhPT0gcHJvZk1vZHVsZU5vbmUg JiYgdGhpcy5fYWN0aXZlUHJvZmlsZXJNb2R1bGVzID09PSBwcm9mTW9kdWxlTm9uZSkpIHsKKyAg ICAgICAgdGhpcy5fZm9yY2VHZXRMb2dMaW5lcyA9IGZhbHNlOwogICAgICAgICAvLyBTdGFydCB0 byBxdWVyeSBsb2cgZGF0YS4KLSAgICAgICAgUmVtb3RlUHJvZmlsZXJBZ2VudC5nZXRMb2dMaW5l cyh0aGlzLmxvZ1Bvc2l0aW9uXyk7CisgICAgICAgIHRoaXMuX2dldE5leHRMb2dMaW5lcyh0cnVl KTsKICAgICB9Ci0gICAgdGhpcy5hY3RpdmVQcm9maWxlck1vZHVsZXNfID0gbW9kdWxlczsKKyAg ICB0aGlzLl9hY3RpdmVQcm9maWxlck1vZHVsZXMgPSBtb2R1bGVzOwogICAgIC8vIFVwZGF0ZSBi dXR0b25zLgogICAgIFdlYkluc3BlY3Rvci5zZXRSZWNvcmRpbmdQcm9maWxlKG1vZHVsZXMgJiBw cm9mTW9kdWxlcy5QUk9GSUxFUl9NT0RVTEVfQ1BVKTsKIH07CkBAIC0xOTAsMTQgKzIxMSwxNyBA QCBkZXZ0b29scy5Qcm9maWxlckFnZW50LnByb3RvdHlwZS5kaWRHZXRBY3RpdmVQcm9maWxlck1v ZHVsZXNfID0gZnVuY3Rpb24obW9kdWxlcwogICogQHBhcmFtIHtudW1iZXJ9IHBvcyBDdXJyZW50 IHBvc2l0aW9uIGluIGxvZy4KICAqIEBwYXJhbSB7c3RyaW5nfSBsb2cgQSBwb3J0aW9uIG9mIHBy b2ZpbGVyIGxvZy4KICAqLwotZGV2dG9vbHMuUHJvZmlsZXJBZ2VudC5wcm90b3R5cGUuZGlkR2V0 TG9nTGluZXNfID0gZnVuY3Rpb24ocG9zLCBsb2cpCitkZXZ0b29scy5Qcm9maWxlckFnZW50LnBy b3RvdHlwZS5fZGlkR2V0TG9nTGluZXMgPSBmdW5jdGlvbihwb3MsIGxvZykKIHsKLSAgICB0aGlz LmxvZ1Bvc2l0aW9uXyA9IHBvczsKKyAgICB0aGlzLl9sb2dQb3NpdGlvbiA9IHBvczsKICAgICBp ZiAobG9nLmxlbmd0aCA+IDApCi0gICAgICAgIHRoaXMucHJvZmlsZXJQcm9jZXNzb3JfLnByb2Nl c3NMb2dDaHVuayhsb2cpOwotICAgIGVsc2UgaWYgKHRoaXMuYWN0aXZlUHJvZmlsZXJNb2R1bGVz XyA9PT0gZGV2dG9vbHMuUHJvZmlsZXJBZ2VudC5Qcm9maWxlck1vZHVsZXMuUFJPRklMRVJfTU9E VUxFX05PTkUpIHsKLSAgICAgICAgLy8gTm8gbmV3IGRhdGEgYW5kIHByb2ZpbGluZyBpcyBzdG9w cGVkLS0tc3VzcGVuZCBsb2cgcmVhZGluZy4KLSAgICAgICAgcmV0dXJuOworICAgICAgICB0aGlz Ll9wcm9maWxlclByb2Nlc3Nvci5wcm9jZXNzTG9nQ2h1bmsobG9nKTsKKyAgICBlbHNlIHsKKyAg ICAgICAgLy8gQWxsb3cgcmUtcmVhZGluZyBmcm9tIHRoZSBsYXN0IHBvc2l0aW9uLgorICAgICAg ICB0aGlzLl9sYXN0UmVxdWVzdGVkTG9nUG9zaXRpb24gPSB0aGlzLl9sb2dQb3NpdGlvbiAtIDE7 CisgICAgICAgIGlmICh0aGlzLl9hY3RpdmVQcm9maWxlck1vZHVsZXMgPT09IGRldnRvb2xzLlBy b2ZpbGVyQWdlbnQuUHJvZmlsZXJNb2R1bGVzLlBST0ZJTEVSX01PRFVMRV9OT05FKQorICAgICAg ICAgICAgLy8gTm8gbmV3IGRhdGEgYW5kIHByb2ZpbGluZyBpcyBzdG9wcGVkLS0tc3VzcGVuZCBs b2cgcmVhZGluZy4KKyAgICAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgc2V0VGltZW91dChm dW5jdGlvbigpIHsgUmVtb3RlUHJvZmlsZXJBZ2VudC5nZXRMb2dMaW5lcyhwb3MpOyB9LCA1MDAp OworICAgIHRoaXMuX2dldE5leHRMb2dMaW5lcygpOwogfTsK