Merge branch 'measuring'

Removing measuring branch. Idea was to make measuring configuration
separate from master. But keeping changes in master and measuring
branch consistent was pain.

10 files changed, 128 insertions, 2 deletions

diff --git a/root/cyclictest/.br-external b/root/cyclictest/.br-external
new file mode 100644
index 0000000..008a945
--- /dev/null
+++ b/root/cyclictest/.br-external
@@ -0,0 +1 @@
+BR2_EXTERNAL ?= /home/kocikare/linux-conf-perf/root/cyclictest/packages
diff --git a/root/cyclictest/.config b/root/cyclictest/.config
index 9691d02..0b86ab6 100644
--- a/root/cyclictest/.config
+++ b/root/cyclictest/.config
@@ -358,7 +358,7 @@ BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS=y
 # BR2_PACKAGE_PV is not set
 # BR2_PACKAGE_RAMSMP is not set
 # BR2_PACKAGE_RAMSPEED is not set
-BR2_PACKAGE_RT_TESTS=y
+# BR2_PACKAGE_RT_TESTS is not set
 # BR2_PACKAGE_SPIDEV_TEST is not set
 # BR2_PACKAGE_STRACE is not set
 # BR2_PACKAGE_STRESS is not set
@@ -1655,3 +1655,8 @@ BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION=""
 # BR2_PACKAGE_INPUT_TOOLS_EVTEST is not set
 # BR2_BFIN_FDPIC is not set
 # BR2_BFIN_FLAT is not set
+
+#
+# User-provided options
+#
+BR2_PACKAGE_RT_TESTS_MASTER=y
diff --git a/root/cyclictest/.gitignore b/root/cyclictest/.gitignore
index cf36401..482619e 100644
--- a/root/cyclictest/.gitignore
+++ b/root/cyclictest/.gitignore
@@ -2,5 +2,8 @@
 !.config
 !.gitignore
 !GNUmakefile
-!prepare_boot
+!.br-external
 !overlay/
