30077 2009-10-05 09:15:43 -0700 Add an ASSERT in updateGuidVersionMap. 2009-10-05 10:30:45 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 benm benm commit-queue darin oldest_to_newest 152314 0 benm 2009-10-05 09:15:43 -0700 The fix for https://bugs.webkit.org/show_bug.cgi?id=27836 should ASSERT that the guid map mutex is locked in updateGuidVersionMap. 152338 1 40639 benm 2009-10-05 10:14:56 -0700 Created attachment 40639 Proposed patch 152341 2 40639 darin 2009-10-05 10:16:19 -0700 Comment on attachment 40639 Proposed patch > // NOTE: Caller must lock guidMutex(). > static inline void updateGuidVersionMap(int guid, String newVersion) > { > + // Ensure the the mutex is locked. > + ASSERT(!guidMutex().tryLock()); I wish there was some way to merge those two comments into one! r=me 152343 3 40639 commit-queue 2009-10-05 10:30:42 -0700 Comment on attachment 40639 Proposed patch Clearing flags on attachment: 40639 Committed r49099: <http://trac.webkit.org/changeset/49099> 152344 4 commit-queue 2009-10-05 10:30:45 -0700 All reviewed patches have been landed. Closing bug. 40639 2009-10-05 10:14:56 -0700 2009-10-05 10:30:42 -0700 Proposed patch 30077.txt text/plain 1291 benm SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0OTA5NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMDktMTAtMDUgIEJlbiBNdXJkb2NoICA8YmVubUBnb29nbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBh biBBU1NFUlQgaW4gdXBkYXRlR3VpZFZlcnNpb25NYXAuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDA3NworCisgICAgICAgICogc3RvcmFnZS9EYXRh YmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjp1cGRhdGVHdWlkVmVyc2lvbk1hcCk6IEFTU0VS VCB0aGF0IHRoZSBndWlkTXV0ZXgoKSBpcyBsb2NrZWQuCisKIDIwMDktMTAtMDUgIE1pa2hhaWwg TmFnYW5vdiAgPG1uYWdhbm92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBU aW1vdGh5IEhhdGNoZXIuCkluZGV4OiBXZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2UuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvc3RvcmFnZS9EYXRhYmFzZS5jcHAJKHJldmlzaW9uIDQ5MDk2KQor KysgV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTIsNiAr OTIsOSBAQCBzdGF0aWMgR3VpZFZlcnNpb25NYXAmIGd1aWRUb1ZlcnNpb25NYXAoCiAvLyBOT1RF OiBDYWxsZXIgbXVzdCBsb2NrIGd1aWRNdXRleCgpLgogc3RhdGljIGlubGluZSB2b2lkIHVwZGF0 ZUd1aWRWZXJzaW9uTWFwKGludCBndWlkLCBTdHJpbmcgbmV3VmVyc2lvbikKIHsKKyAgICAvLyBF bnN1cmUgdGhlIHRoZSBtdXRleCBpcyBsb2NrZWQuCisgICAgQVNTRVJUKCFndWlkTXV0ZXgoKS50 cnlMb2NrKCkpOworCiAgICAgLy8gTm90ZTogSXQgaXMgbm90IHNhZmUgdG8gcHV0IGFuIGVtcHR5 IHN0cmluZyBpbnRvIHRoZSBndWlkVG9WZXJzaW9uTWFwKCkgbWFwLgogICAgIC8vIFRoYXQncyBi ZWNhdXNlIHRoZSBtYXAgaXMgY3Jvc3MtdGhyZWFkLCBidXQgZW1wdHkgc3RyaW5ncyBhcmUgcGVy LXRocmVhZC4KICAgICAvLyBUaGUgY29weSgpIGZ1bmN0aW9uIG1ha2VzIGEgdmVyc2lvbiBvZiB0 aGUgc3RyaW5nIHlvdSBjYW4gdXNlIG9uIHRoZSBjdXJyZW50Cg==