Attachment #172366 for bug #210648

Lines 30-36 Link Here

(-)Makefile (-6 / +15 lines)
30	USES= gmake libtool pkgconfig python:build tar:bz2	30	USES= gmake libtool pkgconfig python:build tar:bz2
31	USE_PERL5= configure	31	USE_PERL5= configure
32		32
33	OPTIONS_DEFINE= CURL DOCS GTK2 HDF5 HWLOC IPMI MYSQL RRD	33	## There is a problem with a python script (man2html.py) that creates the HTML
		34	## docs, which causes the build to hang. For now, just remove the DOCS option.
		35	#OPTIONS_DEFINE= CURL DOCS GTK2 HDF5 HWLOC IPMI MYSQL RRD
		36	OPTIONS_DEFINE= CURL GTK2 HDF5 HWLOC IPMI MYSQL RRD
34	OPTIONS_DEFAULT=HDF5 HWLOC	37	OPTIONS_DEFAULT=HDF5 HWLOC
35	OPTIONS_SUB= yes	38	OPTIONS_SUB= yes
36		39
Lines 41-53 Link Here
41	IPMI_DESC= IPMI engergy consumption accounting	44	IPMI_DESC= IPMI engergy consumption accounting
42	RRD_DESC= RRD external sensor data collection	45	RRD_DESC= RRD external sensor data collection
43		46
44	GTK2_USE= GNOME=glib20,gtk20	47	#DOCS_BUILD_DEPENDS= man2html:textproc/man2html
		48	CONFIGURE_ENV+= ac_have_man2html=no
45		49
46	DOCS_BUILD_DEPENDS= man2html:textproc/man2html
47
48	CURL_LIB_DEPENDS= libcurl.so:ftp/curl	50	CURL_LIB_DEPENDS= libcurl.so:ftp/curl
49	CURL_CONFIGURE_WITH= libcurl	51	CURL_CONFIGURE_WITH= libcurl
50		52
		53	GTK2_USE= GNOME=cairo,gdkpixbuf2,glib20,gtk20
		54	GTK2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
		55	libfreetype.so:print/freetype2
		56	GTK2_USES= gettext
		57	GTK2_CONFIGURE_ENV_OFF= ac_gtk_test=no
		58
51	HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 \	59	HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 \
52	libsz.so:science/szip	60	libsz.so:science/szip
53	HDF5_CONFIGURE_WITH= hdf5	61	HDF5_CONFIGURE_WITH= hdf5
Lines 58-68 Link Here
58	IPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi	66	IPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi
59	IPMI_CONFIGURE_WITH= freeipmi	67	IPMI_CONFIGURE_WITH= freeipmi
60		68
		69	MYSQL_USES= mysql
		70	MYSQL_CONFIGURE_with= mysql
		71
61	RRD_LIB_DEPENDS= librrd.so:databases/rrdtool	72	RRD_LIB_DEPENDS= librrd.so:databases/rrdtool
62	RRD_CONFIGURE_WITH= rrdtool	73	RRD_CONFIGURE_WITH= rrdtool
63		74
64	MYSQL_USE= MYSQL=yes
65
66	CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include	75	CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include
67	LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lkvm	76	LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lkvm
68		77




--- src/plugins/task/affinity/affinity.c.orig	2016-05-31 21:35:09 UTC
+++ src/plugins/task/affinity/affinity.c
@@ -291,12 +291,34 @@ int get_cpuset(cpu_set_t *mask, stepd_st
 	return false;
 }
 
+/* For sysctl() functions */
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#endif
+
+#define	BUFFLEN	127
+
 /* Return true if Power7 processor */
 static bool _is_power_cpu(void)
 {
 	if (is_power == -1) {
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+
+		char    buffer[BUFFLEN+1];
+		size_t  len = BUFFLEN;
+    
+		if ( sysctlbyname("hw.model", buffer, &len, NULL, 0) == 0 )
+		    is_power = ( strstr(buffer, "POWER7") != NULL );
+		else {
+		    error("_get_is_power: sysctl could not retrieve hw.model");
+		    return false;
+		}
+
+#elif defined(__linux__)
+
 		FILE *cpu_info_file;
-		char buffer[128];
+		char buffer[BUFFLEN+1];
 		char* _cpuinfo_path = "/proc/cpuinfo";
 		cpu_info_file = fopen(_cpuinfo_path, "r");
 		if (cpu_info_file == NULL) {
@@ -313,6 +335,14 @@ static bool _is_power_cpu(void)
 			}
 		}
 		fclose(cpu_info_file);
+
+#else
+
+/* Assuming other platforms don't support sysctlbyname() or /proc/cpuinfo */
+#warning	"Power7 check not implemented for this platform."
+	is_power = 0;
+
+#endif
 	}
 
 	if (is_power == 1)
