vim: src/channel.c comparison

comparison src/channel.c @ 8493:caed4b2d305f v7.4.1537

commit https://github.com/vim/vim/commit/509ce2a558e7e0c03242e32e844255af52f1c821 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Mar 11 22:52:15 2016 +0100 patch 7.4.1537 Problem: Too many feature flags for pipes, jobs and channels. Solution: Only use FEAT_JOB_CHANNEL.

author	Christian Brabandt <cb@256bit.org>
date	Fri, 11 Mar 2016 23:00:06 +0100
parents	daebcbd87bd3
children	42277980a76d

comparison

equal deleted inserted replaced

-:a2a51c928924
+:caed4b2d305f
 * Implements communication through a socket or any file handle.
 */
 #include "vim.h"
-#if defined(FEAT_CHANNEL) || defined(PROTO)
+#if defined(FEAT_JOB_CHANNEL) || defined(PROTO)
 /* TRUE when netbeans is running with a GUI. */
 #ifdef FEAT_GUI
 # define CH_HAS_GUI (gui.in_use || gui.starting)
 #endif
 	return NULL;
 channel->ch_id = next_ch_id++;
 ch_log(channel, "Created channel");
-#ifdef CHANNEL_PIPES
 for (part = PART_SOCK; part <= PART_IN; ++part)
-#else
-part = PART_SOCK;
-#endif
 {
 	channel->ch_part[part].ch_fd = INVALID_FD;
 #ifdef FEAT_GUI_X11
 	channel->ch_part[part].ch_inputHandler = (XtInputId)NULL;
 #endif
 */
 static int
 channel_still_useful(channel_T *channel)
 {
 int has_sock_msg;
-#ifdef CHANNEL_PIPES
 int	has_out_msg;
 int	has_err_msg;
-#endif
 /* If the job was killed the channel is not expected to work anymore. */
 if (channel->ch_job_killed && channel->ch_job == NULL)
 	return FALSE;
 /* If there is no callback then nobody can get readahead.  If the fd is
 * closed and there is no readahead then the callback won't be called. */
 has_sock_msg = channel->ch_part[PART_SOCK].ch_fd != INVALID_FD
 	          || channel->ch_part[PART_SOCK].ch_head.rq_next != NULL
 		  || channel->ch_part[PART_SOCK].ch_json_head.jq_next != NULL;
-#ifdef CHANNEL_PIPES
 has_out_msg = channel->ch_part[PART_OUT].ch_fd != INVALID_FD
 		  || channel->ch_part[PART_OUT].ch_head.rq_next != NULL
 		  || channel->ch_part[PART_OUT].ch_json_head.jq_next != NULL;
 has_err_msg = channel->ch_part[PART_ERR].ch_fd != INVALID_FD
 		  || channel->ch_part[PART_ERR].ch_head.rq_next != NULL
 		  || channel->ch_part[PART_ERR].ch_json_head.jq_next != NULL;
-#endif
 return (channel->ch_callback != NULL && (has_sock_msg
-#ifdef CHANNEL_PIPES
+		|| has_out_msg || has_err_msg))
-		|| has_out_msg || has_err_msg
-#endif
-		))
-#ifdef CHANNEL_PIPES
 	    || (channel->ch_part[PART_OUT].ch_callback != NULL && has_out_msg)
