wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 758837: update NSPR to NSPR_4_9_2_BETA1 to pick up the new

Browse Source 
thread name functions.  r=honzab.
This commit is contained in:
Wan-Teh Chang 2012-06-07 11:26:20 -07:00
parent 61230f82a9
commit f8566c2d0d
17 changed files with 211 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nsprpub/TAG-INFO
View File

@ -1 +1 @@
NSPR_4_9_1_RTM
NSPR_4_9_2_BETA1

8
nsprpub/admin/repackage.sh
View File

@ -32,10 +32,10 @@
#
# ------------------------------------------------------------------
FROMTOP=/share/builds/components/nspr20/v4.9.1
TOTOP=./v4.9.1
NSPRDIR=nspr-4.9.1
SOURCETAG=NSPR_4_9_1_RTM
FROMTOP=/share/builds/components/nspr20/v4.9.2
TOTOP=./v4.9.2
NSPRDIR=nspr-4.9.2
SOURCETAG=NSPR_4_9_2_RTM
#
# enumerate Unix object directories on /s/b/c

1
nsprpub/config/prdepend.h
View File

@ -10,4 +10,3 @@
*/
#error "Do not include this header file."

2
nsprpub/configure vendored
View File

@ -736,7 +736,7 @@ test "$host_alias" != "$target_alias" &&
MOD_MAJOR_VERSION=4
MOD_MINOR_VERSION=9
MOD_PATCH_VERSION=1
MOD_PATCH_VERSION=2
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=

2
nsprpub/configure.in
View File

@ -15,7 +15,7 @@ dnl = Defaults
dnl ========================================================
MOD_MAJOR_VERSION=4
MOD_MINOR_VERSION=9
MOD_PATCH_VERSION=1
MOD_PATCH_VERSION=2
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=

1
nsprpub/pr/include/md/_win95.h
View File

