25338 2009-04-22 21:51:53 -0700 Move ThreadingGtk.cpp under the gtk directory. 2009-04-24 17:19:03 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 laszlo.gombos webkit-unassigned oldest_to_newest 118475 0 laszlo.gombos 2009-04-22 21:51:53 -0700 JavaScriptCore/wtf/ThreadingGtk.cpp should be under JavaScriptCore/wtf/gtk/ThreadingGtk.cpp to be consistent with the rest of the source tree structure. Separate bugs will be created for other port specific Threading files (Qt, Win). 118476 1 29706 laszlo.gombos 2009-04-22 21:55:38 -0700 Created attachment 29706 Proposed change. 118542 2 29706 mrowe 2009-04-23 14:17:03 -0700 Comment on attachment 29706 Proposed change. rs=me 118782 3 jmalonzo 2009-04-24 17:19:03 -0700 (In reply to comment #2) > (From update of attachment 29706 [review]) > rs=me > Landed in r42857 29706 2009-04-22 21:55:38 -0700 2009-04-23 14:17:03 -0700 Proposed change. patch_25338.txt text/plain 14789 laszlo.gombos SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDQyNzcxKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDQtMjIgIExhc3psbyBH b21ib3MgIDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yNTMzOAorCisgICAgICAgIE1vdmUgVGhyZWFkaW5nR3RrLmNwcCB1bmRlciB0 aGUgZ3RrIGRpcmVjdG9yeS4KKworICAgICAgICAqIEdOVW1ha2VmaWxlLmFtOgorICAgICAgICAq IHd0Zi9UaHJlYWRpbmdHdGsuY3BwOiBSZW1vdmVkLgorICAgICAgICAqIHd0Zi9ndGsvVGhyZWFk aW5nR3RrLmNwcDogQ29waWVkIGZyb20gSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZ0d0ay5j cHAuCisKIDIwMDktMDQtMjIgIE1hcmsgUm93ZSAgPG1yb3dlQGFwcGxlLmNvbT4KIAogICAgICAg ICBSdWJiZXItc3RhbXBlZCBieSBHYXZpbiBCYXJyYWNsb3VnaC4KSW5kZXg6IEphdmFTY3JpcHRD b3JlL0dOVW1ha2VmaWxlLmFtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL0dOVW1ha2Vm aWxlLmFtCShyZXZpc2lvbiA0Mjc0OCkKKysrIEphdmFTY3JpcHRDb3JlL0dOVW1ha2VmaWxlLmFt CSh3b3JraW5nIGNvcHkpCkBAIC0yNTQsNyArMjU0LDYgQEAgamF2YXNjcmlwdGNvcmVfc291cmNl cyArPSBcCiAJSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZFNwZWNpZmljLmggXAogCUphdmFTY3Jp cHRDb3JlL3d0Zi9UaHJlYWRpbmcuaCBcCiAJSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZy5j cHAgXAotCUphdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmdHdGsuY3BwIFwKIAlKYXZhU2NyaXB0 Q29yZS93dGYvVGhyZWFkaW5nUHRocmVhZHMuY3BwIFwKIAlKYXZhU2NyaXB0Q29yZS93dGYvVHlw ZVRyYWl0cy5jcHAgXAogCUphdmFTY3JpcHRDb3JlL3d0Zi9UeXBlVHJhaXRzLmggXApAQCAtMjYy LDYgKzI2MSw3IEBAIGphdmFzY3JpcHRjb3JlX3NvdXJjZXMgKz0gXAogCUphdmFTY3JpcHRDb3Jl L3d0Zi9WZWN0b3IuaCBcCiAJSmF2YVNjcmlwdENvcmUvd3RmL1ZlY3RvclRyYWl0cy5oIFwKIAlK YXZhU2NyaXB0Q29yZS93dGYvZ3RrL01haW5UaHJlYWRHdGsuY3BwIFwKKwlKYXZhU2NyaXB0Q29y ZS93dGYvZ3RrL1RocmVhZGluZ0d0ay5jcHAgXAogCUphdmFTY3JpcHRDb3JlL3d0Zi91bmljb2Rl L0NvbGxhdG9yLmggXAogCUphdmFTY3JpcHRDb3JlL3d0Zi91bmljb2RlL0NvbGxhdG9yRGVmYXVs dC5jcHAgXAogCUphdmFTY3JpcHRDb3JlL3d0Zi91bmljb2RlL1VURjguY3BwIFwKSW5kZXg6IEph dmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmdHdGsuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFTY3Jp cHRDb3JlL3d0Zi9UaHJlYWRpbmdHdGsuY3BwCShyZXZpc2lvbiA0Mjc0OCkKKysrIEphdmFTY3Jp cHRDb3JlL3d0Zi9UaHJlYWRpbmdHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDI0OSArMCww IEBACi0vKgotICogQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA4IEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KLSAqIENvcHlyaWdodCAoQykgMjAwNyBKdXN0aW4gSGF5Z29vZCAoamhheWdv b2RAcmVha3RpeC5jb20pCi0gKgotICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Ci0gKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKLSAqIGFyZSBt ZXQ6Ci0gKgotICogMS4gIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFp biB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0 aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgotICogMi4gIFJlZGlzdHJpYnV0aW9u cyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAg ICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyIGluIHRoZQotICogICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFs cyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCi0gKiAzLiAgTmVpdGhlciB0aGUgbmFt ZSBvZiBBcHBsZSBJbmMuICgiQXBwbGUiKSBub3IgdGhlIG5hbWVzIG9mCi0gKiAgICAgaXRzIGNv bnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVy aXZlZAotICogICAgIGZyb20gdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdy aXR0ZW4gcGVybWlzc2lvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQ UExFIEFORCBJVFMgQ09OVFJJQlVUT1JTICJBUyBJUyIgQU5EIEFOWQotICogRVhQUkVTUyBPUiBJ TVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1Q TElFRAotICogV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEg UEFSVElDVUxBUiBQVVJQT1NFIEFSRQotICogRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwg QVBQTEUgT1IgSVRTIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWQotICogRElSRUNULCBJ TkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFM IERBTUFHRVMKLSAqIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQg T0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsKLSAqIExPU1MgT0YgVVNFLCBEQVRBLCBP UiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORAot ICogT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklD VCBMSUFCSUxJVFksIE9SIFRPUlQKLSAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJ U0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRgotICogVEhJUyBTT0ZUV0FS RSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KLSAq LwotCi0jaW5jbHVkZSAiY29uZmlnLmgiCi0jaW5jbHVkZSAiVGhyZWFkaW5nLmgiCi0KLSNpZiAh VVNFKFBUSFJFQURTKQotCi0jaW5jbHVkZSAiQ3VycmVudFRpbWUuaCIKLSNpbmNsdWRlICJIYXNo TWFwLmgiCi0jaW5jbHVkZSAiTWFpblRocmVhZC5oIgotI2luY2x1ZGUgIlJhbmRvbU51bWJlclNl ZWQuaCIKLQotI2luY2x1ZGUgPGdsaWIuaD4KLSNpbmNsdWRlIDxsaW1pdHMuaD4KLQotbmFtZXNw YWNlIFdURiB7Ci0KLXN0YXRpYyBNdXRleCogYXRvbWljYWxseUluaXRpYWxpemVkU3RhdGljTXV0 ZXg7Ci0KLXN0YXRpYyBUaHJlYWRJZGVudGlmaWVyIG1haW5UaHJlYWRJZGVudGlmaWVyOwotCi1z dGF0aWMgTXV0ZXgmIHRocmVhZE1hcE11dGV4KCkKLXsKLSAgICBzdGF0aWMgTXV0ZXggbXV0ZXg7 Ci0gICAgcmV0dXJuIG11dGV4OwotfQotCi12b2lkIGluaXRpYWxpemVUaHJlYWRpbmcoKQotewot ICAgIGlmICghZ190aHJlYWRfc3VwcG9ydGVkKCkpCi0gICAgICAgIGdfdGhyZWFkX2luaXQoTlVM TCk7Ci0gICAgQVNTRVJUKGdfdGhyZWFkX3N1cHBvcnRlZCgpKTsKLQotICAgIGlmICghYXRvbWlj YWxseUluaXRpYWxpemVkU3RhdGljTXV0ZXgpIHsKLSAgICAgICAgYXRvbWljYWxseUluaXRpYWxp emVkU3RhdGljTXV0ZXggPSBuZXcgTXV0ZXg7Ci0gICAgICAgIHRocmVhZE1hcE11dGV4KCk7Ci0g ICAgICAgIGluaXRpYWxpemVSYW5kb21OdW1iZXJHZW5lcmF0b3IoKTsKLSAgICAgICAgbWFpblRo cmVhZElkZW50aWZpZXIgPSBjdXJyZW50VGhyZWFkKCk7Ci0gICAgICAgIGluaXRpYWxpemVNYWlu VGhyZWFkKCk7Ci0gICAgfQotfQotCi12b2lkIGxvY2tBdG9taWNhbGx5SW5pdGlhbGl6ZWRTdGF0 aWNNdXRleCgpCi17Ci0gICAgQVNTRVJUKGF0b21pY2FsbHlJbml0aWFsaXplZFN0YXRpY011dGV4 KTsKLSAgICBhdG9taWNhbGx5SW5pdGlhbGl6ZWRTdGF0aWNNdXRleC0+bG9jaygpOwotfQotCi12 b2lkIHVubG9ja0F0b21pY2FsbHlJbml0aWFsaXplZFN0YXRpY011dGV4KCkKLXsKLSAgICBhdG9t aWNhbGx5SW5pdGlhbGl6ZWRTdGF0aWNNdXRleC0+dW5sb2NrKCk7Ci19Ci0KLXN0YXRpYyBIYXNo TWFwPFRocmVhZElkZW50aWZpZXIsIEdUaHJlYWQqPiYgdGhyZWFkTWFwKCkKLXsKLSAgICBzdGF0 aWMgSGFzaE1hcDxUaHJlYWRJZGVudGlmaWVyLCBHVGhyZWFkKj4gbWFwOwotICAgIHJldHVybiBt YXA7Ci19Ci0KLXN0YXRpYyBUaHJlYWRJZGVudGlmaWVyIGlkZW50aWZpZXJCeUd0aHJlYWRIYW5k bGUoR1RocmVhZComIHRocmVhZCkKLXsKLSAgICBNdXRleExvY2tlciBsb2NrZXIodGhyZWFkTWFw TXV0ZXgoKSk7Ci0KLSAgICBIYXNoTWFwPFRocmVhZElkZW50aWZpZXIsIEdUaHJlYWQqPjo6aXRl cmF0b3IgaSA9IHRocmVhZE1hcCgpLmJlZ2luKCk7Ci0gICAgZm9yICg7IGkgIT0gdGhyZWFkTWFw KCkuZW5kKCk7ICsraSkgewotICAgICAgICBpZiAoaS0+c2Vjb25kID09IHRocmVhZCkKLSAgICAg ICAgICAgIHJldHVybiBpLT5maXJzdDsKLSAgICB9Ci0KLSAgICByZXR1cm4gMDsKLX0KLQotc3Rh dGljIFRocmVhZElkZW50aWZpZXIgZXN0YWJsaXNoSWRlbnRpZmllckZvclRocmVhZChHVGhyZWFk KiYgdGhyZWFkKQotewotICAgIEFTU0VSVCghaWRlbnRpZmllckJ5R3RocmVhZEhhbmRsZSh0aHJl YWQpKTsKLQotICAgIE11dGV4TG9ja2VyIGxvY2tlcih0aHJlYWRNYXBNdXRleCgpKTsKLQotICAg IHN0YXRpYyBUaHJlYWRJZGVudGlmaWVyIGlkZW50aWZpZXJDb3VudCA9IDE7Ci0KLSAgICB0aHJl YWRNYXAoKS5hZGQoaWRlbnRpZmllckNvdW50LCB0aHJlYWQpOwotCi0gICAgcmV0dXJuIGlkZW50 aWZpZXJDb3VudCsrOwotfQotCi1zdGF0aWMgR1RocmVhZCogdGhyZWFkRm9ySWRlbnRpZmllcihU aHJlYWRJZGVudGlmaWVyIGlkKQotewotICAgIE11dGV4TG9ja2VyIGxvY2tlcih0aHJlYWRNYXBN dXRleCgpKTsKLQotICAgIHJldHVybiB0aHJlYWRNYXAoKS5nZXQoaWQpOwotfQotCi1zdGF0aWMg dm9pZCBjbGVhclRocmVhZEZvcklkZW50aWZpZXIoVGhyZWFkSWRlbnRpZmllciBpZCkKLXsKLSAg ICBNdXRleExvY2tlciBsb2NrZXIodGhyZWFkTWFwTXV0ZXgoKSk7Ci0KLSAgICBBU1NFUlQodGhy ZWFkTWFwKCkuY29udGFpbnMoaWQpKTsKLQotICAgIHRocmVhZE1hcCgpLnJlbW92ZShpZCk7Ci19 Ci0KLVRocmVhZElkZW50aWZpZXIgY3JlYXRlVGhyZWFkSW50ZXJuYWwoVGhyZWFkRnVuY3Rpb24g ZW50cnlQb2ludCwgdm9pZCogZGF0YSwgY29uc3QgY2hhciopCi17Ci0gICAgR1RocmVhZCogdGhy ZWFkOwotICAgIGlmICghKHRocmVhZCA9IGdfdGhyZWFkX2NyZWF0ZShlbnRyeVBvaW50LCBkYXRh LCBUUlVFLCAwKSkpIHsKLSAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gY3JlYXRlIHRocmVh ZCBhdCBlbnRyeSBwb2ludCAlcCB3aXRoIGRhdGEgJXAiLCBlbnRyeVBvaW50LCBkYXRhKTsKLSAg ICAgICAgcmV0dXJuIDA7Ci0gICAgfQotCi0gICAgVGhyZWFkSWRlbnRpZmllciB0aHJlYWRJRCA9 IGVzdGFibGlzaElkZW50aWZpZXJGb3JUaHJlYWQodGhyZWFkKTsKLSAgICByZXR1cm4gdGhyZWFk SUQ7Ci19Ci0KLXZvaWQgc2V0VGhyZWFkTmFtZUludGVybmFsKGNvbnN0IGNoYXIqKQotewotfQot Ci1pbnQgd2FpdEZvclRocmVhZENvbXBsZXRpb24oVGhyZWFkSWRlbnRpZmllciB0aHJlYWRJRCwg dm9pZCoqIHJlc3VsdCkKLXsKLSAgICBBU1NFUlQodGhyZWFkSUQpOwotCi0gICAgR1RocmVhZCog dGhyZWFkID0gdGhyZWFkRm9ySWRlbnRpZmllcih0aHJlYWRJRCk7Ci0KLSAgICB2b2lkKiBqb2lu UmVzdWx0ID0gZ190aHJlYWRfam9pbih0aHJlYWQpOwotICAgIGlmIChyZXN1bHQpCi0gICAgICAg ICpyZXN1bHQgPSBqb2luUmVzdWx0OwotCi0gICAgY2xlYXJUaHJlYWRGb3JJZGVudGlmaWVyKHRo cmVhZElEKTsKLSAgICByZXR1cm4gMDsKLX0KLQotdm9pZCBkZXRhY2hUaHJlYWQoVGhyZWFkSWRl bnRpZmllcikKLXsKLX0KLQotVGhyZWFkSWRlbnRpZmllciBjdXJyZW50VGhyZWFkKCkKLXsKLSAg ICBHVGhyZWFkKiBjdXJyZW50VGhyZWFkID0gZ190aHJlYWRfc2VsZigpOwotICAgIGlmIChUaHJl YWRJZGVudGlmaWVyIGlkID0gaWRlbnRpZmllckJ5R3RocmVhZEhhbmRsZShjdXJyZW50VGhyZWFk KSkKLSAgICAgICAgcmV0dXJuIGlkOwotICAgIHJldHVybiBlc3RhYmxpc2hJZGVudGlmaWVyRm9y VGhyZWFkKGN1cnJlbnRUaHJlYWQpOwotfQotCi1ib29sIGlzTWFpblRocmVhZCgpCi17Ci0gICAg cmV0dXJuIGN1cnJlbnRUaHJlYWQoKSA9PSBtYWluVGhyZWFkSWRlbnRpZmllcjsKLX0KLQotTXV0 ZXg6Ok11dGV4KCkKLSAgICA6IG1fbXV0ZXgoZ19tdXRleF9uZXcoKSkKLXsKLX0KLQotTXV0ZXg6 On5NdXRleCgpCi17Ci19Ci0KLXZvaWQgTXV0ZXg6OmxvY2soKQotewotICAgIGdfbXV0ZXhfbG9j ayhtX211dGV4LmdldCgpKTsKLX0KLQotYm9vbCBNdXRleDo6dHJ5TG9jaygpCi17Ci0gICAgcmV0 dXJuIGdfbXV0ZXhfdHJ5bG9jayhtX211dGV4LmdldCgpKTsKLX0KLQotdm9pZCBNdXRleDo6dW5s b2NrKCkKLXsKLSAgICBnX211dGV4X3VubG9jayhtX211dGV4LmdldCgpKTsKLX0KLQotVGhyZWFk Q29uZGl0aW9uOjpUaHJlYWRDb25kaXRpb24oKQotICAgIDogbV9jb25kaXRpb24oZ19jb25kX25l dygpKQotewotfQotCi1UaHJlYWRDb25kaXRpb246On5UaHJlYWRDb25kaXRpb24oKQotewotfQot Ci12b2lkIFRocmVhZENvbmRpdGlvbjo6d2FpdChNdXRleCYgbXV0ZXgpCi17Ci0gICAgZ19jb25k X3dhaXQobV9jb25kaXRpb24uZ2V0KCksIG11dGV4LmltcGwoKS5nZXQoKSk7Ci19Ci0KLWJvb2wg VGhyZWFkQ29uZGl0aW9uOjp0aW1lZFdhaXQoTXV0ZXgmIG11dGV4LCBkb3VibGUgYWJzb2x1dGVU aW1lKQotewotICAgIC8vIFRpbWUgaXMgaW4gdGhlIHBhc3QgLSByZXR1cm4gcmlnaHQgYXdheS4K LSAgICBpZiAoYWJzb2x1dGVUaW1lIDwgY3VycmVudFRpbWUoKSkKLSAgICAgICAgcmV0dXJuIGZh bHNlOwotICAgIAotICAgIC8vIFRpbWUgaXMgdG9vIGZhciBpbiB0aGUgZnV0dXJlIGZvciBnX2Nv bmRfdGltZWRfd2FpdCAtIHdhaXQgZm9yZXZlci4KLSAgICBpZiAoYWJzb2x1dGVUaW1lID4gSU5U X01BWCkgewotICAgICAgICB3YWl0KG11dGV4KTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAg fQotCi0gICAgaW50IHRpbWVTZWNvbmRzID0gc3RhdGljX2Nhc3Q8aW50PihhYnNvbHV0ZVRpbWUp OwotICAgIGludCB0aW1lTWljcm9zZWNvbmRzID0gc3RhdGljX2Nhc3Q8aW50PigoYWJzb2x1dGVU aW1lIC0gdGltZVNlY29uZHMpICogMTAwMDAwMC4wKTsKLSAgICAKLSAgICBHVGltZVZhbCB0YXJn ZXRUaW1lOwotICAgIHRhcmdldFRpbWUudHZfc2VjID0gdGltZVNlY29uZHM7Ci0gICAgdGFyZ2V0 VGltZS50dl91c2VjID0gdGltZU1pY3Jvc2Vjb25kczsKLQotICAgIHJldHVybiBnX2NvbmRfdGlt ZWRfd2FpdChtX2NvbmRpdGlvbi5nZXQoKSwgbXV0ZXguaW1wbCgpLmdldCgpLCAmdGFyZ2V0VGlt ZSk7Ci19Ci0KLXZvaWQgVGhyZWFkQ29uZGl0aW9uOjpzaWduYWwoKQotewotICAgIGdfY29uZF9z aWduYWwobV9jb25kaXRpb24uZ2V0KCkpOwotfQotCi12b2lkIFRocmVhZENvbmRpdGlvbjo6YnJv YWRjYXN0KCkKLXsKLSAgICBnX2NvbmRfYnJvYWRjYXN0KG1fY29uZGl0aW9uLmdldCgpKTsKLX0K LQotCi19Ci0KLSNlbmRpZiAvLyAhVVNFKFBUSFJFQURTKQpJbmRleDogSmF2YVNjcmlwdENvcmUv d3RmL2d0ay9UaHJlYWRpbmdHdGsuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL3d0 Zi9ndGsvVGhyZWFkaW5nR3RrLmNwcAkocmV2aXNpb24gNDI3NDgpCShmcm9tIEphdmFTY3JpcHRD b3JlL3d0Zi9UaHJlYWRpbmdHdGsuY3BwOjQyNzQ4KQorKysgSmF2YVNjcmlwdENvcmUvd3RmL2d0 ay9UaHJlYWRpbmdHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMjQ5IEBACisvKgor ICogQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA4IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNyBKdXN0aW4gSGF5Z29vZCAoamhheWdvb2RAcmVha3Rp eC5jb20pCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKgor ICogMS4gIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJv dmUgY29weXJpZ2h0CisgKiAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5h cnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICAgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGlu IHRoZQorICogICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRl ZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKiAzLiAgTmVpdGhlciB0aGUgbmFtZSBvZiBBcHBs ZSBJbmMuICgiQXBwbGUiKSBub3IgdGhlIG5hbWVzIG9mCisgKiAgICAgaXRzIGNvbnRyaWJ1dG9y cyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZAorICog ICAgIGZyb20gdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVy bWlzc2lvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIEFORCBJ VFMgQ09OVFJJQlVUT1JTICJBUyBJUyIgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdB UlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorICog V0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxB UiBQVVJQT1NFIEFSRQorICogRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgT1Ig SVRTIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWQorICogRElSRUNULCBJTkRJUkVDVCwg SU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMK KyAqIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJ VFVURSBHT09EUyBPUiBTRVJWSUNFUzsKKyAqIExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRT OyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORAorICogT04gQU5Z IFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJ VFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJ TkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRgorICogVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5j bHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiVGhyZWFkaW5nLmgiCisKKyNpZiAhVVNFKFBUSFJF QURTKQorCisjaW5jbHVkZSAiQ3VycmVudFRpbWUuaCIKKyNpbmNsdWRlICJIYXNoTWFwLmgiCisj aW5jbHVkZSAiTWFpblRocmVhZC5oIgorI2luY2x1ZGUgIlJhbmRvbU51bWJlclNlZWQuaCIKKwor I2luY2x1ZGUgPGdsaWIuaD4KKyNpbmNsdWRlIDxsaW1pdHMuaD4KKworbmFtZXNwYWNlIFdURiB7 CisKK3N0YXRpYyBNdXRleCogYXRvbWljYWxseUluaXRpYWxpemVkU3RhdGljTXV0ZXg7CisKK3N0 YXRpYyBUaHJlYWRJZGVudGlmaWVyIG1haW5UaHJlYWRJZGVudGlmaWVyOworCitzdGF0aWMgTXV0 ZXgmIHRocmVhZE1hcE11dGV4KCkKK3sKKyAgICBzdGF0aWMgTXV0ZXggbXV0ZXg7CisgICAgcmV0 dXJuIG11dGV4OworfQorCit2b2lkIGluaXRpYWxpemVUaHJlYWRpbmcoKQoreworICAgIGlmICgh Z190aHJlYWRfc3VwcG9ydGVkKCkpCisgICAgICAgIGdfdGhyZWFkX2luaXQoTlVMTCk7CisgICAg QVNTRVJUKGdfdGhyZWFkX3N1cHBvcnRlZCgpKTsKKworICAgIGlmICghYXRvbWljYWxseUluaXRp YWxpemVkU3RhdGljTXV0ZXgpIHsKKyAgICAgICAgYXRvbWljYWxseUluaXRpYWxpemVkU3RhdGlj TXV0ZXggPSBuZXcgTXV0ZXg7CisgICAgICAgIHRocmVhZE1hcE11dGV4KCk7CisgICAgICAgIGlu aXRpYWxpemVSYW5kb21OdW1iZXJHZW5lcmF0b3IoKTsKKyAgICAgICAgbWFpblRocmVhZElkZW50 aWZpZXIgPSBjdXJyZW50VGhyZWFkKCk7CisgICAgICAgIGluaXRpYWxpemVNYWluVGhyZWFkKCk7 CisgICAgfQorfQorCit2b2lkIGxvY2tBdG9taWNhbGx5SW5pdGlhbGl6ZWRTdGF0aWNNdXRleCgp Cit7CisgICAgQVNTRVJUKGF0b21pY2FsbHlJbml0aWFsaXplZFN0YXRpY011dGV4KTsKKyAgICBh dG9taWNhbGx5SW5pdGlhbGl6ZWRTdGF0aWNNdXRleC0+bG9jaygpOworfQorCit2b2lkIHVubG9j a0F0b21pY2FsbHlJbml0aWFsaXplZFN0YXRpY011dGV4KCkKK3sKKyAgICBhdG9taWNhbGx5SW5p dGlhbGl6ZWRTdGF0aWNNdXRleC0+dW5sb2NrKCk7Cit9CisKK3N0YXRpYyBIYXNoTWFwPFRocmVh ZElkZW50aWZpZXIsIEdUaHJlYWQqPiYgdGhyZWFkTWFwKCkKK3sKKyAgICBzdGF0aWMgSGFzaE1h cDxUaHJlYWRJZGVudGlmaWVyLCBHVGhyZWFkKj4gbWFwOworICAgIHJldHVybiBtYXA7Cit9CisK K3N0YXRpYyBUaHJlYWRJZGVudGlmaWVyIGlkZW50aWZpZXJCeUd0aHJlYWRIYW5kbGUoR1RocmVh ZComIHRocmVhZCkKK3sKKyAgICBNdXRleExvY2tlciBsb2NrZXIodGhyZWFkTWFwTXV0ZXgoKSk7 CisKKyAgICBIYXNoTWFwPFRocmVhZElkZW50aWZpZXIsIEdUaHJlYWQqPjo6aXRlcmF0b3IgaSA9 IHRocmVhZE1hcCgpLmJlZ2luKCk7CisgICAgZm9yICg7IGkgIT0gdGhyZWFkTWFwKCkuZW5kKCk7 ICsraSkgeworICAgICAgICBpZiAoaS0+c2Vjb25kID09IHRocmVhZCkKKyAgICAgICAgICAgIHJl dHVybiBpLT5maXJzdDsKKyAgICB9CisKKyAgICByZXR1cm4gMDsKK30KKworc3RhdGljIFRocmVh ZElkZW50aWZpZXIgZXN0YWJsaXNoSWRlbnRpZmllckZvclRocmVhZChHVGhyZWFkKiYgdGhyZWFk KQoreworICAgIEFTU0VSVCghaWRlbnRpZmllckJ5R3RocmVhZEhhbmRsZSh0aHJlYWQpKTsKKwor ICAgIE11dGV4TG9ja2VyIGxvY2tlcih0aHJlYWRNYXBNdXRleCgpKTsKKworICAgIHN0YXRpYyBU aHJlYWRJZGVudGlmaWVyIGlkZW50aWZpZXJDb3VudCA9IDE7CisKKyAgICB0aHJlYWRNYXAoKS5h ZGQoaWRlbnRpZmllckNvdW50LCB0aHJlYWQpOworCisgICAgcmV0dXJuIGlkZW50aWZpZXJDb3Vu dCsrOworfQorCitzdGF0aWMgR1RocmVhZCogdGhyZWFkRm9ySWRlbnRpZmllcihUaHJlYWRJZGVu dGlmaWVyIGlkKQoreworICAgIE11dGV4TG9ja2VyIGxvY2tlcih0aHJlYWRNYXBNdXRleCgpKTsK KworICAgIHJldHVybiB0aHJlYWRNYXAoKS5nZXQoaWQpOworfQorCitzdGF0aWMgdm9pZCBjbGVh clRocmVhZEZvcklkZW50aWZpZXIoVGhyZWFkSWRlbnRpZmllciBpZCkKK3sKKyAgICBNdXRleExv Y2tlciBsb2NrZXIodGhyZWFkTWFwTXV0ZXgoKSk7CisKKyAgICBBU1NFUlQodGhyZWFkTWFwKCku Y29udGFpbnMoaWQpKTsKKworICAgIHRocmVhZE1hcCgpLnJlbW92ZShpZCk7Cit9CisKK1RocmVh ZElkZW50aWZpZXIgY3JlYXRlVGhyZWFkSW50ZXJuYWwoVGhyZWFkRnVuY3Rpb24gZW50cnlQb2lu dCwgdm9pZCogZGF0YSwgY29uc3QgY2hhciopCit7CisgICAgR1RocmVhZCogdGhyZWFkOworICAg IGlmICghKHRocmVhZCA9IGdfdGhyZWFkX2NyZWF0ZShlbnRyeVBvaW50LCBkYXRhLCBUUlVFLCAw KSkpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gY3JlYXRlIHRocmVhZCBhdCBlbnRy eSBwb2ludCAlcCB3aXRoIGRhdGEgJXAiLCBlbnRyeVBvaW50LCBkYXRhKTsKKyAgICAgICAgcmV0 dXJuIDA7CisgICAgfQorCisgICAgVGhyZWFkSWRlbnRpZmllciB0aHJlYWRJRCA9IGVzdGFibGlz aElkZW50aWZpZXJGb3JUaHJlYWQodGhyZWFkKTsKKyAgICByZXR1cm4gdGhyZWFkSUQ7Cit9CisK K3ZvaWQgc2V0VGhyZWFkTmFtZUludGVybmFsKGNvbnN0IGNoYXIqKQoreworfQorCitpbnQgd2Fp dEZvclRocmVhZENvbXBsZXRpb24oVGhyZWFkSWRlbnRpZmllciB0aHJlYWRJRCwgdm9pZCoqIHJl c3VsdCkKK3sKKyAgICBBU1NFUlQodGhyZWFkSUQpOworCisgICAgR1RocmVhZCogdGhyZWFkID0g dGhyZWFkRm9ySWRlbnRpZmllcih0aHJlYWRJRCk7CisKKyAgICB2b2lkKiBqb2luUmVzdWx0ID0g Z190aHJlYWRfam9pbih0aHJlYWQpOworICAgIGlmIChyZXN1bHQpCisgICAgICAgICpyZXN1bHQg PSBqb2luUmVzdWx0OworCisgICAgY2xlYXJUaHJlYWRGb3JJZGVudGlmaWVyKHRocmVhZElEKTsK KyAgICByZXR1cm4gMDsKK30KKwordm9pZCBkZXRhY2hUaHJlYWQoVGhyZWFkSWRlbnRpZmllcikK K3sKK30KKworVGhyZWFkSWRlbnRpZmllciBjdXJyZW50VGhyZWFkKCkKK3sKKyAgICBHVGhyZWFk KiBjdXJyZW50VGhyZWFkID0gZ190aHJlYWRfc2VsZigpOworICAgIGlmIChUaHJlYWRJZGVudGlm aWVyIGlkID0gaWRlbnRpZmllckJ5R3RocmVhZEhhbmRsZShjdXJyZW50VGhyZWFkKSkKKyAgICAg ICAgcmV0dXJuIGlkOworICAgIHJldHVybiBlc3RhYmxpc2hJZGVudGlmaWVyRm9yVGhyZWFkKGN1 cnJlbnRUaHJlYWQpOworfQorCitib29sIGlzTWFpblRocmVhZCgpCit7CisgICAgcmV0dXJuIGN1 cnJlbnRUaHJlYWQoKSA9PSBtYWluVGhyZWFkSWRlbnRpZmllcjsKK30KKworTXV0ZXg6Ok11dGV4 KCkKKyAgICA6IG1fbXV0ZXgoZ19tdXRleF9uZXcoKSkKK3sKK30KKworTXV0ZXg6On5NdXRleCgp Cit7Cit9CisKK3ZvaWQgTXV0ZXg6OmxvY2soKQoreworICAgIGdfbXV0ZXhfbG9jayhtX211dGV4 LmdldCgpKTsKK30KKworYm9vbCBNdXRleDo6dHJ5TG9jaygpCit7CisgICAgcmV0dXJuIGdfbXV0 ZXhfdHJ5bG9jayhtX211dGV4LmdldCgpKTsKK30KKwordm9pZCBNdXRleDo6dW5sb2NrKCkKK3sK KyAgICBnX211dGV4X3VubG9jayhtX211dGV4LmdldCgpKTsKK30KKworVGhyZWFkQ29uZGl0aW9u OjpUaHJlYWRDb25kaXRpb24oKQorICAgIDogbV9jb25kaXRpb24oZ19jb25kX25ldygpKQorewor fQorCitUaHJlYWRDb25kaXRpb246On5UaHJlYWRDb25kaXRpb24oKQoreworfQorCit2b2lkIFRo cmVhZENvbmRpdGlvbjo6d2FpdChNdXRleCYgbXV0ZXgpCit7CisgICAgZ19jb25kX3dhaXQobV9j b25kaXRpb24uZ2V0KCksIG11dGV4LmltcGwoKS5nZXQoKSk7Cit9CisKK2Jvb2wgVGhyZWFkQ29u ZGl0aW9uOjp0aW1lZFdhaXQoTXV0ZXgmIG11dGV4LCBkb3VibGUgYWJzb2x1dGVUaW1lKQorewor ICAgIC8vIFRpbWUgaXMgaW4gdGhlIHBhc3QgLSByZXR1cm4gcmlnaHQgYXdheS4KKyAgICBpZiAo YWJzb2x1dGVUaW1lIDwgY3VycmVudFRpbWUoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAg IAorICAgIC8vIFRpbWUgaXMgdG9vIGZhciBpbiB0aGUgZnV0dXJlIGZvciBnX2NvbmRfdGltZWRf d2FpdCAtIHdhaXQgZm9yZXZlci4KKyAgICBpZiAoYWJzb2x1dGVUaW1lID4gSU5UX01BWCkgewor ICAgICAgICB3YWl0KG11dGV4KTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCisgICAg aW50IHRpbWVTZWNvbmRzID0gc3RhdGljX2Nhc3Q8aW50PihhYnNvbHV0ZVRpbWUpOworICAgIGlu dCB0aW1lTWljcm9zZWNvbmRzID0gc3RhdGljX2Nhc3Q8aW50PigoYWJzb2x1dGVUaW1lIC0gdGlt ZVNlY29uZHMpICogMTAwMDAwMC4wKTsKKyAgICAKKyAgICBHVGltZVZhbCB0YXJnZXRUaW1lOwor ICAgIHRhcmdldFRpbWUudHZfc2VjID0gdGltZVNlY29uZHM7CisgICAgdGFyZ2V0VGltZS50dl91 c2VjID0gdGltZU1pY3Jvc2Vjb25kczsKKworICAgIHJldHVybiBnX2NvbmRfdGltZWRfd2FpdCht X2NvbmRpdGlvbi5nZXQoKSwgbXV0ZXguaW1wbCgpLmdldCgpLCAmdGFyZ2V0VGltZSk7Cit9CisK K3ZvaWQgVGhyZWFkQ29uZGl0aW9uOjpzaWduYWwoKQoreworICAgIGdfY29uZF9zaWduYWwobV9j b25kaXRpb24uZ2V0KCkpOworfQorCit2b2lkIFRocmVhZENvbmRpdGlvbjo6YnJvYWRjYXN0KCkK K3sKKyAgICBnX2NvbmRfYnJvYWRjYXN0KG1fY29uZGl0aW9uLmdldCgpKTsKK30KKworCit9CisK KyNlbmRpZiAvLyAhVVNFKFBUSFJFQURTKQo=