mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

more experimenting with locking in the files table

This commit is contained in:
Mitchell Livingston 2011-08-01 22:27:21 +00:00
parent 61174b007e
commit 97cd1d9d05
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
macosx/FileOutlineController.m
View File

@ -31,6 +31,8 @@
#import "NSMutableArrayAdditions.h"
#import <Quartz/Quartz.h>
#import "utils.h"
#define ROW_SMALL_HEIGHT 18.0
typedef enum
@ -69,8 +71,8 @@ typedef enum
[fOutline setMenu: [self menu]];
#warning needed?
fLock = [[NSRecursiveLock alloc] init];
[fLock setName: @"File Table"];
[self setTorrent: nil];
}
@ -99,7 +101,8 @@ typedef enum
[fFilterText release];
fFilterText = nil;
[fLock lock];
while (![fLock tryLock])
tr_wait_msec(100);
[fOutline deselectAll: nil];
[fOutline reloadData];
@ -119,11 +122,12 @@ typedef enum
const BOOL onLion = [NSApp isOnLionOrBetter];
[fLock lock];
while (![fLock tryLock])
tr_wait_msec(100);
if (onLion)
{
[[NSAnimationContext currentContext] setCompletionHandler: ^{ [fLock unlock]; NSLog(@"called"); }];
[[NSAnimationContext currentContext] setCompletionHandler: ^{ [fLock unlock]; }];
[NSAnimationContext beginGrouping];
[fOutline beginUpdates];
@ -224,7 +228,8 @@ typedef enum
{
[fTorrent updateFileStat];
[fLock lock];
while (![fLock tryLock])
tr_wait_msec(100);
[fOutline reloadData];
@ -367,7 +372,8 @@ typedef enum
- (void) setCheck: (id) sender
{
[fLock lock];
while (![fLock tryLock])
tr_wait_msec(100);
NSInteger state = [sender tag] == FILE_UNCHECK_TAG ? NSOffState : NSOnState;
@ -384,7 +390,8 @@ typedef enum
- (void) setOnlySelectedCheck: (id) sender
{
[fLock lock];
while (![fLock tryLock])
tr_wait_msec(100);
NSIndexSet * indexSet = [fOutline selectedRowIndexes];
NSMutableIndexSet * itemIndexes = [NSMutableIndexSet indexSet];
@ -417,7 +424,8 @@ typedef enum
priority = TR_PRI_LOW;
}
[fLock lock];
while (![fLock tryLock])
tr_wait_msec(100);
NSIndexSet * indexSet = [fOutline selectedRowIndexes];
NSMutableIndexSet * itemIndexes = [NSMutableIndexSet indexSet];
@ -432,7 +440,8 @@ typedef enum
- (void) revealFile: (id) sender
{
[fLock lock];
while (![fLock tryLock])
tr_wait_msec(100);
NSIndexSet * indexes = [fOutline selectedRowIndexes];
if ([NSApp isOnSnowLeopardOrBetter])