From 9627f34230a4edd490b2cfeb8f0edbbc4bfe482a Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Fri, 24 Jun 2016 01:59:39 +1000 Subject: [PATCH] deps: backport 98239224 from libuv upstream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message: win: don't fetch function pointers to SRWLock APIs They're no longer needed, since the Windows-native SRWLock functions are no longer used. PR-URL: https://github.com/libuv/libuv/pull/525 Reviewed-By: Saúl Ibarra Corretgé PR-URL: https://github.com/nodejs/node-private/pull/54 Reviewed-By: Saúl Ibarra Corretgé --- deps/uv/src/win/thread.c | 20 -------------------- deps/uv/src/win/winapi.c | 28 ---------------------------- deps/uv/src/win/winapi.h | 28 ---------------------------- 3 files changed, 76 deletions(-) diff --git a/deps/uv/src/win/thread.c b/deps/uv/src/win/thread.c index 2228c51816..fd0873d603 100644 --- a/deps/uv/src/win/thread.c +++ b/deps/uv/src/win/thread.c @@ -27,28 +27,8 @@ #include "internal.h" -#define HAVE_SRWLOCK_API() (pTryAcquireSRWLockShared != NULL) #define HAVE_CONDVAR_API() (pInitializeConditionVariable != NULL) -static int uv__rwlock_srwlock_init(uv_rwlock_t* rwlock); -static void uv__rwlock_srwlock_destroy(uv_rwlock_t* rwlock); -static void uv__rwlock_srwlock_rdlock(uv_rwlock_t* rwlock); -static int uv__rwlock_srwlock_tryrdlock(uv_rwlock_t* rwlock); -static void uv__rwlock_srwlock_rdunlock(uv_rwlock_t* rwlock); -static void uv__rwlock_srwlock_wrlock(uv_rwlock_t* rwlock); -static int uv__rwlock_srwlock_trywrlock(uv_rwlock_t* rwlock); -static void uv__rwlock_srwlock_wrunlock(uv_rwlock_t* rwlock); - -static int uv__rwlock_fallback_init(uv_rwlock_t* rwlock); -static void uv__rwlock_fallback_destroy(uv_rwlock_t* rwlock); -static void uv__rwlock_fallback_rdlock(uv_rwlock_t* rwlock); -static int uv__rwlock_fallback_tryrdlock(uv_rwlock_t* rwlock); -static void uv__rwlock_fallback_rdunlock(uv_rwlock_t* rwlock); -static void uv__rwlock_fallback_wrlock(uv_rwlock_t* rwlock); -static int uv__rwlock_fallback_trywrlock(uv_rwlock_t* rwlock); -static void uv__rwlock_fallback_wrunlock(uv_rwlock_t* rwlock); - - static int uv_cond_fallback_init(uv_cond_t* cond); static void uv_cond_fallback_destroy(uv_cond_t* cond); static void uv_cond_fallback_signal(uv_cond_t* cond); diff --git a/deps/uv/src/win/winapi.c b/deps/uv/src/win/winapi.c index f3f27f77c1..b0b7fd825f 100644 --- a/deps/uv/src/win/winapi.c +++ b/deps/uv/src/win/winapi.c @@ -40,13 +40,6 @@ sGetQueuedCompletionStatusEx pGetQueuedCompletionStatusEx; sSetFileCompletionNotificationModes pSetFileCompletionNotificationModes; sCreateSymbolicLinkW pCreateSymbolicLinkW; sCancelIoEx pCancelIoEx; -sInitializeSRWLock pInitializeSRWLock; -sAcquireSRWLockShared pAcquireSRWLockShared; -sAcquireSRWLockExclusive pAcquireSRWLockExclusive; -sTryAcquireSRWLockShared pTryAcquireSRWLockShared; -sTryAcquireSRWLockExclusive pTryAcquireSRWLockExclusive; -sReleaseSRWLockShared pReleaseSRWLockShared; -sReleaseSRWLockExclusive pReleaseSRWLockExclusive; sInitializeConditionVariable pInitializeConditionVariable; sSleepConditionVariableCS pSleepConditionVariableCS; sSleepConditionVariableSRW pSleepConditionVariableSRW; @@ -129,27 +122,6 @@ void uv_winapi_init() { pCancelIoEx = (sCancelIoEx) GetProcAddress(kernel32_module, "CancelIoEx"); - pInitializeSRWLock = (sInitializeSRWLock) - GetProcAddress(kernel32_module, "InitializeSRWLock"); - - pAcquireSRWLockShared = (sAcquireSRWLockShared) - GetProcAddress(kernel32_module, "AcquireSRWLockShared"); - - pAcquireSRWLockExclusive = (sAcquireSRWLockExclusive) - GetProcAddress(kernel32_module, "AcquireSRWLockExclusive"); - - pTryAcquireSRWLockShared = (sTryAcquireSRWLockShared) - GetProcAddress(kernel32_module, "TryAcquireSRWLockShared"); - - pTryAcquireSRWLockExclusive = (sTryAcquireSRWLockExclusive) - GetProcAddress(kernel32_module, "TryAcquireSRWLockExclusive"); - - pReleaseSRWLockShared = (sReleaseSRWLockShared) - GetProcAddress(kernel32_module, "ReleaseSRWLockShared"); - - pReleaseSRWLockExclusive = (sReleaseSRWLockExclusive) - GetProcAddress(kernel32_module, "ReleaseSRWLockExclusive"); - pInitializeConditionVariable = (sInitializeConditionVariable) GetProcAddress(kernel32_module, "InitializeConditionVariable"); diff --git a/deps/uv/src/win/winapi.h b/deps/uv/src/win/winapi.h index f4f9145b38..5bc79bcab2 100644 --- a/deps/uv/src/win/winapi.h +++ b/deps/uv/src/win/winapi.h @@ -4655,27 +4655,6 @@ typedef BOOL (WINAPI* sCancelIoEx) (HANDLE hFile, LPOVERLAPPED lpOverlapped); -typedef VOID (WINAPI* sInitializeSRWLock) - (PSRWLOCK SRWLock); - -typedef VOID (WINAPI* sAcquireSRWLockShared) - (PSRWLOCK SRWLock); - -typedef VOID (WINAPI* sAcquireSRWLockExclusive) - (PSRWLOCK SRWLock); - -typedef BOOL (WINAPI* sTryAcquireSRWLockShared) - (PSRWLOCK SRWLock); - -typedef BOOL (WINAPI* sTryAcquireSRWLockExclusive) - (PSRWLOCK SRWLock); - -typedef VOID (WINAPI* sReleaseSRWLockShared) - (PSRWLOCK SRWLock); - -typedef VOID (WINAPI* sReleaseSRWLockExclusive) - (PSRWLOCK SRWLock); - typedef VOID (WINAPI* sInitializeConditionVariable) (PCONDITION_VARIABLE ConditionVariable); @@ -4714,13 +4693,6 @@ extern sGetQueuedCompletionStatusEx pGetQueuedCompletionStatusEx; extern sSetFileCompletionNotificationModes pSetFileCompletionNotificationModes; extern sCreateSymbolicLinkW pCreateSymbolicLinkW; extern sCancelIoEx pCancelIoEx; -extern sInitializeSRWLock pInitializeSRWLock; -extern sAcquireSRWLockShared pAcquireSRWLockShared; -extern sAcquireSRWLockExclusive pAcquireSRWLockExclusive; -extern sTryAcquireSRWLockShared pTryAcquireSRWLockShared; -extern sTryAcquireSRWLockExclusive pTryAcquireSRWLockExclusive; -extern sReleaseSRWLockShared pReleaseSRWLockShared; -extern sReleaseSRWLockExclusive pReleaseSRWLockExclusive; extern sInitializeConditionVariable pInitializeConditionVariable; extern sSleepConditionVariableCS pSleepConditionVariableCS; extern sSleepConditionVariableSRW pSleepConditionVariableSRW;