From 428cb2cb205f32c456608e8dae61f93f9cf7db36 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Thu, 5 Apr 2012 11:21:11 -0700 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +- patches/refresh-temp | 254 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 257 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index 28a580a..84ef2c2 100644 --- a/meta +++ b/meta @@ -1,10 +1,11 @@ Version: 1 -Previous: b17c9148dbd9096220e6ba19f6d466826132a7e5 -Head: f6dd0b57f03dc39e2c64c95be6bb4b3e0ebee467 +Previous: bf3c71abd3b5cc87dfe2371f34e7ee1574ef9af7 +Head: d5f77376d187bf8664a035828b91c5647273c475 Applied: mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9 af_ib: c366c39d4afc939932efc2f5158ae332161369bf daemonize: f6dd0b57f03dc39e2c64c95be6bb4b3e0ebee467 + refresh-temp: d5f77376d187bf8664a035828b91c5647273c475 Unapplied: rel-1.0.6: 0dbad19fe25be12e172cfad296743d831c772845 dev-name2ip: 8e00708e882239292492e13aa51c82042255933c diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 0000000..2f35c7b --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,254 @@ +Bottom: d6adbf9c14e65bd99898548a1328a5122dbfccc7 +Top: 744c795c98f620a23e0aa15ac32d34544c4b3bfc +Author: Sean Hefty +Date: 2012-04-05 11:21:11 -0700 + +Refresh of daemonize + +--- + +diff --git a/Makefile.am b/Makefile.am +index 58e3415..875889a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -23,16 +23,7 @@ EXTRA_DIST = src/acm_mad.h src/libacm.h ibacm.init \ + ibacm_addr.cfg + + install-exec-hook: +- if ! test -d $(DESTDIR)$(sysconfdir); then \ +- mkdir -p $(DESTDIR)$(sysconfdir); \ +- fi; \ +- if ! test -d $(DESTDIR)$(sysconfdir)/rdma; then \ +- mkdir -p $(DESTDIR)$(sysconfdir)/rdma; \ +- fi; \ +- if ! test -d $(DESTDIR)$(sysconfdir)/init.d; then \ +- mkdir -p $(DESTDIR)$(sysconfdir)/init.d; \ +- fi; \ +- install -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacmd; ++ install -D -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacmd; + + dist-hook: ibacm.spec + cp ibacm.spec $(distdir) +diff --git a/ibacm.init b/ibacm.init +index 2cf45fa..411bb14 100644 +--- a/ibacm.init ++++ b/ibacm.init +@@ -19,19 +19,16 @@ + # host route lookups. + ### END INIT INFO + +-PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +-prog=ibacm +-pidfile=/var/run/$prog.pid +-subsys=/var/lock/subsys/$prog +-progd=$(which $prog) ++pidfile=/var/run/ibacm.pid ++subsys=/var/lock/subsys/ibacm + + . /etc/rc.d/init.d/functions + + start() + { +- echo -n "Starting $prog daemon:" ++ echo -n "Starting ibacm daemon:" + +- daemon $progd ++ daemon ibacm + RC=$? + [ $RC -eq 0 ] && touch $subsys + echo +@@ -40,9 +37,9 @@ start() + + stop() + { +- echo -n "Stopping $prog daemon:" ++ echo -n "Stopping ibacm daemon:" + +- killproc -p $pidfile $progd ++ killproc -p $pidfile ibacm + RC=$? + rm -f $subsys + echo +diff --git a/ibacm.spec.in b/ibacm.spec.in +index 31d5a07..ee7d187 100644 +--- a/ibacm.spec.in ++++ b/ibacm.spec.in +@@ -6,7 +6,7 @@ Summary: InfiniBand Communication Manager Assistant + Group: System Environment/Daemons + License: GPLv2 or BSD + Url: http://www.openfabrics.org/ +-Source: http://www.openfabrics.org/downloads/rdmacm/%{name}-%{version}.tar.gz ++Source0: http://www.openfabrics.org/downloads/rdmacm/%{name}-%{version}.tar.gz + Source1: ibacm.init + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +@@ -16,14 +16,14 @@ Requires(preun): chkconfig + ExcludeArch: s390, s390x + + %description +-The ib_acm daemon helps reduce the load of managing path record lookups on ++The %{name} daemon helps reduce the load of managing path record lookups on + large InfiniBand fabrics by providing a user space implementation of what +-is functionally similar to an ARP cache. The use of ib_acm, when properly ++is functionally similar to an ARP cache. The use of %{name}, when properly + configured, can reduce the SA packet load of a large IB cluster from O(n^2) +-to O(n). The ib_acm daemon is started and normally runs in the background, ++to O(n). The %{name} daemon is started and normally runs in the background, + user applications need not know about this daemon as long as their app + uses librdmacm to handle connection bring up/tear down. The librdmacm +-library knows how to talk directly to the ib_acm daemon to retrieve data. ++library knows how to talk directly to the %{name} daemon to retrieve data. + + %package devel + Summary: Headers file needed when building apps to talk directly to ibacm. +@@ -33,7 +33,7 @@ Requires: %{name} = %{version}-%{release} + Most applications do not need to know how to talk directly to the ibacm + daemon, but it does have a socket that it listens on, and it has a + specific protocol for incoming/outgoing data. So if you wish to build +-the ability to communicate directly with ib_acm into your own application, ++the ability to communicate directly with %{name} into your own application, + the protocol used to communicate with it, and the data structures + involved, are in this header file. Please note that this is an unsupported + method of using this daemon. The only supported means of using this is +@@ -47,13 +47,13 @@ wish to make use of this header file. + %build + aclocal -I config && libtoolize --force --copy && autoheader && \ + automake --foreign --add-missing --copy && autoconf +-%configure --sysconfdir=/etc/rdma CFLAGS="$CXXFLAGS -fno-strict-aliasing" LDFLAGS=-lpthread ++%configure --rdmadir=rdma CFLAGS="$CXXFLAGS -fno-strict-aliasing" LDFLAGS=-lpthread + make %{?_smp_mflags} + + %install + rm -rf $RPM_BUILD_ROOT + make DESTDIR=%{buildroot} install +-install -D -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/ibacm ++install -D -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name} + %makeinstall + + %clean +@@ -61,11 +61,11 @@ rm -rf $RPM_BUILD_ROOT + + %post + if [ $1 = 1 ]; then +- chkconfig --add ibacm ++ chkconfig --add %{name} + fi + %preun + if [ $1 = 1 ]; then +- chkconfig --del ibacm ++ chkconfig --del %{name} + fi + + %files +diff --git a/man/ib_acme.1 b/man/ib_acme.1 +index a00e64e..c4915cb 100644 +--- a/man/ib_acme.1 ++++ b/man/ib_acme.1 +@@ -44,19 +44,19 @@ in its local cache. + .TP + \-A + With this option, the ib_acme utility automatically generates the address +-configuration file acm_addr.cfg. The generated file is ++configuration file ibacm_addr.cfg. The generated file is + constructed using the system host name and any IP addresses that are + assigned to IPoIB device instances. + .TP + \-O + With this option, the ib_acme utility automatically generates the option +-configuration file acm_opts.cfg. The generated file is currently generated ++configuration file ibacm_opts.cfg. The generated file is currently generated + using static information. + .TP + \-V + Enables verbose output. When combined with -A or -O options, ib_acme will + display additional details, such as generated address information saved +-to the acm_addr.cfg file. ++to the ibacm_addr.cfg file. + .SH "NOTES" + The ib_acme utility performs two main functions. With the -A and -O options, + it automatically generates address or options configuration files. The +@@ -78,4 +78,4 @@ numerical ranges inside the brackets using the following example as a + guide: node[1-3,5,7-8]. This will result in testing node1, node2, node3, + node5, node7, and node8. + .SH "SEE ALSO" +-ib_acm(7) ibacm(1) ++ibacm(7) ibacm(1) +diff --git a/man/ibacm.1 b/man/ibacm.1 +index ed4b7a5..075b98e 100644 +--- a/man/ibacm.1 ++++ b/man/ibacm.1 +@@ -16,11 +16,13 @@ needed to establish a connection, but does not implement the CM protocol. + A primary user of the ibacm service is the librdmacm library. This + enables applications to make use of the ibacm service without code + changes or needing to be aware that the service is in use. +-The librdmacm can invoke IB ACM services when built using the --with-ib_acm +-option. The IB ACM services tie in under the rdma_resolve_addr, +-rdma_resolve_route, and rdma_getaddrinfo routines. For maximum benefit, +-the rdma_getaddrinfo routine should be used, however existing applications +-should still see significant connection scaling benefits using the calls ++librdmacm versions 1.0.12 - 1.0.15 can invoke IB ACM services when built using ++the --with-ib_acm option. Version 1.0.16 and newer of librdmacm will automatically ++use the IB ACM if it is installed. The IB ACM services tie in under the ++rdma_resolve_addr, rdma_resolve_route, and rdma_getaddrinfo routines. ++For maximum benefit, the rdma_getaddrinfo routine should be used, ++however existing applications should still see significant connection ++scaling benefits using the calls + available in librdmacm 1.0.11 and previous releases. + .P + The IB ACM is focused on being scalable and efficient. The current +@@ -36,16 +38,19 @@ and are available for Linux and Windows. Additional details are given below. + The IB stack should be running with IPoIB configured. + These steps assume that the user has administrative privileges. + .P +-2. Install the IB ACM package. This installs ibacm, and ib_acme. ++2. Install the IB ACM package. This installs ibacm, ib_acme, and init.d scripts. + .P + 3. Run 'ibacm' as administrator to start the ibacm daemon. + .P + 4. Optionally, run 'ib_acme -d -v' to verify that + the ibacm service is running. + .P +-5. Install librdmacm using the build option --with-ib_acm. ++5. Install librdmacm, using the build option --with-ib_acm if needed. + The librdmacm will automatically use the ibacm service. + On failures, the librdmacm will fall back to normal resolution. ++.P ++6. You can use ib_acme -P to gather performance statistics from the local ibacm ++daemon to see if the service is working correctly. + .SH "NOTES" + ib_acme: + .P +@@ -55,19 +60,19 @@ protocol is usable for a given cluster configuration. Additionally, + it automatically generates ibacm configuration files to assist with + or eliminate manual setup. + .P +-acm configuration files: ++ibacm configuration files: + .P + The ibacm service relies on two configuration files. + .P +-The acm_addr.cfg file contains name and address mappings for each IB +- endpoint. Although the names in the acm_addr.cfg ++The ibacm_addr.cfg file contains name and address mappings for each IB ++ endpoint. Although the names in the ibacm_addr.cfg + file can be anything, ib_acme maps the host name and IP addresses to + the IB endpoints. If the address file cannot be found, the ibacm + service will attempt to create one using default values. + .P +-The acm_opts.cfg file provides a set of configurable options for the ++The ibacm_opts.cfg file provides a set of configurable options for the + ibacm service, such as timeout, number of retries, logging level, etc. +-ib_acme generates the acm_opts.cfg file using static information. If ++ib_acme generates the ibacm_opts.cfg file using static information. If + an option file cannot be found, ibacm will use default values. + .P + ibacm: +@@ -95,7 +100,7 @@ Specifically, all IB endpoints join a number of multicast groups. + Multicast groups differ based on rates, mtu, sl, etc., and are prioritized. + All participating endpoints must be able to communicate on the lowest + priority multicast group. The ibacm assigns one or more names/addresses +-to each IB endpoint using the acm_addr.cfg file. Clients provide source ++to each IB endpoint using the ibacm_addr.cfg file. Clients provide source + and destination names or addresses as input to the service, and receive + as output path record data. + .P -- 2.46.0