Index: head/sysutils/slurm-wlm/Makefile =================================================================== --- head/sysutils/slurm-wlm/Makefile (revision 531763) +++ head/sysutils/slurm-wlm/Makefile (revision 531764) @@ -1,135 +1,136 @@ # $FreeBSD$ PORTNAME= slurm DISTVERSION= 20.02.1 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= https://download.schedmd.com/slurm/ PKGNAMESUFFIX= -wlm MAINTAINER= jwb@FreeBSD.org COMMENT= Simple Linux Utility for Resource Management LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING NOT_FOR_ARCHS= armv6 armv7 i386 powerpc NOT_FOR_ARCHS_REASON= 32-bit support is deprecated LIB_DEPENDS= libjson-c.so:devel/json-c \ libsysinfo.so:devel/libsysinfo \ libmunge.so:security/munge \ liblz4.so:archivers/liblz4 USES= compiler:c11 gmake gnome libtool lua pkgconfig python:build \ readline:port shebangfix ssl tar:bz2 USE_LDCONFIG= yes USE_PERL5= configure USE_RC_SUBR= slurmctld slurmd USERS= slurm GROUPS= ${USERS} GNU_CONFIGURE= yes INSTALL_TARGET= install-strip PLIST_SUB= PORTVERSION="${PORTVERSION}" SHEBANG_FILES= doc/html/shtml2html.py doc/man/man2html.py OPTIONS_DEFINE= CURL DOCS GUI HDF5 HWLOC IPMI MYSQL RRD OPTIONS_DEFAULT= HDF5 HWLOC OPTIONS_SUB= yes CURL_DESC= Require cURL for elasticsearch plugins GUI_DESC= Build sview GUI config tool HDF5_DESC= Job profiling using HDF5 HWLOC_DESC= Portable hardware locality IPMI_DESC= IPMI energy consumption accounting RRD_DESC= RRD external sensor data collection DOCS_BUILD_DEPENDS= man2html:textproc/man2html CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_WITH= libcurl GUI_USE= GNOME=cairo,gdkpixbuf2,glib20,gtk20 GUI_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 GUI_USES= gettext GUI_CONFIGURE_ENABLE= glibtest gtktest x11 # Neither of these work. See post-patch below. #GTK2_CONFIGURE_ENV_OFF= ac_gtk_test=no #GTK2_CONFIGURE_OFF= --disable-gtktest HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 \ libsz.so:science/szip HDF5_CONFIGURE_WITH= hdf5 HWLOC_LIB_DEPENDS= libhwloc.so:devel/hwloc HWLOC_CONFIGURE_WITH= hwloc IPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi IPMI_CONFIGURE_WITH= freeipmi MYSQL_USES= mysql MYSQL_CONFIGURE_OFF= --with-mysql_config=/nonexistent RRD_LIB_DEPENDS= librrd.so:databases/rrdtool RRD_CONFIGURE_WITH= rrdtool # --docdir is non-functional # CONFIGURE_ARGS= --docdir=${DOCSDIR} # FreeBSD Infiniband support is still experimental CONFIGURE_ARGS= --without-ofed DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION} CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lprocstat # Hack around nonfunctional --disable-gtktest flag pre-configure-GUI-off: @${REINPLACE_CMD} -e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|' \ ${WRKSRC}/configure # SLURM's configure enables interactive jobs if pty.h exists. Replacing # #include with appropriate headers will therefore not work, so instead # add a pty.h for the build. pre-configure: @${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm @${REINPLACE_CMD} -e 's|sched_setaffinity|cpuset_setaffinity|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|"/proc|"/compat/linux/proc|g' \ -e 's|(/proc)|(/compat/linux/proc)|g' \ ${WRKSRC}/src/slurmd/slurmstepd/req.c \ ${WRKSRC}/src/slurmd/slurmstepd/pdebug.c \ ${WRKSRC}/src/slurmd/common/xcpuinfo.c \ ${WRKSRC}/src/slurmd/common/xcgroup.c \ ${WRKSRC}/src/slurmd/common/set_oomadj.c \ ${WRKSRC}/src/slurmd/common/proctrack.c \ ${WRKSRC}/src/common/callerid.c \ ${WRKSRC}/src/plugins/task/affinity/affinity.c \ ${WRKSRC}/src/plugins/acct_gather_energy/rapl/acct_gather_energy_rapl.c \ ${WRKSRC}/src/plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.c \ ${WRKSRC}/src/plugins/jobacct_gather/common/common_jag.c \ ${WRKSRC}/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c \ ${WRKSRC}/src/plugins/switch/cray_aries/scaling.c \ ${WRKSRC}/src/plugins/proctrack/cray_aries/proctrack_cray_aries.c \ ${WRKSRC}/src/plugins/proctrack/cgroup/proctrack_cgroup.c \ ${WRKSRC}/src/plugins/proctrack/pgid/proctrack_pgid.c \ ${WRKSRC}/src/plugins/proctrack/linuxproc/kill_tree.c \ ${WRKSRC}/src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c \ ${WRKSRC}/src/plugins/node_features/knl_generic/node_features_knl_generic.c \ ${WRKSRC}/contribs/cray/pam_job.c @if ${WHICH} sbatch > /dev/null; then \ ${ECHO_CMD} "********************************************"; \ ${ECHO_CMD} "Build may fail while slurm-wlm is installed."; \ ${ECHO_CMD} "Deinstall slurm-wlm and run make again."; \ ${ECHO_CMD} "********************************************"; \ false; \ fi post-install: ${INSTALL_DATA} ${WRKSRC}/etc/slurm.conf.example \ ${STAGEDIR}${PREFIX}/etc/slurm.conf.sample .include Index: head/sysutils/slurm-wlm/files/patch-src_plugins_proctrack_pgid_proctrack__pgid.c =================================================================== --- head/sysutils/slurm-wlm/files/patch-src_plugins_proctrack_pgid_proctrack__pgid.c (revision 531763) +++ head/sysutils/slurm-wlm/files/patch-src_plugins_proctrack_pgid_proctrack__pgid.c (revision 531764) @@ -1,76 +1,79 @@ --- src/plugins/proctrack/pgid/proctrack_pgid.c.orig 2020-03-26 21:44:05 UTC +++ src/plugins/proctrack/pgid/proctrack_pgid.c @@ -49,6 +49,15 @@ #include #include +#ifdef __FreeBSD__ +#include +#include +#include +#include + +#include /* must be last */ +#endif + #include "slurm/slurm.h" #include "slurm/slurm_errno.h" #include "src/common/log.h" -@@ -179,6 +188,52 @@ proctrack_p_wait(uint64_t cont_id) +@@ -179,6 +188,55 @@ proctrack_p_wait(uint64_t cont_id) return SLURM_SUCCESS; } + +/* + * Get list of all PIDs belonging to process group cont_id + */ +#ifdef __FreeBSD__ +extern int proctrack_p_get_pids(uint64_t cont_id, pid_t **pids, int *npids) +{ + pid_t *pid_array = NULL; + struct procstat *proc_info; + struct kinfo_proc *proc_list; + FILE *procstat_err; + unsigned int pid_count = 0; + + /* + * procstat_getprocs() prints an innocuous but annoying warning + * to stderr by default when no matching processes are found: + * + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=245318 + * + * Remove the redirect to /dev/null if this changes in the future. + */ + if ((procstat_err = fopen("/dev/null", "w+"))) + err_set_file(procstat_err); + proc_info = procstat_open_sysctl(); + proc_list = procstat_getprocs(proc_info, KERN_PROC_PGRP, cont_id, + (unsigned int *) &pid_count); + if (procstat_err) ++ { ++ err_set_file(NULL); + fclose(procstat_err); ++ } + + if (pid_count > 0) { + xrecalloc(pid_array, sizeof(pid_t), pid_count); + // FIXME: Do we need to filter zombies like the Linux code? + // proc_list[c].ki_paddr->p_state == PRS_ZOMBIE + for (size_t c = 0; c < pid_count; ++c) + pid_array[c] = proc_list[c].ki_pid; + } + + procstat_freeprocs(proc_info, proc_list); + procstat_close(proc_info); + + *pids = pid_array; + *npids = pid_count; + + return SLURM_SUCCESS; +} +#else extern int proctrack_p_get_pids(uint64_t cont_id, pid_t **pids, int *npids) { -@@ -241,3 +296,4 @@ fini: *pids = pid_array; +@@ -241,3 +299,4 @@ fini: *pids = pid_array; *npids = pid_count; return rc; } +#endif