143756 2015-04-15 06:17:05 -0700 [W32] Inconsistent ifdefs in BinarySemaphore.h and BinarySemaphore.cpp 2015-04-15 11:23:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 133028 1 lrn1986 webkit-unassigned benjamin cgarcia cmarcelo commit-queue lrn1986 oldest_to_newest 1085451 0 lrn1986 2015-04-15 06:17:05 -0700 One has OS(WINDOWS), the other has PLATFORM(WIN). As a result, MinGW gets one half of the code (the OS(WINDOWS) one), but not the other. 1085517 1 250799 lrn1986 2015-04-15 09:44:50 -0700 Created attachment 250799 Harmonize binary semaphore ifdefs They should be either OS(WINDOWS) (in which case we'd need BinarySemaphoreWin.cpp, which is not shipped by WebKitGTK) or PLATFORM(WIN) (in which case Mutex/ThreadCondition-based implementation is used). This fixes errors like: CXX Source/WTF/wtf/threads/libWTF_la-BinarySemaphore.lo ../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp: In constructor 'WTF::BinarySemaphore::BinarySemaphore()': ../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp:34:7: error: class 'WTF::BinarySemaphore' does not have any field named 'm_isSet' : m_isSet(false) ^ ../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp: In member function 'void WTF::BinarySemaphore::signal()': ../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp:44:24: error: 'm_mutex' was not declared in this scope MutexLocker locker(m_mutex); ^ ../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp:46:5: error: 'm_isSet' was not declared in this scope m_isSet = true; ^ ../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp:47:5: error: 'm_condition' was not declared in this scope m_condition.signal(); ^ ../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp: In member function 'bool WTF::BinarySemaphore::wait(double)': ../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp:52:24: error: 'm_mutex' was not declared in this scope MutexLocker locker(m_mutex); ^ ../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp:55:13: error: 'm_isSet' was not declared in this scope while (!m_isSet) { ^ ../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp:56:21: error: 'm_condition' was not declared in this scope timedOut = !m_condition.timedWait(m_mutex, absoluteTime); ^ ../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp:62:5: error: 'm_isSet' was not declared in this scope m_isSet = false; ^ GNUmakefile:52762: recipe for target 'Source/WTF/wtf/threads/libWTF_la-BinarySemaphore.lo' failed 1085602 2 250799 commit-queue 2015-04-15 11:23:45 -0700 Comment on attachment 250799 Harmonize binary semaphore ifdefs Clearing flags on attachment: 250799 Committed r182848: <http://trac.webkit.org/changeset/182848> 1085603 3 commit-queue 2015-04-15 11:23:50 -0700 All reviewed patches have been landed. Closing bug. 250799 2015-04-15 09:44:50 -0700 2015-04-15 11:23:45 -0700 Harmonize binary semaphore ifdefs Harmonize-binary-semaphore-ifdefs.patch text/plain 6252 lrn1986 RnJvbSBhZTQxN2ZjYWFkYzdiNGMwY2FiOTMwNzcxZWZhY2JkNWU4N2QyNWQzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/PUQwPUEwPUQxPTgzPUQxPTgxPUQwPUJCPUQw PUIwPUQwPUJEPTIwPUQwPTk4PUQwPUI2PUQwPUIxPz0KID0/VVRGLTg/cT89RDE9ODM9RDA9QkI9 RDA9QjA9RDE9ODI9RDA9QkU9RDA9QjI/PSA8bHJuMTk4NkBnbWFpbC5jb20+CkRhdGU6IE1vbiwg MTMgQXByIDIwMTUgMDI6MzU6MDcgKzAwMDAKU3ViamVjdDogW1BBVENIXSBIYXJtb25pemUgYmlu YXJ5IHNlbWFwaG9yZSBpZmRlZnMKClRoZXkgc2hvdWxkIGJlIGVpdGhlciBPUyhXSU5ET1dTKSAo aW4gd2hpY2ggY2FzZSB3ZSdkIG5lZWQKQmluYXJ5U2VtYXBob3JlV2luLmNwcCwgd2hpY2ggaXMg bm90IHNoaXBwZWQgYnkgV2ViS2l0R1RLKQpvciBQTEFURk9STShXSU4pIChpbiB3aGljaCBjYXNl IE11dGV4L1RocmVhZENvbmRpdGlvbi1iYXNlZAppbXBsZW1lbnRhdGlvbiBpcyB1c2VkKS4KClRo aXMgZml4ZXMgZXJyb3JzIGxpa2U6CiAgQ1hYICAgICAgU291cmNlL1dURi93dGYvdGhyZWFkcy9s aWJXVEZfbGEtQmluYXJ5U2VtYXBob3JlLmxvCi4uL3dlYmtpdGd0ay0yLjQuOC9Tb3VyY2UvV1RG L3d0Zi90aHJlYWRzL0JpbmFyeVNlbWFwaG9yZS5jcHA6IEluIGNvbnN0cnVjdG9yICdXVEY6OkJp bmFyeVNlbWFwaG9yZTo6QmluYXJ5U2VtYXBob3JlKCknOgouLi93ZWJraXRndGstMi40LjgvU291 cmNlL1dURi93dGYvdGhyZWFkcy9CaW5hcnlTZW1hcGhvcmUuY3BwOjM0Ojc6IGVycm9yOiBjbGFz cyAnV1RGOjpCaW5hcnlTZW1hcGhvcmUnIGRvZXMgbm90IGhhdmUgYW55IGZpZWxkIG5hbWVkICdt X2lzU2V0JwogICAgIDogbV9pc1NldChmYWxzZSkKICAgICAgIF4KLi4vd2Via2l0Z3RrLTIuNC44 L1NvdXJjZS9XVEYvd3RmL3RocmVhZHMvQmluYXJ5U2VtYXBob3JlLmNwcDogSW4gbWVtYmVyIGZ1 bmN0aW9uICd2b2lkIFdURjo6QmluYXJ5U2VtYXBob3JlOjpzaWduYWwoKSc6Ci4uL3dlYmtpdGd0 ay0yLjQuOC9Tb3VyY2UvV1RGL3d0Zi90aHJlYWRzL0JpbmFyeVNlbWFwaG9yZS5jcHA6NDQ6MjQ6 IGVycm9yOiAnbV9tdXRleCcgd2FzIG5vdCBkZWNsYXJlZCBpbiB0aGlzIHNjb3BlCiAgICAgTXV0 ZXhMb2NrZXIgbG9ja2VyKG1fbXV0ZXgpOwogICAgICAgICAgICAgICAgICAgICAgICBeCi4uL3dl YmtpdGd0ay0yLjQuOC9Tb3VyY2UvV1RGL3d0Zi90aHJlYWRzL0JpbmFyeVNlbWFwaG9yZS5jcHA6 NDY6NTogZXJyb3I6ICdtX2lzU2V0JyB3YXMgbm90IGRlY2xhcmVkIGluIHRoaXMgc2NvcGUKICAg ICBtX2lzU2V0ID0gdHJ1ZTsKICAgICBeCi4uL3dlYmtpdGd0ay0yLjQuOC9Tb3VyY2UvV1RGL3d0 Zi90aHJlYWRzL0JpbmFyeVNlbWFwaG9yZS5jcHA6NDc6NTogZXJyb3I6ICdtX2NvbmRpdGlvbicg d2FzIG5vdCBkZWNsYXJlZCBpbiB0aGlzIHNjb3BlCiAgICAgbV9jb25kaXRpb24uc2lnbmFsKCk7 CiAgICAgXgouLi93ZWJraXRndGstMi40LjgvU291cmNlL1dURi93dGYvdGhyZWFkcy9CaW5hcnlT ZW1hcGhvcmUuY3BwOiBJbiBtZW1iZXIgZnVuY3Rpb24gJ2Jvb2wgV1RGOjpCaW5hcnlTZW1hcGhv cmU6OndhaXQoZG91YmxlKSc6Ci4uL3dlYmtpdGd0ay0yLjQuOC9Tb3VyY2UvV1RGL3d0Zi90aHJl YWRzL0JpbmFyeVNlbWFwaG9yZS5jcHA6NTI6MjQ6IGVycm9yOiAnbV9tdXRleCcgd2FzIG5vdCBk ZWNsYXJlZCBpbiB0aGlzIHNjb3BlCiAgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fbXV0ZXgpOwog ICAgICAgICAgICAgICAgICAgICAgICBeCi4uL3dlYmtpdGd0ay0yLjQuOC9Tb3VyY2UvV1RGL3d0 Zi90aHJlYWRzL0JpbmFyeVNlbWFwaG9yZS5jcHA6NTU6MTM6IGVycm9yOiAnbV9pc1NldCcgd2Fz IG5vdCBkZWNsYXJlZCBpbiB0aGlzIHNjb3BlCiAgICAgd2hpbGUgKCFtX2lzU2V0KSB7CiAgICAg ICAgICAgICBeCi4uL3dlYmtpdGd0ay0yLjQuOC9Tb3VyY2UvV1RGL3d0Zi90aHJlYWRzL0JpbmFy eVNlbWFwaG9yZS5jcHA6NTY6MjE6IGVycm9yOiAnbV9jb25kaXRpb24nIHdhcyBub3QgZGVjbGFy ZWQgaW4gdGhpcyBzY29wZQogICAgICAgICB0aW1lZE91dCA9ICFtX2NvbmRpdGlvbi50aW1lZFdh aXQobV9tdXRleCwgYWJzb2x1dGVUaW1lKTsKICAgICAgICAgICAgICAgICAgICAgXgouLi93ZWJr aXRndGstMi40LjgvU291cmNlL1dURi93dGYvdGhyZWFkcy9CaW5hcnlTZW1hcGhvcmUuY3BwOjYy OjU6IGVycm9yOiAnbV9pc1NldCcgd2FzIG5vdCBkZWNsYXJlZCBpbiB0aGlzIHNjb3BlCiAgICAg bV9pc1NldCA9IGZhbHNlOwogICAgIF4KR05VbWFrZWZpbGU6NTI3NjI6IHJlY2lwZSBmb3IgdGFy Z2V0ICdTb3VyY2UvV1RGL3d0Zi90aHJlYWRzL2xpYldURl9sYS1CaW5hcnlTZW1hcGhvcmUubG8n IGZhaWxlZAoKaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0Mzc1Ngot LS0KIFNvdXJjZS9XVEYvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgfCA0NyArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKwogU291cmNlL1dURi93dGYvdGhyZWFkcy9CaW5hcnlT ZW1hcGhvcmUuaCB8ICA0ICstLQogMiBmaWxlcyBjaGFuZ2VkLCA0OSBpbnNlcnRpb25zKCspLCAy IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNl L1dURi9DaGFuZ2VMb2cKaW5kZXggZWY3MTgyNy4uMWM1YzdlZiAxMDA2NDQKLS0tIGEvU291cmNl L1dURi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw1MiBA QAogMjAxNS0wNC0xNSAg0KDRg9GB0LvQsNC9INCY0LbQsdGD0LvQsNGC0L7QsiAgPGxybjE5ODZA Z21haWwuY29tPgogCisgICAgICAgIEhhcm1vbml6ZSBiaW5hcnkgc2VtYXBob3JlIGlmZGVmcwor CisgICAgICAgIFRoZXkgc2hvdWxkIGJlIGVpdGhlciBPUyhXSU5ET1dTKSAoaW4gd2hpY2ggY2Fz ZSB3ZSdkIG5lZWQKKyAgICAgICAgQmluYXJ5U2VtYXBob3JlV2luLmNwcCwgd2hpY2ggaXMgbm90 IHNoaXBwZWQgYnkgV2ViS2l0R1RLKQorICAgICAgICBvciBQTEFURk9STShXSU4pIChpbiB3aGlj aCBjYXNlIE11dGV4L1RocmVhZENvbmRpdGlvbi1iYXNlZAorICAgICAgICBpbXBsZW1lbnRhdGlv biBpcyB1c2VkKS4KKworICAgICAgICBUaGlzIGZpeGVzIGVycm9ycyBsaWtlOgorICAgICAgICAg IENYWCAgICAgIFNvdXJjZS9XVEYvd3RmL3RocmVhZHMvbGliV1RGX2xhLUJpbmFyeVNlbWFwaG9y ZS5sbworICAgICAgICAuLi93ZWJraXRndGstMi40LjgvU291cmNlL1dURi93dGYvdGhyZWFkcy9C aW5hcnlTZW1hcGhvcmUuY3BwOiBJbiBjb25zdHJ1Y3RvciAnV1RGOjpCaW5hcnlTZW1hcGhvcmU6 OkJpbmFyeVNlbWFwaG9yZSgpJzoKKyAgICAgICAgLi4vd2Via2l0Z3RrLTIuNC44L1NvdXJjZS9X VEYvd3RmL3RocmVhZHMvQmluYXJ5U2VtYXBob3JlLmNwcDozNDo3OiBlcnJvcjogY2xhc3MgJ1dU Rjo6QmluYXJ5U2VtYXBob3JlJyBkb2VzIG5vdCBoYXZlIGFueSBmaWVsZCBuYW1lZCAnbV9pc1Nl dCcKKyAgICAgICAgICAgICA6IG1faXNTZXQoZmFsc2UpCisgICAgICAgICAgICAgICBeCisgICAg ICAgIC4uL3dlYmtpdGd0ay0yLjQuOC9Tb3VyY2UvV1RGL3d0Zi90aHJlYWRzL0JpbmFyeVNlbWFw aG9yZS5jcHA6IEluIG1lbWJlciBmdW5jdGlvbiAndm9pZCBXVEY6OkJpbmFyeVNlbWFwaG9yZTo6 c2lnbmFsKCknOgorICAgICAgICAuLi93ZWJraXRndGstMi40LjgvU291cmNlL1dURi93dGYvdGhy ZWFkcy9CaW5hcnlTZW1hcGhvcmUuY3BwOjQ0OjI0OiBlcnJvcjogJ21fbXV0ZXgnIHdhcyBub3Qg ZGVjbGFyZWQgaW4gdGhpcyBzY29wZQorICAgICAgICAgICAgIE11dGV4TG9ja2VyIGxvY2tlciht X211dGV4KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXgorICAgICAgICAuLi93 ZWJraXRndGstMi40LjgvU291cmNlL1dURi93dGYvdGhyZWFkcy9CaW5hcnlTZW1hcGhvcmUuY3Bw OjQ2OjU6IGVycm9yOiAnbV9pc1NldCcgd2FzIG5vdCBkZWNsYXJlZCBpbiB0aGlzIHNjb3BlCisg ICAgICAgICAgICAgbV9pc1NldCA9IHRydWU7CisgICAgICAgICAgICAgXgorICAgICAgICAuLi93 ZWJraXRndGstMi40LjgvU291cmNlL1dURi93dGYvdGhyZWFkcy9CaW5hcnlTZW1hcGhvcmUuY3Bw OjQ3OjU6IGVycm9yOiAnbV9jb25kaXRpb24nIHdhcyBub3QgZGVjbGFyZWQgaW4gdGhpcyBzY29w ZQorICAgICAgICAgICAgIG1fY29uZGl0aW9uLnNpZ25hbCgpOworICAgICAgICAgICAgIF4KKyAg ICAgICAgLi4vd2Via2l0Z3RrLTIuNC44L1NvdXJjZS9XVEYvd3RmL3RocmVhZHMvQmluYXJ5U2Vt YXBob3JlLmNwcDogSW4gbWVtYmVyIGZ1bmN0aW9uICdib29sIFdURjo6QmluYXJ5U2VtYXBob3Jl Ojp3YWl0KGRvdWJsZSknOgorICAgICAgICAuLi93ZWJraXRndGstMi40LjgvU291cmNlL1dURi93 dGYvdGhyZWFkcy9CaW5hcnlTZW1hcGhvcmUuY3BwOjUyOjI0OiBlcnJvcjogJ21fbXV0ZXgnIHdh cyBub3QgZGVjbGFyZWQgaW4gdGhpcyBzY29wZQorICAgICAgICAgICAgIE11dGV4TG9ja2VyIGxv Y2tlcihtX211dGV4KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXgorICAgICAg ICAuLi93ZWJraXRndGstMi40LjgvU291cmNlL1dURi93dGYvdGhyZWFkcy9CaW5hcnlTZW1hcGhv cmUuY3BwOjU1OjEzOiBlcnJvcjogJ21faXNTZXQnIHdhcyBub3QgZGVjbGFyZWQgaW4gdGhpcyBz Y29wZQorICAgICAgICAgICAgIHdoaWxlICghbV9pc1NldCkgeworICAgICAgICAgICAgICAgICAg ICAgXgorICAgICAgICAuLi93ZWJraXRndGstMi40LjgvU291cmNlL1dURi93dGYvdGhyZWFkcy9C aW5hcnlTZW1hcGhvcmUuY3BwOjU2OjIxOiBlcnJvcjogJ21fY29uZGl0aW9uJyB3YXMgbm90IGRl Y2xhcmVkIGluIHRoaXMgc2NvcGUKKyAgICAgICAgICAgICAgICAgdGltZWRPdXQgPSAhbV9jb25k aXRpb24udGltZWRXYWl0KG1fbXV0ZXgsIGFic29sdXRlVGltZSk7CisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIF4KKyAgICAgICAgLi4vd2Via2l0Z3RrLTIuNC44L1NvdXJjZS9XVEYvd3Rm L3RocmVhZHMvQmluYXJ5U2VtYXBob3JlLmNwcDo2Mjo1OiBlcnJvcjogJ21faXNTZXQnIHdhcyBu b3QgZGVjbGFyZWQgaW4gdGhpcyBzY29wZQorICAgICAgICAgICAgIG1faXNTZXQgPSBmYWxzZTsK KyAgICAgICAgICAgICBeCisgICAgICAgIEdOVW1ha2VmaWxlOjUyNzYyOiByZWNpcGUgZm9yIHRh cmdldCAnU291cmNlL1dURi93dGYvdGhyZWFkcy9saWJXVEZfbGEtQmluYXJ5U2VtYXBob3JlLmxv JyBmYWlsZWQKKworICAgICAgICBbVzMyXSBJbmNvbnNpc3RlbnQgaWZkZWZzIGluIEJpbmFyeVNl bWFwaG9yZS5oIGFuZCBCaW5hcnlTZW1hcGhvcmUuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM3NTYKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi90aHJlYWRzL0JpbmFyeVNlbWFwaG9yZS5o OgorCisyMDE1LTA0LTE1ICDQoNGD0YHQu9Cw0L0g0JjQttCx0YPQu9Cw0YLQvtCyICA8bHJuMTk4 NkBnbWFpbC5jb20+CisKICAgICAgICAgQWxsb3cgTWluR1ctR0NDIHRvIHVzZSBHQ0MgYXNtIGNv ZGUgZm9yIHdlYWtDb21wYXJlQW5kU3dhcAogCiAgICAgICAgIE9TKFdJTkRPV1MpICE9IENPTVBJ TEVSKE1TVkMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi90aHJlYWRzL0JpbmFyeVNlbWFw aG9yZS5oIGIvU291cmNlL1dURi93dGYvdGhyZWFkcy9CaW5hcnlTZW1hcGhvcmUuaAppbmRleCBk ZTUxZDQ3Li5jYWUxMDIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi90aHJlYWRzL0JpbmFy eVNlbWFwaG9yZS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL3RocmVhZHMvQmluYXJ5U2VtYXBob3Jl LmgKQEAgLTQxLDEyICs0MSwxMiBAQCBwdWJsaWM6CiAgICAgV1RGX0VYUE9SVF9QUklWQVRFIHZv aWQgc2lnbmFsKCk7CiAgICAgV1RGX0VYUE9SVF9QUklWQVRFIGJvb2wgd2FpdChkb3VibGUgYWJz b2x1dGVUaW1lKTsKIAotI2lmIE9TKFdJTkRPV1MpCisjaWYgUExBVEZPUk0oV0lOKQogICAgIEhB TkRMRSBldmVudCgpIGNvbnN0IHsgcmV0dXJuIG1fZXZlbnQ7IH0KICNlbmRpZgogCiBwcml2YXRl OgotI2lmIE9TKFdJTkRPV1MpCisjaWYgUExBVEZPUk0oV0lOKQogICAgIEhBTkRMRSBtX2V2ZW50 OwogI2Vsc2UKICAgICBib29sIG1faXNTZXQ7Ci0tIAoxLjguNS4z