src: add pmu-tools to the src build

Change-Id: Ia9e0cbf6793a6ce5be5253f65cabd0813ff1e968
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>

diff --git a/src/Makefile b/src/Makefile
index 48d79e9..382acef 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -36,6 +36,7 @@ include mk/master.mk
 SUBDIRS =
 SUBDIRS += dpdk
 SUBDIRS += libpqos
+SUBDIRS += pmu-tools
 SUBDIRS += collectd
 SUBDIRS += collectd-ceilometer-plugin
 

diff --git a/src/collectd/Makefile b/src/collectd/Makefile
index 9dbfdcc..b7fc2a1 100644 (file)
--- a/src/collectd/Makefile
+++ b/src/collectd/Makefile
@@ -43,6 +43,7 @@ CONFIG_CMD += --enable-syslog
 CONFIG_CMD += --enable-logfile
 CONFIG_CMD += --with-libpqos=$(LIBPQOS_DIR)
 CONFIG_CMD += --with-hugepages
+CONFIG_CMD += --with-libjevents=/usr/local
 CONFIG_CMD += --enable-exec
 CONFIG_CMD += --enable-python
 CONFIG_CMD += --enable-threshold

diff --git a/src/package-list.mk b/src/package-list.mk
index 885edec..762b423 100644 (file)
--- a/src/package-list.mk
+++ b/src/package-list.mk
@@ -11,6 +11,9 @@ DPDK_TAG ?= v16.11
 LIBPQOS_URL ?= https://github.com/01org/intel-cmt-cat.git
 LIBPQOS_TAG ?= master
 
+PMUTOOLS_URL ?= https://github.com/andikleen/pmu-tools
+PMUTOOLS_TAG ?= master
+
 # collectd section
 COLLECTD_URL ?= https://github.com/collectd/collectd
 COLLECTD_TAG ?= master

diff --git a/src/pmu-tools/Makefile b/src/pmu-tools/Makefile
new file mode 100644 (file)
index 0000000..e40521f
--- /dev/null
+++ b/src/pmu-tools/Makefile
@@ -0,0 +1,81 @@
+# makefile to manage collectd package
+#
+
+# Copyright 2017 OPNFV
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Contributors:
+#   Aihua Li, Huawei Technologies.
+#   Maryam Tahhan, Intel Corporation.
+
+include ../mk/master.mk
+include ../package-list.mk
+
+WORK_DIR = pmu-tools
+TAG_DONE_FLAG = $(WORK_DIR)/.$(PMUTOOLS_TAG).done
+BUILD_CMD =
+MAKEFILE = Makefile
+
+.PHONY: install force_install force_make
+
+# install depends on make
+force_install: force_make
+
+all: force_make
+       @echo "Finished making $(WORK_DIR) "
+
+INSTALL_TARGET = force_install force_make
+
+force_make: $(WORK_DIR) $(TAG_DONE_FLAG)
+       $(AT)cd $(WORK_DIR) && git pull $(PMUTOOLS_URL) $(PMUTOOLS_TAG)
+       @echo "git pull done"
+       $(AT)cd $(WORK_DIR)/jevents
+       $(AT)sed -i 's/CFLAGS += -g -Wall -O2 -Wno-unused-result -fPIC/CFLAGS += -g -Wall -O2 -Wno-unused-result -fPIC/' $(MAKEFILE)
+       $(AT)$(MAKE) -C $(WORK_DIR)/jevents
+       @echo "Make done"
+
+force_install:
+       $(AT)sudo $(MAKE) -C $(WORK_DIR)/jevents install
+       $(AT)./$(WORK_DIR)/event_download.py
+
+install: $(INSTALL_TARGET)
+
+# hard way to clean and clobber
+clean:
+       $(AT)cd $(WORK_DIR) && git clean -xfd *.o
+
+clobber:
+       $(AT)rm -rf $(WORK_DIR)
+
+# distclean is for developer who would like to keep the
+# clone git repo, saving time to fetch again from url
+distclean:
+       $(AT)cd $(WORK_DIR) && git clean -xfd && git checkout -f
+
+test:
+       @echo "Make test in $(WORK_DIR) (stub) "
+
+sanity:
+       @echo "Make sanity in $(WORK_DIR) (stub) "
+
+$(WORK_DIR):
+       $(AT)git clone $(PMUTOOLS_URL)
+
+$(TAG_DONE_FLAG): $(WORK_DIR)
+       $(AT)cd $(WORK_DIR); git checkout $(PMUTOOLS_TAG)
+ifneq ($(PATCH_FILE),)
+       $(AT)cd $(WORK_DIR); patch -p1 < ../$(PATCH_FILE)
+endif
+       $(AT)touch $@