83919 2012-04-13 11:10:50 -0700 GC activity timer should be tied to allocation, not collection 2012-04-18 11:16:08 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mhahnenberg mhahnenberg fpizlo ggaren webkit.review.bot oldest_to_newest 602238 0 mhahnenberg 2012-04-13 11:10:50 -0700 Currently we schedule our GCActivityCallback timer at the end of a collection. This is not an accurate picture of small amounts of allocation, which is the timer's purpose in the first place. This can cause some extra unnecessary full GCs as well as wasting some memory if we haven't done a collection recently. We should move the scheduling to the allocation slow path, which would mostly mitigate these issues. 604348 1 137606 mhahnenberg 2012-04-17 14:34:33 -0700 Created attachment 137606 Patch 604521 2 137606 ggaren 2012-04-17 17:38:16 -0700 Comment on attachment 137606 Patch r=me 604802 3 137606 webkit.review.bot 2012-04-18 09:18:50 -0700 Comment on attachment 137606 Patch Clearing flags on attachment: 137606 Committed r114511: <http://trac.webkit.org/changeset/114511> 604803 4 webkit.review.bot 2012-04-18 09:18:54 -0700 All reviewed patches have been landed. Closing bug. 604915 5 mhahnenberg 2012-04-18 11:16:08 -0700 <rdar://problem/11130716> 137606 2012-04-17 14:34:33 -0700 2012-04-18 09:18:50 -0700 Patch bug-83919-20120417143432.patch text/plain 12540 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTE0NDMxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDU4IEBA CisyMDEyLTA0LTE3ICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgR0MgYWN0aXZpdHkgdGltZXIgc2hvdWxkIGJlIHRpZWQgdG8gYWxsb2NhdGlvbiwg bm90IGNvbGxlY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTgzOTE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBBUEkvSlNDb250ZXh0UmVmLmNwcDogVXNlZCB0aGUgbmV3IGRpZEFiYW5kb25PYmpl Y3RHcmFwaCBjYWxsYmFjayB0byBpbmRpY2F0ZSB0aGF0IG5vdyB0aGF0IHdlJ3ZlIAorICAgICAg ICByZWxlYXNlZCBhIGdsb2JhbCBvYmplY3QsIHdlJ3JlIGFiYW5kb25pbmcgYSBwb3RlbnRpYWxs eSBsYXJnZSBudW1iZXIgb2Ygb2JqZWN0cyB0aGF0IEpTQyBtaWdodCB3YW50IAorICAgICAgICB0 byBjb2xsZWN0LgorICAgICAgICAqIGhlYXAvQ29waWVkU3BhY2UuY3BwOgorICAgICAgICAoSlND OjpDb3BpZWRTcGFjZTo6dHJ5QWxsb2NhdGVTbG93Q2FzZSk6IEFkZGVkIHRoZSBjYWxsIHRvIHRp bWVyJ3Mgd2lsbEFsbG9jYXRlIGZ1bmN0aW9uIHRvIGluZGljYXRlIAorICAgICAgICB0aGF0IHdl J3ZlIGhpdCBhIHNsb3cgcGF0aCBhbmQgYXJlIGFsbG9jYXRpbmcgbm93LCBzbyBzY2hlZHVsZSB0 aGUgdGltZXIuCisgICAgICAgICogaGVhcC9IZWFwLmNwcDoKKyAgICAgICAgKEpTQzo6SGVhcDo6 SGVhcCk6CisgICAgICAgIChKU0M6OkhlYXA6OmNvbGxlY3RBbGxHYXJiYWdlKTogUmVtb3ZlZCB0 aGUgY2FsbCB0byBkaXNjYXJkQWxsQ29tcGlsZWRDb2RlIGJlY2F1c2UgaXQgd2FzIGNhdXNpbmcg dXMgdG8gCisgICAgICAgIHRocm93IGF3YXkgdG9vIG11Y2ggY29kZSBkdXJpbmcgb3VyIGJlbmNo bWFya3MgKGVzcGVjaWFsbHkgdnA4LCB3aGljaCBpcyB2ZXJ5IGxhcmdlIGFuZCB0aHVzIGhhcyBs YXJnZSAKKyAgICAgICAgYW1vdW50cyBvZiBjb21waWxlZCBjb2RlKS4KKyAgICAgICAgKEpTQzo6 SGVhcDo6Y29sbGVjdCk6IEFkZGVkIHRoZSBuZXcgY2FsbCB0byBkaWRDb2xsZWN0IGF0IHRoZSBj b25jbHVzaW9uIG9mIGEgY29sbGVjdGlvbiBzbyB0aGF0IHdlIAorICAgICAgICBjYW4gY2FuY2Vs IHRoZSB0aW1lciBpZiB3ZSBubyBsb25nZXIgbmVlZCB0byBydW4gYSBjb2xsZWN0aW9uLiBBbHNv IGFkZGVkIGEgY2hlY2sgYXQgdGhlIGJlZ2lubmluZyBvZiBhIAorICAgICAgICBjb2xsZWN0aW9u IHRvIHNlZSBpZiB3ZSBzaG91bGQgdGhyb3cgYXdheSBvdXIgY29tcGlsZWQgY29kZS4gQ3VycmVu dGx5IHRoaXMgaXMgc2V0IHRvIGhhcHBlbiBhYm91dCBvbmNlIAorICAgICAgICBldmVyeSBtaW51 dGUuCisgICAgICAgICogaGVhcC9IZWFwLmg6IEFkZGVkIGZpZWxkIHRvIGtlZXAgdHJhY2sgb2Yg dGhlIGxhc3QgdGltZSB3ZSB0aHJldyBhd2F5IG91ciBjb21waWxlZCBjb2RlLgorICAgICAgICAq IGhlYXAvTWFya2VkQWxsb2NhdG9yLmNwcDoKKyAgICAgICAgKEpTQzo6TWFya2VkQWxsb2NhdG9y OjphbGxvY2F0ZVNsb3dDYXNlKTogQWRkZWQgY2FsbCB0byB3aWxsQWxsb2NhdGUgb24gdGhlIGFs bG9jYXRpb24gc2xvdyBwYXRoLCBqdXN0IGxpa2UgCisgICAgICAgIGluIENvcGllZFNwYWNlLgor ICAgICAgICAqIHJ1bnRpbWUvR0NBY3Rpdml0eUNhbGxiYWNrLmNwcDogQWRkZWQgZGVmYXVsdCBz dHVicyBmb3Igbm9uLUNGIHBsYXRmb3Jtcy4KKyAgICAgICAgKEpTQzo6RGVmYXVsdEdDQWN0aXZp dHlDYWxsYmFjazo6d2lsbEFsbG9jYXRlKToKKyAgICAgICAgKEpTQyk6CisgICAgICAgIChKU0M6 OkRlZmF1bHRHQ0FjdGl2aXR5Q2FsbGJhY2s6OmRpZENvbGxlY3QpOgorICAgICAgICAoSlNDOjpE ZWZhdWx0R0NBY3Rpdml0eUNhbGxiYWNrOjpkaWRBYmFuZG9uT2JqZWN0R3JhcGgpOgorICAgICAg ICAqIHJ1bnRpbWUvR0NBY3Rpdml0eUNhbGxiYWNrLmg6IEFkZGVkIG5ldyBmdW5jdGlvbnMgdG8g bWFrZSBKU0MncyBHQyB0aW1lciBsZXNzIGFyY2FuZS4gVGhpcyBpbmNsdWRlcyByZXBsYWNpbmcg CisgICAgICAgIHRoZSBvcGVyYXRvciAoKSB3aXRoIHdpbGxBbGxvY2F0ZSgpIGFuZCBhZGRpbmcg YW4gZXhwbGljaXQgZGlkQ29sbGVjdCgpIHRvIGNhbmNlbCB0aGUgdGltZXIgYWZ0ZXIgYSBjb2xs ZWN0aW9uIAorICAgICAgICBvY2N1cnMgcmF0aGVyIHRoYW4gcmVseWluZyBvbiB0aGUgd2F5IHRo ZSB0aW1lciBpcyBpbnZva2VkIHRvIGNhbmNlbCBpdHNlbGYuIEFsc28gYWRkZWQgYSBjYWxsYmFj ayBmb3IgCisgICAgICAgIHdoZW4gc29tZWJvZHkgZWxzZSAoZS5nLiBXZWJDb3JlIG9yIHRoZSBK U0MgQVBJKSB0byBub3RpZnkgSlNDIHRoYXQgdGhleSBoYXZlIGp1c3QgYWJhbmRvbmVkIGFuIGVu dGlyZSBncmFwaCBvZiAKKyAgICAgICAgb2JqZWN0cyBhbmQgdGhhdCBKU0MgbWlnaHQgd2FudCB0 byBjbGVhbiB0aGVtIHVwLgorICAgICAgICAoSlNDOjpHQ0FjdGl2aXR5Q2FsbGJhY2s6On5HQ0Fj dGl2aXR5Q2FsbGJhY2spOgorICAgICAgICAoSlNDOjpHQ0FjdGl2aXR5Q2FsbGJhY2s6OndpbGxB bGxvY2F0ZSk6CisgICAgICAgIChKU0M6OkdDQWN0aXZpdHlDYWxsYmFjazo6ZGlkQ29sbGVjdCk6 CisgICAgICAgIChKU0M6OkdDQWN0aXZpdHlDYWxsYmFjazo6ZGlkQWJhbmRvbk9iamVjdEdyYXBo KToKKyAgICAgICAgKEpTQzo6R0NBY3Rpdml0eUNhbGxiYWNrOjpzeW5jaHJvbml6ZSk6CisgICAg ICAgIChEZWZhdWx0R0NBY3Rpdml0eUNhbGxiYWNrKToKKyAgICAgICAgKiBydW50aW1lL0dDQWN0 aXZpdHlDYWxsYmFja0NGLmNwcDogUmUtd2lyZWQgYWxsIHRoZSBydW4gbG9vcCBzdHVmZiB0byBp bXBsZW1lbnQgdGhlIGFmb3JlbWVudGlvbmVkIGZ1bmN0aW9ucy4gCisgICAgICAgIFdlIGFkZGVk IGEgZmxhZyB0byBjaGVjayB3aGV0aGVyIHRoZSB0aW1lciB3YXMgYWN0aXZlIGJlY2F1c2UgdGhl IGNhbGwgdG8gQ0ZSdW5Mb29wVGltZXJTZXROZXh0RmlyZURhdGUgYWN0dWFsbHkgCisgICAgICAg IHR1cm5lZCBvdXQgdG8gYmUgcXVpdGUgZXhwZW5zaXZlIChhbHRob3VnaCBJbnN0cnVtZW50cyBj b3VsZG4ndCB0ZWxsIHVzIHRoaXMpLgorICAgICAgICAoRGVmYXVsdEdDQWN0aXZpdHlDYWxsYmFj a1BsYXRmb3JtRGF0YSk6CisgICAgICAgIChKU0MpOgorICAgICAgICAoSlNDOjpEZWZhdWx0R0NB Y3Rpdml0eUNhbGxiYWNrUGxhdGZvcm1EYXRhOjp0aW1lckRpZEZpcmUpOgorICAgICAgICAoSlND OjpEZWZhdWx0R0NBY3Rpdml0eUNhbGxiYWNrOjpjb21tb25Db25zdHJ1Y3Rvcik6CisgICAgICAg IChKU0M6OnNjaGVkdWxlVGltZXIpOgorICAgICAgICAoSlNDOjpjYW5jZWxUaW1lcik6CisgICAg ICAgIChKU0M6OkRlZmF1bHRHQ0FjdGl2aXR5Q2FsbGJhY2s6OndpbGxBbGxvY2F0ZSk6CisgICAg ICAgIChKU0M6OkRlZmF1bHRHQ0FjdGl2aXR5Q2FsbGJhY2s6OmRpZENvbGxlY3QpOgorICAgICAg ICAoSlNDOjpEZWZhdWx0R0NBY3Rpdml0eUNhbGxiYWNrOjpkaWRBYmFuZG9uT2JqZWN0R3JhcGgp OgorCiAyMDEyLTA0LTE3ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAg ICAgdXNlIGFmdGVyIGZyZWUgaW4gSlNDOjpERkc6Ok5vZGU6Om9wIC8gSlNDOjpERkc6OkJ5dGVD b2RlUGFyc2VyOjpmbHVzaEFyZ3VtZW50CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJ L0pTQ29udGV4dFJlZi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0FQ SS9KU0NvbnRleHRSZWYuY3BwCShyZXZpc2lvbiAxMTQzODYpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvQVBJL0pTQ29udGV4dFJlZi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0OSw3ICsxNDks NyBAQCB2b2lkIEpTR2xvYmFsQ29udGV4dFJlbGVhc2UoSlNHbG9iYWxDb250CiAgICAgICAgIGds b2JhbERhdGEuaGVhcC5kZXN0cm95KCk7CiAgICAgfSBlbHNlIGlmIChyZWxlYXNpbmdHbG9iYWxP YmplY3QpIHsKICAgICAgICAgZ2xvYmFsRGF0YS5oZWFwLmFjdGl2aXR5Q2FsbGJhY2soKS0+c3lu Y2hyb25pemUoKTsKLSAgICAgICAgKCpnbG9iYWxEYXRhLmhlYXAuYWN0aXZpdHlDYWxsYmFjaygp KSgpOworICAgICAgICBnbG9iYWxEYXRhLmhlYXAuYWN0aXZpdHlDYWxsYmFjaygpLT5kaWRBYmFu ZG9uT2JqZWN0R3JhcGgoKTsKICAgICB9CiAKICAgICBnbG9iYWxEYXRhLmRlcmVmKCk7CkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9Db3BpZWRTcGFjZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQ29waWVkU3BhY2UuY3BwCShyZXZpc2lvbiAx MTQzODYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9Db3BpZWRTcGFjZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJDb3BpZWRTcGFjZS5oIgog CiAjaW5jbHVkZSAiQ29waWVkU3BhY2VJbmxpbmVNZXRob2RzLmgiCisjaW5jbHVkZSAiR0NBY3Rp dml0eUNhbGxiYWNrLmgiCiAKIG5hbWVzcGFjZSBKU0MgewogCkBAIC01MSw2ICs1Miw4IEBAIHZv aWQgQ29waWVkU3BhY2U6OmluaXQoKQogCiBDaGVja2VkQm9vbGVhbiBDb3BpZWRTcGFjZTo6dHJ5 QWxsb2NhdGVTbG93Q2FzZShzaXplX3QgYnl0ZXMsIHZvaWQqKiBvdXRQdHIpCiB7CisgICAgbV9o ZWFwLT5hY3Rpdml0eUNhbGxiYWNrKCktPndpbGxBbGxvY2F0ZSgpOworICAgIAogICAgIGlmIChp c092ZXJzaXplKGJ5dGVzKSkKICAgICAgICAgcmV0dXJuIHRyeUFsbG9jYXRlT3ZlcnNpemUoYnl0 ZXMsIG91dFB0cik7CiAgICAgCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFw LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNwcAko cmV2aXNpb24gMTE0Mzg2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTMyOCw4ICszMjgsOCBAQCBIZWFwOjpIZWFwKEpTR2xvYmFsRGF0 YSogZ2xvYmFsRGF0YSwgSGVhCiAgICAgLCBtX2lzU2FmZVRvQ29sbGVjdChmYWxzZSkKICAgICAs IG1fZ2xvYmFsRGF0YShnbG9iYWxEYXRhKQogICAgICwgbV9sYXN0R0NMZW5ndGgoMCkKKyAgICAs IG1fbGFzdENvZGVEaXNjYXJkVGltZShXVEY6OmN1cnJlbnRUaW1lKCkpCiB7Ci0gICAgKCptX2Fj dGl2aXR5Q2FsbGJhY2spKCk7CiAgICAgbV9udW1iZXJPZkZyZWVCbG9ja3MgPSAwOwogICAgIG1f YmxvY2tGcmVlaW5nVGhyZWFkID0gY3JlYXRlVGhyZWFkKGJsb2NrRnJlZWluZ1RocmVhZFN0YXJ0 RnVuYywgdGhpcywgIkphdmFTY3JpcHRDb3JlOjpCbG9ja0ZyZWUiKTsKICAgICAKQEAgLTc4Mywx MSArNzgzLDEyIEBAIHZvaWQgSGVhcDo6Y29sbGVjdEFsbEdhcmJhZ2UoKQogewogICAgIGlmICgh bV9pc1NhZmVUb0NvbGxlY3QpCiAgICAgICAgIHJldHVybjsKLSAgICBkaXNjYXJkQWxsQ29tcGls ZWRDb2RlKCk7CiAKICAgICBjb2xsZWN0KERvU3dlZXApOwogfQogCitzdGF0aWMgZG91YmxlIG1p bnV0ZSA9IDYwLjA7CisKIHZvaWQgSGVhcDo6Y29sbGVjdChTd2VlcFRvZ2dsZSBzd2VlcFRvZ2ds ZSkKIHsKICAgICBTYW1wbGluZ1JlZ2lvbiBzYW1wbGluZ1JlZ2lvbigiR2FyYmFnZSBDb2xsZWN0 aW9uIik7CkBAIC03OTYsNyArNzk3LDEzIEBAIHZvaWQgSGVhcDo6Y29sbGVjdChTd2VlcFRvZ2ds ZSBzd2VlcFRvZ2cKICAgICBBU1NFUlQoZ2xvYmFsRGF0YSgpLT5pZGVudGlmaWVyVGFibGUgPT0g d3RmVGhyZWFkRGF0YSgpLmN1cnJlbnRJZGVudGlmaWVyVGFibGUoKSk7CiAgICAgQVNTRVJUKG1f aXNTYWZlVG9Db2xsZWN0KTsKICAgICBKQVZBU0NSSVBUQ09SRV9HQ19CRUdJTigpOworCiAgICAg ZG91YmxlIGxhc3RHQ1N0YXJ0VGltZSA9IFdURjo6Y3VycmVudFRpbWUoKTsKKyAgICBpZiAobGFz dEdDU3RhcnRUaW1lIC0gbV9sYXN0Q29kZURpc2NhcmRUaW1lID4gbWludXRlKSB7CisgICAgICAg IGRpc2NhcmRBbGxDb21waWxlZENvZGUoKTsKKyAgICAgICAgbV9sYXN0Q29kZURpc2NhcmRUaW1l ID0gV1RGOjpjdXJyZW50VGltZSgpOworICAgIH0KKwogI2lmIEVOQUJMRShHR0MpCiAgICAgYm9v bCBmdWxsR0MgPSBzd2VlcFRvZ2dsZSA9PSBEb1N3ZWVwOwogICAgIGlmICghZnVsbEdDKQpAQCAt ODU1LDcgKzg2Miw3IEBAIHZvaWQgSGVhcDo6Y29sbGVjdChTd2VlcFRvZ2dsZSBzd2VlcFRvZ2cK ICAgICBtX2xhc3RHQ0xlbmd0aCA9IGxhc3RHQ0VuZFRpbWUgLSBsYXN0R0NTdGFydFRpbWU7CiAg ICAgSkFWQVNDUklQVENPUkVfR0NfRU5EKCk7CiAKLSAgICAoKm1fYWN0aXZpdHlDYWxsYmFjayko KTsKKyAgICBtX2FjdGl2aXR5Q2FsbGJhY2stPmRpZENvbGxlY3QoKTsKIH0KIAogdm9pZCBIZWFw OjpjYW5vbmljYWxpemVDZWxsTGl2ZW5lc3NEYXRhKCkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9oZWFwL0hlYXAuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVh cC9IZWFwLmgJKHJldmlzaW9uIDExNDM4NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFw L0hlYXAuaAkod29ya2luZyBjb3B5KQpAQCAtMjQ3LDYgKzI0Nyw3IEBAIG5hbWVzcGFjZSBKU0Mg ewogCiAgICAgICAgIEpTR2xvYmFsRGF0YSogbV9nbG9iYWxEYXRhOwogICAgICAgICBkb3VibGUg bV9sYXN0R0NMZW5ndGg7CisgICAgICAgIGRvdWJsZSBtX2xhc3RDb2RlRGlzY2FyZFRpbWU7CiAK ICAgICAgICAgRG91Ymx5TGlua2VkTGlzdDxGdW5jdGlvbkV4ZWN1dGFibGU+IG1fZnVuY3Rpb25z OwogICAgIH07CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYXJrZWRBbGxvY2F0 b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hcmtlZEFs bG9jYXRvci5jcHAJKHJldmlzaW9uIDExNDM4NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9o ZWFwL01hcmtlZEFsbG9jYXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNiArMSw3IEBACiAj aW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiTWFya2VkQWxsb2NhdG9yLmgiCiAKKyNpbmNs dWRlICJHQ0FjdGl2aXR5Q2FsbGJhY2suaCIKICNpbmNsdWRlICJIZWFwLmgiCiAKIG5hbWVzcGFj ZSBKU0MgewpAQCAtNDEsNiArNDIsOCBAQCB2b2lkKiBNYXJrZWRBbGxvY2F0b3I6OmFsbG9jYXRl U2xvd0Nhc2UoCiAgICAgQVNTRVJUKG1faGVhcC0+bV9vcGVyYXRpb25JblByb2dyZXNzID09IE5v T3BlcmF0aW9uKTsKICNlbmRpZgogICAgIAorICAgIG1faGVhcC0+YWN0aXZpdHlDYWxsYmFjaygp LT53aWxsQWxsb2NhdGUoKTsKKyAgICAKICAgICB2b2lkKiByZXN1bHQgPSB0cnlBbGxvY2F0ZSgp OwogICAgIAogICAgIGlmIChMSUtFTFkocmVzdWx0ICE9IDApKQpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvR0NBY3Rpdml0eUNhbGxiYWNrLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9HQ0FjdGl2aXR5Q2FsbGJhY2suY3BwCShyZXZp c2lvbiAxMTQzODYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9HQ0FjdGl2aXR5 Q2FsbGJhY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Miw3ICs0MiwxNSBAQCBEZWZhdWx0R0NB Y3Rpdml0eUNhbGxiYWNrOjp+RGVmYXVsdEdDQWN0CiB7CiB9CiAKLXZvaWQgRGVmYXVsdEdDQWN0 aXZpdHlDYWxsYmFjazo6b3BlcmF0b3IoKSgpCit2b2lkIERlZmF1bHRHQ0FjdGl2aXR5Q2FsbGJh Y2s6OndpbGxBbGxvY2F0ZSgpCit7Cit9CisKK3ZvaWQgRGVmYXVsdEdDQWN0aXZpdHlDYWxsYmFj azo6ZGlkQ29sbGVjdCgpCit7Cit9CisKK3ZvaWQgRGVmYXVsdEdDQWN0aXZpdHlDYWxsYmFjazo6 ZGlkQWJhbmRvbk9iamVjdEdyYXBoKCkKIHsKIH0KIApJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvR0NBY3Rpdml0eUNhbGxiYWNrLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvR0NBY3Rpdml0eUNhbGxiYWNrLmgJKHJldmlzaW9uIDExNDM4 NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0dDQWN0aXZpdHlDYWxsYmFjay5o CSh3b3JraW5nIGNvcHkpCkBAIC00Miw5ICs0MiwxMSBAQCBjbGFzcyBIZWFwOwogCiBjbGFzcyBH Q0FjdGl2aXR5Q2FsbGJhY2sgewogcHVibGljOgotICAgIHZpcnR1YWwgfkdDQWN0aXZpdHlDYWxs YmFjaygpIHt9Ci0gICAgdmlydHVhbCB2b2lkIG9wZXJhdG9yKCkoKSB7fQotICAgIHZpcnR1YWwg dm9pZCBzeW5jaHJvbml6ZSgpIHt9CisgICAgdmlydHVhbCB+R0NBY3Rpdml0eUNhbGxiYWNrKCkg eyB9CisgICAgdmlydHVhbCB2b2lkIHdpbGxBbGxvY2F0ZSgpIHsgfQorICAgIHZpcnR1YWwgdm9p ZCBkaWRDb2xsZWN0KCkgeyB9CisgICAgdmlydHVhbCB2b2lkIGRpZEFiYW5kb25PYmplY3RHcmFw aCgpIHsgfQorICAgIHZpcnR1YWwgdm9pZCBzeW5jaHJvbml6ZSgpIHsgfQogCiBwcm90ZWN0ZWQ6 CiAgICAgR0NBY3Rpdml0eUNhbGxiYWNrKCkge30KQEAgLTU3LDEwICs1OSwxMiBAQCBwdWJsaWM6 CiAgICAgc3RhdGljIFBhc3NPd25QdHI8RGVmYXVsdEdDQWN0aXZpdHlDYWxsYmFjaz4gY3JlYXRl KEhlYXAqKTsKIAogICAgIERlZmF1bHRHQ0FjdGl2aXR5Q2FsbGJhY2soSGVhcCopOwotICAgIH5E ZWZhdWx0R0NBY3Rpdml0eUNhbGxiYWNrKCk7CisgICAgdmlydHVhbCB+RGVmYXVsdEdDQWN0aXZp dHlDYWxsYmFjaygpOwogCi0gICAgdm9pZCBvcGVyYXRvcigpKCk7Ci0gICAgdm9pZCBzeW5jaHJv bml6ZSgpOworICAgIHZpcnR1YWwgdm9pZCB3aWxsQWxsb2NhdGUoKTsKKyAgICB2aXJ0dWFsIHZv aWQgZGlkQ29sbGVjdCgpOworICAgIHZpcnR1YWwgdm9pZCBkaWRBYmFuZG9uT2JqZWN0R3JhcGgo KTsKKyAgICB2aXJ0dWFsIHZvaWQgc3luY2hyb25pemUoKTsKIAogI2lmIFVTRShDRikKIHByb3Rl Y3RlZDoKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0dDQWN0aXZpdHlDYWxs YmFja0NGLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9H Q0FjdGl2aXR5Q2FsbGJhY2tDRi5jcHAJKHJldmlzaW9uIDExNDM4NikKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0dDQWN0aXZpdHlDYWxsYmFja0NGLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNDUsMjEgKzQ1LDI0IEBACiBuYW1lc3BhY2UgSlNDIHsKIAogc3RydWN0IERlZmF1bHRH Q0FjdGl2aXR5Q2FsbGJhY2tQbGF0Zm9ybURhdGEgewotICAgIHN0YXRpYyB2b2lkIHRyaWdnZXIo Q0ZSdW5Mb29wVGltZXJSZWYsIHZvaWQgKmluZm8pOworICAgIHN0YXRpYyB2b2lkIHRpbWVyRGlk RmlyZShDRlJ1bkxvb3BUaW1lclJlZiwgdm9pZCAqaW5mbyk7CiAKICAgICBSZXRhaW5QdHI8Q0ZS dW5Mb29wVGltZXJSZWY+IHRpbWVyOwogICAgIFJldGFpblB0cjxDRlJ1bkxvb3BSZWY+IHJ1bkxv b3A7CiAgICAgQ0ZSdW5Mb29wVGltZXJDb250ZXh0IGNvbnRleHQ7CisgICAgYm9vbCB0aW1lcklz QWN0aXZlOwogfTsKIAorY29uc3QgZG91YmxlIGdjQ1BVQnVkZ2V0ID0gMC4wMjU7Citjb25zdCBk b3VibGUgZ2NUaW1lckludGVydmFsTXVsdGlwbGllciA9IDEuMCAvIGdjQ1BVQnVkZ2V0OwogY29u c3QgQ0ZUaW1lSW50ZXJ2YWwgZGVjYWRlID0gNjAgKiA2MCAqIDI0ICogMzY1ICogMTA7Citjb25z dCBDRlRpbWVJbnRlcnZhbCBob3VyID0gNjAgKiA2MDsKIAotdm9pZCBEZWZhdWx0R0NBY3Rpdml0 eUNhbGxiYWNrUGxhdGZvcm1EYXRhOjp0cmlnZ2VyKENGUnVuTG9vcFRpbWVyUmVmIHRpbWVyLCB2 b2lkICppbmZvKQordm9pZCBEZWZhdWx0R0NBY3Rpdml0eUNhbGxiYWNrUGxhdGZvcm1EYXRhOjp0 aW1lckRpZEZpcmUoQ0ZSdW5Mb29wVGltZXJSZWYsIHZvaWQgKmluZm8pCiB7CiAgICAgSGVhcCog aGVhcCA9IHN0YXRpY19jYXN0PEhlYXAqPihpbmZvKTsKICAgICBBUElFbnRyeVNoaW0gc2hpbSho ZWFwLT5nbG9iYWxEYXRhKCkpOwogICAgIGhlYXAtPmNvbGxlY3RBbGxHYXJiYWdlKCk7Ci0gICAg Q0ZSdW5Mb29wVGltZXJTZXROZXh0RmlyZURhdGUodGltZXIsIENGQWJzb2x1dGVUaW1lR2V0Q3Vy cmVudCgpICsgZGVjYWRlKTsKIH0KIAogRGVmYXVsdEdDQWN0aXZpdHlDYWxsYmFjazo6RGVmYXVs dEdDQWN0aXZpdHlDYWxsYmFjayhIZWFwKiBoZWFwKQpAQCAtODgsMTYgKzkxLDQzIEBAIHZvaWQg RGVmYXVsdEdDQWN0aXZpdHlDYWxsYmFjazo6Y29tbW9uQ28KICAgICBtZW1zZXQoJmQtPmNvbnRl eHQsIDAsIHNpemVvZihDRlJ1bkxvb3BUaW1lckNvbnRleHQpKTsKICAgICBkLT5jb250ZXh0Lmlu Zm8gPSBoZWFwOwogICAgIGQtPnJ1bkxvb3AgPSBydW5Mb29wOwotICAgIGQtPnRpbWVyLmFkb3B0 Q0YoQ0ZSdW5Mb29wVGltZXJDcmVhdGUoMCwgZGVjYWRlLCBkZWNhZGUsIDAsIDAsIERlZmF1bHRH Q0FjdGl2aXR5Q2FsbGJhY2tQbGF0Zm9ybURhdGE6OnRyaWdnZXIsICZkLT5jb250ZXh0KSk7Cisg ICAgZC0+dGltZXIuYWRvcHRDRihDRlJ1bkxvb3BUaW1lckNyZWF0ZSgwLCBkZWNhZGUsIGRlY2Fk ZSwgMCwgMCwgRGVmYXVsdEdDQWN0aXZpdHlDYWxsYmFja1BsYXRmb3JtRGF0YTo6dGltZXJEaWRG aXJlLCAmZC0+Y29udGV4dCkpOworICAgIGQtPnRpbWVySXNBY3RpdmUgPSBmYWxzZTsKICAgICBD RlJ1bkxvb3BBZGRUaW1lcihkLT5ydW5Mb29wLmdldCgpLCBkLT50aW1lci5nZXQoKSwga0NGUnVu TG9vcENvbW1vbk1vZGVzKTsKIH0KIAotdm9pZCBEZWZhdWx0R0NBY3Rpdml0eUNhbGxiYWNrOjpv cGVyYXRvcigpKCkKK3N0YXRpYyB2b2lkIHNjaGVkdWxlVGltZXIoRGVmYXVsdEdDQWN0aXZpdHlD YWxsYmFja1BsYXRmb3JtRGF0YSogZCkKIHsKLSAgICBDRlRpbWVJbnRlcnZhbCB0cmlnZ2VySW50 ZXJ2YWwgPSBzdGF0aWNfY2FzdDxIZWFwKj4oZC0+Y29udGV4dC5pbmZvKS0+bGFzdEdDTGVuZ3Ro KCkgKiAxMDAuMDsgCisgICAgaWYgKGQtPnRpbWVySXNBY3RpdmUpCisgICAgICAgIHJldHVybjsK KyAgICBkLT50aW1lcklzQWN0aXZlID0gdHJ1ZTsKKyAgICBDRlRpbWVJbnRlcnZhbCB0cmlnZ2Vy SW50ZXJ2YWwgPSBzdGF0aWNfY2FzdDxIZWFwKj4oZC0+Y29udGV4dC5pbmZvKS0+bGFzdEdDTGVu Z3RoKCkgKiBnY1RpbWVySW50ZXJ2YWxNdWx0aXBsaWVyOyAKICAgICBDRlJ1bkxvb3BUaW1lclNl dE5leHRGaXJlRGF0ZShkLT50aW1lci5nZXQoKSwgQ0ZBYnNvbHV0ZVRpbWVHZXRDdXJyZW50KCkg KyB0cmlnZ2VySW50ZXJ2YWwpOwogfQogCitzdGF0aWMgdm9pZCBjYW5jZWxUaW1lcihEZWZhdWx0 R0NBY3Rpdml0eUNhbGxiYWNrUGxhdGZvcm1EYXRhKiBkKQoreworICAgIGlmICghZC0+dGltZXJJ c0FjdGl2ZSkKKyAgICAgICAgcmV0dXJuOworICAgIGQtPnRpbWVySXNBY3RpdmUgPSBmYWxzZTsK KyAgICBDRlJ1bkxvb3BUaW1lclNldE5leHRGaXJlRGF0ZShkLT50aW1lci5nZXQoKSwgQ0ZBYnNv bHV0ZVRpbWVHZXRDdXJyZW50KCkgKyBkZWNhZGUpOworfQorCit2b2lkIERlZmF1bHRHQ0FjdGl2 aXR5Q2FsbGJhY2s6OndpbGxBbGxvY2F0ZSgpCit7CisgICAgc2NoZWR1bGVUaW1lcihkLmdldCgp KTsKK30KKwordm9pZCBEZWZhdWx0R0NBY3Rpdml0eUNhbGxiYWNrOjpkaWRDb2xsZWN0KCkKK3sK KyAgICBjYW5jZWxUaW1lcihkLmdldCgpKTsKK30KKwordm9pZCBEZWZhdWx0R0NBY3Rpdml0eUNh bGxiYWNrOjpkaWRBYmFuZG9uT2JqZWN0R3JhcGgoKQoreworICAgIHNjaGVkdWxlVGltZXIoZC5n ZXQoKSk7Cit9CisKIHZvaWQgRGVmYXVsdEdDQWN0aXZpdHlDYWxsYmFjazo6c3luY2hyb25pemUo KQogewogICAgIGlmIChDRlJ1bkxvb3BHZXRDdXJyZW50KCkgPT0gZC0+cnVuTG9vcC5nZXQoKSkK