Diff
Modified: trunk/Source/WTF/ChangeLog (237051 => 237052)
--- trunk/Source/WTF/ChangeLog 2018-10-11 22:06:42 UTC (rev 237051)
+++ trunk/Source/WTF/ChangeLog 2018-10-11 22:52:43 UTC (rev 237052)
@@ -1,3 +1,16 @@
+2018-10-11 Ross Kirsling <[email protected]>
+
+ [WTF] Semaphore.h conflicts with POSIX header
+ https://bugs.webkit.org/show_bug.cgi?id=190486
+
+ Reviewed by Yusuke Suzuki.
+
+ Rename Semaphore.h to WTFSemaphore.h to avoid conflict with POSIX semaphore.h on case-insensitive file systems.
+
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/CMakeLists.txt:
+ * wtf/WTFSemaphore.h: Renamed from wtf/Semaphore.h.
+
2018-10-10 Mark Lam <[email protected]>
Changes towards allowing use of the ASAN detect_stack_use_after_return option.
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (237051 => 237052)
--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2018-10-11 22:06:42 UTC (rev 237051)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2018-10-11 22:52:43 UTC (rev 237052)
@@ -426,6 +426,7 @@
9C67C542589348E285B49699 /* IndexedContainerIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexedContainerIterator.h; sourceTree = "<group>"; };
A30D412C1F0DE0BA00B71954 /* SoftLinking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoftLinking.h; sourceTree = "<group>"; };
A30D412D1F0DE13F00B71954 /* SoftLinking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoftLinking.h; sourceTree = "<group>"; };
+ A36E16F7216FF828008DD87E /* WTFSemaphore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WTFSemaphore.h; sourceTree = "<group>"; };
A3AB6E6A1F3E1AD6009C14B1 /* ValueToString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ValueToString.h; sourceTree = "<group>"; };
A3E4DD911F3A803400DED0B4 /* TextStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextStream.cpp; sourceTree = "<group>"; };
A3E4DD921F3A803400DED0B4 /* TextStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextStream.h; sourceTree = "<group>"; };
@@ -638,7 +639,6 @@
E38D6E261F5522E300A75CC4 /* StringBuilderJSON.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringBuilderJSON.cpp; sourceTree = "<group>"; };
E3A32BC21FC830E2007D7E76 /* JSValueMalloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSValueMalloc.cpp; sourceTree = "<group>"; };
E3A32BC31FC830E2007D7E76 /* JSValueMalloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSValueMalloc.h; sourceTree = "<group>"; };
- E3C21D8B209D5C70006CC078 /* Semaphore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Semaphore.h; sourceTree = "<group>"; };
E3CF76902115D6BA0091DE48 /* CompactPointerTuple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompactPointerTuple.h; sourceTree = "<group>"; };
E3E158251EADA53C004A079D /* SystemFree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemFree.h; sourceTree = "<group>"; };
E431CC4A21187ADB000C8A07 /* DispatchSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DispatchSPI.h; sourceTree = "<group>"; };
@@ -1071,7 +1071,6 @@
0F66B2841DC97BAB004A1D3F /* Seconds.cpp */,
0F66B2851DC97BAB004A1D3F /* Seconds.h */,
A8A47306151A825B004123FF /* SegmentedVector.h */,
- E3C21D8B209D5C70006CC078 /* Semaphore.h */,
A8A47307151A825B004123FF /* SentinelLinkedList.h */,
A8A4731A151A825B004123FF /* SetForScope.h */,
A8A47308151A825B004123FF /* SHA1.cpp */,
@@ -1155,6 +1154,7 @@
E4A0AD371A96245500536DF6 /* WorkQueue.cpp */,
E4A0AD381A96245500536DF6 /* WorkQueue.h */,
FE05FAFE1FE5007500093230 /* WTFAssertions.cpp */,
+ A36E16F7216FF828008DD87E /* WTFSemaphore.h */,
);
path = wtf;
sourceTree = "<group>";
@@ -1547,7 +1547,6 @@
51F1752C1F3D486000C74950 /* PersistentDecoder.cpp in Sources */,
51F1752D1F3D486000C74950 /* PersistentEncoder.cpp in Sources */,
FE85416E1FBE285D008DA5DA /* Poisoned.cpp in Sources */,
- FEEA4DF9216D7BE400AC0602 /* StackPointer.cpp in Sources */,
0F9D3362165DBA73005AD387 /* PrintStream.cpp in Sources */,
7AF023B52061E17000A8EFD6 /* ProcessPrivilege.cpp in Sources */,
143F611F1565F0F900DB514A /* RAMSize.cpp in Sources */,
@@ -1566,6 +1565,7 @@
A748745217A0BDAE00FA04CB /* SixCharacterHash.cpp in Sources */,
A8A47425151A825B004123FF /* SizeLimits.cpp in Sources */,
A8A47427151A825B004123FF /* StackBounds.cpp in Sources */,
+ FEEA4DF9216D7BE400AC0602 /* StackPointer.cpp in Sources */,
FEDACD3D1630F83F00C69634 /* StackStats.cpp in Sources */,
3337DB9CE743410FAF076E17 /* StackTrace.cpp in Sources */,
A8A4743C151A825B004123FF /* StringBuilder.cpp in Sources */,
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (237051 => 237052)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2018-10-11 22:06:42 UTC (rev 237051)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2018-10-11 22:52:43 UTC (rev 237052)
@@ -197,7 +197,6 @@
ScopedLambda.h
Seconds.h
SegmentedVector.h
- Semaphore.h
SentinelLinkedList.h
SetForScope.h
SharedTask.h
@@ -254,6 +253,7 @@
Variant.h
Vector.h
VectorTraits.h
+ WTFSemaphore.h
WallTime.h
WeakPtr.h
WeakRandom.h
Deleted: trunk/Source/WTF/wtf/Semaphore.h (237051 => 237052)
--- trunk/Source/WTF/wtf/Semaphore.h 2018-10-11 22:06:42 UTC (rev 237051)
+++ trunk/Source/WTF/wtf/Semaphore.h 2018-10-11 22:52:43 UTC (rev 237052)
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2018 Yusuke Suzuki <[email protected]>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include <wtf/Condition.h>
-#include <wtf/Lock.h>
-#include <wtf/Noncopyable.h>
-
-namespace WTF {
-
-class Semaphore {
- WTF_MAKE_NONCOPYABLE(Semaphore);
- WTF_MAKE_FAST_ALLOCATED;
-public:
- constexpr Semaphore(unsigned value)
- : m_value(value)
- {
- }
-
- void signal()
- {
- auto locker = holdLock(m_lock);
- m_value++;
- m_condition.notifyOne();
- }
-
- bool waitUntil(const TimeWithDynamicClockType& timeout)
- {
- auto locker = holdLock(m_lock);
- bool satisfied = m_condition.waitUntil(m_lock, timeout,
- [&] {
- return m_value;
- });
- if (satisfied)
- --m_value;
- return satisfied;
- }
-
- bool waitFor(Seconds relativeTimeout)
- {
- return waitUntil(MonotonicTime::now() + relativeTimeout);
- }
-
- void wait()
- {
- waitUntil(ParkingLot::Time::infinity());
- }
-
-private:
- unsigned m_value { 0 };
- Lock m_lock;
- Condition m_condition;
-};
-
-
-} // namespace WTF
-
-using WTF::Semaphore;
Copied: trunk/Source/WTF/wtf/WTFSemaphore.h (from rev 237051, trunk/Source/WTF/wtf/Semaphore.h) (0 => 237052)
--- trunk/Source/WTF/wtf/WTFSemaphore.h (rev 0)
+++ trunk/Source/WTF/wtf/WTFSemaphore.h 2018-10-11 22:52:43 UTC (rev 237052)
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2018 Yusuke Suzuki <[email protected]>.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <wtf/Condition.h>
+#include <wtf/Lock.h>
+#include <wtf/Noncopyable.h>
+
+namespace WTF {
+
+class Semaphore {
+ WTF_MAKE_NONCOPYABLE(Semaphore);
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ constexpr Semaphore(unsigned value)
+ : m_value(value)
+ {
+ }
+
+ void signal()
+ {
+ auto locker = holdLock(m_lock);
+ m_value++;
+ m_condition.notifyOne();
+ }
+
+ bool waitUntil(const TimeWithDynamicClockType& timeout)
+ {
+ auto locker = holdLock(m_lock);
+ bool satisfied = m_condition.waitUntil(m_lock, timeout,
+ [&] {
+ return m_value;
+ });
+ if (satisfied)
+ --m_value;
+ return satisfied;
+ }
+
+ bool waitFor(Seconds relativeTimeout)
+ {
+ return waitUntil(MonotonicTime::now() + relativeTimeout);
+ }
+
+ void wait()
+ {
+ waitUntil(ParkingLot::Time::infinity());
+ }
+
+private:
+ unsigned m_value { 0 };
+ Lock m_lock;
+ Condition m_condition;
+};
+
+
+} // namespace WTF
+
+using WTF::Semaphore;
Modified: trunk/Source/WebCore/ChangeLog (237051 => 237052)
--- trunk/Source/WebCore/ChangeLog 2018-10-11 22:06:42 UTC (rev 237051)
+++ trunk/Source/WebCore/ChangeLog 2018-10-11 22:52:43 UTC (rev 237052)
@@ -1,3 +1,12 @@
+2018-10-11 Ross Kirsling <[email protected]>
+
+ [WTF] Semaphore.h conflicts with POSIX header
+ https://bugs.webkit.org/show_bug.cgi?id=190486
+
+ Reviewed by Yusuke Suzuki.
+
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+
2018-10-11 Thibault Saunier <[email protected]>
[GStreamer] Support arbitrary video resolution in getUserMedia API
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (237051 => 237052)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2018-10-11 22:06:42 UTC (rev 237051)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2018-10-11 22:52:43 UTC (rev 237052)
@@ -55,8 +55,8 @@
#import <wtf/BlockObjCExceptions.h>
#import <wtf/HashCountedSet.h>
#import <wtf/MainThread.h>
-#import <wtf/Semaphore.h>
#import <wtf/SoftLinking.h>
+#import <wtf/WTFSemaphore.h>
#import <wtf/WeakPtr.h>
#import <wtf/text/AtomicString.h>
#import <wtf/text/CString.h>
