185997 2018-05-25 14:51:19 -0700 [Cocoa]: Remove what appears to be a stale mbmalloc target 2018-07-16 16:58:50 -0700 1 1 1 Unclassified WebKit bmalloc WebKit Nightly Build Unspecified Unspecified RESOLVED INVALID P2 Normal --- 1 joepeck joepeck darin ggaren joepeck oldest_to_newest 1427477 0 joepeck 2018-05-25 14:51:19 -0700 Remove what appears to be a stale mbmalloc target • Attempting to build this target fails to link due to missing Foundation symbols • It looks like the PerformanceTools/MallocBench Xcode project has a mbmalloc target which does build and work 1427486 1 341331 joepeck 2018-05-25 14:54:17 -0700 Created attachment 341331 [PATCH] Proposed Fix I'm able to do things without this target... but I'll do a bit more qualification before toggling that cq flag. 1427612 2 joepeck 2018-05-25 17:34:43 -0700 Ahh, so I see some build commands for linux ports, but I'm not sure this it actually makes sense still. Is there an advantage to the mbmalloc in bmalloc versus the mbmalloc in MallocBench? They seem to produce the same build product, so I suspect only 1 should actually be around. 1427997 3 341331 darin 2018-05-28 20:32:44 -0700 Comment on attachment 341331 [PATCH] Proposed Fix Looks like you need to remove mbmalloc.cpp from bmalloc/CMakeLists.txt too. There’s also some mbmalloc stuff in the WTF Xcode project. 1428127 4 joepeck 2018-05-29 10:57:39 -0700 Apparently this is not stale. Closing the bug. • The mbmalloc.dylib produced here uses bmalloc. • The mbmalloc.dylib produced by MallocBench uses the system malloc. 1428142 5 ggaren 2018-05-29 11:26:01 -0700 Maybe we should clean this up by moving the mbmalloc targets from MallocBench and bmalloc into separate projects inside PerformanceTests/MallocBench. The point of mbmalloc is to be a shim around a given malloc implementation. So, you could think of it as a feature of MallocBench that it includes sub-projects that can shim around different mallocs. For example, if we wanted MallocBench to test JEMalloc or TCMalloc, we would need to write additional mbmalloc shims. 341331 2018-05-25 14:54:17 -0700 2018-07-16 16:58:50 -0700 [PATCH] Proposed Fix stale-1.patch text/plain 14036 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9ibWFsbG9jL0NoYW5nZUxvZyBiL1NvdXJjZS9ibWFsbG9jL0No YW5nZUxvZwppbmRleCBlMzlmY2UzYWEzNS4uNTRkODM5MzViMzMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9ibWFsbG9jL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvYm1hbGxvYy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxOC0wNS0yNSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUu Y29tPgorCisgICAgICAgIFtDb2NvYV06IFJlbW92ZSAgd2hhdCBhcHBlYXJzIHRvIGJlIGEgc3Rh bGUgbWJtYWxsb2MgdGFyZ2V0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xODU5OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIGJtYWxsb2MueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAg KiBibWFsbG9jL21ibWFsbG9jLmNwcDogUmVtb3ZlZC4KKwogMjAxOC0wNS0yMyAgQW50dGkgS29p dmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgSW5jcmVhc2UgdGhlIHNpbXVsYXRl ZCBtZW1vcnkgc2l6ZSBvbiBQTEFURk9STShJT1NfU0lNVUxBVE9SKSBmcm9tIDUxMk1CIHRvIDEw MjRNQgpkaWZmIC0tZ2l0IGEvU291cmNlL2JtYWxsb2MvYm1hbGxvYy54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qIGIvU291cmNlL2JtYWxsb2MvYm1hbGxvYy54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qCmluZGV4IGJkMzg4OWU5M2RkLi5iNDQ3Mzg5YjZmNSAxMDA2NDQKLS0tIGEvU291cmNlL2Jt YWxsb2MvYm1hbGxvYy54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9ibWFs bG9jL2JtYWxsb2MueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtOTAsNyArOTAsNiBAQAog CQkxNDNDQjgxRDE5MDIyQkM5MDBCMTZBNDUgLyogTXV0ZXguaCBpbiBIZWFkZXJzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDE0M0NCODFCMTkwMjJCQzkwMEIxNkE0NSAvKiBN dXRleC5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJ CTE0NDBBRkNCMUE5NTI2MTEwMDgzN0ZBQSAvKiBab25lLmggaW4gSGVhZGVycyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxNDQwQUZDQTFBOTUyNjExMDA4MzdGQUEgLyogWm9u ZS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTE0 NDBBRkNEMUE5NTI3QUYwMDgzN0ZBQSAvKiBab25lLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDE0NDBBRkNDMUE5NTI3QUYwMDgzN0ZBQSAvKiBab25l LmNwcCAqLzsgfTsKLQkJMTQ0OEMzMDAxOEYzNzU0NjAwNTAyODM5IC8qIG1ibWFsbG9jLmNwcCBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDE0NDhDMkZGMThG Mzc1NDMwMDUwMjgzOSAvKiBtYm1hbGxvYy5jcHAgKi87IH07CiAJCTE0NDhDMzAxMThGMzc1NEMw MDUwMjgzOSAvKiBibWFsbG9jLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSAxNDQ4QzJGRTE4RjM3NTQzMDA1MDI4MzkgLyogYm1hbGxvYy5oICovOyBzZXR0 aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTE0NEJFMTFGMUNBMzQ2 NTIwMDk5QzhDMCAvKiBPYmplY3QuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDE0NEJFMTFFMUNBMzQ2NTIwMDk5QzhDMCAvKiBPYmplY3QuaCAqLzsgc2V0 dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQkxNDRDMDdGNDFDN0I3 MDI2MDA1MUJCNkEgLyogTGFyZ2VNYXAuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gMTQ0QzA3RjIxQzdCNzAyNjAwNTFCQjZBIC8qIExhcmdlTWFwLmNw cCAqLzsgfTsKQEAgLTEwMiw3ICsxMDEsNiBAQAogCQkxNEM4OTkyQjFDQzQ4NUU3MDAyN0EwNTcg LyogTWFwLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAx NEM4OTkyQTFDQzQ4NUU3MDAyN0EwNTcgLyogTWFwLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVU RVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJMTRDODk5MkQxQ0M1NzgzMzAwMjdBMDU3IC8qIExh cmdlUmFuZ2UuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDE0Qzg5OTJDMUNDNTc4MzMwMDI3QTA1NyAvKiBMYXJnZVJhbmdlLmggKi87IHNldHRpbmdzID0g e0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJMTRDOTE5QzkxOEZDQzU5RjAwMjhE QjQzIC8qIEJQbGF0Zm9ybS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gMTRDOTE5QzgxOEZDQzU5RjAwMjhEQjQzIC8qIEJQbGF0Zm9ybS5oICovOyBzZXR0 aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07Ci0JCTE0Q0MzOTRDMThFQTg4 NTgwMDRBRkUzNCAvKiBsaWJibWFsbG9jLmEgaW4gRnJhbWV3b3JrcyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSAxNEYyNzFCRTE4RUEzOTYzMDA4QzE1MkYgLyogbGliYm1hbGxv Yy5hICovOyB9OwogCQkxNERENzg5MDE4RjQ4Q0VCMDA5NTA3MDIgLyogU2l6ZXMuaCBpbiBIZWFk ZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDE0NUY2ODc0MTc5REY4NDEw MEQ2NTU5OCAvKiBTaXplcy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUs ICk7IH07IH07CiAJCTE0REQ3ODkzMThGNDhEMEYwMDk1MDcwMiAvKiBPYmplY3RUeXBlLmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxNDg1NjU2MDE4QTQz REJBMDBFRDY5NDIgLyogT2JqZWN0VHlwZS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0g KFByaXZhdGUsICk7IH07IH07CiAJCTE0REQ3ODk4MThGNDhENEEwMDk1MDcwMiAvKiBBbGxvY2F0 b3IuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDE0NUY2 ODU2MTc5REM4Q0EwMEQ2NTU5OCAvKiBBbGxvY2F0b3IuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklC VVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwpAQCAtMTU0LDEzICsxNTIsNiBAQAogCQkJcmVtb3Rl R2xvYmFsSURTdHJpbmcgPSAxNEYyNzFCRDE4RUEzOTYzMDA4QzE1MkY7CiAJCQlyZW1vdGVJbmZv ID0gYm1hbGxvYzsKIAkJfTsKLQkJMTRDQzM5NEQxOEVBODg2MTAwNEFGRTM0IC8qIFBCWENvbnRh aW5lckl0ZW1Qcm94eSAqLyA9IHsKLQkJCWlzYSA9IFBCWENvbnRhaW5lckl0ZW1Qcm94eTsKLQkJ CWNvbnRhaW5lclBvcnRhbCA9IDE0NUY2ODM3MTc5REM0NUYwMEQ2NTU5OCAvKiBQcm9qZWN0IG9i amVjdCAqLzsKLQkJCXByb3h5VHlwZSA9IDE7Ci0JCQlyZW1vdGVHbG9iYWxJRFN0cmluZyA9IDE0 RjI3MUJEMThFQTM5NjMwMDhDMTUyRjsKLQkJCXJlbW90ZUluZm8gPSBibWFsbG9jOwotCQl9Owog LyogRW5kIFBCWENvbnRhaW5lckl0ZW1Qcm94eSBzZWN0aW9uICovCiAKIC8qIEJlZ2luIFBCWENv cHlGaWxlc0J1aWxkUGhhc2Ugc2VjdGlvbiAqLwpAQCAtMjU1LDcgKzI0Niw2IEBACiAJCTE0NDQ2 OUZEMTdBNjFGMUYwMEY5RUExRCAvKiBQZXJUaHJlYWQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Yy5oOyBsaW5lRW5kaW5nID0gMDsgbmFtZSA9IFBlclRocmVhZC5oOyBwYXRoID0gYm1hbGxvYy9Q ZXJUaHJlYWQuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgeGNMYW5ndWFnZVNwZWNpZmljYXRp b25JZGVudGlmaWVyID0geGNvZGUubGFuZy5vYmpjcHA7IH07CiAJCTE0NDQ2QTA3MTdBNjFGQTQw MEY5RUExRCAvKiBQZXJQcm9jZXNzLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9 IFBlclByb2Nlc3MuaDsgcGF0aCA9IGJtYWxsb2MvUGVyUHJvY2Vzcy5oOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQkxNDQ4QzJGRTE4RjM3NTQzMDA1MDI4MzkgLyogYm1hbGxvYy5oICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jLmg7IG5hbWUgPSBibWFsbG9jLmg7IHBhdGggPSBibWFsbG9jL2JtYWxsb2MuaDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJMTQ0OEMyRkYxOEYzNzU0MzAwNTAyODM5IC8qIG1ibWFs bG9jLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9IG1ibWFsbG9jLmNwcDsgcGF0aCA9IGJtYWxsb2Mv bWJtYWxsb2MuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxNDRCRTExRTFDQTM0 NjUyMDA5OUM4QzAgLyogT2JqZWN0LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9 IE9iamVjdC5oOyBwYXRoID0gYm1hbGxvYy9PYmplY3QuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJMTQ0QzA3RjIxQzdCNzAyNjAwNTFCQjZBIC8qIExhcmdlTWFwLmNwcCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9IExhcmdlTWFwLmNwcDsgcGF0aCA9IGJtYWxs b2MvTGFyZ2VNYXAuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxNDRDMDdGMzFD N0I3MDI2MDA1MUJCNkEgLyogTGFyZ2VNYXAuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBu YW1lID0gTGFyZ2VNYXAuaDsgcGF0aCA9IGJtYWxsb2MvTGFyZ2VNYXAuaDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKQEAgLTI4Miw3ICsyNzIsNiBAQAogCQkxNEM4OTkyQTFDQzQ4NUU3MDAy N0EwNTcgLyogTWFwLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9IE1hcC5oOyBw YXRoID0gYm1hbGxvYy9NYXAuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMTRDODk5 MkMxQ0M1NzgzMzAwMjdBMDU3IC8qIExhcmdlUmFuZ2UuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Yy5oOyBuYW1lID0gTGFyZ2VSYW5nZS5oOyBwYXRoID0gYm1hbGxvYy9MYXJnZVJhbmdlLmg7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTE0QzkxOUM4MThGQ0M1OUYwMDI4REI0MyAvKiBC UGxhdGZvcm0uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBuYW1lID0gQlBsYXRmb3JtLmg7 IHBhdGggPSBibWFsbG9jL0JQbGF0Zm9ybS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owot CQkxNENDMzk0NDE4RUE4NzQzMDA0QUZFMzQgLyogbGlibWJtYWxsb2MuZHlsaWIgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZXhwbGljaXRGaWxlVHlwZSA9ICJjb21waWxlZC5tYWNoLW8u ZHlsaWIiOyBpbmNsdWRlSW5JbmRleCA9IDA7IHBhdGggPSBsaWJtYm1hbGxvYy5keWxpYjsgc291 cmNlVHJlZSA9IEJVSUxUX1BST0RVQ1RTX0RJUjsgfTsKIAkJMTREOURCNDUxN0YyNDQ3MTAwRUFB Qjc5IC8qIEZpeGVkVmVjdG9yLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbGluZUVuZGlu ZyA9IDA7IG5hbWUgPSBGaXhlZFZlY3Rvci5oOyBwYXRoID0gYm1hbGxvYy9GaXhlZFZlY3Rvci5o OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB4Y0xhbmd1YWdlU3BlY2lmaWNhdGlvbklkZW50aWZp ZXIgPSB4Y29kZS5sYW5nLm9iamNwcDsgfTsKIAkJMTREQTMyMEMxODg3NUIwOTAwNzI2OUUwIC8q IEhlYXAuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBuYW1lID0gSGVhcC5oOyBwYXRoID0g Ym1hbGxvYy9IZWFwLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTE0REEzMjBFMTg4 NzVEOUYwMDcyNjlFMCAvKiBIZWFwLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsg bmFtZSA9IEhlYXAuY3BwOyBwYXRoID0gYm1hbGxvYy9IZWFwLmNwcDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKQEAgLTMwOCwxNCArMjk3LDYgQEAKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVw bG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsKLQkJMTRDQzM5NDExOEVBODc0MzAwNEFG RTM0IC8qIEZyYW1ld29ya3MgKi8gPSB7Ci0JCQlpc2EgPSBQQlhGcmFtZXdvcmtzQnVpbGRQaGFz ZTsKLQkJCWJ1aWxkQWN0aW9uTWFzayA9IDIxNDc0ODM2NDc7Ci0JCQlmaWxlcyA9ICgKLQkJCQkx NENDMzk0QzE4RUE4ODU4MDA0QUZFMzQgLyogbGliYm1hbGxvYy5hIGluIEZyYW1ld29ya3MgKi8s Ci0JCQkpOwotCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7Ci0JCX07 CiAJCTE0RjI3MUJCMThFQTM5NjMwMDhDMTUyRiAvKiBGcmFtZXdvcmtzICovID0gewogCQkJaXNh ID0gUEJYRnJhbWV3b3Jrc0J1aWxkUGhhc2U7CiAJCQlidWlsZEFjdGlvbk1hc2sgPSAyMTQ3NDgz NjQ3OwpAQCAtMzk1LDcgKzM3Niw2IEBACiAJCQljaGlsZHJlbiA9ICgKIAkJCQkwRjUxNjc3MzFG QUQ2ODUyMDA4MjM2QTggLyogYm1hbGxvYy5jcHAgKi8sCiAJCQkJMTQ0OEMyRkUxOEYzNzU0MzAw NTAyODM5IC8qIGJtYWxsb2MuaCAqLywKLQkJCQkxNDQ4QzJGRjE4RjM3NTQzMDA1MDI4MzkgLyog bWJtYWxsb2MuY3BwICovLAogCQkJKTsKIAkJCW5hbWUgPSBhcGk7CiAJCQlzb3VyY2VUcmVlID0g Ijxncm91cD4iOwpAQCAtNDIyLDcgKzQwMiw2IEBACiAJCQljaGlsZHJlbiA9ICgKIAkJCQkwRjdF QjdFRjFGOTUyODUzMDBGMUFCQ0IgLyogdGVzdGJtYWxsb2MgKi8sCiAJCQkJMTRGMjcxQkUxOEVB Mzk2MzAwOEMxNTJGIC8qIGxpYmJtYWxsb2MuYSAqLywKLQkJCQkxNENDMzk0NDE4RUE4NzQzMDA0 QUZFMzQgLyogbGlibWJtYWxsb2MuZHlsaWIgKi8sCiAJCQkpOwogCQkJbmFtZSA9IFByb2R1Y3Rz OwogCQkJc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsKQEAgLTU1MiwxMyArNTMxLDYgQEAKIC8qIEVu ZCBQQlhHcm91cCBzZWN0aW9uICovCiAKIC8qIEJlZ2luIFBCWEhlYWRlcnNCdWlsZFBoYXNlIHNl Y3Rpb24gKi8KLQkJMTRDQzM5NDIxOEVBODc0MzAwNEFGRTM0IC8qIEhlYWRlcnMgKi8gPSB7Ci0J CQlpc2EgPSBQQlhIZWFkZXJzQnVpbGRQaGFzZTsKLQkJCWJ1aWxkQWN0aW9uTWFzayA9IDIxNDc0 ODM2NDc7Ci0JCQlmaWxlcyA9ICgKLQkJCSk7Ci0JCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rw cm9jZXNzaW5nID0gMDsKLQkJfTsKIAkJMTRGMjcxQkMxOEVBMzk2MzAwOEMxNTJGIC8qIEhlYWRl cnMgKi8gPSB7CiAJCQlpc2EgPSBQQlhIZWFkZXJzQnVpbGRQaGFzZTsKIAkJCWJ1aWxkQWN0aW9u TWFzayA9IDIxNDc0ODM2NDc7CkBAIC02NzIsMjQgKzY0NCw2IEBACiAJCQlwcm9kdWN0UmVmZXJl bmNlID0gMEY3RUI3RUYxRjk1Mjg1MzAwRjFBQkNCIC8qIHRlc3RibWFsbG9jICovOwogCQkJcHJv ZHVjdFR5cGUgPSAiY29tLmFwcGxlLnByb2R1Y3QtdHlwZS50b29sIjsKIAkJfTsKLQkJMTRDQzM5 NDMxOEVBODc0MzAwNEFGRTM0IC8qIG1ibWFsbG9jICovID0gewotCQkJaXNhID0gUEJYTmF0aXZl VGFyZ2V0OwotCQkJYnVpbGRDb25maWd1cmF0aW9uTGlzdCA9IDE0Q0MzOTQ1MThFQTg3NDMwMDRB RkUzNCAvKiBCdWlsZCBjb25maWd1cmF0aW9uIGxpc3QgZm9yIFBCWE5hdGl2ZVRhcmdldCAibWJt YWxsb2MiICovOwotCQkJYnVpbGRQaGFzZXMgPSAoCi0JCQkJMTRDQzM5NDAxOEVBODc0MzAwNEFG RTM0IC8qIFNvdXJjZXMgKi8sCi0JCQkJMTRDQzM5NDExOEVBODc0MzAwNEFGRTM0IC8qIEZyYW1l d29ya3MgKi8sCi0JCQkJMTRDQzM5NDIxOEVBODc0MzAwNEFGRTM0IC8qIEhlYWRlcnMgKi8sCi0J CQkpOwotCQkJYnVpbGRSdWxlcyA9ICgKLQkJCSk7Ci0JCQlkZXBlbmRlbmNpZXMgPSAoCi0JCQkJ MTRDQzM5NEUxOEVBODg2MTAwNEFGRTM0IC8qIFBCWFRhcmdldERlcGVuZGVuY3kgKi8sCi0JCQkp OwotCQkJbmFtZSA9IG1ibWFsbG9jOwotCQkJcHJvZHVjdE5hbWUgPSBtYm1hbGxvYzsKLQkJCXBy b2R1Y3RSZWZlcmVuY2UgPSAxNENDMzk0NDE4RUE4NzQzMDA0QUZFMzQgLyogbGlibWJtYWxsb2Mu ZHlsaWIgKi87Ci0JCQlwcm9kdWN0VHlwZSA9ICJjb20uYXBwbGUucHJvZHVjdC10eXBlLmxpYnJh cnkuZHluYW1pYyI7Ci0JCX07CiAJCTE0RjI3MUJEMThFQTM5NjMwMDhDMTUyRiAvKiBibWFsbG9j ICovID0gewogCQkJaXNhID0gUEJYTmF0aXZlVGFyZ2V0OwogCQkJYnVpbGRDb25maWd1cmF0aW9u TGlzdCA9IDE0RjI3MUJGMThFQTM5NjMwMDhDMTUyRiAvKiBCdWlsZCBjb25maWd1cmF0aW9uIGxp c3QgZm9yIFBCWE5hdGl2ZVRhcmdldCAiYm1hbGxvYyIgKi87CkBAIC03NDAsNyArNjk0LDYgQEAK IAkJCXRhcmdldHMgPSAoCiAJCQkJMEY3RUI4NTAxRjk1NTA0QjAwRjFBQkNCIC8qIEFsbCAqLywK IAkJCQkxNEYyNzFCRDE4RUEzOTYzMDA4QzE1MkYgLyogYm1hbGxvYyAqLywKLQkJCQkxNENDMzk0 MzE4RUE4NzQzMDA0QUZFMzQgLyogbWJtYWxsb2MgKi8sCiAJCQkJMEY3RUI3RUUxRjk1Mjg1MzAw RjFBQkNCIC8qIHRlc3RibWFsbG9jICovLAogCQkJKTsKIAkJfTsKQEAgLTc1NSwxNCArNzA4LDYg QEAKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJ fTsKLQkJMTRDQzM5NDAxOEVBODc0MzAwNEFGRTM0IC8qIFNvdXJjZXMgKi8gPSB7Ci0JCQlpc2Eg PSBQQlhTb3VyY2VzQnVpbGRQaGFzZTsKLQkJCWJ1aWxkQWN0aW9uTWFzayA9IDIxNDc0ODM2NDc7 Ci0JCQlmaWxlcyA9ICgKLQkJCQkxNDQ4QzMwMDE4RjM3NTQ2MDA1MDI4MzkgLyogbWJtYWxsb2Mu Y3BwIGluIFNvdXJjZXMgKi8sCi0JCQkpOwotCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJv Y2Vzc2luZyA9IDA7Ci0JCX07CiAJCTE0RjI3MUJBMThFQTM5NjMwMDhDMTUyRiAvKiBTb3VyY2Vz ICovID0gewogCQkJaXNhID0gUEJYU291cmNlc0J1aWxkUGhhc2U7CiAJCQlidWlsZEFjdGlvbk1h c2sgPSAyMTQ3NDgzNjQ3OwpAQCAtODEwLDExICs3NTUsNiBAQAogCQkJdGFyZ2V0ID0gMTRGMjcx QkQxOEVBMzk2MzAwOEMxNTJGIC8qIGJtYWxsb2MgKi87CiAJCQl0YXJnZXRQcm94eSA9IDBGN0VC ODU1MUY5NTUwNTQwMEYxQUJDQiAvKiBQQlhDb250YWluZXJJdGVtUHJveHkgKi87CiAJCX07Ci0J CTE0Q0MzOTRFMThFQTg4NjEwMDRBRkUzNCAvKiBQQlhUYXJnZXREZXBlbmRlbmN5ICovID0gewot CQkJaXNhID0gUEJYVGFyZ2V0RGVwZW5kZW5jeTsKLQkJCXRhcmdldCA9IDE0RjI3MUJEMThFQTM5 NjMwMDhDMTUyRiAvKiBibWFsbG9jICovOwotCQkJdGFyZ2V0UHJveHkgPSAxNENDMzk0RDE4RUE4 ODYxMDA0QUZFMzQgLyogUEJYQ29udGFpbmVySXRlbVByb3h5ICovOwotCQl9OwogLyogRW5kIFBC WFRhcmdldERlcGVuZGVuY3kgc2VjdGlvbiAqLwogCiAvKiBCZWdpbiBYQ0J1aWxkQ29uZmlndXJh dGlvbiBzZWN0aW9uICovCkBAIC04ODAsMTMgKzgyMCw2IEBACiAJCQl9OwogCQkJbmFtZSA9IFBy b2R1Y3Rpb247CiAJCX07Ci0JCTE0MjAyRjExMThGMzdDMTUwMDZDMzdEQiAvKiBQcm9kdWN0aW9u ICovID0gewotCQkJaXNhID0gWENCdWlsZENvbmZpZ3VyYXRpb247Ci0JCQliYXNlQ29uZmlndXJh dGlvblJlZmVyZW5jZSA9IDE0QjY1MEM5MThGM0EwNDIwMDc1MTk2OCAvKiBtYm1hbGxvYy54Y2Nv bmZpZyAqLzsKLQkJCWJ1aWxkU2V0dGluZ3MgPSB7Ci0JCQl9OwotCQkJbmFtZSA9IFByb2R1Y3Rp b247Ci0JCX07CiAJCTE0NUY2ODRBMTc5REM0NUYwMEQ2NTU5OCAvKiBEZWJ1ZyAqLyA9IHsKIAkJ CWlzYSA9IFhDQnVpbGRDb25maWd1cmF0aW9uOwogCQkJYmFzZUNvbmZpZ3VyYXRpb25SZWZlcmVu Y2UgPSAxNEI2NTBDNzE4RjM5RjQ4MDA3NTE5NjggLyogRGVidWdSZWxlYXNlLnhjY29uZmlnICov OwpAQCAtOTA1LDIwICs4MzgsNiBAQAogCQkJfTsKIAkJCW5hbWUgPSBSZWxlYXNlOwogCQl9Owot CQkxNENDMzk0NjE4RUE4NzQzMDA0QUZFMzQgLyogRGVidWcgKi8gPSB7Ci0JCQlpc2EgPSBYQ0J1 aWxkQ29uZmlndXJhdGlvbjsKLQkJCWJhc2VDb25maWd1cmF0aW9uUmVmZXJlbmNlID0gMTRCNjUw QzkxOEYzQTA0MjAwNzUxOTY4IC8qIG1ibWFsbG9jLnhjY29uZmlnICovOwotCQkJYnVpbGRTZXR0 aW5ncyA9IHsKLQkJCX07Ci0JCQluYW1lID0gRGVidWc7Ci0JCX07Ci0JCTE0Q0MzOTQ3MThFQTg3 NDMwMDRBRkUzNCAvKiBSZWxlYXNlICovID0gewotCQkJaXNhID0gWENCdWlsZENvbmZpZ3VyYXRp b247Ci0JCQliYXNlQ29uZmlndXJhdGlvblJlZmVyZW5jZSA9IDE0QjY1MEM5MThGM0EwNDIwMDc1 MTk2OCAvKiBtYm1hbGxvYy54Y2NvbmZpZyAqLzsKLQkJCWJ1aWxkU2V0dGluZ3MgPSB7Ci0JCQl9 OwotCQkJbmFtZSA9IFJlbGVhc2U7Ci0JCX07CiAJCTE0RjI3MUMwMThFQTM5NjMwMDhDMTUyRiAv KiBEZWJ1ZyAqLyA9IHsKIAkJCWlzYSA9IFhDQnVpbGRDb25maWd1cmF0aW9uOwogCQkJYmFzZUNv bmZpZ3VyYXRpb25SZWZlcmVuY2UgPSAxNEI2NTBDNjE4RjM5RjQ4MDA3NTE5NjggLyogYm1hbGxv Yy54Y2NvbmZpZyAqLzsKQEAgLTk2NiwxNiArODg1LDYgQEAKIAkJCWRlZmF1bHRDb25maWd1cmF0 aW9uSXNWaXNpYmxlID0gMDsKIAkJCWRlZmF1bHRDb25maWd1cmF0aW9uTmFtZSA9IFByb2R1Y3Rp b247CiAJCX07Ci0JCTE0Q0MzOTQ1MThFQTg3NDMwMDRBRkUzNCAvKiBCdWlsZCBjb25maWd1cmF0 aW9uIGxpc3QgZm9yIFBCWE5hdGl2ZVRhcmdldCAibWJtYWxsb2MiICovID0gewotCQkJaXNhID0g WENDb25maWd1cmF0aW9uTGlzdDsKLQkJCWJ1aWxkQ29uZmlndXJhdGlvbnMgPSAoCi0JCQkJMTRD QzM5NDYxOEVBODc0MzAwNEFGRTM0IC8qIERlYnVnICovLAotCQkJCTE0Q0MzOTQ3MThFQTg3NDMw MDRBRkUzNCAvKiBSZWxlYXNlICovLAotCQkJCTE0MjAyRjExMThGMzdDMTUwMDZDMzdEQiAvKiBQ cm9kdWN0aW9uICovLAotCQkJKTsKLQkJCWRlZmF1bHRDb25maWd1cmF0aW9uSXNWaXNpYmxlID0g MDsKLQkJCWRlZmF1bHRDb25maWd1cmF0aW9uTmFtZSA9IFByb2R1Y3Rpb247Ci0JCX07CiAJCTE0 RjI3MUJGMThFQTM5NjMwMDhDMTUyRiAvKiBCdWlsZCBjb25maWd1cmF0aW9uIGxpc3QgZm9yIFBC WE5hdGl2ZVRhcmdldCAiYm1hbGxvYyIgKi8gPSB7CiAJCQlpc2EgPSBYQ0NvbmZpZ3VyYXRpb25M aXN0OwogCQkJYnVpbGRDb25maWd1cmF0aW9ucyA9ICgKZGlmZiAtLWdpdCBhL1NvdXJjZS9ibWFs bG9jL2JtYWxsb2MvbWJtYWxsb2MuY3BwIGIvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9tYm1hbGxv Yy5jcHAKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDRjYTNkM2U5NjgyLi4wMDAwMDAw MDAwMAotLS0gYS9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL21ibWFsbG9jLmNwcAorKysgL2Rldi9u dWxsCkBAIC0xLDYzICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTQgQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICoKLSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0g KiBhcmUgbWV0OgotICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0 YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSAqIDIuIFJlZGlzdHJpYnV0aW9u cyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAg ICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2Ns YWltZXIgaW4gdGhlCi0gKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMg cHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgotICoKLSAqIFRISVMgU09GVFdBUkUgSVMg UFJPVklERUQgQlkgQVBQTEUgSU5DLiBgYEFTIElTJycgQU5EIEFOWQotICogRVhQUkVTUyBPUiBJ TVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUKLSAq IElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEg UEFSVElDVUxBUgotICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxM IEFQUExFIElOQy4gT1IKLSAqIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1Qs IElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLAotICogRVhFTVBMQVJZLCBPUiBDT05TRVFV RU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAotICogUFJPQ1VS RU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEs IE9SCi0gKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VE IEFORCBPTiBBTlkgVEhFT1JZCi0gKiBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1Qs IFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKLSAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBP VEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQotICogT0YgVEhJUyBT T0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH RS4gCi0gKi8KLQotI2luY2x1ZGUgImJtYWxsb2MuaCIKLQotI2luY2x1ZGUgIkJFeHBvcnQuaCIK LQotZXh0ZXJuICJDIiB7Ci0KLUJFWFBPUlQgdm9pZCogbWJtYWxsb2Moc2l6ZV90KTsKLUJFWFBP UlQgdm9pZCogbWJtZW1hbGlnbihzaXplX3QsIHNpemVfdCk7Ci1CRVhQT1JUIHZvaWQgbWJmcmVl KHZvaWQqLCBzaXplX3QpOwotQkVYUE9SVCB2b2lkKiBtYnJlYWxsb2Modm9pZCosIHNpemVfdCwg c2l6ZV90KTsKLUJFWFBPUlQgdm9pZCBtYnNjYXZlbmdlKCk7Ci0gICAgCi12b2lkKiBtYm1hbGxv YyhzaXplX3Qgc2l6ZSkKLXsKLSAgICByZXR1cm4gYm1hbGxvYzo6YXBpOjptYWxsb2Moc2l6ZSk7 Ci19Ci0KLXZvaWQqIG1ibWVtYWxpZ24oc2l6ZV90IGFsaWdubWVudCwgc2l6ZV90IHNpemUpCi17 Ci0gICAgcmV0dXJuIGJtYWxsb2M6OmFwaTo6bWVtYWxpZ24oYWxpZ25tZW50LCBzaXplKTsKLX0K LQotdm9pZCBtYmZyZWUodm9pZCogcCwgc2l6ZV90KQotewotICAgIGJtYWxsb2M6OmFwaTo6ZnJl ZShwKTsKLX0KLQotdm9pZCogbWJyZWFsbG9jKHZvaWQqIHAsIHNpemVfdCwgc2l6ZV90IHNpemUp Ci17Ci0gICAgcmV0dXJuIGJtYWxsb2M6OmFwaTo6cmVhbGxvYyhwLCBzaXplKTsKLX0KLQotdm9p ZCBtYnNjYXZlbmdlKCkKLXsKLSAgICBibWFsbG9jOjphcGk6OnNjYXZlbmdlKCk7Ci19Ci0KLX0g Ly8gZXh0ZXJuICJDIgo=