@ -362,6 +362,7 @@ extern PROsfd _MD_Accept(PRFileDesc *fd, PRNetAddr *raddr, PRUint32 *rlen,
#define _MD_CREATE_THREAD _PR_MD_CREATE_THREAD
#define _MD_YIELD _PR_MD_YIELD
#define _MD_SET_PRIORITY _PR_MD_SET_PRIORITY
#define _MD_SET_CURRENT_THREAD_NAME _PR_MD_SET_CURRENT_THREAD_NAME
#define _MD_CLEAN_THREAD _PR_MD_CLEAN_THREAD
#define _MD_SETTHREADAFFINITYMASK _PR_MD_SETTHREADAFFINITYMASK
#define _MD_GETTHREADAFFINITYMASK _PR_MD_GETTHREADAFFINITYMASK

1
nsprpub/pr/include/md/_winnt.h
View File

@ -376,6 +376,7 @@ extern int _PR_NTFiberSafeSelect(int, fd_set *, fd_set *, fd_set *,
#define _MD_END_THREAD _PR_MD_END_THREAD
#define _MD_YIELD _PR_MD_YIELD
#define _MD_SET_PRIORITY _PR_MD_SET_PRIORITY
#define _MD_SET_CURRENT_THREAD_NAME _PR_MD_SET_CURRENT_THREAD_NAME
#define _MD_CLEAN_THREAD _PR_MD_CLEAN_THREAD
#define _MD_SETTHREADAFFINITYMASK _PR_MD_SETTHREADAFFINITYMASK
#define _MD_GETTHREADAFFINITYMASK _PR_MD_GETTHREADAFFINITYMASK

6
nsprpub/pr/include/prinit.h
View File

@ -31,11 +31,11 @@ PR_BEGIN_EXTERN_C
** The format of the version string is
** "<major version>.<minor version>[.<patch level>] [<Beta>]"
*/
#define PR_VERSION "4.9.1"
#define PR_VERSION "4.9.2 Beta"
#define PR_VMAJOR 4
#define PR_VMINOR 9
#define PR_VPATCH 1
#define PR_BETA PR_FALSE
#define PR_VPATCH 2
#define PR_BETA PR_TRUE
/*
** PRVersionCheck

4
nsprpub/pr/include/private/primpl.h
View File

@ -977,6 +977,9 @@ extern void _PR_MD_YIELD(void);
extern void _PR_MD_SET_PRIORITY(_MDThread *md, PRThreadPriority newPri);
#define _PR_MD_SET_PRIORITY _MD_SET_PRIORITY
extern void _PR_MD_SET_CURRENT_THREAD_NAME(const char *name);
#define _PR_MD_SET_CURRENT_THREAD_NAME _MD_SET_CURRENT_THREAD_NAME
NSPR_API(void) _PR_MD_SUSPENDALL(void);
#define _PR_MD_SUSPENDALL _MD_SUSPENDALL
@ -1533,6 +1536,7 @@ struct PRThread {
PRIntn errorStringLength; /* textLength from last call to PR_SetErrorText() */
PRInt32 errorStringSize; /* malloc()'d size of buffer | zero */
char *errorString; /* current error string | NULL */
char *name; /* thread's name */
#if defined(_PR_PTHREADS)
pthread_t id; /* pthread identifier for the thread */

11
nsprpub/pr/include/prthread.h
View File

@ -144,6 +144,17 @@ NSPR_API(PRThreadPriority) PR_GetThreadPriority(const PRThread *thread);
*/
NSPR_API(void) PR_SetThreadPriority(PRThread *thread, PRThreadPriority priority);
/*
** Set the name of the current thread, which will be visible in a debugger
** and accessible via a call to PR_GetThreadName().
*/
NSPR_API(PRStatus) PR_SetCurrentThreadName(const char *name);
/*
** Return the name of "thread", if set. Otherwise return NULL.
*/
NSPR_API(const char *) PR_GetThreadName(const PRThread *thread);
/*
** This routine returns a new index for per-thread-private data table.
** The index is visible to all threads within a process. This index can

34
nsprpub/pr/src/md/windows/ntthread.c
View File

@ -276,6 +276,40 @@ _PR_MD_SET_PRIORITY(_MDThread *thread, PRThreadPriority newPri)
return;
}
const DWORD MS_VC_EXCEPTION = 0x406D1388;
#pragma pack(push,8)
typedef struct tagTHREADNAME_INFO
{
DWORD dwType; // Must be 0x1000.
LPCSTR szName; // Pointer to name (in user addr space).
DWORD dwThreadID; // Thread ID (-1=caller thread).
DWORD dwFlags; // Reserved for future use, must be zero.
} THREADNAME_INFO;
#pragma pack(pop)
void
_PR_MD_SET_CURRENT_THREAD_NAME(const char *name)
{
THREADNAME_INFO info;
if (!IsDebuggerPresent())
return;
info.dwType = 0x1000;
info.szName = (char*) name;
info.dwThreadID = -1;
info.dwFlags = 0;
__try {
RaiseException(MS_VC_EXCEPTION,
0,
sizeof(info) / sizeof(ULONG_PTR),
(ULONG_PTR*)&info);
} __except(EXCEPTION_CONTINUE_EXECUTION) {
}
}
void
_PR_MD_CLEAN_THREAD(PRThread *thread)
{

34
nsprpub/pr/src/md/windows/w95thred.c
View File

@ -168,6 +168,40 @@ _PR_MD_SET_PRIORITY(_MDThread *thread, PRThreadPriority newPri)
return;
}
const DWORD MS_VC_EXCEPTION = 0x406D1388;
#pragma pack(push,8)
typedef struct tagTHREADNAME_INFO
{
DWORD dwType; // Must be 0x1000.
LPCSTR szName; // Pointer to name (in user addr space).
DWORD dwThreadID; // Thread ID (-1=caller thread).
DWORD dwFlags; // Reserved for future use, must be zero.
} THREADNAME_INFO;
#pragma pack(pop)
void
_PR_MD_SET_CURRENT_THREAD_NAME(const char *name)
{
THREADNAME_INFO info;
if (!IsDebuggerPresent())
return;
info.dwType = 0x1000;
info.szName = (char*) name;
info.dwThreadID = -1;
info.dwFlags = 0;
__try {
RaiseException(MS_VC_EXCEPTION,
0,
sizeof(info) / sizeof(ULONG_PTR),
(ULONG_PTR*)&info);
} __except(EXCEPTION_CONTINUE_EXECUTION) {
}
}
void
_PR_MD_CLEAN_THREAD(PRThread *thread)
{

5
nsprpub/pr/src/nspr.def
View File

@ -446,3 +446,8 @@ EXPORTS ;-
;+ global:
PR_GetVersion;
;+} NSPR_4.8;
;+NSPR_4.9.2 {
;+ global:
PR_GetThreadName;
PR_SetCurrentThreadName;
;+} NSPR_4.8.9;

73
nsprpub/pr/src/pthreads/ptthread.c
View File

@ -19,6 +19,7 @@
#include <unistd.h>
#include <string.h>
#include <signal.h>
#include <dlfcn.h>
#ifdef SYMBIAN
/* In Open C sched_get_priority_min/max do not work properly, so we undefine
@ -794,6 +795,8 @@ static void _pt_thread_death_internal(void *arg, PRBool callDestructors)
PR_Free(thred->privateData);
if (NULL != thred->errorString)
PR_Free(thred->errorString);
if (NULL != thred->name)
PR_Free(thred->name);
PR_Free(thred->stack);
if (NULL != thred->syspoll_list)
PR_Free(thred->syspoll_list);
@ -1612,6 +1615,76 @@ PR_IMPLEMENT(void*)PR_GetSP(PRThread *thred)
#endif /* !defined(_PR_DCETHREADS) */
PR_IMPLEMENT(PRStatus) PR_SetCurrentThreadName(const char *name)
{
PRThread *thread;
size_t nameLen;
int result;
if (!name) {
PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
return PR_FAILURE;
}
thread = PR_GetCurrentThread();
if (!thread)
return PR_FAILURE;
PR_Free(thread->name);
nameLen = strlen(name) + 1;
thread->name = (char *)PR_Malloc(nameLen);
if (!thread->name)
return PR_FAILURE;
memcpy(thread->name, name, nameLen);
#if defined(OPENBSD) || defined(FREEBSD)
result = pthread_set_name_np(thread->id, name);
#else /* not BSD */
/*
* On OSX, pthread_setname_np is only available in 10.6 or later, so test
* for it at runtime. It also may not be available on all linux distros.
* The name length limit is 16 bytes.
*/
#if defined(DARWIN)
int (*dynamic_pthread_setname_np)(const char*);
#else
int (*dynamic_pthread_setname_np)(pthread_t, const char*);
#endif
*(void**)(&dynamic_pthread_setname_np) =
dlsym(RTLD_DEFAULT, "pthread_setname_np");
if (!dynamic_pthread_setname_np)
return PR_SUCCESS;
#define SETNAME_LENGTH_CONSTRAINT 15
char name_dup[SETNAME_LENGTH_CONSTRAINT + 1];
if (nameLen > SETNAME_LENGTH_CONSTRAINT + 1) {
memcpy(name_dup, name, SETNAME_LENGTH_CONSTRAINT);
name_dup[SETNAME_LENGTH_CONSTRAINT] = '\0';
name = name_dup;
}
#if defined(DARWIN)
result = dynamic_pthread_setname_np(name);
#else
result = dynamic_pthread_setname_np(thread->id, name);
#endif
#endif /* not BSD */
if (result) {
PR_SetError(PR_UNKNOWN_ERROR, result);
return PR_FAILURE;
}
return PR_SUCCESS;
}
PR_IMPLEMENT(const char *) PR_GetThreadName(const PRThread *thread)
{
if (!thread)
return NULL;
return thread->name;
}
#endif /* defined(_PR_PTHREADS) || defined(_PR_DCETHREADS) */
/* ptthread.c */

32
nsprpub/pr/src/threads/combined/pruthr.c
View File

@ -237,6 +237,7 @@ static void _PR_InitializeRecycledThread(PRThread *thread)
PR_ASSERT(thread->dumpArg == 0 && thread->dump == 0);
PR_ASSERT(thread->errorString == 0 && thread->errorStringSize == 0);
PR_ASSERT(thread->errorStringLength == 0);
PR_ASSERT(thread->name == 0);
/* Reset data members in thread structure */
thread->errorCode = thread->osErrorCode = 0;
@ -1581,6 +1582,37 @@ PR_IMPLEMENT(void) PR_SetThreadPriority(PRThread *thread,
} else _PR_SetThreadPriority(thread, newPri);
}
PR_IMPLEMENT(PRStatus) PR_SetCurrentThreadName(const char *name)
{
PRThread *thread;
size_t nameLen;
if (!name) {
PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
return PR_FAILURE;
}
thread = PR_GetCurrentThread();
if (!thread)
return PR_FAILURE;
PR_Free(thread->name);
nameLen = strlen(name) + 1;
thread->name = (char *)PR_Malloc(nameLen);
if (!thread->name)
return PR_FAILURE;
memcpy(thread->name, name, nameLen);
_PR_MD_SET_CURRENT_THREAD_NAME(thread->name);
return PR_SUCCESS;
}
PR_IMPLEMENT(const char *) PR_GetThreadName(const PRThread *thread)
{
if (!thread)
return NULL;
return thread->name;
}
/*
** This routine prevents all other threads from running. This call is needed by

1
nsprpub/pr/src/threads/prcthr.c
View File

@ -35,6 +35,7 @@ void _PR_CleanupThread(PRThread *thread)
}
thread->dump = 0;
PR_DELETE(thread->name);
PR_DELETE(thread->errorString);
thread->errorStringSize = 0;
thread->errorStringLength = 0;

9
nsprpub/pr/tests/vercheck.c
View File

@ -20,9 +20,10 @@
#include <stdlib.h>
/*
* This release (4.9.1) is backward compatible with the
* This release (4.9.2) is backward compatible with the
* 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, 4.5.x, 4.6.x, 4.7.x,
* 4.8.x, and 4.9 releases. It, of course, is compatible with itself.
* 4.8.x, 4.9, and 4.9.1 releases. It, of course,
* is compatible with itself.
*/
static char *compatible_version[] = {
"4.0", "4.0.1", "4.1", "4.1.1", "4.1.2", "4.1.3",
@ -34,7 +35,7 @@ static char *compatible_version[] = {
"4.7.6",
"4.8", "4.8.1", "4.8.2", "4.8.3", "4.8.4", "4.8.5",
"4.8.6", "4.8.7", "4.8.8", "4.8.9",
"4.9", PR_VERSION
"4.9", "4.9.1", PR_VERSION
};
/*
@ -49,7 +50,7 @@ static char *incompatible_version[] = {
"3.0", "3.0.1",
"3.1", "3.1.1", "3.1.2", "3.1.3",
"3.5", "3.5.1",
"4.9.2",
"4.9.3",
"4.10", "4.10.1",
"10.0", "11.1", "12.14.20"
};