From owner-svn-src-projects@FreeBSD.ORG Mon Jun 9 14:27:37 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E3597562; Mon, 9 Jun 2014 14:27:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D0A0429E3; Mon, 9 Jun 2014 14:27:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s59ERbG8040224; Mon, 9 Jun 2014 14:27:37 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s59ERbuV040223; Mon, 9 Jun 2014 14:27:37 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201406091427.s59ERbuV040223@svn.freebsd.org> From: Gleb Smirnoff Date: Mon, 9 Jun 2014 14:27:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r267272 - projects/sendfile/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jun 2014 14:27:38 -0000 Author: glebius Date: Mon Jun 9 14:27:37 2014 New Revision: 267272 URL: http://svnweb.freebsd.org/changeset/base/267272 Log: Provide pru_ready method for TCP. It simply checks pcb and socket buffer, calls sbready() and if the latter reports, that now there is data to send, it calls tcp_output(). Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/netinet/tcp_usrreq.c Modified: projects/sendfile/sys/netinet/tcp_usrreq.c ============================================================================== --- projects/sendfile/sys/netinet/tcp_usrreq.c Mon Jun 9 14:24:41 2014 (r267271) +++ projects/sendfile/sys/netinet/tcp_usrreq.c Mon Jun 9 14:27:37 2014 (r267272) @@ -925,6 +925,38 @@ out: return (error); } +static int +tcp_usr_ready(struct socket *so, struct mbuf *m, int count) +{ + struct inpcb *inp; + struct tcpcb *tp; + int error; + + inp = sotoinpcb(so); + INP_WLOCK(inp); + if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) { + INP_WUNLOCK(inp); + return (ECONNRESET); + } + tp = intotcpcb(inp); + + SOCKBUF_LOCK(&so->so_snd); + if (so->so_snd.sb_state & SBS_CANTSENDMORE) { + SOCKBUF_UNLOCK(&so->so_snd); + error = ENOTCONN; + } else if (sbready(&so->so_snd, m, count) == 0) { + SOCKBUF_UNLOCK(&so->so_snd); + error = tcp_output(tp); + } else { + SOCKBUF_UNLOCK(&so->so_snd); + error = EINPROGRESS; + } + + INP_WUNLOCK(inp); + + return (error); +} + /* * Abort the TCP. Drop the connection abruptly. */ @@ -1059,6 +1091,7 @@ struct pr_usrreqs tcp_usrreqs = { .pru_rcvd = tcp_usr_rcvd, .pru_rcvoob = tcp_usr_rcvoob, .pru_send = tcp_usr_send, + .pru_ready = tcp_usr_ready, .pru_shutdown = tcp_usr_shutdown, .pru_sockaddr = in_getsockaddr, .pru_sosetlabel = in_pcbsosetlabel,