amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-06 04:20:33 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 2fdf0ead0781ef2362dd389811d5db44ca4cc84a

Browse Source 
Monotone-Revision: c91eef7edcfd08d414664c25a590b6268a7e58e2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-11-29T04:19:32
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-11-29 04:19:32 +00:00
parent 3821d1aa7f
commit b79a7e5a00
129 changed files with 4402 additions and 3316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SOPE/GDLContentStore/GCSChannelManager.m
-40
View File
@@ -46,11 +46,6 @@
(eg missing release due to an exception)
*/
#if defined(THREADSAFE)
static NSLock *channelLock;
static NSLock *adaptorLock;
#endif
@interface GCSChannelHandle : NSObject
{
@public
@@ -89,11 +84,6 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
[[ud objectForKey: @"GCSChannelCollectionTimer"] intValue];
if (ChannelCollectionTimer < 1)
ChannelCollectionTimer = 5*60;
#if defined(THREADSAFE)
channelLock = [NSLock new];
adaptorLock = [NSLock new];
#endif
}
+ (NSString *) adaptorNameForURLScheme: (NSString *) _scheme
@@ -106,14 +96,8 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
{
static GCSChannelManager *cm = nil;
#if defined(THREADSAFE)
[channelLock lock];
#endif
if (!cm)
cm = [self new];
#if defined(THREADSAFE)
[channelLock unlock];
#endif
return cm;
}
@@ -202,9 +186,6 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
{
if ((key = [self databaseKeyForURL: _url]))
{
#if defined(THREADSAFE)
[adaptorLock lock];
#endif
adaptor = [urlToAdaptor objectForKey: key];
if (adaptor)
[self debugWithFormat: @"using cached adaptor: %@", adaptor];
@@ -236,9 +217,6 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
[urlToAdaptor setObject: adaptor forKey: key];
}
#if defined(THREADSAFE)
[adaptorLock unlock];
#endif
}
}
@@ -319,9 +297,6 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
/* look for cached handles */
#if defined(THREADSAFE)
[channelLock lock];
#endif
handle = [self findAvailChannelHandleForURL: _url];
if (handle)
{
@@ -369,9 +344,6 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
}
}
}
#if defined(THREADSAFE)
[channelLock unlock];
#endif
return channel;
}
@@ -387,9 +359,6 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
GCSChannelHandle *handle;
BOOL keepOpen;
#if defined(THREADSAFE)
[channelLock lock];
#endif
handle = [self findBusyChannelHandleForChannel: _channel];
if (handle)
{
@@ -430,9 +399,6 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
[_channel release];
}
#if defined(THREADSAFE)
[channelLock unlock];
#endif
}
/* checking for tables */
@@ -481,9 +447,6 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
unsigned i, count;
GCSChannelHandle *handle;
#if defined(THREADSAFE)
[channelLock lock];
#endif
count = [availableChannels count];
if (count)
{
@@ -518,9 +481,6 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
[handlesToRemove release];
}
#if defined(THREADSAFE)
[channelLock unlock];
#endif
}
/* debugging */