97879 2012-09-28 02:59:19 -0700 Web Inspector: make HashSet memory instrumentation non-intrusive 2012-09-28 04:21:33 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys apavlov benjamin bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 730421 0 yurys 2012-09-28 02:59:19 -0700 Declaring reportMemoryUsage as a friend of HashSet and HashTable is considered harmful, so we should switch to using only public API of the classes. This way we will still be able to collect necessary information. The problem is that it will be easier to change the implementation and forget to update the instrumentation(which is probably fine since these classes don't change often), also we won't be able to automatically mark corresponding objects in the memory as instrumented while checking correctness of the memory instrumentation. 730422 1 166187 yurys 2012-09-28 03:04:19 -0700 Created attachment 166187 Patch 730428 2 166187 loislo 2012-09-28 03:09:01 -0700 Comment on attachment 166187 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166187&action=review lgtm > Source/WebKit/chromium/ChangeLog:8 > + Updatee the test for HashSet memory instrumentation. We don't add typo: Updatee 730475 3 166187 yurys 2012-09-28 04:15:52 -0700 Comment on attachment 166187 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166187&action=review >> Source/WebKit/chromium/ChangeLog:8 >> + Updatee the test for HashSet memory instrumentation. We don't add > > typo: Updatee Done. 730479 4 yurys 2012-09-28 04:21:33 -0700 Committed r129875: <http://trac.webkit.org/changeset/129875> 166187 2012-09-28 03:04:19 -0700 2012-09-28 04:17:46 -0700 Patch bug-97879-20120928140335.patch text/plain 15199 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5ODU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGJlYmI0ODVjMjkyY2RhNWVhNWFlMTc2 NmNhZjA2NTlkNTUxOGYzYjEuLmRiOTIyYzgzOTc4OWMxYmIxZDI1ZTRkNzk3NzQ2OWJlMzFiNDEw NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTItMDktMjggIFl1cnkgU2VtaWtoYXRza3kgIDx5 dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogbWFrZSBIYXNoU2V0 IG1lbW9yeSBpbnN0cnVtZW50YXRpb24gbm9uLWludHJ1c2l2ZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTc4NzkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmVkIHJlcG9ydE1lbW9yeVVzYWdlIGRl Y2xhcmF0aW9ucyBhcyBhIGZyaWVuZCBvZiBIYXNoU2V0IGFuZCBIYXNoVGFibGUuIEFsc28KKyAg ICAgICAgcmVtb3ZlZCBNZW1vcnlJbnN0cnVtZW50YXRpb25IYXNoVGFibGUgd2hpY2ggaXMgbm90 IG5lZWRlZCBpZiB3ZSBkb24ndCBoYXZlCisgICAgICAgIGFjY2VzcyB0byBIYXNoU2V0J3MgZ3V0 cy4KKworICAgICAgICAqIEdOVW1ha2VmaWxlLmxpc3QuYW06CisgICAgICAgICogV1RGLmd5cGk6 CisgICAgICAgICogV1RGLnBybzoKKyAgICAgICAgKiBXVEYudmNwcm9qL1dURi52Y3Byb2o6Cisg ICAgICAgICogV1RGLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogd3RmL0hh c2hTZXQuaDoKKyAgICAgICAgKFdURik6CisgICAgICAgIChIYXNoU2V0KToKKyAgICAgICAgKiB3 dGYvSGFzaFRhYmxlLmg6CisgICAgICAgIChIYXNoVGFibGUpOgorICAgICAgICAqIHd0Zi9NZW1v cnlJbnN0cnVtZW50YXRpb24uaDoKKyAgICAgICAgKFdURjo6TWVtb3J5Q2xhc3NJbmZvOjphZGRQ cml2YXRlQnVmZmVyKToKKyAgICAgICAgKiB3dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaFNl dC5oOgorICAgICAgICAoV1RGOjpyZXBvcnRNZW1vcnlVc2FnZSk6CisgICAgICAgICogd3RmL01l bW9yeUluc3RydW1lbnRhdGlvbkhhc2hUYWJsZS5oOiBSZW1vdmVkLgorCiAyMDEyLTA5LTI3ICBB bmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHRo ZSBjbGFuZyBwcmFnbWFzIHRvIGRpc2FibGUgd2FybmluZ3MgaW4gTm9uY29weWFibGUuaApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCBhZmQzZWJkMTJjNzg1M2FiMjViNWRiYmQ3ZmUwNWVj YmZiZWZjZTgwLi4yM2U3NjVkZTFkMjllZmU4YjVjYTI0MTZkODcxNzMyZTA3YjQzOTkxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA5LTI4ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IG1ha2UgSGFzaFNldCBtZW1vcnkgaW5zdHJ1bWVudGF0aW9uIG5vbi1pbnRydXNpdmUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3ODc5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlZSB0aGUg dGVzdCBmb3IgSGFzaFNldCBtZW1vcnkgaW5zdHJ1bWVudGF0aW9uLiBXZSBkb24ndCBhZGQKKyAg ICAgICAgSGFzaFNldCdzIHByaXZhdGUgb2JqZWN0cyBpbnRvIHRoZSBzZXQgb2YgdmlzaXRlZCBv YmplY3RzIGFueSBtb3JlCisgICAgICAgIGFuZCBzaG91bGQgdXBkYXRlIHRoZSBleHBlY3RhdGlv biBhY2NvcmRpbmdseS4KKworICAgICAgICAqIHRlc3RzL01lbW9yeUluc3RydW1lbnRhdGlvblRl c3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VEVTVCk6CisKIDIwMTItMDktMjcgIE1hcmsgUGls Z3JpbSAgPHBpbGdyaW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gVXBkYXRl IFdlYlZlY3Rvci5oIHJlZmVyZW5jZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvR05VbWFrZWZp bGUubGlzdC5hbSBiL1NvdXJjZS9XVEYvR05VbWFrZWZpbGUubGlzdC5hbQppbmRleCAwOGZhY2Rj ODgzMTdlN2FhZjRiMzE1ODIzMjY1YjVkZDBhNjA2MmZhLi4wY2ViOWZkZWU0ZGE2MzRiM2VmZjcz NWI5NDU2YmVlODE5OGRiZjM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0dOVW1ha2VmaWxlLmxp c3QuYW0KKysrIGIvU291cmNlL1dURi9HTlVtYWtlZmlsZS5saXN0LmFtCkBAIC04Miw3ICs4Miw2 IEBAIHd0Zl9zb3VyY2VzICs9IFwKICAgICBTb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50 YXRpb24uaCBcCiAgICAgU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uQXJyYXlC dWZmZXJWaWV3LmggXAogICAgIFNvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbkhh c2hTZXQuaCBcCi0gICAgU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaFRh YmxlLmggXAogICAgIFNvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblZlY3Rvci5o IFwKICAgICBTb3VyY2UvV1RGL3d0Zi9NZXNzYWdlUXVldWUuaCBcCiAgICAgU291cmNlL1dURi93 dGYvTWV0YUFsbG9jYXRvci5jcHAgXApkaWZmIC0tZ2l0IGEvU291cmNlL1dURi9XVEYuZ3lwaSBi L1NvdXJjZS9XVEYvV1RGLmd5cGkKaW5kZXggMTBlMzJkZjI2ZDE1N2NiODEwMTBhMmZlMzY5M2Ni NjlmOTZjYjM2Ny4uZGVhYzU3MTljN2FlNWI5OWMyZDE4Y2I0OGIyYzU1NDYyMmJkOGIxNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dURi9XVEYuZ3lwaQorKysgYi9Tb3VyY2UvV1RGL1dURi5neXBpCkBA IC01Miw3ICs1Miw2IEBACiAgICAgICAgICAgICAnd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbi5o JywKICAgICAgICAgICAgICd3dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uQXJyYXlCdWZmZXJWaWV3 LmgnLAogICAgICAgICAgICAgJ3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25IYXNoU2V0LmgnLAot ICAgICAgICAgICAgJ3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25IYXNoVGFibGUuaCcsCiAgICAg ICAgICAgICAnd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblZlY3Rvci5oJywKICAgICAgICAgICAg ICd3dGYvTWVzc2FnZVF1ZXVlLmgnLAogICAgICAgICAgICAgJ3d0Zi9Ob25Db3B5aW5nU29ydC5o JywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvV1RGLnBybyBiL1NvdXJjZS9XVEYvV1RGLnBybwpp bmRleCAwMDA0ZGU4MWFmODYxM2Y3ZGUzZDY3ZWVkNjNlODE3MmMwMzRhOWE5Li43YTEwYmVmZTMz ZDRlOGY1NmI5ZTdkZTUwYzI5NjIzNTljZTg1NDdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL1dU Ri5wcm8KKysrIGIvU291cmNlL1dURi9XVEYucHJvCkBAIC04OSw3ICs4OSw2IEBAIEhFQURFUlMg Kz0gXAogICAgIE1lbW9yeUluc3RydW1lbnRhdGlvbi5oIFwKICAgICBNZW1vcnlJbnN0cnVtZW50 YXRpb25BcnJheUJ1ZmZlclZpZXcuaCBcCiAgICAgTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaFNl dC5oIFwKLSAgICBNZW1vcnlJbnN0cnVtZW50YXRpb25IYXNoVGFibGUuaCBcCiAgICAgTWVtb3J5 SW5zdHJ1bWVudGF0aW9uVmVjdG9yLmggXAogICAgIE1lc3NhZ2VRdWV1ZS5oIFwKICAgICBNZXRh QWxsb2NhdG9yLmggXApkaWZmIC0tZ2l0IGEvU291cmNlL1dURi9XVEYudmNwcm9qL1dURi52Y3By b2ogYi9Tb3VyY2UvV1RGL1dURi52Y3Byb2ovV1RGLnZjcHJvagppbmRleCA2NTEzNDRhYWE5YmJk ZjEwOTExYzYyYTE1YTk2NTZhNzk4NDE2OGUzLi5iOTJlNzc4OTAzNTNmYzgxNGJkMWEwOWVhMjRj ZjdlZjUzOGQwOTk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL1dURi52Y3Byb2ovV1RGLnZjcHJv agorKysgYi9Tb3VyY2UvV1RGL1dURi52Y3Byb2ovV1RGLnZjcHJvagpAQCAtOTEzLDEwICs5MTMs NiBAQAogCQkJPgogCQk8L0ZpbGU+CiAJCTxGaWxlCi0JCSAgICAgICAgUmVsYXRpdmVQYXRoPSIu Llx3dGZcTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaFRhYmxlLmgiCi0JCQk+Ci0JCTwvRmlsZT4K LQkJPEZpbGUKIAkJICAgICAgICBSZWxhdGl2ZVBhdGg9Ii4uXHd0ZlxNZW1vcnlJbnN0cnVtZW50 YXRpb25WZWN0b3IuaCIKIAkJCT4KIAkJPC9GaWxlPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi9X VEYueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XVEYvV1RGLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oKaW5kZXggOWQ3NjdmM2UxNzFhMGFkNzcxYzg0ZDEwZTNjZWJmYzdjNDk5 MzkzOS4uOTczYjFjODE2NDE2ZjliOTM5MDUwZjY0MTk2ZjM1YTFmMmEyYmJjMyAxMDA2NDQKLS0t IGEvU291cmNlL1dURi9XVEYueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2Uv V1RGL1dURi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC00MCw3ICs0MCw2IEBACiAJCTJD Q0Q4OTJBMTVDMDM5MDIwMDI4NTA4MyAvKiBHcmVnb3JpYW5EYXRlVGltZS5jcHAgaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyQ0NEODkyOTE1QzAzOTAyMDAy ODUwODMgLyogR3JlZ29yaWFuRGF0ZVRpbWUuY3BwICovOyB9OwogCQk0MzMwRjM4RjE1NzQ1QjA1 MDBBQUZBOEYgLyogVVJMU3RyaW5nLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDQzMzBGMzhFMTU3NDVCMDUwMEFBRkE4RiAvKiBVUkxTdHJpbmcuY3Bw ICovOyB9OwogCQk0RjAzMjFCQzE1NkFBOEQxMDA2RUJBRjYgLyogQml0QXJyYXkuaCBpbiBIZWFk ZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDRGMDMyMUJCMTU2QUE4RDEw MDZFQkFGNiAvKiBCaXRBcnJheS5oICovOyB9OwotCQk0RjBCQUJCQjE2MTFENUY1MDAwMjNGNjYg LyogTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaFRhYmxlLmggaW4gSGVhZGVycyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0RjBCQUJCQTE2MTFENUY1MDAwMjNGNjYgLyogTWVt b3J5SW5zdHJ1bWVudGF0aW9uSGFzaFRhYmxlLmggKi87IH07CiAJCTRGMUIyREI2MTYwQjQ0QUEw MDU4NjU1OSAvKiBNZW1vcnlJbnN0cnVtZW50YXRpb25IYXNoU2V0LmggaW4gSGVhZGVycyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0RjFCMkRCNTE2MEI0NEFBMDA1ODY1NTkg LyogTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaFNldC5oICovOyB9OwogCQk0RjFEMTE1NDE1RkYx MUJFMDAyNkU5MDggLyogTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmggaW4gSGVhZGVycyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0RjFEMTE1MzE1RkYxMUJFMDAyNkU5MDggLyog TWVtb3J5SW5zdHJ1bWVudGF0aW9uLmggKi87IH07CiAJCTRGQ0I3MTBBMTYwQTFBMDcwMDg0MjVF QyAvKiBNZW1vcnlJbnN0cnVtZW50YXRpb25WZWN0b3IuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDRGQ0I3MTA5MTYwQTFBMDcwMDg0MjVFQyAvKiBNZW1v cnlJbnN0cnVtZW50YXRpb25WZWN0b3IuaCAqLzsgfTsKQEAgLTMxMiw3ICszMTEsNiBAQAogCQky Q0NEODkyOTE1QzAzOTAyMDAyODUwODMgLyogR3JlZ29yaWFuRGF0ZVRpbWUuY3BwICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gR3JlZ29yaWFuRGF0ZVRpbWUuY3BwOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0MzMwRjM4RTE1NzQ1QjA1MDBBQUZBOEYgLyogVVJM U3RyaW5nLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFVSTFN0cmlu Zy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTRGMDMyMUJCMTU2QUE4RDEwMDZF QkFGNiAvKiBCaXRBcnJheS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBCaXRB cnJheS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwotCQk0RjBCQUJCQTE2MTFENUY1MDAw MjNGNjYgLyogTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaFRhYmxlLmggKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmMuaDsgcGF0aCA9IE1lbW9yeUluc3RydW1lbnRhdGlvbkhhc2hUYWJsZS5oOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0RjFCMkRCNTE2MEI0NEFBMDA1ODY1NTkgLyogTWVt b3J5SW5zdHJ1bWVudGF0aW9uSGFzaFNldC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBh dGggPSBNZW1vcnlJbnN0cnVtZW50YXRpb25IYXNoU2V0Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CiAJCTRGMUQxMTUzMTVGRjExQkUwMDI2RTkwOCAvKiBNZW1vcnlJbnN0cnVtZW50YXRp b24uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gTWVtb3J5SW5zdHJ1bWVudGF0 aW9uLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTRGQ0I3MTA5MTYwQTFBMDcwMDg0 MjVFQyAvKiBNZW1vcnlJbnN0cnVtZW50YXRpb25WZWN0b3IuaCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuYy5oOyBwYXRoID0gTWVtb3J5SW5zdHJ1bWVudGF0aW9uVmVjdG9yLmg7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CkBAIC03MDAsNyArNjk4LDYgQEAKIAkJCQk0RjFEMTE1MzE1RkYxMUJF MDAyNkU5MDggLyogTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmggKi8sCiAJCQkJNEZEODU1NDYxNjEz M0UwRTAwQzVCNzA0IC8qIE1lbW9yeUluc3RydW1lbnRhdGlvbkFycmF5QnVmZmVyVmlldy5oICov LAogCQkJCTRGMUIyREI1MTYwQjQ0QUEwMDU4NjU1OSAvKiBNZW1vcnlJbnN0cnVtZW50YXRpb25I YXNoU2V0LmggKi8sCi0JCQkJNEYwQkFCQkExNjExRDVGNTAwMDIzRjY2IC8qIE1lbW9yeUluc3Ry dW1lbnRhdGlvbkhhc2hUYWJsZS5oICovLAogCQkJCTRGQ0I3MTA5MTYwQTFBMDcwMDg0MjVFQyAv KiBNZW1vcnlJbnN0cnVtZW50YXRpb25WZWN0b3IuaCAqLywKIAkJCQlBOEE0NzJDQzE1MUE4MjVC MDA0MTIzRkYgLyogTWVzc2FnZVF1ZXVlLmggKi8sCiAJCQkJQThBNDcyQ0QxNTFBODI1QjAwNDEy M0ZGIC8qIE1ldGFBbGxvY2F0b3IuY3BwICovLApAQCAtMTE1NSw3ICsxMTUyLDYgQEAKIAkJCQky NkU2QzIwRDE2MDkwMzczMDBDQTZBRjQgLyogVVJMVXRpbC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJ NEZDQjcxMEExNjBBMUEwNzAwODQyNUVDIC8qIE1lbW9yeUluc3RydW1lbnRhdGlvblZlY3Rvci5o IGluIEhlYWRlcnMgKi8sCiAJCQkJNEYxQjJEQjYxNjBCNDRBQTAwNTg2NTU5IC8qIE1lbW9yeUlu c3RydW1lbnRhdGlvbkhhc2hTZXQuaCBpbiBIZWFkZXJzICovLAotCQkJCTRGMEJBQkJCMTYxMUQ1 RjUwMDAyM0Y2NiAvKiBNZW1vcnlJbnN0cnVtZW50YXRpb25IYXNoVGFibGUuaCBpbiBIZWFkZXJz ICovLAogCQkJCTRGRDg1NTQ3MTYxMzNFMEUwMEM1QjcwNCAvKiBNZW1vcnlJbnN0cnVtZW50YXRp b25BcnJheUJ1ZmZlclZpZXcuaCBpbiBIZWFkZXJzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JE ZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYv SGFzaFNldC5oIGIvU291cmNlL1dURi93dGYvSGFzaFNldC5oCmluZGV4IGU2ZWU1OTI5YWZhYTM1 NDNjZWVlMzlkNjk3NTQwZjc5NGZlMjE5N2IuLjFiM2IyZTI4NzMzNDM5YjEwYmI3NTNjOTA0ZDU0 ZmZlYzU1ZjI1Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0hhc2hTZXQuaAorKysgYi9T b3VyY2UvV1RGL3d0Zi9IYXNoU2V0LmgKQEAgLTI3LDcgKzI3LDYgQEAKIG5hbWVzcGFjZSBXVEYg ewogCiAgICAgc3RydWN0IElkZW50aXR5RXh0cmFjdG9yOwotICAgIGNsYXNzIE1lbW9yeU9iamVj dEluZm87CiAgICAgCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVmFsdWUsIHR5cGVuYW1lIEhhc2hG dW5jdGlvbnMsIHR5cGVuYW1lIFRyYWl0cz4gY2xhc3MgSGFzaFNldDsKICAgICB0ZW1wbGF0ZTx0 eXBlbmFtZSBWYWx1ZSwgdHlwZW5hbWUgSGFzaEZ1bmN0aW9ucywgdHlwZW5hbWUgVHJhaXRzPgpA QCAtOTcsNyArOTYsNiBAQCBuYW1lc3BhY2UgV1RGIHsKICAgICBwcml2YXRlOgogICAgICAgICBm cmllbmQgdm9pZCBkZWxldGVBbGxWYWx1ZXM8Pihjb25zdCBIYXNoU2V0Jik7CiAgICAgICAgIGZy aWVuZCB2b2lkIGZhc3REZWxldGVBbGxWYWx1ZXM8Pihjb25zdCBIYXNoU2V0Jik7Ci0gICAgICAg IHRlbXBsYXRlPHR5cGVuYW1lIFYsIHR5cGVuYW1lIEgsIHR5cGVuYW1lIFQ+IGZyaWVuZCB2b2lk IHJlcG9ydE1lbW9yeVVzYWdlKGNvbnN0IEhhc2hTZXQ8ViwgSCwgVD4qIGNvbnN0JiwgTWVtb3J5 T2JqZWN0SW5mbyopOwogCiAgICAgICAgIEhhc2hUYWJsZVR5cGUgbV9pbXBsOwogICAgIH07CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9IYXNoVGFibGUuaCBiL1NvdXJjZS9XVEYvd3RmL0hh c2hUYWJsZS5oCmluZGV4IGNjMWY2ZmVjNDBjN2Q0ZjA0OTYyYTQyZGM0NmU4YjNmNzczYTI2ZGUu LjFjZTNjNWNmNjg4ZWYwYTgxZTEwNjFiYzZjZTI2MjBiZTNkOTgwMGUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XVEYvd3RmL0hhc2hUYWJsZS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL0hhc2hUYWJsZS5o CkBAIC0zMDcsOCArMzA3LDYgQEAgbmFtZXNwYWNlIFdURiB7CiAgICAgICAgIGJvb2wgaXNOZXdF bnRyeTsKICAgICB9OwogCi0gICAgY2xhc3MgTWVtb3J5T2JqZWN0SW5mbzsKLQogICAgIHRlbXBs YXRlPHR5cGVuYW1lIEtleSwgdHlwZW5hbWUgVmFsdWUsIHR5cGVuYW1lIEV4dHJhY3RvciwgdHlw ZW5hbWUgSGFzaEZ1bmN0aW9ucywgdHlwZW5hbWUgVHJhaXRzLCB0eXBlbmFtZSBLZXlUcmFpdHM+ CiAgICAgY2xhc3MgSGFzaFRhYmxlIHsKICAgICBwdWJsaWM6CkBAIC00ODYsOCArNDg0LDYgQEAg bmFtZXNwYWNlIFdURiB7CiAgICAgICAgIHN0YXRpYyBjb25zdCBpbnQgbV9tYXhMb2FkID0gMjsK ICAgICAgICAgc3RhdGljIGNvbnN0IGludCBtX21pbkxvYWQgPSA2OwogCi0gICAgICAgIHRlbXBs YXRlPHR5cGVuYW1lIEssIHR5cGVuYW1lIFYsIHR5cGVuYW1lIEUsIHR5cGVuYW1lIEgsIHR5cGVu YW1lIFQsIHR5cGVuYW1lIEtUPiBmcmllbmQgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShjb25zdCBI YXNoVGFibGU8SywgViwgRSwgSCwgVCwgS1Q+KiBjb25zdCYsIE1lbW9yeU9iamVjdEluZm8qKTsK LQogICAgICAgICBWYWx1ZVR5cGUqIG1fdGFibGU7CiAgICAgICAgIGludCBtX3RhYmxlU2l6ZTsK ICAgICAgICAgaW50IG1fdGFibGVTaXplTWFzazsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3Rm L01lbW9yeUluc3RydW1lbnRhdGlvbi5oIGIvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVu dGF0aW9uLmgKaW5kZXggOWJkZDIzZTE1MzFkZGM1ZjFlOGU5NzVlYmE4NzVmOTlhNjhmMzY1MS4u NjliMDIyNTRiMzdhZmE3MjBiMjU2MjY3YzI4OGM1OGYxZWVlNWM4ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgKKysrIGIvU291cmNlL1dURi93dGYv TWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgKQEAgLTIyMCw2ICsyMjAsNyBAQCBwdWJsaWM6CiAgICAg dGVtcGxhdGU8dHlwZW5hbWUgTWFwVHlwZT4gdm9pZCBhZGRJbnN0cnVtZW50ZWRNYXBWYWx1ZXMo Y29uc3QgTWFwVHlwZSYgbWFwKSB7IG1fbWVtb3J5SW5zdHJ1bWVudGF0aW9uLT5hZGRJbnN0cnVt ZW50ZWRNYXBWYWx1ZXMobWFwLCBtX29iamVjdFR5cGUpOyB9CiAgICAgdGVtcGxhdGU8dHlwZW5h bWUgTGlzdEhhc2hTZXRUeXBlPiB2b2lkIGFkZExpc3RIYXNoU2V0KGNvbnN0IExpc3RIYXNoU2V0 VHlwZSYgc2V0KSB7IG1fbWVtb3J5SW5zdHJ1bWVudGF0aW9uLT5hZGRMaXN0SGFzaFNldChzZXQs IG1fb2JqZWN0VHlwZSwgdHJ1ZSk7IH0KICAgICB2b2lkIGFkZFJhd0J1ZmZlcihjb25zdCB2b2lk KiBjb25zdCYgYnVmZmVyLCBzaXplX3Qgc2l6ZSkgeyBtX21lbW9yeUluc3RydW1lbnRhdGlvbi0+ YWRkUmF3QnVmZmVyKGJ1ZmZlciwgbV9vYmplY3RUeXBlLCBzaXplKTsgfQorICAgIHZvaWQgYWRk UHJpdmF0ZUJ1ZmZlcihzaXplX3Qgc2l6ZSkgeyBtX21lbW9yeUluc3RydW1lbnRhdGlvbi0+Y291 bnRPYmplY3RTaXplKG1fb2JqZWN0VHlwZSwgc2l6ZSk7IH0KIAogICAgIHZvaWQgYWRkV2Vha1Bv aW50ZXIodm9pZCopIHsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0 cnVtZW50YXRpb25IYXNoU2V0LmggYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRp b25IYXNoU2V0LmgKaW5kZXggOTczMTIzNmY2YzE0YmRhZDNkZmVkYzc3MjYzMGZhOWMxNGQzYzBi NC4uOGIwMzUzNzViZmNmNTRmZmY0Y2U2Njg4MTJjYzhiNTBiMTk2NjE2ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaFNldC5oCisrKyBiL1NvdXJj ZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbkhhc2hTZXQuaApAQCAtMzEsOCArMzEsNyBA QAogI2lmbmRlZiBNZW1vcnlJbnN0cnVtZW50YXRpb25IYXNoU2V0X2gKICNkZWZpbmUgTWVtb3J5 SW5zdHJ1bWVudGF0aW9uSGFzaFNldF9oCiAKLSNpbmNsdWRlIDx3dGYvTWVtb3J5SW5zdHJ1bWVu dGF0aW9uSGFzaFRhYmxlLmg+Ci0jaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nSGFzaC5oPgorI2lu Y2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+CiAKIG5hbWVzcGFjZSBXVEYgewogCkBAIC00MCw3ICszOSw3 IEBAIHRlbXBsYXRlPHR5cGVuYW1lIFZhbHVlQXJnLCB0eXBlbmFtZSBIYXNoQXJnLCB0eXBlbmFt ZSBUcmFpdHNBcmc+CiB2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKGNvbnN0IEhhc2hTZXQ8VmFsdWVB cmcsIEhhc2hBcmcsIFRyYWl0c0FyZz4qIGNvbnN0JiBoYXNoU2V0LCBNZW1vcnlPYmplY3RJbmZv KiBtZW1vcnlPYmplY3RJbmZvKQogewogICAgIE1lbW9yeUNsYXNzSW5mbyBpbmZvKG1lbW9yeU9i amVjdEluZm8sIGhhc2hTZXQpOwotICAgIGluZm8uYWRkTWVtYmVyKGhhc2hTZXQtPm1faW1wbCk7 CisgICAgaW5mby5hZGRQcml2YXRlQnVmZmVyKHNpemVvZih0eXBlbmFtZSBIYXNoVGFibGU8VmFs dWVBcmcsIFZhbHVlQXJnLCBJZGVudGl0eUV4dHJhY3RvciwgSGFzaEFyZywgVHJhaXRzQXJnLCBU cmFpdHNBcmc+OjpWYWx1ZVR5cGUpICogaGFzaFNldC0+Y2FwYWNpdHkoKSk7CiAgICAgaW5mby5h ZGRDb2xsZWN0aW9uRWxlbWVudHMoaGFzaFNldC0+YmVnaW4oKSwgaGFzaFNldC0+ZW5kKCkpOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25IYXNo VGFibGUuaCBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbkhhc2hUYWJsZS5o CmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwYWViZjZlMjM3ZjdiZWYyNGI2NGMwMjY0 ZmI2MTdhYmI5NDFhOTJmLi4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbkhhc2hUYWJsZS5oCisr KyAvZGV2L251bGwKQEAgLTEsNDcgKzAsMCBAQAotLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMiBH b29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICoKLSAqIFJlZGlzdHJpYnV0aW9uIGFu ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotICogbW9k aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k aXRpb25zIGFyZQotICogbWV0OgotICoKLSAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3Vy Y2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiBub3RpY2UsIHRoaXMg bGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0gKiAgICAg KiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3Zl Ci0gKiBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyCi0gKiBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIg bWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCi0gKiBkaXN0cmlidXRpb24uCi0gKiAgICAgKiBO ZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzCi0gKiBj b250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRl cml2ZWQgZnJvbQotICogdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0 ZW4gcGVybWlzc2lvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBD T1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCi0gKiAiQVMgSVMiIEFORCBBTlkgRVhQ UkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAotICogTElNSVRF RCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5F U1MgRk9SCi0gKiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZF TlQgU0hBTEwgVEhFIENPUFlSSUdIVAotICogT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJM RSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCi0gKiBTUEVDSUFMLCBFWEVN UExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCi0gKiBM SU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBM T1NTIE9GIFVTRSwKLSAqIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElP TikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQotICogVEhFT1JZIE9GIExJQUJJTElUWSwgV0hF VEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAotICogKElOQ0xVRElO RyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUg VVNFCi0gKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgotICovCi0KLSNpZm5kZWYgTWVtb3J5SW5zdHJ1bWVudGF0aW9u SGFzaFRhYmxlX2gKLSNkZWZpbmUgTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaFRhYmxlX2gKLQot I2luY2x1ZGUgPHd0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb24uaD4KLQotbmFtZXNwYWNlIFdURiB7 Ci0KLXRlbXBsYXRlPHR5cGVuYW1lIEtleSwgdHlwZW5hbWUgVmFsdWUsIHR5cGVuYW1lIEV4dHJh Y3RvciwgdHlwZW5hbWUgSGFzaEZ1bmN0aW9ucywgdHlwZW5hbWUgVHJhaXRzLCB0eXBlbmFtZSBL ZXlUcmFpdHM+Ci12b2lkIHJlcG9ydE1lbW9yeVVzYWdlKGNvbnN0IEhhc2hUYWJsZTxLZXksIFZh bHVlLCBFeHRyYWN0b3IsIEhhc2hGdW5jdGlvbnMsIFRyYWl0cywgS2V5VHJhaXRzPiogY29uc3Qm IGhhc2hUYWJsZSwgTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykKLXsKLSAgICBN ZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmplY3RJbmZvLCBoYXNoVGFibGUpOwotICAgIGlu Zm8uYWRkUmF3QnVmZmVyKGhhc2hUYWJsZS0+bV90YWJsZSwgc2l6ZW9mKHR5cGVuYW1lIEhhc2hU YWJsZTxLZXksIFZhbHVlLCBFeHRyYWN0b3IsIEhhc2hGdW5jdGlvbnMsIFRyYWl0cywgS2V5VHJh aXRzPjo6VmFsdWVUeXBlKSAqIGhhc2hUYWJsZS0+Y2FwYWNpdHkoKSk7Ci19Ci0KLX0KLQotI2Vu ZGlmIC8vICFkZWZpbmVkKE1lbW9yeUluc3RydW1lbnRhdGlvbkhhc2hUYWJsZV9oKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9NZW1vcnlJbnN0cnVtZW50YXRpb25U ZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvTWVtb3J5SW5zdHJ1bWVudGF0 aW9uVGVzdC5jcHAKaW5kZXggMTEyMDQ0NWRjMDVlZjU3YWYxM2VhNTM4ODM5N2VjMTkxYjNlMmQ4 Ni4uYmVjMWMwMGY3N2U1MTZjODk0ZTBiYjJhN2VlMmYxMmZlZjEzMWY2NiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9NZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL01lbW9yeUluc3RydW1lbnRhdGlv blRlc3QuY3BwCkBAIC00NDcsNyArNDQ3LDcgQEAgVEVTVChNZW1vcnlJbnN0cnVtZW50YXRpb25U ZXN0LCBoYXNoU2V0V2l0aEluc3RydW1lbnRlZFR5cGUpCiAgICAgSW5zdHJ1bWVudGVkT3duZXI8 VmFsdWVUeXBlKiA+IHJvb3QodmFsdWUuZ2V0KCkpOwogICAgIGhlbHBlci5hZGRSb290T2JqZWN0 KHJvb3QpOwogICAgIEVYUEVDVF9FUShzaXplb2YoVmFsdWVUeXBlKSArIHNpemVvZihTdHJpbmcp ICogdmFsdWUtPmNhcGFjaXR5KCkgKyBzaXplb2YoU3RyaW5nSW1wbCkgKiB2YWx1ZS0+c2l6ZSgp LCBoZWxwZXIucmVwb3J0ZWRTaXplRm9yQWxsVHlwZXMoKSk7Ci0gICAgRVhQRUNUX0VRKGNvdW50 ICsgMiwgKHNpemVfdCloZWxwZXIudmlzaXRlZE9iamVjdHMoKSk7CisgICAgRVhQRUNUX0VRKGNv dW50ICsgMSwgKHNpemVfdCloZWxwZXIudmlzaXRlZE9iamVjdHMoKSk7CiB9CiAKIFRFU1QoTWVt b3J5SW5zdHJ1bWVudGF0aW9uVGVzdCwgYXJyYXlCdWZmZXIpCg==