54067 2011-02-08 22:32:54 -0800 nrwt multiprocessing: minor cleanup prior to implementing the new worker 2011-02-09 16:09:45 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 49566 54068 1 dpranke dpranke eric mihaip ojan tony oldest_to_newest 347991 0 dpranke 2011-02-08 22:32:54 -0800 nrwt multiprocessing: minor cleanup prior to implementing the new worker 347992 1 81753 dpranke 2011-02-08 22:34:39 -0800 Created attachment 81753 Patch 347995 2 81754 dpranke 2011-02-08 22:48:30 -0800 Created attachment 81754 make ManagerConnection inherit from BrokerConnection 348388 3 81754 tony 2011-02-09 11:00:39 -0800 Comment on attachment 81754 make ManagerConnection inherit from BrokerConnection View in context: https://bugs.webkit.org/attachment.cgi?id=81754&action=review > Tools/Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py:139 > +class _ManagerConnection(message_broker2.BrokerConnection): It might be good to somehow make it clear in the diagram in message_broker2.py that BrokerConnection is always a Manager. Something like: 50 BrokerClient ------> ManagerConnection (implements BrokerConnection) 51 ^ | 52 | v 53 \---------------- Broker 348458 4 dpranke 2011-02-09 12:18:53 -0800 WorkerConnection (see bug 54067) will also implement BrokerConnection, just as the Worker class will implement AbstractWorker (and hence BrokerClient). Also, from the broker's point of view, there's no such thing as a "manager", only clients. It might make sense to create a similar drawing in manager_worker_broker showing both sides. Thoughts? 348464 5 tony 2011-02-09 12:28:18 -0800 (In reply to comment #4) > WorkerConnection (see bug 54067) will also implement BrokerConnection, just as the Worker class will implement AbstractWorker (and hence BrokerClient). Also, from the broker's point of view, there's no such thing as a "manager", only clients. It might make sense to create a similar drawing in manager_worker_broker showing both sides. > > Thoughts? Ah, right, I see. Seems like in manager_worker_broker.py, we could have a diagram with the concrete classes on the manager side and in whatever file has the Worker implementations, it could have a diagram with the worker side. 348679 6 dpranke 2011-02-09 16:07:03 -0800 er, that was supposed to be bug 54068, not 54067 (which is this bug). At any rate, I will add a diagram in that bug, since most of the classes don't exist in this patch. 348680 7 81754 dpranke 2011-02-09 16:09:41 -0800 Comment on attachment 81754 make ManagerConnection inherit from BrokerConnection Clearing flags on attachment: 81754 Committed r78159: <http://trac.webkit.org/changeset/78159> 348681 8 dpranke 2011-02-09 16:09:45 -0800 All reviewed patches have been landed. Closing bug. 81753 2011-02-08 22:34:39 -0800 2011-02-08 22:48:28 -0800 Patch bug-54067-20110208223437.patch text/plain 4844 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogNzgwMTAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjMDMyNTIwODdkNDhlYThiYmUzZmY3MTEzY2NiNTFiNjU0 ODJmMGVlLi5kMWVhMTJkMDFjODM3Yjk0ODBhZmEwOTE1YWQ4YjAxYzQwNGZlZmJkIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDItMDggIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbnJ3dCBtdWx0aXBy b2Nlc3Npbmc6IG1pbm9yIGNsZWFudXAgcHJpb3IgdG8gaW1wbGVtZW50aW5nIHRoZSBuZXcgd29y a2VyCisKKyAgICAgICAgVGhpcyBwYXRjaCByZW5hbWVzIEFic3RyYWN0TWFuYWdlciB0byBNYW5h Z2VyQ29ubmVjdGlvbiBhbmQKKyAgICAgICAgY2hhbmdlcyBzb21lIGFyZ3VtZW50IG5hbWVzIHRv IGJlIG1vcmUgY29uc2lzdGVudCBiZXR3ZWVuCisgICAgICAgIG1hbmFnZXJfd29ya2VyX2Jyb2tl ciBhbmQgbWVzc2FnZV9icm9rZXIuIEl0IGFsc28gZml4ZXMgYSBjb3VwbGUKKyAgICAgICAgb2Yg dHlwb3MgaW4gbWVzc2FnZV9icm9rZXIuIFRoZXNlIGNoYW5nZXMgd2lsbCBiZSB0ZXN0ZWQgYnkg Y29kZQorICAgICAgICBpbnRyb2R1Y2VkIGluIHRoZSBuZXh0IHBhdGNoLgorICAgICAgIAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQwNjcKKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL21hbmFn ZXJfd29ya2VyX2Jyb2tlci5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9sYXlvdXRfcGFja2FnZS9tZXNzYWdlX2Jyb2tlcjIucHk6CisKIDIwMTEtMDItMDggIFNh aWxlc2ggQWdyYXdhbCAgPHNhaWxAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEtlbm5ldGggUnVzc2VsbC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL21hbmFnZXJfd29ya2VyX2Jyb2tlci5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL21hbmFnZXJfd29y a2VyX2Jyb2tlci5weQppbmRleCA0MDUyNjc3NzlhZjFhMDM0MjM0NmRlNTg2ODgwNWYwMTM0ZTIz NmE3Li4xNzY0ZWM2MDVkY2U2ZjUxODQ5ZTUxZWQ4NDJmNDE0M2I5NjYwYWI0IDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9tYW5h Z2VyX3dvcmtlcl9icm9rZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbGF5b3V0X3BhY2thZ2UvbWFuYWdlcl93b3JrZXJfYnJva2VyLnB5CkBAIC03NywxMyAr NzcsMTMgQEAgZGVmIHJ1bnRpbWVfb3B0aW9ucygpOgogICAgIHJldHVybiBvcHRpb25zCiAKIAot ZGVmIGdldChwb3J0LCBvcHRpb25zLCBtYW5hZ2VyLCB3b3JrZXJfY2xhc3MpOgorZGVmIGdldChw b3J0LCBvcHRpb25zLCBjbGllbnQsIHdvcmtlcl9jbGFzcyk6CiAgICAgIiIiUmV0dXJuIGEgY29u bmVjdGlvbiB0byBhIG1hbmFnZXIvd29ya2VyIG1lc3NhZ2VfYnJva2VyCiAKICAgICBBcmdzOgog ICAgICAgICBwb3J0IC0gaGFuZGxlIHRvIGxheW91dF90ZXN0cy9wb3J0IG9iamVjdCBmb3IgcG9y dC1zcGVjaWZpYyBzdHVmZgogICAgICAgICBvcHRpb25zIC0gb3B0cGFyc2UgYXJndW1lbnQgZm9y IGNvbW1hbmQtbGluZSBvcHRpb25zCi0gICAgICAgIG1hbmFnZXIgLSBvYmplY3QgdG8gZGlzcGF0 Y2ggcmVwbGllcyB0bworICAgICAgICBjbGllbnQgLSBvYmplY3QgdG8gZGlzcGF0Y2ggcmVwbGll cyB0bwogICAgICAgICB3b3JrZXJfY2xhc3MgLSB0eXBlIG9mIHdvcmtlcnMgdG8gY3JlYXRlLiBU aGlzIGNsYXNzIG11c3QgaW1wbGVtZW50CiAgICAgICAgICAgICB0aGUgbWV0aG9kcyBpbiBBYnN0 cmFjdFdvcmtlci4KICAgICBSZXR1cm5zOgpAQCAtMTA1LDcgKzEwNSw3IEBAIGRlZiBnZXQocG9y dCwgb3B0aW9ucywgbWFuYWdlciwgd29ya2VyX2NsYXNzKToKICAgICAgICAgICAgICAgICAgICAg ICAgICB3b3JrZXJfbW9kZWwpCiAKICAgICBicm9rZXIgPSBtZXNzYWdlX2Jyb2tlcjIuQnJva2Vy KG9wdGlvbnMsIHF1ZXVlX2NsYXNzKQotICAgIHJldHVybiBtYW5hZ2VyX2NsYXNzKGJyb2tlciwg cG9ydCwgb3B0aW9ucywgbWFuYWdlciwgd29ya2VyX2NsYXNzKQorICAgIHJldHVybiBtYW5hZ2Vy X2NsYXNzKGJyb2tlciwgcG9ydCwgb3B0aW9ucywgY2xpZW50LCB3b3JrZXJfY2xhc3MpCiAKIAog Y2xhc3MgQWJzdHJhY3RXb3JrZXIobWVzc2FnZV9icm9rZXIyLkJyb2tlckNsaWVudCk6CkBAIC0x MzYsMzAgKzEzNiwzMCBAQCBjbGFzcyBBYnN0cmFjdFdvcmtlcihtZXNzYWdlX2Jyb2tlcjIuQnJv a2VyQ2xpZW50KToKICAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcgogCiAKLWNsYXNz IF9BYnN0cmFjdE1hbmFnZXIob2JqZWN0KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgYnJva2Vy LCBwb3J0LCBvcHRpb25zLCBtYW5hZ2VyLCB3b3JrZXJfY2xhc3MpOgorY2xhc3MgX01hbmFnZXJD b25uZWN0aW9uKG9iamVjdCk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGJyb2tlciwgcG9ydCwg b3B0aW9ucywgY2xpZW50LCB3b3JrZXJfY2xhc3MpOgogICAgICAgICAiIiJCYXNlIGluaXRpYWxp emF0aW9uIGZvciBhbGwgTWFuYWdlciBvYmplY3RzLgogCiAgICAgICAgIEFyZ3M6CiAgICAgICAg ICAgICBicm9rZXI6IGhhbmRsZSB0byB0aGUgbWVzc2FnZV9icm9rZXIyIG9iamVjdAogICAgICAg ICAgICAgcG9ydDogaGFuZGxlIHRvIHBvcnQtc3BlY2lmaWMgZnVuY3Rpb25hbGl0eQogICAgICAg ICAgICAgb3B0aW9uczogY29tbWFuZCBsaW5lIG9wdGlvbnMgb2JqZWN0Ci0gICAgICAgICAgICBt YW5hZ2VyOiBNYW5hZ2VyIGNhbGxiYWNrIG9iamVjdCAodGhlIGNhbGxlcikKKyAgICAgICAgICAg IGNsaWVudDogTWFuYWdlciBjYWxsYmFjayBvYmplY3QgKHRoZSBjYWxsZXIpCiAgICAgICAgICAg ICB3b3JrZXJfY2xhc3M6IGNsYXNzIG9iamVjdCB0byB1c2UgdG8gY3JlYXRlIHdvcmtlcnMuCiAg ICAgICAgICIiIgogICAgICAgICBzZWxmLl9icm9rZXIgPSBicm9rZXIKICAgICAgICAgc2VsZi5f b3B0aW9ucyA9IG9wdGlvbnMKLSAgICAgICAgc2VsZi5fbWFuYWdlciA9IG1hbmFnZXIKKyAgICAg ICAgc2VsZi5fY2xpZW50ID0gY2xpZW50CiAgICAgICAgIHNlbGYuX3dvcmtlcl9jbGFzcyA9IHdv cmtlcl9jbGFzcwogCiAKLWNsYXNzIF9JbmxpbmVNYW5hZ2VyKF9BYnN0cmFjdE1hbmFnZXIpOgor Y2xhc3MgX0lubGluZU1hbmFnZXIoX01hbmFnZXJDb25uZWN0aW9uKToKICAgICBwYXNzCiAKIAot Y2xhc3MgX1RocmVhZGVkTWFuYWdlcihfQWJzdHJhY3RNYW5hZ2VyKToKK2NsYXNzIF9UaHJlYWRl ZE1hbmFnZXIoX01hbmFnZXJDb25uZWN0aW9uKToKICAgICBwYXNzCiAKIAotY2xhc3MgX011bHRp UHJvY2Vzc01hbmFnZXIoX0Fic3RyYWN0TWFuYWdlcik6CitjbGFzcyBfTXVsdGlQcm9jZXNzTWFu YWdlcihfTWFuYWdlckNvbm5lY3Rpb24pOgogICAgIHBhc3MKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL21lc3NhZ2VfYnJva2Vy Mi5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdl L21lc3NhZ2VfYnJva2VyMi5weQppbmRleCA4ZTE1OTIzZjYyMTJkOTU1MTUzNjhiMmY3ZmIyYTU3 OGRlYWM3ODM3Li5lYzNjOTcwMWI5OThlZmQyYzczZTcyOWMwYWM3YWMyMGIwYzJiOTRiIDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2Fn ZS9tZXNzYWdlX2Jyb2tlcjIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbGF5b3V0X3BhY2thZ2UvbWVzc2FnZV9icm9rZXIyLnB5CkBAIC0xMzIsNyArMTMyLDcg QEAgY2xhc3MgQnJva2VyKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX3J1bl9sb29wKHRvcGljX25h bWUsIGNsaWVudCwgYmxvY2s9RmFsc2UsIGRlbGF5X3NlY3M9Tm9uZSkKIAogICAgIGRlZiBfcnVu X2xvb3Aoc2VsZiwgdG9waWNfbmFtZSwgY2xpZW50LCBibG9jaywgZGVsYXlfc2Vjcyk6Ci0gICAg ICAgIHF1ZXVlID0gc2VsZi5fZmluZF90b3BpYyh0b3BpY19uYW1lKQorICAgICAgICBxdWV1ZSA9 IHNlbGYuX2dldF9xdWV1ZV9mb3JfdG9waWModG9waWNfbmFtZSkKICAgICAgICAgd2hpbGUgbm90 IGNsaWVudC5pc19kb25lKCk6CiAgICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICAgcyA9 IHF1ZXVlLmdldChibG9jaywgZGVsYXlfc2VjcykKQEAgLTE0Niw3ICsxNDYsNyBAQCBjbGFzcyBC cm9rZXIob2JqZWN0KToKICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoCiAgICAgICAgICAg ICAgICAiJXM6IHJlY2VpdmVkIG1lc3NhZ2UgJyVzJyBpdCBjb3VsZG4ndCBoYW5kbGUiICUKICAg ICAgICAgICAgICAgIChjbGllbnQubmFtZSgpLCBtZXNzYWdlLm5hbWUpKQotICAgICAgICBvcHRh cmdzID0gbWVzc2FnZS5ib2R5CisgICAgICAgIG9wdGFyZ3MgPSBtZXNzYWdlLmFyZ3MKICAgICAg ICAgbWVzc2FnZV9oYW5kbGVyID0gZ2V0YXR0cihjbGllbnQsICdoYW5kbGVfJyArIG1lc3NhZ2Uu bmFtZSkKICAgICAgICAgbWVzc2FnZV9oYW5kbGVyKG1lc3NhZ2Uuc3JjLCAqb3B0YXJncykKIAo= 81754 2011-02-08 22:48:30 -0800 2011-02-09 16:09:41 -0800 make ManagerConnection inherit from BrokerConnection bug-54067-20110208224828.patch text/plain 4950 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogNzgwMTAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjMDMyNTIwODdkNDhlYThiYmUzZmY3MTEzY2NiNTFiNjU0 ODJmMGVlLi5kMWVhMTJkMDFjODM3Yjk0ODBhZmEwOTE1YWQ4YjAxYzQwNGZlZmJkIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDItMDggIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbnJ3dCBtdWx0aXBy b2Nlc3Npbmc6IG1pbm9yIGNsZWFudXAgcHJpb3IgdG8gaW1wbGVtZW50aW5nIHRoZSBuZXcgd29y a2VyCisKKyAgICAgICAgVGhpcyBwYXRjaCByZW5hbWVzIEFic3RyYWN0TWFuYWdlciB0byBNYW5h Z2VyQ29ubmVjdGlvbiBhbmQKKyAgICAgICAgY2hhbmdlcyBzb21lIGFyZ3VtZW50IG5hbWVzIHRv IGJlIG1vcmUgY29uc2lzdGVudCBiZXR3ZWVuCisgICAgICAgIG1hbmFnZXJfd29ya2VyX2Jyb2tl ciBhbmQgbWVzc2FnZV9icm9rZXIuIEl0IGFsc28gZml4ZXMgYSBjb3VwbGUKKyAgICAgICAgb2Yg dHlwb3MgaW4gbWVzc2FnZV9icm9rZXIuIFRoZXNlIGNoYW5nZXMgd2lsbCBiZSB0ZXN0ZWQgYnkg Y29kZQorICAgICAgICBpbnRyb2R1Y2VkIGluIHRoZSBuZXh0IHBhdGNoLgorICAgICAgIAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQwNjcKKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL21hbmFn ZXJfd29ya2VyX2Jyb2tlci5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9sYXlvdXRfcGFja2FnZS9tZXNzYWdlX2Jyb2tlcjIucHk6CisKIDIwMTEtMDItMDggIFNh aWxlc2ggQWdyYXdhbCAgPHNhaWxAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEtlbm5ldGggUnVzc2VsbC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL21hbmFnZXJfd29ya2VyX2Jyb2tlci5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL21hbmFnZXJfd29y a2VyX2Jyb2tlci5weQppbmRleCA0MDUyNjc3NzlhZjFhMDM0MjM0NmRlNTg2ODgwNWYwMTM0ZTIz NmE3Li45ZmFlYzZlNjUxNDU2MTJmZjFlZTlkZDkyZGMzMjlkZjI3NmFjNDE0IDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9tYW5h Z2VyX3dvcmtlcl9icm9rZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbGF5b3V0X3BhY2thZ2UvbWFuYWdlcl93b3JrZXJfYnJva2VyLnB5CkBAIC03NywxMyAr NzcsMTMgQEAgZGVmIHJ1bnRpbWVfb3B0aW9ucygpOgogICAgIHJldHVybiBvcHRpb25zCiAKIAot ZGVmIGdldChwb3J0LCBvcHRpb25zLCBtYW5hZ2VyLCB3b3JrZXJfY2xhc3MpOgorZGVmIGdldChw b3J0LCBvcHRpb25zLCBjbGllbnQsIHdvcmtlcl9jbGFzcyk6CiAgICAgIiIiUmV0dXJuIGEgY29u bmVjdGlvbiB0byBhIG1hbmFnZXIvd29ya2VyIG1lc3NhZ2VfYnJva2VyCiAKICAgICBBcmdzOgog ICAgICAgICBwb3J0IC0gaGFuZGxlIHRvIGxheW91dF90ZXN0cy9wb3J0IG9iamVjdCBmb3IgcG9y dC1zcGVjaWZpYyBzdHVmZgogICAgICAgICBvcHRpb25zIC0gb3B0cGFyc2UgYXJndW1lbnQgZm9y IGNvbW1hbmQtbGluZSBvcHRpb25zCi0gICAgICAgIG1hbmFnZXIgLSBvYmplY3QgdG8gZGlzcGF0 Y2ggcmVwbGllcyB0bworICAgICAgICBjbGllbnQgLSBvYmplY3QgdG8gZGlzcGF0Y2ggcmVwbGll cyB0bwogICAgICAgICB3b3JrZXJfY2xhc3MgLSB0eXBlIG9mIHdvcmtlcnMgdG8gY3JlYXRlLiBU aGlzIGNsYXNzIG11c3QgaW1wbGVtZW50CiAgICAgICAgICAgICB0aGUgbWV0aG9kcyBpbiBBYnN0 cmFjdFdvcmtlci4KICAgICBSZXR1cm5zOgpAQCAtMTA1LDcgKzEwNSw3IEBAIGRlZiBnZXQocG9y dCwgb3B0aW9ucywgbWFuYWdlciwgd29ya2VyX2NsYXNzKToKICAgICAgICAgICAgICAgICAgICAg ICAgICB3b3JrZXJfbW9kZWwpCiAKICAgICBicm9rZXIgPSBtZXNzYWdlX2Jyb2tlcjIuQnJva2Vy KG9wdGlvbnMsIHF1ZXVlX2NsYXNzKQotICAgIHJldHVybiBtYW5hZ2VyX2NsYXNzKGJyb2tlciwg cG9ydCwgb3B0aW9ucywgbWFuYWdlciwgd29ya2VyX2NsYXNzKQorICAgIHJldHVybiBtYW5hZ2Vy X2NsYXNzKGJyb2tlciwgcG9ydCwgb3B0aW9ucywgY2xpZW50LCB3b3JrZXJfY2xhc3MpCiAKIAog Y2xhc3MgQWJzdHJhY3RXb3JrZXIobWVzc2FnZV9icm9rZXIyLkJyb2tlckNsaWVudCk6CkBAIC0x MzYsMzAgKzEzNiwzMCBAQCBjbGFzcyBBYnN0cmFjdFdvcmtlcihtZXNzYWdlX2Jyb2tlcjIuQnJv a2VyQ2xpZW50KToKICAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcgogCiAKLWNsYXNz IF9BYnN0cmFjdE1hbmFnZXIob2JqZWN0KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgYnJva2Vy LCBwb3J0LCBvcHRpb25zLCBtYW5hZ2VyLCB3b3JrZXJfY2xhc3MpOgorY2xhc3MgX01hbmFnZXJD b25uZWN0aW9uKG1lc3NhZ2VfYnJva2VyMi5Ccm9rZXJDb25uZWN0aW9uKToKKyAgICBkZWYgX19p bml0X18oc2VsZiwgYnJva2VyLCBwb3J0LCBvcHRpb25zLCBjbGllbnQsIHdvcmtlcl9jbGFzcyk6 CiAgICAgICAgICIiIkJhc2UgaW5pdGlhbGl6YXRpb24gZm9yIGFsbCBNYW5hZ2VyIG9iamVjdHMu CiAKICAgICAgICAgQXJnczoKICAgICAgICAgICAgIGJyb2tlcjogaGFuZGxlIHRvIHRoZSBtZXNz YWdlX2Jyb2tlcjIgb2JqZWN0CiAgICAgICAgICAgICBwb3J0OiBoYW5kbGUgdG8gcG9ydC1zcGVj aWZpYyBmdW5jdGlvbmFsaXR5CiAgICAgICAgICAgICBvcHRpb25zOiBjb21tYW5kIGxpbmUgb3B0 aW9ucyBvYmplY3QKLSAgICAgICAgICAgIG1hbmFnZXI6IE1hbmFnZXIgY2FsbGJhY2sgb2JqZWN0 ICh0aGUgY2FsbGVyKQorICAgICAgICAgICAgY2xpZW50OiBjYWxsYmFjayBvYmplY3QgKHRoZSBj YWxsZXIpCiAgICAgICAgICAgICB3b3JrZXJfY2xhc3M6IGNsYXNzIG9iamVjdCB0byB1c2UgdG8g Y3JlYXRlIHdvcmtlcnMuCiAgICAgICAgICIiIgotICAgICAgICBzZWxmLl9icm9rZXIgPSBicm9r ZXIKKyAgICAgICAgbWVzc2FnZV9icm9rZXIyLkJyb2tlckNvbm5lY3Rpb24uX19pbml0X18oc2Vs ZiwgYnJva2VyLCBjbGllbnQsCisgICAgICAgICAgICBNQU5BR0VSX1RPUElDLCBBTllfV09SS0VS X1RPUElDKQogICAgICAgICBzZWxmLl9vcHRpb25zID0gb3B0aW9ucwotICAgICAgICBzZWxmLl9t YW5hZ2VyID0gbWFuYWdlcgogICAgICAgICBzZWxmLl93b3JrZXJfY2xhc3MgPSB3b3JrZXJfY2xh c3MKIAogCi1jbGFzcyBfSW5saW5lTWFuYWdlcihfQWJzdHJhY3RNYW5hZ2VyKToKK2NsYXNzIF9J bmxpbmVNYW5hZ2VyKF9NYW5hZ2VyQ29ubmVjdGlvbik6CiAgICAgcGFzcwogCiAKLWNsYXNzIF9U aHJlYWRlZE1hbmFnZXIoX0Fic3RyYWN0TWFuYWdlcik6CitjbGFzcyBfVGhyZWFkZWRNYW5hZ2Vy KF9NYW5hZ2VyQ29ubmVjdGlvbik6CiAgICAgcGFzcwogCiAKLWNsYXNzIF9NdWx0aVByb2Nlc3NN YW5hZ2VyKF9BYnN0cmFjdE1hbmFnZXIpOgorY2xhc3MgX011bHRpUHJvY2Vzc01hbmFnZXIoX01h bmFnZXJDb25uZWN0aW9uKToKICAgICBwYXNzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9tZXNzYWdlX2Jyb2tlcjIucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9tZXNzYWdl X2Jyb2tlcjIucHkKaW5kZXggOGUxNTkyM2Y2MjEyZDk1NTE1MzY4YjJmN2ZiMmE1NzhkZWFjNzgz Ny4uZWMzYzk3MDFiOTk4ZWZkMmM3M2U3MjljMGFjN2FjMjBiMGMyYjk0YiAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvbWVzc2Fn ZV9icm9rZXIyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xh eW91dF9wYWNrYWdlL21lc3NhZ2VfYnJva2VyMi5weQpAQCAtMTMyLDcgKzEzMiw3IEBAIGNsYXNz IEJyb2tlcihvYmplY3QpOgogICAgICAgICBzZWxmLl9ydW5fbG9vcCh0b3BpY19uYW1lLCBjbGll bnQsIGJsb2NrPUZhbHNlLCBkZWxheV9zZWNzPU5vbmUpCiAKICAgICBkZWYgX3J1bl9sb29wKHNl bGYsIHRvcGljX25hbWUsIGNsaWVudCwgYmxvY2ssIGRlbGF5X3NlY3MpOgotICAgICAgICBxdWV1 ZSA9IHNlbGYuX2ZpbmRfdG9waWModG9waWNfbmFtZSkKKyAgICAgICAgcXVldWUgPSBzZWxmLl9n ZXRfcXVldWVfZm9yX3RvcGljKHRvcGljX25hbWUpCiAgICAgICAgIHdoaWxlIG5vdCBjbGllbnQu aXNfZG9uZSgpOgogICAgICAgICAgICAgdHJ5OgogICAgICAgICAgICAgICAgIHMgPSBxdWV1ZS5n ZXQoYmxvY2ssIGRlbGF5X3NlY3MpCkBAIC0xNDYsNyArMTQ2LDcgQEAgY2xhc3MgQnJva2VyKG9i amVjdCk6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKAogICAgICAgICAgICAgICAgIiVz OiByZWNlaXZlZCBtZXNzYWdlICclcycgaXQgY291bGRuJ3QgaGFuZGxlIiAlCiAgICAgICAgICAg ICAgICAoY2xpZW50Lm5hbWUoKSwgbWVzc2FnZS5uYW1lKSkKLSAgICAgICAgb3B0YXJncyA9IG1l c3NhZ2UuYm9keQorICAgICAgICBvcHRhcmdzID0gbWVzc2FnZS5hcmdzCiAgICAgICAgIG1lc3Nh Z2VfaGFuZGxlciA9IGdldGF0dHIoY2xpZW50LCAnaGFuZGxlXycgKyBtZXNzYWdlLm5hbWUpCiAg ICAgICAgIG1lc3NhZ2VfaGFuZGxlcihtZXNzYWdlLnNyYywgKm9wdGFyZ3MpCiAK