-	    || (channel->ch_part[PART_ERR].ch_callback != NULL && has_err_msg)
+	    || (channel->ch_part[PART_ERR].ch_callback != NULL && has_err_msg);
-#endif
-	    ;
 }
 /*
 * Close a channel and free all its resources if there is no further action
 * possible, there is no callback to be invoked or the associated job was
 static void
 channel_gui_register(channel_T *channel)
 {
 if (channel->CH_SOCK_FD != INVALID_FD)
 	channel_gui_register_one(channel, PART_SOCK);
-# ifdef CHANNEL_PIPES
 if (channel->CH_OUT_FD != INVALID_FD)
 	channel_gui_register_one(channel, PART_OUT);
 if (channel->CH_ERR_FD != INVALID_FD)
 	channel_gui_register_one(channel, PART_ERR);
-# endif
 }
 /*
 * Register any of our file descriptors with the GUI event handling system.
 * Called when the GUI has started.
 static void
 channel_gui_unregister(channel_T *channel)
 {
 int	    part;
-#ifdef CHANNEL_PIPES
 for (part = PART_SOCK; part < PART_IN; ++part)
-#else
-part = PART_SOCK;
-#endif
-{
 	channel_gui_unregister_one(channel, part);
-}
 }
 #endif
 static char *e_cannot_connect = N_("E902: Cannot connect to port");
 #endif
 return channel;
 }
-#if defined(CHANNEL_PIPES) || defined(PROTO)
 static void
 may_close_part(sock_T *fd)
 {
 if (*fd != INVALID_FD)
 {
 # if defined(FEAT_GUI)
 	channel_gui_register_one(channel, PART_ERR);
 # endif
 }
 }
-#endif
 /*
 * Sets the job the channel is associated with and associated options.
 * This does not keep a refcount, when the job is freed ch_job is cleared.
 */
 */
 int
 channel_can_write_to(channel_T *channel)
 {
 return channel != NULL && (channel->CH_SOCK_FD != INVALID_FD
-#ifdef CHANNEL_PIPES
+			  || channel->CH_IN_FD != INVALID_FD);
-			  || channel->CH_IN_FD != INVALID_FD
-#endif
-			  );
 }
 /*
 * Return TRUE when channel "channel" is open for reading or writing.
 * Also returns FALSE for invalid "channel".
 */
 int
 channel_is_open(channel_T *channel)
 {
 return channel != NULL && (channel->CH_SOCK_FD != INVALID_FD
-#ifdef CHANNEL_PIPES
 			  || channel->CH_IN_FD != INVALID_FD
 			  || channel->CH_OUT_FD != INVALID_FD
-			  || channel->CH_ERR_FD != INVALID_FD
+			  || channel->CH_ERR_FD != INVALID_FD);
-#endif
-			  );
 }
 /*
 * Return a string indicating the status of the channel.
 */
 if (channel->CH_SOCK_FD != INVALID_FD)
 {
 	sock_close(channel->CH_SOCK_FD);
 	channel->CH_SOCK_FD = INVALID_FD;
 }
-#if defined(CHANNEL_PIPES)
 may_close_part(&channel->CH_IN_FD);
 may_close_part(&channel->CH_OUT_FD);
 may_close_part(&channel->CH_ERR_FD);
