Merge branch 'performancecopilot:main' into rapl-msr-support

Author: christianhorn

CHANGELOG

@@ -1,6 +1,9 @@
 pcp-7.0.0 (1 July 2025)
     - Work-in-progress.
 
+pcp-6.3.3 (29 January 2025)
+    - Debian build changes - see debian/changelog for details
+
 pcp-6.3.2 (6 November 2024)
     - PMDA additions, enhancements and bug fixes:
 	pmdabpf: avoid a too-low rlimit setting within pmdabpf

build/containers/archive-analysis/Dockerfile

@@ -5,7 +5,7 @@ COPY . /usr/src/pcp
 WORKDIR /usr/src/pcp
 RUN dnf install -y git which rpm-build 'dnf-command(builddep)'
 RUN dnf builddep -y build/rpm/redhat.spec
-RUN dnf remove -y selinux-policy
+RUN dnf remove -y selinux-policy || true
 
 RUN ./Makepkgs --verbose
 RUN mkdir /build && \

build/containers/pcp/Dockerfile

@@ -5,7 +5,6 @@ COPY . /usr/src/pcp
 WORKDIR /usr/src/pcp
 RUN dnf install -y git which rpm-build 'dnf-command(builddep)'
 RUN dnf builddep -y build/rpm/redhat.spec
-RUN dnf remove -y selinux-policy
 
 RUN ./Makepkgs --verbose
 RUN mkdir /build && \

configure

@@ -768,6 +768,8 @@ ncursesw_CFLAGS
 HAVE_NCURSES
 ncurses_LIBS
 ncurses_CFLAGS
+lib_for_inih
+HAVE_LIBINIH
 HAVE_LIBUV
 libuv_LIBS
 libuv_CFLAGS
@@ -5029,7 +5031,8 @@ printf %s "checking __pmResult padding... " >&6; }
 ans=`sed <conftest.out -n -e '/__pmResult pad/s/.* //p'`
 if test -n "$ans"
 then
-    printf "%s\n" "#define PM_PAD_RESULT $ans" >>confdefs.h
+
+printf "%s\n" "#define PM_PAD_RESULT $ans" >>confdefs.h
 
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ans" >&5
 printf "%s\n" "$ans" >&6; }
@@ -5042,7 +5045,8 @@ printf %s "checking timespec padding... " >&6; }
 ans=`sed <conftest.out -n -e '/timespec pad/s/.* //p'`
 if test -n "$ans"
 then
-    printf "%s\n" "#define PM_PAD_TIMESPEC $ans" >>confdefs.h
+
+printf "%s\n" "#define PM_PAD_TIMESPEC $ans" >>confdefs.h
 
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ans" >&5
 printf "%s\n" "$ans" >&6; }
@@ -5442,11 +5446,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5488,11 +5492,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -12480,6 +12484,57 @@ else $as_nop
 fi
 
 
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ini_parse in -linih" >&5
+printf %s "checking for ini_parse in -linih... " >&6; }
+if test ${ac_cv_lib_inih_ini_parse+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-linih  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char ini_parse ();
+int
+main (void)
+{
+return ini_parse ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_inih_ini_parse=yes
+else $as_nop
+  ac_cv_lib_inih_ini_parse=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inih_ini_parse" >&5
+printf "%s\n" "$ac_cv_lib_inih_ini_parse" >&6; }
+if test "x$ac_cv_lib_inih_ini_parse" = xyes
+then :
+   have_libinih=true
+	 lib_for_inih="-linih"
+
+else $as_nop
+   have_libinih=false
+         lib_for_inih=""
+
+
+fi
+
+HAVE_LIBINIH=$have_libinih
+
+
+
 
 pkg_failed=no
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ncurses" >&5
@@ -14527,6 +14582,8 @@ CFLAGS="$save_CFLAGS"
 
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether const arg for scandir() select method" >&5
 printf %s "checking whether const arg for scandir() select method... " >&6; }
+save_CFLAGS="$CFLAGS"
+CFLAGS="-Werror"
 cat <<End-of-File >conftest.c
 #include <stdlib.h>
 #include <unistd.h>
