Skip to content

Commit 9627f34

Browse files
committed
deps: backport 98239224 from libuv upstream
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: libuv/libuv#525 Reviewed-By: Saúl Ibarra Corretgé <[email protected]> PR-URL: nodejs-private/node-private#54 Reviewed-By: Saúl Ibarra Corretgé <[email protected]>
1 parent 5df21b2 commit 9627f34

File tree

3 files changed

+0
-76
lines changed

3 files changed

+0
-76
lines changed

Diff for: deps/uv/src/win/thread.c

-20
Original file line numberDiff line numberDiff line change
@@ -27,28 +27,8 @@
2727
#include "internal.h"
2828

2929

30-
#define HAVE_SRWLOCK_API() (pTryAcquireSRWLockShared != NULL)
3130
#define HAVE_CONDVAR_API() (pInitializeConditionVariable != NULL)
3231

33-
static int uv__rwlock_srwlock_init(uv_rwlock_t* rwlock);
34-
static void uv__rwlock_srwlock_destroy(uv_rwlock_t* rwlock);
35-
static void uv__rwlock_srwlock_rdlock(uv_rwlock_t* rwlock);
36-
static int uv__rwlock_srwlock_tryrdlock(uv_rwlock_t* rwlock);
37-
static void uv__rwlock_srwlock_rdunlock(uv_rwlock_t* rwlock);
38-
static void uv__rwlock_srwlock_wrlock(uv_rwlock_t* rwlock);
39-
static int uv__rwlock_srwlock_trywrlock(uv_rwlock_t* rwlock);
40-
static void uv__rwlock_srwlock_wrunlock(uv_rwlock_t* rwlock);
41-
42-
static int uv__rwlock_fallback_init(uv_rwlock_t* rwlock);
43-
static void uv__rwlock_fallback_destroy(uv_rwlock_t* rwlock);
44-
static void uv__rwlock_fallback_rdlock(uv_rwlock_t* rwlock);
45-
static int uv__rwlock_fallback_tryrdlock(uv_rwlock_t* rwlock);
46-
static void uv__rwlock_fallback_rdunlock(uv_rwlock_t* rwlock);
47-
static void uv__rwlock_fallback_wrlock(uv_rwlock_t* rwlock);
48-
static int uv__rwlock_fallback_trywrlock(uv_rwlock_t* rwlock);
49-
static void uv__rwlock_fallback_wrunlock(uv_rwlock_t* rwlock);
50-
51-
5232
static int uv_cond_fallback_init(uv_cond_t* cond);
5333
static void uv_cond_fallback_destroy(uv_cond_t* cond);
5434
static void uv_cond_fallback_signal(uv_cond_t* cond);

Diff for: deps/uv/src/win/winapi.c

