svn commit: r512031 - in head/sysutils/slurm-wlm: . files

[Jason W. Bacon]

Author: jwb
Date: Sat Sep 14 16:02:32 2019
New Revision: 512031
URL: https://svnweb.freebsd.org/changeset/ports/512031

Log:
  sysutils/slurm-wlm: Temporary patch to silence job accounting errors
  
  Disables linux-specific code when using jobacct_gather/linux for now.
  Long-term solution is to revamp job accounting code for FreeBSD.

Added:
  head/sysutils/slurm-wlm/files/patch-src_plugins_jobacct__gather_common_common__jag.c   (contents, props changed)
Modified:
  head/sysutils/slurm-wlm/Makefile

Modified: head/sysutils/slurm-wlm/Makefile
==============================================================================
--- head/sysutils/slurm-wlm/Makefile	Sat Sep 14 15:54:20 2019	(r512030)
+++ head/sysutils/slurm-wlm/Makefile	Sat Sep 14 16:02:32 2019	(r512031)
@@ -2,7 +2,7 @@
 
 PORTNAME=	slurm
 DISTVERSION=	19.05.1-2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils python
 MASTER_SITES=	https://download.schedmd.com/slurm/
 PKGNAMESUFFIX=	-wlm

Added: head/sysutils/slurm-wlm/files/patch-src_plugins_jobacct__gather_common_common__jag.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/slurm-wlm/files/patch-src_plugins_jobacct__gather_common_common__jag.c	Sat Sep 14 16:02:32 2019	(r512031)
@@ -0,0 +1,26 @@
+--- src/plugins/jobacct_gather/common/common_jag.c.orig	2019-09-13 13:35:31 UTC
++++ src/plugins/jobacct_gather/common/common_jag.c
+@@ -250,6 +250,12 @@ static int _get_sys_interface_freq_line(uint32_t cpu, 
+ 	return 0;
+ }
+ 
++
++/*
++ * Check for lightweight processes (POSIX threads)
++ * Should be rewritten for FreeBSD so it doesn't depend on /proc
++ */
++
+ static int _is_a_lwp(uint32_t pid)
+ {
+ 	char *filename = NULL;
+@@ -258,6 +264,10 @@ static int _is_a_lwp(uint32_t pid)
+ 	ssize_t n;
+ 	char *tgids = NULL;
+ 	pid_t tgid = -1;
++
++	// Disable check for now, this will only skew process accounting
++	// slightly by including threads
++	return 0;
+ 
+ 	xstrfmtcat(filename, "/proc/%u/status", pid);
+