MINOR: stconn: Remove .chk_rcv() callback functions

These callback functions are no longer used, so they can safely be
removed. In addition, the field was removed from the app_ops structure.

diff --git a/include/haproxy/stconn-t.h b/include/haproxy/stconn-t.h
index a9fbac270c0fd2e4e887702590297ebecbf7bdfb..a0e93f2feca03b9651597d6b5e3e843554cac0db 100644 (file)
--- a/include/haproxy/stconn-t.h
+++ b/include/haproxy/stconn-t.h
@@ -354,7 +354,6 @@ struct sedesc {
  * There are very few combinations in practice (strm/chk <-> none/mux/applet).
  */
 struct sc_app_ops {
-       void (*chk_rcv)(struct stconn *);    /* chk_rcv function, may not be null */
        void (*chk_snd)(struct stconn *);    /* chk_snd function, may not be null */
        void (*abort)(struct stconn *);      /* abort function, may not be null */
        void (*shutdown)(struct stconn *);   /* shutdown function, may not be null */

diff --git a/src/stconn.c b/src/stconn.c
index a1aedeb312944274bd9615adf9ecff9689b8f2eb..446b8615d5ad20df5f1060a2db73b52950d515be 100644 (file)
--- a/src/stconn.c
+++ b/src/stconn.c
@@ -32,19 +32,16 @@ DECLARE_TYPED_POOL(pool_head_sedesc, "sedesc", struct sedesc);
 /* functions used by default on a detached stream connector */
 static void sc_app_abort(struct stconn *sc);
 static void sc_app_shut(struct stconn *sc);
-static void sc_app_chk_rcv(struct stconn *sc);
 static void sc_app_chk_snd(struct stconn *sc);
 
 /* functions used on a mux-based stream connector */
 static void sc_app_abort_conn(struct stconn *sc);
 static void sc_app_shut_conn(struct stconn *sc);
-static void sc_app_chk_rcv_conn(struct stconn *sc);
 static void sc_app_chk_snd_conn(struct stconn *sc);
 
 /* functions used on an applet-based stream connector */
 static void sc_app_abort_applet(struct stconn *sc);
 static void sc_app_shut_applet(struct stconn *sc);
-static void sc_app_chk_rcv_applet(struct stconn *sc);
 static void sc_app_chk_snd_applet(struct stconn *sc);
 
 static int sc_conn_recv(struct stconn *sc);
@@ -52,7 +49,6 @@ static int sc_conn_send(struct stconn *sc);
 
 /* stream connector operations for connections */
 struct sc_app_ops sc_app_conn_ops = {
-       .chk_rcv = sc_app_chk_rcv_conn,
        .chk_snd = sc_app_chk_snd_conn,
        .abort   = sc_app_abort_conn,
        .shutdown= sc_app_shut_conn,
@@ -61,7 +57,6 @@ struct sc_app_ops sc_app_conn_ops = {
 
 /* stream connector operations for embedded tasks */
 struct sc_app_ops sc_app_embedded_ops = {
-       .chk_rcv = sc_app_chk_rcv,
        .chk_snd = sc_app_chk_snd,
        .abort   = sc_app_abort,
        .shutdown= sc_app_shut,
@@ -70,7 +65,6 @@ struct sc_app_ops sc_app_embedded_ops = {
 
 /* stream connector operations for applets */
 struct sc_app_ops sc_app_applet_ops = {
-       .chk_rcv = sc_app_chk_rcv_applet,
        .chk_snd = sc_app_chk_snd_applet,
        .abort   = sc_app_abort_applet,
        .shutdown= sc_app_shut_applet,
@@ -79,7 +73,6 @@ struct sc_app_ops sc_app_applet_ops = {
 
 /* stream connector for health checks on connections */
 struct sc_app_ops sc_app_check_ops = {
-       .chk_rcv = NULL,
        .chk_snd = NULL,
        .abort   = NULL,
        .shutdown= NULL,
@@ -87,7 +80,6 @@ struct sc_app_ops sc_app_check_ops = {
 };
 
 struct sc_app_ops sc_app_hstream_ops = {
-       .chk_rcv = NULL,
        .chk_snd = NULL,
        .abort   = NULL,
        .shutdown= NULL,
@@ -771,20 +763,6 @@ static void sc_app_shut(struct stconn *sc)
                task_wakeup(sc_strm_task(sc), TASK_WOKEN_IO);
 }
 
-/* default chk_rcv function for scheduled tasks */
-static void sc_app_chk_rcv(struct stconn *sc)
-{
-       if (sc_ep_have_ff_data(sc_opposite(sc))) {
-               /* stop reading */
-               sc_need_room(sc, -1);
-       }
-       else {
-               /* (re)start reading */
-               if (!(sc->flags & SC_FL_DONT_WAKE))
-                       task_wakeup(sc_strm_task(sc), TASK_WOKEN_IO);
-       }
-}
-
 /* default chk_snd function for scheduled tasks */
 static void sc_app_chk_snd(struct stconn *sc)
 {
@@ -904,21 +882,6 @@ static void sc_app_shut_conn(struct stconn *sc)
                __sc_strm(sc)->conn_exp = TICK_ETERNITY;
 }
 
-/* This function is used for inter-stream connector calls. It is called by the
- * consumer to inform the producer side that it may be interested in checking
- * for free space in the buffer. Note that it intentionally does not update
- * timeouts, so that we can still check them later at wake-up. This function is
- * dedicated to connection-based stream connectors.
- */
-static void sc_app_chk_rcv_conn(struct stconn *sc)
-{
-       BUG_ON(!sc_conn(sc));
-
-       /* (re)start reading */
-       if (sc_state_in(sc->state, SC_SB_CON|SC_SB_RDY|SC_SB_EST))
-               tasklet_wakeup(sc->wait_event.tasklet, TASK_WOKEN_IO);
-}
-
 
 /* This function is used for inter-stream connector calls. It is called by the
  * producer to inform the consumer side that it may be interested in checking
@@ -1089,17 +1052,6 @@ static void sc_app_shut_applet(struct stconn *sc)
                __sc_strm(sc)->conn_exp = TICK_ETERNITY;
 }
 
-/* chk_rcv function for applets */
-static void sc_app_chk_rcv_applet(struct stconn *sc)
-{
-       BUG_ON(!sc_appctx(sc));
-
-       if (!sc_ep_have_ff_data(sc_opposite(sc))) {
-               /* (re)start reading */
-               appctx_wakeup(__sc_appctx(sc));
-       }
-}
-
 /* chk_snd function for applets */
 static void sc_app_chk_snd_applet(struct stconn *sc)
 {