corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 156633 replace PR_CurrentThread with PR_GetCurrentThread

Browse Source 
patch by riceman+bmo@mail.rit.edu r=morse,dougt,dveditz,timeless sr=dveditz
This commit is contained in:
timeless@mac.com
2002-09-03 14:51:05 +00:00
parent 2cdb75d804
commit a176bd1a37
13 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/libjar/nsJARChannel.cpp
View File

@@ -153,7 +153,7 @@ NS_IMETHODIMP
nsJARChannel::Cancel(nsresult status) nsJARChannel::Cancel(nsresult status)
{ {
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == PR_CurrentThread(), "wrong thread"); NS_ASSERTION(mInitiator == PR_GetCurrentThread(), "wrong thread");
#endif #endif
NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code"); NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code");
nsresult rv = NS_OK; nsresult rv = NS_OK;
@@ -171,7 +171,7 @@ NS_IMETHODIMP
nsJARChannel::Suspend() nsJARChannel::Suspend()
{ {
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == PR_CurrentThread(), "wrong thread"); NS_ASSERTION(mInitiator == PR_GetCurrentThread(), "wrong thread");
#endif #endif
nsresult rv = NS_OK; nsresult rv = NS_OK;
@@ -186,7 +186,7 @@ NS_IMETHODIMP
nsJARChannel::Resume() nsJARChannel::Resume()
{ {
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == PR_CurrentThread(), "wrong thread"); NS_ASSERTION(mInitiator == PR_GetCurrentThread(), "wrong thread");
#endif #endif
nsresult rv = NS_OK; nsresult rv = NS_OK;
@@ -264,7 +264,7 @@ nsJARChannel::AsyncOpen(nsIStreamListener* listener, nsISupports* ctxt)
nsresult rv; nsresult rv;
#ifdef DEBUG #ifdef DEBUG
mInitiator = PR_CurrentThread(); mInitiator = PR_GetCurrentThread();
#endif #endif
mUserContext = ctxt; mUserContext = ctxt;
@@ -577,7 +577,7 @@ nsJARChannel::OnStartRequest(nsIRequest* jarExtractionTransport,
nsISupports* context) nsISupports* context)
{ {
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == PR_CurrentThread(), "wrong thread"); NS_ASSERTION(mInitiator == PR_GetCurrentThread(), "wrong thread");
#endif #endif
return mUserListener->OnStartRequest(this, mUserContext); return mUserListener->OnStartRequest(this, mUserContext);
} }
@@ -588,7 +588,7 @@ nsJARChannel::OnStopRequest(nsIRequest* jarExtractionTransport, nsISupports* con
{ {
nsresult rv; nsresult rv;
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == PR_CurrentThread(), "wrong thread"); NS_ASSERTION(mInitiator == PR_GetCurrentThread(), "wrong thread");
#endif #endif
#ifdef PR_LOGGING #ifdef PR_LOGGING
if (PR_LOG_TEST(gJarProtocolLog, PR_LOG_DEBUG)) { if (PR_LOG_TEST(gJarProtocolLog, PR_LOG_DEBUG)) {
@@ -626,7 +626,7 @@ nsJARChannel::OnDataAvailable(nsIRequest* jarCacheTransport,
PRUint32 count) PRUint32 count)
{ {
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == PR_CurrentThread(), "wrong thread"); NS_ASSERTION(mInitiator == PR_GetCurrentThread(), "wrong thread");
#endif #endif
return mUserListener->OnDataAvailable(this, mUserContext, return mUserListener->OnDataAvailable(this, mUserContext,
inStr, sourceOffset, count); inStr, sourceOffset, count);

4
modules/plugin/samples/SanePlugin/nsSanePlugin.cpp
View File

@@ -109,7 +109,7 @@ nsSanePluginInstance::nsSanePluginInstance( void )
mOnScanCompleteScript = nsnull; mOnScanCompleteScript = nsnull;
mOnInitCompleteScript = nsnull; mOnInitCompleteScript = nsnull;
mScanThread = nsnull; mScanThread = nsnull;
mUIThread = PR_CurrentThread(); mUIThread = PR_GetCurrentThread();
mState = 0; // idle mState = 0; // idle
mSuccess = 1; // success mSuccess = 1; // success
@@ -682,7 +682,7 @@ nsSanePluginInstance::IsUIThread()
if (!mUIThread) if (!mUIThread)
return PR_FALSE; return PR_FALSE;
return (mUIThread == PR_CurrentThread()); return (mUIThread == PR_GetCurrentThread());
} }
// End of Plugin Instance API Methods. // End of Plugin Instance API Methods.

16
netwerk/protocol/file/src/nsFileChannel.cpp
View File

@@ -193,7 +193,7 @@ nsFileChannel::Cancel(nsresult status)
{ {
NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code"); NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code");
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == PR_CurrentThread(), NS_ASSERTION(mInitiator == PR_GetCurrentThread(),
"wrong thread calling this routine"); "wrong thread calling this routine");
#endif #endif
mStatus = status; mStatus = status;
@@ -206,7 +206,7 @@ NS_IMETHODIMP
nsFileChannel::Suspend() nsFileChannel::Suspend()
{ {
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == PR_CurrentThread(), NS_ASSERTION(mInitiator == PR_GetCurrentThread(),
"wrong thread calling this routine"); "wrong thread calling this routine");
#endif #endif
if (mCurrentRequest) if (mCurrentRequest)
@@ -218,7 +218,7 @@ NS_IMETHODIMP
nsFileChannel::Resume() nsFileChannel::Resume()
{ {
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == PR_CurrentThread(), NS_ASSERTION(mInitiator == PR_GetCurrentThread(),
"wrong thread calling this routine"); "wrong thread calling this routine");
#endif #endif
if (mCurrentRequest) if (mCurrentRequest)
@@ -323,9 +323,9 @@ nsFileChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt)
nsresult rv; nsresult rv;
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == nsnull || mInitiator == PR_CurrentThread(), NS_ASSERTION(mInitiator == nsnull || mInitiator == PR_GetCurrentThread(),
"wrong thread calling this routine"); "wrong thread calling this routine");
mInitiator = PR_CurrentThread(); mInitiator = PR_GetCurrentThread();
#endif #endif
if (mFileTransport) if (mFileTransport)
@@ -522,7 +522,7 @@ nsFileChannel::OnStartRequest(nsIRequest* request, nsISupports* context)
// unconditionally inherit the status of the file transport // unconditionally inherit the status of the file transport
request->GetStatus(&mStatus); request->GetStatus(&mStatus);
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == PR_CurrentThread(), NS_ASSERTION(mInitiator == PR_GetCurrentThread(),
"wrong thread calling this routine"); "wrong thread calling this routine");
#endif #endif
NS_ASSERTION(mRealListener, "No listener..."); NS_ASSERTION(mRealListener, "No listener...");
@@ -554,7 +554,7 @@ nsFileChannel::OnStopRequest(nsIRequest* request, nsISupports* context,
mStatus = aStatus; mStatus = aStatus;
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == PR_CurrentThread(), NS_ASSERTION(mInitiator == PR_GetCurrentThread(),
"wrong thread calling this routine"); "wrong thread calling this routine");
#endif #endif
@@ -583,7 +583,7 @@ nsFileChannel::OnDataAvailable(nsIRequest* request, nsISupports* context,
PRUint32 aLength) PRUint32 aLength)
{ {
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == PR_CurrentThread(), NS_ASSERTION(mInitiator == PR_GetCurrentThread(),
"wrong thread calling this routine"); "wrong thread calling this routine");
#endif #endif

14
netwerk/protocol/jar/src/nsJARChannel.cpp
View File

@@ -153,7 +153,7 @@ NS_IMETHODIMP
nsJARChannel::Cancel(nsresult status) nsJARChannel::Cancel(nsresult status)
{ {
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == PR_CurrentThread(), "wrong thread"); NS_ASSERTION(mInitiator == PR_GetCurrentThread(), "wrong thread");
#endif #endif
NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code"); NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code");
nsresult rv = NS_OK; nsresult rv = NS_OK;
@@ -171,7 +171,7 @@ NS_IMETHODIMP
nsJARChannel::Suspend() nsJARChannel::Suspend()
{ {
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == PR_CurrentThread(), "wrong thread"); NS_ASSERTION(mInitiator == PR_GetCurrentThread(), "wrong thread");
#endif #endif
nsresult rv = NS_OK; nsresult rv = NS_OK;
@@ -186,7 +186,7 @@ NS_IMETHODIMP
nsJARChannel::Resume() nsJARChannel::Resume()
{ {
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == PR_CurrentThread(), "wrong thread"); NS_ASSERTION(mInitiator == PR_GetCurrentThread(), "wrong thread");
#endif #endif
nsresult rv = NS_OK; nsresult rv = NS_OK;
@@ -264,7 +264,7 @@ nsJARChannel::AsyncOpen(nsIStreamListener* listener, nsISupports* ctxt)
nsresult rv; nsresult rv;
#ifdef DEBUG #ifdef DEBUG
mInitiator = PR_CurrentThread(); mInitiator = PR_GetCurrentThread();
#endif #endif
mUserContext = ctxt; mUserContext = ctxt;
@@ -577,7 +577,7 @@ nsJARChannel::OnStartRequest(nsIRequest* jarExtractionTransport,
nsISupports* context) nsISupports* context)
{ {
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == PR_CurrentThread(), "wrong thread"); NS_ASSERTION(mInitiator == PR_GetCurrentThread(), "wrong thread");
#endif #endif
return mUserListener->OnStartRequest(this, mUserContext); return mUserListener->OnStartRequest(this, mUserContext);
} }
@@ -588,7 +588,7 @@ nsJARChannel::OnStopRequest(nsIRequest* jarExtractionTransport, nsISupports* con
{ {
nsresult rv; nsresult rv;
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == PR_CurrentThread(), "wrong thread"); NS_ASSERTION(mInitiator == PR_GetCurrentThread(), "wrong thread");
#endif #endif
#ifdef PR_LOGGING #ifdef PR_LOGGING
if (PR_LOG_TEST(gJarProtocolLog, PR_LOG_DEBUG)) { if (PR_LOG_TEST(gJarProtocolLog, PR_LOG_DEBUG)) {
@@ -626,7 +626,7 @@ nsJARChannel::OnDataAvailable(nsIRequest* jarCacheTransport,
PRUint32 count) PRUint32 count)
{ {
#ifdef DEBUG #ifdef DEBUG
NS_ASSERTION(mInitiator == PR_CurrentThread(), "wrong thread"); NS_ASSERTION(mInitiator == PR_GetCurrentThread(), "wrong thread");
#endif #endif
return mUserListener->OnDataAvailable(this, mUserContext, return mUserListener->OnDataAvailable(this, mUserContext,
inStr, sourceOffset, count); inStr, sourceOffset, count);

2
netwerk/test/TestCacheMgr.cpp
View File

@@ -260,7 +260,7 @@ InitQueue() {
do_GetService(kEventQueueServiceCID, &rv); do_GetService(kEventQueueServiceCID, &rv);
NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service"); NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service");
rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), &eventQueue); rv = eventQService->GetThreadEventQueue(PR_GetCurrentThread(), &eventQueue);
NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue for main thread"); NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue for main thread");
return NS_OK; return NS_OK;

2
netwerk/test/TestRawCache.cpp
View File

@@ -268,7 +268,7 @@ InitQueue() {
do_GetService(kEventQueueServiceCID, &rv); do_GetService(kEventQueueServiceCID, &rv);
NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service"); NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service");
rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), &eventQueue); rv = eventQService->GetThreadEventQueue(PR_GetCurrentThread(), &eventQueue);
NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue for main thread"); NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue for main thread");
return NS_OK; return NS_OK;

