97683 2012-09-26 07:39:42 -0700 Web Inspector: expose debug memory instrumentation debug data through the protocol 2012-09-27 00:57:35 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys alph apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 728545 0 yurys 2012-09-26 07:39:42 -0700 To add a test for memory instrumentation we need to be able to retrieve the number of instrumented objects and the number of instrumented objects that were not allocated by the memory allocator. The easiest way to achieve this is to expose these data as part of response to Memory.getProcessMemoryDistribution command. 728546 1 165799 yurys 2012-09-26 07:43:33 -0700 Created attachment 165799 Patch 728563 2 165799 loislo 2012-09-26 08:02:37 -0700 Comment on attachment 165799 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=165799&action=review > Source/WebCore/inspector/InspectorMemoryAgent.cpp:543 > + RefPtr<InspectorMemoryBlock> totalInstrumented = InspectorMemoryBlock::create().setName("TotalInstrumentedObjects"); TotalInstrumentedObjectsCount > Source/WebCore/inspector/InspectorMemoryAgent.cpp:546 > + RefPtr<InspectorMemoryBlock> incorrectlyInstrumented = InspectorMemoryBlock::create().setName("InstrumentedButNotAllocated"); InstrumentedButNotAllocatedObjectsCount 728564 3 loislo 2012-09-26 08:03:04 -0700 otherwise lgtm 728569 4 165804 yurys 2012-09-26 08:08:12 -0700 Created attachment 165804 Patch 728570 5 yurys 2012-09-26 08:08:54 -0700 (In reply to comment #2) > (From update of attachment 165799 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=165799&action=review > > > Source/WebCore/inspector/InspectorMemoryAgent.cpp:543 > > + RefPtr<InspectorMemoryBlock> totalInstrumented = InspectorMemoryBlock::create().setName("TotalInstrumentedObjects"); > > TotalInstrumentedObjectsCount > Done. > > Source/WebCore/inspector/InspectorMemoryAgent.cpp:546 > > + RefPtr<InspectorMemoryBlock> incorrectlyInstrumented = InspectorMemoryBlock::create().setName("InstrumentedButNotAllocated"); > > InstrumentedButNotAllocatedObjectsCount Done. 729295 6 165804 webkit.review.bot 2012-09-27 00:57:32 -0700 Comment on attachment 165804 Patch Clearing flags on attachment: 165804 Committed r129734: <http://trac.webkit.org/changeset/129734> 729296 7 webkit.review.bot 2012-09-27 00:57:35 -0700 All reviewed patches have been landed. Closing bug. 165799 2012-09-26 07:43:33 -0700 2012-09-26 08:08:06 -0700 Patch bug-97683-20120926184251.patch text/plain 5462 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5NjMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWNlNjU5ZWNlMTRmOGNk ODUzNWY5Mzc4ODFiOWQzOTFiN2QyMTJhYy4uZDlkY2I4NDE4MWQzMmQ3ZmI4ZTg1NDcxNmMxZjM3 NmZjYjE2ZDM0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDEyLTA5LTI2ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGV4cG9zZSBkZWJ1ZyBtZW1vcnkgaW5zdHJ1bWVudGF0aW9uIGRlYnVnIGRhdGEgdGhyb3Vn aCB0aGUgcHJvdG9jb2wKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTk3NjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgTWVtb3J5LmdldFByb2Nlc3NNZW1vcnlEaXN0cmlidXRpb24gY29tbWFuZCBub3cgcmV0 dXJucyBudW1iZXIgb2YgaW5zdHJ1bWVudGVkCisgICAgICAgIG9iamVjdHMgdGhhdCB3ZXJlIGZv dW5kIGFuZCB0aGUgbnVtYmVyIG9mIHRoZSBvYmplY3RzIHRoYXQgd2VyZSBjb3VudGVkIGJ5Cisg ICAgICAgIHRoZSBpbnN0cnVtZW50YXRpb24gYnV0IHdlcmUgbm90IGFjdHVhbGx5IGFsbG9jYXRl ZCBieSB0aGUgbWVtb3J5IGFsbG9jYXRvci4KKyAgICAgICAgVGhlc2UgbnVtYmVycyBhcmUgb25s eSBhZGRlZCB0byB0aGUgcmVzcG9uc2UgaWYgZW1iZWRkZXIgcHJvdmlkZXMgYWNjZXNzIHRvIHRo ZQorICAgICAgICBzZXQgb2YgYWxsIGxpdmUgaGVhcCBvYmplY3RzLiBUaGVzZSBudW1iZXJzIGFy ZSBpbnRlbmRlZCB0byBiZSB1c2VkIGZvciB0ZXN0aW5nCisgICAgICAgIG1lbW9yeSBpbnN0cnVt ZW50YXRpb24uCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Y29sbGVjdERvbVRyZWVJbmZvKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvTWVtb3J5SW5zdHJ1bWVudGF0aW9uSW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpN ZW1vcnlJbnN0cnVtZW50YXRpb25JbXBsOjpNZW1vcnlJbnN0cnVtZW50YXRpb25JbXBsKToKKyAg ICAgICAgKFdlYkNvcmU6Ok1lbW9yeUluc3RydW1lbnRhdGlvbkltcGw6OmNoZWNrQ291bnRlZE9i amVjdCk6CisgICAgICAgICogaW5zcGVjdG9yL01lbW9yeUluc3RydW1lbnRhdGlvbkltcGwuaDoK KyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeUluc3RydW1lbnRhdGlvbkltcGw6OmNoZWNrSW5zdHJ1 bWVudGVkT2JqZWN0cyk6CisgICAgICAgIChXZWJDb3JlOjpNZW1vcnlJbnN0cnVtZW50YXRpb25J bXBsOjp0b3RhbENvdW50ZWRPYmplY3RzKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeUluc3Ry dW1lbnRhdGlvbkltcGw6OnRvdGFsT2JqZWN0c05vdEluQWxsb2NhdGVkU2V0KToKKyAgICAgICAg KE1lbW9yeUluc3RydW1lbnRhdGlvbkltcGwpOgorCisyMDEyLTA5LTI2ICBZdXJ5IFNlbWlraGF0 c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFVucmV2aWV3ZWQuIFJvbGwgb3V0 IGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzEyOTUwMiBzaW5jZSBpdCBicm9rZSBj b29raWUgdGFibGUuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05NzQ3MQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yTWVtb3J5QWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck1l bW9yeUFnZW50LmNwcAppbmRleCAzOWZlYTc4OTBjZjE1ZWJhNWQyOGQ2MzhlZmJiYTIwNGIwYjhj NTQxLi42ZmY4ZGNiOWRjN2E2ODcyZDU1OTY1ZjBjZjFhZWIxNTI4OTg5NTBiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JNZW1vcnlBZ2VudC5jcHAKQEAgLTUz OSw2ICs1MzksMTYgQEAgc3RhdGljIHZvaWQgY29sbGVjdERvbVRyZWVJbmZvKFBhZ2UqIHBhZ2Us IEluc3BlY3RvckNsaWVudCogaW5zcGVjdG9yQ2xpZW50LCBWaXMKICAgICBkb21UcmVlc0l0ZXJh dG9yLnZpc2l0TWVtb3J5Q2FjaGUoKTsKIAogICAgIGRvbVRyZWVzSXRlcmF0b3IuZHVtcFN0YXRp c3RpY3MoY2hpbGRyZW4sIGluc3BlY3RvckRhdGEpOworICAgIGlmIChtZW1vcnlJbnN0cnVtZW50 YXRpb24uY2hlY2tJbnN0cnVtZW50ZWRPYmplY3RzKCkpIHsKKyAgICAgICAgUmVmUHRyPEluc3Bl Y3Rvck1lbW9yeUJsb2NrPiB0b3RhbEluc3RydW1lbnRlZCA9IEluc3BlY3Rvck1lbW9yeUJsb2Nr OjpjcmVhdGUoKS5zZXROYW1lKCJUb3RhbEluc3RydW1lbnRlZE9iamVjdHMiKTsKKyAgICAgICAg dG90YWxJbnN0cnVtZW50ZWQtPnNldFNpemUobWVtb3J5SW5zdHJ1bWVudGF0aW9uLnRvdGFsQ291 bnRlZE9iamVjdHMoKSk7CisKKyAgICAgICAgUmVmUHRyPEluc3BlY3Rvck1lbW9yeUJsb2NrPiBp bmNvcnJlY3RseUluc3RydW1lbnRlZCA9IEluc3BlY3Rvck1lbW9yeUJsb2NrOjpjcmVhdGUoKS5z ZXROYW1lKCJJbnN0cnVtZW50ZWRCdXROb3RBbGxvY2F0ZWQiKTsKKyAgICAgICAgaW5jb3JyZWN0 bHlJbnN0cnVtZW50ZWQtPnNldFNpemUobWVtb3J5SW5zdHJ1bWVudGF0aW9uLnRvdGFsT2JqZWN0 c05vdEluQWxsb2NhdGVkU2V0KCkpOworCisgICAgICAgIGNoaWxkcmVuLT5hZGRJdGVtKHRvdGFs SW5zdHJ1bWVudGVkKTsKKyAgICAgICAgY2hpbGRyZW4tPmFkZEl0ZW0oaW5jb3JyZWN0bHlJbnN0 cnVtZW50ZWQpOworICAgIH0KIH0KIAogc3RhdGljIHZvaWQgYWRkUGxhdGZvcm1Db21wb25lbnRz SW5mbyhQYXNzUmVmUHRyPFR5cGVCdWlsZGVyOjpBcnJheTxJbnNwZWN0b3JNZW1vcnlCbG9jaz4g PiBjaGlsZHJlbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9NZW1vcnlJ bnN0cnVtZW50YXRpb25JbXBsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9NZW1vcnlJ bnN0cnVtZW50YXRpb25JbXBsLmNwcAppbmRleCBkODQ5M2FmYzRkYTFjY2QwNTlkYjcxYTMzNTJh YTMzN2IxN2I0N2Q2Li44MjJlYjlmMTU2MWM4ZmNkNWZjYzRlY2ZlOGM5NTE4YWI0YmVmYTA4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvTWVtb3J5SW5zdHJ1bWVudGF0aW9u SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL01lbW9yeUluc3RydW1lbnRh dGlvbkltcGwuY3BwCkBAIC0zNywxMSArMzcsMTEgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog Ci1NZW1vcnlJbnN0cnVtZW50YXRpb25JbXBsOjpNZW1vcnlJbnN0cnVtZW50YXRpb25JbXBsKFZp c2l0ZWRPYmplY3RzJiB2aXNpdGVkT2JqZWN0cywgY29uc3QgVmlzaXRlZE9iamVjdHMqIGFsbG9j YXRlZE9iamVjdHMKLSAgICApCitNZW1vcnlJbnN0cnVtZW50YXRpb25JbXBsOjpNZW1vcnlJbnN0 cnVtZW50YXRpb25JbXBsKFZpc2l0ZWRPYmplY3RzJiB2aXNpdGVkT2JqZWN0cywgY29uc3QgVmlz aXRlZE9iamVjdHMqIGFsbG9jYXRlZE9iamVjdHMpCiAgICAgOiBtX3Zpc2l0ZWRPYmplY3RzKHZp c2l0ZWRPYmplY3RzKQogICAgICwgbV9hbGxvY2F0ZWRPYmplY3RzKGFsbG9jYXRlZE9iamVjdHMp CiAgICAgLCBtX3RvdGFsQ291bnRlZE9iamVjdHMoMCkKKyAgICAsIG1fdG90YWxPYmplY3RzTm90 SW5BbGxvY2F0ZWRTZXQoMCkKIHsKIH0KIApAQCAtNzUsMTEgKzc1LDE0IEBAIGJvb2wgTWVtb3J5 SW5zdHJ1bWVudGF0aW9uSW1wbDo6dmlzaXRlZChjb25zdCB2b2lkKiBvYmplY3QpCiAKIHZvaWQg TWVtb3J5SW5zdHJ1bWVudGF0aW9uSW1wbDo6Y2hlY2tDb3VudGVkT2JqZWN0KGNvbnN0IHZvaWQq IG9iamVjdCkKIHsKLSAgICBpZiAoIW1fYWxsb2NhdGVkT2JqZWN0cykKKyAgICBpZiAoIWNoZWNr SW5zdHJ1bWVudGVkT2JqZWN0cygpKQogICAgICAgICByZXR1cm47CiAgICAgaWYgKCFtX2FsbG9j YXRlZE9iamVjdHMtPmNvbnRhaW5zKG9iamVjdCkpIHsKLSAgICAgICAgcHJpbnRmKCJGb3VuZCB1 bmtud293biBvYmplY3QgcmVmZXJlbmNlZCBieVBvaW50ZXI6ICVwXG4iLCBvYmplY3QpOworICAg ICAgICArK21fdG90YWxPYmplY3RzTm90SW5BbGxvY2F0ZWRTZXQ7CisjaWYgMAorICAgICAgICBw cmludGYoIkZvdW5kIHVua25vd24gb2JqZWN0IHJlZmVyZW5jZWQgYnkgcG9pbnRlcjogJXBcbiIs IG9iamVjdCk7CiAgICAgICAgIFdURlJlcG9ydEJhY2t0cmFjZSgpOworI2VuZGlmCiAgICAgfQog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvTWVtb3J5SW5zdHJ1bWVu dGF0aW9uSW1wbC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL01lbW9yeUluc3RydW1lbnRh dGlvbkltcGwuaAppbmRleCAxNDU0M2IyYWVjMjk2YzgyY2E0YWI2MWUwNjIxZDgxZmJhNDZhMGI1 Li5lZjk1NDZkODczNWQxODlhYThkOTE4ZWU3NTU0MmM5ZjhhODYwY2Q5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvTWVtb3J5SW5zdHJ1bWVudGF0aW9uSW1wbC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9NZW1vcnlJbnN0cnVtZW50YXRpb25JbXBsLmgKQEAg LTYzLDYgKzYzLDEwIEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIHNpemU7CiAgICAgfQogCisg ICAgYm9vbCBjaGVja0luc3RydW1lbnRlZE9iamVjdHMoKSBjb25zdCB7IHJldHVybiBtX2FsbG9j YXRlZE9iamVjdHM7IH0KKyAgICBzaXplX3QgdG90YWxDb3VudGVkT2JqZWN0cygpIGNvbnN0IHsg cmV0dXJuIG1fdG90YWxDb3VudGVkT2JqZWN0czsgfQorICAgIHNpemVfdCB0b3RhbE9iamVjdHNO b3RJbkFsbG9jYXRlZFNldCgpIGNvbnN0IHsgcmV0dXJuIG1fdG90YWxPYmplY3RzTm90SW5BbGxv Y2F0ZWRTZXQ7IH0KKwogcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgY291bnRPYmplY3RTaXpl KE1lbW9yeU9iamVjdFR5cGUsIHNpemVfdCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIGRl ZmVySW5zdHJ1bWVudGVkUG9pbnRlcihQYXNzT3duUHRyPEluc3RydW1lbnRlZFBvaW50ZXJCYXNl PikgT1ZFUlJJREU7CkBAIC03Niw2ICs4MCw3IEBAIHByaXZhdGU6CiAgICAgVmVjdG9yPE93blB0 cjxJbnN0cnVtZW50ZWRQb2ludGVyQmFzZT4gPiBtX2RlZmVycmVkSW5zdHJ1bWVudGVkUG9pbnRl cnM7CiAgICAgY29uc3QgVmlzaXRlZE9iamVjdHMqIG1fYWxsb2NhdGVkT2JqZWN0czsKICAgICBz aXplX3QgbV90b3RhbENvdW50ZWRPYmplY3RzOworICAgIHNpemVfdCBtX3RvdGFsT2JqZWN0c05v dEluQWxsb2NhdGVkU2V0OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo= 165804 2012-09-26 08:08:12 -0700 2012-09-27 00:57:32 -0700 Patch bug-97683-20120926190730.patch text/plain 5992 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5NjMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWNlNjU5ZWNlMTRmOGNk ODUzNWY5Mzc4ODFiOWQzOTFiN2QyMTJhYy4uZDlkY2I4NDE4MWQzMmQ3ZmI4ZTg1NDcxNmMxZjM3 NmZjYjE2ZDM0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDEyLTA5LTI2ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGV4cG9zZSBkZWJ1ZyBtZW1vcnkgaW5zdHJ1bWVudGF0aW9uIGRlYnVnIGRhdGEgdGhyb3Vn aCB0aGUgcHJvdG9jb2wKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTk3NjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgTWVtb3J5LmdldFByb2Nlc3NNZW1vcnlEaXN0cmlidXRpb24gY29tbWFuZCBub3cgcmV0 dXJucyBudW1iZXIgb2YgaW5zdHJ1bWVudGVkCisgICAgICAgIG9iamVjdHMgdGhhdCB3ZXJlIGZv dW5kIGFuZCB0aGUgbnVtYmVyIG9mIHRoZSBvYmplY3RzIHRoYXQgd2VyZSBjb3VudGVkIGJ5Cisg ICAgICAgIHRoZSBpbnN0cnVtZW50YXRpb24gYnV0IHdlcmUgbm90IGFjdHVhbGx5IGFsbG9jYXRl ZCBieSB0aGUgbWVtb3J5IGFsbG9jYXRvci4KKyAgICAgICAgVGhlc2UgbnVtYmVycyBhcmUgb25s eSBhZGRlZCB0byB0aGUgcmVzcG9uc2UgaWYgZW1iZWRkZXIgcHJvdmlkZXMgYWNjZXNzIHRvIHRo ZQorICAgICAgICBzZXQgb2YgYWxsIGxpdmUgaGVhcCBvYmplY3RzLiBUaGVzZSBudW1iZXJzIGFy ZSBpbnRlbmRlZCB0byBiZSB1c2VkIGZvciB0ZXN0aW5nCisgICAgICAgIG1lbW9yeSBpbnN0cnVt ZW50YXRpb24uCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Y29sbGVjdERvbVRyZWVJbmZvKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvTWVtb3J5SW5zdHJ1bWVudGF0aW9uSW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpN ZW1vcnlJbnN0cnVtZW50YXRpb25JbXBsOjpNZW1vcnlJbnN0cnVtZW50YXRpb25JbXBsKToKKyAg ICAgICAgKFdlYkNvcmU6Ok1lbW9yeUluc3RydW1lbnRhdGlvbkltcGw6OmNoZWNrQ291bnRlZE9i amVjdCk6CisgICAgICAgICogaW5zcGVjdG9yL01lbW9yeUluc3RydW1lbnRhdGlvbkltcGwuaDoK KyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeUluc3RydW1lbnRhdGlvbkltcGw6OmNoZWNrSW5zdHJ1 bWVudGVkT2JqZWN0cyk6CisgICAgICAgIChXZWJDb3JlOjpNZW1vcnlJbnN0cnVtZW50YXRpb25J bXBsOjp0b3RhbENvdW50ZWRPYmplY3RzKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeUluc3Ry dW1lbnRhdGlvbkltcGw6OnRvdGFsT2JqZWN0c05vdEluQWxsb2NhdGVkU2V0KToKKyAgICAgICAg KE1lbW9yeUluc3RydW1lbnRhdGlvbkltcGwpOgorCisyMDEyLTA5LTI2ICBZdXJ5IFNlbWlraGF0 c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFVucmV2aWV3ZWQuIFJvbGwgb3V0 IGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzEyOTUwMiBzaW5jZSBpdCBicm9rZSBj b29raWUgdGFibGUuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05NzQ3MQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yTWVtb3J5QWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck1l bW9yeUFnZW50LmNwcAppbmRleCAzOWZlYTc4OTBjZjE1ZWJhNWQyOGQ2MzhlZmJiYTIwNGIwYjhj NTQxLi4xNGY5ZGFmNDhiMjUwMDJkMTIxZTkyYmFkM2JiZWU3NjQ3ZTY3ZTc5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JNZW1vcnlBZ2VudC5jcHAKQEAgLTUx Nyw2ICs1MTcsMjAgQEAgcHJpdmF0ZToKIAogfQogCitzdGF0aWMgdm9pZCBhZGRNZW1vcnlJbnN0 cnVtZW50YXRpb25EZWJ1Z0RhdGEoVHlwZUJ1aWxkZXI6OkFycmF5PEluc3BlY3Rvck1lbW9yeUJs b2NrPiogY2hpbGRyZW4sIGNvbnN0IE1lbW9yeUluc3RydW1lbnRhdGlvbkltcGwmIG1lbW9yeUlu c3RydW1lbnRhdGlvbikKK3sKKyAgICBpZiAobWVtb3J5SW5zdHJ1bWVudGF0aW9uLmNoZWNrSW5z dHJ1bWVudGVkT2JqZWN0cygpKSB7CisgICAgICAgIFJlZlB0cjxJbnNwZWN0b3JNZW1vcnlCbG9j az4gdG90YWxJbnN0cnVtZW50ZWQgPSBJbnNwZWN0b3JNZW1vcnlCbG9jazo6Y3JlYXRlKCkuc2V0 TmFtZSgiSW5zdHJ1bWVudGVkT2JqZWN0c0NvdW50Iik7CisgICAgICAgIHRvdGFsSW5zdHJ1bWVu dGVkLT5zZXRTaXplKG1lbW9yeUluc3RydW1lbnRhdGlvbi50b3RhbENvdW50ZWRPYmplY3RzKCkp OworCisgICAgICAgIFJlZlB0cjxJbnNwZWN0b3JNZW1vcnlCbG9jaz4gaW5jb3JyZWN0bHlJbnN0 cnVtZW50ZWQgPSBJbnNwZWN0b3JNZW1vcnlCbG9jazo6Y3JlYXRlKCkuc2V0TmFtZSgiSW5zdHJ1 bWVudGVkQnV0Tm90QWxsb2NhdGVkT2JqZWN0c0NvdW50Iik7CisgICAgICAgIGluY29ycmVjdGx5 SW5zdHJ1bWVudGVkLT5zZXRTaXplKG1lbW9yeUluc3RydW1lbnRhdGlvbi50b3RhbE9iamVjdHNO b3RJbkFsbG9jYXRlZFNldCgpKTsKKworICAgICAgICBjaGlsZHJlbi0+YWRkSXRlbSh0b3RhbElu c3RydW1lbnRlZCk7CisgICAgICAgIGNoaWxkcmVuLT5hZGRJdGVtKGluY29ycmVjdGx5SW5zdHJ1 bWVudGVkKTsKKyAgICB9Cit9CisKIHN0YXRpYyB2b2lkIGNvbGxlY3REb21UcmVlSW5mbyhQYWdl KiBwYWdlLCBJbnNwZWN0b3JDbGllbnQqIGluc3BlY3RvckNsaWVudCwgVmlzaXRlZE9iamVjdHMm IHZpc2l0ZWRPYmplY3RzLCBUeXBlQnVpbGRlcjo6QXJyYXk8SW5zcGVjdG9yTWVtb3J5QmxvY2s+ KiBjaGlsZHJlbiwgSW5zcGVjdG9yRGF0YUNvdW50ZXIqIGluc3BlY3RvckRhdGEpCiB7CiAgICAg SGFzaFNldDxjb25zdCB2b2lkKj4gYWxsb2NhdGVkT2JqZWN0czsKQEAgLTUzOSw2ICs1NTMsNyBA QCBzdGF0aWMgdm9pZCBjb2xsZWN0RG9tVHJlZUluZm8oUGFnZSogcGFnZSwgSW5zcGVjdG9yQ2xp ZW50KiBpbnNwZWN0b3JDbGllbnQsIFZpcwogICAgIGRvbVRyZWVzSXRlcmF0b3IudmlzaXRNZW1v cnlDYWNoZSgpOwogCiAgICAgZG9tVHJlZXNJdGVyYXRvci5kdW1wU3RhdGlzdGljcyhjaGlsZHJl biwgaW5zcGVjdG9yRGF0YSk7CisgICAgYWRkTWVtb3J5SW5zdHJ1bWVudGF0aW9uRGVidWdEYXRh KGNoaWxkcmVuLCBtZW1vcnlJbnN0cnVtZW50YXRpb24pOwogfQogCiBzdGF0aWMgdm9pZCBhZGRQ bGF0Zm9ybUNvbXBvbmVudHNJbmZvKFBhc3NSZWZQdHI8VHlwZUJ1aWxkZXI6OkFycmF5PEluc3Bl Y3Rvck1lbW9yeUJsb2NrPiA+IGNoaWxkcmVuKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL01lbW9yeUluc3RydW1lbnRhdGlvbkltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL01lbW9yeUluc3RydW1lbnRhdGlvbkltcGwuY3BwCmluZGV4IGQ4NDkzYWZjNGRh MWNjZDA1OWRiNzFhMzM1MmFhMzM3YjE3YjQ3ZDYuLjgyMmViOWYxNTYxYzhmY2Q1ZmNjNGVjZmU4 Yzk1MThhYjRiZWZhMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9NZW1v cnlJbnN0cnVtZW50YXRpb25JbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv TWVtb3J5SW5zdHJ1bWVudGF0aW9uSW1wbC5jcHAKQEAgLTM3LDExICszNywxMSBAQAogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKLU1lbW9yeUluc3RydW1lbnRhdGlvbkltcGw6Ok1lbW9yeUluc3Ry dW1lbnRhdGlvbkltcGwoVmlzaXRlZE9iamVjdHMmIHZpc2l0ZWRPYmplY3RzLCBjb25zdCBWaXNp dGVkT2JqZWN0cyogYWxsb2NhdGVkT2JqZWN0cwotICAgICkKK01lbW9yeUluc3RydW1lbnRhdGlv bkltcGw6Ok1lbW9yeUluc3RydW1lbnRhdGlvbkltcGwoVmlzaXRlZE9iamVjdHMmIHZpc2l0ZWRP YmplY3RzLCBjb25zdCBWaXNpdGVkT2JqZWN0cyogYWxsb2NhdGVkT2JqZWN0cykKICAgICA6IG1f dmlzaXRlZE9iamVjdHModmlzaXRlZE9iamVjdHMpCiAgICAgLCBtX2FsbG9jYXRlZE9iamVjdHMo YWxsb2NhdGVkT2JqZWN0cykKICAgICAsIG1fdG90YWxDb3VudGVkT2JqZWN0cygwKQorICAgICwg bV90b3RhbE9iamVjdHNOb3RJbkFsbG9jYXRlZFNldCgwKQogewogfQogCkBAIC03NSwxMSArNzUs MTQgQEAgYm9vbCBNZW1vcnlJbnN0cnVtZW50YXRpb25JbXBsOjp2aXNpdGVkKGNvbnN0IHZvaWQq IG9iamVjdCkKIAogdm9pZCBNZW1vcnlJbnN0cnVtZW50YXRpb25JbXBsOjpjaGVja0NvdW50ZWRP YmplY3QoY29uc3Qgdm9pZCogb2JqZWN0KQogewotICAgIGlmICghbV9hbGxvY2F0ZWRPYmplY3Rz KQorICAgIGlmICghY2hlY2tJbnN0cnVtZW50ZWRPYmplY3RzKCkpCiAgICAgICAgIHJldHVybjsK ICAgICBpZiAoIW1fYWxsb2NhdGVkT2JqZWN0cy0+Y29udGFpbnMob2JqZWN0KSkgewotICAgICAg ICBwcmludGYoIkZvdW5kIHVua253b3duIG9iamVjdCByZWZlcmVuY2VkIGJ5UG9pbnRlcjogJXBc biIsIG9iamVjdCk7CisgICAgICAgICsrbV90b3RhbE9iamVjdHNOb3RJbkFsbG9jYXRlZFNldDsK KyNpZiAwCisgICAgICAgIHByaW50ZigiRm91bmQgdW5rbm93biBvYmplY3QgcmVmZXJlbmNlZCBi eSBwb2ludGVyOiAlcFxuIiwgb2JqZWN0KTsKICAgICAgICAgV1RGUmVwb3J0QmFja3RyYWNlKCk7 CisjZW5kaWYKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9NZW1vcnlJbnN0cnVtZW50YXRpb25JbXBsLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv TWVtb3J5SW5zdHJ1bWVudGF0aW9uSW1wbC5oCmluZGV4IDE0NTQzYjJhZWMyOTZjODJjYTRhYjYx ZTA2MjFkODFmYmE0NmEwYjUuLmVmOTU0NmQ4NzM1ZDE4OWFhOGQ5MThlZTc1NTQyYzlmOGE4NjBj ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9NZW1vcnlJbnN0cnVtZW50 YXRpb25JbXBsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL01lbW9yeUluc3RydW1l bnRhdGlvbkltcGwuaApAQCAtNjMsNiArNjMsMTAgQEAgcHVibGljOgogICAgICAgICByZXR1cm4g c2l6ZTsKICAgICB9CiAKKyAgICBib29sIGNoZWNrSW5zdHJ1bWVudGVkT2JqZWN0cygpIGNvbnN0 IHsgcmV0dXJuIG1fYWxsb2NhdGVkT2JqZWN0czsgfQorICAgIHNpemVfdCB0b3RhbENvdW50ZWRP YmplY3RzKCkgY29uc3QgeyByZXR1cm4gbV90b3RhbENvdW50ZWRPYmplY3RzOyB9CisgICAgc2l6 ZV90IHRvdGFsT2JqZWN0c05vdEluQWxsb2NhdGVkU2V0KCkgY29uc3QgeyByZXR1cm4gbV90b3Rh bE9iamVjdHNOb3RJbkFsbG9jYXRlZFNldDsgfQorCiBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9p ZCBjb3VudE9iamVjdFNpemUoTWVtb3J5T2JqZWN0VHlwZSwgc2l6ZV90KSBPVkVSUklERTsKICAg ICB2aXJ0dWFsIHZvaWQgZGVmZXJJbnN0cnVtZW50ZWRQb2ludGVyKFBhc3NPd25QdHI8SW5zdHJ1 bWVudGVkUG9pbnRlckJhc2U+KSBPVkVSUklERTsKQEAgLTc2LDYgKzgwLDcgQEAgcHJpdmF0ZToK ICAgICBWZWN0b3I8T3duUHRyPEluc3RydW1lbnRlZFBvaW50ZXJCYXNlPiA+IG1fZGVmZXJyZWRJ bnN0cnVtZW50ZWRQb2ludGVyczsKICAgICBjb25zdCBWaXNpdGVkT2JqZWN0cyogbV9hbGxvY2F0 ZWRPYmplY3RzOwogICAgIHNpemVfdCBtX3RvdGFsQ291bnRlZE9iamVjdHM7CisgICAgc2l6ZV90 IG1fdG90YWxPYmplY3RzTm90SW5BbGxvY2F0ZWRTZXQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCg==