65782 2011-08-05 11:40:49 -0700 Fix Timer heap implementation to work with more libraries (other versions of STL) 2011-08-06 13:17:31 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 darin darin andersca oldest_to_newest 447313 0 darin 2011-08-05 11:40:49 -0700 Fix Timer heap implementation to work with more libraries (other versions of STL) 447314 1 103092 darin 2011-08-05 11:43:25 -0700 Created attachment 103092 Patch 447506 2 darin 2011-08-05 17:41:26 -0700 I’ll have to find time to fix the Windows build and then land. 447508 3 darin 2011-08-05 17:42:56 -0700 I also noticed there is a typo in swap, timerB = a, which did not cause a problem at runtime because it is not used in our current library implementations. I’ll fix that typo before landing. 447649 4 darin 2011-08-06 13:17:31 -0700 Committed r92556: <http://trac.webkit.org/changeset/92556> 103092 2011-08-05 11:43:25 -0700 2011-08-05 17:41:11 -0700 Patch bug-65782-20110805114324.patch text/plain 12943 darin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkyNDkxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDgtMDUgIERhcmluIEFk bGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBUaW1lciBoZWFwIGltcGxlbWVu dGF0aW9uIHRvIHdvcmsgd2l0aCBtb3JlIGxpYnJhcmllcyAob3RoZXIgdmVyc2lvbnMgb2YgU1RM KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjU3ODIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBiZWhh dmlvciBjaGFuZ2UsIHNvIG5vIHRlc3RzIG5lZWRlZC4gRXhpc3RpbmcgdGVzdHMgcGFzcy4KKwor ICAgICAgICAqIHBsYXRmb3JtL1RpbWVyLmNwcDogQWRkZWQgVGltZXJIZWFwUG9pbnRlciBhbmQg VGltZXJIZWFwUmVmZXJlbmNlIGNsYXNzCisgICAgICAgIGFsb25nc2lkZSB0aGUgVGltZXJIZWFw SXRlcmF0b3IgY2xhc3MuIEFsc28gYWRkZWQgYSBzd2FwIGZ1bmN0aW9uLiBBbHNvCisgICAgICAg IGFkZGVkIGEgVGltZXJIZWFwTGVzc1RoYW5GdW5jdGlvbiBjbGFzcy4KKyAgICAgICAgKFdlYkNv cmU6OlRpbWVyQmFzZTo6aGVhcERlY3JlYXNlS2V5KTogUGFzcyBwb2ludGVycyBpbiB0byB0aGUg VGltZXJIZWFwSXRlcmF0b3IKKyAgICAgICAgc2luY2UgdGhhdCdzIGhvdyB0aGUgY2xhc3Mgd29y a3Mgbm93LiBQYXNzIGEgVGltZXJIZWFwTGVzc1RoYW5GdW5jdGlvbiBvYmplY3QKKyAgICAgICAg aW5zdGVhZCBvZiBsZXR0aW5nIHRoZSBsaWJyYXJ5IHVzZSB0aGUgPCBvcGVyYXRvciBkaXJlY3Rs eS4KKyAgICAgICAgKFdlYkNvcmU6OlRpbWVyQmFzZTo6aGVhcFBvcE1pbik6IERpdHRvLgorCisg ICAgICAgICogcGxhdGZvcm0vVGltZXIuaDogVXBkYXRlZCBmb3IgYWJvdmUgY2hhbmdlcy4KKwog MjAxMS0wOC0wNSAgSm9jaGVuIEVpc2luZ2VyICA8am9jaGVuQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBJbnRyb2R1Y2UgYSBuZXcgUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRUeXBlIGZvciBYSFJz CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9UaW1lci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVGltZXIuY3BwCShyZXZpc2lvbiA5MjQ5MSkKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1RpbWVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDEsNiAr NDEsOCBAQCB1c2luZyBuYW1lc3BhY2Ugc3RkOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2Ns YXNzIFRpbWVySGVhcFJlZmVyZW5jZTsKKwogLy8gVGltZXJzIGFyZSBzdG9yZWQgaW4gYSBoZWFw IGRhdGEgc3RydWN0dXJlLCB1c2VkIHRvIGltcGxlbWVudCBhIHByaW9yaXR5IHF1ZXVlLgogLy8g VGhpcyBhbGxvd3MgdXMgdG8gZWZmaWNpZW50bHkgZGV0ZXJtaW5lIHdoaWNoIHRpbWVyIG5lZWRz IHRvIGZpcmUgdGhlIHNvb25lc3QuCiAvLyBUaGVuIHdlIHNldCBhIHNpbmdsZSBzaGFyZWQgc3lz dGVtIHRpbWVyIHRvIGZpcmUgYXQgdGhhdCB0aW1lLgpAQCAtNTMsMTEwICs1NSwxMzYgQEAgc3Rh dGljIFZlY3RvcjxUaW1lckJhc2UqPiYgdGltZXJIZWFwKCkKICAgICByZXR1cm4gdGhyZWFkR2xv YmFsRGF0YSgpLnRocmVhZFRpbWVycygpLnRpbWVySGVhcCgpOwogfQogCi0vLyBDbGFzcyB0byBy ZXByZXNlbnQgZWxlbWVudHMgaW4gdGhlIGhlYXAgd2hlbiBjYWxsaW5nIHRoZSBzdGFuZGFyZCBs aWJyYXJ5IGhlYXAgYWxnb3JpdGhtcy4KLS8vIE1haW50YWlucyB0aGUgbV9oZWFwSW5kZXggdmFs dWUgaW4gdGhlIHRpbWVycyB0aGVtc2VsdmVzLCB3aGljaCBhbGxvd3MgdXMgdG8gZG8gZWZmaWNp ZW50Ci0vLyBtb2RpZmljYXRpb24gb2YgdGhlIGhlYXAuCi1jbGFzcyBUaW1lckhlYXBFbGVtZW50 IHsKLXB1YmxpYzoKLSAgICBleHBsaWNpdCBUaW1lckhlYXBFbGVtZW50KGludCBpKQotICAgICAg ICA6IG1faW5kZXgoaSkKLSAgICAgICAgLCBtX3RpbWVyKHRpbWVySGVhcCgpW21faW5kZXhdKQot ICAgIHsgCi0gICAgICAgIGNoZWNrQ29uc2lzdGVuY3koKTsgCi0gICAgfQotCi0gICAgVGltZXJI ZWFwRWxlbWVudChjb25zdCBUaW1lckhlYXBFbGVtZW50Jik7Ci0gICAgVGltZXJIZWFwRWxlbWVu dCYgb3BlcmF0b3I9KGNvbnN0IFRpbWVySGVhcEVsZW1lbnQmKTsKLQotICAgIFRpbWVyQmFzZSog dGltZXIoKSBjb25zdCB7IHJldHVybiBtX3RpbWVyOyB9Ci0KLSAgICB2b2lkIGNoZWNrQ29uc2lz dGVuY3koKSBjb25zdAotICAgIHsKLSAgICAgICAgQVNTRVJUKG1faW5kZXggPj0gMCk7Ci0gICAg ICAgIEFTU0VSVChtX2luZGV4IDwgc3RhdGljX2Nhc3Q8aW50Pih0aW1lckhlYXAoKS5zaXplKCkp KTsKLSAgICB9CisvLyAtLS0tLS0tLS0tLS0tLS0tCiAKK2NsYXNzIFRpbWVySGVhcFBvaW50ZXIg eworcHVibGljOgorICAgIFRpbWVySGVhcFBvaW50ZXIoVGltZXJCYXNlKiogcG9pbnRlcikgOiBt X3BvaW50ZXIocG9pbnRlcikgeyB9CisgICAgVGltZXJIZWFwUmVmZXJlbmNlIG9wZXJhdG9yKigp IGNvbnN0OworICAgIFRpbWVyQmFzZSogb3BlcmF0b3ItPigpIGNvbnN0IHsgcmV0dXJuICptX3Bv aW50ZXI7IH0KIHByaXZhdGU6Ci0gICAgVGltZXJIZWFwRWxlbWVudCgpOworICAgIFRpbWVyQmFz ZSoqIG1fcG9pbnRlcjsKK307CiAKLSAgICBpbnQgbV9pbmRleDsKLSAgICBUaW1lckJhc2UqIG1f dGltZXI7CitjbGFzcyBUaW1lckhlYXBSZWZlcmVuY2UgeworcHVibGljOgorICAgIFRpbWVySGVh cFJlZmVyZW5jZShUaW1lckJhc2UqJiByZWZlcmVuY2UpIDogbV9yZWZlcmVuY2UocmVmZXJlbmNl KSB7IH0KKyAgICBvcGVyYXRvciBUaW1lckJhc2UqKCkgY29uc3QgeyByZXR1cm4gbV9yZWZlcmVu Y2U7IH0KKyAgICBUaW1lckhlYXBQb2ludGVyIG9wZXJhdG9yJigpIGNvbnN0IHsgcmV0dXJuICZt X3JlZmVyZW5jZTsgfQorICAgIFRpbWVySGVhcFJlZmVyZW5jZSYgb3BlcmF0b3I9KFRpbWVyQmFz ZSopOworICAgIFRpbWVySGVhcFJlZmVyZW5jZSYgb3BlcmF0b3I9KFRpbWVySGVhcFJlZmVyZW5j ZSk7Citwcml2YXRlOgorICAgIFRpbWVyQmFzZSomIG1fcmVmZXJlbmNlOwogfTsKIAotaW5saW5l IFRpbWVySGVhcEVsZW1lbnQ6OlRpbWVySGVhcEVsZW1lbnQoY29uc3QgVGltZXJIZWFwRWxlbWVu dCYgbykKLSAgICA6IG1faW5kZXgoLTEpLCBtX3RpbWVyKG8udGltZXIoKSkKK2lubGluZSBUaW1l ckhlYXBSZWZlcmVuY2UgVGltZXJIZWFwUG9pbnRlcjo6b3BlcmF0b3IqKCkgY29uc3QKIHsKKyAg ICByZXR1cm4gKm1fcG9pbnRlcjsKIH0KIAotaW5saW5lIFRpbWVySGVhcEVsZW1lbnQmIFRpbWVy SGVhcEVsZW1lbnQ6Om9wZXJhdG9yPShjb25zdCBUaW1lckhlYXBFbGVtZW50JiBvKQoraW5saW5l IFRpbWVySGVhcFJlZmVyZW5jZSYgVGltZXJIZWFwUmVmZXJlbmNlOjpvcGVyYXRvcj0oVGltZXJC YXNlKiB0aW1lcikKIHsKLSAgICBUaW1lckJhc2UqIHQgPSBvLnRpbWVyKCk7Ci0gICAgbV90aW1l ciA9IHQ7Ci0gICAgaWYgKG1faW5kZXggIT0gLTEpIHsKLSAgICAgICAgY2hlY2tDb25zaXN0ZW5j eSgpOwotICAgICAgICB0aW1lckhlYXAoKVttX2luZGV4XSA9IHQ7Ci0gICAgICAgIHQtPm1faGVh cEluZGV4ID0gbV9pbmRleDsKLSAgICB9CisgICAgbV9yZWZlcmVuY2UgPSB0aW1lcjsKKyAgICBW ZWN0b3I8VGltZXJCYXNlKj4mIGhlYXAgPSB0aW1lckhlYXAoKTsKKyAgICBpZiAoJm1fcmVmZXJl bmNlID49IGhlYXAuZGF0YSgpICYmICZtX3JlZmVyZW5jZSA8IGhlYXAuZGF0YSgpICsgaGVhcC5z aXplKCkpCisgICAgICAgIHRpbWVyLT5tX2hlYXBJbmRleCA9ICZtX3JlZmVyZW5jZSAtIGhlYXAu ZGF0YSgpOwogICAgIHJldHVybiAqdGhpczsKIH0KIAotaW5saW5lIGJvb2wgb3BlcmF0b3I8KGNv bnN0IFRpbWVySGVhcEVsZW1lbnQmIGEsIGNvbnN0IFRpbWVySGVhcEVsZW1lbnQmIGIpCitpbmxp bmUgVGltZXJIZWFwUmVmZXJlbmNlJiBUaW1lckhlYXBSZWZlcmVuY2U6Om9wZXJhdG9yPShUaW1l ckhlYXBSZWZlcmVuY2UgYikKIHsKLSAgICAvLyBUaGUgY29tcGFyaXNvbnMgYmVsb3cgYXJlICJi YWNrd2FyZHMiIGJlY2F1c2UgdGhlIGhlYXAgcHV0cyB0aGUgbGFyZ2VzdCAKLSAgICAvLyBlbGVt ZW50IGZpcnN0IGFuZCB3ZSB3YW50IHRoZSBsb3dlc3QgdGltZSB0byBiZSB0aGUgZmlyc3Qgb25l IGluIHRoZSBoZWFwLgotICAgIGRvdWJsZSBhRmlyZVRpbWUgPSBhLnRpbWVyKCktPm1fbmV4dEZp cmVUaW1lOwotICAgIGRvdWJsZSBiRmlyZVRpbWUgPSBiLnRpbWVyKCktPm1fbmV4dEZpcmVUaW1l OwotICAgIGlmIChiRmlyZVRpbWUgIT0gYUZpcmVUaW1lKQotICAgICAgICByZXR1cm4gYkZpcmVU aW1lIDwgYUZpcmVUaW1lOwotICAgIAotICAgIC8vIFdlIG5lZWQgdG8gbG9vayBhdCB0aGUgZGlm ZmVyZW5jZSBvZiB0aGUgaW5zZXJ0aW9uIG9yZGVycyBpbnN0ZWFkIG9mIGNvbXBhcmluZyB0aGUg dHdvIAotICAgIC8vIG91dHJpZ2h0IGluIGNhc2Ugb2Ygb3ZlcmZsb3cuIAotICAgIHVuc2lnbmVk IGRpZmZlcmVuY2UgPSBhLnRpbWVyKCktPm1faGVhcEluc2VydGlvbk9yZGVyIC0gYi50aW1lcigp LT5tX2hlYXBJbnNlcnRpb25PcmRlcjsKLSAgICByZXR1cm4gZGlmZmVyZW5jZSA8IFVJTlRfTUFY IC8gMjsKKyAgICBUaW1lckJhc2UqIHRpbWVyID0gYjsKKyAgICByZXR1cm4gKnRoaXMgPSB0aW1l cjsKK30KKworaW5saW5lIHZvaWQgc3dhcChUaW1lckhlYXBSZWZlcmVuY2UgYSwgVGltZXJIZWFw UmVmZXJlbmNlIGIpCit7CisgICAgVGltZXJCYXNlKiB0aW1lckEgPSBhOworICAgIFRpbWVyQmFz ZSogdGltZXJCID0gYTsKKyAgICBhID0gdGltZXJCOworICAgIGIgPSB0aW1lckE7CiB9CiAKIC8v IC0tLS0tLS0tLS0tLS0tLS0KIAogLy8gQ2xhc3MgdG8gcmVwcmVzZW50IGl0ZXJhdG9ycyBpbiB0 aGUgaGVhcCB3aGVuIGNhbGxpbmcgdGhlIHN0YW5kYXJkIGxpYnJhcnkgaGVhcCBhbGdvcml0aG1z LgotLy8gUmV0dXJucyBUaW1lckhlYXBFbGVtZW50IGZvciBlbGVtZW50cyBpbiB0aGUgaGVhcCBy YXRoZXIgdGhhbiB0aGUgVGltZXJCYXNlIHBvaW50ZXJzIHRoZW1zZWx2ZXMuCi1jbGFzcyBUaW1l ckhlYXBJdGVyYXRvciA6IHB1YmxpYyBpdGVyYXRvcjxyYW5kb21fYWNjZXNzX2l0ZXJhdG9yX3Rh ZywgVGltZXJIZWFwRWxlbWVudCwgaW50PiB7CisvLyBVc2VzIGEgY3VzdG9tIHBvaW50ZXIgYW5k IHJlZmVyZW5jZSB0eXBlIHRoYXQgdXBkYXRlIGluZGljZXMgZm9yIHBvaW50ZXJzIGluIHRoZSBo ZWFwLgorY2xhc3MgVGltZXJIZWFwSXRlcmF0b3IgOiBwdWJsaWMgaXRlcmF0b3I8cmFuZG9tX2Fj Y2Vzc19pdGVyYXRvcl90YWcsIFRpbWVyQmFzZSosIHB0cmRpZmZfdCwgVGltZXJIZWFwUG9pbnRl ciwgVGltZXJIZWFwUmVmZXJlbmNlPiB7CiBwdWJsaWM6Ci0gICAgVGltZXJIZWFwSXRlcmF0b3Io KSA6IG1faW5kZXgoLTEpIHsgfQotICAgIFRpbWVySGVhcEl0ZXJhdG9yKGludCBpKSA6IG1faW5k ZXgoaSkgeyBjaGVja0NvbnNpc3RlbmN5KCk7IH0KLQotICAgIFRpbWVySGVhcEl0ZXJhdG9yJiBv cGVyYXRvcisrKCkgeyBjaGVja0NvbnNpc3RlbmN5KCk7ICsrbV9pbmRleDsgY2hlY2tDb25zaXN0 ZW5jeSgpOyByZXR1cm4gKnRoaXM7IH0KLSAgICBUaW1lckhlYXBJdGVyYXRvciBvcGVyYXRvcisr KGludCkgeyBjaGVja0NvbnNpc3RlbmN5KCk7IGNoZWNrQ29uc2lzdGVuY3koMSk7IHJldHVybiBt X2luZGV4Kys7IH0KKyAgICBleHBsaWNpdCBUaW1lckhlYXBJdGVyYXRvcihUaW1lckJhc2UqKiBw b2ludGVyKSA6IG1fcG9pbnRlcihwb2ludGVyKSB7IGNoZWNrQ29uc2lzdGVuY3koKTsgfQogCi0g ICAgVGltZXJIZWFwSXRlcmF0b3ImIG9wZXJhdG9yLS0oKSB7IGNoZWNrQ29uc2lzdGVuY3koKTsg LS1tX2luZGV4OyBjaGVja0NvbnNpc3RlbmN5KCk7IHJldHVybiAqdGhpczsgfQotICAgIFRpbWVy SGVhcEl0ZXJhdG9yIG9wZXJhdG9yLS0oaW50KSB7IGNoZWNrQ29uc2lzdGVuY3koKTsgY2hlY2tD b25zaXN0ZW5jeSgtMSk7IHJldHVybiBtX2luZGV4LS07IH0KKyAgICBUaW1lckhlYXBJdGVyYXRv ciYgb3BlcmF0b3IrKygpIHsgY2hlY2tDb25zaXN0ZW5jeSgpOyArK21fcG9pbnRlcjsgY2hlY2tD b25zaXN0ZW5jeSgpOyByZXR1cm4gKnRoaXM7IH0KKyAgICBUaW1lckhlYXBJdGVyYXRvciBvcGVy YXRvcisrKGludCkgeyBjaGVja0NvbnNpc3RlbmN5KDEpOyByZXR1cm4gVGltZXJIZWFwSXRlcmF0 b3IobV9wb2ludGVyKyspOyB9CiAKLSAgICBUaW1lckhlYXBJdGVyYXRvciYgb3BlcmF0b3IrPShp bnQgaSkgeyBjaGVja0NvbnNpc3RlbmN5KCk7IG1faW5kZXggKz0gaTsgY2hlY2tDb25zaXN0ZW5j eSgpOyByZXR1cm4gKnRoaXM7IH0KLSAgICBUaW1lckhlYXBJdGVyYXRvciYgb3BlcmF0b3ItPShp bnQgaSkgeyBjaGVja0NvbnNpc3RlbmN5KCk7IG1faW5kZXggLT0gaTsgY2hlY2tDb25zaXN0ZW5j eSgpOyByZXR1cm4gKnRoaXM7IH0KKyAgICBUaW1lckhlYXBJdGVyYXRvciYgb3BlcmF0b3ItLSgp IHsgY2hlY2tDb25zaXN0ZW5jeSgpOyAtLW1fcG9pbnRlcjsgY2hlY2tDb25zaXN0ZW5jeSgpOyBy ZXR1cm4gKnRoaXM7IH0KKyAgICBUaW1lckhlYXBJdGVyYXRvciBvcGVyYXRvci0tKGludCkgeyBj aGVja0NvbnNpc3RlbmN5KC0xKTsgcmV0dXJuIFRpbWVySGVhcEl0ZXJhdG9yKG1fcG9pbnRlci0t KTsgfQogCi0gICAgVGltZXJIZWFwRWxlbWVudCBvcGVyYXRvciooKSBjb25zdCB7IHJldHVybiBU aW1lckhlYXBFbGVtZW50KG1faW5kZXgpOyB9Ci0gICAgVGltZXJIZWFwRWxlbWVudCBvcGVyYXRv cltdKGludCBpKSBjb25zdCB7IHJldHVybiBUaW1lckhlYXBFbGVtZW50KG1faW5kZXggKyBpKTsg fQorICAgIFRpbWVySGVhcEl0ZXJhdG9yJiBvcGVyYXRvcis9KHB0cmRpZmZfdCBpKSB7IGNoZWNr Q29uc2lzdGVuY3koKTsgbV9wb2ludGVyICs9IGk7IGNoZWNrQ29uc2lzdGVuY3koKTsgcmV0dXJu ICp0aGlzOyB9CisgICAgVGltZXJIZWFwSXRlcmF0b3ImIG9wZXJhdG9yLT0ocHRyZGlmZl90IGkp IHsgY2hlY2tDb25zaXN0ZW5jeSgpOyBtX3BvaW50ZXIgLT0gaTsgY2hlY2tDb25zaXN0ZW5jeSgp OyByZXR1cm4gKnRoaXM7IH0KIAotICAgIGludCBpbmRleCgpIGNvbnN0IHsgcmV0dXJuIG1faW5k ZXg7IH0KKyAgICBUaW1lckhlYXBSZWZlcmVuY2Ugb3BlcmF0b3IqKCkgY29uc3QgeyByZXR1cm4g VGltZXJIZWFwUmVmZXJlbmNlKCptX3BvaW50ZXIpOyB9CisgICAgVGltZXJIZWFwUmVmZXJlbmNl IG9wZXJhdG9yW10ocHRyZGlmZl90IGkpIGNvbnN0IHsgcmV0dXJuIFRpbWVySGVhcFJlZmVyZW5j ZShtX3BvaW50ZXJbaV0pOyB9CisgICAgVGltZXJCYXNlKiBvcGVyYXRvci0+KCkgY29uc3QgeyBy ZXR1cm4gKm1fcG9pbnRlcjsgfQogCi0gICAgdm9pZCBjaGVja0NvbnNpc3RlbmN5KGludCBvZmZz ZXQgPSAwKSBjb25zdAorcHJpdmF0ZToKKyAgICB2b2lkIGNoZWNrQ29uc2lzdGVuY3koc2l6ZV90 IG9mZnNldCA9IDApIGNvbnN0CiAgICAgewotICAgICAgICBBU1NFUlRfVU5VU0VEKG9mZnNldCwg bV9pbmRleCArIG9mZnNldCA+PSAwKTsKLSAgICAgICAgQVNTRVJUX1VOVVNFRChvZmZzZXQsIG1f aW5kZXggKyBvZmZzZXQgPD0gc3RhdGljX2Nhc3Q8aW50Pih0aW1lckhlYXAoKS5zaXplKCkpKTsK KyAgICAgICAgQVNTRVJUKG1fcG9pbnRlciA+PSB0aW1lckhlYXAoKS5kYXRhKCkpOworICAgICAg ICBBU1NFUlQobV9wb2ludGVyIDw9IHRpbWVySGVhcCgpLmRhdGEoKSArIHRpbWVySGVhcCgpLnNp emUoKSk7CisgICAgICAgIEFTU0VSVF9VTlVTRUQob2Zmc2V0LCBtX3BvaW50ZXIgKyBvZmZzZXQg Pj0gdGltZXJIZWFwKCkuZGF0YSgpKTsKKyAgICAgICAgQVNTRVJUX1VOVVNFRChvZmZzZXQsIG1f cG9pbnRlciArIG9mZnNldCA8PSB0aW1lckhlYXAoKS5kYXRhKCkgKyB0aW1lckhlYXAoKS5zaXpl KCkpOwogICAgIH0KIAotcHJpdmF0ZToKLSAgICBpbnQgbV9pbmRleDsKKyAgICBmcmllbmQgYm9v bCBvcGVyYXRvcj09KFRpbWVySGVhcEl0ZXJhdG9yLCBUaW1lckhlYXBJdGVyYXRvcik7CisgICAg ZnJpZW5kIGJvb2wgb3BlcmF0b3IhPShUaW1lckhlYXBJdGVyYXRvciwgVGltZXJIZWFwSXRlcmF0 b3IpOworICAgIGZyaWVuZCBib29sIG9wZXJhdG9yPChUaW1lckhlYXBJdGVyYXRvciwgVGltZXJI ZWFwSXRlcmF0b3IpOworICAgIGZyaWVuZCBib29sIG9wZXJhdG9yPihUaW1lckhlYXBJdGVyYXRv ciwgVGltZXJIZWFwSXRlcmF0b3IpOworICAgIGZyaWVuZCBib29sIG9wZXJhdG9yPD0oVGltZXJI ZWFwSXRlcmF0b3IsIFRpbWVySGVhcEl0ZXJhdG9yKTsKKyAgICBmcmllbmQgYm9vbCBvcGVyYXRv cj49KFRpbWVySGVhcEl0ZXJhdG9yLCBUaW1lckhlYXBJdGVyYXRvcik7CisgICAgCisgICAgZnJp ZW5kIFRpbWVySGVhcEl0ZXJhdG9yIG9wZXJhdG9yKyhUaW1lckhlYXBJdGVyYXRvciwgc2l6ZV90 KTsKKyAgICBmcmllbmQgVGltZXJIZWFwSXRlcmF0b3Igb3BlcmF0b3IrKHNpemVfdCwgVGltZXJI ZWFwSXRlcmF0b3IpOworICAgIAorICAgIGZyaWVuZCBUaW1lckhlYXBJdGVyYXRvciBvcGVyYXRv ci0oVGltZXJIZWFwSXRlcmF0b3IsIHNpemVfdCk7CisgICAgZnJpZW5kIHB0cmRpZmZfdCBvcGVy YXRvci0oVGltZXJIZWFwSXRlcmF0b3IsIFRpbWVySGVhcEl0ZXJhdG9yKTsKKworICAgIFRpbWVy QmFzZSoqIG1fcG9pbnRlcjsKIH07CiAKLWlubGluZSBib29sIG9wZXJhdG9yPT0oVGltZXJIZWFw SXRlcmF0b3IgYSwgVGltZXJIZWFwSXRlcmF0b3IgYikgeyByZXR1cm4gYS5pbmRleCgpID09IGIu aW5kZXgoKTsgfQotaW5saW5lIGJvb2wgb3BlcmF0b3IhPShUaW1lckhlYXBJdGVyYXRvciBhLCBU aW1lckhlYXBJdGVyYXRvciBiKSB7IHJldHVybiBhLmluZGV4KCkgIT0gYi5pbmRleCgpOyB9Ci1p bmxpbmUgYm9vbCBvcGVyYXRvcjwoVGltZXJIZWFwSXRlcmF0b3IgYSwgVGltZXJIZWFwSXRlcmF0 b3IgYikgeyByZXR1cm4gYS5pbmRleCgpIDwgYi5pbmRleCgpOyB9CitpbmxpbmUgYm9vbCBvcGVy YXRvcj09KFRpbWVySGVhcEl0ZXJhdG9yIGEsIFRpbWVySGVhcEl0ZXJhdG9yIGIpIHsgcmV0dXJu IGEubV9wb2ludGVyID09IGIubV9wb2ludGVyOyB9CitpbmxpbmUgYm9vbCBvcGVyYXRvciE9KFRp bWVySGVhcEl0ZXJhdG9yIGEsIFRpbWVySGVhcEl0ZXJhdG9yIGIpIHsgcmV0dXJuIGEubV9wb2lu dGVyICE9IGIubV9wb2ludGVyOyB9CitpbmxpbmUgYm9vbCBvcGVyYXRvcjwoVGltZXJIZWFwSXRl cmF0b3IgYSwgVGltZXJIZWFwSXRlcmF0b3IgYikgeyByZXR1cm4gYS5tX3BvaW50ZXIgPCBiLm1f cG9pbnRlcjsgfQoraW5saW5lIGJvb2wgb3BlcmF0b3I+KFRpbWVySGVhcEl0ZXJhdG9yIGEsIFRp bWVySGVhcEl0ZXJhdG9yIGIpIHsgcmV0dXJuIGEubV9wb2ludGVyID4gYi5tX3BvaW50ZXI7IH0K K2lubGluZSBib29sIG9wZXJhdG9yPD0oVGltZXJIZWFwSXRlcmF0b3IgYSwgVGltZXJIZWFwSXRl cmF0b3IgYikgeyByZXR1cm4gYS5tX3BvaW50ZXIgPD0gYi5tX3BvaW50ZXI7IH0KK2lubGluZSBi b29sIG9wZXJhdG9yPj0oVGltZXJIZWFwSXRlcmF0b3IgYSwgVGltZXJIZWFwSXRlcmF0b3IgYikg eyByZXR1cm4gYS5tX3BvaW50ZXIgPj0gYi5tX3BvaW50ZXI7IH0KKworaW5saW5lIFRpbWVySGVh cEl0ZXJhdG9yIG9wZXJhdG9yKyhUaW1lckhlYXBJdGVyYXRvciBhLCBzaXplX3QgYikgeyByZXR1 cm4gVGltZXJIZWFwSXRlcmF0b3IoYS5tX3BvaW50ZXIgKyBiKTsgfQoraW5saW5lIFRpbWVySGVh cEl0ZXJhdG9yIG9wZXJhdG9yKyhzaXplX3QgYSwgVGltZXJIZWFwSXRlcmF0b3IgYikgeyByZXR1 cm4gVGltZXJIZWFwSXRlcmF0b3IoYSArIGIubV9wb2ludGVyKTsgfQorCitpbmxpbmUgVGltZXJI ZWFwSXRlcmF0b3Igb3BlcmF0b3ItKFRpbWVySGVhcEl0ZXJhdG9yIGEsIHNpemVfdCBiKSB7IHJl dHVybiBUaW1lckhlYXBJdGVyYXRvcihhLm1fcG9pbnRlciAtIGIpOyB9CitpbmxpbmUgcHRyZGlm Zl90IG9wZXJhdG9yLShUaW1lckhlYXBJdGVyYXRvciBhLCBUaW1lckhlYXBJdGVyYXRvciBiKSB7 IHJldHVybiBhLm1fcG9pbnRlciAtIGIubV9wb2ludGVyOyB9CisKKy8vIC0tLS0tLS0tLS0tLS0t LS0KIAotaW5saW5lIFRpbWVySGVhcEl0ZXJhdG9yIG9wZXJhdG9yKyhUaW1lckhlYXBJdGVyYXRv ciBhLCBpbnQgYikgeyByZXR1cm4gYS5pbmRleCgpICsgYjsgfQotaW5saW5lIFRpbWVySGVhcEl0 ZXJhdG9yIG9wZXJhdG9yKyhpbnQgYSwgVGltZXJIZWFwSXRlcmF0b3IgYikgeyByZXR1cm4gYSAr IGIuaW5kZXgoKTsgfQorY2xhc3MgVGltZXJIZWFwTGVzc1RoYW5GdW5jdGlvbiB7CitwdWJsaWM6 CisgICAgYm9vbCBvcGVyYXRvcigpKFRpbWVyQmFzZSosIFRpbWVyQmFzZSopIGNvbnN0OworfTsK IAotaW5saW5lIFRpbWVySGVhcEl0ZXJhdG9yIG9wZXJhdG9yLShUaW1lckhlYXBJdGVyYXRvciBh LCBpbnQgYikgeyByZXR1cm4gYS5pbmRleCgpIC0gYjsgfQotaW5saW5lIGludCBvcGVyYXRvci0o VGltZXJIZWFwSXRlcmF0b3IgYSwgVGltZXJIZWFwSXRlcmF0b3IgYikgeyByZXR1cm4gYS5pbmRl eCgpIC0gYi5pbmRleCgpOyB9CitpbmxpbmUgYm9vbCBUaW1lckhlYXBMZXNzVGhhbkZ1bmN0aW9u OjpvcGVyYXRvcigpKFRpbWVyQmFzZSogYSwgVGltZXJCYXNlKiBiKSBjb25zdAoreworICAgIC8v IFRoZSBjb21wYXJpc29ucyBiZWxvdyBhcmUgImJhY2t3YXJkcyIgYmVjYXVzZSB0aGUgaGVhcCBw dXRzIHRoZSBsYXJnZXN0IAorICAgIC8vIGVsZW1lbnQgZmlyc3QgYW5kIHdlIHdhbnQgdGhlIGxv d2VzdCB0aW1lIHRvIGJlIHRoZSBmaXJzdCBvbmUgaW4gdGhlIGhlYXAuCisgICAgZG91YmxlIGFG aXJlVGltZSA9IGEtPm1fbmV4dEZpcmVUaW1lOworICAgIGRvdWJsZSBiRmlyZVRpbWUgPSBiLT5t X25leHRGaXJlVGltZTsKKyAgICBpZiAoYkZpcmVUaW1lICE9IGFGaXJlVGltZSkKKyAgICAgICAg cmV0dXJuIGJGaXJlVGltZSA8IGFGaXJlVGltZTsKKyAgICAKKyAgICAvLyBXZSBuZWVkIHRvIGxv b2sgYXQgdGhlIGRpZmZlcmVuY2Ugb2YgdGhlIGluc2VydGlvbiBvcmRlcnMgaW5zdGVhZCBvZiBj b21wYXJpbmcgdGhlIHR3byAKKyAgICAvLyBvdXRyaWdodCBpbiBjYXNlIG9mIG92ZXJmbG93LiAK KyAgICB1bnNpZ25lZCBkaWZmZXJlbmNlID0gYS0+bV9oZWFwSW5zZXJ0aW9uT3JkZXIgLSBiLT5t X2hlYXBJbnNlcnRpb25PcmRlcjsKKyAgICByZXR1cm4gZGlmZmVyZW5jZSA8IG51bWVyaWNfbGlt aXRzPHVuc2lnbmVkPjo6bWF4KCkgLyAyOworfQogCiAvLyAtLS0tLS0tLS0tLS0tLS0tCiAKQEAg LTIyNSw3ICsyNTMsOCBAQCB2b2lkIFRpbWVyQmFzZTo6aGVhcERlY3JlYXNlS2V5KCkKIHsKICAg ICBBU1NFUlQobV9uZXh0RmlyZVRpbWUgIT0gMCk7CiAgICAgY2hlY2tIZWFwSW5kZXgoKTsKLSAg ICBwdXNoX2hlYXAoVGltZXJIZWFwSXRlcmF0b3IoMCksIFRpbWVySGVhcEl0ZXJhdG9yKG1faGVh cEluZGV4ICsgMSkpOworICAgIFRpbWVyQmFzZSoqIGhlYXBEYXRhID0gdGltZXJIZWFwKCkuZGF0 YSgpOworICAgIHB1c2hfaGVhcChUaW1lckhlYXBJdGVyYXRvcihoZWFwRGF0YSksIFRpbWVySGVh cEl0ZXJhdG9yKGhlYXBEYXRhICsgbV9oZWFwSW5kZXggKyAxKSwgVGltZXJIZWFwTGVzc1RoYW5G dW5jdGlvbigpKTsKICAgICBjaGVja0hlYXBJbmRleCgpOwogfQogCkBAIC0yNzQsNyArMzAzLDkg QEAgdm9pZCBUaW1lckJhc2U6OmhlYXBQb3BNaW4oKQogewogICAgIEFTU0VSVCh0aGlzID09IHRp bWVySGVhcCgpLmZpcnN0KCkpOwogICAgIGNoZWNrSGVhcEluZGV4KCk7Ci0gICAgcG9wX2hlYXAo VGltZXJIZWFwSXRlcmF0b3IoMCksIFRpbWVySGVhcEl0ZXJhdG9yKHRpbWVySGVhcCgpLnNpemUo KSkpOworICAgIFZlY3RvcjxUaW1lckJhc2UqPiYgaGVhcCA9IHRpbWVySGVhcCgpOworICAgIFRp bWVyQmFzZSoqIGhlYXBEYXRhID0gaGVhcC5kYXRhKCk7CisgICAgcG9wX2hlYXAoVGltZXJIZWFw SXRlcmF0b3IoaGVhcERhdGEpLCBUaW1lckhlYXBJdGVyYXRvcihoZWFwRGF0YSArIGhlYXAuc2l6 ZSgpKSwgVGltZXJIZWFwTGVzc1RoYW5GdW5jdGlvbigpKTsKICAgICBjaGVja0hlYXBJbmRleCgp OwogICAgIEFTU0VSVCh0aGlzID09IHRpbWVySGVhcCgpLmxhc3QoKSk7CiB9CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9UaW1lci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL1RpbWVyLmgJKHJldmlzaW9uIDkyNDkxKQorKysgU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vVGltZXIuaAkod29ya2luZyBjb3B5KQpAQCAtODQsOSArODQsOSBAQCBwcml2YXRlOgog ICAgIFRocmVhZElkZW50aWZpZXIgbV90aHJlYWQ7CiAjZW5kaWYKIAotICAgIGZyaWVuZCBjbGFz cyBUaW1lckhlYXBFbGVtZW50OwogICAgIGZyaWVuZCBjbGFzcyBUaHJlYWRUaW1lcnM7Ci0gICAg ZnJpZW5kIGJvb2wgb3BlcmF0b3I8KGNvbnN0IFRpbWVySGVhcEVsZW1lbnQmLCBjb25zdCBUaW1l ckhlYXBFbGVtZW50Jik7CisgICAgZnJpZW5kIGNsYXNzIFRpbWVySGVhcExlc3NUaGFuRnVuY3Rp b247CisgICAgZnJpZW5kIGNsYXNzIFRpbWVySGVhcFJlZmVyZW5jZTsKIH07CiAKIHRlbXBsYXRl IDx0eXBlbmFtZSBUaW1lckZpcmVkQ2xhc3M+IGNsYXNzIFRpbWVyIDogcHVibGljIFRpbWVyQmFz ZSB7Cg==