@@ -14536,8 +14593,9 @@ my_select(const struct dirent *foo) { return 0; }
 int main() { struct dirent **list; return scandir(".", &list, my_select, NULL); }
 End-of-File
 (eval $ac_compile) 2>conftest.out
+_ret=$?
 cat conftest.out >&5
-if test -s conftest.out
+if test $_ret != 0
 then
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
@@ -14548,6 +14606,7 @@ printf "%s\n" "#define HAVE_CONST_DIRENT 1" >>confdefs.h
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 fi
+CFLAGS="$save_CFLAGS"
 rm -f conftest.*
 
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct dirent has a d_off field" >&5
@@ -14559,8 +14618,9 @@ cat <<End-of-File >conftest.c
 int main() { struct dirent d; d.d_off = 0; }
 End-of-File
 (eval $ac_compile) 2>conftest.out
+_ret=$?
 cat conftest.out >&5
-if test -s conftest.out
+if test $_ret != 0
 then
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }

configure.ac

@@ -563,7 +563,7 @@ AC_MSG_CHECKING([__pmResult padding])
 ans=`sed <conftest.out -n -e '/__pmResult pad/s/.* //p'`
 if test -n "$ans"
 then
-    AC_DEFINE_UNQUOTED(PM_PAD_RESULT, $ans, [])
+    AC_DEFINE_UNQUOTED(PM_PAD_RESULT, $ans, [__pmResult padding])
     AC_MSG_RESULT($ans)
 else
     AC_MSG_RESULT([no])
@@ -572,7 +572,7 @@ AC_MSG_CHECKING([timespec padding])
 ans=`sed <conftest.out -n -e '/timespec pad/s/.* //p'`
 if test -n "$ans"
 then
-    AC_DEFINE_UNQUOTED(PM_PAD_TIMESPEC, $ans, [])
+    AC_DEFINE_UNQUOTED(PM_PAD_TIMESPEC, $ans, [timespec padding])
     AC_MSG_RESULT($ans)
 else
     AC_MSG_RESULT([no])
@@ -2108,6 +2108,18 @@ AC_CHECK_LIB(uv, uv_pipe_chmod,
 	     have_uv_pipe_chmod=true,
 	     have_uv_pipe_chmod=false)
 
+dnl PKG_CHECK_MODULES() does not work for libinih
+AC_CHECK_LIB(inih, ini_parse,
+       [ have_libinih=true
+	 lib_for_inih="-linih"
+       ],
+       [ have_libinih=false
+         lib_for_inih=""
+       ]
+)
+AC_SUBST(HAVE_LIBINIH, [$have_libinih])
+AC_SUBST(lib_for_inih)
+
 PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=true], [have_ncurses=false])
 AC_SUBST(HAVE_NCURSES, [$have_ncurses])
 
@@ -2497,6 +2509,11 @@ AC_SUBST([rdynamic_flag])
 
 dnl check if argument to user's select() method in scandir call is const
 AC_MSG_CHECKING([whether const arg for scandir() select method])