+!overlay/**
+!packages/
+!packages/**
diff --git a/root/cyclictest/overlay/etc/init.d/S90lcp b/root/cyclictest/overlay/etc/init.d/S90lcp
new file mode 100755
index 0000000..b5a9076
--- /dev/null
+++ b/root/cyclictest/overlay/etc/init.d/S90lcp
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/sbin/lcpinit
diff --git a/root/cyclictest/overlay/sbin/lcpinit b/root/cyclictest/overlay/sbin/lcpinit
new file mode 100755
index 0000000..e2c1f78
--- /dev/null
+++ b/root/cyclictest/overlay/sbin/lcpinit
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cyclictest -n -p99 -t3 -l10000 -q | sed 's/^/! /' | sed 's/$/ ok/'
+
+echo "NOVABOOT EXIT LINUX-CONF-PERF"
diff --git a/root/cyclictest/packages/Config.in b/root/cyclictest/packages/Config.in
new file mode 100644
index 0000000..45dad4f
--- /dev/null
+++ b/root/cyclictest/packages/Config.in
@@ -0,0 +1 @@
+source "$BR2_EXTERNAL/rt-tests-master/Config.in"
diff --git a/root/cyclictest/packages/external.mk b/root/cyclictest/packages/external.mk
new file mode 100644
index 0000000..d37f28a
--- /dev/null
+++ b/root/cyclictest/packages/external.mk
@@ -0,0 +1 @@
+include $(BR2_EXTERNAL)/rt-tests-master/rt-tests-master.mk
diff --git a/root/cyclictest/packages/rt-tests-master/0001-Comment-undeclared-calls.patch b/root/cyclictest/packages/rt-tests-master/0001-Comment-undeclared-calls.patch
new file mode 100644
index 0000000..c593705
--- /dev/null
+++ b/root/cyclictest/packages/rt-tests-master/0001-Comment-undeclared-calls.patch
@@ -0,0 +1,34 @@
+From 3e6052ef340c939d689b7a69909c74d38915cee9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <kocikare@fel.cvut.cz>
+Date: Tue, 11 Aug 2015 18:31:12 +0200
+Subject: [PATCH] Comment undeclared calls
+
+Those calls seems to be uninplemented or missing while compiling on
+powerpc architecture.
+---
+ src/lib/rt-sched.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/rt-sched.c b/src/lib/rt-sched.c
+index 4a8e3c4..4984735 100644
+--- a/src/lib/rt-sched.c
++++ b/src/lib/rt-sched.c
+@@ -31,7 +31,7 @@ int sched_setattr(pid_t pid,
+ 		  const struct sched_attr *attr,
+ 		  unsigned int flags)
+ {
+-	return syscall(__NR_sched_setattr, pid, attr, flags);
++	//return syscall(__NR_sched_setattr, pid, attr, flags);
+ }
+ 
+ int sched_getattr(pid_t pid,
+@@ -39,5 +39,5 @@ int sched_getattr(pid_t pid,
+ 		  unsigned int size,
+ 		  unsigned int flags)
+ {
+-        return syscall(__NR_sched_getattr, pid, attr, size, flags);
++        //return syscall(__NR_sched_getattr, pid, attr, size, flags);
+ }
+-- 
+2.1.4
+
diff --git a/root/cyclictest/packages/rt-tests-master/Config.in b/root/cyclictest/packages/rt-tests-master/Config.in
new file mode 100644
index 0000000..a54eb3a
--- /dev/null
+++ b/root/cyclictest/packages/rt-tests-master/Config.in
@@ -0,0 +1,34 @@
+config BR2_PACKAGE_RT_TESTS_MASTER
+	bool "rt-tests-master"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
+	help
+	  This is additional copy of rt-test package to provide
+	  master version of rt-tests.
+
+	  Set of utilities for testing the real-time behaviour of a
+	  Linux system.
+
+	  All tools are simple C programs with no dependencies, except
+	  the hwlatdetect utility, which is a Python script and
+	  therefore requires the Python interpreter. It will only be
+	  installed if a Python interpreter has been selected in the
+	  Buildroot configuration.
+
+	  Note that this package requires a toolchain built with the
+	  NPTL implementation of the pthread API (this is always the
+	  case with glibc/eglibc toolchains, but may not necessarily
+	  be the case with uClibc toolchains, since the thread
+	  implementation is configurable).
+
+	  http://rt.wiki.kernel.org
+
+
+comment "rt-tests may not work on MIPS with an external uClibc toolchain"
+	depends on BR2_PACKAGE_RT_TESTS_MASTER
+	depends on BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+
+comment "rt-tests needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU
diff --git a/root/cyclictest/packages/rt-tests-master/rt-tests-master.mk b/root/cyclictest/packages/rt-tests-master/rt-tests-master.mk
new file mode 100644
index 0000000..82fe53e
--- /dev/null
+++ b/root/cyclictest/packages/rt-tests-master/rt-tests-master.mk
@@ -0,0 +1,39 @@
+################################################################################
+#
+# rt-tests
+#
+################################################################################
+
+RT_TESTS_MASTER_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git
+RT_TESTS_MASTER_VERSION = v0.92
+RT_TESTS_MASTER_LICENSE = GPLv2+
+RT_TESTS_MASTER_LICENSE_FILES = COPYING
+
+ifeq ($(BR2_PACKAGE_PYTHON),y)
+RT_TESTS_MASTER_DEPENDENCIES = python
+endif
+
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),y)
+RT_TESTS_MASTER_HAVE_NPTL=yes
+else
+RT_TESTS_MASTER_HAVE_NPTL=no
+endif
+
+define RT_TESTS_MASTER_BUILD_CMDS
+	$(MAKE) -C $(@D) 			\
+		CC="$(TARGET_CC)" 		\
+		HAVE_NPTL=$(RT_TESTS_MASTER_HAVE_NPTL)	\
+		CFLAGS="$(TARGET_CFLAGS)"	\
+		prefix=/usr NUMA=0
+endef
+
+define RT_TESTS_MASTER_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) 				\
+		HAVE_NPTL=$(RT_TESTS_MASTER_HAVE_NPTL)		\
+		DESTDIR="$(TARGET_DIR)" 		\
+		prefix=/usr 				\
+		$(if $(BR2_PACKAGE_PYTHON),HASPYTHON=1 PYLIB=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/) \
+		install
+endef
+
+$(eval $(generic-package))