Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Additional Fix for bug 99515 - nsAutoConfig event loop hanging. r=danm and sr=alecf

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@103859 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mitesh%netscape.com 2001-09-26 20:28:45 +00:00
parent 3af4e8c8ed
commit c4935abc36
1 changed files with 29 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
mozilla/modules/libpref/src/nsAutoConfig.cpp
View File

@ -299,52 +299,48 @@ nsresult nsAutoConfig::downloadAutoConfig()
} }
} }
// Getting an event queue. If we start an AsyncOpen, the thread
// needs to wait before the reading of autoconfig is done
nsCOMPtr<nsIEventQueue> currentThreadQ;
nsCOMPtr<nsIEventQueueService> service;
// We are having the event queue processing only for the startup
// It is not needed with the repeating timer.
if (firstTime) {
service = do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv);
if (NS_FAILED(rv))
return rv;
rv = service->PushThreadEventQueue(getter_AddRefs(currentThreadQ));
if (NS_FAILED(rv))
return rv;
}
// create a new url // create a new url
nsCOMPtr<nsIURI> url; nsCOMPtr<nsIURI> url;
nsCOMPtr<nsIChannel> channel; nsCOMPtr<nsIChannel> channel;
rv = NS_NewURI(getter_AddRefs(url), mConfigURL, nsnull, nsnull); rv = NS_NewURI(getter_AddRefs(url), mConfigURL, nsnull, nsnull);
if (NS_FAILED(rv)) { if (NS_FAILED(rv))
service->PopThreadEventQueue(currentThreadQ);
return rv; return rv;
}
// open a channel for the url // open a channel for the url
rv = NS_OpenURI(getter_AddRefs(channel),url, nsnull, nsnull, nsnull, nsIRequest::INHIBIT_PERSISTENT_CACHING | nsIRequest::LOAD_BYPASS_CACHE); rv = NS_OpenURI(getter_AddRefs(channel),url, nsnull, nsnull, nsnull, nsIRequest::INHIBIT_PERSISTENT_CACHING | nsIRequest::LOAD_BYPASS_CACHE);
if (NS_FAILED(rv)) { if (NS_FAILED(rv))
service->PopThreadEventQueue(currentThreadQ);
return rv; return rv;
}
rv = channel->AsyncOpen(this, nsnull); rv = channel->AsyncOpen(this, nsnull);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
service->PopThreadEventQueue(currentThreadQ);
readOfflineFile(); readOfflineFile();
return rv; return rv;
} }
// Set a repeating timer if the pref is set. // Set a repeating timer if the pref is set.
// This is to be done only once. // This is to be done only once.
// Also We are having the event queue processing only for the startup
// It is not needed with the repeating timer.
if (firstTime) { if (firstTime) {
firstTime = PR_FALSE; firstTime = PR_FALSE;
// Getting an event queue. If we start an AsyncOpen, the thread
// needs to wait before the reading of autoconfig is done
nsCOMPtr<nsIEventQueueService> service =
do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv);
if (NS_FAILED(rv))
return rv;
nsCOMPtr<nsIEventQueue> currentThreadQ;
rv = service->GetThreadEventQueue(NS_CURRENT_THREAD,
getter_AddRefs(currentThreadQ));
if (NS_FAILED(rv))
return rv;
/* process events until we're finished. AutoConfig.jsc reading needs /* process events until we're finished. AutoConfig.jsc reading needs
to be finished before the browser starts loading up to be finished before the browser starts loading up
We are waiting for the mLoaded which will be set through We are waiting for the mLoaded which will be set through
@ -353,27 +349,19 @@ nsresult nsAutoConfig::downloadAutoConfig()
that mLoaded will be set to true in any case (success/failure) that mLoaded will be set to true in any case (success/failure)
*/ */
PLEvent *event;
while (!mLoaded) { while (!mLoaded) {
rv = currentThreadQ->WaitForEvent(&event);
NS_ASSERTION(NS_SUCCEEDED(rv),"-->nsAutoConfig::downloadAutoConfig: currentThreadQ->WaitForEvent failed..."); PRBool isEventPending;
if (NS_FAILED(rv)) { rv = currentThreadQ->PendingEvents(&isEventPending);
service->PopThreadEventQueue(currentThreadQ); if (NS_FAILED(rv))
return rv; return rv;
} if (isEventPending) {
rv = currentThreadQ->HandleEvent(event); rv = currentThreadQ->ProcessPendingEvents();
NS_ASSERTION(NS_SUCCEEDED(rv), "-->nsAutoConfig::downloadAutoConfig: currentThreadQ->HandleEvent failed..."); if (NS_FAILED(rv))
if (NS_FAILED(rv)) { return rv;
service->PopThreadEventQueue(currentThreadQ);
return rv;
} }
} }
// Removing the eventQueue from the list
rv = service->PopThreadEventQueue(currentThreadQ);
if (NS_FAILED(rv))
return rv;
PRInt32 minutes = 0; PRInt32 minutes = 0;
rv = mPrefBranch->GetIntPref("autoadmin.refresh_interval", rv = mPrefBranch->GetIntPref("autoadmin.refresh_interval",
&minutes); &minutes);