Integrated OPA in Makefile (v. 10.9.3.1.1/ libopamgt 0.4.0) + changed boost source link

config.mk

@@ -3,7 +3,7 @@ DCDBDEPSPATH ?= $(DCDBBASEPATH)/deps
 DCDBDEPLOYPATH ?= $(DCDBBASEPATH)/install
 
 # dcdbpusher plugins to be built
-PLUGINS = procfs pdu sysfs ipmi bacnet snmp gpfsmon msr tester
+PLUGINS = procfs pdu sysfs opa ipmi bacnet snmp gpfsmon msr tester
 
 # data analytics plugins to be built
 OPERATORS = aggregator regressor job_aggregator testeroperator filesink smucngperf persystsql

dcdbpusher/Makefile

@@ -105,8 +105,8 @@ libdcdbplugin_tester.$(LIBEXT): sensors/tester/TesterSensorGroup.o sensors/teste
 libdcdbplugin_gpfsmon.$(LIBEXT): sensors/gpfsmon/GpfsmonSensorGroup.o sensors/gpfsmon/GpfsmonConfigurator.o
 	$(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system
 
-#libdcdbplugin_opa.$(LIBEXT): sensors/opa/OpaSensorGroup.o sensors/opa/OpaConfigurator.o
-#	$(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lopamgt -libverbs -libumad -lssl
+libdcdbplugin_opa.$(LIBEXT): sensors/opa/OpaSensorGroup.o sensors/opa/OpaConfigurator.o
+	$(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lopamgt -lssl
 
 libdcdbplugin_msr.$(LIBEXT): sensors/msr/MSRSensorGroup.o sensors/msr/MSRConfigurator.o
 	$(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system

dependencies.mk

@@ -11,12 +11,15 @@ GPG-ERROR_VERSION = 1.36
 NET-SNMP_VERSION = 5.8
 OPENCV_VERSION = 4.1.0
 MARIADBCONNECTOR_VERSION = 3.1.3
+OPASTACK_VERSION = 10.9.3.1.1
+LIBOPA_VERSION = 0.4.0
 
 BOOST_VERSION_U   = $(subst .,_,$(BOOST_VERSION))
+OPASTACK_VERSION_H = $(subst .1.1,.1-1,$(OPASTACK_VERSION))
 
 DISTFILES = apache-cassandra-$(CASSANDRA_VERSION).tar.gz;http://archive.apache.org/dist/cassandra/$(CASSANDRA_VERSION)/apache-cassandra-$(CASSANDRA_VERSION)-bin.tar.gz \
             mosquitto-$(MOSQUITTO_VERSION).tar.gz;http://mosquitto.org/files/source/mosquitto-$(MOSQUITTO_VERSION).tar.gz \
-            boost_$(BOOST_VERSION_U).tar.gz;https://sourceforge.net/projects/boost/files/boost/$(BOOST_VERSION)/boost_$(BOOST_VERSION_U).tar.gz \
+            boost_$(BOOST_VERSION_U).tar.gz;https://dl.bintray.com/boostorg/release/$(BOOST_VERSION)/source/boost_$(BOOST_VERSION_U).tar.gz \
             openssl-$(OPENSSL_VERSION).tar.gz;https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz \
             libuv-v$(LIBUV_VERSION).tar.gz;https://dist.libuv.org/dist/v$(LIBUV_VERSION)/libuv-v$(LIBUV_VERSION).tar.gz \
             cpp-driver-$(CPPDRV_VERSION).tar.gz;https://github.com/datastax/cpp-driver/archive/$(CPPDRV_VERSION).tar.gz \
@@ -26,8 +29,8 @@ DISTFILES = apache-cassandra-$(CASSANDRA_VERSION).tar.gz;http://archive.apache.o
             freeipmi-$(FREEIPMI_VERSION).tar.gz;http://ftp.gnu.org/gnu/freeipmi/freeipmi-$(FREEIPMI_VERSION).tar.gz \
             net-snmp-$(NET-SNMP_VERSION).tar.gz;https://sourceforge.net/projects/net-snmp/files/net-snmp/$(NET-SNMP_VERSION)/net-snmp-$(NET-SNMP_VERSION).tar.gz/download \
             opencv-$(OPENCV_VERSION).tar.gz;https://github.com/opencv/opencv/archive/$(OPENCV_VERSION).tar.gz \
-            mariadb-connector-c-$(MARIADBCONNECTOR_VERSION)-src.tar.gz;https://downloads.mariadb.com/Connectors/c/connector-c-$(MARIADBCONNECTOR_VERSION)/mariadb-connector-c-$(MARIADBCONNECTOR_VERSION)-src.tar.gz
-            
+            mariadb-connector-c-$(MARIADBCONNECTOR_VERSION)-src.tar.gz;https://downloads.mariadb.com/Connectors/c/connector-c-$(MARIADBCONNECTOR_VERSION)/mariadb-connector-c-$(MARIADBCONNECTOR_VERSION)-src.tar.gz \
+            IntelOPA-Basic.SLES123-x86_64.$(OPASTACK_VERSION).tgz;https://downloadmirror.intel.com/28866/eng/IntelOPA-Basic.SLES123-x86_64.$(OPASTACK_VERSION).tgz
             
 
 DISTFILES_HASHES = apache-cassandra-3.0.18.tar.gz|94dbdaa58b366166c53f881b8e266bc8;\
@@ -42,6 +45,7 @@ DISTFILES_HASHES = apache-cassandra-3.0.18.tar.gz|94dbdaa58b366166c53f881b8e266b
                    freeipmi-1.6.3.tar.gz|b2d97e20db9b81b460ce1b9dad5bf54e;\
                    net-snmp-5.8.tar.gz|63bfc65fbb86cdb616598df1aff6458a; \
                    opencv-4.1.0.tar.gz|b80c59c7e4feee6a00608315e02b0b73; \
+                   IntelOPA-Basic.SLES123-x86_64.10.9.3.1.1.tgz|b87ff694b5ad1d691a874860bdbe2c31; \
                    mariadb-connector-c-3.1.3-src.tar.gz|384817d60cd890f83c5c9673bfa11a8b;
 
 CASSANDRA_CLUSTER_NAME                 = Datacenter Monitor Database
@@ -58,7 +62,7 @@ FETCH = wget -c --no-check-certificate -O
 MD5 = $(if $(shell which md5 2>/dev/null),md5,$(if $(shell md5sum --tag Makefile 2&> /dev/null || true),md5sum --tag,openssl md5))
 DISTFILESNAMES = $(foreach f,$(DISTFILES),$(shell echo "$(f)" | sed 's/;.*//'))
 DISTFILESPATHS_FULL = $(foreach f,$(DISTFILES),$(shell echo "$(f)" | sed 's/.tar.gz;.*//; s/.tgz;.*//; s/.zip;.*//' ))
-DISTFILESPATHS = apache-cassandra-$(CASSANDRA_VERSION) mosquitto-$(MOSQUITTO_VERSION) boost_$(BOOST_VERSION_U) openssl-$(OPENSSL_VERSION) libuv-v$(LIBUV_VERSION) cpp-driver-$(CPPDRV_VERSION) opencv-$(OPENCV_VERSION) mariadb-connector-c-$(MARIADBCONNECTOR_VERSION)-src 
+DISTFILESPATHS = apache-cassandra-$(CASSANDRA_VERSION) mosquitto-$(MOSQUITTO_VERSION) boost_$(BOOST_VERSION_U) openssl-$(OPENSSL_VERSION) libuv-v$(LIBUV_VERSION) cpp-driver-$(CPPDRV_VERSION) opencv-$(OPENCV_VERSION) mariadb-connector-c-$(MARIADBCONNECTOR_VERSION)-src IntelOPA-Basic.SLES123-x86_64.$(OPASTACK_VERSION)
 ifneq (,$(findstring bacnet,$(PLUGINS)))
  	DISTFILESPATHS += bacnet-stack-$(BACNET-STACK_VERSION) 
 endif
@@ -122,7 +126,13 @@ $(DCDBDEPSPATH)/%/.extracted: | $(DCDBDEPSPATH)/distfiles/$$(call getarchive,%)
 		else \
 			cd $(DCDBDEPSPATH) && tar xf distfiles/$(F) > /dev/null; \
 		fi; \
-	fi 
+		if [ $(F) = "IntelOPA-Basic.SLES123-x86_64.$(OPASTACK_VERSION).tgz" ]; then \
+			echo "Extracting OPA Library and Headers..."; \
+			cd $(DCDBDEPSPATH)/IntelOPA-Basic.SLES123-x86_64.$(OPASTACK_VERSION)/IntelOPA-Tools.SLES123-x86_64.$(OPASTACK_VERSION)/RPMS/x86_64/; \
+			rpm2cpio opa-libopamgt-$(OPASTACK_VERSION_H).x86_64.rpm | cpio -idmv; \
+			rpm2cpio opa-libopamgt-devel-$(OPASTACK_VERSION_H).x86_64.rpm | cpio -idmv; \
+		fi; \
+	fi
 	@touch $@
 
 $(DCDBDEPSPATH)/%/.patched: $(DCDBDEPSPATH)/%/.extracted
@@ -284,12 +294,24 @@ $(DCDBDEPSPATH)/opencv-$(OPENCV_VERSION)/.built: $(DCDBDEPSPATH)/opencv-$(OPENCV
 	@echo "Building OpenCV library..."
 	cd $(@D) && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$(DCDBDEPLOYPATH) -DCMAKE_INSTALL_LIBDIR=lib -DINSTALL_C_EXAMPLES=OFF -DBUILD_EXAMPLES=OFF -DBUILD_LIST=core,dnn,features2d,flann,gapi,ml ..
 	cd $(@D) && cd build && make -j $(MAKETHREADS) && touch $(@)
-	
+
 $(DCDBDEPSPATH)/opencv-$(OPENCV_VERSION)/.installed: $(DCDBDEPSPATH)/opencv-$(OPENCV_VERSION)/.built | $(DCDBDEPLOYPATH)
 	@echo ""
 	@echo "Installing OpenCV library..."
 	cd $(@D) && cd build && make install && touch $(@)
-	
+
+$(DCDBDEPSPATH)/IntelOPA-Basic.SLES123-x86_64.$(OPASTACK_VERSION)/.built: $(DCDBDEPSPATH)/IntelOPA-Basic.SLES123-x86_64.$(OPASTACK_VERSION)/.patched
+	@touch $(@)
+
+$(DCDBDEPSPATH)/IntelOPA-Basic.SLES123-x86_64.$(OPASTACK_VERSION)/.installed: $(DCDBDEPSPATH)/IntelOPA-Basic.SLES123-x86_64.$(OPASTACK_VERSION)/.built | $(DCDBDEPLOYPATH)
+	@echo ""
+	@echo "Installing Intel OPA library..."
+	cp -a $(DCDBDEPSPATH)/IntelOPA-Basic.SLES123-x86_64.$(OPASTACK_VERSION)/IntelOPA-Tools.SLES123-x86_64.$(OPASTACK_VERSION)/RPMS/x86_64/usr/include/opamgt $(DCDBDEPLOYPATH)/include/ && \
+	mv $(DCDBDEPLOYPATH)/include/opamgt/iba $(DCDBDEPLOYPATH)/include/ && \
+	cp -a $(DCDBDEPSPATH)/IntelOPA-Basic.SLES123-x86_64.$(OPASTACK_VERSION)/IntelOPA-Tools.SLES123-x86_64.$(OPASTACK_VERSION)/RPMS/x86_64/usr/lib/* $(DCDBDEPLOYPATH)/lib/ && \
+	ln -sr $(DCDBDEPLOYPATH)/lib/libopamgt.so.$(LIBOPA_VERSION) $(DCDBDEPLOYPATH)/lib/libopamgt.so.0 && \
+	touch $(@)
+
 $(DCDBDEPSPATH)/mariadb-connector-c-$(MARIADBCONNECTOR_VERSION)-src/.built: $(DCDBDEPSPATH)/mariadb-connector-c-$(MARIADBCONNECTOR_VERSION)-src/.patched
 	@echo ""
 	@echo "Building MariaDB Connector...";

patches/IntelOPA-Basic.SLES123-x86_64.10.9.3.1.1.patch

+--- IntelOPA-Basic.SLES123-x86_64.10.9.3.1.1/IntelOPA-Tools.SLES123-x86_64.10.9.3.1.1/RPMS/x86_64/usr/include/opamgt/opamgt.h	2019-11-22 14:31:35.000000000 +0100
++++ IntelOPA-Basic.SLES123-x86_64.10.9.3.1.1/IntelOPA-Tools.SLES123-x86_64.10.9.3.1.1/RPMS/x86_64/usr/include/opamgt/opamgt.h	2019-11-22 14:45:42.000000000 +0100
+@@ -39,8 +39,8 @@
+ #include <stdint.h>
+ #include <stdio.h>
+ #include <iba/stl_types.h>
+-#include <infiniband/umad.h>
+-#include <infiniband/verbs.h>
++//#include <infiniband/umad.h>
++//#include <infiniband/verbs.h>
+ 
+ typedef uint32_t OMGT_STATUS_T;
+ 
+@@ -69,6 +69,8 @@
+ 
+ #define OMGT_STATUS_COUNT                   0x16 /* should be the last value */
+ 
++#define UMAD_CA_NAME_LEN 20
++#define IBV_SYSFS_NAME_MAX 64
+ 
+ /* opaque data defined internally */
+ struct omgt_port;