[ALL] Remove listen error callback

The listen error callback is the vestigial tail of IBAL...  At some point in the distant past, it served a function, though a dubious one at best given the implementation of the listen error callbacks in client code that all effectively generate some output but really ignore the event.

This patch eliminates the listen error callback, its associated callback record, and all the no-op handlers in the various clients.

Signed-off-by: Fab Tillier <ftillier@microsoft.com>
git-svn-id: svn://openib.tc.cornell.edu/gen1@1363 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/core/al/al_cm_qp.c b/trunk/core/al/al_cm_qp.c
index 2107ee724815c52fb33d8f2b0d05b726dad54e7d..0966cb163521aadb47087ce37bea154868ffb01d 100644 (file)
--- a/trunk/core/al/al_cm_qp.c
+++ b/trunk/core/al/al_cm_qp.c
@@ -1811,7 +1811,6 @@ static ib_api_status_t
 __cep_listen(\r
        IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_cm_listen_t* const           p_cm_listen,\r
-       IN              const   ib_pfn_listen_err_cb_t          pfn_listen_err_cb,\r
        IN              const   void* const                                     listen_context,\r
                OUT                     ib_listen_handle_t* const       ph_cm_listen )\r
 {\r
@@ -1821,8 +1820,6 @@ __cep_listen(
 \r
        AL_ENTER( AL_DBG_CM );\r
 \r
-       UNUSED_PARAM( pfn_listen_err_cb );\r
-\r
        /* Allocate the listen object. */\r
        p_listen = (al_listen_t*)cl_zalloc( sizeof(al_listen_t) );\r
        if( !p_listen )\r
@@ -1900,7 +1897,6 @@ ib_api_status_t
 ib_cm_listen(\r
        IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_cm_listen_t* const           p_cm_listen,\r
-       IN              const   ib_pfn_listen_err_cb_t          pfn_listen_err_cb,\r
        IN              const   void* const                                     listen_context,\r
                OUT                     ib_listen_handle_t* const       ph_cm_listen )\r
 {\r
@@ -1913,14 +1909,13 @@ ib_cm_listen(
                AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_AL_HANDLE\n") );\r
                return IB_INVALID_AL_HANDLE;\r
        }\r
-       if( !p_cm_listen || !pfn_listen_err_cb || !ph_cm_listen )\r
+       if( !p_cm_listen || !ph_cm_listen )\r
        {\r
                AL_PRINT_EXIT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r
        }\r
 \r
-       status = __cep_listen(h_al, p_cm_listen, pfn_listen_err_cb, listen_context,\r
-               ph_cm_listen );\r
+       status = __cep_listen(h_al, p_cm_listen, listen_context, ph_cm_listen );\r
 \r
        AL_EXIT( AL_DBG_CM );\r
        return status;\r

diff --git a/trunk/inc/iba/ib_al.h b/trunk/inc/iba/ib_al.h
index c25ef119a6df3532635fab943ebac066fec9e13b..72a8b4fa9ae854f7375574e3aace3253a455de66 100644 (file)
--- a/trunk/inc/iba/ib_al.h
+++ b/trunk/inc/iba/ib_al.h
@@ -5835,68 +5835,6 @@ typedef struct _ib_cm_drep
 *****/\r
 \r
 \r
-/****s* Access Layer/ib_listen_err_rec_t\r
-* NAME\r
-*      ib_listen_err_rec_t\r
-*\r
-* DESCRIPTION\r
-*      Information returned to the user when an error occurs on a listen request.\r
-*\r
-* SYNOPSIS\r
-*/\r
-typedef struct _ib_listen_err_rec\r
-{\r
-       TO_LONG_PTR(void* ,                                                             listen_context) ;\r
-       ib_api_status_t                                                         reason;\r
-TO_LONG_PTR(   ib_listen_handle_t ,                                                    h_cm_listen) ; \r
-\r
-}      ib_listen_err_rec_t;\r
-/*\r
-* FIELDS\r
-*      listen_context\r
-*              User-defined context information associated with the listen request\r
-*              through the ib_cm_listen call.\r
-*\r
-*      reason\r
-*              A status that identifies the reason for error being reported.\r
-*\r
-*      h_cm_listen\r
-*              The handle for the listen request.  This handle will match the handle\r
-*              returned by ib_cm_listen call.  It is provided in case an error event\r
-*              occurs before a client's call to ib_cm_listen can return.\r
-*\r
-* SEE ALSO\r
-*      ib_pfn_listen_err_cb_t, ib_api_status_t\r
-*****/\r
-\r
-\r
-/****f* Access Layer/ib_pfn_listen_err_cb_t\r
-* NAME\r
-*      ib_pfn_listen_err_cb_t\r
-*\r
-* DESCRIPTION\r
-*      A user-specified callback that is invoked after an error has occurred on\r
-*      a listen request.\r
-*\r
-* SYNOPSIS\r
-*/\r
-typedef void\r
-(AL_API * FUNC_PTR64 ib_pfn_listen_err_cb_t)(\r
-       IN                              ib_listen_err_rec_t                     *p_listen_err_rec );\r
-/*\r
-* PARAMETERS\r
-*      p_listen_err_rec\r
-*              [in] Error information returned to the user, indicating the reason\r
-*              for the error and associated context information.\r
-*\r
-* NOTES\r
-*      This callback is invoked within a system thread context in the kernel.\r
-*\r
-* SEE ALSO\r
-*      p_listen_err_rec\r
-*****/\r
-\r
-\r
 /****f* Access Layer/ib_cm_listen\r
 * NAME\r
 *      ib_cm_listen\r
@@ -5911,7 +5849,6 @@ AL_EXPORT ib_api_status_t AL_API
 ib_cm_listen(\r
        IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_cm_listen_t* const           p_cm_listen,\r
-       IN              const   ib_pfn_listen_err_cb_t          pfn_listen_err_cb,\r
        IN              const   void* const                                     listen_context,\r
                OUT                     ib_listen_handle_t* const       ph_cm_listen );\r
 /*\r
@@ -5923,10 +5860,6 @@ ib_cm_listen(
 *              [in] Information used to direct the listen request to match incoming\r
 *              connection requests.\r
 *\r
-*      pfn_listen_err_cb\r
-*              [in] User-specified error callback routine to invoke if an error\r
-*              occurs while listening.\r
-*\r
 *      listen_context\r
 *              User-specified context information that is returned as a part of all\r
 *              connection requests through the pfn_cm_req_cb routine.  The context is\r
@@ -5983,7 +5916,7 @@ ib_cm_listen(
 *      thread.\r
 *\r
 * SEE ALSO\r
-*      ib_cm_listen_t, ib_pfn_listen_err_cb_t\r
+*      ib_cm_listen_t\r
 *****/\r
 \r
 \r

diff --git a/trunk/inc/kernel/iba/ib_al_ifc.h b/trunk/inc/kernel/iba/ib_al_ifc.h
index b4e6eae575e7bac9bea73bdf6da8082695a78c64..dc615bfbf4c78b6f014072898915b353466a4fb1 100644 (file)
--- a/trunk/inc/kernel/iba/ib_al_ifc.h
+++ b/trunk/inc/kernel/iba/ib_al_ifc.h
@@ -419,7 +419,6 @@ typedef ib_api_status_t
 (*ib_pfn_cm_listen_t)(\r
        IN              const   ib_al_handle_t                          h_al,\r
        IN              const   ib_cm_listen_t* const           p_cm_listen,\r
-       IN              const   ib_pfn_listen_err_cb_t          listen_err_cb,\r
        IN              const   void* const                                     listen_context,\r
                OUT                     ib_listen_handle_t* const       ph_cm_listen );\r
 \r

diff --git a/trunk/tests/alts/cmtests.c b/trunk/tests/alts/cmtests.c
index cde0f42b53717b37a4a2fbd7c6cc9ea5f28fdb68..80fa0f58ce5adb96df26da9f1f6c9b6481fc6d2e 100644 (file)
--- a/trunk/tests/alts/cmtests.c
+++ b/trunk/tests/alts/cmtests.c
@@ -1972,17 +1972,6 @@ alts_cm_mra_cb(
        ALTS_EXIT( ALTS_DBG_VERBOSE);\r
 }\r
 \r
-void\r
-alts_cm_err_cb(\r
-       IN                              ib_listen_err_rec_t                     *p_err_rec )\r
-{\r
-       ALTS_ENTER( ALTS_DBG_VERBOSE );\r
-\r
-       UNUSED_PARAM( p_err_rec );\r
-\r
-       ALTS_EXIT( ALTS_DBG_VERBOSE);\r
-}\r
-\r
 \r
 void\r
 alts_cm_rtu_cb(\r
@@ -2210,8 +2199,7 @@ alts_cm_client_server(
        p_listen->pkey = p_ca_obj->p_dest_port_attr->p_pkey_table[0];\r
        p_listen->pfn_cm_req_cb = alts_cm_req_cb;\r
 \r
-       ib_status = ib_cm_listen(h_al, p_listen, alts_cm_err_cb,\r
-               p_ca_obj, &p_ca_obj->h_cm_listen );\r
+       ib_status = ib_cm_listen(h_al, p_listen, p_ca_obj, &p_ca_obj->h_cm_listen );\r
        if(ib_status != IB_SUCCESS)\r
        {\r
                ALTS_PRINT( ALTS_DBG_ERROR,\r
@@ -2225,8 +2213,7 @@ alts_cm_client_server(
                p_listen->svc_id = 2;\r
                p_ca_obj->handoff_svc_id = 2;\r
 \r
-               ib_status = ib_cm_listen(h_al, p_listen, alts_cm_err_cb,\r
-                       p_ca_obj, &p_ca_obj->h_cm_listen_handoff );\r
+               ib_status = ib_cm_listen(h_al, p_listen, p_ca_obj, &p_ca_obj->h_cm_listen_handoff );\r
                if(ib_status != IB_SUCCESS)\r
                {\r
                        ALTS_PRINT( ALTS_DBG_ERROR,\r

diff --git a/trunk/tests/cmtest/user/cmtest_main.c b/trunk/tests/cmtest/user/cmtest_main.c
index 3d7fbf5cb6999c3a4e783204226b03ef5773a6ee..0ce9f1029d2029d233685882555d0f5835d64a1a 100644 (file)
--- a/trunk/tests/cmtest/user/cmtest_main.c
+++ b/trunk/tests/cmtest/user/cmtest_main.c
@@ -674,18 +674,6 @@ __ca_async_event_cb(
 \r
 \r
 \r
-static void AL_API\r
-__cm_listen_err_cb(\r
-       IN                              ib_listen_err_rec_t                     *p_listen_err_rec )\r
-{\r
-       CL_ENTER( CMT_DBG_VERBOSE, cmt_dbg_lvl );\r
-       if( !p_listen_err_rec )\r
-               printf( "%s NULL p_listen_err_rec\n", __FUNCTION__ );\r
-       CL_EXIT( CMT_DBG_VERBOSE, cmt_dbg_lvl );\r
-}\r
-\r
-\r
-\r
 static void AL_API\r
 __cancel_listen_cb(\r
        IN                              void                                            *context )\r
@@ -1520,7 +1508,6 @@ __listen()
 \r
        status = ib_cm_listen( g_root.h_al,\r
                                                   &cm_listen, \r
-                                                  __cm_listen_err_cb,\r
                                                   &g_root,\r
                                                   &g_root.h_listen );\r
        if( status != IB_SUCCESS )\r

diff --git a/trunk/ulp/dapl/dapl/ibal/dapl_ibal_cm.c b/trunk/ulp/dapl/dapl/ibal/dapl_ibal_cm.c
index d05e3b5315672d477eac5bbe57f151015d996817..93c4b7a12019560290e285728fbfaac30d86595e 100644 (file)
--- a/trunk/ulp/dapl/dapl/ibal/dapl_ibal_cm.c
+++ b/trunk/ulp/dapl/dapl/ibal/dapl_ibal_cm.c
@@ -590,15 +590,6 @@ dapli_ib_sa_query_cb (
     } \r
 }\r
 \r
-\r
-static void \r
-dapli_ibal_listen_err_cb (\r
-        IN    ib_listen_err_rec_t          *p_listen_err_rec )\r
-{\r
-    UNUSED_PARAM( p_listen_err_rec );\r
-    dapl_dbg_log (DAPL_DBG_TYPE_CM, "--> DiLEcb: CM callback listen error\n");\r
-}\r
-\r
 static void \r
 dapli_ib_cm_apr_cb (\r
         IN    ib_cm_apr_rec_t          *p_cm_apr_rec )\r
@@ -1480,7 +1471,6 @@ dapls_ib_setup_conn_listener (
 \r
     ib_status = ib_cm_listen ( dapl_ibal_root.h_al,\r
                                &cm_listen,\r
-                               dapli_ibal_listen_err_cb,\r
                                (void *) sp_ptr,\r
                                &sp_ptr->cm_srvc_handle);\r
 \r

diff --git a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c
index 0998421b964aa1d75a39df752f6231d4ba75311b..fdfe3623db2a6e0809d7cdf3923aacb2d2b4d8d8 100644 (file)
--- a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c
+++ b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c
@@ -78,16 +78,6 @@ dapli_ib_cm_event_str(ib_cm_events_t e)
 }\r
 \r
 \r
-static void \r
-dapli_ibal_listen_err_cb (\r
-        IN    ib_listen_err_rec_t          *p_listen_err_rec )\r
-{\r
-    UNUSED_PARAM( p_listen_err_rec );\r
-\r
-    dapl_dbg_log (DAPL_DBG_TYPE_CM, "--> %s: CM callback listen error\n",\r
-                  "DiLEcb");\r
-}\r
-\r
 static void \r
 dapli_ib_cm_apr_cb (\r
         IN    ib_cm_apr_rec_t          *p_cm_apr_rec )\r
@@ -1174,7 +1164,6 @@ dapls_ib_setup_conn_listener (
 \r
     ib_status = ib_cm_listen ( dapl_ibal_root.h_al,\r
                                &cm_listen,\r
-                               dapli_ibal_listen_err_cb,\r
                                (void *) sp_ptr,\r
                                &sp_ptr->cm_srvc_handle );\r
 \r

diff --git a/trunk/ulp/wsd/user/ib_cm.c b/trunk/ulp/wsd/user/ib_cm.c
index 3b38c59d8827c7199c94ec52d31e5c46e3a20516..d883e841f5baf9c35d0cc3517c8a8cdeb140d925 100644 (file)
--- a/trunk/ulp/wsd/user/ib_cm.c
+++ b/trunk/ulp/wsd/user/ib_cm.c
@@ -43,7 +43,6 @@ static void AL_API cm_rtu_callback(IN ib_cm_rtu_rec_t * p_cm_rtu_rec);
 static void AL_API cm_rej_callback(IN ib_cm_rej_rec_t * p_cm_rej_rec);\r
 static void AL_API cm_mra_callback(IN ib_cm_mra_rec_t * p_cm_mra_rec);\r
 static void AL_API cm_dreq_callback(IN ib_cm_dreq_rec_t * p_cm_dreq_rec);\r
-static void AL_API listen_err_callback(IN ib_listen_err_rec_t * p_listen_err_rec);\r
 static void AL_API cm_apr_callback(IN ib_cm_apr_rec_t * p_cm_apr_rec);\r
 \r
 \r
@@ -582,27 +581,6 @@ cm_drep_callback(
 }\r
 \r
 \r
-/*\r
- * A user-specified callback that is invoked after an error has occurred on\r
- * a listen request.\r
- */\r
-static void AL_API\r
-listen_err_callback(\r
-       IN                              ib_listen_err_rec_t                     *p_listen_err_rec )\r
-{\r
-       /* TODO */\r
-       IBSP_ENTER( IBSP_DBG_CM );\r
-\r
-       UNUSED_PARAM( p_listen_err_rec );\r
-\r
-       IBSP_ERROR( ("not implemented") );\r
-\r
-       CL_ASSERT( 0 );\r
-\r
-       IBSP_EXIT( IBSP_DBG_CM );\r
-}\r
-\r
-\r
 /*\r
  * A user-specified callback that is invoked after receiving a load\r
  * alternate path response message.\r
@@ -688,7 +666,7 @@ ib_listen(
 \r
        param.qp_type = IB_QPT_RELIABLE_CONN;\r
 \r
-       status = ib_cm_listen( g_ibsp.al_handle, &param, listen_err_callback, socket_info,      /* context */\r
+       status = ib_cm_listen( g_ibsp.al_handle, &param, socket_info,   /* context */\r
                &socket_info->listen.handle );\r
 \r
        if( status != IB_SUCCESS )\r