54253 2011-02-10 15:52:34 -0800 A little more encapsulation for MarkedBlock: Moved allocate() and sweep() into MarkedBlock 2011-02-10 16:20:21 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ggaren ggaren oldest_to_newest 349463 0 ggaren 2011-02-10 15:52:34 -0800 A little more encapsulation for MarkedBlock: Moved allocate() and sweep() into MarkedBlock 349469 1 82064 ggaren 2011-02-10 15:57:18 -0800 Created attachment 82064 Patch 349476 2 82064 oliver 2011-02-10 16:01:54 -0800 Comment on attachment 82064 Patch r=me 349488 3 ggaren 2011-02-10 16:20:21 -0800 Committed r78284: <http://trac.webkit.org/changeset/78284> 82064 2011-02-10 15:57:18 -0800 2011-02-10 16:01:54 -0800 Patch bug-54253-20110210155717.patch text/plain 9354 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gNzgyODEpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzQgQEAK KzIwMTEtMDItMTAgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBIGxpdHRsZSBtb3JlIGVu Y2Fwc3VsYXRpb24gZm9yIE1hcmtlZEJsb2NrOiBNb3ZlZCBhbGxvY2F0ZSgpIGFuZCBzd2VlcCgp IGludG8gTWFya2VkQmxvY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTU0MjUzCisgICAgICAgIAorICAgICAgICBTdW5TcGlkZXIgcmVwb3J0cyBubyBj aGFuZ2UuCisKKyAgICAgICAgKiBydW50aW1lL0NvbGxlY3RvckhlYXBJdGVyYXRvci5oOiBSZW1v dmVkIERlYWRPYmplY3RJdGVyYXRvciwgc2luY2UgaXQKKyAgICAgICAgaXMgbm93IHVudXNlZC4K KworICAgICAgICAqIHJ1bnRpbWUvSGVhcC5jcHA6CisgICAgICAgIChKU0M6OkhlYXA6OnJlc2V0 KTogTW92ZWQgdGhlIGNhbGwgdG8gc2hyaW5rKCkgaGVyZSwgc2luY2UgaXQgc2VlbXMgYQorICAg ICAgICBsaXR0bGUgbW9yZSBjbGVhciBmb3IgTWFya2VkU3BhY2UncyBjbGllbnQgdG8gdGVsbCBp dCBleHBsaWNpdGx5IHdoZW4gdG8KKyAgICAgICAgc2hyaW5rLgorCisgICAgICAgICogcnVudGlt ZS9KU0NlbGwuaDoKKyAgICAgICAgKEpTQzo6SlNDZWxsOjpNYXJrZWRCbG9jazo6YWxsb2NhdGUp OiBTcGxpdCBvdXQgZnJvbSBNYXJrZWRTcGFjZTo6YWxsb2NhdGUuCisKKyAgICAgICAgKiBydW50 aW1lL01hcmtlZEJsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6TWFya2VkQmxvY2s6OnN3ZWVwKTog U3BsaXQgb3V0IGZyb20gTWFya2VkU3BhY2U6OnN3ZWVwLCBhbmQKKyAgICAgICAgY29udmVydGVk IHRvIG1vcmUgZGlyZWN0bHkgaXRlcmF0ZSBhIE1hcmtlZEJsb2NrIGJhc2VkIG9uIGtub3dpbmcg aXRzCisgICAgICAgIGludGVybmFsIHN0cnVjdHVyZS4KKworICAgICAgICAqIHJ1bnRpbWUvTWFy a2VkQmxvY2suaDoKKyAgICAgICAgKiBydW50aW1lL01hcmtlZFNwYWNlLmNwcDoKKyAgICAgICAg KEpTQzo6TWFya2VkU3BhY2U6OmFsbG9jYXRlKToKKyAgICAgICAgKEpTQzo6TWFya2VkU3BhY2U6 OnN3ZWVwKToKKyAgICAgICAgKiBydW50aW1lL01hcmtlZFNwYWNlLmg6IFNwbGl0IG91dCB0aGUg Y29kZSBtZW50aW9uZWQgYWJvdmUuCisKIDIwMTEtMDItMTAgIFBhdHJpY2sgR2Fuc3RlcmVyICA8 cGFyb2dhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4K SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbGxlY3RvckhlYXBJdGVyYXRv ci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbGxlY3Rv ckhlYXBJdGVyYXRvci5oCShyZXZpc2lvbiA3ODI3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0NvbGxlY3RvckhlYXBJdGVyYXRvci5oCSh3b3JraW5nIGNvcHkpCkBAIC01Mywx MiArNTMsNiBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgTGl2ZU9iamVjdEl0ZXJhdG9yJiBv cGVyYXRvcisrKCk7CiAgICAgfTsKIAotICAgIGNsYXNzIERlYWRPYmplY3RJdGVyYXRvciA6IHB1 YmxpYyBDb2xsZWN0b3JIZWFwSXRlcmF0b3IgewotICAgIHB1YmxpYzoKLSAgICAgICAgRGVhZE9i amVjdEl0ZXJhdG9yKENvbGxlY3RvckhlYXAmLCBzaXplX3Qgc3RhcnRCbG9jaywgc2l6ZV90IHN0 YXJ0Q2VsbCA9IDApOwotICAgICAgICBEZWFkT2JqZWN0SXRlcmF0b3ImIG9wZXJhdG9yKysoKTsK LSAgICB9OwotCiAgICAgaW5saW5lIENvbGxlY3RvckhlYXBJdGVyYXRvcjo6Q29sbGVjdG9ySGVh cEl0ZXJhdG9yKENvbGxlY3RvckhlYXAmIGhlYXAsIHNpemVfdCBzdGFydEJsb2NrLCBzaXplX3Qg c3RhcnRDZWxsKQogICAgICAgICA6IG1faGVhcChoZWFwKQogICAgICAgICAsIG1fYmxvY2soc3Rh cnRCbG9jaykKQEAgLTExMiwyMSArMTA2LDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHJl dHVybiAqdGhpczsKICAgICB9CiAKLSAgICBpbmxpbmUgRGVhZE9iamVjdEl0ZXJhdG9yOjpEZWFk T2JqZWN0SXRlcmF0b3IoQ29sbGVjdG9ySGVhcCYgaGVhcCwgc2l6ZV90IHN0YXJ0QmxvY2ssIHNp emVfdCBzdGFydENlbGwpCi0gICAgICAgIDogQ29sbGVjdG9ySGVhcEl0ZXJhdG9yKGhlYXAsIHN0 YXJ0QmxvY2ssIHN0YXJ0Q2VsbCkKLSAgICB7Ci0gICAgICAgIGlmIChpc1ZhbGlkKCkgJiYgaXNM aXZlKCkpCi0gICAgICAgICAgICArKygqdGhpcyk7Ci0gICAgfQotCi0gICAgaW5saW5lIERlYWRP YmplY3RJdGVyYXRvciYgRGVhZE9iamVjdEl0ZXJhdG9yOjpvcGVyYXRvcisrKCkKLSAgICB7Ci0g ICAgICAgIGRvIHsKLSAgICAgICAgICAgIGFkdmFuY2UoKTsKLSAgICAgICAgfSB3aGlsZSAoaXNW YWxpZCgpICYmIGlzTGl2ZSgpKTsKLSAgICAgICAgcmV0dXJuICp0aGlzOwotICAgIH0KLQogfSAv LyBuYW1lc3BhY2UgSlNDCiAKICNlbmRpZiAvLyBDb2xsZWN0b3JIZWFwSXRlcmF0b3JfaApJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSGVhcC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSGVhcC5jcHAJKHJldmlzaW9uIDc4MjcxKQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSGVhcC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTM4Myw4ICszODMsMTAgQEAgdm9pZCBIZWFwOjpyZXNldChTd2VlcFRvZ2dsZSBzd2VlcFRv Z2dsZQogICAgIG1fbWFya2VkU3BhY2UucmVzZXQoKTsKICAgICBtX2V4dHJhQ29zdCA9IDA7CiAK LSAgICBpZiAoc3dlZXBUb2dnbGUgPT0gRG9Td2VlcCkKKyAgICBpZiAoc3dlZXBUb2dnbGUgPT0g RG9Td2VlcCkgewogICAgICAgICBtX21hcmtlZFNwYWNlLnN3ZWVwKCk7CisgICAgICAgIG1fbWFy a2VkU3BhY2Uuc2hyaW5rKCk7CisgICAgfQogCiAgICAgc2l6ZV90IHVzZWRDZWxsQ291bnQgPSBt X21hcmtlZFNwYWNlLm1hcmtlZENlbGxzKCk7CiAgICAgc2l6ZV90IHByb3BvcnRpb25hbEJ5dGVz ID0gc3RhdGljX2Nhc3Q8c2l6ZV90Pih1c2VkQ2VsbENvdW50ICogMS41ICogSGVhcENvbnN0YW50 czo6Y2VsbFNpemUpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxs LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsLmgJ KHJldmlzaW9uIDc4MjcxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxs LmgJKHdvcmtpbmcgY29weSkKQEAgLTQwMSw2ICs0MDEsMjIgQEAgbmFtZXNwYWNlIEpTQyB7CiAg ICAgICAgIHJldHVybiBpc0NlbGwoKSAmJiBhc0NlbGwoKSAmJiBhc0NlbGwoKS0+aXNab21iaWUo KTsKICAgICB9CiAjZW5kaWYKKworICAgIGlubGluZSB2b2lkKiBNYXJrZWRCbG9jazo6YWxsb2Nh dGUoc2l6ZV90JiBuZXh0Q2VsbCkKKyAgICB7CisgICAgICAgIGRvIHsKKyAgICAgICAgICAgIEFT U0VSVChuZXh0Q2VsbCA8IEhlYXBDb25zdGFudHM6OmNlbGxzUGVyQmxvY2spOworICAgICAgICAg ICAgaWYgKCFtYXJrZWQudGVzdEFuZFNldChuZXh0Q2VsbCkpIHsgLy8gQWx3YXlzIGZhbHNlIGZv ciB0aGUgbGFzdCBjZWxsIGluIHRoZSBibG9jaworICAgICAgICAgICAgICAgIEpTQ2VsbCogY2Vs bCA9IHJlaW50ZXJwcmV0X2Nhc3Q8SlNDZWxsKj4oJmNlbGxzW25leHRDZWxsKytdKTsKKyAgICAg ICAgICAgICAgICBjZWxsLT5+SlNDZWxsKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIGNlbGw7 CisgICAgICAgICAgICB9CisgICAgICAgICAgICBuZXh0Q2VsbCA9IG1hcmtlZC5uZXh0UG9zc2li bHlVbnNldChuZXh0Q2VsbCk7CisgICAgICAgIH0gd2hpbGUgKG5leHRDZWxsICE9IEhlYXBDb25z dGFudHM6OmNlbGxzUGVyQmxvY2spOworICAgICAgICAKKyAgICAgICAgcmV0dXJuIDA7CisgICAg fQorCiB9IC8vIG5hbWVzcGFjZSBKU0MKIAogI2VuZGlmIC8vIEpTQ2VsbF9oCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9NYXJrZWRCbG9jay5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTWFya2VkQmxvY2suY3BwCShyZXZpc2lvbiA3 ODI3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL01hcmtlZEJsb2NrLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNTYsNCArNTYsMjkgQEAgTWFya2VkQmxvY2s6Ok1hcmtlZEJsb2Nr KGNvbnN0IFBhZ2VBbGxvYwogICAgICAgICBuZXcgKCZjZWxsc1tpXSkgSlNDZWxsKGR1bW15TWFy a2FibGVDZWxsU3RydWN0dXJlKTsKIH0KIAordm9pZCBNYXJrZWRCbG9jazo6c3dlZXAoKQorewor I2lmICFFTkFCTEUoSlNDX1pPTUJJRVMpCisgICAgU3RydWN0dXJlKiBkdW1teU1hcmthYmxlQ2Vs bFN0cnVjdHVyZSA9IG1faGVhcC0+Z2xvYmFsRGF0YSgpLT5kdW1teU1hcmthYmxlQ2VsbFN0cnVj dHVyZS5nZXQoKTsKKyNlbmRpZgorCisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBIZWFwQ29u c3RhbnRzOjpjZWxsc1BlckJsb2NrOyArK2kpIHsKKyAgICAgICAgaWYgKG1hcmtlZC5nZXQoaSkp CisgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICBKU0NlbGwqIGNlbGwgPSByZWludGVy cHJldF9jYXN0PEpTQ2VsbCo+KCZjZWxsc1tpXSk7CisjaWYgRU5BQkxFKEpTQ19aT01CSUVTKQor ICAgICAgICBpZiAoIWNlbGwtPmlzWm9tYmllKCkpIHsKKyAgICAgICAgICAgIGNvbnN0IENsYXNz SW5mbyogaW5mbyA9IGNlbGwtPmNsYXNzSW5mbygpOworICAgICAgICAgICAgY2VsbC0+fkpTQ2Vs bCgpOworICAgICAgICAgICAgbmV3IChjZWxsKSBKU1pvbWJpZShpbmZvLCBKU1pvbWJpZTo6bGVh a2VkWm9tYmllU3RydWN0dXJlKCkpOworICAgICAgICAgICAgbWFya2VkLnNldChpKTsKKyAgICAg ICAgfQorI2Vsc2UKKyAgICAgICAgY2VsbC0+fkpTQ2VsbCgpOworICAgICAgICBuZXcgKGNlbGwp IEpTQ2VsbChkdW1teU1hcmthYmxlQ2VsbFN0cnVjdHVyZSk7CisjZW5kaWYKKyAgICB9Cit9CisK IH0gLy8gbmFtZXNwYWNlIEpTQwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv TWFya2VkQmxvY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9NYXJrZWRCbG9jay5oCShyZXZpc2lvbiA3ODI3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL01hcmtlZEJsb2NrLmgJKHdvcmtpbmcgY29weSkKQEAgLTY0LDYgKzY0LDkgQEAg bmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHN0YXRpYyBNYXJrZWRCbG9jayogYmxvY2tGb3IoY29u c3Qgdm9pZCopOwogICAgICAgICAKICAgICAgICAgSGVhcCogaGVhcCgpIGNvbnN0OworICAgICAg ICAKKyAgICAgICAgdm9pZCogYWxsb2NhdGUoc2l6ZV90JiBuZXh0Q2VsbCk7CisgICAgICAgIHZv aWQgc3dlZXAoKTsKIAogICAgICAgICBzaXplX3QgY2VsbE51bWJlcihjb25zdCB2b2lkKik7CiAg ICAgICAgIGJvb2wgaXNNYXJrZWQoY29uc3Qgdm9pZCopOwpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvTWFya2VkU3BhY2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL01hcmtlZFNwYWNlLmNwcAkocmV2aXNpb24gNzgyNzEpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9NYXJrZWRTcGFjZS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTY4LDI5ICs2OCwxNSBAQCB2b2lkKiBNYXJrZWRTcGFjZTo6YWxsb2NhdGUoc2l6ZV90 KQogICAgIGRvIHsKICAgICAgICAgQVNTRVJUKG1faGVhcC5uZXh0QmxvY2sgPCBtX2hlYXAuYmxv Y2tzLnNpemUoKSk7CiAgICAgICAgIE1hcmtlZEJsb2NrKiBibG9jayA9IG1faGVhcC5jb2xsZWN0 b3JCbG9jayhtX2hlYXAubmV4dEJsb2NrKTsKLSAgICAgICAgZG8gewotICAgICAgICAgICAgQVNT RVJUKG1faGVhcC5uZXh0Q2VsbCA8IEhlYXBDb25zdGFudHM6OmNlbGxzUGVyQmxvY2spOwotICAg ICAgICAgICAgaWYgKCFibG9jay0+bWFya2VkLnRlc3RBbmRTZXQobV9oZWFwLm5leHRDZWxsKSkg eyAvLyBBbHdheXMgZmFsc2UgZm9yIHRoZSBsYXN0IGNlbGwgaW4gdGhlIGJsb2NrCi0gICAgICAg ICAgICAgICAgQ29sbGVjdG9yQ2VsbCogY2VsbCA9ICZibG9jay0+Y2VsbHNbbV9oZWFwLm5leHRD ZWxsXTsKLQotICAgICAgICAgICAgICAgIEpTQ2VsbCogaW1wID0gcmVpbnRlcnByZXRfY2FzdDxK U0NlbGwqPihjZWxsKTsKLSAgICAgICAgICAgICAgICBpbXAtPn5KU0NlbGwoKTsKLQotICAgICAg ICAgICAgICAgICsrbV9oZWFwLm5leHRDZWxsOwotICAgICAgICAgICAgICAgIHJldHVybiBjZWxs OwotICAgICAgICAgICAgfQotICAgICAgICAgICAgbV9oZWFwLm5leHRDZWxsID0gYmxvY2stPm1h cmtlZC5uZXh0UG9zc2libHlVbnNldChtX2hlYXAubmV4dENlbGwpOwotICAgICAgICB9IHdoaWxl IChtX2hlYXAubmV4dENlbGwgIT0gSGVhcENvbnN0YW50czo6Y2VsbHNQZXJCbG9jayk7CisgICAg ICAgIGlmICh2b2lkKiByZXN1bHQgPSBibG9jay0+YWxsb2NhdGUobV9oZWFwLm5leHRDZWxsKSkK KyAgICAgICAgICAgIHJldHVybiByZXN1bHQ7CisKICAgICAgICAgbV9oZWFwLm5leHRDZWxsID0g MDsKICAgICAgICAgbV93YXRlck1hcmsgKz0gQkxPQ0tfU0laRTsKICAgICB9IHdoaWxlICgrK21f aGVhcC5uZXh0QmxvY2sgIT0gbV9oZWFwLmJsb2Nrcy5zaXplKCkpOwogCi0gICAgaWYgKG1fd2F0 ZXJNYXJrIDwgbV9oaWdoV2F0ZXJNYXJrKSB7Ci0gICAgICAgIE1hcmtlZEJsb2NrKiBibG9jayA9 IGFsbG9jYXRlQmxvY2soKTsKLSAgICAgICAgQVNTRVJUKCFibG9jay0+bWFya2VkLmdldChtX2hl YXAubmV4dENlbGwpKTsKLSAgICAgICAgYmxvY2stPm1hcmtlZC5zZXQobV9oZWFwLm5leHRDZWxs KTsKLSAgICAgICAgcmV0dXJuICZibG9jay0+Y2VsbHNbbV9oZWFwLm5leHRDZWxsKytdOwotICAg IH0KKyAgICBpZiAobV93YXRlck1hcmsgPCBtX2hpZ2hXYXRlck1hcmspCisgICAgICAgIHJldHVy biBhbGxvY2F0ZUJsb2NrKCktPmFsbG9jYXRlKG1faGVhcC5uZXh0Q2VsbCk7CiAKICAgICByZXR1 cm4gMDsKIH0KQEAgLTE0NCwyOSArMTMwLDggQEAgc2l6ZV90IE1hcmtlZFNwYWNlOjptYXJrZWRD ZWxscyhzaXplX3QgcwogCiB2b2lkIE1hcmtlZFNwYWNlOjpzd2VlcCgpCiB7Ci0jaWYgIUVOQUJM RShKU0NfWk9NQklFUykKLSAgICBTdHJ1Y3R1cmUqIGR1bW15TWFya2FibGVDZWxsU3RydWN0dXJl ID0gZ2xvYmFsRGF0YSgpLT5kdW1teU1hcmthYmxlQ2VsbFN0cnVjdHVyZS5nZXQoKTsKLSNlbmRp ZgotCi0gICAgRGVhZE9iamVjdEl0ZXJhdG9yIGl0KG1faGVhcCwgMCwgMCk7Ci0gICAgRGVhZE9i amVjdEl0ZXJhdG9yIGVuZChtX2hlYXAsIG1faGVhcC5ibG9ja3Muc2l6ZSgpLCAwKTsKLSAgICBm b3IgKCA7IGl0ICE9IGVuZDsgKytpdCkgewotICAgICAgICBKU0NlbGwqIGNlbGwgPSAqaXQ7Ci0j aWYgRU5BQkxFKEpTQ19aT01CSUVTKQotICAgICAgICBpZiAoIWNlbGwtPmlzWm9tYmllKCkpIHsK LSAgICAgICAgICAgIGNvbnN0IENsYXNzSW5mbyogaW5mbyA9IGNlbGwtPmNsYXNzSW5mbygpOwot ICAgICAgICAgICAgY2VsbC0+fkpTQ2VsbCgpOwotICAgICAgICAgICAgbmV3IChjZWxsKSBKU1pv bWJpZShpbmZvLCBKU1pvbWJpZTo6bGVha2VkWm9tYmllU3RydWN0dXJlKCkpOwotICAgICAgICAg ICAgSGVhcDo6bWFya0NlbGwoY2VsbCk7Ci0gICAgICAgIH0KLSNlbHNlCi0gICAgICAgIGNlbGwt Pn5KU0NlbGwoKTsKLSAgICAgICAgLy8gQ2FsbGVycyBvZiBzd2VlcCBhc3N1bWUgaXQncyBzYWZl IHRvIG1hcmsgYW55IGNlbGwgaW4gdGhlIGhlYXAuCi0gICAgICAgIG5ldyAoY2VsbCkgSlNDZWxs KGR1bW15TWFya2FibGVDZWxsU3RydWN0dXJlKTsKLSNlbmRpZgotICAgIH0KLSAgICAKLSAgICBz aHJpbmsoKTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1faGVhcC5ibG9ja3Muc2l6ZSgp OyArK2kpCisgICAgICAgIG1faGVhcC5jb2xsZWN0b3JCbG9jayhpKS0+c3dlZXAoKTsKIH0KIAog c2l6ZV90IE1hcmtlZFNwYWNlOjpvYmplY3RDb3VudCgpIGNvbnN0CkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9NYXJrZWRTcGFjZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL01hcmtlZFNwYWNlLmgJKHJldmlzaW9uIDc4MjcxKQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTWFya2VkU3BhY2UuaAkod29ya2luZyBjb3B5 KQpAQCAtODAsNiArODAsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgdm9pZCBtYXJrUm9v dHMoKTsKICAgICAgICAgdm9pZCByZXNldCgpOwogICAgICAgICB2b2lkIHN3ZWVwKCk7CisgICAg ICAgIHZvaWQgc2hyaW5rKCk7CiAgICAgICAgIHNpemVfdCBtYXJrZWRDZWxscyhzaXplX3Qgc3Rh cnRCbG9jayA9IDAsIHNpemVfdCBzdGFydENlbGwgPSAwKSBjb25zdDsKIAogICAgICAgICBzaXpl X3Qgc2l6ZSgpIGNvbnN0OwpAQCAtOTQsNyArOTUsNiBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICBw cml2YXRlOgogICAgICAgICBORVZFUl9JTkxJTkUgTWFya2VkQmxvY2sqIGFsbG9jYXRlQmxvY2so KTsKICAgICAgICAgTkVWRVJfSU5MSU5FIHZvaWQgZnJlZUJsb2NrKHNpemVfdCk7Ci0gICAgICAg IHZvaWQgc2hyaW5rKCk7CiAKICAgICAgICAgdm9pZCBjbGVhck1hcmtCaXRzKE1hcmtlZEJsb2Nr Kik7CiAK