Fix channel in GUI

Use dispatch source instead of CFSocket with Runloop because it can't read socket in time at closing.

Author: splhack

src/MacVim/MMBackend.h

@@ -155,9 +155,6 @@ extern NSTimeInterval MMBalloonEvalInternalDelay;
 - (BOOL)imState;
 - (void)setImState:(BOOL)activated;
 
-- (void *)addChannel:(channel_T *)channel part:(int)part;
-- (void)removeChannel:(void *)cookie;
-
 #ifdef FEAT_BEVAL
 - (void)setLastToolTip:(NSString *)toolTip;
 #endif

src/MacVim/MMBackend.m

@@ -163,18 +163,6 @@ - (NSComparisonResult)serverNameCompare:(NSString *)string;
 @end
 
 
-@interface MMChannel : NSObject {
-    channel_T           *channel;
-    int                 part;
-    CFSocketRef         socket;
-    CFRunLoopSourceRef  runLoopSource;
-}
-
-- (id)initWithChannel:(channel_T *)c part:(int)p;
-- (void)read;
-@end
-
-
 @interface MMBackend (Private)
 - (void)clearDrawData;
 - (void)didChangeWholeLine;
@@ -1685,19 +1673,6 @@ - (void)setImState:(BOOL)activated
     [self flushQueue:YES];
 }
 
-- (void *)addChannel:(channel_T *)channel part:(int)part
-{
-    MMChannel *mmChannel =
-        [[MMChannel alloc] initWithChannel:channel part:part];
-    return (void *)mmChannel;
-}
-
-- (void)removeChannel:(void *)cookie
-{
-    MMChannel *mmChannel = (MMChannel *)cookie;
-    [mmChannel release];
-}
-
 #ifdef FEAT_BEVAL
 - (void)setLastToolTip:(NSString *)toolTip
 {
@@ -3409,68 +3384,3 @@ - (char_u *)vimStringSave
 }
 
 @end // NSString (VimStrings)
-
-
-
-@implementation MMChannel
-
-- (void)dealloc
-{
-    CFSocketInvalidate(socket);
-    CFRunLoopSourceInvalidate(runLoopSource);
-    CFRelease(runLoopSource);
-    CFRelease(socket);
-    [super dealloc];
-}
-
-static void socketReadCallback(CFSocketRef s,
-                               CFSocketCallBackType callbackType,
-                               CFDataRef address,
-                               const void *data,
-                               void *info)
-{
-    MMChannel *mmChannel = (MMChannel *)info;
-    [mmChannel read];
-}
-
-- (id)initWithChannel:(channel_T *)c part:(int)p
-{
-    self = [super init];
-    if (!self) return nil;
-
-    channel = c;
-    part = p;
-
-    // Tell CFRunLoop that we are interested in channel socket input.
-    CFSocketContext ctx = {0, (void *)self, NULL, NULL, NULL};
-    socket = CFSocketCreateWithNative(kCFAllocatorDefault,
-                                      channel->ch_part[part].ch_fd,
-                                      kCFSocketReadCallBack,
-                                      &socketReadCallback,
-                                      &ctx);
-    CFOptionFlags opt = CFSocketGetSocketFlags(socket);
-    opt &= ~(kCFSocketCloseOnInvalidate|kCFSocketLeaveErrors);
-    CFSocketSetSocketFlags(socket, opt);
-    runLoopSource = CFSocketCreateRunLoopSource(NULL,
-                                                socket,
-                                                0);
-    CFRunLoopAddSource(CFRunLoopGetCurrent(),
-                       runLoopSource,
-                       kCFRunLoopCommonModes);
-
-    return self;
-}
-
-- (void)read
-{
-    int fd = channel->ch_part[part].ch_fd;
-    fd_set fds;
-    FD_ZERO(&fds);
-    FD_SET(fd, &fds);
-    struct timeval t;
-    memset(&t, 0, sizeof(t));
-    if (select(FD_SETSIZE, &fds, NULL, NULL, &t) > 0)
-        channel_read(channel, part, "MMChannel_read");
-}
-
-@end

src/MacVim/gui_macvim.m

@@ -2260,13 +2260,24 @@ static int vimModMaskToEventModifierFlags(int mods)
     void *
 gui_macvim_add_channel(channel_T *channel, int part)
 {
-    return [[MMBackend sharedInstance] addChannel:channel part:part];
+    dispatch_source_t s =
+        dispatch_source_create(DISPATCH_SOURCE_TYPE_READ,
+                               channel->ch_part[part].ch_fd,
+                               0,
+                               dispatch_get_main_queue());
+    dispatch_source_set_event_handler(s, ^{
+        channel_read(channel, part, "gui_macvim_add_channel");
+    });
+    dispatch_resume(s);
+    return s;
 }
 
     void
 gui_macvim_remove_channel(void *cookie)
 {
-    [[MMBackend sharedInstance] removeChannel:cookie];
+    dispatch_source_t s = (dispatch_source_t)cookie;
+    dispatch_source_cancel(s);
+    dispatch_release(s);
 }