18351 2008-04-07 22:01:31 -0700 Network bar graph should graph by size when Transfer Size is selected 2008-04-08 11:09:13 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 17773 1 timothy timothy aroben oldest_to_newest 76553 0 timothy 2008-04-07 22:01:31 -0700 The Network timeline currenty only shows time bars no batter what is selected in the pop-up menu at the bottom. The bars next to the resources should graph sizes when Transfer Size is selected. 76554 1 20391 timothy 2008-04-07 22:12:58 -0700 Created attachment 20391 Patch 76615 2 20391 aroben 2008-04-08 08:30:24 -0700 Comment on attachment 20391 Patch r=me 76625 3 20391 timothy 2008-04-08 11:08:59 -0700 Comment on attachment 20391 Patch Landed in r31723. 20391 2008-04-07 22:12:58 -0700 2008-04-08 08:30:24 -0700 Patch 0001-Makes-the-Network-timeline-graph-resource-sizes-on-t.patch text/plain 22866 timothy RnJvbSA0YjRiODA3MzUxMTljODY5MGJlYjcwMTQ4ODk1ZWRkMWRlNjY2MzU1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGh5IEhhdGNoZXIgPHRpbW90aHlAYXBwbGUuY29tPgpE YXRlOiBNb24sIDcgQXByIDIwMDggMTc6MjU6NTYgLTA3MDAKU3ViamVjdDogW1BBVENIXSBNYWtl cyB0aGUgTmV0d29yayB0aW1lbGluZSBncmFwaCByZXNvdXJjZSBzaXplcyBvbiB0aGUgYmFyIGdy YXBoCiB3aGVuIFRyYW5zZmVyIFNpemUgaXMgc2VsZWN0ZWQuCgpodHRwOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODM1MQoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgoq IHBhZ2UvaW5zcGVjdG9yL1Jlc291cmNlLmpzOgooV2ViSW5zcGVjdG9yLlJlc291cmNlLkNvbXBh cmVCeVRpbWUpOiBBcnJheSBzb3J0aW5nIGZ1bmN0aW9uIGZvciB0aW1lLgpDb3BpZWQgZnJvbSBX ZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnRpbWVsaW5lRW50cnlDb21wYXJlLgoKKiBwYWdlL2lu c3BlY3Rvci9SZXNvdXJjZXNQYW5lbC5qczoKKFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwpOiBT ZXQgdGhlIHNlbGVjdGVkSW5kZXggb2YgZ3JhcGhNb2RlU2VsZWN0RWxlbWVudCB0bwptYWtlIFRy YW5zZmVyIFRpbWUgdGhlIGRlZmF1bHQgZ3JhcGguCihXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVs LnByb3RvdHlwZS5jaGFuZ2VHcmFwaE1vZGUpOiBDYWxsIGNhbGN1bGF0b3IucmVzZXQsCl9yZWZy ZXNoQWxsUmVzb3VyY2VzIGFuZCBfdXBkYXRlR3JhcGhEaXZpZGVyc0lmTmVlZGVkLgooV2ViSW5z cGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUuZ2V0IHRvdGFsRHVyYXRpb24pOiBSZW1vdmVk LgooV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUuX3VwZGF0ZUdyYXBoQm91bmRy aWVzSWZOZWVkZWQpOiBSZW1vdmVkIGJvdW5kYXJ5CmNoZWNraW5nIGNvZGUgYW5kIGp1c3QgY2Fs bCBjYWxjdWxhdG9yLnVwZGF0ZUJvdW5kcmllcy4KKFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwu cHJvdG90eXBlLl91cGRhdGVHcmFwaERpdmlkZXJzSWZOZWVkZWQpOiBBZGQgYSBmb3JjZSBhcmd1 bWVudC4KVXNlIGNhbGN1bGF0b3IuYm91bmRhcnlTcGFuIHdoZW4gY29tcHV0aW5nIHRoZSBzbGlj ZS4gSWYgdGhlIHNsaWNlIGlzIE5hTiwgZG9uJ3QgbWFrZSBhIGxhYmVsLgpBc2sgdGhlIGNhbGN1 bGF0b3IgdG8gZm9ybWF0IHRoZSBsYWJlbCB2YWx1ZXMgZm9yIGVhY2ggc2xpY2UuCihXZWJJbnNw ZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZS5jbGVhclRpbWVsaW5lKTogQ2FsbCBjYWxjdWxh dG9yLnJlc2V0LgooV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC50aW1lbGluZUVudHJ5Q29tcGFy ZSk6IENhbGwgV2ViSW5zcGVjdG9yLlJlc291cmNlLkNvbXBhcmVCeVRpbWUuCgooV2ViSW5zcGVj dG9yLk5ldHdvcmtUaW1lbGluZUVudHJ5LnByb3RvdHlwZS5yZWZyZXNoKTogQXNrIHRoZSBwYW5l bCdzIGNhbGN1bGF0b3IgdG8gY29tcHV0ZQpiYXIgZ3JhcGggcGVyY2VudGFnZXMgZm9yIGEgcmVz b3VyY2UuIFVzZSB0aG9zZSBwZXJjZW50YWdlcyB0byBjaGFuZ2UgdGhlIGJhciBzdHlsZS4KCihX ZWJJbnNwZWN0b3IuUmVzb3VyY2VDYWxjdWxhdG9yKTogUmVuYW1lZCBmcm9tIFdlYkluc3BlY3Rv ci5UaW1lbGluZVZhbHVlQ2FsY3VsYXRvci4KKFdlYkluc3BlY3Rvci5SZXNvdXJjZUNhbGN1bGF0 b3IucHJvdG90eXBlLmNvbXB1dGVTdW1tYXJ5VmFsdWVzKTogQ2hhbmdlZCB0aGUgQXJyYXkuZm9y RWFjaAp0byBhIG5vcm1hbCBmb3IgbG9vcC4gV29yayB3aXRoIHJlc291cmNlcyBpbnN0ZWFkIG9m IFRpbWVsaW5lRW50cmllcy4KKFdlYkluc3BlY3Rvci5SZXNvdXJjZUNhbGN1bGF0b3IucHJvdG90 eXBlLmNvbXB1dGVCYXJHcmFwaFBlcmNlbnRhZ2VzKTogUmV0dXJuIGJhc2ljIGJhciBncmFwaApw ZXJjZW50cyB3aXRoIHN0YXJ0IGFsd2F5cyBiZWluZyB6ZXJvLgooV2ViSW5zcGVjdG9yLlJlc291 cmNlQ2FsY3VsYXRvci5wcm90b3R5cGUuZ2V0IGJvdW5kYXJ5U3Bhbik6IFJldHVybiB0aGUgZGlm ZmVyZW5jZSBiZXR3ZWVuCm1heGltdW1Cb3VuZGFyeSBhbmQgbWluaW11bUJvdW5kYXJ5LgooV2Vi SW5zcGVjdG9yLlJlc291cmNlQ2FsY3VsYXRvci5wcm90b3R5cGUudXBkYXRlQm91bmRyaWVzKTog VXBkYXRlIG1heGltdW1Cb3VuZGFyeSBiYXNlZCBvbiBfdmFsdWUuClRoZSBtaW5pbXVtQm91bmRh cnkgaXMgYWx3YXlzIHplcm8uCihXZWJJbnNwZWN0b3IuUmVzb3VyY2VDYWxjdWxhdG9yLnByb3Rv dHlwZS5yZXNldCk6IERlbGV0ZSBtYXhpbXVtQm91bmRhcnkgYW5kIG1pbmltdW1Cb3VuZGFyeS4K KFdlYkluc3BlY3Rvci5SZXNvdXJjZUNhbGN1bGF0b3IucHJvdG90eXBlLl92YWx1ZSk6IFRha2Vz IGEgUmVzb3VyY2UgaW5zdGVhZCBvZiBUaW1lbGluZUVudHJ5LgoKKFdlYkluc3BlY3Rvci5SZXNv dXJjZVRyYW5zZmVyVGltZUNhbGN1bGF0b3IpOiBSZW5hbWVkIGZyb20gVHJhbnNmZXJUaW1lQ2Fs Y3VsYXRvci4KKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyYW5zZmVyVGltZUNhbGN1bGF0b3IucHJv dG90eXBlLmNvbXB1dGVTdW1tYXJ5VmFsdWVzKTogV29yayB3aXRoIHJlc291cmNlcwppbnN0ZWFk IG9mIGVudHJpZXMuIENoYW5nZWQgdGhlIEFycmF5LmZvckVhY2ggdG8gYSBub3JtYWwgZm9yIGxv b3AuCihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmFuc2ZlclRpbWVDYWxjdWxhdG9yLnByb3RvdHlw ZS5jb21wdXRlQmFyR3JhcGhQZXJjZW50YWdlcyk6IFJldHVybiBwZXJjZW50cwpqdXN0IGxpa2Ug V2ViSW5zcGVjdG9yLk5ldHdvcmtUaW1lbGluZUVudHJ5LnByb3RvdHlwZS5yZWZyZXNoIHdhcyBk b2luZyBiZWZvcmUuCihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmFuc2ZlclRpbWVDYWxjdWxhdG9y LnByb3RvdHlwZS51cGRhdGVCb3VuZHJpZXMpOiBVcGRhdGUgbWluaW11bUJvdW5kYXJ5IGFuZApt YXhpbXVtQm91bmRhcnkganVzdCBsaWtlIHRoZSBjaGVja3MgV2ViSW5zcGVjdG9yLk5ldHdvcmtQ YW5lbC5wcm90b3R5cGUuX3VwZGF0ZUdyYXBoQm91bmRyaWVzSWZOZWVkZWQgd2FzIGRvaW5nLgoK KFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyYW5zZmVyU2l6ZUNhbGN1bGF0b3IpOiBSZW5hbWVkIGZy b20gVHJhbnNmZXJTaXplQ2FsY3VsYXRvci4KKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyYW5zZmVy U2l6ZUNhbGN1bGF0b3IucHJvdG90eXBlLl92YWx1ZSk6IFRha2VzIGEgUmVzb3VyY2UgaW5zdGVh ZCBvZiBUaW1lbGluZUVudHJ5LgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAg ICAgICAgICAgfCAgIDUxICsrKysrKysKIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2Uu anMgICAgICAgfCAgIDEzICsrCiBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1Jlc291cmNlc1BhbmVs LmpzIHwgIDIyOSArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdl ZCwgMTk3IGluc2VydGlvbnMoKyksIDk2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNv cmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmE4MDFmOC4uNGI3ZjFiYiAx MDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAg LTE4MSw2ICsxODEsNTcgQEAKIAogMjAwOC0wNC0wNyAgVGltb3RoeSBIYXRjaGVyICA8dGltb3Ro eUBhcHBsZS5jb20+CiAKKyAgICAgICAgTWFrZXMgdGhlIE5ldHdvcmsgdGltZWxpbmUgZ3JhcGgg cmVzb3VyY2Ugc2l6ZXMgb24gdGhlIGJhciBncmFwaAorICAgICAgICB3aGVuIFRyYW5zZmVyIFNp emUgaXMgc2VsZWN0ZWQuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9SZXNvdXJjZS5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5SZXNvdXJjZS5Db21wYXJlQnlUaW1lKTogQXJyYXkgc29ydGluZyBmdW5jdGlvbiBmb3Ig dGltZS4KKyAgICAgICAgQ29waWVkIGZyb20gV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC50aW1l bGluZUVudHJ5Q29tcGFyZS4KKworICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL1Jlc291cmNlc1Bh bmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbCk6IFNldCB0aGUgc2Vs ZWN0ZWRJbmRleCBvZiBncmFwaE1vZGVTZWxlY3RFbGVtZW50IHRvCisgICAgICAgIG1ha2UgVHJh bnNmZXIgVGltZSB0aGUgZGVmYXVsdCBncmFwaC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3 b3JrUGFuZWwucHJvdG90eXBlLmNoYW5nZUdyYXBoTW9kZSk6IENhbGwgY2FsY3VsYXRvci5yZXNl dCwKKyAgICAgICAgX3JlZnJlc2hBbGxSZXNvdXJjZXMgYW5kIF91cGRhdGVHcmFwaERpdmlkZXJz SWZOZWVkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZS5n ZXQgdG90YWxEdXJhdGlvbik6IFJlbW92ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29y a1BhbmVsLnByb3RvdHlwZS5fdXBkYXRlR3JhcGhCb3VuZHJpZXNJZk5lZWRlZCk6IFJlbW92ZWQg Ym91bmRhcnkKKyAgICAgICAgY2hlY2tpbmcgY29kZSBhbmQganVzdCBjYWxsIGNhbGN1bGF0b3Iu dXBkYXRlQm91bmRyaWVzLgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90 b3R5cGUuX3VwZGF0ZUdyYXBoRGl2aWRlcnNJZk5lZWRlZCk6IEFkZCBhIGZvcmNlIGFyZ3VtZW50 LgorICAgICAgICBVc2UgY2FsY3VsYXRvci5ib3VuZGFyeVNwYW4gd2hlbiBjb21wdXRpbmcgdGhl IHNsaWNlLiBJZiB0aGUgc2xpY2UgaXMgTmFOLCBkb24ndCBtYWtlIGEgbGFiZWwuCisgICAgICAg IEFzayB0aGUgY2FsY3VsYXRvciB0byBmb3JtYXQgdGhlIGxhYmVsIHZhbHVlcyBmb3IgZWFjaCBz bGljZS4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwucHJvdG90eXBlLmNsZWFy VGltZWxpbmUpOiBDYWxsIGNhbGN1bGF0b3IucmVzZXQuCisgICAgICAgIChXZWJJbnNwZWN0b3Iu TmV0d29ya1BhbmVsLnRpbWVsaW5lRW50cnlDb21wYXJlKTogQ2FsbCBXZWJJbnNwZWN0b3IuUmVz b3VyY2UuQ29tcGFyZUJ5VGltZS4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtUaW1l bGluZUVudHJ5LnByb3RvdHlwZS5yZWZyZXNoKTogQXNrIHRoZSBwYW5lbCdzIGNhbGN1bGF0b3Ig dG8gY29tcHV0ZQorICAgICAgICBiYXIgZ3JhcGggcGVyY2VudGFnZXMgZm9yIGEgcmVzb3VyY2Uu IFVzZSB0aG9zZSBwZXJjZW50YWdlcyB0byBjaGFuZ2UgdGhlIGJhciBzdHlsZS4KKworICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlQ2FsY3VsYXRvcik6IFJlbmFtZWQgZnJvbSBXZWJJbnNw ZWN0b3IuVGltZWxpbmVWYWx1ZUNhbGN1bGF0b3IuCisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVz b3VyY2VDYWxjdWxhdG9yLnByb3RvdHlwZS5jb21wdXRlU3VtbWFyeVZhbHVlcyk6IENoYW5nZWQg dGhlIEFycmF5LmZvckVhY2gKKyAgICAgICAgdG8gYSBub3JtYWwgZm9yIGxvb3AuIFdvcmsgd2l0 aCByZXNvdXJjZXMgaW5zdGVhZCBvZiBUaW1lbGluZUVudHJpZXMuCisgICAgICAgIChXZWJJbnNw ZWN0b3IuUmVzb3VyY2VDYWxjdWxhdG9yLnByb3RvdHlwZS5jb21wdXRlQmFyR3JhcGhQZXJjZW50 YWdlcyk6IFJldHVybiBiYXNpYyBiYXIgZ3JhcGgKKyAgICAgICAgcGVyY2VudHMgd2l0aCBzdGFy dCBhbHdheXMgYmVpbmcgemVyby4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZUNhbGN1 bGF0b3IucHJvdG90eXBlLmdldCBib3VuZGFyeVNwYW4pOiBSZXR1cm4gdGhlIGRpZmZlcmVuY2Ug YmV0d2VlbgorICAgICAgICBtYXhpbXVtQm91bmRhcnkgYW5kIG1pbmltdW1Cb3VuZGFyeS4KKyAg ICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZUNhbGN1bGF0b3IucHJvdG90eXBlLnVwZGF0ZUJv dW5kcmllcyk6IFVwZGF0ZSBtYXhpbXVtQm91bmRhcnkgYmFzZWQgb24gX3ZhbHVlLgorICAgICAg ICBUaGUgbWluaW11bUJvdW5kYXJ5IGlzIGFsd2F5cyB6ZXJvLgorICAgICAgICAoV2ViSW5zcGVj dG9yLlJlc291cmNlQ2FsY3VsYXRvci5wcm90b3R5cGUucmVzZXQpOiBEZWxldGUgbWF4aW11bUJv dW5kYXJ5IGFuZCBtaW5pbXVtQm91bmRhcnkuCisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VDYWxjdWxhdG9yLnByb3RvdHlwZS5fdmFsdWUpOiBUYWtlcyBhIFJlc291cmNlIGluc3RlYWQg b2YgVGltZWxpbmVFbnRyeS4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJhbnNm ZXJUaW1lQ2FsY3VsYXRvcik6IFJlbmFtZWQgZnJvbSBUcmFuc2ZlclRpbWVDYWxjdWxhdG9yLgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJhbnNmZXJUaW1lQ2FsY3VsYXRvci5wcm90 b3R5cGUuY29tcHV0ZVN1bW1hcnlWYWx1ZXMpOiBXb3JrIHdpdGggcmVzb3VyY2VzCisgICAgICAg IGluc3RlYWQgb2YgZW50cmllcy4gQ2hhbmdlZCB0aGUgQXJyYXkuZm9yRWFjaCB0byBhIG5vcm1h bCBmb3IgbG9vcC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyYW5zZmVyVGltZUNh bGN1bGF0b3IucHJvdG90eXBlLmNvbXB1dGVCYXJHcmFwaFBlcmNlbnRhZ2VzKTogUmV0dXJuIHBl cmNlbnRzCisgICAgICAgIGp1c3QgbGlrZSBXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lRW50 cnkucHJvdG90eXBlLnJlZnJlc2ggd2FzIGRvaW5nIGJlZm9yZS4KKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5SZXNvdXJjZVRyYW5zZmVyVGltZUNhbGN1bGF0b3IucHJvdG90eXBlLnVwZGF0ZUJvdW5k cmllcyk6IFVwZGF0ZSBtaW5pbXVtQm91bmRhcnkgYW5kCisgICAgICAgIG1heGltdW1Cb3VuZGFy eSBqdXN0IGxpa2UgdGhlIGNoZWNrcyBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlw ZS5fdXBkYXRlR3JhcGhCb3VuZHJpZXNJZk5lZWRlZCB3YXMgZG9pbmcuCisKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5SZXNvdXJjZVRyYW5zZmVyU2l6ZUNhbGN1bGF0b3IpOiBSZW5hbWVkIGZyb20g VHJhbnNmZXJTaXplQ2FsY3VsYXRvci4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRy YW5zZmVyU2l6ZUNhbGN1bGF0b3IucHJvdG90eXBlLl92YWx1ZSk6IFRha2VzIGEgUmVzb3VyY2Ug aW5zdGVhZCBvZiBUaW1lbGluZUVudHJ5LgorCisyMDA4LTA0LTA3ICBUaW1vdGh5IEhhdGNoZXIg IDx0aW1vdGh5QGFwcGxlLmNvbT4KKwogICAgICAgICBSZW5hbWVkIHZhcmlvdXMgZnVuY3Rpb25z IHRoYXQgYXJlIGludGVybmFsIHRvIHRoZSBDb25zb2xlCiAgICAgICAgIG9iamVjdCB0byBoYXZl IGFuIHVuZGVyc2NvcmUgcHJlZml4LgogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvaW5zcGVj dG9yL1Jlc291cmNlLmpzIGIvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9SZXNvdXJjZS5qcwppbmRl eCAxMDYyNTVhLi44MjBlMDg5IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1Jl c291cmNlLmpzCisrKyBiL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2UuanMKQEAgLTY2 Miw2ICs2NjIsMTkgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICB9 CiB9CiAKK1dlYkluc3BlY3Rvci5SZXNvdXJjZS5Db21wYXJlQnlUaW1lID0gZnVuY3Rpb24oYSwg YikKK3sKKyAgICBpZiAoYS5zdGFydFRpbWUgPCBiLnN0YXJ0VGltZSkKKyAgICAgICAgcmV0dXJu IC0xOworICAgIGlmIChhLnN0YXJ0VGltZSA+IGIuc3RhcnRUaW1lKQorICAgICAgICByZXR1cm4g MTsKKyAgICBpZiAoYS5lbmRUaW1lIDwgYi5lbmRUaW1lKQorICAgICAgICByZXR1cm4gLTE7Cisg ICAgaWYgKGEuZW5kVGltZSA+IGIuZW5kVGltZSkKKyAgICAgICAgcmV0dXJuIDE7CisgICAgcmV0 dXJuIDA7Cit9CisKIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVFbGVtZW50ID0gZnVuY3Rpb24o cmVzb3VyY2UpCiB7CiAgICAgVHJlZUVsZW1lbnQuY2FsbCh0aGlzLCAiIiwgcmVzb3VyY2UsIGZh bHNlKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2VzUGFuZWwu anMgYi9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IGNlNDhj YTMuLjkwYmJkZmYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2Vz UGFuZWwuanMKKysrIGIvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9SZXNvdXJjZXNQYW5lbC5qcwpA QCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDcgQXBwbGUgSW5jLiAgQWxs IHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNywgMjAwOCBBcHBsZSBJbmMu ICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBA IC02NCwxNSArNjQsMTcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbCA9IGZ1bmN0aW9uKCkK ICAgICB0aGlzLmdyYXBoTGFiZWxFbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImJyIikpOwogCiAgICAgdmFyIHNpemVPcHRpb25FbGVtZW50ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgib3B0aW9uIik7Ci0gICAgc2l6ZU9wdGlvbkVsZW1lbnQuY2FsY3VsYXRvciA9 IG5ldyBXZWJJbnNwZWN0b3IuVHJhbnNmZXJTaXplQ2FsY3VsYXRvcigpOworICAgIHNpemVPcHRp b25FbGVtZW50LmNhbGN1bGF0b3IgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlVHJhbnNmZXJT aXplQ2FsY3VsYXRvcigpOwogICAgIHNpemVPcHRpb25FbGVtZW50LnRleHRDb250ZW50ID0gc2l6 ZU9wdGlvbkVsZW1lbnQuY2FsY3VsYXRvci50aXRsZTsKICAgICB0aGlzLmdyYXBoTW9kZVNlbGVj dEVsZW1lbnQuYXBwZW5kQ2hpbGQoc2l6ZU9wdGlvbkVsZW1lbnQpOwogCiAgICAgdmFyIHRpbWVP cHRpb25FbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgib3B0aW9uIik7Ci0gICAgdGlt ZU9wdGlvbkVsZW1lbnQuY2FsY3VsYXRvciA9IG5ldyBXZWJJbnNwZWN0b3IuVHJhbnNmZXJUaW1l Q2FsY3VsYXRvcigpOworICAgIHRpbWVPcHRpb25FbGVtZW50LmNhbGN1bGF0b3IgPSBuZXcgV2Vi SW5zcGVjdG9yLlJlc291cmNlVHJhbnNmZXJUaW1lQ2FsY3VsYXRvcigpOwogICAgIHRpbWVPcHRp b25FbGVtZW50LnRleHRDb250ZW50ID0gdGltZU9wdGlvbkVsZW1lbnQuY2FsY3VsYXRvci50aXRs ZTsKICAgICB0aGlzLmdyYXBoTW9kZVNlbGVjdEVsZW1lbnQuYXBwZW5kQ2hpbGQodGltZU9wdGlv bkVsZW1lbnQpOwogCisgICAgdGhpcy5ncmFwaE1vZGVTZWxlY3RFbGVtZW50LnNlbGVjdGVkSW5k ZXggPSAxOworCiAgICAgdmFyIGdyYXBoU2lkZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJkaXYiKTsKICAgICBncmFwaFNpZGVFbGVtZW50LmNsYXNzTmFtZSA9ICJuZXR3b3JrLWdy YXBoLXNpZGUiOwogICAgIGdyYXBoQXJlYS5hcHBlbmRDaGlsZChncmFwaFNpZGVFbGVtZW50KTsK QEAgLTEzNSw2ICsxMzcsOSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZSA9 IHsKIAogICAgIGNoYW5nZUdyYXBoTW9kZTogZnVuY3Rpb24oZXZlbnQpCiAgICAgeworICAgICAg ICB0aGlzLmNhbGN1bGF0b3IucmVzZXQoKTsKKyAgICAgICAgdGhpcy5fcmVmcmVzaEFsbFJlc291 cmNlcyhmYWxzZSwgdHJ1ZSwgdHJ1ZSk7CisgICAgICAgIHRoaXMuX3VwZGF0ZUdyYXBoRGl2aWRl cnNJZk5lZWRlZCh0cnVlKTsKICAgICAgICAgdGhpcy5fdXBkYXRlU3VtbWFyeUdyYXBoKCk7CiAg ICAgfSwKIApAQCAtMTQzLDExICsxNDgsNiBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnBy b3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuZ3JhcGhNb2RlU2VsZWN0RWxlbWVudC5v cHRpb25zW3RoaXMuZ3JhcGhNb2RlU2VsZWN0RWxlbWVudC5zZWxlY3RlZEluZGV4XS5jYWxjdWxh dG9yOwogICAgIH0sCiAKLSAgICBnZXQgdG90YWxEdXJhdGlvbigpCi0gICAgewotICAgICAgICBy ZXR1cm4gdGhpcy5sYXRlc3RFbmRUaW1lIC0gdGhpcy5lYXJsaWVzdFN0YXJ0VGltZTsKLSAgICB9 LAotCiAgICAgZ2V0IG5lZWRzUmVmcmVzaCgpIAogICAgIHsgCiAgICAgICAgIHJldHVybiB0aGlz Ll9uZWVkc1JlZnJlc2g7IApAQCAtMjUyLDE2ICsyNTIsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29y a1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIF91cGRhdGVHcmFwaEJvdW5kcmllc0lmTmVlZGVk OiBmdW5jdGlvbihyZXNvdXJjZSwgaW1tZWRpYXRlKQogICAgIHsKLSAgICAgICAgdmFyIGRpZENo YW5nZSA9IGZhbHNlOwotICAgICAgICBpZiAocmVzb3VyY2Uuc3RhcnRUaW1lICE9PSAtMSAmJiAo dGhpcy5lYXJsaWVzdFN0YXJ0VGltZSA9PT0gdW5kZWZpbmVkIHx8IHJlc291cmNlLnN0YXJ0VGlt ZSA8IHRoaXMuZWFybGllc3RTdGFydFRpbWUpKSB7Ci0gICAgICAgICAgICB0aGlzLmVhcmxpZXN0 U3RhcnRUaW1lID0gcmVzb3VyY2Uuc3RhcnRUaW1lOwotICAgICAgICAgICAgZGlkQ2hhbmdlID0g dHJ1ZTsKLSAgICAgICAgfQotCi0gICAgICAgIGlmIChyZXNvdXJjZS5lbmRUaW1lICE9PSAtMSAm JiAodGhpcy5sYXRlc3RFbmRUaW1lID09PSB1bmRlZmluZWQgfHwgcmVzb3VyY2UuZW5kVGltZSA+ IHRoaXMubGF0ZXN0RW5kVGltZSkpIHsKLSAgICAgICAgICAgIHRoaXMubGF0ZXN0RW5kVGltZSA9 IHJlc291cmNlLmVuZFRpbWU7Ci0gICAgICAgICAgICBkaWRDaGFuZ2UgPSB0cnVlOwotICAgICAg ICB9CisgICAgICAgIHZhciBkaWRDaGFuZ2UgPSB0aGlzLmNhbGN1bGF0b3IudXBkYXRlQm91bmRy aWVzKHJlc291cmNlKTsKIAogICAgICAgICBpZiAoZGlkQ2hhbmdlKSB7CiAgICAgICAgICAgICBp ZiAoaW1tZWRpYXRlKSB7CkBAIC0yODMsNyArMjc0LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtQ YW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3VwZGF0ZUdyYXBoRGl2aWRlcnNUaW1l b3V0ID0gc2V0VGltZW91dCh0aGlzLl91cGRhdGVHcmFwaERpdmlkZXJzSWZOZWVkZWQuYmluZCh0 aGlzKSwgNTAwKTsKICAgICB9LAogCi0gICAgX3VwZGF0ZUdyYXBoRGl2aWRlcnNJZk5lZWRlZDog ZnVuY3Rpb24oKQorICAgIF91cGRhdGVHcmFwaERpdmlkZXJzSWZOZWVkZWQ6IGZ1bmN0aW9uKGZv cmNlKQogICAgIHsKICAgICAgICAgaWYgKCJfdXBkYXRlR3JhcGhEaXZpZGVyc1RpbWVvdXQiIGlu IHRoaXMpIHsKICAgICAgICAgICAgIGNsZWFyVGltZW91dCh0aGlzLl91cGRhdGVHcmFwaERpdmlk ZXJzVGltZW91dCk7CkBAIC0zMDIsMTIgKzI5MywxMSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1Bh bmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogCiAgICAgICAgIHZhciBkaXZpZGVyQ291bnQg PSBNYXRoLnJvdW5kKHRoaXMuZGl2aWRlcnNFbGVtZW50Lm9mZnNldFdpZHRoIC8gNjQpOwotICAg ICAgICB2YXIgdGltZVNsaWNlID0gdGhpcy50b3RhbER1cmF0aW9uIC8gZGl2aWRlckNvdW50Owot Ci0gICAgICAgIGlmICh0aGlzLl9jdXJyZW50RGl2aWRlclNsaWNlID09PSB0aW1lU2xpY2UpCisg ICAgICAgIHZhciBzbGljZSA9IHRoaXMuY2FsY3VsYXRvci5ib3VuZGFyeVNwYW4gLyBkaXZpZGVy Q291bnQ7CisgICAgICAgIGlmICghZm9yY2UgJiYgdGhpcy5fY3VycmVudERpdmlkZXJTbGljZSA9 PT0gc2xpY2UpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdGhpcy5fY3VycmVudERp dmlkZXJTbGljZSA9IHRpbWVTbGljZTsKKyAgICAgICAgdGhpcy5fY3VycmVudERpdmlkZXJTbGlj ZSA9IHNsaWNlOwogCiAgICAgICAgIHRoaXMuZGl2aWRlcnNFbGVtZW50LnJlbW92ZUNoaWxkcmVu KCk7CiAKQEAgLTMyMCw3ICszMTAsOCBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3Rv dHlwZSA9IHsKIAogICAgICAgICAgICAgdmFyIGxhYmVsID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7CiAgICAgICAgICAgICBsYWJlbC5jbGFzc05hbWUgPSAibmV0d29yay1kaXZpZGVy LWxhYmVsIjsKLSAgICAgICAgICAgIGxhYmVsLnRleHRDb250ZW50ID0gTnVtYmVyLnNlY29uZHNU b1N0cmluZyh0aW1lU2xpY2UgKiBpKTsKKyAgICAgICAgICAgIGlmICghaXNOYU4oc2xpY2UpKQor ICAgICAgICAgICAgICAgIGxhYmVsLnRleHRDb250ZW50ID0gdGhpcy5jYWxjdWxhdG9yLmZvcm1h dFZhbHVlKHNsaWNlICogaSk7CiAgICAgICAgICAgICBkaXZpZGVyLmFwcGVuZENoaWxkKGxhYmVs KTsKIAogICAgICAgICAgICAgdGhpcy5kaXZpZGVyc0VsZW1lbnQuYXBwZW5kQ2hpbGQoZGl2aWRl cik7CkBAIC02MzAsOCArNjIxLDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5 cGUgPSB7CiAKICAgICBjbGVhclRpbWVsaW5lOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICBk ZWxldGUgdGhpcy5lYXJsaWVzdFN0YXJ0VGltZTsKLSAgICAgICAgZGVsZXRlIHRoaXMubGF0ZXN0 RW5kVGltZTsKKyAgICAgICAgdGhpcy5jYWxjdWxhdG9yLnJlc2V0KCk7CiAKICAgICAgICAgdmFy IGVudHJpZXNMZW5ndGggPSB0aGlzLnRpbWVsaW5lRW50cmllcy5sZW5ndGg7CiAgICAgICAgIGZv ciAodmFyIGkgPSAwOyBpIDwgZW50cmllc0xlbmd0aDsgKytpKQpAQCAtNjU4LDE1ICs2NDgsNyBA QCBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNw ZWN0b3IuUGFuZWwucHJvdG90eXBlOwogCiBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnRpbWVs aW5lRW50cnlDb21wYXJlID0gZnVuY3Rpb24oYSwgYikKIHsKLSAgICBpZiAoYS5yZXNvdXJjZS5z dGFydFRpbWUgPCBiLnJlc291cmNlLnN0YXJ0VGltZSkKLSAgICAgICAgcmV0dXJuIC0xOwotICAg IGlmIChhLnJlc291cmNlLnN0YXJ0VGltZSA+IGIucmVzb3VyY2Uuc3RhcnRUaW1lKQotICAgICAg ICByZXR1cm4gMTsKLSAgICBpZiAoYS5yZXNvdXJjZS5lbmRUaW1lIDwgYi5yZXNvdXJjZS5lbmRU aW1lKQotICAgICAgICByZXR1cm4gLTE7Ci0gICAgaWYgKGEucmVzb3VyY2UuZW5kVGltZSA+IGIu cmVzb3VyY2UuZW5kVGltZSkKLSAgICAgICAgcmV0dXJuIDE7Ci0gICAgcmV0dXJuIDA7CisgICAg cmV0dXJuIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5Db21wYXJlQnlUaW1lKGEucmVzb3VyY2UsIGIu cmVzb3VyY2UpOwogfQogCiBXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lRW50cnkgPSBmdW5j dGlvbihwYW5lbCwgcmVzb3VyY2UpCkBAIC03MzAsMTkgKzcxMiw5IEBAIFdlYkluc3BlY3Rvci5O ZXR3b3JrVGltZWxpbmVFbnRyeS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgdGhpcy5w YW5lbC5fc29ydFJlc291cmNlc1Nvb25JZk5lZWRlZCgpOwogICAgICAgICB9CiAKLSAgICAgICAg aWYgKHRoaXMucmVzb3VyY2Uuc3RhcnRUaW1lICE9PSAtMSkgewotICAgICAgICAgICAgdmFyIHBl cmNlbnRTdGFydCA9ICgodGhpcy5yZXNvdXJjZS5zdGFydFRpbWUgLSB0aGlzLnBhbmVsLmVhcmxp ZXN0U3RhcnRUaW1lKSAvIHRoaXMucGFuZWwudG90YWxEdXJhdGlvbikgKiAxMDA7Ci0gICAgICAg ICAgICB0aGlzLmJhckVsZW1lbnQuc3R5bGUubGVmdCA9IHBlcmNlbnRTdGFydCArICIlIjsKLSAg ICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHRoaXMuYmFyRWxlbWVudC5zdHlsZS5sZWZ0ID0g bnVsbDsKLSAgICAgICAgfQotCi0gICAgICAgIGlmICh0aGlzLnJlc291cmNlLmVuZFRpbWUgIT09 IC0xKSB7Ci0gICAgICAgICAgICB2YXIgcGVyY2VudEVuZCA9ICgodGhpcy5wYW5lbC5sYXRlc3RF bmRUaW1lIC0gdGhpcy5yZXNvdXJjZS5lbmRUaW1lKSAvIHRoaXMucGFuZWwudG90YWxEdXJhdGlv bikgKiAxMDA7Ci0gICAgICAgICAgICB0aGlzLmJhckVsZW1lbnQuc3R5bGUucmlnaHQgPSBwZXJj ZW50RW5kICsgIiUiOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgdGhpcy5iYXJFbGVt ZW50LnN0eWxlLnJpZ2h0ID0gIjBweCI7Ci0gICAgICAgIH0KKyAgICAgICAgdmFyIHBlcmNlbnRh Z2VzID0gdGhpcy5wYW5lbC5jYWxjdWxhdG9yLmNvbXB1dGVCYXJHcmFwaFBlcmNlbnRhZ2VzKHRo aXMucmVzb3VyY2UpOworICAgICAgICB0aGlzLmJhckVsZW1lbnQuc3R5bGUubGVmdCA9IHBlcmNl bnRhZ2VzLnN0YXJ0ICsgIiUiOworICAgICAgICB0aGlzLmJhckVsZW1lbnQuc3R5bGUucmlnaHQg PSAoMTAwIC0gcGVyY2VudGFnZXMuZW5kKSArICIlIjsKIAogICAgICAgICB0aGlzLmJhckVsZW1l bnQuY2xhc3NOYW1lID0gIm5ldHdvcmstYmFyIG5ldHdvcmstY2F0ZWdvcnktIiArIHRoaXMucmVz b3VyY2UuY2F0ZWdvcnkubmFtZTsKIApAQCAtODkxLDMzICs4NjMsNjEgQEAgV2ViSW5zcGVjdG9y Lk5ldHdvcmtUaW1lbGluZUVudHJ5LnByb3RvdHlwZSA9IHsKICAgICB9CiB9CiAKLVdlYkluc3Bl Y3Rvci5UaW1lbGluZVZhbHVlQ2FsY3VsYXRvciA9IGZ1bmN0aW9uKCkKK1dlYkluc3BlY3Rvci5S ZXNvdXJjZUNhbGN1bGF0b3IgPSBmdW5jdGlvbigpCiB7CiB9CiAKLVdlYkluc3BlY3Rvci5UaW1l bGluZVZhbHVlQ2FsY3VsYXRvci5wcm90b3R5cGUgPSB7Ci0gICAgY29tcHV0ZVN1bW1hcnlWYWx1 ZXM6IGZ1bmN0aW9uKGVudHJpZXMpCitXZWJJbnNwZWN0b3IuUmVzb3VyY2VDYWxjdWxhdG9yLnBy b3RvdHlwZSA9IHsKKyAgICBjb21wdXRlU3VtbWFyeVZhbHVlczogZnVuY3Rpb24ocmVzb3VyY2Vz KQogICAgIHsKICAgICAgICAgdmFyIHRvdGFsID0gMDsKICAgICAgICAgdmFyIGNhdGVnb3J5VmFs dWVzID0ge307CiAKLSAgICAgICAgZnVuY3Rpb24gY29tcHV0ZShlbnRyeSkKLSAgICAgICAgewot ICAgICAgICAgICAgdmFyIHZhbHVlID0gdGhpcy5fdmFsdWUoZW50cnkpOwotICAgICAgICAgICAg aWYgKHZhbHVlID09PSB1bmRlZmluZWQpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotCi0gICAg ICAgICAgICBpZiAoIShlbnRyeS5yZXNvdXJjZS5jYXRlZ29yeS5uYW1lIGluIGNhdGVnb3J5VmFs dWVzKSkKLSAgICAgICAgICAgICAgICBjYXRlZ29yeVZhbHVlc1tlbnRyeS5yZXNvdXJjZS5jYXRl Z29yeS5uYW1lXSA9IDA7Ci0gICAgICAgICAgICBjYXRlZ29yeVZhbHVlc1tlbnRyeS5yZXNvdXJj ZS5jYXRlZ29yeS5uYW1lXSArPSB2YWx1ZTsKKyAgICAgICAgdmFyIHJlc291cmNlc0xlbmd0aCA9 IHJlc291cmNlcy5sZW5ndGg7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcmVzb3VyY2Vz TGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIHZhciByZXNvdXJjZSA9IHJlc291cmNlc1tpXS5y ZXNvdXJjZTsKKyAgICAgICAgICAgIHZhciB2YWx1ZSA9IHRoaXMuX3ZhbHVlKHJlc291cmNlKTsK KyAgICAgICAgICAgIGlmICh0eXBlb2YgdmFsdWUgPT09ICJ1bmRlZmluZWQiKQorICAgICAgICAg ICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgaWYgKCEocmVzb3VyY2UuY2F0ZWdvcnkubmFt ZSBpbiBjYXRlZ29yeVZhbHVlcykpCisgICAgICAgICAgICAgICAgY2F0ZWdvcnlWYWx1ZXNbcmVz b3VyY2UuY2F0ZWdvcnkubmFtZV0gPSAwOworICAgICAgICAgICAgY2F0ZWdvcnlWYWx1ZXNbcmVz b3VyY2UuY2F0ZWdvcnkubmFtZV0gKz0gdmFsdWU7CiAgICAgICAgICAgICB0b3RhbCArPSB2YWx1 ZTsKICAgICAgICAgfQotICAgICAgICBlbnRyaWVzLmZvckVhY2goY29tcHV0ZSwgdGhpcyk7CiAK ICAgICAgICAgcmV0dXJuIHtjYXRlZ29yeVZhbHVlczogY2F0ZWdvcnlWYWx1ZXMsIHRvdGFsOiB0 b3RhbH07CiAgICAgfSwKIAotICAgIF92YWx1ZTogZnVuY3Rpb24oZW50cnkpCisgICAgY29tcHV0 ZUJhckdyYXBoUGVyY2VudGFnZXM6IGZ1bmN0aW9uKHJlc291cmNlKQorICAgIHsKKyAgICAgICAg cmV0dXJuIHtzdGFydDogMCwgZW5kOiAodGhpcy5fdmFsdWUocmVzb3VyY2UpIC8gdGhpcy5ib3Vu ZGFyeVNwYW4pICogMTAwfTsKKyAgICB9LAorCisgICAgZ2V0IGJvdW5kYXJ5U3BhbigpCisgICAg eworICAgICAgICByZXR1cm4gdGhpcy5tYXhpbXVtQm91bmRhcnkgLSB0aGlzLm1pbmltdW1Cb3Vu ZGFyeTsKKyAgICB9LAorCisgICAgdXBkYXRlQm91bmRyaWVzOiBmdW5jdGlvbihyZXNvdXJjZSkK KyAgICB7CisgICAgICAgIHRoaXMubWluaW11bUJvdW5kYXJ5ID0gMDsKKworICAgICAgICB2YXIg dmFsdWUgPSB0aGlzLl92YWx1ZShyZXNvdXJjZSk7CisgICAgICAgIGlmICh0eXBlb2YgdGhpcy5t YXhpbXVtQm91bmRhcnkgPT09ICJ1bmRlZmluZWQiIHx8IHZhbHVlID4gdGhpcy5tYXhpbXVtQm91 bmRhcnkpIHsKKyAgICAgICAgICAgIHRoaXMubWF4aW11bUJvdW5kYXJ5ID0gdmFsdWU7CisgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorCisgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICB9LAorCisgICAgcmVzZXQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGRlbGV0ZSB0 aGlzLm1pbmltdW1Cb3VuZGFyeTsKKyAgICAgICAgZGVsZXRlIHRoaXMubWF4aW11bUJvdW5kYXJ5 OworICAgIH0sCisKKyAgICBfdmFsdWU6IGZ1bmN0aW9uKHJlc291cmNlKQogICAgIHsKICAgICAg ICAgcmV0dXJuIDA7CiAgICAgfSwKQEAgLTkzMyw1MyArOTMzLDU5IEBAIFdlYkluc3BlY3Rvci5U aW1lbGluZVZhbHVlQ2FsY3VsYXRvci5wcm90b3R5cGUgPSB7CiAgICAgfQogfQogCi1XZWJJbnNw ZWN0b3IuVHJhbnNmZXJUaW1lQ2FsY3VsYXRvciA9IGZ1bmN0aW9uKCkKK1dlYkluc3BlY3Rvci5S ZXNvdXJjZVRyYW5zZmVyVGltZUNhbGN1bGF0b3IgPSBmdW5jdGlvbigpCiB7Ci0gICAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lVmFsdWVDYWxjdWxhdG9yLmNhbGwodGhpcyk7CisgICAgV2ViSW5zcGVj dG9yLlJlc291cmNlQ2FsY3VsYXRvci5jYWxsKHRoaXMpOwogfQogCi1XZWJJbnNwZWN0b3IuVHJh bnNmZXJUaW1lQ2FsY3VsYXRvci5wcm90b3R5cGUgPSB7Ci0gICAgY29tcHV0ZVN1bW1hcnlWYWx1 ZXM6IGZ1bmN0aW9uKGVudHJpZXMpCitXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmFuc2ZlclRpbWVD YWxjdWxhdG9yLnByb3RvdHlwZSA9IHsKKyAgICBjb21wdXRlU3VtbWFyeVZhbHVlczogZnVuY3Rp b24ocmVzb3VyY2VzKQogICAgIHsKLSAgICAgICAgdmFyIGVudHJpZXNCeUNhdGVnb3J5ID0ge307 Ci0gICAgICAgIGVudHJpZXMuZm9yRWFjaChmdW5jdGlvbihlbnRyeSkgewotICAgICAgICAgICAg aWYgKCEoZW50cnkucmVzb3VyY2UuY2F0ZWdvcnkubmFtZSBpbiBlbnRyaWVzQnlDYXRlZ29yeSkp Ci0gICAgICAgICAgICAgICAgZW50cmllc0J5Q2F0ZWdvcnlbZW50cnkucmVzb3VyY2UuY2F0ZWdv cnkubmFtZV0gPSBbXTsKLSAgICAgICAgICAgIGVudHJpZXNCeUNhdGVnb3J5W2VudHJ5LnJlc291 cmNlLmNhdGVnb3J5Lm5hbWVdLnB1c2goZW50cnkpOwotICAgICAgICB9KTsKKyAgICAgICAgdmFy IHJlc291cmNlc0J5Q2F0ZWdvcnkgPSB7fTsKKyAgICAgICAgdmFyIHJlc291cmNlc0xlbmd0aCA9 IHJlc291cmNlcy5sZW5ndGg7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcmVzb3VyY2Vz TGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIHZhciByZXNvdXJjZSA9IHJlc291cmNlc1tpXS5y ZXNvdXJjZTsKKyAgICAgICAgICAgIGlmICghKHJlc291cmNlLmNhdGVnb3J5Lm5hbWUgaW4gcmVz b3VyY2VzQnlDYXRlZ29yeSkpCisgICAgICAgICAgICAgICAgcmVzb3VyY2VzQnlDYXRlZ29yeVty ZXNvdXJjZS5jYXRlZ29yeS5uYW1lXSA9IFtdOworICAgICAgICAgICAgcmVzb3VyY2VzQnlDYXRl Z29yeVtyZXNvdXJjZS5jYXRlZ29yeS5uYW1lXS5wdXNoKHJlc291cmNlKTsKKyAgICAgICAgfQog CiAgICAgICAgIHZhciBlYXJsaWVzdFN0YXJ0OwogICAgICAgICB2YXIgbGF0ZXN0RW5kOwogICAg ICAgICB2YXIgY2F0ZWdvcnlWYWx1ZXMgPSB7fTsKLSAgICAgICAgZm9yICh2YXIgY2F0ZWdvcnkg aW4gZW50cmllc0J5Q2F0ZWdvcnkpIHsKLSAgICAgICAgICAgIGVudHJpZXNCeUNhdGVnb3J5W2Nh dGVnb3J5XS5zb3J0KFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwudGltZWxpbmVFbnRyeUNvbXBh cmUpOworICAgICAgICBmb3IgKHZhciBjYXRlZ29yeSBpbiByZXNvdXJjZXNCeUNhdGVnb3J5KSB7 CisgICAgICAgICAgICByZXNvdXJjZXNCeUNhdGVnb3J5W2NhdGVnb3J5XS5zb3J0KFdlYkluc3Bl Y3Rvci5SZXNvdXJjZS5Db21wYXJlQnlUaW1lKTsKICAgICAgICAgICAgIGNhdGVnb3J5VmFsdWVz W2NhdGVnb3J5XSA9IDA7CiAKICAgICAgICAgICAgIHZhciBzZWdtZW50ID0ge3N0YXJ0OiAtMSwg ZW5kOiAtMX07Ci0gICAgICAgICAgICBlbnRyaWVzQnlDYXRlZ29yeVtjYXRlZ29yeV0uZm9yRWFj aChmdW5jdGlvbihlbnRyeSkgewotICAgICAgICAgICAgICAgIGlmIChlbnRyeS5yZXNvdXJjZS5z dGFydFRpbWUgPT0gLTEgfHwgZW50cnkucmVzb3VyY2UuZW5kVGltZSA9PSAtMSkKLSAgICAgICAg ICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgICAgICAgICAgaWYgKGVhcmxpZXN0U3RhcnQg PT09IHVuZGVmaW5lZCkKLSAgICAgICAgICAgICAgICAgICAgZWFybGllc3RTdGFydCA9IGVudHJ5 LnJlc291cmNlLnN0YXJ0VGltZTsKKyAgICAgICAgICAgIHZhciBjYXRlZ29yeVJlc291cmNlcyA9 IHJlc291cmNlc0J5Q2F0ZWdvcnlbY2F0ZWdvcnldOworICAgICAgICAgICAgdmFyIHJlc291cmNl c0xlbmd0aCA9IGNhdGVnb3J5UmVzb3VyY2VzLmxlbmd0aDsKKyAgICAgICAgICAgIGZvciAodmFy IGkgPSAwOyBpIDwgcmVzb3VyY2VzTGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgICAgICB2YXIg cmVzb3VyY2UgPSBjYXRlZ29yeVJlc291cmNlc1tpXTsKKyAgICAgICAgICAgICAgICBpZiAocmVz b3VyY2Uuc3RhcnRUaW1lID09PSAtMSB8fCByZXNvdXJjZS5lbmRUaW1lID09PSAtMSkKKyAgICAg ICAgICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgICAgICAgICBpZiAodHlwZW9mIGVh cmxpZXN0U3RhcnQgPT09ICJ1bmRlZmluZWQiKQorICAgICAgICAgICAgICAgICAgICBlYXJsaWVz dFN0YXJ0ID0gcmVzb3VyY2Uuc3RhcnRUaW1lOwogICAgICAgICAgICAgICAgIGVsc2UKLSAgICAg ICAgICAgICAgICAgICAgZWFybGllc3RTdGFydCA9IE1hdGgubWluKGVhcmxpZXN0U3RhcnQsIGVu dHJ5LnJlc291cmNlLnN0YXJ0VGltZSk7CisgICAgICAgICAgICAgICAgICAgIGVhcmxpZXN0U3Rh cnQgPSBNYXRoLm1pbihlYXJsaWVzdFN0YXJ0LCByZXNvdXJjZS5zdGFydFRpbWUpOwogCi0gICAg ICAgICAgICAgICAgaWYgKGxhdGVzdEVuZCA9PT0gdW5kZWZpbmVkKQotICAgICAgICAgICAgICAg ICAgICBsYXRlc3RFbmQgPSBlbnRyeS5yZXNvdXJjZS5lbmRUaW1lOworICAgICAgICAgICAgICAg IGlmICh0eXBlb2YgbGF0ZXN0RW5kID09PSAidW5kZWZpbmVkIikKKyAgICAgICAgICAgICAgICAg ICAgbGF0ZXN0RW5kID0gcmVzb3VyY2UuZW5kVGltZTsKICAgICAgICAgICAgICAgICBlbHNlCi0g ICAgICAgICAgICAgICAgICAgIGxhdGVzdEVuZCA9IE1hdGgubWF4KGxhdGVzdEVuZCwgZW50cnku cmVzb3VyY2UuZW5kVGltZSk7CisgICAgICAgICAgICAgICAgICAgIGxhdGVzdEVuZCA9IE1hdGgu bWF4KGxhdGVzdEVuZCwgcmVzb3VyY2UuZW5kVGltZSk7CiAKLSAgICAgICAgICAgICAgICBpZiAo ZW50cnkucmVzb3VyY2Uuc3RhcnRUaW1lIDw9IHNlZ21lbnQuZW5kKSB7Ci0gICAgICAgICAgICAg ICAgICAgIHNlZ21lbnQuZW5kID0gTWF0aC5tYXgoc2VnbWVudC5lbmQsIGVudHJ5LnJlc291cmNl LmVuZFRpbWUpOwotICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAg aWYgKHJlc291cmNlLnN0YXJ0VGltZSA8PSBzZWdtZW50LmVuZCkgeworICAgICAgICAgICAgICAg ICAgICBzZWdtZW50LmVuZCA9IE1hdGgubWF4KHNlZ21lbnQuZW5kLCByZXNvdXJjZS5lbmRUaW1l KTsKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICAgICAgfQogCiAg ICAgICAgICAgICAgICAgY2F0ZWdvcnlWYWx1ZXNbY2F0ZWdvcnldICs9IHNlZ21lbnQuZW5kIC0g c2VnbWVudC5zdGFydDsKIAotICAgICAgICAgICAgICAgIHNlZ21lbnQuc3RhcnQgPSBlbnRyeS5y ZXNvdXJjZS5zdGFydFRpbWU7Ci0gICAgICAgICAgICAgICAgc2VnbWVudC5lbmQgPSBlbnRyeS5y ZXNvdXJjZS5lbmRUaW1lOwotICAgICAgICAgICAgfSk7CisgICAgICAgICAgICAgICAgc2VnbWVu dC5zdGFydCA9IHJlc291cmNlLnN0YXJ0VGltZTsKKyAgICAgICAgICAgICAgICBzZWdtZW50LmVu ZCA9IHJlc291cmNlLmVuZFRpbWU7CisgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIC8vIEFk ZCB0aGUgbGFzdCBzZWdtZW50CiAgICAgICAgICAgICBjYXRlZ29yeVZhbHVlc1tjYXRlZ29yeV0g Kz0gc2VnbWVudC5lbmQgLSBzZWdtZW50LnN0YXJ0OwpAQCAtOTg4LDYgKzk5NCwzNyBAQCBXZWJJ bnNwZWN0b3IuVHJhbnNmZXJUaW1lQ2FsY3VsYXRvci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJl dHVybiB7Y2F0ZWdvcnlWYWx1ZXM6IGNhdGVnb3J5VmFsdWVzLCB0b3RhbDogbGF0ZXN0RW5kIC0g ZWFybGllc3RTdGFydH07CiAgICAgfSwKIAorICAgIGNvbXB1dGVCYXJHcmFwaFBlcmNlbnRhZ2Vz OiBmdW5jdGlvbihyZXNvdXJjZSkKKyAgICB7CisgICAgICAgIGlmIChyZXNvdXJjZS5zdGFydFRp bWUgIT09IC0xKQorICAgICAgICAgICAgdmFyIHN0YXJ0ID0gKChyZXNvdXJjZS5zdGFydFRpbWUg LSB0aGlzLm1pbmltdW1Cb3VuZGFyeSkgLyB0aGlzLmJvdW5kYXJ5U3BhbikgKiAxMDA7CisgICAg ICAgIGVsc2UKKyAgICAgICAgICAgIHZhciBzdGFydCA9IDEwMDsKKworICAgICAgICBpZiAocmVz b3VyY2UuZW5kVGltZSAhPT0gLTEpCisgICAgICAgICAgICB2YXIgZW5kID0gKChyZXNvdXJjZS5l bmRUaW1lIC0gdGhpcy5taW5pbXVtQm91bmRhcnkpIC8gdGhpcy5ib3VuZGFyeVNwYW4pICogMTAw OworICAgICAgICBlbHNlCisgICAgICAgICAgICB2YXIgZW5kID0gMTAwOworCisgICAgICAgIHJl dHVybiB7c3RhcnQ6IHN0YXJ0LCBlbmQ6IGVuZH07CisgICAgfSwKKworICAgIHVwZGF0ZUJvdW5k cmllczogZnVuY3Rpb24ocmVzb3VyY2UpCisgICAgeworICAgICAgICB2YXIgZGlkQ2hhbmdlID0g ZmFsc2U7CisgICAgICAgIGlmIChyZXNvdXJjZS5zdGFydFRpbWUgIT09IC0xICYmICh0eXBlb2Yg dGhpcy5taW5pbXVtQm91bmRhcnkgPT09ICJ1bmRlZmluZWQiIHx8IHJlc291cmNlLnN0YXJ0VGlt ZSA8IHRoaXMubWluaW11bUJvdW5kYXJ5KSkgeworICAgICAgICAgICAgdGhpcy5taW5pbXVtQm91 bmRhcnkgPSByZXNvdXJjZS5zdGFydFRpbWU7CisgICAgICAgICAgICBkaWRDaGFuZ2UgPSB0cnVl OworICAgICAgICB9CisKKyAgICAgICAgaWYgKHJlc291cmNlLmVuZFRpbWUgIT09IC0xICYmICh0 eXBlb2YgdGhpcy5tYXhpbXVtQm91bmRhcnkgPT09ICJ1bmRlZmluZWQiIHx8IHJlc291cmNlLmVu ZFRpbWUgPiB0aGlzLm1heGltdW1Cb3VuZGFyeSkpIHsKKyAgICAgICAgICAgIHRoaXMubWF4aW11 bUJvdW5kYXJ5ID0gcmVzb3VyY2UuZW5kVGltZTsKKyAgICAgICAgICAgIGRpZENoYW5nZSA9IHRy dWU7CisgICAgICAgIH0KKworICAgICAgICByZXR1cm4gZGlkQ2hhbmdlOworICAgIH0sCisKICAg ICBnZXQgdGl0bGUoKQogICAgIHsKICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiVHJhbnNmZXIgVGltZSIpOwpAQCAtMTAwNCwxNyArMTA0MSwxNyBAQCBXZWJJbnNwZWN0b3Iu VHJhbnNmZXJUaW1lQ2FsY3VsYXRvci5wcm90b3R5cGUgPSB7CiAgICAgfQogfQogCi1XZWJJbnNw ZWN0b3IuVHJhbnNmZXJUaW1lQ2FsY3VsYXRvci5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5z cGVjdG9yLlRpbWVsaW5lVmFsdWVDYWxjdWxhdG9yLnByb3RvdHlwZTsKK1dlYkluc3BlY3Rvci5S ZXNvdXJjZVRyYW5zZmVyVGltZUNhbGN1bGF0b3IucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYklu c3BlY3Rvci5SZXNvdXJjZUNhbGN1bGF0b3IucHJvdG90eXBlOwogCi1XZWJJbnNwZWN0b3IuVHJh bnNmZXJTaXplQ2FsY3VsYXRvciA9IGZ1bmN0aW9uKCkKK1dlYkluc3BlY3Rvci5SZXNvdXJjZVRy YW5zZmVyU2l6ZUNhbGN1bGF0b3IgPSBmdW5jdGlvbigpCiB7Ci0gICAgV2ViSW5zcGVjdG9yLlRp bWVsaW5lVmFsdWVDYWxjdWxhdG9yLmNhbGwodGhpcyk7CisgICAgV2ViSW5zcGVjdG9yLlJlc291 cmNlQ2FsY3VsYXRvci5jYWxsKHRoaXMpOwogfQogCi1XZWJJbnNwZWN0b3IuVHJhbnNmZXJTaXpl Q2FsY3VsYXRvci5wcm90b3R5cGUgPSB7Ci0gICAgX3ZhbHVlOiBmdW5jdGlvbihlbnRyeSkKK1dl Ykluc3BlY3Rvci5SZXNvdXJjZVRyYW5zZmVyU2l6ZUNhbGN1bGF0b3IucHJvdG90eXBlID0gewor ICAgIF92YWx1ZTogZnVuY3Rpb24ocmVzb3VyY2UpCiAgICAgewotICAgICAgICByZXR1cm4gZW50 cnkucmVzb3VyY2UuY29udGVudExlbmd0aDsKKyAgICAgICAgcmV0dXJuIHJlc291cmNlLmNvbnRl bnRMZW5ndGg7CiAgICAgfSwKIAogICAgIGdldCB0aXRsZSgpCkBAIC0xMDMzLDQgKzEwNzAsNCBA QCBXZWJJbnNwZWN0b3IuVHJhbnNmZXJTaXplQ2FsY3VsYXRvci5wcm90b3R5cGUgPSB7CiAgICAg fQogfQogCi1XZWJJbnNwZWN0b3IuVHJhbnNmZXJTaXplQ2FsY3VsYXRvci5wcm90b3R5cGUuX19w cm90b19fID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmFsdWVDYWxjdWxhdG9yLnByb3RvdHlwZTsK K1dlYkluc3BlY3Rvci5SZXNvdXJjZVRyYW5zZmVyU2l6ZUNhbGN1bGF0b3IucHJvdG90eXBlLl9f cHJvdG9fXyA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZUNhbGN1bGF0b3IucHJvdG90eXBlOwotLSAK MS41LjQuNAoK