AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[search] Build in index generation in thread.

Browse source
This commit is contained in:
vng 2011-12-29 00:18:04 +03:00 • committed by Alex Zolotarev
parent 4446f0cc0e
commit 29a245c355
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
indexer/search_index_builder.cpp
View file

@ -119,6 +119,8 @@ void indexer::BuildSearchIndex(FeaturesVector const & featuresVector, Writer & w
bool indexer::BuildSearchIndexFromDatFile(string const & fName)
{
LOG(LINFO, ("Start building search index ..."));
try
{
Platform & pl = GetPlatform();
@ -157,5 +159,6 @@ bool indexer::BuildSearchIndexFromDatFile(string const & fName)
return false;
}
LOG(LINFO, ("End building search index."));
return true;
}

6
platform/platform_mac.mm
View file

@ -15,6 +15,9 @@
#include <sys/stat.h>
#include <sys/sysctl.h>
#include <dispatch/dispatch.h>
Platform::Platform()
{
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
@ -120,7 +123,8 @@ void Platform::RunAsync(TFunctor const & fn, Priority p)
int priority = DISPATCH_QUEUE_PRIORITY_DEFAULT;
switch (p)
{
case EPriorityBackground: priority = DISPATCH_QUEUE_PRIORITY_BACKGROUND; break;
// It seems like this option is not supported in Snow Leopard.
//case EPriorityBackground: priority = DISPATCH_QUEUE_PRIORITY_BACKGROUND; break;
case EPriorityDefault: priority = DISPATCH_QUEUE_PRIORITY_DEFAULT; break;
case EPriorityHigh: priority = DISPATCH_QUEUE_PRIORITY_HIGH; break;
case EPriorityLow: priority = DISPATCH_QUEUE_PRIORITY_LOW; break;

7
storage/storage.cpp
View file

@ -356,8 +356,9 @@ namespace storage
file = file.substr(i+1);
// Generate search index if it's supported in this build
if (GetPlatform().IsFeatureSupported("search"))
GetPlatform().RunAsync(bind(&Storage::GenerateSearchIndex, this, cref(file)));
Platform & pl = GetPlatform();
if (pl.IsFeatureSupported("search"))
pl.RunAsync(bind(&Storage::GenerateSearchIndex, this, file));
else // Or simply activate downloaded map
UpdateAfterSearchIndex(file);
}
@ -369,7 +370,7 @@ namespace storage
{
if (indexer::BuildSearchIndexFromDatFile(fName))
{
GetPlatform().RunOnGuiThread(bind(&Storage::UpdateAfterSearchIndex, this, cref(fName)));
GetPlatform().RunOnGuiThread(bind(&Storage::UpdateAfterSearchIndex, this, fName));
}
else
{