Skip to content

arc and non-arc compatibility #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Coeur wants to merge 1 commit into
base: master
Choose a base branch
from
Open

arc and non-arc compatibility #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion VDKQueue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ extern NSString * VDKQueueAccessRevocationNotification;

@interface VDKQueue : NSObject
{
id<VDKQueueDelegate> _delegate;
BOOL _alwaysPostNotifications; // By default, notifications are posted only if there is no delegate set. Set this value to YES to have notes posted even when there is a delegate.

@private
Expand Down
68 changes: 44 additions & 24 deletions VDKQueue.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,30 @@
// distribution.

#import "VDKQueue.h"
#import <AppKit/AppKit.h>
#import <unistd.h>
#import <fcntl.h>
#include <sys/stat.h>

// ARC Helpers

#if ! __has_feature(objc_arc)
#define ARCCompatAutorelease(__obj__) [__obj__ autorelease];
#define ARCCompatRetain(__obj__) [__obj__ retain];
#define ARCCompatRelease(__obj__) [__obj__ release];
#define ARCCompatDealloc(__obj__) [__obj__ dealloc];
#define ARCCompatAutoreleaseInline(__obj__) [__obj__ autorelease]
#define ARCCompatRetainInline(__obj__) [__obj__ retain]
#define ARCCompatBridge(__type__, __obj__) __obj__
#else
#define ARCCompatAutorelease(__obj__)
#define ARCCompatRetain(__obj__)
#define ARCCompatRelease(__obj__)
#define ARCCompatDealloc(__obj__)
#define ARCCompatAutoreleaseInline(__obj__) __obj__
#define ARCCompatRetainInline(__obj__) __obj__
#define ARCCompatBridge(__type__, __obj__) (__bridge __type__)__obj__
#endif


NSString * VDKQueueRenameNotification = @"VDKQueueFileRenamedNotification";
Expand Down Expand Up @@ -70,7 +90,7 @@ - (id) initWithPath:(NSString*)inPath andSubscriptionFlags:(u_int)flags;
_watchedFD = open([_path fileSystemRepresentation], O_EVTONLY, 0);
if (_watchedFD < 0)
{
[self autorelease];
ARCCompatAutorelease(self)
return nil;
}
_subscriptionFlags = flags;
Expand All @@ -80,13 +100,13 @@ - (id) initWithPath:(NSString*)inPath andSubscriptionFlags:(u_int)flags;

-(void) dealloc
{
[_path release];
ARCCompatRelease(_path)
_path = nil;

if (_watchedFD >= 0) close(_watchedFD);
_watchedFD = -1;

[super dealloc];
ARCCompatDealloc(super)
}

@end
Expand Down Expand Up @@ -128,7 +148,7 @@ - (id) init
_coreQueueFD = kqueue();
if (_coreQueueFD == -1)
{
[self autorelease];
ARCCompatAutorelease(self)
return nil;
}

Expand All @@ -147,10 +167,10 @@ - (void) dealloc
// Do this to close all the open file descriptors for files we're watching
[self removeAllPaths];

[_watchedPathEntries release];
ARCCompatRelease(_watchedPathEntries)
_watchedPathEntries = nil;

[super dealloc];
ARCCompatDealloc(super)
}


Expand All @@ -172,7 +192,7 @@ - (VDKQueuePathEntry *) addPathToQueue:(NSString *)path notifyingAbout:(u_int)fl
// All flags already set?
if(([pathEntry subscriptionFlags] & flags) == flags)
{
return [[pathEntry retain] autorelease];
return ARCCompatAutoreleaseInline(ARCCompatRetainInline(pathEntry));
}

flags |= [pathEntry subscriptionFlags];
Expand All @@ -183,12 +203,12 @@ - (VDKQueuePathEntry *) addPathToQueue:(NSString *)path notifyingAbout:(u_int)fl

if (!pathEntry)
{
pathEntry = [[[VDKQueuePathEntry alloc] initWithPath:path andSubscriptionFlags:flags] autorelease];
pathEntry = ARCCompatAutoreleaseInline([[VDKQueuePathEntry alloc] initWithPath:path andSubscriptionFlags:flags]);
}

