127455 2014-01-22 17:27:34 -0800 Debug mechanism to override process QoS on Mac 2014-01-22 18:24:46 -0800 1 1 1 Unclassified WebKit WebKit2 525.x (Safari 3.1) Unspecified Unspecified NEW P2 Normal --- 1 barraclough barraclough oldest_to_newest 970946 0 barraclough 2014-01-22 17:27:34 -0800 . 970948 1 221926 barraclough 2014-01-22 17:30:26 -0800 Created attachment 221926 fix 970967 2 barraclough 2014-01-22 18:12:20 -0800 Transmitting file data ............ Committed revision 162578. 970978 3 221926 sam 2014-01-22 18:24:46 -0800 Comment on attachment 221926 fix View in context: https://bugs.webkit.org/attachment.cgi?id=221926&action=review > Source/WebKit2/Shared/mac/ChildProcessMac.mm:206 > +#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 Can this be HAVE(QOS...)? > Source/WebKit2/UIProcess/WebContext.cpp:397 > +#if PLATFORM(MAC) > + m_networkProcess->send(Messages::NetworkProcess::SetQOS(networkProcessLatencyQOS(), networkProcessThroughputQOS()), 0); > +#endif Any reason this can't go in the the InitializeNetworkProcess call? > Source/WebKit2/UIProcess/WebContext.cpp:614 > +#if PLATFORM(MAC) > + process->send(Messages::WebProcess::SetQOS(webProcessLatencyQOS(), webProcessThroughputQOS()), 0); > +#endif Any reason this can't go in the the InitializeWebProcess call? > Source/WebKit2/UIProcess/WebContext.h:93 > +#if PLATFORM(MAC) > +int networkProcessLatencyQOS(); > +int networkProcessThroughputQOS(); > +int webProcessLatencyQOS(); > +int webProcessThroughputQOS(); > +#endif If these are Mac specific, please add them to their own header. > Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp:213 > +#if PLATFORM(MAC) > + m_connection->send(Messages::PluginProcess::SetQOS(pluginProcessLatencyQOS(), pluginProcessThroughputQOS()), 0); > +#endif Any reason this can't go in the the InitializePluginProcess call? 221926 2014-01-22 17:30:26 -0800 2014-01-22 18:24:46 -0800 fix 127455.1.patch text/plain 10478 barraclough SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MjU3NCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDE0LTAxLTIyICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBEZWJ1ZyBtZWNo YW5pc20gdG8gb3ZlcnJpZGUgcHJvY2VzcyBRb1Mgb24gTWFjCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc0NTUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9j ZXNzLm1lc3NhZ2VzLmluOgorICAgICAgICAgICAgLSBhZGRlZCBtZXNzYWdlLgorICAgICAgICAq IFBsdWdpblByb2Nlc3MvUGx1Z2luUHJvY2Vzcy5tZXNzYWdlcy5pbjoKKyAgICAgICAgICAgIC0g YWRkZWQgbWVzc2FnZS4KKyAgICAgICAgKiBTaGFyZWQvQ2hpbGRQcm9jZXNzLmg6CisgICAgICAg ICogU2hhcmVkL21hYy9DaGlsZFByb2Nlc3NNYWMubW06CisgICAgICAgIChXZWJLaXQ6OkNoaWxk UHJvY2Vzczo6c2V0UU9TKToKKyAgICAgICAgICAgIC0gQWRkZWQgaW1wbGVtZW50YXRpb24gb2Yg bmV3IG1lc3NhZ2UuCisgICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc1By b3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJvY2Vzc1Byb3h5OjpkaWRGaW5pc2hM YXVuY2hpbmcpOgorICAgICAgICAgICAgLSBTZXRRT1MgZm9yIHRoZSBQbHVnaW5Qcm9jZXNzLgor ICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NQcm94eS5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9QbHVnaW5zL21hYy9QbHVnaW5Qcm9jZXNzUHJveHlNYWMubW06CisgICAg ICAgIChXZWJLaXQ6OnBsdWdpblByb2Nlc3NMYXRlbmN5UU9TKToKKyAgICAgICAgKFdlYktpdDo6 cGx1Z2luUHJvY2Vzc1Rocm91Z2hwdXRRT1MpOgorICAgICAgICAgICAgLSByZWFkIE5TVXNlckRl ZmF1bHRzLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViQ29udGV4dDo6ZW5zdXJlTmV0d29ya1Byb2Nlc3MpOgorICAgICAgICAgICAgLSBT ZXRRT1MgZm9yIHRoZSBOZXR3b3JrUHJvY2Vzcy4KKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4 dDo6Y3JlYXRlTmV3V2ViUHJvY2Vzcyk6CisgICAgICAgICAgICAtIFNldFFPUyBmb3IgdGhlIFdl YlByb2Nlc3MuCisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHQuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW06CisgICAgICAgIChXZWJLaXQ6Om5ldHdvcmtQ cm9jZXNzTGF0ZW5jeVFPUyk6CisgICAgICAgIChXZWJLaXQ6Om5ldHdvcmtQcm9jZXNzVGhyb3Vn aHB1dFFPUyk6CisgICAgICAgIChXZWJLaXQ6OndlYlByb2Nlc3NMYXRlbmN5UU9TKToKKyAgICAg ICAgKFdlYktpdDo6d2ViUHJvY2Vzc1Rocm91Z2hwdXRRT1MpOgorICAgICAgICAgICAgLSByZWFk IE5TVXNlckRlZmF1bHRzLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5tZXNzYWdl cy5pbjoKKyAgICAgICAgICAgIC0gYWRkZWQgbWVzc2FnZS4KKwogMjAxNC0wMS0yMiAgRGF2aWQg RmFybGVyICA8ZGZhcmxlckBhcHBsZS5jb20+CiAKICAgICAgICAgQVNBTiBidWlsZHMgYXJlIGJy b2tlbiAtIG1pc3NpbmcgZmxhZ3MKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L05ldHdvcmtQcm9jZXNzLm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLm1lc3NhZ2VzLmluCShyZXZpc2lvbiAxNjI1 NTgpCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5tZXNz YWdlcy5pbgkod29ya2luZyBjb3B5KQpAQCAtNDIsNiArNDIsNyBAQCBtZXNzYWdlcyAtPiBOZXR3 b3JrUHJvY2VzcyBMZWdhY3lSZWNlaXZlCiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgU2V0UHJv Y2Vzc1N1cHByZXNzaW9uRW5hYmxlZChib29sIGZsYWcpCisgICAgU2V0UU9TKGludCBsYXRlbmN5 UU9TLCBpbnQgdGhyb3VnaHB1dFFPUykKICNlbmRpZgogCiAgICAgQWxsb3dTcGVjaWZpY0hUVFBT Q2VydGlmaWNhdGVGb3JIb3N0KFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyBjZXJ0aWZpY2F0ZSwg U3RyaW5nIGhvc3QpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpblBy b2Nlc3MubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvUGx1Z2luUHJv Y2Vzcy9QbHVnaW5Qcm9jZXNzLm1lc3NhZ2VzLmluCShyZXZpc2lvbiAxNjI1NTgpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpblByb2Nlc3MubWVzc2FnZXMuaW4JKHdvcmtp bmcgY29weSkKQEAgLTQwLDcgKzQwLDggQEAgbWVzc2FnZXMgLT4gUGx1Z2luUHJvY2VzcyBMZWdh Y3lSZWNlaXZlcgogICAgIENsZWFyU2l0ZURhdGEoVmVjdG9yPFN0cmluZz4gc2l0ZXMsIHVpbnQ2 NF90IGZsYWdzLCB1aW50NjRfdCBtYXhBZ2VJblNlY29uZHMsIHVpbnQ2NF90IGNhbGxiYWNrSUQp CiAKICNpZiBQTEFURk9STShNQUMpCi0gICAgU2V0UHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZChi b29sIGZsYWcpOworICAgIFNldFByb2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWQoYm9vbCBmbGFnKQor ICAgIFNldFFPUyhpbnQgbGF0ZW5jeVFPUywgaW50IHRocm91Z2hwdXRRT1MpCiAjZW5kaWYKIH0K IApJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL0NoaWxkUHJvY2Vzcy5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9DaGlsZFByb2Nlc3MuaAkocmV2aXNpb24gMTYyNTU4 KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL0NoaWxkUHJvY2Vzcy5oCSh3b3JraW5nIGNvcHkp CkBAIC02OSw2ICs2OSw3IEBAIHB1YmxpYzoKIAogI2lmIFBMQVRGT1JNKE1BQykKICAgICB2b2lk IHNldEFwcGxpY2F0aW9uSXNEYWVtb24oKTsKKyAgICB2b2lkIHNldFFPUyhpbnQgbGF0ZW5jeVFP UywgaW50IHRocm91Z2hwdXRRT1MpOwogI2VuZGlmCiAKICAgICBJUEM6OkNvbm5lY3Rpb24qIHBh cmVudFByb2Nlc3NDb25uZWN0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9jb25uZWN0aW9uLmdldCgp OyB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL0NoaWxkUHJvY2Vzc01hYy5tbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL0NoaWxkUHJvY2Vzc01hYy5t bQkocmV2aXNpb24gMTYyNTU4KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9DaGlsZFBy b2Nlc3NNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDcgQEAKICNpbXBvcnQgIldl YktpdFN5c3RlbUludGVyZmFjZS5oIgogI2ltcG9ydCA8V2ViQ29yZS9GaWxlU3lzdGVtLmg+CiAj aW1wb3J0IDxXZWJDb3JlL1N5c3RlbVZlcnNpb25NYWMuaD4KKyNpbXBvcnQgPG1hY2gvbWFjaC5o PgogI2ltcG9ydCA8bWFjaC90YXNrLmg+CiAjaW1wb3J0IDxwd2QuaD4KICNpbXBvcnQgPHN0ZGxp Yi5oPgpAQCAtMjAwLDQgKzIwMSwyMiBAQCB2b2lkIENoaWxkUHJvY2Vzczo6c3RvcE5TQXBwUnVu TG9vcCgpCiB9CiAjZW5kaWYKIAordm9pZCBDaGlsZFByb2Nlc3M6OnNldFFPUyhpbnQgbGF0ZW5j eVFPUywgaW50IHRocm91Z2hwdXRRT1MpCit7CisjaWYgIVBMQVRGT1JNKElPUykgJiYgX19NQUNf T1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDkwCisgICAgaWYgKCFsYXRlbmN5UU9TICYm ICF0aHJvdWdocHV0UU9TKQorICAgICAgICByZXR1cm47CisKKyAgICBzdHJ1Y3QgdGFza19xb3Nf cG9saWN5IHFvc2luZm8gPSB7CisgICAgICAgIGxhdGVuY3lRT1MgPyBMQVRFTkNZX1FPU19USUVS XzAgKyBsYXRlbmN5UU9TIC0gMSA6IExBVEVOQ1lfUU9TX1RJRVJfVU5TUEVDSUZJRUQsCisgICAg ICAgIHRocm91Z2hwdXRRT1MgPyBUSFJPVUdIUFVUX1FPU19USUVSXzAgKyB0aHJvdWdocHV0UU9T IC0gMSA6IFRIUk9VR0hQVVRfUU9TX1RJRVJfVU5TUEVDSUZJRUQKKyAgICB9OworCisgICAgdGFz a19wb2xpY3lfc2V0KG1hY2hfdGFza19zZWxmKCksIFRBU0tfT1ZFUlJJREVfUU9TX1BPTElDWSwg KHRhc2tfcG9saWN5X3QpJnFvc2luZm8sIFRBU0tfUU9TX1BPTElDWV9DT1VOVCk7CisjZWxzZQor ICAgIFVOVVNFRF9QQVJBTShsYXRlbmN5UU9TKTsKKyAgICBVTlVTRURfUEFSQU0odGhyb3VnaHB1 dFFPUyk7CisjZW5kaWYKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCShyZXZpc2lvbiAxNjI1NTgpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM5 MSw2ICszOTEsMTAgQEAgdm9pZCBXZWJDb250ZXh0OjplbnN1cmVOZXR3b3JrUHJvY2VzcygpCiAK ICAgICAvLyBJbml0aWFsaXplIHRoZSBuZXR3b3JrIHByb2Nlc3MuCiAgICAgbV9uZXR3b3JrUHJv Y2Vzcy0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3M6OkluaXRpYWxpemVOZXR3b3JrUHJv Y2VzcyhwYXJhbWV0ZXJzKSwgMCk7CisKKyNpZiBQTEFURk9STShNQUMpCisgICAgbV9uZXR3b3Jr UHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3M6OlNldFFPUyhuZXR3b3JrUHJv Y2Vzc0xhdGVuY3lRT1MoKSwgbmV0d29ya1Byb2Nlc3NUaHJvdWdocHV0UU9TKCkpLCAwKTsKKyNl bmRpZgogfQogCiB2b2lkIFdlYkNvbnRleHQ6Om5ldHdvcmtQcm9jZXNzQ3Jhc2hlZChOZXR3b3Jr UHJvY2Vzc1Byb3h5KiBuZXR3b3JrUHJvY2Vzc1Byb3h5KQpAQCAtNjA1LDYgKzYwOSwxMCBAQCBX ZWJQcm9jZXNzUHJveHkmIFdlYkNvbnRleHQ6OmNyZWF0ZU5ld1dlCiAgICAgICAgIGluamVjdGVk QnVuZGxlSW5pdGlhbGl6YXRpb25Vc2VyRGF0YSA9IG1faW5qZWN0ZWRCdW5kbGVJbml0aWFsaXph dGlvblVzZXJEYXRhOwogICAgIHByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6Oklu aXRpYWxpemVXZWJQcm9jZXNzKHBhcmFtZXRlcnMsIFdlYkNvbnRleHRVc2VyTWVzc2FnZUVuY29k ZXIoaW5qZWN0ZWRCdW5kbGVJbml0aWFsaXphdGlvblVzZXJEYXRhLmdldCgpLCAqcHJvY2Vzcykp LCAwKTsKIAorI2lmIFBMQVRGT1JNKE1BQykKKyAgICBwcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQcm9jZXNzOjpTZXRRT1Mod2ViUHJvY2Vzc0xhdGVuY3lRT1MoKSwgd2ViUHJvY2Vzc1Rocm91 Z2hwdXRRT1MoKSksIDApOworI2VuZGlmCisKICAgICBpZiAoV2ViUHJlZmVyZW5jZXM6OmFueVBh Z2VHcm91cHNBcmVVc2luZ1ByaXZhdGVCcm93c2luZygpKQogICAgICAgICBwcm9jZXNzLT5zZW5k KE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpFbnN1cmVQcml2YXRlQnJvd3NpbmdTZXNzaW9uKFNlc3Np b25UcmFja2VyOjpsZWdhY3lQcml2YXRlU2Vzc2lvbklEKSwgMCk7CiAKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaAkocmV2aXNpb24gMTYyNTU4KQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaAkod29ya2luZyBjb3B5KQpAQCAtODUsNiArODUs MTMgQEAgY2xhc3MgV2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHk7CiBzdHJ1Y3QgTmV0d29ya1By b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM7CiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNKE1BQykKK2lu dCBuZXR3b3JrUHJvY2Vzc0xhdGVuY3lRT1MoKTsKK2ludCBuZXR3b3JrUHJvY2Vzc1Rocm91Z2hw dXRRT1MoKTsKK2ludCB3ZWJQcm9jZXNzTGF0ZW5jeVFPUygpOworaW50IHdlYlByb2Nlc3NUaHJv dWdocHV0UU9TKCk7CisjZW5kaWYKKwogY2xhc3MgV2ViQ29udGV4dCA6IHB1YmxpYyBBUEk6Ok9i amVjdEltcGw8QVBJOjpPYmplY3Q6OlR5cGU6OkNvbnRleHQ+LCBwcml2YXRlIElQQzo6TWVzc2Fn ZVJlY2VpdmVyCiAjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAgICAgLCBwcml2YXRl IFBsdWdpbkluZm9TdG9yZUNsaWVudApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Bs dWdpbnMvUGx1Z2luUHJvY2Vzc1Byb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzUHJveHkuY3BwCShyZXZpc2lvbiAxNjI1 NTgpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzUHJv eHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMDgsNiArMjA4LDEwIEBAIHZvaWQgUGx1Z2luUHJv Y2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVuY2gKICAgICAvLyBJbml0aWFsaXplIHRoZSBwbHVnLWlu IGhvc3QgcHJvY2Vzcy4KICAgICBtX2Nvbm5lY3Rpb24tPnNlbmQoTWVzc2FnZXM6OlBsdWdpblBy b2Nlc3M6OkluaXRpYWxpemVQbHVnaW5Qcm9jZXNzKHBhcmFtZXRlcnMpLCAwKTsKIAorI2lmIFBM QVRGT1JNKE1BQykKKyAgICBtX2Nvbm5lY3Rpb24tPnNlbmQoTWVzc2FnZXM6OlBsdWdpblByb2Nl c3M6OlNldFFPUyhwbHVnaW5Qcm9jZXNzTGF0ZW5jeVFPUygpLCBwbHVnaW5Qcm9jZXNzVGhyb3Vn aHB1dFFPUygpKSwgMCk7CisjZW5kaWYKKwogICAgIC8vIFNlbmQgYWxsIG91ciBwZW5kaW5nIHJl cXVlc3RzLgogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9wZW5kaW5nR2V0U2l0ZXNSZXF1 ZXN0cy5zaXplKCk7ICsraSkKICAgICAgICAgbV9jb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpQ bHVnaW5Qcm9jZXNzOjpHZXRTaXRlc1dpdGhEYXRhKG1fcGVuZGluZ0dldFNpdGVzUmVxdWVzdHNb aV0pLCAwKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblBy b2Nlc3NQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVn aW5zL1BsdWdpblByb2Nlc3NQcm94eS5oCShyZXZpc2lvbiAxNjI1NTgpCisrKyBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzUHJveHkuaAkod29ya2luZyBjb3B5 KQpAQCAtNjMsNiArNjMsMTEgQEAgc3RydWN0IFJhd1BsdWdpbk1ldGFEYXRhIHsKIH07CiAjZW5k aWYKIAorI2lmIFBMQVRGT1JNKE1BQykKK2ludCBwbHVnaW5Qcm9jZXNzTGF0ZW5jeVFPUygpOwor aW50IHBsdWdpblByb2Nlc3NUaHJvdWdocHV0UU9TKCk7CisjZW5kaWYKKwogY2xhc3MgUGx1Z2lu UHJvY2Vzc1Byb3h5IDogcHVibGljIENoaWxkUHJvY2Vzc1Byb3h5IHsKIHB1YmxpYzoKICAgICBz dGF0aWMgUGFzc1JlZlB0cjxQbHVnaW5Qcm9jZXNzUHJveHk+IGNyZWF0ZShQbHVnaW5Qcm9jZXNz TWFuYWdlciosIGNvbnN0IFBsdWdpblByb2Nlc3NBdHRyaWJ1dGVzJiwgdWludDY0X3QgcGx1Z2lu UHJvY2Vzc1Rva2VuKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL21h Yy9QbHVnaW5Qcm9jZXNzUHJveHlNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1BsdWdpbnMvbWFjL1BsdWdpblByb2Nlc3NQcm94eU1hYy5tbQkocmV2aXNpb24g MTYyNTU4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvbWFjL1BsdWdpblBy b2Nlc3NQcm94eU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDYzLDYgKzQ2MywxOCBAQCB2b2lk IFBsdWdpblByb2Nlc3NQcm94eTo6b3BlbkZpbGUoY29uc3QgCiAgICAgW1tOU1dvcmtzcGFjZSBz aGFyZWRXb3Jrc3BhY2VdIG9wZW5GaWxlOmZ1bGxQYXRoXTsKIH0KIAoraW50IHBsdWdpblByb2Nl c3NMYXRlbmN5UU9TKCkKK3sKKyAgICBzdGF0aWMgaW50IHFvcyA9IFtbTlNVc2VyRGVmYXVsdHMg c3RhbmRhcmRVc2VyRGVmYXVsdHNdIGludGVnZXJGb3JLZXk6QCJXZWJLaXRQbHVnaW5Qcm9jZXNz TGF0ZW5jeVFPUyJdOworICAgIHJldHVybiBxb3M7Cit9CisKK2ludCBwbHVnaW5Qcm9jZXNzVGhy b3VnaHB1dFFPUygpCit7CisgICAgc3RhdGljIGludCBxb3MgPSBbW05TVXNlckRlZmF1bHRzIHN0 YW5kYXJkVXNlckRlZmF1bHRzXSBpbnRlZ2VyRm9yS2V5OkAiV2ViS2l0UGx1Z2luUHJvY2Vzc1Ro cm91Z2hwdXRRT1MiXTsKKyAgICByZXR1cm4gcW9zOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJL aXQKIAogI2VuZGlmIC8vIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQpJbmRleDogU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWFjLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1hYy5tbQkocmV2aXNpb24gMTYy NTU4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWFjLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC00NzQsNCArNDc0LDI4IEBAIHZvaWQgV2ViQ29udGV4dDo6cmVzZXRI U1RTSG9zdHMoKQogI2VuZGlmCiB9CiAKK2ludCBuZXR3b3JrUHJvY2Vzc0xhdGVuY3lRT1MoKQor eworICAgIHN0YXRpYyBpbnQgcW9zID0gW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZh dWx0c10gaW50ZWdlckZvcktleTpAIldlYktpdE5ldHdvcmtQcm9jZXNzTGF0ZW5jeVFPUyJdOwor ICAgIHJldHVybiBxb3M7Cit9CisKK2ludCBuZXR3b3JrUHJvY2Vzc1Rocm91Z2hwdXRRT1MoKQor eworICAgIHN0YXRpYyBpbnQgcW9zID0gW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZh dWx0c10gaW50ZWdlckZvcktleTpAIldlYktpdE5ldHdvcmtQcm9jZXNzVGhyb3VnaHB1dFFPUyJd OworICAgIHJldHVybiBxb3M7Cit9CisKK2ludCB3ZWJQcm9jZXNzTGF0ZW5jeVFPUygpCit7Cisg ICAgc3RhdGljIGludCBxb3MgPSBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRz XSBpbnRlZ2VyRm9yS2V5OkAiV2ViS2l0V2ViUHJvY2Vzc0xhdGVuY3lRT1MiXTsKKyAgICByZXR1 cm4gcW9zOworfQorCitpbnQgd2ViUHJvY2Vzc1Rocm91Z2hwdXRRT1MoKQoreworICAgIHN0YXRp YyBpbnQgcW9zID0gW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gaW50ZWdl ckZvcktleTpAIldlYktpdFdlYlByb2Nlc3NUaHJvdWdocHV0UU9TIl07CisgICAgcmV0dXJuIHFv czsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlByb2Nlc3MubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluCShyZXZpc2lvbiAxNjI1NTgpCisr KyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MubWVzc2FnZXMuaW4JKHdvcmtp bmcgY29weSkKQEAgLTgwLDcgKzgwLDggQEAgbWVzc2FnZXMgLT4gV2ViUHJvY2VzcyBMZWdhY3lS ZWNlaXZlciB7CiAgICAgUmVsZWFzZVBhZ2VDYWNoZSgpCiAKICNpZiBQTEFURk9STShNQUMpCi0g ICAgU2V0UHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZChib29sIGZsYWcpOworICAgIFNldFByb2Nl c3NTdXBwcmVzc2lvbkVuYWJsZWQoYm9vbCBmbGFnKQorICAgIFNldFFPUyhpbnQgbGF0ZW5jeVFP UywgaW50IHRocm91Z2hwdXRRT1MpCiAjZW5kaWYKIAogI2lmIFVTRShTT1VQKQo=