@@ -336,7 +366,11 @@ void reset_cpuset(cpu_set_t *new_mask, c
 	if (slurm_getaffinity(1, sizeof(full_mask), &full_mask)) {
 		/* Try to get full CPU mask from process init */
 		CPU_ZERO(&full_mask);
+#ifdef __FreeBSD__
+		CPU_OR(&full_mask, cur_mask);
+#else
 		CPU_OR(&full_mask, &full_mask, cur_mask);
+#endif
 	}
 	CPU_ZERO(&newer_mask);
 	for (cur_offset = 0; cur_offset < CPU_SETSIZE; cur_offset++) {
@@ -361,7 +395,10 @@ int slurm_setaffinity(pid_t pid, size_t 
 	int rval;
 	char mstr[1 + CPU_SETSIZE / 4];
 
-#ifdef SCHED_GETAFFINITY_THREE_ARGS
+#ifdef __FreeBSD__
+        rval = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID,
+				pid, size, mask);
+#elif defined(SCHED_GETAFFINITY_THREE_ARGS)        
 	rval = sched_setaffinity(pid, size, mask);
 #else
 	rval = sched_setaffinity(pid, mask);
@@ -379,7 +416,19 @@ int slurm_getaffinity(pid_t pid, size_t 
 	char mstr[1 + CPU_SETSIZE / 4];
 
 	CPU_ZERO(mask);
-#ifdef SCHED_GETAFFINITY_THREE_ARGS
+
+	/*
+	 * The FreeBSD cpuset API is a superset of the Linux API.
+	 * In addition to PIDs, it supports threads, interrupts,
+	 * jails, and potentially other objects.  The first two arguments
+	 * to cpuset_*etaffinity() below indicate that the third argument
+	 * is a PID.  -1 indicates the PID of the calling process.
+	 * Linux sched_*etaffinity() uses 0 for this.
+	 */
+#ifdef __FreeBSD__
+        rval = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID,
+				pid, size, mask);
+#elif SCHED_GETAFFINITY_THREE_ARGS
 	rval = sched_getaffinity(pid, size, mask);
 #else
 	rval = sched_getaffinity(pid, mask);




--- src/plugins/task/affinity/affinity.h.orig	2016-05-31 21:35:09 UTC
+++ src/plugins/task/affinity/affinity.h
@@ -33,6 +33,18 @@
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
+
+/*
+ * FreeBSD and Linux affinity functions have a slightly different interface
+ * and are defined in different headers.  See platform-dependencies in
+ * affinity.c.
+ */
+#ifdef __FreeBSD__
+#include <sys/param.h>
+#include <sys/cpuset.h>
+typedef cpuset_t cpu_set_t;
+#endif
+
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif




sbin/slurmstepd
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/Slurm_Entity.pdf
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/Slurm_Individual.pdf
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/accounting.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/accounting_storageplugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/acct_gather.conf.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/acct_gather_energy_plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/acct_gather_profile_plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/add.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/allocation_pies.gif
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/api.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/arch.gif
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/authplugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bb_plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/big_sys.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bluegene.conf.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bluegene.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bull.jpg
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/burst_buffer.conf.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/burst_buffer.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cgroup.conf.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cgroups.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/checkpoint_blcr.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/checkpoint_plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/coding_style.pdf
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/configurator.easy.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/configurator.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cons_res.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cons_res_share.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/contributor.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/core_spec.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/core_spec_plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cpu_management.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cray.conf.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cray.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cray_alps.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/crypto_plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/disclaimer.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/dist_plane.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/documentation.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/download.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/elastic_computing.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/entities.gif
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/example_usage.gif
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ext_sensors.conf.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ext_sensorsplugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/fair_tree.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/faq.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gang_scheduling.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gres.conf.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gres.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gres_design.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gres_plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/hdf5_job_outline.png
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/hdf5_profile_user_guide.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/hdf5_task_attr.png
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/high_throughput.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm-pe.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm_pe_fig1.png
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm_pe_fig2.png
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_array.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_container_plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_exit_code.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_launch.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_submit_plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/jobacct_gatherplugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/jobcompplugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/k_function.gif
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/launch_plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/licenses.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/linuxstyles.css
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mail.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/man_index.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/maui.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mc_support.gif
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mc_support.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/meetings.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/moab.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mpi_guide.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mpiplugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/multi_cluster.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/news.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/nonstop.conf.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/overview.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex1.gif
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex2.gif
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex3.gif

%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex5.gif
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex6.gif
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex7.gif
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/platforms.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_mgmt.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_save.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/preempt.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/preemption_plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_multifactor.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_multifactor3.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/proctrack_plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/programmer_guide.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/prolog_epilog.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/publications.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/qos.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/quickstart.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/quickstart_admin.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/reservations.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/resource_limits.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/rosetta.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/route_plugin.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/rpc.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sacct.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sacctmgr.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/salloc.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sattach.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sbatch.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sbcast.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/scancel.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sched_config.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/schedmd.png
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/schedplugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/scontrol.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sdiag.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/select_design.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/selectplugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sh5util.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sinfo.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm.conf.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_design.pdf
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_logo.png
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_ug_agenda.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_ug_cfp.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmctld.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmctld_plugstack.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmd.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmdbd.conf.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmdbd.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmstepd.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmstyles.css
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/smap.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/spank.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sponsors.gif
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sprio.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/squeue.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sreport.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/srun.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/srun_cr.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sshare.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sstat.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/strigger.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sun_const.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sview.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/switchplugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/taskplugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/team.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/testimonials.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topo_ex1.gif
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topo_ex2.gif
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topology.conf.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topology.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topology_plugin.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tres.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/troubleshoot.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tutorial_intro_files.tar
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tutorials.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/usage_pies.gif
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/user_permissions.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/wckey.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/wiki.conf.html

Return to bug 210648

Lines 420-507 Link Here

(-)pkg-plist (-141 lines)
420	sbin/slurmstepd	420	sbin/slurmstepd
421	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/Slurm_Entity.pdf	421	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/Slurm_Entity.pdf
422	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/Slurm_Individual.pdf	422	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/Slurm_Individual.pdf
423	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/accounting.html
424	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/accounting_storageplugins.html
425	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/acct_gather.conf.html
426	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/acct_gather_energy_plugins.html
427	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/acct_gather_profile_plugins.html
428	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/add.html
429	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/allocation_pies.gif	423	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/allocation_pies.gif
430	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/api.html
431	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/arch.gif	424	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/arch.gif
432	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/authplugins.html
433	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bb_plugins.html
434	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/big_sys.html
435	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bluegene.conf.html
436	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bluegene.html
437	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bull.jpg	425	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bull.jpg
438	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/burst_buffer.conf.html
439	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/burst_buffer.html
440	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cgroup.conf.html
441	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cgroups.html
442	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/checkpoint_blcr.html
443	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/checkpoint_plugins.html
444	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/coding_style.pdf	426	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/coding_style.pdf
445	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/configurator.easy.html
446	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/configurator.html
447	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cons_res.html
448	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cons_res_share.html
449	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/contributor.html
450	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/core_spec.html
451	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/core_spec_plugins.html
452	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cpu_management.html
453	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cray.conf.html
454	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cray.html
455	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cray_alps.html
456	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/crypto_plugins.html
457	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/disclaimer.html
458	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/dist_plane.html
459	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/documentation.html
460	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/download.html
461	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/elastic_computing.html
462	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/entities.gif	427	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/entities.gif
463	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/example_usage.gif	428	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/example_usage.gif
464	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ext_sensors.conf.html
465	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ext_sensorsplugins.html
466	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/fair_tree.html
467	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/faq.html
468	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gang_scheduling.html
469	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gres.conf.html
470	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gres.html
471	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gres_design.html
472	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gres_plugins.html
473	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/hdf5_job_outline.png	429	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/hdf5_job_outline.png
474	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/hdf5_profile_user_guide.html
475	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/hdf5_task_attr.png	430	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/hdf5_task_attr.png
476	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/high_throughput.html
477	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm-pe.html
478	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm.html
479	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm_pe_fig1.png	431	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm_pe_fig1.png
480	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm_pe_fig2.png	432	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm_pe_fig2.png
481	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_array.html
482	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_container_plugins.html
483	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_exit_code.html
484	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_launch.html
485	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_submit_plugins.html
486	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/jobacct_gatherplugins.html
487	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/jobcompplugins.html
488	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/k_function.gif	433	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/k_function.gif
489	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/launch_plugins.html
490	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/licenses.html
491	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/linuxstyles.css	434	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/linuxstyles.css
492	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mail.html
493	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/man_index.html
494	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/maui.html
495	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mc_support.gif	435	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mc_support.gif
496	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mc_support.html
497	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/meetings.html
498	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/moab.html
499	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mpi_guide.html
500	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mpiplugins.html
501	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/multi_cluster.html
502	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/news.html
503	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/nonstop.conf.html
504	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/overview.html
505	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex1.gif	436	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex1.gif
506	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex2.gif	437	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex2.gif
507	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex3.gif	438	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex3.gif
Lines 509-592 Link Here
509	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex5.gif	440	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex5.gif
510	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex6.gif	441	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex6.gif
511	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex7.gif	442	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex7.gif
512	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/platforms.html
513	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plugins.html
514	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_mgmt.html
515	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_plugins.html
516	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_save.html
517	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/preempt.html
518	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/preemption_plugins.html
519	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_multifactor.html
520	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_multifactor3.html
521	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_plugins.html
522	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/proctrack_plugins.html
523	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/programmer_guide.html
524	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/prolog_epilog.html
525	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/publications.html
526	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/qos.html
527	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/quickstart.html
528	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/quickstart_admin.html
529	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/reservations.html
530	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/resource_limits.html
531	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/rosetta.html
532	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/route_plugin.html
533	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/rpc.html
534	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sacct.html
535	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sacctmgr.html
536	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/salloc.html
537	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sattach.html
538	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sbatch.html
539	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sbcast.html
540	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/scancel.html
541	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sched_config.html
542	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/schedmd.png	443	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/schedmd.png
543	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/schedplugins.html
544	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/scontrol.html
545	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sdiag.html
546	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/select_design.html
547	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/selectplugins.html
548	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sh5util.html
549	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sinfo.html
550	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm.conf.html
551	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm.html
552	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_design.pdf	444	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_design.pdf
553	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_logo.png	445	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_logo.png
554	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_ug_agenda.html
555	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_ug_cfp.html
556	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmctld.html
557	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmctld_plugstack.html
558	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmd.html
559	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmdbd.conf.html
560	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmdbd.html
561	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmstepd.html
562	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmstyles.css	446	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmstyles.css
563	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/smap.html
564	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/spank.html
565	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sponsors.gif	447	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sponsors.gif
566	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sprio.html
567	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/squeue.html
568	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sreport.html
569	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/srun.html
570	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/srun_cr.html
571	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sshare.html
572	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sstat.html
573	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/strigger.html
574	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sun_const.html
575	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sview.html
576	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/switchplugins.html
577	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/taskplugins.html
578	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/team.html
579	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/testimonials.html
580	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topo_ex1.gif	448	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topo_ex1.gif
581	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topo_ex2.gif	449	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topo_ex2.gif
582	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topology.conf.html
583	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topology.html
584	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topology_plugin.html
585	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tres.html
586	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/troubleshoot.html
587	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tutorial_intro_files.tar	450	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tutorial_intro_files.tar
588	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tutorials.html
589	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/usage_pies.gif	451	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/usage_pies.gif
590	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/user_permissions.html
591	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/wckey.html
592	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/wiki.conf.html

Line 0 Link Here

(-)files/patch-src_plugins_task_affinity_affinity.c (+98 lines)
		1	--- src/plugins/task/affinity/affinity.c.orig 2016-05-31 21:35:09 UTC
		2	+++ src/plugins/task/affinity/affinity.c
		3	@@ -291,12 +291,34 @@ int get_cpuset(cpu_set_t *mask, stepd_st
		4	return false;
		5	}
		6
		7	+/* For sysctl() functions */
		8	+#if defined(__FreeBSD__) \|\| defined(__NetBSD__)
		9	+#include <sys/types.h>
		10	+#include <sys/sysctl.h>
		11	+#endif
		12	+
		13	+#define BUFFLEN 127
		14	+
		15	/* Return true if Power7 processor */
		16	static bool _is_power_cpu(void)
		17	{
		18	if (is_power == -1) {
		19	+#if defined(__FreeBSD__) \|\| defined(__NetBSD__)
		20	+
		21	+ char buffer[BUFFLEN+1];
		22	+ size_t len = BUFFLEN;
		23	+
		24	+ if ( sysctlbyname("hw.model", buffer, &len, NULL, 0) == 0 )
		25	+ is_power = ( strstr(buffer, "POWER7") != NULL );
		26	+ else {
		27	+ error("_get_is_power: sysctl could not retrieve hw.model");
		28	+ return false;
		29	+ }
		30	+
		31	+#elif defined(__linux__)
		32	+
		33	FILE *cpu_info_file;
		34	- char buffer[128];
		35	+ char buffer[BUFFLEN+1];
		36	char* _cpuinfo_path = "/proc/cpuinfo";
		37	cpu_info_file = fopen(_cpuinfo_path, "r");
		38	if (cpu_info_file == NULL) {
		39	@@ -313,6 +335,14 @@ static bool _is_power_cpu(void)
		40	}
		41	}
		42	fclose(cpu_info_file);
		43	+
		44	+#else
		45	+
		46	+/* Assuming other platforms don't support sysctlbyname() or /proc/cpuinfo */
		47	+#warning "Power7 check not implemented for this platform."
		48	+ is_power = 0;
		49	+
		50	+#endif
		51	}
		52
		53	if (is_power == 1)
		54	@@ -336,7 +366,11 @@ void reset_cpuset(cpu_set_t *new_mask, c
		55	if (slurm_getaffinity(1, sizeof(full_mask), &full_mask)) {
		56	/* Try to get full CPU mask from process init */
		57	CPU_ZERO(&full_mask);
		58	+#ifdef __FreeBSD__
		59	+ CPU_OR(&full_mask, cur_mask);
		60	+#else
		61	CPU_OR(&full_mask, &full_mask, cur_mask);
		62	+#endif
		63	}
		64	CPU_ZERO(&newer_mask);
65	for (cur_offset = 0; cur_offset < CPU_SETSIZE; cur_offset++) {
66	@@ -361,7 +395,10 @@ int slurm_setaffinity(pid_t pid, size_t
67	int rval;
68	char mstr[1 + CPU_SETSIZE / 4];
69
70	-#ifdef SCHED_GETAFFINITY_THREE_ARGS
71	+#ifdef __FreeBSD__
72	+ rval = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID,
73	+ pid, size, mask);
74	+#elif defined(SCHED_GETAFFINITY_THREE_ARGS)
75	rval = sched_setaffinity(pid, size, mask);
76	#else
77	rval = sched_setaffinity(pid, mask);
78	@@ -379,7 +416,19 @@ int slurm_getaffinity(pid_t pid, size_t
79	char mstr[1 + CPU_SETSIZE / 4];
80
81	CPU_ZERO(mask);
82	-#ifdef SCHED_GETAFFINITY_THREE_ARGS
83	+
84	+ /*
85	+ * The FreeBSD cpuset API is a superset of the Linux API.
86	+ * In addition to PIDs, it supports threads, interrupts,
87	+ * jails, and potentially other objects. The first two arguments
88	+ * to cpuset_*etaffinity() below indicate that the third argument
89	+ * is a PID. -1 indicates the PID of the calling process.
90	+ * Linux sched_*etaffinity() uses 0 for this.
91	+ */
92	+#ifdef __FreeBSD__
93	+ rval = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID,
94	+ pid, size, mask);
95	+#elif SCHED_GETAFFINITY_THREE_ARGS
96	rval = sched_getaffinity(pid, size, mask);
97	#else
98	rval = sched_getaffinity(pid, mask);

Line 0 Link Here

(-)files/patch-src_plugins_task_affinity_affinity.h (+21 lines)
	1	--- src/plugins/task/affinity/affinity.h.orig 2016-05-31 21:35:09 UTC
	2	+++ src/plugins/task/affinity/affinity.h
	3	@@ -33,6 +33,18 @@
	4	* with SLURM; if not, write to the Free Software Foundation, Inc.,
	5	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	6	\*****************************************************************************/
	7	+
	8	+/*
	9	+ * FreeBSD and Linux affinity functions have a slightly different interface
	10	+ * and are defined in different headers. See platform-dependencies in
	11	+ * affinity.c.
	12	+ */
	13	+#ifdef __FreeBSD__
	14	+#include <sys/param.h>
	15	+#include <sys/cpuset.h>
	16	+typedef cpuset_t cpu_set_t;
	17	+#endif
	18	+
	19	#ifdef HAVE_CONFIG_H
	20	# include "config.h"
	21	#endif