if (pathEntry)
{
EV_SET(&ev, [pathEntry watchedFD], EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR, flags, 0, pathEntry);
EV_SET(&ev, [pathEntry watchedFD], EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR, flags, 0, ARCCompatBridge(void*, pathEntry));

[pathEntry setSubscriptionFlags:flags];

Expand All @@ -203,7 +223,7 @@ - (VDKQueuePathEntry *) addPathToQueue:(NSString *)path notifyingAbout:(u_int)fl
}
}

return [[pathEntry retain] autorelease];
return ARCCompatAutoreleaseInline(ARCCompatRetainInline(pathEntry));
}

return nil;
Expand Down Expand Up @@ -250,10 +270,10 @@ - (void) watcherThread:(id)sender
// check here to try to eliminate this (infrequent) problem. In theory, a KEVENT that does not have a VDKQueuePathEntry
// object attached as the udata parameter is not an event we registered for, so we should not be "missing" any events. In theory.
//
id pe = ev.udata;
id pe = ARCCompatBridge(id, ev.udata);
if (pe && [pe respondsToSelector:@selector(path)])
{
NSString *fpath = [((VDKQueuePathEntry *)pe).path retain]; // Need to retain so it does not disappear while the block at the bottom is waiting to run on the main thread. Released in that block.
NSString *fpath = ARCCompatRetainInline(((VDKQueuePathEntry *)pe).path); // Need to retain so it does not disappear while the block at the bottom is waiting to run on the main thread. Released in that block.
if (!fpath) continue;

[[NSWorkspace sharedWorkspace] noteFileSystemChanged:fpath];
Expand Down Expand Up @@ -300,18 +320,18 @@ - (void) watcherThread:(id)sender
^{
for (NSString *note in notes)
{
[_delegate VDKQueue:self receivedNotification:note forPath:fpath];
[self->_delegate VDKQueue:self receivedNotification:note forPath:fpath];

if (!_delegate || _alwaysPostNotifications)
if (!self->_delegate || self->_alwaysPostNotifications)
{
NSDictionary *userInfoDict = [[NSDictionary alloc] initWithObjectsAndKeys:fpath, @"path", nil];
[[[NSWorkspace sharedWorkspace] notificationCenter] postNotificationName:note object:self userInfo:userInfoDict];
[userInfoDict release];
ARCCompatRelease(userInfoDict)
}
}

[fpath release];
[notes release];
ARCCompatRelease(fpath)
ARCCompatRelease(notes)
});
}
}
Expand All @@ -330,7 +350,7 @@ - (void) watcherThread:(id)sender
NSLog(@"VDKQueue watcherThread: Couldn't close main kqueue (%d)", errno);
}

[notesToPost release];
ARCCompatRelease(notesToPost)

#if DEBUG_LOG_THREAD_LIFETIME
NSLog(@"watcherThread finished.");
Expand All @@ -351,7 +371,7 @@ - (void) watcherThread:(id)sender
- (void) addPath:(NSString *)aPath
{
if (!aPath) return;
[aPath retain];
ARCCompatRetain(aPath)

@synchronized(self)
{
Expand All @@ -367,14 +387,14 @@ - (void) addPath:(NSString *)aPath
}
}

[aPath release];
ARCCompatRelease(aPath)
}


- (void) addPath:(NSString *)aPath notifyingAbout:(u_int)flags
{
if (!aPath) return;
[aPath retain];
ARCCompatRetain(aPath)

@synchronized(self)
{
Expand All @@ -390,14 +410,14 @@ - (void) addPath:(NSString *)aPath notifyingAbout:(u_int)flags
}
}

[aPath release];
ARCCompatRelease(aPath)
}


- (void) removePath:(NSString *)aPath
{
if (!aPath) return;
[aPath retain];
ARCCompatRetain(aPath)

@synchronized(self)
{
Expand All @@ -409,7 +429,7 @@ - (void) removePath:(NSString *)aPath
}
}

[aPath release];
ARCCompatRelease(aPath)
}


Expand Down