-28
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,6 @@ sGetQueuedCompletionStatusEx pGetQueuedCompletionStatusEx;
4040
sSetFileCompletionNotificationModes pSetFileCompletionNotificationModes;
4141
sCreateSymbolicLinkW pCreateSymbolicLinkW;
4242
sCancelIoEx pCancelIoEx;
43-
sInitializeSRWLock pInitializeSRWLock;
44-
sAcquireSRWLockShared pAcquireSRWLockShared;
45-
sAcquireSRWLockExclusive pAcquireSRWLockExclusive;
46-
sTryAcquireSRWLockShared pTryAcquireSRWLockShared;
47-
sTryAcquireSRWLockExclusive pTryAcquireSRWLockExclusive;
48-
sReleaseSRWLockShared pReleaseSRWLockShared;
49-
sReleaseSRWLockExclusive pReleaseSRWLockExclusive;
5043
sInitializeConditionVariable pInitializeConditionVariable;
5144
sSleepConditionVariableCS pSleepConditionVariableCS;
5245
sSleepConditionVariableSRW pSleepConditionVariableSRW;
@@ -129,27 +122,6 @@ void uv_winapi_init() {
129122
pCancelIoEx = (sCancelIoEx)
130123
GetProcAddress(kernel32_module, "CancelIoEx");
131124

132-
pInitializeSRWLock = (sInitializeSRWLock)
133-
GetProcAddress(kernel32_module, "InitializeSRWLock");
134-
135-
pAcquireSRWLockShared = (sAcquireSRWLockShared)
136-
GetProcAddress(kernel32_module, "AcquireSRWLockShared");
137-
138-
pAcquireSRWLockExclusive = (sAcquireSRWLockExclusive)
139-
GetProcAddress(kernel32_module, "AcquireSRWLockExclusive");
140-
141-
pTryAcquireSRWLockShared = (sTryAcquireSRWLockShared)
142-
GetProcAddress(kernel32_module, "TryAcquireSRWLockShared");
143-
144-
pTryAcquireSRWLockExclusive = (sTryAcquireSRWLockExclusive)
145-
GetProcAddress(kernel32_module, "TryAcquireSRWLockExclusive");
146-
147-
pReleaseSRWLockShared = (sReleaseSRWLockShared)
148-
GetProcAddress(kernel32_module, "ReleaseSRWLockShared");
149-
150-
pReleaseSRWLockExclusive = (sReleaseSRWLockExclusive)
151-
GetProcAddress(kernel32_module, "ReleaseSRWLockExclusive");
152-
153125
pInitializeConditionVariable = (sInitializeConditionVariable)
154126
GetProcAddress(kernel32_module, "InitializeConditionVariable");
155127

Diff for: deps/uv/src/win/winapi.h

-28
Original file line numberDiff line numberDiff line change
@@ -4655,27 +4655,6 @@ typedef BOOL (WINAPI* sCancelIoEx)
46554655
(HANDLE hFile,
46564656
LPOVERLAPPED lpOverlapped);
46574657

4658-
typedef VOID (WINAPI* sInitializeSRWLock)
4659-
(PSRWLOCK SRWLock);
4660-
4661-
typedef VOID (WINAPI* sAcquireSRWLockShared)
4662-
(PSRWLOCK SRWLock);
4663-
4664-
typedef VOID (WINAPI* sAcquireSRWLockExclusive)
4665-
(PSRWLOCK SRWLock);
4666-
4667-
typedef BOOL (WINAPI* sTryAcquireSRWLockShared)
4668-
(PSRWLOCK SRWLock);
4669-
4670-
typedef BOOL (WINAPI* sTryAcquireSRWLockExclusive)
4671-
(PSRWLOCK SRWLock);
4672-
4673-
typedef VOID (WINAPI* sReleaseSRWLockShared)
4674-
(PSRWLOCK SRWLock);
4675-
4676-
typedef VOID (WINAPI* sReleaseSRWLockExclusive)
4677-
(PSRWLOCK SRWLock);
4678-
46794658
typedef VOID (WINAPI* sInitializeConditionVariable)
46804659
(PCONDITION_VARIABLE ConditionVariable);
46814660

@@ -4714,13 +4693,6 @@ extern sGetQueuedCompletionStatusEx pGetQueuedCompletionStatusEx;
47144693
extern sSetFileCompletionNotificationModes pSetFileCompletionNotificationModes;
47154694
extern sCreateSymbolicLinkW pCreateSymbolicLinkW;
47164695
extern sCancelIoEx pCancelIoEx;
4717-
extern sInitializeSRWLock pInitializeSRWLock;
4718-
extern sAcquireSRWLockShared pAcquireSRWLockShared;
4719-
extern sAcquireSRWLockExclusive pAcquireSRWLockExclusive;
4720-
extern sTryAcquireSRWLockShared pTryAcquireSRWLockShared;
4721-
extern sTryAcquireSRWLockExclusive pTryAcquireSRWLockExclusive;
4722-
extern sReleaseSRWLockShared pReleaseSRWLockShared;
4723-
extern sReleaseSRWLockExclusive pReleaseSRWLockExclusive;
47244696
extern sInitializeConditionVariable pInitializeConditionVariable;
47254697
extern sSleepConditionVariableCS pSleepConditionVariableCS;
47264698
extern sSleepConditionVariableSRW pSleepConditionVariableSRW;

0 commit comments

Comments
 (0)