50128 2010-11-28 03:02:54 -0800 [Qt][WK2] webkit2 does not compile on OS X 2010-12-15 04:34:29 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC OS X 10.6 RESOLVED FIXED Qt, QtTriaged P2 Normal --- 0 jhanssen webkit-unassigned commit-queue kenneth webkit.review.bot oldest_to_newest 314173 0 jhanssen 2010-11-28 03:02:54 -0800 The Qt webkit2 port does not compile on OS X 314174 1 74969 jhanssen 2010-11-28 03:06:15 -0800 Created attachment 74969 Patch prctl(2) is Linux specific, it's not part of POSIX unfortunately 314213 2 74969 kenneth 2010-11-28 10:17:25 -0800 Comment on attachment 74969 Patch unfortunately the above code was introduced to fix something, that now needs special handling on mac. i will r+ but you need to take this up with the person who introduced the above code. 317902 3 75747 jhanssen 2010-12-06 16:14:27 -0800 Created attachment 75747 Patch New patch with a generic implementation for killing all child processes when the parent dies. This will not be invoked if the parent is killed with SIGKILL though. 317906 4 webkit.review.bot 2010-12-06 16:16:37 -0800 Attachment 75747 did not pass style-queue: Failed to run "[u'git', u'reset', u'--hard', u'HEAD']" exit_code: 128 error: Could not write new index file. fatal: Could not reset index file to revision 'HEAD'. If any of these errors are false positives, please file a bug against check-webkit-style. 319991 5 75747 eric 2010-12-10 00:07:42 -0800 Comment on attachment 75747 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=75747&action=review > WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp:91 > + : QProcess(parent), m_pid(0) webkit normally puts each of these on its own line. 320098 6 75747 kbalazs 2010-12-10 04:37:33 -0800 Comment on attachment 75747 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=75747&action=review > WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp:75 > +#if defined Q_OS_UNIX > +Q_GLOBAL_STATIC(QSet<Q_PID>, processes); Maybe using a WTF::HashSet would be more WebKitish. Furthermore, WTF::HashSet is stored in FastMalloc memory and I think the less we mixing the FastMalloc and the standard heap is the better. > WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp:84 > +static void cleanupProcesses() > +{ > + QSet<Q_PID>::ConstIterator it = processes()->begin(); > + while (it != processes()->end()) { > + kill(*it, SIGINT); > + ++it; > + } > +} We can do it more platform independently by storing QProcess pointers and use QProcess::kill. > WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp:110 > + processes()->remove(m_pid); > + m_pid = 0; m_pid = 0 seems to be useless here. 320381 7 76251 jhanssen 2010-12-10 13:51:28 -0800 Created attachment 76251 Patch 320958 8 76251 eric 2010-12-13 00:28:14 -0800 Comment on attachment 76251 Patch Looks sane to me. 322532 9 76251 kling 2010-12-15 00:39:08 -0800 Comment on attachment 76251 Patch Looks sane indeed, r=me 322569 10 76251 commit-queue 2010-12-15 04:34:23 -0800 Comment on attachment 76251 Patch Clearing flags on attachment: 76251 Committed r74108: <http://trac.webkit.org/changeset/74108> 322570 11 commit-queue 2010-12-15 04:34:29 -0800 All reviewed patches have been landed. Closing bug. 74969 2010-11-28 03:06:15 -0800 2010-12-06 16:14:22 -0800 Patch bug-50128-20101128030613.patch text/plain 1395 jhanssen ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg ZWY0YzkyYWMwNThiOWNiM2Q1N2UzYjcwMTRlNTY3YTgzODJjOGVmYy4uNmQxMjA3YmI5NGI1YWZi MjRkZGE5ZjU1MzFiNTM4Yjk3N2QyNjhiZiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0xMS0yOCAgSmFu IEVyaWsgSGFuc3NlbiAgPGpoYW5zc2VuQHNlbmNoYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XVtXSzJdIHdlYmtpdDIgZG9lcyBub3Qg Y29tcGlsZSBvbiBPUyBYCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01MDEyOAorCisgICAgICAgIHByY3RsKDIpIGlzIG9ubHkgYXZhaWxhYmxlIG9uIExp bnV4LCBzbyBndWFyZCB1c2luZworICAgICAgICBRX09TX0xJTlVYIGluc3RlYWQgb2YgUV9PU19V TklYLgorCisgICAgICAgICogVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UXRXZWJQcm9jZXNzOjpzZXR1cENoaWxkUHJvY2Vzcyk6 CisKIDIwMTAtMTEtMjQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGltcGxpY2l0bHkgYnkgSm9obiBTdWxsaXZhbi4KZGlmZiAtLWdpdCBhL1dl YktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcCBiL1dlYktp dDIvVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcAppbmRleCAyMjdl YmFhY2I1MTVhZDg1OWQ0YzA4ZmNkMDkzZmM1YjJhZWVhZTk4Li4xNmI3NjQ1M2MxMzJkN2M5NWMy NmFmZjg4MGNhNDcyZjk5NGIwM2ZlIDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVu Y2hlci9xdC9Qcm9jZXNzTGF1bmNoZXJRdC5jcHAKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1 bmNoZXIvcXQvUHJvY2Vzc0xhdW5jaGVyUXQuY3BwCkBAIC00Nyw3ICs0Nyw3IEBACiAKICNpbmNs dWRlIDxzeXMvcmVzb3VyY2UuaD4KICNpbmNsdWRlIDx1bmlzdGQuaD4KLSNpZiBkZWZpbmVkIFFf T1NfVU5JWAorI2lmIGRlZmluZWQgUV9PU19MSU5VWAogI2luY2x1ZGUgPHN5cy9wcmN0bC5oPgog I2luY2x1ZGUgPHNpZ25hbC5oPgogI2VuZGlmCkBAIC04NSw3ICs4NSw3IEBAIHByb3RlY3RlZDoK IAogdm9pZCBRdFdlYlByb2Nlc3M6OnNldHVwQ2hpbGRQcm9jZXNzKCkKIHsKLSNpZiBkZWZpbmVk IFFfT1NfVU5JWAorI2lmIGRlZmluZWQgUV9PU19MSU5VWAogICAgIHByY3RsKFBSX1NFVF9QREVB VEhTSUcsIFNJR0lOVCk7CiAjZW5kaWYKIH0K 75747 2010-12-06 16:14:27 -0800 2010-12-10 13:51:24 -0800 Patch bug-50128-20101206161425.patch text/plain 3891 jhanssen ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg OTdkNjMzZWMyZDc5NmVlMzg0ZTA1NmUxYzdmYWIxNzU1ODIxNTYwZS4uNzM3NWI2OTU5NzRhNTlh YWI1MjFmODQ2ZTVjOTMyYzIxMjQxODY0NSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0xMi0wNiAgSmFu IEVyaWsgSGFuc3NlbiAgPGpoYW5zc2VuQHNlbmNoYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XVtXSzJdIHdlYmtpdDIgZG9lcyBub3Qg Y29tcGlsZSBvbiBPUyBYCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01MDEyOAorCisgICAgICAgIHByY3RsKDIpIGlzIG9ubHkgYXZhaWxhYmxlIG9uIExp bnV4LCBzbyB1c2UgYW4gYXRleGl0IGhhbmRsZXIgZm9yIGtpbGxpbmcKKyAgICAgICAgYWxsIHRo ZSBjaGlsZCBwcm9jZXNzZXMgd2hlbiB0aGUgcHJvY2VzcyBpcyBleGl0aW5nLgorCisgICAgICAg ICogVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcDoKKyAgICAgICAg KFdlYktpdDo6Y2xlYW51cFByb2Nlc3Nlcyk6CisgICAgICAgIChXZWJLaXQ6OlF0V2ViUHJvY2Vz czo6UXRXZWJQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6UXRXZWJQcm9jZXNzOjpwcm9jZXNz U3RhdGVDaGFuZ2VkKToKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vzc0xhdW5jaGVySGVscGVyOjps YXVuY2gpOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzTGF1bmNoZXJIZWxwZXI6Omluc3RhbmNl KToKKwogMjAxMC0xMi0wMyAgSm9obiBTdWxsaXZhbiAgPHN1bGxpdmFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBBZGFtIFJvYmVuLgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVBy b2Nlc3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xhdW5jaGVyUXQuY3BwIGIvV2ViS2l0Mi9VSVByb2Nl c3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xhdW5jaGVyUXQuY3BwCmluZGV4IDIyN2ViYWFjYjUxNWFk ODU5ZDRjMDhmY2QwOTNmYzViMmFlZWFlOTguLjQzYmNjNDczNTNmZGQzODY0NWYwNjhkNDYwNzUx NWM1MmZhNDUzMDggMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1By b2Nlc3NMYXVuY2hlclF0LmNwcAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9xdC9Q cm9jZXNzTGF1bmNoZXJRdC5jcHAKQEAgLTQyLDEzICs0MiwxMyBAQAogI2luY2x1ZGUgPFFGaWxl PgogI2luY2x1ZGUgPFFMb2NhbFNlcnZlcj4KICNpbmNsdWRlIDxRUHJvY2Vzcz4KKyNpbmNsdWRl IDxRU2V0PgogCiAjaW5jbHVkZSA8UXRDb3JlL3FnbG9iYWwuaD4KIAogI2luY2x1ZGUgPHN5cy9y ZXNvdXJjZS5oPgogI2luY2x1ZGUgPHVuaXN0ZC5oPgogI2lmIGRlZmluZWQgUV9PU19VTklYCi0j aW5jbHVkZSA8c3lzL3ByY3RsLmg+CiAjaW5jbHVkZSA8c2lnbmFsLmg+CiAjZW5kaWYKIApAQCAt NzEsMjQgKzcxLDQ2IEBAIHByaXZhdGU6CiAgICAgUV9TTE9UIHZvaWQgbmV3Q29ubmVjdGlvbigp OwogfTsKIAorI2lmIGRlZmluZWQgUV9PU19VTklYCitRX0dMT0JBTF9TVEFUSUMoUVNldDxRX1BJ RD4sIHByb2Nlc3Nlcyk7CisKK3N0YXRpYyB2b2lkIGNsZWFudXBQcm9jZXNzZXMoKQoreworICAg IFFTZXQ8UV9QSUQ+OjpDb25zdEl0ZXJhdG9yIGl0ID0gcHJvY2Vzc2VzKCktPmJlZ2luKCk7Cisg ICAgd2hpbGUgKGl0ICE9IHByb2Nlc3NlcygpLT5lbmQoKSkgeworICAgICAgICBraWxsKCppdCwg U0lHSU5UKTsKKyAgICAgICAgKytpdDsKKyAgICB9Cit9CisKIGNsYXNzIFF0V2ViUHJvY2VzcyA6 IHB1YmxpYyBRUHJvY2VzcwogewogICAgIFFfT0JKRUNUCiBwdWJsaWM6CiAgICAgUXRXZWJQcm9j ZXNzKFFPYmplY3QqIHBhcmVudCA9IDApCi0gICAgICAgIDogUVByb2Nlc3MocGFyZW50KQotICAg IHt9CisgICAgICAgIDogUVByb2Nlc3MocGFyZW50KSwgbV9waWQoMCkKKyAgICB7CisgICAgICAg IGNvbm5lY3QodGhpcywgU0lHTkFMKHN0YXRlQ2hhbmdlZChRUHJvY2Vzczo6UHJvY2Vzc1N0YXRl KSksIHRoaXMsIFNMT1QocHJvY2Vzc1N0YXRlQ2hhbmdlZChRUHJvY2Vzczo6UHJvY2Vzc1N0YXRl KSkpOworICAgIH0KIAotcHJvdGVjdGVkOgotICAgIHZpcnR1YWwgdm9pZCBzZXR1cENoaWxkUHJv Y2VzcygpOworcHJpdmF0ZSBzbG90czoKKyAgICB2b2lkIHByb2Nlc3NTdGF0ZUNoYW5nZWQoUVBy b2Nlc3M6OlByb2Nlc3NTdGF0ZSBzdGF0ZSk7CisKK3ByaXZhdGU6CisgICAgUV9QSUQgbV9waWQ7 CiB9OwogCi12b2lkIFF0V2ViUHJvY2Vzczo6c2V0dXBDaGlsZFByb2Nlc3MoKQordm9pZCBRdFdl YlByb2Nlc3M6OnByb2Nlc3NTdGF0ZUNoYW5nZWQoUVByb2Nlc3M6OlByb2Nlc3NTdGF0ZSBzdGF0 ZSkKIHsKLSNpZiBkZWZpbmVkIFFfT1NfVU5JWAotICAgIHByY3RsKFBSX1NFVF9QREVBVEhTSUcs IFNJR0lOVCk7Ci0jZW5kaWYKKyAgICBpZiAoc3RhdGUgPT0gUVByb2Nlc3M6OlJ1bm5pbmcgJiYg IW1fcGlkKSB7CisgICAgICAgIG1fcGlkID0gcGlkKCk7CisgICAgICAgIHByb2Nlc3NlcygpLT5p bnNlcnQobV9waWQpOworICAgIH0gZWxzZSBpZiAoc3RhdGUgPT0gUVByb2Nlc3M6Ok5vdFJ1bm5p bmcgJiYgbV9waWQpIHsKKyAgICAgICAgcHJvY2Vzc2VzKCktPnJlbW92ZShtX3BpZCk7CisgICAg ICAgIG1fcGlkID0gMDsKKyAgICB9CiB9CisjZW5kaWYKIAogdm9pZCBQcm9jZXNzTGF1bmNoZXJI ZWxwZXI6OmxhdW5jaChXZWJLaXQ6OlByb2Nlc3NMYXVuY2hlciogbGF1bmNoZXIpCiB7CkBAIC0x MDIsNyArMTI0LDExIEBAIHZvaWQgUHJvY2Vzc0xhdW5jaGVySGVscGVyOjpsYXVuY2goV2ViS2l0 OjpQcm9jZXNzTGF1bmNoZXIqIGxhdW5jaGVyKQogCiAgICAgUVN0cmluZyBwcm9ncmFtKGFwcGxp Y2F0aW9uUGF0aC5hcmcobV9zZXJ2ZXIuc2VydmVyTmFtZSgpKSk7CiAKKyNpZiBkZWZpbmVkIFFf T1NfVU5JWAogICAgIFFQcm9jZXNzKiB3ZWJQcm9jZXNzID0gbmV3IFF0V2ViUHJvY2VzcygpOwor I2Vsc2UKKyAgICBRUHJvY2Vzcyogd2ViUHJvY2VzcyA9IG5ldyBRUHJvY2VzcygpOworI2VuZGlm CiAgICAgd2ViUHJvY2Vzcy0+c2V0UHJvY2Vzc0NoYW5uZWxNb2RlKFFQcm9jZXNzOjpGb3J3YXJk ZWRDaGFubmVscyk7CiAgICAgd2ViUHJvY2Vzcy0+c3RhcnQocHJvZ3JhbSk7CiAKQEAgLTE0NSw3 ICsxNzEsMTYgQEAgUHJvY2Vzc0xhdW5jaGVySGVscGVyOjpQcm9jZXNzTGF1bmNoZXJIZWxwZXIo KQogCiBQcm9jZXNzTGF1bmNoZXJIZWxwZXIqIFByb2Nlc3NMYXVuY2hlckhlbHBlcjo6aW5zdGFu Y2UoKQogewotICAgIHN0YXRpYyBQcm9jZXNzTGF1bmNoZXJIZWxwZXIqIHJlc3VsdCA9IG5ldyBQ cm9jZXNzTGF1bmNoZXJIZWxwZXIoKTsKKyAgICBzdGF0aWMgUHJvY2Vzc0xhdW5jaGVySGVscGVy KiByZXN1bHQgPSAwOworICAgIGlmICghcmVzdWx0KSB7CisgICAgICAgIHJlc3VsdCA9IG5ldyBQ cm9jZXNzTGF1bmNoZXJIZWxwZXIoKTsKKyNpZiBkZWZpbmVkIFFfT1NfVU5JWAorICAgICAgICAv LyBUaGUgZm9sbG93aW5nIGxpbmUgc2VydmVzIGEgZHVhbCBwdXJwb3NlLCBpdCBtYWtlcyB0aGUg aW5pdGlhbCBpbnNlcnRpb24gc2xpZ2h0IGZhc3RlcgorICAgICAgICAvLyBhbmQgYWxzbyBndWFy YW50ZWVzIHRoYXQgb3VyIHN0YXRpYyBpcyBpbml0aWFsaXplZCBiZWZvcmUgdGhlIGV4aXQgaGFu ZGxlciBpcyBpbnN0YWxsZWQuCisgICAgICAgIHByb2Nlc3NlcygpLT5yZXNlcnZlKDEwKTsKKyAg ICAgICAgYXRleGl0KGNsZWFudXBQcm9jZXNzZXMpOworI2VuZGlmCisgICAgfQogICAgIHJldHVy biByZXN1bHQ7CiB9CiAK 76251 2010-12-10 13:51:28 -0800 2010-12-15 04:34:23 -0800 Patch bug-50128-20101210135126.patch text/plain 3447 jhanssen ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg NmMwOTk2MjgwMTJkYTljY2I3NzM5YjQ2MjgwM2UxYzczNTI2ZTNjMC4uZmM3ZWM4NTY2ZDA0YmVi NmUxZGNhM2U4YWQ4YjM1NDdhZTdkNjQ5MyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0xMi0xMCAgSmFu IEVyaWsgSGFuc3NlbiAgPGpoYW5zc2VuQHNlbmNoYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XVtXSzJdIHdlYmtpdDIgZG9lcyBub3Qg Y29tcGlsZSBvbiBPUyBYCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01MDEyOAorCisgICAgICAgIHByY3RsKDIpIGlzIG9ubHkgYXZhaWxhYmxlIG9uIExp bnV4LCBzbyB1c2UgYW4gYXRleGl0IGhhbmRsZXIgZm9yIGtpbGxpbmcKKyAgICAgICAgYWxsIHRo ZSBjaGlsZCBwcm9jZXNzZXMgd2hlbiB0aGUgcHJvY2VzcyBpcyBleGl0aW5nLgorCisgICAgICAg ICogVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcDoKKyAgICAgICAg KFdlYktpdDo6Y2xlYW51cFByb2Nlc3Nlcyk6CisgICAgICAgIChXZWJLaXQ6OlF0V2ViUHJvY2Vz czo6UXRXZWJQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6UXRXZWJQcm9jZXNzOjpwcm9jZXNz U3RhdGVDaGFuZ2VkKToKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vzc0xhdW5jaGVySGVscGVyOjpp bnN0YW5jZSk6CisKIDIwMTAtMTItMTAgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNv dHRlQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlz dGlhbnNlbi4KZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nl c3NMYXVuY2hlclF0LmNwcCBiL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NM YXVuY2hlclF0LmNwcAppbmRleCAyMjdlYmFhY2I1MTVhZDg1OWQ0YzA4ZmNkMDkzZmM1YjJhZWVh ZTk4Li42NzRkN2UxNDhkNDhmMmUxM2JjZWMwMWFiYTJhYzVkMTdjZTVlZGU4IDEwMDY0NAotLS0g YS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9xdC9Qcm9jZXNzTGF1bmNoZXJRdC5jcHAKKysr IGIvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xhdW5jaGVyUXQuY3BwCkBA IC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiV2ViUHJvY2Vzcy5oIgogI2luY2x1ZGUgPHJ1bnRp bWUvSW5pdGlhbGl6ZVRocmVhZGluZy5oPgogI2luY2x1ZGUgPHN0cmluZz4KKyNpbmNsdWRlIDx3 dGYvSGFzaFNldC5oPgogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3Rm L1RocmVhZGluZy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgpAQCAtNDcsMTAg KzQ4LDYgQEAKIAogI2luY2x1ZGUgPHN5cy9yZXNvdXJjZS5oPgogI2luY2x1ZGUgPHVuaXN0ZC5o PgotI2lmIGRlZmluZWQgUV9PU19VTklYCi0jaW5jbHVkZSA8c3lzL3ByY3RsLmg+Ci0jaW5jbHVk ZSA8c2lnbmFsLmg+Ci0jZW5kaWYKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTcx LDIzICs2OCw0MSBAQCBwcml2YXRlOgogICAgIFFfU0xPVCB2b2lkIG5ld0Nvbm5lY3Rpb24oKTsK IH07CiAKK1FfR0xPQkFMX1NUQVRJQyhXVEY6Okhhc2hTZXQ8UVByb2Nlc3MqPiwgcHJvY2Vzc2Vz KTsKKworc3RhdGljIHZvaWQgY2xlYW51cFByb2Nlc3NlcygpCit7CisgICAgV1RGOjpIYXNoU2V0 PFFQcm9jZXNzKj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gcHJvY2Vzc2VzKCktPmJlZ2luKCk7Cisg ICAgd2hpbGUgKGl0ICE9IHByb2Nlc3NlcygpLT5lbmQoKSkgeworICAgICAgICAoKml0KS0+a2ls bCgpOworICAgICAgICArK2l0OworICAgIH0KK30KKwogY2xhc3MgUXRXZWJQcm9jZXNzIDogcHVi bGljIFFQcm9jZXNzCiB7CiAgICAgUV9PQkpFQ1QKIHB1YmxpYzoKICAgICBRdFdlYlByb2Nlc3Mo UU9iamVjdCogcGFyZW50ID0gMCkKICAgICAgICAgOiBRUHJvY2VzcyhwYXJlbnQpCi0gICAge30K KyAgICB7CisgICAgICAgIGNvbm5lY3QodGhpcywgU0lHTkFMKHN0YXRlQ2hhbmdlZChRUHJvY2Vz czo6UHJvY2Vzc1N0YXRlKSksIHRoaXMsIFNMT1QocHJvY2Vzc1N0YXRlQ2hhbmdlZChRUHJvY2Vz czo6UHJvY2Vzc1N0YXRlKSkpOworICAgIH0KIAotcHJvdGVjdGVkOgotICAgIHZpcnR1YWwgdm9p ZCBzZXR1cENoaWxkUHJvY2VzcygpOworcHJpdmF0ZSBzbG90czoKKyAgICB2b2lkIHByb2Nlc3NT dGF0ZUNoYW5nZWQoUVByb2Nlc3M6OlByb2Nlc3NTdGF0ZSBzdGF0ZSk7CiB9OwogCi12b2lkIFF0 V2ViUHJvY2Vzczo6c2V0dXBDaGlsZFByb2Nlc3MoKQordm9pZCBRdFdlYlByb2Nlc3M6OnByb2Nl c3NTdGF0ZUNoYW5nZWQoUVByb2Nlc3M6OlByb2Nlc3NTdGF0ZSBzdGF0ZSkKIHsKLSNpZiBkZWZp bmVkIFFfT1NfVU5JWAotICAgIHByY3RsKFBSX1NFVF9QREVBVEhTSUcsIFNJR0lOVCk7Ci0jZW5k aWYKKyAgICBRUHJvY2VzcyogcHJvY2VzcyA9IHFvYmplY3RfY2FzdDxRUHJvY2Vzcyo+KHNlbmRl cigpKTsKKyAgICBpZiAoIXByb2Nlc3MpCisgICAgICAgIHJldHVybjsKKworICAgIGlmIChzdGF0 ZSA9PSBRUHJvY2Vzczo6UnVubmluZykKKyAgICAgICAgcHJvY2Vzc2VzKCktPmFkZChwcm9jZXNz KTsKKyAgICBlbHNlIGlmIChzdGF0ZSA9PSBRUHJvY2Vzczo6Tm90UnVubmluZykKKyAgICAgICAg cHJvY2Vzc2VzKCktPnJlbW92ZShwcm9jZXNzKTsKIH0KIAogdm9pZCBQcm9jZXNzTGF1bmNoZXJI ZWxwZXI6OmxhdW5jaChXZWJLaXQ6OlByb2Nlc3NMYXVuY2hlciogbGF1bmNoZXIpCkBAIC0xNDUs NyArMTYwLDE1IEBAIFByb2Nlc3NMYXVuY2hlckhlbHBlcjo6UHJvY2Vzc0xhdW5jaGVySGVscGVy KCkKIAogUHJvY2Vzc0xhdW5jaGVySGVscGVyKiBQcm9jZXNzTGF1bmNoZXJIZWxwZXI6Omluc3Rh bmNlKCkKIHsKLSAgICBzdGF0aWMgUHJvY2Vzc0xhdW5jaGVySGVscGVyKiByZXN1bHQgPSBuZXcg UHJvY2Vzc0xhdW5jaGVySGVscGVyKCk7CisgICAgc3RhdGljIFByb2Nlc3NMYXVuY2hlckhlbHBl ciogcmVzdWx0ID0gMDsKKyAgICBpZiAoIXJlc3VsdCkgeworICAgICAgICByZXN1bHQgPSBuZXcg UHJvY2Vzc0xhdW5jaGVySGVscGVyKCk7CisKKyAgICAgICAgLy8gVGhlIHB1cnBvc2Ugb2YgdGhl IGZvbGxvd2luZyBsaW5lIGlzIHRvIGVuc3VyZSB0aGF0IG91ciBzdGF0aWMgaXMgaW5pdGlhbGl6 ZWQgYmVmb3JlIHRoZSBleGl0IGhhbmRsZXIgaXMgaW5zdGFsbGVkLgorICAgICAgICBwcm9jZXNz ZXMoKS0+Y2xlYXIoKTsKKworICAgICAgICBhdGV4aXQoY2xlYW51cFByb2Nlc3Nlcyk7CisgICAg fQogICAgIHJldHVybiByZXN1bHQ7CiB9CiAK