diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Don't need to define LOCK just use PL_LOCK from SWI headers.

Browse Source
This commit is contained in:
Andreas Becker 2014-05-29 11:40:33 +02:00
parent daaaf52338
commit f01de36c23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
C/pl-yap.c
View File

@ -23,8 +23,8 @@
#include <limits.h> #include <limits.h>
#endif #endif
#define LOCK() PL_LOCK(L_PLFLAG) //#define LOCK() PL_LOCK(L_PLFLAG)
#define UNLOCK() PL_UNLOCK(L_PLFLAG) //#define UNLOCK() PL_UNLOCK(L_PLFLAG)
int fileerrors; int fileerrors;
@ -1185,12 +1185,13 @@ static int thread_highest_id = 0;
X_API int X_API int
PL_w32thread_raise(DWORD id, int sig) PL_w32thread_raise(DWORD id, int sig)
{ int i; { int i;
CACHE_REGS
if ( sig < 0 || sig > MAXSIGNAL ) if ( sig < 0 || sig > MAXSIGNAL )
return FALSE; /* illegal signal */ return FALSE; /* illegal signal */
LOCK(); PL_LOCK(L_PLFLAG);
LOCK(LOCAL_SignalLock); // LOCK(LOCAL_SignalLock);
for(i = 0; i <= thread_highest_id; i++) for(i = 0; i <= thread_highest_id; i++)
{ PL_thread_info_t *info = GD->thread.threads[i]; { PL_thread_info_t *info = GD->thread.threads[i];
@ -1200,14 +1201,14 @@ PL_w32thread_raise(DWORD id, int sig)
Yap_external_signal(i, sig); //raiseSignal(info->thread_data, sig); Yap_external_signal(i, sig); //raiseSignal(info->thread_data, sig);
if ( info->w32id ) if ( info->w32id )
PostThreadMessage(info->w32id, WM_SIGNALLED, 0, 0L); PostThreadMessage(info->w32id, WM_SIGNALLED, 0, 0L);
UNLOCK(LOCAL_SignalLock); //UNLOCK(LOCAL_SignalLock);
UNLOCK(); PL_UNLOCK(L_PLFLAG);
DEBUG(1, Sdprintf("Signalled %d to thread %d\n", sig, i)); DEBUG(1, Sdprintf("Signalled %d to thread %d\n", sig, i));
return TRUE; return TRUE;
} }
} }
UNLOCK(LOCAL_SignalLock); // UNLOCK(LOCAL_SignalLock);
UNLOCK(); PL_UNLOCK(L_PLFLAG);
return FALSE; /* can't find thread */ return FALSE; /* can't find thread */
} }