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

Bug 1339050 - Asynchronously apply safebrowsing DB update. r=francois,gcp

Browse Source 
A new function Classifier::AsyncApplyUpdates() is implemented for async update.
Besides, all public Classifier interfaces become "worker thread only" and
we remove DBServiceWorker::ApplyUpdatesBackground/Foreground.

In DBServiceWorker::FinishUpdate, instead of calling Classifier::ApplyUpdates,
we call Classifier::AsyncApplyUpdates and install a callback for notifying
the update observer when update is finished. The callback will occur on the
caller thread (i.e. worker thread.)

As for the shutdown issue, when the main thread is notified to shut down,
we at first *synchronously* dispatch an event to the worker thread to
shut down the update thread. After getting synchronized with all other
threads, we send last two events "CancelUpdate" and "CloseDb" to notify
dangling update (i.e. BeginUpdate is called but FinishUpdate isn't)
and do cleanup work.

MozReview-Commit-ID: DXZvA2eFKlc
This commit is contained in:
Henry Chang
2017-04-06 07:07:56 +08:00
parent 11d0639a0e
commit 4543c61a48
14 changed files with 461 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
toolkit/components/url-classifier/HashStore.cpp
View File

@@ -101,22 +101,6 @@ extern mozilla::LazyLogModule gUrlClassifierDbServiceLog;
#define LOG(args) MOZ_LOG(gUrlClassifierDbServiceLog, mozilla::LogLevel::Debug, args)
#define LOG_ENABLED() MOZ_LOG_TEST(gUrlClassifierDbServiceLog, mozilla::LogLevel::Debug)
// Either the return was successful or we call the Reset function (unless we
// hit an OOM). Used while reading in the store.
#define SUCCESS_OR_RESET(res) \
do { \
nsresult __rv = res; /* Don't evaluate |res| more than once */ \
if (__rv == NS_ERROR_OUT_OF_MEMORY) { \
NS_WARNING("SafeBrowsing OOM."); \
return __rv; \
} \
if (NS_FAILED(__rv)) { \
NS_WARNING("SafeBrowsing store corrupted or out of date."); \
Reset(); \
return __rv; \
} \
} while(0)
namespace mozilla {
namespace safebrowsing {
@@ -306,7 +290,7 @@ HashStore::Open()
UpdateHeader();
return NS_OK;
}
SUCCESS_OR_RESET(rv);
NS_ENSURE_SUCCESS(rv, rv);
int64_t fileSize;
rv = storeFile->GetFileSize(&fileSize);
@@ -320,10 +304,10 @@ HashStore::Open()
mInputStream = NS_BufferInputStream(origStream, mFileSize);
rv = ReadHeader();
SUCCESS_OR_RESET(rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = SanityCheck();
SUCCESS_OR_RESET(rv);
NS_ENSURE_SUCCESS(rv, rv);
return NS_OK;
}
@@ -512,13 +496,13 @@ nsresult
HashStore::PrepareForUpdate()
{
nsresult rv = CheckChecksum(mFileSize);
SUCCESS_OR_RESET(rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = ReadChunkNumbers();
SUCCESS_OR_RESET(rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = ReadHashes();
SUCCESS_OR_RESET(rv);
NS_ENSURE_SUCCESS(rv, rv);
return NS_OK;
}