| Index: third_party/WebKit/Source/wtf/ThreadingPrimitives.h
|
| diff --git a/third_party/WebKit/Source/wtf/ThreadingPrimitives.h b/third_party/WebKit/Source/wtf/ThreadingPrimitives.h
|
| index 84b72a6f19ff00a2494db3c3e71cb89308541ac3..0f405887be647e8c650cd367323d4eea44d461c9 100644
|
| --- a/third_party/WebKit/Source/wtf/ThreadingPrimitives.h
|
| +++ b/third_party/WebKit/Source/wtf/ThreadingPrimitives.h
|
| @@ -1,175 +1,9 @@
|
| -/*
|
| - * Copyright (C) 2007, 2008, 2010 Apple Inc. All rights reserved.
|
| - * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com)
|
| - *
|
| - * 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.
|
| - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
|
| - * its contributors may be used to endorse or promote products derived
|
| - * from this software without specific prior written permission.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
|
| - *
|
| - */
|
| +// Copyright 2017 The Chromium Authors. All rights reserved.
|
| +// Use of this source code is governed by a BSD-style license that can be
|
| +// found in the LICENSE file.
|
|
|
| -#ifndef ThreadingPrimitives_h
|
| -#define ThreadingPrimitives_h
|
| +#include "platform/wtf/ThreadingPrimitives.h"
|
|
|
| -#include "wtf/Allocator.h"
|
| -#include "wtf/Assertions.h"
|
| -#include "wtf/Locker.h"
|
| -#include "wtf/Noncopyable.h"
|
| -#include "wtf/WTFExport.h"
|
| -
|
| -#if OS(WIN)
|
| -#include <windows.h>
|
| -#endif
|
| -
|
| -#if OS(POSIX)
|
| -#include <pthread.h>
|
| -#endif
|
| -
|
| -namespace WTF {
|
| -
|
| -#if OS(POSIX)
|
| -struct PlatformMutex {
|
| - pthread_mutex_t m_internalMutex;
|
| -#if DCHECK_IS_ON()
|
| - size_t m_recursionCount;
|
| -#endif
|
| -};
|
| -typedef pthread_cond_t PlatformCondition;
|
| -#elif OS(WIN)
|
| -struct PlatformMutex {
|
| - CRITICAL_SECTION m_internalMutex;
|
| - size_t m_recursionCount;
|
| -};
|
| -struct PlatformCondition {
|
| - size_t m_waitersGone;
|
| - size_t m_waitersBlocked;
|
| - size_t m_waitersToUnblock;
|
| - HANDLE m_blockLock;
|
| - HANDLE m_blockQueue;
|
| - HANDLE m_unblockLock;
|
| -
|
| - bool timedWait(PlatformMutex&, DWORD durationMilliseconds);
|
| - void signal(bool unblockAll);
|
| -};
|
| -#else
|
| -typedef void* PlatformMutex;
|
| -typedef void* PlatformCondition;
|
| -#endif
|
| -
|
| -class WTF_EXPORT MutexBase {
|
| - WTF_MAKE_NONCOPYABLE(MutexBase);
|
| - USING_FAST_MALLOC(MutexBase);
|
| -
|
| - public:
|
| - ~MutexBase();
|
| -
|
| - void lock();
|
| - void unlock();
|
| -#if DCHECK_IS_ON()
|
| - bool locked() { return m_mutex.m_recursionCount > 0; }
|
| -#endif
|
| -
|
| - public:
|
| - PlatformMutex& impl() { return m_mutex; }
|
| -
|
| - protected:
|
| - MutexBase(bool recursive);
|
| -
|
| - PlatformMutex m_mutex;
|
| -};
|
| -
|
| -class WTF_EXPORT Mutex : public MutexBase {
|
| - public:
|
| - Mutex() : MutexBase(false) {}
|
| - bool tryLock();
|
| -};
|
| -
|
| -class WTF_EXPORT RecursiveMutex : public MutexBase {
|
| - public:
|
| - RecursiveMutex() : MutexBase(true) {}
|
| - bool tryLock();
|
| -};
|
| -
|
| -typedef Locker<MutexBase> MutexLocker;
|
| -
|
| -class MutexTryLocker final {
|
| - STACK_ALLOCATED();
|
| - WTF_MAKE_NONCOPYABLE(MutexTryLocker);
|
| -
|
| - public:
|
| - MutexTryLocker(Mutex& mutex) : m_mutex(mutex), m_locked(mutex.tryLock()) {}
|
| - ~MutexTryLocker() {
|
| - if (m_locked)
|
| - m_mutex.unlock();
|
| - }
|
| -
|
| - bool locked() const { return m_locked; }
|
| -
|
| - private:
|
| - Mutex& m_mutex;
|
| - bool m_locked;
|
| -};
|
| -
|
| -class WTF_EXPORT ThreadCondition final {
|
| - USING_FAST_MALLOC(ThreadCondition); // Only HeapTest.cpp requires.
|
| - WTF_MAKE_NONCOPYABLE(ThreadCondition);
|
| -
|
| - public:
|
| - ThreadCondition();
|
| - ~ThreadCondition();
|
| -
|
| - void wait(MutexBase&);
|
| - // Returns true if the condition was signaled before absoluteTime, false if
|
| - // the absoluteTime was reached or is in the past.
|
| - // The absoluteTime is in seconds, starting on January 1, 1970. The time is
|
| - // assumed to use the same time zone as WTF::currentTime().
|
| - bool timedWait(MutexBase&, double absoluteTime);
|
| - void signal();
|
| - void broadcast();
|
| -
|
| - private:
|
| - PlatformCondition m_condition;
|
| -};
|
| -
|
| -#if OS(WIN)
|
| -// The absoluteTime is in seconds, starting on January 1, 1970. The time is
|
| -// assumed to use the same time zone as WTF::currentTime().
|
| -// Returns an interval in milliseconds suitable for passing to one of the Win32
|
| -// wait functions (e.g., ::WaitForSingleObject).
|
| -DWORD absoluteTimeToWaitTimeoutInterval(double absoluteTime);
|
| -#endif
|
| -
|
| -} // namespace WTF
|
| -
|
| -using WTF::MutexBase;
|
| -using WTF::Mutex;
|
| -using WTF::RecursiveMutex;
|
| -using WTF::MutexLocker;
|
| -using WTF::MutexTryLocker;
|
| -using WTF::ThreadCondition;
|
| -
|
| -#if OS(WIN)
|
| -using WTF::absoluteTimeToWaitTimeoutInterval;
|
| -#endif
|
| -
|
| -#endif // ThreadingPrimitives_h
|
| +// The contents of this header was moved to platform/wtf as part of
|
| +// WTF migration project. See the following post for details:
|
| +// https://groups.google.com/a/chromium.org/d/msg/blink-dev/tLdAZCTlcAA/bYXVT8gYCAAJ
|
|
|