+save_CFLAGS="$CFLAGS"
+dnl Using -Werror to make the compiler fail on purpose if scandir()
+dnl on this system does not support `const struct dirent *' for
+dnl callbacks.
+CFLAGS="-Werror"
 cat <<End-of-File >conftest.c
 #include <stdlib.h>
 #include <unistd.h>
@@ -2506,14 +2523,16 @@ my_select(const struct dirent *foo) { return 0; }
 int main() { struct dirent **list; return scandir(".", &list, my_select, NULL); }
 End-of-File
 (eval $ac_compile) 2>conftest.out
+_ret=$?
 cat conftest.out >&5
-if test -s conftest.out
+if test $_ret != 0
 then
     AC_MSG_RESULT(no)
 else
     AC_DEFINE(HAVE_CONST_DIRENT, [1], [const arg for scandir() select method])
     AC_MSG_RESULT(yes)
 fi
+CFLAGS="$save_CFLAGS"
 rm -f conftest.*
 
 dnl check if struct dirent has a d_off (directory offset) field
@@ -2525,8 +2544,9 @@ cat <<End-of-File >conftest.c
 int main() { struct dirent d; d.d_off = 0; }
 End-of-File
 (eval $ac_compile) 2>conftest.out
+_ret=$?
 cat conftest.out >&5
-if test -s conftest.out
+if test $_ret != 0
 then
     AC_MSG_RESULT(no)
 else

debian/changelog

@@ -4,6 +4,15 @@ pcp (7.0.0-1) unstable; urgency=low
 
  -- Nathan Scott <[email protected]>  Tue, 01 Jul 2025 07:39:11 +1000
 
+pcp (6.3.3-1) unstable; urgency=low
+
+  * 6.3.2 release plus fixes for Debian build issues
+  * don't dink with /var/run/pcp in pcp.postinst (closes: #1071103)
+  * avoid dangling systemd symlinks on purge (closes: #986074)
+  * change to allow Rules-Requires-Root: no in build (closes: #1089409)
+
+ -- Nathan Scott <[email protected]>  Wed, 29 Jan 2025 09:25:03 +1100
+
 pcp (6.3.2-1) unstable; urgency=low
 
   * New release (full details in CHANGELOG).

debian/control.pcp

@@ -4,15 +4,16 @@ Priority: extra
 Homepage: https://pcp.io
 Maintainer: PCP Development Team <[email protected]>
 Uploaders: Nathan Scott <[email protected]>, Ken McDonell <[email protected]>
-Build-Depends: bison, flex, gawk, procps, pkg-config, debhelper (>= 5), ?{perl (>= 5.6)}, libreadline-dev | libreadline5-dev | libreadline-gplv2-dev, chrpath, libbsd-dev [kfreebsd-any], libkvm-dev [kfreebsd-any], ?{python-all}, ?{python-dev}, python3-dev, python3-setuptools, libsasl2-dev, ?{libuv1-dev}, ?{libssl-dev}, libavahi-common-dev, ?{qt-dev}, autotools-dev, zlib1g-dev, autoconf, ?{libclass-dbi-perl}, ?{libdbd-mysql-perl}, ?{python-psycopg2}, ?{python-openpyxl}, ?{dh-python}, ?{libpfm4-dev}, libncurses5-dev, ?{python-six}, ?{python-json-pointer}, ?{python-requests}, ?{libextutils-autoinstall-perl}, ?{libxml-tokeparser-perl}, ?{librrds-perl}, ?{libjson-perl}, ?{libwww-perl}, ?{libnet-snmp-perl}, ?{liblzma-dev}, ?{libsystemd-dev}, ?{python3-bpfcc}, ?{bpftrace}, ?{clang}, ?{llvm}, ?{libbpf-dev}, ?{libibumad-dev}, ?{libibmad-dev}, manpages
+Rules-Requires-Root: no
+Build-Depends: bison, flex, gawk, procps, pkg-config, debhelper (>= 5), ?{perl (>= 5.6)}, libreadline-dev | libreadline5-dev | libreadline-gplv2-dev, chrpath, libbsd-dev [kfreebsd-any], libkvm-dev [kfreebsd-any], ?{python-all}, ?{python-dev}, python3-dev, python3-setuptools, libsasl2-dev, ?{libuv1-dev}, ?{libssl-dev}, libavahi-common-dev, ?{qt-dev}, autotools-dev, zlib1g-dev, autoconf, ?{libclass-dbi-perl}, ?{libdbd-mysql-perl}, ?{python-psycopg2}, ?{python-openpyxl}, ?{dh-python}, ?{libpfm4-dev}, libncurses5-dev, ?{python-six}, ?{python-json-pointer}, ?{python-requests}, ?{libextutils-autoinstall-perl}, ?{libxml-tokeparser-perl}, ?{librrds-perl}, ?{libjson-perl}, ?{libwww-perl}, ?{libnet-snmp-perl}, ?{liblzma-dev}, ?{libsystemd-dev}, ?{python3-bpfcc}, ?{bpftrace}, ?{clang}, ?{llvm}, ?{libbpf-dev}, ?{libibumad-dev}, ?{libibmad-dev}, ?{libinih-dev}, manpages
 Standards-Version: 3.9.3
 X-Python3-Version: >= 3.3
 
 Package: pcp
 Depends: ${shlibs:Depends}, ${misc:Depends}, gawk, procps, ?{python-pcp}, ?{python}, libpcp-pmda3 (= ${binary:Version}), libpcp-mmv1 (= ${binary:Version}), libpcp-web1 (= ${binary:Version}), libpcp-archive1 (= ${binary:Version}), libpcp3 (= ${binary:Version}), pcp-conf (= ${binary:Version})
 Recommends: libpcp-pmda-perl
 Conflicts: pgpool2, dstat, pcp-webapi, pcp-manager
-Suggests: pcp-gui, libpcp-import-perl, ?{bpftrace}, ?{python3-bpfcc}, redis-server
+Suggests: pcp-gui, libpcp-import-perl, ?{bpftrace}, ?{python3-bpfcc}, redis-server, zstd
 Provides: dstat, pcp-webapi, pcp-manager
 Replaces: dstat, pcp-webapi, pcp-manager
 Architecture: any
@@ -400,75 +401,3 @@ Description: Performance Co-Pilot (PCP) Test Suite
  Provides a series of tests that exercise the many utilities and daemon
  processes that form the PCP toolkit.  Regular users should never have
  any need to install this package, it is for developers and testers only.
-
-Package: libpcp3t64
-Depends: libpcp3, ${misc:Depends}
-Architecture: any
-Priority: optional
-Section: oldlibs
-Description: transitional package
- This is a transitional package to address incorrect Debian renaming.
- It can safely be removed.
-
-Package: libpcp-archive1t64
-Depends: libpcp-archive1, ${misc:Depends}
-Architecture: any
-Priority: optional
-Section: oldlibs
-Description: transitional package
- This is a transitional package to address incorrect Debian renaming.
- It can safely be removed.
-
-Package: libpcp-gui2t64
-Depends: libpcp-gui2, ${misc:Depends}
-Architecture: any
-Priority: optional
-Section: oldlibs
-Description: transitional package
- This is a transitional package to address incorrect Debian renaming.
- It can safely be removed.
-
-Package: libpcp-mmv1t64
-Depends: libpcp-mmv1, ${misc:Depends}
-Architecture: any
-Priority: optional
-Section: oldlibs
-Description: transitional package
- This is a transitional package to address incorrect Debian renaming.
- It can safely be removed.
-
-Package: libpcp-pmda3t64
-Depends: libpcp-pmda3, ${misc:Depends}
-Architecture: any
-Priority: optional
-Section: oldlibs
-Description: transitional package
- This is a transitional package to address incorrect Debian renaming.
- It can safely be removed.
-
-Package: libpcp-trace2t64
-Depends: libpcp-trace2, ${misc:Depends}
-Architecture: any
-Priority: optional
-Section: oldlibs
-Description: transitional package
- This is a transitional package to address incorrect Debian renaming.
- It can safely be removed.
-
-Package: libpcp-web1t64
-Depends: libpcp-web1, ${misc:Depends}
-Architecture: any
-Priority: optional
-Section: oldlibs
-Description: transitional package
- This is a transitional package to address incorrect Debian renaming.
- It can safely be removed.
-
-Package: libpcp-import1t64
-Depends: libpcp-import1, ${misc:Depends}
-Architecture: any
-Priority: optional
-Section: oldlibs
-Description: transitional package
- This is a transitional package to address incorrect Debian renaming.
- It can safely be removed.

debian/fixcontrol

@@ -253,6 +253,13 @@ else
     echo 's/?{libuv1-dev}, //' >>$tmp.sed
 fi
 
+if $HAVE_LIBINIH
+then
+    echo 's/?{libinih-dev}, /libinih-dev, /' >>$tmp.sed
+else
+    echo 's/?{libinih-dev}, //' >>$tmp.sed
+fi
+
 if $HAVE_PERL
 then
     echo 's/?{\\(perl[^}]*\\)}, /\\1, /' >>$tmp.sed

debian/pcp.postinst.tail

@@ -29,8 +29,8 @@ chown pcp:pcp /var/lib/pcp/tmp
 chmod 775 /var/lib/pcp/tmp
 chown pcp:pcp /var/log/pcp
 chmod 775 /var/log/pcp
-chown pcp:pcp /var/run/pcp
-chmod 775 /var/run/pcp
+# we used to dink with /var/run/pcp here, but that is done more
+# safely in pcp-reboot-init now
 
 # must match src/pmdas/{json,bash,mmv}/GNUmakefile
 #