[openib-general] [PATCH] remove scm provider from uDAPL build.

[Arlin Davis]

Here is a patch to remove uDAPL scm provider from the build since it is no longer needed nor
supported. This provider was merely a stop gap until uCMA was pushed into kernel.

Tziporet, can you get this change into OFED 1.1?

Signed-off by: Arlin Davis ardavis at ichips.intel.com


Index: doc/dat.conf
===================================================================
--- doc/dat.conf	(revision 9781)
+++ doc/dat.conf	(working copy)
@@ -6,19 +6,10 @@
 # <ia_name> <api_version> <threadsafety> <default> <lib_path> \
 #           <provider_version> <ia_params> <platform_params>
 #
-# Example for openib_cma and openib_scm
-#
-# For cma version you specify <ia_params> as:
+# For the uDAPL cma provder, specify <ia_params> as one of the following:
 #       network address, network hostname, or netdev name and 0 for port
 #
-# For scm version you specify <ia_params> as actual device name and port
-#
 # Simple (OpenIB-cma) default with netdev name provided first on list 
 # to enable use of same dat.conf version on all nodes
 #
 OpenIB-cma u1.2 nonthreadsafe default /usr/lib/libdaplcma.so mv_dapl.1.2 "ib0 0" ""
-OpenIB-cma-ip u1.2 nonthreadsafe default /usr/lib/libdaplcma.so mv_dapl.1.2 "192.168.0.22 0" ""
-OpenIB-cma-name u1.2 nonthreadsafe default /usr/lib/libdaplcma.so mv_dapl.1.2 "svr1-ib0 0" ""
-OpenIB-cma-netdev u1.2 nonthreadsafe default /usr/lib/libdaplcma.so mv_dapl.1.2 "ib0 0" ""
-OpenIB-scm1 u1.2 nonthreadsafe default /usr/lib/libdaplscm.so mv_dapl.1.2 "mthca0 1" ""
-OpenIB-scm2 u1.2 nonthreadsafe default /usr/lib/libdaplscm.so mv_dapl.1.2 "mthca0 2" ""
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 9781)
+++ Makefile.am	(working copy)
@@ -18,11 +18,9 @@
 
 datlibdir = $(libdir)
 dapllibcmadir = $(libdir)
-dapllibscmdir = $(libdir)
 
 datlib_LTLIBRARIES = dat/udat/libdat.la
 dapllibcma_LTLIBRARIES = dapl/udapl/libdaplcma.la
-dapllibscm_LTLIBRARIES = dapl/udapl/libdaplscm.la
 
 dat_udat_libdat_la_CFLAGS = -Wall $(DBGFLAGS) -D_GNU_SOURCE $(OSFLAGS) \
 				-I$(srcdir)/dat/include/ -I$(srcdir)/dat/udat/ \
@@ -34,21 +32,13 @@
 				-I$(srcdir)/dapl/common -I$(srcdir)/dapl/udapl/linux \
 				-I$(srcdir)/dapl/openib_cma 
 		
-dapl_udapl_libdaplscm_la_CFLAGS = -Wall $(DBGFLAGS) -D_GNU_SOURCE $(OSFLAGS) \
-				-DOPENIB -DCQ_WAIT_OBJECT \
-				-I$(srcdir)/dat/include/ -I$(srcdir)/dapl/include/ \
-				-I$(srcdir)/dapl/common -I$(srcdir)/dapl/udapl/linux \
-				-I$(srcdir)/dapl/openib_scm 
-
 if HAVE_LD_VERSION_SCRIPT
     dat_version_script = -Wl,--version-script=$(srcdir)/dat/udat/libdat.map
     daplcma_version_script = -Wl,--version-script=$(srcdir)/dapl/udapl/libdaplcma.map
-    daplscm_version_script = -Wl,--version-script=$(srcdir)/dapl/udapl/libdaplscm.map
 			
 else
     dat_version_script = 
     daplcma_version_script = 
-    daplscm_version_script = 
     
 endif
 
@@ -177,116 +167,6 @@
 				   -Wl,-init,dapl_init -Wl,-fini,dapl_fini \
 				   -lpthread -libverbs -lrdmacm 
 				