2
webshell/tests/viewer/nsPhMain.cpp
View File

@@ -151,7 +151,7 @@ void abnormal_exit_handler(int signum)
|| (signum == SIGABRT) || (signum == SIGABRT)
) )
{ {
PR_CurrentThread(); PR_GetCurrentThread();
printf("prog = viewer\npid = %d\nsignal = %s\n", getpid(), strsignal(signum)); printf("prog = viewer\npid = %d\nsignal = %s\n", getpid(), strsignal(signum));
#if 0 #if 0

2
webshell/tests/viewer/unix/gtk/nsGtkMain.cpp
View File

@@ -146,7 +146,7 @@ static char _progname[1024] = "huh?";
void void
ah_crap_handler(int signum) ah_crap_handler(int signum)
{ {
PR_CurrentThread(); PR_GetCurrentThread();
printf("prog = %s\npid = %d\nsignal = %s\n", printf("prog = %s\npid = %d\nsignal = %s\n",
_progname, _progname,

2
webshell/tests/viewer/unix/gtk2/nsGtkMain.cpp
View File

@@ -144,7 +144,7 @@ static char _progname[1024] = "huh?";
void void
ah_crap_handler(int signum) ah_crap_handler(int signum)
{ {
PR_CurrentThread(); PR_GetCurrentThread();
printf("prog = %s\npid = %d\nsignal = %s\n", printf("prog = %s\npid = %d\nsignal = %s\n",
_progname, _progname,

4
xpcom/glue/nsDebug.cpp
View File

@@ -489,7 +489,7 @@ NS_ErrorAccordingToNSPR()
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// This wrapper around PR_CurrentThread is simply here for debug builds so // This wrapper around PR_GetCurrentThread is simply here for debug builds so
// that clients linking with xpcom don't also have to link with nspr explicitly. // that clients linking with xpcom don't also have to link with nspr explicitly.
#if defined(NS_DEBUG) && defined(NS_MT_SUPPORTED) #if defined(NS_DEBUG) && defined(NS_MT_SUPPORTED)
@@ -503,7 +503,7 @@ extern "C" NS_COM void NS_CheckThreadSafe(void* owningThread, const char* msg);
void* void*
NS_CurrentThread(void) NS_CurrentThread(void)
{ {
void* th = PR_CurrentThread(); void* th = PR_GetCurrentThread();
return th; return th;
} }

8
xpcom/threads/nsThread.cpp
View File

@@ -275,14 +275,14 @@ nsThread::Init(nsIRunnable* runnable,
NS_IMETHODIMP NS_IMETHODIMP
nsThread::GetCurrentThread(nsIThread * *aCurrentThread) nsThread::GetCurrentThread(nsIThread * *aCurrentThread)
{ {
return GetIThread(PR_CurrentThread(), aCurrentThread); return GetIThread(PR_GetCurrentThread(), aCurrentThread);
} }
/* void sleep (in PRUint32 msec); */ /* void sleep (in PRUint32 msec); */
NS_IMETHODIMP NS_IMETHODIMP
nsThread::Sleep(PRUint32 msec) nsThread::Sleep(PRUint32 msec)
{ {
if (PR_CurrentThread() != mThread) if (PR_GetCurrentThread() != mThread)
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
if (PR_Sleep(PR_MillisecondsToInterval(msec)) != PR_SUCCESS) if (PR_Sleep(PR_MillisecondsToInterval(msec)) != PR_SUCCESS)
@@ -361,7 +361,7 @@ nsThread::WaitUntilReadyToStartMain()
NS_COM nsresult NS_COM nsresult
nsIThread::GetCurrent(nsIThread* *result) nsIThread::GetCurrent(nsIThread* *result)
{ {
return GetIThread(PR_CurrentThread(), result); return GetIThread(PR_GetCurrentThread(), result);
} }
NS_COM nsresult NS_COM nsresult
@@ -424,7 +424,7 @@ nsIThread::IsMainThread()
PRThread *theMainThread; PRThread *theMainThread;
gMainThread->GetPRThread(&theMainThread); gMainThread->GetPRThread(&theMainThread);
return theMainThread == PR_CurrentThread(); return theMainThread == PR_GetCurrentThread();
} }
void void

4
xpcom/threads/plevent.c
View File

@@ -346,7 +346,7 @@ PL_PostSynchronousEvent(PLEventQueue* self, PLEvent* event)
PR_ASSERT(event != NULL); PR_ASSERT(event != NULL);
PR_Lock(event->lock); PR_Lock(event->lock);
if (PR_CurrentThread() == self->handlerThread) { if (PR_GetCurrentThread() == self->handlerThread) {
/* Handle the case where the thread requesting the event handling /* Handle the case where the thread requesting the event handling
is also the thread that's supposed to do the handling. */ is also the thread that's supposed to do the handling. */
result = event->handler(event); result = event->handler(event);
@@ -693,7 +693,7 @@ PL_DequeueEvent(PLEvent* self, PLEventQueue* queue)
client has put it in the queue, they have no idea whether it's client has put it in the queue, they have no idea whether it's
been processed and destroyed or not. */ been processed and destroyed or not. */
PR_ASSERT(queue->handlerThread == PR_CurrentThread()); PR_ASSERT(queue->handlerThread == PR_GetCurrentThread());
PR_EnterMonitor(queue->monitor); PR_EnterMonitor(queue->monitor);

4
xpfe/bootstrap/nsSigHandlers.cpp
View File

@@ -94,7 +94,7 @@ void abnormal_exit_handler(int signum)
|| (signum == SIGABRT) || (signum == SIGABRT)
) )
{ {
PR_CurrentThread(); PR_GetCurrentThread();
printf("prog = %s\npid = %d\nsignal = %s\n", printf("prog = %s\npid = %d\nsignal = %s\n",
_progname, getpid(), strsignal(signum)); _progname, getpid(), strsignal(signum));
@@ -118,7 +118,7 @@ void abnormal_exit_handler(int signum)
void void
ah_crap_handler(int signum) ah_crap_handler(int signum)
{ {
PR_CurrentThread(); PR_GetCurrentThread();
// I don't think strsignal is portable. If it is, this can be changed. // I don't think strsignal is portable. If it is, this can be changed.
#ifdef LINUX #ifdef LINUX