Merge pull request #19109 from opensourcerouting/vtysh_flush_revert

lib: revert addition of vtysh_flush() call in vty_out()

Author: mjstapp

lib/vty.c

@@ -346,17 +346,8 @@ int vty_out(struct vty *vty, const char *format, ...)
 	case VTY_SHELL_SERV:
 	case VTY_FILE:
 	default:
-		vty->vty_buf_size_accumulated += strlen(filtered);
 		/* print without crlf replacement */
 		buffer_put(vty->obuf, (uint8_t *)filtered, strlen(filtered));
-		/* For every chunk of memory, we invoke vtysh_flush where we
-		 * put the data of collective vty->obuf Linked List items on the
-		 * socket and free the vty->obuf data.
-		 */
-		if (vty->vty_buf_size_accumulated >= vty->buf_size_intermediate) {
-			vty->vty_buf_size_accumulated = 0;
-			vtysh_flush(vty);
-		}
 		break;
 	}
 
@@ -2174,13 +2165,6 @@ static void vtysh_accept(struct event *thread)
 #endif /* VTYSH_DEBUG */
 
 	vty = vty_new();
-
-	vty->buf_size_set = ret;
-	if (vty->buf_size_set < VTY_MAX_INTERMEDIATE_FLUSH)
-		vty->buf_size_intermediate = vty->buf_size_set / 2;
-	else
-		vty->buf_size_intermediate = VTY_MAX_INTERMEDIATE_FLUSH;
-
 	vty->fd = sock;
 	vty->wfd = sock;
 	vty->type = VTY_SHELL_SERV;
@@ -2260,7 +2244,6 @@ static int vtysh_flush(struct vty *vty)
 		vty_close(vty);
 		return -1;
 	case BUFFER_EMPTY:
-		vty->vty_buf_size_accumulated = 0;
 		break;
 	}
 	return 0;

lib/vty.h

@@ -228,10 +228,6 @@ struct vty {
 	uintptr_t mgmt_req_pending_data;
 	bool mgmt_locked_candidate_ds;
 	bool mgmt_locked_running_ds;
-	uint64_t vty_buf_size_accumulated;
-
-	int buf_size_set;
-	uint64_t buf_size_intermediate;
 };
 
 static inline void vty_push_context(struct vty *vty, int node, uint64_t id)
@@ -337,9 +333,6 @@ struct vty_arg {
 /* Vty max send buffer size */
 #define VTY_SEND_BUF_MAX 16777216
 
-/* Vty flush intermediate size */
-#define VTY_MAX_INTERMEDIATE_FLUSH 131072
-
 /* Directory separator. */
 #ifndef DIRECTORY_SEP
 #define DIRECTORY_SEP '/'