WIP: minor updates

Author: marc-casavant

scripts/docker/build/ubuntu24/Dockerfile.cb

@@ -32,6 +32,34 @@ RUN apt-get update && \
     rm -r /var/lib/apt/lists/*
 
 
+#
+#  Install profiling tools
+#
+RUN apt-get update && \
+    apt-get install $APT_OPTS \
+        libgoogle-perftools-dev \
+        google-perftools \
+        valgrind \
+        heaptrack \
+        psmisc \
+        kcachegrind \
+        kio \
+        libkf5iconthemes5 \
+        libkf5parts5 \
+        libkf5textwidgets5 \
+        libqt5gui5 \
+        libqt5widgets5 && \
+    apt-get clean && \
+    rm -r /var/lib/apt/lists/*
+
+#
+#  Install FlameGraph scripts
+#
+RUN git clone --depth 1 https://github.com/brendangregg/FlameGraph /opt/flamegraph \
+    && chmod +x /opt/flamegraph/*.pl /opt/flamegraph/*.sh
+
+ENV PATH="/opt/flamegraph:${PATH}"
+
 #
 #  Set up NetworkRADIUS extras repository
 #
@@ -81,12 +109,15 @@ RUN git clone --depth 1 --no-single-branch ${source}
 
 #
 #  Install build dependencies for all branches from v4 onwards
+#  Debian sid fails if debian/control doesn't exist due to an issue
+#  in one of the included make files, so we create a blank file.
 #
 WORKDIR freeradius-server
 RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[4-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \
     do \
         git checkout $i; \
         if [ -e ./debian/control.in ] ; then \
+	    touch -t 202001010000 debian/control; \
             debian/rules debian/control ; \
         fi ; \
         mk-build-deps -irt"apt-get -o Debug::pkgProblemResolver=yes $APT_OPTS" debian/control ; \

scripts/docker/crossbuild.mk

@@ -41,7 +41,7 @@ endif
 CB_IPREFIX:=freeradius40x-build
 CB_CPREFIX:=fr40x-crossbuild-
 
-PROFILING_PROFILE ?= valgrind-callgrind
+PROFILE ?= valgrind-callgrind
 
 #
 #  This Makefile is included in-line, and not via the "boilermake"
@@ -94,21 +94,21 @@ crossbuild.help: crossbuild.info
 	@echo "    crossbuild.IMAGE.wipe    - remove Docker image"
 	@echo ""
 	@echo "Profiling targets:"
-	@echo "    crossbuild.IMAGE.profregen              - regenerate Dockerfile.prof using default profile ($(PROFILING_PROFILE))"
-	@echo "    crossbuild.IMAGE.profregen PROFILING_PROFILE=<name>  - regenerate using a specific profile"
-	@echo "    crossbuild.IMAGE.profbuild              - build profiling image using default profile ($(PROFILING_PROFILE))"
-	@echo "    crossbuild.IMAGE.profbuild PROFILING_PROFILE=<name>  - build using a specific profile"
+	@echo "    crossbuild.IMAGE.profregen              - regenerate Dockerfile.prof using default profile ($(PROFILE))"
+	@echo "    crossbuild.IMAGE.profregen PROFILE=<name>  - regenerate using a specific profile"
+	@echo "    crossbuild.IMAGE.profbuild              - build profiling image using default profile ($(PROFILE))"
+	@echo "    crossbuild.IMAGE.profbuild PROFILE=<name>  - build using a specific profile"
 	@echo ""
 	@echo "Available profiling profiles (scripts/docker/profiling/profiles/):"
 	@echo "    valgrind-callgrind       - callgrind call graph and instruction profiling"
 	@echo "    valgrind-massif          - FUTURE: massif heap memory profiling"
 	@echo "    gperftools-cpu           - FUTURE: gperftools CPU profiling"
 	@echo ""
-	@echo "Profiling image profregen/profbuild examples:"
+	@echo "Profiling examples:"
 	@echo "    make crossbuild.ubuntu24.profregen"
-	@echo "    make crossbuild.ubuntu24.profregen PROFILING_PROFILE=valgrind-callgrind"
+	@echo "    make crossbuild.ubuntu24.profregen PROFILE=valgrind-callgrind"
 	@echo "    make crossbuild.ubuntu24.profbuild"
-	@echo "    make crossbuild.ubuntu24.profbuild PROFILING_PROFILE=gperftools-cpu"
+	@echo "    make crossbuild.ubuntu24.profbuild PROFILE=gperftools-cpu"
 	@echo ""
 	@echo "Use 'make NOCACHE=1 ...' to disregard the Docker cache on build"
 
@@ -169,9 +169,9 @@ crossbuild.${1}.profbuild: $(DD)/stamp-image.${1}-profbuild
 $(DD)/stamp-image.${1}-profbuild: $(DT)/${1}/Dockerfile.prof
 	${Q}echo "BUILD ${1} ($(CB_IPREFIX)/${1}-prof) > $(DD)/build.${1}-profbuild"
 	${Q}docker build $(DOCKER_BUILD_OPTS) . \
-    	-f $(DT)/${1}/Dockerfile.prof \
-	    -t $(CB_IPREFIX)/${1}-prof \
-	    >$(DD)/build.${1}-profbuild 2>&1
+		-f $(DT)/${1}/Dockerfile.prof \
+		-t $(CB_IPREFIX)/${1}-prof \
+		>$(DD)/build.${1}-profbuild 2>&1
 	${Q}touch $(DD)/stamp-image.${1}-profbuild
 
 #
@@ -295,7 +295,7 @@ $(DT)/${1}/Dockerfile.prof: $(DOCKER_TMPL) $(CB_DIR)/m4/profiling.deb.m4 $(CB_DI
 	    -D D_NAME=${1} \
 	    -D D_TYPE=profiling \
 	    -D CB_IMAGE=$(CB_IPREFIX)/${1} \
-	    -D PROFILING_PROFILE_NAME=$(PROFILING_PROFILE) \
+	    -D PROFILE_NAME=$(PROFILE) \
 	    $$< > $$@
 
 #

scripts/docker/m4/profiling.deb.m4

@@ -2,7 +2,7 @@ ARG from=CB_IMAGE
 FROM ${from}
 
 # Copy profiling profile scripts into the container
-COPY scripts/docker/profiling/profiles/PROFILING_PROFILE_NAME /profiling
+COPY scripts/docker/profiling/profiles/PROFILE_NAME /profiling
 
 RUN /profiling/configure-cmd
 RUN make

scripts/docker/m4/profiling.rpm.m4

@@ -2,10 +2,11 @@ ARG from=CB_IMAGE
 FROM ${from}
 
 # Copy profiling profile scripts into the container
-COPY /scripts/docker/profiling/profiles/PROFILING_PROFILE_NAME /profiling
+COPY scripts/docker/profiling/profiles/PROFILE_NAME /profiling
 
 RUN /profiling/configure-cmd
 RUN make
+RUN make install
 
 WORKDIR /
 COPY scripts/docker/etc/docker-entrypoint.sh.PKG_TYPE docker-entrypoint.sh