110827 2013-02-25 17:54:27 -0800 Add cookies to FastMalloc spans 2013-02-26 12:41:32 -0800 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 oliver oliver abarth rniwa roger_fong oldest_to_newest 841463 0 oliver 2013-02-25 17:54:27 -0800 As it says in the title. 841466 1 190168 oliver 2013-02-25 17:57:46 -0800 Created attachment 190168 Patch 841480 2 190168 msaboff 2013-02-25 18:10:23 -0800 Comment on attachment 190168 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=190168&action=review > Source/WTF/ChangeLog:12 > + (WTF): Remove this line. 841483 3 oliver 2013-02-25 18:15:15 -0800 Committed r143996: <http://trac.webkit.org/changeset/143996> 841508 4 roger_fong 2013-02-25 18:28:50 -0800 Windows build failure: http://build.webkit.org/builders/Apple%20Win%20Release%20%28Build%29/builds/44915/steps/compile-webkit/logs/stdio 841522 5 rniwa 2013-02-25 18:55:17 -0800 This patch broke builds other than Mac and Chromium ports. 841532 6 rniwa 2013-02-25 19:17:19 -0800 (In reply to comment #5) > This patch broke builds other than Mac and Chromium ports. Tried to fix this in http://trac.webkit.org/changeset/144001. Does the fix look right to you? 841539 7 oliver 2013-02-25 19:29:48 -0800 (In reply to comment #6) > (In reply to comment #5) > > This patch broke builds other than Mac and Chromium ports. > > Tried to fix this in http://trac.webkit.org/changeset/144001. Does the fix look right to you? Gah, sorry! Yes it looks correct. My bad. 842251 8 abarth 2013-02-26 12:09:20 -0800 This patch might have caused a performance regression on the chromium-mac port. There are some other performance regression rollouts in progress. If they don't heal the bot, I'm going to try rolling this one out as well. 842254 9 oliver 2013-02-26 12:14:17 -0800 (In reply to comment #8) > This patch might have caused a performance regression on the chromium-mac port. There are some other performance regression rollouts in progress. If they don't heal the bot, I'm going to try rolling this one out as well. Really? I'll rerun perf tests locally - what is the hardware that chr-mac is running on? 842258 10 abarth 2013-02-26 12:19:50 -0800 (In reply to comment #9) > (In reply to comment #8) > > This patch might have caused a performance regression on the chromium-mac port. There are some other performance regression rollouts in progress. If they don't heal the bot, I'm going to try rolling this one out as well. > > Really? I'll rerun perf tests locally - what is the hardware that chr-mac is running on? I don't know for certain, but I would guess a Mac Mini. 842272 11 abarth 2013-02-26 12:41:32 -0800 The perf graph is actually looking pretty good right now. I'm going to let it cycle a few more times, but it looks like you're off the hook. :) 190168 2013-02-25 17:57:46 -0800 2013-02-25 18:10:22 -0800 Patch bug-110827-20130225175402.patch text/plain 9066 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzOTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGM5ZTljNDI5NTM5YWIxM2YzMGZhYTkz MzI2ZjAyYjcxYjg0MWEyZDIuLjMxMmE5NTEwNDhjYzNmZjRmMjg4OWZjZDNiNmE2MGNiYTFhZWE2 NTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTMtMDItMjUgIE9saXZlciBIdW50ICA8b2xpdmVy QGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgY29va2llcyB0byBGYXN0TWFsbG9jIHNwYW5zCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTA4MjcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBjb29r aWUgdG8gc3BhbnMsIGFuZCBtb3ZlIHNvbWUgb2YgdGhlIGhhcmRlbmluZyBhcm91bmQgc28KKyAg ICAgICAgdGhhdCBpdCdzIG1vcmUgdXNlZnVsLgorCisgICAgICAgICogd3RmL0Zhc3RNYWxsb2Mu Y3BwOgorICAgICAgICAoV1RGKToKKyAgICAgICAgKFdURjo6aW50ZXJuYWxFbnRyb3B5VmFsdWUp OgorICAgICAgICAoV1RGOjpzcGFuSW5pdGlhbGl6ZXJDb29raWUpOgorICAgICAgICAoV1RGOjpT cGFuOjppbml0Q29va2llKToKKyAgICAgICAgKFdURjo6U3Bhbjo6Y2xlYXJDb29raWUpOgorICAg ICAgICAoV1RGOjpTcGFuOjppc1ZhbGlkKToKKyAgICAgICAgKFNwYW4pOgorICAgICAgICAoV1RG OjpOZXdTcGFuKToKKyAgICAgICAgKFdURjo6RGVsZXRlU3Bhbik6CisgICAgICAgIChXVEY6OlRD TWFsbG9jX1RocmVhZENhY2hlX0ZyZWVMaXN0OjpWYWxpZGF0ZSk6CisgICAgICAgIChXVEY6OlRD TWFsbG9jX0NlbnRyYWxfRnJlZUxpc3Q6OlBvcHVsYXRlKToKKyAgICAgICAgKFdURjo6VENNYWxs b2NfVGhyZWFkQ2FjaGU6OkRlYWxsb2NhdGUpOgorICAgICAgICAoV1RGOjpUQ01hbGxvY19UaHJl YWRDYWNoZTo6Q3JlYXRlQ2FjaGVJZk5lY2Vzc2FyeSk6CisKIDIwMTMtMDItMjMgIElseWEgVGlr aG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IE5hdGl2ZSBNZW1vcnkgSW5zdHJ1bWVudGF0aW9uOiByZXBsYWNlIFN0cmluZyB3aXRoIGNvbnN0 IGNoYXIqIGluIE1lbW9yeU9iamVjdEluZm8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0Zh c3RNYWxsb2MuY3BwIGIvU291cmNlL1dURi93dGYvRmFzdE1hbGxvYy5jcHAKaW5kZXggNzcxZTNk ZDE1YzY4OGQ1NzdhMjQ2YmNjNjMyYWIxNjE0NTIzMGNkMi4uYzRlOWE3ZTE4ZmRhMjlkZWUyODAy NjlhMzEwMTJhYWJiZTQ4M2I2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvRmFzdE1hbGxv Yy5jcHAKKysrIGIvU291cmNlL1dURi93dGYvRmFzdE1hbGxvYy5jcHAKQEAgLTUxMiwxOSArNTEy LDYgQEAgbmFtZXNwYWNlIFdURiB7CiAjZGVmaW5lIE1FU1NBR0UgTE9HX0VSUk9SCiAjZGVmaW5l IENIRUNLX0NPTkRJVElPTiBBU1NFUlQKIAotI2lmIEVOQUJMRShUQ01BTExPQ19IQVJERU5JTkcp Ci0vKgotICogVG8gbWFrZSBpdCBoYXJkZXIgdG8gZXhwbG9pdCB1c2UtYWZ0ZXIgZnJlZSBzdHls ZSBleHBsb2l0cwotICogd2UgbWFzayB0aGUgYWRkcmVzc2VzIHdlIHB1dCBpbnRvIG91ciBsaW5r ZWQgbGlzdHMgd2l0aCB0aGUKLSAqIGFkZHJlc3Mgb2Yga0xMSGFyZGVuaW5nTWFzay4gIER1ZSB0 byBBU0xSIHRoZSBhZGRyZXNzIG9mCi0gKiBrTExIYXJkZW5pbmdNYXNrIHNob3VsZCBiZSBzdWZm aWNpZW50bHkgcmFuZG9taXplZCB0byBtYWtlIGRpcmVjdAotICogZnJlZWxpc3QgbWFuaXB1bGF0 aW9uIG11Y2ggbW9yZSBkaWZmaWN1bHQuCi0gKi8KLXN0YXRpYyBjb25zdCBjaGFyIGtMTEhhcmRl bmluZ01hc2sgPSAwOwotZW51bSB7Ci0gICAgTWFza0tleVNoaWZ0ID0gMTMKLX07Ci0KIHRlbXBs YXRlIDx1bnNpZ25lZD4gc3RydWN0IEVudHJvcHlTb3VyY2U7CiB0ZW1wbGF0ZSA8PiBzdHJ1Y3Qg RW50cm9weVNvdXJjZTw0PiB7CiAgICAgc3RhdGljIHVpbnQzMl90IHZhbHVlKCkKQEAgLTU0NCw5 ICs1MzEsMjIgQEAgdGVtcGxhdGUgPD4gc3RydWN0IEVudHJvcHlTb3VyY2U8OD4gewogICAgIH0K IH07CiAKKyNpZiBFTkFCTEUoVENNQUxMT0NfSEFSREVOSU5HKQorLyoKKyAqIFRvIG1ha2UgaXQg aGFyZGVyIHRvIGV4cGxvaXQgdXNlLWFmdGVyIGZyZWUgc3R5bGUgZXhwbG9pdHMKKyAqIHdlIG1h c2sgdGhlIGFkZHJlc3NlcyB3ZSBwdXQgaW50byBvdXIgbGlua2VkIGxpc3RzIHdpdGggdGhlCisg KiBhZGRyZXNzIG9mIGtMTEhhcmRlbmluZ01hc2suICBEdWUgdG8gQVNMUiB0aGUgYWRkcmVzcyBv ZgorICoga0xMSGFyZGVuaW5nTWFzayBzaG91bGQgYmUgc3VmZmljaWVudGx5IHJhbmRvbWl6ZWQg dG8gbWFrZSBkaXJlY3QKKyAqIGZyZWVsaXN0IG1hbmlwdWxhdGlvbiBtdWNoIG1vcmUgZGlmZmlj dWx0LgorICovCitzdGF0aWMgY29uc3QgY2hhciBrTExIYXJkZW5pbmdNYXNrID0gMDsKK2VudW0g eworICAgIE1hc2tLZXlTaGlmdCA9IDEzCit9OworCiBzdGF0aWMgQUxXQVlTX0lOTElORSB1aW50 cHRyX3QgaW50ZXJuYWxFbnRyb3B5VmFsdWUoKSAKIHsKLSAgICBzdGF0aWMgdWludHB0cl90IHZh bHVlID0gRW50cm9weVNvdXJjZTxzaXplb2YodWludHB0cl90KT46OnZhbHVlKCk7CisgICAgc3Rh dGljIHVpbnRwdHJfdCB2YWx1ZSA9IEVudHJvcHlTb3VyY2U8c2l6ZW9mKHVpbnRwdHJfdCk+Ojp2 YWx1ZSgpIHwgMTsKICAgICBBU1NFUlQodmFsdWUpOwogICAgIHJldHVybiB2YWx1ZTsKIH0KQEAg LTU3MywyMyArNTczLDI3IEBAIHN0YXRpYyBBTFdBWVNfSU5MSU5FIHVpbnQzMl90IGZyZWVkT2Jq ZWN0RW5kUG9pc29uKCkKICNkZWZpbmUgUFRSX1RPX1VJTlQzMihwdHIpIHN0YXRpY19jYXN0PHVp bnQzMl90PihyZWludGVycHJldF9jYXN0PHVpbnRwdHJfdD4ocHRyKSkKICNkZWZpbmUgRU5EX1BP SVNPTl9JTkRFWChhbGxvY2F0aW9uU2l6ZSkgKCgoYWxsb2NhdGlvblNpemUpIC0gc2l6ZW9mKHVp bnQzMl90KSkgLyBzaXplb2YodWludDMyX3QpKQogI2RlZmluZSBQT0lTT05fQUxMT0NBVElPTihh bGxvY2F0aW9uLCBhbGxvY2F0aW9uU2l6ZSkgZG8geyBcCi0gICAgcmVpbnRlcnByZXRfY2FzdDx1 aW50MzJfdCo+KGFsbG9jYXRpb24pWzBdID0gMTsgXAotICAgIHJlaW50ZXJwcmV0X2Nhc3Q8dWlu dDMyX3QqPihhbGxvY2F0aW9uKVsxXSA9IDE7IFwKLSAgICBpZiAoYWxsb2NhdGlvblNpemUgPCA0 ICogc2l6ZW9mKHVpbnQzMl90KSkgXAorICAgIEFTU0VSVCgoYWxsb2NhdGlvblNpemUpID49IDIg KiBzaXplb2YodWludDMyX3QpKTsgXAorICAgIHJlaW50ZXJwcmV0X2Nhc3Q8dWludDMyX3QqPihh bGxvY2F0aW9uKVswXSA9IDB4YmFkYmVlZjE7IFwKKyAgICByZWludGVycHJldF9jYXN0PHVpbnQz Ml90Kj4oYWxsb2NhdGlvbilbMV0gPSAweGJhZGJlZWYzOyBcCisgICAgaWYgKChhbGxvY2F0aW9u U2l6ZSkgPCA0ICogc2l6ZW9mKHVpbnQzMl90KSkgXAogICAgICAgICBicmVhazsgXAotICAgIHJl aW50ZXJwcmV0X2Nhc3Q8dWludDMyX3QqPihhbGxvY2F0aW9uKVsyXSA9IDE7IFwKLSAgICByZWlu dGVycHJldF9jYXN0PHVpbnQzMl90Kj4oYWxsb2NhdGlvbilbRU5EX1BPSVNPTl9JTkRFWChhbGxv Y2F0aW9uU2l6ZSldID0gMTsgXAorICAgIHJlaW50ZXJwcmV0X2Nhc3Q8dWludDMyX3QqPihhbGxv Y2F0aW9uKVsyXSA9IDB4YmFkYmVlZjU7IFwKKyAgICByZWludGVycHJldF9jYXN0PHVpbnQzMl90 Kj4oYWxsb2NhdGlvbilbRU5EX1BPSVNPTl9JTkRFWChhbGxvY2F0aW9uU2l6ZSldID0gMHhiYWRi ZWVmNzsgXAogfSB3aGlsZSAoZmFsc2UpOwogCiAjZGVmaW5lIFBPSVNPTl9ERUFMTE9DQVRJT05f RVhQTElDSVQoYWxsb2NhdGlvbiwgYWxsb2NhdGlvblNpemUsIHN0YXJ0UG9pc29uLCBlbmRQb2lz b24pIGRvIHsgXAotICAgIGlmIChhbGxvY2F0aW9uU2l6ZSA8IDQgKiBzaXplb2YodWludDMyX3Qp KSBcCisgICAgQVNTRVJUKChhbGxvY2F0aW9uU2l6ZSkgPj0gMiAqIHNpemVvZih1aW50MzJfdCkp OyBcCisgICAgcmVpbnRlcnByZXRfY2FzdDx1aW50MzJfdCo+KGFsbG9jYXRpb24pWzBdID0gMHhi YWRiZWVmOTsgXAorICAgIHJlaW50ZXJwcmV0X2Nhc3Q8dWludDMyX3QqPihhbGxvY2F0aW9uKVsx XSA9IDB4YmFkYmVlZmI7IFwKKyAgICBpZiAoKGFsbG9jYXRpb25TaXplKSA8IDQgKiBzaXplb2Yo dWludDMyX3QpKSBcCiAgICAgICAgIGJyZWFrOyBcCiAgICAgcmVpbnRlcnByZXRfY2FzdDx1aW50 MzJfdCo+KGFsbG9jYXRpb24pWzJdID0gKHN0YXJ0UG9pc29uKSBeIFBUUl9UT19VSU5UMzIoYWxs b2NhdGlvbik7IFwKICAgICByZWludGVycHJldF9jYXN0PHVpbnQzMl90Kj4oYWxsb2NhdGlvbilb RU5EX1BPSVNPTl9JTkRFWChhbGxvY2F0aW9uU2l6ZSldID0gKGVuZFBvaXNvbikgXiBQVFJfVE9f VUlOVDMyKGFsbG9jYXRpb24pOyBcCiB9IHdoaWxlIChmYWxzZSkKIAogI2RlZmluZSBQT0lTT05f REVBTExPQ0FUSU9OKGFsbG9jYXRpb24sIGFsbG9jYXRpb25TaXplKSBcCi0gICAgUE9JU09OX0RF QUxMT0NBVElPTl9FWFBMSUNJVChhbGxvY2F0aW9uLCBhbGxvY2F0aW9uU2l6ZSwgZnJlZWRPYmpl Y3RTdGFydFBvaXNvbigpLCBmcmVlZE9iamVjdEVuZFBvaXNvbigpKQorICAgIFBPSVNPTl9ERUFM TE9DQVRJT05fRVhQTElDSVQoYWxsb2NhdGlvbiwgKGFsbG9jYXRpb25TaXplKSwgZnJlZWRPYmpl Y3RTdGFydFBvaXNvbigpLCBmcmVlZE9iamVjdEVuZFBvaXNvbigpKQogCiAjZGVmaW5lIE1BWV9C RV9QT0lTT05FRChhbGxvY2F0aW9uLCBhbGxvY2F0aW9uU2l6ZSkgKCgoYWxsb2NhdGlvblNpemUp ID49IDQgKiBzaXplb2YodWludDMyX3QpKSAmJiAoIFwKICAgICAocmVpbnRlcnByZXRfY2FzdDx1 aW50MzJfdCo+KGFsbG9jYXRpb24pWzJdID09IChmcmVlZE9iamVjdFN0YXJ0UG9pc29uKCkgXiBQ VFJfVE9fVUlOVDMyKGFsbG9jYXRpb24pKSkgfHwgXApAQCAtMTE1MCw2ICsxMTU0LDIwIEBAIHN0 YXRpYyBzaXplX3QgQWxsb2NhdGlvblNpemUoc2l6ZV90IGJ5dGVzKSB7CiAgIH0KIH0KIAorZW51 bSB7CisgICAga1NwYW5Db29raWVCaXRzID0gMTAsCisgICAga1NwYW5Db29raWVNYXNrID0gKDEg PDwgMTApIC0gMSwKKyAgICBrU3BhblRoaXNTaGlmdCA9IDcKK307CisKK3N0YXRpYyB1aW50MzJf dCBzcGFuVmFsaWRhdGlvbkNvb2tpZTsKK3N0YXRpYyB1aW50MzJfdCBzcGFuSW5pdGlhbGl6ZXJD b29raWUoKQoreworICAgIHN0YXRpYyB1aW50MzJfdCB2YWx1ZSA9IEVudHJvcHlTb3VyY2U8c2l6 ZW9mKHVpbnQzMl90KT46OnZhbHVlKCkgJiBrU3BhbkNvb2tpZU1hc2s7CisgICAgc3BhblZhbGlk YXRpb25Db29raWUgPSB2YWx1ZTsKKyAgICByZXR1cm4gdmFsdWU7Cit9CisKIC8vIEluZm9ybWF0 aW9uIGtlcHQgZm9yIGEgc3BhbiAoYSBjb250aWd1b3VzIHJ1biBvZiBwYWdlcykuCiBzdHJ1Y3Qg U3BhbiB7CiAgIFBhZ2VJRCAgICAgICAgc3RhcnQ7ICAgICAgICAgIC8vIFN0YXJ0aW5nIHBhZ2Ug bnVtYmVyCkBAIC0xMTcyLDYgKzExOTAsMTcgQEAgcHVibGljOgogICB1bnNpZ25lZCBpbnQgIHNp emVjbGFzcyA6IDg7ICAvLyBTaXplLWNsYXNzIGZvciBzbWFsbCBvYmplY3RzIChvciAwKQogICB1 bnNpZ25lZCBpbnQgIHJlZmNvdW50IDogMTE7ICAvLyBOdW1iZXIgb2Ygbm9uLWZyZWUgb2JqZWN0 cwogICBib29sIGRlY29tbWl0dGVkIDogMTsKKyAgdm9pZCBpbml0Q29va2llKCkKKyAgeworICAg ICAgbV9jb29raWUgPSAoKHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90Pih0aGlzKSA+PiBrU3Bh blRoaXNTaGlmdCkgJiBrU3BhbkNvb2tpZU1hc2spIF4gc3BhbkluaXRpYWxpemVyQ29va2llKCk7 CisgIH0KKyAgdm9pZCBjbGVhckNvb2tpZSgpIHsgbV9jb29raWUgPSAwOyB9CisgIGJvb2wgaXNW YWxpZCgpIGNvbnN0CisgIHsKKyAgICAgIHJldHVybiAoKChyZWludGVycHJldF9jYXN0PHVpbnRw dHJfdD4odGhpcykgPj4ga1NwYW5UaGlzU2hpZnQpICYga1NwYW5Db29raWVNYXNrKSBeIG1fY29v a2llKSA9PSBzcGFuVmFsaWRhdGlvbkNvb2tpZTsKKyAgfQorcHJpdmF0ZToKKyAgdWludDMyX3Qg bV9jb29raWUgOiBrU3BhbkNvb2tpZUJpdHM7CiAKICN1bmRlZiBTUEFOX0hJU1RPUlkKICNpZmRl ZiBTUEFOX0hJU1RPUlkKQEAgLTEyMDIsNiArMTIzMSw3IEBAIHN0YXRpYyBTcGFuKiBOZXdTcGFu KFBhZ2VJRCBwLCBMZW5ndGggbGVuKSB7CiAgIG1lbXNldChyZXN1bHQsIDAsIHNpemVvZigqcmVz dWx0KSk7CiAgIHJlc3VsdC0+c3RhcnQgPSBwOwogICByZXN1bHQtPmxlbmd0aCA9IGxlbjsKKyAg cmVzdWx0LT5pbml0Q29va2llKCk7CiAjaWZkZWYgU1BBTl9ISVNUT1JZCiAgIHJlc3VsdC0+bmV4 dGhpc3RvcnkgPSAwOwogI2VuZGlmCkBAIC0xMjA5LDEwICsxMjM5LDEyIEBAIHN0YXRpYyBTcGFu KiBOZXdTcGFuKFBhZ2VJRCBwLCBMZW5ndGggbGVuKSB7CiB9CiAKIHN0YXRpYyBpbmxpbmUgdm9p ZCBEZWxldGVTcGFuKFNwYW4qIHNwYW4pIHsKKyAgUkVMRUFTRV9BU1NFUlQoc3Bhbi0+aXNWYWxp ZCgpKTsKICNpZm5kZWYgTkRFQlVHCiAgIC8vIEluIGRlYnVnIG1vZGUsIHRyYXNoIHRoZSBjb250 ZW50cyBvZiBkZWxldGVkIFNwYW5zCiAgIG1lbXNldChzcGFuLCAweDNmLCBzaXplb2YoKnNwYW4p KTsKICNlbmRpZgorICBzcGFuLT5jbGVhckNvb2tpZSgpOwogICBzcGFuX2FsbG9jYXRvci5EZWxl dGUoc3Bhbik7CiB9CiAKQEAgLTI1ODcsMTAgKzI2MTksMTIgQEAgY2xhc3MgVENNYWxsb2NfVGhy ZWFkQ2FjaGVfRnJlZUxpc3QgewogICAgIC8vIFJ1bnMgdGhyb3VnaCB0aGUgbGlua2VkIGxpc3Qg dG8gZW5zdXJlIHRoYXQKICAgICAvLyB3ZSBjYW4gZG8gdGhhdCwgYW5kIGVuc3VyZXMgdGhhdCAn bWlzc2luZycKICAgICAvLyBpcyBub3QgcHJlc2VudAotICAgIE5FVkVSX0lOTElORSB2b2lkIFZh bGlkYXRlKEhhcmRlbmVkU0xMIG1pc3NpbmcpIHsKKyAgICBORVZFUl9JTkxJTkUgdm9pZCBWYWxp ZGF0ZShIYXJkZW5lZFNMTCBtaXNzaW5nLCBzaXplX3Qgc2l6ZSkgewogICAgICAgICBIYXJkZW5l ZFNMTCBub2RlID0gbGlzdF87CisgICAgICAgIFVOVVNFRF9QQVJBTShzaXplKTsKICAgICAgICAg d2hpbGUgKG5vZGUpIHsKICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKG5vZGUgIT0gbWlzc2lu Zyk7CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVChJU19ERUZJTklURUxZX1BPSVNPTkVEKG5v ZGUudmFsdWUoKSwgc2l6ZSkpOwogICAgICAgICAgICAgbm9kZSA9IFNMTF9OZXh0KG5vZGUsIGVu dHJvcHlfKTsKICAgICAgICAgfQogICAgIH0KQEAgLTMxMjEsNyArMzE1NSwxNSBAQCBBTFdBWVNf SU5MSU5FIHZvaWQgVENNYWxsb2NfQ2VudHJhbF9GcmVlTGlzdDo6UG9wdWxhdGUoKSB7CiAgIH0K ICAgQVNTRVJUKHB0ciA9PSBzdGFydCk7CiAgIEFTU0VSVChwdHIgPT0gaGVhZC52YWx1ZSgpKTsK LSAgUE9JU09OX0RFQUxMT0NBVElPTl9FWFBMSUNJVChwdHIsIHNpemUsIHN0YXJ0UG9pc29uLCBl bmRQb2lzb24pOworI2lmbmRlZiBOREVCVUcKKyAgICB7CisgICAgICAgIEhhcmRlbmVkU0xMIG5v ZGUgPSBoZWFkOworICAgICAgICB3aGlsZSAobm9kZSkgeworICAgICAgICAgICAgQVNTRVJUKElT X0RFRklOSVRFTFlfUE9JU09ORUQobm9kZS52YWx1ZSgpLCBzaXplKSk7CisgICAgICAgICAgICBu b2RlID0gU0xMX05leHQobm9kZSwgZW50cm9weV8pOworICAgICAgICB9CisgICAgfQorI2VuZGlm CiAgIHNwYW4tPm9iamVjdHMgPSBoZWFkOwogICBBU1NFUlQoc3Bhbi0+b2JqZWN0cy52YWx1ZSgp ID09IGhlYWQudmFsdWUoKSk7CiAgIHNwYW4tPnJlZmNvdW50ID0gMDsgLy8gTm8gc3ViLW9iamVj dCBpbiB1c2UgeWV0CkBAIC0zMjAwLDcgKzMyNDIsNyBAQCBpbmxpbmUgdm9pZCBUQ01hbGxvY19U aHJlYWRDYWNoZTo6RGVhbGxvY2F0ZShIYXJkZW5lZFNMTCBwdHIsIHNpemVfdCBjbCkgewogICBz aXplXyArPSBhbGxvY2F0aW9uU2l6ZTsKICAgRnJlZUxpc3QqIGxpc3QgPSAmbGlzdF9bY2xdOwog ICBpZiAoTUFZX0JFX1BPSVNPTkVEKHB0ci52YWx1ZSgpLCBhbGxvY2F0aW9uU2l6ZSkpCi0gICAg ICBsaXN0LT5WYWxpZGF0ZShwdHIpOworICAgICAgbGlzdC0+VmFsaWRhdGUocHRyLCBhbGxvY2F0 aW9uU2l6ZSk7CiAKICAgUE9JU09OX0RFQUxMT0NBVElPTihwdHIudmFsdWUoKSwgYWxsb2NhdGlv blNpemUpOwogICBsaXN0LT5QdXNoKHB0cik7CkBAIC0zOTU0LDYgKzM5OTYsNyBAQCBzdGF0aWMg QUxXQVlTX0lOTElORSB2b2lkIGRvX2ZyZWUodm9pZCogcHRyKSB7CiAKICAgaWYgKGNsID09IDAp IHsKICAgICBzcGFuID0gcGFnZWhlYXAtPkdldERlc2NyaXB0b3IocCk7CisgICAgUkVMRUFTRV9B U1NFUlQoc3Bhbi0+aXNWYWxpZCgpKTsKICAgICBjbCA9IHNwYW4tPnNpemVjbGFzczsKICAgICBw YWdlaGVhcC0+Q2FjaGVTaXplQ2xhc3MocCwgY2wpOwogICB9CkBAIC0zOTY2LDggKzQwMDksNyBA QCBzdGF0aWMgQUxXQVlTX0lOTElORSB2b2lkIGRvX2ZyZWUodm9pZCogcHRyKSB7CiAgICAgICBo ZWFwLT5EZWFsbG9jYXRlKEhhcmRlbmVkU0xMOjpjcmVhdGUocHRyKSwgY2wpOwogICAgIH0gZWxz ZSB7CiAgICAgICAvLyBEZWxldGUgZGlyZWN0bHkgaW50byBjZW50cmFsIGNhY2hlCi0gICAgICBz aXplX3QgYWxsb2NhdGlvblNpemUgPSBCeXRlU2l6ZUZvckNsYXNzKGNsKTsKLSAgICAgIFBPSVNP Tl9ERUFMTE9DQVRJT04ocHRyLCBhbGxvY2F0aW9uU2l6ZSk7CisgICAgICBQT0lTT05fREVBTExP Q0FUSU9OKHB0ciwgQnl0ZVNpemVGb3JDbGFzcyhjbCkpOwogICAgICAgU0xMX1NldE5leHQoSGFy ZGVuZWRTTEw6OmNyZWF0ZShwdHIpLCBIYXJkZW5lZFNMTDo6bnVsbCgpLCBjZW50cmFsX2NhY2hl W2NsXS5lbnRyb3B5KCkpOwogICAgICAgY2VudHJhbF9jYWNoZVtjbF0uSW5zZXJ0UmFuZ2UoSGFy ZGVuZWRTTEw6OmNyZWF0ZShwdHIpLCBIYXJkZW5lZFNMTDo6Y3JlYXRlKHB0ciksIDEpOwogICAg IH0K