35341 2010-02-24 07:19:36 -0800 Expose Database object of currently active task on the database thread 2010-02-24 19:51:20 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 0 jochen webkit-unassigned commit-queue jorlow oldest_to_newest 193338 0 jochen 2010-02-24 07:19:36 -0800 Expose Database object of currently active task on the database thread 193340 1 49390 jochen 2010-02-24 07:22:31 -0800 Created attachment 49390 Patch 193342 2 jochen 2010-02-24 07:24:16 -0800 I can't think of any way to test this using a html file 193346 3 49390 jorlow 2010-02-24 07:32:45 -0800 Comment on attachment 49390 Patch Close...but I think it's worth adding an assert. > diff --git a/WebCore/storage/DatabaseThread.cpp b/WebCore/storage/DatabaseThread.cpp > index ec4c6d1..e5a21d1 100644 > --- a/WebCore/storage/DatabaseThread.cpp > +++ b/WebCore/storage/DatabaseThread.cpp > @@ -42,6 +42,7 @@ namespace WebCore { > > DatabaseThread::DatabaseThread() > : m_threadID(0) > + , m_databaseOfCurrentTask(0) > , m_transactionClient(new SQLTransactionClient()) > , m_transactionCoordinator(new SQLTransactionCoordinator()) > , m_cleanupSync(0) > @@ -96,7 +97,9 @@ void* DatabaseThread::databaseThread() > > AutodrainedPool pool; > while (OwnPtr<DatabaseTask> task = m_queue.waitForMessage()) { ASSERT it's 0 first > + m_databaseOfCurrentTask = task->database(); > task->performTask(); > + m_databaseOfCurrentTask = 0; > pool.cycle(); > } 193347 4 49392 jochen 2010-02-24 07:38:05 -0800 Created attachment 49392 patch 193348 5 49392 jorlow 2010-02-24 07:38:50 -0800 Comment on attachment 49392 patch r=me 193608 6 49392 commit-queue 2010-02-24 19:51:15 -0800 Comment on attachment 49392 patch Clearing flags on attachment: 49392 Committed r55214: <http://trac.webkit.org/changeset/55214> 193609 7 commit-queue 2010-02-24 19:51:20 -0800 All reviewed patches have been landed. Closing bug. 49390 2010-02-24 07:22:31 -0800 2010-02-24 07:38:00 -0800 Patch bug-35341-20100224162229.patch text/plain 2411 jochen ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Y2U0OWM3MC4uMWQ1MzAyMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wMi0yNCAgSm9jaGVuIEVpc2lu Z2VyICA8am9jaGVuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBFeHBvc2UgRGF0YWJhc2Ugb2JqZWN0IG9mIGN1cnJlbnRseSBh Y3RpdmUgdGFzayBvbiB0aGUgZGF0YWJhc2UgdGhyZWFkCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTM0MQorCisgICAgICAgICogc3RvcmFnZS9EYXRh YmFzZVRocmVhZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZVRocmVhZDo6RGF0YWJh c2VUaHJlYWQpOgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VUaHJlYWQ6OmRhdGFiYXNlVGhy ZWFkKToKKyAgICAgICAgKiBzdG9yYWdlL0RhdGFiYXNlVGhyZWFkLmg6CisgICAgICAgIChXZWJD b3JlOjpEYXRhYmFzZVRocmVhZDo6Z2V0RGF0YWJhc2VPZkN1cnJlbnRUYXNrKToKKwogMjAxMC0w Mi0yMyAgTGVhbmRybyBQZXJlaXJhICA8bGVhbmRyb0Bwcm9mdXNpb24ubW9iaT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBHdXN0YXZvIE5vcm9uaGEgU2lsdmEuCmRpZmYgLS1naXQgYS9XZWJDb3Jl L3N0b3JhZ2UvRGF0YWJhc2VUaHJlYWQuY3BwIGIvV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlVGhy ZWFkLmNwcAppbmRleCBlYzRjNmQxLi5lNWEyMWQxIDEwMDY0NAotLS0gYS9XZWJDb3JlL3N0b3Jh Z2UvRGF0YWJhc2VUaHJlYWQuY3BwCisrKyBiL1dlYkNvcmUvc3RvcmFnZS9EYXRhYmFzZVRocmVh ZC5jcHAKQEAgLTQyLDYgKzQyLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBEYXRhYmFzZVRo cmVhZDo6RGF0YWJhc2VUaHJlYWQoKQogICAgIDogbV90aHJlYWRJRCgwKQorICAgICwgbV9kYXRh YmFzZU9mQ3VycmVudFRhc2soMCkKICAgICAsIG1fdHJhbnNhY3Rpb25DbGllbnQobmV3IFNRTFRy YW5zYWN0aW9uQ2xpZW50KCkpCiAgICAgLCBtX3RyYW5zYWN0aW9uQ29vcmRpbmF0b3IobmV3IFNR TFRyYW5zYWN0aW9uQ29vcmRpbmF0b3IoKSkKICAgICAsIG1fY2xlYW51cFN5bmMoMCkKQEAgLTk2 LDcgKzk3LDkgQEAgdm9pZCogRGF0YWJhc2VUaHJlYWQ6OmRhdGFiYXNlVGhyZWFkKCkKIAogICAg IEF1dG9kcmFpbmVkUG9vbCBwb29sOwogICAgIHdoaWxlIChPd25QdHI8RGF0YWJhc2VUYXNrPiB0 YXNrID0gbV9xdWV1ZS53YWl0Rm9yTWVzc2FnZSgpKSB7CisgICAgICAgIG1fZGF0YWJhc2VPZkN1 cnJlbnRUYXNrID0gdGFzay0+ZGF0YWJhc2UoKTsKICAgICAgICAgdGFzay0+cGVyZm9ybVRhc2so KTsKKyAgICAgICAgbV9kYXRhYmFzZU9mQ3VycmVudFRhc2sgPSAwOwogICAgICAgICBwb29sLmN5 Y2xlKCk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2VUaHJl YWQuaCBiL1dlYkNvcmUvc3RvcmFnZS9EYXRhYmFzZVRocmVhZC5oCmluZGV4IDM3MDI2MTkuLmRh ZjJhOWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvc3RvcmFnZS9EYXRhYmFzZVRocmVhZC5oCisrKyBi L1dlYkNvcmUvc3RvcmFnZS9EYXRhYmFzZVRocmVhZC5oCkBAIC02NCw2ICs2NCw3IEBAIHB1Ymxp YzoKICAgICB2b2lkIHJlY29yZERhdGFiYXNlT3BlbihEYXRhYmFzZSopOwogICAgIHZvaWQgcmVj b3JkRGF0YWJhc2VDbG9zZWQoRGF0YWJhc2UqKTsKICAgICBUaHJlYWRJZGVudGlmaWVyIGdldFRo cmVhZElEKCkgeyByZXR1cm4gbV90aHJlYWRJRDsgfQorICAgIERhdGFiYXNlKiBnZXREYXRhYmFz ZU9mQ3VycmVudFRhc2soKSB7IHJldHVybiBtX2RhdGFiYXNlT2ZDdXJyZW50VGFzazsgfQogCiAg ICAgU1FMVHJhbnNhY3Rpb25DbGllbnQqIHRyYW5zYWN0aW9uQ2xpZW50KCkgeyByZXR1cm4gbV90 cmFuc2FjdGlvbkNsaWVudC5nZXQoKTsgfQogICAgIFNRTFRyYW5zYWN0aW9uQ29vcmRpbmF0b3Iq IHRyYW5zYWN0aW9uQ29vcmRpbmF0b3IoKSB7IHJldHVybiBtX3RyYW5zYWN0aW9uQ29vcmRpbmF0 b3IuZ2V0KCk7IH0KQEAgLTgwLDYgKzgxLDggQEAgcHJpdmF0ZToKIAogICAgIE1lc3NhZ2VRdWV1 ZTxEYXRhYmFzZVRhc2s+IG1fcXVldWU7CiAKKyAgICBEYXRhYmFzZSogbV9kYXRhYmFzZU9mQ3Vy cmVudFRhc2s7CisKICAgICAvLyBUaGlzIHNldCBrZWVwcyB0cmFjayBvZiB0aGUgb3BlbiBkYXRh YmFzZXMgdGhhdCBoYXZlIGJlZW4gdXNlZCBvbiB0aGlzIHRocmVhZC4KICAgICB0eXBlZGVmIEhh c2hTZXQ8UmVmUHRyPERhdGFiYXNlPiA+IERhdGFiYXNlU2V0OwogICAgIERhdGFiYXNlU2V0IG1f b3BlbkRhdGFiYXNlU2V0Owo= 49392 2010-02-24 07:38:05 -0800 2010-02-24 19:51:15 -0800 patch bug-35341-20100224163803.patch text/plain 2455 jochen ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Y2U0OWM3MC4uMWQ1MzAyMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wMi0yNCAgSm9jaGVuIEVpc2lu Z2VyICA8am9jaGVuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBFeHBvc2UgRGF0YWJhc2Ugb2JqZWN0IG9mIGN1cnJlbnRseSBh Y3RpdmUgdGFzayBvbiB0aGUgZGF0YWJhc2UgdGhyZWFkCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTM0MQorCisgICAgICAgICogc3RvcmFnZS9EYXRh YmFzZVRocmVhZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZVRocmVhZDo6RGF0YWJh c2VUaHJlYWQpOgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VUaHJlYWQ6OmRhdGFiYXNlVGhy ZWFkKToKKyAgICAgICAgKiBzdG9yYWdlL0RhdGFiYXNlVGhyZWFkLmg6CisgICAgICAgIChXZWJD b3JlOjpEYXRhYmFzZVRocmVhZDo6Z2V0RGF0YWJhc2VPZkN1cnJlbnRUYXNrKToKKwogMjAxMC0w Mi0yMyAgTGVhbmRybyBQZXJlaXJhICA8bGVhbmRyb0Bwcm9mdXNpb24ubW9iaT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBHdXN0YXZvIE5vcm9uaGEgU2lsdmEuCmRpZmYgLS1naXQgYS9XZWJDb3Jl L3N0b3JhZ2UvRGF0YWJhc2VUaHJlYWQuY3BwIGIvV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlVGhy ZWFkLmNwcAppbmRleCBlYzRjNmQxLi42NTA5MmYxIDEwMDY0NAotLS0gYS9XZWJDb3JlL3N0b3Jh Z2UvRGF0YWJhc2VUaHJlYWQuY3BwCisrKyBiL1dlYkNvcmUvc3RvcmFnZS9EYXRhYmFzZVRocmVh ZC5jcHAKQEAgLTQyLDYgKzQyLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBEYXRhYmFzZVRo cmVhZDo6RGF0YWJhc2VUaHJlYWQoKQogICAgIDogbV90aHJlYWRJRCgwKQorICAgICwgbV9kYXRh YmFzZU9mQ3VycmVudFRhc2soMCkKICAgICAsIG1fdHJhbnNhY3Rpb25DbGllbnQobmV3IFNRTFRy YW5zYWN0aW9uQ2xpZW50KCkpCiAgICAgLCBtX3RyYW5zYWN0aW9uQ29vcmRpbmF0b3IobmV3IFNR TFRyYW5zYWN0aW9uQ29vcmRpbmF0b3IoKSkKICAgICAsIG1fY2xlYW51cFN5bmMoMCkKQEAgLTk2 LDcgKzk3LDEwIEBAIHZvaWQqIERhdGFiYXNlVGhyZWFkOjpkYXRhYmFzZVRocmVhZCgpCiAKICAg ICBBdXRvZHJhaW5lZFBvb2wgcG9vbDsKICAgICB3aGlsZSAoT3duUHRyPERhdGFiYXNlVGFzaz4g dGFzayA9IG1fcXVldWUud2FpdEZvck1lc3NhZ2UoKSkgeworICAgICAgICBBU1NFUlQoIW1fZGF0 YWJhc2VPZkN1cnJlbnRUYXNrKTsKKyAgICAgICAgbV9kYXRhYmFzZU9mQ3VycmVudFRhc2sgPSB0 YXNrLT5kYXRhYmFzZSgpOwogICAgICAgICB0YXNrLT5wZXJmb3JtVGFzaygpOworICAgICAgICBt X2RhdGFiYXNlT2ZDdXJyZW50VGFzayA9IDA7CiAgICAgICAgIHBvb2wuY3ljbGUoKTsKICAgICB9 CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvc3RvcmFnZS9EYXRhYmFzZVRocmVhZC5oIGIvV2ViQ29y ZS9zdG9yYWdlL0RhdGFiYXNlVGhyZWFkLmgKaW5kZXggMzcwMjYxOS4uZGFmMmE5ZSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlVGhyZWFkLmgKKysrIGIvV2ViQ29yZS9zdG9y YWdlL0RhdGFiYXNlVGhyZWFkLmgKQEAgLTY0LDYgKzY0LDcgQEAgcHVibGljOgogICAgIHZvaWQg cmVjb3JkRGF0YWJhc2VPcGVuKERhdGFiYXNlKik7CiAgICAgdm9pZCByZWNvcmREYXRhYmFzZUNs b3NlZChEYXRhYmFzZSopOwogICAgIFRocmVhZElkZW50aWZpZXIgZ2V0VGhyZWFkSUQoKSB7IHJl dHVybiBtX3RocmVhZElEOyB9CisgICAgRGF0YWJhc2UqIGdldERhdGFiYXNlT2ZDdXJyZW50VGFz aygpIHsgcmV0dXJuIG1fZGF0YWJhc2VPZkN1cnJlbnRUYXNrOyB9CiAKICAgICBTUUxUcmFuc2Fj dGlvbkNsaWVudCogdHJhbnNhY3Rpb25DbGllbnQoKSB7IHJldHVybiBtX3RyYW5zYWN0aW9uQ2xp ZW50LmdldCgpOyB9CiAgICAgU1FMVHJhbnNhY3Rpb25Db29yZGluYXRvciogdHJhbnNhY3Rpb25D b29yZGluYXRvcigpIHsgcmV0dXJuIG1fdHJhbnNhY3Rpb25Db29yZGluYXRvci5nZXQoKTsgfQpA QCAtODAsNiArODEsOCBAQCBwcml2YXRlOgogCiAgICAgTWVzc2FnZVF1ZXVlPERhdGFiYXNlVGFz az4gbV9xdWV1ZTsKIAorICAgIERhdGFiYXNlKiBtX2RhdGFiYXNlT2ZDdXJyZW50VGFzazsKKwog ICAgIC8vIFRoaXMgc2V0IGtlZXBzIHRyYWNrIG9mIHRoZSBvcGVuIGRhdGFiYXNlcyB0aGF0IGhh dmUgYmVlbiB1c2VkIG9uIHRoaXMgdGhyZWFkLgogICAgIHR5cGVkZWYgSGFzaFNldDxSZWZQdHI8 RGF0YWJhc2U+ID4gRGF0YWJhc2VTZXQ7CiAgICAgRGF0YWJhc2VTZXQgbV9vcGVuRGF0YWJhc2VT ZXQ7Cg==