From 493e65b5b47f47e4824f775959fd98e56aeaccc4 Mon Sep 17 00:00:00 2001 From: Arlin Davis Date: Fri, 28 Sep 2007 17:03:41 -0700 Subject: [PATCH] Clean up packaging, modify dat.conf for cma provider name change to ofa Signed-off by: Arlin Davis --- Makefile.am | 26 +++++++++---------- configure.in | 6 ++--- libdat2.spec.in => dapl.spec.in | 14 +++++----- dapl/udapl/{libdaplcma.map => libdaplofa.map} | 0 dapl/udapl/libdaplscm.map | 6 ----- doc/dat.conf | 12 ++++----- test/dapltest/configure.in | 4 +-- test/dapltest/mdep/linux/dapl_mdep_user.h | 2 +- test/dtest/configure.in | 4 +-- test/dtest/dat.conf | 11 -------- test/dtest/dtest.c | 2 +- test/dtest/dtestx.c | 2 +- 12 files changed, 35 insertions(+), 54 deletions(-) rename libdat2.spec.in => dapl.spec.in (93%) rename dapl/udapl/{libdaplcma.map => libdaplofa.map} (100%) delete mode 100644 dapl/udapl/libdaplscm.map delete mode 100644 test/dtest/dat.conf diff --git a/Makefile.am b/Makefile.am index f473aaa..fc0be18 100755 --- a/Makefile.am +++ b/Makefile.am @@ -28,16 +28,16 @@ endif sysconf_DATA = doc/dat.conf datlibdir = $(libdir) -dapllibcmadir = $(libdir) +dapllibofadir = $(libdir) datlib_LTLIBRARIES = dat/udat/libdat.la -dapllibcma_LTLIBRARIES = dapl/udapl/libdaplcma.la +dapllibofa_LTLIBRARIES = dapl/udapl/libdaplofa.la dat_udat_libdat_la_CFLAGS = -Wall $(DBGFLAGS) -D_GNU_SOURCE $(OSFLAGS) $(XFLAGS) \ -I$(srcdir)/dat/include/ -I$(srcdir)/dat/udat/ \ -I$(srcdir)/dat/udat/linux -I$(srcdir)/dat/common/ -dapl_udapl_libdaplcma_la_CFLAGS = -Wall $(DBGFLAGS) -D_GNU_SOURCE $(OSFLAGS) $(XFLAGS) \ +dapl_udapl_libdaplofa_la_CFLAGS = -Wall $(DBGFLAGS) -D_GNU_SOURCE $(OSFLAGS) $(XFLAGS) \ -DOPENIB -DCQ_WAIT_OBJECT \ -I$(srcdir)/dat/include/ -I$(srcdir)/dapl/include/ \ -I$(srcdir)/dapl/common -I$(srcdir)/dapl/udapl/linux \ @@ -45,11 +45,11 @@ dapl_udapl_libdaplcma_la_CFLAGS = -Wall $(DBGFLAGS) -D_GNU_SOURCE $(OSFLAGS) $(X 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 + daplofa_version_script = -Wl,--version-script=$(srcdir)/dapl/udapl/libdaplofa.map else dat_version_script = - daplcma_version_script = + daplofa_version_script = endif @@ -66,13 +66,12 @@ dat_udat_libdat_la_SOURCES = dat/udat/udat.c \ dat/common/dat_init.c \ dat/common/dat_dr.c \ dat/common/dat_sr.c -# version-info current:revision:age dat_udat_libdat_la_LDFLAGS = -version-info 2:0:0 $(dat_version_script) -ldl # -# uDAPL OpenIB uCMA version: libdaplcma.so +# uDAPL OpenFabrics rdma_cm version: libdaplofa.so # -dapl_udapl_libdaplcma_la_SOURCES = dapl/udapl/dapl_init.c \ +dapl_udapl_libdaplofa_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 \ @@ -178,8 +177,7 @@ dapl_udapl_libdaplcma_la_SOURCES = dapl/udapl/dapl_init.c \ dapl/openib_cma/dapl_ib_cm.c \ dapl/openib_cma/dapl_ib_mem.c $(XPROGRAMS) -# version-info current:revision:age -dapl_udapl_libdaplcma_la_LDFLAGS = -version-info 2:0:0 $(daplcma_version_script) \ +dapl_udapl_libdaplofa_la_LDFLAGS = -version-info 2:0:0 $(daplofa_version_script) \ -Wl,-init,dapl_init -Wl,-fini,dapl_fini \ -lpthread -libverbs -lrdmacm @@ -244,8 +242,8 @@ EXTRA_DIST = dat/common/dat_dictionary.h \ dapl/openib_cma/dapl_ib_util.h \ dat/udat/libdat.map \ doc/dat.conf \ - dapl/udapl/libdaplcma.map \ - libdat2.spec.in \ + dapl/udapl/libdaplofa.map \ + dapl.spec.in \ $(man_MANS) \ test/dapltest/include/dapl_bpool.h \ test/dapltest/include/dapl_client_info.h \ @@ -275,7 +273,7 @@ EXTRA_DIST = dat/common/dat_dictionary.h \ test/dapltest/include/dapl_version.h \ test/dapltest/mdep/linux/dapl_mdep_user.h -dist-hook: libdat2.spec - cp libdat2.spec $(distdir) +dist-hook: dapl.spec + cp dapl.spec $(distdir) SUBDIRS = . test/dtest test/dapltest diff --git a/configure.in b/configure.in index 4eda85f..3a06640 100644 --- a/configure.in +++ b/configure.in @@ -1,11 +1,11 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT(dapl, 2.0.1, general@lists.openfabrics.org) +AC_INIT(dapl, 2.0.1-pre, general@lists.openfabrics.org) AC_CONFIG_SRCDIR([dat/udat/udat.c]) AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(dapl, 2.0.1) +AM_INIT_AUTOMAKE(dapl, 2.0.1-pre) AM_PROG_LIBTOOL @@ -86,6 +86,6 @@ AC_CACHE_CHECK(Check for RHEL5 system, ac_cv_rhel5, fi) AM_CONDITIONAL(OS_RHEL5, test "$ac_cv_rhel5" = "yes") -AC_CONFIG_FILES([Makefile test/dtest/Makefile test/dapltest/Makefile libdat2.spec]) +AC_CONFIG_FILES([Makefile test/dtest/Makefile test/dapltest/Makefile dapl.spec]) AC_OUTPUT diff --git a/libdat2.spec.in b/dapl.spec.in similarity index 93% rename from libdat2.spec.in rename to dapl.spec.in index 5f9517c..b1986e9 100644 --- a/libdat2.spec.in +++ b/dapl.spec.in @@ -37,7 +37,7 @@ %define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE} Summary: Userspace DAT and DAPL 2.0 API. -Name: dapl +Name: dapl2 Version: %ver Release: %rel%{?dist} @@ -55,7 +55,7 @@ atomic operations and rdma write with immediate data. %package devel Summary: Development files for the libdat and libdapl libraries Group: System Environment/Libraries -Requires: %{name} = %{version}.%{release} +Requires: %{name} = %{version}-%{release} %description devel Static libraries and header files for the libdat and libdapl library. @@ -63,7 +63,7 @@ Static libraries and header files for the libdat and libdapl library. %package utils Summary: Test suites for uDAPL library Group: System Environment/Libraries -Requires: %{name} = %{version}.%{release} +Requires: %{name} = %{version}-%{release} %description utils Useful test suites to validate uDAPL library API's. @@ -87,24 +87,24 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) +%defattr(-,root,root) %{_libdir}/libda*.so* %config(noreplace) %{_sysconfdir}/dat.conf %doc AUTHORS README %files devel -%defattr(-,root,root,-) +%defattr(-,root,root) %{_libdir}/*.a %{_includedir}/dat2/* %files utils -%defattr(-,root,root,-) +%defattr(-,root,root) %{_bindir}/* %{_mandir}/man1/* %changelog * Tue Sep 18 2007 Arlin Davis - 2.0.1.pre -- Coexist with DAT 1.2 libraries +- Coexist with DAT 1.2 libraries, library name changes libdat2, etc. * Wed Mar 7 2007 Arlin Davis - 2.0.0.pre - Initial release of DAT 2.0 APIs, includes IB extensions diff --git a/dapl/udapl/libdaplcma.map b/dapl/udapl/libdaplofa.map similarity index 100% rename from dapl/udapl/libdaplcma.map rename to dapl/udapl/libdaplofa.map diff --git a/dapl/udapl/libdaplscm.map b/dapl/udapl/libdaplscm.map deleted file mode 100644 index 21342c7..0000000 --- a/dapl/udapl/libdaplscm.map +++ /dev/null @@ -1,6 +0,0 @@ -DAPL_SCM_1.2 { - global: - dat_provider_fini; - dat_provider_init; - local: *; -}; diff --git a/doc/dat.conf b/doc/dat.conf index 005f9ee..12d4b58 100755 --- a/doc/dat.conf +++ b/doc/dat.conf @@ -12,15 +12,15 @@ # Simple (OpenIB-cma) default with netdev name provided first on list # to enable use of same dat.conf version on all nodes # -# Add examples for multiple interfaces and IPoIB HA fail over, and bonding +# 1.2 and 2.0 examples for multiple interfaces, IPoIB HA failover, bonding: # OpenIB-cma u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 "ib0 0" "" OpenIB-cma-1 u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 "ib1 0" "" OpenIB-cma-2 u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 "ib2 0" "" OpenIB-cma-3 u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 "ib3 0" "" OpenIB-bond u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 "bond0 0" "" -OpenIB-2-cma u2.0 nonthreadsafe default libdaplcma.so.2 dapl.2.0 "ib0 0" "" -OpenIB-2-cma-1 u2.0 nonthreadsafe default libdaplcma.so.2 dapl.2.0 "ib1 0" "" -OpenIB-2-cma-2 u2.0 nonthreadsafe default libdaplcma.so.2 dapl.2.0 "ib2 0" "" -OpenIB-2-cma-3 u2.0 nonthreadsafe default libdaplcma.so.2 dapl.2.0 "ib3 0" "" -OpenIB-2-bond u2.0 nonthreadsafe default libdaplcma.so.2 dapl.2.0 "bond0 0" "" +ofa-v2-0 u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 "ib0 0" "" +ofa-v2-1 u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 "ib1 0" "" +ofa-v2-2 u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 "ib2 0" "" +ofa-v2-3 u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 "ib3 0" "" +ofa-v2-bond u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 "bond0 0" "" diff --git a/test/dapltest/configure.in b/test/dapltest/configure.in index ebdd59d..c6b5a26 100755 --- a/test/dapltest/configure.in +++ b/test/dapltest/configure.in @@ -1,11 +1,11 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT(dapltest, 1.2.1, dapl-devel@lists.sourceforge.net) +AC_INIT(dapltest2, 1.2.1, dapl-devel@lists.sourceforge.net) AC_CONFIG_SRCDIR([$top_srcdir/dapl/test/dapltest/cmd/dapl_main.c]) AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(dapltest, 1.2.1) +AM_INIT_AUTOMAKE(dapltest2, 1.2.1) AM_PROG_LIBTOOL diff --git a/test/dapltest/mdep/linux/dapl_mdep_user.h b/test/dapltest/mdep/linux/dapl_mdep_user.h index fbaf8af..ea4e4e0 100755 --- a/test/dapltest/mdep/linux/dapl_mdep_user.h +++ b/test/dapltest/mdep/linux/dapl_mdep_user.h @@ -48,7 +48,7 @@ #endif /* Default Device Name */ -#define DT_MdepDeviceName "OpenIB-cma" +#define DT_MdepDeviceName "ofa-v2-0" /* Boolean */ typedef int bool; diff --git a/test/dtest/configure.in b/test/dtest/configure.in index 822df5e..2fca057 100755 --- a/test/dtest/configure.in +++ b/test/dtest/configure.in @@ -1,11 +1,11 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT(dtest, 1.2.1, dapl-devel@lists.sourceforge.net) +AC_INIT(dtest, 2.0 dapl-devel@lists.sourceforge.net) AC_CONFIG_SRCDIR([$top_srcdir/dapl/test/dtest/dtest.c]) AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(dtest, 1.2.1) +AM_INIT_AUTOMAKE(dtest, 2.0) AM_PROG_LIBTOOL diff --git a/test/dtest/dat.conf b/test/dtest/dat.conf deleted file mode 100644 index c40dac6..0000000 --- a/test/dtest/dat.conf +++ /dev/null @@ -1,11 +0,0 @@ -# -# DAT 1.1 and 1.2 configuration file -# -# Each entry should have the following fields: -# -# \ -# -# -# Example for openib using the first Mellanox adapter, port 1 and port 2 - -IB1 u1.2 nonthreadsafe default diff --git a/test/dtest/dtest.c b/test/dtest/dtest.c index ba12a58..adc0306 100644 --- a/test/dtest/dtest.c +++ b/test/dtest/dtest.c @@ -44,7 +44,7 @@ #include #ifndef DAPL_PROVIDER -#define DAPL_PROVIDER "OpenIB-2-cma" +#define DAPL_PROVIDER "ofa-v2-0" #endif #define MAX_POLLING_CNT 50000 diff --git a/test/dtest/dtestx.c b/test/dtest/dtestx.c index 04a0d5d..f6e077f 100755 --- a/test/dtest/dtestx.c +++ b/test/dtest/dtestx.c @@ -147,7 +147,7 @@ connect_ep(char *hostname) DAT_DTO_COMPLETION_EVENT_DATA *dto_event = &event.event_data.dto_completion_event_data; - status = dat_ia_open("OpenIB-2-cma", 8, &async_evd, &ia); + status = dat_ia_open("OpenIBv2-cma", 8, &async_evd, &ia); _OK(status, "dat_ia_open"); status = dat_pz_create(ia, &pz); -- 2.46.0