adium/adium

Don't flush inside this lock. The lock is acquired on the main thread to cancel a search, and flushing can take a looong time.

2012-02-11, Thijs Alkemade
e30c939bb5dc
Parents bb8f087a0860
Children bd6e7eab2b08963f93d5e2c6
Don't flush inside this lock. The lock is acquired on the main thread to cancel a search, and flushing can take a looong time.
1 files changed, 4 insertions(+), 3 deletions(-)
  • +4 -3
    Source/AILogViewerWindowController.m
    • --- a/Source/AILogViewerWindowController.m Sat Feb 11 00:48:52 2012 +0100
    +++ b/Source/AILogViewerWindowController.m Sat Feb 11 00:51:32 2012 +0100
    @@ -1575,15 +1575,16 @@
    [wildcardedSearchString appendFormat:@"%@ ", searchComponent];
    }
    - AILogWithSignature(@"Calling flush");
    - SKIndexFlush(logSearchIndex);
    - AILogWithSignature(@"Done flushing. Now we can search.");
    thisSearch = SKSearchCreate(logSearchIndex,
    (CFStringRef)wildcardedSearchString,
    kSKSearchOptionDefault);
    currentSearch = (thisSearch ? (SKSearchRef)CFRetain(thisSearch) : NULL);
    [currentSearchLock unlock];
    + AILogWithSignature(@"Calling flush");
    + SKIndexFlush(logSearchIndex);
    + AILogWithSignature(@"Done flushing. Now we can search.");
    +
    //Retrieve matches as long as more are pending
    while (more && currentSearch) {
    #define BATCH_NUMBER 100