From c9f8e8ebab83f47caf2b33b6c6f45e76b66d88e0 Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Wed, 17 Jun 2009 09:10:42 +0000 Subject: [PATCH] Improve the Win32 reader-writer lock implementation by making it just a normal lock. This is obviously bad, but at least it's threadsafe! If you know how to improve this in a pre-Vista friendly well, patches welcome! Patch by Max Burke. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@73607 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/System/Win32/RWMutex.inc | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/System/Win32/RWMutex.inc b/lib/System/Win32/RWMutex.inc index 5360b41b0e6..7fc4b33b1e9 100644 --- a/lib/System/Win32/RWMutex.inc +++ b/lib/System/Win32/RWMutex.inc @@ -18,31 +18,39 @@ #include "Win32.h" -// FIXME: THIS IS NOT THREAD-SAFE!! -// Windows does not have reader-writer locks pre-Vista. If you want to have -// thread-safe LLVM on Windows, for now at least, you need to use a pthreads -// replacement library. +// FIXME: Windows does not have reader-writer locks pre-Vista. If you want +// real reader-writer locks, you a pthreads implementation for Windows. namespace llvm { using namespace sys; -RWMutex::RWMutex() { } +RWMutex::RWMutex() { + data_ = calloc(1, sizeof(CRITICAL_SECTION)); + InitializeCriticalSection(static_cast(data_)); +} -RWMutex::~RWMutex() { } +RWMutex::~RWMutex() { + DeleteCriticalSection(static_cast(data_)); + free(data_); +} bool RWMutex::reader_acquire() { + EnterCriticalSection(static_cast(data_)); return true; } bool RWMutex::reader_release() { + LeaveCriticalSection(static_cast(data_)); return true; } bool RWMutex::writer_acquire() { + EnterCriticalSection(static_cast(data_)); return true; } bool RWMutex::writer_release() { + LeaveCriticalSection(static_cast(data_)); return true; }