WIP: initial edits to support new profiling image builds

Author: marc-casavant

scripts/docker/crossbuild.mk

@@ -26,7 +26,8 @@ DD:=$(CB_DIR)/crossbuild
 DOCKER_TMPL:=$(CB_DIR)/m4/Dockerfile.m4
 
 # List of all the docker images (sorted for "crossbuild.info")
-CB_IMAGES:=$(sort $(patsubst $(DT)/%,%,$(wildcard $(DT)/*)))
+CB_IMAGES := $(sort $(filter-out profiling,\
+    $(patsubst $(DT)/%,%,$(wildcard $(DT)/*/))))
 
 # Location of the .git dir (may be different for e.g. submodules)
 GITDIR:=$(shell perl -MCwd -e 'print Cwd::abs_path shift' $$(git rev-parse --git-dir))
@@ -40,6 +41,8 @@ endif
 CB_IPREFIX:=freeradius40x-build
 CB_CPREFIX:=fr40x-crossbuild-
 
+PROFILING_PROFILE ?= valgrind-callgrind
+
 #
 #  This Makefile is included in-line, and not via the "boilermake"
 #  wrapper.  But it's still useful to use the same process for
@@ -90,6 +93,23 @@ crossbuild.help: crossbuild.info
 	@echo "    crossbuild.IMAGE.clean   - stop container and tidy up"
 	@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 ""
+	@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 "    make crossbuild.ubuntu24.profregen"
+	@echo "    make crossbuild.ubuntu24.profregen PROFILING_PROFILE=valgrind-callgrind"
+	@echo "    make crossbuild.ubuntu24.profbuild"
+	@echo "    make crossbuild.ubuntu24.profbuild PROFILING_PROFILE=gperftools-cpu"
+	@echo ""
 	@echo "Use 'make NOCACHE=1 ...' to disregard the Docker cache on build"
 
 #
@@ -140,6 +160,20 @@ $(DD)/stamp-image.${1}:
 	${Q}docker build $(DOCKER_BUILD_OPTS) $(DT)/${1} -f $(DT)/${1}/Dockerfile.cb -t $(CB_IPREFIX)/${1} >$(DD)/build.${1} 2>&1
 	${Q}touch $(DD)/stamp-image.${1}
 
+#
+#  Build the profiling image
+#
+.PHONY: crossbuild.${1}.profbuild
+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) $(DT)/${1} \
+	    -f $(DT)/${1}/Dockerfile.prof \
+	    -t $(CB_IPREFIX)/${1}-prof \
+	    >$(DD)/build.${1}-profbuild 2>&1
+	${Q}touch $(DD)/stamp-image.${1}-profbuild
+
 #
 #  Start up the docker container
 #
@@ -249,6 +283,21 @@ $(DT)/${1}/Dockerfile.cb: $(DOCKER_TMPL) $(CB_DIR)/m4/crossbuild.deb.m4 $(CB_DIR
 	${Q}echo REGEN ${1}
 	${Q}m4 -I $(CB_DIR)/m4 -D D_NAME=${1} -D D_TYPE=crossbuild $$< > $$@
 
+#
+#  Regenerate Dockerfile.prof from m4 template
+#
+.PHONY: crossbuild.${1}.profregen
+crossbuild.${1}.profregen: $(DT)/${1}/Dockerfile.prof
+
+$(DT)/${1}/Dockerfile.prof: $(DOCKER_TMPL) $(CB_DIR)/m4/profiling.deb.m4 $(CB_DIR)/m4/profiling.rpm.m4
+	${Q}echo REGEN ${1}
+	${Q}m4 -I $(CB_DIR)/m4 \
+	    -D D_NAME=${1} \
+	    -D D_TYPE=profiling \
+	    -D CB_IMAGE=$(CB_IPREFIX)/${1} \
+	    -D PROFILING_PROFILE_NAME=$(PROFILING_PROFILE) \
+	    $$< > $$@
+
 #
 #  Run the build test
 #

scripts/docker/docker.mk

@@ -22,7 +22,7 @@ DT:=$(CB_DIR)/build
 DOCKER_TMPL:=$(CB_DIR)/m4/Dockerfile.m4
 
 # List of all the docker images (sorted for "docker.info")
-IMAGES:=$(sort $(patsubst $(DT)/%,%,$(wildcard $(DT)/*)))
+IMAGES:=$(sort $(filter-out profiling,$(patsubst $(DT)/%,%,$(wildcard $(DT)/*))))
 
 # Don't use the Docker cache if asked
 ifneq "$(NOCACHE)" ""

scripts/docker/m4/crossbuild.deb.m4

@@ -27,6 +27,24 @@ 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
+
 #
 #  Set up NetworkRADIUS extras repository
 #

scripts/docker/m4/profiling.deb.m4

@@ -0,0 +1,16 @@
+ARG from=CB_IMAGE
+FROM ${from}
+
+# Copy profiling profile scripts into the container
+COPY /scripts/docker/profiling/profiles/PROFILING_PROFILE_NAME /profiling
+
+RUN /profiling/configure-cmd
+RUN make
+
+WORKDIR /
+COPY scripts/docker/etc/docker-entrypoint.sh.PKG_TYPE docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+EXPOSE 1812/udp 1813/udp
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["/profiling/start-cmd"]

scripts/docker/profiling/profiles/valgrind-callgrind/configure-cmd

@@ -0,0 +1,4 @@
+#!/bin/sh
+./configure --enable-developer --disable-verify-ptr \
+    CFLAGS="-g3 -O1 -fno-omit-frame-pointer" \
+    LDFLAGS="-fno-omit-frame-pointer"

scripts/docker/profiling/profiles/valgrind-callgrind/startprofiling-cmd

@@ -0,0 +1,2 @@
+#!/bin/sh
+valgrind --tool=callgrind scripts/bin/radiusd -f -l stdout -S resources.talloc_skip_cleanup=yes