48606 2010-10-28 18:34:42 -0700 Connection::sendSyncMessage needs to dispatch incoming sync messages 2010-10-29 10:25:49 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 301525 0 andersca 2010-10-28 18:34:42 -0700 Connection::sendSyncMessage needs to dispatch incoming sync messages 301527 1 72282 andersca 2010-10-28 18:38:51 -0700 Created attachment 72282 Patch 301537 2 72282 aroben 2010-10-28 19:12:20 -0700 Comment on attachment 72282 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=72282&action=review > WebKit2/Platform/CoreIPC/Connection.cpp:235 > - // First, check if there is a sync reply at the top of the stack. > + // First, check if we have any incoming sync messages that we need to process. > + Vector<IncomingMessage> syncMessagesReceivedWhileWaitingForSyncReply; > + m_syncMessagesReceivedWhileWaitingForSyncReply.swap(syncMessagesReceivedWhileWaitingForSyncReply); > + > + if (!syncMessagesReceivedWhileWaitingForSyncReply.isEmpty()) { > + // Make sure to unlock the mutex here because we're calling out to client code which could in turn send > + // another sync message and we don't want that to deadlock. > + m_syncReplyStateMutex.unlock(); > + > + for (size_t i = 0; i < syncMessagesReceivedWhileWaitingForSyncReply.size(); ++i) { > + IncomingMessage& message = syncMessagesReceivedWhileWaitingForSyncReply[i]; > + OwnPtr<ArgumentDecoder> arguments = message.releaseArguments(); > + > + dispatchSyncMessage(message.messageID(), arguments.get()); > + } > + m_syncReplyStateMutex.lock(); > + } > + > + // Second, check if there is a sync reply at the top of the stack. I think it would be clearer to use two separately-scoped MutexLockers instead of manually unlocking/locking. I guess you save an unlock/lock in the case where we haven't received any sync messages; maybe that's important? > WebKit2/Platform/CoreIPC/Connection.cpp:281 > + // Add this message and wake up the client thread. > + m_waitForSyncReplySemaphore.signal(); > + return; The "Add this message" part of this comment seems misplaced, since you already added it. 301850 3 andersca 2010-10-29 10:25:49 -0700 Committed r70893: <http://trac.webkit.org/changeset/70893> 72282 2010-10-28 18:38:51 -0700 2010-10-28 19:12:20 -0700 Patch bug-48606-20101028183850.patch text/plain 6277 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg MjA0YTAwZmUwMjk2NGQ1MjVmZTc3YzkyZDJkZTk0MzA2Njc5OTkzMS4uMjNjYzkxMDBhOWFkM2Y1 OTgxNjg0N2Q3OTg1YzlkNjI4NGRkMmUxYSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNiBAQAogMjAxMC0xMC0yOCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvbm5lY3Rpb246OnNlbmRTeW5jTWVzc2FnZSBu ZWVkcyB0byBkaXNwYXRjaCBpbmNvbWluZyBzeW5jIG1lc3NhZ2VzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODYwNgorCisgICAgICAgICogUGxhdGZv cm0vQ29yZUlQQy9Db25uZWN0aW9uLmNwcDoKKyAgICAgICAgKENvcmVJUEM6OkNvbm5lY3Rpb246 OnNlbmRTeW5jTWVzc2FnZSk6CisgICAgICAgIFByb3RlY3QgdGhlIGNvbm5lY3Rpb24gd2hlbiB3 YWl0aW5nIGZvciBhIHJlcGx5LiBTY2hlZHVsZSBmb3IgYW55IHJlbWFpbmluZyBpbmNvbWluZyBz eW5jIG1lc3NhZ2VzCisgICAgICAgIHRvIGJlIHNlbnQgb25jZSB0aGUgYm90dG9tLW1vc3Qgd2Fp dEZvclN5bmNSZXBseSBjYWxscyByZXR1cm5zLgorCisgICAgICAgIChDb3JlSVBDOjpDb25uZWN0 aW9uOjp3YWl0Rm9yU3luY1JlcGx5KToKKyAgICAgICAgTWFrZSBzdXJlIHRvIGRpc3BhdGNoIGFu eSBpbmNvbWluZyBzeW5jIG1lc3NhZ2VzLgorCisgICAgICAgIChDb3JlSVBDOjpDb25uZWN0aW9u Ojpwcm9jZXNzSW5jb21pbmdNZXNzYWdlKToKKyAgICAgICAgSWYgdGhlIGluY29taW5nIG1lc3Nh Z2UgaXMgYSBzeW5jIG1lc3NhZ2UgYW5kIHdlJ3JlIHdhaXRpbmcgZm9yIGEgc3luYyByZXBseSwg YWRkIHRoZSBtZXNzYWdlIHRvIHRoZQorICAgICAgICBxdWV1ZSBvZiAic3luYyBtZXNzYWdlcyBy ZWNlaXZlZCB3aGlsZSB3YWl0aW5nIGZvciBzeW5jIHJlcGx5IiBhbmQgd2FrZSB1cCB0aGUgY2xp ZW50IHRocmVhZC4KKworICAgICAgICAqIFBsYXRmb3JtL0NvcmVJUEMvQ29ubmVjdGlvbi5oOgor CisyMDEwLTEwLTI4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAg ICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2Jlbi4KIAogICAgICAgICBNb3ZlIGNvZGUgdG8gZGlz cGF0Y2ggYSBzeW5jIG1lc3NhZ2Ugb3V0IGludG8gYSBzZXBhcmF0ZSBmdW5jdGlvbgpkaWZmIC0t Z2l0IGEvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0Nvbm5lY3Rpb24uY3BwIGIvV2ViS2l0Mi9Q bGF0Zm9ybS9Db3JlSVBDL0Nvbm5lY3Rpb24uY3BwCmluZGV4IGM2NzhkMTcxMGI3ZGJiMTM1MzBl YTU2ZDUyZTM5Nzg1OTEzOWMxNDMuLjhlOGIyYzQ4NWQ0M2UwZDVkYmYxMmVkMzY2YzExNWZiY2My M2VkOGYgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9Db25uZWN0aW9uLmNw cAorKysgYi9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQ29ubmVjdGlvbi5jcHAKQEAgLTE3Niw3 ICsxNzYsOSBAQCBQYXNzT3duUHRyPEFyZ3VtZW50RGVjb2Rlcj4gQ29ubmVjdGlvbjo6c2VuZFN5 bmNNZXNzYWdlKE1lc3NhZ2VJRCBtZXNzYWdlSUQsIHVpbgogICAgIC8vIEZpcnN0IHNlbmQgdGhl IG1lc3NhZ2UuCiAgICAgc2VuZE1lc3NhZ2UobWVzc2FnZUlELCBlbmNvZGVyKTsKICAgICAKLSAg ICAvLyBUaGVuIHdhaXQgZm9yIGEgcmVwbHkuCisgICAgLy8gVGhlbiB3YWl0IGZvciBhIHJlcGx5 LiBXYWl0aW5nIGZvciBhIHJlcGx5IGNvdWxkIGludm9sdmUgZGlzcGF0Y2hpbmcgaW5jb21pbmcg c3luYyBtZXNzYWdlcywgc28KKyAgICAvLyBrZWVwIGFuIGV4dHJhIHJlZmVyZW5jZSB0byB0aGUg Y29ubmVjdGlvbiBoZXJlIGluIGNhc2UgaXQncyBpbnZhbGlkYXRlZC4KKyAgICBSZWZQdHI8Q29u bmVjdGlvbj4gcHJvdGVjdCh0aGlzKTsKICAgICBPd25QdHI8QXJndW1lbnREZWNvZGVyPiByZXBs eSA9IHdhaXRGb3JTeW5jUmVwbHkoc3luY1JlcXVlc3RJRCwgdGltZW91dCk7CiAKICAgICAvLyBG aW5hbGx5LCBwb3AgdGhlIHBlbmRpbmcgc3luYyByZXBseSBpbmZvcm1hdGlvbi4KQEAgLTE4NCw2 ICsxODYsMjAgQEAgUGFzc093blB0cjxBcmd1bWVudERlY29kZXI+IENvbm5lY3Rpb246OnNlbmRT eW5jTWVzc2FnZShNZXNzYWdlSUQgbWVzc2FnZUlELCB1aW4KICAgICAgICAgTXV0ZXhMb2NrZXIg bG9ja2VyKG1fc3luY1JlcGx5U3RhdGVNdXRleCk7CiAgICAgICAgIEFTU0VSVChtX3BlbmRpbmdT eW5jUmVwbGllcy5sYXN0KCkuc3luY1JlcXVlc3RJRCA9PSBzeW5jUmVxdWVzdElEKTsKICAgICAg ICAgbV9wZW5kaW5nU3luY1JlcGxpZXMucmVtb3ZlTGFzdCgpOworCisgICAgICAgIGlmIChtX3Bl bmRpbmdTeW5jUmVwbGllcy5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgIC8vIFRoaXMgd2FzIHRo ZSBib3R0b20tbW9zdCBzZW5kU3luY01lc3NhZ2UgY2FsbCBpbiB0aGUgc3RhY2suIElmIHdlIGhh dmUgYW55IHBlbmRpbmcgaW5jb21pbmcKKyAgICAgICAgICAgIC8vIHN5bmMgbWVzc2FnZXMsIHRo ZXkgbmVlZCB0byBiZSBkaXNwYXRjaGVkLgorICAgICAgICAgICAgaWYgKCFtX3N5bmNNZXNzYWdl c1JlY2VpdmVkV2hpbGVXYWl0aW5nRm9yU3luY1JlcGx5LmlzRW1wdHkoKSkgeworICAgICAgICAg ICAgICAgIC8vIEFkZCB0aGUgbWVzc2FnZXMuCisgICAgICAgICAgICAgICAgTXV0ZXhMb2NrZXIg bG9ja2VyKG1faW5jb21pbmdNZXNzYWdlc0xvY2spOworICAgICAgICAgICAgICAgIG1faW5jb21p bmdNZXNzYWdlcy5hcHBlbmQobV9zeW5jTWVzc2FnZXNSZWNlaXZlZFdoaWxlV2FpdGluZ0ZvclN5 bmNSZXBseSk7CisgICAgICAgICAgICAgICAgbV9zeW5jTWVzc2FnZXNSZWNlaXZlZFdoaWxlV2Fp dGluZ0ZvclN5bmNSZXBseS5jbGVhcigpOworCisgICAgICAgICAgICAgICAgLy8gU2NoZWR1bGUg Zm9yIHRoZSBtZXNzYWdlcyB0byBiZSBzZW50LgorICAgICAgICAgICAgICAgIG1fY2xpZW50UnVu TG9vcC0+c2NoZWR1bGVXb3JrKFdvcmtJdGVtOjpjcmVhdGUodGhpcywgJkNvbm5lY3Rpb246OmRp c3BhdGNoTWVzc2FnZXMpKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQogICAgIH0KICAgICAK ICAgICByZXR1cm4gcmVwbHkucmVsZWFzZSgpOwpAQCAtMTk4LDcgKzIxNCwyNSBAQCBQYXNzT3du UHRyPEFyZ3VtZW50RGVjb2Rlcj4gQ29ubmVjdGlvbjo6d2FpdEZvclN5bmNSZXBseSh1aW50NjRf dCBzeW5jUmVxdWVzdElELAogICAgICAgICB7CiAgICAgICAgICAgICBNdXRleExvY2tlciBsb2Nr ZXIobV9zeW5jUmVwbHlTdGF0ZU11dGV4KTsKIAotICAgICAgICAgICAgLy8gRmlyc3QsIGNoZWNr IGlmIHRoZXJlIGlzIGEgc3luYyByZXBseSBhdCB0aGUgdG9wIG9mIHRoZSBzdGFjay4KKyAgICAg ICAgICAgIC8vIEZpcnN0LCBjaGVjayBpZiB3ZSBoYXZlIGFueSBpbmNvbWluZyBzeW5jIG1lc3Nh Z2VzIHRoYXQgd2UgbmVlZCB0byBwcm9jZXNzLgorICAgICAgICAgICAgVmVjdG9yPEluY29taW5n TWVzc2FnZT4gc3luY01lc3NhZ2VzUmVjZWl2ZWRXaGlsZVdhaXRpbmdGb3JTeW5jUmVwbHk7Cisg ICAgICAgICAgICBtX3N5bmNNZXNzYWdlc1JlY2VpdmVkV2hpbGVXYWl0aW5nRm9yU3luY1JlcGx5 LnN3YXAoc3luY01lc3NhZ2VzUmVjZWl2ZWRXaGlsZVdhaXRpbmdGb3JTeW5jUmVwbHkpOworCisg ICAgICAgICAgICBpZiAoIXN5bmNNZXNzYWdlc1JlY2VpdmVkV2hpbGVXYWl0aW5nRm9yU3luY1Jl cGx5LmlzRW1wdHkoKSkgeworICAgICAgICAgICAgICAgIC8vIE1ha2Ugc3VyZSB0byB1bmxvY2sg dGhlIG11dGV4IGhlcmUgYmVjYXVzZSB3ZSdyZSBjYWxsaW5nIG91dCB0byBjbGllbnQgY29kZSB3 aGljaCBjb3VsZCBpbiB0dXJuIHNlbmQKKyAgICAgICAgICAgICAgICAvLyBhbm90aGVyIHN5bmMg bWVzc2FnZSBhbmQgd2UgZG9uJ3Qgd2FudCB0aGF0IHRvIGRlYWRsb2NrLgorICAgICAgICAgICAg ICAgIG1fc3luY1JlcGx5U3RhdGVNdXRleC51bmxvY2soKTsKKyAgICAgICAgICAgICAgICAKKyAg ICAgICAgICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHN5bmNNZXNzYWdlc1JlY2VpdmVk V2hpbGVXYWl0aW5nRm9yU3luY1JlcGx5LnNpemUoKTsgKytpKSB7CisgICAgICAgICAgICAgICAg ICAgIEluY29taW5nTWVzc2FnZSYgbWVzc2FnZSA9IHN5bmNNZXNzYWdlc1JlY2VpdmVkV2hpbGVX YWl0aW5nRm9yU3luY1JlcGx5W2ldOworICAgICAgICAgICAgICAgICAgICBPd25QdHI8QXJndW1l bnREZWNvZGVyPiBhcmd1bWVudHMgPSBtZXNzYWdlLnJlbGVhc2VBcmd1bWVudHMoKTsKKworICAg ICAgICAgICAgICAgICAgICBkaXNwYXRjaFN5bmNNZXNzYWdlKG1lc3NhZ2UubWVzc2FnZUlEKCks IGFyZ3VtZW50cy5nZXQoKSk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIG1f c3luY1JlcGx5U3RhdGVNdXRleC5sb2NrKCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAg IC8vIFNlY29uZCwgY2hlY2sgaWYgdGhlcmUgaXMgYSBzeW5jIHJlcGx5IGF0IHRoZSB0b3Agb2Yg dGhlIHN0YWNrLgogICAgICAgICAgICAgQVNTRVJUKCFtX3BlbmRpbmdTeW5jUmVwbGllcy5pc0Vt cHR5KCkpOwogICAgICAgICAgICAgCiAgICAgICAgICAgICBQZW5kaW5nU3luY1JlcGx5JiBwZW5k aW5nU3luY1JlcGx5ID0gbV9wZW5kaW5nU3luY1JlcGxpZXMubGFzdCgpOwpAQCAtMjMzLDcgKzI2 NywyMSBAQCB2b2lkIENvbm5lY3Rpb246OnByb2Nlc3NJbmNvbWluZ01lc3NhZ2UoTWVzc2FnZUlE IG1lc3NhZ2VJRCwgUGFzc093blB0cjxBcmd1bWVudAogICAgICAgICBtX3dhaXRGb3JTeW5jUmVw bHlTZW1hcGhvcmUuc2lnbmFsKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgCisKKyAg ICAvLyBDaGVjayBpZiB0aGlzIGlzIGEgc3luYyBtZXNzYWdlLiBJZiBpdCBpcywgYW5kIHdlJ3Jl IHdhaXRpbmcgZm9yIGEgc3luYyByZXBseSB0aGlzIG1lc3NhZ2UKKyAgICAvLyBuZWVkcyB0byBi ZSBkaXNwYXRjaGVkLiBJZiB3ZSBkb24ndCB3ZSdsbCBlbmQgdXAgd2l0aCBhIGRlYWRsb2NrIHdo ZXJlIGJvdGggc3luYyBtZXNzYWdlIHNlbmRlcnMgYXJlCisgICAgLy8gc3R1Y2sgd2FpdGluZyBm b3IgYSByZXBseS4KKyAgICBpZiAobWVzc2FnZUlELmlzU3luYygpKSB7CisgICAgICAgIE11dGV4 TG9ja2VyIGxvY2tlcihtX3N5bmNSZXBseVN0YXRlTXV0ZXgpOworICAgICAgICBpZiAoIW1fcGVu ZGluZ1N5bmNSZXBsaWVzLmlzRW1wdHkoKSkgeworICAgICAgICAgICAgbV9zeW5jTWVzc2FnZXNS ZWNlaXZlZFdoaWxlV2FpdGluZ0ZvclN5bmNSZXBseS5hcHBlbmQoSW5jb21pbmdNZXNzYWdlKG1l c3NhZ2VJRCwgYXJndW1lbnRzKSk7CisKKyAgICAgICAgICAgIC8vIEFkZCB0aGlzIG1lc3NhZ2Ug YW5kIHdha2UgdXAgdGhlIGNsaWVudCB0aHJlYWQuCisgICAgICAgICAgICBtX3dhaXRGb3JTeW5j UmVwbHlTZW1hcGhvcmUuc2lnbmFsKCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0K KyAgICB9CisgICAgICAgIAogICAgIC8vIENoZWNrIGlmIHdlJ3JlIHdhaXRpbmcgZm9yIHRoaXMg bWVzc2FnZS4KICAgICB7CiAgICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX3dhaXRGb3JNZXNz YWdlTXV0ZXgpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0Nvbm5lY3Rp b24uaCBiL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9Db25uZWN0aW9uLmgKaW5kZXggZWVlYzI2 ZmQ2MjA1NDc3NWVmMDdiZjNhNTZiYzE0MDIwNGI5ZGVkZC4uZDYzYzIzNGUxZjI2OTZlMTAxMjZl OWEyNjM2MTgyZjQyYzFkNmE3OSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBD L0Nvbm5lY3Rpb24uaAorKysgYi9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQ29ubmVjdGlvbi5o CkBAIC0yMzIsNiArMjMyLDcgQEAgcHJpdmF0ZToKICAgICBNdXRleCBtX3N5bmNSZXBseVN0YXRl TXV0ZXg7CiAgICAgYm9vbCBtX3Nob3VsZFdhaXRGb3JTeW5jUmVwbGllczsKICAgICBWZWN0b3I8 UGVuZGluZ1N5bmNSZXBseT4gbV9wZW5kaW5nU3luY1JlcGxpZXM7CisgICAgVmVjdG9yPEluY29t aW5nTWVzc2FnZT4gbV9zeW5jTWVzc2FnZXNSZWNlaXZlZFdoaWxlV2FpdGluZ0ZvclN5bmNSZXBs eTsKIAogI2lmIFBMQVRGT1JNKE1BQykKICAgICAvLyBDYWxsZWQgb24gdGhlIGNvbm5lY3Rpb24g cXVldWUuCg==