gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make non-blocking

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@16261 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2003-03-25 18:02:14 +00:00
parent ffcac98789
commit 36b41ee794
2 changed files with 43 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -3,6 +3,8 @@
* Source/NSURL.m: When loading a resource and attempting to notify
a client, check that the client responds to the selectors before
sending messages to it.
Make ([-loadResourceDataNotifyingClient:usingCache:]) work in
background (non-blocking).
2003-03-25 David Ayers <d.ayers@inode.at>

68
Source/NSURL.m
View file

@ -1125,8 +1125,6 @@ static void unescape(const char *from, char * to)
usingCache: (BOOL)shouldUseCache
{
NSURLHandle *handle = [self URLHandleUsingCache: shouldUseCache];
NSRunLoop *loop;
NSDate *future;
if (client != nil)
{
@ -1145,24 +1143,6 @@ static void unescape(const char *from, char * to)
* Kick off the load process.
*/
[handle loadInBackground];
/*
* Keep the runloop going until the load has completed (or failed).
*/
loop = [NSRunLoop currentRunLoop];
future = [NSDate distantFuture];
while ([handle status] == NSURLHandleLoadInProgress)
{
[loop runMode: NSDefaultRunLoopMode beforeDate: future];
}
if (client != nil)
{
[handle removeClient: self];
[clientsLock lock];
NSMapRemove((NSMapTable*)_clients, (void*)handle);
[clientsLock unlock];
}
}
/**
@ -1357,8 +1337,21 @@ static void unescape(const char *from, char * to)
if (shouldUseCache == NO || [handle status] != NSURLHandleLoadSucceeded)
{
NSRunLoop *loop;
NSDate *future;
[self loadResourceDataNotifyingClient: self
usingCache: shouldUseCache];
/*
* Keep the runloop going until the load has completed (or failed).
*/
loop = [NSRunLoop currentRunLoop];
future = [NSDate distantFuture];
while ([handle status] == NSURLHandleLoadInProgress)
{
[loop runMode: NSDefaultRunLoopMode beforeDate: future];
}
}
data = [handle resourceData];
return data;
@ -1527,10 +1520,18 @@ static void unescape(const char *from, char * to)
{
id c = clientForHandle(_clients, sender);
if ([c respondsToSelector: @selector(URL:resourceDidFailLoadingWithReason:)])
if (c != nil)
{
[c URL: self resourceDidFailLoadingWithReason: reason];
if ([c respondsToSelector:
@selector(URL:resourceDidFailLoadingWithReason:)])
{
[c URL: self resourceDidFailLoadingWithReason: reason];
}
[clientsLock lock];
NSMapRemove((NSMapTable*)_clients, (void*)sender);
[clientsLock unlock];
}
[sender removeClient: self];
}
- (void) URLHandleResourceDidBeginLoading: (NSURLHandle*)sender
@ -1541,23 +1542,36 @@ static void unescape(const char *from, char * to)
{
id c = clientForHandle(_clients, sender);
if ([c respondsToSelector: @selector(URLResourceDidCancelLoading:)])
if (c != nil)
{
[c URLResourceDidCancelLoading: self];
if ([c respondsToSelector: @selector(URLResourceDidCancelLoading:)])
{
[c URLResourceDidCancelLoading: self];
}
[clientsLock lock];
NSMapRemove((NSMapTable*)_clients, (void*)sender);
[clientsLock unlock];
}
[sender removeClient: self];
}
- (void) URLHandleResourceDidFinishLoading: (NSURLHandle*)sender
{
id c = clientForHandle(_clients, sender);
if ([c respondsToSelector: @selector(URLResourceDidFinishLoading:g:)])
if (c != nil)
{
[c URLResourceDidFinishLoading: self];
if ([c respondsToSelector: @selector(URLResourceDidFinishLoading:g:)])
{
[c URLResourceDidFinishLoading: self];
}
[clientsLock lock];
NSMapRemove((NSMapTable*)_clients, (void*)sender);
[clientsLock unlock];
}
[sender removeClient: self];
}
@end