Skip to content

Remove unused ConcRT wrappers #1325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 3, 2020
Merged

Remove unused ConcRT wrappers #1325

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 12 additions & 103 deletions stl/src/primitives.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,13 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#pragma once
#pragma warning(push)
#pragma warning(disable : 4201) // nonstandard extension used: nameless struct/union
#pragma warning(disable : 4324) // structure was padded due to alignment specifier

#include <crtdefs.h>
#include <cstdlib> // for __max
#include <exception>
#include <new>

#include <Windows.h>

#include "awint.hpp"

#ifdef _STL_CONCRT_SUPPORT
#pragma warning(push)
#pragma warning(disable : 6297 6385 6386 6504 28204)
#include <concrt.h>
#include <concrtinternal.h>
#pragma warning(pop)
#endif

enum class __stl_sync_api_modes_enum { normal, win7, vista, concrt };

extern __stl_sync_api_modes_enum __stl_sync_api_impl_mode;
Expand Down Expand Up @@ -195,78 +181,6 @@ namespace Concurrency {
CONDITION_VARIABLE m_condition_variable;
};

#ifdef _STL_CONCRT_SUPPORT
class stl_critical_section_concrt final : public stl_critical_section_interface {
public:
stl_critical_section_concrt() = default;
~stl_critical_section_concrt() = delete;
stl_critical_section_concrt(const stl_critical_section_concrt&) = delete;
stl_critical_section_concrt& operator=(const stl_critical_section_concrt&) = delete;

virtual void lock() override {
m_critical_section.lock();
}

virtual bool try_lock() override {
return m_critical_section.try_lock();
}

virtual bool try_lock_for(unsigned int duration) override {
return m_critical_section.try_lock_for(duration);
}

virtual void unlock() override {
m_critical_section.unlock();
}

virtual void destroy() override {
// the destructor of stl_critical_section_concrt will never be invoked
m_critical_section.~critical_section();
}

critical_section& native_handle() {
return m_critical_section;
}

private:
critical_section m_critical_section;
};

class stl_condition_variable_concrt final : public stl_condition_variable_interface {
public:
stl_condition_variable_concrt() = default;
~stl_condition_variable_concrt() = delete;
stl_condition_variable_concrt(const stl_condition_variable_concrt&) = delete;
stl_condition_variable_concrt& operator=(const stl_condition_variable_concrt&) = delete;

virtual void wait(stl_critical_section_interface* lock) override {
m_condition_variable.wait(static_cast<stl_critical_section_concrt*>(lock)->native_handle());
}

virtual bool wait_for(stl_critical_section_interface* lock, unsigned int timeout) override {
return m_condition_variable.wait_for(
static_cast<stl_critical_section_concrt*>(lock)->native_handle(), timeout);
}

virtual void notify_one() override {
m_condition_variable.notify_one();
}

virtual void notify_all() override {
m_condition_variable.notify_all();
}

virtual void destroy() override {
// the destructor of stl_condition_variable_concrt will never be invoked
m_condition_variable.~_Condition_variable();
}

private:
_Condition_variable m_condition_variable;
};

#endif // _STL_CONCRT_SUPPORT

inline bool are_win7_sync_apis_available() {
#if _STL_WIN32_WINNT >= _WIN32_WINNT_WIN7
return true;
Expand Down Expand Up @@ -327,32 +241,29 @@ namespace Concurrency {
const size_t stl_condition_variable_max_alignment = alignof(stl_condition_variable_win7);
#elif defined _STL_CONCRT_SUPPORT

// TRANSITION: stl_critical_section_concrt and stl_condition_variable_concrt are now unused,
// except to determine these size/alignment values. After verifying that these static_asserts succeed,
// we can substitute these values below, and remove the class definitions.
#ifdef _WIN64
static_assert(sizeof(stl_critical_section_concrt) == 64);
static_assert(sizeof(stl_condition_variable_concrt) == 72);
static_assert(alignof(stl_critical_section_concrt) == 8);
static_assert(alignof(stl_condition_variable_concrt) == 8);
const size_t sizeof_stl_critical_section_concrt = 64;
const size_t sizeof_stl_condition_variable_concrt = 72;
const size_t alignof_stl_critical_section_concrt = 8;
const size_t alignof_stl_condition_variable_concrt = 8;
#else // ^^^ 64-bit / 32-bit vvv
static_assert(sizeof(stl_critical_section_concrt) == 36);
static_assert(sizeof(stl_condition_variable_concrt) == 40);
static_assert(alignof(stl_critical_section_concrt) == 4);
static_assert(alignof(stl_condition_variable_concrt) == 4);
const size_t sizeof_stl_critical_section_concrt = 36;
const size_t sizeof_stl_condition_variable_concrt = 40;
const size_t alignof_stl_critical_section_concrt = 4;
const size_t alignof_stl_condition_variable_concrt = 4;
#endif // ^^^ 32-bit ^^^

const size_t stl_critical_section_max_size =
__max(__max(sizeof(stl_critical_section_concrt), sizeof(stl_critical_section_vista)),
__max(__max(sizeof_stl_critical_section_concrt, sizeof(stl_critical_section_vista)),
sizeof(stl_critical_section_win7));
const size_t stl_condition_variable_max_size =
__max(__max(sizeof(stl_condition_variable_concrt), sizeof(stl_condition_variable_vista)),
__max(__max(sizeof_stl_condition_variable_concrt, sizeof(stl_condition_variable_vista)),
sizeof(stl_condition_variable_win7));
const size_t stl_critical_section_max_alignment =
__max(__max(alignof(stl_critical_section_concrt), alignof(stl_critical_section_vista)),
__max(__max(alignof_stl_critical_section_concrt, alignof(stl_critical_section_vista)),
alignof(stl_critical_section_win7));
const size_t stl_condition_variable_max_alignment =
__max(__max(alignof(stl_condition_variable_concrt), alignof(stl_condition_variable_vista)),
__max(__max(alignof_stl_condition_variable_concrt, alignof(stl_condition_variable_vista)),
alignof(stl_condition_variable_win7));
#else
const size_t stl_critical_section_max_size =
Expand All @@ -366,5 +277,3 @@ namespace Concurrency {
#endif
} // namespace details
} // namespace Concurrency

#pragma warning(pop)