-
-#        
-# uDAPL OpenIB Socket CM version: libdaplscm.so
-#
-dapl_udapl_libdaplscm_la_SOURCES = dapl/udapl/dapl_init.c \
-        dapl/udapl/dapl_evd_create.c               \
-        dapl/udapl/dapl_evd_query.c                \
-        dapl/udapl/dapl_cno_create.c               \
-        dapl/udapl/dapl_cno_modify_agent.c         \
-        dapl/udapl/dapl_cno_free.c                 \
-        dapl/udapl/dapl_cno_wait.c                 \
-        dapl/udapl/dapl_cno_query.c                \
-        dapl/udapl/dapl_lmr_create.c               \
-        dapl/udapl/dapl_evd_wait.c                 \
-        dapl/udapl/dapl_evd_disable.c              \
-        dapl/udapl/dapl_evd_enable.c               \
-        dapl/udapl/dapl_evd_modify_cno.c           \
-        dapl/udapl/dapl_evd_set_unwaitable.c       \
-        dapl/udapl/dapl_evd_clear_unwaitable.c     \
-        dapl/udapl/linux/dapl_osd.c                \
-        dapl/common/dapl_cookie.c                   \
-        dapl/common/dapl_cr_accept.c                \
-        dapl/common/dapl_cr_query.c                 \
-        dapl/common/dapl_cr_reject.c                \
-        dapl/common/dapl_cr_util.c                  \
-        dapl/common/dapl_cr_callback.c              \
-        dapl/common/dapl_cr_handoff.c               \
-        dapl/common/dapl_ep_connect.c               \
-        dapl/common/dapl_ep_create.c                \
-        dapl/common/dapl_ep_disconnect.c            \
-        dapl/common/dapl_ep_dup_connect.c           \
-        dapl/common/dapl_ep_free.c                  \
-        dapl/common/dapl_ep_reset.c                 \
-        dapl/common/dapl_ep_get_status.c            \
-        dapl/common/dapl_ep_modify.c                \
-        dapl/common/dapl_ep_post_rdma_read.c        \
-        dapl/common/dapl_ep_post_rdma_write.c       \
-        dapl/common/dapl_ep_post_recv.c             \
-        dapl/common/dapl_ep_post_send.c             \
-        dapl/common/dapl_ep_query.c                 \
-        dapl/common/dapl_ep_util.c                  \
-        dapl/common/dapl_evd_dequeue.c              \
-        dapl/common/dapl_evd_free.c                 \
-        dapl/common/dapl_evd_post_se.c              \
-        dapl/common/dapl_evd_resize.c               \
-        dapl/common/dapl_evd_util.c                 \
-        dapl/common/dapl_evd_cq_async_error_callb.c \
-        dapl/common/dapl_evd_qp_async_error_callb.c \
-        dapl/common/dapl_evd_un_async_error_callb.c \
-        dapl/common/dapl_evd_connection_callb.c     \
-        dapl/common/dapl_evd_dto_callb.c            \
-        dapl/common/dapl_get_consumer_context.c     \
-        dapl/common/dapl_get_handle_type.c          \
-        dapl/common/dapl_hash.c                     \
-        dapl/common/dapl_hca_util.c                 \
-        dapl/common/dapl_ia_close.c                 \
-        dapl/common/dapl_ia_open.c                  \
-        dapl/common/dapl_ia_query.c                 \
-        dapl/common/dapl_ia_util.c                  \
-        dapl/common/dapl_llist.c                    \
-        dapl/common/dapl_lmr_free.c                 \
-        dapl/common/dapl_lmr_query.c                \
-        dapl/common/dapl_lmr_util.c                 \
-        dapl/common/dapl_lmr_sync_rdma_read.c       \
-        dapl/common/dapl_lmr_sync_rdma_write.c      \
-        dapl/common/dapl_mr_util.c                  \
-        dapl/common/dapl_provider.c                 \
-        dapl/common/dapl_sp_util.c                  \
-        dapl/common/dapl_psp_create.c               \
-        dapl/common/dapl_psp_create_any.c           \
-        dapl/common/dapl_psp_free.c                 \
-        dapl/common/dapl_psp_query.c                \
-        dapl/common/dapl_pz_create.c                \
-        dapl/common/dapl_pz_free.c                  \
-        dapl/common/dapl_pz_query.c                 \
-        dapl/common/dapl_pz_util.c                  \
-        dapl/common/dapl_rmr_create.c               \
-        dapl/common/dapl_rmr_free.c                 \
-        dapl/common/dapl_rmr_bind.c                 \
-        dapl/common/dapl_rmr_query.c                \
-        dapl/common/dapl_rmr_util.c                 \
-        dapl/common/dapl_rsp_create.c               \
-        dapl/common/dapl_rsp_free.c                 \
-        dapl/common/dapl_rsp_query.c                \
-        dapl/common/dapl_cno_util.c                 \
-        dapl/common/dapl_set_consumer_context.c     \
-        dapl/common/dapl_ring_buffer_util.c         \
-        dapl/common/dapl_name_service.c             \
-        dapl/common/dapl_timer_util.c               \
-        dapl/common/dapl_ep_create_with_srq.c       \
-        dapl/common/dapl_ep_recv_query.c            \
-        dapl/common/dapl_ep_set_watermark.c         \
-        dapl/common/dapl_srq_create.c               \
-        dapl/common/dapl_srq_free.c                 \
-        dapl/common/dapl_srq_query.c                \
-        dapl/common/dapl_srq_resize.c               \
-        dapl/common/dapl_srq_post_recv.c            \
-        dapl/common/dapl_srq_set_lw.c               \
-        dapl/common/dapl_srq_util.c                 \
-        dapl/common/dapl_debug.c                    \
-	dapl/openib_scm/dapl_ib_util.c              \
-	dapl/openib_scm/dapl_ib_cq.c                \
-	dapl/openib_scm/dapl_ib_qp.c                \
-	dapl/openib_scm/dapl_ib_cm.c                \
-        dapl/openib_scm/dapl_ib_mem.c               
-
-dapl_udapl_libdaplscm_la_LDFLAGS = -version-info 1:2:0 $(daplscm_version_script) \
-				   -Wl,-init,dapl_init -Wl,-fini,dapl_fini \
-				   -lpthread -libverbs
-				    
 libdatincludedir = $(includedir)/dat
 
 libdatinclude_HEADERS = dat/include/dat/dat.h \