84477 2012-04-20 12:20:04 -0700 Heap should cancel GC timer at the start of the collection 2012-04-20 12:55:39 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mhahnenberg mhahnenberg ggaren oldest_to_newest 606799 0 mhahnenberg 2012-04-20 12:20:04 -0700 Currently the Heap cancels the GC timer at the conclusion of a collection. We should change this to be at the beginning because something (e.g. a finalizer) could call didAbandonObjectGraph(), which will schedule the timer, but then we'll immediately unschedule the timer at the conclusion of the collection, thus potentially preventing large swaths of memory from being reclaimed in a timely manner. 606821 1 138146 mhahnenberg 2012-04-20 12:47:48 -0700 Created attachment 138146 Patch 606822 2 138146 ggaren 2012-04-20 12:49:28 -0700 Comment on attachment 138146 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138146&action=review > Source/JavaScriptCore/API/JSBase.cpp:104 > if (!globalData.heap.isBusy()) We want to allow this during GC finalizers! 606824 3 138147 mhahnenberg 2012-04-20 12:53:05 -0700 Created attachment 138147 Patch 606825 4 138147 ggaren 2012-04-20 12:53:44 -0700 Comment on attachment 138147 Patch r=me 606826 5 mhahnenberg 2012-04-20 12:55:39 -0700 Committed r114772: <http://trac.webkit.org/changeset/114772> 138146 2012-04-20 12:47:48 -0700 2012-04-20 12:52:58 -0700 Patch bug-84477-20120420124746.patch text/plain 4429 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTE0NzcxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDEyLTA0LTIwICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgSGVhcCBzaG91bGQgY2FuY2VsIEdDIHRpbWVyIGF0IHRoZSBzdGFydCBvZiB0aGUg Y29sbGVjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODQ0NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIEFQSS9KU0Jhc2UuY3BwOgorICAgICAgICAoSlNHYXJiYWdlQ29sbGVjdCk6IFJlbW92ZSBv dXRkYXRlZCBmaXgtbWUuCisgICAgICAgICogaGVhcC9IZWFwLmNwcDoKKyAgICAgICAgKEpTQzo6 SGVhcDo6Y29sbGVjdCk6IFJlbmFtZSBkaWRDb2xsZWN0IHRvIHdpbGxDb2xsZWN0IGFuZCBtb3Zl IHRoZSBjYWxsIHRvIHRoZSAKKyAgICAgICAgdG9wIG9mIEhlYXA6OmNvbGxlY3QuCisgICAgICAg ICogcnVudGltZS9HQ0FjdGl2aXR5Q2FsbGJhY2suY3BwOiBSZW5hbWVkIGRpZENvbGxlY3QgdG8g d2lsbENvbGxlY3QuCisgICAgICAgIChKU0M6OkRlZmF1bHRHQ0FjdGl2aXR5Q2FsbGJhY2s6Ondp bGxDb2xsZWN0KToKKyAgICAgICAgKiBydW50aW1lL0dDQWN0aXZpdHlDYWxsYmFjay5oOiBEaXR0 by4KKyAgICAgICAgKEpTQzo6R0NBY3Rpdml0eUNhbGxiYWNrOjp3aWxsQ29sbGVjdCk6CisgICAg ICAgIChEZWZhdWx0R0NBY3Rpdml0eUNhbGxiYWNrKTogCisgICAgICAgICogcnVudGltZS9HQ0Fj dGl2aXR5Q2FsbGJhY2tDRi5jcHA6IERpdHRvLgorICAgICAgICAoSlNDOjpEZWZhdWx0R0NBY3Rp dml0eUNhbGxiYWNrOjp3aWxsQ29sbGVjdCk6CisKIDIwMTItMDQtMjAgIE1hcmsgSGFobmVuYmVy ZyAgPG1oYWhuZW5iZXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBKU0dhcmJhZ2VDb2xsZWN0IHNo b3VsZCBub3QgY2FsbCBjb2xsZWN0QWxsR2FyYmFnZSgpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvQVBJL0pTQmFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L0FQSS9KU0Jhc2UuY3BwCShyZXZpc2lvbiAxMTQ3NzEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvQVBJL0pTQmFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMywxMCArMTAzLDYgQEAgdm9p ZCBKU0dhcmJhZ2VDb2xsZWN0KEpTQ29udGV4dFJlZiBjdHgpCiAgICAgSlNHbG9iYWxEYXRhJiBn bG9iYWxEYXRhID0gZXhlYy0+Z2xvYmFsRGF0YSgpOwogICAgIGlmICghZ2xvYmFsRGF0YS5oZWFw LmlzQnVzeSgpKQogICAgICAgICBnbG9iYWxEYXRhLmhlYXAuYWN0aXZpdHlDYWxsYmFjaygpLT5k aWRBYmFuZG9uT2JqZWN0R3JhcGgoKTsKLQotICAgIC8vIEZJWE1FOiBQZXJoYXBzIHdlIHNob3Vs ZCB0cmlnZ2VyIGEgc2Vjb25kIG1hcmsgYW5kIHN3ZWVwCi0gICAgLy8gb25jZSB0aGUgZ2FyYmFn ZSBjb2xsZWN0b3IgaXMgZG9uZSBpZiB0aGlzIGlzIGNhbGxlZCB3aGVuCi0gICAgLy8gdGhlIGNv bGxlY3RvciBpcyBidXN5LgogfQogCiB2b2lkIEpTUmVwb3J0RXh0cmFNZW1vcnlDb3N0KEpTQ29u dGV4dFJlZiBjdHgsIHNpemVfdCBzaXplKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hl YXAvSGVhcC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVh cC5jcHAJKHJldmlzaW9uIDExNDc3MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hl YXAuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MDEsNiArODAxLDggQEAgdm9pZCBIZWFwOjpjb2xs ZWN0KFN3ZWVwVG9nZ2xlIHN3ZWVwVG9nZwogICAgIEFTU0VSVChtX2lzU2FmZVRvQ29sbGVjdCk7 CiAgICAgSkFWQVNDUklQVENPUkVfR0NfQkVHSU4oKTsKIAorICAgIG1fYWN0aXZpdHlDYWxsYmFj ay0+d2lsbENvbGxlY3QoKTsKKwogICAgIGRvdWJsZSBsYXN0R0NTdGFydFRpbWUgPSBXVEY6OmN1 cnJlbnRUaW1lKCk7CiAgICAgaWYgKGxhc3RHQ1N0YXJ0VGltZSAtIG1fbGFzdENvZGVEaXNjYXJk VGltZSA+IG1pbnV0ZSkgewogICAgICAgICBkaXNjYXJkQWxsQ29tcGlsZWRDb2RlKCk7CkBAIC04 NjUsOCArODY3LDYgQEAgdm9pZCBIZWFwOjpjb2xsZWN0KFN3ZWVwVG9nZ2xlIHN3ZWVwVG9nZwog ICAgIGRvdWJsZSBsYXN0R0NFbmRUaW1lID0gV1RGOjpjdXJyZW50VGltZSgpOwogICAgIG1fbGFz dEdDTGVuZ3RoID0gbGFzdEdDRW5kVGltZSAtIGxhc3RHQ1N0YXJ0VGltZTsKICAgICBKQVZBU0NS SVBUQ09SRV9HQ19FTkQoKTsKLQotICAgIG1fYWN0aXZpdHlDYWxsYmFjay0+ZGlkQ29sbGVjdCgp OwogfQogCiB2b2lkIEhlYXA6OmNhbm9uaWNhbGl6ZUNlbGxMaXZlbmVzc0RhdGEoKQpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvR0NBY3Rpdml0eUNhbGxiYWNrLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9HQ0FjdGl2aXR5Q2FsbGJh Y2suY3BwCShyZXZpc2lvbiAxMTQ3NzApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9HQ0FjdGl2aXR5Q2FsbGJhY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0Niw3IEBA IHZvaWQgRGVmYXVsdEdDQWN0aXZpdHlDYWxsYmFjazo6ZGlkQWxsb2MKIHsKIH0KIAotdm9pZCBE ZWZhdWx0R0NBY3Rpdml0eUNhbGxiYWNrOjpkaWRDb2xsZWN0KCkKK3ZvaWQgRGVmYXVsdEdDQWN0 aXZpdHlDYWxsYmFjazo6d2lsbENvbGxlY3QoKQogewogfQogCkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9HQ0FjdGl2aXR5Q2FsbGJhY2suaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9HQ0FjdGl2aXR5Q2FsbGJhY2suaAkocmV2aXNpb24g MTE0NzcwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvR0NBY3Rpdml0eUNhbGxi YWNrLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDcgKzQ0LDcgQEAgY2xhc3MgR0NBY3Rpdml0eUNh bGxiYWNrIHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5HQ0FjdGl2aXR5Q2FsbGJhY2soKSB7IH0K ICAgICB2aXJ0dWFsIHZvaWQgZGlkQWxsb2NhdGUoc2l6ZV90KSB7IH0KLSAgICB2aXJ0dWFsIHZv aWQgZGlkQ29sbGVjdCgpIHsgfQorICAgIHZpcnR1YWwgdm9pZCB3aWxsQ29sbGVjdCgpIHsgfQog ICAgIHZpcnR1YWwgdm9pZCBkaWRBYmFuZG9uT2JqZWN0R3JhcGgoKSB7IH0KICAgICB2aXJ0dWFs IHZvaWQgc3luY2hyb25pemUoKSB7IH0KIApAQCAtNjIsNyArNjIsNyBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCB+RGVmYXVsdEdDQWN0aXZpdHlDYWxsYmFjaygpOwogCiAgICAgdmlydHVhbCB2b2lk IGRpZEFsbG9jYXRlKHNpemVfdCk7Ci0gICAgdmlydHVhbCB2b2lkIGRpZENvbGxlY3QoKTsKKyAg ICB2aXJ0dWFsIHZvaWQgd2lsbENvbGxlY3QoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQWJhbmRv bk9iamVjdEdyYXBoKCk7CiAgICAgdmlydHVhbCB2b2lkIHN5bmNocm9uaXplKCk7CiAKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0dDQWN0aXZpdHlDYWxsYmFja0NGLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9HQ0FjdGl2aXR5Q2Fs bGJhY2tDRi5jcHAJKHJldmlzaW9uIDExNDc3MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0dDQWN0aXZpdHlDYWxsYmFja0NGLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIxLDcg KzEyMSw3IEBAIHZvaWQgRGVmYXVsdEdDQWN0aXZpdHlDYWxsYmFjazo6ZGlkQWxsb2MKICAgICBz Y2hlZHVsZVRpbWVyKGQuZ2V0KCkpOwogfQogCi12b2lkIERlZmF1bHRHQ0FjdGl2aXR5Q2FsbGJh Y2s6OmRpZENvbGxlY3QoKQordm9pZCBEZWZhdWx0R0NBY3Rpdml0eUNhbGxiYWNrOjp3aWxsQ29s bGVjdCgpCiB7CiAgICAgY2FuY2VsVGltZXIoZC5nZXQoKSk7CiB9Cg== 138147 2012-04-20 12:53:05 -0700 2012-04-20 12:53:44 -0700 Patch bug-84477-20120420125304.patch text/plain 5159 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTE0NzcxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBA CisyMDEyLTA0LTIwICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgSGVhcCBzaG91bGQgY2FuY2VsIEdDIHRpbWVyIGF0IHRoZSBzdGFydCBvZiB0aGUg Y29sbGVjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODQ0NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBDdXJyZW50bHkgdGhlIEhlYXAgY2FuY2VscyB0aGUgR0MgdGltZXIgYXQgdGhlIGNvbmNsdXNp b24gb2YgYSBjb2xsZWN0aW9uLiAKKyAgICAgICAgV2Ugc2hvdWxkIGNoYW5nZSB0aGlzIHRvIGJl IGF0IHRoZSBiZWdpbm5pbmcgYmVjYXVzZSBzb21ldGhpbmcgKGUuZy4gYSBmaW5hbGl6ZXIpIAor ICAgICAgICBjb3VsZCBjYWxsIGRpZEFiYW5kb25PYmplY3RHcmFwaCgpLCB3aGljaCB3aWxsIHNj aGVkdWxlIHRoZSB0aW1lciwgYnV0IHRoZW4gCisgICAgICAgIHdlJ2xsIGltbWVkaWF0ZWx5IHVu c2NoZWR1bGUgdGhlIHRpbWVyIGF0IHRoZSBjb25jbHVzaW9uIG9mIHRoZSBjb2xsZWN0aW9uLCAK KyAgICAgICAgdGh1cyBwb3RlbnRpYWxseSBwcmV2ZW50aW5nIGxhcmdlIHN3YXRocyBvZiBtZW1v cnkgZnJvbSBiZWluZyByZWNsYWltZWQgaW4gYSB0aW1lbHkgbWFubmVyLgorCisgICAgICAgICog QVBJL0pTQmFzZS5jcHA6CisgICAgICAgIChKU0dhcmJhZ2VDb2xsZWN0KTogUmVtb3ZlIG91dGRh dGVkIGZpeC1tZSBhbmQgcmVtb3ZlIGNoZWNrIGZvciB3aGV0aGVyIHRoZSBIZWFwIGlzIAorICAg ICAgICBidXN5IG9yIG5vdCwgc2luY2Ugd2UncmUganVzdCBzY2hlZHVsaW5nIGEgdGltZXIgdG8g cnVuIGEgR0MgaW4gdGhlIGZ1dHVyZS4KKyAgICAgICAgKiBoZWFwL0hlYXAuY3BwOgorICAgICAg ICAoSlNDOjpIZWFwOjpjb2xsZWN0KTogUmVuYW1lIGRpZENvbGxlY3QgdG8gd2lsbENvbGxlY3Qg YW5kIG1vdmUgdGhlIGNhbGwgdG8gdGhlIAorICAgICAgICB0b3Agb2YgSGVhcDo6Y29sbGVjdC4K KyAgICAgICAgKiBydW50aW1lL0dDQWN0aXZpdHlDYWxsYmFjay5jcHA6IFJlbmFtZWQgZGlkQ29s bGVjdCB0byB3aWxsQ29sbGVjdC4KKyAgICAgICAgKEpTQzo6RGVmYXVsdEdDQWN0aXZpdHlDYWxs YmFjazo6d2lsbENvbGxlY3QpOgorICAgICAgICAqIHJ1bnRpbWUvR0NBY3Rpdml0eUNhbGxiYWNr Lmg6IERpdHRvLgorICAgICAgICAoSlNDOjpHQ0FjdGl2aXR5Q2FsbGJhY2s6OndpbGxDb2xsZWN0 KToKKyAgICAgICAgKERlZmF1bHRHQ0FjdGl2aXR5Q2FsbGJhY2spOiAKKyAgICAgICAgKiBydW50 aW1lL0dDQWN0aXZpdHlDYWxsYmFja0NGLmNwcDogRGl0dG8uCisgICAgICAgIChKU0M6OkRlZmF1 bHRHQ0FjdGl2aXR5Q2FsbGJhY2s6OndpbGxDb2xsZWN0KToKKwogMjAxMi0wNC0yMCAgTWFyayBI YWhuZW5iZXJnICA8bWhhaG5lbmJlcmdAYXBwbGUuY29tPgogCiAgICAgICAgIEpTR2FyYmFnZUNv bGxlY3Qgc2hvdWxkIG5vdCBjYWxsIGNvbGxlY3RBbGxHYXJiYWdlKCkKSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9BUEkvSlNCYXNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvQVBJL0pTQmFzZS5jcHAJKHJldmlzaW9uIDExNDc3MSkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9BUEkvSlNCYXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAwLDEzICsxMDAs NyBAQCB2b2lkIEpTR2FyYmFnZUNvbGxlY3QoSlNDb250ZXh0UmVmIGN0eCkKICAgICBFeGVjU3Rh dGUqIGV4ZWMgPSB0b0pTKGN0eCk7CiAgICAgQVBJRW50cnlTaGltIGVudHJ5U2hpbShleGVjLCBm YWxzZSk7CiAKLSAgICBKU0dsb2JhbERhdGEmIGdsb2JhbERhdGEgPSBleGVjLT5nbG9iYWxEYXRh KCk7Ci0gICAgaWYgKCFnbG9iYWxEYXRhLmhlYXAuaXNCdXN5KCkpCi0gICAgICAgIGdsb2JhbERh dGEuaGVhcC5hY3Rpdml0eUNhbGxiYWNrKCktPmRpZEFiYW5kb25PYmplY3RHcmFwaCgpOwotCi0g ICAgLy8gRklYTUU6IFBlcmhhcHMgd2Ugc2hvdWxkIHRyaWdnZXIgYSBzZWNvbmQgbWFyayBhbmQg c3dlZXAKLSAgICAvLyBvbmNlIHRoZSBnYXJiYWdlIGNvbGxlY3RvciBpcyBkb25lIGlmIHRoaXMg aXMgY2FsbGVkIHdoZW4KLSAgICAvLyB0aGUgY29sbGVjdG9yIGlzIGJ1c3kuCisgICAgZXhlYy0+ Z2xvYmFsRGF0YSgpLmhlYXAuYWN0aXZpdHlDYWxsYmFjaygpLT5kaWRBYmFuZG9uT2JqZWN0R3Jh cGgoKTsKIH0KIAogdm9pZCBKU1JlcG9ydEV4dHJhTWVtb3J5Q29zdChKU0NvbnRleHRSZWYgY3R4 LCBzaXplX3Qgc2l6ZSkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuY3BwCShyZXZp c2lvbiAxMTQ3NzApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAkod29y a2luZyBjb3B5KQpAQCAtODAxLDYgKzgwMSw4IEBAIHZvaWQgSGVhcDo6Y29sbGVjdChTd2VlcFRv Z2dsZSBzd2VlcFRvZ2cKICAgICBBU1NFUlQobV9pc1NhZmVUb0NvbGxlY3QpOwogICAgIEpBVkFT Q1JJUFRDT1JFX0dDX0JFR0lOKCk7CiAKKyAgICBtX2FjdGl2aXR5Q2FsbGJhY2stPndpbGxDb2xs ZWN0KCk7CisKICAgICBkb3VibGUgbGFzdEdDU3RhcnRUaW1lID0gV1RGOjpjdXJyZW50VGltZSgp OwogICAgIGlmIChsYXN0R0NTdGFydFRpbWUgLSBtX2xhc3RDb2RlRGlzY2FyZFRpbWUgPiBtaW51 dGUpIHsKICAgICAgICAgZGlzY2FyZEFsbENvbXBpbGVkQ29kZSgpOwpAQCAtODY1LDggKzg2Nyw2 IEBAIHZvaWQgSGVhcDo6Y29sbGVjdChTd2VlcFRvZ2dsZSBzd2VlcFRvZ2cKICAgICBkb3VibGUg bGFzdEdDRW5kVGltZSA9IFdURjo6Y3VycmVudFRpbWUoKTsKICAgICBtX2xhc3RHQ0xlbmd0aCA9 IGxhc3RHQ0VuZFRpbWUgLSBsYXN0R0NTdGFydFRpbWU7CiAgICAgSkFWQVNDUklQVENPUkVfR0Nf RU5EKCk7Ci0KLSAgICBtX2FjdGl2aXR5Q2FsbGJhY2stPmRpZENvbGxlY3QoKTsKIH0KIAogdm9p ZCBIZWFwOjpjYW5vbmljYWxpemVDZWxsTGl2ZW5lc3NEYXRhKCkKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0dDQWN0aXZpdHlDYWxsYmFjay5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvR0NBY3Rpdml0eUNhbGxiYWNrLmNwcAkocmV2 aXNpb24gMTE0NzcwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvR0NBY3Rpdml0 eUNhbGxiYWNrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDYsNyArNDYsNyBAQCB2b2lkIERlZmF1 bHRHQ0FjdGl2aXR5Q2FsbGJhY2s6OmRpZEFsbG9jCiB7CiB9CiAKLXZvaWQgRGVmYXVsdEdDQWN0 aXZpdHlDYWxsYmFjazo6ZGlkQ29sbGVjdCgpCit2b2lkIERlZmF1bHRHQ0FjdGl2aXR5Q2FsbGJh Y2s6OndpbGxDb2xsZWN0KCkKIHsKIH0KIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvR0NBY3Rpdml0eUNhbGxiYWNrLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvR0NBY3Rpdml0eUNhbGxiYWNrLmgJKHJldmlzaW9uIDExNDc3MCkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0dDQWN0aXZpdHlDYWxsYmFjay5oCSh3b3Jr aW5nIGNvcHkpCkBAIC00NCw3ICs0NCw3IEBAIGNsYXNzIEdDQWN0aXZpdHlDYWxsYmFjayB7CiBw dWJsaWM6CiAgICAgdmlydHVhbCB+R0NBY3Rpdml0eUNhbGxiYWNrKCkgeyB9CiAgICAgdmlydHVh bCB2b2lkIGRpZEFsbG9jYXRlKHNpemVfdCkgeyB9Ci0gICAgdmlydHVhbCB2b2lkIGRpZENvbGxl Y3QoKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgd2lsbENvbGxlY3QoKSB7IH0KICAgICB2aXJ0dWFs IHZvaWQgZGlkQWJhbmRvbk9iamVjdEdyYXBoKCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIHN5bmNo cm9uaXplKCkgeyB9CiAKQEAgLTYyLDcgKzYyLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgfkRl ZmF1bHRHQ0FjdGl2aXR5Q2FsbGJhY2soKTsKIAogICAgIHZpcnR1YWwgdm9pZCBkaWRBbGxvY2F0 ZShzaXplX3QpOwotICAgIHZpcnR1YWwgdm9pZCBkaWRDb2xsZWN0KCk7CisgICAgdmlydHVhbCB2 b2lkIHdpbGxDb2xsZWN0KCk7CiAgICAgdmlydHVhbCB2b2lkIGRpZEFiYW5kb25PYmplY3RHcmFw aCgpOwogICAgIHZpcnR1YWwgdm9pZCBzeW5jaHJvbml6ZSgpOwogCkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9HQ0FjdGl2aXR5Q2FsbGJhY2tDRi5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvR0NBY3Rpdml0eUNhbGxiYWNrQ0YuY3Bw CShyZXZpc2lvbiAxMTQ3NzApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9HQ0Fj dGl2aXR5Q2FsbGJhY2tDRi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMSw3ICsxMjEsNyBAQCB2 b2lkIERlZmF1bHRHQ0FjdGl2aXR5Q2FsbGJhY2s6OmRpZEFsbG9jCiAgICAgc2NoZWR1bGVUaW1l cihkLmdldCgpKTsKIH0KIAotdm9pZCBEZWZhdWx0R0NBY3Rpdml0eUNhbGxiYWNrOjpkaWRDb2xs ZWN0KCkKK3ZvaWQgRGVmYXVsdEdDQWN0aXZpdHlDYWxsYmFjazo6d2lsbENvbGxlY3QoKQogewog ICAgIGNhbmNlbFRpbWVyKGQuZ2V0KCkpOwogfQo=