46682 2010-09-27 17:35:50 -0700 Patch locks should expire if a patch is marked for retry 2010-09-27 19:21:45 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric eric abarth commit-queue oldest_to_newest 285954 0 eric 2010-09-27 17:35:50 -0700 Patch locks should expire if a patch is marked for retry 285955 1 69000 eric 2010-09-27 17:38:42 -0700 Created attachment 69000 Patch 285957 2 69000 abarth 2010-09-27 17:40:36 -0700 Comment on attachment 69000 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69000&action=review > WebKitTools/QueueStatusServer/handlers/updatestatus.py:68 > + active_items.expire_item(queue_status.active_patch_id) > + active_items.put() This is a read-modify-write. Does it need to be in a transaction to ensure atomicity? 285961 3 eric 2010-09-27 17:44:10 -0700 (In reply to comment #2) > (From update of attachment 69000 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=69000&action=review > > > WebKitTools/QueueStatusServer/handlers/updatestatus.py:68 > > + active_items.expire_item(queue_status.active_patch_id) > > + active_items.put() > > This is a read-modify-write. Does it need to be in a transaction to ensure atomicity? It would, yes. I guess I shoudl do that. :) Originally I thougtht a transaction wouldn't be needed here, but since we're replacing the whole list, that could cause badness in the multiple-writer case. 285977 4 69005 eric 2010-09-27 18:12:49 -0700 Created attachment 69005 Patch 285979 5 eric 2010-09-27 18:15:26 -0700 Now with transactiony goodness. 285983 6 69005 abarth 2010-09-27 18:39:11 -0700 Comment on attachment 69005 Patch yay transactions 286012 7 69005 commit-queue 2010-09-27 19:21:40 -0700 Comment on attachment 69005 Patch Clearing flags on attachment: 69005 Committed r68474: <http://trac.webkit.org/changeset/68474> 286013 8 commit-queue 2010-09-27 19:21:45 -0700 All reviewed patches have been landed. Closing bug. 69000 2010-09-27 17:38:42 -0700 2010-09-27 18:12:46 -0700 Patch bug-46682-20100927173841.patch text/plain 4319 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4Mzk3OWNiZTA1MGEyNzViNzI5MjZiMzc1MTEwNzQ4MTkyYThiYWZiLi5hMmM3N2U1 MzRkMWRhMTE1OWU5OTQ1OWFlOWQ4ZGZjNjNhMzEwZDIzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjUgQEAK IDIwMTAtMDktMjcgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhdGNoIGxvY2tzIHNob3VsZCBl eHBpcmUgaWYgYSBwYXRjaCBpcyBtYXJrZWQgZm9yIHJldHJ5CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjY4MgorCisgICAgICAgIFRoaXMgd2FzIHBh cnQgQWRhbSdzIG9yaWdpbmFsIENvbW1pdFF1ZXVlVGFzayBkZXNpZ24sCisgICAgICAgIGJ1dCBz dXBwb3J0IGZvciBpdCB3YXMgbWlzc2luZyBmcm9tIHRoZSBzZXJ2ZXIuCisgICAgICAgIEkgYWRk ZWQgdGhlIHN1cHBvcnQsIGJ1dCB0cmlnZ2VyaW5nIGxvY2stcmVsZWFzZSBiYXNlZCBvbiB0aGlz CisgICAgICAgIHNwZWNpYWwgInJldHJ5IiBzdGF0dXMgZmVlbHMgYSBiaXQgc3RyYW5nZSBzbyBJ IGFkZGVkIGEgRklYTUUuCisKKyAgICAgICAgSSBhbHNvIGNoYW5nZWQgdGhlIHRleHQgaW4gcXVl dWVzdGF0dXMuaHRtbCB0byBzYXkgIkxvY2sgQWNxdWlyZWQiCisgICAgICAgIHNpbmNlICJMYXN0 IEFjdGl2aXR5IiBpc24ndCByZWFsbHkgdHJ1ZS4gIFdlIG9ubHkgdXBkYXRlIHRoZSBsb2NrCisg ICAgICAgIGRhdGUgd2hlbiB0aGUgcGF0Y2ggaXMgc3RhcnRlZCwgbm90IG9uIGV2ZXJ5IHN0YXR1 cyB1cGRhdGUuCisKKyAgICAgICAgKiBRdWV1ZVN0YXR1c1NlcnZlci9oYW5kbGVycy91cGRhdGVz dGF0dXMucHk6CisgICAgICAgICogUXVldWVTdGF0dXNTZXJ2ZXIvbW9kZWwvYWN0aXZld29ya2l0 ZW1zLnB5OgorICAgICAgICAqIFF1ZXVlU3RhdHVzU2VydmVyL3RlbXBsYXRlcy9xdWV1ZXN0YXR1 cy5odG1sOgorCisyMDEwLTA5LTI3ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKwog ICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgogCiAgICAgICAgIHF1ZXVlLXN0YXR1cyBz aG91bGQgcmVwb3J0IHdoZW4gdGhlIHBhdGNoIHdhcyBsYXN0IGxvY2tlZCB0byBhIHF1ZXVlCmRp ZmYgLS1naXQgYS9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9oYW5kbGVycy91cGRhdGVz dGF0dXMucHkgYi9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9oYW5kbGVycy91cGRhdGVz dGF0dXMucHkKaW5kZXggNWE5M2RiZDcwOGUzYjIxMDFmMDIxYTliOGM4M2JmODU4MDllYjE5MC4u NDc1MTNmMDhmMDMxNGE1N2M2OGU4NTYzNTMyODUxOWQwNjMxZTRiYSAxMDA2NDQKLS0tIGEvV2Vi S2l0VG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMvdXBkYXRlc3RhdHVzLnB5CisrKyBi L1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL2hhbmRsZXJzL3VwZGF0ZXN0YXR1cy5weQpA QCAtMzEsNiArMzEsNyBAQCBmcm9tIGdvb2dsZS5hcHBlbmdpbmUuZXh0IGltcG9ydCB3ZWJhcHAs IGRiCiBmcm9tIGdvb2dsZS5hcHBlbmdpbmUuZXh0LndlYmFwcCBpbXBvcnQgdGVtcGxhdGUKIAog ZnJvbSBoYW5kbGVycy51cGRhdGViYXNlIGltcG9ydCBVcGRhdGVCYXNlCitmcm9tIG1vZGVsLmFj dGl2ZXdvcmtpdGVtcyBpbXBvcnQgQWN0aXZlV29ya0l0ZW1zCiBmcm9tIG1vZGVsLmF0dGFjaG1l bnQgaW1wb3J0IEF0dGFjaG1lbnQKIGZyb20gbW9kZWwucXVldWVzdGF0dXMgaW1wb3J0IFF1ZXVl U3RhdHVzCiAKQEAgLTU2LDggKzU3LDE5IEBAIGNsYXNzIFVwZGF0ZVN0YXR1cyhVcGRhdGVCYXNl KToKICAgICAgICAgcXVldWVfc3RhdHVzLnJlc3VsdHNfZmlsZSA9IGRiLkJsb2Ioc3RyKHJlc3Vs dHNfZmlsZSkpCiAgICAgICAgIHJldHVybiBxdWV1ZV9zdGF0dXMKIAorICAgICMgRklYTUU6IEFu IGV4cGxpY2l0IGxvY2tfcmVsZWFzZSByZXF1ZXN0IHdvdWxkIGJlIGNsZWFuZXIgdGhhbiB0aGlz IG1hZ2ljYWwgIlJldHJ5IiBzdGF0dXMuCisgICAgZGVmIF91cGRhdGVfYWN0aXZlX3dvcmtfaXRl bXMoc2VsZiwgcXVldWVfc3RhdHVzKToKKyAgICAgICAgaWYgcXVldWVfc3RhdHVzLm1lc3NhZ2Ug IT0gIlJldHJ5IjogICMgRnJvbSBBYnN0cmFjdFF1ZXVlLl9yZXRyeV9zdGF0dXMKKyAgICAgICAg ICAgIHJldHVybgorICAgICAgICBhY3RpdmVfaXRlbXMgPSBBY3RpdmVXb3JrSXRlbXMuYWxsKCku ZmlsdGVyKCJxdWV1ZV9uYW1lID0iLCBxdWV1ZV9zdGF0dXMucXVldWVfbmFtZSkuZ2V0KCkKKyAg ICAgICAgaWYgbm90IGFjdGl2ZV9pdGVtczoKKyAgICAgICAgICAgIHJldHVybgorICAgICAgICBh Y3RpdmVfaXRlbXMuZXhwaXJlX2l0ZW0ocXVldWVfc3RhdHVzLmFjdGl2ZV9wYXRjaF9pZCkKKyAg ICAgICAgYWN0aXZlX2l0ZW1zLnB1dCgpCisKICAgICBkZWYgcG9zdChzZWxmKToKICAgICAgICAg cXVldWVfc3RhdHVzID0gc2VsZi5fcXVldWVfc3RhdHVzX2Zyb21fcmVxdWVzdCgpCiAgICAgICAg IHF1ZXVlX3N0YXR1cy5wdXQoKQorICAgICAgICBzZWxmLl91cGRhdGVfYWN0aXZlX3dvcmtfaXRl bXMocXVldWVfc3RhdHVzKQogICAgICAgICBBdHRhY2htZW50LmRpcnR5KHF1ZXVlX3N0YXR1cy5h Y3RpdmVfcGF0Y2hfaWQpCiAgICAgICAgIHNlbGYucmVzcG9uc2Uub3V0LndyaXRlKHF1ZXVlX3N0 YXR1cy5rZXkoKS5pZCgpKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNTZXJ2 ZXIvbW9kZWwvYWN0aXZld29ya2l0ZW1zLnB5IGIvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNTZXJ2 ZXIvbW9kZWwvYWN0aXZld29ya2l0ZW1zLnB5CmluZGV4IDM5OTljOTI5NWI1MGYxMzkyMWIwNTAw MzM4ZDFkMzAwYmRhNjkyODguLmZmZDQzNmEyMDQ2ZGM3ZDlkZTU3NzdlYmEyNzRmYWM0ZTEyNmQz NmIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21vZGVsL2FjdGl2 ZXdvcmtpdGVtcy5weQorKysgYi9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9tb2RlbC9h Y3RpdmV3b3JraXRlbXMucHkKQEAgLTUzLDYgKzUzLDEwIEBAIGNsYXNzIEFjdGl2ZVdvcmtJdGVt cyhkYi5Nb2RlbCk6CiAgICAgICAgIHNlbGYuaXRlbV9pZHMuYXBwZW5kKHBhaXJbMF0pCiAgICAg ICAgIHNlbGYuaXRlbV9kYXRlcy5hcHBlbmQocGFpclsxXSkKIAorICAgIGRlZiBleHBpcmVfaXRl bShzZWxmLCBpdGVtX2lkKToKKyAgICAgICAgbm9uZXhwaXJlZF9wYWlycyA9IFtwYWlyIGZvciBw YWlyIGluIHNlbGYuX2l0ZW1fdGltZV9wYWlycygpIGlmIHBhaXJbMF0gIT0gaXRlbV9pZF0KKyAg ICAgICAgc2VsZi5fc2V0X2l0ZW1fdGltZV9wYWlycyhub25leHBpcmVkX3BhaXJzKQorCiAgICAg ZGVmIGRlYWN0aXZhdGVfZXhwaXJlZChzZWxmLCBub3cpOgogICAgICAgICBvbmVfaG91cl9hZ28g PSB0aW1lLm1rdGltZSgobm93IC0gdGltZWRlbHRhKG1pbnV0ZXM9NjApKS50aW1ldHVwbGUoKSkK ICAgICAgICAgbm9uZXhwaXJlZF9wYWlycyA9IFtwYWlyIGZvciBwYWlyIGluIHNlbGYuX2l0ZW1f dGltZV9wYWlycygpIGlmIHBhaXJbMV0gPiBvbmVfaG91cl9hZ29dCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci90ZW1wbGF0ZXMvcXVldWVzdGF0dXMuaHRtbCBiL1dl YktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL3RlbXBsYXRlcy9xdWV1ZXN0YXR1cy5odG1sCmlu ZGV4IGZiY2RmZWJiMTliMDE4YTQ2N2MwZTZmZjlmMjM5YzQ3MTc3YjNkYWUuLjFiOTg5NTJiZDlh OTk5NDNmODQyZTY5MTgzMGM2ODJjZThmYTRjZjMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F1 ZXVlU3RhdHVzU2VydmVyL3RlbXBsYXRlcy9xdWV1ZXN0YXR1cy5odG1sCisrKyBiL1dlYktpdFRv b2xzL1F1ZXVlU3RhdHVzU2VydmVyL3RlbXBsYXRlcy9xdWV1ZXN0YXR1cy5odG1sCkBAIC00Miw3 ICs0Miw3IEBACiAKIDxoMz5QYXRjaGVzIGluIHF1ZXVlPC9oMz4KIDx0YWJsZT4KLSAgICA8dHI+ PHRoPlBvc2l0aW9uPC90aD48dGg+UGF0Y2g8L3RoPjx0aD5MYXN0IEFjdGl2aXR5PC90aD48L3Ry PgorICAgIDx0cj48dGg+UG9zaXRpb248L3RoPjx0aD5QYXRjaDwvdGg+PHRoPkxvY2sgQWNxdWly ZWQ8L3RoPjwvdHI+CiAgICAgeyUgZm9yIHJvdyBpbiB3b3JrX2l0ZW1fcm93cyAlfQogICAgIDx0 cj4KICAgICAgICAgPHRkPiN7eyBmb3Jsb29wLmNvdW50ZXIgfX08L3RkPgo= 69005 2010-09-27 18:12:49 -0700 2010-09-27 19:21:39 -0700 Patch bug-46682-20100927181248.patch text/plain 5231 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4Mzk3OWNiZTA1MGEyNzViNzI5MjZiMzc1MTEwNzQ4MTkyYThiYWZiLi41ODQxNTFl N2FmOGRkYWJiMDZkMDMzZDgzZDc2M2E3ODYyODQ4ZTFjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjggQEAK IDIwMTAtMDktMjcgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhdGNoIGxvY2tzIHNob3VsZCBl eHBpcmUgaWYgYSBwYXRjaCBpcyBtYXJrZWQgZm9yIHJldHJ5CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjY4MgorCisgICAgICAgIFRoaXMgd2FzIHBh cnQgQWRhbSdzIG9yaWdpbmFsIENvbW1pdFF1ZXVlVGFzayBkZXNpZ24sCisgICAgICAgIGJ1dCBz dXBwb3J0IGZvciBpdCB3YXMgbWlzc2luZyBmcm9tIHRoZSBzZXJ2ZXIuCisgICAgICAgIEkgYWRk ZWQgdGhlIHN1cHBvcnQsIGJ1dCB0cmlnZ2VyaW5nIGxvY2stcmVsZWFzZSBiYXNlZCBvbiB0aGlz CisgICAgICAgIHNwZWNpYWwgInJldHJ5IiBzdGF0dXMgZmVlbHMgYSBiaXQgc3RyYW5nZSBzbyBJ IGFkZGVkIGEgRklYTUUuCisKKyAgICAgICAgSSBhbHNvIGNoYW5nZWQgdGhlIHRleHQgaW4gcXVl dWVzdGF0dXMuaHRtbCB0byBzYXkgIkxvY2sgQWNxdWlyZWQiCisgICAgICAgIHNpbmNlICJMYXN0 IEFjdGl2aXR5IiBpc24ndCByZWFsbHkgdHJ1ZS4gIFdlIG9ubHkgdXBkYXRlIHRoZSBsb2NrCisg ICAgICAgIGRhdGUgd2hlbiB0aGUgcGF0Y2ggaXMgc3RhcnRlZCwgbm90IG9uIGV2ZXJ5IHN0YXR1 cyB1cGRhdGUuCisKKyAgICAgICAgSSBhbHNvIG5vdGljZWQgYW4gZXhjZXB0aW9uIGluIG5leHQt cGF0Y2gsIHdoaWNoIEkgZml4ZWQgYnkgcmUtd3JpdGluZworICAgICAgICB0aGUgdW56aXAgbG9n aWMgaW4gYWN0aXZld29ya2l0ZW1zLnB5IGFnYWluLgorCisgICAgICAgICogUXVldWVTdGF0dXNT ZXJ2ZXIvaGFuZGxlcnMvdXBkYXRlc3RhdHVzLnB5OgorICAgICAgICAqIFF1ZXVlU3RhdHVzU2Vy dmVyL21vZGVsL2FjdGl2ZXdvcmtpdGVtcy5weToKKyAgICAgICAgKiBRdWV1ZVN0YXR1c1NlcnZl ci90ZW1wbGF0ZXMvcXVldWVzdGF0dXMuaHRtbDoKKworMjAxMC0wOS0yNyAgRXJpYyBTZWlkZWwg IDxlcmljQHdlYmtpdC5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KIAog ICAgICAgICBxdWV1ZS1zdGF0dXMgc2hvdWxkIHJlcG9ydCB3aGVuIHRoZSBwYXRjaCB3YXMgbGFz dCBsb2NrZWQgdG8gYSBxdWV1ZQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNT ZXJ2ZXIvaGFuZGxlcnMvdXBkYXRlc3RhdHVzLnB5IGIvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNT ZXJ2ZXIvaGFuZGxlcnMvdXBkYXRlc3RhdHVzLnB5CmluZGV4IDVhOTNkYmQ3MDhlM2IyMTAxZjAy MWE5YjhjODNiZjg1ODA5ZWIxOTAuLjg5ODU4YjY5OTFiZmMwMjkwM2ZjYWJkZjJmNDJkOTg5MzUz ODQ1NzMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL2hhbmRsZXJz L3VwZGF0ZXN0YXR1cy5weQorKysgYi9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9oYW5k bGVycy91cGRhdGVzdGF0dXMucHkKQEAgLTMxLDYgKzMxLDcgQEAgZnJvbSBnb29nbGUuYXBwZW5n aW5lLmV4dCBpbXBvcnQgd2ViYXBwLCBkYgogZnJvbSBnb29nbGUuYXBwZW5naW5lLmV4dC53ZWJh cHAgaW1wb3J0IHRlbXBsYXRlCiAKIGZyb20gaGFuZGxlcnMudXBkYXRlYmFzZSBpbXBvcnQgVXBk YXRlQmFzZQorZnJvbSBtb2RlbC5hY3RpdmV3b3JraXRlbXMgaW1wb3J0IEFjdGl2ZVdvcmtJdGVt cwogZnJvbSBtb2RlbC5hdHRhY2htZW50IGltcG9ydCBBdHRhY2htZW50CiBmcm9tIG1vZGVsLnF1 ZXVlc3RhdHVzIGltcG9ydCBRdWV1ZVN0YXR1cwogCkBAIC01Niw4ICs1NywyNCBAQCBjbGFzcyBV cGRhdGVTdGF0dXMoVXBkYXRlQmFzZSk6CiAgICAgICAgIHF1ZXVlX3N0YXR1cy5yZXN1bHRzX2Zp bGUgPSBkYi5CbG9iKHN0cihyZXN1bHRzX2ZpbGUpKQogICAgICAgICByZXR1cm4gcXVldWVfc3Rh dHVzCiAKKyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIF9leHBpcmVfaXRlbShrZXksIGl0ZW1f aWQpOgorICAgICAgICBhY3RpdmVfd29ya19pdGVtcyA9IGRiLmdldChrZXkpCisgICAgICAgIGFj dGl2ZV93b3JrX2l0ZW1zLmV4cGlyZV9pdGVtKGl0ZW1faWQpCisgICAgICAgIGFjdGl2ZV93b3Jr X2l0ZW1zLnB1dCgpCisKKyAgICAjIEZJWE1FOiBBbiBleHBsaWNpdCBsb2NrX3JlbGVhc2UgcmVx dWVzdCB3b3VsZCBiZSBjbGVhbmVyIHRoYW4gdGhpcyBtYWdpY2FsICJSZXRyeSIgc3RhdHVzLgor ICAgIGRlZiBfdXBkYXRlX2FjdGl2ZV93b3JrX2l0ZW1zKHNlbGYsIHF1ZXVlX3N0YXR1cyk6Cisg ICAgICAgIGlmIHF1ZXVlX3N0YXR1cy5tZXNzYWdlICE9ICJSZXRyeSI6ICAjIEZyb20gQWJzdHJh Y3RRdWV1ZS5fcmV0cnlfc3RhdHVzCisgICAgICAgICAgICByZXR1cm4KKyAgICAgICAgYWN0aXZl X2l0ZW1zID0gQWN0aXZlV29ya0l0ZW1zLmFsbCgpLmZpbHRlcigicXVldWVfbmFtZSA9IiwgcXVl dWVfc3RhdHVzLnF1ZXVlX25hbWUpLmdldCgpCisgICAgICAgIGlmIG5vdCBhY3RpdmVfaXRlbXM6 CisgICAgICAgICAgICByZXR1cm4KKyAgICAgICAgcmV0dXJuIGRiLnJ1bl9pbl90cmFuc2FjdGlv bihzZWxmLl9leHBpcmVfaXRlbSwgYWN0aXZlX2l0ZW1zLmtleSgpLCBxdWV1ZV9zdGF0dXMuYWN0 aXZlX3BhdGNoX2lkKQorCiAgICAgZGVmIHBvc3Qoc2VsZik6CiAgICAgICAgIHF1ZXVlX3N0YXR1 cyA9IHNlbGYuX3F1ZXVlX3N0YXR1c19mcm9tX3JlcXVlc3QoKQogICAgICAgICBxdWV1ZV9zdGF0 dXMucHV0KCkKKyAgICAgICAgc2VsZi5fdXBkYXRlX2FjdGl2ZV93b3JrX2l0ZW1zKHF1ZXVlX3N0 YXR1cykKICAgICAgICAgQXR0YWNobWVudC5kaXJ0eShxdWV1ZV9zdGF0dXMuYWN0aXZlX3BhdGNo X2lkKQogICAgICAgICBzZWxmLnJlc3BvbnNlLm91dC53cml0ZShxdWV1ZV9zdGF0dXMua2V5KCku aWQoKSkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21vZGVsL2Fj dGl2ZXdvcmtpdGVtcy5weSBiL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21vZGVsL2Fj dGl2ZXdvcmtpdGVtcy5weQppbmRleCAzOTk5YzkyOTViNTBmMTM5MjFiMDUwMDMzOGQxZDMwMGJk YTY5Mjg4Li40OTZmOTAwMTIwNzQxNzRhMmZiZjRlOGMyNmQxZTg1YWNkNDFkODFlIDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9tb2RlbC9hY3RpdmV3b3JraXRlbXMu cHkKKysrIGIvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvbW9kZWwvYWN0aXZld29ya2l0 ZW1zLnB5CkBAIC00MywxNiArNDMsMjEgQEAgY2xhc3MgQWN0aXZlV29ya0l0ZW1zKGRiLk1vZGVs KToKICAgICAgICAgcmV0dXJuIHppcChzZWxmLml0ZW1faWRzLCBzZWxmLml0ZW1fZGF0ZXMpCiAK ICAgICBkZWYgX3NldF9pdGVtX3RpbWVfcGFpcnMoc2VsZiwgcGFpcnMpOgotICAgICAgICBpZiBu b3QgcGFpcnM6Ci0gICAgICAgICAgICBzZWxmLml0ZW1faWRzID0gW10KLSAgICAgICAgICAgIHNl bGYuaXRlbV9kYXRlcyA9IFtdCi0gICAgICAgICAgICByZXR1cm4KLSAgICAgICAgc2VsZi5pdGVt X2lkcywgc2VsZi5pdGVtX2RhdGVzID0gemlwKCpwYWlycykKKyAgICAgICAgaWYgcGFpcnM6Cisg ICAgICAgICAgICAjIFRoZSAqIG9wZXJhdG9yIHJhaXNlcyBvbiBhbiBlbXB0eSBsaXN0LgorICAg ICAgICAgICAgIyBkYi5Nb2RlbCBkb2VzIG5vdCB0dXBsZXMsIHdlIGhhdmUgdG8gbWFrZSBsaXN0 cy4KKyAgICAgICAgICAgIHNlbGYuaXRlbV9pZHMsIHNlbGYuaXRlbV9kYXRlcyA9IG1hcChsaXN0 LCB6aXAoKnBhaXJzKSkKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHNlbGYuaXRlbV9pZHMg PSBzZWxmLml0ZW1fZGF0ZXMgPSBbXQogCiAgICAgZGVmIF9hcHBlbmRfaXRlbV90aW1lX3BhaXIo c2VsZiwgcGFpcik6CiAgICAgICAgIHNlbGYuaXRlbV9pZHMuYXBwZW5kKHBhaXJbMF0pCiAgICAg ICAgIHNlbGYuaXRlbV9kYXRlcy5hcHBlbmQocGFpclsxXSkKIAorICAgIGRlZiBleHBpcmVfaXRl bShzZWxmLCBpdGVtX2lkKToKKyAgICAgICAgbm9uZXhwaXJlZF9wYWlycyA9IFtwYWlyIGZvciBw YWlyIGluIHNlbGYuX2l0ZW1fdGltZV9wYWlycygpIGlmIHBhaXJbMF0gIT0gaXRlbV9pZF0KKyAg ICAgICAgc2VsZi5fc2V0X2l0ZW1fdGltZV9wYWlycyhub25leHBpcmVkX3BhaXJzKQorCiAgICAg ZGVmIGRlYWN0aXZhdGVfZXhwaXJlZChzZWxmLCBub3cpOgogICAgICAgICBvbmVfaG91cl9hZ28g PSB0aW1lLm1rdGltZSgobm93IC0gdGltZWRlbHRhKG1pbnV0ZXM9NjApKS50aW1ldHVwbGUoKSkK ICAgICAgICAgbm9uZXhwaXJlZF9wYWlycyA9IFtwYWlyIGZvciBwYWlyIGluIHNlbGYuX2l0ZW1f dGltZV9wYWlycygpIGlmIHBhaXJbMV0gPiBvbmVfaG91cl9hZ29dCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci90ZW1wbGF0ZXMvcXVldWVzdGF0dXMuaHRtbCBiL1dl YktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL3RlbXBsYXRlcy9xdWV1ZXN0YXR1cy5odG1sCmlu ZGV4IGZiY2RmZWJiMTliMDE4YTQ2N2MwZTZmZjlmMjM5YzQ3MTc3YjNkYWUuLjFiOTg5NTJiZDlh OTk5NDNmODQyZTY5MTgzMGM2ODJjZThmYTRjZjMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F1 ZXVlU3RhdHVzU2VydmVyL3RlbXBsYXRlcy9xdWV1ZXN0YXR1cy5odG1sCisrKyBiL1dlYktpdFRv b2xzL1F1ZXVlU3RhdHVzU2VydmVyL3RlbXBsYXRlcy9xdWV1ZXN0YXR1cy5odG1sCkBAIC00Miw3 ICs0Miw3IEBACiAKIDxoMz5QYXRjaGVzIGluIHF1ZXVlPC9oMz4KIDx0YWJsZT4KLSAgICA8dHI+ PHRoPlBvc2l0aW9uPC90aD48dGg+UGF0Y2g8L3RoPjx0aD5MYXN0IEFjdGl2aXR5PC90aD48L3Ry PgorICAgIDx0cj48dGg+UG9zaXRpb248L3RoPjx0aD5QYXRjaDwvdGg+PHRoPkxvY2sgQWNxdWly ZWQ8L3RoPjwvdHI+CiAgICAgeyUgZm9yIHJvdyBpbiB3b3JrX2l0ZW1fcm93cyAlfQogICAgIDx0 cj4KICAgICAgICAgPHRkPiN7eyBmb3Jsb29wLmNvdW50ZXIgfX08L3RkPgo=