55217 2011-02-25 07:13:42 -0800 [GStreamer] Frame accurate seeking isn't always accurate 2011-03-16 01:53:02 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All OS X 10.6 RESOLVED FIXED http://www.massive-interactive.nl/html5_video/smpte_test_universal.html HTML5 P2 Normal --- 1 pnormand webkit-unassigned abarth coenen.rob commit-queue eric.carlson eric jer.noble scherkus slomo webkit.review.bot oldest_to_newest 357893 0 pnormand 2011-02-25 07:13:42 -0800 +++ This bug was initially created as a clone of Bug #52697 +++ The current GStreamer MediaPlayer backend doesn't use frame accurate seeking. In addition to using the GST_SEEK_FLAG_ACCURATE flag it should support a frame step event when possible (positive playback rate, frame requested is ahead of current playback position). 357897 1 83807 pnormand 2011-02-25 07:23:04 -0800 Created attachment 83807 proposed patch 357899 2 webkit.review.bot 2011-02-25 07:26:16 -0800 Attachment 83807 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:552: Missing spaces around | [whitespace/operators] [3] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 357900 3 83808 pnormand 2011-02-25 07:27:20 -0800 Created attachment 83808 proposed patch 359723 4 pnormand 2011-03-01 00:42:21 -0800 Hi Sebastian, Can you have a look at this patch when you get time? I did my tests with the website linked to that bug. Thanks in advance for any feedback :) 364531 5 83808 pnormand 2011-03-09 09:08:27 -0800 Comment on attachment 83808 proposed patch Pulling out of review, I have a new patch, simpler, without using the step event. Will upload it soon :) 365179 6 85331 pnormand 2011-03-10 07:59:20 -0800 Created attachment 85331 proposed patch 367291 7 85331 mrobinson 2011-03-14 15:29:56 -0700 Comment on attachment 85331 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=85331&action=review Looks good to me, though I think the time calculation logic could be cleaned up a bit to make it clearer. > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:530 > + glong microSeconds; > + float microSecondsf = modf(time, &seconds); > + microSecondsf *= 1000000; > + microSeconds = static_cast<glong>(roundf(microSecondsf / 10000) * 10000); > + timeValue.tv_sec = static_cast<glong>(seconds); > + timeValue.tv_usec = microSeconds; > + > + GstClockTime clockTime = GST_TIMEVAL_TO_TIME(timeValue); > + LOG_VERBOSE(Media, "Seek: %" GST_TIME_FORMAT, GST_TIME_ARGS(clockTime)); I think you should probably just dispense with the microseconds variable altogether and rename microsecondsf to microseconds. float seconds; float microseconds = modf(time, &seconds) * 1000000; timeValue.tv_sec = static_cast<glong>(seconds); timeValue.tv_usec = static_cast<glong>(roundf(microSecondsf / 10000) * 10000); I'm still a bit confused by this logic, because you multiply microsecondsf by 1000000 and then immediately divide by 10000. 367325 8 pnormand 2011-03-14 16:13:02 -0700 (In reply to comment #7) > > I think you should probably just dispense with the microseconds variable altogether and rename microsecondsf to microseconds. > Agreed. > float seconds; > float microseconds = modf(time, &seconds) * 1000000; > timeValue.tv_sec = static_cast<glong>(seconds); > timeValue.tv_usec = static_cast<glong>(roundf(microSecondsf / 10000) * 10000); > > I'm still a bit confused by this logic, because you multiply microsecondsf by 1000000 and then immediately divide by 10000. An example of time is 2.155999 seconds. modf() will return 0.155999 seconds. So to get the microseconds value we multiply by 1000000. The division and multiplication are used to round. If microseconds is something like 155999: roundf(15.5999) * 10000 = 160000 microseconds I'll have another look at this tomorrow morning, thanks for the review anyway :) 367575 9 85789 pnormand 2011-03-15 02:20:21 -0700 Created attachment 85789 proposed patch 367662 10 85789 mrobinson 2011-03-15 08:01:56 -0700 Comment on attachment 85789 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=85789&action=review Looks good to me! > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:524 > + GTimeVal timeValue; > + float seconds; > + float microSeconds = modf(time, &seconds) * 1000000; > + timeValue.tv_sec = static_cast<glong>(seconds); > + timeValue.tv_usec = static_cast<glong>(roundf(microSeconds / 10000) * 10000); Super nit here, but do you mind moving GTimeVal timeValue right down to where you first use it? 368262 11 pnormand 2011-03-16 01:53:02 -0700 Committed r81228: <http://trac.webkit.org/changeset/81228> 83807 2011-02-25 07:23:04 -0800 2011-02-25 07:27:20 -0800 proposed patch proposed-patch.patch text/plain 6427 pnormand RnJvbSA4YWM3MTVlNjQzZjU0MzJjZDY2ZmZmYzUzNGVmM2FhYmUzZDlhODgyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBUaHUsIDI0IEZlYiAyMDExIDA5OjEzOjE1ICswMTAwClN1YmplY3Q6IFtQQVRDSF0g cHJvcG9zZWQgcGF0Y2gKCi0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDIwICsrKysrKwogLi4uL2dzdHJlYW1lci9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXIuY3BwICAgICAgfCAgIDYzICsrKysrKysrKysrKysrKysrKy0tCiAuLi4v Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oICAgICAgICB8ICAgIDMgKy0K IDMgZmlsZXMgY2hhbmdlZCwgNzkgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKaW5kZXggOWZkYmRjZS4uNGZlYTY4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisy MDExLTAyLTI1ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1N0cmVhbWVyXSBG cmFtZSBhY2N1cmF0ZSBzZWVraW5nIGlzbid0IGFsd2F5cyBhY2N1cmF0ZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUyMTcKKworICAgICAgICBEdXJp bmcgc2VlayBvcGVyYXRpb24gc2VuZCBhIGZyYW1lIHN0ZXAgZXZlbnQgaWYgcGxheWJhY2sgcmF0 ZSBpcworICAgICAgICBwb3NpdGl2ZSBhbmQgcmVxdWVzdGVkIGZyYW1lIGlzIGFoZWFkIG9mIGN1 cnJlbnQgcGxheWJhY2sKKyAgICAgICAgcG9zaXRpb24uIEluIG90aGVyIGNhc2VzIGF0dGVtcHQg YSBub3JtYWwgc2VlayBldmVudCB3aXRoIHRoZQorICAgICAgICBBQ0NVUkFURSBzZWVrIGZsYWcu CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBhbHJlYWR5IGNvdmVyZWQgYnkgbWVkaWEvdmlkZW8t ZnJhbWUtYWNjdXJhdGUtc2Vlay5odG1sLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmN1cnJlbnRUaW1lKToKKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2Vlayk6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnZpZGVvRnJhbWVyYXRlKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyLmg6CisKIDIwMTEtMDItMjQgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9t aXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCAwNzVmNzFlLi5k MWIzODhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy LmNwcApAQCAtNDk1LDcgKzQ5NSw3IEBAIGZsb2F0IE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l cjo6Y3VycmVudFRpbWUoKSBjb25zdAogICAgICAgICByZXR1cm4gMC4wZjsKIAogICAgIGlmICht X3NlZWtpbmcpCi0gICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxmbG9hdD4obV9zZWVrVGltZSk7 CisgICAgICAgIHJldHVybiBtX3NlZWtUaW1lOwogCiAgICAgcmV0dXJuIHBsYXliYWNrUG9zaXRp b24obV9wbGF5QmluKTsKIApAQCAtNTEzLDE3ICs1MTMsNDkgQEAgdm9pZCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6OnNlZWsoZmxvYXQgdGltZSkKICAgICBpZiAobV9lcnJvck9jY3VyZWQp CiAgICAgICAgIHJldHVybjsKIAotICAgIEdzdENsb2NrVGltZSBzZWMgPSAoR3N0Q2xvY2tUaW1l KShzdGF0aWNfY2FzdDxmbG9hdD4odGltZSAqIEdTVF9TRUNPTkQpKTsKLSAgICBMT0dfVkVSQk9T RShNZWRpYSwgIlNlZWs6ICUiIEdTVF9USU1FX0ZPUk1BVCwgR1NUX1RJTUVfQVJHUyhzZWMpKTsK KyAgICBHc3RDbG9ja1RpbWUgY2xvY2tUaW1lID0gKEdzdENsb2NrVGltZSkoc3RhdGljX2Nhc3Q8 ZmxvYXQ+KHRpbWUgKiBHU1RfU0VDT05EKSk7CisgICAgTE9HX1ZFUkJPU0UoTWVkaWEsICJTZWVr OiAlIiBHU1RfVElNRV9GT1JNQVQsIEdTVF9USU1FX0FSR1MoY2xvY2tUaW1lKSk7CisKKyAgICAv LyBJZiBhIHNwZWNpZmljIHZpZGVvIGZyYW1lIGlzIHJlcXVlc3RlZCBkdXJpbmcgZm9yd2FyZCBw bGF5YmFjaywKKyAgICAvLyB0cnkgdG8gdXNlIGEgc3RlcCBldmVudCwgdGhpcyBpcyBtb3JlIHJl bGlhYmxlIHRoYW4gYW4gYWNjdXJhdGUKKyAgICAvLyBzZWVrIGluIHRoaXMgc3BlY2lmaWMgY29u dGV4dC4KKworICAgIGZsb2F0IGZyYW1lcmF0ZSA9IHZpZGVvRnJhbWVyYXRlKCk7CisgICAgaWYg KG1fcGxheWJhY2tSYXRlICYmIGZyYW1lcmF0ZSkgeworICAgICAgICBsb25nIGRvdWJsZSBmcmFt ZU51bWJlcjsKKyAgICAgICAgbG9uZyBkb3VibGUgZnJhbWVEZWNpbWFscyA9IG1vZGYodGltZSAq IGZyYW1lcmF0ZSwgJmZyYW1lTnVtYmVyKTsKKyAgICAgICAgaWYgKCFmcmFtZURlY2ltYWxzKSB7 CisgICAgICAgICAgICAvLyBBbiBleGFjdCBmcmFtZSB3YXMgcmVxdWVzdGVkIGR1cmluZyBmb3J3 YXJkIHBsYXliYWNrLCB1c2UgYSBzdGVwIGV2ZW50LgorCisgICAgICAgICAgICBsb25nIGRvdWJs ZSBjdXJyZW50RnJhbWVOdW1iZXI7CisgICAgICAgICAgICBsb25nIGRvdWJsZSBjdXJyZW50RnJh bWVEZWNpbWFscyA9IG1vZGYocGxheWJhY2tQb3NpdGlvbihtX3BsYXlCaW4pICogZnJhbWVyYXRl LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZj dXJyZW50RnJhbWVOdW1iZXIpOworCisgICAgICAgICAgICAvLyBXZSBjYW4gdXNlIGEgc3RlcCBl dmVudCBvbmx5IHRvIHNraXAgZnJhbWVzIGFoZWFkLiBJdAorICAgICAgICAgICAgLy8gZG9lc24n dCB3b3JrIGZvciByZXZlcnNlIGZyYW1lIHNraXBwaW5nLgorICAgICAgICAgICAgaWYgKGZyYW1l TnVtYmVyID4gY3VycmVudEZyYW1lTnVtYmVyKSB7CisgICAgICAgICAgICAgICAgZ3VpbnQ2NCBm cmFtZXNUb1NraXAgPSBsbHJvdW5kZihjdXJyZW50RnJhbWVEZWNpbWFscykgKyBmcmFtZU51bWJl ciAtIGN1cnJlbnRGcmFtZU51bWJlcjsKKyAgICAgICAgICAgICAgICBHc3RFdmVudCogZXZlbnQg PSBnc3RfZXZlbnRfbmV3X3N0ZXAoR1NUX0ZPUk1BVF9CVUZGRVJTLCBmcmFtZXNUb1NraXAsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fcGxh eWJhY2tSYXRlLCBUUlVFLCBGQUxTRSk7CisgICAgICAgICAgICAgICAgaWYgKGdzdF9lbGVtZW50 X3NlbmRfZXZlbnQobV9wbGF5QmluLCBldmVudCkpIHsKKyAgICAgICAgICAgICAgICAgICAgTE9H X1ZFUkJPU0UoTWVkaWEsICJTa2lwcGVkIHRvIHZpZGVvIGZyYW1lIG51bWJlciAlbGxkIiwgc3Rh dGljX2Nhc3Q8bG9uZyBsb25nPihmcmFtZU51bWJlcikpOworICAgICAgICAgICAgICAgICAgICBt X3NlZWtpbmcgPSB0cnVlOworICAgICAgICAgICAgICAgICAgICBtX3NlZWtUaW1lID0gdGltZTsK KyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIH0KKyAgICAgICAgfQorICAgIH0KKwogICAgIGlmICghZ3N0X2VsZW1lbnRfc2VlayhtX3Bs YXlCaW4sIG1fcGxheWVyLT5yYXRlKCksCiAgICAgICAgICAgICBHU1RfRk9STUFUX1RJTUUsCi0g ICAgICAgICAgICAoR3N0U2Vla0ZsYWdzKShHU1RfU0VFS19GTEFHX0ZMVVNIKSwKLSAgICAgICAg ICAgIEdTVF9TRUVLX1RZUEVfU0VULCBzZWMsCisgICAgICAgICAgICAoR3N0U2Vla0ZsYWdzKShH U1RfU0VFS19GTEFHX0ZMVVNIfEdTVF9TRUVLX0ZMQUdfQUNDVVJBVEUpLAorICAgICAgICAgICAg R1NUX1NFRUtfVFlQRV9TRVQsIGNsb2NrVGltZSwKICAgICAgICAgICAgIEdTVF9TRUVLX1RZUEVf Tk9ORSwgR1NUX0NMT0NLX1RJTUVfTk9ORSkpCiAgICAgICAgIExPR19WRVJCT1NFKE1lZGlhLCAi U2VlayB0byAlZiBmYWlsZWQiLCB0aW1lKTsKICAgICBlbHNlIHsKICAgICAgICAgbV9zZWVraW5n ID0gdHJ1ZTsKLSAgICAgICAgbV9zZWVrVGltZSA9IHNlYzsKKyAgICAgICAgbV9zZWVrVGltZSA9 IHRpbWU7CiAgICAgfQogfQogCkBAIC01MzcsNiArNTY5LDI1IEBAIGJvb2wgTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyOjpzZWVraW5nKCkgY29uc3QKICAgICByZXR1cm4gbV9zZWVraW5nOwog fQogCitmbG9hdCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnZpZGVvRnJhbWVyYXRlKCkK K3sKKyAgICBpZiAoIWhhc1ZpZGVvKCkpCisgICAgICAgIHJldHVybiAwLjBmOworCisgICAgR3N0 UGFkKiBwYWQgPSBnc3RfZWxlbWVudF9nZXRfc3RhdGljX3BhZChtX3dlYmtpdFZpZGVvU2luaywg InNpbmsiKTsKKyAgICBpZiAoIXBhZCkKKyAgICAgICAgcmV0dXJuIDAuMGY7CisKKyAgICBjb25z dCBHVmFsdWUqIGZyYW1lcmF0ZVZhbHVlID0gZ3N0X3ZpZGVvX2ZyYW1lX3JhdGUocGFkKTsKKyAg ICBpZiAoIWZyYW1lcmF0ZVZhbHVlKQorICAgICAgICByZXR1cm4gMC4wZjsKKworICAgIGdpbnQg bnVtZXJhdG9yID0gZ3N0X3ZhbHVlX2dldF9mcmFjdGlvbl9udW1lcmF0b3IoZnJhbWVyYXRlVmFs dWUpOworICAgIGdpbnQgZGVub21pbmF0b3IgPSBnc3RfdmFsdWVfZ2V0X2ZyYWN0aW9uX2Rlbm9t aW5hdG9yKGZyYW1lcmF0ZVZhbHVlKTsKKworICAgIHJldHVybiBzdGF0aWNfY2FzdDxmbG9hdD4o bnVtZXJhdG9yKSAvIHN0YXRpY19jYXN0PGZsb2F0PihkZW5vbWluYXRvcik7Cit9CisKIC8vIFJl dHVybnMgdGhlIHNpemUgb2YgdGhlIHZpZGVvCiBJbnRTaXplIE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lcjo6bmF0dXJhbFNpemUoKSBjb25zdAogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lci5oCmluZGV4IDExZWI4MWIuLjQwZTFiMDggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgKQEAgLTE1Myw2ICsxNTMsNyBA QCBjbGFzcyBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIgOiBwdWJsaWMgTWVkaWFQbGF5ZXJQ cml2YXRlSW50ZXJmYWNlIHsKICAgICAgICAgICAgIGJvb2wgY2hhbmdlUGlwZWxpbmVTdGF0ZShH c3RTdGF0ZSBzdGF0ZSk7CiAKICAgICAgICAgICAgIHZvaWQgcHJvY2Vzc0J1ZmZlcmluZ1N0YXRz KEdzdE1lc3NhZ2UqIG1lc3NhZ2UpOworICAgICAgICAgICAgZmxvYXQgdmlkZW9GcmFtZXJhdGUo KTsKIAogICAgICAgICBwcml2YXRlOgogICAgICAgICAgICAgTWVkaWFQbGF5ZXIqIG1fcGxheWVy OwpAQCAtMTYxLDcgKzE2Miw3IEBAIGNsYXNzIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lciA6 IHB1YmxpYyBNZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2UgewogICAgICAgICAgICAgR3N0RWxl bWVudCogbV92aWRlb1NpbmtCaW47CiAgICAgICAgICAgICBHc3RFbGVtZW50KiBtX2Zwc1Npbms7 CiAgICAgICAgICAgICBHc3RFbGVtZW50KiBtX3NvdXJjZTsKLSAgICAgICAgICAgIEdzdENsb2Nr VGltZSBtX3NlZWtUaW1lOworICAgICAgICAgICAgZmxvYXQgbV9zZWVrVGltZTsKICAgICAgICAg ICAgIGJvb2wgbV9jaGFuZ2luZ1JhdGU7CiAgICAgICAgICAgICBmbG9hdCBtX2VuZFRpbWU7CiAg ICAgICAgICAgICBib29sIG1faXNFbmRSZWFjaGVkOwotLSAKMS43LjQuMQ== 83808 2011-02-25 07:27:20 -0800 2011-03-10 07:59:20 -0800 proposed patch proposed-patch.patch text/plain 6429 pnormand RnJvbSA5OGMwODQ4OGJlZmM2OTc0MjY1M2JmZGJjNmY0MjUxYmRiNDQzMzk2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBUaHUsIDI0IEZlYiAyMDExIDA5OjEzOjE1ICswMTAwClN1YmplY3Q6IFtQQVRDSF0g cHJvcG9zZWQgcGF0Y2gKCi0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDIwICsrKysrKwogLi4uL2dzdHJlYW1lci9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXIuY3BwICAgICAgfCAgIDYzICsrKysrKysrKysrKysrKysrKy0tCiAuLi4v Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oICAgICAgICB8ICAgIDMgKy0K IDMgZmlsZXMgY2hhbmdlZCwgNzkgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKaW5kZXggOWZkYmRjZS4uNGZlYTY4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisy MDExLTAyLTI1ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1N0cmVhbWVyXSBG cmFtZSBhY2N1cmF0ZSBzZWVraW5nIGlzbid0IGFsd2F5cyBhY2N1cmF0ZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUyMTcKKworICAgICAgICBEdXJp bmcgc2VlayBvcGVyYXRpb24gc2VuZCBhIGZyYW1lIHN0ZXAgZXZlbnQgaWYgcGxheWJhY2sgcmF0 ZSBpcworICAgICAgICBwb3NpdGl2ZSBhbmQgcmVxdWVzdGVkIGZyYW1lIGlzIGFoZWFkIG9mIGN1 cnJlbnQgcGxheWJhY2sKKyAgICAgICAgcG9zaXRpb24uIEluIG90aGVyIGNhc2VzIGF0dGVtcHQg YSBub3JtYWwgc2VlayBldmVudCB3aXRoIHRoZQorICAgICAgICBBQ0NVUkFURSBzZWVrIGZsYWcu CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBhbHJlYWR5IGNvdmVyZWQgYnkgbWVkaWEvdmlkZW8t ZnJhbWUtYWNjdXJhdGUtc2Vlay5odG1sLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmN1cnJlbnRUaW1lKToKKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2Vlayk6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnZpZGVvRnJhbWVyYXRlKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyLmg6CisKIDIwMTEtMDItMjQgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9t aXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCAwNzVmNzFlLi4w OWQxMzJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy LmNwcApAQCAtNDk1LDcgKzQ5NSw3IEBAIGZsb2F0IE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l cjo6Y3VycmVudFRpbWUoKSBjb25zdAogICAgICAgICByZXR1cm4gMC4wZjsKIAogICAgIGlmICht X3NlZWtpbmcpCi0gICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxmbG9hdD4obV9zZWVrVGltZSk7 CisgICAgICAgIHJldHVybiBtX3NlZWtUaW1lOwogCiAgICAgcmV0dXJuIHBsYXliYWNrUG9zaXRp b24obV9wbGF5QmluKTsKIApAQCAtNTEzLDE3ICs1MTMsNDkgQEAgdm9pZCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6OnNlZWsoZmxvYXQgdGltZSkKICAgICBpZiAobV9lcnJvck9jY3VyZWQp CiAgICAgICAgIHJldHVybjsKIAotICAgIEdzdENsb2NrVGltZSBzZWMgPSAoR3N0Q2xvY2tUaW1l KShzdGF0aWNfY2FzdDxmbG9hdD4odGltZSAqIEdTVF9TRUNPTkQpKTsKLSAgICBMT0dfVkVSQk9T RShNZWRpYSwgIlNlZWs6ICUiIEdTVF9USU1FX0ZPUk1BVCwgR1NUX1RJTUVfQVJHUyhzZWMpKTsK KyAgICBHc3RDbG9ja1RpbWUgY2xvY2tUaW1lID0gKEdzdENsb2NrVGltZSkoc3RhdGljX2Nhc3Q8 ZmxvYXQ+KHRpbWUgKiBHU1RfU0VDT05EKSk7CisgICAgTE9HX1ZFUkJPU0UoTWVkaWEsICJTZWVr OiAlIiBHU1RfVElNRV9GT1JNQVQsIEdTVF9USU1FX0FSR1MoY2xvY2tUaW1lKSk7CisKKyAgICAv LyBJZiBhIHNwZWNpZmljIHZpZGVvIGZyYW1lIGlzIHJlcXVlc3RlZCBkdXJpbmcgZm9yd2FyZCBw bGF5YmFjaywKKyAgICAvLyB0cnkgdG8gdXNlIGEgc3RlcCBldmVudCwgdGhpcyBpcyBtb3JlIHJl bGlhYmxlIHRoYW4gYW4gYWNjdXJhdGUKKyAgICAvLyBzZWVrIGluIHRoaXMgc3BlY2lmaWMgY29u dGV4dC4KKworICAgIGZsb2F0IGZyYW1lcmF0ZSA9IHZpZGVvRnJhbWVyYXRlKCk7CisgICAgaWYg KG1fcGxheWJhY2tSYXRlICYmIGZyYW1lcmF0ZSkgeworICAgICAgICBsb25nIGRvdWJsZSBmcmFt ZU51bWJlcjsKKyAgICAgICAgbG9uZyBkb3VibGUgZnJhbWVEZWNpbWFscyA9IG1vZGYodGltZSAq IGZyYW1lcmF0ZSwgJmZyYW1lTnVtYmVyKTsKKyAgICAgICAgaWYgKCFmcmFtZURlY2ltYWxzKSB7 CisgICAgICAgICAgICAvLyBBbiBleGFjdCBmcmFtZSB3YXMgcmVxdWVzdGVkIGR1cmluZyBmb3J3 YXJkIHBsYXliYWNrLCB1c2UgYSBzdGVwIGV2ZW50LgorCisgICAgICAgICAgICBsb25nIGRvdWJs ZSBjdXJyZW50RnJhbWVOdW1iZXI7CisgICAgICAgICAgICBsb25nIGRvdWJsZSBjdXJyZW50RnJh bWVEZWNpbWFscyA9IG1vZGYocGxheWJhY2tQb3NpdGlvbihtX3BsYXlCaW4pICogZnJhbWVyYXRl LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZj dXJyZW50RnJhbWVOdW1iZXIpOworCisgICAgICAgICAgICAvLyBXZSBjYW4gdXNlIGEgc3RlcCBl dmVudCBvbmx5IHRvIHNraXAgZnJhbWVzIGFoZWFkLiBJdAorICAgICAgICAgICAgLy8gZG9lc24n dCB3b3JrIGZvciByZXZlcnNlIGZyYW1lIHNraXBwaW5nLgorICAgICAgICAgICAgaWYgKGZyYW1l TnVtYmVyID4gY3VycmVudEZyYW1lTnVtYmVyKSB7CisgICAgICAgICAgICAgICAgZ3VpbnQ2NCBm cmFtZXNUb1NraXAgPSBsbHJvdW5kZihjdXJyZW50RnJhbWVEZWNpbWFscykgKyBmcmFtZU51bWJl ciAtIGN1cnJlbnRGcmFtZU51bWJlcjsKKyAgICAgICAgICAgICAgICBHc3RFdmVudCogZXZlbnQg PSBnc3RfZXZlbnRfbmV3X3N0ZXAoR1NUX0ZPUk1BVF9CVUZGRVJTLCBmcmFtZXNUb1NraXAsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fcGxh eWJhY2tSYXRlLCBUUlVFLCBGQUxTRSk7CisgICAgICAgICAgICAgICAgaWYgKGdzdF9lbGVtZW50 X3NlbmRfZXZlbnQobV9wbGF5QmluLCBldmVudCkpIHsKKyAgICAgICAgICAgICAgICAgICAgTE9H X1ZFUkJPU0UoTWVkaWEsICJTa2lwcGVkIHRvIHZpZGVvIGZyYW1lIG51bWJlciAlbGxkIiwgc3Rh dGljX2Nhc3Q8bG9uZyBsb25nPihmcmFtZU51bWJlcikpOworICAgICAgICAgICAgICAgICAgICBt X3NlZWtpbmcgPSB0cnVlOworICAgICAgICAgICAgICAgICAgICBtX3NlZWtUaW1lID0gdGltZTsK KyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIH0KKyAgICAgICAgfQorICAgIH0KKwogICAgIGlmICghZ3N0X2VsZW1lbnRfc2VlayhtX3Bs YXlCaW4sIG1fcGxheWVyLT5yYXRlKCksCiAgICAgICAgICAgICBHU1RfRk9STUFUX1RJTUUsCi0g ICAgICAgICAgICAoR3N0U2Vla0ZsYWdzKShHU1RfU0VFS19GTEFHX0ZMVVNIKSwKLSAgICAgICAg ICAgIEdTVF9TRUVLX1RZUEVfU0VULCBzZWMsCisgICAgICAgICAgICAoR3N0U2Vla0ZsYWdzKShH U1RfU0VFS19GTEFHX0ZMVVNIIHwgR1NUX1NFRUtfRkxBR19BQ0NVUkFURSksCisgICAgICAgICAg ICBHU1RfU0VFS19UWVBFX1NFVCwgY2xvY2tUaW1lLAogICAgICAgICAgICAgR1NUX1NFRUtfVFlQ RV9OT05FLCBHU1RfQ0xPQ0tfVElNRV9OT05FKSkKICAgICAgICAgTE9HX1ZFUkJPU0UoTWVkaWEs ICJTZWVrIHRvICVmIGZhaWxlZCIsIHRpbWUpOwogICAgIGVsc2UgewogICAgICAgICBtX3NlZWtp bmcgPSB0cnVlOwotICAgICAgICBtX3NlZWtUaW1lID0gc2VjOworICAgICAgICBtX3NlZWtUaW1l ID0gdGltZTsKICAgICB9CiB9CiAKQEAgLTUzNyw2ICs1NjksMjUgQEAgYm9vbCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OnNlZWtpbmcoKSBjb25zdAogICAgIHJldHVybiBtX3NlZWtpbmc7 CiB9CiAKK2Zsb2F0IE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dmlkZW9GcmFtZXJhdGUo KQoreworICAgIGlmICghaGFzVmlkZW8oKSkKKyAgICAgICAgcmV0dXJuIDAuMGY7CisKKyAgICBH c3RQYWQqIHBhZCA9IGdzdF9lbGVtZW50X2dldF9zdGF0aWNfcGFkKG1fd2Via2l0VmlkZW9TaW5r LCAic2luayIpOworICAgIGlmICghcGFkKQorICAgICAgICByZXR1cm4gMC4wZjsKKworICAgIGNv bnN0IEdWYWx1ZSogZnJhbWVyYXRlVmFsdWUgPSBnc3RfdmlkZW9fZnJhbWVfcmF0ZShwYWQpOwor ICAgIGlmICghZnJhbWVyYXRlVmFsdWUpCisgICAgICAgIHJldHVybiAwLjBmOworCisgICAgZ2lu dCBudW1lcmF0b3IgPSBnc3RfdmFsdWVfZ2V0X2ZyYWN0aW9uX251bWVyYXRvcihmcmFtZXJhdGVW YWx1ZSk7CisgICAgZ2ludCBkZW5vbWluYXRvciA9IGdzdF92YWx1ZV9nZXRfZnJhY3Rpb25fZGVu b21pbmF0b3IoZnJhbWVyYXRlVmFsdWUpOworCisgICAgcmV0dXJuIHN0YXRpY19jYXN0PGZsb2F0 PihudW1lcmF0b3IpIC8gc3RhdGljX2Nhc3Q8ZmxvYXQ+KGRlbm9taW5hdG9yKTsKK30KKwogLy8g UmV0dXJucyB0aGUgc2l6ZSBvZiB0aGUgdmlkZW8KIEludFNpemUgTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyOjpuYXR1cmFsU2l6ZSgpIGNvbnN0CiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgKaW5kZXggMTFlYjgxYi4uNDBlMWIwOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaApAQCAtMTUzLDYgKzE1Myw3 IEBAIGNsYXNzIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lciA6IHB1YmxpYyBNZWRpYVBsYXll clByaXZhdGVJbnRlcmZhY2UgewogICAgICAgICAgICAgYm9vbCBjaGFuZ2VQaXBlbGluZVN0YXRl KEdzdFN0YXRlIHN0YXRlKTsKIAogICAgICAgICAgICAgdm9pZCBwcm9jZXNzQnVmZmVyaW5nU3Rh dHMoR3N0TWVzc2FnZSogbWVzc2FnZSk7CisgICAgICAgICAgICBmbG9hdCB2aWRlb0ZyYW1lcmF0 ZSgpOwogCiAgICAgICAgIHByaXZhdGU6CiAgICAgICAgICAgICBNZWRpYVBsYXllciogbV9wbGF5 ZXI7CkBAIC0xNjEsNyArMTYyLDcgQEAgY2xhc3MgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy IDogcHVibGljIE1lZGlhUGxheWVyUHJpdmF0ZUludGVyZmFjZSB7CiAgICAgICAgICAgICBHc3RF bGVtZW50KiBtX3ZpZGVvU2lua0JpbjsKICAgICAgICAgICAgIEdzdEVsZW1lbnQqIG1fZnBzU2lu azsKICAgICAgICAgICAgIEdzdEVsZW1lbnQqIG1fc291cmNlOwotICAgICAgICAgICAgR3N0Q2xv Y2tUaW1lIG1fc2Vla1RpbWU7CisgICAgICAgICAgICBmbG9hdCBtX3NlZWtUaW1lOwogICAgICAg ICAgICAgYm9vbCBtX2NoYW5naW5nUmF0ZTsKICAgICAgICAgICAgIGZsb2F0IG1fZW5kVGltZTsK ICAgICAgICAgICAgIGJvb2wgbV9pc0VuZFJlYWNoZWQ7Ci0tIAoxLjcuNC4x 85331 2011-03-10 07:59:20 -0800 2011-03-15 02:20:21 -0700 proposed patch proposed-patch.patch text/plain 4402 pnormand RnJvbSBhNWY0MzgyNTJiYzMxNjdhY2RkOTU4Nzg1NWEzMzk5NmI3NDMwY2Y0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBUaHUsIDEwIE1hciAyMDExIDE3OjAwOjMzICswMTAwClN1YmplY3Q6IFtQQVRDSF0g cHJvcG9zZWQgcGF0Y2gKCi0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDE4ICsrKysrKysrKysrKysKIC4uLi9nc3RyZWFtZXIvTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCAgICAgIHwgICAyNiArKysrKysrKysrKysrKystLS0t CiAuLi4vZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oICAgICAgICB8ICAg IDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwgMzkgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggNDljNjg3Ny4uZjZlNGQyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDExLTAzLTEwICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1N0cmVh bWVyXSBGcmFtZSBhY2N1cmF0ZSBzZWVraW5nIGlzbid0IGFsd2F5cyBhY2N1cmF0ZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUyMTcKKworICAgICAg ICBBdHRlbXB0IHRvIGJ1aWxkIHRoZSBzZWVrIEdzdENsb2NrVGltZSBwb3NpdGlvbiBieSBjb252 ZXJ0aW5nIHRoZQorICAgICAgICBmbG9hdCB0aW1lIHZhbHVlIHRvIGEgR1RpbWVWYWwgdmFsdWUg cm91bmRlZCBhdCBtaWNyb3NlY29uZAorICAgICAgICBwcmVjaXNpb24uIEFkZGl0aW9uYWxseSBw ZXJmb3JtIHRoZSBzZWVrIHdpdGggdGhlIEFDQ1VSQVRFIHNlZWsKKyAgICAgICAgZmxhZy4gVGhl c2UgbW9kaWZpY2F0aW9ucyBhdCBsZWFzdCBmaXggdGhpcyBtYW51YWwtdGVzdDoKKyAgICAgICAg aHR0cDovL3d3dy5tYXNzaXZlLWludGVyYWN0aXZlLm5sL2h0bWw1X3ZpZGVvL3NtcHRlX3Rlc3Rf dW5pdmVyc2FsLmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpjdXJyZW50VGltZSk6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnNlZWspOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaDoKKwogMjAxMS0w My0xMCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBO b3QgcmV2aWV3ZWQ6IHJvbGxpbmcgb3V0IHI4MDQ3OCBhbmQgaXRzIGZvbGxvdyB1cHMgZm9yIGJy ZWFraW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3Bw CmluZGV4IDM3NjNlZjcuLmRjM2YyNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuY3BwCkBAIC00OTUsNyArNDk1LDcgQEAgZmxvYXQgTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyOjpjdXJyZW50VGltZSgpIGNvbnN0CiAgICAgICAgIHJldHVybiAw LjBmOwogCiAgICAgaWYgKG1fc2Vla2luZykKLSAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PGZs b2F0PihtX3NlZWtUaW1lKTsKKyAgICAgICAgcmV0dXJuIG1fc2Vla1RpbWU7CiAKICAgICByZXR1 cm4gcGxheWJhY2tQb3NpdGlvbihtX3BsYXlCaW4pOwogCkBAIC01MTMsMTcgKzUxMywzMSBAQCB2 b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2VlayhmbG9hdCB0aW1lKQogICAgIGlm IChtX2Vycm9yT2NjdXJlZCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgR3N0Q2xvY2tUaW1lIHNl YyA9IChHc3RDbG9ja1RpbWUpKHN0YXRpY19jYXN0PGZsb2F0Pih0aW1lICogR1NUX1NFQ09ORCkp OwotICAgIExPR19WRVJCT1NFKE1lZGlhLCAiU2VlazogJSIgR1NUX1RJTUVfRk9STUFULCBHU1Rf VElNRV9BUkdTKHNlYykpOworICAgIC8vIEV4dHJhY3QgdGhlIGludGVnZXIgcGFydCBvZiB0aGUg dGltZSAoc2Vjb25kcykgYW5kIHRoZQorICAgIC8vIGZyYWN0aW9uYWwgcGFydCAobWljcm9zZWNv bmRzKS4gQXR0ZW1wdCB0byByb3VuZCB0aGUKKyAgICAvLyBtaWNyb3NlY29uZHMgc28gbm8gZmxv YXRpbmcgcG9pbnQgcHJlY2lzaW9uIGlzIGxvc3QgYW5kIHdlIGNhbgorICAgIC8vIHBlcmZvcm0g YW4gYWNjdXJhdGUgc2Vlay4KKyAgICBHVGltZVZhbCB0aW1lVmFsdWU7CisgICAgZmxvYXQgc2Vj b25kczsKKyAgICBnbG9uZyBtaWNyb1NlY29uZHM7CisgICAgZmxvYXQgbWljcm9TZWNvbmRzZiA9 IG1vZGYodGltZSwgJnNlY29uZHMpOworICAgIG1pY3JvU2Vjb25kc2YgKj0gMTAwMDAwMDsKKyAg ICBtaWNyb1NlY29uZHMgPSBzdGF0aWNfY2FzdDxnbG9uZz4ocm91bmRmKG1pY3JvU2Vjb25kc2Yg LyAxMDAwMCkgKiAxMDAwMCk7CisgICAgdGltZVZhbHVlLnR2X3NlYyA9IHN0YXRpY19jYXN0PGds b25nPihzZWNvbmRzKTsKKyAgICB0aW1lVmFsdWUudHZfdXNlYyA9IG1pY3JvU2Vjb25kczsKKwor ICAgIEdzdENsb2NrVGltZSBjbG9ja1RpbWUgPSBHU1RfVElNRVZBTF9UT19USU1FKHRpbWVWYWx1 ZSk7CisgICAgTE9HX1ZFUkJPU0UoTWVkaWEsICJTZWVrOiAlIiBHU1RfVElNRV9GT1JNQVQsIEdT VF9USU1FX0FSR1MoY2xvY2tUaW1lKSk7CisKICAgICBpZiAoIWdzdF9lbGVtZW50X3NlZWsobV9w bGF5QmluLCBtX3BsYXllci0+cmF0ZSgpLAogICAgICAgICAgICAgR1NUX0ZPUk1BVF9USU1FLAot ICAgICAgICAgICAgKEdzdFNlZWtGbGFncykoR1NUX1NFRUtfRkxBR19GTFVTSCksCi0gICAgICAg ICAgICBHU1RfU0VFS19UWVBFX1NFVCwgc2VjLAorICAgICAgICAgICAgKEdzdFNlZWtGbGFncyko R1NUX1NFRUtfRkxBR19GTFVTSCB8IEdTVF9TRUVLX0ZMQUdfQUNDVVJBVEUpLAorICAgICAgICAg ICAgR1NUX1NFRUtfVFlQRV9TRVQsIGNsb2NrVGltZSwKICAgICAgICAgICAgIEdTVF9TRUVLX1RZ UEVfTk9ORSwgR1NUX0NMT0NLX1RJTUVfTk9ORSkpCiAgICAgICAgIExPR19WRVJCT1NFKE1lZGlh LCAiU2VlayB0byAlZiBmYWlsZWQiLCB0aW1lKTsKICAgICBlbHNlIHsKICAgICAgICAgbV9zZWVr aW5nID0gdHJ1ZTsKLSAgICAgICAgbV9zZWVrVGltZSA9IHNlYzsKKyAgICAgICAgbV9zZWVrVGlt ZSA9IHRpbWU7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyLmgKaW5kZXggMTFlYjgxYi4uODAwMzg4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaApAQCAtMTYxLDcgKzE2MSw3IEBAIGNsYXNzIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lciA6IHB1YmxpYyBNZWRpYVBsYXllclByaXZhdGVJbnRl cmZhY2UgewogICAgICAgICAgICAgR3N0RWxlbWVudCogbV92aWRlb1NpbmtCaW47CiAgICAgICAg ICAgICBHc3RFbGVtZW50KiBtX2Zwc1Npbms7CiAgICAgICAgICAgICBHc3RFbGVtZW50KiBtX3Nv dXJjZTsKLSAgICAgICAgICAgIEdzdENsb2NrVGltZSBtX3NlZWtUaW1lOworICAgICAgICAgICAg ZmxvYXQgbV9zZWVrVGltZTsKICAgICAgICAgICAgIGJvb2wgbV9jaGFuZ2luZ1JhdGU7CiAgICAg ICAgICAgICBmbG9hdCBtX2VuZFRpbWU7CiAgICAgICAgICAgICBib29sIG1faXNFbmRSZWFjaGVk OwotLSAKMS43LjQuMQ== 85789 2011-03-15 02:20:21 -0700 2011-03-15 08:01:56 -0700 proposed patch proposed-patch.patch text/plain 4270 pnormand RnJvbSA1ZTQ1Zjg4ZmRlM2I1MGQ4ZDk4NmVjMWE2ZjdlNmY1NzZlNTIyNThkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBUaHUsIDEwIE1hciAyMDExIDE3OjAwOjMzICswMTAwClN1YmplY3Q6IFtQQVRDSF0g cHJvcG9zZWQgcGF0Y2gKCi0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDE4ICsrKysrKysrKysrKysrKwogLi4uL2dzdHJlYW1lci9NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwICAgICAgfCAgIDIzICsrKysrKysrKysrKysrLS0t LS0KIC4uLi9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmggICAgICAgIHwg ICAgMiArLQogMyBmaWxlcyBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwppbmRleCAyZmM5NDZkLi4zODNkY2JiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MjEgQEAKKzIwMTEtMDMtMTAgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHU3Ry ZWFtZXJdIEZyYW1lIGFjY3VyYXRlIHNlZWtpbmcgaXNuJ3QgYWx3YXlzIGFjY3VyYXRlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTIxNworCisgICAg ICAgIEF0dGVtcHQgdG8gYnVpbGQgdGhlIHNlZWsgR3N0Q2xvY2tUaW1lIHBvc2l0aW9uIGJ5IGNv bnZlcnRpbmcgdGhlCisgICAgICAgIGZsb2F0IHRpbWUgdmFsdWUgdG8gYSBHVGltZVZhbCB2YWx1 ZSByb3VuZGVkIGF0IG1pY3Jvc2Vjb25kCisgICAgICAgIHByZWNpc2lvbi4gQWRkaXRpb25hbGx5 IHBlcmZvcm0gdGhlIHNlZWsgd2l0aCB0aGUgQUNDVVJBVEUgc2VlaworICAgICAgICBmbGFnLiBU aGVzZSBtb2RpZmljYXRpb25zIGF0IGxlYXN0IGZpeCB0aGlzIG1hbnVhbC10ZXN0OgorICAgICAg ICBodHRwOi8vd3d3Lm1hc3NpdmUtaW50ZXJhY3RpdmUubmwvaHRtbDVfdmlkZW8vc21wdGVfdGVz dF91bml2ZXJzYWwuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmN1cnJlbnRUaW1lKToKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2Vlayk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oOgorCiAyMDEx LTAzLTE0ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgQWRhbSBSb2JlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyLmNwcAppbmRleCAzNzYzZWY3Li5hOWY2YWYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtNDk1LDcgKzQ5NSw3IEBAIGZsb2F0IE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y3VycmVudFRpbWUoKSBjb25zdAogICAgICAgICBy ZXR1cm4gMC4wZjsKIAogICAgIGlmIChtX3NlZWtpbmcpCi0gICAgICAgIHJldHVybiBzdGF0aWNf Y2FzdDxmbG9hdD4obV9zZWVrVGltZSk7CisgICAgICAgIHJldHVybiBtX3NlZWtUaW1lOwogCiAg ICAgcmV0dXJuIHBsYXliYWNrUG9zaXRpb24obV9wbGF5QmluKTsKIApAQCAtNTEzLDE3ICs1MTMs MjggQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnNlZWsoZmxvYXQgdGltZSkK ICAgICBpZiAobV9lcnJvck9jY3VyZWQpCiAgICAgICAgIHJldHVybjsKIAotICAgIEdzdENsb2Nr VGltZSBzZWMgPSAoR3N0Q2xvY2tUaW1lKShzdGF0aWNfY2FzdDxmbG9hdD4odGltZSAqIEdTVF9T RUNPTkQpKTsKLSAgICBMT0dfVkVSQk9TRShNZWRpYSwgIlNlZWs6ICUiIEdTVF9USU1FX0ZPUk1B VCwgR1NUX1RJTUVfQVJHUyhzZWMpKTsKKyAgICAvLyBFeHRyYWN0IHRoZSBpbnRlZ2VyIHBhcnQg b2YgdGhlIHRpbWUgKHNlY29uZHMpIGFuZCB0aGUKKyAgICAvLyBmcmFjdGlvbmFsIHBhcnQgKG1p Y3Jvc2Vjb25kcykuIEF0dGVtcHQgdG8gcm91bmQgdGhlCisgICAgLy8gbWljcm9zZWNvbmRzIHNv IG5vIGZsb2F0aW5nIHBvaW50IHByZWNpc2lvbiBpcyBsb3N0IGFuZCB3ZSBjYW4KKyAgICAvLyBw ZXJmb3JtIGFuIGFjY3VyYXRlIHNlZWsuCisgICAgR1RpbWVWYWwgdGltZVZhbHVlOworICAgIGZs b2F0IHNlY29uZHM7CisgICAgZmxvYXQgbWljcm9TZWNvbmRzID0gbW9kZih0aW1lLCAmc2Vjb25k cykgKiAxMDAwMDAwOworICAgIHRpbWVWYWx1ZS50dl9zZWMgPSBzdGF0aWNfY2FzdDxnbG9uZz4o c2Vjb25kcyk7CisgICAgdGltZVZhbHVlLnR2X3VzZWMgPSBzdGF0aWNfY2FzdDxnbG9uZz4ocm91 bmRmKG1pY3JvU2Vjb25kcyAvIDEwMDAwKSAqIDEwMDAwKTsKKworICAgIEdzdENsb2NrVGltZSBj bG9ja1RpbWUgPSBHU1RfVElNRVZBTF9UT19USU1FKHRpbWVWYWx1ZSk7CisgICAgTE9HX1ZFUkJP U0UoTWVkaWEsICJTZWVrOiAlIiBHU1RfVElNRV9GT1JNQVQsIEdTVF9USU1FX0FSR1MoY2xvY2tU aW1lKSk7CisKICAgICBpZiAoIWdzdF9lbGVtZW50X3NlZWsobV9wbGF5QmluLCBtX3BsYXllci0+ cmF0ZSgpLAogICAgICAgICAgICAgR1NUX0ZPUk1BVF9USU1FLAotICAgICAgICAgICAgKEdzdFNl ZWtGbGFncykoR1NUX1NFRUtfRkxBR19GTFVTSCksCi0gICAgICAgICAgICBHU1RfU0VFS19UWVBF X1NFVCwgc2VjLAorICAgICAgICAgICAgKEdzdFNlZWtGbGFncykoR1NUX1NFRUtfRkxBR19GTFVT SCB8IEdTVF9TRUVLX0ZMQUdfQUNDVVJBVEUpLAorICAgICAgICAgICAgR1NUX1NFRUtfVFlQRV9T RVQsIGNsb2NrVGltZSwKICAgICAgICAgICAgIEdTVF9TRUVLX1RZUEVfTk9ORSwgR1NUX0NMT0NL X1RJTUVfTk9ORSkpCiAgICAgICAgIExPR19WRVJCT1NFKE1lZGlhLCAiU2VlayB0byAlZiBmYWls ZWQiLCB0aW1lKTsKICAgICBlbHNlIHsKICAgICAgICAgbV9zZWVraW5nID0gdHJ1ZTsKLSAgICAg ICAgbV9zZWVrVGltZSA9IHNlYzsKKyAgICAgICAgbV9zZWVrVGltZSA9IHRpbWU7CiAgICAgfQog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgKaW5kZXgg MTFlYjgxYi4uODAwMzg4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXIuaApAQCAtMTYxLDcgKzE2MSw3IEBAIGNsYXNzIE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lciA6IHB1YmxpYyBNZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2UgewogICAgICAgICAg ICAgR3N0RWxlbWVudCogbV92aWRlb1NpbmtCaW47CiAgICAgICAgICAgICBHc3RFbGVtZW50KiBt X2Zwc1Npbms7CiAgICAgICAgICAgICBHc3RFbGVtZW50KiBtX3NvdXJjZTsKLSAgICAgICAgICAg IEdzdENsb2NrVGltZSBtX3NlZWtUaW1lOworICAgICAgICAgICAgZmxvYXQgbV9zZWVrVGltZTsK ICAgICAgICAgICAgIGJvb2wgbV9jaGFuZ2luZ1JhdGU7CiAgICAgICAgICAgICBmbG9hdCBtX2Vu ZFRpbWU7CiAgICAgICAgICAgICBib29sIG1faXNFbmRSZWFjaGVkOwotLSAKMS43LjQuMQ==