-#endif
 if (invoke_close_cb && channel->ch_close_cb != NULL)
 {
 	  typval_T	argv[1];
 	  typval_T	rettv;
 void
 channel_clear(channel_T *channel)
 {
 ch_log(channel, "Clearing channel");
 channel_clear_one(channel, PART_SOCK);
-#ifdef CHANNEL_PIPES
 channel_clear_one(channel, PART_OUT);
 channel_clear_one(channel, PART_ERR);
-#endif
 vim_free(channel->ch_callback);
 channel->ch_callback = NULL;
 vim_free(channel->ch_close_cb);
 channel->ch_close_cb = NULL;
 }
 if (fd != INVALID_FD)
 	for (channel = first_channel; channel != NULL;
 						   channel = channel->ch_next)
 	{
-#  ifdef CHANNEL_PIPES
 	    for (part = PART_SOCK; part < PART_IN; ++part)
-#  else
-	    part = PART_SOCK;
-#  endif
 		if (channel->ch_part[part].ch_fd == fd)
 		{
 		    *partp = part;
 		    return channel;
 		}
 int		part;
 sock_T	fd;
 for (channel = first_channel; channel != NULL; channel = channel->ch_next)
 {
-#  ifdef CHANNEL_PIPES
 	/* check the socket and pipes */
 	for (part = PART_SOCK; part <= PART_ERR; ++part)
-#  else
-	/* only check the socket */
-	part = PART_SOCK;
-#  endif
 	{
 	    fd = channel->ch_part[part].ch_fd;
 	    if (fd != INVALID_FD && channel_wait(channel, fd, 0) == OK)
 		channel_read(channel, part, "channel_handle_events");
 	}
 struct	pollfd *fds = fds_in;
 int		part;
 for (channel = first_channel; channel != NULL; channel = channel->ch_next)
 {
-#  ifdef CHANNEL_PIPES
 	for (part = PART_SOCK; part < PART_IN; ++part)
-#  else
-	part = PART_SOCK;
-#  endif
 	{
 	    if (channel->ch_part[part].ch_fd != INVALID_FD)
 	    {
 		channel->ch_part[part].ch_poll_idx = nfd;
 		fds[nfd].fd = channel->ch_part[part].ch_fd;
 struct	pollfd *fds = fds_in;
 int		part;
 for (channel = first_channel; channel != NULL; channel = channel->ch_next)
 {
-#  ifdef CHANNEL_PIPES
 	for (part = PART_SOCK; part < PART_IN; ++part)
-#  else
-	part = PART_SOCK;
-#  endif
 	{
 	    int idx = channel->ch_part[part].ch_poll_idx;
 	    if (ret > 0 && idx != -1 && fds[idx].revents & POLLIN)
 	    {
 fd_set	*rfds = rfds_in;
 int		part;
 for (channel = first_channel; channel != NULL; channel = channel->ch_next)
 {
-#  ifdef CHANNEL_PIPES
 	for (part = PART_SOCK; part < PART_IN; ++part)
-#  else
-	part = PART_SOCK;
-#  endif
 	{
 	    sock_T fd = channel->ch_part[part].ch_fd;
 	    if (fd != INVALID_FD)
 	    {
 fd_set	*rfds = rfds_in;
 int		part;
 for (channel = first_channel; channel != NULL; channel = channel->ch_next)
 {
-#  ifdef CHANNEL_PIPES
 	for (part = PART_SOCK; part < PART_IN; ++part)
-#  else
-	part = PART_SOCK;
-#  endif
 	{
 	    sock_T fd = channel->ch_part[part].ch_fd;
 	    if (ret > 0 && fd != INVALID_FD && FD_ISSET(fd, rfds))
 	    {
 		channel = first_channel;
 		part = PART_SOCK;
 		continue;
 	    }
 	}
-#ifdef CHANNEL_PIPES
 	if (part < PART_ERR)
 	    ++part;
 	else
-#endif
 	{
 	    channel = channel->ch_next;
 	    part = PART_SOCK;
 	}
 }
 channel_T	*channel;
 int		part;
 for (channel = first_channel; channel != NULL; channel = channel->ch_next)
 {
-#ifdef CHANNEL_PIPES
 	for (part = PART_SOCK; part < PART_IN; ++part)
-#else
-	part = PART_SOCK;
-#endif
 	{
 	    jsonq_T *head = &channel->ch_part[part].ch_json_head;
 	    jsonq_T *item = head->jq_next;
 	    while (item != NULL)
 * Return the "part" to write to for "channel".
 */
 int
 channel_part_send(channel_T *channel)
 {
-#ifdef CHANNEL_PIPES
 if (channel->CH_SOCK_FD == INVALID_FD)
 	return PART_IN;
-#endif
 return PART_SOCK;
 }
 /*
 * Return the default "part" to read from for "channel".
 */
 int
 channel_part_read(channel_T *channel)
 {
-#ifdef CHANNEL_PIPES
 if (channel->CH_SOCK_FD == INVALID_FD)
 	return PART_OUT;
-#endif
 return PART_SOCK;
 }
 /*
 * Return the mode of "channel"/"part"
 channel_get_timeout(channel_T *channel, int part)
 {
 return channel->ch_part[part].ch_timeout;
 }
-#endif /* FEAT_CHANNEL */
+#endif /* FEAT_JOB_CHANNEL */

Mercurial > vim

comparison src/channel.c @ 8493:caed4b2d305f v7.4.1537