diff --git a/src/plugins/switch/cray/ports.c b/src/plugins/switch/cray/ports.c
new file mode 100644
index 0000000000000000000000000000000000000000..ea6f7cccbc590eb6ca9b94f9394246962b3c3a0e
--- /dev/null
+++ b/src/plugins/switch/cray/ports.c
@@ -0,0 +1,153 @@
+/*****************************************************************************\
+ * ports.c - Library for managing a switch on a Cray system.
+ *****************************************************************************
+ * Copyright (C) 2014 SchedMD LLC
+ * Copyright 2014 Cray Inc. All Rights Reserved.
+ * Written by David Gloe <c16817@cray.com>
+ *
+ * This file is part of SLURM, a resource management program.
+ * For details, see <http://slurm.schedmd.com/>.
+ * Please also read the included file: DISCLAIMER.
+ *
+ * SLURM is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * In addition, as a special exception, the copyright holders give permission
+ * to link the code of portions of this program with the OpenSSL library under
+ * certain conditions as described in each individual source file, and
+ * distribute linked combinations including the two. You must obey the GNU
+ * General Public License in all respects for all of the code used other than
+ * OpenSSL. If you modify file(s) with this exception, you may extend this
+ * exception to your version of the file(s), but you are not obligated to do
+ * so. If you do not wish to do so, delete this exception statement from your
+ * version. If you delete this exception statement from all source files in
+ * the program, then also delete it here.
+ *
+ * SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with SLURM; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+\*****************************************************************************/
+
+#include "switch_cray.h"
+
+#ifdef HAVE_NATIVE_CRAY
+#include <unistd.h>
+
+// Global variables
+bitstr_t *port_resv = NULL;
+uint32_t last_alloc_port = 0;
+pthread_mutex_t port_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+/*
+ * Function: assign_port
+ * Description:
+ * Looks for and assigns the next free port. This port is used by Cray's
+ * PMI for its communications to manage its control tree.
+ *
+ * To avoid port conflicts, this function selects a large range of
+ * ports within the middle of the port range where it assumes no
+ * ports are used. No special precautions are taken to handle a
+ * selected port already in use by some other non-SLURM component
+ * on the node.
+ *
+ * If there are no free ports, then it loops through the entire table
+ * ATTEMPTS number of times before declaring a failure.
+ *
+ * Returns:
+ * 0 on success and -1 on failure.
+ */
+int assign_port(uint32_t *real_port)
+{
+ int port, tmp, attempts = 0;
+
+ if (!real_port) {
+ CRAY_ERR("real_port address was NULL.");
+ return -1;
+ }
+
+ /*
+ * Ports is an index into the reserved port table.
+ * The ports range from 0 up to PORT_CNT.
+ */
+ pthread_mutex_lock(&port_mutex);
+ port = ++last_alloc_port % PORT_CNT;
+
+ /*
+ * Find an unreserved port to assign.
+ * Abandon the attempt if we've been through the available ports ATTEMPT
+ * number of times
+ */
+ while (bit_test(port_resv, port)) {
+ tmp = ++port % PORT_CNT;
+ port = tmp;
+ attempts++;
+ if ((attempts / PORT_CNT) >= ATTEMPTS) {
+ CRAY_ERR("No free ports among %d ports. "
+ "Went through entire port list %d times",
+ PORT_CNT, ATTEMPTS);
+ pthread_mutex_unlock(&port_mutex);
+ return -1;
+ } else if ((attempts % PORT_CNT) == 0) {
+ /*
+ * Each time through give other threads a chance
+ * to release ports
+ */
+ pthread_mutex_unlock(&port_mutex);
+ sleep(1);
+ pthread_mutex_lock(&port_mutex);
+ }
+ }
+
+ bit_set(port_resv, port);
+ last_alloc_port = port;
+ pthread_mutex_unlock(&port_mutex);
+
+ /*
+ * The port index must be scaled up by the MIN_PORT.
+ */
+ *real_port = (port + MIN_PORT);
+ return 0;
+}
+
+/*
+ * Function: release_port
+ * Description:
+ * Release the port.
+ *
+ * Returns:
+ * 0 on success and -1 on failure.
+ */
+int release_port(uint32_t real_port)
+{
+
+ uint32_t port;
+
+ if ((real_port < MIN_PORT) || (real_port >= MAX_PORT)) {
+ CRAY_ERR("Port %" PRIu32 " outside of valid range %" PRIu32
+ " : %" PRIu32, real_port, MIN_PORT, MAX_PORT);
+ return -1;
+ }
+
+ port = real_port - MIN_PORT;
+
+ pthread_mutex_lock(&port_mutex);
+ if (bit_test(port_resv, port)) {
+ bit_clear(port_resv, port);
+ pthread_mutex_unlock(&port_mutex);
+ } else {
+ CRAY_ERR("Attempting to release port %d,"
+ " but it was not reserved.", real_port);
+ pthread_mutex_unlock(&port_mutex);
+ return -1;
+ }
+ return 0;
+}
+
+#endif
diff --git a/src/plugins/switch/cray/switch_cray.c b/src/plugins/switch/cray/switch_cray.c
index 4178113a91b2f9ee7056ffb2ca4f0e550bc5197b..0c95795972bc5d424dd560fbf95a68a465528255 100644
--- a/src/plugins/switch/cray/switch_cray.c
+++ b/src/plugins/switch/cray/switch_cray.c
@@ -580,7 +580,7 @@ int switch_p_build_jobinfo(switch_jobinfo_t *switch_job,
/*
* Get a unique port for PMI communications
*/
- rc = _assign_port(&port);
+ rc = assign_port(&port);
if (rc < 0) {
info("(%s: %d: %s) assign_port failed",
THIS_FILE, __LINE__, __FUNCTION__);
@@ -1434,7 +1434,7 @@ extern int switch_p_job_step_complete(switch_jobinfo_t *jobinfo,
* Release the reserved PMI port
* If this fails, do not exit with an error.
*/
- rc = _release_port(job->port);
+ rc = release_port(job->port);
if (rc != 0) {
error("(%s: %d: %s) Releasing port %" PRIu32 " failed.",
THIS_FILE, __LINE__, __FUNCTION__, job->port);
@@ -1591,102 +1591,6 @@ static int _get_cpu_total(void)
return total;
}
-/*
- * Function: assign_port
- * Description:
- * Looks for and assigns the next free port. This port is used by Cray's
- * PMI for its communications to manage its control tree.
- *
- * To avoid port conflicts, this function selects a large range of
- * ports within the middle of the port range where it assumes no
- * ports are used. No special precautions are taken to handle a
- * selected port already in use by some other non-SLURM component
- * on the node.
- *
- * If there are no free ports, then it loops through the entire table
- * ATTEMPTS number of times before declaring a failure.
- *
- * Returns:
- * 0 on success and -1 on failure.
- */
-static int _assign_port(uint32_t *real_port)
-{
- int port, tmp, attempts = 0;
-
- if (!real_port) {
- error("(%s: %d: %s) real_port address was NULL.",
- THIS_FILE, __LINE__, __FUNCTION__);
- return -1;
- }
-
- /*
- * Ports is an index into the reserved port table.
- * The ports range from 0 up to PORT_CNT.
- */
- port = ++last_alloc_port % PORT_CNT;
-
- /*
- * Find an unreserved port to assign.
- * Abandon the attempt if we've been through the available ports ATTEMPT
- * number of times
- */
- while (port_resv[port] == 1) {
- tmp = ++port % PORT_CNT;
- port = tmp;
- attempts++;
- if ((attempts / PORT_CNT) >= ATTEMPTS) {
- error("(%s: %d: %s) No free ports among %d ports. "
- " Went through entire port list %d times",
- THIS_FILE, __LINE__, __FUNCTION__, PORT_CNT,
- ATTEMPTS);
- return -1;
- }
- }
-
- port_resv[port] = 1;
- last_alloc_port = port;
-
- /*
- * The port index must be scaled up by the MIN_PORT.
- */
- *real_port = (port + MIN_PORT);
- return 0;
-}
-
-/*
- * Function: release_port
- * Description:
- * Release the port.
- *
- * Returns:
- * 0 on success and -1 on failure.
- */
-static int _release_port(uint32_t real_port)
-{
-
- uint32_t port;
-
- if ((real_port < MIN_PORT) || (real_port >= MAX_PORT)) {
- error("(%s: %d: %s) Port %" PRIu32
- "outside of valid range %" PRIu32
- ": %" PRIu32, THIS_FILE, __LINE__,
- __FUNCTION__, real_port, MIN_PORT, MAX_PORT);
- return -1;
- }
-
- port = real_port - MIN_PORT;
-
- if (port_resv[port]) {
- port_resv[port] = 0;
- } else {
- error("(%s: %d: %s) Attempting to release port %d,"
- " but it was not reserved.",
- THIS_FILE, __LINE__, __FUNCTION__, real_port);
- return -1;
- }
- return 0;
-}
-
/*
* Function: _free_alpsc_pe_info
* Description: