diff --git a/config.h.in b/config.h.in
index 7863bfd72b7f02e226517a83dc9778c62ed22e6f..a5c48d13f269c903ced2d2342e8bb4c03cb88d67 100644
--- a/config.h.in
+++ b/config.h.in
@@ -308,9 +308,6 @@
/* Define to 1 if using XCPU for job launch */
#undef HAVE_XCPU
-/* Define to 1 if you have the `\' function. */
-#undef HAVE__
-
/* Define if you have __progname. */
#undef HAVE__PROGNAME
diff --git a/configure.ac b/configure.ac
index 92e6af6b43d2c3eebdd174886dfb8317deb27e31..46c4c7107f4d4487596477e9dd005982eda72f8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,11 +37,11 @@ dnl Check to see if this architecture should use slurm_* prefix function
dnl aliases for plugins.
dnl
case "$host" in
- *-*-aix*) AC_DEFINE(USE_ALIAS, 0,
+ *-*-aix*) AC_DEFINE(USE_ALIAS, 0,
[Define slurm_ prefix function aliases for plusins]) ;;
*darwin*) AC_DEFINE(USE_ALIAS, 0,
[Define slurm_ prefix function aliases for plusins]) ;;
- *) AC_DEFINE(USE_ALIAS, 1,
+ *) AC_DEFINE(USE_ALIAS, 1,
[Define slurm_ prefix function aliases for plugins]) ;;
esac
@@ -141,7 +141,7 @@ AC_CHECK_FUNCS( \
mtrace \
strndup \
strlcpy \
- strsignal \
+ strsignal \
inet_aton \
inet_ntop \
inet_pton \
@@ -243,10 +243,10 @@ dnl
X_AC_PRINTF_NULL
dnl Check for whether to include readline support
-dnl
+dnl
X_AC_READLINE
-dnl
+dnl
dnl
X_AC_SLURM_WITH_SSL
AM_CONDITIONAL(HAVE_OPENSSL, test "x$ac_have_openssl" = "xyes")
@@ -309,7 +309,7 @@ X_AC_BLCR
dnl All slurm Makefiles:
AC_CONFIG_FILES([Makefile
- config.xml
+ config.xml
auxdir/Makefile
contribs/Makefile
contribs/pam/Makefile
@@ -319,8 +319,8 @@ AC_CONFIG_FILES([Makefile
contribs/phpext/Makefile
contribs/phpext/slurm_php/config.m4
contribs/slurmdb-direct/Makefile
- src/Makefile
- src/api/Makefile
+ src/Makefile
+ src/api/Makefile
src/common/Makefile
src/database/Makefile
src/sacct/Makefile
@@ -328,18 +328,18 @@ AC_CONFIG_FILES([Makefile
src/sreport/Makefile
src/sstat/Makefile
src/sshare/Makefile
- src/salloc/Makefile
- src/sbatch/Makefile
+ src/salloc/Makefile
+ src/sbatch/Makefile
src/sattach/Makefile
src/sprio/Makefile
- src/srun/Makefile
- src/srun_cr/Makefile
- src/slurmd/Makefile
- src/slurmd/slurmd/Makefile
- src/slurmd/slurmstepd/Makefile
+ src/srun/Makefile
+ src/srun_cr/Makefile
+ src/slurmd/Makefile
+ src/slurmd/slurmd/Makefile
+ src/slurmd/slurmstepd/Makefile
src/slurmdbd/Makefile
src/slurmctld/Makefile
- src/sbcast/Makefile
+ src/sbcast/Makefile
src/scontrol/Makefile
src/scancel/Makefile
src/squeue/Makefile
diff --git a/contribs/perlapi/libslurm-perl/Slurm.xs b/contribs/perlapi/libslurm-perl/Slurm.xs
index 62625ee815938dbcbfd0be1fbdae13dcd1215ba8..724ad4b0c7742e28428af65665c771e199fbacea 100644
--- a/contribs/perlapi/libslurm-perl/Slurm.xs
+++ b/contribs/perlapi/libslurm-perl/Slurm.xs
@@ -11,7 +11,7 @@
#include "msg.h"
#include "const-c.inc"
-
+
/* these declaration are not in slurm.h */
extern void slurm_api_set_conf_file(char *pathname);
extern void slurm_api_clear_config(void);
@@ -31,7 +31,7 @@ typedef struct slurm * slurm_t;
static struct slurm slurm;
#define SINGLETON (&slurm)
-static void
+static void
free_slurm(void)
{
if(slurm.node_info_msg) {
@@ -61,19 +61,19 @@ static signo_t
signame_to_no(char* signame)
{
int i = 0;
- struct {
- char * name;
+ struct {
+ char * name;
signo_t no;
} map [] = {
- {"SIGHUP", SIGHUP}, {"SIGINT", SIGINT}, {"SIGQUIT", SIGQUIT}, {"SIGILL", SIGILL}, {"SIGTRAP", SIGTRAP},
- {"SIGABRT", SIGABRT}, {"SIGBUS", SIGBUS}, {"SIGFPE", SIGFPE}, {"SIGKILL", SIGKILL}, {"SIGUSR1", SIGUSR1},
- {"SIGSEGV", SIGSEGV}, {"SIGUSR2", SIGUSR2}, {"SIGPIPE", SIGPIPE}, {"SIGALRM", SIGALRM}, {"SIGTERM", SIGTERM},
- {"SIGCHLD", SIGCHLD}, {"SIGCONT", SIGCONT}, {"SIGSTOP", SIGSTOP}, {"SIGTSTP", SIGTSTP}, {"SIGTTIN", SIGTTIN},
- {"SIGTTOU", SIGTTOU}, {"SIGURG", SIGURG}, {"SIGXCPU", SIGXCPU}, {"SIGXFSZ", SIGXFSZ}, {"SIGVTALRM", SIGVTALRM},
- {"SIGPROF", SIGPROF}, {"SIGWINCH", SIGWINCH}, {"SIGIO", SIGIO}, {"SIGPWR", SIGPWR}, {"SIGSYS", SIGSYS},
+ {"SIGHUP", SIGHUP}, {"SIGINT", SIGINT}, {"SIGQUIT", SIGQUIT}, {"SIGILL", SIGILL}, {"SIGTRAP", SIGTRAP},
+ {"SIGABRT", SIGABRT}, {"SIGBUS", SIGBUS}, {"SIGFPE", SIGFPE}, {"SIGKILL", SIGKILL}, {"SIGUSR1", SIGUSR1},
+ {"SIGSEGV", SIGSEGV}, {"SIGUSR2", SIGUSR2}, {"SIGPIPE", SIGPIPE}, {"SIGALRM", SIGALRM}, {"SIGTERM", SIGTERM},
+ {"SIGCHLD", SIGCHLD}, {"SIGCONT", SIGCONT}, {"SIGSTOP", SIGSTOP}, {"SIGTSTP", SIGTSTP}, {"SIGTTIN", SIGTTIN},
+ {"SIGTTOU", SIGTTOU}, {"SIGURG", SIGURG}, {"SIGXCPU", SIGXCPU}, {"SIGXFSZ", SIGXFSZ}, {"SIGVTALRM", SIGVTALRM},
+ {"SIGPROF", SIGPROF}, {"SIGWINCH", SIGWINCH}, {"SIGIO", SIGIO}, {"SIGPWR", SIGPWR}, {"SIGSYS", SIGSYS},
{NULL, 0}
};
-
+
for( i = 0; map[i].name != NULL; i ++) {
if (strcasecmp (map[i].name, signame) == 0)
return map[i].no;
@@ -132,7 +132,7 @@ PROTOTYPES: ENABLE
######################################################################
# MISC FUNCTIONS
######################################################################
-slurm_t
+slurm_t
get_slurm(slurm_t self = NULL, char *conf_file=NULL)
slurm_t RETVAL = NULL;
CODE:
@@ -207,7 +207,7 @@ slurm_allocate_resources_blocking(slurm_t self, HV* job_req = NULL, time_t timeo
XSRETURN_UNDEF;
}
sarb_cb_sv = callback;
- resp_msg = slurm_allocate_resources_blocking(&job_desc_msg, timeout,
+ resp_msg = slurm_allocate_resources_blocking(&job_desc_msg, timeout,
callback == NULL ? NULL : sarb_cb);
free_job_desc_msg_memory(&job_desc_msg);
if (resp_msg != NULL) {
@@ -297,7 +297,7 @@ slurm_submit_batch_job(slurm_t self, HV* job_req = NULL)
slurm_free_submit_response_response_msg(resp_msg);
OUTPUT:
RETVAL
-
+
int
slurm_job_will_run(slurm_t self, HV* job_req = NULL)
PREINIT:
@@ -328,7 +328,7 @@ int
slurm_signal_job(slurm_t self, U32 jobid, signo_t signal = 0)
C_ARGS:
jobid, signal
-
+
int
slurm_signal_job_step(slurm_t self, U32 jobid, U32 stepid, signo_t signal = 0)
C_ARGS:
@@ -417,7 +417,7 @@ slurm_load_jobs(slurm_t self = NULL, U16 show_flags = 0)
OUTPUT:
RETVAL
-# To be implemented in perl code
+# To be implemented in perl code
#slurm_print_job_info_msg()
#slurm_print_job_info()
#slurm_sprint_job_info()
@@ -435,12 +435,12 @@ slurm_get_end_time(slurm_t self, U32 jobid)
RETVAL = end_time;
OUTPUT:
RETVAL
-
+
long
slurm_get_rem_time(slurm_t self, U32 jobid)
C_ARGS:
jobid
-
+
U32
slurm_pid2jobid(slurm_t self, U32 pid)
PREINIT:
@@ -503,7 +503,7 @@ slurm_get_job_steps(slurm_t self = NULL, U16 show_flags = 0, U32 jobid = 0, U32
# slurm_print_job_step_info_response_msg
# slurm_print_job_step_info_msg
# slurm_sprint_job_step_info
-
+
HV*
slurm_job_step_layout_get(slurm_t self, U32 jobid, U32 stepid)
PREINIT:
@@ -520,9 +520,9 @@ slurm_job_step_layout_get(slurm_t self, U32 jobid, U32 stepid)
}
OUTPUT:
RETVAL
-
-
+
+
######################################################################
# SLURM NODE CONFIGURATION READ/PRINT/UPDATE FUNCTIONS
######################################################################
@@ -562,7 +562,7 @@ slurm_update_node(slurm_t self, HV* update_req = NULL)
}
C_ARGS:
&node_msg
-
+
######################################################################
# SLURM PARTITION CONFIGURATION READ/PRINT/UPDATE FUNCTIONS
######################################################################
@@ -602,7 +602,7 @@ slurm_update_partition(slurm_t self, HV* part_info = NULL)
}
C_ARGS:
&update_msg
-
+
int
slurm_delete_partition(slurm_t self, char* part_name)
PREINIT:
@@ -625,7 +625,7 @@ slurm_ping(slurm_t self, U16 primary = 1)
int
slurm_reconfigure(slurm_t self)
C_ARGS:
-
+
int
slurm_shutdown(slurm_t self, U16 core = 0)
C_ARGS:
@@ -753,7 +753,7 @@ int
slurm_hostlist_count(hostlist_t hl = NULL)
OUTPUT:
RETVAL
-
+
hostlist_t
slurm_hostlist_create(char* hostlist)
@@ -787,7 +787,7 @@ slurm_hostlist_ranged_string(hostlist_t hl = NULL)
RETVAL
char*
-slurm_hostlist_shift(hostlist_t hl = NULL)
+slurm_hostlist_shift(hostlist_t hl = NULL)
PREINIT:
char *host = NULL;
CODE:
diff --git a/contribs/phpext/Makefile.am b/contribs/phpext/Makefile.am
index 365ea0c5e3eaa3171bc7f72d160db1766b71a173..f9ee92ce600f01e88699b30fb45e9dc6c9c13407 100644
--- a/contribs/phpext/Makefile.am
+++ b/contribs/phpext/Makefile.am
@@ -20,7 +20,7 @@ all-local:
fi \
fi && \
$(MAKE) $(add_flags); \
- cd ..;
+ cd ..;
install-exec-local:
@cd $(php_dir) && \
diff --git a/contribs/phpext/Makefile.in b/contribs/phpext/Makefile.in
index 5457b7a1e34a523cf2b73213e8feefcbdce26a40..36919bcf69a87b29d436952989cd1a8efa0d22d5 100644
--- a/contribs/phpext/Makefile.in
+++ b/contribs/phpext/Makefile.in
@@ -461,7 +461,7 @@ all-local:
fi \
fi && \
$(MAKE) $(add_flags); \
- cd ..;
+ cd ..;
install-exec-local:
@cd $(php_dir) && \
diff --git a/contribs/slurmdb-direct/moab_2_slurmdb.pl b/contribs/slurmdb-direct/moab_2_slurmdb.pl
index 5ebd5c33bfc804172f91a5601ceed00eccb57306..8d98dee89ef7322815559d45f57e973a3da868e8 100755
--- a/contribs/slurmdb-direct/moab_2_slurmdb.pl
+++ b/contribs/slurmdb-direct/moab_2_slurmdb.pl
@@ -12,35 +12,35 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <http://www.llnl.gov/linux/slurm/>.
-#
+#
# 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
+# 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
+# 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
+# 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.
-#
+#
###############################################################################
use strict;
@@ -148,21 +148,21 @@ foreach my $line (<STDIN>) {
my $gid = getgrnam($group);
$uid = -2 if !$uid;
$gid = -2 if !$gid;
-
- # figure out the wckey
+
+ # figure out the wckey
my $wckey = "";
if ($rm_ext =~ /wckey:(\w*)/) {
$wckey = $1;
}
-
+
if($partition =~ /\[(\w*)/) {
$partition = $1;
}
- # Only pick out a number at the beginning if it is something else
- # we should skip it and make comp_code 0. If we want something
- # else just change it to whatever you would think would be best.
- # Dispite the Moab documentation the comp code could contain
+ # Only pick out a number at the beginning if it is something else
+ # we should skip it and make comp_code 0. If we want something
+ # else just change it to whatever you would think would be best.
+ # Dispite the Moab documentation the comp code could contain
# characters like ,SID= afterwards, without knowing what that means
# we just skip it. We haven't seen a case where comp_code isn't an
# int at the first so the 0 "should" never happen.
@@ -184,7 +184,7 @@ foreach my $line (<STDIN>) {
$cluster = "";
}
}
-
+
if($message =~ /job\\20exceeded\\20wallclock\\20limit/) {
$event = "JOBTIMEOUT";
}
@@ -194,25 +194,25 @@ foreach my $line (<STDIN>) {
Slurm::Hostlist::uniq($alloc_hl);
$alloc_hl = Slurm::Hostlist::ranged_string($alloc_hl);
}
-
+
if($event eq "JOBSUBMIT") {
$submit_sql .= ", " if $submit_set;
$submit_sql .= "($id, 0, 0, 0, 0, $uid, $gid, \"$cluster\", " .
"\"$account\", \"$partition\", \"$wckey\", " .
"\"$executable\", 0, $req_tasks, $submit_time)";
- $submit_set = 1;
- $set = 1;
+ $submit_set = 1;
+ $set = 1;
} elsif ($event eq "JOBMIGRATE") {
$migrate_sql .= ", " if $migrate_set;
- # here for some reason the eligible time is really the
- # elgible time, so we use the end time which appears
+ # here for some reason the eligible time is really the
+ # elgible time, so we use the end time which appears
# to be the best guess.
$migrate_sql .= "($id, 0, 0, 0, 0, $uid, $gid, \"$cluster\", " .
"\"$account\", \"$partition\", \"$wckey\", " .
"\"$executable\", 0, $req_tasks, $submit_time, " .
"$end_time)";
- $migrate_set = 1;
- $set = 1;
+ $migrate_set = 1;
+ $set = 1;
} elsif ($event eq "JOBSTART") {
$start_sql .= ", " if $start_set;
@@ -223,8 +223,8 @@ foreach my $line (<STDIN>) {
"\"$executable\", 1, $req_tasks, $submit_time, " .
"$eligible_time, $start_time, \"$alloc_hl\", " .
"$req_tasks)";
- $start_set = 1;
- $set = 1;
+ $start_set = 1;
+ $set = 1;
} elsif (($event eq "JOBEND") || ($event eq "JOBCANCEL")
|| ($event eq "JOBFAILURE") || ($event eq "JOBTIMEOUT")) {
if($event eq "JOBEND") {
@@ -243,8 +243,8 @@ foreach my $line (<STDIN>) {
"\"$executable\", $state, $req_tasks, $submit_time, " .
"$eligible_time, $start_time, \"$alloc_hl\", " .
"$req_tasks, $end_time, $comp_code)";
- $end_set = 1;
- $set = 1;
+ $end_set = 1;
+ $set = 1;
} else {
print "ERROR: unknown event of $event\n";
next;
diff --git a/contribs/torque/mpiexec.pl b/contribs/torque/mpiexec.pl
index badbd43d97aaff02322a47527b7a27d4769f33c5..9724a5316ddc49d97bac5d8f1d7b8820c13e5d78 100755
--- a/contribs/torque/mpiexec.pl
+++ b/contribs/torque/mpiexec.pl
@@ -9,36 +9,36 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <auble1@llnl.gov>.
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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
+# 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
+# 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
+# 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.
-#
+#
###############################################################################
use strict;
@@ -65,7 +65,7 @@ sub get_new_config() {
die "$config_file doesn't exsist!";
open FILE, ">$new_config" or
die "Can't open $new_config";
-
+
foreach my $line (<OLD_FILE>) {
my @parts = split(/\:/, $line);
if(!$parts[0] || !$parts[1]
@@ -79,13 +79,13 @@ sub get_new_config() {
$task_cnt = $end_cnt+1;
} else {
print "We don't have support for hostname task layout in a config file right now.\nPlease use srun with the -m arbitrary mode to layout tasks on specific nodes.\n";
- }
+ }
}
-
+
close FILE;
close OLD_FILE;
-
- return ($new_config, $task_cnt);
+
+ return ($new_config, $task_cnt);
}
@@ -139,8 +139,8 @@ my $new_config;
my $command = "$srun";
# write stdout and err to files instead of stdout
-$command .= " -o job.o\%j -e job.e\%j" if $nostdout;
-$command .= " -inone" if $nostdin;
+$command .= " -o job.o\%j -e job.e\%j" if $nostdout;
+$command .= " -inone" if $nostdin;
$command .= " -i0" if !$allstdin; #default only send stdin to first node
$command .= " -n$nprocs" if $nprocs; # number of tasks
$command .= " -w$hostname" if $hostname; # Hostlist provided
diff --git a/contribs/torque/pbsnodes.pl b/contribs/torque/pbsnodes.pl
index 3992f1a64cb6280f2eb015c49332dddf408b9a50..d7ac4e815ab372fa3c16dc0ede0641416e8af685 100755
--- a/contribs/torque/pbsnodes.pl
+++ b/contribs/torque/pbsnodes.pl
@@ -9,36 +9,36 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <auble1@llnl.gov>.
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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
+# 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
+# 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
+# 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.
-#
+#
# Based off code with permission copyright 2006, 2007 Cluster Resources, Inc.
###############################################################################
@@ -90,7 +90,7 @@ Main:
die "Problem loading jobs.\n";
}
-
+
foreach my $node (@{$resp->{node_array}}) {
my $nodeId = $node->{'name'};
my $rCProc = $node->{'cpus'};
@@ -104,14 +104,14 @@ Main:
my $load = $node->{'LOAD'};
my $arch = $node->{'ARCH'};
#
-
+
# Filter nodes according to options and arguments
if (@nodeIds) {
next unless grep /^$nodeId/, @nodeIds;
}
-
+
# Prepare variables
-
+
my @status = ();
push @status, "opsys=$os" if $os;
push @status, "loadave=" . sprintf("%.2f", $load) if defined $load;
diff --git a/contribs/torque/qdel.pl b/contribs/torque/qdel.pl
index 49a991cc512d77ccff40f2dcc978c9fd7246457c..27167d839f420e95902155b6deca31e0cce353ca 100755
--- a/contribs/torque/qdel.pl
+++ b/contribs/torque/qdel.pl
@@ -9,36 +9,36 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <auble1@llnl.gov>.
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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
+# 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
+# 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
+# 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.
-#
+#
# Based off code with permission copyright 2006, 2007 Cluster Resources, Inc.
###############################################################################
@@ -94,7 +94,7 @@ Main:
my $resp = 0;
for(my $i=0; $i<3; $i++) {
$resp = Slurm->kill_job($jobid, SIGKILL);
- $err = Slurm->get_errno();
+ $err = Slurm->get_errno();
if($resp == SLURM_SUCCESS
|| ($err ne ESLURM_TRANSITION_STATE_NO_UPDATE
&& $err ne ESLURM_JOB_PENDING)) {
diff --git a/contribs/torque/qhold.pl b/contribs/torque/qhold.pl
index 4d3e2d5957775b65e4bfc28489e99f1f39c2eb18..41c61dc945e317001ee7e454c18346409fa5ae36 100755
--- a/contribs/torque/qhold.pl
+++ b/contribs/torque/qhold.pl
@@ -10,36 +10,36 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <auble1@llnl.gov>.
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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
+# 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
+# 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
+# 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.
-#
+#
# Based off code with permission copyright 2006, 2007 Cluster Resources, Inc.
###############################################################################
@@ -107,7 +107,7 @@ Main:
my $rc = 0;
foreach my $jobid (@jobIds) {
my $err = 0;
- my $resp = 0;
+ my $resp = 0;
my %update = ();
$update{job_id} = $jobid;
@@ -115,12 +115,12 @@ Main:
$update{priority} = 0;
$update{comment} = $reason; #doesn't do anything in 1.2
} else {
- $update{priority} = -1;
+ $update{priority} = -1;
$update{comment} = "None"; #doesn't do anything in 1.2
}
-
+
if(Slurm->update_job(\%update)) {
- $err = Slurm->get_errno();
+ $err = Slurm->get_errno();
$rc++;
printf("qhold: Error on job id %d: %s\n",
$jobid, Slurm->strerror($err));
diff --git a/contribs/torque/qrls.pl b/contribs/torque/qrls.pl
index 8d44fef2b7b57ad172c83226cd07992970e79d9a..851df7013ea45fa8506a237fa01673fd5da57f6d 100755
--- a/contribs/torque/qrls.pl
+++ b/contribs/torque/qrls.pl
@@ -9,36 +9,36 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <auble1@llnl.gov>.
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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
+# 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
+# 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
+# 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.
-#
+#
# Based off code with permission copyright 2006, 2007 Cluster Resources, Inc.
##############################################################################
@@ -94,17 +94,17 @@ Main:
my $rc = 0;
foreach my $jobid (@jobIds) {
my $err = 0;
- my $resp = 0;
+ my $resp = 0;
my %update = ();
$update{job_id} = $jobid;
-
- $update{priority} = -1;
+
+ $update{priority} = -1;
$update{comment} = "None"; #doesn't do anything in 1.2
-
-
+
+
if(Slurm->update_job(\%update)) {
- $err = Slurm->get_errno();
+ $err = Slurm->get_errno();
$rc++;
printf("qrls: Error on job id %d: %s\n",
$jobid, Slurm->strerror($err));
diff --git a/contribs/torque/qstat.pl b/contribs/torque/qstat.pl
index 6a5a8e50485107c7770f7e41f1a1e6fc6e04f0be..536c22f23132d76798e14ebcbf17b1a8656242a2 100755
--- a/contribs/torque/qstat.pl
+++ b/contribs/torque/qstat.pl
@@ -9,36 +9,36 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <auble1@llnl.gov>.
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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
+# 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
+# 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
+# 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.
-#
+#
# Based off code with permission copyright 2006, 2007 Cluster Resources, Inc.
###############################################################################
@@ -103,13 +103,13 @@ if ($man)
# Use sole remaining argument as jobIds
-if($^O eq 'aix') {
+if($^O eq 'aix') {
$hostname = `hostname`;
} else {
$hostname = `hostname -f`;
}
chomp $hostname;
-
+
# Handle unsupported arguments
#unsupportedOption("-e", DIE) if $executable;
#unsupportedOption("-W", DIE) if $siteSpecific;
@@ -134,19 +134,19 @@ if(defined($queueList)) {
if(!$resp) {
die "Problem loading jobs.\n";
}
-
+
my $line = 0;
foreach my $part (@{$resp->{partition_array}}) {
if (@queueIds) {
next unless grep /^$part->{'name'}/, @queueIds;
- }
-
+ }
+
if ($full) { # Full
print_part_full($part);
} else { # Brief
print_part_brief($part, $line);
$line++;
- }
+ }
$rc = 0;
}
} elsif($queueStatus) {
@@ -190,15 +190,15 @@ if(defined($queueList)) {
my $state = $job->{'job_state'};
if($job->{'end_time'} && $job->{'end_time'} < $now_time) {
$use_time = $job->{'end_time'};
- }
+ }
$job->{'statPSUtl'} = job_time_used($job);
$job->{'aWDuration'} = $job->{'statPSUtl'};
$job->{'allocNodeList'} = $job->{'nodes'} || "--";
$job->{'stateCode'} = stateCode($job->{'job_state'});
$job->{'user_name'} = getpwuid($job->{'user_id'});
- $job->{'name'} = "Allocation" if !$job->{'name'};
-
+ $job->{'name'} = "Allocation" if !$job->{'name'};
+
# Filter jobs according to options and arguments
if (@jobIds) {
next unless grep /^$job->{'job_id'}/, @jobIds;
@@ -211,11 +211,11 @@ if(defined($queueList)) {
next unless ($job->{'stateCode'} eq 'Q');
}
if (@userIds) {
- next unless
+ next unless
grep /^$job->{'user_name'}$/, @userIds;
}
}
-
+
if ($all || $idle || $nodes || $running
|| $giga || $mega || $userList) { # Normal
print_job_select($job);
@@ -245,7 +245,7 @@ sub stateCode
}
switch($state) {
- case [JOB_COMPLETE,
+ case [JOB_COMPLETE,
JOB_CANCELLED,
JOB_TIMEOUT,
JOB_FAILED] { return 'C' }
@@ -265,11 +265,11 @@ sub stateCode
sub hhmm
{
my ($hhmmss) = @_;
-
+
if ($hhmmss == INFINITE) {
return "Infinite";
}
-
+
# Convert hhmmss to duration in minutes
$hhmmss = 0 unless $hhmmss;
$hhmmss =~ /(?:(\d+):)?(?:(\d+):)?([\d\.]+)/;
@@ -378,8 +378,8 @@ sub job_time_used
} else {
$end_time = $job->{'end_time'};
}
-
- return ($end_time - $job->{'suspend_time'} + $job->{'pre_sus_time'})
+
+ return ($end_time - $job->{'suspend_time'} + $job->{'pre_sus_time'})
if $job->{'suspend_time'};
return ($end_time - $job->{'start_time'});
}
@@ -405,7 +405,7 @@ sub running_stopped
return "S";
}
-sub get_exec_host
+sub get_exec_host
{
my ($job) = @_;
@@ -418,12 +418,12 @@ sub get_exec_host
while((my $host = Slurm::Hostlist::shift($hl))) {
push(@allocNodes,
"$host/" . $job->{'cpus_per_node'}[$inx]);
-
+
$cpu_cnt++;
if($cpu_cnt >= $job->{'cpu_count_reps'}[$inx]) {
$cpu_cnt = 0;
$inx++;
- }
+ }
}
$execHost = join '+', @allocNodes;
}
@@ -433,7 +433,7 @@ sub get_exec_host
###############################################################################
# Job Functions
###############################################################################
-sub print_job_brief
+sub print_job_brief
{
my ($job, $line_num) = @_;
@@ -456,7 +456,7 @@ sub print_job_select
if (!defined $header_printed) {
print "\n${hostname}:\n";
-
+
printf("%-20s %-8s %-8s %-20s %-6s %-5s %-3s %-6s %-5s %-1s %-5s\n",
"", "", "", "", "", "", "", "Req'd", "Req'd", "", "Elap");
printf(
@@ -472,10 +472,10 @@ sub print_job_select
$header_printed = 1;
}
$execHost = get_exec_host($job) if $nodes;
-
+
printf("%-20.20s %-8.8s %-8.8s %-20.20s " .
"%-6.6s %5.5s %3.3s %6.6s %-5.5s %-1s %-5.5s",
- $job->{'job_id'},
+ $job->{'job_id'},
$job->{'user_name'},
$job->{'partition'},
$job->{'name'},
@@ -503,25 +503,25 @@ sub print_job_full
# Print the job attributes
printf("Job Id:\t%s\n", $job->{'job_id'});
printf("\tJob_Name = %s\n", $job->{'name'}) if $job->{'name'};
- printf("\tJob_Owner = %s@%s\n",
+ printf("\tJob_Owner = %s@%s\n",
$job->{'user_name'}, $job->{'alloc_node'});
-
+
printf "\tinteractive = True\n" if !$job->{'batch_flag'};
-
+
printf("\tjob_state = %s\n", $job->{'stateCode'});
printf("\tqueue = %s\n", $job->{'partition'});
-
+
printf("\tqtime = %s\n", hRTime($job->{'submit_time'}));
- printf("\tmtime = %s\n", hRTime($job->{'start_time'}))
+ printf("\tmtime = %s\n", hRTime($job->{'start_time'}))
if $job->{'start_time'};
printf("\tctime = %s\n", hRTime($job->{'end_time'}))
if $job->{'end_time'};
-
+
printf("\tAccount_Name = %s\n", $job->{'account'}) if $job->{'account'};
-
+
my $execHost = get_exec_host($job);
printf("\texec_host = %s\n", $execHost) if $execHost ne '--';
-
+
printf("\tPriority = %u\n", $job->{'priority'});
printf("\teuser = %s(%d)\n", $job->{'user_name'}, $job->{'user_id'});
@@ -533,24 +533,24 @@ sub print_job_full
printf("\tResource_List.walltime = %s\n", hhmmss($job->{'aWDuration'}));
printf("\tResource_List.nodect = %d\n", $job->{'num_nodes'})
if $job->{'num_nodes'};
- printf("\tResource_List.ncpus = %s\n", $job->{'num_procs'})
- if $job->{'num_procs'};
-
+ printf("\tResource_List.ncpus = %s\n", $job->{'num_procs'})
+ if $job->{'num_procs'};
+
if ($job->{'reqNodes'}) {
my $nodeExpr = $job->{'reqNodes'};
- $nodeExpr .= ":ppn=" . $job->{'ntasks_per_node'}
- if $job->{'ntasks_per_node'};
-
+ $nodeExpr .= ":ppn=" . $job->{'ntasks_per_node'}
+ if $job->{'ntasks_per_node'};
+
printf("\tResource_List.nodes = %s\n", $nodeExpr);
}
-
+
print "\n";
}
###############################################################################
# Partition Functions
###############################################################################
-sub print_part_brief
+sub print_part_brief
{
my ($part, $line_num) = @_;
@@ -559,7 +559,7 @@ sub print_part_brief
"Queue", "Max", "Tot", "Ena", "Str", "Que", "Run",
"Hld", "Wat", "Trn", "Ext", "T");
printf("%-16s %5s %5s %5s %5s %5s %5s %5s %5s %5s %5s %1s\n",
- "----------------", "---", "---", "---", "---", "---",
+ "----------------", "---", "---", "---", "---", "---",
"---", "---", "---", "---", "---", "-");
}
printf("%-16.16s %5.5s %5.5s %5.5s %5.5s %5.5s %5.5s %5.5s " .
@@ -576,15 +576,15 @@ sub print_part_full
printf("Queue:\t%s\n", $part->{'name'});
printf("\tqueue_type = Execution\n");
printf("\tresources_default.nodes = %d\n", $part->{'total_nodes'});
-
+
printf("\tenabled = %s\n", yes_no($part->{'state_up'}));
-
+
printf("\tstarted = %s\n", yes_no($part->{'state_up'}));
-
+
print "\n";
}
-sub print_part_limits
+sub print_part_limits
{
my ($part, $line_num) = @_;
@@ -597,13 +597,13 @@ sub print_part_limits
"----", "---", "---", "--", "-----");
}
-
+
printf("%-16.16s -- -- ", $part->{'name'});
if($part->{'max_time'} != INFINITE) {
printf("%8u ", $part->{'max_time'});
} else {
printf(" -- ");
-
+
}
if($part->{'max_nodes'} != INFINITE) {
diff --git a/contribs/torque/qsub.pl b/contribs/torque/qsub.pl
index ff800bfb04333b25a18f1d0a1504c455ea2150c6..dc5bff4948b88487fb9acd27c8da185789a5ec6e 100755
--- a/contribs/torque/qsub.pl
+++ b/contribs/torque/qsub.pl
@@ -9,36 +9,36 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <auble1@llnl.gov>.
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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
+# 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
+# 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
+# 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.
-#
+#
###############################################################################
use strict;
@@ -138,7 +138,7 @@ my %node_opts;
if($resource_list) {
%res_opts = %{parse_resource_list($resource_list)};
-
+
# while((my $key, my $val) = each(%res_opts)) {
# print "$key = ";
# if($val) {
@@ -147,7 +147,7 @@ if($resource_list) {
# print "\n";
# }
# }
-
+
if($res_opts{nodes}) {
%node_opts = %{parse_node_opts($res_opts{nodes})};
}
@@ -157,10 +157,10 @@ my $command;
if($interactive) {
$command = "$salloc";
-
+
} else {
$command = "$sbatch";
-
+
$command .= " -D $directive_prefix" if $directive_prefix;
$command .= " -e $err_path" if $err_path;
$command .= " -o $out_path" if $out_path;
@@ -223,11 +223,11 @@ sub parse_resource_list {
'walltime' => ""
);
my @keys = keys(%opt);
-
+
foreach my $key (@keys) {
#print "$rl\n";
($opt{$key}) = $rl =~ m/$key=([\w:\+=+]+)/;
-
+
}
if($opt{cput}) {
$opt{cput} = get_minutes($opt{cput});
@@ -240,7 +240,7 @@ sub parse_resource_list {
if($opt{file}) {
$opt{file} = convert_mb_format($opt{file});
}
-
+
return \%opt;
}
@@ -271,24 +271,24 @@ sub parse_node_opts {
}
}
}
-
+
$opt{hostlist} = Slurm::Hostlist::ranged_string($hl);
my $hl_cnt = Slurm::Hostlist::count($hl);
$opt{node_cnt} = $hl_cnt if $hl_cnt > $opt{node_cnt};
-
- # we always want at least one here
+
+ # we always want at least one here
if(!$opt{node_cnt}) {
-
+
$opt{node_cnt} = 1;
}
-
- # figure out the amount of tasks based of the node cnt and the amount
+
+ # figure out the amount of tasks based of the node cnt and the amount
# of ppn's in the request
if($opt{task_cnt}) {
$opt{task_cnt} *= $opt{node_cnt};
}
-
+
return \%opt;
}
@@ -318,7 +318,7 @@ sub convert_mb_format {
my ($value) = @_;
my ($amount, $suffix) = $value =~ /(\d+)($|[KMGT])/i;
return if !$amount;
- $suffix = lc($suffix);
+ $suffix = lc($suffix);
if (!$suffix) {
$amount /= 1048576;
@@ -330,7 +330,7 @@ sub convert_mb_format {
$amount *= 1024;
} elsif ($suffix eq "t") {
$amount *= 1048576;
- } else {
+ } else {
print "don't know what to do with suffix $suffix\n";
return;
}
@@ -349,13 +349,13 @@ B<qsub> - submit a batch job in a familiar pbs format
=head1 SYNOPSIS
-qsub [-a date_time] [-A account_string] [-b secs] [-c interval]
+qsub [-a date_time] [-A account_string] [-b secs] [-c interval]
[-C directive_prefix] [-e path] [-h] [-I]
[-j join] [-k keep] [-l resource_list] [-m mail_options]
[-M user_list] [-N name] [-o path] [-p priority] [-q destination]
[-r c] [-S path_list] [-u user_list] [-v variable_list] [-V]
[-W additional_attributes] [-z] [script]
-
+
=head1 DESCRIPTION
The B<qsub> command displays information about nodes.
diff --git a/src/Makefile.am b/src/Makefile.am
index 4392926da66593a2659a4816ae5805378b519b61..3bc20923de33621b07f913ec196149bd7c47e94b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
-if WITH_BLCR
+if WITH_BLCR
SRUN_CR = srun_cr
else
-SRUN_CR =
+SRUN_CR =
endif
SUBDIRS = common api database \
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index 5418b408ad727771ed72ce922bbd8d28cd198d93..fbfda5188efda7067d07cb47cd8f4d5be59923d9 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -16,10 +16,10 @@ PMI_OTHER_FLAGS = \
-Wl,--version-script=$(PMI_VERSION_SCRIPT)
endif
-# libslurm version information :
+# libslurm version information :
#
# Update META file information before a public release only!
-#
+#
# Note that libtool builds libslurm.so.<major>.<age>.<rev>
# where major = API_MAJOR = (API_CURRENT - API_AGE)
# and age = API_AGE
@@ -31,13 +31,13 @@ endif
# If any interfaces have been added: increment API_CURRENT, increment API_AGE,
# and set API_REVISION = 0 (e.g. libslurm.so.2.4.6 -> libslurm.so.2.5.0)
#
-# If any interfaces have been removed: increment API_CURRENT, set API_AGE = 0,
+# If any interfaces have been removed: increment API_CURRENT, set API_AGE = 0,
# and set API_REVISION = 0 (e.g. libslurm.so.2.4.6 -> libslurm.so.7.0.0)
#
# If any interfaces have changed: increment API_CURRENT only
# (e.g. libslurm.so.2.4.6 -> libslurm.so.3.4.6)
#
-# If the interfaces have not changed, but underlying code has changed at all:
+# If the interfaces have not changed, but underlying code has changed at all:
# increment API_REVISION only (e.g. libslurm.so.2.4.6 -> libslurm.so.2.4.7)
#
current = $(SLURM_API_CURRENT)
@@ -54,10 +54,10 @@ BUILT_SOURCES = $(VERSION_SCRIPT) $(PMI_VERSION_SCRIPT) libslurm.la
# Note that libslurmhelper is mostly the same as libslurm, except that
# it exports ALL symbols used by the process, libcommon, libeio, etc.
-# Only link with libslurmhelper if you are sure you are not going to be
-# loading a plugin that could use something you yourself are not
+# Only link with libslurmhelper if you are sure you are not going to be
+# loading a plugin that could use something you yourself are not
# calling from here.
-# libslurm.o only contains all the api symbols and will export
+# libslurm.o only contains all the api symbols and will export
# them to plugins that are loaded.
# Also, libslurmhelper, libslurm.o are for convenience, they are not installed.
noinst_LTLIBRARIES = libslurmhelper.la
@@ -108,7 +108,7 @@ libslurmhelper_la_LDFLAGs = \
convenience_libs = \
$(top_builddir)/src/api/libslurmhelper.la
-libslurm_la_SOURCES =
+libslurm_la_SOURCES =
libslurm_la_LIBADD = $(convenience_libs)
libslurm_la_LDFLAGS = \
$(LIB_LDFLAGS) \
@@ -126,9 +126,9 @@ libpmi_la_LDFLAGS = $(LIB_LDFLAGS) \
-version-info $(current):$(rev):$(age) \
$(PMI_OTHER_FLAGS)
-# This was made so we chould export all symbols from libcommon
+# This was made so we chould export all symbols from libcommon
# on multiple platforms
-libslurm_o_SOURCES =
+libslurm_o_SOURCES =
libslurm_o_LDADD = $(top_builddir)/src/common/libeio.o \
$(top_builddir)/src/common/libspank.o \
diff --git a/src/api/Makefile.in b/src/api/Makefile.in
index 96abe78ad5d6bfe03bd24f1e009450839a32a3c0..90b5a81bfff94cbda0460761ef268845f68b0444 100644
--- a/src/api/Makefile.in
+++ b/src/api/Makefile.in
@@ -354,10 +354,10 @@ INCLUDES = -I$(top_srcdir) $(BG_INCLUDES)
@WITH_GNU_LD_TRUE@ -Wl,--version-script=$(PMI_VERSION_SCRIPT)
-# libslurm version information :
+# libslurm version information :
#
# Update META file information before a public release only!
-#
+#
# Note that libtool builds libslurm.so.<major>.<age>.<rev>
# where major = API_MAJOR = (API_CURRENT - API_AGE)
# and age = API_AGE
@@ -369,13 +369,13 @@ INCLUDES = -I$(top_srcdir) $(BG_INCLUDES)
# If any interfaces have been added: increment API_CURRENT, increment API_AGE,
# and set API_REVISION = 0 (e.g. libslurm.so.2.4.6 -> libslurm.so.2.5.0)
#
-# If any interfaces have been removed: increment API_CURRENT, set API_AGE = 0,
+# If any interfaces have been removed: increment API_CURRENT, set API_AGE = 0,
# and set API_REVISION = 0 (e.g. libslurm.so.2.4.6 -> libslurm.so.7.0.0)
#
# If any interfaces have changed: increment API_CURRENT only
# (e.g. libslurm.so.2.4.6 -> libslurm.so.3.4.6)
#
-# If the interfaces have not changed, but underlying code has changed at all:
+# If the interfaces have not changed, but underlying code has changed at all:
# increment API_REVISION only (e.g. libslurm.so.2.4.6 -> libslurm.so.2.4.7)
#
current = $(SLURM_API_CURRENT)
@@ -391,10 +391,10 @@ BUILT_SOURCES = $(VERSION_SCRIPT) $(PMI_VERSION_SCRIPT) libslurm.la
# Note that libslurmhelper is mostly the same as libslurm, except that
# it exports ALL symbols used by the process, libcommon, libeio, etc.
-# Only link with libslurmhelper if you are sure you are not going to be
-# loading a plugin that could use something you yourself are not
+# Only link with libslurmhelper if you are sure you are not going to be
+# loading a plugin that could use something you yourself are not
# calling from here.
-# libslurm.o only contains all the api symbols and will export
+# libslurm.o only contains all the api symbols and will export
# them to plugins that are loaded.
# Also, libslurmhelper, libslurm.o are for convenience, they are not installed.
noinst_LTLIBRARIES = libslurmhelper.la
@@ -462,7 +462,7 @@ libpmi_la_LDFLAGS = $(LIB_LDFLAGS) \
$(PMI_OTHER_FLAGS)
-# This was made so we chould export all symbols from libcommon
+# This was made so we chould export all symbols from libcommon
# on multiple platforms
libslurm_o_SOURCES =
libslurm_o_LDADD = $(top_builddir)/src/common/libeio.o \
diff --git a/src/api/allocate.c b/src/api/allocate.c
index 8ac8a28482bc67b6787b135b2020c37c8164c750..bb085a491457418b6b7513580eb8c029e4443a6b 100644
--- a/src/api/allocate.c
+++ b/src/api/allocate.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -94,7 +94,7 @@ static resource_allocation_response_msg_t *_wait_for_allocation_response(
* NOTE: free the allocated using slurm_free_resource_allocation_response_msg
*/
int
-slurm_allocate_resources (job_desc_msg_t *req,
+slurm_allocate_resources (job_desc_msg_t *req,
resource_allocation_response_msg_t **resp)
{
int rc;
@@ -105,21 +105,21 @@ slurm_allocate_resources (job_desc_msg_t *req,
slurm_msg_t_init(&req_msg);
slurm_msg_t_init(&resp_msg);
- /*
+ /*
* set Node and session id for this request
*/
if (req->alloc_sid == NO_VAL)
req->alloc_sid = getsid(0);
- if ( (req->alloc_node == NULL)
+ if ( (req->alloc_node == NULL)
&& (gethostname_short(host, sizeof(host)) == 0) ) {
req->alloc_node = host;
host_set = true;
}
req_msg.msg_type = REQUEST_RESOURCE_ALLOCATION;
- req_msg.data = req;
-
+ req_msg.data = req;
+
rc = slurm_send_recv_controller_msg(&req_msg, &resp_msg);
/*
@@ -129,7 +129,7 @@ slurm_allocate_resources (job_desc_msg_t *req,
if (host_set)
req->alloc_node = NULL;
- if (rc == SLURM_SOCKET_ERROR)
+ if (rc == SLURM_SOCKET_ERROR)
return SLURM_SOCKET_ERROR;
switch (resp_msg.msg_type) {
@@ -161,7 +161,7 @@ slurm_allocate_resources (job_desc_msg_t *req,
* the controller will put the job in the PENDING state. If
* pending callback is not NULL, it will be called with the job_id
* of the pending job as the sole parameter.
- *
+ *
* RET allocation structure on success, NULL on error set errno to
* indicate the error (errno will be ETIMEDOUT if the timeout is reached
* with no allocation granted)
@@ -185,7 +185,7 @@ slurm_allocate_resources_blocking (const job_desc_msg_t *user_req,
slurm_msg_t_init(&req_msg);
slurm_msg_t_init(&resp_msg);
-
+
/* make a copy of the user's job description struct so that we
* can make changes before contacting the controller */
req = (job_desc_msg_t *)xmalloc(sizeof(job_desc_msg_t));
@@ -193,7 +193,7 @@ slurm_allocate_resources_blocking (const job_desc_msg_t *user_req,
return NULL;
memcpy(req, user_req, sizeof(job_desc_msg_t));
- /*
+ /*
* set Node and session id for this request
*/
if (req->alloc_sid == NO_VAL)
@@ -219,7 +219,7 @@ slurm_allocate_resources_blocking (const job_desc_msg_t *user_req,
}
req_msg.msg_type = REQUEST_RESOURCE_ALLOCATION;
- req_msg.data = req;
+ req_msg.data = req;
rc = slurm_send_recv_controller_msg(&req_msg, &resp_msg);
@@ -252,7 +252,7 @@ slurm_allocate_resources_blocking (const job_desc_msg_t *user_req,
/* yes, allocation has been granted */
errno = SLURM_PROTOCOL_SUCCESS;
} else if (!req->immediate) {
- if (resp->error_code != SLURM_SUCCESS)
+ if (resp->error_code != SLURM_SUCCESS)
info("%s", slurm_strerror(resp->error_code));
/* no, we need to wait for a response */
job_id = resp->job_id;
@@ -261,7 +261,7 @@ slurm_allocate_resources_blocking (const job_desc_msg_t *user_req,
pending_callback(job_id);
resp = _wait_for_allocation_response(job_id, listen,
timeout);
- /* If NULL, we didn't get the allocation in
+ /* If NULL, we didn't get the allocation in
the time desired, so just free the job id */
if ((resp == NULL) && (errno != ESLURM_ALREADY_DONE)) {
errnum = errno;
@@ -284,7 +284,7 @@ slurm_allocate_resources_blocking (const job_desc_msg_t *user_req,
}
/*
- * slurm_job_will_run - determine if a job would execute immediately if
+ * slurm_job_will_run - determine if a job would execute immediately if
* submitted now
* IN job_desc_msg - description of resource allocation request
* RET 0 on success, otherwise return -1 and set errno to indicate the error
@@ -301,8 +301,8 @@ int slurm_job_will_run (job_desc_msg_t *req)
req->alloc_node = buf;
slurm_msg_t_init(&req_msg);
req_msg.msg_type = REQUEST_JOB_WILL_RUN;
- req_msg.data = req;
-
+ req_msg.data = req;
+
if (slurm_send_recv_controller_msg(&req_msg, &resp_msg) < 0)
return SLURM_SOCKET_ERROR;
@@ -317,9 +317,9 @@ int slurm_job_will_run (job_desc_msg_t *req)
buf, sizeof(buf));
info("Job %u to start at %s using %u "
#ifdef HAVE_BG
- "cnodes"
+ "cnodes"
#else
- "processors"
+ "processors"
#endif
" on %s",
will_run_resp->job_id, buf,
@@ -358,7 +358,7 @@ int slurm_job_will_run (job_desc_msg_t *req)
* NOTE: free the response using slurm_free_job_step_create_response_msg
*/
int
-slurm_job_step_create (job_step_create_request_msg_t *req,
+slurm_job_step_create (job_step_create_request_msg_t *req,
job_step_create_response_msg_t **resp)
{
slurm_msg_t req_msg, resp_msg;
@@ -366,8 +366,8 @@ slurm_job_step_create (job_step_create_request_msg_t *req,
slurm_msg_t_init(&req_msg);
slurm_msg_t_init(&resp_msg);
req_msg.msg_type = REQUEST_JOB_STEP_CREATE;
- req_msg.data = req;
-
+ req_msg.data = req;
+
if (slurm_send_recv_controller_msg(&req_msg, &resp_msg) < 0)
return SLURM_ERROR;
@@ -407,8 +407,8 @@ slurm_allocation_lookup(uint32_t jobid,
slurm_msg_t_init(&req_msg);
slurm_msg_t_init(&resp_msg);
req_msg.msg_type = REQUEST_JOB_ALLOCATION_INFO;
- req_msg.data = &req;
-
+ req_msg.data = &req;
+
if (slurm_send_recv_controller_msg(&req_msg, &resp_msg) < 0)
return SLURM_ERROR;
@@ -431,7 +431,7 @@ slurm_allocation_lookup(uint32_t jobid,
}
/*
- * slurm_allocation_lookup_lite - retrieve info for an existing resource
+ * slurm_allocation_lookup_lite - retrieve info for an existing resource
* allocation without the addrs and such
* IN jobid - job allocation identifier
* OUT info - job allocation information
@@ -450,8 +450,8 @@ slurm_allocation_lookup_lite(uint32_t jobid,
slurm_msg_t_init(&req_msg);
slurm_msg_t_init(&resp_msg);
req_msg.msg_type = REQUEST_JOB_ALLOCATION_INFO_LITE;
- req_msg.data = &req;
-
+ req_msg.data = &req;
+
if (slurm_send_recv_controller_msg(&req_msg, &resp_msg) < 0)
return SLURM_ERROR;
@@ -491,8 +491,8 @@ int slurm_sbcast_lookup(uint32_t jobid, job_sbcast_cred_msg_t **info)
slurm_msg_t_init(&req_msg);
slurm_msg_t_init(&resp_msg);
req_msg.msg_type = REQUEST_JOB_SBCAST_CRED;
- req_msg.data = &req;
-
+ req_msg.data = &req;
+
if (slurm_send_recv_controller_msg(&req_msg, &resp_msg) < 0)
return SLURM_ERROR;
@@ -515,7 +515,7 @@ int slurm_sbcast_lookup(uint32_t jobid, job_sbcast_cred_msg_t **info)
}
/*
- * Handle a return code message type.
+ * Handle a return code message type.
* if return code is nonzero, sets errno to return code and returns < 0.
* Otherwise, returns 0 (SLURM_SUCCES)
*/
@@ -525,7 +525,7 @@ _handle_rc_msg(slurm_msg_t *msg)
int rc = ((return_code_msg_t *) msg->data)->return_code;
slurm_free_return_code_msg(msg->data);
- if (rc)
+ if (rc)
slurm_seterrno_ret(rc);
else
return SLURM_SUCCESS;
@@ -534,7 +534,7 @@ _handle_rc_msg(slurm_msg_t *msg)
/*
* Read a SLURM hostfile specified by "filename". "filename" must contain
* a list of SLURM NodeNames, one per line. Reads up to "n" number of hostnames
- * from the file. Returns a string representing a hostlist ranged string of
+ * from the file. Returns a string representing a hostlist ranged string of
* the contents of the file. This is a helper function, it does not
* contact any SLURM daemons.
*
@@ -553,7 +553,7 @@ char *slurm_read_hostfile(char *filename, int n)
int line_num = 0;
hostlist_t hostlist = NULL;
char *nodelist = NULL;
-
+
if (filename == NULL || strlen(filename) == 0)
return NULL;
@@ -592,14 +592,14 @@ char *slurm_read_hostfile(char *filename, int n)
}
line_size--;
continue;
- }
+ }
in_line[i] = '\0';
break;
}
-
+
hostlist_push(hostlist, in_line);
- if(n != (int)NO_VAL && hostlist_count(hostlist) == n)
- break;
+ if(n != (int)NO_VAL && hostlist_count(hostlist) == n)
+ break;
}
fclose(fp);
@@ -610,7 +610,7 @@ char *slurm_read_hostfile(char *filename, int n)
if (hostlist_count(hostlist) < n) {
error("Too few NodeNames in SLURM Hostfile");
goto cleanup_hostfile;
- }
+ }
nodelist = (char *)malloc(0xffff);
if (!nodelist) {
@@ -710,8 +710,8 @@ _handle_msg(slurm_msg_t *msg, resource_allocation_response_msg_t **resp)
* IN slurmctld_fd: file descriptor for slurmctld communications
* OUT resp: resource allocation response message
* RET 1 if resp is filled in, 0 otherwise */
-static int
-_accept_msg_connection(int listen_fd,
+static int
+_accept_msg_connection(int listen_fd,
resource_allocation_response_msg_t **resp)
{
int conn_fd;
@@ -720,7 +720,7 @@ _accept_msg_connection(int listen_fd,
char host[256];
uint16_t port;
int rc = 0;
-
+
conn_fd = slurm_accept_msg_conn(listen_fd, &cli_addr);
if (conn_fd < 0) {
error("Unable to accept connection: %m");
@@ -732,7 +732,7 @@ _accept_msg_connection(int listen_fd,
msg = xmalloc(sizeof(slurm_msg_t));
slurm_msg_t_init(msg);
-
+
if((rc = slurm_receive_msg(conn_fd, msg, 0)) != 0) {
slurm_free_msg(msg);
@@ -741,14 +741,14 @@ _accept_msg_connection(int listen_fd,
*resp = NULL;
return 0;
}
-
+
error("_accept_msg_connection[%s]: %m", host);
return SLURM_ERROR;
}
-
+
rc = _handle_msg(msg, resp); /* handle_msg frees msg */
slurm_free_msg(msg);
-
+
slurm_close_accepted_conn(conn_fd);
return rc;
}
@@ -824,7 +824,7 @@ _wait_for_allocation_response(uint32_t job_id, const listen_t *listen,
errno = errnum;
return NULL;
} else {
- debug3("Unable to confirm allocation for job %u: %m",
+ debug3("Unable to confirm allocation for job %u: %m",
job_id);
return NULL;
}
diff --git a/src/api/allocate_msg.c b/src/api/allocate_msg.c
index 73f1d667a02bcb9db9bafa39c9f1572c6a0ab7c1..a8f602eb11c8821f0e21876657c76ee24bfa38b4 100644
--- a/src/api/allocate_msg.c
+++ b/src/api/allocate_msg.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -165,7 +165,7 @@ extern void slurm_allocation_msg_thr_destroy(
xfree(msg_thr);
}
-static void _handle_node_fail(struct allocation_msg_thread *msg_thr,
+static void _handle_node_fail(struct allocation_msg_thread *msg_thr,
slurm_msg_t *msg)
{
srun_node_fail_msg_t *nf = (srun_node_fail_msg_t *)msg->data;
@@ -177,36 +177,36 @@ static void _handle_node_fail(struct allocation_msg_thread *msg_thr,
}
/*
- * Job has been notified of it's approaching time limit.
+ * Job has been notified of it's approaching time limit.
* Job will be killed shortly after timeout.
* This RPC can arrive multiple times with the same or updated timeouts.
*/
-static void _handle_timeout(struct allocation_msg_thread *msg_thr,
+static void _handle_timeout(struct allocation_msg_thread *msg_thr,
slurm_msg_t *msg)
{
srun_timeout_msg_t *to = (srun_timeout_msg_t *)msg->data;
debug3("received timeout message");
-
+
if (msg_thr->callback.timeout != NULL)
(msg_thr->callback.timeout)(to);
slurm_free_srun_timeout_msg(msg->data);
}
-static void _handle_user_msg(struct allocation_msg_thread *msg_thr,
+static void _handle_user_msg(struct allocation_msg_thread *msg_thr,
slurm_msg_t *msg)
{
srun_user_msg_t *um = (srun_user_msg_t *)msg->data;
debug3("received user message");
-
+
if (msg_thr->callback.user_msg != NULL)
(msg_thr->callback.user_msg)(um);
-
+
slurm_free_srun_user_msg(msg->data);
}
-static void _handle_ping(struct allocation_msg_thread *msg_thr,
+static void _handle_ping(struct allocation_msg_thread *msg_thr,
slurm_msg_t *msg)
{
srun_ping_msg_t *ping = (srun_ping_msg_t *)msg->data;
@@ -215,10 +215,10 @@ static void _handle_ping(struct allocation_msg_thread *msg_thr,
if (msg_thr->callback.ping != NULL)
(msg_thr->callback.ping)(ping);
-
+
slurm_free_srun_ping_msg(msg->data);
}
-static void _handle_job_complete(struct allocation_msg_thread *msg_thr,
+static void _handle_job_complete(struct allocation_msg_thread *msg_thr,
slurm_msg_t *msg)
{
srun_job_complete_msg_t *comp = (srun_job_complete_msg_t *)msg->data;
@@ -226,20 +226,20 @@ static void _handle_job_complete(struct allocation_msg_thread *msg_thr,
if (msg_thr->callback.job_complete != NULL)
(msg_thr->callback.job_complete)(comp);
-
+
slurm_free_srun_job_complete_msg(msg->data);
}
static void
_handle_msg(void *arg, slurm_msg_t *msg)
{
- struct allocation_msg_thread *msg_thr =
+ struct allocation_msg_thread *msg_thr =
(struct allocation_msg_thread *)arg;
uid_t req_uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
uid_t uid = getuid();
-
+
if ((req_uid != slurm_uid) && (req_uid != 0) && (req_uid != uid)) {
- error ("Security violation, slurm message from uid %u",
+ error ("Security violation, slurm message from uid %u",
(unsigned int) req_uid);
return;
}
diff --git a/src/api/block_info.c b/src/api/block_info.c
index 337c40b148fbf90dee6dc2630078cb4c6d2bb263..417d18fe958f4378e2f489c29e421b0116bcc4f5 100644
--- a/src/api/block_info.c
+++ b/src/api/block_info.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -66,7 +66,7 @@
/*
- * slurm_print_block_info_msg - output information about all Bluegene
+ * slurm_print_block_info_msg - output information about all Bluegene
* blocks based upon message as loaded using slurm_load_block
* IN out - file to write to
* IN info_ptr - block information message pointer
@@ -79,17 +79,17 @@ void slurm_print_block_info_msg(
block_info_t * block_ptr = info_ptr->block_array;
char time_str[32];
- slurm_make_time_str ((time_t *)&info_ptr->last_update, time_str,
+ slurm_make_time_str ((time_t *)&info_ptr->last_update, time_str,
sizeof(time_str));
fprintf( out, "Bluegene Block data as of %s, record count %d\n",
time_str, info_ptr->record_count);
- for (i = 0; i < info_ptr->record_count; i++)
+ for (i = 0; i < info_ptr->record_count; i++)
slurm_print_block_info(out, & block_ptr[i], one_liner);
}
/*
- * slurm_print_block_info - output information about a specific Bluegene
+ * slurm_print_block_info - output information about a specific Bluegene
* block based upon message as loaded using slurm_load_block
* IN out - file to write to
* IN block_ptr - an individual block information record pointer
@@ -106,7 +106,7 @@ void slurm_print_block_info(
/*
- * slurm_sprint_block_info - output information about a specific Bluegene
+ * slurm_sprint_block_info - output information about a specific Bluegene
* block based upon message as loaded using slurm_load_block
* IN block_ptr - an individual partition information record pointer
* IN one_liner - print as a single line if true
@@ -128,34 +128,34 @@ char *slurm_sprint_block_info(
convert_num_unit((float)block_ptr->node_cnt, tmp1, sizeof(tmp1),
UNIT_NONE);
- out = xstrdup_printf("BlockName=%s TotalNodes=%s State=%s%s",
+ out = xstrdup_printf("BlockName=%s TotalNodes=%s State=%s%s",
block_ptr->bg_block_id, tmp1,
bg_block_state_string(block_ptr->state),
line_end);
-
+
/****** Line 2 ******/
if (block_ptr->job_running > NO_JOB_RUNNING)
xstrfmtcat(out, "JobRunning=%u ", block_ptr->job_running);
- else
- xstrcat(out, "JobRunning=NONE ");
+ else
+ xstrcat(out, "JobRunning=NONE ");
xstrfmtcat(out, "User=%s ConnType=%s",
- block_ptr->owner_name,
+ block_ptr->owner_name,
conn_type_string(block_ptr->conn_type));
#ifdef HAVE_BGL
xstrfmtcat(out, " NodeUse=%s",
node_use_string(block_ptr->node_use));
#endif
xstrcat(out, line_end);
-
+
/****** Line 3 ******/
- if(block_ptr->ionodes)
+ if(block_ptr->ionodes)
xstrfmtcat(out, "BasePartitions=%s[%s] BPIndices=",
block_ptr->nodes, block_ptr->ionodes);
else
xstrfmtcat(out, "BasePartitions=%s BPIndices=", block_ptr->nodes);
- for (j = 0;
- (block_ptr->bp_inx && (block_ptr->bp_inx[j] != -1));
+ for (j = 0;
+ (block_ptr->bp_inx && (block_ptr->bp_inx[j] != -1));
j+=2) {
if (j > 0)
xstrcat(out, ",");
@@ -180,20 +180,20 @@ char *slurm_sprint_block_info(
xstrfmtcat(out, "CnloadImage=%s%s", block_ptr->linuximage, line_end);
/****** Line 6 ******/
xstrfmtcat(out, "IoloadImage=%s", block_ptr->ramdiskimage);
-#endif
+#endif
if (one_liner)
xstrcat(out, "\n");
else
xstrcat(out, "\n\n");
-
+
return out;
}
/*
- * slurm_load_block_info - issue RPC to get slurm all node select plugin
- * information if changed since update_time
+ * slurm_load_block_info - issue RPC to get slurm all node select plugin
+ * information if changed since update_time
* IN update_time - time of current configuration data
- * IN block_info_msg_pptr - place to store a node select configuration
+ * IN block_info_msg_pptr - place to store a node select configuration
* pointer
* RET 0 or a slurm error code
* NOTE: free the response using slurm_free_block_info_msg
@@ -212,19 +212,19 @@ extern int slurm_load_block_info (
req.last_update = update_time;
req_msg.msg_type = REQUEST_BLOCK_INFO;
req_msg.data = &req;
-
+
if (slurm_send_recv_controller_msg(&req_msg, &resp_msg) < 0)
return SLURM_ERROR;
-
+
switch (resp_msg.msg_type) {
case RESPONSE_BLOCK_INFO:
- *block_info_msg_pptr = (block_info_msg_t *)
+ *block_info_msg_pptr = (block_info_msg_t *)
resp_msg.data;
break;
case RESPONSE_SLURM_RC:
rc = ((return_code_msg_t *) resp_msg.data)->return_code;
- slurm_free_return_code_msg(resp_msg.data);
- if (rc)
+ slurm_free_return_code_msg(resp_msg.data);
+ if (rc)
slurm_seterrno_ret(rc);
*block_info_msg_pptr = NULL;
break;
@@ -233,7 +233,7 @@ extern int slurm_load_block_info (
slurm_seterrno_ret(SLURM_UNEXPECTED_MSG_ERROR);
break;
}
-
+
return SLURM_SUCCESS;
}
@@ -249,7 +249,7 @@ extern int slurm_get_select_jobinfo(select_jobinfo_t *jobinfo,
return select_g_select_jobinfo_get(jobinfo, data_type, data);
}
-extern int slurm_get_select_nodeinfo(select_nodeinfo_t *nodeinfo,
+extern int slurm_get_select_nodeinfo(select_nodeinfo_t *nodeinfo,
enum select_nodedata_type data_type,
enum node_states state, void *data)
{
diff --git a/src/api/cancel.c b/src/api/cancel.c
index cb60701ae796f3d37120d3582d15f59a257f831d..4ec2f60893fed238e0cc80fdaf0b2728739e3c26 100644
--- a/src/api/cancel.c
+++ b/src/api/cancel.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -57,7 +57,7 @@
* IN batch_flag - 1 to signal batch shell only, otherwise 0
* RET 0 on success, otherwise return -1 and set errno to indicate the error
*/
-int
+int
slurm_kill_job ( uint32_t job_id, uint16_t signal, uint16_t batch_flag )
{
int rc;
@@ -65,7 +65,7 @@ slurm_kill_job ( uint32_t job_id, uint16_t signal, uint16_t batch_flag )
job_step_kill_msg_t req;
slurm_msg_t_init(&msg);
- /*
+ /*
* Request message:
*/
req.job_id = job_id;
@@ -92,7 +92,7 @@ slurm_kill_job ( uint32_t job_id, uint16_t signal, uint16_t batch_flag )
* IN signal - signal number
* RET 0 on success, otherwise return -1 and set errno to indicate the error
*/
-int
+int
slurm_kill_job_step (uint32_t job_id, uint32_t step_id, uint16_t signal)
{
int rc;
@@ -100,7 +100,7 @@ slurm_kill_job_step (uint32_t job_id, uint32_t step_id, uint16_t signal)
job_step_kill_msg_t req;
slurm_msg_t_init(&msg);
- /*
+ /*
* Request message:
*/
req.job_id = job_id;
diff --git a/src/api/checkpoint.c b/src/api/checkpoint.c
index 92463559ab346d6e63ced4675e7bc8a7991214e9..b571e836ed580c722a3ed99e75259f9073754937 100644
--- a/src/api/checkpoint.c
+++ b/src/api/checkpoint.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -103,7 +103,7 @@ static int _checkpoint_op (uint16_t op, uint16_t data,
* OUT start_time - time at which checkpoint request was issued
* RET 0 (can be checkpoined) or a slurm error code
*/
-extern int slurm_checkpoint_able (uint32_t job_id, uint32_t step_id,
+extern int slurm_checkpoint_able (uint32_t job_id, uint32_t step_id,
time_t *start_time)
{
int rc;
@@ -172,10 +172,10 @@ extern int slurm_checkpoint_enable (uint32_t job_id, uint32_t step_id)
* IN image_dir - directory used to get/put checkpoint images
* RET 0 or a slurm error code
*/
-extern int slurm_checkpoint_create (uint32_t job_id, uint32_t step_id,
+extern int slurm_checkpoint_create (uint32_t job_id, uint32_t step_id,
uint16_t max_wait, char *image_dir)
{
- return _checkpoint_op (CHECK_CREATE, max_wait, job_id, step_id,
+ return _checkpoint_op (CHECK_CREATE, max_wait, job_id, step_id,
image_dir);
}
@@ -188,10 +188,10 @@ extern int slurm_checkpoint_create (uint32_t job_id, uint32_t step_id,
* IN image_dir - directory used to get/put checkpoint images
* RET 0 or a slurm error code
*/
-extern int slurm_checkpoint_vacate (uint32_t job_id, uint32_t step_id,
+extern int slurm_checkpoint_vacate (uint32_t job_id, uint32_t step_id,
uint16_t max_wait, char *image_dir)
{
- return _checkpoint_op (CHECK_VACATE, max_wait, job_id, step_id,
+ return _checkpoint_op (CHECK_VACATE, max_wait, job_id, step_id,
image_dir);
}
@@ -241,7 +241,7 @@ extern int slurm_checkpoint_complete (uint32_t job_id, uint32_t step_id,
}
/*
- * slurm_checkpoint_error - gather error information for the last checkpoint
+ * slurm_checkpoint_error - gather error information for the last checkpoint
* operation for some job step
* IN job_id - job on which to perform operation
* IN step_id - job step on which to perform operation
@@ -249,11 +249,11 @@ extern int slurm_checkpoint_complete (uint32_t job_id, uint32_t step_id,
* this value is dependent upon the checkpoint plugin used and may be
* completely unrelated to slurm error codes, the highest value for all
* complete calls is preserved
- * OUT error_msg - error message, preserved for highest error_code, value
+ * OUT error_msg - error message, preserved for highest error_code, value
* must be freed by the caller to prevent memory leak
* RET 0 or a slurm error code
*/
-extern int slurm_checkpoint_error ( uint32_t job_id, uint32_t step_id,
+extern int slurm_checkpoint_error ( uint32_t job_id, uint32_t step_id,
uint32_t *error_code, char **error_msg)
{
int rc;
@@ -279,7 +279,7 @@ extern int slurm_checkpoint_error ( uint32_t job_id, uint32_t step_id,
rc = slurm_send_recv_controller_msg(&msg, &resp_msg);
- if (rc == SLURM_SOCKET_ERROR)
+ if (rc == SLURM_SOCKET_ERROR)
return rc;
switch (resp_msg.msg_type) {
@@ -306,7 +306,7 @@ extern int slurm_checkpoint_error ( uint32_t job_id, uint32_t step_id,
}
/*
- * Handle a return code message type.
+ * Handle a return code message type.
* Sets errno to return code and returns it
*/
static int
@@ -331,7 +331,7 @@ _handle_rc_msg(slurm_msg_t *msg)
*/
extern int slurm_checkpoint_task_complete (uint32_t job_id, uint32_t step_id,
uint32_t task_id, time_t begin_time,
- uint32_t error_code,
+ uint32_t error_code,
char *error_msg)
{
int rc;
diff --git a/src/api/complete.c b/src/api/complete.c
index 7e4c6eceaf0dfe1a38edbe50e84e649a25daae83..9936c708b128123880bf5d0d6893b1fa0186d11a 100644
--- a/src/api/complete.c
+++ b/src/api/complete.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -56,7 +56,7 @@
* IN job_return_code - the highest exit code of any task of the job
* RET 0 on success, otherwise return -1 and set errno to indicate the error
*/
-int
+int
slurm_complete_job ( uint32_t job_id, uint32_t job_return_code )
{
int rc;
@@ -71,8 +71,8 @@ slurm_complete_job ( uint32_t job_id, uint32_t job_return_code )
req_msg.data = &req;
if (slurm_send_recv_controller_rc_msg(&req_msg, &rc) < 0)
- return SLURM_ERROR;
-
+ return SLURM_ERROR;
+
if (rc)
slurm_seterrno_ret(rc);
diff --git a/src/api/config_info.c b/src/api/config_info.c
index 0ac951ed0d6ecee9776671bf5e3c3c034bb2d8c1..6f59a3228fd9cc16e4e9b232f71ab8c09a230f5a 100644
--- a/src/api/config_info.c
+++ b/src/api/config_info.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> and Kevin Tew <tew1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -56,8 +56,8 @@
#include "src/common/list.h"
/*
- * slurm_api_version - Return a single number reflecting the SLURM API's
- * version number. Use the macros SLURM_VERSION_NUM, SLURM_VERSION_MAJOR,
+ * slurm_api_version - Return a single number reflecting the SLURM API's
+ * version number. Use the macros SLURM_VERSION_NUM, SLURM_VERSION_MAJOR,
* SLURM_VERSION_MINOR, and SLURM_VERSION_MICRO to work with this value
* RET API's version number
*/
@@ -147,12 +147,12 @@ _preempt_str(uint16_t preempt_mode)
}
/*
- * slurm_print_ctl_conf - output the contents of slurm control configuration
+ * slurm_print_ctl_conf - output the contents of slurm control configuration
* message as loaded using slurm_load_ctl_conf
* IN out - file to write to
* IN slurm_ctl_conf_ptr - slurm control configuration pointer
*/
-void slurm_print_ctl_conf ( FILE* out,
+void slurm_print_ctl_conf ( FILE* out,
slurm_ctl_conf_info_msg_t * slurm_ctl_conf_ptr )
{
char time_str[32], tmp_str[128];
@@ -170,7 +170,7 @@ void slurm_print_ctl_conf ( FILE* out,
if ( slurm_ctl_conf_ptr == NULL )
return ;
- slurm_make_time_str((time_t *)&slurm_ctl_conf_ptr->last_update,
+ slurm_make_time_str((time_t *)&slurm_ctl_conf_ptr->last_update,
time_str, sizeof(time_str));
snprintf(tmp_str, sizeof(tmp_str), "Configuration data as of %s\n",
time_str);
@@ -178,7 +178,7 @@ void slurm_print_ctl_conf ( FILE* out,
ret_list = slurm_ctl_conf_2_key_pairs(slurm_ctl_conf_ptr);
if(ret_list) {
slurm_print_key_pairs(out, ret_list, tmp_str);
-
+
list_destroy((List)ret_list);
}
@@ -194,7 +194,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
if ( slurm_ctl_conf_ptr == NULL )
return NULL;
-
+
ret_list = list_create(destroy_config_key_pair);
key_pair = xmalloc(sizeof(config_key_pair_t));
@@ -226,7 +226,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(slurm_ctl_conf_ptr->accounting_storage_pass);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->accounting_storage_port);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("AccountingStoragePort");
@@ -258,7 +258,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(slurm_ctl_conf_ptr->backup_controller);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u sec",
+ snprintf(tmp_str, sizeof(tmp_str), "%u sec",
slurm_ctl_conf_ptr->batch_start_timeout);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("BatchStartTimeout");
@@ -271,14 +271,14 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->name = xstrdup("BOOT_TIME");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
-
+
snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->cache_groups);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("CacheGroups");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
-
+
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("CheckpointType");
key_pair->value = xstrdup(slurm_ctl_conf_ptr->checkpoint_type);
@@ -310,7 +310,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->name = xstrdup("CryptoType");
key_pair->value = xstrdup(slurm_ctl_conf_ptr->crypto_type);
list_append(ret_list, key_pair);
-
+
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("DebugFlags");
key_pair->value = debug_flags2str(slurm_ctl_conf_ptr->debug_flags);;
@@ -320,12 +320,12 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
list_append(ret_list, key_pair);
key_pair->name = xstrdup("DefMemPerCPU");
if (slurm_ctl_conf_ptr->def_mem_per_cpu & MEM_PER_CPU) {
- snprintf(tmp_str, sizeof(tmp_str), "%u",
- slurm_ctl_conf_ptr->def_mem_per_cpu &
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
+ slurm_ctl_conf_ptr->def_mem_per_cpu &
(~MEM_PER_CPU));
key_pair->value = xstrdup(tmp_str);
} else if (slurm_ctl_conf_ptr->def_mem_per_cpu) {
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->def_mem_per_cpu);
key_pair->value = xstrdup(tmp_str);
} else {
@@ -353,7 +353,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(slurm_ctl_conf_ptr->epilog);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u usec",
+ snprintf(tmp_str, sizeof(tmp_str), "%u usec",
slurm_ctl_conf_ptr->epilog_msg_time);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("EpilogMsgTime");
@@ -372,21 +372,21 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->first_job_id);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("FirstJobId");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u sec",
+ snprintf(tmp_str, sizeof(tmp_str), "%u sec",
slurm_ctl_conf_ptr->get_env_timeout);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("GetEnvTimeout");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u sec",
+ snprintf(tmp_str, sizeof(tmp_str), "%u sec",
slurm_ctl_conf_ptr->health_check_interval);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("HealthCheckInterval");
@@ -411,7 +411,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u sec",
+ snprintf(tmp_str, sizeof(tmp_str), "%u sec",
slurm_ctl_conf_ptr->job_acct_gather_freq);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("JobAcctGatherFrequency");
@@ -443,7 +443,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(slurm_ctl_conf_ptr->job_comp_pass);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->job_comp_port);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("JobCompPort");
@@ -486,14 +486,14 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->kill_on_bad_exit);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("KillOnBadExit");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u sec",
+ snprintf(tmp_str, sizeof(tmp_str), "%u sec",
slurm_ctl_conf_ptr->kill_wait);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("KillWait");
@@ -510,7 +510,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(slurm_ctl_conf_ptr->mail_prog);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->max_job_cnt);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("MaxJobCount");
@@ -521,33 +521,33 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
list_append(ret_list, key_pair);
key_pair->name = xstrdup("MaxMemPerCPU");
if (slurm_ctl_conf_ptr->max_mem_per_cpu & MEM_PER_CPU) {
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->max_mem_per_cpu & (~MEM_PER_CPU));
key_pair->value = xstrdup(tmp_str);
} else if (slurm_ctl_conf_ptr->max_mem_per_cpu) {
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->max_mem_per_cpu);
key_pair->value = xstrdup(tmp_str);
} else {
key_pair->value = xstrdup("UNLIMITED");
}
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->max_tasks_per_node);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("MaxTasksPerNode");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u sec",
+ snprintf(tmp_str, sizeof(tmp_str), "%u sec",
slurm_ctl_conf_ptr->msg_timeout);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("MessageTimeout");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u sec",
+ snprintf(tmp_str, sizeof(tmp_str), "%u sec",
slurm_ctl_conf_ptr->min_job_age);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("MinJobAge");
@@ -571,7 +571,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
list_append(ret_list, key_pair);
#endif
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->next_job_id);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("NEXT_JOB_ID");
@@ -581,13 +581,13 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
if (slurm_ctl_conf_ptr->over_time_limit == (uint16_t) INFINITE)
snprintf(tmp_str, sizeof(tmp_str), "UNLIMITED");
else
- snprintf(tmp_str, sizeof(tmp_str), "%u min",
+ snprintf(tmp_str, sizeof(tmp_str), "%u min",
slurm_ctl_conf_ptr->over_time_limit);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("OverTimeLimit");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
-
+
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("PluginDir");
key_pair->value = xstrdup(slurm_ctl_conf_ptr->plugindir);
@@ -622,7 +622,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->priority_favor_small);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("PriorityFavorSmall");
@@ -648,35 +648,35 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(slurm_ctl_conf_ptr->priority_type);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->priority_weight_age);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("PriorityWeightAge");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->priority_weight_fs);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("PriorityWeightFairShare");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->priority_weight_js);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("PriorityWeightJobSize");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
-
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->priority_weight_part);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("PriorityWeightPartition");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->priority_weight_qos);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("PriorityWeightQOS");
@@ -685,7 +685,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
}
- private_data_string(slurm_ctl_conf_ptr->private_data,
+ private_data_string(slurm_ctl_conf_ptr->private_data,
tmp_str, sizeof(tmp_str));
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("PrivateData");
@@ -707,7 +707,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(slurm_ctl_conf_ptr->prolog_slurmctld);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->propagate_prio_process);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("PropagatePrioProcess");
@@ -718,7 +718,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->name = xstrdup("PropagateResourceLimits");
key_pair->value = xstrdup(slurm_ctl_conf_ptr->propagate_rlimits);
list_append(ret_list, key_pair);
-
+
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("PropagateResourceLimitsExcept");
key_pair->value = xstrdup(slurm_ctl_conf_ptr->propagate_rlimits_except);
@@ -729,14 +729,14 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(slurm_ctl_conf_ptr->resume_program);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u nodes/min",
+ snprintf(tmp_str, sizeof(tmp_str), "%u nodes/min",
slurm_ctl_conf_ptr->resume_rate);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("ResumeRate");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u sec",
+ snprintf(tmp_str, sizeof(tmp_str), "%u sec",
slurm_ctl_conf_ptr->resume_timeout);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("ResumeTimeout");
@@ -751,7 +751,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("ResvOverRun");
key_pair->value = xstrdup(tmp_str);
- list_append(ret_list, key_pair);
+ list_append(ret_list, key_pair);
snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->ret2service);
@@ -759,7 +759,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->name = xstrdup("ReturnToService");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
-
+
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("SallocDefaultCommand");
key_pair->value = xstrdup(slurm_ctl_conf_ptr->salloc_default_command);
@@ -776,14 +776,14 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->schedrootfltr);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("SchedulerRootFilter");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u sec",
+ snprintf(tmp_str, sizeof(tmp_str), "%u sec",
slurm_ctl_conf_ptr->sched_time_slice);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("SchedulerTimeSlice");
@@ -799,7 +799,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->name = xstrdup("SelectType");
key_pair->value = xstrdup(slurm_ctl_conf_ptr->select_type);
list_append(ret_list, key_pair);
-
+
if (slurm_ctl_conf_ptr->select_type_param) {
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("SelectTypeParameters");
@@ -808,7 +808,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
list_append(ret_list, key_pair);
}
- snprintf(tmp_str, sizeof(tmp_str), "%s(%u)",
+ snprintf(tmp_str, sizeof(tmp_str), "%s(%u)",
slurm_ctl_conf_ptr->slurm_user_name,
slurm_ctl_conf_ptr->slurm_user_id);
key_pair = xmalloc(sizeof(config_key_pair_t));
@@ -816,7 +816,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->slurmctld_debug);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("SlurmctldDebug");
@@ -840,7 +840,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u sec",
+ snprintf(tmp_str, sizeof(tmp_str), "%u sec",
slurm_ctl_conf_ptr->slurmctld_timeout);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("SlurmctldTimeout");
@@ -878,15 +878,15 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(slurm_ctl_conf_ptr->slurmd_spooldir);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u sec",
+ snprintf(tmp_str, sizeof(tmp_str), "%u sec",
slurm_ctl_conf_ptr->slurmd_timeout);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("SlurmdTimeout");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%s(%u)",
- slurm_ctl_conf_ptr->slurmd_user_name,
+ snprintf(tmp_str, sizeof(tmp_str), "%s(%u)",
+ slurm_ctl_conf_ptr->slurmd_user_name,
slurm_ctl_conf_ptr->slurmd_user_id);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("SlurmdUser");
@@ -933,24 +933,24 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(slurm_ctl_conf_ptr->suspend_program);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u nodes/min",
+ snprintf(tmp_str, sizeof(tmp_str), "%u nodes/min",
slurm_ctl_conf_ptr->suspend_rate);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("SuspendRate");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- if (!slurm_ctl_conf_ptr->suspend_time)
+ if (!slurm_ctl_conf_ptr->suspend_time)
snprintf(tmp_str, sizeof(tmp_str), "NONE");
else
- snprintf(tmp_str, sizeof(tmp_str), "%d sec",
+ snprintf(tmp_str, sizeof(tmp_str), "%d sec",
((int)slurm_ctl_conf_ptr->suspend_time - 1));
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("SuspendTime");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u sec",
+ snprintf(tmp_str, sizeof(tmp_str), "%u sec",
slurm_ctl_conf_ptr->suspend_timeout);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("SuspendTimeout");
@@ -972,7 +972,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(slurm_ctl_conf_ptr->task_plugin);
list_append(ret_list, key_pair);
- slurm_sprint_cpu_bind_type(tmp_str,
+ slurm_sprint_cpu_bind_type(tmp_str,
slurm_ctl_conf_ptr->task_plugin_param);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("TaskPluginParam");
@@ -994,21 +994,21 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(slurm_ctl_conf_ptr->topology_plugin);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->track_wckey);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("TrackWCKey");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->tree_width);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("TreeWidth");
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%u",
slurm_ctl_conf_ptr->use_pam);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("UsePam");
@@ -1027,21 +1027,21 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- snprintf(tmp_str, sizeof(tmp_str), "%u sec",
+ snprintf(tmp_str, sizeof(tmp_str), "%u sec",
slurm_ctl_conf_ptr->wait_time);
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("WaitTime");
key_pair->value = xstrdup(tmp_str);
- list_append(ret_list, key_pair);
+ list_append(ret_list, key_pair);
return (void *)ret_list;
}
/*
- * slurm_load_ctl_conf - issue RPC to get slurm control configuration
- * information if changed since update_time
+ * slurm_load_ctl_conf - issue RPC to get slurm control configuration
+ * information if changed since update_time
* IN update_time - time of current configuration data
- * IN slurm_ctl_conf_ptr - place to store slurm control configuration
+ * IN slurm_ctl_conf_ptr - place to store slurm control configuration
* pointer
* RET 0 on success, otherwise return -1 and set errno to indicate the error
* NOTE: free the response using slurm_free_ctl_conf
@@ -1052,8 +1052,8 @@ slurm_load_ctl_conf (time_t update_time, slurm_ctl_conf_t **confp)
int rc;
slurm_msg_t req_msg;
slurm_msg_t resp_msg;
- last_update_msg_t req;
-
+ last_update_msg_t req;
+
slurm_msg_t_init(&req_msg);
slurm_msg_t_init(&resp_msg);
@@ -1061,7 +1061,7 @@ slurm_load_ctl_conf (time_t update_time, slurm_ctl_conf_t **confp)
req_msg.msg_type = REQUEST_BUILD_INFO;
req_msg.data = &req;
- if (slurm_send_recv_controller_msg(&req_msg, &resp_msg) < 0)
+ if (slurm_send_recv_controller_msg(&req_msg, &resp_msg) < 0)
return SLURM_ERROR;
switch (resp_msg.msg_type) {
@@ -1070,8 +1070,8 @@ slurm_load_ctl_conf (time_t update_time, slurm_ctl_conf_t **confp)
break;
case RESPONSE_SLURM_RC:
rc = ((return_code_msg_t *) resp_msg.data)->return_code;
- slurm_free_return_code_msg(resp_msg.data);
- if (rc)
+ slurm_free_return_code_msg(resp_msg.data);
+ if (rc)
slurm_seterrno_ret(rc);
break;
default:
@@ -1082,7 +1082,7 @@ slurm_load_ctl_conf (time_t update_time, slurm_ctl_conf_t **confp)
}
/*
- * slurm_load_slurmd_status - issue RPC to get the status of slurmd
+ * slurm_load_slurmd_status - issue RPC to get the status of slurmd
* daemon on this machine
* IN slurmd_info_ptr - place to store slurmd status information
* RET 0 or -1 on error
@@ -1106,13 +1106,13 @@ slurm_load_slurmd_status(slurmd_status_t **slurmd_status_ptr)
this_addr = slurm_conf_get_nodeaddr(this_host);
if (this_addr == NULL)
this_addr = xstrdup("localhost");
- slurm_set_addr(&req_msg.address, (uint16_t)slurm_get_slurmd_port(),
+ slurm_set_addr(&req_msg.address, (uint16_t)slurm_get_slurmd_port(),
this_addr);
xfree(this_addr);
req_msg.msg_type = REQUEST_DAEMON_STATUS;
req_msg.data = NULL;
-
+
rc = slurm_send_recv_node_msg(&req_msg, &resp_msg, 0);
if ((rc != 0) || !resp_msg.auth_cred) {
@@ -1130,8 +1130,8 @@ slurm_load_slurmd_status(slurmd_status_t **slurmd_status_ptr)
break;
case RESPONSE_SLURM_RC:
rc = ((return_code_msg_t *) resp_msg.data)->return_code;
- slurm_free_return_code_msg(resp_msg.data);
- if (rc)
+ slurm_free_return_code_msg(resp_msg.data);
+ if (rc)
slurm_seterrno_ret(rc);
break;
default:
@@ -1143,12 +1143,12 @@ slurm_load_slurmd_status(slurmd_status_t **slurmd_status_ptr)
}
/*
- * slurm_print_slurmd_status - output the contents of slurmd status
+ * slurm_print_slurmd_status - output the contents of slurmd status
* message as loaded using slurm_load_slurmd_status
* IN out - file to write to
* IN slurmd_status_ptr - slurmd status pointer
*/
-void slurm_print_slurmd_status (FILE* out,
+void slurm_print_slurmd_status (FILE* out,
slurmd_status_t * slurmd_status_ptr)
{
char time_str[32];
@@ -1172,7 +1172,7 @@ void slurm_print_slurmd_status (FILE* out,
fprintf(out, "Actual temp disk space = %u MB\n",
slurmd_status_ptr->actual_tmp_disk);
- slurm_make_time_str ((time_t *)&slurmd_status_ptr->booted,
+ slurm_make_time_str ((time_t *)&slurmd_status_ptr->booted,
time_str, sizeof(time_str));
fprintf(out, "Boot time = %s\n", time_str);
@@ -1181,10 +1181,10 @@ void slurm_print_slurmd_status (FILE* out,
if (slurmd_status_ptr->last_slurmctld_msg) {
slurm_make_time_str ((time_t *)
- &slurmd_status_ptr->last_slurmctld_msg,
+ &slurmd_status_ptr->last_slurmctld_msg,
time_str, sizeof(time_str));
fprintf(out, "Last slurmctld msg time = %s\n", time_str);
- } else
+ } else
fprintf(out, "Last slurmctld msg time = NONE\n");
fprintf(out, "Slurmd PID = %u\n",
@@ -1206,7 +1206,7 @@ extern void slurm_print_key_pairs(FILE* out, void *key_pairs, char *title)
if (!config_list)
return;
-
+
fprintf(out, "%s", title);
iter = list_iterator_create(config_list);
while((key_pair = list_next(iter))) {
diff --git a/src/api/init_msg.c b/src/api/init_msg.c
index 4b6e59c8ae4007e24cc081a313d116f383465e4c..00e940e75a1e00ed8d8c733f24f54094064a9a1e 100644
--- a/src/api/init_msg.c
+++ b/src/api/init_msg.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -50,8 +50,8 @@
#include "src/common/forward.h"
/*
- * slurm_init_job_desc_msg - initialize job descriptor with
- * default values
+ * slurm_init_job_desc_msg - initialize job descriptor with
+ * default values
* IN/OUT job_desc_msg - user defined job descriptor
*/
void slurm_init_job_desc_msg(job_desc_msg_t * job_desc_msg)
@@ -101,8 +101,8 @@ void slurm_init_job_desc_msg(job_desc_msg_t * job_desc_msg)
}
/*
- * slurm_init_part_desc_msg - initialize partition descriptor with
- * default values
+ * slurm_init_part_desc_msg - initialize partition descriptor with
+ * default values
* IN/OUT update_part_msg - user defined partition descriptor
*/
void slurm_init_part_desc_msg (update_part_msg_t * update_part_msg)
@@ -121,8 +121,8 @@ void slurm_init_part_desc_msg (update_part_msg_t * update_part_msg)
}
/*
- * slurm_init_resv_desc_msg - initialize reservation descriptor with
- * default values
+ * slurm_init_resv_desc_msg - initialize reservation descriptor with
+ * default values
* OUT job_desc_msg - user defined partition descriptor
*/
void slurm_init_resv_desc_msg (resv_desc_msg_t * resv_msg)
@@ -158,5 +158,5 @@ void slurm_init_update_block_msg (update_block_msg_t *update_block_msg)
update_block_msg->node_cnt = NO_VAL;
update_block_msg->node_use = (uint16_t)NO_VAL;
update_block_msg->state = (uint16_t)NO_VAL;
-
+
}
diff --git a/src/api/job_info.c b/src/api/job_info.c
index 864c701ce5f8727f49ac5a4ba40ac03ede410b06..981f3c89e3fcf1bf5b8ec7e867f12705f554d37a 100644
--- a/src/api/job_info.c
+++ b/src/api/job_info.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
- *
+ * 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.
@@ -64,25 +64,25 @@
#include "src/common/xstring.h"
/*
- * slurm_print_job_info_msg - output information about all Slurm
+ * slurm_print_job_info_msg - output information about all Slurm
* jobs based upon message as loaded using slurm_load_jobs
* IN out - file to write to
* IN job_info_msg_ptr - job information message pointer
* IN one_liner - print as a single line if true
*/
-extern void
+extern void
slurm_print_job_info_msg ( FILE* out, job_info_msg_t *jinfo, int one_liner )
{
int i;
job_info_t *job_ptr = jinfo->job_array;
char time_str[32];
- slurm_make_time_str ((time_t *)&jinfo->last_update, time_str,
+ slurm_make_time_str ((time_t *)&jinfo->last_update, time_str,
sizeof(time_str));
fprintf( out, "Job data as of %s, record count %d\n",
time_str, jinfo->record_count);
- for (i = 0; i < jinfo->record_count; i++)
+ for (i = 0; i < jinfo->record_count; i++)
slurm_print_job_info(out, &job_ptr[i], one_liner);
}
@@ -110,7 +110,7 @@ static void _sprint_range(char *str, uint32_t str_size,
}
/*
- * slurm_print_job_info - output information about a specific Slurm
+ * slurm_print_job_info - output information about a specific Slurm
* job based upon message as loaded using slurm_load_jobs
* IN out - file to write to
* IN job_ptr - an individual job information record pointer
@@ -125,7 +125,7 @@ slurm_print_job_info ( FILE* out, job_info_t * job_ptr, int one_liner )
}
/*
- * slurm_sprint_job_info - output information about a specific Slurm
+ * slurm_sprint_job_info - output information about a specific Slurm
* job based upon message as loaded using slurm_load_jobs
* IN job_ptr - an individual job information record pointer
* IN one_liner - print as a single line if true
@@ -147,8 +147,8 @@ slurm_sprint_job_info ( job_info_t * job_ptr, int one_liner )
#ifdef HAVE_BG
char *nodelist = "BP_List";
- select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_IONODES,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo,
+ SELECT_JOBDATA_IONODES,
&ionodes);
#else
bitstr_t *core_bitmap;
@@ -355,8 +355,8 @@ slurm_sprint_job_info ( job_info_t * job_ptr, int one_liner )
_sprint_range(tmp2, sizeof(tmp2), min_nodes, max_nodes);
snprintf(tmp_line, sizeof(tmp_line),
"NumNodes=%s NumCPUs=%s CPUs/Task=%u ReqS:C:T=%u:%u:%u",
- tmp2, tmp1, job_ptr->cpus_per_task,
- job_ptr->min_sockets,
+ tmp2, tmp1, job_ptr->cpus_per_task,
+ job_ptr->min_sockets,
job_ptr->min_cores,
job_ptr->min_threads);
xstrcat(out, tmp_line);
@@ -524,7 +524,7 @@ slurm_sprint_job_info ( job_info_t * job_ptr, int one_liner )
#endif
/****** Line 13 ******/
-line13:
+line13:
if (job_ptr->job_min_memory & MEM_PER_CPU) {
job_ptr->job_min_memory &= (~MEM_PER_CPU);
tmp3_ptr = "CPU";
@@ -593,7 +593,7 @@ line13:
xstrcat(out, " ");
else
xstrcat(out, "\n ");
- snprintf(tmp_line, sizeof(tmp_line), "Comment=%s ",
+ snprintf(tmp_line, sizeof(tmp_line), "Comment=%s ",
job_ptr->comment);
xstrcat(out, tmp_line);
}
@@ -702,8 +702,8 @@ line13:
}
/*
- * slurm_load_jobs - issue RPC to get all job configuration
- * information if changed since update_time
+ * slurm_load_jobs - issue RPC to get all job configuration
+ * information if changed since update_time
* IN update_time - time of current configuration data
* IN job_info_msg_pptr - place to store a job configuration pointer
* IN show_flags - job filtering option: 0, SHOW_ALL or SHOW_DETAIL
@@ -736,8 +736,8 @@ slurm_load_jobs (time_t update_time, job_info_msg_t **resp,
break;
case RESPONSE_SLURM_RC:
rc = ((return_code_msg_t *) resp_msg.data)->return_code;
- slurm_free_return_code_msg(resp_msg.data);
- if (rc)
+ slurm_free_return_code_msg(resp_msg.data);
+ if (rc)
slurm_seterrno_ret(rc);
break;
default:
@@ -751,7 +751,7 @@ slurm_load_jobs (time_t update_time, job_info_msg_t **resp,
/*
* slurm_load_job - issue RPC to get job information for one job ID
* IN job_info_msg_pptr - place to store a job configuration pointer
- * IN job_id - ID of job we want information about
+ * IN job_id - ID of job we want information about
* IN show_flags - job filtering option: 0, SHOW_ALL or SHOW_DETAIL
* RET 0 or -1 on error
* NOTE: free the response using slurm_free_job_info_msg
@@ -781,8 +781,8 @@ slurm_load_job (job_info_msg_t **resp, uint32_t job_id, uint16_t show_flags)
break;
case RESPONSE_SLURM_RC:
rc = ((return_code_msg_t *) resp_msg.data)->return_code;
- slurm_free_return_code_msg(resp_msg.data);
- if (rc)
+ slurm_free_return_code_msg(resp_msg.data);
+ if (rc)
slurm_seterrno_ret(rc);
break;
default:
@@ -794,7 +794,7 @@ slurm_load_job (job_info_msg_t **resp, uint32_t job_id, uint16_t show_flags)
}
/*
- * slurm_pid2jobid - issue RPC to get the slurm job_id given a process_id
+ * slurm_pid2jobid - issue RPC to get the slurm job_id given a process_id
* on this machine
* IN job_pid - process_id of interest on this machine
* OUT job_id_ptr - place to store a slurm job_id
@@ -819,14 +819,14 @@ slurm_pid2jobid (pid_t job_pid, uint32_t *jobid)
this_addr = slurm_conf_get_nodeaddr(this_host);
if (this_addr == NULL)
this_addr = xstrdup("localhost");
- slurm_set_addr(&req_msg.address, (uint16_t)slurm_get_slurmd_port(),
+ slurm_set_addr(&req_msg.address, (uint16_t)slurm_get_slurmd_port(),
this_addr);
xfree(this_addr);
req.job_pid = job_pid;
req_msg.msg_type = REQUEST_JOB_ID;
req_msg.data = &req;
-
+
rc = slurm_send_recv_node_msg(&req_msg, &resp_msg, 0);
if(rc != 0 || !resp_msg.auth_cred) {
@@ -836,7 +836,7 @@ slurm_pid2jobid (pid_t job_pid, uint32_t *jobid)
return SLURM_ERROR;
}
if(resp_msg.auth_cred)
- g_slurm_auth_destroy(resp_msg.auth_cred);
+ g_slurm_auth_destroy(resp_msg.auth_cred);
switch (resp_msg.msg_type) {
case RESPONSE_JOB_ID:
*jobid = ((job_id_response_msg_t *) resp_msg.data)->job_id;
@@ -844,8 +844,8 @@ slurm_pid2jobid (pid_t job_pid, uint32_t *jobid)
break;
case RESPONSE_SLURM_RC:
rc = ((return_code_msg_t *) resp_msg.data)->return_code;
- slurm_free_return_code_msg(resp_msg.data);
- if (rc)
+ slurm_free_return_code_msg(resp_msg.data);
+ if (rc)
slurm_seterrno_ret(rc);
break;
default:
@@ -859,7 +859,7 @@ slurm_pid2jobid (pid_t job_pid, uint32_t *jobid)
/*
* slurm_get_rem_time - get the expected time remaining for a given job
* IN jobid - slurm job id
- * RET remaining time in seconds or -1 on error
+ * RET remaining time in seconds or -1 on error
*/
extern long slurm_get_rem_time(uint32_t jobid)
{
@@ -907,7 +907,7 @@ extern int32_t islurm_get_rem_time2__()
/*
* slurm_get_end_time - get the expected end time for a given slurm job
* IN jobid - slurm job id
- * end_time_ptr - location in which to store scheduled end time for job
+ * end_time_ptr - location in which to store scheduled end time for job
* RET 0 or -1 on error
*/
extern int
@@ -1013,7 +1013,7 @@ extern int slurm_job_node_ready(uint32_t job_id)
rc = ((return_code_msg_t *) resp.data)->return_code;
slurm_free_return_code_msg(resp.data);
} else if (resp.msg_type == RESPONSE_SLURM_RC) {
- int job_rc = ((return_code_msg_t *) resp.data) ->
+ int job_rc = ((return_code_msg_t *) resp.data) ->
return_code;
if ((job_rc == ESLURM_INVALID_PARTITION_NAME)
|| (job_rc == ESLURM_INVALID_JOB_ID))
@@ -1041,7 +1041,7 @@ extern int slurm_job_cpus_allocated_on_node_id(
for (i = 0; i < job_resrcs_ptr->cpu_array_cnt; i++) {
start_node += job_resrcs_ptr->cpu_array_reps[i];
- if(start_node >= node_id)
+ if(start_node >= node_id)
break;
}
@@ -1066,10 +1066,10 @@ extern int slurm_job_cpus_allocated_on_node(
} else if((node_id = hostlist_find(job_resrcs_ptr->node_hl, node))
== -1) {
error("slurm_cpus_used_on_node: "
- "node %s is not in this allocation", node);
+ "node %s is not in this allocation", node);
return -1;
}
-
+
return slurm_job_cpus_allocated_on_node_id(job_resrcs_ptr, node_id);
}
diff --git a/src/api/job_step_info.c b/src/api/job_step_info.c
index c61a6290c80965be47681d2b3f3c9d22a089e946..003a4ac3785a269e0ebb4f83bddf1e943d26fc31 100644
--- a/src/api/job_step_info.c
+++ b/src/api/job_step_info.c
@@ -5,35 +5,35 @@
* Copyright (C) 2002-2006 The Regents of the University of California.
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Morris Jette <jette1@llnl.gov>,
+ * Written by Morris Jette <jette1@llnl.gov>,
* Joey Ekstrom <ekstrom1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -55,42 +55,42 @@
#include "src/common/xstring.h"
/*
- * slurm_print_job_step_info_msg - output information about all Slurm
+ * slurm_print_job_step_info_msg - output information about all Slurm
* job steps based upon message as loaded using slurm_get_job_steps
* IN out - file to write to
* IN job_step_info_msg_ptr - job step information message pointer
* IN one_liner - print as a single line if true
*/
-void
-slurm_print_job_step_info_msg ( FILE* out,
- job_step_info_response_msg_t * job_step_info_msg_ptr,
+void
+slurm_print_job_step_info_msg ( FILE* out,
+ job_step_info_response_msg_t * job_step_info_msg_ptr,
int one_liner )
{
int i;
job_step_info_t *job_step_ptr = job_step_info_msg_ptr->job_steps ;
char time_str[32];
- slurm_make_time_str ((time_t *)&job_step_info_msg_ptr->last_update,
+ slurm_make_time_str ((time_t *)&job_step_info_msg_ptr->last_update,
time_str, sizeof(time_str));
fprintf( out, "Job step data as of %s, record count %d\n",
time_str, job_step_info_msg_ptr->job_step_count);
- for (i = 0; i < job_step_info_msg_ptr-> job_step_count; i++)
+ for (i = 0; i < job_step_info_msg_ptr-> job_step_count; i++)
{
- slurm_print_job_step_info ( out, & job_step_ptr[i],
+ slurm_print_job_step_info ( out, & job_step_ptr[i],
one_liner ) ;
}
}
/*
- * slurm_print_job_step_info - output information about a specific Slurm
+ * slurm_print_job_step_info - output information about a specific Slurm
* job step based upon message as loaded using slurm_get_job_steps
* IN out - file to write to
* IN job_ptr - an individual job step information record pointer
* IN one_liner - print as a single line if true
*/
void
-slurm_print_job_step_info ( FILE* out, job_step_info_t * job_step_ptr,
+slurm_print_job_step_info ( FILE* out, job_step_info_t * job_step_ptr,
int one_liner )
{
char *print_this = slurm_sprint_job_step_info(job_step_ptr, one_liner);
@@ -99,7 +99,7 @@ slurm_print_job_step_info ( FILE* out, job_step_info_t * job_step_ptr,
}
/*
- * slurm_sprint_job_step_info - output information about a specific Slurm
+ * slurm_sprint_job_step_info - output information about a specific Slurm
* job step based upon message as loaded using slurm_get_job_steps
* IN job_ptr - an individual job step information record pointer
* IN one_liner - print as a single line if true
@@ -107,7 +107,7 @@ slurm_print_job_step_info ( FILE* out, job_step_info_t * job_step_ptr,
* NULL is returned on failure.
*/
char *
-slurm_sprint_job_step_info ( job_step_info_t * job_step_ptr,
+slurm_sprint_job_step_info ( job_step_info_t * job_step_ptr,
int one_liner )
{
char time_str[32];
@@ -124,8 +124,8 @@ slurm_sprint_job_step_info ( job_step_info_t * job_step_ptr,
secs2time_str ((time_t)job_step_ptr->time_limit * 60,
limit_str, sizeof(limit_str));
snprintf(tmp_line, sizeof(tmp_line),
- "StepId=%u.%u UserId=%u StartTime=%s TimeLimit=%s",
- job_step_ptr->job_id, job_step_ptr->step_id,
+ "StepId=%u.%u UserId=%u StartTime=%s TimeLimit=%s",
+ job_step_ptr->job_id, job_step_ptr->step_id,
job_step_ptr->user_id, time_str, limit_str);
out = xstrdup(tmp_line);
if (one_liner)
@@ -135,7 +135,7 @@ slurm_sprint_job_step_info ( job_step_info_t * job_step_ptr,
/****** Line 2 ******/
snprintf(tmp_line, sizeof(tmp_line),
- "Partition=%s Nodes=%s Tasks=%u Name=%s Network=%s",
+ "Partition=%s Nodes=%s Tasks=%u Name=%s Network=%s",
job_step_ptr->partition, job_step_ptr->nodes,
job_step_ptr->num_tasks, job_step_ptr->name,
job_step_ptr->network);
@@ -147,7 +147,7 @@ slurm_sprint_job_step_info ( job_step_info_t * job_step_ptr,
/****** Line 3 ******/
snprintf(tmp_line, sizeof(tmp_line),
- "ResvPorts=%s Checkpoint=%u CheckpointDir=%s\n\n",
+ "ResvPorts=%s Checkpoint=%u CheckpointDir=%s\n\n",
job_step_ptr->resv_ports,
job_step_ptr->ckpt_interval, job_step_ptr->ckpt_dir);
xstrcat(out, tmp_line);
@@ -156,13 +156,13 @@ slurm_sprint_job_step_info ( job_step_info_t * job_step_ptr,
}
/*
- * slurm_get_job_steps - issue RPC to get specific slurm job step
+ * slurm_get_job_steps - issue RPC to get specific slurm job step
* configuration information if changed since update_time.
- * a job_id value of NO_VAL implies all jobs, a step_id value of
+ * a job_id value of NO_VAL implies all jobs, a step_id value of
* NO_VAL implies all steps
* IN update_time - time of current configuration data
* IN job_id - get information for specific job id, NO_VAL for all jobs
- * IN step_id - get information for specific job step id, NO_VAL for all
+ * IN step_id - get information for specific job step id, NO_VAL for all
* job steps
* IN job_info_msg_pptr - place to store a job configuration pointer
* IN show_flags - job step filtering options
@@ -170,7 +170,7 @@ slurm_sprint_job_step_info ( job_step_info_t * job_step_ptr,
* NOTE: free the response using slurm_free_job_step_info_response_msg
*/
int
-slurm_get_job_steps (time_t update_time, uint32_t job_id, uint32_t step_id,
+slurm_get_job_steps (time_t update_time, uint32_t job_id, uint32_t step_id,
job_step_info_response_msg_t **resp, uint16_t show_flags)
{
int rc;
@@ -197,8 +197,8 @@ slurm_get_job_steps (time_t update_time, uint32_t job_id, uint32_t step_id,
break;
case RESPONSE_SLURM_RC:
rc = ((return_code_msg_t *) resp_msg.data)->return_code;
- slurm_free_return_code_msg(resp_msg.data);
- if (rc)
+ slurm_free_return_code_msg(resp_msg.data);
+ if (rc)
slurm_seterrno_ret(rc);
*resp = NULL;
break;
diff --git a/src/api/node_info.c b/src/api/node_info.c
index e4f1a161d9c86dd89f753ee47d64c7d231973c9d..0080acadda920565811163c418658d10e72bbc3c 100644
--- a/src/api/node_info.c
+++ b/src/api/node_info.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -69,21 +69,21 @@
* IN node_info_msg_ptr - node information message pointer
* IN one_liner - print as a single line if true
*/
-void
-slurm_print_node_info_msg ( FILE * out, node_info_msg_t * node_info_msg_ptr,
+void
+slurm_print_node_info_msg ( FILE * out, node_info_msg_t * node_info_msg_ptr,
int one_liner )
{
int i;
node_info_t * node_ptr = node_info_msg_ptr -> node_array ;
char time_str[32];
- slurm_make_time_str ((time_t *)&node_info_msg_ptr->last_update,
+ slurm_make_time_str ((time_t *)&node_info_msg_ptr->last_update,
time_str, sizeof(time_str));
fprintf( out, "Node data as of %s, record count %d\n",
time_str, node_info_msg_ptr->record_count);
for (i = 0; i < node_info_msg_ptr-> record_count; i++) {
- slurm_print_node_table ( out, & node_ptr[i],
+ slurm_print_node_table ( out, & node_ptr[i],
node_info_msg_ptr->node_scaling,
one_liner ) ;
}
@@ -99,10 +99,10 @@ slurm_print_node_info_msg ( FILE * out, node_info_msg_t * node_info_msg_ptr,
* IN one_liner - print as a single line if true
*/
void
-slurm_print_node_table ( FILE * out, node_info_t * node_ptr,
+slurm_print_node_table ( FILE * out, node_info_t * node_ptr,
int node_scaling, int one_liner )
{
- char *print_this = slurm_sprint_node_table(node_ptr, node_scaling,
+ char *print_this = slurm_sprint_node_table(node_ptr, node_scaling,
one_liner);
fprintf ( out, "%s", print_this);
xfree(print_this);
@@ -118,7 +118,7 @@ slurm_print_node_table ( FILE * out, node_info_t * node_ptr,
* NULL is returned on failure.
*/
char *
-slurm_sprint_node_table (node_info_t * node_ptr,
+slurm_sprint_node_table (node_info_t * node_ptr,
int node_scaling, int one_liner )
{
uint16_t my_state = node_ptr->node_state;
@@ -129,7 +129,7 @@ slurm_sprint_node_table (node_info_t * node_ptr,
int cpus_per_node = 1;
int total_used = node_ptr->cpus;
- if(node_scaling)
+ if(node_scaling)
cpus_per_node = node_ptr->cpus / node_scaling;
if (my_state & NODE_STATE_COMPLETING) {
@@ -144,12 +144,12 @@ slurm_sprint_node_table (node_info_t * node_ptr,
my_state &= (~NODE_STATE_POWER_SAVE);
power_str = "+POWER";
}
- slurm_get_select_nodeinfo(node_ptr->select_nodeinfo,
+ slurm_get_select_nodeinfo(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ALLOCATED,
&alloc_cpus);
#ifdef HAVE_BG
- if(!alloc_cpus
+ if(!alloc_cpus
&& (IS_NODE_ALLOCATED(node_ptr) || IS_NODE_COMPLETING(node_ptr)))
alloc_cpus = node_ptr->cpus;
else
@@ -157,7 +157,7 @@ slurm_sprint_node_table (node_info_t * node_ptr,
#endif
total_used -= alloc_cpus;
- slurm_get_select_nodeinfo(node_ptr->select_nodeinfo,
+ slurm_get_select_nodeinfo(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ERROR,
&err_cpus);
@@ -166,7 +166,7 @@ slurm_sprint_node_table (node_info_t * node_ptr,
#endif
total_used -= err_cpus;
- if ((alloc_cpus && err_cpus) ||
+ if ((alloc_cpus && err_cpus) ||
(total_used && (total_used != node_ptr->cpus))) {
my_state &= NODE_STATE_FLAGS;
my_state |= NODE_STATE_MIXED;
@@ -198,7 +198,7 @@ slurm_sprint_node_table (node_info_t * node_ptr,
xstrcat(out, " ");
else
xstrcat(out, "\n ");
-
+
/****** Line 3 ******/
if (node_ptr->os) {
snprintf(tmp_line, sizeof(tmp_line), "OS=%s ", node_ptr->os);
@@ -218,7 +218,7 @@ slurm_sprint_node_table (node_info_t * node_ptr,
"Sockets=%u State=%s%s%s%s ThreadsPerCore=%u "
"TmpDisk=%u Weight=%u",
node_ptr->sockets, node_state_string(my_state),
- comp_str, drain_str, power_str, node_ptr->threads,
+ comp_str, drain_str, power_str, node_ptr->threads,
node_ptr->tmp_disk, node_ptr->weight);
xstrcat(out, tmp_line);
if (one_liner)
@@ -230,40 +230,40 @@ slurm_sprint_node_table (node_info_t * node_ptr,
/*
- * slurm_load_node - issue RPC to get slurm all node configuration information
- * if changed since update_time
+ * slurm_load_node - issue RPC to get slurm all node configuration information
+ * if changed since update_time
* IN update_time - time of current configuration data
* IN node_info_msg_pptr - place to store a node configuration pointer
* IN show_flags - node filtering options
* RET 0 or a slurm error code
* NOTE: free the response using slurm_free_node_info_msg
*/
-extern int slurm_load_node (time_t update_time,
+extern int slurm_load_node (time_t update_time,
node_info_msg_t **resp, uint16_t show_flags)
{
int rc;
slurm_msg_t req_msg;
slurm_msg_t resp_msg;
node_info_request_msg_t req;
-
+
slurm_msg_t_init(&req_msg);
slurm_msg_t_init(&resp_msg);
req.last_update = update_time;
req.show_flags = show_flags;
req_msg.msg_type = REQUEST_NODE_INFO;
req_msg.data = &req;
-
+
if (slurm_send_recv_controller_msg(&req_msg, &resp_msg) < 0)
return SLURM_ERROR;
-
+
switch (resp_msg.msg_type) {
case RESPONSE_NODE_INFO:
*resp = (node_info_msg_t *) resp_msg.data;
break;
case RESPONSE_SLURM_RC:
rc = ((return_code_msg_t *) resp_msg.data)->return_code;
- slurm_free_return_code_msg(resp_msg.data);
- if (rc)
+ slurm_free_return_code_msg(resp_msg.data);
+ if (rc)
slurm_seterrno_ret(rc);
*resp = NULL;
break;
diff --git a/src/api/partition_info.c b/src/api/partition_info.c
index adea20c73a981e633619fca5bc0e53b2445e1ba5..46ced22a1de080db94334c916ab57cfa2b50f0ab 100644
--- a/src/api/partition_info.c
+++ b/src/api/partition_info.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -53,20 +53,20 @@
#include "src/common/xstring.h"
/*
- * slurm_print_partition_info_msg - output information about all Slurm
+ * slurm_print_partition_info_msg - output information about all Slurm
* partitions based upon message as loaded using slurm_load_partitions
* IN out - file to write to
* IN part_info_ptr - partitions information message pointer
* IN one_liner - print as a single line if true
*/
-void slurm_print_partition_info_msg ( FILE* out,
+void slurm_print_partition_info_msg ( FILE* out,
partition_info_msg_t * part_info_ptr, int one_liner )
{
int i ;
partition_info_t * part_ptr = part_info_ptr->partition_array ;
char time_str[32];
- slurm_make_time_str ((time_t *)&part_info_ptr->last_update, time_str,
+ slurm_make_time_str ((time_t *)&part_info_ptr->last_update, time_str,
sizeof(time_str));
fprintf( out, "Partition data as of %s, record count %d\n",
time_str, part_info_ptr->record_count);
@@ -78,13 +78,13 @@ void slurm_print_partition_info_msg ( FILE* out,
}
/*
- * slurm_print_partition_info - output information about a specific Slurm
+ * slurm_print_partition_info - output information about a specific Slurm
* partition based upon message as loaded using slurm_load_partitions
* IN out - file to write to
* IN part_ptr - an individual partition information record pointer
* IN one_liner - print as a single line if true
*/
-void slurm_print_partition_info ( FILE* out, partition_info_t * part_ptr,
+void slurm_print_partition_info ( FILE* out, partition_info_t * part_ptr,
int one_liner )
{
char *print_this = slurm_sprint_partition_info(part_ptr, one_liner);
@@ -94,14 +94,14 @@ void slurm_print_partition_info ( FILE* out, partition_info_t * part_ptr,
/*
- * slurm_sprint_partition_info - output information about a specific Slurm
+ * slurm_sprint_partition_info - output information about a specific Slurm
* partition based upon message as loaded using slurm_load_partitions
* IN part_ptr - an individual partition information record pointer
* IN one_liner - print as a single line if true
* RET out - char * containing formatted output (must be freed after call)
* NULL is returned on failure.
*/
-char *slurm_sprint_partition_info ( partition_info_t * part_ptr,
+char *slurm_sprint_partition_info ( partition_info_t * part_ptr,
int one_liner )
{
char tmp1[16], tmp2[16];
@@ -112,7 +112,7 @@ char *slurm_sprint_partition_info ( partition_info_t * part_ptr,
/****** Line 1 ******/
snprintf(tmp_line, sizeof(tmp_line),
- "PartitionName=%s",
+ "PartitionName=%s",
part_ptr->name);
xstrcat(out, tmp_line);
if (one_liner)
@@ -128,11 +128,11 @@ char *slurm_sprint_partition_info ( partition_info_t * part_ptr,
snprintf(tmp_line, sizeof(tmp_line), "AllocNodes=%s",
part_ptr->allow_alloc_nodes);
xstrcat(out, tmp_line);
- if ((part_ptr->allow_groups == NULL) ||
+ if ((part_ptr->allow_groups == NULL) ||
(part_ptr->allow_groups[0] == '\0'))
sprintf(tmp_line, " AllowGroups=ALL");
else {
- snprintf(tmp_line, sizeof(tmp_line),
+ snprintf(tmp_line, sizeof(tmp_line),
" AllowGroups=%s", part_ptr->allow_groups);
}
xstrcat(out, tmp_line);
@@ -146,11 +146,11 @@ char *slurm_sprint_partition_info ( partition_info_t * part_ptr,
else
xstrcat(out, "\n ");
- /****** Line added here for BG partitions
+ /****** Line added here for BG partitions
to keep with alphabetized output******/
#ifdef HAVE_BG
- snprintf(tmp_line, sizeof(tmp_line), "BasePartitions=%s",
+ snprintf(tmp_line, sizeof(tmp_line), "BasePartitions=%s",
part_ptr->nodes);
xstrcat(out, tmp_line);
if (one_liner)
@@ -165,10 +165,10 @@ char *slurm_sprint_partition_info ( partition_info_t * part_ptr,
if (part_ptr->default_time == INFINITE)
sprintf(tmp_line, "DefaultTime=UNLIMITED");
else if (part_ptr->default_time == NO_VAL)
- sprintf(tmp_line, "DefaultTime=NONE");
+ sprintf(tmp_line, "DefaultTime=NONE");
else {
char time_line[32];
- secs2time_str(part_ptr->default_time * 60, time_line,
+ secs2time_str(part_ptr->default_time * 60, time_line,
sizeof(time_line));
sprintf(tmp_line, " DefaultTime=%s", time_line);
}
@@ -188,7 +188,7 @@ char *slurm_sprint_partition_info ( partition_info_t * part_ptr,
xstrcat(out, " ");
else
xstrcat(out, "\n ");
-
+
/****** Line 4 ******/
if (part_ptr->max_nodes == INFINITE)
@@ -207,7 +207,7 @@ char *slurm_sprint_partition_info ( partition_info_t * part_ptr,
sprintf(tmp_line, " MaxTime=UNLIMITED");
else {
char time_line[32];
- secs2time_str(part_ptr->max_time * 60, time_line,
+ secs2time_str(part_ptr->max_time * 60, time_line,
sizeof(time_line));
sprintf(tmp_line, " MaxTime=%s", time_line);
}
@@ -243,7 +243,7 @@ char *slurm_sprint_partition_info ( partition_info_t * part_ptr,
/****** Line 6 ******/
sprintf(tmp_line, "Priority=%u", part_ptr->priority);
- xstrcat(out, tmp_line);
+ xstrcat(out, tmp_line);
if (part_ptr->root_only)
sprintf(tmp_line, " RootOnly=YES");
else
@@ -275,7 +275,7 @@ char *slurm_sprint_partition_info ( partition_info_t * part_ptr,
else
sprintf(tmp_line, "State=DOWN");
xstrcat(out, tmp_line);
-
+
#ifdef HAVE_BG
convert_num_unit((float)part_ptr->total_cpus, tmp1, sizeof(tmp1),
UNIT_NONE);
@@ -296,22 +296,22 @@ char *slurm_sprint_partition_info ( partition_info_t * part_ptr,
xstrcat(out, "\n");
else
xstrcat(out, "\n\n");
-
+
return out;
}
/*
- * slurm_load_partitions - issue RPC to get slurm all partition configuration
- * information if changed since update_time
+ * slurm_load_partitions - issue RPC to get slurm all partition configuration
+ * information if changed since update_time
* IN update_time - time of current configuration data
- * IN partition_info_msg_pptr - place to store a partition configuration
+ * IN partition_info_msg_pptr - place to store a partition configuration
* pointer
* IN show_flags - partition filtering options
* RET 0 or a slurm error code
* NOTE: free the response using slurm_free_partition_info_msg
*/
-extern int slurm_load_partitions (time_t update_time,
+extern int slurm_load_partitions (time_t update_time,
partition_info_msg_t **resp, uint16_t show_flags)
{
int rc;
@@ -326,18 +326,18 @@ extern int slurm_load_partitions (time_t update_time,
req.show_flags = show_flags;
req_msg.msg_type = REQUEST_PARTITION_INFO;
req_msg.data = &req;
-
+
if (slurm_send_recv_controller_msg(&req_msg, &resp_msg) < 0)
return SLURM_ERROR;
-
+
switch (resp_msg.msg_type) {
case RESPONSE_PARTITION_INFO:
*resp = (partition_info_msg_t *) resp_msg.data;
break;
case RESPONSE_SLURM_RC:
rc = ((return_code_msg_t *) resp_msg.data)->return_code;
- slurm_free_return_code_msg(resp_msg.data);
- if (rc)
+ slurm_free_return_code_msg(resp_msg.data);
+ if (rc)
slurm_seterrno_ret(rc);
*resp = NULL;
break;
diff --git a/src/api/pmi.c b/src/api/pmi.c
index 87082bef8e69df2e9fe42e0fbbe4d4ae138c7afb..90e8b1eb1ec889c541ee271fc7bc865a082f95ba 100644
--- a/src/api/pmi.c
+++ b/src/api/pmi.c
@@ -60,15 +60,15 @@
* 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
+ * 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
+ * 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
+ * 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
@@ -120,7 +120,7 @@ struct kvs_rec {
static void _del_kvs_rec( struct kvs_rec *kvs_ptr );
static void _init_kvs( char kvsname[] );
static void inline _kvs_dump(void);
-static int _kvs_put( const char kvsname[], const char key[],
+static int _kvs_put( const char kvsname[], const char key[],
const char value[], int local);
static void _kvs_swap(struct kvs_rec *kvs_ptr, int inx1, int inx2);
@@ -163,7 +163,7 @@ Return values:
Notes:
Initialize PMI for this process group. The value of spawned indicates whether
-this process was created by 'PMI_Spawn_multiple'. 'spawned' will be 'PMI_TRUE'
+this process was created by 'PMI_Spawn_multiple'. 'spawned' will be 'PMI_TRUE'
if this process group has a parent and 'PMI_FALSE' if it does not.
@*/
@@ -342,7 +342,7 @@ int PMI_Get_size( int *size )
if (!pmi_init)
return PMI_FAIL;
}
-
+
*size = pmi_size;
return PMI_SUCCESS;
}
@@ -383,7 +383,7 @@ int PMI_Get_rank( int *rank )
/*@
PMI_Get_universe_size - obtain the universe size
-(NOTE: "universe size" indicates the maximum recommended
+(NOTE: "universe size" indicates the maximum recommended
process count for the job.)
Output Parameters:
@@ -457,7 +457,7 @@ int PMI_Get_appnum( int *appnum )
}
/*@
-PMI_Publish_name - publish a name
+PMI_Publish_name - publish a name
Input parameters:
. service_name - string representing the service being published
@@ -568,7 +568,7 @@ int PMI_Get_id( char id_str[], int length )
if (pmi_init == 0)
return PMI_FAIL;
- snprintf(id_str, length, "%ld.%ld", pmi_jobid, pmi_stepid);
+ snprintf(id_str, length, "%ld.%ld", pmi_jobid, pmi_stepid);
return PMI_SUCCESS;
}
@@ -659,7 +659,7 @@ int PMI_Barrier( void )
fprintf(stderr, "In: PMI_Barrier\n");
/* Issue the RPC */
- if (slurm_get_kvs_comm_set(&kvs_set_ptr, pmi_rank, pmi_size)
+ if (slurm_get_kvs_comm_set(&kvs_set_ptr, pmi_rank, pmi_size)
!= SLURM_SUCCESS)
return PMI_FAIL;
if (kvs_set_ptr == NULL)
@@ -670,8 +670,8 @@ int PMI_Barrier( void )
for (i=0; i<kvs_set_ptr->kvs_comm_recs; i++) {
kvs_ptr = kvs_set_ptr->kvs_comm_ptr[i];
for (j=0; j<kvs_ptr->kvs_cnt; j++) {
- k = _kvs_put(kvs_ptr->kvs_name,
- kvs_ptr->kvs_keys[j],
+ k = _kvs_put(kvs_ptr->kvs_name,
+ kvs_ptr->kvs_keys[j],
kvs_ptr->kvs_values[j],
0);
if (k != PMI_SUCCESS)
@@ -806,7 +806,7 @@ int PMI_Abort(int exit_code, const char error_msg[])
/* PMI Keymap functions */
/*@
-PMI_KVS_Get_my_name - obtain the name of the keyval space the local process
+PMI_KVS_Get_my_name - obtain the name of the keyval space the local process
group has access to
Input Parameters:
@@ -885,7 +885,7 @@ This function returns the string length required to store a keyval space name.
A routine is used rather than setting a maximum value in 'pmi.h' to allow
different implementations of PMI to be used with the same executable. These
-different implementations may allow different maximum lengths; by using a
+different implementations may allow different maximum lengths; by using a
routine here, we can interface with a variety of implementations of PMI.
@*/
@@ -992,7 +992,7 @@ int PMI_KVS_Create( char kvsname[], int length )
return PMI_FAIL;
pthread_mutex_lock(&kvs_mutex);
- size = snprintf(kvsname, length, "%ld.%ld.%d.%d", pmi_jobid,
+ size = snprintf(kvsname, length, "%ld.%ld.%d.%d", pmi_jobid,
pmi_stepid, pmi_rank, kvs_name_sequence);
if (size >= length) /* truncated */
rc = PMI_ERR_INVALID_LENGTH;
@@ -1062,7 +1062,7 @@ Return values:
Notes:
This function puts the key/value pair in the specified keyval space. The
-value is not visible to other processes until 'PMI_KVS_Commit()' is called.
+value is not visible to other processes until 'PMI_KVS_Commit()' is called.
The function may complete locally. After 'PMI_KVS_Commit()' is called, the
value may be retrieved by calling 'PMI_KVS_Get()'. All keys put to a keyval
space must be unique to the keyval space. You may not put more than once
@@ -1084,7 +1084,7 @@ int PMI_KVS_Put( const char kvsname[], const char key[], const char value[])
return _kvs_put(kvsname, key, value, 1);
}
-static int _kvs_put( const char kvsname[], const char key[], const char value[],
+static int _kvs_put( const char kvsname[], const char key[], const char value[],
int local)
{
int i, j, rc;
@@ -1096,7 +1096,7 @@ static int _kvs_put( const char kvsname[], const char key[], const char value[],
continue;
/* search for duplicate key */
for (j=0; j<kvs_recs[i].kvs_cnt; j++) {
- if (strncmp(kvs_recs[i].kvs_keys[j], key,
+ if (strncmp(kvs_recs[i].kvs_keys[j], key,
PMI_MAX_KEY_LEN))
continue;
if (local)
@@ -1110,7 +1110,7 @@ static int _kvs_put( const char kvsname[], const char key[], const char value[],
rc = PMI_FAIL; /* malloc error */
else {
rc = PMI_SUCCESS;
- strncpy(kvs_recs[i].kvs_values[j], value,
+ strncpy(kvs_recs[i].kvs_values[j], value,
PMI_MAX_VAL_LEN);
}
goto fini;
@@ -1119,7 +1119,7 @@ static int _kvs_put( const char kvsname[], const char key[], const char value[],
kvs_recs[i].kvs_cnt++;
kvs_recs[i].kvs_key_states = realloc(kvs_recs[i].kvs_key_states,
(sizeof (uint16_t) * kvs_recs[i].kvs_cnt));
- kvs_recs[i].kvs_values = realloc(kvs_recs[i].kvs_values,
+ kvs_recs[i].kvs_values = realloc(kvs_recs[i].kvs_values,
(sizeof (char *) * kvs_recs[i].kvs_cnt));
kvs_recs[i].kvs_keys = realloc(kvs_recs[i].kvs_keys,
(sizeof (char *) * kvs_recs[i].kvs_cnt));
@@ -1141,7 +1141,7 @@ static int _kvs_put( const char kvsname[], const char key[], const char value[],
rc = PMI_FAIL; /* malloc error */
else {
rc = PMI_SUCCESS;
- strncpy(kvs_recs[i].kvs_values[j], value,
+ strncpy(kvs_recs[i].kvs_values[j], value,
PMI_MAX_VAL_LEN);
strncpy(kvs_recs[i].kvs_keys[j], key, PMI_MAX_KEY_LEN);
}
@@ -1184,7 +1184,7 @@ int PMI_KVS_Commit( const char kvsname[] )
/* Pack records into RPC for sending to slurmd_step
* NOTE: For performance reasons, we only send key-pairs
* which have been locally set rather than the full key-pair
- * space. We do this by moving the local key-pairs to the
+ * space. We do this by moving the local key-pairs to the
* head of the list and sending the count of local entries
* rather than the full set. */
kvs_set.host_cnt = 1;
@@ -1201,7 +1201,7 @@ int PMI_KVS_Commit( const char kvsname[] )
continue;
local_pairs = 0;
for (j=0; j<kvs_recs[i].kvs_cnt; j++) {
- if (kvs_recs[i].kvs_key_states[j] ==
+ if (kvs_recs[i].kvs_key_states[j] ==
KVS_KEY_STATE_GLOBAL)
continue;
if (local_pairs != j)
@@ -1211,10 +1211,10 @@ int PMI_KVS_Commit( const char kvsname[] )
if (local_pairs == 0)
continue;
- kvs_set.kvs_comm_ptr = realloc(kvs_set.kvs_comm_ptr,
+ kvs_set.kvs_comm_ptr = realloc(kvs_set.kvs_comm_ptr,
(sizeof(struct kvs_comm *) *
(kvs_set.kvs_comm_recs+1)));
- kvs_set.kvs_comm_ptr[kvs_set.kvs_comm_recs] =
+ kvs_set.kvs_comm_ptr[kvs_set.kvs_comm_recs] =
malloc(sizeof(struct kvs_comm));
kvs_set.kvs_comm_ptr[kvs_set.kvs_comm_recs]->kvs_name =
kvs_recs[i].kvs_name;
@@ -1228,7 +1228,7 @@ int PMI_KVS_Commit( const char kvsname[] )
}
/* Send the RPC */
- if (slurm_send_kvs_comm_set(&kvs_set, pmi_rank, pmi_size)
+ if (slurm_send_kvs_comm_set(&kvs_set, pmi_rank, pmi_size)
!= SLURM_SUCCESS)
rc = PMI_FAIL;
else
@@ -1292,7 +1292,7 @@ int PMI_KVS_Get( const char kvsname[], const char key[], char value[], int lengt
if (pmi_debug)
fprintf(stderr, "In: PMI_KVS_Get(%s)\n", key);
-
+
if ((kvsname == NULL) || (strlen(kvsname) > PMI_MAX_KVSNAME_LEN))
return PMI_ERR_INVALID_KVS;
if ((key == NULL) || (strlen(key) >PMI_MAX_KEY_LEN))
@@ -1314,7 +1314,7 @@ int PMI_KVS_Get( const char kvsname[], const char key[], char value[], int lengt
if (strlen(kvs_recs[i].kvs_values[j]) > (length-1))
rc = PMI_ERR_INVALID_LENGTH;
else {
- strncpy(value, kvs_recs[i].kvs_values[j],
+ strncpy(value, kvs_recs[i].kvs_values[j],
length);
rc = PMI_SUCCESS;
}
@@ -1391,7 +1391,7 @@ int PMI_KVS_Iter_first(const char kvsname[], char key[], int key_len, char val[]
(val_len-1)) {
rc = PMI_ERR_INVALID_VAL_LENGTH;
} else {
- strncpy(key, kvs_recs[i].kvs_keys[kvs_recs[i].kvs_inx],
+ strncpy(key, kvs_recs[i].kvs_keys[kvs_recs[i].kvs_inx],
key_len);
strncpy(val,
kvs_recs[i].kvs_values[kvs_recs[i].kvs_inx],
@@ -1399,7 +1399,7 @@ int PMI_KVS_Iter_first(const char kvsname[], char key[], int key_len, char val[]
rc = PMI_SUCCESS;
}
goto fini;
- }
+ }
rc = PMI_ERR_INVALID_KVS;
fini: pthread_mutex_unlock(&kvs_mutex);
@@ -1428,14 +1428,14 @@ Return values:
- PMI_FAIL - failed to get the next keyval pair
Notes:
-This function retrieves the next keyval pair from the specified keyval space.
+This function retrieves the next keyval pair from the specified keyval space.
'PMI_KVS_Iter_first()' must have been previously called. The end of the keyval
space is specified by returning an empty key string. The output parameters,
key and val, must be at least as long as the values returned by
'PMI_KVS_Get_key_length_max()' and 'PMI_KVS_Get_value_length_max()'.
@*/
-int PMI_KVS_Iter_next(const char kvsname[], char key[], int key_len,
+int PMI_KVS_Iter_next(const char kvsname[], char key[], int key_len,
char val[], int val_len)
{
int i, rc;
@@ -1471,7 +1471,7 @@ int PMI_KVS_Iter_next(const char kvsname[], char key[], int key_len,
} else {
strncpy(key, kvs_recs[i].kvs_keys[kvs_recs[i].kvs_inx],
key_len);
- strncpy(val,
+ strncpy(val,
kvs_recs[i].kvs_values[kvs_recs[i].kvs_inx],
val_len);
rc = PMI_SUCCESS;
@@ -1494,7 +1494,7 @@ Input Parameters:
. cmds - array of command strings
. argvs - array of argv arrays for each command string
. maxprocs - array of maximum processes to spawn for each command string
-. info_keyval_sizes - array giving the number of elements in each of the
+. info_keyval_sizes - array giving the number of elements in each of the
'info_keyval_vectors'
. info_keyval_vectors - array of keyval vector arrays
. preput_keyval_size - Number of elements in 'preput_keyval_vector'
@@ -1515,7 +1515,7 @@ field refers to the size of the array parameters - 'cmd', 'argvs', 'maxprocs',
to the size of the 'preput_keyval_vector' array. The 'preput_keyval_vector'
contains keyval pairs that will be put in the keyval space of the newly
created process group before the processes are started. The 'maxprocs' array
-specifies the desired number of processes to create for each 'cmd' string.
+specifies the desired number of processes to create for each 'cmd' string.
The actual number of processes may be less than the numbers specified in
maxprocs. The acceptable number of processes spawned may be controlled by
``soft'' keyvals in the info arrays. The ``soft'' option is specified by
@@ -1567,14 +1567,14 @@ Notes:
This function removes one PMI specific argument from the command line and
creates the corresponding 'PMI_keyval_t' structure for it. It returns
an array and size to the caller. The array must be freed by 'PMI_Free_keyvals()'.
-If the first element of the args array is not a PMI specific argument, the
-function returns success and sets num_parsed to zero. If there are multiple PMI
-specific arguments in the args array, this function may parse more than one
+If the first element of the args array is not a PMI specific argument, the
+function returns success and sets num_parsed to zero. If there are multiple PMI
+specific arguments in the args array, this function may parse more than one
argument as long as the options are contiguous in the args array.
@*/
int PMI_Parse_option(int num_args, char *args[], int *num_parsed,
- PMI_keyval_t **keyvalp,
+ PMI_keyval_t **keyvalp,
int *size)
{
int i, n, s, len;
@@ -1645,7 +1645,7 @@ int PMI_Parse_option(int num_args, char *args[], int *num_parsed,
*keyvalp = temp;
*num_parsed = n;
*size = s;
-
+
return PMI_SUCCESS;
}
@@ -1669,7 +1669,7 @@ Notes:
This function removes PMI specific arguments from the command line and
creates the corresponding 'PMI_keyval_t' structures for them. It returns
an array and size to the caller that can then be passed to 'PMI_Spawn_multiple()'.
-The array can be freed by 'PMI_Free_keyvals()'. The routine 'free()' should
+The array can be freed by 'PMI_Free_keyvals()'. The routine 'free()' should
not be used to free this array as there is no requirement that the array be
allocated with 'malloc()'.
@@ -1682,7 +1682,7 @@ allocated with 'malloc()'.
*/
-int PMI_Args_to_keyval(int *argcp, char *((*argvp)[]), PMI_keyval_t **keyvalp,
+int PMI_Args_to_keyval(int *argcp, char *((*argvp)[]), PMI_keyval_t **keyvalp,
int *size)
{
int i, j, cnt;
@@ -1720,7 +1720,7 @@ int PMI_Args_to_keyval(int *argcp, char *((*argvp)[]), PMI_keyval_t **keyvalp,
while (cnt) {
if (argv[i][0] == '-') {
- temp[j].key = (char *) malloc((strlen(argv[i])+1) *
+ temp[j].key = (char *) malloc((strlen(argv[i])+1) *
sizeof (char));
if (temp[j].key == NULL)
return PMI_FAIL;
@@ -1729,7 +1729,7 @@ int PMI_Args_to_keyval(int *argcp, char *((*argvp)[]), PMI_keyval_t **keyvalp,
--cnt;
if ((cnt) && (argv[i][0] != '-')){
temp[j].val = (char *) malloc(
- (strlen(argv[i])+1) *
+ (strlen(argv[i])+1) *
sizeof (char));
if (temp[j].val == NULL)
return PMI_FAIL;
@@ -1764,7 +1764,7 @@ Return values:
Notes:
This function frees the data returned by 'PMI_Args_to_keyval' and 'PMI_Parse_option'.
- Using this routine instead of 'free' allows the PMI package to track
+ Using this routine instead of 'free' allows the PMI package to track
allocation of storage or to use interal storage as it sees fit.
@*/
int PMI_Free_keyvals(PMI_keyval_t keyvalp[], int size)
@@ -1794,7 +1794,7 @@ int PMI_Free_keyvals(PMI_keyval_t keyvalp[], int size)
}
/*@
-PMI_Get_options - get a string of command line argument descriptions that may be printed
+PMI_Get_options - get a string of command line argument descriptions that may be printed
to the user
Input Parameters:
diff --git a/src/api/pmi_server.c b/src/api/pmi_server.c
index 14867b918eb627c7fe1a53a9ab2ab74392a4d887..deabda8268854cd211c2cc20fec7cc382c333a2a 100644
--- a/src/api/pmi_server.c
+++ b/src/api/pmi_server.c
@@ -6,21 +6,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -92,7 +92,7 @@ static void _print_kvs(void);
/* Transmit the KVS keypairs to all tasks, waiting at a barrier
* This will take some time, so we work with a copy of the KVS keypairs.
- * We also work with a private copy of the barrier data and clear the
+ * We also work with a private copy of the barrier data and clear the
* global data pointers so any new barrier requests get treated as
* completely independent of this one. */
static void _kvs_xmit_tasks(void)
@@ -107,7 +107,7 @@ static void _kvs_xmit_tasks(void)
/* Target KVS_TIME should be about ave processing time */
debug("kvs_put processing time min=%d, max=%d ave=%d (usec)",
- min_time_kvs_put, max_time_kvs_put,
+ min_time_kvs_put, max_time_kvs_put,
(tot_time_kvs_put / barrier_cnt));
min_time_kvs_put = 1000000;
max_time_kvs_put = 0;
@@ -144,7 +144,7 @@ static void *_msg_thread(void *x)
struct msg_arg *msg_arg_ptr = (struct msg_arg *) x;
int rc, success = 0, timeout;
slurm_msg_t msg_send;
-
+
slurm_msg_t_init(&msg_send);
debug2("KVS_Barrier msg to %s:%u",
@@ -196,7 +196,7 @@ static void *_agent(void *x)
}
fanout_off_host = getenv("PMI_FANOUT_OFF_HOST");
- /* only send one message to each host,
+ /* only send one message to each host,
* build table of the ports on each host */
START_TIMER;
slurm_attr_init(&attr);
@@ -208,7 +208,7 @@ static void *_agent(void *x)
kvs_host_list = xmalloc(sizeof(struct kvs_hosts) * pmi_fanout);
host_cnt = 0;
- /* This code enables key-pair forwarding between
+ /* This code enables key-pair forwarding between
* tasks. First task on the node gets the key-pairs
* with host/port information for all other tasks on
* that node it should forward the information to. */
@@ -220,9 +220,9 @@ static void *_agent(void *x)
args->barrier_xmit_ptr[j].hostname))
continue; /* another host */
kvs_host_list[host_cnt].task_id = 0; /* not avail */
- kvs_host_list[host_cnt].port =
+ kvs_host_list[host_cnt].port =
args->barrier_xmit_ptr[j].port;
- kvs_host_list[host_cnt].hostname =
+ kvs_host_list[host_cnt].hostname =
args->barrier_xmit_ptr[j].hostname;
args->barrier_xmit_ptr[j].port = 0;/* don't reissue */
host_cnt++;
@@ -306,14 +306,14 @@ struct kvs_comm **_kvs_comm_dup(void)
rc_kvs[i] = xmalloc(sizeof(struct kvs_comm));
rc_kvs[i]->kvs_name = xstrdup(kvs_comm_ptr[i]->kvs_name);
rc_kvs[i]->kvs_cnt = kvs_comm_ptr[i]->kvs_cnt;
- rc_kvs[i]->kvs_keys =
+ rc_kvs[i]->kvs_keys =
xmalloc(sizeof(char *) * rc_kvs[i]->kvs_cnt);
- rc_kvs[i]->kvs_values =
+ rc_kvs[i]->kvs_values =
xmalloc(sizeof(char *) * rc_kvs[i]->kvs_cnt);
for (j=0; j<rc_kvs[i]->kvs_cnt; j++) {
- rc_kvs[i]->kvs_keys[j] =
+ rc_kvs[i]->kvs_keys[j] =
xstrdup(kvs_comm_ptr[i]->kvs_keys[j]);
- rc_kvs[i]->kvs_values[j] =
+ rc_kvs[i]->kvs_values[j] =
xstrdup(kvs_comm_ptr[i]->kvs_values[j]);
}
}
@@ -333,7 +333,7 @@ static struct kvs_comm *_find_kvs_by_name(char *name)
return NULL;
}
-static void _merge_named_kvs(struct kvs_comm *kvs_orig,
+static void _merge_named_kvs(struct kvs_comm *kvs_orig,
struct kvs_comm *kvs_new)
{
int i, j;
@@ -351,12 +351,12 @@ static void _merge_named_kvs(struct kvs_comm *kvs_orig,
continue; /* already recorded, update */
/* append it */
kvs_orig->kvs_cnt++;
- xrealloc(kvs_orig->kvs_keys,
+ xrealloc(kvs_orig->kvs_keys,
(sizeof(char *) * kvs_orig->kvs_cnt));
- xrealloc(kvs_orig->kvs_values,
+ xrealloc(kvs_orig->kvs_values,
(sizeof(char *) * kvs_orig->kvs_cnt));
kvs_orig->kvs_keys[kvs_orig->kvs_cnt-1] = kvs_new->kvs_keys[i];
- kvs_orig->kvs_values[kvs_orig->kvs_cnt-1] =
+ kvs_orig->kvs_values[kvs_orig->kvs_cnt-1] =
kvs_new->kvs_values[i];
kvs_new->kvs_keys[i] = NULL;
kvs_new->kvs_values[i] = NULL;
@@ -381,7 +381,7 @@ static void _print_kvs(void)
for (j=0; j<kvs_comm_ptr[i]->kvs_cnt; j++) {
info("KVS: %s:%s:%s", kvs_comm_ptr[i]->kvs_name,
kvs_comm_ptr[i]->kvs_keys[j],
- kvs_comm_ptr[i]->kvs_values[j]);
+ kvs_comm_ptr[i]->kvs_values[j]);
}
}
#endif
@@ -394,7 +394,7 @@ extern int pmi_kvs_put(struct kvs_comm_set *kvs_set_ptr)
DEF_TIMERS;
/* Merge new data with old.
- * NOTE: We just move pointers rather than copy data where
+ * NOTE: We just move pointers rather than copy data where
* possible for improved performance */
START_TIMER;
pthread_mutex_lock(&kvs_mutex);
@@ -402,7 +402,7 @@ extern int pmi_kvs_put(struct kvs_comm_set *kvs_set_ptr)
kvs_ptr = _find_kvs_by_name(kvs_set_ptr->
kvs_comm_ptr[i]->kvs_name);
if (kvs_ptr) {
- _merge_named_kvs(kvs_ptr,
+ _merge_named_kvs(kvs_ptr,
kvs_set_ptr->kvs_comm_ptr[i]);
} else {
_move_kvs(kvs_set_ptr->kvs_comm_ptr[i]);
@@ -432,8 +432,8 @@ extern int pmi_kvs_get(kvs_get_msg_t *kvs_get_ptr)
#endif
#if _DEBUG
- info("pmi_kvs_get: rank:%u size:%u port:%u, host:%s",
- kvs_get_ptr->task_id, kvs_get_ptr->size,
+ info("pmi_kvs_get: rank:%u size:%u port:%u, host:%s",
+ kvs_get_ptr->task_id, kvs_get_ptr->size,
kvs_get_ptr->port, kvs_get_ptr->hostname);
#endif
if (kvs_get_ptr->size == 0) {
@@ -457,7 +457,7 @@ extern int pmi_kvs_get(kvs_get_msg_t *kvs_get_ptr)
goto fini;
}
if (kvs_get_ptr->task_id >= barrier_cnt) {
- error("PMK_KVS_Barrier task count(%u) >= size(%u)",
+ error("PMK_KVS_Barrier task count(%u) >= size(%u)",
kvs_get_ptr->task_id, barrier_cnt);
rc = SLURM_ERROR;
goto fini;
@@ -480,7 +480,7 @@ extern int pmi_kvs_get(kvs_get_msg_t *kvs_get_ptr)
#endif
_kvs_xmit_tasks();
}
-fini: pthread_mutex_unlock(&kvs_mutex);
+fini: pthread_mutex_unlock(&kvs_mutex);
return rc;
}
diff --git a/src/api/pmi_server.h b/src/api/pmi_server.h
index 386cd9603218f95b3e958faf999e475593c0e1de..cba627b3bd153fb8c01d1d3295682b9257e592df 100644
--- a/src/api/pmi_server.h
+++ b/src/api/pmi_server.h
@@ -6,21 +6,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/src/api/reconfigure.c b/src/api/reconfigure.c
index 8773722a977fe3582e218bf60c1e7bbf33b0bc98..fb4ca865d7c53b29c078976f3b9c88027f9af057 100644
--- a/src/api/reconfigure.c
+++ b/src/api/reconfigure.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * reconfigure.c - request that slurmctld shutdown or re-read the
+ * reconfigure.c - request that slurmctld shutdown or re-read the
* configuration files
* $Id$
*****************************************************************************
@@ -8,32 +8,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -54,12 +54,12 @@
#include "src/common/forward.h"
#include "src/common/xmalloc.h"
-static int _send_message_controller ( enum controller_id dest,
+static int _send_message_controller ( enum controller_id dest,
slurm_msg_t *request_msg );
/*
* slurm_reconfigure - issue RPC to have Slurm controller (slurmctld)
- * reload its configuration file
+ * reload its configuration file
* RET 0 or a slurm error code
*/
int
@@ -71,7 +71,7 @@ slurm_reconfigure ( void )
slurm_msg_t_init(&req);
req.msg_type = REQUEST_RECONFIGURE;
-
+
if (slurm_send_recv_controller_rc_msg(&req, &rc) < 0)
return SLURM_ERROR;
@@ -109,7 +109,7 @@ slurm_ping (int primary)
/*
* slurm_shutdown - issue RPC to have Slurm controller (slurmctld)
- * cease operations, both the primary and backup controller
+ * cease operations, both the primary and backup controller
* are shutdown.
* IN options - 0: all slurm daemons are shutdown
* 1: slurmctld generates a core file
@@ -126,18 +126,18 @@ slurm_shutdown (uint16_t options)
shutdown_msg.options = options;
req_msg.msg_type = REQUEST_SHUTDOWN;
req_msg.data = &shutdown_msg;
-
- /*
- * Explicity send the message to both primary
- * and backup controllers
+
+ /*
+ * Explicity send the message to both primary
+ * and backup controllers
*/
(void) _send_message_controller(SECONDARY_CONTROLLER, &req_msg);
return _send_message_controller(PRIMARY_CONTROLLER, &req_msg);
}
/*
- * slurm_takeover - issue RPC to have Slurm backup controller take over the
- * primary controller. REQUEST_CONTROL is sent by the backup
+ * slurm_takeover - issue RPC to have Slurm backup controller take over the
+ * primary controller. REQUEST_CONTROL is sent by the backup
* to the primary controller to take control
* RET 0 or a slurm error code
*/
@@ -148,30 +148,30 @@ slurm_takeover ( void )
slurm_msg_t_init(&req_msg);
req_msg.msg_type = REQUEST_TAKEOVER;
-
+
return _send_message_controller(SECONDARY_CONTROLLER, &req_msg);
}
int
-_send_message_controller (enum controller_id dest, slurm_msg_t *req)
+_send_message_controller (enum controller_id dest, slurm_msg_t *req)
{
int rc = SLURM_PROTOCOL_SUCCESS;
slurm_fd fd = -1;
slurm_msg_t *resp_msg = NULL;
-
+
/* always going to one node (primary or backup per value of "dest") */
if ((fd = slurm_open_controller_conn_spec(dest)) < 0)
slurm_seterrno_ret(SLURMCTLD_COMMUNICATIONS_CONNECTION_ERROR);
- if (slurm_send_node_msg(fd, req) < 0)
+ if (slurm_send_node_msg(fd, req) < 0)
slurm_seterrno_ret(SLURMCTLD_COMMUNICATIONS_SEND_ERROR);
resp_msg = xmalloc(sizeof(slurm_msg_t));
slurm_msg_t_init(resp_msg);
-
+
if((rc = slurm_receive_msg(fd, resp_msg, 0)) != 0) {
return SLURMCTLD_COMMUNICATIONS_RECEIVE_ERROR;
}
-
+
if (slurm_shutdown_msg_conn(fd) != SLURM_SUCCESS)
rc = SLURMCTLD_COMMUNICATIONS_SHUTDOWN_ERROR;
else if (resp_msg->msg_type != RESPONSE_SLURM_RC)
diff --git a/src/api/reservation_info.c b/src/api/reservation_info.c
index b20ec80fa090d8add003f5ff0e8e6f785d9ec4dc..58de598bda481cfdd03e4fd88014d060a44b0271 100644
--- a/src/api/reservation_info.c
+++ b/src/api/reservation_info.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -52,20 +52,20 @@
#include "src/common/xstring.h"
/*
- * slurm_print_reservation_info_msg - output information about all Slurm
+ * slurm_print_reservation_info_msg - output information about all Slurm
* reservations based upon message as loaded using slurm_load_reservation
* IN out - file to write to
* IN resv_info_ptr - reservation information message pointer
* IN one_liner - print as a single line if true
*/
-void slurm_print_reservation_info_msg ( FILE* out,
+void slurm_print_reservation_info_msg ( FILE* out,
reserve_info_msg_t * resv_info_ptr, int one_liner )
{
int i ;
reserve_info_t * resv_ptr = resv_info_ptr->reservation_array ;
char time_str[32];
- slurm_make_time_str( (time_t *)&resv_info_ptr->last_update, time_str,
+ slurm_make_time_str( (time_t *)&resv_info_ptr->last_update, time_str,
sizeof(time_str));
fprintf( out, "Reservation data as of %s, record count %d\n",
time_str, resv_info_ptr->record_count);
@@ -77,13 +77,13 @@ void slurm_print_reservation_info_msg ( FILE* out,
}
/*
- * slurm_print_reservation_info - output information about a specific Slurm
+ * slurm_print_reservation_info - output information about a specific Slurm
* reservation based upon message as loaded using slurm_load_reservation
* IN out - file to write to
* IN resv_ptr - an individual reservation information record pointer
* IN one_liner - print as a single line if true
*/
-void slurm_print_reservation_info ( FILE* out, reserve_info_t * resv_ptr,
+void slurm_print_reservation_info ( FILE* out, reserve_info_t * resv_ptr,
int one_liner )
{
char *print_this = slurm_sprint_reservation_info(resv_ptr, one_liner);
@@ -93,14 +93,14 @@ void slurm_print_reservation_info ( FILE* out, reserve_info_t * resv_ptr,
/*
- * slurm_sprint_reservation_info - output information about a specific Slurm
+ * slurm_sprint_reservation_info - output information about a specific Slurm
* reservation based upon message as loaded using slurm_load_reservations
* IN resv_ptr - an individual reservation information record pointer
* IN one_liner - print as a single line if true
* RET out - char * containing formatted output (must be freed after call)
* NULL is returned on failure.
*/
-char *slurm_sprint_reservation_info ( reserve_info_t * resv_ptr,
+char *slurm_sprint_reservation_info ( reserve_info_t * resv_ptr,
int one_liner )
{
char tmp1[32], tmp2[32], *flag_str = NULL;
@@ -112,8 +112,8 @@ char *slurm_sprint_reservation_info ( reserve_info_t * resv_ptr,
slurm_make_time_str(&resv_ptr->end_time, tmp2, sizeof(tmp2));
snprintf(tmp_line, sizeof(tmp_line),
"ReservationName=%s StartTime=%s EndTime=%s Duration=%u",
- resv_ptr->name, tmp1, tmp2,
- (uint32_t) (difftime(resv_ptr->end_time,
+ resv_ptr->name, tmp1, tmp2,
+ (uint32_t) (difftime(resv_ptr->end_time,
resv_ptr->start_time) / 60));
xstrcat(out, tmp_line);
@@ -121,11 +121,11 @@ char *slurm_sprint_reservation_info ( reserve_info_t * resv_ptr,
xstrcat(out, " ");
else
xstrcat(out, "\n ");
-
+
/****** Line 2 ******/
flag_str = reservation_flags_string(resv_ptr->flags);
- snprintf(tmp_line, sizeof(tmp_line),
+ snprintf(tmp_line, sizeof(tmp_line),
"Nodes=%s NodeCnt=%u Features=%s PartitionName=%s Flags=%s",
resv_ptr->node_list, resv_ptr->node_cnt,
resv_ptr->features, resv_ptr->partition, flag_str);
@@ -135,32 +135,32 @@ char *slurm_sprint_reservation_info ( reserve_info_t * resv_ptr,
xstrcat(out, " ");
else
xstrcat(out, "\n ");
-
+
/****** Line 3 ******/
- snprintf(tmp_line, sizeof(tmp_line),
- "Users=%s Accounts=%s Licenses=%s",
+ snprintf(tmp_line, sizeof(tmp_line),
+ "Users=%s Accounts=%s Licenses=%s",
resv_ptr->users, resv_ptr->accounts, resv_ptr->licenses);
xstrcat(out, tmp_line);
if (one_liner)
xstrcat(out, "\n");
else
xstrcat(out, "\n\n");
-
+
return out;
}
/*
- * slurm_load_reservations - issue RPC to get all slurm reservation
- * configuration information if changed since update_time
+ * slurm_load_reservations - issue RPC to get all slurm reservation
+ * configuration information if changed since update_time
* IN update_time - time of current configuration data
- * IN reserve_info_msg_pptr - place to store a reservation configuration
+ * IN reserve_info_msg_pptr - place to store a reservation configuration
* pointer
* RET 0 or a slurm error code
* NOTE: free the response using slurm_free_reservation_info_msg
*/
-extern int slurm_load_reservations (time_t update_time,
+extern int slurm_load_reservations (time_t update_time,
reserve_info_msg_t **resp)
{
int rc;
@@ -174,18 +174,18 @@ extern int slurm_load_reservations (time_t update_time,
req.last_update = update_time;
req_msg.msg_type = REQUEST_RESERVATION_INFO;
req_msg.data = &req;
-
+
if (slurm_send_recv_controller_msg(&req_msg, &resp_msg) < 0)
return SLURM_ERROR;
-
+
switch (resp_msg.msg_type) {
case RESPONSE_RESERVATION_INFO:
*resp = (reserve_info_msg_t *) resp_msg.data;
break;
case RESPONSE_SLURM_RC:
rc = ((return_code_msg_t *) resp_msg.data)->return_code;
- slurm_free_return_code_msg(resp_msg.data);
- if (rc)
+ slurm_free_return_code_msg(resp_msg.data);
+ if (rc)
slurm_seterrno_ret(rc);
*resp = NULL;
break;
diff --git a/src/api/signal.c b/src/api/signal.c
index 7f59f7ffeab8682fe1391daeab5cba88a3ac71ba..8e8b0c2ae1ac7f55c17545e39c42a84407b7e28e 100644
--- a/src/api/signal.c
+++ b/src/api/signal.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Christopher J. Morrone <morrone2@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -75,7 +75,7 @@ static int _terminate_batch_script_step(
* IN signal - signal number
* RET 0 on success, otherwise return -1 and set errno to indicate the error
*/
-extern int
+extern int
slurm_signal_job (uint32_t job_id, uint16_t signal)
{
int rc = SLURM_SUCCESS;
@@ -83,7 +83,7 @@ slurm_signal_job (uint32_t job_id, uint16_t signal)
signal_job_msg_t rpc;
if (slurm_allocation_lookup_lite(job_id, &alloc_info)) {
- rc = slurm_get_errno();
+ rc = slurm_get_errno();
goto fail1;
}
@@ -91,7 +91,7 @@ slurm_signal_job (uint32_t job_id, uint16_t signal)
rpc.job_id = job_id;
rpc.signal = (uint32_t)signal;
- rc = _local_send_recv_rc_msgs(alloc_info->node_list,
+ rc = _local_send_recv_rc_msgs(alloc_info->node_list,
REQUEST_SIGNAL_JOB, &rpc);
slurm_free_resource_allocation_response_msg(alloc_info);
fail1:
@@ -110,7 +110,7 @@ fail1:
* IN signal - signal number
* RET 0 on success, otherwise return -1 and set errno to indicate the error
*/
-extern int
+extern int
slurm_signal_job_step (uint32_t job_id, uint32_t step_id, uint16_t signal)
{
resource_allocation_response_msg_t *alloc_info = NULL;
@@ -138,7 +138,7 @@ slurm_signal_job_step (uint32_t job_id, uint32_t step_id, uint16_t signal)
* Otherwise, look through the list of job step info and find
* the one matching step_id. Signal that step.
*/
- rc = slurm_get_job_steps((time_t)0, job_id, step_id,
+ rc = slurm_get_job_steps((time_t)0, job_id, step_id,
&step_info, SHOW_ALL);
if (rc != 0) {
save_errno = errno;
@@ -160,8 +160,8 @@ fail:
return rc ? -1 : 0;
}
-static int
-_local_send_recv_rc_msgs(const char *nodelist, slurm_msg_type_t type,
+static int
+_local_send_recv_rc_msgs(const char *nodelist, slurm_msg_type_t type,
void *data)
{
List ret_list = NULL;
@@ -201,7 +201,7 @@ _signal_job_step(const job_step_info_t *step,
rpc.job_id = step->job_id;
rpc.job_step_id = step->step_id;
rpc.signal = (uint32_t)signal;
- rc = _local_send_recv_rc_msgs(allocation->node_list,
+ rc = _local_send_recv_rc_msgs(allocation->node_list,
REQUEST_SIGNAL_TASKS, &rpc);
return rc;
}
@@ -228,7 +228,7 @@ static int _signal_batch_script_step(
msg.data = &rpc;
if(slurm_conf_get_addr(name, &msg.address) == SLURM_ERROR) {
error("_signal_batch_script_step: "
- "can't find address for host %s, check slurm.conf",
+ "can't find address for host %s, check slurm.conf",
name);
free(name);
return -1;
@@ -249,7 +249,7 @@ static int _signal_batch_script_step(
* IN job_id - the job's id
* RET 0 on success, otherwise return -1 and set errno to indicate the error
*/
-extern int
+extern int
slurm_terminate_job (uint32_t job_id)
{
int rc = SLURM_SUCCESS;
@@ -257,14 +257,14 @@ slurm_terminate_job (uint32_t job_id)
signal_job_msg_t rpc;
if (slurm_allocation_lookup_lite(job_id, &alloc_info)) {
- rc = slurm_get_errno();
+ rc = slurm_get_errno();
goto fail1;
}
/* same remote procedure call for each node */
rpc.job_id = job_id;
rpc.signal = (uint32_t)-1; /* not used by slurmd */
- rc = _local_send_recv_rc_msgs(alloc_info->node_list,
+ rc = _local_send_recv_rc_msgs(alloc_info->node_list,
REQUEST_TERMINATE_JOB, &rpc);
slurm_free_resource_allocation_response_msg(alloc_info);
@@ -287,7 +287,7 @@ fail1:
* to terminate a job's batch script
* RET 0 on success, otherwise return -1 and set errno to indicate the error
*/
-extern int
+extern int
slurm_terminate_job_step (uint32_t job_id, uint32_t step_id)
{
resource_allocation_response_msg_t *alloc_info = NULL;
@@ -299,7 +299,7 @@ slurm_terminate_job_step (uint32_t job_id, uint32_t step_id)
if (slurm_allocation_lookup_lite(job_id, &alloc_info)) {
return -1;
}
-
+
/*
* The controller won't give us info about the batch script job step,
* so we need to handle that seperately.
@@ -315,7 +315,7 @@ slurm_terminate_job_step (uint32_t job_id, uint32_t step_id)
* Otherwise, look through the list of job step info and find
* the one matching step_id. Terminate that step.
*/
- rc = slurm_get_job_steps((time_t)0, job_id, step_id,
+ rc = slurm_get_job_steps((time_t)0, job_id, step_id,
&step_info, SHOW_ALL);
if (rc != 0) {
save_errno = errno;
@@ -357,7 +357,7 @@ _terminate_job_step(const job_step_info_t *step,
rpc.job_id = step->job_id;
rpc.job_step_id = step->step_id;
rpc.signal = (uint32_t)-1; /* not used by slurmd */
- rc = _local_send_recv_rc_msgs(allocation->node_list,
+ rc = _local_send_recv_rc_msgs(allocation->node_list,
REQUEST_TERMINATE_TASKS, &rpc);
if (rc == -1 && errno == ESLURM_ALREADY_DONE) {
rc = 0;
@@ -381,7 +381,7 @@ static int _terminate_batch_script_step(
allocation->node_list);
return -1;
}
-
+
rpc.job_id = allocation->job_id;
rpc.job_step_id = SLURM_BATCH_SCRIPT;
rpc.signal = (uint32_t)-1; /* not used by slurmd */
@@ -392,7 +392,7 @@ static int _terminate_batch_script_step(
if(slurm_conf_get_addr(name, &msg.address) == SLURM_ERROR) {
error("_signal_batch_script_step: "
- "can't find address for host %s, check slurm.conf",
+ "can't find address for host %s, check slurm.conf",
name);
free(name);
return -1;
@@ -406,7 +406,7 @@ static int _terminate_batch_script_step(
}
/*
- * slurm_notify_job - send message to the job's stdout,
+ * slurm_notify_job - send message to the job's stdout,
* usable only by user root
* IN job_id - slurm job_id or 0 for all jobs
* IN message - arbitrary message
@@ -419,7 +419,7 @@ extern int slurm_notify_job (uint32_t job_id, char *message)
job_notify_msg_t req;
slurm_msg_t_init(&msg);
- /*
+ /*
* Request message:
*/
req.job_id = job_id;
diff --git a/src/api/slurm_hostlist.c b/src/api/slurm_hostlist.c
index 16e9fb06b3bffbe7786191b095fc772b6b433002..01fc85e442ce91273a331eb051e1c06d945b86e0 100644
--- a/src/api/slurm_hostlist.c
+++ b/src/api/slurm_hostlist.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>.
* LLNL-CODE-402394.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/api/slurm_pmi.c b/src/api/slurm_pmi.c
index f3c556d5e782bcec99ef73149aa55f13bf2f75e4..a0ab244dba6043af53999384d3d2c9c5da551268 100644
--- a/src/api/slurm_pmi.c
+++ b/src/api/slurm_pmi.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -99,7 +99,7 @@ again: if (gettimeofday(&tv1, NULL)) {
}
/* Verify we are active at the right time. If current time is different
- * from target by more than 15*pmi_time, then start over. If PMI_TIME
+ * from target by more than 15*pmi_time, then start over. If PMI_TIME
* is set appropriately, then srun should have no more than 30 RPCs
* in the queue at one time in the worst case. */
if (gettimeofday(&tv2, NULL))
@@ -113,7 +113,7 @@ again: if (gettimeofday(&tv1, NULL)) {
error_time = delta_time - tot_time;
if (error_time > (15*pmi_time)) { /* too far off */
#if 0
- info("delta=%u tot=%u err=%u",
+ info("delta=%u tot=%u err=%u",
delta_time, tot_time, error_time);
#endif
if ((++retries) <= 2)
@@ -159,7 +159,7 @@ static void _set_pmi_time(void)
}
/* Transmit PMI Keyval space data */
-int slurm_send_kvs_comm_set(struct kvs_comm_set *kvs_set_ptr,
+int slurm_send_kvs_comm_set(struct kvs_comm_set *kvs_set_ptr,
int pmi_rank, int pmi_size)
{
slurm_msg_t msg_send;
@@ -169,19 +169,19 @@ int slurm_send_kvs_comm_set(struct kvs_comm_set *kvs_set_ptr,
return EINVAL;
if ((rc = _get_addr()) != SLURM_SUCCESS)
- return rc;
+ return rc;
_set_pmi_time();
slurm_msg_t_init(&msg_send);
msg_send.address = srun_addr;
msg_send.msg_type = PMI_KVS_PUT_REQ;
msg_send.data = (void *) kvs_set_ptr;
-
+
/* Send the RPC to the local srun communcation manager.
- * Since the srun can be sent thousands of messages at
- * the same time and refuse some connections, retry as
- * needed. Spread out messages by task's rank. Also
- * increase the timeout if many tasks since the srun
+ * Since the srun can be sent thousands of messages at
+ * the same time and refuse some connections, retry as
+ * needed. Spread out messages by task's rank. Also
+ * increase the timeout if many tasks since the srun
* command is very overloaded.
* We also increase the timeout (default timeout is
* 10 secs). */
@@ -208,7 +208,7 @@ int slurm_send_kvs_comm_set(struct kvs_comm_set *kvs_set_ptr,
}
/* Wait for barrier and get full PMI Keyval space data */
-int slurm_get_kvs_comm_set(struct kvs_comm_set **kvs_set_ptr,
+int slurm_get_kvs_comm_set(struct kvs_comm_set **kvs_set_ptr,
int pmi_rank, int pmi_size)
{
int rc, srun_fd, retries = 0, timeout = 0;
@@ -243,7 +243,7 @@ int slurm_get_kvs_comm_set(struct kvs_comm_set **kvs_set_ptr,
}
/* hostname is not set here, so slurm_get_addr fails
slurm_get_addr(&slurm_addr, &port, hostname, sizeof(hostname)); */
- port = ntohs(slurm_addr.sin_port);
+ port = ntohs(slurm_addr.sin_port);
if ((env_pmi_ifhn = getenv("SLURM_PMI_RESP_IFHN"))) {
strncpy(hostname, env_pmi_ifhn, sizeof(hostname));
hostname[sizeof(hostname)-1] = 0;
@@ -261,11 +261,11 @@ int slurm_get_kvs_comm_set(struct kvs_comm_set **kvs_set_ptr,
msg_send.data = &data;
/* Send the RPC to the local srun communcation manager.
- * Since the srun can be sent thousands of messages at
- * the same time and refuse some connections, retry as
+ * Since the srun can be sent thousands of messages at
+ * the same time and refuse some connections, retry as
* needed. Wait until all key-pairs have been sent by
* all tasks then spread out messages by task's rank.
- * Also increase the message timeout if many tasks
+ * Also increase the message timeout if many tasks
* since the srun command can get very overloaded (the
* default timeout is 10 secs).
*/
@@ -308,7 +308,7 @@ int slurm_get_kvs_comm_set(struct kvs_comm_set **kvs_set_ptr,
}
if(msg_rcv.auth_cred)
(void)g_slurm_auth_destroy(msg_rcv.auth_cred);
-
+
if (msg_rcv.msg_type != PMI_KVS_GET_RESP) {
error("slurm_get_kvs_comm_set msg_type=%d", msg_rcv.msg_type);
slurm_close_accepted_conn(srun_fd);
@@ -316,7 +316,7 @@ int slurm_get_kvs_comm_set(struct kvs_comm_set **kvs_set_ptr,
}
if (slurm_send_rc_msg(&msg_rcv, SLURM_SUCCESS) < 0)
error("slurm_send_rc_msg: %m");
-
+
slurm_close_accepted_conn(srun_fd);
*kvs_set_ptr = msg_rcv.data;
@@ -325,7 +325,7 @@ int slurm_get_kvs_comm_set(struct kvs_comm_set **kvs_set_ptr,
}
/* Forward keypair info to other tasks as required.
- * Clear message forward structure upon completion.
+ * Clear message forward structure upon completion.
* The messages are forwarded sequentially. */
static int _forward_comm_set(struct kvs_comm_set *kvs_set_ptr)
{
diff --git a/src/api/slurm_pmi.h b/src/api/slurm_pmi.h
index 675fbfae99e162ea1b7244c6dee11c611fb8fd2a..9aed20405f4db0e02c8cc784418ad1033e06b2f0 100644
--- a/src/api/slurm_pmi.h
+++ b/src/api/slurm_pmi.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -83,7 +83,7 @@ int slurm_send_kvs_comm_set(struct kvs_comm_set *kvs_set_ptr,
int pmi_rank, int pmi_size);
/* Wait for barrier and get full PMI Keyval space data */
-int slurm_get_kvs_comm_set(struct kvs_comm_set **kvs_set_ptr,
+int slurm_get_kvs_comm_set(struct kvs_comm_set **kvs_set_ptr,
int pmi_rank, int pmi_size);
/* Free kvs_comm_set returned by slurm_get_kvs_comm_set() */
diff --git a/src/api/step_ctx.c b/src/api/step_ctx.c
index d956f4dd6bb2b8e3d166d6339e64712defc81ae7..19afd405622a251c3a9775284ea0acab769c6bc8 100644
--- a/src/api/step_ctx.c
+++ b/src/api/step_ctx.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -93,7 +93,7 @@ _job_fake_cred(struct slurm_step_ctx_struct *ctx)
static job_step_create_request_msg_t *_create_step_request(
const slurm_step_ctx_params_t *step_params)
{
- job_step_create_request_msg_t *step_req =
+ job_step_create_request_msg_t *step_req =
xmalloc(sizeof(job_step_create_request_msg_t));
step_req->job_id = step_params->job_id;
step_req->user_id = (uint32_t)step_params->uid;
@@ -120,7 +120,7 @@ static job_step_create_request_msg_t *_create_step_request(
}
/*
- * slurm_step_ctx_create - Create a job step and its context.
+ * slurm_step_ctx_create - Create a job step and its context.
* IN step_params - job step parameters
* RET the step context or NULL on failure with slurm errno set
* NOTE: Free allocated memory using slurm_step_ctx_destroy.
@@ -134,7 +134,7 @@ slurm_step_ctx_create (const slurm_step_ctx_params_t *step_params)
int sock = -1;
short port = 0;
int errnum = 0;
-
+
/* First copy the user's step_params into a step request
* struct */
step_req = _create_step_request(step_params);
@@ -158,7 +158,7 @@ slurm_step_ctx_create (const slurm_step_ctx_params_t *step_params)
slurm_free_job_step_create_request_msg(step_req);
goto fail;
}
-
+
ctx = xmalloc(sizeof(struct slurm_step_ctx_struct));
ctx->launch_state = NULL;
ctx->magic = STEP_CTX_MAGIC;
@@ -177,7 +177,7 @@ fail:
/*
* slurm_step_ctx_create_no_alloc - Create a job step and its context without
- * getting an allocation.
+ * getting an allocation.
* IN step_params - job step parameters
* IN step_id - since we are faking it give me the id to use
* RET the step context or NULL on failure with slurm errno set
@@ -194,7 +194,7 @@ slurm_step_ctx_create_no_alloc (const slurm_step_ctx_params_t *step_params,
short port = 0;
int errnum = 0;
int cyclic = (step_params->task_dist == SLURM_DIST_CYCLIC);
-
+
/* First copy the user's step_params into a step request struct */
step_req = _create_step_request(step_params);
@@ -216,16 +216,16 @@ slurm_step_ctx_create_no_alloc (const slurm_step_ctx_params_t *step_params,
xmalloc(sizeof(job_step_create_response_msg_t));
step_resp->step_layout = fake_slurm_step_layout_create(
- step_req->node_list,
+ step_req->node_list,
NULL, NULL,
step_req->node_count,
step_req->num_tasks);
-
+
if (switch_alloc_jobinfo(&step_resp->switch_job) < 0)
fatal("switch_alloc_jobinfo: %m");
- if (switch_build_jobinfo(step_resp->switch_job,
- step_resp->step_layout->node_list,
- step_resp->step_layout->tasks,
+ if (switch_build_jobinfo(step_resp->switch_job,
+ step_resp->step_layout->node_list,
+ step_resp->step_layout->tasks,
cyclic, step_req->network) < 0)
fatal("switch_build_jobinfo: %m");
@@ -244,9 +244,9 @@ slurm_step_ctx_create_no_alloc (const slurm_step_ctx_params_t *step_params,
ctx->launch_state = step_launch_state_create(ctx);
ctx->launch_state->slurmctld_socket_fd = sock;
-
+
_job_fake_cred(ctx);
-
+
fail:
errno = errnum;
return (slurm_step_ctx_t *)ctx;
@@ -272,7 +272,7 @@ slurm_step_ctx_get (slurm_step_ctx_t *ctx, int ctx_key, ...)
switch_jobinfo_t **switch_job;
int *int_ptr;
int **int_array_pptr = (int **) NULL;
-
+
if ((ctx == NULL) || (ctx->magic != STEP_CTX_MAGIC)) {
slurm_seterrno(EINVAL);
return SLURM_ERROR;
@@ -292,7 +292,7 @@ slurm_step_ctx_get (slurm_step_ctx_t *ctx, int ctx_key, ...)
uint16_array_pptr = (uint16_t **) va_arg(ap, void *);
*uint16_array_pptr = ctx->step_resp->step_layout->tasks;
break;
-
+
case SLURM_STEP_CTX_TID:
node_inx = va_arg(ap, uint32_t);
if ((node_inx < 0)
@@ -305,9 +305,9 @@ slurm_step_ctx_get (slurm_step_ctx_t *ctx, int ctx_key, ...)
*uint32_array_pptr =
ctx->step_resp->step_layout->tids[node_inx];
break;
-
+
case SLURM_STEP_CTX_RESP:
- step_resp_pptr = (job_step_create_response_msg_t **)
+ step_resp_pptr = (job_step_create_response_msg_t **)
va_arg(ap, void *);
*step_resp_pptr = ctx->step_resp;
break;
@@ -430,9 +430,9 @@ slurm_step_ctx_daemon_per_node_hack(slurm_step_ctx_t *ctx)
new_layout->task_cnt = old_layout->node_cnt;
new_layout->node_list = xstrdup(old_layout->node_list);
slurm_step_layout_destroy(old_layout);
- new_layout->tasks = (uint16_t *) xmalloc(sizeof(uint16_t) *
+ new_layout->tasks = (uint16_t *) xmalloc(sizeof(uint16_t) *
new_layout->node_cnt);
- new_layout->tids = (uint32_t **) xmalloc(sizeof(uint32_t *) *
+ new_layout->tids = (uint32_t **) xmalloc(sizeof(uint32_t *) *
new_layout->node_cnt);
for (i = 0; i < new_layout->node_cnt; i++) {
new_layout->tasks[i] = 1;
@@ -449,7 +449,7 @@ slurm_step_ctx_daemon_per_node_hack(slurm_step_ctx_t *ctx)
return SLURM_SUCCESS;
}
-/*
+/*
* slurm_step_ctx_params_t_init - This initializes parameters
* in the structure that you will pass to slurm_step_ctx_create().
* This function will NOT allocate any new memory.
diff --git a/src/api/step_ctx.h b/src/api/step_ctx.h
index 8ecd26597890712d5324ba5d26246c391ff85812..f934d992218b1cc38cc25b43243299950b36d566 100644
--- a/src/api/step_ctx.h
+++ b/src/api/step_ctx.h
@@ -8,21 +8,21 @@
* Written by Morris Jette <jette1@llnl.gov>,
* Christopher J. Morrone <morrone2@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/src/api/step_io.c b/src/api/step_io.c
index d6beed561bf82febaec84b9decb8f9b2114b2856..8c41632894585f0f029c56a0c124458499aa9134 100644
--- a/src/api/step_io.c
+++ b/src/api/step_io.c
@@ -6,21 +6,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <grondona@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -123,7 +123,7 @@ struct server_io_info {
bool in_eof;
int remote_stdout_objs; /* active eio_obj_t's on the remote node */
int remote_stderr_objs; /* active eio_obj_t's on the remote node */
-
+
/* outgoing variables */
List msg_queue;
struct io_buf *out_msg;
@@ -181,7 +181,7 @@ struct file_read_info {
/**********************************************************************
* Listening socket functions
**********************************************************************/
-static bool
+static bool
_listening_socket_readable(eio_obj_t *obj)
{
debug3("Called _listening_socket_readable");
@@ -211,7 +211,7 @@ static void
_set_listensocks_nonblocking(client_io_t *cio)
{
int i;
- for (i = 0; i < cio->num_listen; i++)
+ for (i = 0; i < cio->num_listen; i++)
fd_set_nonblocking(cio->listensock[i]);
}
@@ -244,7 +244,7 @@ _create_server_eio_obj(int fd, client_io_t *cio, int nodeid,
return eio;
}
-static bool
+static bool
_server_readable(eio_obj_t *obj)
{
struct server_io_info *s = (struct server_io_info *) obj->arg;
@@ -265,7 +265,7 @@ _server_readable(eio_obj_t *obj)
s->testing_connection) {
debug4("remote_stdout_objs = %d", s->remote_stdout_objs);
debug4("remote_stderr_objs = %d", s->remote_stderr_objs);
- return true;
+ return true;
}
if (obj->shutdown) {
@@ -302,7 +302,7 @@ _server_read(eio_obj_t *obj, List objs)
n = io_hdr_read_fd(obj->fd, &s->header);
if (n <= 0) { /* got eof or error on socket read */
if (s->cio->sls)
- step_launch_notify_io_failure(s->cio->sls,
+ step_launch_notify_io_failure(s->cio->sls,
s->node_id);
debug3("got error or unexpected eof "
"on _server_read header");
@@ -378,7 +378,7 @@ _server_read(eio_obj_t *obj, List objs)
else {
debug3("***** passing on eof message");
}
-
+
/*
* Route the message to the proper output
*/
@@ -404,7 +404,7 @@ _server_read(eio_obj_t *obj, List objs)
return SLURM_SUCCESS;
}
-static bool
+static bool
_server_writable(eio_obj_t *obj)
{
struct server_io_info *s = (struct server_io_info *) obj->arg;
@@ -449,13 +449,13 @@ _server_write(eio_obj_t *obj, List objs)
debug3("_server_write: nothing in the queue");
return SLURM_SUCCESS;
}
- debug3(" dequeue successful, s->out_msg->length = %d",
+ debug3(" dequeue successful, s->out_msg->length = %d",
s->out_msg->length);
s->out_remaining = s->out_msg->length;
}
- debug3(" s->out_remaining = %d", s->out_remaining);
-
+ debug3(" s->out_remaining = %d", s->out_remaining);
+
/*
* Write message to socket.
*/
@@ -470,7 +470,7 @@ again:
} else {
error("_server_write write failed: %m");
if (s->cio->sls)
- step_launch_notify_io_failure(s->cio->sls,
+ step_launch_notify_io_failure(s->cio->sls,
s->node_id);
s->out_eof = true;
/* FIXME - perhaps we should free the message here? */
@@ -557,7 +557,7 @@ static int _file_write(eio_obj_t *obj, List objs)
}
info->out_remaining = info->out_msg->length;
}
-
+
/*
* Write message to file.
*/
@@ -802,7 +802,7 @@ _read_io_init_msg(int fd, client_io_t *cio, char *host)
goto fail;
}
if (io_init_msg_validate(&msg, cio->io_key) < 0) {
- goto fail;
+ goto fail;
}
if (msg.nodeid >= cio->num_nodes) {
error ("Invalid nodeid %d from %s", msg.nodeid, host);
@@ -845,7 +845,7 @@ _read_io_init_msg(int fd, client_io_t *cio, char *host)
}
-static bool
+static bool
_is_fd_ready(int fd)
{
struct pollfd pfd[1];
@@ -872,8 +872,8 @@ _handle_io_init_msg(int fd, client_io_t *cio)
struct sockaddr_in *sin;
socklen_t size = sizeof(addr);
char buf[INET_ADDRSTRLEN];
-
- /*
+
+ /*
* Return early if fd is not now ready
*/
if (!_is_fd_ready(fd))
@@ -884,7 +884,7 @@ _handle_io_init_msg(int fd, client_io_t *cio)
continue;
if (errno == EAGAIN) /* No more connections */
return;
- if ((errno == ECONNABORTED) ||
+ if ((errno == ECONNABORTED) ||
(errno == EWOULDBLOCK)) {
return;
}
@@ -895,11 +895,11 @@ _handle_io_init_msg(int fd, client_io_t *cio)
sin = (struct sockaddr_in *) &addr;
inet_ntop(AF_INET, &sin->sin_addr, buf, INET_ADDRSTRLEN);
- debug3("Accepted IO connection: ip=%s sd=%d", buf, sd);
+ debug3("Accepted IO connection: ip=%s sd=%d", buf, sd);
/*
* On AIX the new socket [sd] seems to inherit the O_NONBLOCK
- * flag from the listening socket [fd], so we need to
+ * flag from the listening socket [fd], so we need to
* explicitly set it back to blocking mode.
* (XXX: This should eventually be fixed by making
* reads of IO headers nonblocking)
@@ -1243,7 +1243,7 @@ client_io_handler_abort(client_io_t *cio)
}
-int client_io_handler_send_test_message(client_io_t *cio, int node_id,
+int client_io_handler_send_test_message(client_io_t *cio, int node_id,
bool *sent_message)
{
struct io_buf *msg;
@@ -1258,8 +1258,8 @@ int client_io_handler_send_test_message(client_io_t *cio, int node_id,
*sent_message = false;
/* In this case, the I/O connection has not yet been established.
- A problem might go undetected here, if a task appears to get
- launched correctly, but fails before it can make its I/O
+ A problem might go undetected here, if a task appears to get
+ launched correctly, but fails before it can make its I/O
connection. TODO: Set a timer, see if the task has checked in
within some timeout, and abort the job if not. */
if (cio->ioserver[node_id] == NULL) {
@@ -1272,7 +1272,7 @@ int client_io_handler_send_test_message(client_io_t *cio, int node_id,
goto done;
}
- /*
+ /*
* enqueue a test message, which would be ignored by the slurmstepd
*/
header.type = SLURM_IO_CONNECTION_TEST;
diff --git a/src/api/step_io.h b/src/api/step_io.h
index 370a6d9c1d138d09cc3f9356eb0c0a3e3a6406a7..0082489b496c9369a2e4d2e80329854ac336e305 100644
--- a/src/api/step_io.h
+++ b/src/api/step_io.h
@@ -6,21 +6,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Christopher J. Morrone <morrone2@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -55,10 +55,10 @@ struct client_io {
uint16_t *listenport; /* Array of stdio listen port numbers */
eio_handle_t *eio; /* Event IO handle for stdio traffic */
- pthread_mutex_t ioservers_lock; /* This lock protects
- ioservers_ready_bits, ioservers_ready,
+ pthread_mutex_t ioservers_lock; /* This lock protects
+ ioservers_ready_bits, ioservers_ready,
pointers in ioserver, all the msg_queues
- in each ioserver's server_io_info, and
+ in each ioserver's server_io_info, and
the free_incoming list. The queues
are used both for normal writes
and writes that verify a connection to
@@ -124,12 +124,12 @@ void client_io_handler_downnodes(client_io_t *cio,
const int *node_ids, int num_node_ids);
/*
- * Tell the client IO handler to test the communication path to a
+ * Tell the client IO handler to test the communication path to a
* node suspected to be down by sending a message, which will be
* ignored by the slurmstepd. If the write fails the step_launch_state
* will be notified.
*/
-int client_io_handler_send_test_message(client_io_t *cio, int node_id,
+int client_io_handler_send_test_message(client_io_t *cio, int node_id,
bool *sent_message);
/*
diff --git a/src/api/step_launch.c b/src/api/step_launch.c
index fa29fa3c20da12a2a80a3c5bbd589e309e0e0e7f..2ae2402da62cfc8b1094f437d494a108726b0b54 100644
--- a/src/api/step_launch.c
+++ b/src/api/step_launch.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Christopher J. Morrone <morrone2@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -120,7 +120,7 @@ static struct io_operations message_socket_ops = {
* API functions
**********************************************************************/
-/*
+/*
* slurm_step_launch_params_t_init - initialize a user-allocated
* slurm_step_launch_params_t structure with default values.
* This function will NOT allocate any new memory.
@@ -215,7 +215,7 @@ int slurm_step_launch (slurm_step_ctx_t *ctx,
env_array_merge(&env, (const char **)params->env);
}
env_array_for_step(&env, ctx->step_resp,
- ctx->launch_state->resp_port[0],
+ ctx->launch_state->resp_port[0],
params->preserve_env);
env_array_merge(&env, (const char **)mpi_env);
env_array_free(mpi_env);
@@ -246,7 +246,7 @@ int slurm_step_launch (slurm_step_ctx_t *ctx,
launch.acctg_freq = params->acctg_freq;
launch.open_mode = params->open_mode;
launch.options = job_options_create();
- launch.complete_nodelist =
+ launch.complete_nodelist =
xstrdup(ctx->step_resp->step_layout->node_list);
spank_set_remote_options (launch.options);
launch.task_flags = 0;
@@ -256,10 +256,10 @@ int slurm_step_launch (slurm_step_ctx_t *ctx,
launch.tasks_to_launch = ctx->step_resp->step_layout->tasks;
launch.cpus_allocated = ctx->step_resp->step_layout->tasks;
launch.global_task_ids = ctx->step_resp->step_layout->tids;
-
+
launch.user_managed_io = params->user_managed_io ? 1 : 0;
ctx->launch_state->user_managed_io = params->user_managed_io;
-
+
if (!ctx->launch_state->user_managed_io) {
launch.ofname = params->remote_output_filename;
launch.efname = params->remote_error_filename;
@@ -280,7 +280,7 @@ int slurm_step_launch (slurm_step_ctx_t *ctx,
to notify it of I/O errors. */
ctx->launch_state->io.normal->sls = ctx->launch_state;
- if (client_io_handler_start(ctx->launch_state->io.normal)
+ if (client_io_handler_start(ctx->launch_state->io.normal)
!= SLURM_SUCCESS) {
rc = SLURM_ERROR;
goto fail1;
@@ -291,7 +291,7 @@ int slurm_step_launch (slurm_step_ctx_t *ctx,
launch.io_port[i] =
ctx->launch_state->io.normal->listenport[i];
}
- /* If the io timeout is > 0, create a flag to ping the stepds
+ /* If the io timeout is > 0, create a flag to ping the stepds
if io_timeout seconds pass without stdio traffic to/from
the node. */
ctx->launch_state->io_timeout = slurm_get_msg_timeout();
@@ -415,7 +415,7 @@ void slurm_step_launch_wait_finish(slurm_step_ctx_t *ctx)
if (errnum == ETIMEDOUT) {
error("Timed out waiting for job step to "
"complete");
- /*
+ /*
* Send kill again, in case steps were still
* launching the first time.
* FIXME - eventually the slurmd should
@@ -450,9 +450,9 @@ void slurm_step_launch_wait_finish(slurm_step_ctx_t *ctx)
/* task_exit_signal != 0 when srun receives a message that a task
exited with a SIGTERM or SIGKILL. Without this test, a hang in srun
might occur when a node gets a hard power failure, and TCP does not
- indicate that the I/O connection closed. The I/O thread could
+ indicate that the I/O connection closed. The I/O thread could
block waiting for an EOF message, even though the remote process
- has died. In this case, use client_io_handler_abort to force the
+ has died. In this case, use client_io_handler_abort to force the
I/O thread to stop listening for stdout or stderr and shutdown.*/
if (task_exit_signal && !sls->user_managed_io) {
client_io_handler_abort(sls->io.normal);
@@ -503,8 +503,8 @@ void slurm_step_launch_abort(slurm_step_ctx_t *ctx)
pthread_cond_broadcast(&sls->cond);
}
-/*
- * Forward a signal to all those nodes with running tasks
+/*
+ * Forward a signal to all those nodes with running tasks
*/
void slurm_step_launch_fwd_signal(slurm_step_ctx_t *ctx, int signo)
{
@@ -519,21 +519,21 @@ void slurm_step_launch_fwd_signal(slurm_step_ctx_t *ctx, int signo)
ret_data_info_t *ret_data_info = NULL;
int rc = SLURM_SUCCESS;
struct step_launch_state *sls = ctx->launch_state;
-
+
debug2("forward signal %d to job %u", signo, ctx->job_id);
/* common to all tasks */
msg.job_id = ctx->job_id;
msg.job_step_id = ctx->step_resp->job_step_id;
msg.signal = (uint32_t) signo;
-
+
pthread_mutex_lock(&sls->lock);
-
+
hl = hostlist_create("");
for (node_id = 0;
node_id < ctx->step_resp->step_layout->node_cnt;
node_id++) {
- active = 0;
+ active = 0;
num_tasks = sls->layout->tasks[node_id];
for (j = 0; j < num_tasks; j++) {
if(bit_test(sls->tasks_started,
@@ -545,17 +545,17 @@ void slurm_step_launch_fwd_signal(slurm_step_ctx_t *ctx, int signo)
break;
}
}
-
+
if (!active)
continue;
-
+
name = nodelist_nth_host(sls->layout->node_list, node_id);
hostlist_push(hl, name);
free(name);
}
pthread_mutex_unlock(&sls->lock);
-
+
if(!hostlist_count(hl)) {
hostlist_destroy(hl);
goto nothing_left;
@@ -563,32 +563,32 @@ void slurm_step_launch_fwd_signal(slurm_step_ctx_t *ctx, int signo)
hostlist_ranged_string(hl, sizeof(buf), buf);
hostlist_destroy(hl);
name = xstrdup(buf);
-
- slurm_msg_t_init(&req);
+
+ slurm_msg_t_init(&req);
req.msg_type = REQUEST_SIGNAL_TASKS;
req.data = &msg;
-
- debug3("sending signal %d to job %u on host %s",
+
+ debug3("sending signal %d to job %u on host %s",
signo, ctx->job_id, name);
-
- if (!(ret_list = slurm_send_recv_msgs(name, &req, 0, false))) {
+
+ if (!(ret_list = slurm_send_recv_msgs(name, &req, 0, false))) {
error("fwd_signal: slurm_send_recv_msgs really failed bad");
xfree(name);
return;
}
xfree(name);
- itr = list_iterator_create(ret_list);
+ itr = list_iterator_create(ret_list);
while((ret_data_info = list_next(itr))) {
- rc = slurm_get_return_code(ret_data_info->type,
+ rc = slurm_get_return_code(ret_data_info->type,
ret_data_info->data);
/*
- * Report error unless it is "Invalid job id" which
+ * Report error unless it is "Invalid job id" which
* probably just means the tasks exited in the meanwhile.
*/
if ((rc != 0) && (rc != ESLURM_INVALID_JOB_ID)
&& (rc != ESLURMD_JOB_NOTRUNNING) && (rc != ESRCH)) {
- error("%s: signal: %s",
- ret_data_info->node_name,
+ error("%s: signal: %s",
+ ret_data_info->node_name,
slurm_strerror(rc));
}
}
@@ -596,7 +596,7 @@ void slurm_step_launch_fwd_signal(slurm_step_ctx_t *ctx, int signo)
list_destroy(ret_list);
nothing_left:
debug2("All tasks have been signalled");
-
+
}
/**********************************************************************
@@ -715,7 +715,7 @@ static int _cr_notify_step_launch(slurm_step_ctx_t *ctx)
rc = -1;
goto out;
}
- if (write(fd, &ctx->step_resp->job_step_id, sizeof(uint32_t)) !=
+ if (write(fd, &ctx->step_resp->job_step_id, sizeof(uint32_t)) !=
sizeof(uint32_t)) {
error("failed writing job_step_id to srun_cr: %m");
rc = -1;
@@ -727,7 +727,7 @@ static int _cr_notify_step_launch(slurm_step_ctx_t *ctx)
rc = -1;
goto out;
}
- if (write(fd, ctx->step_resp->step_layout->node_list, len + 1) !=
+ if (write(fd, ctx->step_resp->step_layout->node_list, len + 1) !=
(len + 1)) {
error("failed writing nodelist to srun_cr: %m");
rc = -1;
@@ -773,7 +773,7 @@ static int _msg_thr_create(struct step_launch_state *sls, int num_nodes)
sls->resp_port = xmalloc(sizeof(uint16_t) * sls->num_resp_port);
/* multiple jobs (easily induced via no_alloc) and highly
- * parallel jobs using PMI sometimes result in slow message
+ * parallel jobs using PMI sometimes result in slow message
* responses and timeouts. Raise the default timeout for srun. */
if(!message_socket_ops.timeout)
message_socket_ops.timeout = slurm_get_msg_timeout() * 8000;
@@ -800,7 +800,7 @@ static int _msg_thr_create(struct step_launch_state *sls, int num_nodes)
if (pthread_create(&sls->msg_thread, &attr,
_msg_thr_internal, (void *)sls) != 0) {
error("pthread_create of message thread: %m");
-
+
rc = SLURM_ERROR;
}
slurm_attr_destroy(&attr);
@@ -817,8 +817,8 @@ _launch_handler(struct step_launch_state *sls, slurm_msg_t *resp)
if (msg->return_code) {
for (i = 0; i < msg->count_of_pids; i++) {
- error("task %u launch failed: %s",
- msg->task_ids[i],
+ error("task %u launch failed: %s",
+ msg->task_ids[i],
slurm_strerror(msg->return_code));
bit_set(sls->tasks_started, msg->task_ids[i]);
bit_set(sls->tasks_exited, msg->task_ids[i]);
@@ -835,20 +835,20 @@ _launch_handler(struct step_launch_state *sls, slurm_msg_t *resp)
}
-static void
+static void
_exit_handler(struct step_launch_state *sls, slurm_msg_t *exit_msg)
{
task_exit_msg_t *msg = (task_exit_msg_t *) exit_msg->data;
int i;
- if ((msg->job_id != sls->mpi_info->jobid) ||
+ if ((msg->job_id != sls->mpi_info->jobid) ||
(msg->step_id != sls->mpi_info->stepid)) {
debug("Received MESSAGE_TASK_EXIT from wrong job: %u.%u",
msg->job_id, msg->step_id);
return;
}
- /* Record SIGTERM and SIGKILL termination codes to
+ /* Record SIGTERM and SIGKILL termination codes to
* recognize abnormal termination */
if (WIFSIGNALED(msg->return_code)) {
i = WTERMSIG(msg->return_code);
@@ -870,12 +870,12 @@ _exit_handler(struct step_launch_state *sls, slurm_msg_t *exit_msg)
pthread_mutex_unlock(&sls->lock);
}
-static void
+static void
_job_complete_handler(struct step_launch_state *sls, slurm_msg_t *complete_msg)
{
- srun_job_complete_msg_t *step_msg =
+ srun_job_complete_msg_t *step_msg =
(srun_job_complete_msg_t *) complete_msg->data;
-
+
if (step_msg->step_id == NO_VAL) {
verbose("Complete job %u received",
step_msg->job_id);
@@ -891,7 +891,7 @@ _job_complete_handler(struct step_launch_state *sls, slurm_msg_t *complete_msg)
pthread_mutex_unlock(&sls->lock);
}
-static void
+static void
_timeout_handler(struct step_launch_state *sls, slurm_msg_t *timeout_msg)
{
/* FIXME: does nothing yet */
@@ -969,7 +969,7 @@ _node_fail_handler(struct step_launch_state *sls, slurm_msg_t *fail_msg)
/*
* Receive a message when a slurmd cold starts, that the step on that node
- * may have died. Verify that tasks on these nodes(s) are still alive,
+ * may have died. Verify that tasks on these nodes(s) are still alive,
* and abort the job step if they are not.
* This message could be the result of the slurmd daemon cold-starting
* or a race condition when tasks are starting or terminating.
@@ -989,14 +989,14 @@ _step_missing_handler(struct step_launch_state *sls, slurm_msg_t *missing_msg)
int num_tasks;
bool active;
- debug("Step %u.%u missing from node(s) %s",
+ debug("Step %u.%u missing from node(s) %s",
step_missing->job_id, step_missing->step_id,
step_missing->nodelist);
- /* Ignore this message in the unusual "user_managed_io" case. No way
- to confirm a bad connection, since a test message goes straight to
- the task. Aborting without checking may be too dangerous. This
- choice may cause srun to not exit even though the job step has
+ /* Ignore this message in the unusual "user_managed_io" case. No way
+ to confirm a bad connection, since a test message goes straight to
+ the task. Aborting without checking may be too dangerous. This
+ choice may cause srun to not exit even though the job step has
ended. */
if (sls->user_managed_io)
return;
@@ -1005,13 +1005,13 @@ _step_missing_handler(struct step_launch_state *sls, slurm_msg_t *missing_msg)
if (!sls->io_timeout_thread_created) {
if (_start_io_timeout_thread(sls)) {
- /*
+ /*
* Should I abort here, because of the inability to
* make a thread to verify the connection?
*/
error("Cannot create thread to verify I/O "
"connections.");
-
+
sls->abort = true;
pthread_cond_broadcast(&sls->cond);
pthread_mutex_unlock(&sls->lock);
@@ -1077,10 +1077,10 @@ _step_missing_handler(struct step_launch_state *sls, slurm_msg_t *missing_msg)
sls->io_deadline[node_id] = time(NULL) + sls->io_timeout;
debug("Testing connection to node %d", node_id);
- if (client_io_handler_send_test_message(cio, node_id,
+ if (client_io_handler_send_test_message(cio, node_id,
&test_message_sent)) {
/*
- * If unable to test a connection, assume the step
+ * If unable to test a connection, assume the step
* is having problems and abort. If unable to test,
* the system is probably having serious problems, so
* aborting the step seems reasonable.
@@ -1162,9 +1162,9 @@ _handle_msg(void *arg, slurm_msg_t *msg)
uid_t uid = getuid();
srun_user_msg_t *um;
int rc;
-
+
if ((req_uid != slurm_uid) && (req_uid != 0) && (req_uid != uid)) {
- error ("Security violation, slurm message from uid %u",
+ error ("Security violation, slurm message from uid %u",
(unsigned int) req_uid);
return;
}
@@ -1266,10 +1266,10 @@ static int _fail_step_tasks(slurm_step_ctx_t *ctx, char *node, int ret_code)
slurm_msg_t_init(&req);
req.msg_type = REQUEST_STEP_COMPLETE;
req.data = &msg;
-
+
if (slurm_send_recv_controller_rc_msg(&req, &rc) < 0)
return SLURM_ERROR;
-
+
return SLURM_SUCCESS;
}
@@ -1291,7 +1291,7 @@ static int _launch_tasks(slurm_step_ctx_t *ctx,
int i = 0;
while((name = hostlist_shift(hl))) {
_print_launch_msg(launch_msg, name, i++);
- free(name);
+ free(name);
}
hostlist_destroy(hl);
}
@@ -1299,7 +1299,7 @@ static int _launch_tasks(slurm_step_ctx_t *ctx,
slurm_msg_t_init(&msg);
msg.msg_type = REQUEST_LAUNCH_TASKS;
msg.data = launch_msg;
-
+
if(!(ret_list = slurm_send_recv_msgs(
ctx->step_resp->step_layout->node_list,
&msg, timeout, false))) {
@@ -1308,7 +1308,7 @@ static int _launch_tasks(slurm_step_ctx_t *ctx,
}
ret_itr = list_iterator_create(ret_list);
while ((ret_data = list_next(ret_itr))) {
- rc = slurm_get_return_code(ret_data->type,
+ rc = slurm_get_return_code(ret_data->type,
ret_data->data);
debug("launch returned msg_rc=%d err=%d type=%d",
rc, ret_data->err, ret_data->type);
@@ -1317,7 +1317,7 @@ static int _launch_tasks(slurm_step_ctx_t *ctx,
tot_rc = ret_data->err;
else
tot_rc = rc;
-
+
_fail_step_tasks(ctx, ret_data->node_name, tot_rc);
errno = tot_rc;
@@ -1366,9 +1366,9 @@ static void _print_launch_msg(launch_tasks_request_msg_t *msg,
}
hostlist_ranged_string(hl, 4096, task_list);
hostlist_destroy(hl);
-
- info("launching %u.%u on host %s, %u tasks: %s",
- msg->job_id, msg->job_step_id, hostname,
+
+ info("launching %u.%u on host %s, %u tasks: %s",
+ msg->job_id, msg->job_step_id, hostname,
msg->tasks_to_launch[nodeid], task_list);
debug3("uid:%ld gid:%ld cwd:%s %d", (long) msg->uid,
@@ -1380,7 +1380,7 @@ void record_ppid(void)
srun_ppid = getppid();
}
-/* This is used to initiate an OpenMPI checkpoint program,
+/* This is used to initiate an OpenMPI checkpoint program,
* but is written to be general purpose */
static void
_exec_prog(slurm_msg_t *msg)
@@ -1394,12 +1394,12 @@ _exec_prog(slurm_msg_t *msg)
srun_exec_msg_t *exec_msg = msg->data;
if (exec_msg->argc > 2) {
- verbose("Exec '%s %s' for %u.%u",
+ verbose("Exec '%s %s' for %u.%u",
exec_msg->argv[0], exec_msg->argv[1],
exec_msg->job_id, exec_msg->step_id);
} else {
- verbose("Exec '%s' for %u.%u",
- exec_msg->argv[0],
+ verbose("Exec '%s' for %u.%u",
+ exec_msg->argv[0],
exec_msg->job_id, exec_msg->step_id);
}
@@ -1459,7 +1459,7 @@ _exec_prog(slurm_msg_t *msg)
fini: if (checkpoint) {
now = time(NULL);
if (exit_code) {
- info("Checkpoint completion code %d at %s",
+ info("Checkpoint completion code %d at %s",
exit_code, ctime(&now));
} else {
info("Checkpoint completed successfully at %s",
@@ -1477,7 +1477,7 @@ fini: if (checkpoint) {
* Notify the step_launch_state that an I/O connection went bad.
* If the node is suspected to be down, abort the job.
*/
-int
+int
step_launch_notify_io_failure(step_launch_state_t *sls, int node_id)
{
pthread_mutex_lock(&sls->lock);
@@ -1490,7 +1490,7 @@ step_launch_notify_io_failure(step_launch_state_t *sls, int node_id)
* the _step_missing_handler was called on this node.
*/
if (sls->io_deadline[node_id] != (time_t)NO_VAL) {
- error("Aborting, io error and missing step on node %d",
+ error("Aborting, io error and missing step on node %d",
node_id);
sls->abort = true;
pthread_cond_broadcast(&sls->cond);
@@ -1504,13 +1504,13 @@ step_launch_notify_io_failure(step_launch_state_t *sls, int node_id)
/*
* This is called 1) after a node connects for the first time and 2) when
- * a message comes in confirming that a connection is okay.
+ * a message comes in confirming that a connection is okay.
*
- * Just in case the node was marked questionable very early in the
- * job step setup, clear this flag if/when the node makes its initial
+ * Just in case the node was marked questionable very early in the
+ * job step setup, clear this flag if/when the node makes its initial
* connection.
*/
-int
+int
step_launch_clear_questionable_state(step_launch_state_t *sls, int node_id)
{
pthread_mutex_lock(&sls->lock);
@@ -1569,7 +1569,7 @@ _check_io_timeout(void *_sls)
error( "Cannot communicate with node %d. "
"Aborting job.", ii);
break;
- } else if (next_deadline == (time_t)NO_VAL ||
+ } else if (next_deadline == (time_t)NO_VAL ||
sls->io_deadline[ii] < next_deadline) {
next_deadline = sls->io_deadline[ii];
}
diff --git a/src/api/step_launch.h b/src/api/step_launch.h
index c90d0e8bca52b239167a40fdf3ebb975b9ebaab6..bfef3a10e5c0853a5c5ea5fea8ba781a0856ebd2 100644
--- a/src/api/step_launch.h
+++ b/src/api/step_launch.h
@@ -7,21 +7,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Christopher J. Morrone <morrone2@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -53,8 +53,8 @@ typedef struct {
struct step_launch_state {
/* This lock protects tasks_started, tasks_exited, node_io_error,
- io_deadline, abort, and abort_action_taken. The main thread
- blocks on cond, waking when a tast starts or exits, or the abort
+ io_deadline, abort, and abort_action_taken. The main thread
+ blocks on cond, waking when a tast starts or exits, or the abort
flag is set. */
pthread_mutex_t lock;
pthread_cond_t cond;
@@ -124,8 +124,8 @@ void record_ppid(void);
int step_launch_notify_io_failure(step_launch_state_t *sls, int node_id);
/*
- * Just in case the node was marked questionable very early in the
- * job step setup, clear this flag when the node makes its initial
+ * Just in case the node was marked questionable very early in the
+ * job step setup, clear this flag when the node makes its initial
* connection.
*/
int step_launch_clear_questionable_state(step_launch_state_t *sls, int node_id);
diff --git a/src/api/submit.c b/src/api/submit.c
index 1de73e81087853576edeec22b07001ca28dff785..7529c5cf1188b2e4e6e68eb62e1130b782413ef2 100644
--- a/src/api/submit.c
+++ b/src/api/submit.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -63,7 +63,7 @@ extern pid_t getsid(pid_t pid); /* missing from <unistd.h> */
* RET 0 on success, otherwise return -1 and set errno to indicate the error
*/
int
-slurm_submit_batch_job (job_desc_msg_t *req,
+slurm_submit_batch_job (job_desc_msg_t *req,
submit_response_msg_t **resp )
{
int rc;
@@ -76,7 +76,7 @@ slurm_submit_batch_job (job_desc_msg_t *req,
slurm_msg_t_init(&resp_msg);
- /*
+ /*
* set Node and session id for this request
*/
if (req->alloc_sid == NO_VAL)
@@ -89,7 +89,7 @@ slurm_submit_batch_job (job_desc_msg_t *req,
}
req_msg.msg_type = REQUEST_SUBMIT_BATCH_JOB ;
- req_msg.data = req;
+ req_msg.data = req;
rc = slurm_send_recv_controller_msg(&req_msg, &resp_msg);
@@ -106,7 +106,7 @@ slurm_submit_batch_job (job_desc_msg_t *req,
switch (resp_msg.msg_type) {
case RESPONSE_SLURM_RC:
rc = ((return_code_msg_t *) resp_msg.data)->return_code;
- if (rc)
+ if (rc)
slurm_seterrno_ret(rc);
*resp = NULL;
break;
diff --git a/src/api/suspend.c b/src/api/suspend.c
index 507c8cec72ed08f479eecf79f92dd73c97b8a37a..38559cbaa1812520bd11c30b7a66c0c342698816 100644
--- a/src/api/suspend.c
+++ b/src/api/suspend.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -92,7 +92,7 @@ extern int slurm_resume (uint32_t job_id)
}
/*
- * slurm_requeue - re-queue a batch job, if already running
+ * slurm_requeue - re-queue a batch job, if already running
* then terminate it first
* RET 0 or a slurm error code
*/
diff --git a/src/api/topo_info.c b/src/api/topo_info.c
index 4cfa670a7e421d896283571f84bdd5960bf314f5..17118d959fc172c92527167d3ef8556e883c3bcc 100644
--- a/src/api/topo_info.c
+++ b/src/api/topo_info.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -61,8 +61,8 @@
#include "src/common/xstring.h"
/*
- * slurm_load_topo - issue RPC to get slurm all switch topology configuration
- * information
+ * slurm_load_topo - issue RPC to get slurm all switch topology configuration
+ * information
* IN node_info_msg_pptr - place to store a node configuration pointer
* RET 0 or a slurm error code
* NOTE: free the response using slurm_free_topo_info_msg
@@ -72,23 +72,23 @@ extern int slurm_load_topo(topo_info_response_msg_t **resp)
int rc;
slurm_msg_t req_msg;
slurm_msg_t resp_msg;
-
+
slurm_msg_t_init(&req_msg);
slurm_msg_t_init(&resp_msg);
req_msg.msg_type = REQUEST_TOPO_INFO;
req_msg.data = NULL;
-
+
if (slurm_send_recv_controller_msg(&req_msg, &resp_msg) < 0)
return SLURM_ERROR;
-
+
switch (resp_msg.msg_type) {
case RESPONSE_TOPO_INFO:
*resp = (topo_info_response_msg_t *) resp_msg.data;
break;
case RESPONSE_SLURM_RC:
rc = ((return_code_msg_t *) resp_msg.data)->return_code;
- slurm_free_return_code_msg(resp_msg.data);
- if (rc)
+ slurm_free_return_code_msg(resp_msg.data);
+ if (rc)
slurm_seterrno_ret(rc);
*resp = NULL;
break;
@@ -101,15 +101,15 @@ extern int slurm_load_topo(topo_info_response_msg_t **resp)
}
/*
- * slurm_print_topo_info_msg - output information about all switch topology
- * configuration information based upon message as loaded using
+ * slurm_print_topo_info_msg - output information about all switch topology
+ * configuration information based upon message as loaded using
* slurm_load_topo
* IN out - file to write to
* IN topo_info_msg_ptr - switch topology information message pointer
* IN one_liner - print as a single line if not zero
*/
-extern void slurm_print_topo_info_msg(FILE * out,
- topo_info_response_msg_t *topo_info_msg_ptr,
+extern void slurm_print_topo_info_msg(FILE * out,
+ topo_info_response_msg_t *topo_info_msg_ptr,
int one_liner)
{
int i;
@@ -135,7 +135,7 @@ extern void slurm_print_topo_info_msg(FILE * out,
* RET out - char * containing formatted output (must be freed after call)
* NULL is returned on failure.
*/
-extern void slurm_print_topo_record(FILE * out, topo_info_t *topo_ptr,
+extern void slurm_print_topo_record(FILE * out, topo_info_t *topo_ptr,
int one_liner)
{
char tmp_line[512];
@@ -148,12 +148,12 @@ extern void slurm_print_topo_record(FILE * out, topo_info_t *topo_ptr,
xstrcat(out_buf, tmp_line);
if (topo_ptr->nodes && topo_ptr->nodes[0]) {
- snprintf(tmp_line, sizeof(tmp_line),
+ snprintf(tmp_line, sizeof(tmp_line),
"Nodes=%s ", topo_ptr->nodes);
xstrcat(out_buf, tmp_line);
}
if (topo_ptr->switches && topo_ptr->switches[0]) {
- snprintf(tmp_line, sizeof(tmp_line),
+ snprintf(tmp_line, sizeof(tmp_line),
"Switches=%s ", topo_ptr->switches);
xstrcat(out_buf, tmp_line);
}
diff --git a/src/api/triggers.c b/src/api/triggers.c
index 6d03bfbaa57ba0e527d901ef4faca7effede7ac6..20f77518b6ebcbfecef90947334e4e0874bfcc7b 100644
--- a/src/api/triggers.c
+++ b/src/api/triggers.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -62,7 +62,7 @@ extern int slurm_set_trigger (trigger_info_t *trigger_set)
trigger_info_msg_t req;
slurm_msg_t_init(&msg);
- /*
+ /*
* Request message:
*/
req.record_count = 1;
@@ -90,7 +90,7 @@ extern int slurm_clear_trigger (trigger_info_t *trigger_clear)
trigger_info_msg_t req;
slurm_msg_t_init(&msg);
- /*
+ /*
* Request message:
*/
req.record_count = 1;
@@ -136,8 +136,8 @@ extern int slurm_get_triggers (trigger_info_msg_t ** trigger_get)
break;
case RESPONSE_SLURM_RC:
rc = ((return_code_msg_t *) resp_msg.data)->return_code;
- slurm_free_return_code_msg(resp_msg.data);
- if (rc)
+ slurm_free_return_code_msg(resp_msg.data);
+ if (rc)
slurm_seterrno_ret(rc);
break;
default:
diff --git a/src/api/update_config.c b/src/api/update_config.c
index 862cbb796125dfb26acc18a06b94247060181571..be7076bc7ce962d42f67c0b1b14765533d26fad2 100644
--- a/src/api/update_config.c
+++ b/src/api/update_config.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> and Kevin Tew <tew1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -54,25 +54,25 @@
static int _slurm_update (void * data, slurm_msg_type_t msg_type);
/*
- * slurm_update_job - issue RPC to a job's configuration per request,
+ * slurm_update_job - issue RPC to a job's configuration per request,
* only usable by user root or (for some parameters) the job's owner
* IN job_msg - description of job updates
* RET 0 on success, otherwise return -1 and set errno to indicate the error
*/
-int
-slurm_update_job ( job_desc_msg_t * job_msg )
+int
+slurm_update_job ( job_desc_msg_t * job_msg )
{
return _slurm_update ((void *) job_msg, REQUEST_UPDATE_JOB);
}
/*
- * slurm_update_node - issue RPC to a node's configuration per request,
+ * slurm_update_node - issue RPC to a node's configuration per request,
* only usable by user root
* IN node_msg - description of node updates
* RET 0 on success, otherwise return -1 and set errno to indicate the error
*/
-int
-slurm_update_node ( update_node_msg_t * node_msg )
+int
+slurm_update_node ( update_node_msg_t * node_msg )
{
return _slurm_update ((void *) node_msg, REQUEST_UPDATE_NODE);
}
@@ -82,32 +82,32 @@ slurm_update_node ( update_node_msg_t * node_msg )
* IN part_msg - description of partition configuration
* RET 0 on success, otherwise return -1 and set errno to indicate the error
*/
-int
-slurm_create_partition ( update_part_msg_t * part_msg )
+int
+slurm_create_partition ( update_part_msg_t * part_msg )
{
return _slurm_update ((void *) part_msg, REQUEST_CREATE_PARTITION);
}
/*
- * slurm_update_partition - issue RPC to a partition's configuration per
+ * slurm_update_partition - issue RPC to a partition's configuration per
* request, only usable by user root
* IN part_msg - description of partition updates
* RET 0 on success, otherwise return -1 and set errno to indicate the error
*/
-int
-slurm_update_partition ( update_part_msg_t * part_msg )
+int
+slurm_update_partition ( update_part_msg_t * part_msg )
{
return _slurm_update ((void *) part_msg, REQUEST_UPDATE_PARTITION);
}
/*
- * slurm_delete_partition - issue RPC to delete a partition, only usable
+ * slurm_delete_partition - issue RPC to delete a partition, only usable
* by user root
* IN part_msg - description of partition to delete
* RET 0 on success, otherwise return -1 and set errno to indicate the error
*/
-int
-slurm_delete_partition ( delete_part_msg_t * part_msg )
+int
+slurm_delete_partition ( delete_part_msg_t * part_msg )
{
return _slurm_update ((void *) part_msg, REQUEST_DELETE_PARTITION);
}
@@ -118,8 +118,8 @@ slurm_delete_partition ( delete_part_msg_t * part_msg )
* RET name of reservation on success (caller must free the memory),
* otherwise return NULL and set errno to indicate the error
*/
-char *
-slurm_create_reservation (resv_desc_msg_t * resv_msg )
+char *
+slurm_create_reservation (resv_desc_msg_t * resv_msg )
{
int rc;
char *resv_name = NULL;
@@ -131,8 +131,8 @@ slurm_create_reservation (resv_desc_msg_t * resv_msg )
slurm_msg_t_init(&resp_msg);
req_msg.msg_type = REQUEST_CREATE_RESERVATION;
- req_msg.data = resv_msg;
-
+ req_msg.data = resv_msg;
+
rc = slurm_send_recv_controller_msg(&req_msg, &resp_msg);
switch (resp_msg.msg_type) {
case RESPONSE_CREATE_RESERVATION:
@@ -141,7 +141,7 @@ slurm_create_reservation (resv_desc_msg_t * resv_msg )
break;
case RESPONSE_SLURM_RC:
rc = ((return_code_msg_t *) resp_msg.data)->return_code;
- if (rc)
+ if (rc)
slurm_seterrno(rc);
break;
default:
@@ -152,7 +152,7 @@ slurm_create_reservation (resv_desc_msg_t * resv_msg )
}
/*
- * slurm_update_reservation - modify an existing reservation, only usable by
+ * slurm_update_reservation - modify an existing reservation, only usable by
* user root
* IN resv_msg - description of reservation
* RET 0 on success, otherwise return -1 and set errno to indicate the error
@@ -163,32 +163,32 @@ extern int slurm_update_reservation ( resv_desc_msg_t * resv_msg )
}
/*
- * slurm_delete_reservation - issue RPC to delete a reservation, only usable
+ * slurm_delete_reservation - issue RPC to delete a reservation, only usable
* by user root
* IN resv_msg - description of reservation to delete
* RET 0 on success, otherwise return -1 and set errno to indicate the error
*/
-int
-slurm_delete_reservation ( reservation_name_msg_t * resv_msg )
+int
+slurm_delete_reservation ( reservation_name_msg_t * resv_msg )
{
return _slurm_update ((void *) resv_msg, REQUEST_DELETE_RESERVATION);
}
/*
- * slurm_update_block - issue RPC to a blocks's configuration per
+ * slurm_update_block - issue RPC to a blocks's configuration per
* request, only usable by user root
* IN block_msg - description of block updates
* RET 0 on success, otherwise return -1 and set errno to indicate the error
*/
-int
-slurm_update_block ( update_block_msg_t * block_msg )
+int
+slurm_update_block ( update_block_msg_t * block_msg )
{
return _slurm_update ((void *) block_msg, REQUEST_UPDATE_BLOCK);
}
/* _slurm_update - issue RPC for all update requests */
-static int
+static int
_slurm_update (void *data, slurm_msg_type_t msg_type)
{
int rc;
@@ -196,7 +196,7 @@ _slurm_update (void *data, slurm_msg_type_t msg_type)
slurm_msg_t_init(&req_msg);
req_msg.msg_type = msg_type;
- req_msg.data = data;
+ req_msg.data = data;
if (slurm_send_recv_controller_rc_msg(&req_msg, &rc) < 0)
return SLURM_ERROR;
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 796cc4c80567b05ab069283be39134173fc9cf61..473929eb33bfbd9175065b3fa33fbfdfce9b60d9 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,21 +1,21 @@
-# Makefile for common library
-# If you are linking to this lib any know you are not linking to
-# anything else that will need variables here link to
+# Makefile for common library
+# If you are linking to this lib any know you are not linking to
+# anything else that will need variables here link to
# $(top_builddir)/src/common/libcommon.la
# if you are linking to a stand alone program that needs all symbols link to
-# $(top_builddir)/src/common/libcommon.o with -ldl added
-# This avoids having multiple symbols running around when there should
+# $(top_builddir)/src/common/libcommon.o with -ldl added
+# This avoids having multiple symbols running around when there should
# only be 1 address per symbol. If you link to the libcommon.la in
# a plugin you will get 2 addresses for one symbol which could lead to problems.
AUTOMAKE_OPTIONS = foreign
if HAVE_UNSETENV
-build_unsetenv_src =
+build_unsetenv_src =
extra_unsetenv_src = unsetenv.c unsetenv.h
else
build_unsetenv_src = unsetenv.c unsetenv.h
-extra_unsetenv_src =
+extra_unsetenv_src =
endif
INCLUDES = -I$(top_srcdir) $(BG_INCLUDES)
@@ -123,27 +123,27 @@ libspank_la_SOURCES = \
plugstack.c plugstack.h \
optz.c optz.h
-libcommon_la_LIBADD = -ldl
+libcommon_la_LIBADD = -ldl
libcommon_la_LDFLAGS = $(LIB_LDFLAGS) -module --export-dynamic
-# This was made so we could export all symbols from libcommon
+# This was made so we could export all symbols from libcommon
# on multiple platforms
-libcommon_o_SOURCES =
-libcommon.o : $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES)
- $(LINK) $(libcommon_la_OBJECTS)
+libcommon_o_SOURCES =
+libcommon.o : $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES)
+ $(LINK) $(libcommon_la_OBJECTS)
-# This was made so we could export all symbols from libeio
+# This was made so we could export all symbols from libeio
# on multiple platforms
-libeio_o_SOURCES =
-libeio.o : $(libeio_la_OBJECTS) $(libeio_la_DEPENDENCIES)
- $(LINK) $(libeio_la_OBJECTS)
+libeio_o_SOURCES =
+libeio.o : $(libeio_la_OBJECTS) $(libeio_la_DEPENDENCIES)
+ $(LINK) $(libeio_la_OBJECTS)
-# This was made so we could export all symbols from libspank
+# This was made so we could export all symbols from libspank
# on multiple platforms
-libspank_o_SOURCES =
-libspank.o : $(libspank_la_OBJECTS) $(libspank_la_DEPENDENCIES)
- $(LINK) $(libspank_la_OBJECTS)
+libspank_o_SOURCES =
+libspank.o : $(libspank_la_OBJECTS) $(libspank_la_DEPENDENCIES)
+ $(LINK) $(libspank_la_OBJECTS)
global_defaults.c : $(top_builddir)/config.h Makefile
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 0448257c3e419f5fd900e6193d2c381c526b2901..ab958f17729253fd53ff2a3f29c541f5001f4696 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -15,13 +15,13 @@
@SET_MAKE@
-# Makefile for common library
-# If you are linking to this lib any know you are not linking to
-# anything else that will need variables here link to
+# Makefile for common library
+# If you are linking to this lib any know you are not linking to
+# anything else that will need variables here link to
# $(top_builddir)/src/common/libcommon.la
# if you are linking to a stand alone program that needs all symbols link to
-# $(top_builddir)/src/common/libcommon.o with -ldl added
-# This avoids having multiple symbols running around when there should
+# $(top_builddir)/src/common/libcommon.o with -ldl added
+# This avoids having multiple symbols running around when there should
# only be 1 address per symbol. If you link to the libcommon.la in
# a plugin you will get 2 addresses for one symbol which could lead to problems.
@@ -485,18 +485,18 @@ libspank_la_SOURCES = \
plugstack.c plugstack.h \
optz.c optz.h
-libcommon_la_LIBADD = -ldl
+libcommon_la_LIBADD = -ldl
libcommon_la_LDFLAGS = $(LIB_LDFLAGS) -module --export-dynamic
-# This was made so we could export all symbols from libcommon
+# This was made so we could export all symbols from libcommon
# on multiple platforms
libcommon_o_SOURCES =
-# This was made so we could export all symbols from libeio
+# This was made so we could export all symbols from libeio
# on multiple platforms
libeio_o_SOURCES =
-# This was made so we could export all symbols from libspank
+# This was made so we could export all symbols from libspank
# on multiple platforms
libspank_o_SOURCES =
all: all-am
@@ -861,12 +861,12 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am
-libcommon.o : $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES)
- $(LINK) $(libcommon_la_OBJECTS)
-libeio.o : $(libeio_la_OBJECTS) $(libeio_la_DEPENDENCIES)
- $(LINK) $(libeio_la_OBJECTS)
-libspank.o : $(libspank_la_OBJECTS) $(libspank_la_DEPENDENCIES)
- $(LINK) $(libspank_la_OBJECTS)
+libcommon.o : $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES)
+ $(LINK) $(libcommon_la_OBJECTS)
+libeio.o : $(libeio_la_OBJECTS) $(libeio_la_DEPENDENCIES)
+ $(LINK) $(libeio_la_OBJECTS)
+libspank.o : $(libspank_la_OBJECTS) $(libspank_la_DEPENDENCIES)
+ $(LINK) $(libspank_la_OBJECTS)
global_defaults.c : $(top_builddir)/config.h Makefile
@( echo "/* This file autogenerated by src/common/Makefile */"; \
diff --git a/src/common/arg_desc.c b/src/common/arg_desc.c
index 79bb8714b6b24e30c8c1d747ba91475ea801d819..1d91a146ead0bd918ea03600dd5354261581f236 100644
--- a/src/common/arg_desc.c
+++ b/src/common/arg_desc.c
@@ -14,15 +14,15 @@
* 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
+ * 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
+ * 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
@@ -40,8 +40,8 @@
#include "src/common/xassert.h"
/*
- * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
- * for details.
+ * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
+ * for details.
*/
strong_alias(arg_count, slurm_arg_count);
strong_alias(arg_idx_by_name, slurm_arg_idx_by_name);
@@ -68,7 +68,7 @@ arg_idx_by_name( const arg_desc_t *desc, const char *name )
if ( desc == NULL ) return -1;
if ( name == NULL ) return -1;
-
+
for ( i = 0; desc[ i ].name != NULL; ++i ) {
if ( strcmp( desc[ i ].name, name ) == 0 ) {
return i;
diff --git a/src/common/arg_desc.h b/src/common/arg_desc.h
index 331c3fb6ed8f7ef20ce21ca8d6e1e24c32f95b1a..0dce2dcfd31d0dc0971b6df483cb5cbd8fc58eb7 100644
--- a/src/common/arg_desc.h
+++ b/src/common/arg_desc.h
@@ -14,15 +14,15 @@
* 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
+ * 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
+ * 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
diff --git a/src/common/assoc_mgr.c b/src/common/assoc_mgr.c
index 68b839c18c4f5b2442d0ac167e351618ec7a7a84..cf9aa2729dca763828ac5dc2e256df1508108a62 100644
--- a/src/common/assoc_mgr.c
+++ b/src/common/assoc_mgr.c
@@ -5,32 +5,32 @@
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -70,18 +70,18 @@ pthread_mutex_t assoc_mgr_file_lock = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_t assoc_mgr_wckey_lock = PTHREAD_MUTEX_INITIALIZER;
-/*
+/*
* Comparator used for sorting assocs largest cpu to smallest cpu
- *
+ *
* returns: 1: assoc_a > assoc_b -1: assoc_a < assoc_b
- *
+ *
*/
static int _sort_assoc_dec(acct_association_rec_t *assoc_a,
acct_association_rec_t *assoc_b)
{
if (assoc_a->lft > assoc_b->lft)
return 1;
-
+
return -1;
}
@@ -107,7 +107,7 @@ static int _addto_used_info(acct_association_rec_t *assoc1,
assoc1->grp_used_cpus += assoc2->grp_used_cpus;
assoc1->grp_used_nodes += assoc2->grp_used_nodes;
assoc1->grp_used_wall += assoc2->grp_used_wall;
-
+
assoc1->used_jobs += assoc2->used_jobs;
assoc1->used_submit_jobs += assoc2->used_submit_jobs;
assoc1->usage_raw += assoc2->usage_raw;
@@ -122,7 +122,7 @@ static int _clear_used_info(acct_association_rec_t *assoc)
assoc->grp_used_cpus = 0;
assoc->grp_used_nodes = 0;
-
+
assoc->used_jobs = 0;
assoc->used_submit_jobs = 0;
/* do not reset usage_raw or grp_used_wall.
@@ -150,18 +150,18 @@ static int _grab_parents_qos(acct_association_rec_t *assoc)
parent_assoc = assoc->parent_assoc_ptr;
if(!parent_assoc || !parent_assoc->qos_list
- || !list_count(parent_assoc->qos_list))
+ || !list_count(parent_assoc->qos_list))
return SLURM_SUCCESS;
-
+
itr = list_iterator_create(parent_assoc->qos_list);
- while((qos_char = list_next(itr)))
+ while((qos_char = list_next(itr)))
list_append(assoc->qos_list, xstrdup(qos_char));
list_iterator_destroy(itr);
return SLURM_SUCCESS;
}
-static int _local_update_assoc_qos_list(acct_association_rec_t *assoc,
+static int _local_update_assoc_qos_list(acct_association_rec_t *assoc,
List new_qos_list)
{
ListIterator new_qos_itr = NULL, curr_qos_itr = NULL;
@@ -172,11 +172,11 @@ static int _local_update_assoc_qos_list(acct_association_rec_t *assoc,
error("need both new qos_list and an association to update");
return SLURM_ERROR;
}
-
+
if(!list_count(new_qos_list)) {
_grab_parents_qos(assoc);
return SLURM_SUCCESS;
- }
+ }
/* Even though we only use the valid_qos bitstr for things we
need to keep the list around for now since we don't pack the
@@ -184,7 +184,7 @@ static int _local_update_assoc_qos_list(acct_association_rec_t *assoc,
*/
new_qos_itr = list_iterator_create(new_qos_list);
curr_qos_itr = list_iterator_create(assoc->qos_list);
-
+
while((new_qos = list_next(new_qos_itr))) {
if(new_qos[0] == '-') {
while((curr_qos = list_next(curr_qos_itr))) {
@@ -196,10 +196,10 @@ static int _local_update_assoc_qos_list(acct_association_rec_t *assoc,
list_iterator_reset(curr_qos_itr);
} else if(new_qos[0] == '+') {
- while((curr_qos = list_next(curr_qos_itr)))
- if(!strcmp(curr_qos, new_qos+1))
+ while((curr_qos = list_next(curr_qos_itr)))
+ if(!strcmp(curr_qos, new_qos+1))
break;
-
+
if(!curr_qos) {
list_append(assoc->qos_list,
xstrdup(new_qos+1));
@@ -214,13 +214,13 @@ static int _local_update_assoc_qos_list(acct_association_rec_t *assoc,
if(!flushed)
list_flush(assoc->qos_list);
list_append(assoc->qos_list, xstrdup(new_qos));
- flushed = 1;
+ flushed = 1;
}
}
list_iterator_destroy(curr_qos_itr);
list_iterator_destroy(new_qos_itr);
- return SLURM_SUCCESS;
+ return SLURM_SUCCESS;
}
/* locks should be put in place before calling this function */
@@ -234,7 +234,7 @@ static int _set_assoc_parent_and_user(acct_association_rec_t *assoc,
last_acct_parent = NULL;
last_parent = NULL;
}
-
+
if(!assoc || !assoc_list) {
error("you didn't give me an association");
return SLURM_ERROR;
@@ -247,11 +247,11 @@ static int _set_assoc_parent_and_user(acct_association_rec_t *assoc,
for. Then if that isn't panning out look at the
last account parent. If still we don't have it we
will look for it in the list. If it isn't there we
- will just add it to the parent and call it good
+ will just add it to the parent and call it good
*/
if(last_parent && assoc->parent_id == last_parent->id) {
assoc->parent_assoc_ptr = last_parent;
- } else if(last_acct_parent
+ } else if(last_acct_parent
&& assoc->parent_id == last_acct_parent->id) {
assoc->parent_assoc_ptr = last_acct_parent;
} else {
@@ -260,7 +260,7 @@ static int _set_assoc_parent_and_user(acct_association_rec_t *assoc,
while((assoc2 = list_next(itr))) {
if(assoc2->id == assoc->parent_id) {
assoc->parent_assoc_ptr = assoc2;
- if(assoc->user)
+ if(assoc->user)
last_parent = assoc2;
else
last_acct_parent = assoc2;
@@ -270,31 +270,31 @@ static int _set_assoc_parent_and_user(acct_association_rec_t *assoc,
list_iterator_destroy(itr);
}
if(assoc->parent_assoc_ptr && setup_childern) {
- if(!assoc->parent_assoc_ptr->childern_list)
- assoc->parent_assoc_ptr->childern_list =
+ if(!assoc->parent_assoc_ptr->childern_list)
+ assoc->parent_assoc_ptr->childern_list =
list_create(NULL);
list_append(assoc->parent_assoc_ptr->childern_list,
assoc);
- }
-
+ }
+
if(assoc == assoc->parent_assoc_ptr) {
assoc->parent_assoc_ptr = NULL;
error("association %u was pointing to "
"itself as it's parent");
}
- } else
+ } else
assoc_mgr_root_assoc = assoc;
-
+
if(assoc->user) {
uid_t pw_uid;
if (uid_from_string (assoc->user, &pw_uid) < 0)
assoc->uid = (uint32_t)NO_VAL;
else
- assoc->uid = pw_uid;
+ assoc->uid = pw_uid;
/* get the qos bitmap here */
if(g_qos_count > 0) {
- if(!assoc->valid_qos
+ if(!assoc->valid_qos
|| (bit_size(assoc->valid_qos) != g_qos_count)) {
FREE_NULL_BITMAP(assoc->valid_qos);
assoc->valid_qos = bit_alloc(g_qos_count);
@@ -305,13 +305,13 @@ static int _set_assoc_parent_and_user(acct_association_rec_t *assoc,
assoc->qos_list);
}
} else {
- assoc->uid = (uint32_t)NO_VAL;
+ assoc->uid = (uint32_t)NO_VAL;
}
//log_assoc_rec(assoc);
return SLURM_SUCCESS;
}
-
+
static int _post_association_list(List assoc_list)
{
acct_association_rec_t *assoc = NULL;
@@ -321,7 +321,7 @@ static int _post_association_list(List assoc_list)
if(!assoc_list)
return SLURM_ERROR;
-
+
itr = list_iterator_create(assoc_list);
//START_TIMER;
while((assoc = list_next(itr))) {
@@ -340,16 +340,16 @@ static int _post_association_list(List assoc_list)
|| !list_count(assoc->childern_list))
continue;
itr2 = list_iterator_create(assoc->childern_list);
- while((assoc2 = list_next(itr2)))
+ while((assoc2 = list_next(itr2)))
count += assoc2->shares_raw;
list_iterator_reset(itr2);
- while((assoc2 = list_next(itr2)))
+ while((assoc2 = list_next(itr2)))
assoc2->level_shares = count;
list_iterator_destroy(itr2);
- }
+ }
/* Now normalize the static shares */
list_iterator_reset(itr);
- while((assoc = list_next(itr)))
+ while((assoc = list_next(itr)))
_normalize_assoc_shares(assoc);
}
list_iterator_destroy(itr);
@@ -423,11 +423,11 @@ static int _get_assoc_mgr_association_list(void *db_conn, int enforce)
if(assoc_q.cluster_list)
list_destroy(assoc_q.cluster_list);
-
+
if(!assoc_mgr_association_list) {
/* create list so we don't keep calling this if there
isn't anything there */
- assoc_mgr_association_list =
+ assoc_mgr_association_list =
list_create(destroy_acct_association_rec);
slurm_mutex_unlock(&assoc_mgr_association_lock);
if(enforce & ACCOUNTING_ENFORCE_ASSOCS) {
@@ -439,7 +439,7 @@ static int _get_assoc_mgr_association_list(void *db_conn, int enforce)
"list was given so we are giving a blank list");
return SLURM_SUCCESS;
}
- }
+ }
_post_association_list(assoc_mgr_association_list);
@@ -464,7 +464,7 @@ static int _get_assoc_mgr_qos_list(void *db_conn, int enforce)
return SLURM_ERROR;
} else {
return SLURM_SUCCESS;
- }
+ }
} else {
ListIterator itr = list_iterator_create(assoc_mgr_qos_list);
acct_qos_rec_t *qos = NULL;
@@ -474,7 +474,7 @@ static int _get_assoc_mgr_qos_list(void *db_conn, int enforce)
if(qos->id > g_qos_count)
g_qos_count = qos->id;
- if(qos->priority > g_qos_max_priority)
+ if(qos->priority > g_qos_max_priority)
g_qos_max_priority = qos->priority;
}
/* Since in the database id's don't start at 1
@@ -486,9 +486,9 @@ static int _get_assoc_mgr_qos_list(void *db_conn, int enforce)
if(g_qos_max_priority) {
list_iterator_reset(itr);
-
+
while((qos = list_next(itr))) {
- qos->norm_priority = (double)qos->priority
+ qos->norm_priority = (double)qos->priority
/ (double)g_qos_max_priority;
}
}
@@ -506,7 +506,7 @@ static int _get_assoc_mgr_user_list(void *db_conn, int enforce)
memset(&user_q, 0, sizeof(acct_user_cond_t));
user_q.with_coords = 1;
-
+
slurm_mutex_lock(&assoc_mgr_user_lock);
if(assoc_mgr_user_list)
list_destroy(assoc_mgr_user_list);
@@ -520,11 +520,11 @@ static int _get_assoc_mgr_user_list(void *db_conn, int enforce)
return SLURM_ERROR;
} else {
return SLURM_SUCCESS;
- }
- }
+ }
+ }
_post_user_list(assoc_mgr_user_list);
-
+
slurm_mutex_unlock(&assoc_mgr_user_lock);
return SLURM_SUCCESS;
}
@@ -554,10 +554,10 @@ static int _get_local_wckey_list(void *db_conn, int enforce)
assoc_mgr_wckey_list =
acct_storage_g_get_wckeys(db_conn, uid, &wckey_q);
// END_TIMER2("get_wckeys");
-
+
if(wckey_q.cluster_list)
list_destroy(wckey_q.cluster_list);
-
+
if(!assoc_mgr_wckey_list) {
/* create list so we don't keep calling this if there
isn't anything there */
@@ -572,10 +572,10 @@ static int _get_local_wckey_list(void *db_conn, int enforce)
"list was given so we are giving a blank list");
return SLURM_SUCCESS;
}
- }
+ }
_post_wckey_list(assoc_mgr_wckey_list);
-
+
slurm_mutex_unlock(&assoc_mgr_wckey_lock);
return SLURM_SUCCESS;
@@ -606,39 +606,39 @@ static int _refresh_assoc_mgr_association_list(void *db_conn, int enforce)
current_assocs = assoc_mgr_association_list;
// START_TIMER;
- assoc_mgr_association_list =
+ assoc_mgr_association_list =
acct_storage_g_get_associations(db_conn, uid, &assoc_q);
// END_TIMER2("get_associations");
if(assoc_q.cluster_list)
list_destroy(assoc_q.cluster_list);
-
+
if(!assoc_mgr_association_list) {
assoc_mgr_association_list = current_assocs;
slurm_mutex_unlock(&assoc_mgr_association_lock);
-
+
error("_refresh_assoc_mgr_association_list: "
"no new list given back keeping cached one.");
return SLURM_ERROR;
}
_post_association_list(assoc_mgr_association_list);
-
+
if(!current_assocs) {
slurm_mutex_unlock(&assoc_mgr_association_lock);
return SLURM_SUCCESS;
}
-
+
curr_itr = list_iterator_create(current_assocs);
assoc_mgr_itr = list_iterator_create(assoc_mgr_association_list);
-
+
/* add used limits We only look for the user associations to
* do the parents since a parent may have moved */
while((curr_assoc = list_next(curr_itr))) {
if(!curr_assoc->user)
continue;
while((assoc = list_next(assoc_mgr_itr))) {
- if(assoc->id == curr_assoc->id)
+ if(assoc->id == curr_assoc->id)
break;
}
@@ -648,12 +648,12 @@ static int _refresh_assoc_mgr_association_list(void *db_conn, int enforce)
different than the one we are updating from */
assoc = assoc->parent_assoc_ptr;
}
- list_iterator_reset(assoc_mgr_itr);
+ list_iterator_reset(assoc_mgr_itr);
}
-
+
list_iterator_destroy(curr_itr);
list_iterator_destroy(assoc_mgr_itr);
-
+
slurm_mutex_unlock(&assoc_mgr_association_lock);
if(current_assocs)
@@ -690,7 +690,7 @@ static int _refresh_assoc_mgr_qos_list(void *db_conn, int enforce)
}
/* This only gets a new list if available dropping the old one if
- * needed
+ * needed
*/
static int _refresh_assoc_mgr_user_list(void *db_conn, int enforce)
{
@@ -700,7 +700,7 @@ static int _refresh_assoc_mgr_user_list(void *db_conn, int enforce)
memset(&user_q, 0, sizeof(acct_user_cond_t));
user_q.with_coords = 1;
-
+
current_users = acct_storage_g_get_users(db_conn, uid, &user_q);
if(!current_users) {
@@ -712,11 +712,11 @@ static int _refresh_assoc_mgr_user_list(void *db_conn, int enforce)
slurm_mutex_lock(&assoc_mgr_user_lock);
- if(assoc_mgr_user_list)
+ if(assoc_mgr_user_list)
list_destroy(assoc_mgr_user_list);
assoc_mgr_user_list = current_users;
-
+
slurm_mutex_unlock(&assoc_mgr_user_lock);
return SLURM_SUCCESS;
@@ -769,9 +769,9 @@ extern int assoc_mgr_init(void *db_conn, assoc_init_args_t *args)
if(!checked_prio) {
char *prio = slurm_get_priority_type();
- if(prio && !strcmp(prio, "priority/multifactor"))
+ if(prio && !strcmp(prio, "priority/multifactor"))
setup_childern = 1;
-
+
xfree(prio);
checked_prio = 1;
}
@@ -781,10 +781,10 @@ extern int assoc_mgr_init(void *db_conn, assoc_init_args_t *args)
if(args->remove_assoc_notify)
remove_assoc_notify = args->remove_assoc_notify;
cache_level = args->cache_level;
- assoc_mgr_refresh_lists(db_conn, args);
+ assoc_mgr_refresh_lists(db_conn, args);
}
-
- if(running_cache) {
+
+ if(running_cache) {
debug4("No need to run assoc_mgr_init, "
"we probably don't have a connection. "
"If we do use assoc_mgr_refresh_lists instead.");
@@ -799,18 +799,18 @@ extern int assoc_mgr_init(void *db_conn, assoc_init_args_t *args)
/* check if we can't talk to the db yet */
if(errno == ESLURM_ACCESS_DENIED)
return SLURM_ERROR;
-
+
/* get qos before association since it is used there */
if((!assoc_mgr_qos_list) && (cache_level & ASSOC_MGR_CACHE_QOS))
if(_get_assoc_mgr_qos_list(db_conn, enforce) == SLURM_ERROR)
return SLURM_ERROR;
if((!assoc_mgr_association_list)
- && (cache_level & ASSOC_MGR_CACHE_ASSOC))
+ && (cache_level & ASSOC_MGR_CACHE_ASSOC))
if(_get_assoc_mgr_association_list(db_conn, enforce)
== SLURM_ERROR)
return SLURM_ERROR;
-
+
if((!assoc_mgr_user_list) && (cache_level & ASSOC_MGR_CACHE_USER))
if(_get_assoc_mgr_user_list(db_conn, enforce) == SLURM_ERROR)
return SLURM_ERROR;
@@ -835,7 +835,7 @@ extern int assoc_mgr_fini(char *state_save_location)
if(state_save_location)
dump_assoc_mgr_state(state_save_location);
- if(assoc_mgr_association_list)
+ if(assoc_mgr_association_list)
list_destroy(assoc_mgr_association_list);
if(assoc_mgr_qos_list)
list_destroy(assoc_mgr_qos_list);
@@ -854,7 +854,7 @@ extern int assoc_mgr_fini(char *state_save_location)
extern int assoc_mgr_get_user_assocs(void *db_conn,
acct_association_rec_t *assoc,
- int enforce,
+ int enforce,
List assoc_list)
{
ListIterator itr = NULL;
@@ -866,14 +866,14 @@ extern int assoc_mgr_get_user_assocs(void *db_conn,
xassert(assoc_list);
if(!assoc_mgr_association_list) {
- if(_get_assoc_mgr_association_list(db_conn, enforce)
+ if(_get_assoc_mgr_association_list(db_conn, enforce)
== SLURM_ERROR)
return SLURM_ERROR;
}
if((!assoc_mgr_association_list
|| !list_count(assoc_mgr_association_list))
- && !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
+ && !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
return SLURM_SUCCESS;
slurm_mutex_lock(&assoc_mgr_association_lock);
@@ -900,7 +900,7 @@ extern int assoc_mgr_get_user_assocs(void *db_conn,
}
extern int assoc_mgr_fill_in_assoc(void *db_conn, acct_association_rec_t *assoc,
- int enforce,
+ int enforce,
acct_association_rec_t **assoc_pptr)
{
ListIterator itr = NULL;
@@ -910,13 +910,13 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn, acct_association_rec_t *assoc,
if (assoc_pptr)
*assoc_pptr = NULL;
if(!assoc_mgr_association_list) {
- if(_get_assoc_mgr_association_list(db_conn, enforce)
+ if(_get_assoc_mgr_association_list(db_conn, enforce)
== SLURM_ERROR)
return SLURM_ERROR;
}
if((!assoc_mgr_association_list
|| !list_count(assoc_mgr_association_list))
- && !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
+ && !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
return SLURM_SUCCESS;
if(!assoc->id) {
@@ -936,7 +936,7 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn, acct_association_rec_t *assoc,
memset(&user, 0, sizeof(acct_user_rec_t));
user.uid = assoc->uid;
if(assoc_mgr_fill_in_user(db_conn, &user,
- enforce, NULL)
+ enforce, NULL)
== SLURM_ERROR) {
if(enforce & ACCOUNTING_ENFORCE_ASSOCS) {
error("User %d not found", assoc->uid);
@@ -945,7 +945,7 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn, acct_association_rec_t *assoc,
debug3("User %d not found", assoc->uid);
return SLURM_SUCCESS;
}
- }
+ }
assoc->user = user.name;
if(user.default_acct)
assoc->acct = user.default_acct;
@@ -962,8 +962,8 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn, acct_association_rec_t *assoc,
return SLURM_SUCCESS;
}
}
- }
-
+ }
+
if(!assoc->cluster)
assoc->cluster = assoc_mgr_cluster_name;
}
@@ -991,8 +991,8 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn, acct_association_rec_t *assoc,
assoc->uid, found_assoc->uid);
continue;
}
-
- if(found_assoc->acct
+
+ if(found_assoc->acct
&& strcasecmp(assoc->acct, found_assoc->acct)) {
debug4("not the right account %s != %s",
assoc->acct, found_assoc->acct);
@@ -1006,10 +1006,10 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn, acct_association_rec_t *assoc,
debug4("not the right cluster");
continue;
}
-
+
if(assoc->partition
- && (!found_assoc->partition
- || strcasecmp(assoc->partition,
+ && (!found_assoc->partition
+ || strcasecmp(assoc->partition,
found_assoc->partition))) {
ret_assoc = found_assoc;
debug3("found association for no partition");
@@ -1020,10 +1020,10 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn, acct_association_rec_t *assoc,
break;
}
list_iterator_destroy(itr);
-
+
if(!ret_assoc) {
slurm_mutex_unlock(&assoc_mgr_association_lock);
- if(enforce & ACCOUNTING_ENFORCE_ASSOCS)
+ if(enforce & ACCOUNTING_ENFORCE_ASSOCS)
return SLURM_ERROR;
else
return SLURM_SUCCESS;
@@ -1036,7 +1036,7 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn, acct_association_rec_t *assoc,
if(!assoc->acct)
assoc->acct = ret_assoc->acct;
-
+
if(!assoc->childern_list)
assoc->childern_list = ret_assoc->childern_list;
@@ -1068,7 +1068,7 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn, acct_association_rec_t *assoc,
if(assoc->parent_acct) {
xfree(assoc->parent_acct);
assoc->parent_acct = xstrdup(ret_assoc->parent_acct);
- } else
+ } else
assoc->parent_acct = ret_assoc->parent_acct;
assoc->parent_assoc_ptr = ret_assoc->parent_assoc_ptr;
assoc->parent_id = ret_assoc->parent_id;
@@ -1116,12 +1116,12 @@ extern int assoc_mgr_fill_in_user(void *db_conn, acct_user_rec_t *user,
if(user_pptr)
*user_pptr = NULL;
- if(!assoc_mgr_user_list)
- if(_get_assoc_mgr_user_list(db_conn, enforce) == SLURM_ERROR)
+ if(!assoc_mgr_user_list)
+ if(_get_assoc_mgr_user_list(db_conn, enforce) == SLURM_ERROR)
return SLURM_ERROR;
if((!assoc_mgr_user_list || !list_count(assoc_mgr_user_list))
- && !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
+ && !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
return SLURM_SUCCESS;
slurm_mutex_lock(&assoc_mgr_user_lock);
@@ -1130,7 +1130,7 @@ extern int assoc_mgr_fill_in_user(void *db_conn, acct_user_rec_t *user,
if(user->uid != NO_VAL) {
if(user->uid == found_user->uid)
break;
- } else if(user->name
+ } else if(user->name
&& !strcasecmp(user->name, found_user->name))
break;
}
@@ -1138,13 +1138,13 @@ extern int assoc_mgr_fill_in_user(void *db_conn, acct_user_rec_t *user,
if(!found_user) {
slurm_mutex_unlock(&assoc_mgr_user_lock);
- if(enforce & ACCOUNTING_ENFORCE_ASSOCS)
+ if(enforce & ACCOUNTING_ENFORCE_ASSOCS)
return SLURM_ERROR;
else
return SLURM_SUCCESS;
}
- debug3("found correct user");
+ debug3("found correct user");
if(user_pptr)
*user_pptr = found_user;
@@ -1181,27 +1181,27 @@ extern int assoc_mgr_fill_in_qos(void *db_conn, acct_qos_rec_t *qos,
if(qos_pptr)
*qos_pptr = NULL;
- if(!assoc_mgr_qos_list)
+ if(!assoc_mgr_qos_list)
if(_get_assoc_mgr_qos_list(db_conn, enforce) == SLURM_ERROR)
return SLURM_ERROR;
if((!assoc_mgr_qos_list || !list_count(assoc_mgr_qos_list))
- && !(enforce & ACCOUNTING_ENFORCE_QOS))
+ && !(enforce & ACCOUNTING_ENFORCE_QOS))
return SLURM_SUCCESS;
slurm_mutex_lock(&assoc_mgr_qos_lock);
itr = list_iterator_create(assoc_mgr_qos_list);
while((found_qos = list_next(itr))) {
- if(qos->id == found_qos->id)
+ if(qos->id == found_qos->id)
break;
else if(qos->name && !strcasecmp(qos->name, found_qos->name))
break;
}
list_iterator_destroy(itr);
-
+
if(!found_qos) {
slurm_mutex_unlock(&assoc_mgr_qos_lock);
- if(enforce & ACCOUNTING_ENFORCE_QOS)
+ if(enforce & ACCOUNTING_ENFORCE_QOS)
return SLURM_ERROR;
else
return SLURM_SUCCESS;
@@ -1239,7 +1239,7 @@ extern int assoc_mgr_fill_in_qos(void *db_conn, acct_qos_rec_t *qos,
qos->max_submit_jobs_pu = found_qos->max_submit_jobs_pu;
qos->max_wall_pj = found_qos->max_wall_pj;
- if(!qos->name)
+ if(!qos->name)
qos->name = found_qos->name;
qos->norm_priority = found_qos->norm_priority;
@@ -1263,7 +1263,7 @@ extern int assoc_mgr_fill_in_qos(void *db_conn, acct_qos_rec_t *qos,
}
extern int assoc_mgr_fill_in_wckey(void *db_conn, acct_wckey_rec_t *wckey,
- int enforce,
+ int enforce,
acct_wckey_rec_t **wckey_pptr)
{
ListIterator itr = NULL;
@@ -1277,7 +1277,7 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, acct_wckey_rec_t *wckey,
return SLURM_ERROR;
}
if((!assoc_mgr_wckey_list || !list_count(assoc_mgr_wckey_list))
- && !(enforce & ACCOUNTING_ENFORCE_WCKEYS))
+ && !(enforce & ACCOUNTING_ENFORCE_WCKEYS))
return SLURM_SUCCESS;
if(!wckey->id) {
@@ -1298,7 +1298,7 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, acct_wckey_rec_t *wckey,
user.uid = wckey->uid;
user.name = wckey->user;
if(assoc_mgr_fill_in_user(db_conn, &user,
- enforce, NULL)
+ enforce, NULL)
== SLURM_ERROR) {
if(enforce & ACCOUNTING_ENFORCE_WCKEYS) {
error("User %d not found", wckey->uid);
@@ -1325,7 +1325,7 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, acct_wckey_rec_t *wckey,
return SLURM_SUCCESS;
}
}
-
+
} else if(wckey->uid == (uint32_t)NO_VAL && !wckey->user) {
if(enforce & ACCOUNTING_ENFORCE_WCKEYS) {
error("get_wckey_id: "
@@ -1336,8 +1336,8 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, acct_wckey_rec_t *wckey,
return SLURM_SUCCESS;
}
}
-
-
+
+
if(!wckey->cluster)
wckey->cluster = assoc_mgr_cluster_name;
}
@@ -1364,9 +1364,9 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, acct_wckey_rec_t *wckey,
} else if(wckey->user && strcasecmp(wckey->user,
found_wckey->user))
continue;
-
+
if(wckey->name
- && (!found_wckey->name
+ && (!found_wckey->name
|| strcasecmp(wckey->name, found_wckey->name))) {
debug4("not the right name %s != %s",
wckey->name, found_wckey->name);
@@ -1381,9 +1381,9 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, acct_wckey_rec_t *wckey,
"we need one to get a wckey.");
continue;
}
-
+
if(found_wckey->cluster
- && strcasecmp(wckey->cluster,
+ && strcasecmp(wckey->cluster,
found_wckey->cluster)) {
debug4("not the right cluster");
continue;
@@ -1394,10 +1394,10 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, acct_wckey_rec_t *wckey,
break;
}
list_iterator_destroy(itr);
-
+
if(!ret_wckey) {
slurm_mutex_unlock(&assoc_mgr_wckey_lock);
- if(enforce & ACCOUNTING_ENFORCE_WCKEYS)
+ if(enforce & ACCOUNTING_ENFORCE_WCKEYS)
return SLURM_ERROR;
else
return SLURM_SUCCESS;
@@ -1410,7 +1410,7 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, acct_wckey_rec_t *wckey,
wckey->cluster = ret_wckey->cluster;
wckey->id = ret_wckey->id;
-
+
if(!wckey->name)
wckey->name = ret_wckey->name;
@@ -1429,26 +1429,26 @@ extern acct_admin_level_t assoc_mgr_get_admin_level(void *db_conn,
ListIterator itr = NULL;
acct_user_rec_t * found_user = NULL;
- if(!assoc_mgr_user_list)
+ if(!assoc_mgr_user_list)
if(_get_assoc_mgr_user_list(db_conn, 0) == SLURM_ERROR)
return ACCT_ADMIN_NOTSET;
- if(!assoc_mgr_user_list)
+ if(!assoc_mgr_user_list)
return ACCT_ADMIN_NOTSET;
slurm_mutex_lock(&assoc_mgr_user_lock);
itr = list_iterator_create(assoc_mgr_user_list);
while((found_user = list_next(itr))) {
- if(uid == found_user->uid)
+ if(uid == found_user->uid)
break;
}
list_iterator_destroy(itr);
slurm_mutex_unlock(&assoc_mgr_user_lock);
-
- if(found_user)
+
+ if(found_user)
return found_user->admin_level;
-
- return ACCT_ADMIN_NOTSET;
+
+ return ACCT_ADMIN_NOTSET;
}
extern int assoc_mgr_is_user_acct_coord(void *db_conn,
@@ -1459,21 +1459,21 @@ extern int assoc_mgr_is_user_acct_coord(void *db_conn,
acct_coord_rec_t *acct = NULL;
acct_user_rec_t * found_user = NULL;
- if(!assoc_mgr_user_list)
+ if(!assoc_mgr_user_list)
if(_get_assoc_mgr_user_list(db_conn, 0) == SLURM_ERROR)
return ACCT_ADMIN_NOTSET;
- if(!assoc_mgr_user_list)
+ if(!assoc_mgr_user_list)
return ACCT_ADMIN_NOTSET;
slurm_mutex_lock(&assoc_mgr_user_lock);
itr = list_iterator_create(assoc_mgr_user_list);
while((found_user = list_next(itr))) {
- if(uid == found_user->uid)
+ if(uid == found_user->uid)
break;
}
list_iterator_destroy(itr);
-
+
if(!found_user || !found_user->coord_accts) {
slurm_mutex_unlock(&assoc_mgr_user_lock);
return 0;
@@ -1484,14 +1484,14 @@ extern int assoc_mgr_is_user_acct_coord(void *db_conn,
break;
}
list_iterator_destroy(itr);
-
+
if(acct) {
slurm_mutex_unlock(&assoc_mgr_user_lock);
return 1;
}
slurm_mutex_unlock(&assoc_mgr_user_lock);
- return 0;
+ return 0;
}
extern List assoc_mgr_get_shares(void *db_conn,
@@ -1514,11 +1514,11 @@ extern List assoc_mgr_get_shares(void *db_conn,
memset(&user, 0, sizeof(acct_user_rec_t));
user.uid = uid;
-
- if(user_list && list_count(user_list))
+
+ if(user_list && list_count(user_list))
user_itr = list_iterator_create(user_list);
- if(acct_list && list_count(acct_list))
+ if(acct_list && list_count(acct_list))
acct_itr = list_iterator_create(acct_list);
if (private_data & PRIVATE_DATA_USAGE) {
@@ -1527,13 +1527,13 @@ extern List assoc_mgr_get_shares(void *db_conn,
/* Check permissions of the requesting user.
*/
if((uid == slurm_uid || uid == 0)
- || assoc_mgr_get_admin_level(db_conn, uid)
- >= ACCT_ADMIN_OPERATOR)
- is_admin = 1;
+ || assoc_mgr_get_admin_level(db_conn, uid)
+ >= ACCT_ADMIN_OPERATOR)
+ is_admin = 1;
else {
if(assoc_mgr_fill_in_user(
db_conn, &user,
- ACCOUNTING_ENFORCE_ASSOCS, NULL)
+ ACCOUNTING_ENFORCE_ASSOCS, NULL)
== SLURM_ERROR) {
debug3("User %d not found", user.uid);
goto end_it;
@@ -1545,7 +1545,7 @@ extern List assoc_mgr_get_shares(void *db_conn,
slurm_mutex_lock(&assoc_mgr_association_lock);
itr = list_iterator_create(assoc_mgr_association_list);
- while((assoc = list_next(itr))) {
+ while((assoc = list_next(itr))) {
if(user_itr && assoc->user) {
while((tmp_char = list_next(user_itr))) {
if(!strcasecmp(tmp_char, assoc->user))
@@ -1553,7 +1553,7 @@ extern List assoc_mgr_get_shares(void *db_conn,
}
list_iterator_reset(user_itr);
/* not correct user */
- if(!tmp_char)
+ if(!tmp_char)
continue;
}
@@ -1564,7 +1564,7 @@ extern List assoc_mgr_get_shares(void *db_conn,
}
list_iterator_reset(acct_itr);
/* not correct account */
- if(!tmp_char)
+ if(!tmp_char)
continue;
}
@@ -1573,10 +1573,10 @@ extern List assoc_mgr_get_shares(void *db_conn,
ListIterator itr = NULL;
acct_coord_rec_t *coord = NULL;
- if(assoc->user &&
- !strcmp(assoc->user, user.name))
+ if(assoc->user &&
+ !strcmp(assoc->user, user.name))
goto is_user;
-
+
if(!user.coord_accts) {
debug4("This user isn't a coord.");
goto bad_user;
@@ -1585,20 +1585,20 @@ extern List assoc_mgr_get_shares(void *db_conn,
if(!assoc->acct) {
debug("No account name given "
"in association.");
- goto bad_user;
+ goto bad_user;
}
-
+
itr = list_iterator_create(user.coord_accts);
while((coord = list_next(itr))) {
- if(!strcasecmp(coord->name,
+ if(!strcasecmp(coord->name,
assoc->acct))
break;
}
list_iterator_destroy(itr);
-
- if(coord)
+
+ if(coord)
goto is_user;
-
+
bad_user:
continue;
}
@@ -1611,9 +1611,9 @@ extern List assoc_mgr_get_shares(void *db_conn,
share->assoc_id = assoc->id;
share->cluster = xstrdup(assoc->cluster);
- if(assoc == assoc_mgr_root_assoc)
+ if(assoc == assoc_mgr_root_assoc)
share->shares_raw = NO_VAL;
- else
+ else
share->shares_raw = assoc->shares_raw;
share->shares_norm = assoc->shares_norm;
@@ -1623,16 +1623,16 @@ extern List assoc_mgr_get_shares(void *db_conn,
/* We only calculate user effective usage when
* we need it
*/
- if(assoc->usage_efctv == (long double)NO_VAL)
+ if(assoc->usage_efctv == (long double)NO_VAL)
priority_g_set_assoc_usage(assoc);
-
+
share->name = xstrdup(assoc->user);
share->parent = xstrdup(assoc->acct);
share->user = 1;
} else {
share->name = xstrdup(assoc->acct);
if(!assoc->parent_acct && assoc->parent_assoc_ptr)
- share->parent =
+ share->parent =
xstrdup(assoc->parent_assoc_ptr->acct);
else
share->parent = xstrdup(assoc->parent_acct);
@@ -1642,12 +1642,12 @@ extern List assoc_mgr_get_shares(void *db_conn,
}
list_iterator_destroy(itr);
slurm_mutex_unlock(&assoc_mgr_association_lock);
-end_it:
- if(user_itr)
+end_it:
+ if(user_itr)
list_iterator_destroy(user_itr);
- if(acct_itr)
+ if(acct_itr)
list_iterator_destroy(acct_itr);
-
+
return ret_list;
}
@@ -1668,9 +1668,9 @@ extern int assoc_mgr_update_assocs(acct_update_object_t *update)
while((object = list_pop(update->objects))) {
if(object->cluster && assoc_mgr_cluster_name) {
/* only update the local clusters assocs */
- if(strcasecmp(object->cluster,
+ if(strcasecmp(object->cluster,
assoc_mgr_cluster_name)) {
- destroy_acct_association_rec(object);
+ destroy_acct_association_rec(object);
continue;
}
}
@@ -1690,18 +1690,18 @@ extern int assoc_mgr_update_assocs(acct_update_object_t *update)
debug4("not the right user");
continue;
}
-
+
if(object->acct
- && (!rec->acct
+ && (!rec->acct
|| strcasecmp(object->acct,
rec->acct))) {
debug4("not the right account");
continue;
}
-
+
if(object->partition
- && (!rec->partition
- || strcasecmp(object->partition,
+ && (!rec->partition
+ || strcasecmp(object->partition,
rec->partition))) {
debug4("not the right partition");
continue;
@@ -1716,7 +1716,7 @@ extern int assoc_mgr_update_assocs(acct_update_object_t *update)
continue;
}
break;
- }
+ }
}
//info("%d assoc %u", update->type, object->id);
switch(update->type) {
@@ -1731,38 +1731,38 @@ extern int assoc_mgr_update_assocs(acct_update_object_t *update)
if(setup_childern) {
/* we need to update the shares on
each sibling and child
- association now
+ association now
*/
parents_changed = 1;
}
}
- if(object->grp_cpu_mins != NO_VAL)
+ if(object->grp_cpu_mins != NO_VAL)
rec->grp_cpu_mins = object->grp_cpu_mins;
- if(object->grp_cpus != NO_VAL)
+ if(object->grp_cpus != NO_VAL)
rec->grp_cpus = object->grp_cpus;
- if(object->grp_jobs != NO_VAL)
+ if(object->grp_jobs != NO_VAL)
rec->grp_jobs = object->grp_jobs;
- if(object->grp_nodes != NO_VAL)
+ if(object->grp_nodes != NO_VAL)
rec->grp_nodes = object->grp_nodes;
- if(object->grp_submit_jobs != NO_VAL)
+ if(object->grp_submit_jobs != NO_VAL)
rec->grp_submit_jobs = object->grp_submit_jobs;
- if(object->grp_wall != NO_VAL)
+ if(object->grp_wall != NO_VAL)
rec->grp_wall = object->grp_wall;
-
- if(object->max_cpu_mins_pj != NO_VAL)
+
+ if(object->max_cpu_mins_pj != NO_VAL)
rec->max_cpu_mins_pj = object->max_cpu_mins_pj;
- if(object->max_cpus_pj != NO_VAL)
+ if(object->max_cpus_pj != NO_VAL)
rec->max_cpus_pj = object->max_cpus_pj;
- if(object->max_jobs != NO_VAL)
+ if(object->max_jobs != NO_VAL)
rec->max_jobs = object->max_jobs;
- if(object->max_nodes_pj != NO_VAL)
+ if(object->max_nodes_pj != NO_VAL)
rec->max_nodes_pj = object->max_nodes_pj;
- if(object->max_submit_jobs != NO_VAL)
+ if(object->max_submit_jobs != NO_VAL)
rec->max_submit_jobs = object->max_submit_jobs;
- if(object->max_wall_pj != NO_VAL)
+ if(object->max_wall_pj != NO_VAL)
rec->max_wall_pj = object->max_wall_pj;
-
+
if(object->parent_acct) {
xfree(rec->parent_acct);
@@ -1790,9 +1790,9 @@ extern int assoc_mgr_update_assocs(acct_update_object_t *update)
!= g_qos_count)) {
FREE_NULL_BITMAP(
rec->valid_qos);
- rec->valid_qos =
+ rec->valid_qos =
bit_alloc(g_qos_count);
- }
+ }
set_qos_bitstr_from_list(
rec->valid_qos, rec->qos_list);
}
@@ -1829,7 +1829,7 @@ extern int assoc_mgr_update_assocs(acct_update_object_t *update)
if(remove_assoc_notify) {
/* since there are some deadlock
issues while inside our lock here
- we have to process a notify later
+ we have to process a notify later
*/
if(!remove_list)
remove_list = list_create(
@@ -1842,16 +1842,16 @@ extern int assoc_mgr_update_assocs(acct_update_object_t *update)
default:
break;
}
-
- destroy_acct_association_rec(object);
+
+ destroy_acct_association_rec(object);
}
-
+
/* We have to do this after the entire list is processed since
* we may have added the parent which wasn't in the list before
*/
if(parents_changed) {
int reset = 1;
- list_sort(assoc_mgr_association_list,
+ list_sort(assoc_mgr_association_list,
(ListCmpF)_sort_assoc_dec);
list_iterator_reset(itr);
@@ -1894,10 +1894,10 @@ extern int assoc_mgr_update_assocs(acct_update_object_t *update)
goto is_user;
itr2 = list_iterator_create(
object->childern_list);
- while((rec = list_next(itr2)))
+ while((rec = list_next(itr2)))
count += rec->shares_raw;
list_iterator_reset(itr2);
- while((rec = list_next(itr2)))
+ while((rec = list_next(itr2)))
rec->level_shares = count;
list_iterator_destroy(itr2);
}
@@ -1932,20 +1932,20 @@ extern int assoc_mgr_update_assocs(acct_update_object_t *update)
list_iterator_destroy(itr);
slurm_mutex_unlock(&assoc_mgr_association_lock);
-
+
/* This needs to happen outside of the
assoc_mgr_association_lock */
if(remove_list) {
itr = list_iterator_create(remove_list);
- while((rec = list_next(itr)))
+ while((rec = list_next(itr)))
remove_assoc_notify(rec);
-
+
list_iterator_destroy(itr);
list_destroy(remove_list);
}
- return rc;
+ return rc;
}
extern int assoc_mgr_update_wckeys(acct_update_object_t *update)
@@ -1966,7 +1966,7 @@ extern int assoc_mgr_update_wckeys(acct_update_object_t *update)
/* only update the local clusters assocs */
if(strcasecmp(object->cluster,
assoc_mgr_cluster_name)) {
- destroy_acct_wckey_rec(object);
+ destroy_acct_wckey_rec(object);
continue;
}
}
@@ -1982,15 +1982,15 @@ extern int assoc_mgr_update_wckeys(acct_update_object_t *update)
debug4("not the right user");
continue;
}
-
+
if(object->name
- && (!rec->name
+ && (!rec->name
|| strcasecmp(object->name,
rec->name))) {
debug4("not the right wckey");
continue;
}
-
+
/* only check for on the slurmdbd */
if(!assoc_mgr_cluster_name && object->cluster
&& (!rec->cluster
@@ -2000,7 +2000,7 @@ extern int assoc_mgr_update_wckeys(acct_update_object_t *update)
continue;
}
break;
- }
+ }
}
//info("%d WCKEY %u", update->type, object->id);
switch(update->type) {
@@ -2036,20 +2036,20 @@ extern int assoc_mgr_update_wckeys(acct_update_object_t *update)
default:
break;
}
-
- destroy_acct_wckey_rec(object);
+
+ destroy_acct_wckey_rec(object);
}
list_iterator_destroy(itr);
slurm_mutex_unlock(&assoc_mgr_wckey_lock);
- return rc;
+ return rc;
}
extern int assoc_mgr_update_users(acct_update_object_t *update)
{
acct_user_rec_t * rec = NULL;
acct_user_rec_t * object = NULL;
-
+
ListIterator itr = NULL;
int rc = SLURM_SUCCESS;
uid_t pw_uid;
@@ -2062,7 +2062,7 @@ extern int assoc_mgr_update_users(acct_update_object_t *update)
while((object = list_pop(update->objects))) {
list_iterator_reset(itr);
while((rec = list_next(itr))) {
- if(!strcasecmp(object->name, rec->name))
+ if(!strcasecmp(object->name, rec->name))
break;
}
@@ -2086,7 +2086,7 @@ extern int assoc_mgr_update_users(acct_update_object_t *update)
object->default_wckey = NULL;
}
- if(object->admin_level != ACCT_ADMIN_NOTSET)
+ if(object->admin_level != ACCT_ADMIN_NOTSET)
rec->admin_level = object->admin_level;
break;
@@ -2132,13 +2132,13 @@ extern int assoc_mgr_update_users(acct_update_object_t *update)
default:
break;
}
-
- destroy_acct_user_rec(object);
+
+ destroy_acct_user_rec(object);
}
list_iterator_destroy(itr);
slurm_mutex_unlock(&assoc_mgr_user_lock);
- return rc;
+ return rc;
}
extern int assoc_mgr_update_qos(acct_update_object_t *update)
@@ -2152,9 +2152,9 @@ extern int assoc_mgr_update_qos(acct_update_object_t *update)
int rc = SLURM_SUCCESS;
bool resize_qos_bitstr = 0;
- if(!assoc_mgr_qos_list)
+ if(!assoc_mgr_qos_list)
return SLURM_SUCCESS;
-
+
slurm_mutex_lock(&assoc_mgr_qos_lock);
itr = list_iterator_create(assoc_mgr_qos_list);
while((object = list_pop(update->objects))) {
@@ -2176,11 +2176,11 @@ extern int assoc_mgr_update_qos(acct_update_object_t *update)
/* char *tmp = get_qos_complete_str_bitstr( */
/* assoc_mgr_qos_list, */
/* object->preempt_bitstr); */
-
+
/* info("new qos %s(%d) now preempts %s", */
/* object->name, object->id, tmp); */
/* xfree(tmp); */
-
+
/* Since in the database id's don't start at 1
instead of 0 we need to ignore the 0 bit and start
with 1 so increase the count by 1.
@@ -2189,7 +2189,7 @@ extern int assoc_mgr_update_qos(acct_update_object_t *update)
resize_qos_bitstr = 1;
g_qos_count = object->id+1;
}
- object = NULL;
+ object = NULL;
break;
case ACCT_MODIFY_QOS:
if(!rec) {
@@ -2197,57 +2197,57 @@ extern int assoc_mgr_update_qos(acct_update_object_t *update)
break;
}
- if(object->grp_cpu_mins != NO_VAL)
+ if(object->grp_cpu_mins != NO_VAL)
rec->grp_cpu_mins = object->grp_cpu_mins;
- if(object->grp_cpus != NO_VAL)
+ if(object->grp_cpus != NO_VAL)
rec->grp_cpus = object->grp_cpus;
- if(object->grp_jobs != NO_VAL)
+ if(object->grp_jobs != NO_VAL)
rec->grp_jobs = object->grp_jobs;
- if(object->grp_nodes != NO_VAL)
+ if(object->grp_nodes != NO_VAL)
rec->grp_nodes = object->grp_nodes;
- if(object->grp_submit_jobs != NO_VAL)
+ if(object->grp_submit_jobs != NO_VAL)
rec->grp_submit_jobs = object->grp_submit_jobs;
- if(object->grp_wall != NO_VAL)
+ if(object->grp_wall != NO_VAL)
rec->grp_wall = object->grp_wall;
-
- if(object->max_cpu_mins_pj != NO_VAL)
+
+ if(object->max_cpu_mins_pj != NO_VAL)
rec->max_cpu_mins_pj = object->max_cpu_mins_pj;
- if(object->max_cpus_pj != NO_VAL)
+ if(object->max_cpus_pj != NO_VAL)
rec->max_cpus_pj = object->max_cpus_pj;
- if(object->max_jobs_pu != NO_VAL)
+ if(object->max_jobs_pu != NO_VAL)
rec->max_jobs_pu = object->max_jobs_pu;
- if(object->max_nodes_pj != NO_VAL)
+ if(object->max_nodes_pj != NO_VAL)
rec->max_nodes_pj = object->max_nodes_pj;
- if(object->max_submit_jobs_pu != NO_VAL)
+ if(object->max_submit_jobs_pu != NO_VAL)
rec->max_submit_jobs_pu =
object->max_submit_jobs_pu;
- if(object->max_wall_pj != NO_VAL)
+ if(object->max_wall_pj != NO_VAL)
rec->max_wall_pj = object->max_wall_pj;
-
+
if(object->preempt_bitstr) {
- if(rec->preempt_bitstr)
+ if(rec->preempt_bitstr)
FREE_NULL_BITMAP(rec->preempt_bitstr);
-
+
rec->preempt_bitstr = object->preempt_bitstr;
object->preempt_bitstr = NULL;
/* char *tmp = get_qos_complete_str_bitstr( */
/* assoc_mgr_qos_list, */
/* rec->preempt_bitstr); */
-
+
/* info("qos %s(%d) now preempts %s", */
/* rec->name, rec->id, tmp); */
/* xfree(tmp); */
}
- if(object->priority != NO_VAL)
+ if(object->priority != NO_VAL)
rec->priority = object->priority;
- if(object->usage_factor != (double)NO_VAL)
+ if(object->usage_factor != (double)NO_VAL)
rec->usage_factor = object->usage_factor;
-
+
break;
case ACCT_REMOVE_QOS:
- if(rec)
+ if(rec)
list_delete_item(itr);
if(!assoc_mgr_association_list)
@@ -2267,12 +2267,12 @@ extern int assoc_mgr_update_qos(acct_update_object_t *update)
}
list_iterator_destroy(assoc_itr);
slurm_mutex_unlock(&assoc_mgr_association_lock);
-
+
break;
default:
break;
}
- destroy_acct_qos_rec(object);
+ destroy_acct_qos_rec(object);
}
if(resize_qos_bitstr) {
@@ -2280,10 +2280,10 @@ extern int assoc_mgr_update_qos(acct_update_object_t *update)
qos' */
list_iterator_reset(itr);
while((object = list_next(itr))) {
- if(!object->preempt_bitstr)
+ if(!object->preempt_bitstr)
continue;
- object->preempt_bitstr =
+ object->preempt_bitstr =
bit_realloc(object->preempt_bitstr,
g_qos_count);
}
@@ -2303,10 +2303,10 @@ extern int assoc_mgr_update_qos(acct_update_object_t *update)
}
}
list_iterator_destroy(itr);
-
+
slurm_mutex_unlock(&assoc_mgr_qos_lock);
-
- return rc;
+
+ return rc;
}
extern int assoc_mgr_validate_assoc_id(void *db_conn,
@@ -2316,20 +2316,20 @@ extern int assoc_mgr_validate_assoc_id(void *db_conn,
ListIterator itr = NULL;
acct_association_rec_t * found_assoc = NULL;
- if(!assoc_mgr_association_list)
- if(_get_assoc_mgr_association_list(db_conn, enforce)
+ if(!assoc_mgr_association_list)
+ if(_get_assoc_mgr_association_list(db_conn, enforce)
== SLURM_ERROR)
return SLURM_ERROR;
if((!assoc_mgr_association_list
|| !list_count(assoc_mgr_association_list))
- && !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
+ && !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
return SLURM_SUCCESS;
-
+
slurm_mutex_lock(&assoc_mgr_association_lock);
itr = list_iterator_create(assoc_mgr_association_list);
while((found_assoc = list_next(itr))) {
- if(assoc_id == found_assoc->id)
+ if(assoc_id == found_assoc->id)
break;
}
list_iterator_destroy(itr);
@@ -2358,7 +2358,7 @@ extern void assoc_mgr_clear_used_info(void)
slurm_mutex_unlock(&assoc_mgr_association_lock);
}
-extern int dump_assoc_mgr_state(char *state_save_location)
+extern int dump_assoc_mgr_state(char *state_save_location)
{
static int high_buffer_size = (1024 * 1024);
int error_code = 0, log_fd;
@@ -2378,41 +2378,41 @@ extern int dump_assoc_mgr_state(char *state_save_location)
msg.my_list = assoc_mgr_association_list;
/* let us know what to unpack */
pack16(DBD_ADD_ASSOCS, buffer);
- slurmdbd_pack_list_msg(SLURMDBD_VERSION,
+ slurmdbd_pack_list_msg(SLURMDBD_VERSION,
DBD_ADD_ASSOCS, &msg, buffer);
slurm_mutex_unlock(&assoc_mgr_association_lock);
}
-
+
if(assoc_mgr_user_list) {
memset(&msg, 0, sizeof(dbd_list_msg_t));
slurm_mutex_lock(&assoc_mgr_user_lock);
msg.my_list = assoc_mgr_user_list;
/* let us know what to unpack */
pack16(DBD_ADD_USERS, buffer);
- slurmdbd_pack_list_msg(SLURMDBD_VERSION,
+ slurmdbd_pack_list_msg(SLURMDBD_VERSION,
DBD_ADD_USERS, &msg, buffer);
slurm_mutex_unlock(&assoc_mgr_user_lock);
}
- if(assoc_mgr_qos_list) {
+ if(assoc_mgr_qos_list) {
memset(&msg, 0, sizeof(dbd_list_msg_t));
slurm_mutex_lock(&assoc_mgr_qos_lock);
msg.my_list = assoc_mgr_qos_list;
/* let us know what to unpack */
pack16(DBD_ADD_QOS, buffer);
- slurmdbd_pack_list_msg(SLURMDBD_VERSION,
- DBD_ADD_QOS, &msg, buffer);
+ slurmdbd_pack_list_msg(SLURMDBD_VERSION,
+ DBD_ADD_QOS, &msg, buffer);
slurm_mutex_unlock(&assoc_mgr_qos_lock);
}
- if(assoc_mgr_wckey_list) {
+ if(assoc_mgr_wckey_list) {
memset(&msg, 0, sizeof(dbd_list_msg_t));
slurm_mutex_lock(&assoc_mgr_wckey_lock);
msg.my_list = assoc_mgr_wckey_list;
/* let us know what to unpack */
pack16(DBD_ADD_WCKEYS, buffer);
- slurmdbd_pack_list_msg(SLURMDBD_VERSION,
- DBD_ADD_WCKEYS, &msg, buffer);
+ slurmdbd_pack_list_msg(SLURMDBD_VERSION,
+ DBD_ADD_WCKEYS, &msg, buffer);
slurm_mutex_unlock(&assoc_mgr_wckey_lock);
}
@@ -2420,7 +2420,7 @@ extern int dump_assoc_mgr_state(char *state_save_location)
reg_file = xstrdup_printf("%s/assoc_mgr_state", state_save_location);
old_file = xstrdup_printf("%s.old", reg_file);
new_file = xstrdup_printf("%s.new", reg_file);
-
+
slurm_mutex_lock(&assoc_mgr_file_lock);
log_fd = creat(new_file, 0600);
if (log_fd < 0) {
@@ -2477,10 +2477,10 @@ extern int dump_assoc_mgr_state(char *state_save_location)
while((assoc = list_next(itr))) {
if(!assoc->user)
continue;
-
+
pack32(assoc->id, buffer);
/* we only care about the main part here so
- anything under 1 we are dropping
+ anything under 1 we are dropping
*/
pack64((uint64_t)assoc->usage_raw, buffer);
pack32(assoc->grp_used_wall, buffer);
@@ -2492,7 +2492,7 @@ extern int dump_assoc_mgr_state(char *state_save_location)
reg_file = xstrdup_printf("%s/assoc_usage", state_save_location);
old_file = xstrdup_printf("%s.old", reg_file);
new_file = xstrdup_printf("%s.new", reg_file);
-
+
log_fd = creat(new_file, 0600);
if (log_fd < 0) {
error("Can't save state, create file %s error %m",
@@ -2548,7 +2548,7 @@ extern int dump_assoc_mgr_state(char *state_save_location)
while((qos = list_next(itr))) {
pack32(qos->id, buffer);
/* we only care about the main part here so
- anything under 1 we are dropping
+ anything under 1 we are dropping
*/
pack64((uint64_t)qos->usage_raw, buffer);
pack32(qos->grp_used_wall, buffer);
@@ -2560,7 +2560,7 @@ extern int dump_assoc_mgr_state(char *state_save_location)
reg_file = xstrdup_printf("%s/qos_usage", state_save_location);
old_file = xstrdup_printf("%s.old", reg_file);
new_file = xstrdup_printf("%s.new", reg_file);
-
+
log_fd = creat(new_file, 0600);
if (log_fd < 0) {
error("Can't save state, create file %s error %m",
@@ -2600,7 +2600,7 @@ extern int dump_assoc_mgr_state(char *state_save_location)
xfree(reg_file);
xfree(new_file);
slurm_mutex_unlock(&assoc_mgr_file_lock);
-
+
free_buf(buffer);
END_TIMER2("dump_assoc_mgr_state");
return error_code;
@@ -2640,7 +2640,7 @@ extern int load_assoc_usage(char *state_save_location)
if (errno == EINTR)
continue;
else {
- error("Read error on %s: %m",
+ error("Read error on %s: %m",
state_file);
break;
}
@@ -2669,7 +2669,7 @@ extern int load_assoc_usage(char *state_save_location)
}
safe_unpack_time(&buf_time, buffer);
-
+
slurm_mutex_lock(&assoc_mgr_association_lock);
itr = list_iterator_create(assoc_mgr_association_list);
while (remaining_buf(buffer) > 0) {
@@ -2681,10 +2681,10 @@ extern int load_assoc_usage(char *state_save_location)
safe_unpack32(&assoc_id, buffer);
safe_unpack64(&usage_raw, buffer);
safe_unpack32(&grp_used_wall, buffer);
- while((assoc = list_next(itr)))
+ while((assoc = list_next(itr)))
if(assoc->id == assoc_id)
break;
-
+
while(assoc) {
assoc->grp_used_wall += grp_used_wall;
assoc->usage_raw += (long double)usage_raw;
@@ -2697,7 +2697,7 @@ extern int load_assoc_usage(char *state_save_location)
}
list_iterator_destroy(itr);
slurm_mutex_unlock(&assoc_mgr_association_lock);
-
+
free_buf(buffer);
return SLURM_SUCCESS;
@@ -2744,7 +2744,7 @@ extern int load_qos_usage(char *state_save_location)
if (errno == EINTR)
continue;
else {
- error("Read error on %s: %m",
+ error("Read error on %s: %m",
state_file);
break;
}
@@ -2773,7 +2773,7 @@ extern int load_qos_usage(char *state_save_location)
}
safe_unpack_time(&buf_time, buffer);
-
+
slurm_mutex_lock(&assoc_mgr_qos_lock);
itr = list_iterator_create(assoc_mgr_qos_list);
while (remaining_buf(buffer) > 0) {
@@ -2785,19 +2785,19 @@ extern int load_qos_usage(char *state_save_location)
safe_unpack32(&qos_id, buffer);
safe_unpack64(&usage_raw, buffer);
safe_unpack32(&grp_used_wall, buffer);
- while((qos = list_next(itr)))
+ while((qos = list_next(itr)))
if(qos->id == qos_id)
break;
if(qos) {
qos->grp_used_wall += grp_used_wall;
qos->usage_raw += (long double)usage_raw;
}
-
+
list_iterator_reset(itr);
}
list_iterator_destroy(itr);
slurm_mutex_unlock(&assoc_mgr_qos_lock);
-
+
free_buf(buffer);
return SLURM_SUCCESS;
@@ -2822,7 +2822,7 @@ extern int load_assoc_mgr_state(char *state_save_location)
Buf buffer;
time_t buf_time;
dbd_list_msg_t *msg = NULL;
-
+
/* read the file */
state_file = xstrdup(state_save_location);
xstrcat(state_file, "/assoc_mgr_state"); /* Always ignore .old file */
@@ -2842,7 +2842,7 @@ extern int load_assoc_mgr_state(char *state_save_location)
if (errno == EINTR)
continue;
else {
- error("Read error on %s: %m",
+ error("Read error on %s: %m",
state_file);
break;
}
@@ -2890,7 +2890,7 @@ extern int load_assoc_mgr_state(char *state_save_location)
assoc_mgr_association_list = msg->my_list;
_post_association_list(assoc_mgr_association_list);
- debug("Recovered %u associations",
+ debug("Recovered %u associations",
list_count(assoc_mgr_association_list));
slurm_mutex_unlock(&assoc_mgr_association_lock);
msg->my_list = NULL;
@@ -2910,7 +2910,7 @@ extern int load_assoc_mgr_state(char *state_save_location)
list_destroy(assoc_mgr_user_list);
assoc_mgr_user_list = msg->my_list;
_post_user_list(assoc_mgr_user_list);
- debug("Recovered %u users",
+ debug("Recovered %u users",
list_count(assoc_mgr_user_list));
slurm_mutex_unlock(&assoc_mgr_user_lock);
msg->my_list = NULL;
@@ -2929,11 +2929,11 @@ extern int load_assoc_mgr_state(char *state_save_location)
if(assoc_mgr_qos_list)
list_destroy(assoc_mgr_qos_list);
assoc_mgr_qos_list = msg->my_list;
- debug("Recovered %u qos",
+ debug("Recovered %u qos",
list_count(assoc_mgr_qos_list));
slurm_mutex_unlock(&assoc_mgr_qos_lock);
msg->my_list = NULL;
- slurmdbd_free_list_msg(SLURMDBD_VERSION, msg);
+ slurmdbd_free_list_msg(SLURMDBD_VERSION, msg);
break;
case DBD_ADD_WCKEYS:
error_code = slurmdbd_unpack_list_msg(
@@ -2948,11 +2948,11 @@ extern int load_assoc_mgr_state(char *state_save_location)
if(assoc_mgr_wckey_list)
list_destroy(assoc_mgr_wckey_list);
assoc_mgr_wckey_list = msg->my_list;
- debug("Recovered %u wckeys",
+ debug("Recovered %u wckeys",
list_count(assoc_mgr_wckey_list));
slurm_mutex_unlock(&assoc_mgr_wckey_lock);
msg->my_list = NULL;
- slurmdbd_free_list_msg(SLURMDBD_VERSION, msg);
+ slurmdbd_free_list_msg(SLURMDBD_VERSION, msg);
break;
default:
error("unknown type %u given", type);
@@ -2968,7 +2968,7 @@ unpack_error:
if(buffer)
free_buf(buffer);
return SLURM_ERROR;
-}
+}
extern int assoc_mgr_refresh_lists(void *db_conn, assoc_init_args_t *args)
{
@@ -2980,7 +2980,7 @@ extern int assoc_mgr_refresh_lists(void *db_conn, assoc_init_args_t *args)
cache_level = args->cache_level;
return SLURM_SUCCESS;
}
-
+
if(cache_level & ASSOC_MGR_CACHE_ASSOC) {
if(_refresh_assoc_mgr_association_list(db_conn, enforce)
== SLURM_ERROR)
@@ -3001,14 +3001,14 @@ extern int assoc_mgr_refresh_lists(void *db_conn, assoc_init_args_t *args)
running_cache = 0;
- return SLURM_SUCCESS;
+ return SLURM_SUCCESS;
}
extern int assoc_mgr_set_missing_uids()
{
uid_t pw_uid;
ListIterator itr = NULL;
-
+
if(assoc_mgr_association_list) {
acct_association_rec_t *object = NULL;
slurm_mutex_lock(&assoc_mgr_association_lock);
@@ -3066,7 +3066,7 @@ extern int assoc_mgr_set_missing_uids()
slurm_mutex_unlock(&assoc_mgr_user_lock);
}
- return SLURM_SUCCESS;
+ return SLURM_SUCCESS;
}
diff --git a/src/common/assoc_mgr.h b/src/common/assoc_mgr.h
index facdd26711ff69b9d1021ef6924ba82cbb673b3c..a57f5a36abfe7893957cfe8adadd39ddea5465bb 100644
--- a/src/common/assoc_mgr.h
+++ b/src/common/assoc_mgr.h
@@ -6,38 +6,38 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
\*****************************************************************************/
-#ifndef _SLURM_ASSOC_MGR_H
+#ifndef _SLURM_ASSOC_MGR_H
#define _SLURM_ASSOC_MGR_H
#ifdef HAVE_CONFIG_H
@@ -75,8 +75,8 @@ extern pthread_mutex_t assoc_mgr_user_lock;
extern pthread_mutex_t assoc_mgr_file_lock;
extern pthread_mutex_t assoc_mgr_wckey_lock;
-/*
- * get info from the storage
+/*
+ * get info from the storage
* IN: assoc - acct_association_rec_t with at least cluster and
* account set for account association. To get user
* association set user, and optional partition.
@@ -90,17 +90,17 @@ extern pthread_mutex_t assoc_mgr_wckey_lock;
*/
extern int assoc_mgr_get_user_assocs(void *db_conn,
acct_association_rec_t *assoc,
- int enforce,
+ int enforce,
List assoc_list);
-/*
- * get info from the storage
+/*
+ * get info from the storage
* IN/OUT: assoc - acct_association_rec_t with at least cluster and
* account set for account association. To get user
* association set user, and optional partition.
* Sets "id" field with the association ID.
* IN: enforce - return an error if no such association exists
- * IN/OUT: assoc_pptr - if non-NULL then return a pointer to the
+ * IN/OUT: assoc_pptr - if non-NULL then return a pointer to the
* acct_association record in cache on success
* DO NOT FREE.
* RET: SLURM_SUCCESS on success, else SLURM_ERROR
@@ -110,12 +110,12 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
int enforce,
acct_association_rec_t **assoc_pptr);
-/*
- * get info from the storage
+/*
+ * get info from the storage
* IN/OUT: user - acct_user_rec_t with the name set of the user.
* "default_account" will be filled in on
* successful return DO NOT FREE.
- * IN/OUT: user_pptr - if non-NULL then return a pointer to the
+ * IN/OUT: user_pptr - if non-NULL then return a pointer to the
* acct_user record in cache on success
* DO NOT FREE.
* RET: SLURM_SUCCESS on success SLURM_ERROR else
@@ -124,10 +124,10 @@ extern int assoc_mgr_fill_in_user(void *db_conn, acct_user_rec_t *user,
int enforce,
acct_user_rec_t **user_pptr);
-/*
- * get info from the storage
+/*
+ * get info from the storage
* IN/OUT: qos - acct_qos_rec_t with the id set of the qos.
- * IN/OUT: qos_pptr - if non-NULL then return a pointer to the
+ * IN/OUT: qos_pptr - if non-NULL then return a pointer to the
* acct_qos record in cache on success
* DO NOT FREE.
* RET: SLURM_SUCCESS on success SLURM_ERROR else
@@ -135,13 +135,13 @@ extern int assoc_mgr_fill_in_user(void *db_conn, acct_user_rec_t *user,
extern int assoc_mgr_fill_in_qos(void *db_conn, acct_qos_rec_t *qos,
int enforce,
acct_qos_rec_t **qos_pptr);
-/*
- * get info from the storage
+/*
+ * get info from the storage
* IN/OUT: wckey - acct_wckey_rec_t with the name, cluster and user
- * for the wckey association.
+ * for the wckey association.
* Sets "id" field with the wckey ID.
* IN: enforce - return an error if no such wckey exists
- * IN/OUT: wckey_pptr - if non-NULL then return a pointer to the
+ * IN/OUT: wckey_pptr - if non-NULL then return a pointer to the
* acct_wckey record in cache on success
* RET: SLURM_SUCCESS on success, else SLURM_ERROR
*/
@@ -150,16 +150,16 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn,
int enforce,
acct_wckey_rec_t **wckey_pptr);
-/*
- * get admin_level of uid
+/*
+ * get admin_level of uid
* IN: uid - uid of user to check admin_level of.
- * RET: admin level ACCT_ADMIN_NOTSET on error
+ * RET: admin level ACCT_ADMIN_NOTSET on error
*/
-extern acct_admin_level_t assoc_mgr_get_admin_level(void *db_conn,
+extern acct_admin_level_t assoc_mgr_get_admin_level(void *db_conn,
uint32_t uid);
-/*
- * see if user is coordinator of given acct
+/*
+ * see if user is coordinator of given acct
* IN: uid - uid of user to check.
* IN: acct - name of account
* RET: 0 for no, 1 for yes
@@ -172,7 +172,7 @@ extern int assoc_mgr_fini(char *state_save_location);
/*
* get the share information from the association list in the form of
- * a list containing association_share_object_t's
+ * a list containing association_share_object_t's
* IN: uid: uid_t of user issuing the request
* IN: acct_list: char * list of accounts you want (NULL for all)
* IN: user_list: char * list of user names you want (NULL for all)
@@ -180,47 +180,47 @@ extern int assoc_mgr_fini(char *state_save_location);
extern List assoc_mgr_get_shares(
void *db_conn, uid_t uid, List acct_list, List user_list);
-/*
- * update associations in cache
+/*
+ * update associations in cache
* IN: acct_update_object_t *object
* RET: SLURM_SUCCESS on success (or not found) SLURM_ERROR else
*/
extern int assoc_mgr_update_assocs(acct_update_object_t *update);
-/*
- * update wckeys in cache
+/*
+ * update wckeys in cache
* IN: acct_update_object_t *object
* RET: SLURM_SUCCESS on success (or not found) SLURM_ERROR else
*/
extern int assoc_mgr_update_wckeys(acct_update_object_t *update);
-/*
- * update qos in cache
+/*
+ * update qos in cache
* IN: acct_update_object_t *object
* RET: SLURM_SUCCESS on success (or not found) SLURM_ERROR else
*/
extern int assoc_mgr_update_qos(acct_update_object_t *update);
-/*
- * update users in cache
+/*
+ * update users in cache
* IN: acct_update_object_t *object
* RET: SLURM_SUCCESS on success (or not found) SLURM_ERROR else
*/
extern int assoc_mgr_update_users(acct_update_object_t *update);
-/*
- * validate that an association ID is still valid
- * IN: assoc_id - association ID previously returned by
- * get_assoc_id(void *db_conn,
+/*
+ * validate that an association ID is still valid
+ * IN: assoc_id - association ID previously returned by
+ * get_assoc_id(void *db_conn,
)
* RET: SLURM_SUCCESS on success SLURM_ERROR else
*/
-extern int assoc_mgr_validate_assoc_id(void *db_conn,
+extern int assoc_mgr_validate_assoc_id(void *db_conn,
uint32_t assoc_id,
int enforce);
/*
- * clear the used_* fields from every assocation,
+ * clear the used_* fields from every assocation,
* used on reconfiguration
*/
extern void assoc_mgr_clear_used_info(void);
diff --git a/src/common/basil_resv_conf.c b/src/common/basil_resv_conf.c
index 7f185cd7b15ed861bbcd36d5a5f95814f7f75ae4..d14d54307d34c706df27de92105e799b0bd8eff8 100644
--- a/src/common/basil_resv_conf.c
+++ b/src/common/basil_resv_conf.c
@@ -1,38 +1,38 @@
/*****************************************************************************\
* basil_resv_conf.h - user interface to BASIL for confirming a resource
- * reservation. BASIL is Cray's Batch Application Scheduler Interface
+ * reservation. BASIL is Cray's Batch Application Scheduler Interface
* Layer.
*****************************************************************************
* Copyright (C) 2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -57,7 +57,7 @@
/*
* basil_resv_conf - confirm a previously created BASIL resource reservation.
- * This must be called from the same container from which the user
+ * This must be called from the same container from which the user
* application is to run. The container is normally a Linux Process
* Group or SGI Process Aggregate (see http://oss.sgi.com/projects/pagg).
* IN reservation_id - ID of reservation conform
@@ -74,7 +74,7 @@ extern int basil_resv_conf(char *reservation_id, uint32_t job_id)
error("basil confirm of %s error: %s", reservation_id, "TBD");
return SLURM_ERROR;
}
- debug("basil confirm of reservation %s by job %u complete",
+ debug("basil confirm of reservation %s by job %u complete",
reservation_id, job_id);
#else
debug("basil confirm of reservation %s by job %u complete",
diff --git a/src/common/basil_resv_conf.h b/src/common/basil_resv_conf.h
index ab72578f9a4e0c6e9c689457a77a882105428c0c..928a6eaba17be1ceeabb86c5362b9963b2847d61 100644
--- a/src/common/basil_resv_conf.h
+++ b/src/common/basil_resv_conf.h
@@ -1,38 +1,38 @@
/*****************************************************************************\
* basil_resv_conf.h - user interface to BASIL for confirming a resource
- * reservation. BASIL is Cray's Batch Application Scheduler Interface
+ * reservation. BASIL is Cray's Batch Application Scheduler Interface
* Layer.
*****************************************************************************
* Copyright (C) 2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -54,7 +54,7 @@
/*
* basil_resv_conf - confirm a previously created BASIL resource reservation.
- * This must be called from the same container from which the user
+ * This must be called from the same container from which the user
* application is to run. The container is normally a Linux Process
* Group or SGI Process Aggregate (see http://oss.sgi.com/projects/pagg).
* IN reservation_id - ID of reservation conform
diff --git a/src/common/bitstring.c b/src/common/bitstring.c
index 501283824421f3d26358d4b757f5e203a56b8955..04f5532346ff51d2a500a033f956620cadae2e67 100644
--- a/src/common/bitstring.c
+++ b/src/common/bitstring.c
@@ -1,39 +1,39 @@
/*****************************************************************************\
* bitstring.c - bitmap manipulation functions
*****************************************************************************
- * See comments about origin, limitations, and internal structure in
+ * See comments about origin, limitations, and internal structure in
* bitstring.h.
*
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jim Garlick <garlick@llnl.gov>, Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -51,8 +51,8 @@
#include "src/common/xstring.h"
/*
- * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
- * for details.
+ * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
+ * for details.
*/
strong_alias(bit_alloc, slurm_bit_alloc);
strong_alias(bit_test, slurm_bit_test);
@@ -95,7 +95,7 @@ strong_alias(bit_copybits, slurm_bit_copybits);
strong_alias(bit_get_bit_num, slurm_bit_get_bit_num);
strong_alias(bit_get_pos_num, slurm_bit_get_pos_num);
-/*
+/*
* Allocate a bitstring.
* nbits (IN) valid bits in new bitstring, initialized to all clear
* RETURN new bitstring
@@ -113,9 +113,9 @@ bit_alloc(bitoff_t nbits)
return new;
}
-/*
+/*
* Reallocate a bitstring (expand or contract size).
- * b (IN) pointer to old bitstring
+ * b (IN) pointer to old bitstring
* nbits (IN) valid bits in new bitstr
* RETURN new bitstring
*/
@@ -124,7 +124,7 @@ bit_realloc(bitstr_t *b, bitoff_t nbits)
{
bitoff_t obits;
bitstr_t *new = NULL;
-
+
_assert_bitstr_valid(b);
obits = _bitstr_bits(b);
new = realloc(b, _bitstr_words(nbits) * sizeof(bitstr_t));
@@ -137,10 +137,10 @@ bit_realloc(bitstr_t *b, bitoff_t nbits)
return new;
}
-/*
+/*
* Free a bitstr.
* b (IN/OUT) bitstr to be freed
- */
+ */
void
bit_free(bitstr_t *b)
{
@@ -162,8 +162,8 @@ bit_size(bitstr_t *b)
return _bitstr_bits(b);
}
-/*
- * Is bit N of bitstring b set?
+/*
+ * Is bit N of bitstring b set?
* b (IN) bitstring to test
* bit (IN) bit position to test
* RETURN 1 if bit set, 0 if clear
@@ -176,7 +176,7 @@ bit_test(bitstr_t *b, bitoff_t bit)
return ((b[_bit_word(bit)] & _bit_mask(bit)) ? 1 : 0);
}
-/*
+/*
* Set bit N of bitstring.
* b (IN) target bitstring
* bit (IN) bit position to set
@@ -189,7 +189,7 @@ bit_set(bitstr_t *b, bitoff_t bit)
b[_bit_word(bit)] |= _bit_mask(bit);
}
-/*
+/*
* Clear bit N of bitstring
* b (IN) target bitstring
* bit (IN) bit position to clear
@@ -202,7 +202,7 @@ bit_clear(bitstr_t *b, bitoff_t bit)
b[_bit_word(bit)] &= ~_bit_mask(bit);
}
-/*
+/*
* Set bits start ... stop in bitstring
* b (IN) target bitstring
* start (IN) starting (low numbered) bit position
@@ -225,7 +225,7 @@ bit_nset(bitstr_t *b, bitoff_t start, bitoff_t stop)
}
}
-/*
+/*
* Clear bits start ... stop in bitstring
* b (IN) target bitstring
* start (IN) starting (low numbered) bit position
@@ -248,7 +248,7 @@ bit_nclear(bitstr_t *b, bitoff_t start, bitoff_t stop)
}
}
-/*
+/*
* Find first bit clear in bitstring.
* b (IN) bitstring to search
* nbits (IN) number of bits to search
@@ -388,12 +388,12 @@ bit_nffs(bitstr_t *b, int n)
return value;
}
-/*
+/*
* Find first bit set in b.
* b (IN) bitstring to search
* RETURN resulting bit position (-1 if none found)
*/
-bitoff_t
+bitoff_t
bit_ffs(bitstr_t *b)
{
bitoff_t bit = 0, value = -1;
@@ -418,12 +418,12 @@ bit_ffs(bitstr_t *b)
return value;
}
-/*
+/*
* Find last bit set in b.
* b (IN) bitstring to search
* RETURN resulting bit position (-1 if none found)
*/
-bitoff_t
+bitoff_t
bit_fls(bitstr_t *b)
{
bitoff_t bit, value = -1;
@@ -435,7 +435,7 @@ bit_fls(bitstr_t *b)
return -1;
bit = _bitstr_bits(b) - 1; /* zero origin */
-
+
while (bit >= 0 && /* test partitial words */
(_bit_word(bit) == _bit_word(bit + 1))) {
if (bit_test(b, bit)) {
@@ -461,8 +461,8 @@ bit_fls(bitstr_t *b)
return value;
}
-/*
- * set all bits between the first and last bits set (i.e. fill in the gaps
+/*
+ * set all bits between the first and last bits set (i.e. fill in the gaps
* to make set bits contiguous)
*/
void
@@ -493,7 +493,7 @@ bit_super_set(bitstr_t *b1, bitstr_t *b2) {
assert(_bitstr_bits(b1) == _bitstr_bits(b2));
for (bit = 0; bit < _bitstr_bits(b1); bit += sizeof(bitstr_t)*8) {
- if (b1[_bit_word(bit)] != (b1[_bit_word(bit)] &
+ if (b1[_bit_word(bit)] != (b1[_bit_word(bit)] &
b2[_bit_word(bit)]))
return 0;
}
@@ -542,7 +542,7 @@ bit_and(bitstr_t *b1, bitstr_t *b2) {
b1[_bit_word(bit)] &= b2[_bit_word(bit)];
}
-/*
+/*
* b1 = ~b1 one's complement
* b1 (IN/OUT) first bitmap
*/
@@ -556,7 +556,7 @@ bit_not(bitstr_t *b) {
b[_bit_word(bit)] = ~b[_bit_word(bit)];
}
-/*
+/*
* b1 |= b2
* b1 (IN/OUT) first bitmap
* b2 (IN) second bitmap
@@ -575,7 +575,7 @@ bit_or(bitstr_t *b1, bitstr_t *b2) {
-/*
+/*
* return a copy of the supplied bitmap
*/
bitstr_t *
@@ -618,7 +618,7 @@ static uint32_t
hweight(uint32_t w)
{
uint32_t res;
-
+
res = (w & 0x55555555) + ((w >> 1) & 0x55555555);
res = (res & 0x33333333) + ((res >> 2) & 0x33333333);
res = (res & 0x0F0F0F0F) + ((res >> 4) & 0x0F0F0F0F);
@@ -635,7 +635,7 @@ static uint64_t
hweight(uint64_t w)
{
uint64_t res;
-
+
res = (w & 0x5555555555555555) + ((w >> 1) & 0x5555555555555555);
res = (res & 0x3333333333333333) + ((res >> 2) & 0x3333333333333333);
res = (res & 0x0F0F0F0F0F0F0F0F) + ((res >> 4) & 0x0F0F0F0F0F0F0F0F);
@@ -650,7 +650,7 @@ hweight(uint64_t w)
/*
* Count the number of bits set in bitstring.
* b (IN) bitstring to check
- * RETURN count of set bits
+ * RETURN count of set bits
*/
int
bit_set_count(bitstr_t *b)
@@ -706,7 +706,7 @@ bit_overlap(bitstr_t *b1, bitstr_t *b2)
/*
* Count the number of bits clear in bitstring.
* b (IN) bitstring to check
- * RETURN count of clear bits
+ * RETURN count of clear bits
*/
int
bit_clear_count(bitstr_t *b)
@@ -769,7 +769,7 @@ int_and_set_count(int *i1, int ilen, bitstr_t *b2) {
return(sum);
}
-/*
+/*
* rotate b1 by n bits returning a rotated copy
* b1 (IN) bitmap to rotate
* n (IN) rotation distance (+ = rotate left, - = rotate right)
@@ -816,7 +816,7 @@ bit_rotate_copy(bitstr_t *b1, int n, bitoff_t nbits) {
return(new);
}
-/*
+/*
* rotate b1 by n bits
* b1 (IN/OUT) bitmap to rotate
* n (IN) rotation distance (+ = rotate left, - = rotate right)
@@ -864,7 +864,7 @@ bit_pick_cnt(bitstr_t *b, bitoff_t nbits) {
}
new_bits = hweight(b[word]);
- if (((count + new_bits) <= nbits) &&
+ if (((count + new_bits) <= nbits) &&
((bit + word_size - 1) < _bitstr_bits(b))) {
new[word] = b[word];
count += new_bits;
@@ -887,7 +887,7 @@ bit_pick_cnt(bitstr_t *b, bitoff_t nbits) {
return new;
}
-/*
+/*
* XXX the relationship between stdint types and "unsigned [long] long"
* types is architecture/compiler dependent, so this may have to be tweaked.
*/
@@ -926,11 +926,11 @@ bit_fmt(char *str, int len, bitstr_t *b)
count++;
}
if (bit == start) /* add single bit position */
- ret = snprintf(str+strlen(str),
+ ret = snprintf(str+strlen(str),
len-strlen(str),
BITSTR_SINGLE_FMT, start);
else /* add bit position range */
- ret = snprintf(str+strlen(str),
+ ret = snprintf(str+strlen(str),
len-strlen(str),
BITSTR_RANGE_FMT, start, bit);
assert(ret != -1);
@@ -951,13 +951,13 @@ bit_fmt(char *str, int len, bitstr_t *b)
int
bit_unfmt(bitstr_t *b, char *str)
{
- int *intvec, rc = 0;
+ int *intvec, rc = 0;
_assert_bitstr_valid(b);
if (str[0] == '\0') /* no bits set */
return rc;
intvec = bitfmt2int(str);
- if (intvec == NULL)
+ if (intvec == NULL)
return -1;
rc = inx2bitstr(b, intvec);
xfree(intvec);
@@ -965,22 +965,22 @@ bit_unfmt(bitstr_t *b, char *str)
}
/*
- * bitfmt2int - convert a string describing bitmap (output from bit_fmt,
- * e.g. "0-30,45,50-60") into an array of integer (start/end) pairs
+ * bitfmt2int - convert a string describing bitmap (output from bit_fmt,
+ * e.g. "0-30,45,50-60") into an array of integer (start/end) pairs
* terminated by -1 (e.g. "0, 30, 45, 45, 50, 60, -1")
* input: bitmap string as produced by bitstring.c : bitfmt
* output: an array of integers
* NOTE: the caller must xfree the returned memory
*/
int *
-bitfmt2int (char *bit_str_ptr)
+bitfmt2int (char *bit_str_ptr)
{
int *bit_int_ptr, i, bit_inx, size, sum, start_val;
- if (bit_str_ptr == NULL)
+ if (bit_str_ptr == NULL)
return NULL;
size = strlen (bit_str_ptr) + 1;
- bit_int_ptr = xmalloc ( sizeof (int) *
+ bit_int_ptr = xmalloc ( sizeof (int) *
(size * 2 + 1)); /* more than enough space */
bit_inx = sum = 0;
@@ -996,7 +996,7 @@ bitfmt2int (char *bit_str_ptr)
sum = 0;
}
- else if (bit_str_ptr[i] == ',' ||
+ else if (bit_str_ptr[i] == ',' ||
bit_str_ptr[i] == '\0') {
if (i == 0)
break;
@@ -1016,20 +1016,20 @@ bitfmt2int (char *bit_str_ptr)
/*
* intbitfmt - convert a array of interger (start/end) pairs
* terminated by -1 (e.g. "0, 30, 45, 45, 50, 60, -1") to a
- * string describing bitmap (output from bit_fmt, e.g. "0-30,45,50-60")
+ * string describing bitmap (output from bit_fmt, e.g. "0-30,45,50-60")
* input: int array
* output: char *
* NOTE: the caller must xfree the returned memory
*/
char *
-inx2bitfmt (int *inx)
+inx2bitfmt (int *inx)
{
int j=0;
char *bit_char_ptr = NULL;
- if (inx == NULL)
+ if (inx == NULL)
return NULL;
-
+
while (inx[j] >= 0) {
if(bit_char_ptr)
xstrfmtcat(bit_char_ptr, ",%d-%d", inx[j], inx[j+1]);
@@ -1041,10 +1041,10 @@ inx2bitfmt (int *inx)
return bit_char_ptr;
}
-int inx2bitstr(bitstr_t *b, int *inx)
+int inx2bitstr(bitstr_t *b, int *inx)
{
int *p, rc=0;
-
+
assert(b);
assert(inx);
@@ -1055,7 +1055,7 @@ int inx2bitstr(bitstr_t *b, int *inx)
rc = -1;
break;
}
- bit_nset(b, *p, *(p + 1));
+ bit_nset(b, *p, *(p + 1));
}
return rc;
}
@@ -1082,8 +1082,8 @@ char * bit_fmt_hexmask(bitstr_t * bitmap)
retstr = xmalloc(charsize + 3);
- retstr[0] = '0';
- retstr[1] = 'x';
+ retstr[0] = '0';
+ retstr[1] = 'x';
retstr[charsize + 2] = '\0';
ptr = &retstr[charsize + 1];
for (i=0; i < bitsize;) {
@@ -1112,7 +1112,7 @@ char * bit_fmt_hexmask(bitstr_t * bitmap)
* bitmap (OUT) bitmap to update
* str (IN) hex mask string to unformat
*/
-int bit_unfmt_hexmask(bitstr_t * bitmap, const char* str)
+int bit_unfmt_hexmask(bitstr_t * bitmap, const char* str)
{
int bit_index = 0, len = strlen(str);
int rc = 0;
@@ -1126,7 +1126,7 @@ int bit_unfmt_hexmask(bitstr_t * bitmap, const char* str)
}
while(curpos >= str) {
- current = (int) *curpos;
+ current = (int) *curpos;
if (isxdigit(current)) { /* valid hex digit */
if (isdigit(current)) {
current -= '0';
@@ -1142,7 +1142,7 @@ int bit_unfmt_hexmask(bitstr_t * bitmap, const char* str)
if ((current & 1) && (bit_index < bitsize))
bit_set(bitmap, bit_index);
if ((current & 2) && (bit_index+1 < bitsize))
- bit_set(bitmap, bit_index+1);
+ bit_set(bitmap, bit_index+1);
if ((current & 4) && (bit_index+2 < bitsize))
bit_set(bitmap, bit_index+2);
if ((current & 8) && (bit_index+3 < bitsize))
@@ -1197,7 +1197,7 @@ char * bit_fmt_binmask(bitstr_t * bitmap)
* bitmap (OUT) bitmap to update
* str (IN) hex mask string to unformat
*/
-int bit_unfmt_binmask(bitstr_t * bitmap, const char* str)
+int bit_unfmt_binmask(bitstr_t * bitmap, const char* str)
{
int bit_index = 0, len = strlen(str);
const char *curpos = str + len - 1;
@@ -1205,7 +1205,7 @@ int bit_unfmt_binmask(bitstr_t * bitmap, const char* str)
bitoff_t bitsize = bit_size(bitmap);
while(curpos >= str) {
- current = (int) *curpos;
+ current = (int) *curpos;
current -= '0';
if ((current & 1) && (bit_index < bitsize))
bit_set(bitmap, bit_index);
@@ -1228,7 +1228,7 @@ bit_get_bit_num(bitstr_t *b, int pos)
bitoff_t bit;
int cnt = 0;
bitoff_t bit_cnt;
-
+
_assert_bitstr_valid(b);
bit_cnt = _bitstr_bits(b);
assert(pos <= bit_cnt);
@@ -1236,8 +1236,8 @@ bit_get_bit_num(bitstr_t *b, int pos)
for (bit = 0; bit < bit_cnt; bit++) {
if (bit_test(b, bit)) { /* we got one */
if(cnt == pos)
- break;
- cnt++;
+ break;
+ cnt++;
}
}
@@ -1259,18 +1259,18 @@ bit_get_pos_num(bitstr_t *b, bitoff_t pos)
bitoff_t bit;
int cnt = -1;
bitoff_t bit_cnt;
-
+
_assert_bitstr_valid(b);
bit_cnt = _bitstr_bits(b);
assert(pos <= bit_cnt);
-
+
if (!bit_test(b, pos)) {
error("bit %d not set", pos);
return cnt;
}
for (bit = 0; bit <= pos; bit++) {
if (bit_test(b, bit)) { /* we got one */
- cnt++;
+ cnt++;
}
}
diff --git a/src/common/bitstring.h b/src/common/bitstring.h
index 386a6a663150cd9eaec1d85b1c5bb438c5cd9d1e..b1a739bfbd3a394806ea95f53b9a6570686a2910 100644
--- a/src/common/bitstring.h
+++ b/src/common/bitstring.h
@@ -2,51 +2,51 @@
* bitstring.h - definitions for bitstring.c, bitmap manipulation functions
*****************************************************************************
* Reimplementation of the functionality of Paul Vixie's bitstring.h macros
- * from his cron package and later contributed to 4.4BSD. Little remains,
+ * from his cron package and later contributed to 4.4BSD. Little remains,
* though interface semantics are preserved in functions noted below.
*
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jim Garlick <garlick@llnl.gov>, Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
\*****************************************************************************/
/*
- * A bitstr_t is an array of configurable size words. The first two words
- * are for internal use. Word 0 is a magic cookie used to validate that the
- * bitstr_t is properly initialized. Word 1 is the number of valid bits in
+ * A bitstr_t is an array of configurable size words. The first two words
+ * are for internal use. Word 0 is a magic cookie used to validate that the
+ * bitstr_t is properly initialized. Word 1 is the number of valid bits in
* the bitstr_t This limts the capacity of a bitstr_t to 4 gigabits if using
* 32 bit words.
- *
+ *
* bitstrings are zero origin
*
* bitstrings are always stored in a little-endian fashion. In other words,
@@ -84,19 +84,19 @@ typedef int32_t bitstr_t;
typedef bitstr_t bitoff_t;
-/*
- * internal macros / defs
+/*
+ * internal macros / defs
*/
/* 2 words used for magic cookie and size */
-#define BITSTR_OVERHEAD 2
+#define BITSTR_OVERHEAD 2
/* bitstr_t signature in first word */
#define BITSTR_MAGIC 0x42434445
#define BITSTR_MAGIC_STACK 0x42434446 /* signature if on stack */
/* max bit position in word */
-#define BITSTR_MAXPOS (sizeof(bitstr_t)*8 - 1)
+#define BITSTR_MAXPOS (sizeof(bitstr_t)*8 - 1)
/* word of the bitstring bit is in */
#define _bit_word(bit) (((bit) >> BITSTR_SHIFT) + BITSTR_OVERHEAD)
@@ -135,8 +135,8 @@ typedef bitstr_t bitoff_t;
assert((bit) < _bitstr_bits(name)); \
} while (0)
-/*
- * external macros
+/*
+ * external macros
*/
/* allocate a bitstring on the stack */
diff --git a/src/common/checkpoint.c b/src/common/checkpoint.c
index 8751148e307eccbeec08bc7c6ecc73d553c78ef8..8c010fa51dfe4cfd5c09a3f11743f135fbaf7667 100644
--- a/src/common/checkpoint.c
+++ b/src/common/checkpoint.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -55,17 +55,17 @@
/*
* WARNING: Do not change the order of these fields or add additional
* fields at the beginning of the structure. If you do, job completion
- * logging plugins will stop working. If you need to add fields, add them
+ * logging plugins will stop working. If you need to add fields, add them
* at the end of the structure.
*/
typedef struct slurm_checkpoint_ops {
- int (*ckpt_op) (uint32_t job_id, uint32_t step_id,
+ int (*ckpt_op) (uint32_t job_id, uint32_t step_id,
struct step_record *step_ptr, uint16_t op,
uint16_t data, char *image_dir, time_t *event_time,
uint32_t *error_code, char **error_msg);
int (*ckpt_comp) (struct step_record * step_ptr, time_t event_time,
uint32_t error_code, char *error_msg);
- int (*ckpt_task_comp) (struct step_record * step_ptr,
+ int (*ckpt_task_comp) (struct step_record * step_ptr,
uint32_t task_id,
time_t event_time, uint32_t error_code,
char *error_msg);
@@ -114,12 +114,12 @@ _slurm_checkpoint_context_create( const char *checkpoint_type )
if ( c->checkpoint_type == NULL ) {
debug3( "can't make local copy of checkpoint type" );
xfree( c );
- return NULL;
+ return NULL;
}
/* Plugin rack is demand-loaded on first reference. */
- c->plugin_list = NULL;
- c->cur_plugin = PLUGIN_INVALID_HANDLE;
+ c->plugin_list = NULL;
+ c->cur_plugin = PLUGIN_INVALID_HANDLE;
return c;
}
@@ -173,13 +173,13 @@ _slurm_checkpoint_get_ops( slurm_checkpoint_context_t c )
/* Find the correct plugin. */
c->cur_plugin = plugin_load_and_link(c->checkpoint_type, n_syms, syms,
(void **) &c->ops);
- if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
+ if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
error("Couldn't find the specified plugin name for %s "
"looking at all files",
c->checkpoint_type);
-
+
/* Get the plugin list, if needed. */
if ( c->plugin_list == NULL ) {
char *plugin_dir;
@@ -190,21 +190,21 @@ _slurm_checkpoint_get_ops( slurm_checkpoint_context_t c )
}
plugrack_set_major_type( c->plugin_list, "checkpoint" );
- plugrack_set_paranoia( c->plugin_list,
- PLUGRACK_PARANOIA_NONE,
+ plugrack_set_paranoia( c->plugin_list,
+ PLUGRACK_PARANOIA_NONE,
0 );
plugin_dir = slurm_get_plugin_dir();
plugrack_read_dir( c->plugin_list, plugin_dir );
xfree(plugin_dir);
}
-
+
/* Find the correct plugin. */
- c->cur_plugin =
+ c->cur_plugin =
plugrack_use_by_type( c->plugin_list, c->checkpoint_type );
if ( c->cur_plugin == PLUGIN_INVALID_HANDLE ) {
error( "can't find a plugin for type %s", c->checkpoint_type );
return NULL;
- }
+ }
/* Dereference the API. */
if ( plugin_get_syms( c->cur_plugin,
@@ -267,7 +267,7 @@ checkpoint_fini(void)
/* perform some checkpoint operation */
extern int
-checkpoint_op(uint32_t job_id, uint32_t step_id,
+checkpoint_op(uint32_t job_id, uint32_t step_id,
void *step_ptr, uint16_t op,
uint16_t data, char *image_dir, time_t *event_time,
uint32_t *error_code, char **error_msg)
@@ -277,9 +277,9 @@ checkpoint_op(uint32_t job_id, uint32_t step_id,
slurm_mutex_lock( &context_lock );
if ( g_context ) {
retval = (*(g_context->ops.ckpt_op))(
- job_id, step_id,
+ job_id, step_id,
(struct step_record *) step_ptr,
- op, data, image_dir,
+ op, data, image_dir,
event_time, error_code, error_msg);
} else {
error ("slurm_checkpoint plugin context not initialized");
@@ -317,7 +317,7 @@ checkpoint_task_comp(void * step_ptr, uint32_t task_id, time_t event_time,
slurm_mutex_lock( &context_lock );
if ( g_context )
retval = (*(g_context->ops.ckpt_task_comp))(
- (struct step_record *) step_ptr, task_id,
+ (struct step_record *) step_ptr, task_id,
event_time, error_code, error_msg);
else {
error ("slurm_checkpoint plugin context not initialized");
@@ -431,7 +431,7 @@ extern int checkpoint_restart_task (void *job, char *image_dir, int gtid)
slurm_mutex_lock( &context_lock );
if ( g_context ) {
- retval = (*(g_context->ops.ckpt_restart_task))(job, image_dir,
+ retval = (*(g_context->ops.ckpt_restart_task))(job, image_dir,
gtid);
} else {
error ("slurm_checkpoint plugin context not initialized");
@@ -441,8 +441,8 @@ extern int checkpoint_restart_task (void *job, char *image_dir, int gtid)
return retval;
}
-extern int checkpoint_tasks (uint32_t job_id, uint32_t step_id,
- time_t begin_time, char *image_dir,
+extern int checkpoint_tasks (uint32_t job_id, uint32_t step_id,
+ time_t begin_time, char *image_dir,
uint16_t wait, char *nodelist)
{
int rc = SLURM_SUCCESS, temp_rc;
diff --git a/src/common/checkpoint.h b/src/common/checkpoint.h
index 13b39a98d265ee37a238062c3f6be21e38b99607..d65c22f335fe537d41474613d5d65744f9ff9abf 100644
--- a/src/common/checkpoint.h
+++ b/src/common/checkpoint.h
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * checkpoint.h - implementation-independent checkpoint API definitions.
+ * checkpoint.h - implementation-independent checkpoint API definitions.
* $Id$
*****************************************************************************
* Copyright (C) 2004-2007 The Regents of the University of California.
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -51,7 +51,7 @@ enum check_opts {
CHECK_ABLE, /* able to checkpoint now */
CHECK_DISABLE, /* disable checkpointing */
CHECK_ENABLE, /* enable checkpointing */
- CHECK_CREATE, /* create a checkpoint for this job,
+ CHECK_CREATE, /* create a checkpoint for this job,
* job continues execution afterwards */
CHECK_VACATE, /* create a checkpoint for this job,
* job terminates afterwards */
@@ -73,7 +73,7 @@ extern int checkpoint_init(char *checkpoint_type);
extern int checkpoint_fini(void);
/* perform many checkpoint operation on job/step */
-extern int checkpoint_op(uint32_t job_id, uint32_t step_id,
+extern int checkpoint_op(uint32_t job_id, uint32_t step_id,
void *step_ptr, uint16_t op,
uint16_t data, char *image_dir, time_t *event_time,
uint32_t *error_code, char **error_msg);
@@ -82,11 +82,11 @@ extern int checkpoint_op(uint32_t job_id, uint32_t step_id,
extern int checkpoint_comp(void * step_ptr, time_t event_time, uint32_t error_code,
char *error_msg);
-extern int checkpoint_task_comp(void * step_ptr, uint32_t task_id,
+extern int checkpoint_task_comp(void * step_ptr, uint32_t task_id,
time_t event_time, uint32_t error_code, char *error_msg);
/* gather checkpoint error info */
-extern int checkpoint_error(void * step_ptr,
+extern int checkpoint_error(void * step_ptr,
uint16_t *ckpt_errno, char **ckpt_strerror);
/* allocate and initialize a job step's checkpoint context */
@@ -109,8 +109,8 @@ extern int checkpoint_signal_tasks (void *slurmd_job, char *image_dir);
extern int checkpoint_restart_task(void *slurmd_job, char *image_dir, int gtid);
/* send checkpoint request to specified job/step */
-extern int checkpoint_tasks (uint32_t job_id, uint32_t step_id,
- time_t begin_time, char *image_dir,
+extern int checkpoint_tasks (uint32_t job_id, uint32_t step_id,
+ time_t begin_time, char *image_dir,
uint16_t wait, char *nodelist);
#endif /*_HAVE_SLURM_CHECKPOINT_H__*/
diff --git a/src/common/daemonize.c b/src/common/daemonize.c
index 0dd23427b7b50fbaa558d058930c751607221b41..dc35c7639fe99046ee7a4761f20e6daa4a690307 100644
--- a/src/common/daemonize.c
+++ b/src/common/daemonize.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark A. Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -57,7 +57,7 @@ closeall(int fd)
{
int fdlimit = sysconf(_SC_OPEN_MAX);
- while (fd < fdlimit)
+ while (fd < fdlimit)
close(fd++);
}
@@ -99,7 +99,7 @@ daemon(int nochdir, int noclose)
dup2(0, STDOUT_FILENO);
dup2(0, STDERR_FILENO);
} else {
- /*
+ /*
* Otherwise, dup stdin, stdout, and stderr onto /dev/null
*/
int devnull = open("/dev/null", O_RDWR);
@@ -133,10 +133,10 @@ read_pidfile(const char *pidfile, int *pidfd)
unsigned long pid;
pid_t lpid;
- if ((fd = open(pidfile, O_RDONLY)) < 0)
+ if ((fd = open(pidfile, O_RDONLY)) < 0)
return ((pid_t) 0);
- if (!(fp = fdopen(fd, "r")) && (errno != ENOENT))
+ if (!(fp = fdopen(fd, "r")) && (errno != ENOENT))
error ("Unable to access old pidfile at `%s': %m", pidfile);
if (fscanf(fp, "%lu", &pid) < 1) {
@@ -151,13 +151,13 @@ read_pidfile(const char *pidfile, int *pidfd)
return ((pid_t) 0);
}
- if (lpid != (pid_t) pid)
+ if (lpid != (pid_t) pid)
fatal ("pidfile locked by %lu but contains pid=%lu",
(unsigned long) lpid, (unsigned long) pid);
if (pidfd != NULL)
*pidfd = fd;
- else
+ else
(void) close(fd);
return (lpid);
@@ -191,7 +191,7 @@ create_pidfile(const char *pidfile)
}
fflush(fp);
-
+
return (fileno(fp));
error:
@@ -200,7 +200,7 @@ create_pidfile(const char *pidfile)
return -1;
}
-void
+void
test_core_limit(void)
{
#ifdef RLIMIT_CORE
@@ -210,7 +210,7 @@ test_core_limit(void)
else if (rlim->rlim_cur != RLIM_INFINITY) {
rlim->rlim_cur /= 1024; /* bytes to KB */
if (rlim->rlim_cur < 2048) {
- verbose("Warning: Core limit is only %u KB",
+ verbose("Warning: Core limit is only %u KB",
rlim->rlim_cur);
}
}
diff --git a/src/common/daemonize.h b/src/common/daemonize.h
index 1d8bb8cd117a7e1fd80c141ca32179319541e48e..b0ad174b2e882bef8d9796333c648975e495fc60 100644
--- a/src/common/daemonize.h
+++ b/src/common/daemonize.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/common/eio.c b/src/common/eio.c
index d10c41915e9049139534b9b3c499d93288772acf..af98c7ca00515d830c8e94ffd0453dd3c1c485df 100644
--- a/src/common/eio.c
+++ b/src/common/eio.c
@@ -5,39 +5,39 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
\*****************************************************************************/
#if HAVE_CONFIG_H
# include <config.h>
-#endif
+#endif
#include <sys/poll.h>
#include <unistd.h>
@@ -124,7 +124,7 @@ bool eio_message_socket_readable(eio_obj_t *obj)
}
return false;
}
- return true;
+ return true;
}
int eio_message_socket_accept(eio_obj_t *obj, List objs)
@@ -191,7 +191,7 @@ cleanup:
int eio_signal_shutdown(eio_handle_t *eio)
{
char c = 1;
- if (write(eio->fds[1], &c, sizeof(char)) != 1)
+ if (write(eio->fds[1], &c, sizeof(char)) != 1)
return error("eio_handle_signal_shutdown: write; %m");
return 0;
}
@@ -199,7 +199,7 @@ int eio_signal_shutdown(eio_handle_t *eio)
int eio_signal_wakeup(eio_handle_t *eio)
{
char c = 0;
- if (write(eio->fds[1], &c, sizeof(char)) != 1)
+ if (write(eio->fds[1], &c, sizeof(char)) != 1)
return error("eio_handle_signal_wake: write; %m");
return 0;
}
@@ -256,15 +256,15 @@ int eio_handle_mainloop(eio_handle_t *eio)
maxnfds = n;
xrealloc(pollfds, (maxnfds+1) * sizeof(struct pollfd));
xrealloc(map, maxnfds * sizeof(eio_obj_t * ));
- /*
- * Note: xrealloc() also handles initial malloc
+ /*
+ * Note: xrealloc() also handles initial malloc
*/
}
- debug4("eio: handling events for %d objects",
+ debug4("eio: handling events for %d objects",
list_count(eio->obj_list));
nfds = _poll_setup_pollfds(pollfds, map, eio->obj_list);
- if (nfds <= 0)
+ if (nfds <= 0)
goto done;
/*
@@ -279,7 +279,7 @@ int eio_handle_mainloop(eio_handle_t *eio)
if (_poll_internal(pollfds, nfds) < 0)
goto error;
- if (pollfds[nfds-1].revents & POLLIN)
+ if (pollfds[nfds-1].revents & POLLIN)
_eio_wakeup_handler(eio);
_poll_dispatch(pollfds, nfds-1, map, eio->obj_list);
@@ -288,14 +288,14 @@ int eio_handle_mainloop(eio_handle_t *eio)
retval = -1;
done:
xfree(pollfds);
- xfree(map);
+ xfree(map);
return retval;
}
static int
_poll_internal(struct pollfd *pfds, unsigned int nfds)
-{
- int n;
+{
+ int n;
while ((n = poll(pfds, nfds, -1)) < 0) {
switch (errno) {
case EINTR : return 0;
@@ -353,7 +353,7 @@ _poll_setup_pollfds(struct pollfd *pfds, eio_obj_t *map[], List l)
}
static void
-_poll_dispatch(struct pollfd *pfds, unsigned int nfds, eio_obj_t *map[],
+_poll_dispatch(struct pollfd *pfds, unsigned int nfds, eio_obj_t *map[],
List objList)
{
int i;
@@ -475,7 +475,7 @@ void eio_new_initial_obj(eio_handle_t *eio, eio_obj_t *obj)
{
xassert(eio != NULL);
xassert(eio->magic == EIO_MAGIC);
-
+
list_enqueue(eio->obj_list, obj);
}
diff --git a/src/common/eio.h b/src/common/eio.h
index 549e5e9304840b688fc9760e84e8a2f7743b65e9..2db2beb492cbc9094a2c25c1f3fc715cb9ca2f39 100644
--- a/src/common/eio.h
+++ b/src/common/eio.h
@@ -5,21 +5,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
@@ -52,8 +52,8 @@ typedef struct eio_handle_components eio_handle_t;
* file descriptor will continue to be polled.
*/
struct io_operations {
- bool (*readable )(eio_obj_t *);
- bool (*writable )(eio_obj_t *);
+ bool (*readable )(eio_obj_t *);
+ bool (*writable )(eio_obj_t *);
void (*handle_msg )(void *arg, slurm_msg_t *msg);
int (*handle_read )(eio_obj_t *, List);
int (*handle_write)(eio_obj_t *, List);
diff --git a/src/common/env.c b/src/common/env.c
index 02a14d2974231e7f22d67b8a053a3e9801338f8d..82d16f9005d6f1be11fd6de00c77d0ad50e1b4ea 100644
--- a/src/common/env.c
+++ b/src/common/env.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>, Danny Auble <da@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -39,7 +39,7 @@
#if HAVE_CONFIG_H
# include "config.h"
-#endif
+#endif
#include <fcntl.h>
#include <stdio.h>
@@ -65,8 +65,8 @@
#include "src/common/slurm_step_layout.h"
/*
- * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
- * for details.
+ * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
+ * for details.
*/
strong_alias(setenvf, slurm_setenvpf);
strong_alias(unsetenvp, slurm_unsetenvp);
@@ -97,7 +97,7 @@ _find_name_in_env(char **env, const char *name)
while (*ep != NULL) {
size_t cnt = 0;
- while ( ((*ep)[cnt] == name[cnt])
+ while ( ((*ep)[cnt] == name[cnt])
&& ( name[cnt] != '\0')
&& ((*ep)[cnt] != '\0') )
++cnt;
@@ -126,7 +126,7 @@ _extend_env(char ***envp)
(*envp)[newcnt - 1] = NULL;
ep = &((*envp)[newcnt - 2]);
- /*
+ /*
* Find last non-NULL entry
*/
while (*ep == NULL)
@@ -135,7 +135,7 @@ _extend_env(char ***envp)
return (++ep);
}
-/* return true if the environment variables should not be set for
+/* return true if the environment variables should not be set for
* srun's --get-user-env option */
static bool _discard_env(char *name, char *value)
{
@@ -192,7 +192,7 @@ static void _set_distribution(task_dist_states_t distribution,
/*
* Return the number of elements in the environment `env'
*/
-int
+int
envcount (char **env)
{
int envc = 0;
@@ -219,14 +219,14 @@ setenvfs(const char *fmt, ...)
va_start(ap, fmt);
vsnprintf(buf, ENV_BUFSIZE, fmt, ap);
va_end(ap);
-
+
bufcpy = xstrdup(buf);
xfree(buf);
rc = putenv(bufcpy);
return rc;
}
-int
+int
setenvf(char ***envp, const char *name, const char *fmt, ...)
{
char **ep = NULL;
@@ -241,19 +241,19 @@ setenvf(char ***envp, const char *name, const char *fmt, ...)
va_end(ap);
bufcpy = xstrdup(buf);
xfree(buf);
-
+
xstrfmtcat (str, "%s=%s", name, bufcpy);
xfree(bufcpy);
- if(envp && *envp) {
+ if(envp && *envp) {
ep = _find_name_in_env (*envp, name);
-
- if (*ep != NULL)
+
+ if (*ep != NULL)
xfree (*ep);
else
ep = _extend_env (envp);
-
+
*ep = str;
-
+
return (0);
} else {
rc = putenv(str);
@@ -262,10 +262,10 @@ setenvf(char ***envp, const char *name, const char *fmt, ...)
}
/*
- * Remove environment variable `name' from "environment"
+ * Remove environment variable `name' from "environment"
* contained in `env'
*
- * [ This was taken almost verbatim from glibc's
+ * [ This was taken almost verbatim from glibc's
* unsetenv() code. ]
*/
void unsetenvp(char **env, const char *name)
@@ -279,7 +279,7 @@ void unsetenvp(char **env, const char *name)
while ((ep = _find_name_in_env (ep, name)) && (*ep != NULL)) {
char **dp = ep;
xfree (*ep);
- do
+ do
dp[0] = dp[1];
while (*dp++);
@@ -313,7 +313,7 @@ int setup_env(env_t *env, bool preserve_env)
if (env == NULL)
return SLURM_ERROR;
-
+
if (env->task_pid
&& setenvf(&env->env, "SLURM_TASK_PID", "%d", (int)env->task_pid)) {
error("Unable to set SLURM_TASK_PID environment variable");
@@ -324,65 +324,65 @@ int setup_env(env_t *env, bool preserve_env)
&& setenvf(&env->env, "SLURM_NPROCS", "%d", env->nprocs)) {
error("Unable to set SLURM_NPROCS environment variable");
rc = SLURM_FAILURE;
- }
-
- if (env->cpus_per_task
- && setenvf(&env->env, "SLURM_CPUS_PER_TASK", "%d",
+ }
+
+ if (env->cpus_per_task
+ && setenvf(&env->env, "SLURM_CPUS_PER_TASK", "%d",
env->cpus_per_task) ) {
error("Unable to set SLURM_CPUS_PER_TASK");
rc = SLURM_FAILURE;
- }
-
- if (env->ntasks_per_node
- && setenvf(&env->env, "SLURM_NTASKS_PER_NODE", "%d",
+ }
+
+ if (env->ntasks_per_node
+ && setenvf(&env->env, "SLURM_NTASKS_PER_NODE", "%d",
env->ntasks_per_node) ) {
error("Unable to set SLURM_NTASKS_PER_NODE");
rc = SLURM_FAILURE;
- }
-
- if (env->ntasks_per_socket
- && setenvf(&env->env, "SLURM_NTASKS_PER_SOCKET", "%d",
+ }
+
+ if (env->ntasks_per_socket
+ && setenvf(&env->env, "SLURM_NTASKS_PER_SOCKET", "%d",
env->ntasks_per_socket) ) {
error("Unable to set SLURM_NTASKS_PER_SOCKET");
rc = SLURM_FAILURE;
- }
+ }
- if (env->ntasks_per_core
- && setenvf(&env->env, "SLURM_NTASKS_PER_CORE", "%d",
+ if (env->ntasks_per_core
+ && setenvf(&env->env, "SLURM_NTASKS_PER_CORE", "%d",
env->ntasks_per_core) ) {
error("Unable to set SLURM_NTASKS_PER_CORE");
rc = SLURM_FAILURE;
- }
+ }
- if (env->cpus_on_node
- && setenvf(&env->env, "SLURM_CPUS_ON_NODE", "%d",
+ if (env->cpus_on_node
+ && setenvf(&env->env, "SLURM_CPUS_ON_NODE", "%d",
env->cpus_on_node) ) {
error("Unable to set SLURM_CPUS_ON_NODE");
rc = SLURM_FAILURE;
- }
+ }
_set_distribution(env->distribution, &dist, &lllp_dist);
- if(dist)
+ if(dist)
if (setenvf(&env->env, "SLURM_DISTRIBUTION", "%s", dist)) {
error("Can't set SLURM_DISTRIBUTION env variable");
rc = SLURM_FAILURE;
}
- if(env->distribution == SLURM_DIST_PLANE)
- if (setenvf(&env->env, "SLURM_DIST_PLANESIZE", "%u",
+ if(env->distribution == SLURM_DIST_PLANE)
+ if (setenvf(&env->env, "SLURM_DIST_PLANESIZE", "%u",
env->plane_size)) {
error("Can't set SLURM_DIST_PLANESIZE "
"env variable");
rc = SLURM_FAILURE;
}
-
+
if(lllp_dist)
if (setenvf(&env->env, "SLURM_DIST_LLLP", "%s", lllp_dist)) {
error("Can't set SLURM_DIST_LLLP env variable");
rc = SLURM_FAILURE;
}
-
-
+
+
if (env->cpu_bind_type) {
char *str_verbose, *str_bind_type, *str_bind_list;
char *str_bind;
@@ -580,7 +580,7 @@ int setup_env(env_t *env, bool preserve_env)
}
}
- if (env->overcommit
+ if (env->overcommit
&& (setenvf(&env->env, "SLURM_OVERCOMMIT", "1"))) {
error("Unable to set SLURM_OVERCOMMIT environment variable");
rc = SLURM_FAILURE;
@@ -592,7 +592,7 @@ int setup_env(env_t *env, bool preserve_env)
rc = SLURM_FAILURE;
}
- if (env->labelio
+ if (env->labelio
&& setenvf(&env->env, "SLURM_LABELIO", "1")) {
error("Unable to set SLURM_LABELIO environment variable");
rc = SLURM_FAILURE;
@@ -601,49 +601,49 @@ int setup_env(env_t *env, bool preserve_env)
if(env->select_jobinfo) {
#ifdef HAVE_BG
char *bgl_part_id = NULL;
- select_g_select_jobinfo_get(env->select_jobinfo,
+ select_g_select_jobinfo_get(env->select_jobinfo,
SELECT_JOBDATA_BLOCK_ID, &bgl_part_id);
if (bgl_part_id) {
#ifndef HAVE_BGL
uint16_t conn_type = (uint16_t)NO_VAL;
- select_g_select_jobinfo_get(env->select_jobinfo,
+ select_g_select_jobinfo_get(env->select_jobinfo,
SELECT_JOBDATA_CONN_TYPE,
&conn_type);
if(conn_type > SELECT_SMALL) {
- if(setenvf(&env->env,
+ if(setenvf(&env->env,
"SUBMIT_POOL", "%s", bgl_part_id))
rc = SLURM_FAILURE;
}
#endif
- if(setenvf(&env->env,
+ if(setenvf(&env->env,
"MPIRUN_PARTITION", "%s", bgl_part_id))
rc = SLURM_FAILURE;
-
+
if(setenvf(&env->env, "MPIRUN_NOFREE", "%d", 1))
rc = SLURM_FAILURE;
if(setenvf(&env->env, "MPIRUN_NOALLOCATE", "%d", 1))
rc = SLURM_FAILURE;
xfree(bgl_part_id);
- } else
+ } else
rc = SLURM_FAILURE;
-
+
if(rc == SLURM_FAILURE)
error("Can't set MPIRUN_PARTITION "
"environment variable");
-
+
#endif
#ifdef HAVE_CRAY_XT
char *resv_id = NULL;
- select_g_select_jobinfo_get(env->select_jobinfo,
+ select_g_select_jobinfo_get(env->select_jobinfo,
SELECT_JOBDATA_RESV_ID, &resv_id);
if (resv_id) {
- if(setenvf(&env->env,
+ if(setenvf(&env->env,
"BASIL_RESVERATION_ID", "%s", resv_id))
rc = SLURM_FAILURE;
- } else
+ } else
rc = SLURM_FAILURE;
-
+
if(rc == SLURM_FAILURE)
error("Can't set BASIL_RESVERATION_ID "
"environment variable");
@@ -662,19 +662,19 @@ int setup_env(env_t *env, bool preserve_env)
rc = SLURM_FAILURE;
}
}
-
+
if (env->nodeid >= 0
&& setenvf(&env->env, "SLURM_NODEID", "%d", env->nodeid)) {
error("Unable to set SLURM_NODEID environment");
rc = SLURM_FAILURE;
}
-
+
if (env->procid >= 0
&& setenvf(&env->env, "SLURM_PROCID", "%d", env->procid)) {
error("Unable to set SLURM_PROCID environment");
rc = SLURM_FAILURE;
}
-
+
if (env->localid >= 0
&& setenvf(&env->env, "SLURM_LOCALID", "%d", env->localid)) {
error("Unable to set SLURM_LOCALID environment");
@@ -686,7 +686,7 @@ int setup_env(env_t *env, bool preserve_env)
error("Unable to set SLURM_STEPID environment");
rc = SLURM_FAILURE;
}
-
+
if (!preserve_env && env->nhosts
&& setenvf(&env->env, "SLURM_NNODES", "%d", env->nhosts)) {
error("Unable to set SLURM_NNODES environment var");
@@ -698,29 +698,29 @@ int setup_env(env_t *env, bool preserve_env)
error("Unable to set SLURM_NODELIST environment var.");
rc = SLURM_FAILURE;
}
-
- if (!preserve_env && env->task_count
- && setenvf (&env->env,
+
+ if (!preserve_env && env->task_count
+ && setenvf (&env->env,
"SLURM_TASKS_PER_NODE", "%s", env->task_count)) {
error ("Can't set SLURM_TASKS_PER_NODE env variable");
rc = SLURM_FAILURE;
}
-
+
if (env->comm_port
- && setenvf (&env->env, "SLURM_SRUN_COMM_PORT", "%u",
+ && setenvf (&env->env, "SLURM_SRUN_COMM_PORT", "%u",
env->comm_port)) {
error ("Can't set SLURM_SRUN_COMM_PORT env variable");
rc = SLURM_FAILURE;
}
if (env->cli) {
-
+
slurm_print_slurm_addr (env->cli, addrbuf, INET_ADDRSTRLEN);
- /*
+ /*
* XXX: Eventually, need a function for slurm_addrs that
* returns just the IP address (not addr:port)
- */
+ */
if ((dist = strchr (addrbuf, ':')) != NULL)
*dist = '\0';
@@ -731,8 +731,8 @@ int setup_env(env_t *env, bool preserve_env)
&& setenvf(&env->env, "SLURM_GTIDS", "%s", env->sgtids)) {
error("Unable to set SLURM_GTIDS environment variable");
rc = SLURM_FAILURE;
- }
-
+ }
+
#ifdef HAVE_AIX
{
char res_env[128];
@@ -749,7 +749,7 @@ int setup_env(env_t *env, bool preserve_env)
debug_num = atoi(debug_env);
snprintf(res_env, sizeof(res_env), "SLURM_LL_API_DEBUG=%d",
debug_num);
-
+
/* Required for AIX/POE systems indicating pre-allocation */
setenvf(&env->env, "LOADLBATCH", "yes");
setenvf(&env->env, "LOADL_ACTIVE", "3.2.0");
@@ -771,8 +771,8 @@ int setup_env(env_t *env, bool preserve_env)
error("Can't set SLURM_PTY_WIN_ROW env variable");
rc = SLURM_FAILURE;
}
- if (env->ckpt_dir
- && setenvf(&env->env, "SLURM_CHECKPOINT_IMAGE_DIR", "%s",
+ if (env->ckpt_dir
+ && setenvf(&env->env, "SLURM_CHECKPOINT_IMAGE_DIR", "%s",
env->ckpt_dir)) {
error("Can't set SLURM_CHECKPOINT_IMAGE_DIR env variable");
rc = SLURM_FAILURE;
@@ -831,7 +831,7 @@ static char *_uint16_array_to_str(int array_len, const uint16_t *array)
}
previous = 0;
}
-
+
return str;
}
@@ -890,7 +890,7 @@ extern char *uint32_compressed_to_str(uint32_t array_len,
* SLURM_JOBID
* SLURM_NNODES
* SLURM_NODELIST
- * SLURM_TASKS_PER_NODE
+ * SLURM_TASKS_PER_NODE
*/
int
env_array_for_job(char ***dest, const resource_allocation_response_msg_t *alloc,
@@ -907,7 +907,7 @@ env_array_for_job(char ***dest, const resource_allocation_response_msg_t *alloc,
uint32_t node_cnt = alloc->node_cnt;
#ifdef HAVE_BG
- select_g_select_jobinfo_get(alloc->select_jobinfo,
+ select_g_select_jobinfo_get(alloc->select_jobinfo,
SELECT_JOBDATA_NODE_CNT,
&node_cnt);
if(!node_cnt)
@@ -921,16 +921,16 @@ env_array_for_job(char ***dest, const resource_allocation_response_msg_t *alloc,
alloc->node_list);
_set_distribution(desc->task_dist, &dist, &lllp_dist);
- if(dist)
+ if(dist)
env_array_overwrite_fmt(dest, "SLURM_DISTRIBUTION", "%s",
dist);
-
- if(desc->task_dist == SLURM_DIST_PLANE)
+
+ if(desc->task_dist == SLURM_DIST_PLANE)
env_array_overwrite_fmt(dest, "SLURM_DIST_PLANESIZE",
"%u", desc->plane_size);
-
+
if(lllp_dist)
- env_array_overwrite_fmt(dest, "SLURM_DIST_LLLP", "%s",
+ env_array_overwrite_fmt(dest, "SLURM_DIST_LLLP", "%s",
lllp_dist);
tmp = uint32_compressed_to_str(alloc->num_cpu_groups,
@@ -952,7 +952,7 @@ env_array_for_job(char ***dest, const resource_allocation_response_msg_t *alloc,
if (tmp) {
#ifndef HAVE_BGL
uint16_t conn_type = (uint16_t)NO_VAL;
- select_g_select_jobinfo_get(alloc->select_jobinfo,
+ select_g_select_jobinfo_get(alloc->select_jobinfo,
SELECT_JOBDATA_CONN_TYPE, &conn_type);
if(conn_type > SELECT_SMALL) {
env_array_overwrite_fmt(dest, "SUBMIT_POOL", "%s",
@@ -982,7 +982,7 @@ env_array_for_job(char ***dest, const resource_allocation_response_msg_t *alloc,
env_array_overwrite_fmt(dest, "SLURM_JOBID", "%u", alloc->job_id);
env_array_overwrite_fmt(dest, "SLURM_NNODES", "%u", node_cnt);
env_array_overwrite_fmt(dest, "SLURM_NODELIST", "%s", alloc->node_list);
-
+
if(num_tasks == NO_VAL) {
/* If we know how many tasks we are going to do then
we set SLURM_TASKS_PER_NODE */
@@ -990,17 +990,17 @@ env_array_for_job(char ***dest, const resource_allocation_response_msg_t *alloc,
/* If no tasks were given we can figure it out here
* by totalling up the cpus and then dividing by the
* number of cpus per task */
-
+
num_tasks = 0;
for (i = 0; i < alloc->num_cpu_groups; i++) {
- num_tasks += alloc->cpu_count_reps[i]
+ num_tasks += alloc->cpu_count_reps[i]
* alloc->cpus_per_node[i];
}
- if((int)desc->cpus_per_task > 1
+ if((int)desc->cpus_per_task > 1
&& desc->cpus_per_task != (uint16_t)NO_VAL)
num_tasks /= desc->cpus_per_task;
//num_tasks = desc->num_procs;
- }
+ }
if(desc->task_dist == SLURM_DIST_ARBITRARY) {
tmp = desc->req_nodes;
@@ -1016,9 +1016,9 @@ env_array_for_job(char ***dest, const resource_allocation_response_msg_t *alloc,
num_tasks,
desc->cpus_per_task,
desc->task_dist,
- desc->plane_size)))
+ desc->plane_size)))
return SLURM_ERROR;
-
+
tmp = _uint16_array_to_str(step_layout->node_cnt,
step_layout->tasks);
slurm_step_layout_destroy(step_layout);
@@ -1048,7 +1048,7 @@ env_array_for_job(char ***dest, const resource_allocation_response_msg_t *alloc,
* SLURM_NNODES
* SLURM_NODELIST
* SLURM_NPROCS
- * SLURM_TASKS_PER_NODE
+ * SLURM_TASKS_PER_NODE
*/
extern int
env_array_for_batch_job(char ***dest, const batch_job_launch_msg_t *batch,
@@ -1095,8 +1095,8 @@ env_array_for_batch_job(char ***dest, const batch_job_launch_msg_t *batch,
env_array_overwrite_fmt(dest, "SLURM_JOBID", "%u", batch->job_id);
env_array_overwrite_fmt(dest, "SLURM_NNODES", "%u", num_nodes);
env_array_overwrite_fmt(dest, "SLURM_NODELIST", "%s", batch->nodes);
- if(num_tasks)
- env_array_overwrite_fmt(dest, "SLURM_NPROCS", "%u",
+ if(num_tasks)
+ env_array_overwrite_fmt(dest, "SLURM_NPROCS", "%u",
num_tasks);
if((batch->cpus_per_task != 0) &&
@@ -1108,7 +1108,7 @@ env_array_for_batch_job(char ***dest, const batch_job_launch_msg_t *batch,
env_array_overwrite_fmt(dest, "SLURM_CPUS_PER_TASK", "%u",
cpus_per_task);
}
-
+
if((tmp = getenvp(*dest, "SLURM_ARBITRARY_NODELIST"))) {
task_dist = SLURM_DIST_ARBITRARY;
num_tasks = batch->nprocs;
@@ -1166,7 +1166,7 @@ env_array_for_batch_job(char ***dest, const batch_job_launch_msg_t *batch,
*
*/
void
-env_array_for_step(char ***dest,
+env_array_for_step(char ***dest,
const job_step_create_response_msg_t *step,
uint16_t launcher_port,
bool preserve_env)
@@ -1197,7 +1197,7 @@ env_array_for_step(char ***dest,
"%hu", step->step_layout->node_cnt);
env_array_overwrite_fmt(dest, "SLURM_NPROCS",
"%u", step->step_layout->task_cnt);
- env_array_overwrite_fmt(dest, "SLURM_TASKS_PER_NODE", "%s",
+ env_array_overwrite_fmt(dest, "SLURM_TASKS_PER_NODE", "%s",
tmp);
}
env_array_overwrite_fmt(dest, "SLURM_SRUN_COMM_PORT",
@@ -1275,7 +1275,7 @@ int env_array_append_fmt(char ***array_ptr, const char *name,
xfree(buf);
ep = _extend_env(array_ptr);
*ep = str;
-
+
return 1;
}
@@ -1305,7 +1305,7 @@ int env_array_append(char ***array_ptr, const char *name,
xstrfmtcat (str, "%s=%s", name, value);
ep = _extend_env(array_ptr);
*ep = str;
-
+
return 1;
}
@@ -1337,7 +1337,7 @@ int env_array_overwrite_fmt(char ***array_ptr, const char *name,
va_start(ap, value_fmt);
vsnprintf (buf, ENV_BUFSIZE, value_fmt, ap);
va_end(ap);
-
+
xstrfmtcat (str, "%s=%s", name, buf);
xfree(buf);
ep = _find_name_in_env(*array_ptr, name);
@@ -1348,7 +1348,7 @@ int env_array_overwrite_fmt(char ***array_ptr, const char *name,
}
*ep = str;
-
+
return 1;
}
@@ -1383,12 +1383,12 @@ int env_array_overwrite(char ***array_ptr, const char *name,
}
*ep = str;
-
+
return 1;
}
-/*
- * Copy env_array must be freed by env_array_free
+/*
+ * Copy env_array must be freed by env_array_free
*/
char **env_array_copy(const char **array)
{
@@ -1555,7 +1555,7 @@ static char **_load_env_cache(const char *username)
int i;
state_save_loc = slurm_get_state_save_location();
- i = snprintf(fname, sizeof(fname), "%s/env_cache/%s", state_save_loc,
+ i = snprintf(fname, sizeof(fname), "%s/env_cache/%s", state_save_loc,
username);
xfree(state_save_loc);
if (i < 0) {
@@ -1576,7 +1576,7 @@ static char **_load_env_cache(const char *username)
if (!fgets(line, ENV_BUFSIZE, fp))
break;
_strip_cr_nl(line);
- if (_env_array_entry_splitter(line, name, sizeof(name),
+ if (_env_array_entry_splitter(line, name, sizeof(name),
value, ENV_BUFSIZE) &&
(!_discard_env(name, value))) {
if (value[0] == '(') {
@@ -1606,14 +1606,14 @@ static char **_load_env_cache(const char *username)
/*
* Return an array of strings representing the specified user's default
- * environment variables following a two-prongged approach.
+ * environment variables following a two-prongged approach.
* 1. Execute (more or less): "/bin/su - <username> -c /usr/bin/env"
* Depending upon the user's login scripts, this may take a very
* long time to complete or possibly never return
* 2. Load the user environment from a cache file. This is used
* in the event that option 1 times out.
*
- * timeout value is in seconds or zero for default (2 secs)
+ * timeout value is in seconds or zero for default (2 secs)
* mode is 1 for short ("su <user>"), 2 for long ("su - <user>")
* On error, returns NULL.
*
@@ -1640,7 +1640,7 @@ char **env_array_user_default(const char *username, int timeout, int mode)
return NULL;
}
- snprintf(stepd_path, sizeof(stepd_path), "%s/sbin/slurmstepd",
+ snprintf(stepd_path, sizeof(stepd_path), "%s/sbin/slurmstepd",
SLURM_PREFIX);
config_timeout = slurm_get_env_timeout();
if (config_timeout == 0) /* just read directly from cache */
@@ -1767,13 +1767,13 @@ char **env_array_user_default(const char *username, int timeout, int mode)
break;
if (config_timeout >= 2) {
/* Non-killable processes are indicative of file system
- * problems. The process will remain as a zombie, but
+ * problems. The process will remain as a zombie, but
* slurmd/salloc/moab will not otherwise be effected. */
error("Failed to kill program loading user environment");
break;
}
}
-
+
if (!found) {
error("Failed to load current user environment variables");
xfree(buffer);
@@ -1808,7 +1808,7 @@ char **env_array_user_default(const char *username, int timeout, int mode)
found = 1;
break;
}
- if (_env_array_entry_splitter(line, name, sizeof(name),
+ if (_env_array_entry_splitter(line, name, sizeof(name),
value, ENV_BUFSIZE) &&
(!_discard_env(name, value))) {
if (value[0] == '(') {
diff --git a/src/common/env.h b/src/common/env.h
index 46aec6c252d81d76cec85a7f5f830904a66f54d3..a13f4a52546ff2e69dba156fa57d8d0c33b4b891 100644
--- a/src/common/env.h
+++ b/src/common/env.h
@@ -5,21 +5,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
@@ -69,7 +69,7 @@ typedef struct env_options {
int ntasks_per_core; /* --ntasks-per-core=n */
int cpus_on_node;
pid_t task_pid;
- char *sgtids; /* global ranks array of integers */
+ char *sgtids; /* global ranks array of integers */
uint16_t pty_port; /* used to communicate window size changes */
uint8_t ws_col; /* window size, columns */
uint8_t ws_row; /* window size, row count */
@@ -133,7 +133,7 @@ int env_array_for_job(char ***dest,
* SLURM_TASKS_PER_NODE <- poorly named, really CPUs per node
* ? probably only needed for users...
*/
-extern int env_array_for_batch_job(char ***dest,
+extern int env_array_for_batch_job(char ***dest,
const batch_job_launch_msg_t *batch,
const char* node_name);
@@ -184,8 +184,8 @@ char **env_array_create(void);
*/
void env_array_merge(char ***dest_array, const char **src_array);
-/*
- * Copy env_array must be freed by env_array_free
+/*
+ * Copy env_array must be freed by env_array_free
*/
char **env_array_copy(const char **array);
@@ -267,7 +267,7 @@ char **env_array_user_default(const char *username, int timeout, int mode);
/*
* The cpus-per-node representation in SLURM (and perhaps tasks-per-node
* in the future) is stored in a compressed format comprised of two
- * equal-length arrays, and an integer holding the array length. In one
+ * equal-length arrays, and an integer holding the array length. In one
* array an element represents a count (number of cpus, number of tasks,
* etc.), and the corresponding element in the other array contains the
* number of times the count is repeated sequentially in the uncompressed
diff --git a/src/common/forward.c b/src/common/forward.c
index 7ccce549d3c552eae66ff87224320042925a1915..c9373ccd77be5eec3551a8642acea72f0d0d571d 100644
--- a/src/common/forward.c
+++ b/src/common/forward.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <auble1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -94,8 +94,8 @@ void *_forward_thread(void *arg)
char buf[8196];
int steps = 0;
int start_timeout = fwd_msg->timeout;
-
- /* repeat until we are sure the message was sent */
+
+ /* repeat until we are sure the message was sent */
while((name = hostlist_shift(hl))) {
if(slurm_conf_get_addr(name, &addr) == SLURM_ERROR) {
error("forward_thread: can't find address for host "
@@ -108,7 +108,7 @@ void *_forward_thread(void *arg)
slurm_mutex_unlock(fwd_msg->forward_mutex);
continue;
}
- goto cleanup;
+ goto cleanup;
}
if ((fd = slurm_open_msg_conn(&addr)) < 0) {
error("forward_thread to %s: %m", name);
@@ -122,7 +122,7 @@ void *_forward_thread(void *arg)
slurm_mutex_unlock(fwd_msg->forward_mutex);
continue;
}
- goto cleanup;
+ goto cleanup;
}
hostlist_ranged_string(hl, sizeof(buf), buf);
@@ -137,42 +137,42 @@ void *_forward_thread(void *arg)
name, fwd_msg->header.forward.nodelist);
} else
debug3("forward: send to %s ", name);
-
+
pack_header(&fwd_msg->header, buffer);
-
+
/* add forward data to buffer */
if (remaining_buf(buffer) < fwd_msg->buf_len) {
buffer->size += (fwd_msg->buf_len + BUF_SIZE);
xrealloc(buffer->head, buffer->size);
}
if (fwd_msg->buf_len) {
- memcpy(&buffer->head[buffer->processed],
+ memcpy(&buffer->head[buffer->processed],
fwd_msg->buf, fwd_msg->buf_len);
buffer->processed += fwd_msg->buf_len;
}
-
+
/*
* forward message
*/
- if(_slurm_msg_sendto(fd,
- get_buf_data(buffer),
+ if(_slurm_msg_sendto(fd,
+ get_buf_data(buffer),
get_buf_offset(buffer),
SLURM_PROTOCOL_NO_SEND_RECV_FLAGS ) < 0) {
error("forward_thread: slurm_msg_sendto: %m");
-
+
slurm_mutex_lock(fwd_msg->forward_mutex);
- mark_as_failed_forward(&fwd_msg->ret_list, name,
+ mark_as_failed_forward(&fwd_msg->ret_list, name,
errno);
free(name);
if(hostlist_count(hl) > 0) {
- free_buf(buffer);
+ free_buf(buffer);
buffer = init_buf(fwd_msg->buf_len);
slurm_mutex_unlock(fwd_msg->forward_mutex);
slurm_close_accepted_conn(fd);
fd = -1;
continue;
}
- goto cleanup;
+ goto cleanup;
}
if ((fwd_msg->header.msg_type == REQUEST_SHUTDOWN) ||
@@ -184,7 +184,7 @@ void *_forward_thread(void *arg)
free(name);
i=0;
while((name = hostlist_shift(hl))) {
- ret_data_info =
+ ret_data_info =
xmalloc(sizeof(ret_data_info_t));
list_push(fwd_msg->ret_list, ret_data_info);
ret_data_info->node_name = xstrdup(name);
@@ -196,7 +196,7 @@ void *_forward_thread(void *arg)
if(fwd_msg->header.forward.cnt > 0) {
static int message_timeout = -1;
if (message_timeout < 0)
- message_timeout =
+ message_timeout =
slurm_get_msg_timeout() * 1000;
steps = (fwd_msg->header.forward.cnt+1) /
slurm_get_tree_width();
@@ -205,29 +205,29 @@ void *_forward_thread(void *arg)
steps++;
fwd_msg->timeout += (start_timeout*steps);
/* info("now + %d*%d = %d", start_timeout, steps, fwd_msg->timeout); */
- }
-
+ }
+
ret_list = slurm_receive_msgs(fd, steps, fwd_msg->timeout);
/* info("sent %d forwards got %d back", */
/* fwd_msg->header.forward.cnt, list_count(ret_list)); */
-
- if(!ret_list || (fwd_msg->header.forward.cnt != 0
+
+ if(!ret_list || (fwd_msg->header.forward.cnt != 0
&& list_count(ret_list) <= 1)) {
slurm_mutex_lock(fwd_msg->forward_mutex);
- mark_as_failed_forward(&fwd_msg->ret_list, name,
+ mark_as_failed_forward(&fwd_msg->ret_list, name,
errno);
free(name);
if(ret_list)
list_destroy(ret_list);
if (hostlist_count(hl) > 0) {
- free_buf(buffer);
+ free_buf(buffer);
buffer = init_buf(fwd_msg->buf_len);
slurm_mutex_unlock(fwd_msg->forward_mutex);
slurm_close_accepted_conn(fd);
fd = -1;
continue;
}
- goto cleanup;
+ goto cleanup;
} else if((fwd_msg->header.forward.cnt+1)
!= list_count(ret_list)) {
/* this should never be called since the above
@@ -263,15 +263,15 @@ void *_forward_thread(void *arg)
if(!node_found) {
mark_as_failed_forward(
&fwd_msg->ret_list,
- tmp,
- SLURM_COMMUNICATIONS_CONNECTION_ERROR);
+ tmp,
+ SLURM_COMMUNICATIONS_CONNECTION_ERROR);
}
free(tmp);
}
hostlist_iterator_destroy(host_itr);
if(!first_node_found) {
mark_as_failed_forward(&fwd_msg->ret_list,
- name,
+ name,
SLURM_COMMUNICATIONS_CONNECTION_ERROR);
}
}
@@ -295,7 +295,7 @@ cleanup:
error ("close(%d): %m", fd);
hostlist_destroy(hl);
destroy_forward(&fwd_msg->header.forward);
- free_buf(buffer);
+ free_buf(buffer);
pthread_cond_signal(fwd_msg->notify);
slurm_mutex_unlock(fwd_msg->forward_mutex);
@@ -308,13 +308,13 @@ void *_fwd_tree_thread(void *arg)
List ret_list = NULL;
char *name = NULL;
char buf[8196];
- slurm_msg_t send_msg;
-
+ slurm_msg_t send_msg;
+
slurm_msg_t_init(&send_msg);
send_msg.msg_type = fwd_tree->orig_msg->msg_type;
send_msg.data = fwd_tree->orig_msg->data;
- /* repeat until we are sure the message was sent */
+ /* repeat until we are sure the message was sent */
while((name = hostlist_shift(fwd_tree->tree_hl))) {
if(slurm_conf_get_addr(name, &send_msg.address)
== SLURM_ERROR) {
@@ -326,20 +326,20 @@ void *_fwd_tree_thread(void *arg)
pthread_cond_signal(fwd_tree->notify);
slurm_mutex_unlock(fwd_tree->tree_mutex);
free(name);
-
+
continue;
}
-
+
send_msg.forward.timeout = fwd_tree->timeout;
if((send_msg.forward.cnt = hostlist_count(fwd_tree->tree_hl))) {
- hostlist_ranged_string(fwd_tree->tree_hl,
+ hostlist_ranged_string(fwd_tree->tree_hl,
sizeof(buf), buf);
send_msg.forward.nodelist = xstrdup(buf);
} else
send_msg.forward.nodelist = NULL;
if (send_msg.forward.nodelist && send_msg.forward.nodelist[0]) {
- debug3("Tree sending to %s along with %s",
+ debug3("Tree sending to %s along with %s",
name, send_msg.forward.nodelist);
} else
debug3("Tree sending to %s", name);
@@ -368,21 +368,21 @@ void *_fwd_tree_thread(void *arg)
pthread_cond_signal(fwd_tree->notify);
slurm_mutex_unlock(fwd_tree->tree_mutex);
free(name);
-
+
continue;
}
free(name);
-
+
/* check for error and try again */
- if(errno == SLURM_COMMUNICATIONS_CONNECTION_ERROR)
- continue;
-
+ if(errno == SLURM_COMMUNICATIONS_CONNECTION_ERROR)
+ continue;
+
break;
}
_destroy_tree_fwd(fwd_tree);
-
+
return NULL;
}
@@ -420,7 +420,7 @@ extern void forward_init(forward_t *forward, forward_t *from)
* needing to be forwarded.
* RET: SLURM_SUCCESS - int
*/
-extern int forward_msg(forward_struct_t *forward_struct,
+extern int forward_msg(forward_struct_t *forward_struct,
header_t *header)
{
int j = 0;
@@ -437,45 +437,45 @@ extern int forward_msg(forward_struct_t *forward_struct,
xfree(span);
return SLURM_ERROR;
}
- hl = hostlist_create(header->forward.nodelist);
+ hl = hostlist_create(header->forward.nodelist);
hostlist_uniq(hl);
-
+
while((name = hostlist_shift(hl))) {
pthread_attr_t attr_agent;
pthread_t thread_agent;
char buf[8192];
-
+
slurm_attr_init(&attr_agent);
if (pthread_attr_setdetachstate
(&attr_agent, PTHREAD_CREATE_DETACHED))
error("pthread_attr_setdetachstate error %m");
-
+
forward_msg = &forward_struct->forward_msg[thr_count];
forward_msg->ret_list = forward_struct->ret_list;
-
+
forward_msg->timeout = forward_struct->timeout;
-
+
if(forward_msg->timeout <= 0) {
/* convert secs to msec */
- forward_msg->timeout = slurm_get_msg_timeout() * 1000;
+ forward_msg->timeout = slurm_get_msg_timeout() * 1000;
}
forward_msg->notify = &forward_struct->notify;
forward_msg->forward_mutex = &forward_struct->forward_mutex;
forward_msg->buf_len = forward_struct->buf_len;
forward_msg->buf = forward_struct->buf;
-
- memcpy(&forward_msg->header.orig_addr,
- &header->orig_addr,
+
+ memcpy(&forward_msg->header.orig_addr,
+ &header->orig_addr,
sizeof(slurm_addr));
-
+
forward_msg->header.version = header->version;
forward_msg->header.flags = header->flags;
forward_msg->header.msg_type = header->msg_type;
forward_msg->header.body_length = header->body_length;
forward_msg->header.ret_list = NULL;
forward_msg->header.ret_cnt = 0;
-
+
forward_hl = hostlist_create(name);
free(name);
for(j = 0; j < span[thr_count]; j++) {
@@ -491,7 +491,7 @@ extern int forward_msg(forward_struct_t *forward_struct,
forward_init(&forward_msg->header.forward, NULL);
forward_msg->header.forward.nodelist = xstrdup(buf);
while(pthread_create(&thread_agent, &attr_agent,
- _forward_thread,
+ _forward_thread,
(void *)forward_msg)) {
error("pthread_create error %m");
if (++retries > MAX_RETRIES)
@@ -499,7 +499,7 @@ extern int forward_msg(forward_struct_t *forward_struct,
sleep(1); /* sleep and try again */
}
slurm_attr_destroy(&attr_agent);
- thr_count++;
+ thr_count++;
}
hostlist_destroy(hl);
xfree(span);
@@ -533,7 +533,7 @@ extern List start_msg_tree(hostlist_t hl, slurm_msg_t *msg, int timeout)
xassert(hl);
xassert(msg);
- hostlist_uniq(hl);
+ hostlist_uniq(hl);
host_count = hostlist_count(hl);
span = set_span(host_count, 0);
@@ -542,7 +542,7 @@ extern List start_msg_tree(hostlist_t hl, slurm_msg_t *msg, int timeout)
pthread_cond_init(¬ify, NULL);
ret_list = list_create(destroy_data_info);
-
+
while((name = hostlist_shift(hl))) {
pthread_attr_t attr_agent;
pthread_t thread_agent;
@@ -562,7 +562,7 @@ extern List start_msg_tree(hostlist_t hl, slurm_msg_t *msg, int timeout)
if(fwd_tree->timeout <= 0) {
/* convert secs to msec */
- fwd_tree->timeout = slurm_get_msg_timeout() * 1000;
+ fwd_tree->timeout = slurm_get_msg_timeout() * 1000;
}
fwd_tree->tree_hl = hostlist_create(name);
@@ -583,10 +583,10 @@ extern List start_msg_tree(hostlist_t hl, slurm_msg_t *msg, int timeout)
sleep(1); /* sleep and try again */
}
slurm_attr_destroy(&attr_agent);
- thr_count++;
+ thr_count++;
}
xfree(span);
-
+
slurm_mutex_lock(&tree_mutex);
count = list_count(ret_list);
@@ -613,45 +613,45 @@ extern List start_msg_tree(hostlist_t hl, slurm_msg_t *msg, int timeout)
* IN: err - int - error message from attempt
*
*/
-extern void mark_as_failed_forward(List *ret_list, char *node_name, int err)
+extern void mark_as_failed_forward(List *ret_list, char *node_name, int err)
{
ret_data_info_t *ret_data_info = NULL;
-
+
debug3("problems with %s", node_name);
- if(!*ret_list)
+ if(!*ret_list)
*ret_list = list_create(destroy_data_info);
-
+
ret_data_info = xmalloc(sizeof(ret_data_info_t));
ret_data_info->node_name = xstrdup(node_name);
ret_data_info->type = RESPONSE_FORWARD_FAILED;
ret_data_info->err = err;
list_push(*ret_list, ret_data_info);
-
+
return;
}
extern void forward_wait(slurm_msg_t * msg)
{
int count = 0;
-
+
/* wait for all the other messages on the tree under us */
if(msg->forward_struct) {
debug2("looking for %d", msg->forward_struct->fwd_cnt);
slurm_mutex_lock(&msg->forward_struct->forward_mutex);
count = 0;
- if (msg->ret_list != NULL)
+ if (msg->ret_list != NULL)
count = list_count(msg->ret_list);
-
+
debug2("Got back %d", count);
while((count < msg->forward_struct->fwd_cnt)) {
- pthread_cond_wait(&msg->forward_struct->notify,
+ pthread_cond_wait(&msg->forward_struct->notify,
&msg->forward_struct->forward_mutex);
-
+
if (msg->ret_list != NULL) {
count = list_count(msg->ret_list);
}
debug2("Got back %d", count);
-
+
}
debug2("Got them all");
slurm_mutex_unlock(&msg->forward_struct->forward_mutex);
@@ -664,14 +664,14 @@ void destroy_data_info(void *object)
{
ret_data_info_t *ret_data_info = (ret_data_info_t *)object;
if(ret_data_info) {
- slurm_free_msg_data(ret_data_info->type,
- ret_data_info->data);
+ slurm_free_msg_data(ret_data_info->type,
+ ret_data_info->data);
xfree(ret_data_info->node_name);
xfree(ret_data_info);
}
}
-void destroy_forward(forward_t *forward)
+void destroy_forward(forward_t *forward)
{
if(forward->init == FORWARD_INIT) {
xfree(forward->nodelist);
diff --git a/src/common/forward.h b/src/common/forward.h
index da707a571232586094757453da153d3712c06bd8..31e12f8a43350f4b99254191d88dc74f51b252b9 100644
--- a/src/common/forward.h
+++ b/src/common/forward.h
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <auble1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -45,7 +45,7 @@
#include "src/common/slurm_protocol_api.h"
/*
- * forward_init - initilize forward structure
+ * forward_init - initilize forward structure
* IN: forward - forward_t * - struct to store forward info
* IN: from - forward_t * - (OPTIONAL) can be NULL, can be used to
* init the forward to this state
@@ -59,21 +59,21 @@ extern void forward_init(forward_t *forward, forward_t *from);
* the forwarded message
*
* IN: forward_struct - forward_struct_t * - holds information about message
- * that needs to be forwarded to
+ * that needs to be forwarded to
* childern processes
* IN: header - header_t - header from message that came in
* needing to be forwarded.
* RET: SLURM_SUCCESS - int
*/
/*********************************************************************
-// Code taken from common/slurm_protocol_api.c
+// Code taken from common/slurm_protocol_api.c
// Set up the forward_struct using the remainder of the buffer being received,
// right after header has been removed form the original buffer
forward_struct = xmalloc(sizeof(forward_struct_t));
forward_struct->buf_len = remaining_buf(buffer);
forward_struct->buf = xmalloc(sizeof(char) * forward_struct->buf_len);
-memcpy(forward_struct->buf, &buffer->head[buffer->processed],
+memcpy(forward_struct->buf, &buffer->head[buffer->processed],
forward_struct->buf_len);
forward_struct->ret_list = ret_list;
@@ -85,7 +85,7 @@ if (forward_msg(forward_struct, &header) == SLURM_ERROR) {
}
*********************************************************************/
-extern int forward_msg(forward_struct_t *forward_struct,
+extern int forward_msg(forward_struct_t *forward_struct,
header_t *header);
@@ -111,20 +111,20 @@ extern List start_msg_tree(hostlist_t hl, slurm_msg_t *msg, int timeout);
* IN: err - int - error message from attempt
*
*/
-extern void mark_as_failed_forward(List *ret_list, char *node_name, int err);
+extern void mark_as_failed_forward(List *ret_list, char *node_name, int err);
extern void forward_wait(slurm_msg_t *msg);
/*
- * no_resp_forward - Used to respond for nodes not able to respond since
+ * no_resp_forward - Used to respond for nodes not able to respond since
* the parent had failed in some way
- * IN: forward - forward_t * -
- * IN: ret_list - List * -
+ * IN: forward - forward_t * -
+ * IN: ret_list - List * -
* IN: err - int - type of error from parent
* RET: SLURM_SUCCESS - int
*/
/*********************************************************************
-Code taken from common/slurm_protocol_api.c
+Code taken from common/slurm_protocol_api.c
//This function should only be used after a message is recieved.
// a call to slurm_receive_msg will fill in a ret_list
@@ -133,7 +133,7 @@ Code taken from common/slurm_protocol_api.c
// if ret_list is null or list_count is 0 means there may have been an error
// this fuction will check to make sure if there were supposed to be forwards
-// we handle the return code for the messages
+// we handle the return code for the messages
if(!ret_list || list_count(ret_list) == 0) {
no_resp_forwards(&req->forward, &ret_list, errno);
}
@@ -144,5 +144,5 @@ if(!ret_list || list_count(ret_list) == 0) {
extern void destroy_data_info(void *object);
extern void destroy_forward(forward_t *forward);
extern void destroy_forward_struct(forward_struct_t *forward_struct);
-
+
#endif
diff --git a/src/common/getopt.c b/src/common/getopt.c
index 8a2f95b77aafef4dc77e1e53d614eceee8018e53..b0f9c2460dd1aa8dfe5ee1c0874913053c1496b6 100644
--- a/src/common/getopt.c
+++ b/src/common/getopt.c
@@ -20,7 +20,7 @@
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. */
-
+
/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
Ditto for AIX 3.2 and <stdlib.h>. */
#ifndef _NO_PROTO
@@ -189,7 +189,7 @@ static enum
/* Value of POSIXLY_CORRECT environment variable. */
static char *posixly_correct;
-
+
#ifdef __GNU_LIBRARY__
/* We want to avoid inclusion of string.h with non-GNU libraries
because there are many ways it can cause trouble.
@@ -239,7 +239,7 @@ extern int strlen (const char *);
#endif /* __GNUC__ */
#endif /* not __GNU_LIBRARY__ */
-
+
/* Handle permutation of arguments. */
/* Describe the part of ARGV that contains non-options that have
@@ -445,7 +445,7 @@ _getopt_initialize (argc, argv, optstring)
return optstring;
}
-
+
/* Scan elements of ARGV (whose length is ARGC) for option characters
given in OPTSTRING.
@@ -514,7 +514,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
int print_errors = opterr;
if (optstring[0] == ':')
print_errors = 0;
-
+
if (argc < 1)
return -1;
@@ -981,7 +981,7 @@ getopt (argc, argv, optstring)
}
#endif /* Not ELIDE_CODE. */
-
+
#ifdef TEST
/* Compile with -DTEST to make an executable for use in testing
diff --git a/src/common/getopt1.c b/src/common/getopt1.c
index 53aabec5948047db427406a20027ee61b7944477..08952725003873cdd85445ec46e9e520d3e4f095 100644
--- a/src/common/getopt1.c
+++ b/src/common/getopt1.c
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. */
-
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -92,7 +92,7 @@ getopt_long_only (argc, argv, options, long_options, opt_index)
#endif /* Not ELIDE_CODE. */
-
+
#ifdef TEST
#include <stdio.h>
diff --git a/src/common/hostlist.c b/src/common/hostlist.c
index 0009dde0a802811d862c134a657055f195944faf..1ee2eb8f8fd8b9fa3a947c467c69d735a01debb3 100644
--- a/src/common/hostlist.c
+++ b/src/common/hostlist.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -76,8 +76,8 @@
#include "src/common/xassert.h"
/*
- * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
- * for details.
+ * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
+ * for details.
*/
strong_alias(hostlist_create, slurm_hostlist_create);
strong_alias(hostlist_copy, slurm_hostlist_copy);
@@ -157,7 +157,7 @@ extern void * lsd_nomem_error(char *file, int line, char *mesg);
return(lsd_nomem_error(__FILE__, __LINE__, mesg)); \
} while (0)
-/*
+/*
* Some constants and tunables:
*/
@@ -303,19 +303,19 @@ static pthread_mutex_t multi_dim_lock = PTHREAD_MUTEX_INITIALIZER;
static void _parse_int_to_array(int in, int out[SYSTEM_DIMENSIONS]);
static int _tell_if_used(int dim, int curr,
int start[SYSTEM_DIMENSIONS],
- int end[SYSTEM_DIMENSIONS],
+ int end[SYSTEM_DIMENSIONS],
int last[SYSTEM_DIMENSIONS],
int *found);
static int _get_next_box(int start[SYSTEM_DIMENSIONS],
int end[SYSTEM_DIMENSIONS]);
static int _get_boxes(char *buf, int max_len);
-static void _set_box_in_grid(int dim, int curr,
+static void _set_box_in_grid(int dim, int curr,
int start[SYSTEM_DIMENSIONS],
int end[SYSTEM_DIMENSIONS],
bool value);
static int _add_box_ranges(int dim, int curr,
int start[SYSTEM_DIMENSIONS],
- int end[SYSTEM_DIMENSIONS],
+ int end[SYSTEM_DIMENSIONS],
int pos[SYSTEM_DIMENSIONS],
struct _range *ranges,
int len, int *count);
@@ -326,8 +326,8 @@ static void _set_min_max_of_grid(int dim, int curr,
int max[SYSTEM_DIMENSIONS],
int pos[SYSTEM_DIMENSIONS]);
static void _set_grid(unsigned long start, unsigned long end);
-static bool _test_box_in_grid(int dim, int curr,
- int start[SYSTEM_DIMENSIONS],
+static bool _test_box_in_grid(int dim, int curr,
+ int start[SYSTEM_DIMENSIONS],
int end[SYSTEM_DIMENSIONS]);
static bool _test_box(int start[SYSTEM_DIMENSIONS], int end[SYSTEM_DIMENSIONS]);
#endif
@@ -363,7 +363,7 @@ static char * hostrange_shift(hostrange_t);
static int hostrange_join(hostrange_t, hostrange_t);
static hostrange_t hostrange_intersect(hostrange_t, hostrange_t);
static int hostrange_hn_within(hostrange_t, hostname_t);
-static size_t hostrange_to_string(hostrange_t hr, size_t, char *,
+static size_t hostrange_to_string(hostrange_t hr, size_t, char *,
char *);
static size_t hostrange_numstr(hostrange_t, size_t, char *);
@@ -451,7 +451,7 @@ static int hostset_find_host(hostset_t, const char *);
#define UNLOCK_HOSTLIST(_hl) \
do { \
mutex_unlock(&(_hl)->mutex); \
- } while (0)
+ } while (0)
#define seterrno_ret(_errno, _rc) \
do { \
@@ -475,7 +475,7 @@ static void _error(char *file, int line, char *msg, ...)
va_start(ap, msg);
len = vsnprintf(buf, 1024, msg, ap);
- if ((len < 0) || (len > 1024))
+ if ((len < 0) || (len > 1024))
buf[1023] = '\0';
lsd_fatal_error(file, line, buf);
@@ -484,8 +484,8 @@ static void _error(char *file, int line, char *msg, ...)
return;
}
-/*
- * Helper function for host list string parsing routines
+/*
+ * Helper function for host list string parsing routines
* Returns a pointer to the next token; additionally advance *str
* to the next separator.
*
@@ -517,7 +517,7 @@ static char * _next_tok(char *sep, char **str)
if ((memchr(tok, '[', *str - tok) != NULL) &&
(memchr(tok, ']', *str - tok) == NULL)) {
char *q = strchr(*str, ']');
-
+
if (q && (memchr(*str, '[', q - *str) == NULL))
*str = ++q;
@@ -555,12 +555,12 @@ static int _zero_padded(unsigned long num, int width)
}
/* test whether two format `width' parameters are "equivalent"
- * The width arguments "wn" and "wm" for integers "n" and "m"
+ * The width arguments "wn" and "wm" for integers "n" and "m"
* are equivalent if:
- *
+ *
* o wn == wm OR
*
- * o applying the same format width (either wn or wm) to both of
+ * o applying the same format width (either wn or wm) to both of
* 'n' and 'm' will not change the zero padding of *either* 'm' nor 'n'.
*
* If this function returns 1 (or true), the appropriate width value
@@ -602,7 +602,7 @@ static int _width_equiv(unsigned long n, int *wn, unsigned long m, int *wm)
/* ----[ hostname_t functions ]---- */
-/*
+/*
* return the location of the last char in the hostname prefix
*/
static int host_prefix_end(const char *hostname)
@@ -627,13 +627,13 @@ static int host_prefix_end(const char *hostname)
return -1;
idx = len - 1;
- while (idx >= 0 && isdigit((char) hostname[idx]))
+ while (idx >= 0 && isdigit((char) hostname[idx]))
idx--;
#endif
return idx;
}
-/*
+/*
* create a hostname_t object from a string hostname
*/
static hostname_t hostname_create(const char *hostname)
@@ -666,7 +666,7 @@ static hostname_t hostname_create(const char *hostname)
}
hn->suffix = hn->hostname + idx + 1;
-#if (SYSTEM_DIMENSIONS > 1)
+#if (SYSTEM_DIMENSIONS > 1)
if(strlen(hn->suffix) != SYSTEM_DIMENSIONS)
hostlist_base = 10;
#endif
@@ -704,7 +704,7 @@ static void hostname_destroy(hostname_t hn)
free(hn);
}
-/* return true if the hostname has a valid numeric suffix
+/* return true if the hostname has a valid numeric suffix
*/
static int hostname_suffix_is_valid(hostname_t hn)
{
@@ -726,12 +726,12 @@ static int hostname_suffix_width(hostname_t hn)
/* ----[ hostrange_t functions ]---- */
-/* allocate a new hostrange object
+/* allocate a new hostrange object
*/
static hostrange_t hostrange_new(void)
{
hostrange_t new = (hostrange_t) malloc(sizeof(*new));
- if (!new)
+ if (!new)
out_of_memory("hostrange create");
return new;
}
@@ -861,7 +861,7 @@ static hostrange_t hostrange_delete_host(hostrange_t hr, unsigned long n)
/* hostrange_cmp() is used to sort hostrange objects. It will
* sort based on the following (in order):
* o result of strcmp on prefixes
- * o if widths are compatible, then:
+ * o if widths are compatible, then:
* sort based on lowest suffix in range
* else
* sort based on width */
@@ -880,11 +880,11 @@ static int hostrange_cmp(hostrange_t h1, hostrange_t h2)
}
-/* compare the prefixes of two hostrange objects.
+/* compare the prefixes of two hostrange objects.
* returns:
* < 0 if h1 prefix is less than h2 OR h2 == NULL.
*
- * 0 if h1's prefix and h2's prefix match,
+ * 0 if h1's prefix and h2's prefix match,
* UNLESS, either h1 or h2 (NOT both) do not have a valid suffix.
*
* > 0 if h1's prefix is greater than h2's OR h1 == NULL. */
@@ -918,7 +918,7 @@ static int hostrange_within_range(hostrange_t h1, hostrange_t h2)
}
-/* compare two hostrange objects to determine if they are width
+/* compare two hostrange objects to determine if they are width
* compatible, returns:
* 1 if widths can safely be combined
* 0 if widths cannot be safely combined
@@ -955,7 +955,7 @@ static char *hostrange_pop(hostrange_t hr)
hr->lo++; /* effectively set count == 0 */
host = strdup(hr->prefix);
} else if (hostrange_count(hr) > 0) {
- size = strlen(hr->prefix) + hr->width + 16;
+ size = strlen(hr->prefix) + hr->width + 16;
if (!(host = (char *) malloc(size * sizeof(char))))
out_of_memory("hostrange pop");
#if (SYSTEM_DIMENSIONS > 1)
@@ -974,11 +974,11 @@ static char *hostrange_pop(hostrange_t hr)
hr->hi--;
host[len] = '\0';
} else {
- snprintf(host, size, "%s%0*lu", hr->prefix,
+ snprintf(host, size, "%s%0*lu", hr->prefix,
hr->width, hr->hi--);
}
#else
- snprintf(host, size, "%s%0*lu", hr->prefix,
+ snprintf(host, size, "%s%0*lu", hr->prefix,
hr->width, hr->hi--);
#endif
}
@@ -1021,7 +1021,7 @@ static char *hostrange_shift(hostrange_t hr)
snprintf(host, size, "%s%0*lu", hr->prefix,
hr->width, hr->lo++);
}
-#else
+#else
snprintf(host, size, "%s%0*lu", hr->prefix,
hr->width, hr->lo++);
#endif
@@ -1037,7 +1037,7 @@ static char *hostrange_shift(hostrange_t hr)
*
* -1 if ranges do not overlap (including incompatible zero padding)
* 0 if ranges join perfectly
- * >0 number of hosts that were duplicated in h1 and h2
+ * >0 number of hosts that were duplicated in h1 and h2
*
* h2 will be coalesced into h1 if rc >= 0
*
@@ -1091,7 +1091,7 @@ static hostrange_t hostrange_intersect(hostrange_t h1, hostrange_t h2)
assert(hostrange_cmp(h1, h2) <= 0);
if ((hostrange_prefix_cmp(h1, h2) == 0)
- && (h1->hi > h2->lo)
+ && (h1->hi > h2->lo)
&& (hostrange_width_combine(h1, h2))) {
if (!(new = hostrange_copy(h1)))
@@ -1109,24 +1109,24 @@ static hostrange_t hostrange_intersect(hostrange_t h1, hostrange_t h2)
static int hostrange_hn_within(hostrange_t hr, hostname_t hn)
{
if (hr->singlehost) {
- /*
- * If the current hostrange [hr] is a `singlehost' (no valid
+ /*
+ * If the current hostrange [hr] is a `singlehost' (no valid
* numeric suffix (lo and hi)), then the hostrange [hr]
* stores just one host with name == hr->prefix.
- *
+ *
* Thus the full hostname in [hn] must match hr->prefix, in
- * which case we return true. Otherwise, there is no
+ * which case we return true. Otherwise, there is no
* possibility that [hn] matches [hr].
*/
if (strcmp (hn->hostname, hr->prefix) == 0)
return 1;
- else
+ else
return 0;
}
/*
* Now we know [hr] is not a "singlehost", so hostname
- * better have a valid numeric suffix, or there is no
+ * better have a valid numeric suffix, or there is no
* way we can match
*/
if (!hostname_suffix_is_valid (hn))
@@ -1136,7 +1136,7 @@ static int hostrange_hn_within(hostrange_t hr, hostname_t hn)
* If hostrange and hostname prefixes don't match, then
* there is way the hostname falls within the range [hr].
*/
- if (strcmp(hr->prefix, hn->prefix) != 0)
+ if (strcmp(hr->prefix, hn->prefix) != 0)
return 0;
/*
@@ -1166,7 +1166,7 @@ hostrange_to_string(hostrange_t hr, size_t n, char *buf, char *separator)
if (n == 0)
return 0;
-
+
assert(hr != NULL);
if (hr->singlehost)
@@ -1191,7 +1191,7 @@ hostrange_to_string(hostrange_t hr, size_t n, char *buf, char *separator)
ret = snprintf(buf + len, m, "%s%0*lu",
hr->prefix, hr->width, i);
}
-#else
+#else
ret = snprintf(buf + len, m, "%s%0*lu",
hr->prefix, hr->width, i);
#endif
@@ -1230,18 +1230,18 @@ static size_t hostrange_numstr(hostrange_t hr, size_t n, char *buf)
if (hr->width == SYSTEM_DIMENSIONS) {
int i2=0;
int coord[SYSTEM_DIMENSIONS];
-
+
_parse_int_to_array(hr->lo, coord);
-
+
for(i2 = 0; i2<SYSTEM_DIMENSIONS; i2++) {
if(len <= n)
buf[len++] = alpha_num[coord[i2]];
}
- buf[len] = '\0';
+ buf[len] = '\0';
} else {
len = snprintf(buf, n, "%0*lu", hr->width, hr->lo);
}
-#else
+#else
len = snprintf(buf, n, "%0*lu", hr->width, hr->lo);
#endif
@@ -1251,7 +1251,7 @@ static size_t hostrange_numstr(hostrange_t hr, size_t n, char *buf)
if (hr->width == SYSTEM_DIMENSIONS) {
int i2=0;
int coord[SYSTEM_DIMENSIONS];
-
+
_parse_int_to_array(hr->hi, coord);
buf[len++] = '-';
@@ -1259,15 +1259,15 @@ static size_t hostrange_numstr(hostrange_t hr, size_t n, char *buf)
if(len <= n)
buf[len++] = alpha_num[coord[i2]];
}
- buf[len] = '\0';
+ buf[len] = '\0';
} else {
- len2 = snprintf(buf+len, n-len, "-%0*lu",
+ len2 = snprintf(buf+len, n-len, "-%0*lu",
hr->width, hr->hi);
}
-#else
+#else
len2 = snprintf(buf+len, n-len, "-%0*lu", hr->width, hr->hi);
#endif
- if (len2 < 0)
+ if (len2 < 0)
len = -1;
else
len += len2;
@@ -1279,7 +1279,7 @@ static size_t hostrange_numstr(hostrange_t hr, size_t n, char *buf)
/* ----[ hostlist functions ]---- */
-/* Create a new hostlist object.
+/* Create a new hostlist object.
* Returns an empty hostlist, or NULL if memory allocation fails.
*/
static hostlist_t hostlist_new(void)
@@ -1316,9 +1316,9 @@ fail1:
/* Resize the internal array used to store the list of hostrange objects.
*
* returns 1 for a successful resize,
- * 0 if call to _realloc fails
+ * 0 if call to _realloc fails
*
- * It is assumed that the caller has the hostlist hl locked
+ * It is assumed that the caller has the hostlist hl locked
*/
static int hostlist_resize(hostlist_t hl, size_t newsize)
{
@@ -1329,7 +1329,7 @@ static int hostlist_resize(hostlist_t hl, size_t newsize)
oldsize = hl->size;
hl->size = newsize;
hl->hr = realloc((void *) hl->hr, hl->size*sizeof(hostrange_t));
- if (!(hl->hr))
+ if (!(hl->hr))
return 0;
for (i = oldsize; i < newsize; i++)
@@ -1392,7 +1392,7 @@ error:
/* Same as hostlist_push_range() above, but prefix, lo, hi, and width
- * are passed as args
+ * are passed as args
*/
static int
hostlist_push_hr(hostlist_t hl, char *prefix, unsigned long lo,
@@ -1495,7 +1495,7 @@ hostlist_t _hostlist_create(const char *hostlist, char *sep, char *r_op)
"Bluegene or Sun Constellation systems!!!!");
#endif
orig = str = strdup(hostlist);
-
+
/* return an empty list if an empty string was passed in */
if (str == NULL || strlen(str) == 0)
goto done;
@@ -1511,23 +1511,23 @@ hostlist_t _hostlist_create(const char *hostlist, char *sep, char *r_op)
high = low = 0;
- /* find end of alpha part
+ /* find end of alpha part
* do this by finding last occurence of range_op in str */
pos = strlen(tok) - 1;
if (strstr(tok, r_op) != '\0') {
- while (pos >= 0 && (char) tok[pos] != range_op)
+ while (pos >= 0 && (char) tok[pos] != range_op)
pos--;
}
/* now back up past any digits */
while (pos >= 0 && isdigit((char) tok[--pos])) {;}
- /* Check for valid x-y range (x must be a digit)
+ /* Check for valid x-y range (x must be a digit)
* Reset pos if the range is not valid */
if (!isdigit((char) tok[++pos]))
pos = strlen(tok) - 1;
- /* create prefix string
+ /* create prefix string
* if prefix will be zero length, but prefix already exists
* use the previous prefix and fmt
*/
@@ -1547,7 +1547,7 @@ hostlist_t _hostlist_create(const char *hostlist, char *sep, char *r_op)
} else
tok += pos;
-#if (SYSTEM_DIMENSIONS > 1)
+#if (SYSTEM_DIMENSIONS > 1)
if(strlen(tok) != SYSTEM_DIMENSIONS)
hostlist_base = 10;
else
@@ -1595,7 +1595,7 @@ hostlist_t _hostlist_create(const char *hostlist, char *sep, char *r_op)
high = 0; /* special case, ugh. */
}
- /* error if:
+ /* error if:
* 1. we are not at end of string
* 2. upper bound equals lower bound
*/
@@ -1622,7 +1622,7 @@ done:
#else /* !WANT_RECKLESS_HOSTRANGE_EXPANSION */
-hostlist_t _hostlist_create(const char *hostlist, char *sep, char *r_op)
+hostlist_t _hostlist_create(const char *hostlist, char *sep, char *r_op)
{
return _hostlist_create_bracketed(hostlist, sep, r_op);
}
@@ -1634,7 +1634,7 @@ hostlist_t _hostlist_create(const char *hostlist, char *sep, char *r_op)
static int _parse_box_range(char *str, struct _range *ranges,
int len, int *count)
{
-
+
#if (SYSTEM_DIMENSIONS > 1)
int start[SYSTEM_DIMENSIONS], end[SYSTEM_DIMENSIONS],
pos[SYSTEM_DIMENSIONS];
@@ -1642,10 +1642,10 @@ static int _parse_box_range(char *str, struct _range *ranges,
char coord2[SYSTEM_DIMENSIONS+1];
int i, a;
- if ((str[SYSTEM_DIMENSIONS] != 'x') ||
- (str[(SYSTEM_DIMENSIONS * 2) + 1] != '\0'))
+ if ((str[SYSTEM_DIMENSIONS] != 'x') ||
+ (str[(SYSTEM_DIMENSIONS * 2) + 1] != '\0'))
return 0;
-
+
for(i = 0; i<SYSTEM_DIMENSIONS; i++) {
if ((str[i] >= '0') && (str[i] <= '9'))
start[i] = str[i] - '0';
@@ -1679,7 +1679,7 @@ static int _parse_box_range(char *str, struct _range *ranges,
#endif
}
-/* Grab a single range from str
+/* Grab a single range from str
* returns 1 if str contained a valid number or range,
* 0 if conversion of str to a range failed.
*/
@@ -1689,39 +1689,39 @@ static int _parse_single_range(const char *str, struct _range *range)
char *orig = strdup(str);
int hostlist_base = HOSTLIST_BASE;
- if (!orig)
+ if (!orig)
seterrno_ret(ENOMEM, 0);
-
- if ((p = strchr(str, 'x')))
+
+ if ((p = strchr(str, 'x')))
goto error; /* do NOT allow boxes here */
-
+
if ((p = strchr(str, '-'))) {
*p++ = '\0';
if (*p == '-') /* do NOT allow negative numbers */
goto error;
}
-
+
range->width = strlen(str);
-
+
#if (SYSTEM_DIMENSIONS > 1)
/* If we get something here where the width is not
SYSTEM_DIMENSIONS we need to treat it as a regular number
since that is how it will be treated in the future.
*/
- if(range->width != SYSTEM_DIMENSIONS)
- hostlist_base = 10;
+ if(range->width != SYSTEM_DIMENSIONS)
+ hostlist_base = 10;
#endif
range->lo = strtoul(str, &q, hostlist_base);
- if (q == str)
+ if (q == str)
goto error;
-
+
range->hi = (p && *p) ? strtoul(p, &q, hostlist_base) : range->lo;
- if (q == p || *q != '\0')
+ if (q == p || *q != '\0')
goto error;
-
- if (range->lo > range->hi)
+
+ if (range->lo > range->hi)
goto error;
if (range->hi - range->lo + 1 > MAX_RANGE ) {
@@ -1733,7 +1733,7 @@ static int _parse_single_range(const char *str, struct _range *range)
free(orig);
return 1;
-
+
error:
errno = EINVAL;
_error(__FILE__, __LINE__, "Invalid range: `%s'", orig);
@@ -1743,7 +1743,7 @@ error:
/*
* Convert 'str' containing comma separated digits and ranges into an array
- * of struct _range types (max 'len' elements).
+ * of struct _range types (max 'len' elements).
*
* Return number of ranges created, or -1 on error.
*/
@@ -1764,14 +1764,14 @@ static int _parse_range_list(char *str, struct _range *ranges, int len)
*p++ = '\0';
/* info("looking at %s", str); */
if ((SYSTEM_DIMENSIONS > 1) &&
- (str[SYSTEM_DIMENSIONS] == 'x') &&
+ (str[SYSTEM_DIMENSIONS] == 'x') &&
(strlen(str) == (SYSTEM_DIMENSIONS * 2 + 1))) {
- if (!_parse_box_range(str, ranges, len, &count))
- return -1;
+ if (!_parse_box_range(str, ranges, len, &count))
+ return -1;
} else {
- if (!_parse_single_range(str, &ranges[count++]))
- return -1;
- }
+ if (!_parse_single_range(str, &ranges[count++]))
+ return -1;
+ }
str = p;
}
return count;
@@ -1810,7 +1810,7 @@ _push_range_list(hostlist_t hl, char *prefix, struct _range *range,
}
for (j = pre_range->lo; j <= pre_range->hi; j++) {
snprintf(new_prefix, sizeof(new_prefix),
- "%s%0*lu%s", tmp_prefix,
+ "%s%0*lu%s", tmp_prefix,
pre_range->width, j, q);
range = saved_range;
for (k = 0; k < n; k++) {
@@ -1826,7 +1826,7 @@ _push_range_list(hostlist_t hl, char *prefix, struct _range *range,
}
for (k = 0; k < n; k++) {
- hostlist_push_hr(hl, prefix,
+ hostlist_push_hr(hl, prefix,
range->lo, range->hi, range->width);
range++;
}
@@ -1834,10 +1834,10 @@ _push_range_list(hostlist_t hl, char *prefix, struct _range *range,
}
/*
- * Create a hostlist from a string with brackets '[' ']' to aid
+ * Create a hostlist from a string with brackets '[' ']' to aid
* detection of ranges and compressed lists
*/
-static hostlist_t
+static hostlist_t
_hostlist_create_bracketed(const char *hostlist, char *sep, char *r_op)
{
hostlist_t new = hostlist_new();
@@ -1853,7 +1853,7 @@ _hostlist_create_bracketed(const char *hostlist, char *sep, char *r_op)
hostlist_destroy(new);
return NULL;
}
-
+
while ((tok = _next_tok(sep, &str)) != NULL) {
strncpy(cur_tok, tok, 1024);
if ((p = strrchr(tok, '[')) != NULL) {
@@ -1865,13 +1865,13 @@ _hostlist_create_bracketed(const char *hostlist, char *sep, char *r_op)
goto error;
*q = '\0';
nr = _parse_range_list(p, ranges, MAX_RANGES);
- if (nr < 0)
+ if (nr < 0)
goto error;
if (_push_range_list(new, prefix, ranges, nr))
goto error;
} else {
/* The hostname itself contains a '['
- * (no ']' found).
+ * (no ']' found).
* Not likely what the user
* wanted. We will just tack one on
* the end. */
@@ -1883,7 +1883,7 @@ _hostlist_create_bracketed(const char *hostlist, char *sep, char *r_op)
}
- } else
+ } else
hostlist_push_host(new, cur_tok);
}
@@ -1984,7 +1984,7 @@ int hostlist_push_host(hostlist_t hl, const char *str)
hostname_suffix_width(hn));
else
hr = hostrange_create_single(str);
-
+
hostlist_push_range(hl, hr);
hostrange_destroy(hr);
@@ -2018,7 +2018,7 @@ char *hostlist_pop(hostlist_t hl)
error("hostlist_pop: no hostlist given");
return NULL;
}
-
+
LOCK_HOSTLIST(hl);
if (hl->nhosts > 0) {
hostrange_t hr = hl->hr[hl->nranges - 1];
@@ -2033,7 +2033,7 @@ char *hostlist_pop(hostlist_t hl)
return host;
}
-/* find all iterators affected by a shift (or deletion) at
+/* find all iterators affected by a shift (or deletion) at
* hl->hr[idx], depth, with the deletion of n ranges */
static void
hostlist_shift_iterators(hostlist_t hl, int idx, int depth, int n)
@@ -2142,7 +2142,7 @@ char *hostlist_shift_range(hostlist_t hl)
do {
hostlist_push_range(hltmp, hl->hr[i]);
hostrange_destroy(hl->hr[i]);
- } while ( (++i < hl->nranges)
+ } while ( (++i < hl->nranges)
&& hostrange_within_range(hltmp->hr[0], hl->hr[i]) );
hostlist_shift_iterators(hl, i, 0, hltmp->nranges);
@@ -2171,7 +2171,7 @@ int hostlist_delete(hostlist_t hl, const char *hosts)
hostlist_t hltmp;
if(!hl)
return -1;
-
+
if (!(hltmp = hostlist_create(hosts)))
seterrno_ret(EINVAL, 0);
@@ -2211,7 +2211,7 @@ _hostrange_string(hostrange_t hr, int depth)
if (hr->width == SYSTEM_DIMENSIONS) {
int i2=0;
int coord[SYSTEM_DIMENSIONS];
-
+
_parse_int_to_array((hr->lo+depth), coord);
for(i2 = 0; i2<SYSTEM_DIMENSIONS; i2++) {
@@ -2220,11 +2220,11 @@ _hostrange_string(hostrange_t hr, int depth)
}
buf[len] = '\0';
} else {
- snprintf(buf+len, MAXHOSTNAMELEN+15 - len, "%0*lu",
+ snprintf(buf+len, MAXHOSTNAMELEN+15 - len, "%0*lu",
hr->width, hr->lo + depth);
}
#else
- snprintf(buf+len, MAXHOSTNAMELEN+15 - len, "%0*lu",
+ snprintf(buf+len, MAXHOSTNAMELEN+15 - len, "%0*lu",
hr->width, hr->lo + depth);
#endif
}
@@ -2336,7 +2336,7 @@ done:
return ret;
}
-/* hostrange compare with void * arguments to allow use with
+/* hostrange compare with void * arguments to allow use with
* libc qsort()
*/
int _cmp(const void *hr1, const void *hr2)
@@ -2370,7 +2370,7 @@ void hostlist_sort(hostlist_t hl)
}
-/* search through hostlist for ranges that can be collapsed
+/* search through hostlist for ranges that can be collapsed
* does =not= delete any hosts
*/
static void hostlist_collapse(hostlist_t hl)
@@ -2392,7 +2392,7 @@ static void hostlist_collapse(hostlist_t hl)
UNLOCK_HOSTLIST(hl);
}
-/* search through hostlist (hl) for intersecting ranges
+/* search through hostlist (hl) for intersecting ranges
* split up duplicates and coalesce ranges where possible
*/
static void hostlist_coalesce(hostlist_t hl)
@@ -2584,21 +2584,21 @@ static void _parse_int_to_array(int in, int out[SYSTEM_DIMENSIONS])
static int my_start_pow = 0;
int my_pow_minus = my_start_pow_minus;
int my_pow = my_start_pow;
-
+
if(!my_start_pow) {
/* this will never change so just calculate it once */
my_start_pow = 1;
-
+
/* To avoid having to use the pow function and include
the math lib everywhere just do this. */
- for(a = 0; a<SYSTEM_DIMENSIONS; a++)
+ for(a = 0; a<SYSTEM_DIMENSIONS; a++)
my_start_pow *= HOSTLIST_BASE;
-
+
my_pow = my_start_pow;
my_pow_minus = my_start_pow_minus =
my_start_pow / HOSTLIST_BASE;
}
-
+
for(a = 0; a<SYSTEM_DIMENSIONS; a++) {
out[a] = (int)in % my_pow;
/* This only needs to be done until we get a 0 here
@@ -2610,13 +2610,13 @@ static void _parse_int_to_array(int in, int out[SYSTEM_DIMENSIONS])
/* set this up for the next dimension */
my_pow = my_pow_minus;
my_pow_minus /= HOSTLIST_BASE;
- }
+ }
}
}
static int _tell_if_used(int dim, int curr,
int start[SYSTEM_DIMENSIONS],
- int end[SYSTEM_DIMENSIONS],
+ int end[SYSTEM_DIMENSIONS],
int last[SYSTEM_DIMENSIONS], int *found)
{
int rc = 1;
@@ -2664,7 +2664,7 @@ static int _tell_if_used(int dim, int curr,
(*found) = dim;
}
} else {
- if((rc = _tell_if_used(dim+1, curr,
+ if((rc = _tell_if_used(dim+1, curr,
start, end,
last, found)) != 1) {
return rc;
@@ -2711,12 +2711,12 @@ again:
on the boxes we are able to make.
*/
memcpy(orig_grid_end, grid_end, dim_grid_size);
- } else
+ } else
memcpy(start, last, dim_grid_size);
memcpy(end, start, dim_grid_size);
-
+
/* for(i = 0; i<SYSTEM_DIMENSIONS; i++) { */
/* coord[i] = alpha_num[start[i]]; */
/* } */
@@ -2729,7 +2729,7 @@ again:
/* coord2[i] = alpha_num[grid_end[i]]; */
/* } */
/* info("current grid is %sx%s", coord, coord2); */
-
+
/* remove what we just did */
_set_box_in_grid(A, 0, start, end, false);
@@ -2740,7 +2740,7 @@ again:
/* send the orid_grid_end so we don't miss anything that was set. */
_set_min_max_of_grid(A, 0, grid_start, orig_grid_end,
new_min, new_max, pos);
-
+
if(new_max[A] != -1) {
/* for(i = 0; i<SYSTEM_DIMENSIONS; i++) { */
/* coord[i] = alpha_num[new_min[i]]; */
@@ -2762,8 +2762,8 @@ again:
goto again;
}
}
-
- if(found != -1)
+
+ if(found != -1)
rc = 1;
return rc;
@@ -2830,9 +2830,9 @@ _get_boxes(char *buf, int max_len)
buf[len++] = ',';
}
}
-
+
buf[len - 1] = ']';
-
+
end_it:
/* NUL terminate for safety, but do not add terminator to len */
buf[len] = '\0';
@@ -2849,17 +2849,17 @@ _set_box_in_grid(int dim, int curr, int start[SYSTEM_DIMENSIONS],
for (i=start[dim]; i<=end[dim]; i++) {
curr = start_curr + (i * offset[dim]);
- if(dim == (SYSTEM_DIMENSIONS-1))
+ if(dim == (SYSTEM_DIMENSIONS-1))
grid[curr] = value;
- else
+ else
_set_box_in_grid(dim+1, curr, start, end, value);
-
+
}
}
static int _add_box_ranges(int dim, int curr,
int start[SYSTEM_DIMENSIONS],
- int end[SYSTEM_DIMENSIONS],
+ int end[SYSTEM_DIMENSIONS],
int pos[SYSTEM_DIMENSIONS],
struct _range *ranges,
int len, int *count)
@@ -2872,7 +2872,7 @@ static int _add_box_ranges(int dim, int curr,
if(dim == (SYSTEM_DIMENSIONS-2)) {
char new_str[(SYSTEM_DIMENSIONS*2)+2];
memset(new_str, 0, sizeof(new_str));
-
+
if (*count == len) {
errno = EINVAL;
_error(__FILE__, __LINE__,
@@ -2894,7 +2894,7 @@ static int _add_box_ranges(int dim, int curr,
&ranges[*count]))
return 0;
(*count)++;
- } else
+ } else
if(!_add_box_ranges(dim+1, curr, start, end, pos,
ranges, len, count))
return 0;
@@ -2921,7 +2921,7 @@ static void _set_min_max_of_grid(int dim, int curr,
min[i] = MIN(min[i], pos[i]);
max[i] = MAX(max[i], pos[i]);
}
- } else
+ } else
_set_min_max_of_grid(dim+1, curr, start, end,
min, max, pos);
}
@@ -2949,10 +2949,10 @@ _set_grid(unsigned long start, unsigned long end)
/* info("going to set %sx%s", coord, coord2); */
_set_box_in_grid(A, 0, sent_start, sent_end, true);
-}
+}
static bool
-_test_box_in_grid(int dim, int curr,
+_test_box_in_grid(int dim, int curr,
int start[SYSTEM_DIMENSIONS], int end[SYSTEM_DIMENSIONS])
{
int i;
@@ -2961,7 +2961,7 @@ _test_box_in_grid(int dim, int curr,
for (i=start[dim]; i<=end[dim]; i++) {
curr = start_curr + (i * offset[dim]);
if(dim == (SYSTEM_DIMENSIONS-1)) {
- if(!grid[curr])
+ if(!grid[curr])
return false;
} else {
if(!_test_box_in_grid(dim+1, curr, start, end))
@@ -2980,7 +2980,7 @@ _test_box(int start[SYSTEM_DIMENSIONS], int end[SYSTEM_DIMENSIONS])
if(!memcmp(start, end, dim_grid_size)) /* single node */
return false;
- for(i = 0; i<SYSTEM_DIMENSIONS; i++)
+ for(i = 0; i<SYSTEM_DIMENSIONS; i++)
if (start[i] > end[i])
return false;
@@ -3004,11 +3004,11 @@ ssize_t hostlist_ranged_string(hostlist_t hl, size_t n, char *buf)
/* compute things that only need to be calculated once */
if(dim_grid_size == -1) {
- int i;
+ int i;
dim_grid_size = sizeof(grid_start);
/* the last one is always 1 */
offset[SYSTEM_DIMENSIONS-1] = 1;
- for(i=(SYSTEM_DIMENSIONS-2); i>=0; i--)
+ for(i=(SYSTEM_DIMENSIONS-2); i>=0; i--)
offset[i] = offset[i+1] * HOSTLIST_BASE;
}
@@ -3045,7 +3045,7 @@ ssize_t hostlist_ranged_string(hostlist_t hl, size_t n, char *buf)
"%d chars long",
SYSTEM_DIMENSIONS, i, hl->hr[i]->width);
}
- goto notbox;
+ goto notbox;
}
_set_grid(hl->hr[i]->lo, hl->hr[i]->hi);
}
@@ -3082,7 +3082,7 @@ ssize_t hostlist_ranged_string(hostlist_t hl, size_t n, char *buf)
too_long:
len = n; /* truncated */
box = true;
-
+
notbox:
#endif
if (!box) {
@@ -3095,7 +3095,7 @@ notbox:
}
UNLOCK_HOSTLIST(hl);
-
+
/* NUL terminate */
if (len >= n) {
truncated = 1;
@@ -3116,7 +3116,7 @@ notbox:
static hostlist_iterator_t hostlist_iterator_new(void)
{
hostlist_iterator_t i = (hostlist_iterator_t) malloc(sizeof(*i));
- if (!i)
+ if (!i)
return NULL;
i->hl = NULL;
i->hr = NULL;
@@ -3239,7 +3239,7 @@ char *hostlist_next(hostlist_iterator_t i)
if(len <= (MAXHOSTNAMELEN + 15))
buf[len++] = alpha_num[coord[i2]];
}
- buf[len] = '\0';
+ buf[len] = '\0';
} else {
snprintf(buf + len, MAXHOSTNAMELEN + 15 - len, "%0*lu",
i->hr->width, i->hr->lo + i->depth);
@@ -3347,7 +3347,7 @@ void hostset_destroy(hostset_t set)
free(set);
}
-/* inserts a single range object into a hostset
+/* inserts a single range object into a hostset
* Assumes that the set->hl lock is already held
* Updates hl->nhosts
*/
@@ -3369,7 +3369,7 @@ static int hostset_insert_range(hostset_t set, hostrange_t hr)
for (i = 0; i < hl->nranges; i++) {
if (hostrange_cmp(hr, hl->hr[i]) <= 0) {
- if ((ndups = hostrange_join(hr, hl->hr[i])) >= 0)
+ if ((ndups = hostrange_join(hr, hl->hr[i])) >= 0)
hostlist_delete_range(hl, i);
else if (ndups < 0)
ndups = 0;
@@ -3412,7 +3412,7 @@ int hostset_insert(hostset_t set, const char *hosts)
hostlist_uniq(hl);
LOCK_HOSTLIST(set->hl);
- for (i = 0; i < hl->nranges; i++)
+ for (i = 0; i < hl->nranges; i++)
n += hostset_insert_range(set, hl->hr[i]);
UNLOCK_HOSTLIST(set->hl);
hostlist_destroy(hl);
@@ -3543,7 +3543,7 @@ int hostset_find(hostset_t set, const char *hostname)
return hostlist_find(set->hl, hostname);
}
-#if TEST_MAIN
+#if TEST_MAIN
int hostlist_nranges(hostlist_t hl)
{
@@ -3617,7 +3617,7 @@ int main(int ac, char **av)
exit(1);
}
- /* build a temporary hostlist, remove duplicates,
+ /* build a temporary hostlist, remove duplicates,
* use it to make the hostset */
if (!(hl2 = hostlist_create(ac > 1 ? av[1] : NULL))) {
perror("hostlist_create");
diff --git a/src/common/hostlist.h b/src/common/hostlist.h
index 047cfc635613fafc657d782fe8bf7b96a61b1fd1..e0031980c8040e385689349c7e741472a8c84fe2 100644
--- a/src/common/hostlist.h
+++ b/src/common/hostlist.h
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -71,7 +71,7 @@ extern char *alpha_num;
* #define lsd_fatal_error(file,line,mesg) \
* error("%s:%s %s\n",file,line,mesg);
*
- * If WITH_LSD_NOMEM_ERROR_FUNC is defined, the linker will expect to
+ * If WITH_LSD_NOMEM_ERROR_FUNC is defined, the linker will expect to
* find an external lsd_nomem_error(file,line,mesg) function. By default,
* lsd_nomem_error(file,line,mesg) is a macro definition that returns NULL.
* This macro may be redefined to invoke another routine instead.
@@ -80,9 +80,9 @@ extern char *alpha_num;
*
*/
-/* The hostlist opaque data type
+/* The hostlist opaque data type
*
- * A hostlist is a list of hostnames optimized for a prefixXXXX style
+ * A hostlist is a list of hostnames optimized for a prefixXXXX style
* naming convention, where XXXX is a decimal, numeric suffix.
*/
#ifndef __hostlist_t_defined
@@ -93,7 +93,7 @@ extern char *alpha_num;
/* A hostset is a special case of a hostlist. It:
*
* 1. never contains duplicates
- * 2. is always sorted
+ * 2. is always sorted
* (Note: sort occurs first on alphanumeric prefix -- where prefix
* matches, numeric suffixes will be sorted *by value*)
*/
@@ -101,7 +101,7 @@ typedef struct hostset * hostset_t;
/* The hostlist iterator type (may be used with a hostset as well)
* used for non-destructive access to hostlist members.
- *
+ *
*/
typedef struct hostlist_iterator * hostlist_iterator_t;
@@ -112,39 +112,39 @@ typedef struct hostlist_iterator * hostlist_iterator_t;
//int set_grid(hostlist_t hl, int count);
int set_grid(int start, int end, int count);
/*
- * hostlist_create():
+ * hostlist_create():
*
- * Create a new hostlist from a string representation.
+ * Create a new hostlist from a string representation.
*
* The string representation may contain one or more hostnames or
- * bracketed hostlists separated by either `,' or whitespace (e.g.
- * "alpha,beta,gamma"). A bracketed hostlist is denoted by a common
+ * bracketed hostlists separated by either `,' or whitespace (e.g.
+ * "alpha,beta,gamma"). A bracketed hostlist is denoted by a common
* prefix followed by a list of numeric ranges contained within brackets
- * (e.g. "tux[0-5,12,20-25]"). Note that the numeric ranges can include
- * one or more leading zeros to indicate the numeric portion has a
- * fixed number of digits (e.g. "linux[0000-1023]").
+ * (e.g. "tux[0-5,12,20-25]"). Note that the numeric ranges can include
+ * one or more leading zeros to indicate the numeric portion has a
+ * fixed number of digits (e.g. "linux[0000-1023]").
*
* To support the BlueGene system's 3-D topology, a node name prefix
- * is followed by three digits identifying the node's position in
+ * is followed by three digits identifying the node's position in
* the X, Y and Z positions respectively. For example "bgl123" represents
* the node or midplane with an X position of 1, Y of 2, and Z of 3.
* A rectangular prism may be described using two endpoint locations
- * separated by "x" (e.g. "bgl[123x456]" selects all nodes with X
- * positions between 1 and 4 inclusive, Y between 2 and 5, and Z between
- * 3 and 6 for a total of 4*4*4=64 nodes). Two or more rectangular
+ * separated by "x" (e.g. "bgl[123x456]" selects all nodes with X
+ * positions between 1 and 4 inclusive, Y between 2 and 5, and Z between
+ * 3 and 6 for a total of 4*4*4=64 nodes). Two or more rectangular
* prisms may be specified using comma separators within the brackets
* (e.g. "bgl[000x133,400x533]").
*
* Note: if this module is compiled with WANT_RECKLESS_HOSTRANGE_EXPANSION
- * defined, a much more loose interpretation of host ranges is used.
- * Reckless hostrange expansion allows all of the following (in addition to
+ * defined, a much more loose interpretation of host ranges is used.
+ * Reckless hostrange expansion allows all of the following (in addition to
* bracketed hostlists):
*
* o tux0-5,tux12,tux20-25
* o tux0-tux5,tux12,tux20-tux25
* o tux0-5,12,20-25
*
- * If str is NULL, and empty hostlist is created and returned.
+ * If str is NULL, and empty hostlist is created and returned.
*
* If the create fails, hostlist_create() returns NULL.
*
@@ -153,7 +153,7 @@ int set_grid(int start, int end, int count);
*/
hostlist_t hostlist_create(const char *hostlist);
-/* hostlist_copy():
+/* hostlist_copy():
*
* Allocate a copy of a hostlist object. Returned hostlist must be freed
* with hostlist_destroy.
@@ -175,7 +175,7 @@ void hostlist_destroy(hostlist_t hl);
*
* The hosts argument may take the same form as in hostlist_create()
*
- * Returns the number of hostnames inserted into the list,
+ * Returns the number of hostnames inserted into the list,
* or 0 on failure.
*/
int hostlist_push(hostlist_t hl, const char *hosts);
@@ -183,7 +183,7 @@ int hostlist_push(hostlist_t hl, const char *hosts);
/* hostlist_push_host():
*
- * Push a single host onto the hostlist hl.
+ * Push a single host onto the hostlist hl.
* This function is more efficient than hostlist_push() for a single
* hostname, since the argument does not need to be checked for ranges.
*
@@ -251,8 +251,8 @@ char * hostlist_shift_range(hostlist_t hl);
/* hostlist_find():
*
- * Searches hostlist hl for the first host matching hostname
- * and returns position in list if found.
+ * Searches hostlist hl for the first host matching hostname
+ * and returns position in list if found.
*
* Returns -1 if host is not found.
*
@@ -271,7 +271,7 @@ int hostlist_delete(hostlist_t hl, const char *hosts);
/* hostlist_delete_host():
*
* Deletes the first host that matches `hostname' from the hostlist hl.
- * Note: "hostname" argument cannot contain a range of hosts
+ * Note: "hostname" argument cannot contain a range of hosts
* (see hostlist_delete() for this functionality.)
*
* Returns 1 if successful, 0 if hostname is not found in list.
@@ -292,7 +292,7 @@ int hostlist_delete_nth(hostlist_t hl, int n);
/* hostlist_count():
*
* Return the number of hosts in hostlist hl.
- */
+ */
int hostlist_count(hostlist_t hl);
/* hostlist_is_empty(): return true if hostlist is empty. */
@@ -301,7 +301,7 @@ int hostlist_count(hostlist_t hl);
/* ----[ Other hostlist operations ]---- */
/* hostlist_sort():
- *
+ *
* Sort the hostlist hl.
*
*/
@@ -310,7 +310,7 @@ void hostlist_sort(hostlist_t hl);
/* hostlist_uniq():
*
* Sort the hostlist hl and remove duplicate entries.
- *
+ *
*/
void hostlist_uniq(hostlist_t hl);
@@ -330,7 +330,7 @@ void hostlist_uniq(hostlist_t hl);
* the list.
*
* The result will be NULL terminated.
- *
+ *
* hostlist_ranged_string() will write a bracketed hostlist representation
* where possible.
*/
@@ -388,11 +388,11 @@ void hostlist_iterator_reset(hostlist_iterator_t i);
/* hostlist_next():
*
- * Returns a pointer to the next hostname on the hostlist
+ * Returns a pointer to the next hostname on the hostlist
* or NULL at the end of the list
*
* The caller is responsible for freeing the returned memory.
- */
+ */
char * hostlist_next(hostlist_iterator_t i);
@@ -482,8 +482,8 @@ int hostset_count(hostset_t set);
/* hostset_find():
*
- * Searches hostset set for a host matching hostname
- * and returns position in list if found.
+ * Searches hostset set for a host matching hostname
+ * and returns position in list if found.
*
* Returns -1 if host is not found.
*/
diff --git a/src/common/io_hdr.c b/src/common/io_hdr.c
index 09056fba036d24983f9b1e2f51925176b477e450..da7b2315e945879ea27f2aa85f2707d9c230d2c3 100644
--- a/src/common/io_hdr.c
+++ b/src/common/io_hdr.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark A. Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -84,7 +84,7 @@ io_hdr_unpack(io_hdr_t *hdr, Buf buffer)
return SLURM_ERROR;
}
-int
+int
io_hdr_packed_size()
{
return sizeof(uint32_t) + 3*sizeof(uint16_t);
@@ -149,7 +149,7 @@ fail:
-int
+int
io_init_msg_validate(struct slurm_io_init_msg *msg, const char *sig)
{
debug2("Entering io_init_msg_validate");
@@ -224,7 +224,7 @@ io_init_msg_write_to_fd(int fd, struct slurm_io_init_msg *msg)
Buf buf;
void *ptr;
int n;
-
+
xassert(msg);
debug2("Entering io_init_msg_write_to_fd");
@@ -232,7 +232,7 @@ io_init_msg_write_to_fd(int fd, struct slurm_io_init_msg *msg)
buf = init_buf(io_init_msg_packed_size());
debug2(" msg->nodeid = %d", msg->nodeid);
io_init_msg_pack(msg, buf);
-
+
ptr = get_buf_data(buf);
again:
if ((n = write(fd, ptr, io_init_msg_packed_size())) < 0) {
@@ -259,7 +259,7 @@ io_init_msg_read_from_fd(int fd, struct slurm_io_init_msg *msg)
Buf buf;
void *ptr;
int n;
-
+
xassert(msg);
debug2("Entering io_init_msg_read_from_fd");
diff --git a/src/common/io_hdr.h b/src/common/io_hdr.h
index 5ea908464d821a8daef1b7e0c2d02c006ee5135b..f5eb6f6b6ec46093025854c8cf7cde4abcbff502 100644
--- a/src/common/io_hdr.h
+++ b/src/common/io_hdr.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark A. Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -68,7 +68,7 @@
struct slurm_io_init_msg {
uint16_t version;
- unsigned char cred_signature[SLURM_IO_KEY_SIZE];
+ unsigned char cred_signature[SLURM_IO_KEY_SIZE];
uint32_t nodeid;
uint32_t stdout_objs;
uint32_t stderr_objs;
diff --git a/src/common/job_options.c b/src/common/job_options.c
index 5d8e468819db8bc4402d63992febf15809838ee6..00ac72bfc267f28058c22038c13bac9e5fcc352f 100644
--- a/src/common/job_options.c
+++ b/src/common/job_options.c
@@ -1,37 +1,37 @@
/*****************************************************************************\
- * src/common/job_options.c - Extra job options
+ * src/common/job_options.c - Extra job options
* $Id$
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <grondona1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -62,7 +62,7 @@ struct job_options {
};
-static struct job_option_info *
+static struct job_option_info *
job_option_info_create (int type, const char *opt, const char *optarg)
{
struct job_option_info *ji = xmalloc (sizeof (*ji));
@@ -113,7 +113,7 @@ static struct job_option_info * job_option_info_unpack (Buf buf)
/*
* Create generic job options container.
*/
-job_options_t job_options_create (void)
+job_options_t job_options_create (void)
{
job_options_t j = xmalloc (sizeof (*j));
@@ -128,7 +128,7 @@ job_options_t job_options_create (void)
/*
* Destroy container, freeing all data associated with options.
*/
-void job_options_destroy (job_options_t opts)
+void job_options_destroy (job_options_t opts)
{
xassert (opts != NULL);
xassert (opts->magic == JOB_OPTIONS_MAGIC);
@@ -144,7 +144,7 @@ void job_options_destroy (job_options_t opts)
/*
* Append option of type `type' and its argument to job options
*/
-int job_options_append (job_options_t opts, int type, const char *opt,
+int job_options_append (job_options_t opts, int type, const char *opt,
const char *optarg)
{
xassert (opts != NULL);
@@ -181,7 +181,7 @@ int job_options_pack (job_options_t opts, Buf buf)
i = list_iterator_create (opts->options);
- while ((opt = list_next (i)))
+ while ((opt = list_next (i)))
job_option_info_pack (opt, buf);
list_iterator_destroy (i);
@@ -232,7 +232,7 @@ const struct job_option_info * job_options_next (job_options_t opts)
xassert (opts->magic == JOB_OPTIONS_MAGIC);
xassert (opts->options != NULL);
xassert (opts->iterator != NULL);
-
+
return (list_next (opts->iterator));
}
@@ -244,6 +244,6 @@ void job_options_iterator_reset (job_options_t opts)
xassert (opts->magic == JOB_OPTIONS_MAGIC);
xassert (opts->options != NULL);
xassert (opts->iterator != NULL);
-
+
list_iterator_reset (opts->iterator);
}
diff --git a/src/common/job_options.h b/src/common/job_options.h
index 09da3139a686249f1dfe643c14233ac14a9c257a..6ec2b355023f1460c77c2c36442c5963c62fc79f 100644
--- a/src/common/job_options.h
+++ b/src/common/job_options.h
@@ -1,37 +1,37 @@
/*****************************************************************************\
- * src/common/job_options.h - Extra job options
+ * src/common/job_options.h - Extra job options
* $Id$
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <grondona1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -67,7 +67,7 @@ void job_options_destroy (job_options_t opts);
/*
* Append option of type `type' and its argument to job options
*/
-int job_options_append (job_options_t opts, int type, const char *opt,
+int job_options_append (job_options_t opts, int type, const char *opt,
const char *optarg);
/*
diff --git a/src/common/job_resources.c b/src/common/job_resources.c
index 2af33fb1accde7f954a09074fa735aa8dcd593e0..dff30bc77c05ca9b4ed09cbf7ea93dce2d64d16a 100644
--- a/src/common/job_resources.c
+++ b/src/common/job_resources.c
@@ -5,32 +5,32 @@
* Copyright (C) 2008 Lawrence Livermore National Security.
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ *
+ * 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
+ * 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
+ * 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -600,7 +600,7 @@ extern void pack_job_resources(job_resources_t *job_resrcs_ptr, Buf buffer)
#endif
}
-extern int unpack_job_resources(job_resources_t **job_resrcs_pptr,
+extern int unpack_job_resources(job_resources_t **job_resrcs_pptr,
char *nodelist, Buf buffer)
{
char *bit_fmt = NULL;
diff --git a/src/common/job_resources.h b/src/common/job_resources.h
index 334d1ccce25fe7d4efddccf496793a743b588445..7702cf5c909a8eaf814761305056d62a85527e5e 100644
--- a/src/common/job_resources.h
+++ b/src/common/job_resources.h
@@ -5,32 +5,32 @@
* Copyright (C) 2008 Lawrence Livermore National Security.
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ *
+ * 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
+ * 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
+ * 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/src/common/jobacct_common.c b/src/common/jobacct_common.c
index 18dad291207e5876a3a33ab7a517938988a5cadd..cb89f76911c85bb9e246c51d9477d341d940c64f 100644
--- a/src/common/jobacct_common.c
+++ b/src/common/jobacct_common.c
@@ -5,32 +5,32 @@
* Copyright (C) 2005 Hewlett-Packard Development Company, L.P.
* Written by Danny Auble, <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -80,7 +80,7 @@ static void _pack_sacct(sacct_t *sacct, Buf buffer)
pack16((uint16_t) 0, buffer);
}
return;
- }
+ }
pack32(sacct->max_vsize, buffer);
temp = sacct->ave_vsize * mult;
@@ -206,7 +206,7 @@ extern void destroy_jobacct_selected_step(void *object)
}
}
-
+
extern void pack_jobacct_job_rec(void *object, uint16_t rpc_version, Buf buffer)
{
jobacct_job_rec_t *job = (jobacct_job_rec_t *)object;
@@ -542,8 +542,8 @@ unpack_error:
*job = NULL;
return SLURM_ERROR;
}
-
-extern void pack_jobacct_step_rec(jobacct_step_rec_t *step,
+
+extern void pack_jobacct_step_rec(jobacct_step_rec_t *step,
uint16_t rpc_version, Buf buffer)
{
uint32_t uint32_tmp = NO_VAL;
@@ -593,7 +593,7 @@ extern void pack_jobacct_step_rec(jobacct_step_rec_t *step,
}
}
-extern int unpack_jobacct_step_rec(jobacct_step_rec_t **step,
+extern int unpack_jobacct_step_rec(jobacct_step_rec_t **step,
uint16_t rpc_version, Buf buffer)
{
uint32_t uint32_tmp;
@@ -656,7 +656,7 @@ unpack_error:
destroy_jobacct_step_rec(step_ptr);
*step = NULL;
return SLURM_ERROR;
-}
+}
extern void pack_jobacct_selected_step(jobacct_selected_step_t *step,
uint16_t rpc_version, Buf buffer)
@@ -670,7 +670,7 @@ extern int unpack_jobacct_selected_step(jobacct_selected_step_t **step,
{
jobacct_selected_step_t *step_ptr =
xmalloc(sizeof(jobacct_selected_step_t));
-
+
*step = step_ptr;
safe_unpack32(&step_ptr->jobid, buffer);
@@ -684,7 +684,7 @@ unpack_error:
return SLURM_ERROR;
}
-extern int jobacct_common_init_struct(struct jobacctinfo *jobacct,
+extern int jobacct_common_init_struct(struct jobacctinfo *jobacct,
jobacct_id_t *jobacct_id)
{
if(!jobacct_id) {
@@ -711,7 +711,7 @@ extern int jobacct_common_init_struct(struct jobacctinfo *jobacct,
jobacct->min_cpu = (uint32_t)NO_VAL;
memcpy(&jobacct->min_cpu_id, jobacct_id, sizeof(jobacct_id_t));
jobacct->tot_cpu = 0;
-
+
return SLURM_SUCCESS;
}
@@ -729,7 +729,7 @@ extern void jobacct_common_free_jobacct(void *object)
xfree(jobacct);
}
-extern int jobacct_common_setinfo(struct jobacctinfo *jobacct,
+extern int jobacct_common_setinfo(struct jobacctinfo *jobacct,
enum jobacct_data_type type, void *data)
{
int rc = SLURM_SUCCESS;
@@ -790,7 +790,7 @@ extern int jobacct_common_setinfo(struct jobacctinfo *jobacct,
jobacct->tot_cpu = *uint32;
break;
default:
- debug("jobacct_g_set_setinfo data_type %d invalid",
+ debug("jobacct_g_set_setinfo data_type %d invalid",
type);
}
slurm_mutex_unlock(&jobacct_lock);
@@ -798,10 +798,10 @@ extern int jobacct_common_setinfo(struct jobacctinfo *jobacct,
rwfail:
slurm_mutex_unlock(&jobacct_lock);
return SLURM_ERROR;
-
+
}
-extern int jobacct_common_getinfo(struct jobacctinfo *jobacct,
+extern int jobacct_common_getinfo(struct jobacctinfo *jobacct,
enum jobacct_data_type type, void *data)
{
int rc = SLURM_SUCCESS;
@@ -863,7 +863,7 @@ extern int jobacct_common_getinfo(struct jobacctinfo *jobacct,
*uint32 = jobacct->tot_cpu;
break;
default:
- debug("jobacct_g_set_setinfo data_type %d invalid",
+ debug("jobacct_g_set_setinfo data_type %d invalid",
type);
}
slurm_mutex_unlock(&jobacct_lock);
@@ -874,7 +874,7 @@ rwfail:
}
-extern void jobacct_common_aggregate(struct jobacctinfo *dest,
+extern void jobacct_common_aggregate(struct jobacctinfo *dest,
struct jobacctinfo *from)
{
xassert(dest);
@@ -886,19 +886,19 @@ extern void jobacct_common_aggregate(struct jobacctinfo *dest,
dest->max_vsize_id = from->max_vsize_id;
}
dest->tot_vsize += from->tot_vsize;
-
+
if(dest->max_rss < from->max_rss) {
dest->max_rss = from->max_rss;
dest->max_rss_id = from->max_rss_id;
}
dest->tot_rss += from->tot_rss;
-
+
if(dest->max_pages < from->max_pages) {
dest->max_pages = from->max_pages;
dest->max_pages_id = from->max_pages_id;
}
dest->tot_pages += from->tot_pages;
- if((dest->min_cpu > from->min_cpu)
+ if((dest->min_cpu > from->min_cpu)
|| (dest->min_cpu == (uint32_t)NO_VAL)) {
if(from->min_cpu == (uint32_t)NO_VAL)
from->min_cpu = 0;
@@ -906,7 +906,7 @@ extern void jobacct_common_aggregate(struct jobacctinfo *dest,
dest->min_cpu_id = from->min_cpu_id;
}
dest->tot_cpu += from->tot_cpu;
-
+
if(dest->max_vsize_id.taskid == (uint16_t)NO_VAL)
dest->max_vsize_id = from->max_vsize_id;
@@ -932,7 +932,7 @@ extern void jobacct_common_aggregate(struct jobacctinfo *dest,
dest->sys_cpu_usec -= 1E6;
}
- slurm_mutex_unlock(&jobacct_lock);
+ slurm_mutex_unlock(&jobacct_lock);
}
extern void jobacct_common_2_sacct(sacct_t *sacct, struct jobacctinfo *jobacct)
@@ -965,7 +965,7 @@ extern void jobacct_common_pack(struct jobacctinfo *jobacct, Buf buffer)
for(i=0; i<4; i++)
pack16((uint16_t) 0, buffer);
return;
- }
+ }
slurm_mutex_lock(&jobacct_lock);
pack32((uint32_t)jobacct->user_cpu_sec, buffer);
pack32((uint32_t)jobacct->user_cpu_usec, buffer);
@@ -1007,7 +1007,7 @@ extern int jobacct_common_unpack(struct jobacctinfo **jobacct, Buf buffer)
safe_unpack32(&(*jobacct)->tot_pages, buffer);
safe_unpack32(&(*jobacct)->min_cpu, buffer);
safe_unpack32(&(*jobacct)->tot_cpu, buffer);
- if(_unpack_jobacct_id(&(*jobacct)->max_vsize_id, buffer)
+ if(_unpack_jobacct_id(&(*jobacct)->max_vsize_id, buffer)
!= SLURM_SUCCESS)
goto unpack_error;
if(_unpack_jobacct_id(&(*jobacct)->max_rss_id, buffer)
@@ -1032,7 +1032,7 @@ extern int jobacct_common_set_proctrack_container_id(uint32_t id)
if(pgid_plugin)
return SLURM_SUCCESS;
- if(cont_id != (uint32_t)NO_VAL)
+ if(cont_id != (uint32_t)NO_VAL)
info("Warning: jobacct: set_proctrack_container_id: "
"cont_id is already set to %d you are setting it to %d",
cont_id, id);
@@ -1063,7 +1063,7 @@ extern int jobacct_common_set_mem_limit(uint32_t job_id, uint32_t mem_limit)
extern int jobacct_common_add_task(pid_t pid, jobacct_id_t *jobacct_id)
{
struct jobacctinfo *jobacct = jobacct_common_alloc_jobacct(jobacct_id);
-
+
slurm_mutex_lock(&jobacct_lock);
if(pid <= 0) {
error("invalid pid given (%d) for task acct", pid);
@@ -1075,7 +1075,7 @@ extern int jobacct_common_add_task(pid_t pid, jobacct_id_t *jobacct_id)
jobacct->pid = pid;
jobacct->min_cpu = 0;
- debug2("adding task %u pid %d on node %u to jobacct",
+ debug2("adding task %u pid %d on node %u to jobacct",
jobacct_id->taskid, pid, jobacct_id->nodeid);
list_push(task_list, jobacct);
slurm_mutex_unlock(&jobacct_lock);
@@ -1092,7 +1092,7 @@ extern struct jobacctinfo *jobacct_common_stat_task(pid_t pid)
struct jobacctinfo *jobacct = NULL;
struct jobacctinfo *ret_jobacct = NULL;
ListIterator itr = NULL;
-
+
slurm_mutex_lock(&jobacct_lock);
if (!task_list) {
error("no task list created!");
@@ -1100,7 +1100,7 @@ extern struct jobacctinfo *jobacct_common_stat_task(pid_t pid)
}
itr = list_iterator_create(task_list);
- while((jobacct = list_next(itr))) {
+ while((jobacct = list_next(itr))) {
if(jobacct->pid == pid)
break;
}
@@ -1127,7 +1127,7 @@ extern struct jobacctinfo *jobacct_common_remove_task(pid_t pid)
}
itr = list_iterator_create(task_list);
- while((jobacct = list_next(itr))) {
+ while((jobacct = list_next(itr))) {
if(jobacct->pid == pid) {
list_remove(itr);
break;
@@ -1135,7 +1135,7 @@ extern struct jobacctinfo *jobacct_common_remove_task(pid_t pid)
}
list_iterator_destroy(itr);
if(jobacct) {
- debug2("removing task %u pid %d from jobacct",
+ debug2("removing task %u pid %d from jobacct",
jobacct->max_vsize_id.taskid, jobacct->pid);
} else {
error("pid(%d) not being watched in jobacct!", pid);
diff --git a/src/common/jobacct_common.h b/src/common/jobacct_common.h
index 9439cdc48c8c07173237e03b29d224ef8d564351..bacb25d5f71fa6ebc930104c3c119c115c5aff02 100644
--- a/src/common/jobacct_common.h
+++ b/src/common/jobacct_common.h
@@ -5,32 +5,32 @@
* Copyright (C) 2005 Hewlett-Packard Development Company, L.P.
* Written by Danny Auble, <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -69,11 +69,11 @@
typedef struct {
uint16_t taskid; /* contains which task number it was on */
- uint32_t nodeid; /* contains which node number it was on */
+ uint32_t nodeid; /* contains which node number it was on */
} jobacct_id_t;
typedef struct {
- uint32_t max_vsize;
+ uint32_t max_vsize;
jobacct_id_t max_vsize_id;
float ave_vsize;
uint32_t max_rss;
@@ -84,7 +84,7 @@ typedef struct {
float ave_pages;
float min_cpu;
jobacct_id_t min_cpu_id;
- float ave_cpu;
+ float ave_cpu;
} sacct_t;
typedef struct {
@@ -98,7 +98,7 @@ typedef struct {
time_t eligible;
time_t end;
int32_t exitcode;
- void *first_step_ptr; /* this pointer to a jobacct_step_rec_t
+ void *first_step_ptr; /* this pointer to a jobacct_step_rec_t
is set up on the
client side so does not need to
be packed */
@@ -174,19 +174,19 @@ struct jobacctinfo {
uint32_t user_cpu_usec;
uint32_t max_vsize; /* max size of virtual memory */
jobacct_id_t max_vsize_id; /* contains which task number it was on */
- uint32_t tot_vsize; /* total virtual memory
+ uint32_t tot_vsize; /* total virtual memory
(used to figure out ave later) */
uint32_t max_rss; /* max Resident Set Size */
jobacct_id_t max_rss_id; /* contains which task it was on */
- uint32_t tot_rss; /* total rss
+ uint32_t tot_rss; /* total rss
(used to figure out ave later) */
uint32_t max_pages; /* max pages */
jobacct_id_t max_pages_id; /* contains which task it was on */
uint32_t tot_pages; /* total pages
- (used to figure out ave later) */
+ (used to figure out ave later) */
uint32_t min_cpu; /* min cpu time */
jobacct_id_t min_cpu_id; /* contains which task it was on */
- uint32_t tot_cpu; /* total cpu time
+ uint32_t tot_cpu; /* total cpu time
(used to figure out ave later) */
};
@@ -205,12 +205,12 @@ extern void destroy_jobacct_selected_step(void *object);
extern void pack_jobacct_job_rec(void *object,
uint16_t rpc_version, Buf buffer);
-extern int unpack_jobacct_job_rec(void **object, uint16_t rpc_version,
+extern int unpack_jobacct_job_rec(void **object, uint16_t rpc_version,
Buf buffer);
-
-extern void pack_jobacct_step_rec(jobacct_step_rec_t *step,
+
+extern void pack_jobacct_step_rec(jobacct_step_rec_t *step,
uint16_t rpc_version, Buf buffer);
-extern int unpack_jobacct_step_rec(jobacct_step_rec_t **step,
+extern int unpack_jobacct_step_rec(jobacct_step_rec_t **step,
uint16_t rpc_version, Buf buffer);
extern void pack_jobacct_selected_step(jobacct_selected_step_t *step,
@@ -219,16 +219,16 @@ extern int unpack_jobacct_selected_step(jobacct_selected_step_t **step,
uint16_t rpc_version, Buf buffer);
/* These should only be called from the jobacct-gather plugin */
-extern int jobacct_common_init_struct(struct jobacctinfo *jobacct,
+extern int jobacct_common_init_struct(struct jobacctinfo *jobacct,
jobacct_id_t *jobacct_id);
extern struct jobacctinfo *jobacct_common_alloc_jobacct(
jobacct_id_t *jobacct_id);
extern void jobacct_common_free_jobacct(void *object);
-extern int jobacct_common_setinfo(struct jobacctinfo *jobacct,
+extern int jobacct_common_setinfo(struct jobacctinfo *jobacct,
enum jobacct_data_type type, void *data);
-extern int jobacct_common_getinfo(struct jobacctinfo *jobacct,
+extern int jobacct_common_getinfo(struct jobacctinfo *jobacct,
enum jobacct_data_type type, void *data);
-extern void jobacct_common_aggregate(struct jobacctinfo *dest,
+extern void jobacct_common_aggregate(struct jobacctinfo *dest,
struct jobacctinfo *from);
extern void jobacct_common_2_sacct(sacct_t *sacct,
struct jobacctinfo *jobacct);
diff --git a/src/common/log.c b/src/common/log.c
index aba157ba9feb8578b3c9c49f6ca3c6b6120c592e..de87c8cf42fbd9877825fc66dee7141729a76f20 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -6,8 +6,8 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
- * Much of this code was derived or adapted from the log.c component of
+ *
+ * Much of this code was derived or adapted from the log.c component of
* openssh which contains the following notices:
*****************************************************************************
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -84,8 +84,8 @@
#endif
/*
-** Define slurm-specific aliases for use by plugins, see slurm_xlator.h
-** for details.
+** Define slurm-specific aliases for use by plugins, see slurm_xlator.h
+** for details.
*/
strong_alias(log_init, slurm_log_init);
strong_alias(log_reinit, slurm_log_reinit);
@@ -109,7 +109,7 @@ strong_alias(debug, slurm_debug);
strong_alias(debug2, slurm_debug2);
strong_alias(debug3, slurm_debug3);
-/*
+/*
** struct defining a "log" type
*/
typedef struct {
@@ -135,16 +135,16 @@ static log_t *log = NULL;
/* define a default argv0 */
#if HAVE_PROGRAM_INVOCATION_NAME
-/* This used to use program_invocation_short_name, but on some systems
+/* This used to use program_invocation_short_name, but on some systems
* that gets truncated at 16 bytes, too short for our needs. */
extern char * program_invocation_name;
# define default_name program_invocation_name
-#else
+#else
# define default_name ""
#endif
-/*
+/*
* pthread_atfork handlers:
*/
#ifdef WITH_PTHREADS
@@ -157,31 +157,31 @@ static bool at_forked = false;
pthread_atfork(_atfork_prep, _atfork_parent, _atfork_child); \
at_forked = true; \
}
-#else
+#else
# define atfork_install_handlers() (NULL)
#endif
static void _log_flush();
/*
- * Initialize log with
+ * Initialize log with
* prog = program name to tag error messages with
* opt = log_options_t specifying max log levels for syslog, stderr, and file
* fac = log facility for syslog (unused if syslog level == LOG_QUIET)
* logfile =
* logfile name if logfile level > LOG_QUIET
*/
-static int
+static int
_log_init(char *prog, log_options_t opt, log_facility_t fac, char *logfile )
{
int rc = 0;
-
+
if (!log) {
log = (log_t *)xmalloc(sizeof(log_t));
log->logfp = NULL;
log->argv0 = NULL;
log->buf = NULL;
log->fbuf = NULL;
- log->fpfx = NULL;
+ log->fpfx = NULL;
atfork_install_handlers();
}
@@ -203,7 +203,7 @@ _log_init(char *prog, log_options_t opt, log_facility_t fac, char *logfile )
log->opt = opt;
- if (log->buf)
+ if (log->buf)
cbuf_destroy(log->buf);
if (log->fbuf)
cbuf_destroy(log->fbuf);
@@ -217,7 +217,7 @@ _log_init(char *prog, log_options_t opt, log_facility_t fac, char *logfile )
log->facility = fac;
if (logfile && (log->opt.logfile_level > LOG_LEVEL_QUIET)) {
- FILE *fp;
+ FILE *fp;
fp = safeopen(logfile, "a", SAFEOPEN_LINK_OK);
@@ -225,13 +225,13 @@ _log_init(char *prog, log_options_t opt, log_facility_t fac, char *logfile )
char *errmsg = NULL;
slurm_mutex_unlock(&log_lock);
xslurm_strerrorcat(errmsg);
- fprintf(stderr,
+ fprintf(stderr,
"%s: log_init(): Unable to open logfile"
"`%s': %s\n", prog, logfile, errmsg);
xfree(errmsg);
rc = errno;
goto out;
- }
+ }
if (log->logfp)
fclose(log->logfp); /* Ignore errors */
@@ -310,7 +310,7 @@ void log_set_argv0(char *argv0)
xfree(log->argv0);
if (!argv0)
log->argv0 = xstrdup("");
- else
+ else
log->argv0 = xstrdup(argv0);
slurm_mutex_unlock(&log_lock);
}
@@ -319,7 +319,7 @@ void log_set_argv0(char *argv0)
* the log mutex
*/
int log_alter(log_options_t opt, log_facility_t fac, char *logfile)
-{
+{
int rc = 0;
slurm_mutex_lock(&log_lock);
rc = _log_init(NULL, opt, fac, logfile);
@@ -343,13 +343,13 @@ FILE *log_fp(void)
/* return a heap allocated string formed from fmt and ap arglist
* returned string is allocated with xmalloc, so must free with xfree.
- *
+ *
* args are like printf, with the addition of the following format chars:
* - %m expands to strerror(errno)
* - %t expands to strftime("%x %X") [ locally preferred short date/time ]
* - %T expands to rfc822 date time [ "dd Mon yyyy hh:mm:ss GMT offset" ]
*
- * simple format specifiers are handled explicitly to avoid calls to
+ * simple format specifiers are handled explicitly to avoid calls to
* vsnprintf and allow dynamic sizing of the message buffer. If a call
* is made to vsnprintf, however, the message will be limited to 1024 bytes.
* (inc. newline)
@@ -366,7 +366,7 @@ static char *vxstrfmt(const char *fmt, va_list ap)
while (*fmt != '\0') {
- if ((p = (char *)strchr(fmt, '%')) == NULL) {
+ if ((p = (char *)strchr(fmt, '%')) == NULL) {
/* no more format chars */
xstrcat(buf, fmt);
break;
@@ -376,7 +376,7 @@ static char *vxstrfmt(const char *fmt, va_list ap)
/* take difference from fmt to just before `%' */
len = (size_t) ((long)(p) - (long)fmt);
- /* append from fmt to p into buf if there's
+ /* append from fmt to p into buf if there's
* anythere there
*/
if (len > 0) {
@@ -394,11 +394,11 @@ static char *vxstrfmt(const char *fmt, va_list ap)
xslurm_strerrorcat(buf);
break;
- case 't': /* "%t" => locally preferred date/time*/
+ case 't': /* "%t" => locally preferred date/time*/
xstrftimecat(buf, "%x %X");
break;
case 'T': /* "%T" => "dd Mon yyyy hh:mm:ss off" */
- xstrftimecat(buf, "%a %d %b %Y %H:%M:%S %z");
+ xstrftimecat(buf, "%a %d %b %Y %H:%M:%S %z");
break;
#ifdef USE_ISO_8601
case 'M': /* "%M" => "yyyy-mm-ddThh:mm:ss" */
@@ -411,7 +411,7 @@ static char *vxstrfmt(const char *fmt, va_list ap)
#endif
case 's': /* "%s" => append string */
/* we deal with this case for efficiency */
- if (unprocessed == 0)
+ if (unprocessed == 0)
xstrcat(buf, va_arg(ap, char *));
else
xstrcat(buf, "%s");
@@ -446,15 +446,15 @@ static char *vxstrfmt(const char *fmt, va_list ap)
long_long = 1;
p++;
}
-
+
if ((unprocessed == 0) && (*(p+1) == 'u')) {
if(long_long) {
snprintf(tmp, sizeof(tmp),
- "%llu",
+ "%llu",
va_arg(ap,
long long unsigned));
long_long = 0;
- } else
+ } else
snprintf(tmp, sizeof(tmp),
"%lu",
va_arg(ap,
@@ -464,7 +464,7 @@ static char *vxstrfmt(const char *fmt, va_list ap)
} else if ((unprocessed==0) && (*(p+1)=='d')) {
if(long_long) {
snprintf(tmp, sizeof(tmp),
- "%lld",
+ "%lld",
va_arg(ap,
long long int));
long_long = 0;
@@ -478,7 +478,7 @@ static char *vxstrfmt(const char *fmt, va_list ap)
if(long_long) {
xstrcat(buf, "%llf");
long_long = 0;
- } else
+ } else
snprintf(tmp, sizeof(tmp),
"%lf",
va_arg(ap, double));
@@ -487,7 +487,7 @@ static char *vxstrfmt(const char *fmt, va_list ap)
} else if ((unprocessed==0) && (*(p+1)=='x')) {
if(long_long) {
snprintf(tmp, sizeof(tmp),
- "%llx",
+ "%llx",
va_arg(ap,
long long int));
long_long = 0;
@@ -502,10 +502,10 @@ static char *vxstrfmt(const char *fmt, va_list ap)
long_long = 0;
} else
xstrcat(buf, "%l");
- break;
+ break;
case 'L':
if ((unprocessed==0) && (*(p+1)=='f')) {
- snprintf(tmp, sizeof(tmp), "%Lf",
+ snprintf(tmp, sizeof(tmp), "%Lf",
va_arg(ap, long double));
xstrcat(buf, tmp);
p++;
@@ -552,7 +552,7 @@ static void xlogfmtcat(char **dst, const char *fmt, ...)
}
static void
-_log_printf(cbuf_t cb, FILE *stream, const char *fmt, ...)
+_log_printf(cbuf_t cb, FILE *stream, const char *fmt, ...)
{
va_list ap;
@@ -563,7 +563,7 @@ _log_printf(cbuf_t cb, FILE *stream, const char *fmt, ...)
char *buf = vxstrfmt(fmt, ap);
int len = strlen(buf);
int dropped;
- cbuf_write(cb, buf, len, &dropped);
+ cbuf_write(cb, buf, len, &dropped);
cbuf_read_to_fd(cb, fileno(stream), -1);
xfree(buf);
} else {
@@ -574,7 +574,7 @@ _log_printf(cbuf_t cb, FILE *stream, const char *fmt, ...)
}
/*
- * log a message at the specified level to facilities that have been
+ * log a message at the specified level to facilities that have been
* configured to receive messages at that level
*/
static void log_msg(log_level_t level, const char *fmt, va_list args)
@@ -590,8 +590,8 @@ static void log_msg(log_level_t level, const char *fmt, va_list args)
_log_init(NULL, opts, 0, NULL);
}
- if (level > log->opt.syslog_level &&
- level > log->opt.logfile_level &&
+ if (level > log->opt.syslog_level &&
+ level > log->opt.logfile_level &&
level > log->opt.stderr_level) {
slurm_mutex_unlock(&log_lock);
return;
@@ -653,16 +653,16 @@ static void log_msg(log_level_t level, const char *fmt, va_list args)
if (level <= log->opt.stderr_level) {
fflush(stdout);
if (strlen(buf) > 0 && buf[strlen(buf) - 1] == '\n')
- _log_printf( log->buf, stderr, "%s: %s%s",
+ _log_printf( log->buf, stderr, "%s: %s%s",
log->argv0, pfx, buf);
else
- _log_printf( log->buf, stderr, "%s: %s%s\n",
+ _log_printf( log->buf, stderr, "%s: %s%s\n",
log->argv0, pfx, buf);
fflush(stderr);
}
if (level <= log->opt.logfile_level && log->logfp != NULL) {
- xlogfmtcat(&msgbuf, "[%M] %s%s%s",
+ xlogfmtcat(&msgbuf, "[%M] %s%s%s",
log->fpfx, pfx, buf);
if (strlen(buf) > 0 && buf[strlen(buf) - 1] == '\n')
@@ -706,7 +706,7 @@ _log_flush()
if (!log->opt.buffered)
return;
- if (log->opt.stderr_level)
+ if (log->opt.stderr_level)
cbuf_read_to_fd(log->buf, fileno(stderr), -1);
else if (log->logfp && (fileno(log->logfp) > 0))
cbuf_read_to_fd(log->fbuf, fileno(log->logfp), -1);
@@ -846,13 +846,13 @@ struct fatal_cleanup {
/* static variables */
#ifdef WITH_PTHREADS
- static pthread_mutex_t fatal_lock = PTHREAD_MUTEX_INITIALIZER;
+ static pthread_mutex_t fatal_lock = PTHREAD_MUTEX_INITIALIZER;
#else
static int fatal_lock;
#endif /* WITH_PTHREADS */
static struct fatal_cleanup *fatal_cleanups = NULL;
-/* Registers a cleanup function to be called by fatal() for this thread
+/* Registers a cleanup function to be called by fatal() for this thread
** before exiting. */
void
fatal_add_cleanup(void (*proc) (void *), void *context)
@@ -869,7 +869,7 @@ fatal_add_cleanup(void (*proc) (void *), void *context)
slurm_mutex_unlock(&fatal_lock);
}
-/* Registers a cleanup function to be called by fatal() for all threads
+/* Registers a cleanup function to be called by fatal() for all threads
** of the job. */
void
fatal_add_cleanup_job(void (*proc) (void *), void *context)
@@ -897,7 +897,7 @@ fatal_remove_cleanup(void (*proc) (void *context), void *context)
for (cup = &fatal_cleanups; *cup; cup = &cu->next) {
cu = *cup;
if (cu->thread_id == my_thread_id &&
- cu->proc == proc &&
+ cu->proc == proc &&
cu->context == context) {
*cup = cu->next;
xfree(cu);
@@ -910,7 +910,7 @@ fatal_remove_cleanup(void (*proc) (void *context), void *context)
(u_long) proc, (u_long) context);
}
-/* Removes a cleanup frunction to be called at fatal() for all threads of
+/* Removes a cleanup frunction to be called at fatal() for all threads of
** the job. */
void
fatal_remove_cleanup_job(void (*proc) (void *context), void *context)
@@ -921,7 +921,7 @@ fatal_remove_cleanup_job(void (*proc) (void *context), void *context)
for (cup = &fatal_cleanups; *cup; cup = &cu->next) {
cu = *cup;
if (cu->thread_id == 0 &&
- cu->proc == proc &&
+ cu->proc == proc &&
cu->context == context) {
*cup = cu->next;
xfree(cu);
@@ -934,7 +934,7 @@ fatal_remove_cleanup_job(void (*proc) (void *context), void *context)
"0x%lx 0x%lx", (u_long) proc, (u_long) context);
}
-/* Execute cleanup functions, first thread-specific then those for the
+/* Execute cleanup functions, first thread-specific then those for the
** whole job */
void
fatal_cleanup(void)
@@ -976,7 +976,7 @@ dump_cleanup_list(void)
for (cup = &fatal_cleanups; *cup; cup = &cu->next) {
cu = *cup;
info ("loc=%ld thread_id=%ld proc=%ld, context=%ld, next=%ld",
- (long)cu, (long)cu->thread_id, (long)cu->proc,
+ (long)cu, (long)cu->thread_id, (long)cu->proc,
(long)cu->context, (long)cu->next);
}
slurm_mutex_unlock(&fatal_lock);
diff --git a/src/common/log.h b/src/common/log.h
index 99d936f915c03bc5455bbe222911a88bb4ae8bf2..9ef143c716496e3e4853c7e0104e0eb07a8051da 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -5,8 +5,8 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
- * Much of this code was derived or adapted from the log.c component of
+ *
+ * Much of this code was derived or adapted from the log.c component of
* openssh which contains the following notices:
*****************************************************************************
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -53,7 +53,7 @@
# include <sys/syslog.h>
#endif
-#include <syslog.h>
+#include <syslog.h>
#include <stdio.h>
#include "src/common/macros.h"
@@ -66,7 +66,7 @@ typedef enum {
SYSLOG_FACILITY_AUTH = LOG_AUTH,
#ifdef LOG_AUTHPRIV
SYSLOG_FACILITY_AUTHPRIV = LOG_AUTHPRIV,
-#endif
+#endif
SYSLOG_FACILITY_LOCAL0 = LOG_LOCAL0,
SYSLOG_FACILITY_LOCAL1 = LOG_LOCAL1,
SYSLOG_FACILITY_LOCAL2 = LOG_LOCAL2,
@@ -74,7 +74,7 @@ typedef enum {
SYSLOG_FACILITY_LOCAL4 = LOG_LOCAL4,
SYSLOG_FACILITY_LOCAL5 = LOG_LOCAL5,
SYSLOG_FACILITY_LOCAL6 = LOG_LOCAL6,
- SYSLOG_FACILITY_LOCAL7 = LOG_LOCAL7
+ SYSLOG_FACILITY_LOCAL7 = LOG_LOCAL7
} log_facility_t;
/*
@@ -113,12 +113,12 @@ typedef struct {
{ LOG_LEVEL_INFO, LOG_LEVEL_INFO, LOG_LEVEL_INFO, 1, 0 }
#define LOG_OPTS_SYSLOG_DEFAULT \
- { LOG_LEVEL_QUIET, LOG_LEVEL_INFO, LOG_LEVEL_QUIET, 1, 0 }
+ { LOG_LEVEL_QUIET, LOG_LEVEL_INFO, LOG_LEVEL_QUIET, 1, 0 }
#define LOG_OPTS_STDERR_ONLY \
{ LOG_LEVEL_INFO, LOG_LEVEL_QUIET, LOG_LEVEL_QUIET, 1, 0 }
-/*
+/*
* initialize log module (called only once)
*
* example:
@@ -134,7 +134,7 @@ typedef struct {
*
* log function automatically takes the basename() of argv0.
*/
-int log_init(char *argv0, log_options_t opts,
+int log_init(char *argv0, log_options_t opts,
log_facility_t fac, char *logfile);
/* reinitialize log module.
@@ -144,13 +144,13 @@ int log_init(char *argv0, log_options_t opts,
*/
void log_reinit(void);
-/*
+/*
* Close log and free associated memory
*/
void log_fini(void);
/* Alter log facility, options are like log_init() above, except that
- * an argv0 argument is not passed.
+ * an argv0 argument is not passed.
*
* This function may be called multiple times.
*/
@@ -161,7 +161,7 @@ int log_alter(log_options_t opts, log_facility_t fac, char *logfile);
*/
void log_set_fpfx(char *pfx);
-/*
+/*
* (re)set argv0 string prepended to all log messages
*/
void log_set_argv0(char *pfx);
@@ -171,10 +171,10 @@ void log_set_argv0(char *pfx);
*/
FILE *log_fp(void);
-/*
+/*
* Buffered log functions:
- *
- * log_has_data() returns true if there is data in the
+ *
+ * log_has_data() returns true if there is data in the
* internal log buffer
*/
bool log_has_data(void);
@@ -185,7 +185,7 @@ bool log_has_data(void);
*/
void log_flush(void);
-/*
+/*
* the following log a message to the log facility at the appropriate level:
*
* Messages do not need a newline!
@@ -195,7 +195,7 @@ void log_flush(void);
* fmt expands to
* ~~~~ ~~~~~~~~~~~
* "%m" => strerror(errno)
- * "%t" => strftime "%x %X" (locally preferred short date/time)
+ * "%t" => strftime "%x %X" (locally preferred short date/time)
* "%T" => strftime "%a %d %b %Y %H:%M:%S %z" (rfc822 date/time)
*/
diff --git a/src/common/macros.h b/src/common/macros.h
index 768aa04128faa2d97c4cd60f2626fdef0f01403f..6fa9a29ebe1d30b4fef4d5174368af404297b5f4 100644
--- a/src/common/macros.h
+++ b/src/common/macros.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -46,7 +46,7 @@
#ifndef NULL
# include <stddef.h> /* for NULL */
-#endif
+#endif
#if HAVE_STDBOOL_H
# include <stdbool.h>
@@ -70,7 +70,7 @@ typedef enum {false, true} bool;
#endif
#ifndef MAX
-# define MAX(a,b) ((a) > (b) ? (a) : (b))
+# define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
#ifndef MIN
@@ -110,13 +110,13 @@ typedef enum {false, true} bool;
-/*
-** define __CURRENT_FUNC__ macro for returning current function
+/*
+** define __CURRENT_FUNC__ macro for returning current function
*/
#if defined (__GNUC__) && (__GNUC__ < 3)
# define __CURRENT_FUNC__ __PRETTY_FUNCTION__
#else /* !__GNUC__ */
-# ifdef _AIX
+# ifdef _AIX
# define __CURRENT_FUNC__ __func__
# else
# define __CURRENT_FUNC__ ""
diff --git a/src/common/mpi.c b/src/common/mpi.c
index eeea9fb396ca0a16cabadcd6ef05bb815e8ea2db..283f73da5e43ff4228451f436cd8e44d49ed991a 100644
--- a/src/common/mpi.c
+++ b/src/common/mpi.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <grondo1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -55,7 +55,7 @@
/*
* WARNING: Do not change the order of these fields or add additional
* fields at the beginning of the structure. If you do, MPI plugins
- * will stop working. If you need to add fields, add them
+ * will stop working. If you need to add fields, add them
* at the end of the structure.
*/
typedef struct slurm_mpi_ops {
@@ -134,7 +134,7 @@ _slurm_mpi_context_destroy( slurm_mpi_context_t c )
/*
* Resolve the operations from the plugin.
*/
-static slurm_mpi_ops_t *
+static slurm_mpi_ops_t *
_slurm_mpi_get_ops( slurm_mpi_context_t c )
{
/*
@@ -149,23 +149,23 @@ _slurm_mpi_get_ops( slurm_mpi_context_t c )
};
int n_syms = sizeof( syms ) / sizeof( char * );
char *plugin_dir = NULL;
-
+
/* Find the correct plugin. */
c->cur_plugin = plugin_load_and_link(c->mpi_type, n_syms, syms,
(void **) &c->ops);
- if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
+ if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
error("Couldn't find the specified plugin name for %s "
"looking at all files",
c->mpi_type);
-
+
/* Get the plugin list, if needed. */
if ( c->plugin_list == NULL ) {
c->plugin_list = plugrack_create();
if ( c->plugin_list == NULL ) {
error("Unable to create a plugin manager");
- return NULL;
+ return NULL;
}
plugrack_set_major_type(c->plugin_list, "mpi");
@@ -176,16 +176,16 @@ _slurm_mpi_get_ops( slurm_mpi_context_t c )
plugrack_read_dir(c->plugin_list, plugin_dir);
xfree(plugin_dir);
}
-
- if (strcasecmp (c->mpi_type, "mpi/list") == 0) {
+
+ if (strcasecmp (c->mpi_type, "mpi/list") == 0) {
plugrack_print_all_plugin(c->plugin_list);
exit(0);
} else {
/* Find the correct plugin. */
- c->cur_plugin = plugrack_use_by_type(c->plugin_list,
+ c->cur_plugin = plugrack_use_by_type(c->plugin_list,
c->mpi_type);
if ( c->cur_plugin == PLUGIN_INVALID_HANDLE ) {
- error("can't find a valid plugin for type %s",
+ error("can't find a valid plugin for type %s",
c->mpi_type);
return NULL;
}
@@ -213,7 +213,7 @@ int _mpi_init (char *mpi_type)
if ( g_context )
goto done;
-
+
if (mpi_type == NULL) {
mpi_type = slurm_get_mpi_default();
got_default = 1;
@@ -221,13 +221,13 @@ int _mpi_init (char *mpi_type)
if (mpi_type == NULL) {
error("No MPI default set.");
retval = SLURM_ERROR;
- goto done;
+ goto done;
}
setenvf (NULL, "SLURM_MPI_TYPE", "%s", mpi_type);
-
+
full_type = xmalloc(sizeof(char) * (strlen(mpi_type)+5));
sprintf(full_type,"mpi/%s",mpi_type);
-
+
g_context = _slurm_mpi_context_create(full_type);
xfree(full_type);
if ( g_context == NULL ) {
@@ -242,8 +242,8 @@ int _mpi_init (char *mpi_type)
g_context = NULL;
retval = SLURM_ERROR;
}
-
-
+
+
done:
if(got_default)
xfree(mpi_type);
@@ -254,19 +254,19 @@ done:
int mpi_hook_slurmstepd_init (char ***env)
{
char *mpi_type = getenvp (*env, "SLURM_MPI_TYPE");
-
+
debug("mpi type = %s", mpi_type);
- if(_mpi_init(mpi_type) == SLURM_ERROR)
+ if(_mpi_init(mpi_type) == SLURM_ERROR)
return SLURM_ERROR;
-
+
unsetenvp (*env, "SLURM_MPI_TYPE");
return SLURM_SUCCESS;
}
int mpi_hook_slurmstepd_task (const mpi_plugin_task_info_t *job, char ***env)
-{
+{
if (mpi_hook_slurmstepd_init(env) == SLURM_ERROR)
return SLURM_ERROR;
@@ -276,10 +276,10 @@ int mpi_hook_slurmstepd_task (const mpi_plugin_task_info_t *job, char ***env)
int mpi_hook_client_init (char *mpi_type)
{
debug("mpi type = %s", mpi_type);
-
- if(_mpi_init(mpi_type) == SLURM_ERROR)
+
+ if(_mpi_init(mpi_type) == SLURM_ERROR)
return SLURM_ERROR;
-
+
return SLURM_SUCCESS;
}
@@ -288,7 +288,7 @@ mpi_hook_client_prelaunch(const mpi_plugin_client_info_t *job, char ***env)
{
if (_mpi_init(NULL) < 0)
return NULL;
-
+
return (*(g_context->ops.client_prelaunch))(job, env);
}
@@ -296,7 +296,7 @@ bool mpi_hook_client_single_task_per_node (void)
{
if (_mpi_init(NULL) < 0)
return SLURM_ERROR;
-
+
return (*(g_context->ops.client_single_task))();
}
@@ -304,7 +304,7 @@ int mpi_hook_client_fini (mpi_plugin_client_state_t *state)
{
if (_mpi_init(NULL) < 0)
return SLURM_ERROR;
-
+
return (*(g_context->ops.client_fini))(state);
}
diff --git a/src/common/mpi.h b/src/common/mpi.h
index 2fa2e2b27c92acda2da6cfff862aa775fc9ec3e1..7adced49c5d62b526c5a61f22dd3bdb503d99043 100644
--- a/src/common/mpi.h
+++ b/src/common/mpi.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <grondo1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -41,7 +41,7 @@
#if HAVE_CONFIG_H
# include "config.h"
-#endif
+#endif
#include <stdbool.h>
#include <slurm/slurm.h>
diff --git a/src/common/net.c b/src/common/net.c
index a65b9831b8a0bd1d380ea16382ff2b3195a41da7..e2929046107629f72d77037d0912cf112d3383dd 100644
--- a/src/common/net.c
+++ b/src/common/net.c
@@ -3,35 +3,35 @@
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Mark Grondona <grondona1@llnl.gov>, Kevin Tew <tew1@llnl.gov>,
+ * Written by Mark Grondona <grondona1@llnl.gov>, Kevin Tew <tew1@llnl.gov>,
* et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -56,8 +56,8 @@
#include "src/common/net.h"
/*
- * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
- * for details.
+ * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
+ * for details.
*/
strong_alias(net_stream_listen, slurm_net_stream_listen);
strong_alias(net_accept_stream, slurm_net_accept_stream);
@@ -65,7 +65,7 @@ strong_alias(net_set_low_water, slurm_net_set_low_water);
#ifndef NET_DEFAULT_BACKLOG
# define NET_DEFAULT_BACKLOG 1024
-#endif
+#endif
/*
* Returns the port number in host byte order.
@@ -88,7 +88,7 @@ static short _sock_bind_wild(int sockfd)
return ntohs(sin.sin_port);
}
-/* open a stream socket on an ephemereal port and put it into
+/* open a stream socket on an ephemereal port and put it into
* the listen state. fd and port are filled in with the new
* socket's file descriptor and port #.
*
@@ -104,7 +104,7 @@ int net_stream_listen(int *fd, short *port)
val = 1;
rc = setsockopt(*fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(int));
- if (rc > 0)
+ if (rc > 0)
goto cleanup;
*port = _sock_bind_wild(*fd);
@@ -164,7 +164,7 @@ int readn(int fd, void *buf, size_t nbytes)
int net_set_low_water(int sock, size_t size)
{
- if (setsockopt(sock, SOL_SOCKET, SO_RCVLOWAT,
+ if (setsockopt(sock, SOL_SOCKET, SO_RCVLOWAT,
(const void *) &size, sizeof(size)) < 0) {
error("Unable to set low water socket option: %m");
return -1;
diff --git a/src/common/net.h b/src/common/net.h
index ef19ce25620ff5af467aeb28ff5f8295a465ec33..75c5baa6d5e44f1b64383728934d6f9c423b0dab 100644
--- a/src/common/net.h
+++ b/src/common/net.h
@@ -16,15 +16,15 @@
* 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
+ * 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
+ * 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
@@ -44,7 +44,7 @@
#include "src/common/macros.h"
-/* open a stream socket on an ephemereal port and put it into
+/* open a stream socket on an ephemereal port and put it into
* the listen state. fd and port are filled in with the new
* socket's file descriptor and port #.
*
diff --git a/src/common/node_conf.c b/src/common/node_conf.c
index e202d4bfe8ab9a395f7cb566cb6295ce79c07cb6..5b1bee1f131bf50101a09471982a51ffb45f835b 100644
--- a/src/common/node_conf.c
+++ b/src/common/node_conf.c
@@ -1,9 +1,9 @@
/*****************************************************************************\
* node_conf.c - partially manage the node records of slurm
- * (see src/slurmctld/node_mgr.c for the set of functionalities
+ * (see src/slurmctld/node_mgr.c for the set of functionalities
* related to slurmctld usage of nodes)
- * Note: there is a global node table (node_record_table_ptr), its
- * hash table (node_hash_table), time stamp (last_node_update) and
+ * Note: there is a global node table (node_record_table_ptr), its
+ * hash table (node_hash_table), time stamp (last_node_update) and
* configuration list (config_list)
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
@@ -11,32 +11,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -110,7 +110,7 @@ static void _add_config_feature(char *feature, bitstr_t *node_bitmap)
feature_iter = list_iterator_create(feature_list);
if (feature_iter == NULL)
fatal("list_iterator_create malloc failure");
- while ((feature_ptr = (struct features_record *)
+ while ((feature_ptr = (struct features_record *)
list_next(feature_iter))) {
if (strcmp(feature, feature_ptr->name))
continue;
@@ -130,7 +130,7 @@ static void _add_config_feature(char *feature, bitstr_t *node_bitmap)
}
-/*
+/*
* _build_single_nodeline_info - From the slurm.conf reader, build table,
* and set values
* RET 0 if no error, error code otherwise
@@ -244,7 +244,7 @@ cleanup:
* RET 0 if no error, errno otherwise
* global: config_list - list of all configuration records
*/
-static int _delete_config_record (void)
+static int _delete_config_record (void)
{
last_node_update = time (NULL);
(void) list_delete_all (config_list, &_list_find_config, NULL);
@@ -254,13 +254,13 @@ static int _delete_config_record (void)
#if _DEBUG
-/*
+/*
* _dump_hash - print the node_hash_table contents, used for debugging
- * or analysis of hash technique
+ * or analysis of hash technique
* global: node_record_table_ptr - pointer to global node table
* node_hash_table - table of hash indecies
*/
-static void _dump_hash (void)
+static void _dump_hash (void)
{
int i, inx;
struct node_record *node_ptr;
@@ -279,36 +279,36 @@ static void _dump_hash (void)
}
#endif
-/*
+/*
* _find_alias_node_record - find a record for node with the alias of
* the specified name supplied
- * input: name - name to be aliased of the desired node
+ * input: name - name to be aliased of the desired node
* output: return pointer to node record or NULL if not found
* global: node_record_table_ptr - pointer to global node table
* node_hash_table - table of hash indecies
*/
-static struct node_record *_find_alias_node_record (char *name)
+static struct node_record *_find_alias_node_record (char *name)
{
int i;
char *alias = NULL;
-
+
if ((name == NULL) || (name[0] == '\0')) {
info("_find_alias_node_record: passed NULL name");
return NULL;
}
/* Get the alias we have just to make sure the user isn't
* trying to use the real hostname to run on something that has
- * been aliased.
+ * been aliased.
*/
alias = slurm_conf_get_nodename(name);
-
+
if (!alias)
return NULL;
-
+
/* try to find via hash table, if it exists */
if (node_hash_table) {
struct node_record *node_ptr;
-
+
i = _hash_index (alias);
node_ptr = node_hash_table[i];
while (node_ptr) {
@@ -320,7 +320,7 @@ static struct node_record *_find_alias_node_record (char *name)
node_ptr = node_ptr->node_next;
}
error ("_find_alias_node_record: lookup failure for %s", name);
- }
+ }
/* revert to sequential search */
else {
@@ -328,7 +328,7 @@ static struct node_record *_find_alias_node_record (char *name)
if (!strcmp (alias, node_record_table_ptr[i].name)) {
xfree(alias);
return (&node_record_table_ptr[i]);
- }
+ }
}
}
@@ -336,12 +336,12 @@ static struct node_record *_find_alias_node_record (char *name)
return (struct node_record *) NULL;
}
-/*
- * _hash_index - return a hash table index for the given node name
+/*
+ * _hash_index - return a hash table index for the given node name
* IN name = the node's name
* RET the hash table index
*/
-static int _hash_index (char *name)
+static int _hash_index (char *name)
{
int index = 0;
int j;
@@ -357,15 +357,15 @@ static int _hash_index (char *name)
for (j = 1; *name; name++, j++)
index += (int)*name * j;
index %= node_record_count;
-
+
return index;
}
-/* _list_delete_config - delete an entry from the config list,
+/* _list_delete_config - delete an entry from the config list,
* see list.h for documentation */
-static void _list_delete_config (void *config_entry)
+static void _list_delete_config (void *config_entry)
{
- struct config_record *config_ptr = (struct config_record *)
+ struct config_record *config_ptr = (struct config_record *)
config_entry;
xassert(config_ptr);
@@ -377,11 +377,11 @@ static void _list_delete_config (void *config_entry)
xfree (config_ptr);
}
-/* _list_delete_feature - delete an entry from the feature list,
+/* _list_delete_feature - delete an entry from the feature list,
* see list.h for documentation */
-static void _list_delete_feature (void *feature_entry)
+static void _list_delete_feature (void *feature_entry)
{
- struct features_record *feature_ptr = (struct features_record *)
+ struct features_record *feature_ptr = (struct features_record *)
feature_entry;
xassert(feature_ptr);
@@ -391,13 +391,13 @@ static void _list_delete_feature (void *feature_entry)
xfree (feature_ptr);
}
-/*
- * _list_find_config - find an entry in the config list, see list.h for
- * documentation
+/*
+ * _list_find_config - find an entry in the config list, see list.h for
+ * documentation
* IN key - is NULL for all config
* RET 1 if key == NULL, 0 otherwise
*/
-static int _list_find_config (void *config_entry, void *key)
+static int _list_find_config (void *config_entry, void *key)
{
if (key == NULL)
return 1;
@@ -405,14 +405,14 @@ static int _list_find_config (void *config_entry, void *key)
}
/*
- * bitmap2node_name - given a bitmap, build a list of comma separated node
+ * bitmap2node_name - given a bitmap, build a list of comma separated node
* names. names may include regular expressions (e.g. "lx[01-10]")
* IN bitmap - bitmap pointer
- * RET pointer to node list or NULL on error
+ * RET pointer to node list or NULL on error
* globals: node_record_table_ptr - pointer to node table
* NOTE: the caller must xfree the memory at node_list when no longer required
*/
-char * bitmap2node_name (bitstr_t *bitmap)
+char * bitmap2node_name (bitstr_t *bitmap)
{
int i, first, last;
hostlist_t hl;
@@ -441,13 +441,13 @@ char * bitmap2node_name (bitstr_t *bitmap)
return xstrdup(buf);
}
-/*
- * _list_find_feature - find an entry in the feature list, see list.h for
- * documentation
+/*
+ * _list_find_feature - find an entry in the feature list, see list.h for
+ * documentation
* IN key - is feature name or NULL for all features
* RET 1 if found, 0 otherwise
*/
-static int _list_find_feature (void *feature_entry, void *key)
+static int _list_find_feature (void *feature_entry, void *key)
{
struct features_record *feature_ptr;
@@ -460,7 +460,7 @@ static int _list_find_feature (void *feature_entry, void *key)
return 0;
}
-/*
+/*
* _build_all_nodeline_info - get a array of slurm_conf_node_t structures
* from the slurm.conf reader, build table, and set values
* IN set_bitmap - if true, set node_bitmap in config record (used by slurmd)
@@ -503,7 +503,7 @@ extern int build_all_nodeline_info (bool set_bitmap)
fatal ("memory allocation failure");
while ((config_ptr = (struct config_record *)
list_next(config_iterator))) {
- node_name2bitmap(config_ptr->nodes, true,
+ node_name2bitmap(config_ptr->nodes, true,
&config_ptr->node_bitmap);
}
list_iterator_destroy(config_iterator);
@@ -526,7 +526,7 @@ extern void build_config_feature_list(struct config_record *config_ptr)
if (feature_iter == NULL)
fatal("list_iterator_create malloc failure");
bit_not(config_ptr->node_bitmap);
- while ((feature_ptr = (struct features_record *)
+ while ((feature_ptr = (struct features_record *)
list_next(feature_iter))) {
bit_and(feature_ptr->node_bitmap, config_ptr->node_bitmap);
}
@@ -553,15 +553,15 @@ extern void build_config_feature_list(struct config_record *config_ptr)
}
/*
- * create_config_record - create a config_record entry and set is values to
- * the defaults. each config record corresponds to a line in the
- * slurm.conf file and typically describes the configuration of a
+ * create_config_record - create a config_record entry and set is values to
+ * the defaults. each config record corresponds to a line in the
+ * slurm.conf file and typically describes the configuration of a
* large number of nodes
* RET pointer to the config_record
- * NOTE: memory allocated will remain in existence until
+ * NOTE: memory allocated will remain in existence until
* _delete_config_record() is called to delete all configuration records
*/
-extern struct config_record * create_config_record (void)
+extern struct config_record * create_config_record (void)
{
struct config_record *config_ptr;
@@ -579,34 +579,34 @@ extern struct config_record * create_config_record (void)
return config_ptr;
}
-/*
+/*
* create_node_record - create a node record and set its values to defaults
* IN config_ptr - pointer to node's configuration information
* IN node_name - name of the node
* RET pointer to the record or NULL if error
- * NOTE: allocates memory at node_record_table_ptr that must be xfreed when
+ * NOTE: allocates memory at node_record_table_ptr that must be xfreed when
* the global node table is no longer required
*/
extern struct node_record *create_node_record (
- struct config_record *config_ptr, char *node_name)
+ struct config_record *config_ptr, char *node_name)
{
struct node_record *node_ptr;
int old_buffer_size, new_buffer_size;
last_node_update = time (NULL);
xassert(config_ptr);
- xassert(node_name);
+ xassert(node_name);
/* round up the buffer size to reduce overhead of xrealloc */
old_buffer_size = (node_record_count) * sizeof (struct node_record);
- old_buffer_size =
+ old_buffer_size =
((int) ((old_buffer_size / BUF_SIZE) + 1)) * BUF_SIZE;
- new_buffer_size =
+ new_buffer_size =
(node_record_count + 1) * sizeof (struct node_record);
- new_buffer_size =
+ new_buffer_size =
((int) ((new_buffer_size / BUF_SIZE) + 1)) * BUF_SIZE;
if (!node_record_table_ptr) {
- node_record_table_ptr =
+ node_record_table_ptr =
(struct node_record *) xmalloc (new_buffer_size);
} else if (old_buffer_size != new_buffer_size)
xrealloc (node_record_table_ptr, new_buffer_size);
@@ -626,24 +626,24 @@ extern struct node_record *create_node_record (
}
-/*
+/*
* find_node_record - find a record for node with specified name
- * input: name - name of the desired node
+ * input: name - name of the desired node
* output: return pointer to node record or NULL if not found
*/
-extern struct node_record *find_node_record (char *name)
+extern struct node_record *find_node_record (char *name)
{
int i;
-
+
if ((name == NULL) || (name[0] == '\0')) {
info("find_node_record passed NULL name");
return NULL;
}
-
+
/* try to find via hash table, if it exists */
if (node_hash_table) {
struct node_record *node_ptr;
-
+
i = _hash_index (name);
node_ptr = node_hash_table[i];
while (node_ptr) {
@@ -657,32 +657,32 @@ extern struct node_record *find_node_record (char *name)
if ((node_record_count == 1) &&
(strcmp(node_record_table_ptr[0].name, "localhost") == 0))
return (&node_record_table_ptr[0]);
-
+
error ("find_node_record: lookup failure for %s", name);
- }
+ }
/* revert to sequential search */
else {
for (i = 0; i < node_record_count; i++) {
if (!strcmp (name, node_record_table_ptr[i].name)) {
return (&node_record_table_ptr[i]);
- }
+ }
}
}
-
+
/* look for the alias node record if the user put this in
instead of what slurm sees the node name as */
return _find_alias_node_record (name);
}
-/*
- * init_node_conf - initialize the node configuration tables and values.
- * this should be called before creating any node or configuration
+/*
+ * init_node_conf - initialize the node configuration tables and values.
+ * this should be called before creating any node or configuration
* entries.
* RET 0 if no error, otherwise an error code
*/
-extern int init_node_conf (void)
+extern int init_node_conf (void)
{
last_node_update = time (NULL);
int i;
@@ -733,16 +733,16 @@ extern void node_fini2 (void)
/*
- * node_name2bitmap - given a node name regular expression, build a bitmap
+ * node_name2bitmap - given a node name regular expression, build a bitmap
* representation
* IN node_names - list of nodes
- * IN best_effort - if set don't return an error on invalid node name entries
- * OUT bitmap - set to bitmap, may not have all bits set on error
+ * IN best_effort - if set don't return an error on invalid node name entries
+ * OUT bitmap - set to bitmap, may not have all bits set on error
* RET 0 if no error, otherwise EINVAL
* NOTE: the caller must bit_free() memory at bitmap when no longer required
*/
-extern int node_name2bitmap (char *node_names, bool best_effort,
- bitstr_t **bitmap)
+extern int node_name2bitmap (char *node_names, bool best_effort,
+ bitstr_t **bitmap)
{
int rc = SLURM_SUCCESS;
char *this_node_name;
@@ -753,7 +753,7 @@ extern int node_name2bitmap (char *node_names, bool best_effort,
if (my_bitmap == NULL)
fatal("bit_alloc malloc failure");
*bitmap = my_bitmap;
-
+
if (node_names == NULL) {
info("node_name2bitmap: node_names is NULL");
return rc;
@@ -771,7 +771,7 @@ extern int node_name2bitmap (char *node_names, bool best_effort,
struct node_record *node_ptr;
node_ptr = find_node_record (this_node_name);
if (node_ptr) {
- bit_set (my_bitmap, (bitoff_t) (node_ptr -
+ bit_set (my_bitmap, (bitoff_t) (node_ptr -
node_record_table_ptr));
} else {
error ("node_name2bitmap: invalid node specified %s",
@@ -801,17 +801,17 @@ extern void purge_node_rec (struct node_record *node_ptr)
}
-/*
- * rehash_node - build a hash table of the node_record entries.
+/*
+ * rehash_node - build a hash table of the node_record entries.
* NOTE: manages memory for node_hash_table
*/
-extern void rehash_node (void)
+extern void rehash_node (void)
{
int i, inx;
struct node_record *node_ptr = node_record_table_ptr;
xfree (node_hash_table);
- node_hash_table = xmalloc (sizeof (struct node_record *) *
+ node_hash_table = xmalloc (sizeof (struct node_record *) *
node_record_count);
for (i = 0; i < node_record_count; i++, node_ptr++) {
diff --git a/src/common/node_conf.h b/src/common/node_conf.h
index 3951382e5f8d412d0a07b287689f212026204c64..75cdb1179d1d6a00c2724b0a420c38e24294b838 100644
--- a/src/common/node_conf.h
+++ b/src/common/node_conf.h
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * node_conf.h - definitions for reading the node part of slurm configuration
+ * node_conf.h - definitions for reading the node part of slurm configuration
* file and work with the corresponding structures
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -71,7 +71,7 @@ struct config_record {
uint16_t threads; /* number of threads per core */
uint32_t real_memory; /* MB real memory on the node */
uint32_t tmp_disk; /* MB total storage in TMP_FS file system */
- uint32_t weight; /* arbitrary priority of node for
+ uint32_t weight; /* arbitrary priority of node for
* scheduling work on */
char *feature; /* arbitrary list of features associated */
char **feature_array; /* array of feature names */
@@ -90,10 +90,10 @@ extern List feature_list; /* list of features_record entries */
struct node_record {
uint32_t magic; /* magic cookie for data integrity */
char *name; /* name of the node. NULL==defunct */
- uint16_t node_state; /* enum node_states, ORed with
- * NODE_STATE_NO_RESPOND if not
+ uint16_t node_state; /* enum node_states, ORed with
+ * NODE_STATE_NO_RESPOND if not
* responding */
- bool not_responding; /* set if fails to respond,
+ bool not_responding; /* set if fails to respond,
* clear after logging this */
time_t last_response; /* last response from the node */
time_t last_idle; /* time node last become idle */
@@ -106,7 +106,7 @@ struct node_record {
uint32_t up_time; /* seconds since node boot */
struct config_record *config_ptr; /* configuration spec ptr */
uint16_t part_cnt; /* number of associated partitions */
- struct part_record **part_pptr; /* array of pointers to partitions
+ struct part_record **part_pptr; /* array of pointers to partitions
* associated with this node*/
char *comm_name; /* communications path name to node */
uint16_t port; /* TCP port number of the slurmd */
@@ -140,16 +140,16 @@ extern time_t last_node_update; /* time of last node record update */
/*
- * bitmap2node_name - given a bitmap, build a list of comma separated node
+ * bitmap2node_name - given a bitmap, build a list of comma separated node
* names. names may include regular expressions (e.g. "lx[01-10]")
* IN bitmap - bitmap pointer
- * RET pointer to node list or NULL on error
+ * RET pointer to node list or NULL on error
* globals: node_record_table_ptr - pointer to node table
* NOTE: the caller must xfree the memory at node_list when no longer required
*/
char * bitmap2node_name (bitstr_t *bitmap);
-/*
+/*
* _build_all_nodeline_info - get a array of slurm_conf_node_t structures
* from the slurm.conf reader, build table, and set values
* IN set_bitmap - if true, set node_bitmap in config record (used by slurmd)
@@ -161,38 +161,38 @@ extern int build_all_nodeline_info (bool set_bitmap);
extern void build_config_feature_list (struct config_record *config_ptr);
/*
- * create_config_record - create a config_record entry and set is values to
- * the defaults. each config record corresponds to a line in the
- * slurm.conf file and typically describes the configuration of a
+ * create_config_record - create a config_record entry and set is values to
+ * the defaults. each config record corresponds to a line in the
+ * slurm.conf file and typically describes the configuration of a
* large number of nodes
* RET pointer to the config_record
- * NOTE: memory allocated will remain in existence until
+ * NOTE: memory allocated will remain in existence until
* _delete_config_record() is called to delete all configuration records
*/
extern struct config_record *create_config_record (void);
-/*
+/*
* create_node_record - create a node record and set its values to defaults
* IN config_ptr - pointer to node's configuration information
* IN node_name - name of the node
* RET pointer to the record or NULL if error
- * NOTE: allocates memory at node_record_table_ptr that must be xfreed when
+ * NOTE: allocates memory at node_record_table_ptr that must be xfreed when
* the global node table is no longer required
*/
extern struct node_record *create_node_record (
struct config_record *config_ptr, char *node_name);
-/*
+/*
* find_node_record - find a record for node with specified name
- * input: name - name of the desired node
+ * input: name - name of the desired node
* output: return pointer to node record or NULL if not found
* node_hash_table - table of hash indecies
*/
extern struct node_record *find_node_record (char *name);
-/*
- * init_node_conf - initialize the node configuration tables and values.
- * this should be called before creating any node or configuration
+/*
+ * init_node_conf - initialize the node configuration tables and values.
+ * this should be called before creating any node or configuration
* entries.
* RET 0 if no error, otherwise an error code
*/
@@ -202,22 +202,22 @@ extern int init_node_conf (void);
extern void node_fini2 (void);
/*
- * node_name2bitmap - given a node name regular expression, build a bitmap
+ * node_name2bitmap - given a node name regular expression, build a bitmap
* representation
* IN node_names - list of nodes
- * IN best_effort - if set don't return an error on invalid node name entries
- * OUT bitmap - set to bitmap, may not have all bits set on error
+ * IN best_effort - if set don't return an error on invalid node name entries
+ * OUT bitmap - set to bitmap, may not have all bits set on error
* RET 0 if no error, otherwise EINVAL
* NOTE: the caller must bit_free() memory at bitmap when no longer required
*/
-extern int node_name2bitmap (char *node_names, bool best_effort,
+extern int node_name2bitmap (char *node_names, bool best_effort,
bitstr_t **bitmap);
/* Purge the contents of a node record */
extern void purge_node_rec (struct node_record *node_ptr);
-/*
- * rehash_node - build a hash table of the node_record entries.
+/*
+ * rehash_node - build a hash table of the node_record entries.
* NOTE: manages memory for node_hash_table
*/
extern void rehash_node (void);
diff --git a/src/common/node_select.c b/src/common/node_select.c
index b68e76212998937a96c674d5ca4077773a3cb119..b83b2a30838d5276c9a7163cd6be24c56bd1e6b2 100644
--- a/src/common/node_select.c
+++ b/src/common/node_select.c
@@ -1,12 +1,12 @@
/*****************************************************************************\
* node_select.c - node selection plugin wrapper.
*
- * NOTE: The node selection plugin itself is intimately tied to slurmctld
- * functions and data structures. Some related functions (e.g. data structure
- * un/packing, environment variable setting) are required by most SLURM
+ * NOTE: The node selection plugin itself is intimately tied to slurmctld
+ * functions and data structures. Some related functions (e.g. data structure
+ * un/packing, environment variable setting) are required by most SLURM
* commands. Since some of these commands must be executed on the BlueGene
- * front-end nodes, the functions they require are here rather than within
- * the plugin. This is because functions required by the plugin can not be
+ * front-end nodes, the functions they require are here rather than within
+ * the plugin. This is because functions required by the plugin can not be
* resolved on the front-end nodes, so we can't load the plugins there.
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
@@ -14,32 +14,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -78,8 +78,8 @@ typedef struct slurm_select_ops {
int node_cnt);
int (*block_init) (List block_list);
int (*job_test) (struct job_record *job_ptr,
- bitstr_t *bitmap,
- uint32_t min_nodes,
+ bitstr_t *bitmap,
+ uint32_t min_nodes,
uint32_t max_nodes,
uint32_t req_nodes,
uint16_t mode,
@@ -92,9 +92,9 @@ typedef struct slurm_select_ops {
int (*job_resume) (struct job_record *job_ptr);
int (*pack_select_info) (time_t last_query_time,
Buf *buffer_ptr);
- int (*nodeinfo_pack) (select_nodeinfo_t *nodeinfo,
+ int (*nodeinfo_pack) (select_nodeinfo_t *nodeinfo,
Buf buffer);
- int (*nodeinfo_unpack) (select_nodeinfo_t **nodeinfo,
+ int (*nodeinfo_unpack) (select_nodeinfo_t **nodeinfo,
Buf buffer);
select_nodeinfo_t *(*nodeinfo_alloc) (uint32_t size);
int (*nodeinfo_free) (select_nodeinfo_t *nodeinfo);
@@ -102,13 +102,13 @@ typedef struct slurm_select_ops {
int (*nodeinfo_set) (struct job_record *job_ptr);
int (*nodeinfo_get) (select_nodeinfo_t *nodeinfo,
enum
- select_nodedata_type dinfo,
+ select_nodedata_type dinfo,
enum node_states state,
void *data);
select_jobinfo_t *(*jobinfo_alloc) ();
int (*jobinfo_free) (select_jobinfo_t *jobinfo);
int (*jobinfo_set) (select_jobinfo_t *jobinfo,
- enum
+ enum
select_jobdata_type data_type,
void *data);
int (*jobinfo_get) (select_jobinfo_t *jobinfo,
@@ -125,11 +125,11 @@ typedef struct slurm_select_ops {
int mode);
char * (*jobinfo_xstrdup) (select_jobinfo_t *jobinfo,
int mode);
- int (*update_block) (update_block_msg_t
+ int (*update_block) (update_block_msg_t
*block_desc_ptr);
int (*update_sub_node) (update_block_msg_t
*block_desc_ptr);
- int (*get_info_from_plugin)(enum
+ int (*get_info_from_plugin)(enum
select_plugindata_info dinfo,
struct job_record *job_ptr,
void *data);
@@ -149,7 +149,7 @@ typedef struct slurm_select_context {
} slurm_select_context_t;
static slurm_select_context_t * g_select_context = NULL;
-static pthread_mutex_t g_select_context_lock =
+static pthread_mutex_t g_select_context_lock =
PTHREAD_MUTEX_INITIALIZER;
#ifdef HAVE_CRAY_XT /* node selection specific logic */
@@ -217,13 +217,13 @@ static slurm_select_ops_t * _select_get_ops(slurm_select_context_t *c)
/* Find the correct plugin. */
c->cur_plugin = plugin_load_and_link(c->select_type, n_syms, syms,
(void **) &c->ops);
- if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
+ if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
error("Couldn't find the specified plugin name for %s "
"looking at all files",
c->select_type);
-
+
/* Get plugin list. */
if ( c->plugin_list == NULL ) {
char *plugin_dir;
@@ -243,7 +243,7 @@ static slurm_select_ops_t * _select_get_ops(slurm_select_context_t *c)
c->cur_plugin = plugrack_use_by_type( c->plugin_list, c->select_type );
if ( c->cur_plugin == PLUGIN_INVALID_HANDLE ) {
- error( "cannot find node selection plugin for %s",
+ error( "cannot find node selection plugin for %s",
c->select_type );
return NULL;
}
@@ -321,19 +321,19 @@ static void _free_block_info(block_info_t *block_info)
}
}
-/* NOTE: The matching pack functions are directly in the select/bluegene
- * plugin. The unpack functions can not be there since the plugin is
- * dependent upon libraries which do not exist on the BlueGene front-end
+/* NOTE: The matching pack functions are directly in the select/bluegene
+ * plugin. The unpack functions can not be there since the plugin is
+ * dependent upon libraries which do not exist on the BlueGene front-end
* nodes. */
static int _unpack_block_info(block_info_t *block_info, Buf buffer)
{
uint32_t uint32_tmp;
char *bp_inx_str = NULL;
-
+
safe_unpackstr_xmalloc(&block_info->bg_block_id,
&uint32_tmp, buffer);
#ifdef HAVE_BGL
- safe_unpackstr_xmalloc(&block_info->blrtsimage,
+ safe_unpackstr_xmalloc(&block_info->blrtsimage,
&uint32_tmp, buffer);
#endif
safe_unpackstr_xmalloc(&bp_inx_str, &uint32_tmp, buffer);
@@ -344,7 +344,7 @@ static int _unpack_block_info(block_info_t *block_info, Buf buffer)
xfree(bp_inx_str);
}
safe_unpack16(&block_info->conn_type, buffer);
- safe_unpackstr_xmalloc(&(block_info->ionodes),
+ safe_unpackstr_xmalloc(&(block_info->ionodes),
&uint32_tmp, buffer);
safe_unpackstr_xmalloc(&bp_inx_str, &uint32_tmp, buffer);
if (bp_inx_str == NULL) {
@@ -368,7 +368,7 @@ static int _unpack_block_info(block_info_t *block_info, Buf buffer)
safe_unpackstr_xmalloc(&block_info->ramdiskimage,
&uint32_tmp, buffer);
safe_unpack16(&block_info->state, buffer);
-
+
return SLURM_SUCCESS;
unpack_error:
@@ -392,7 +392,7 @@ extern void node_select_pack_block_info(block_info_t *block_info, Buf buffer)
packnull(buffer);
#ifdef HAVE_BGL
packnull(buffer);
-#endif
+#endif
pack16((uint16_t)NO_VAL, buffer);
packnull(buffer);
@@ -407,7 +407,7 @@ extern void node_select_pack_block_info(block_info_t *block_info, Buf buffer)
pack32(NO_VAL, buffer);
#ifdef HAVE_BGL
pack16((uint16_t)NO_VAL, buffer);
-#endif
+#endif
packnull(buffer);
packnull(buffer);
@@ -416,7 +416,7 @@ extern void node_select_pack_block_info(block_info_t *block_info, Buf buffer)
packstr(block_info->bg_block_id, buffer);
#ifdef HAVE_BGL
packstr(block_info->blrtsimage, buffer);
-#endif
+#endif
if(block_info->bp_inx) {
char *bitfmt = inx2bitfmt(block_info->bp_inx);
@@ -424,11 +424,11 @@ extern void node_select_pack_block_info(block_info_t *block_info, Buf buffer)
xfree(bitfmt);
} else
packnull(buffer);
-
+
pack16(block_info->conn_type, buffer);
packstr(block_info->ionodes, buffer);
-
+
if(block_info->ionode_inx) {
char *bitfmt = inx2bitfmt(block_info->ionode_inx);
packstr(bitfmt, buffer);
@@ -437,13 +437,13 @@ extern void node_select_pack_block_info(block_info_t *block_info, Buf buffer)
packnull(buffer);
pack32(block_info->job_running, buffer);
-
+
packstr(block_info->linuximage, buffer);
packstr(block_info->mloaderimage, buffer);
packstr(block_info->nodes, buffer);
pack32(block_info->node_cnt, buffer);
#ifdef HAVE_BGL
- pack16(block_info->node_use, buffer);
+ pack16(block_info->node_use, buffer);
#endif
packstr(block_info->owner_name, buffer);
packstr(block_info->ramdiskimage, buffer);
@@ -495,10 +495,10 @@ extern int node_select_block_info_msg_unpack(
buf = xmalloc(sizeof(block_info_msg_t));
safe_unpack32(&(buf->record_count), buffer);
safe_unpack_time(&(buf->last_update), buffer);
- buf->block_array = xmalloc(sizeof(block_info_t) *
+ buf->block_array = xmalloc(sizeof(block_info_t) *
buf->record_count);
for(i=0; i<buf->record_count; i++) {
- if (_unpack_block_info(&(buf->block_array[i]), buffer))
+ if (_unpack_block_info(&(buf->block_array[i]), buffer))
goto unpack_error;
}
*block_info_msg_pptr = buf;
@@ -506,7 +506,7 @@ extern int node_select_block_info_msg_unpack(
unpack_error:
node_select_block_info_msg_free(&buf);
- *block_info_msg_pptr = NULL;
+ *block_info_msg_pptr = NULL;
return SLURM_ERROR;
}
@@ -518,7 +518,7 @@ extern int slurm_select_init(void)
{
int retval = SLURM_SUCCESS;
char *select_type = NULL;
-
+
slurm_mutex_lock( &g_select_context_lock );
if ( g_select_context )
@@ -634,30 +634,30 @@ extern int select_g_block_init(List block_list)
* SELECT_MODE_TEST_ONLY: test if job can ever run
* SELECT_MODE_WILL_RUN: determine when and where job can run
* IN preemptee_candidates - List of pointers to jobs which can bee preempted
- * IN/OUT preemptee_job_list - Pointer to list of job pointers. These are the
- * jobs to be preempted to initiate the pending job. Not set
+ * IN/OUT preemptee_job_list - Pointer to list of job pointers. These are the
+ * jobs to be preempted to initiate the pending job. Not set
* if mode=SELECT_MODE_TEST_ONLY or input pointer is NULL.
* Existing list is appended to.
* RET zero on success, EINVAL otherwise
*/
extern int select_g_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
- uint32_t min_nodes, uint32_t max_nodes,
- uint32_t req_nodes, uint16_t mode,
+ uint32_t min_nodes, uint32_t max_nodes,
+ uint32_t req_nodes, uint16_t mode,
List preemptee_candidates,
List *preemptee_job_list)
{
if (slurm_select_init() < 0)
return SLURM_ERROR;
- return (*(g_select_context->ops.job_test))(job_ptr, bitmap,
- min_nodes, max_nodes,
+ return (*(g_select_context->ops.job_test))(job_ptr, bitmap,
+ min_nodes, max_nodes,
req_nodes, mode,
preemptee_candidates,
preemptee_job_list);
}
/*
- * Note initiation of job is about to begin. Called immediately
+ * Note initiation of job is about to begin. Called immediately
* after select_g_job_test(). Executed from slurmctld.
* IN job_ptr - pointer to job being initiated
*/
@@ -672,7 +672,7 @@ extern int select_g_job_begin(struct job_record *job_ptr)
/*
* determine if job is ready to execute per the node select plugin
* IN job_ptr - pointer to job being tested
- * RET: -2 fatal error, -1 try again, 1 if ready to execute,
+ * RET: -2 fatal error, -1 try again, 1 if ready to execute,
* 0 not ready to execute
*/
extern int select_g_job_ready(struct job_record *job_ptr)
@@ -725,26 +725,26 @@ extern int select_g_pack_select_info(time_t last_query_time, Buf *buffer)
{
if (slurm_select_init() < 0)
return SLURM_ERROR;
-
+
return (*(g_select_context->ops.pack_select_info))
(last_query_time, buffer);
}
-extern int select_g_select_nodeinfo_pack(select_nodeinfo_t *nodeinfo,
+extern int select_g_select_nodeinfo_pack(select_nodeinfo_t *nodeinfo,
Buf buffer)
{
if (slurm_select_init() < 0)
return SLURM_ERROR;
-
+
return (*(g_select_context->ops.nodeinfo_pack))(nodeinfo, buffer);
}
-extern int select_g_select_nodeinfo_unpack(select_nodeinfo_t **nodeinfo,
+extern int select_g_select_nodeinfo_unpack(select_nodeinfo_t **nodeinfo,
Buf buffer)
{
if (slurm_select_init() < 0)
return SLURM_ERROR;
-
+
return (*(g_select_context->ops.nodeinfo_unpack))(nodeinfo, buffer);
}
@@ -752,7 +752,7 @@ extern select_nodeinfo_t *select_g_select_nodeinfo_alloc(uint32_t size)
{
if (slurm_select_init() < 0)
return NULL;
-
+
return (*(g_select_context->ops.nodeinfo_alloc))(size);
}
@@ -760,7 +760,7 @@ extern int select_g_select_nodeinfo_free(select_nodeinfo_t *nodeinfo)
{
if (slurm_select_init() < 0)
return SLURM_ERROR;
-
+
return (*(g_select_context->ops.nodeinfo_free))(nodeinfo);
}
@@ -768,7 +768,7 @@ extern int select_g_select_nodeinfo_set_all(time_t last_query_time)
{
if (slurm_select_init() < 0)
return SLURM_ERROR;
-
+
return (*(g_select_context->ops.nodeinfo_set_all))(last_query_time);
}
@@ -776,12 +776,12 @@ extern int select_g_select_nodeinfo_set(struct job_record *job_ptr)
{
if (slurm_select_init() < 0)
return SLURM_ERROR;
-
+
return (*(g_select_context->ops.nodeinfo_set))(job_ptr);
}
-extern int select_g_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
- enum select_nodedata_type dinfo,
+extern int select_g_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
+ enum select_nodedata_type dinfo,
enum node_states state,
void *data)
{
@@ -861,7 +861,7 @@ extern int select_g_select_jobinfo_set (select_jobinfo_t *jobinfo,
jobinfo->reservation_id = xstrdup(tmp_char);
break;
default:
- debug("select_g_select_jobinfo_set data_type %d invalid",
+ debug("select_g_select_jobinfo_set data_type %d invalid",
data_type);
}
@@ -871,11 +871,11 @@ extern int select_g_select_jobinfo_set (select_jobinfo_t *jobinfo,
/* get data from a select job credential
* IN jobinfo - updated select job credential
* IN data_type - type of data to enter into job credential
- * OUT data - the data to get from job credential, caller must xfree
- * data for data_tyep == SELECT_DATA_BLOCK_ID
+ * OUT data - the data to get from job credential, caller must xfree
+ * data for data_tyep == SELECT_DATA_BLOCK_ID
*/
extern int select_g_select_jobinfo_get (select_jobinfo_t *jobinfo,
- enum select_jobdata_type data_type,
+ enum select_jobdata_type data_type,
void *data)
{
int rc = SLURM_SUCCESS;
@@ -899,10 +899,10 @@ extern int select_g_select_jobinfo_get (select_jobinfo_t *jobinfo,
*tmp_char = xstrdup(jobinfo->reservation_id);
break;
default:
- /* There is some use of BlueGene specific params that
+ /* There is some use of BlueGene specific params that
* are not supported on the Cray, but requested on
* all systems */
- debug2("select_g_select_jobinfo_get data_type %d invalid",
+ debug2("select_g_select_jobinfo_get data_type %d invalid",
data_type);
return SLURM_ERROR;
}
@@ -918,7 +918,7 @@ extern int select_g_select_jobinfo_get (select_jobinfo_t *jobinfo,
extern select_jobinfo_t *select_g_select_jobinfo_copy(select_jobinfo_t *jobinfo)
{
struct select_jobinfo *rc = NULL;
-
+
if (jobinfo == NULL)
;
else if (jobinfo->magic != JOBINFO_MAGIC)
@@ -940,7 +940,7 @@ extern select_jobinfo_t *select_g_select_jobinfo_copy(select_jobinfo_t *jobinfo)
extern int select_g_select_jobinfo_pack(select_jobinfo_t *jobinfo, Buf buffer)
{
if (jobinfo) {
- /* NOTE: If new elements are added here, make sure to
+ /* NOTE: If new elements are added here, make sure to
* add equivalant pack of zeros below for NULL pointer */
packstr(jobinfo->reservation_id, buffer);
} else {
@@ -986,7 +986,7 @@ unpack_error:
extern char *select_g_select_jobinfo_sprint(select_jobinfo_t *jobinfo,
char *buf, size_t size, int mode)
{
-
+
if (buf == NULL) {
error("select_g_select_jobinfo_sprint: buf is null");
return NULL;
@@ -1011,25 +1011,25 @@ extern char *select_g_select_jobinfo_sprint(select_jobinfo_t *jobinfo,
"RESV_ID");
break;
case SELECT_PRINT_DATA:
- snprintf(buf, size,
+ snprintf(buf, size,
"%7s",
jobinfo->reservation_id);
break;
case SELECT_PRINT_MIXED:
- snprintf(buf, size,
+ snprintf(buf, size,
"Resv_ID=%s",
jobinfo->reservation_id);
break;
case SELECT_PRINT_RESV_ID:
snprintf(buf, size, "%s", jobinfo->reservation_id);
- break;
+ break;
default:
/* likely a BlueGene specific mode */
error("select_g_select_jobinfo_sprint: bad mode %d", mode);
if (size > 0)
buf[0] = '\0';
}
-
+
return buf;
}
@@ -1042,7 +1042,7 @@ extern char *select_g_select_jobinfo_xstrdup(
select_jobinfo_t *jobinfo, int mode)
{
char *buf = NULL;
-
+
if ((mode != SELECT_PRINT_DATA) &&
jobinfo && (jobinfo->magic != JOBINFO_MAGIC)) {
error("select_g_select_jobinfo_xstrdup: jobinfo magic bad");
@@ -1058,16 +1058,16 @@ extern char *select_g_select_jobinfo_xstrdup(
switch (mode) {
case SELECT_PRINT_HEAD:
- xstrcat(buf,
+ xstrcat(buf,
"RESV_ID");
break;
case SELECT_PRINT_DATA:
- xstrfmtcat(buf,
+ xstrfmtcat(buf,
"%7s",
jobinfo->reservation_id);
break;
case SELECT_PRINT_MIXED:
- xstrfmtcat(buf,
+ xstrfmtcat(buf,
"Resv_ID=%s",
jobinfo->reservation_id);
break;
@@ -1077,7 +1077,7 @@ extern char *select_g_select_jobinfo_xstrdup(
default:
error("select_g_select_jobinfo_xstrdup: bad mode %d", mode);
}
-
+
return buf;
}
@@ -1087,7 +1087,7 @@ extern select_jobinfo_t *select_g_select_jobinfo_alloc()
{
if (slurm_select_init() < 0)
return NULL;
-
+
return (*(g_select_context->ops.jobinfo_alloc))();
}
@@ -1098,7 +1098,7 @@ extern int select_g_select_jobinfo_free(select_jobinfo_t *jobinfo)
{
if (slurm_select_init() < 0)
return SLURM_ERROR;
-
+
return (*(g_select_context->ops.jobinfo_free))(jobinfo);
}
@@ -1108,7 +1108,7 @@ extern int select_g_select_jobinfo_set(select_jobinfo_t *jobinfo,
{
if (slurm_select_init() < 0)
return SLURM_ERROR;
-
+
return (*(g_select_context->ops.jobinfo_set))(jobinfo, data_type, data);
}
@@ -1118,12 +1118,12 @@ extern int select_g_select_jobinfo_set(select_jobinfo_t *jobinfo,
* IN/OUT data - the data to enter into job credential
*/
extern int select_g_select_jobinfo_get(select_jobinfo_t *jobinfo,
- enum select_jobdata_type data_type,
+ enum select_jobdata_type data_type,
void *data)
{
if (slurm_select_init() < 0)
return SLURM_ERROR;
-
+
return (*(g_select_context->ops.jobinfo_get))(jobinfo, data_type, data);
}
@@ -1136,7 +1136,7 @@ extern select_jobinfo_t *select_g_select_jobinfo_copy(select_jobinfo_t *jobinfo)
{
if (slurm_select_init() < 0)
return NULL;
-
+
return (*(g_select_context->ops.jobinfo_copy))(jobinfo);
}
@@ -1149,7 +1149,7 @@ extern int select_g_select_jobinfo_pack(select_jobinfo_t *jobinfo, Buf buffer)
{
if (slurm_select_init() < 0)
return SLURM_ERROR;
-
+
return (*(g_select_context->ops.jobinfo_pack))(jobinfo, buffer);
}
@@ -1164,7 +1164,7 @@ extern int select_g_select_jobinfo_unpack(
{
if (slurm_select_init() < 0)
return SLURM_ERROR;
-
+
return (*(g_select_context->ops.jobinfo_unpack))(jobinfo, buffer);
}
@@ -1180,7 +1180,7 @@ extern char *select_g_select_jobinfo_sprint(select_jobinfo_t *jobinfo,
{
if (slurm_select_init() < 0)
return NULL;
-
+
return (*(g_select_context->ops.jobinfo_sprint))
(jobinfo, buf, size, mode);
}
@@ -1194,14 +1194,14 @@ extern char *select_g_select_jobinfo_xstrdup(
{
if (slurm_select_init() < 0)
return NULL;
-
+
return (*(g_select_context->ops.jobinfo_xstrdup))(jobinfo, mode);
}
#endif /* HAVE_CRAY_XT */
-/*
- * Update specific block (usually something has gone wrong)
+/*
+ * Update specific block (usually something has gone wrong)
* IN block_desc_ptr - information about the block
*/
extern int select_g_update_block (update_block_msg_t *block_desc_ptr)
@@ -1212,8 +1212,8 @@ extern int select_g_update_block (update_block_msg_t *block_desc_ptr)
return (*(g_select_context->ops.update_block))(block_desc_ptr);
}
-/*
- * Update specific sub nodes (usually something has gone wrong)
+/*
+ * Update specific sub nodes (usually something has gone wrong)
* IN block_desc_ptr - information about the block
*/
extern int select_g_update_sub_node (update_block_msg_t *block_desc_ptr)
@@ -1224,13 +1224,13 @@ extern int select_g_update_sub_node (update_block_msg_t *block_desc_ptr)
return (*(g_select_context->ops.update_sub_node))(block_desc_ptr);
}
-/*
+/*
* Get select data from a plugin
- * IN dinfo - type of data to get from the node record
+ * IN dinfo - type of data to get from the node record
* (see enum select_plugindata_info)
* IN/OUT data - the data to get from node record
*/
-extern int select_g_get_info_from_plugin (enum select_plugindata_info dinfo,
+extern int select_g_get_info_from_plugin (enum select_plugindata_info dinfo,
struct job_record *job_ptr,
void *data)
{
@@ -1255,7 +1255,7 @@ extern int select_g_update_node_config (int index)
return (*(g_select_context->ops.update_node_config))(index);
}
-/*
+/*
* Updated a node state in the plugin, this should happen when a node is
* drained or put into a down state then changed back.
* IN index - index into the node record list
@@ -1270,7 +1270,7 @@ extern int select_g_update_node_state (int index, uint16_t state)
return (*(g_select_context->ops.update_node_state))(index, state);
}
-/*
+/*
* Alter the node count for a job given the type of system we are on
* IN/OUT job_desc - current job desc
*/
@@ -1283,7 +1283,7 @@ extern int select_g_alter_node_cnt (enum select_node_cnt type, void *data)
/* default to one, so most plugins don't have to */
uint32_t *nodes = (uint32_t *)data;
*nodes = 1;
- }
+ }
return (*(g_select_context->ops.alter_node_cnt))(type, data);
}
@@ -1294,7 +1294,7 @@ extern int select_g_reconfigure (void)
{
if (slurm_select_init() < 0)
return SLURM_ERROR;
-
+
return (*(g_select_context->ops.reconfigure))();
}
diff --git a/src/common/node_select.h b/src/common/node_select.h
index 448b368265be40ebfc267153a4d992ee07fafb53..378ad7ed0a5da8dd6bb804afebae738d4cf9f3f4 100644
--- a/src/common/node_select.h
+++ b/src/common/node_select.h
@@ -6,38 +6,38 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
\*****************************************************************************/
-#ifndef _NODE_SELECT_H
+#ifndef _NODE_SELECT_H
#define _NODE_SELECT_H
#include <slurm/slurm.h>
@@ -70,7 +70,7 @@ extern void node_select_pack_block_info(block_info_t *block_info, Buf buffer);
extern int node_select_unpack_block_info(block_info_t **block_info, Buf buffer);
/*
- * node_select_block_info_msg_free - free buffer returned by
+ * node_select_block_info_msg_free - free buffer returned by
* slurm_load_node_select
* IN block_info_msg_pptr - data is freed and pointer is set to NULL
* RET 0 or a slurm error code
@@ -105,8 +105,8 @@ extern int select_g_state_save(char *dir_name);
*/
extern int select_g_state_restore(char *dir_name);
-/*
- * Note the initialization of job records, issued upon restart of
+/*
+ * Note the initialization of job records, issued upon restart of
* slurmctld and used to synchronize any job state.
*/
extern int select_g_job_init(List job_list);
@@ -124,39 +124,39 @@ extern int select_g_node_init(struct node_record *node_ptr, int node_cnt);
*/
extern int select_g_block_init(List part_list);
-/*
- * Update specific block (usually something has gone wrong)
+/*
+ * Update specific block (usually something has gone wrong)
* IN block_desc_ptr - information about the block
*/
extern int select_g_update_block (update_block_msg_t *block_desc_ptr);
-/*
- * Update specific sub nodes (usually something has gone wrong)
+/*
+ * Update specific sub nodes (usually something has gone wrong)
* IN block_desc_ptr - information about the block
*/
extern int select_g_update_sub_node (update_block_msg_t *block_desc_ptr);
-/*
+/*
* Get select data from a plugin
* IN node_pts - current node record
- * IN dinfo - type of data to get from the node record
+ * IN dinfo - type of data to get from the node record
* (see enum select_plugindata_info)
* IN job_ptr - pointer to the job that's related to this query (may be NULL)
* IN/OUT data - the data to get from node record
*/
-extern int select_g_get_info_from_plugin (enum select_plugindata_info dinfo,
+extern int select_g_get_info_from_plugin (enum select_plugindata_info dinfo,
struct job_record *job_ptr,
void *data);
-/*
- * Updated a node configuration. This happens when a node registers with
+/*
+ * Updated a node configuration. This happens when a node registers with
* more resources than originally configured (e.g. memory).
* IN index - index into the node record list
* RETURN SLURM_SUCCESS on success || SLURM_ERROR else wise
*/
extern int select_g_update_node_config (int index);
-/*
+/*
* Updated a node state in the plugin, this should happen when a node is
* drained or put into a down state then changed back.
* IN index - index into the node record list
@@ -165,7 +165,7 @@ extern int select_g_update_node_config (int index);
*/
extern int select_g_update_node_state (int index, uint16_t state);
-/*
+/*
* Alter the node count for a job given the type of system we are on
* IN/OUT job_desc - current job desc
*/
@@ -219,20 +219,20 @@ extern int select_g_alter_node_cnt (enum select_node_cnt type, void *data);
* SELECT_MODE_TEST_ONLY: test if job can ever run
* SELECT_MODE_WILL_RUN: determine when and where job can run
* IN preemptee_candidates - List of pointers to jobs which can bee preempted
- * IN/OUT preemptee_job_list - Pointer to list of job pointers. These are the
- * jobs to be preempted to initiate the pending job. Not set
+ * IN/OUT preemptee_job_list - Pointer to list of job pointers. These are the
+ * jobs to be preempted to initiate the pending job. Not set
* if mode=SELECT_MODE_TEST_ONLY or input pointer is NULL.
* Existing list is appended to.
* RET zero on success, EINVAL otherwise
*/
extern int select_g_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
- uint32_t min_nodes, uint32_t max_nodes,
- uint32_t req_nodes, uint16_t mode,
+ uint32_t min_nodes, uint32_t max_nodes,
+ uint32_t req_nodes, uint16_t mode,
List preemptee_candidates,
List *preemptee_job_list);
/*
- * Note initiation of job is about to begin. Called immediately
+ * Note initiation of job is about to begin. Called immediately
* after select_g_job_test(). Executed from slurmctld.
* IN job_ptr - pointer to job being initiated
*/
@@ -283,7 +283,7 @@ extern int select_g_select_jobinfo_free(select_jobinfo_t *jobinfo);
* IN data - the data to enter into job credential
*/
extern int select_g_select_jobinfo_set(select_jobinfo_t *jobinfo,
- enum select_jobdata_type data_type,
+ enum select_jobdata_type data_type,
void *data);
/* get data from a select job credential
@@ -357,9 +357,9 @@ extern int select_g_select_nodeinfo_set_all(time_t last_query_time);
extern int select_g_select_nodeinfo_set(struct job_record *job_ptr);
-extern int select_g_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
+extern int select_g_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
enum select_nodedata_type dinfo,
- enum node_states state,
+ enum node_states state,
void *data);
@@ -367,7 +367,7 @@ extern int select_g_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
* NODE-SELECT PLUGIN SPECIFIC INFORMATION FUNCTIONS *
\******************************************************/
-/* pack node-select plugin specific information into a buffer in
+/* pack node-select plugin specific information into a buffer in
* machine independent form
* IN last_update_time - time of latest information consumer has
* OUT buffer - location to hold the data, consumer must free
diff --git a/src/common/optz.c b/src/common/optz.c
index 61d562d4f009987fc545901866184261da4bd067..79106f0ee2feca1c53bc77af165224c1dc402199 100644
--- a/src/common/optz.c
+++ b/src/common/optz.c
@@ -4,32 +4,32 @@
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/common/optz.h b/src/common/optz.h
index 5eedcc07baa961cdd10d3ae83979bbf1778955b6..37d14278c6e5a902e08b2890d06197e1f2674401 100644
--- a/src/common/optz.h
+++ b/src/common/optz.h
@@ -4,32 +4,32 @@
* Copyright (C) 2005 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/common/pack.c b/src/common/pack.c
index afda7603bc545783242b25be9a428811f950e74f..b4a2aa5b2a42a784054a133fec220763bdc66280 100644
--- a/src/common/pack.c
+++ b/src/common/pack.c
@@ -5,35 +5,35 @@
* Copyright (C) 2002-2007 The Regents of the University of California.
* Copyright (C) 2008 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Jim Garlick <garlick@llnl.gov>,
+ * Written by Jim Garlick <garlick@llnl.gov>,
* Morris Jette <jette1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -63,8 +63,8 @@
#define MAX_PACK_STR_LEN (16 * 1024 * 1024)
/*
- * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
- * for details.
+ * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
+ * for details.
*/
strong_alias(create_buf, slurm_create_buf);
strong_alias(free_buf, slurm_free_buf);
@@ -218,7 +218,7 @@ void packdouble(double val, Buf buffer)
this is here to
correct it. */
uint64_t nl = HTON_uint64(nl1);
-
+
if (remaining_buf(buffer) < sizeof(nl)) {
if (buffer->size > (MAX_BUF_SIZE - BUF_SIZE)) {
error("pack64: buffer size too large");
@@ -235,7 +235,7 @@ void packdouble(double val, Buf buffer)
/*
* Given a buffer containing a network byte order 64-bit integer,
- * typecast as double, and divide by FLOAT_MULT
+ * typecast as double, and divide by FLOAT_MULT
* store a host double at 'valp', and adjust buffer counters.
*/
int unpackdouble(double *valp, Buf buffer)
@@ -243,7 +243,7 @@ int unpackdouble(double *valp, Buf buffer)
uint64_t nl;
if (remaining_buf(buffer) < sizeof(nl))
return SLURM_ERROR;
-
+
memcpy(&nl, &buffer->head[buffer->processed], sizeof(nl));
*valp = (double)NTOH_uint64(nl) / (double)FLOAT_MULT;
@@ -281,7 +281,7 @@ int unpack64(uint64_t * valp, Buf buffer)
uint64_t nl;
if (remaining_buf(buffer) < sizeof(nl))
return SLURM_ERROR;
-
+
memcpy(&nl, &buffer->head[buffer->processed], sizeof(nl));
*valp = NTOH_uint64(nl);
buffer->processed += sizeof(nl);
@@ -318,7 +318,7 @@ int unpack32(uint32_t * valp, Buf buffer)
uint32_t nl;
if (remaining_buf(buffer) < sizeof(nl))
return SLURM_ERROR;
-
+
memcpy(&nl, &buffer->head[buffer->processed], sizeof(nl));
*valp = ntohl(nl);
buffer->processed += sizeof(nl);
@@ -455,8 +455,8 @@ int unpack8(uint8_t * valp, Buf buffer)
}
/*
- * Given a pointer to memory (valp) and a size (size_val), convert
- * size_val to network byte order and store at buffer followed by
+ * Given a pointer to memory (valp) and a size (size_val), convert
+ * size_val to network byte order and store at buffer followed by
* the data at valp. Adjust buffer counters.
*/
void packmem(char *valp, uint32_t size_val, Buf buffer)
@@ -484,10 +484,10 @@ void packmem(char *valp, uint32_t size_val, Buf buffer)
/*
* Given a buffer containing a network byte order 16-bit integer,
- * and an arbitrary data string, return a pointer to the
- * data string in 'valp'. Also return the sizes of 'valp' in bytes.
+ * and an arbitrary data string, return a pointer to the
+ * data string in 'valp'. Also return the sizes of 'valp' in bytes.
* Adjust buffer counters.
- * NOTE: valp is set to point into the buffer bufp, a copy of
+ * NOTE: valp is set to point into the buffer bufp, a copy of
* the data is not made
*/
int unpackmem_ptr(char **valp, uint32_t * size_valp, Buf buffer)
@@ -508,7 +508,7 @@ int unpackmem_ptr(char **valp, uint32_t * size_valp, Buf buffer)
return SLURM_ERROR;
*valp = &buffer->head[buffer->processed];
buffer->processed += *size_valp;
- } else
+ } else
*valp = NULL;
return SLURM_SUCCESS;
}
@@ -516,10 +516,10 @@ int unpackmem_ptr(char **valp, uint32_t * size_valp, Buf buffer)
/*
* Given a buffer containing a network byte order 16-bit integer,
- * and an arbitrary data string, copy the data string into the location
- * specified by valp. Also return the sizes of 'valp' in bytes.
+ * and an arbitrary data string, copy the data string into the location
+ * specified by valp. Also return the sizes of 'valp' in bytes.
* Adjust buffer counters.
- * NOTE: The caller is responsible for the management of valp and
+ * NOTE: The caller is responsible for the management of valp and
* insuring it has sufficient size
*/
int unpackmem(char *valp, uint32_t * size_valp, Buf buffer)
@@ -540,17 +540,17 @@ int unpackmem(char *valp, uint32_t * size_valp, Buf buffer)
return SLURM_ERROR;
memcpy(valp, &buffer->head[buffer->processed], *size_valp);
buffer->processed += *size_valp;
- } else
+ } else
*valp = 0;
return SLURM_SUCCESS;
}
/*
* Given a buffer containing a network byte order 16-bit integer,
- * and an arbitrary data string, copy the data string into the location
- * specified by valp. Also return the sizes of 'valp' in bytes.
+ * and an arbitrary data string, copy the data string into the location
+ * specified by valp. Also return the sizes of 'valp' in bytes.
* Adjust buffer counters.
- * NOTE: valp is set to point into a newly created buffer,
+ * NOTE: valp is set to point into a newly created buffer,
* the caller is responsible for calling xfree() on *valp
* if non-NULL (set to NULL on zero size buffer value)
*/
@@ -581,10 +581,10 @@ int unpackmem_xmalloc(char **valp, uint32_t * size_valp, Buf buffer)
/*
* Given a buffer containing a network byte order 16-bit integer,
- * and an arbitrary data string, copy the data string into the location
- * specified by valp. Also return the sizes of 'valp' in bytes.
+ * and an arbitrary data string, copy the data string into the location
+ * specified by valp. Also return the sizes of 'valp' in bytes.
* Adjust buffer counters.
- * NOTE: valp is set to point into a newly created buffer,
+ * NOTE: valp is set to point into a newly created buffer,
* the caller is responsible for calling free() on *valp
* if non-NULL (set to NULL on zero size buffer value)
*/
@@ -613,9 +613,9 @@ int unpackmem_malloc(char **valp, uint32_t * size_valp, Buf buffer)
}
/*
- * Given a pointer to array of char * (char ** or char *[] ) and a size
- * (size_val), convert size_val to network byte order and store in the
- * buffer followed by the data at valp. Adjust buffer counters.
+ * Given a pointer to array of char * (char ** or char *[] ) and a size
+ * (size_val), convert size_val to network byte order and store in the
+ * buffer followed by the data at valp. Adjust buffer counters.
*/
void packstr_array(char **valp, uint32_t size_val, Buf buffer)
{
@@ -644,7 +644,7 @@ void packstr_array(char **valp, uint32_t size_val, Buf buffer)
* Given 'buffer' pointing to a network byte order 16-bit integer
* (size) and a array of strings store the number of strings in
* 'size_valp' and the array of strings in valp
- * NOTE: valp is set to point into a newly created buffer,
+ * NOTE: valp is set to point into a newly created buffer,
* the caller is responsible for calling xfree on *valp
* if non-NULL (set to NULL on zero size buffer value)
*/
@@ -678,7 +678,7 @@ int unpackstr_array(char ***valp, uint32_t * size_valp, Buf buffer)
/*
* Given a pointer to memory (valp), size (size_val), and buffer,
- * store the memory contents into the buffer
+ * store the memory contents into the buffer
*/
void packmem_array(char *valp, uint32_t size_val, Buf buffer)
{
@@ -697,7 +697,7 @@ void packmem_array(char *valp, uint32_t size_val, Buf buffer)
/*
* Given a pointer to memory (valp), size (size_val), and buffer,
- * store the buffer contents into memory
+ * store the buffer contents into memory
*/
int unpackmem_array(char *valp, uint32_t size_valp, Buf buffer)
{
diff --git a/src/common/pack.h b/src/common/pack.h
index 3b16d15adcdba1cc9b6c661e2cb6929f26fb8988..9636b2d1f32defea3bc65e131773ec0ab5cb9f6e 100644
--- a/src/common/pack.h
+++ b/src/common/pack.h
@@ -1,5 +1,5 @@
/****************************************************************************\
- * pack.h - definitions for lowest level un/pack functions. all functions
+ * pack.h - definitions for lowest level un/pack functions. all functions
* utilize a Buf structure. Call init_buf, un/pack, and free_buf
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Kevin Tew <tew1@llnl.gov>, Morris Jette <jette1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -208,7 +208,7 @@ int unpackmem_array(char *valp, uint32_t size_valp, Buf buffer);
assert(size_val == 0 || array != NULL); \
assert(buf->magic == BUF_MAGIC); \
pack32_array(array,size_val,buf); \
-} while (0)
+} while (0)
#define safe_unpack16_array(valp,size_valp,buf) do { \
assert(valp != NULL); \
@@ -276,7 +276,7 @@ int unpackmem_array(char *valp, uint32_t size_valp, Buf buffer);
packmem(_tmp_str,_size,buf); \
} else \
packmem(NULL,(uint32_t)0,buf); \
-} while (0)
+} while (0)
#define safe_packstr(str,max_len,buf) do { \
uint32_t _size; \
@@ -292,7 +292,7 @@ int unpackmem_array(char *valp, uint32_t size_valp, Buf buffer);
tmp_str[max_len - 1] = (char) NULL; \
packmem(tmp_str,max_len,buf); \
} \
-} while (0)
+} while (0)
#define packstr(str,buf) do { \
uint32_t _size = 0; \
@@ -302,7 +302,7 @@ int unpackmem_array(char *valp, uint32_t size_valp, Buf buffer);
assert(_size <= 0xffffffff); \
assert(buf->magic == BUF_MAGIC); \
packmem(str,(uint32_t)_size,buf); \
-} while (0)
+} while (0)
#define packnull(buf) do { \
assert(buf != NULL); \
@@ -321,7 +321,7 @@ int unpackmem_array(char *valp, uint32_t size_valp, Buf buffer);
} else \
packmem(NULL,(uint32_t)0,buf); \
} while (0)
-
+
#define pack_bit_str(bitmap,buf) do { \
assert(buf->magic == BUF_MAGIC); \
if (bitmap) { \
@@ -334,8 +334,8 @@ int unpackmem_array(char *valp, uint32_t size_valp, Buf buffer);
packmem(_tmp_str,_size,buf); \
} else \
pack32(NO_VAL, buf); \
-} while (0)
-
+} while (0)
+
#define unpack_bit_str(bitmap,buf) do { \
assert(bitmap != NULL); \
assert(*bitmap == NULL); \
@@ -352,7 +352,7 @@ int unpackmem_array(char *valp, uint32_t size_valp, Buf buffer);
} else \
*bitmap = NULL; \
} \
-} while (0)
+} while (0)
#define unpackstr_ptr \
unpackmem_ptr
@@ -374,7 +374,7 @@ int unpackmem_array(char *valp, uint32_t size_valp, Buf buffer);
assert(sizeof(*size_valp) == sizeof(uint32_t)); \
assert(buf->magic == BUF_MAGIC); \
packstr_array(array,size_val,buf); \
-} while (0)
+} while (0)
#define safe_unpackstr_array(valp,size_valp,buf) do { \
assert(valp != NULL); \
diff --git a/src/common/parse_config.c b/src/common/parse_config.c
index 9a36b137450e34069cca6029c859574efccee654..0649b6ea8f00093de5031089d20f0fd783f7c211 100644
--- a/src/common/parse_config.c
+++ b/src/common/parse_config.c
@@ -8,32 +8,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Christopher J. Morrone <morrone2@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -147,7 +147,7 @@ s_p_hashtbl_t *s_p_hashtbl_create(
len = CONF_HASH_LEN * sizeof(s_p_values_t *);
hashtbl = (s_p_hashtbl_t *)xmalloc(len);
memset(hashtbl, 0, len);
-
+
for (op = options; op->key != NULL; op++) {
value = xmalloc(sizeof(s_p_values_t));
value->key = xstrdup(op->key);
@@ -236,7 +236,7 @@ static int _keyvalue_regex(const char *line,
*value = NULL;
*remaining = (char *)line;
memset(pmatch, 0, sizeof(regmatch_t)*nmatch);
-
+
if (regexec(&keyvalue_re, line, nmatch, pmatch, 0)
== REG_NOMATCH) {
return -1;
@@ -369,7 +369,7 @@ static int _get_next_line(char *buf, int buf_size, FILE *file)
}
/* _strip_cr_nl(buf); */ /* not necessary */
_strip_escapes(buf);
-
+
return lines;
}
@@ -377,7 +377,7 @@ static int _handle_string(s_p_values_t *v,
const char *value, const char *line, char **leftover)
{
if (v->data_count != 0) {
- error("%s specified more than once, latest value used",
+ error("%s specified more than once, latest value used",
v->key);
xfree(v->data);
v->data_count = 0;
@@ -402,7 +402,7 @@ static int _handle_long(s_p_values_t *v,
const char *value, const char *line, char **leftover)
{
if (v->data_count != 0) {
- error("%s specified more than once, latest value used",
+ error("%s specified more than once, latest value used",
v->key);
xfree(v->data);
v->data_count = 0;
@@ -445,7 +445,7 @@ static int _handle_uint16(s_p_values_t *v,
const char *value, const char *line, char **leftover)
{
if (v->data_count != 0) {
- error("%s specified more than once, latest value used",
+ error("%s specified more than once, latest value used",
v->key);
xfree(v->data);
v->data_count = 0;
@@ -470,7 +470,7 @@ static int _handle_uint16(s_p_values_t *v,
|| strcasecmp(value, "INFINITE") == 0) {
num = (uint16_t) INFINITE;
} else {
- error("%s value \"%s\" is not a valid number",
+ error("%s value \"%s\" is not a valid number",
v->key, value);
return -1;
}
@@ -478,7 +478,7 @@ static int _handle_uint16(s_p_values_t *v,
error("%s value (%s) is out of range", v->key, value);
return -1;
} else if (value[0] == '-') {
- error("%s value (%s) is less than zero", v->key,
+ error("%s value (%s) is less than zero", v->key,
value);
return -1;
} else if (num > 0xffff) {
@@ -498,7 +498,7 @@ static int _handle_uint32(s_p_values_t *v,
const char *value, const char *line, char **leftover)
{
if (v->data_count != 0) {
- error("%s specified more than once, latest value used",
+ error("%s specified more than once, latest value used",
v->key);
xfree(v->data);
v->data_count = 0;
@@ -527,7 +527,7 @@ static int _handle_uint32(s_p_values_t *v,
(strcasecmp(value, "INFINITE") == 0)) {
num = (uint32_t) INFINITE;
} else {
- error("%s value (%s) is not a valid number",
+ error("%s value (%s) is not a valid number",
v->key, value);
return -1;
}
@@ -535,11 +535,11 @@ static int _handle_uint32(s_p_values_t *v,
error("%s value (%s) is out of range", v->key, value);
return -1;
} else if (value[0] == '-') {
- error("%s value (%s) is less than zero", v->key,
+ error("%s value (%s) is less than zero", v->key,
value);
return -1;
} else if (num > 0xffffffff) {
- error("%s value (%s) is greater than 4294967295",
+ error("%s value (%s) is greater than 4294967295",
v->key, value);
return -1;
}
@@ -552,7 +552,7 @@ static int _handle_uint32(s_p_values_t *v,
}
static int _handle_pointer(s_p_values_t *v,
- const char *value, const char *line,
+ const char *value, const char *line,
char **leftover)
{
if (v->handler != NULL) {
@@ -601,11 +601,11 @@ static int _handle_array(s_p_values_t *v,
}
static int _handle_boolean(s_p_values_t *v,
- const char *value, const char *line,
+ const char *value, const char *line,
char **leftover)
{
if (v->data_count != 0) {
- error("%s specified more than once, latest value used",
+ error("%s specified more than once, latest value used",
v->key);
xfree(v->data);
v->data_count = 0;
@@ -823,9 +823,9 @@ int s_p_parse_file(s_p_hashtbl_t *hashtbl, char *filename)
error("s_p_parse_file: No filename given.");
return SLURM_ERROR;
}
-
+
_keyvalue_regex_init();
-
+
f = fopen(filename, "r");
if (f == NULL) {
error("s_p_parse_file: unable to read \"%s\": %m",
@@ -1083,7 +1083,7 @@ int s_p_get_pointer(void **ptr, const char *key, const s_p_hashtbl_t *hashtbl)
* Returns 1 when a value was set for "key" during parsing and both
* "ptr_array" and "count" were successfully set, otherwise returns 0.
*/
-int s_p_get_array(void **ptr_array[], int *count,
+int s_p_get_array(void **ptr_array[], int *count,
const char *key, const s_p_hashtbl_t *hashtbl)
{
s_p_values_t *p;
diff --git a/src/common/parse_config.h b/src/common/parse_config.h
index 0f713603386d61ac571939e493d8338cde2f77b1..b9e8026d288d5b057f9807d1005d17bee5e5c61f 100644
--- a/src/common/parse_config.h
+++ b/src/common/parse_config.h
@@ -13,28 +13,28 @@
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -290,7 +290,7 @@ int s_p_get_pointer(void **ptr, const char *key, const s_p_hashtbl_t *hashtbl);
* Returns 1 when a value was set for "key" during parsing and "ptr"
* was successfully set, otherwise returns 0;
*/
-int s_p_get_array(void **ptr_array[], int *count,
+int s_p_get_array(void **ptr_array[], int *count,
const char *key, const s_p_hashtbl_t *hashtbl);
/*
diff --git a/src/common/parse_spec.c b/src/common/parse_spec.c
index 01c1dbbae6013993b75466f46d9024de07576ab6..d07abc120d18964b30c989f761cc09aa7ca91b10 100644
--- a/src/common/parse_spec.c
+++ b/src/common/parse_spec.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -66,20 +66,20 @@ static int _load_long (long *destination, char *keyword, char *in_line) ;
static int _load_integer (int *destination, char *keyword, char *in_line) ;
static int _load_float (float *destination, char *keyword, char *in_line) ;
-/*
+/*
* slurm_parser - parse the supplied specification into keyword/value pairs
- * only the keywords supplied will be searched for. The supplied
- * specification is altered, overwriting the keyword and value pairs
+ * only the keywords supplied will be searched for. The supplied
+ * specification is altered, overwriting the keyword and value pairs
* with spaces.
- * spec - pointer to the string of specifications, sets of three values
- * (as many sets as required): keyword, type, value
- * IN keyword - string with the keyword to search for including equal sign
+ * spec - pointer to the string of specifications, sets of three values
+ * (as many sets as required): keyword, type, value
+ * IN keyword - string with the keyword to search for including equal sign
* (e.g. "name=")
* IN type - char with value 'd'==int, 'f'==float, 's'==string, 'l'==long
* IN/OUT value - pointer to storage location for value (char **) for type 's'
* RET 0 if no error, otherwise errno code
* NOTE: terminate with a keyword value of "END"
- * NOTE: values of type (char *) are xfreed if non-NULL. caller must xfree any
+ * NOTE: values of type (char *) are xfreed if non-NULL. caller must xfree any
* returned value
*/
int
@@ -90,7 +90,7 @@ slurm_parser (char *spec, ...)
int error_code, *int_ptr, type;
long *long_ptr;
float *float_ptr;
-
+
error_code = 0;
va_start(ap, spec);
while (error_code == 0) {
@@ -125,17 +125,17 @@ slurm_parser (char *spec, ...)
/*
- * _load_float - parse a string for a keyword, value pair, and load the float
+ * _load_float - parse a string for a keyword, value pair, and load the float
* value
* IN keyword - string to search for
- * IN/OUT in_line - string to search for keyword, the keyword and value
+ * IN/OUT in_line - string to search for keyword, the keyword and value
* (if present) are overwritten by spaces
* OUT destination - set to value, no change if value not found
* RET 0 if no error, otherwise an error code
* NOTE: in_line is overwritten, do not use a constant
*/
-static int
-_load_float (float *destination, char *keyword, char *in_line)
+static int
+_load_float (float *destination, char *keyword, char *in_line)
{
char scratch[BUFFER_SIZE]; /* scratch area for parsing the input line */
char *str_ptr1, *str_ptr2, *str_ptr3;
@@ -146,7 +146,7 @@ _load_float (float *destination, char *keyword, char *in_line)
str_len1 = strlen (keyword);
strcpy (scratch, str_ptr1 + str_len1);
if ((scratch[0] < '0') && (scratch[0] > '9')) {
- error ("_load_float: bad value for keyword %s",
+ error ("_load_float: bad value for keyword %s",
keyword);
return EINVAL;
}
@@ -162,18 +162,18 @@ _load_float (float *destination, char *keyword, char *in_line)
/*
- * _load_integer - parse a string for a keyword, value pair, and load the
+ * _load_integer - parse a string for a keyword, value pair, and load the
* integer value
* OUT destination - location into which result is stored
- * set to 1 if keyword found without value,
+ * set to 1 if keyword found without value,
* set to -1 if keyword followed by "unlimited"
* IN keyword - string to search for
- * IN/OUT in_line - string to search for keyword, the keyword and value
+ * IN/OUT in_line - string to search for keyword, the keyword and value
* (if present) are overwritten by spaces
* RET 0 if no error, otherwise an error code
*/
-static int
-_load_integer (int *destination, char *keyword, char *in_line)
+static int
+_load_integer (int *destination, char *keyword, char *in_line)
{
char scratch[BUFFER_SIZE]; /* scratch area for parsing the input line */
char *str_ptr1, *str_ptr2, *str_ptr3;
@@ -183,22 +183,22 @@ _load_integer (int *destination, char *keyword, char *in_line)
if (str_ptr1 != NULL) {
str_len1 = strlen (keyword);
strcpy (scratch, str_ptr1 + str_len1);
- if ((scratch[0] == '\0') ||
+ if ((scratch[0] == '\0') ||
(isspace ((int) scratch[0]))) {
/* keyword with no value set */
*destination = 1;
str_len2 = 0;
}
else {
- str_ptr2 = (char *) strtok_r (scratch, SEPCHARS,
+ str_ptr2 = (char *) strtok_r (scratch, SEPCHARS,
&str_ptr3);
str_len2 = strlen (str_ptr2);
if (strcasecmp (str_ptr2, "UNLIMITED") == 0)
*destination = -1;
- else if ((str_ptr2[0] >= '0') &&
+ else if ((str_ptr2[0] >= '0') &&
(str_ptr2[0] <= '9')) {
- *destination = (int) strtol (scratch,
- (char **) NULL,
+ *destination = (int) strtol (scratch,
+ (char **) NULL,
10);
}
else {
@@ -217,20 +217,20 @@ _load_integer (int *destination, char *keyword, char *in_line)
/*
- * _load_long - parse a string for a keyword, value pair, and load the
+ * _load_long - parse a string for a keyword, value pair, and load the
* long value
- * IN/OUT destination - location into which result is stored, set to value,
- * no change if value not found,
- * set to 1 if keyword found without value,
+ * IN/OUT destination - location into which result is stored, set to value,
+ * no change if value not found,
+ * set to 1 if keyword found without value,
* set to -1 if keyword followed by "unlimited"
* IN keyword - string to search for
- * IN/OUR in_line - string to search for keyword, the keyword and value
+ * IN/OUR in_line - string to search for keyword, the keyword and value
* (if present) are overwritten by spaces
* RET 0 if no error, otherwise an error code
* NOTE: in_line is overwritten, do not use a constant
*/
-static int
-_load_long (long *destination, char *keyword, char *in_line)
+static int
+_load_long (long *destination, char *keyword, char *in_line)
{
char scratch[BUFFER_SIZE]; /* scratch area for parsing the input line */
char *str_ptr1, *str_ptr2, *str_ptr3;
@@ -240,22 +240,22 @@ _load_long (long *destination, char *keyword, char *in_line)
if (str_ptr1 != NULL) {
str_len1 = strlen (keyword);
strcpy (scratch, str_ptr1 + str_len1);
- if ((scratch[0] == '\0') ||
- (isspace ((int) scratch[0]))) {
+ if ((scratch[0] == '\0') ||
+ (isspace ((int) scratch[0]))) {
/* keyword with no value set */
*destination = 1;
str_len2 = 0;
}
else {
- str_ptr2 = (char *) strtok_r (scratch, SEPCHARS,
+ str_ptr2 = (char *) strtok_r (scratch, SEPCHARS,
&str_ptr3);
str_len2 = strlen (str_ptr2);
if (strcasecmp (str_ptr2, "UNLIMITED") == 0)
*destination = -1L;
- else if ((str_ptr2[0] == '-') ||
- ((str_ptr2[0] >= '0') &&
+ else if ((str_ptr2[0] == '-') ||
+ ((str_ptr2[0] >= '0') &&
(str_ptr2[0] <= '9'))) {
- *destination = strtol (scratch,
+ *destination = strtol (scratch,
(char **) NULL, 10);
}
else {
@@ -274,21 +274,21 @@ _load_long (long *destination, char *keyword, char *in_line)
/*
- * load_string - parse a string for a keyword, value pair, and load the
+ * load_string - parse a string for a keyword, value pair, and load the
* char value
- * IN/OUT destination - location into which result is stored, set to value,
- * no change if value not found, if destination had previous value,
+ * IN/OUT destination - location into which result is stored, set to value,
+ * no change if value not found, if destination had previous value,
* that memory location is automatically freed
* IN keyword - string to search for
- * IN/OUT in_line - string to search for keyword, the keyword and value
+ * IN/OUT in_line - string to search for keyword, the keyword and value
* (if present) are overwritten by spaces
* RET 0 if no error, otherwise an error code
* NOTE: destination must be free when no longer required
- * NOTE: if destination is non-NULL at function call time, it will be freed
+ * NOTE: if destination is non-NULL at function call time, it will be freed
* NOTE: in_line is overwritten, do not use a constant
*/
-int
-load_string (char **destination, char *keyword, char *in_line)
+int
+load_string (char **destination, char *keyword, char *in_line)
{
char scratch[BUFFER_SIZE];/* scratch area for parsing the input line */
char *str_ptr1, *str_ptr2, *str_ptr3;
@@ -307,7 +307,7 @@ load_string (char **destination, char *keyword, char *in_line)
str_ptr2 = strtok_r (scratch, SEPCHARS, &str_ptr3);
if ((str_ptr2 == NULL) ||
((str_len2 = strlen (str_ptr2))== 0)){
- info ("load_string : keyword %s lacks value",
+ info ("load_string : keyword %s lacks value",
keyword);
return EINVAL;
}
diff --git a/src/common/parse_spec.h b/src/common/parse_spec.h
index c8f5009f7b7956c2d2df0c0c8b3745c4a214b7ef..6db55110f48dfeb855ea264738ea29fe8738f24f 100644
--- a/src/common/parse_spec.h
+++ b/src/common/parse_spec.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -52,36 +52,36 @@
# include <inttypes.h>
#endif /* HAVE_CONFIG_H */
-/*
+/*
* slurm_parser - parse the supplied specification into keyword/value pairs
- * only the keywords supplied will be searched for. the supplied
- * specification is altered, overwriting the keyword and value pairs
+ * only the keywords supplied will be searched for. the supplied
+ * specification is altered, overwriting the keyword and value pairs
* with spaces.
- * spec - pointer to the string of specifications, sets of three values
- * (as many sets as required): keyword, type, value
- * IN keyword - string with the keyword to search for including equal sign
+ * spec - pointer to the string of specifications, sets of three values
+ * (as many sets as required): keyword, type, value
+ * IN keyword - string with the keyword to search for including equal sign
* (e.g. "name=")
* IN type - char with value 'd'==int, 'f'==float, 's'==string, 'l'==long
* IN/OUT value - pointer to storage location for value (char **) for type 's'
* RET 0 if no error, otherwise errno code
* NOTE: terminate with a keyword value of "END"
- * NOTE: values of type (char *) are xfreed if non-NULL. caller must xfree any
+ * NOTE: values of type (char *) are xfreed if non-NULL. caller must xfree any
* returned value
*/
extern int slurm_parser (char *spec, ...) ;
/*
- * load_string - parse a string for a keyword, value pair, and load the
+ * load_string - parse a string for a keyword, value pair, and load the
* char value
- * IN/OUT destination - location into which result is stored, set to value,
- * no change if value not found, if destination had previous value,
+ * IN/OUT destination - location into which result is stored, set to value,
+ * no change if value not found, if destination had previous value,
* that memory location is automatically freed
* IN keyword - string to search for
- * IN/OUT in_line - string to search for keyword, the keyword and value
+ * IN/OUT in_line - string to search for keyword, the keyword and value
* (if present) are overwritten by spaces
* RET 0 if no error, otherwise an error code
* NOTE: destination must be free when no longer required
- * NOTE: if destination is non-NULL at function call time, it will be freed
+ * NOTE: if destination is non-NULL at function call time, it will be freed
* NOTE: in_line is overwritten, do not use a constant
*/
extern int load_string (char **destination, char *keyword, char *in_line) ;
diff --git a/src/common/parse_time.c b/src/common/parse_time.c
index 96e99cbc34bd50ce4f02a48c1c08674f5eb5c90a..9033550b2b046e82044089b13b698b67152ca1c6 100644
--- a/src/common/parse_time.c
+++ b/src/common/parse_time.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -118,7 +118,7 @@ static int _get_delta(char *time_str, int *pos, long *delta)
* hour, minute, second (out): numberic values
* RET: -1 on error, 0 otherwise
*/
-static int
+static int
_get_time(char *time_str, int *pos, int *hour, int *minute, int * second)
{
int hr, min, sec;
@@ -229,9 +229,9 @@ static int _get_date(char *time_str, int *pos, int *month, int *mday, int *year)
if ((time_str[offset] < '0') || (time_str[offset] > '9'))
goto prob;
yr = (yr * 10) + time_str[offset++] - '0';
-
+
offset++; // for the -
-
+
/* get month */
mon = time_str[offset++] - '0';
if ((time_str[offset] >= '0') && (time_str[offset] <= '9'))
@@ -240,9 +240,9 @@ static int _get_date(char *time_str, int *pos, int *month, int *mday, int *year)
offset -= 2;
goto prob;
}
-
+
offset++; // for the -
-
+
/* get day */
if ((time_str[offset] < '0') || (time_str[offset] > '9'))
goto prob;
@@ -253,7 +253,7 @@ static int _get_date(char *time_str, int *pos, int *month, int *mday, int *year)
offset -= 2;
goto prob;
}
-
+
*pos = offset - 1;
*month = mon - 1; /* zero origin */
*mday = day;
@@ -261,7 +261,7 @@ static int _get_date(char *time_str, int *pos, int *month, int *mday, int *year)
happy 1900 == "00" */
return 0;
}
-
+
/* get month */
mon = time_str[offset++] - '0';
if ((time_str[offset] >= '0') && (time_str[offset] <= '9'))
@@ -317,7 +317,7 @@ static int _get_date(char *time_str, int *pos, int *month, int *mday, int *year)
* YYYY-MM-DD[THH:MM[:SS]]
*
* now + count [minutes | hours | days | weeks]
- *
+ *
* Invalid input results in message to stderr and return value of zero
* NOTE: not thread safe
* NOTE: by default this will look into the future for the next time.
@@ -334,7 +334,7 @@ extern time_t parse_time(char *time_str, int past)
time_now_tm = localtime(&time_now);
for (pos=0; ((time_str[pos] != '\0')&&(time_str[pos] != '\n')); pos++) {
- if (isblank(time_str[pos]) || (time_str[pos] == '-')
+ if (isblank(time_str[pos]) || (time_str[pos] == '-')
|| (time_str[pos] == 'T'))
continue;
if (strncasecmp(time_str+pos, "today", 5) == 0) {
@@ -381,14 +381,14 @@ extern time_t parse_time(char *time_str, int past)
struct tm *later_tm;
for (i=(pos+3); ; i++) {
if (time_str[i] == '+') {
- pos += i;
+ pos += i;
if (_get_delta(time_str, &pos, &delta))
goto prob;
break;
}
if (isblank(time_str[i]))
continue;
- if ((time_str[i] == '\0')
+ if ((time_str[i] == '\0')
|| (time_str[i] == '\n')) {
pos += (i-1);
break;
@@ -416,7 +416,7 @@ extern time_t parse_time(char *time_str, int past)
goto prob;
continue;
}
-
+
if (_get_date(time_str, &pos, &month, &mday, &year))
goto prob;
}
@@ -429,10 +429,10 @@ extern time_t parse_time(char *time_str, int past)
hour = 0;
minute = 0;
}
- else if ((hour != -1) && (month == -1)) {
+ else if ((hour != -1) && (month == -1)) {
/* time, no date implies soonest day */
if (past || (hour > time_now_tm->tm_hour)
- || ((hour == time_now_tm->tm_hour)
+ || ((hour == time_now_tm->tm_hour)
&& (minute > time_now_tm->tm_min))) {
/* today */
month = time_now_tm->tm_mon;
@@ -456,14 +456,14 @@ extern time_t parse_time(char *time_str, int past)
year = time_now_tm->tm_year;
}
} else if ((month > time_now_tm->tm_mon)
- || ((month == time_now_tm->tm_mon)
+ || ((month == time_now_tm->tm_mon)
&& (mday > time_now_tm->tm_mday))
- || ((month == time_now_tm->tm_mon)
+ || ((month == time_now_tm->tm_mon)
&& (mday == time_now_tm->tm_mday)
- && (hour > time_now_tm->tm_hour))
- || ((month == time_now_tm->tm_mon)
+ && (hour > time_now_tm->tm_hour))
+ || ((month == time_now_tm->tm_mon)
&& (mday == time_now_tm->tm_mday)
- && (hour == time_now_tm->tm_hour)
+ && (hour == time_now_tm->tm_hour)
&& (minute > time_now_tm->tm_min))) {
/* this year */
year = time_now_tm->tm_year;
@@ -515,7 +515,7 @@ int main(int argc, char *argv[])
*
* IN time - a time stamp
* OUT string - pointer user defined buffer
- * IN size - length of string buffer, we recommend a size of 32 bytes to
+ * IN size - length of string buffer, we recommend a size of 32 bytes to
* easily support different site-specific formats
*/
extern void
@@ -533,8 +533,8 @@ slurm_make_time_str (time_t *time, char *string, int size)
* schedulers management of SLURM. */
snprintf(string, size,
"%4.4u-%2.2u-%2.2uT%2.2u:%2.2u:%2.2u",
- (time_tm.tm_year + 1900), (time_tm.tm_mon+1),
- time_tm.tm_mday, time_tm.tm_hour, time_tm.tm_min,
+ (time_tm.tm_year + 1900), (time_tm.tm_mon+1),
+ time_tm.tm_mday, time_tm.tm_hour, time_tm.tm_min,
time_tm.tm_sec);
#else
/* Format MM/DD-HH:MM:SS */
@@ -636,7 +636,7 @@ extern void secs2time_str(time_t time, char *string, int size)
days, hours, minutes, seconds);
else
snprintf(string, size,
- "%2.2ld:%2.2ld:%2.2ld",
+ "%2.2ld:%2.2ld:%2.2ld",
hours, minutes, seconds);
}
}
@@ -658,7 +658,7 @@ extern void mins2time_str(uint32_t time, char *string, int size)
days, hours, minutes, seconds);
else
snprintf(string, size,
- "%2.2ld:%2.2ld:%2.2ld",
+ "%2.2ld:%2.2ld:%2.2ld",
hours, minutes, seconds);
}
}
diff --git a/src/common/parse_time.h b/src/common/parse_time.h
index c2af20d3e45859b7b4aa922eb0d6baff8b61a470..cd31d81e13a2c4f1f894d9067a7d3e3a3e0815a3 100644
--- a/src/common/parse_time.h
+++ b/src/common/parse_time.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -77,7 +77,7 @@ extern time_t parse_time(char *time_str, int past);
* IN size - length of string buffer, we recommend a size of 32 bytes to
* easily support different site-specific formats
*/
-extern void slurm_make_time_str (time_t *time, char *string, int size);
+extern void slurm_make_time_str (time_t *time, char *string, int size);
/* Convert a string to an equivalent time value
* input formats:
@@ -91,8 +91,8 @@ extern void slurm_make_time_str (time_t *time, char *string, int size);
*/
extern int time_str2mins(char *string);
-/* Convert a time value into a string that can be converted back by
- * time_str2mins.
+/* Convert a time value into a string that can be converted back by
+ * time_str2mins.
* fill in string with HH:MM:SS or D-HH:MM:SS
*/
extern void secs2time_str(time_t time, char *string, int size);
diff --git a/src/common/plugin.c b/src/common/plugin.c
index 9a0d6ff2b2b21d0fb5d67ee1e98bf6d34215500f..49321008bbd060e11751dc44299969f214d3f7f7 100644
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jay Windley <jwindley@lnxi.com>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -108,7 +108,7 @@ plugin_peek( const char *fq_path,
plugin_handle_t plug;
char *type;
uint32_t *version;
-
+
plug = dlopen( fq_path, RTLD_LAZY );
if ( plug == NULL ) {
debug3( "plugin_peek: dlopen(%s): %s", fq_path, _dlerror() );
@@ -118,13 +118,13 @@ plugin_peek( const char *fq_path,
if ( plugin_type != NULL ) {
strncpy( plugin_type, type, type_len );
}
- } else {
+ } else {
dlclose( plug );
/* could be vestigial library, don't treat as an error */
verbose( "%s: not a SLURM plugin", fq_path );
return SLURM_ERROR;
}
-
+
if ( ( version = (uint32_t *) dlsym( plug, PLUGIN_VERSION ) ) != NULL ) {
if ( plugin_version != NULL ) {
*plugin_version = *version;
@@ -161,9 +161,9 @@ plugin_load_from_file(plugin_handle_t *p, const char *fq_path)
/*
* Try to open the shared object.
*
- * Use RTLD_LAZY to allow plugins to use symbols that may be
+ * Use RTLD_LAZY to allow plugins to use symbols that may be
* defined in only one slurm entity (e.g. srun and not slurmd),
- * when the use of that symbol is restricted to within the
+ * when the use of that symbol is restricted to within the
* entity from which it is available. (i.e. srun symbols are only
* used in the context of srun, not slurmd.)
*
@@ -208,7 +208,7 @@ plugin_load_and_link(const char *type_name, int n_syms,
char *head=NULL, *dir_array=NULL, *so_name = NULL,
*file_name=NULL;
int i=0;
-
+
if (!type_name)
return plug;
@@ -224,16 +224,16 @@ plugin_load_and_link(const char *type_name, int n_syms,
xfree(so_name);
return plug;
}
-
+
head = dir_array;
for (i=0; ; i++) {
bool got_colon = 0;
if (dir_array[i] == ':') {
dir_array[i] = '\0';
got_colon = 1;
- } else if(dir_array[i] != '\0')
+ } else if(dir_array[i] != '\0')
continue;
-
+
file_name = xstrdup_printf("%s/%s", head, so_name);
debug3("Trying to load plugin %s", file_name);
if ((stat(file_name, &st) < 0) || (!S_ISREG(st.st_mode))) {
@@ -243,20 +243,20 @@ plugin_load_and_link(const char *type_name, int n_syms,
} else {
plugin_load_from_file(&plug, file_name);
xfree(file_name);
- if (plugin_get_syms(plug, n_syms, names, ptrs) >=
+ if (plugin_get_syms(plug, n_syms, names, ptrs) >=
n_syms) {
debug3("Success.");
break;
- } else
+ } else
plug = PLUGIN_INVALID_HANDLE;
}
if (got_colon) {
head = dir_array + i + 1;
- } else
+ } else
break;
}
-
+
xfree(dir_array);
xfree(so_name);
return plug;
@@ -271,7 +271,7 @@ void
plugin_unload( plugin_handle_t plug )
{
void (*fini)(void);
-
+
if ( plug != PLUGIN_INVALID_HANDLE ) {
if ( ( fini = dlsym( plug, "fini" ) ) != NULL ) {
(*fini)();
@@ -313,7 +313,7 @@ plugin_get_version( plugin_handle_t plug )
{
uint32_t *ptr;
- if ( plug == PLUGIN_INVALID_HANDLE ) return 0;
+ if ( plug == PLUGIN_INVALID_HANDLE ) return 0;
ptr = (uint32_t *) dlsym( plug, PLUGIN_VERSION );
return ptr ? *ptr : 0;
}
@@ -329,9 +329,9 @@ plugin_get_syms( plugin_handle_t plug,
count = 0;
for ( i = 0; i < n_syms; ++i ) {
ptrs[ i ] = dlsym( plug, names[ i ] );
- if ( ptrs[ i ] )
+ if ( ptrs[ i ] )
++count;
- else
+ else
debug3("Couldn't find sym '%s' in the plugin",
names[ i ]);
}
diff --git a/src/common/plugin.h b/src/common/plugin.h
index 1e5c3fbc8e601bf47db5ba5157d114796b7463c1..06f6d44f367a4d3fb1f90216a5f1b24f9a9e9a61 100644
--- a/src/common/plugin.h
+++ b/src/common/plugin.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jay Windlay <jwindley@lnxi.com>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/common/plugrack.c b/src/common/plugrack.c
index 9df07b15580a8a06a47c069d050ebded9eb1a4e0..b7543ce04b9f32c1da704f26398feaee19d38ca0 100644
--- a/src/common/plugrack.c
+++ b/src/common/plugrack.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jay Windley <jwindley@lnxi.com>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -144,7 +144,7 @@ static void
plugrack_entry_destructor( void *v )
{
plugrack_entry_t *victim = v;
-
+
if ( victim == NULL ) return;
/*
@@ -155,7 +155,7 @@ plugrack_entry_destructor( void *v )
xassert( victim->refcount == 0 );
xfree( victim->full_type );
xfree( victim->fq_path );
- if ( victim->plug != PLUGIN_INVALID_HANDLE )
+ if ( victim->plug != PLUGIN_INVALID_HANDLE )
plugin_unload( victim->plug );
xfree( victim );
}
@@ -181,12 +181,12 @@ accept_path_paranoia( plugrack_t rack,
/* Internal function, so assert rather than fail gracefully. */
xassert( rack );
xassert( fq_path );
-
+
if ( stat( fq_path, &st ) < 0 ) {
debug3( "accept_path_paranoia: stat(%s) failed", fq_path );
return 0;
}
-
+
/* Is path owned by authorized user? */
if ( check_own ) {
if ( st.st_uid != rack->uid ) {
@@ -198,9 +198,9 @@ accept_path_paranoia( plugrack_t rack,
/* Is path writable by others? */
if ( check_write ) {
- if ( ( st.st_mode & S_IWGRP )
+ if ( ( st.st_mode & S_IWGRP )
|| ( st.st_mode & S_IWOTH ) ) {
- debug3( "accept_path_paranoia: %s writable by others",
+ debug3( "accept_path_paranoia: %s writable by others",
fq_path );
return 0;
}
@@ -231,7 +231,7 @@ plugrack_destroy( plugrack_t rack )
{
ListIterator it;
plugrack_entry_t *e;
-
+
if ( ! rack ) return SLURM_ERROR;
/*
@@ -276,7 +276,7 @@ plugrack_set_major_type( plugrack_t rack, const char *type )
return SLURM_ERROR;
}
}
-
+
return SLURM_SUCCESS;
}
@@ -304,7 +304,7 @@ plugrack_add_plugin_path( plugrack_t rack,
const char *fq_path )
{
plugrack_entry_t *e;
-
+
if ( ! rack ) return SLURM_ERROR;
if ( ! fq_path ) return SLURM_ERROR;
@@ -319,7 +319,7 @@ plugrack_add_plugin_path( plugrack_t rack,
return SLURM_SUCCESS;
}
-
+
/* test for the plugin in the various colon separated directories */
int
plugrack_read_dir( plugrack_t rack, const char *dir )
@@ -381,18 +381,18 @@ _plugrack_read_single_dir( plugrack_t rack, char *dir )
tail = &fq_path[ strlen( dir ) ];
*tail = '/';
++tail;
-
+
/* Check whether we should be paranoid about this directory. */
if ( ! accept_path_paranoia( rack,
dir,
- rack->paranoia &
+ rack->paranoia &
PLUGRACK_PARANOIA_DIR_OWN,
- rack->paranoia &
+ rack->paranoia &
PLUGRACK_PARANOIA_DIR_WRITABLE ) ) {
xfree( fq_path );
return SLURM_ERROR;
}
-
+
/* Open the directory. */
dirp = opendir( dir );
if ( dirp == NULL ) {
@@ -400,20 +400,20 @@ _plugrack_read_single_dir( plugrack_t rack, char *dir )
xfree( fq_path );
return SLURM_ERROR;
}
-
+
while ( 1 ) {
e = readdir( dirp );
if ( e == NULL )
break;
/*
- * Compose file name. Where NAME_MAX is defined it represents
+ * Compose file name. Where NAME_MAX is defined it represents
* the largest file name given in a dirent. This macro is used
- * in the allocation of "tail" above, so this unbounded copy
+ * in the allocation of "tail" above, so this unbounded copy
* should work.
*/
strcpy( tail, e->d_name );
-
+
/* Check only regular files. */
if ( (strncmp(e->d_name, ".", 1) == 0)
|| (stat( fq_path, &st ) < 0)
@@ -425,25 +425,25 @@ _plugrack_read_single_dir( plugrack_t rack, char *dir )
continue;
/* file's prefix must match specified major_type
- * to avoid having some program try to open a
- * plugin designed for a different program and
+ * to avoid having some program try to open a
+ * plugin designed for a different program and
* discovering undefined symbols */
- if ((rack->major_type) &&
- (!_match_major(e->d_name, rack->major_type)))
+ if ((rack->major_type) &&
+ (!_match_major(e->d_name, rack->major_type)))
continue;
-
+
/* See if we should be paranoid about this file. */
if (!accept_path_paranoia( rack,
fq_path,
- rack->paranoia &
+ rack->paranoia &
PLUGRACK_PARANOIA_FILE_OWN,
- rack->paranoia &
+ rack->paranoia &
PLUGRACK_PARANOIA_FILE_WRITABLE )) {
debug3( "plugin_read_dir: skipping %s for security "
"reasons", fq_path );
continue;
}
-
+
/* Test the type. */
if ( plugin_peek( fq_path,
plugin_type,
@@ -451,14 +451,14 @@ _plugrack_read_single_dir( plugrack_t rack, char *dir )
NULL ) == SLURM_ERROR ) {
continue;
}
-
- if ( rack->major_type
+
+ if ( rack->major_type
&& ( strncmp( rack->major_type,
plugin_type,
strlen( rack->major_type ) ) != 0 ) ) {
continue;
}
-
+
/* Add it to the list. */
(void) plugrack_add_plugin_path( rack, plugin_type, fq_path );
}
@@ -469,25 +469,25 @@ _plugrack_read_single_dir( plugrack_t rack, char *dir )
return SLURM_SUCCESS;
}
-/* Return TRUE if the specified pathname is recognized as that of a shared
+/* Return TRUE if the specified pathname is recognized as that of a shared
* object (i.e. containing ".so\0") */
static bool
_so_file ( char *file_name )
{
int i;
- if (file_name == NULL)
+ if (file_name == NULL)
return false;
for (i=0; file_name[i] ;i++) {
- if ( (file_name[i] == '.') && (file_name[i+1] == 's') &&
+ if ( (file_name[i] == '.') && (file_name[i+1] == 's') &&
(file_name[i+2] == 'o') && (file_name[i+3] == '\0') )
return true;
}
return false;
}
-/* Return TRUE of the specified major_type is a prefix of the shared object
+/* Return TRUE of the specified major_type is a prefix of the shared object
* pathname (i.e. either "<major_name>..." or "lib<major_name>...") */
static bool
_match_major ( const char *path_name, const char *major_type )
@@ -510,7 +510,7 @@ plugrack_read_cache( plugrack_t rack,
const char *cache_file )
{
/* Don't care for now. */
-
+
return SLURM_ERROR;
}
@@ -520,7 +520,7 @@ plugrack_purge_idle( plugrack_t rack )
{
ListIterator it;
plugrack_entry_t *e;
-
+
if ( ! rack ) return SLURM_ERROR;
it = list_iterator_create( rack->entries );
@@ -562,7 +562,7 @@ plugrack_write_cache( plugrack_t rack,
const char *cache )
{
/* Not implemented. */
-
+
return SLURM_SUCCESS;
}
@@ -572,28 +572,28 @@ plugrack_use_by_type( plugrack_t rack,
{
ListIterator it;
plugrack_entry_t *e;
-
+
if (!rack)
return PLUGIN_INVALID_HANDLE;
if (!full_type)
return PLUGIN_INVALID_HANDLE;
-
+
it = list_iterator_create(rack->entries);
while ((e = list_next(it))) {
plugin_err_t err;
if (strcmp(full_type, e->full_type) != 0)
continue;
-
+
/* See if plugin is loaded. */
if (e->plug == PLUGIN_INVALID_HANDLE &&
(err = plugin_load_from_file(&e->plug, e->fq_path)))
error ("%s: %s\n", e->fq_path, plugin_strerror (err));
-
+
/* If load was successful, increment the reference count. */
if (e->plug != PLUGIN_INVALID_HANDLE)
e->refcount++;
-
+
/*
* Return the plugin, even if it failed to load -- this serves
* as an error return value.
@@ -601,7 +601,7 @@ plugrack_use_by_type( plugrack_t rack,
list_iterator_destroy(it);
return e->plug;
}
-
+
/* Couldn't find a suitable plugin. */
list_iterator_destroy(it);
return PLUGIN_INVALID_HANDLE;
diff --git a/src/common/plugrack.h b/src/common/plugrack.h
index 2fd3a850263e878a431e19614e0f2c38e19b4896..285bca14e306cb44a39c34721868f910025aff61 100644
--- a/src/common/plugrack.h
+++ b/src/common/plugrack.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jay Windley <jwindley@lnxi.com>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/common/plugstack.c b/src/common/plugstack.c
index 549d73e1742b08f721e9ab3051547cfadd7fb889..aad5bfd3eefd2a75f72e6909678657bf8f5dd18d 100644
--- a/src/common/plugstack.c
+++ b/src/common/plugstack.c
@@ -15,15 +15,15 @@
* 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
+ * 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
+ * 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
+ * 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
@@ -104,7 +104,7 @@ struct spank_plugin {
};
/*
- * SPANK Plugin options
+ * SPANK Plugin options
*/
#define SPANK_OPTION_ENV_PREFIX "_SLURM_SPANK_OPTION_"
@@ -236,7 +236,7 @@ _plugin_stack_parse_line(char *line, char **plugin, int *acp, char ***argv,
if (!(option = strtok_r(line, separators, &sp)))
return (0);
- if (((*type) = _plugin_stack_line_type(option)) == CF_ERROR)
+ if (((*type) = _plugin_stack_line_type(option)) == CF_ERROR)
return (-1);
if (!(path = strtok_r(NULL, separators, &sp)))
@@ -317,7 +317,7 @@ void _spank_plugin_destroy(struct spank_plugin *sp)
static char *
_spank_plugin_find (const char *path, const char *file)
{
- char dir [4096];
+ char dir [4096];
char *p, *entry;
int pathlen = strlen (path);
@@ -388,11 +388,11 @@ _spank_stack_process_line(const char *file, int line, char *buf, List *stackp)
required = (type == CF_REQUIRED);
if (!(p = _spank_plugin_create(path, ac, argv, required))) {
if (required)
- error ("spank: %s:%d:"
+ error ("spank: %s:%d:"
" Failed to load plugin %s. Aborting.",
file, line, path);
else
- verbose ("spank: %s:%d:"
+ verbose ("spank: %s:%d:"
"Failed to load optional plugin %s. Ignored.",
file, line, path);
return (required ? -1 : 0);
@@ -400,7 +400,7 @@ _spank_stack_process_line(const char *file, int line, char *buf, List *stackp)
if (*stackp == NULL)
*stackp = list_create((ListDelF) _spank_plugin_destroy);
- verbose ("spank: %s:%d: Loaded plugin %s",
+ verbose ("spank: %s:%d: Loaded plugin %s",
file, line, xbasename (p->fq_path));
list_append (*stackp, p);
@@ -459,7 +459,7 @@ _spank_conf_include (const char *file, int lineno, const char *pattern,
return (SLURM_ERROR);
}
- if (pattern[0] != '/') {
+ if (pattern[0] != '/') {
char *dirc = xstrdup (file);
char *dname = dirname (dirc);
@@ -471,13 +471,13 @@ _spank_conf_include (const char *file, int lineno, const char *pattern,
}
verbose ("%s: %d: include \"%s\"", file, lineno, pattern);
-
+
rc = glob (pattern, 0, NULL, &gl);
switch (rc) {
case 0:
for (i = 0; i < gl.gl_pathc; i++) {
rc = _spank_stack_create (gl.gl_pathv[i], stackp);
- if (rc < 0)
+ if (rc < 0)
break;
}
break;
@@ -588,7 +588,7 @@ static int _do_call_stack(step_fn_t type, void * job, int taskid)
break;
case LOCAL_USER_INIT:
if (sp->ops.local_user_init) {
- rc = (*sp->ops.local_user_init) (spank, sp->ac,
+ rc = (*sp->ops.local_user_init) (spank, sp->ac,
sp->argv);
debug2("spank: %s: %s = %d\n", name,
fn_name, rc);
@@ -876,16 +876,16 @@ _spank_option_register(struct spank_plugin *p, struct spank_option *opt)
list_create((ListDelF) _spank_plugin_opt_destroy);
}
- spopt = list_find_first(option_cache,
+ spopt = list_find_first(option_cache,
(ListFindF) _opt_by_name, opt->name);
if (spopt) {
struct spank_plugin *q = spopt->plugin;
- info("spank: option \"%s\" provided by both %s and %s",
- opt->name, xbasename(p->fq_path),
+ info("spank: option \"%s\" provided by both %s and %s",
+ opt->name, xbasename(p->fq_path),
xbasename(q->fq_path));
/*
* Disable this option, but still cache it, in case
- * options are loaded in a different order on the
+ * options are loaded in a different order on the
* remote side.
*/
disabled = 1;
@@ -942,11 +942,11 @@ static int _add_one_option(struct option **optz, struct spank_plugin_opt *spopt)
if (optz_add(optz, &opt) < 0) {
if (errno == EEXIST) {
error ("Ingoring conflicting option \"%s\" "
- "in plugin \"%s\"",
+ "in plugin \"%s\"",
opt.name, spopt->plugin->name);
} else {
error("Unable to add option \"%s\" "
- "from plugin \"%s\"",
+ "from plugin \"%s\"",
opt.name, spopt->plugin->name);
}
@@ -1015,7 +1015,7 @@ int spank_process_option(int optval, const char *arg)
return (rc);
/*
- * Set optarg and "found" so that option will be forwarded
+ * Set optarg and "found" so that option will be forwarded
* to remote side.
*/
if (opt->opt->has_arg)
@@ -1025,13 +1025,13 @@ int spank_process_option(int optval, const char *arg)
return (0);
}
-static char *
+static char *
_find_word_boundary(char *str, char *from, char **next)
{
char *p = from;
- /*
- * Back up past any non-whitespace if we are pointing in
+ /*
+ * Back up past any non-whitespace if we are pointing in
* the middle of a word.
*/
while ((p != str) && !isspace (*p))
@@ -1056,7 +1056,7 @@ _find_word_boundary(char *str, char *from, char **next)
return (p+1);
}
-static char *
+static char *
_get_next_segment (char **from, int width, char *buf, int bufsiz)
{
int len;
@@ -1072,7 +1072,7 @@ _get_next_segment (char **from, int width, char *buf, int bufsiz)
}
if (!(p = _find_word_boundary (seg, *from + width, from))) {
- /*
+ /*
* Need to break up a word. Use user-supplied buffer.
*/
strlcpy (buf, seg, width+1);
@@ -1090,7 +1090,7 @@ _get_next_segment (char **from, int width, char *buf, int bufsiz)
return (seg);
}
-static int
+static int
_term_columns ()
{
char *val;
@@ -1136,7 +1136,7 @@ _spank_opt_print(struct spank_option *opt, FILE * fp, int left_pad, int width)
snprintf(p, len + 1, "%s", trunc);
}
-
+
q = buf;
strlcpy (buf, opt->usage, sizeof (buf));
@@ -1149,7 +1149,7 @@ _spank_opt_print(struct spank_option *opt, FILE * fp, int left_pad, int width)
/* Get remaining line-wrapped lines.
*/
- while ((p = _get_next_segment (&q, descrsiz, seg, sizeof (seg))))
+ while ((p = _get_next_segment (&q, descrsiz, seg, sizeof (seg))))
fprintf(fp, "%*s%s\n", width, "", p);
return;
@@ -1383,7 +1383,7 @@ int spank_get_remote_options(job_options_t opts)
return (0);
}
-/*
+/*
* Return a task info structure corresponding to pid.
*/
static slurmd_task_info_t * job_task_info_by_pid (slurmd_job_t *job, pid_t pid)
@@ -1419,7 +1419,7 @@ global_to_local_id (slurmd_job_t *job, uint32_t gid, uint32_t *p2uint32)
}
return (ESPANK_NOEXIST);
}
-
+
/*
* Return 1 if spank_item_t is valid for S_TYPE_LOCAL
@@ -1428,7 +1428,7 @@ static int _valid_in_local_context (spank_item_t item)
{
int rc = 0;
switch (item) {
- case S_JOB_UID:
+ case S_JOB_UID:
case S_JOB_GID:
case S_JOB_ID:
case S_JOB_STEPID:
@@ -1585,7 +1585,7 @@ spank_err_t spank_get_item(spank_t spank, spank_item_t item, ...)
slurmd_task_info_t *task;
slurmd_job_t *slurmd_job = NULL;
struct spank_launcher_job_info *launcher_job = NULL;
- va_list vargs;
+ va_list vargs;
spank_err_t rc = ESPANK_SUCCESS;
if ((spank == NULL) || (spank->magic != SPANK_MAGIC))
@@ -1743,7 +1743,7 @@ spank_err_t spank_get_item(spank_t spank, spank_item_t item, ...)
rc = ESPANK_NOT_EXECD;
else if (!(task = job_task_info_by_pid (slurmd_job, pid)))
rc = ESPANK_NOEXIST;
- else
+ else
*p2uint32 = task->gtid;
break;
case S_JOB_PID_TO_LOCAL_ID:
@@ -1755,7 +1755,7 @@ spank_err_t spank_get_item(spank_t spank, spank_item_t item, ...)
rc = ESPANK_NOT_EXECD;
else if (!(task = job_task_info_by_pid (slurmd_job, pid)))
rc = ESPANK_NOEXIST;
- else
+ else
*p2uint32 = task->id;
break;
case S_JOB_LOCAL_TO_GLOBAL_ID:
@@ -1766,7 +1766,7 @@ spank_err_t spank_get_item(spank_t spank, spank_item_t item, ...)
if ((uint32 <= slurmd_job->ntasks) &&
slurmd_job->task && slurmd_job->task[uint32]) {
*p2uint32 = slurmd_job->task[uint32]->gtid;
- } else
+ } else
rc = ESPANK_NOEXIST;
break;
case S_JOB_GLOBAL_TO_LOCAL_ID:
@@ -1875,6 +1875,6 @@ spank_err_t spank_unsetenv (spank_t spank, const char *var)
return (ESPANK_BAD_ARG);
unsetenvp(((slurmd_job_t *) spank->job)->env, var);
-
+
return (ESPANK_SUCCESS);
}
diff --git a/src/common/plugstack.h b/src/common/plugstack.h
index 1ac51e2ec23a9b4b11ebd4afb91b22c2ee64b672..5d1d5977a0e3d8bc9264ff2360ecd09f53b1c95e 100644
--- a/src/common/plugstack.h
+++ b/src/common/plugstack.h
@@ -4,32 +4,32 @@
* Copyright (C) 2005 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -91,7 +91,7 @@ int spank_fini (slurmd_job_t *job);
/*
* Create a struct option table (suitable for passing to getopt_long())
* from SPANK plugin provided options, optionally prepending an existing
- * table of options `orig_options' Result must be freed by
+ * table of options `orig_options' Result must be freed by
* spank_option_table_destroy().
*
* If any options in orig_options conflict with internal spank options,
@@ -101,7 +101,7 @@ int spank_fini (slurmd_job_t *job);
struct option *spank_option_table_create (const struct option *orig_options);
/*
- * Free memory associated with an option table created by
+ * Free memory associated with an option table created by
* spank_p[tion_table_create.
*/
void spank_option_table_destroy (struct option *opt_table);
@@ -115,7 +115,7 @@ void spank_option_table_destroy (struct option *opt_table);
* the option belongs to a *required* plugin, and the plugin's callback
* for that option fails.
*/
-int spank_process_option (int optval, const char *optarg);
+int spank_process_option (int optval, const char *optarg);
/*
* Generate --help style output on stream `fp' for all internal spank
@@ -126,7 +126,7 @@ int spank_process_option (int optval, const char *optarg);
*/
int spank_print_options (FILE *fp, int width, int left_pad);
-/* Set all registered remote options (i.e. those passed to
+/* Set all registered remote options (i.e. those passed to
* spank_process_option) in the job options `options'.
*/
int spank_set_remote_options (job_options_t options);
diff --git a/src/common/print_fields.c b/src/common/print_fields.c
index 0681f70dad9a7f90424a053e04800ca83fb363a3..3a11e7527eff42adebf5049651cbb903f66ac958 100644
--- a/src/common/print_fields.c
+++ b/src/common/print_fields.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -50,7 +50,7 @@ static int _sort_char_list(char *name_a, char *name_b)
return -1;
else if (diff > 0)
return 1;
-
+
return 0;
}
@@ -71,7 +71,7 @@ extern void print_fields_header(List print_fields_list)
int curr_inx = 1;
int field_count = 0;
- if(!print_fields_list || !print_fields_have_header)
+ if(!print_fields_list || !print_fields_have_header)
return;
field_count = list_count(print_fields_list);
@@ -81,7 +81,7 @@ extern void print_fields_header(List print_fields_list)
if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& (curr_inx == field_count))
- printf("%s", field->name);
+ printf("%s", field->name);
else if(print_fields_parsable_print)
printf("%s|", field->name);
else {
@@ -96,11 +96,11 @@ extern void print_fields_header(List print_fields_list)
return;
while((field = list_next(itr))) {
int abs_len = abs(field->len);
- printf("%*.*s ", abs_len, abs_len,
+ printf("%*.*s ", abs_len, abs_len,
"-----------------------------------------------------");
}
list_iterator_destroy(itr);
- printf("\n");
+ printf("\n");
}
extern void print_fields_date(print_field_t *field, time_t value, int last)
@@ -114,13 +114,13 @@ extern void print_fields_date(print_field_t *field, time_t value, int last)
slurm_make_time_str(&value, (char *)temp_char, sizeof(temp_char));
if(print_fields_parsable_print == PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
- printf("%s", temp_char);
+ printf("%s", temp_char);
else if(print_fields_parsable_print)
printf("%s|", temp_char);
else if(field->len == abs_len)
printf("%*.*s ", abs_len, abs_len, temp_char);
else
- printf("%-*.*s ", abs_len, abs_len, temp_char);
+ printf("%-*.*s ", abs_len, abs_len, temp_char);
}
extern void print_fields_str(print_field_t *field, char *value, int last)
@@ -135,17 +135,17 @@ extern void print_fields_str(print_field_t *field, char *value, int last)
print_this = " ";
} else
print_this = value;
-
+
if(print_fields_parsable_print == PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
- printf("%s", print_this);
+ printf("%s", print_this);
else if(print_fields_parsable_print)
printf("%s|", print_this);
else {
if(value) {
memcpy(&temp_char, value, abs_len);
-
- if(strlen(value) > abs_len)
+
+ if(strlen(value) > abs_len)
temp_char[abs_len-1] = '+';
print_this = temp_char;
}
@@ -162,21 +162,21 @@ extern void print_fields_int(print_field_t *field, int value, int last)
int abs_len = abs(field->len);
/* (value == unset) || (value == cleared) */
if((value == NO_VAL) || (value == INFINITE)) {
- if(print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
;
else if(print_fields_parsable_print)
- printf("|");
- else
+ printf("|");
+ else
printf("%*s ", abs_len, " ");
} else {
if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
- printf("%d", value);
+ printf("%d", value);
else if(print_fields_parsable_print)
- printf("%d|", value);
+ printf("%d|", value);
else if(field->len == abs_len)
printf("%*d ", abs_len, value);
else
@@ -189,21 +189,21 @@ extern void print_fields_uint32(print_field_t *field, uint32_t value, int last)
int abs_len = abs(field->len);
/* (value == unset) || (value == cleared) */
if((value == NO_VAL) || (value == INFINITE)) {
- if(print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
;
else if(print_fields_parsable_print)
- printf("|");
- else
+ printf("|");
+ else
printf("%*s ", field->len, " ");
} else {
if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
- printf("%u", value);
+ printf("%u", value);
else if(print_fields_parsable_print)
- printf("%u|", value);
+ printf("%u|", value);
else if(field->len == abs_len)
printf("%*u ", abs_len, value);
else
@@ -216,21 +216,21 @@ extern void print_fields_uint64(print_field_t *field, uint64_t value, int last)
int abs_len = abs(field->len);
/* (value == unset) || (value == cleared) */
if((value == NO_VAL) || (value == INFINITE)) {
- if(print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
;
else if(print_fields_parsable_print)
- printf("|");
- else
+ printf("|");
+ else
printf("%*s ", field->len, " ");
} else {
if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
- printf("%llu", (long long unsigned) value);
+ printf("%llu", (long long unsigned) value);
else if(print_fields_parsable_print)
- printf("%llu|", (long long unsigned) value);
+ printf("%llu|", (long long unsigned) value);
else if(field->len == abs_len)
printf("%*llu ", abs_len, (long long unsigned) value);
else
@@ -243,21 +243,21 @@ extern void print_fields_double(print_field_t *field, double value, int last)
int abs_len = abs(field->len);
/* (value == unset) || (value == cleared) */
if((value == NO_VAL) || (value == INFINITE)) {
- if(print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
;
else if(print_fields_parsable_print)
- printf("|");
- else
+ printf("|");
+ else
printf("%*s ", field->len, " ");
} else {
if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
- printf("%f", value);
+ printf("%f", value);
else if(print_fields_parsable_print)
- printf("%f|", value);
+ printf("%f|", value);
else if(field->len == abs_len)
printf("%*f ", abs_len, value);
else
@@ -271,21 +271,21 @@ extern void print_fields_long_double(
int abs_len = abs(field->len);
/* (value == unset) || (value == cleared) */
if((value == NO_VAL) || (value == INFINITE)) {
- if(print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
;
else if(print_fields_parsable_print)
- printf("|");
- else
+ printf("|");
+ else
printf("%*s ", field->len, " ");
} else {
if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
- printf("%Lf", value);
+ printf("%Lf", value);
else if(print_fields_parsable_print)
- printf("%Lf|", value);
+ printf("%Lf|", value);
else if(field->len == abs_len)
printf("%*Lf ", abs_len, value);
else
@@ -299,18 +299,18 @@ extern void print_fields_time(print_field_t *field, uint32_t value, int last)
int abs_len = abs(field->len);
/* (value == unset) || (value == cleared) */
if((value == NO_VAL) || (value == INFINITE)) {
- if(print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
;
else if(print_fields_parsable_print)
- printf("|");
+ printf("|");
else
printf("%*s ", field->len, " ");
} else {
char time_buf[32];
mins2time_str((time_t) value, time_buf, sizeof(time_buf));
- if(print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%s", time_buf);
@@ -323,24 +323,24 @@ extern void print_fields_time(print_field_t *field, uint32_t value, int last)
}
}
-extern void print_fields_time_from_secs(print_field_t *field,
+extern void print_fields_time_from_secs(print_field_t *field,
uint32_t value, int last)
{
int abs_len = abs(field->len);
/* (value == unset) || (value == cleared) */
if((value == NO_VAL) || (value == INFINITE)) {
- if(print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
;
else if(print_fields_parsable_print)
- printf("|");
+ printf("|");
else
printf("%*s ", field->len, " ");
} else {
char time_buf[32];
secs2time_str((time_t) value, time_buf, sizeof(time_buf));
- if(print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%s", time_buf);
@@ -359,7 +359,7 @@ extern void print_fields_char_list(print_field_t *field, List value, int last)
ListIterator itr = NULL;
char *print_this = NULL;
char *object = NULL;
-
+
if(!value || !list_count(value)) {
if(print_fields_parsable_print)
print_this = xstrdup("");
@@ -369,23 +369,23 @@ extern void print_fields_char_list(print_field_t *field, List value, int last)
list_sort(value, (ListCmpF)_sort_char_list);
itr = list_iterator_create(value);
while((object = list_next(itr))) {
- if(print_this)
+ if(print_this)
xstrfmtcat(print_this, ",%s", object);
- else
+ else
print_this = xstrdup(object);
}
list_iterator_destroy(itr);
}
-
+
if(print_fields_parsable_print == PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%s", print_this);
else if(print_fields_parsable_print)
printf("%s|", print_this);
else {
- if(strlen(print_this) > abs_len)
+ if(strlen(print_this) > abs_len)
print_this[abs_len-1] = '+';
-
+
if(field->len == abs_len)
printf("%*.*s ", abs_len, abs_len, print_this);
else
diff --git a/src/common/print_fields.h b/src/common/print_fields.h
index 95cdf62049c44c5966788517c1e29d93b8a692cd..a6fea8e39553fb4d585b42fbf586c2c2428ba317 100644
--- a/src/common/print_fields.h
+++ b/src/common/print_fields.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -69,7 +69,7 @@
#include "src/common/list.h"
typedef struct {
- int len; /* what is the width of the print */
+ int len; /* what is the width of the print */
char *name; /* name to be printed in header */
void (*print_routine) (); /* what is the function to print with */
uint16_t type; /* defined in the local function */
@@ -98,7 +98,7 @@ extern void print_fields_uint64(
print_field_t *field, uint64_t value, int last);
extern void print_fields_time_from_mins(print_field_t *field,
uint32_t value, int last);
-extern void print_fields_time_from_secs(print_field_t *field,
+extern void print_fields_time_from_secs(print_field_t *field,
uint32_t value, int last);
extern void print_fields_char_list(print_field_t *field, List value, int last);
diff --git a/src/common/proc_args.c b/src/common/proc_args.c
index 3539115cbcf12fb1c5a99f476f6b56db4e649def..49a2c000839cf2866f675c5db3fcc9fb5435d640 100644
--- a/src/common/proc_args.c
+++ b/src/common/proc_args.c
@@ -4,33 +4,33 @@
*****************************************************************************
* Copyright (C) 2007 Hewlett-Packard Development Company, L.P.
* Written by Christopher Holmes <cholmes@hp.com>, who borrowed heavily
- * from existing SLURM source code, particularly src/srun/opt.c
- *
+ * from existing SLURM source code, particularly src/srun/opt.c
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -86,7 +86,7 @@ void print_slurm_version(void)
printf("%s %s\n", PACKAGE, SLURM_VERSION);
}
-/*
+/*
* verify that a distribution type in arg is of a known form
* returns the task_dist_states, or -1 if state is unknown
*/
@@ -290,7 +290,7 @@ _str_to_nodes(const char *num_str, char **leftover)
if (endptr == num_str) { /* no valid digits */
*leftover = (char *)num_str;
return 0;
- }
+ }
if (*endptr != '\0' && (*endptr == 'k' || *endptr == 'K')) {
num *= 1024;
endptr++;
@@ -300,7 +300,7 @@ _str_to_nodes(const char *num_str, char **leftover)
return (int)num;
}
-/*
+/*
* verify that a node count in arg is of a known form (count or min-max)
* OUT min, max specified minimum and maximum node counts
* RET true if valid
@@ -309,7 +309,7 @@ bool verify_node_count(const char *arg, int *min_nodes, int *max_nodes)
{
char *ptr, *min_str, *max_str;
char *leftover;
-
+
/* Does the string contain a "-" character? If so, treat as a range.
* otherwise treat as an absolute node count. */
if ((ptr = index(arg, '-')) != NULL) {
@@ -356,7 +356,7 @@ bool verify_node_count(const char *arg, int *min_nodes, int *max_nodes)
}
/*
- * If the node list supplied is a file name, translate that into
+ * If the node list supplied is a file name, translate that into
* a list of nodes, we orphan the data pointed to
* RET true if the node list is a valid one
*/
@@ -364,7 +364,7 @@ bool verify_node_list(char **node_list_pptr, enum task_dist_states dist,
int task_count)
{
char *nodelist = NULL;
-
+
xassert (node_list_pptr);
xassert (*node_list_pptr);
@@ -374,12 +374,12 @@ bool verify_node_list(char **node_list_pptr, enum task_dist_states dist,
/* If we are using Arbitrary grab count out of the hostfile
using them exactly the way we read it in since we are
saying, lay it out this way! */
- if(dist == SLURM_DIST_ARBITRARY)
+ if(dist == SLURM_DIST_ARBITRARY)
nodelist = slurm_read_hostfile(*node_list_pptr, task_count);
else
nodelist = slurm_read_hostfile(*node_list_pptr, NO_VAL);
-
- if (!nodelist)
+
+ if (!nodelist)
return false;
xfree(*node_list_pptr);
@@ -389,7 +389,7 @@ bool verify_node_list(char **node_list_pptr, enum task_dist_states dist,
return true;
}
-/*
+/*
* get either 1 or 2 integers for a resource count in the form of either
* (count, min-max, or '*')
* A partial error message is passed in via the 'what' param.
@@ -400,7 +400,7 @@ bool verify_node_list(char **node_list_pptr, enum task_dist_states dist,
* IN isFatal - if set, exit on error
* RET true if valid
*/
-bool get_resource_arg_range(const char *arg, const char *what, int* min,
+bool get_resource_arg_range(const char *arg, const char *what, int* min,
int *max, bool isFatal)
{
char *p;
@@ -450,7 +450,7 @@ bool get_resource_arg_range(const char *arg, const char *what, int* min,
result *= 1048576;
p++;
}
-
+
if (((*p != '\0') && (*p != '-')) || (result <= 0L)) {
error ("Invalid numeric value \"%s\" for %s.", arg, what);
if (isFatal)
@@ -469,13 +469,13 @@ bool get_resource_arg_range(const char *arg, const char *what, int* min,
return true;
}
-/*
- * verify that a resource counts in arg are of a known form X, X:X, X:X:X, or
+/*
+ * verify that a resource counts in arg are of a known form X, X:X, X:X:X, or
* X:X:X:X, where X is defined as either (count, min-max, or '*')
* RET true if valid
*/
-bool verify_socket_core_thread_count(const char *arg, int *min_sockets,
- int *min_cores, int *min_threads,
+bool verify_socket_core_thread_count(const char *arg, int *min_sockets,
+ int *min_cores, int *min_threads,
cpu_bind_type_t *cpu_bind_type)
{
bool tmp_val,ret_val;
@@ -486,7 +486,7 @@ bool verify_socket_core_thread_count(const char *arg, int *min_sockets,
buf[1][0] = '\0';
buf[2][0] = '\0';
- for (j=0;j<3;j++) {
+ for (j=0;j<3;j++) {
for (i=0;i<47;i++) {
if (*cur_ptr == '\0' || *cur_ptr ==':')
break;
@@ -515,24 +515,24 @@ bool verify_socket_core_thread_count(const char *arg, int *min_sockets,
buf[j][i] = '\0';
ret_val = true;
- tmp_val = get_resource_arg_range(&buf[0][0], "first arg of -B",
+ tmp_val = get_resource_arg_range(&buf[0][0], "first arg of -B",
min_sockets, NULL, true);
ret_val = ret_val && tmp_val;
- tmp_val = get_resource_arg_range(&buf[1][0], "second arg of -B",
+ tmp_val = get_resource_arg_range(&buf[1][0], "second arg of -B",
min_cores, NULL, true);
ret_val = ret_val && tmp_val;
- tmp_val = get_resource_arg_range(&buf[2][0], "third arg of -B",
+ tmp_val = get_resource_arg_range(&buf[2][0], "third arg of -B",
min_threads, NULL, true);
ret_val = ret_val && tmp_val;
return ret_val;
}
-/*
+/*
* verify that a hint is valid and convert it into the implied settings
* RET true if valid
*/
-bool verify_hint(const char *arg, int *min_sockets, int *min_cores,
+bool verify_hint(const char *arg, int *min_sockets, int *min_cores,
int *min_threads, cpu_bind_type_t *cpu_bind_type)
{
char *buf, *p, *tok;
@@ -667,7 +667,7 @@ search_path(char *cwd, char *cmd, bool check_current_dir, int access_mode)
ListIterator i = NULL;
char *path, *fullpath = NULL;
- if ( (cmd[0] == '.' || cmd[0] == '/')
+ if ( (cmd[0] == '.' || cmd[0] == '/')
&& (access(cmd, access_mode) == 0 ) ) {
if (cmd[0] == '.')
xstrfmtcat(fullpath, "%s/", cwd);
@@ -679,7 +679,7 @@ search_path(char *cwd, char *cmd, bool check_current_dir, int access_mode)
if (l == NULL)
return NULL;
- if (check_current_dir)
+ if (check_current_dir)
list_prepend(l, xstrdup(cwd));
i = list_iterator_create(l);
@@ -734,7 +734,7 @@ char *print_geometry(const uint16_t *geometry)
return rc;
}
-/* Translate a signal option string "--signal=<int>[@<time>]" into
+/* Translate a signal option string "--signal=<int>[@<time>]" into
* it's warn_signal and warn_time components.
* RET 0 on success, -1 on failure */
int get_signal_opts(char *optarg, uint16_t *warn_signal, uint16_t *warn_time)
diff --git a/src/common/proc_args.h b/src/common/proc_args.h
index 995e46bd5562d4eeb02ed801eae7fdd75f35428c..25a9da1eb6bd6eab097d7048614c8a8d67599398 100644
--- a/src/common/proc_args.h
+++ b/src/common/proc_args.h
@@ -4,33 +4,33 @@
*****************************************************************************
* Copyright (C) 2007 Hewlett-Packard Development Company, L.P.
* Written by Christopher Holmes <cholmes@hp.com>, who borrowed heavily
- * from existing SLURM source code, particularly src/srun/opt.c
- *
+ * from existing SLURM source code, particularly src/srun/opt.c
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -87,7 +87,7 @@ bool verify_node_count(const char *arg, int *min_nodes, int *max_nodes);
bool verify_node_list(char **node_list_pptr, enum task_dist_states dist,
int task_count);
-/*
+/*
* get either 1 or 2 integers for a resource count in the form of either
* (count, min-max, or '*')
* A partial error message is passed in via the 'what' param.
@@ -98,16 +98,16 @@ bool verify_node_list(char **node_list_pptr, enum task_dist_states dist,
* IN isFatal - if set, exit on error
* RET true if valid
*/
-bool get_resource_arg_range(const char *arg, const char *what, int* min,
+bool get_resource_arg_range(const char *arg, const char *what, int* min,
int *max, bool isFatal);
/* verify resource counts from a complex form of: X, X:X, X:X:X or X:X:X:X */
-bool verify_socket_core_thread_count(const char *arg, int *min_sockets,
- int *min_cores, int *min_threads,
+bool verify_socket_core_thread_count(const char *arg, int *min_sockets,
+ int *min_cores, int *min_threads,
cpu_bind_type_t *cpu_bind_type);
/* verify a hint and convert it into the implied settings */
-bool verify_hint(const char *arg, int *min_sockets, int *min_cores,
+bool verify_hint(const char *arg, int *min_sockets, int *min_cores,
int *min_threads, cpu_bind_type_t *cpu_bind_type);
/* parse the mail type */
@@ -126,7 +126,7 @@ char *print_commandline(const int script_argc, char **script_argv);
/* helper function for printing geometry option */
char *print_geometry(const uint16_t *geometry);
-/* Translate a signal option string "--signal=<int>[@<time>]" into
+/* Translate a signal option string "--signal=<int>[@<time>]" into
* it's warn_signal and warn_time components.
* RET 0 on success, -1 on failure */
int get_signal_opts(char *optarg, uint16_t *warn_signal, uint16_t *warn_time);
diff --git a/src/common/read_config.c b/src/common/read_config.c
index 1b16ed3be3ea57c36f2cc58c40a8ce9d0dbc3ca3..5e5ad8c85e4160d0095acb7587b14f3d1760686f 100644
--- a/src/common/read_config.c
+++ b/src/common/read_config.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -76,8 +76,8 @@
#include "src/common/strlcpy.h"
/*
-** Define slurm-specific aliases for use by plugins, see slurm_xlator.h
-** for details.
+** Define slurm-specific aliases for use by plugins, see slurm_xlator.h
+** for details.
*/
strong_alias(destroy_config_key_pair, slurm_destroy_config_key_pair);
strong_alias(sort_key_pairs, slurm_sort_key_pairs);
@@ -353,8 +353,8 @@ static int _defunct_option(void **dest, slurm_parser_enum_t type,
}
#ifdef HAVE_3D
-/* Used to get the general name of the machine, used primarily
- * for bluegene systems. Not in general use because some systems
+/* Used to get the general name of the machine, used primarily
+ * for bluegene systems. Not in general use because some systems
* have multiple prefix's such as foo[1-1000],bar[1-1000].
*/
/* Caller must be holding slurm_conf_lock() */
@@ -365,7 +365,7 @@ static void _set_node_prefix(const char *nodenames)
xassert(nodenames != NULL);
for (i = 1; nodenames[i] != '\0'; i++) {
- if((nodenames[i-1] == '[')
+ if((nodenames[i-1] == '[')
|| (nodenames[i-1] <= '9'
&& nodenames[i-1] >= '0'))
break;
@@ -465,8 +465,8 @@ static int _parse_nodename(void **dest, slurm_parser_enum_t type,
if (!s_p_get_uint16(&n->port, "Port", tbl)
&& !s_p_get_uint16(&n->port, "Port", dflt)) {
- /* This gets resolved in slurm_conf_get_port()
- * and slurm_conf_get_addr(). For now just
+ /* This gets resolved in slurm_conf_get_port()
+ * and slurm_conf_get_addr(). For now just
* leave with a value of zero */
n->port = 0;
}
@@ -520,7 +520,7 @@ static int _parse_nodename(void **dest, slurm_parser_enum_t type,
"reset to 1", n->nodenames);
n->threads = 1;
}
-
+
if (!no_cpus && /* infer missing Sockets= */
no_sockets) {
n->sockets = n->cpus / (n->cores * n->threads);
@@ -645,9 +645,9 @@ static int _parse_partitionname(void **dest, slurm_parser_enum_t type,
}
if (!s_p_get_string(&p->allow_alloc_nodes, "AllocNodes", tbl)) {
- s_p_get_string(&p->allow_alloc_nodes, "AllocNodes",
+ s_p_get_string(&p->allow_alloc_nodes, "AllocNodes",
dflt);
- if (p->allow_alloc_nodes &&
+ if (p->allow_alloc_nodes &&
(strcasecmp(p->allow_alloc_nodes, "ALL") == 0)) {
/* NULL means to allow all submit notes */
xfree(p->allow_alloc_nodes);
@@ -741,7 +741,7 @@ static int _parse_partitionname(void **dest, slurm_parser_enum_t type,
p->max_share = 1; /* Shared=NO */
} else
p->max_share = i;
- } else if (strcasecmp(tmp, "YES") == 0)
+ } else if (strcasecmp(tmp, "YES") == 0)
p->max_share = 4;
else if (strncasecmp(tmp, "FORCE:", 6) == 0) {
int i = strtol(&tmp[6], (char **) NULL, 10);
@@ -968,7 +968,7 @@ static void _push_to_hashtbls(char *alias, char *hostname,
/*
* Register the given NodeName in the alias table.
- * If node_hostname is NULL, only node_name will be used and
+ * If node_hostname is NULL, only node_name will be used and
* no lookup table record is created.
*/
static int _register_conf_node_aliases(slurm_conf_node_t *node_ptr)
@@ -1047,7 +1047,7 @@ static int _register_conf_node_aliases(slurm_conf_node_t *node_ptr)
free(hostname);
free(address);
#endif
-
+
}
/* free allocated storage */
@@ -1337,9 +1337,9 @@ extern int slurm_conf_get_cpus_sct(const char *node_name,
}
-/* gethostname_short - equivalent to gethostname, but return only the first
- * component of the fully qualified name
- * (e.g. "linux123.foo.bar" becomes "linux123")
+/* gethostname_short - equivalent to gethostname, but return only the first
+ * component of the fully qualified name
+ * (e.g. "linux123.foo.bar" becomes "linux123")
* OUT name
*/
int
@@ -1366,8 +1366,8 @@ gethostname_short (char *name, size_t len)
return 0;
}
-/*
- * free_slurm_conf - free all storage associated with a slurm_ctl_conf_t.
+/*
+ * free_slurm_conf - free all storage associated with a slurm_ctl_conf_t.
* IN/OUT ctl_conf_ptr - pointer to data structure to be freed
* IN purge_node_hash - purge system-wide node hash table if set,
* set to zero if clearing private copy of config data
@@ -1444,10 +1444,10 @@ free_slurm_conf (slurm_ctl_conf_t *ctl_conf_ptr, bool purge_node_hash)
_free_name_hashtbl();
}
-/*
- * init_slurm_conf - initialize or re-initialize the slurm configuration
+/*
+ * init_slurm_conf - initialize or re-initialize the slurm configuration
* values to defaults (NULL or NO_VAL). Note that the configuration
- * file pathname (slurm_conf) is not changed.
+ * file pathname (slurm_conf) is not changed.
* IN/OUT ctl_conf_ptr - pointer to data structure to be initialized
*/
void
@@ -1532,16 +1532,16 @@ init_slurm_conf (slurm_ctl_conf_t *ctl_conf_ptr)
ctl_conf_ptr->schedrootfltr = (uint16_t) NO_VAL;
xfree( ctl_conf_ptr->select_type );
ctl_conf_ptr->select_type_param = (uint16_t) NO_VAL;
- ctl_conf_ptr->slurm_user_id = (uint16_t) NO_VAL;
+ ctl_conf_ptr->slurm_user_id = (uint16_t) NO_VAL;
xfree (ctl_conf_ptr->slurm_user_name);
- ctl_conf_ptr->slurmd_user_id = (uint16_t) NO_VAL;
+ ctl_conf_ptr->slurmd_user_id = (uint16_t) NO_VAL;
xfree (ctl_conf_ptr->slurmd_user_name);
- ctl_conf_ptr->slurmctld_debug = (uint16_t) NO_VAL;
+ ctl_conf_ptr->slurmctld_debug = (uint16_t) NO_VAL;
xfree (ctl_conf_ptr->slurmctld_logfile);
xfree (ctl_conf_ptr->slurmctld_pidfile);
ctl_conf_ptr->slurmctld_port = (uint32_t) NO_VAL;
ctl_conf_ptr->slurmctld_timeout = (uint16_t) NO_VAL;
- ctl_conf_ptr->slurmd_debug = (uint16_t) NO_VAL;
+ ctl_conf_ptr->slurmd_debug = (uint16_t) NO_VAL;
xfree (ctl_conf_ptr->slurmd_logfile);
xfree (ctl_conf_ptr->slurmd_pidfile);
ctl_conf_ptr->slurmd_port = (uint32_t) NO_VAL;
@@ -1588,7 +1588,7 @@ static void _init_slurm_conf(const char *file_name)
name = default_slurm_config_file;
}
if(conf_initialized) {
- error("the conf_hashtbl is already inited");
+ error("the conf_hashtbl is already inited");
}
conf_hashtbl = s_p_hashtbl_create(slurm_conf_options);
conf_ptr->last_update = time(NULL);
@@ -1614,7 +1614,7 @@ _destroy_slurm_conf()
}
free_slurm_conf(conf_ptr, true);
conf_initialized = false;
-
+
/* xfree(conf_ptr); */
}
@@ -1661,9 +1661,9 @@ static int _internal_reinit(const char *file_name)
/* could check modified time on slurm.conf here */
_destroy_slurm_conf();
}
-
+
_init_slurm_conf(name);
-
+
conf_initialized = true;
return SLURM_SUCCESS;
@@ -1679,7 +1679,7 @@ static int _internal_reinit(const char *file_name)
* file and reinitialize the configuration structures.
* RET SLURM_SUCCESS if conf file is reinitialized, otherwise SLURM_ERROR.
*/
-extern int
+extern int
slurm_conf_reinit(const char *file_name)
{
int rc;
@@ -1697,7 +1697,7 @@ slurm_conf_mutex_init(void)
pthread_mutex_init(&conf_lock, NULL);
}
-extern void
+extern void
slurm_conf_install_fork_handlers()
{
int err;
@@ -1746,14 +1746,14 @@ slurm_conf_unlock(void)
static void _normalize_debug_level(uint16_t *level)
{
if (*level > LOG_LEVEL_END) {
- error("Normalizing debug level from %u to %d",
+ error("Normalizing debug level from %u to %d",
*level, (LOG_LEVEL_END - 1));
*level = (LOG_LEVEL_END - 1);
}
/* level is uint16, always > LOG_LEVEL_QUIET(0), can't underflow */
}
-/*
+/*
*
* IN/OUT ctl_conf_ptr - a configuration as loaded by read_slurm_conf_ctl
*
@@ -1772,7 +1772,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
char *default_storage_user = NULL, *default_storage_pass = NULL;
char *default_storage_loc = NULL;
uint32_t default_storage_port = 0;
-
+
if (s_p_get_string(&conf->backup_controller, "BackupController",
hashtbl)
&& strcasecmp("localhost", conf->backup_controller) == 0) {
@@ -1791,7 +1791,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
conf->backup_addr = xstrdup(conf->backup_controller);
}
- if (!s_p_get_uint16(&conf->batch_start_timeout, "BatchStartTimeout",
+ if (!s_p_get_uint16(&conf->batch_start_timeout, "BatchStartTimeout",
hashtbl))
conf->batch_start_timeout = DEFAULT_BATCH_START_TIMEOUT;
@@ -1861,7 +1861,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
if (s_p_get_uint32(&conf->def_mem_per_cpu, "DefMemPerCPU", hashtbl))
conf->def_mem_per_cpu |= MEM_PER_CPU;
- else if (!s_p_get_uint32(&conf->def_mem_per_cpu, "DefMemPerNode",
+ else if (!s_p_get_uint32(&conf->def_mem_per_cpu, "DefMemPerNode",
hashtbl))
conf->def_mem_per_cpu = DEFAULT_MEM_PER_CPU;
@@ -1873,11 +1873,11 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
} else /* Default: no DebugFlags */
conf->debug_flags = 0;
- if (!s_p_get_boolean((bool *) &conf->disable_root_jobs,
+ if (!s_p_get_boolean((bool *) &conf->disable_root_jobs,
"DisableRootJobs", hashtbl))
conf->disable_root_jobs = DEFAULT_DISABLE_ROOT_JOBS;
- if (!s_p_get_boolean((bool *) &conf->enforce_part_limits,
+ if (!s_p_get_boolean((bool *) &conf->enforce_part_limits,
"EnforcePartLimits", hashtbl))
conf->enforce_part_limits = DEFAULT_ENFORCE_PART_LIMITS;
@@ -1928,7 +1928,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
"Refer to the slurm.conf man page or the web "
"documentation for further explanation.");
}
-
+
if(!s_p_get_string(&conf->job_acct_gather_type,
"JobAcctGatherType", hashtbl))
conf->job_acct_gather_type =
@@ -1948,7 +1948,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
DEFAULT_JOB_COMP_TYPE);
conf->job_comp_type =
xstrdup(DEFAULT_JOB_COMP_TYPE);
- } else
+ } else
conf->job_comp_type =
xstrdup_printf("jobcomp/%s",
default_storage_type);
@@ -1959,7 +1959,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
if(default_storage_loc)
conf->job_comp_loc = xstrdup(default_storage_loc);
else if(!strcmp(conf->job_comp_type, "job_comp/mysql")
- || !strcmp(conf->job_comp_type, "job_comp/pgsql"))
+ || !strcmp(conf->job_comp_type, "job_comp/pgsql"))
conf->job_comp_loc = xstrdup(DEFAULT_JOB_COMP_DB);
else
conf->job_comp_loc = xstrdup(DEFAULT_JOB_COMP_LOC);
@@ -1988,11 +1988,11 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
hashtbl)) {
if(default_storage_port)
conf->job_comp_port = default_storage_port;
- else if(!strcmp(conf->job_comp_type, "job_comp/mysql"))
+ else if(!strcmp(conf->job_comp_type, "job_comp/mysql"))
conf->job_comp_port = DEFAULT_MYSQL_PORT;
- else if(!strcmp(conf->job_comp_type, "job_comp/pgsql"))
+ else if(!strcmp(conf->job_comp_type, "job_comp/pgsql"))
conf->job_comp_port = DEFAULT_PGSQL_PORT;
- else
+ else
conf->job_comp_port = DEFAULT_STORAGE_PORT;
}
@@ -2007,9 +2007,9 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
if (!s_p_get_uint16(&conf->get_env_timeout, "GetEnvTimeout", hashtbl))
conf->get_env_timeout = DEFAULT_GET_ENV_TIMEOUT;
- s_p_get_uint16(&conf->health_check_interval, "HealthCheckInterval",
+ s_p_get_uint16(&conf->health_check_interval, "HealthCheckInterval",
hashtbl);
- s_p_get_string(&conf->health_check_program, "HealthCheckProgram",
+ s_p_get_string(&conf->health_check_program, "HealthCheckProgram",
hashtbl);
if (!s_p_get_uint16(&conf->kill_on_bad_exit, "KillOnBadExit", hashtbl))
@@ -2026,15 +2026,15 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
if (!s_p_get_uint16(&conf->max_job_cnt, "MaxJobCount", hashtbl))
conf->max_job_cnt = DEFAULT_MAX_JOB_COUNT;
- if (s_p_get_uint32(&conf->max_mem_per_cpu,
+ if (s_p_get_uint32(&conf->max_mem_per_cpu,
"MaxMemPerCPU", hashtbl)) {
conf->max_mem_per_cpu |= MEM_PER_CPU;
- } else if (!s_p_get_uint32(&conf->max_mem_per_cpu,
+ } else if (!s_p_get_uint32(&conf->max_mem_per_cpu,
"MaxMemPerNode", hashtbl)) {
conf->max_mem_per_cpu = DEFAULT_MAX_MEM_PER_CPU;
}
- if (!s_p_get_uint16(&conf->max_tasks_per_node, "MaxTasksPerNode",
+ if (!s_p_get_uint16(&conf->max_tasks_per_node, "MaxTasksPerNode",
hashtbl)) {
conf->max_tasks_per_node = DEFAULT_MAX_TASKS_PER_NODE;
}
@@ -2054,7 +2054,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
s_p_get_string(&conf->mpi_params, "MpiParams", hashtbl);
- if(!s_p_get_boolean((bool *)&conf->track_wckey,
+ if(!s_p_get_boolean((bool *)&conf->track_wckey,
"TrackWCKey", hashtbl))
conf->track_wckey = false;
@@ -2064,50 +2064,50 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
conf->accounting_storage_type =
xstrdup_printf("accounting_storage/%s",
default_storage_type);
- else
+ else
conf->accounting_storage_type =
xstrdup(DEFAULT_ACCOUNTING_STORAGE_TYPE);
}
if (s_p_get_string(&temp_str, "AccountingStorageEnforce", hashtbl)) {
if (strstr(temp_str, "1") || strstr(temp_str, "associations"))
- conf->accounting_storage_enforce
+ conf->accounting_storage_enforce
|= ACCOUNTING_ENFORCE_ASSOCS;
if (strstr(temp_str, "2") || strstr(temp_str, "limits")) {
- conf->accounting_storage_enforce
+ conf->accounting_storage_enforce
|= ACCOUNTING_ENFORCE_ASSOCS;
- conf->accounting_storage_enforce
+ conf->accounting_storage_enforce
|= ACCOUNTING_ENFORCE_LIMITS;
}
if (strstr(temp_str, "wckeys")) {
- conf->accounting_storage_enforce
+ conf->accounting_storage_enforce
|= ACCOUNTING_ENFORCE_ASSOCS;
- conf->accounting_storage_enforce
+ conf->accounting_storage_enforce
|= ACCOUNTING_ENFORCE_WCKEYS;
conf->track_wckey = true;
- }
+ }
if (strstr(temp_str, "qos")) {
- conf->accounting_storage_enforce
+ conf->accounting_storage_enforce
|= ACCOUNTING_ENFORCE_ASSOCS;
- conf->accounting_storage_enforce
+ conf->accounting_storage_enforce
|= ACCOUNTING_ENFORCE_QOS;
- }
+ }
if (strstr(temp_str, "all")) {
conf->accounting_storage_enforce = 0xffff;
conf->track_wckey = true;
- }
-
+ }
+
xfree(temp_str);
}
/* if no backup we don't care */
s_p_get_string(&conf->accounting_storage_backup_host,
"AccountingStorageBackupHost", hashtbl);
-
+
if (!s_p_get_string(&conf->accounting_storage_host,
"AccountingStorageHost", hashtbl)) {
if(default_storage_host)
@@ -2129,10 +2129,10 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
if(default_storage_loc)
conf->accounting_storage_loc =
xstrdup(default_storage_loc);
- else if(!strcmp(conf->accounting_storage_type,
+ else if(!strcmp(conf->accounting_storage_type,
"accounting_storage/mysql")
- || !strcmp(conf->accounting_storage_type,
- "accounting_storage/pgsql"))
+ || !strcmp(conf->accounting_storage_type,
+ "accounting_storage/pgsql"))
conf->accounting_storage_loc =
xstrdup(DEFAULT_ACCOUNTING_DB);
else
@@ -2159,18 +2159,18 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
if(default_storage_port)
conf->accounting_storage_port = default_storage_port;
else if(!strcmp(conf->accounting_storage_type,
- "accounting_storage/slurmdbd"))
+ "accounting_storage/slurmdbd"))
conf->accounting_storage_port = SLURMDBD_PORT;
- else if(!strcmp(conf->accounting_storage_type,
- "accounting_storage/mysql"))
+ else if(!strcmp(conf->accounting_storage_type,
+ "accounting_storage/mysql"))
conf->accounting_storage_port = DEFAULT_MYSQL_PORT;
else if(!strcmp(conf->accounting_storage_type,
- "accounting_storage/pgsql"))
+ "accounting_storage/pgsql"))
conf->accounting_storage_port = DEFAULT_PGSQL_PORT;
else
conf->accounting_storage_port = DEFAULT_STORAGE_PORT;
}
-
+
/* remove the user and loc if using slurmdbd */
if(!strcmp(conf->accounting_storage_type,
"accounting_storage/slurmdbd")) {
@@ -2260,14 +2260,14 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
}
conf->priority_decay_hl = max_time * 60;
xfree(temp_str);
- } else
+ } else
conf->priority_decay_hl = DEFAULT_PRIORITY_DECAY;
- if (s_p_get_boolean(&truth, "PriorityFavorSmall", hashtbl) && truth)
+ if (s_p_get_boolean(&truth, "PriorityFavorSmall", hashtbl) && truth)
conf->priority_favor_small = 1;
- else
+ else
conf->priority_favor_small = 0;
-
+
if (s_p_get_string(&temp_str, "PriorityMaxAge", hashtbl)) {
int max_time = time_str2mins(temp_str);
if ((max_time < 0) && (max_time != INFINITE)) {
@@ -2276,7 +2276,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
}
conf->priority_max_age = max_time * 60;
xfree(temp_str);
- } else
+ } else
conf->priority_max_age = DEFAULT_PRIORITY_DECAY;
if (s_p_get_string(&temp_str, "PriorityUsageResetPeriod", hashtbl)) {
@@ -2337,7 +2337,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
if (!strcmp(conf->switch_type,"switch/elan"))
conf->proctrack_type = xstrdup("proctrack/rms");
else
- conf->proctrack_type =
+ conf->proctrack_type =
xstrdup(DEFAULT_PROCTRACK_TYPE);
}
if ((!strcmp(conf->switch_type, "switch/elan"))
@@ -2595,7 +2595,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
if (set_mode)
fatal("Bad TaskPluginParam: %s", tok);
set_mode = true;
- /* No change to task_plugin_param,
+ /* No change to task_plugin_param,
* this is the default */
} else if (strcasecmp(tok, "verbose") == 0) {
conf->task_plugin_param |= CPU_BIND_VERBOSE;
@@ -2670,7 +2670,7 @@ slurm_conf_expand_slurmd_path(const char *path, const char *node_name)
xstrsubstitute(dir, "%h", hostname);
xfree(hostname);
xstrsubstitute(dir, "%n", node_name);
-
+
return dir;
}
@@ -2706,7 +2706,7 @@ extern char * debug_flags2str(uint32_t debug_flags)
xstrcat(rc, ",");
xstrcat(rc, "Wiki");
}
-
+
return rc;
}
@@ -2770,11 +2770,11 @@ extern int unpack_config_key_pair(void **object, uint16_t rpc_version,
{
uint32_t uint32_tmp;
config_key_pair_t *object_ptr = xmalloc(sizeof(config_key_pair_t));
-
+
*object = object_ptr;
safe_unpackstr_xmalloc(&object_ptr->name, &uint32_tmp, buffer);
safe_unpackstr_xmalloc(&object_ptr->value, &uint32_tmp, buffer);
-
+
return SLURM_SUCCESS;
unpack_error:
diff --git a/src/common/read_config.h b/src/common/read_config.h
index c92974c5d3e741359cbe8bc7188f0deba412b3f1..6cc720e7d0a3ad0e4d9b3e8ec8035a1d6e8d1e01 100644
--- a/src/common/read_config.h
+++ b/src/common/read_config.h
@@ -1,5 +1,5 @@
/*****************************************************************************
- * read_config.h - definitions for reading the overall slurm configuration
+ * read_config.h - definitions for reading the overall slurm configuration
* file
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
@@ -12,28 +12,28 @@
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -155,15 +155,15 @@ typedef struct slurm_conf_node {
char *reason;
char *state;
uint32_t tmp_disk; /* MB total storage in TMP_FS file system */
- uint32_t weight; /* arbitrary priority of node for
+ uint32_t weight; /* arbitrary priority of node for
* scheduling work on */
} slurm_conf_node_t;
typedef struct slurm_conf_partition {
char *allow_alloc_nodes;/* comma delimited list of allowed
- * allocating nodes
+ * allocating nodes
* NULL indicates all */
- char *allow_groups; /* comma delimited list of groups,
+ char *allow_groups; /* comma delimited list of groups,
* NULL indicates all */
bool default_flag; /* Set if default partition */
uint32_t default_time; /* minutes or INFINITE */
@@ -179,7 +179,7 @@ typedef struct slurm_conf_partition {
char *name; /* name of the partition */
char *nodes; /* comma delimited list names of nodes */
uint16_t priority; /* scheduling priority for jobs */
- bool root_only_flag;/* 1 if allocate/submit RPC can only be
+ bool root_only_flag;/* 1 if allocate/submit RPC can only be
issued by user root */
bool state_up_flag; /* 1 if state is up, 0 if down */
uint32_t total_nodes; /* total number of nodes in the partition */
@@ -225,7 +225,7 @@ extern int slurm_conf_init(const char *file_name);
*/
extern int slurm_conf_reinit(const char *file_name);
-/*
+/*
* slurm_conf_mutex_init - init the slurm_conf mutex
*/
extern void slurm_conf_mutex_init(void);
@@ -247,7 +247,7 @@ extern void slurm_conf_unlock(void);
/*
* Set "ptr_array" with the pointer to an array of pointers to
* slurm_conf_node_t structures.
- *
+ *
* Return value is the length of the array.
*/
extern int slurm_conf_nodename_array(slurm_conf_node_t **ptr_array[]);
@@ -255,7 +255,7 @@ extern int slurm_conf_nodename_array(slurm_conf_node_t **ptr_array[]);
/*
* Set "ptr_array" with the pointer to an array of pointers to
* slurm_conf_partition_t structures.
- *
+ *
* Return value is the length of the array.
*/
extern int slurm_conf_partition_array(slurm_conf_partition_t **ptr_array[]);
@@ -263,7 +263,7 @@ extern int slurm_conf_partition_array(slurm_conf_partition_t **ptr_array[]);
/*
* Set "ptr_array" with the pointer to an array of pointers to
* slurm_conf_downnodes_t structures.
- *
+ *
* Return value is the length of the array.
*/
extern int slurm_conf_downnodes_array(slurm_conf_downnodes_t **ptr_array[]);
@@ -332,16 +332,16 @@ extern int slurm_conf_get_cpus_sct(const char *node_name,
uint16_t *procs, uint16_t *sockets,
uint16_t *cores, uint16_t *threads);
-/*
- * init_slurm_conf - initialize or re-initialize the slurm configuration
+/*
+ * init_slurm_conf - initialize or re-initialize the slurm configuration
* values defaults (NULL or NO_VAL). Note that the configuration
- * file pathname (slurm_conf) is not changed.
+ * file pathname (slurm_conf) is not changed.
* IN/OUT ctl_conf_ptr - pointer to data structure to be initialized
*/
extern void init_slurm_conf (slurm_ctl_conf_t *ctl_conf_ptr);
-/*
- * free_slurm_conf - free all storage associated with a slurm_ctl_conf_t.
+/*
+ * free_slurm_conf - free all storage associated with a slurm_ctl_conf_t.
* IN/OUT ctl_conf_ptr - pointer to data structure to be freed
* IN purge_node_hash - purge system-wide node hash table if set,
* set to zero if clearing private copy of config data
@@ -350,9 +350,9 @@ extern void free_slurm_conf (slurm_ctl_conf_t *ctl_conf_ptr,
bool purge_node_hash);
/*
- * gethostname_short - equivalent to gethostname(), but return only the first
- * component of the fully qualified name (e.g. "linux123.foo.bar"
- * becomes "linux123")
+ * gethostname_short - equivalent to gethostname(), but return only the first
+ * component of the fully qualified name (e.g. "linux123.foo.bar"
+ * becomes "linux123")
* NOTE: NodeName in the config may be different from real hostname.
* Use get_conf_node_name() to get the former.
*/
@@ -383,7 +383,7 @@ extern uint32_t debug_str2flags(char *debug_flags);
extern void destroy_config_key_pair(void *object);
extern void pack_config_key_pair(void *in, uint16_t rpc_version, Buf buffer);
-extern int unpack_config_key_pair(void **object, uint16_t rpc_version,
+extern int unpack_config_key_pair(void **object, uint16_t rpc_version,
Buf buffer);
extern int sort_key_pairs(config_key_pair_t *key_a, config_key_pair_t *key_b);
diff --git a/src/common/safeopen.c b/src/common/safeopen.c
index 980efc373799714ad112470d1b5f4b7dab9fe53a..a6c06373dc2f5297273012abda00fc6357041e59 100644
--- a/src/common/safeopen.c
+++ b/src/common/safeopen.c
@@ -15,15 +15,15 @@
* 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
+ * 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
+ * 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
@@ -39,7 +39,7 @@
#if HAVE_CONFIG_H
# include "config.h"
-#endif
+#endif
#if HAVE_UNISTD_H
# include <unistd.h>
@@ -80,7 +80,7 @@ FILE * safeopen(const char *path, const char *mode, int flags)
fstat(fd, &fb2);
if (fb2.st_ino != fb1.st_ino) {
- fprintf(stderr, "safeopen(): refusing to open `%s', "
+ fprintf(stderr, "safeopen(): refusing to open `%s', "
"which is a soft link\n", path);
close(fd);
return NULL;
diff --git a/src/common/safeopen.h b/src/common/safeopen.h
index f0b7929337bdc4a1b5a24746cc77d03c5d0390f4..81e70eba26828507d2d2c88884ddb80086f75099 100644
--- a/src/common/safeopen.h
+++ b/src/common/safeopen.h
@@ -15,15 +15,15 @@
* 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
+ * 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
+ * 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
diff --git a/src/common/slurm_accounting_storage.c b/src/common/slurm_accounting_storage.c
index 712226e6304770b47c5269bd3cc7969406649c75..ee61cb360c9da30fec8d03af49d3be1772b2f8d6 100644
--- a/src/common/slurm_accounting_storage.c
+++ b/src/common/slurm_accounting_storage.c
@@ -8,32 +8,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -66,7 +66,7 @@
*/
typedef struct slurm_acct_storage_ops {
- void *(*get_conn) (bool make_agent, int conn_num,
+ void *(*get_conn) (bool make_agent, int conn_num,
bool rollback);
int (*close_conn) (void **db_conn);
int (*commit) (void *db_conn, bool commit);
@@ -145,9 +145,9 @@ typedef struct slurm_acct_storage_ops {
acct_txn_cond_t *txn_cond);
int (*get_usage) (void *db_conn, uint32_t uid,
void *in, int type,
- time_t start,
+ time_t start,
time_t end);
- int (*roll_usage) (void *db_conn,
+ int (*roll_usage) (void *db_conn,
time_t sent_start, time_t sent_end,
uint16_t archive_data);
int (*node_down) (void *db_conn,
@@ -178,11 +178,11 @@ typedef struct slurm_acct_storage_ops {
int (*job_suspend) (void *db_conn,
struct job_record *job_ptr);
List (*get_jobs_cond) (void *db_conn, uint32_t uid,
- acct_job_cond_t *job_cond);
+ acct_job_cond_t *job_cond);
int (*archive_dump) (void *db_conn,
- acct_archive_cond_t *arch_cond);
+ acct_archive_cond_t *arch_cond);
int (*archive_load) (void *db_conn,
- acct_archive_rec_t *arch_rec);
+ acct_archive_rec_t *arch_rec);
int (*update_shares_used) (void *db_conn,
List shares_used);
int (*flush_jobs) (void *db_conn,
@@ -199,7 +199,7 @@ typedef struct slurm_acct_storage_context {
} slurm_acct_storage_context_t;
static slurm_acct_storage_context_t * g_acct_storage_context = NULL;
-static pthread_mutex_t g_acct_storage_context_lock =
+static pthread_mutex_t g_acct_storage_context_lock =
PTHREAD_MUTEX_INITIALIZER;
/*
@@ -281,7 +281,7 @@ static slurm_acct_storage_ops_t * _acct_storage_get_ops(
/* Find the correct plugin. */
c->cur_plugin = plugin_load_and_link(c->acct_storage_type, n_syms, syms,
(void **) &c->ops);
- if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
+ if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
error("Couldn't find the specified plugin name for %s "
@@ -308,7 +308,7 @@ static slurm_acct_storage_ops_t * _acct_storage_get_ops(
c->cur_plugin = plugrack_use_by_type( c->plugin_list,
c->acct_storage_type );
if ( c->cur_plugin == PLUGIN_INVALID_HANDLE ) {
- error( "cannot find accounting_storage plugin for %s",
+ error( "cannot find accounting_storage plugin for %s",
c->acct_storage_type );
return NULL;
}
@@ -371,11 +371,11 @@ static int _acct_storage_context_destroy(slurm_acct_storage_context_t *c)
return rc;
}
-/*
+/*
* Comparator used for sorting immediate childern of acct_hierarchical_recs
- *
+ *
* returns: -1: assoc_a > assoc_b 0: assoc_a == assoc_b 1: assoc_a < assoc_b
- *
+ *
*/
static int _sort_childern_list(acct_hierarchical_rec_t *assoc_a,
@@ -385,13 +385,13 @@ static int _sort_childern_list(acct_hierarchical_rec_t *assoc_a,
/* first just check the lfts and rgts if a lft is inside of the
* others lft and rgt just return it is less
- */
- if(assoc_a->assoc->lft > assoc_b->assoc->lft
+ */
+ if(assoc_a->assoc->lft > assoc_b->assoc->lft
&& assoc_a->assoc->lft < assoc_b->assoc->rgt)
return 1;
/* check to see if this is a user association or an account.
- * We want the accounts at the bottom
+ * We want the accounts at the bottom
*/
if(assoc_a->assoc->user && !assoc_b->assoc->user)
return -1;
@@ -404,7 +404,7 @@ static int _sort_childern_list(acct_hierarchical_rec_t *assoc_a,
return -1;
else if (diff > 0)
return 1;
-
+
return 0;
}
@@ -446,7 +446,7 @@ static int _append_hierarchical_childern_ret_list(
while((acct_hierarchical_rec = list_next(itr))) {
list_append(ret_list, acct_hierarchical_rec->assoc);
- if(list_count(acct_hierarchical_rec->childern))
+ if(list_count(acct_hierarchical_rec->childern))
_append_hierarchical_childern_ret_list(
ret_list, acct_hierarchical_rec->childern);
}
@@ -539,7 +539,7 @@ extern void destroy_acct_accounting_rec(void *object)
extern void destroy_acct_association_rec(void *object)
{
- acct_association_rec_t *acct_association =
+ acct_association_rec_t *acct_association =
(acct_association_rec_t *)object;
if(acct_association) {
@@ -620,7 +620,7 @@ extern void destroy_acct_wckey_rec(void *object)
extern void destroy_acct_archive_rec(void *object)
{
acct_archive_rec_t *arch_rec = (acct_archive_rec_t *)object;
-
+
if(arch_rec) {
xfree(arch_rec->archive_file);
xfree(arch_rec->insert);
@@ -671,7 +671,7 @@ extern void destroy_acct_cluster_cond(void *object)
extern void destroy_acct_association_cond(void *object)
{
- acct_association_cond_t *acct_association =
+ acct_association_cond_t *acct_association =
(acct_association_cond_t *)object;
if(acct_association) {
@@ -728,7 +728,7 @@ extern void destroy_acct_association_cond(void *object)
extern void destroy_acct_job_cond(void *object)
{
- acct_job_cond_t *job_cond =
+ acct_job_cond_t *job_cond =
(acct_job_cond_t *)object;
if(job_cond) {
@@ -775,7 +775,7 @@ extern void destroy_acct_reservation_cond(void *object)
{
acct_reservation_cond_t *acct_resv = (acct_reservation_cond_t *)object;
if(acct_resv) {
- if(acct_resv->cluster_list)
+ if(acct_resv->cluster_list)
list_destroy(acct_resv->cluster_list);
if(acct_resv->id_list)
list_destroy(acct_resv->id_list);
@@ -842,13 +842,13 @@ extern void destroy_acct_archive_cond(void *object)
extern void destroy_acct_update_object(void *object)
{
- acct_update_object_t *acct_update =
+ acct_update_object_t *acct_update =
(acct_update_object_t *) object;
if(acct_update) {
- if(acct_update->objects)
+ if(acct_update->objects)
list_destroy(acct_update->objects);
-
+
xfree(acct_update);
}
}
@@ -884,7 +884,7 @@ extern void destroy_acct_hierarchical_rec(void *object)
/* Most of this is pointers to something else that will be
* destroyed elsewhere.
*/
- acct_hierarchical_rec_t *acct_hierarchical_rec =
+ acct_hierarchical_rec_t *acct_hierarchical_rec =
(acct_hierarchical_rec_t *)object;
if(acct_hierarchical_rec) {
if(acct_hierarchical_rec->childern) {
@@ -975,12 +975,12 @@ extern void pack_acct_user_rec(void *in, uint16_t rpc_version, Buf buffer)
pack32(NO_VAL, buffer);
return;
}
-
+
pack16(object->admin_level, buffer);
if(object->assoc_list)
count = list_count(object->assoc_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->assoc_list);
@@ -994,7 +994,7 @@ extern void pack_acct_user_rec(void *in, uint16_t rpc_version, Buf buffer)
if(object->coord_accts)
count = list_count(object->coord_accts);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->coord_accts);
@@ -1009,11 +1009,11 @@ extern void pack_acct_user_rec(void *in, uint16_t rpc_version, Buf buffer)
packstr(object->default_wckey, buffer);
packstr(object->name, buffer);
- pack32(object->uid, buffer);
+ pack32(object->uid, buffer);
if(object->wckey_list)
count = list_count(object->wckey_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->wckey_list);
@@ -1034,11 +1034,11 @@ extern void pack_acct_user_rec(void *in, uint16_t rpc_version, Buf buffer)
pack32(0, buffer);
return;
}
-
+
pack16(object->admin_level, buffer);
if(object->assoc_list)
count = list_count(object->assoc_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->assoc_list);
@@ -1052,7 +1052,7 @@ extern void pack_acct_user_rec(void *in, uint16_t rpc_version, Buf buffer)
if(object->coord_accts)
count = list_count(object->coord_accts);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->coord_accts);
@@ -1066,7 +1066,7 @@ extern void pack_acct_user_rec(void *in, uint16_t rpc_version, Buf buffer)
packstr(object->default_acct, buffer);
packstr(object->name, buffer);
- pack32(object->uid, buffer);
+ pack32(object->uid, buffer);
} else {
if(!object) {
pack16(0, buffer);
@@ -1078,16 +1078,16 @@ extern void pack_acct_user_rec(void *in, uint16_t rpc_version, Buf buffer)
pack32(0, buffer);
return;
}
-
+
pack16(object->admin_level, buffer);
if(object->assoc_list)
count = list_count(object->assoc_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->assoc_list);
while((assoc = list_next(itr))) {
- pack_acct_association_rec(assoc, rpc_version,
+ pack_acct_association_rec(assoc, rpc_version,
buffer);
}
list_iterator_destroy(itr);
@@ -1096,7 +1096,7 @@ extern void pack_acct_user_rec(void *in, uint16_t rpc_version, Buf buffer)
if(object->coord_accts)
count = list_count(object->coord_accts);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->coord_accts);
@@ -1113,7 +1113,7 @@ extern void pack_acct_user_rec(void *in, uint16_t rpc_version, Buf buffer)
pack32(count, buffer); // NEEDED for old qos_list
pack32(object->uid, buffer);
- }
+ }
}
extern int unpack_acct_user_rec(void **object, uint16_t rpc_version, Buf buffer)
@@ -1128,7 +1128,7 @@ extern int unpack_acct_user_rec(void **object, uint16_t rpc_version, Buf buffer)
int i;
*object = object_ptr;
-
+
if(rpc_version >= 4) {
safe_unpack16(&object_ptr->admin_level, buffer);
safe_unpack32(&count, buffer);
@@ -1148,7 +1148,7 @@ extern int unpack_acct_user_rec(void **object, uint16_t rpc_version, Buf buffer)
object_ptr->coord_accts =
list_create(destroy_acct_coord_rec);
for(i=0; i<count; i++) {
- if(unpack_acct_coord_rec((void *)&coord,
+ if(unpack_acct_coord_rec((void *)&coord,
rpc_version, buffer)
== SLURM_ERROR)
goto unpack_error;
@@ -1173,7 +1173,7 @@ extern int unpack_acct_user_rec(void **object, uint16_t rpc_version, Buf buffer)
list_append(object_ptr->wckey_list, wckey);
}
}
-
+
} else if(rpc_version >= 3) {
safe_unpack16(&object_ptr->admin_level, buffer);
safe_unpack32(&count, buffer);
@@ -1193,7 +1193,7 @@ extern int unpack_acct_user_rec(void **object, uint16_t rpc_version, Buf buffer)
object_ptr->coord_accts =
list_create(destroy_acct_coord_rec);
for(i=0; i<count; i++) {
- if(unpack_acct_coord_rec((void *)&coord,
+ if(unpack_acct_coord_rec((void *)&coord,
rpc_version, buffer)
== SLURM_ERROR)
goto unpack_error;
@@ -1223,7 +1223,7 @@ extern int unpack_acct_user_rec(void **object, uint16_t rpc_version, Buf buffer)
object_ptr->coord_accts =
list_create(destroy_acct_coord_rec);
for(i=0; i<count; i++) {
- if(unpack_acct_coord_rec((void *)&coord,
+ if(unpack_acct_coord_rec((void *)&coord,
rpc_version, buffer)
== SLURM_ERROR)
goto unpack_error;
@@ -1263,7 +1263,7 @@ extern void pack_acct_used_limits(void *in, uint16_t rpc_version, Buf buffer)
pack32(0, buffer);
return;
}
-
+
pack32(object->jobs, buffer);
pack32(object->submit_jobs, buffer);
pack32(object->uid, buffer);
@@ -1278,7 +1278,7 @@ extern void pack_acct_used_limits(void *in, uint16_t rpc_version, Buf buffer)
pack32(0, buffer);
return;
}
-
+
pack64(0, buffer);
pack32(0, buffer);
pack32(object->jobs, buffer);
@@ -1336,10 +1336,10 @@ extern void pack_acct_account_rec(void *in, uint16_t rpc_version, Buf buffer)
packnull(buffer);
return;
}
-
+
if(object->assoc_list)
count = list_count(object->assoc_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->assoc_list);
@@ -1353,7 +1353,7 @@ extern void pack_acct_account_rec(void *in, uint16_t rpc_version, Buf buffer)
if(object->coordinators)
count = list_count(object->coordinators);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->coordinators);
@@ -1377,10 +1377,10 @@ extern void pack_acct_account_rec(void *in, uint16_t rpc_version, Buf buffer)
pack32(NO_VAL, buffer);
return;
}
-
+
if(object->assoc_list)
count = list_count(object->assoc_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->assoc_list);
@@ -1394,7 +1394,7 @@ extern void pack_acct_account_rec(void *in, uint16_t rpc_version, Buf buffer)
if(object->coordinators)
count = list_count(object->coordinators);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->coordinators);
@@ -1432,7 +1432,7 @@ extern int unpack_acct_account_rec(void **object, uint16_t rpc_version,
object_ptr->assoc_list =
list_create(destroy_acct_association_rec);
for(i=0; i<count; i++) {
- if(unpack_acct_association_rec((void *)&assoc,
+ if(unpack_acct_association_rec((void *)&assoc,
rpc_version,
buffer)
== SLURM_ERROR)
@@ -1442,10 +1442,10 @@ extern int unpack_acct_account_rec(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->coordinators =
+ object_ptr->coordinators =
list_create(destroy_acct_coord_rec);
for(i=0; i<count; i++) {
- if(unpack_acct_coord_rec((void *)&coord,
+ if(unpack_acct_coord_rec((void *)&coord,
rpc_version, buffer)
== SLURM_ERROR)
goto unpack_error;
@@ -1463,7 +1463,7 @@ extern int unpack_acct_account_rec(void **object, uint16_t rpc_version,
object_ptr->assoc_list =
list_create(destroy_acct_association_rec);
for(i=0; i<count; i++) {
- if(unpack_acct_association_rec((void *)&assoc,
+ if(unpack_acct_association_rec((void *)&assoc,
rpc_version,
buffer)
== SLURM_ERROR)
@@ -1473,10 +1473,10 @@ extern int unpack_acct_account_rec(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->coordinators =
+ object_ptr->coordinators =
list_create(destroy_acct_coord_rec);
for(i=0; i<count; i++) {
- if(unpack_acct_coord_rec((void *)&coord,
+ if(unpack_acct_coord_rec((void *)&coord,
rpc_version, buffer)
== SLURM_ERROR)
goto unpack_error;
@@ -1496,7 +1496,7 @@ extern int unpack_acct_account_rec(void **object, uint16_t rpc_version,
xfree(tmp_info);
}
}
- }
+ }
return SLURM_SUCCESS;
@@ -1541,7 +1541,7 @@ extern void pack_cluster_accounting_rec(void *in, uint16_t rpc_version,
Buf buffer)
{
cluster_accounting_rec_t *object = (cluster_accounting_rec_t *)in;
-
+
if(rpc_version >= 5) {
if(!object) {
pack64(0, buffer);
@@ -1554,7 +1554,7 @@ extern void pack_cluster_accounting_rec(void *in, uint16_t rpc_version,
pack64(0, buffer);
return;
}
-
+
pack64(object->alloc_secs, buffer);
pack32(object->cpu_count, buffer);
pack64(object->down_secs, buffer);
@@ -1574,7 +1574,7 @@ extern void pack_cluster_accounting_rec(void *in, uint16_t rpc_version,
pack64(0, buffer);
return;
}
-
+
pack64(object->alloc_secs, buffer);
pack32(object->cpu_count, buffer);
pack64(object->down_secs, buffer);
@@ -1590,7 +1590,7 @@ extern int unpack_cluster_accounting_rec(void **object, uint16_t rpc_version,
{
cluster_accounting_rec_t *object_ptr =
xmalloc(sizeof(cluster_accounting_rec_t));
-
+
*object = object_ptr;
if(rpc_version >= 5) {
@@ -1611,7 +1611,7 @@ extern int unpack_cluster_accounting_rec(void **object, uint16_t rpc_version,
safe_unpack_time(&object_ptr->period_start, buffer);
safe_unpack64(&object_ptr->resv_secs, buffer);
}
-
+
return SLURM_SUCCESS;
unpack_error:
@@ -1643,7 +1643,7 @@ extern void pack_acct_cluster_rec(void *in, uint16_t rpc_version, Buf buffer)
pack16(0, buffer);
return;
}
-
+
if(object->accounting_list)
count = list_count(object->accounting_list);
@@ -1685,7 +1685,7 @@ extern void pack_acct_cluster_rec(void *in, uint16_t rpc_version, Buf buffer)
pack16(0, buffer);
return;
}
-
+
if(object->accounting_list)
count = list_count(object->accounting_list);
@@ -1728,7 +1728,7 @@ extern void pack_acct_cluster_rec(void *in, uint16_t rpc_version, Buf buffer)
pack16(0, buffer);
return;
}
-
+
if(object->accounting_list)
count = list_count(object->accounting_list);
@@ -1761,7 +1761,7 @@ extern void pack_acct_cluster_rec(void *in, uint16_t rpc_version, Buf buffer)
}
packstr(object->name, buffer);
- }
+ }
}
extern int unpack_acct_cluster_rec(void **object, uint16_t rpc_version,
@@ -1799,7 +1799,7 @@ extern int unpack_acct_cluster_rec(void **object, uint16_t rpc_version,
safe_unpackstr_xmalloc(&object_ptr->nodes, &uint32_tmp, buffer);
if(unpack_acct_association_rec(
- (void **)&object_ptr->root_assoc,
+ (void **)&object_ptr->root_assoc,
rpc_version, buffer)
== SLURM_ERROR)
goto unpack_error;
@@ -1828,7 +1828,7 @@ extern int unpack_acct_cluster_rec(void **object, uint16_t rpc_version,
safe_unpack32(&count, buffer); /* for defunt valid_qos_list */
if(unpack_acct_association_rec(
- (void **)&object_ptr->root_assoc,
+ (void **)&object_ptr->root_assoc,
rpc_version, buffer)
== SLURM_ERROR)
goto unpack_error;
@@ -1850,7 +1850,7 @@ extern int unpack_acct_cluster_rec(void **object, uint16_t rpc_version,
safe_unpackstr_xmalloc(&object_ptr->control_host,
&uint32_tmp, buffer);
safe_unpack32(&object_ptr->control_port, buffer);
- object_ptr->root_assoc =
+ object_ptr->root_assoc =
xmalloc(sizeof(acct_association_rec_t));
init_acct_association_rec(object_ptr->root_assoc);
safe_unpack32(&object_ptr->root_assoc->shares_raw, buffer);
@@ -1865,7 +1865,7 @@ extern int unpack_acct_cluster_rec(void **object, uint16_t rpc_version,
before we started checking .
*/
object_ptr->rpc_version = 2;
- }
+ }
return SLURM_SUCCESS;
unpack_error:
@@ -1877,17 +1877,17 @@ unpack_error:
extern void pack_acct_accounting_rec(void *in, uint16_t rpc_version, Buf buffer)
{
acct_accounting_rec_t *object = (acct_accounting_rec_t *)in;
-
+
if(!object) {
pack64(0, buffer);
pack32(0, buffer);
pack_time(0, buffer);
return;
}
-
+
pack64(object->alloc_secs, buffer);
pack32(object->id, buffer);
- pack_time(object->period_start, buffer);
+ pack_time(object->period_start, buffer);
}
extern int unpack_acct_accounting_rec(void **object, uint16_t rpc_version,
@@ -1895,13 +1895,13 @@ extern int unpack_acct_accounting_rec(void **object, uint16_t rpc_version,
{
acct_accounting_rec_t *object_ptr =
xmalloc(sizeof(acct_accounting_rec_t));
-
+
*object = object_ptr;
-
+
safe_unpack64(&object_ptr->alloc_secs, buffer);
safe_unpack32(&object_ptr->id, buffer);
- safe_unpack_time(&object_ptr->period_start, buffer);
-
+ safe_unpack_time(&object_ptr->period_start, buffer);
+
return SLURM_SUCCESS;
unpack_error:
@@ -1910,15 +1910,15 @@ unpack_error:
return SLURM_ERROR;
}
-extern void pack_acct_association_rec(void *in, uint16_t rpc_version,
+extern void pack_acct_association_rec(void *in, uint16_t rpc_version,
Buf buffer)
{
acct_accounting_rec_t *acct_info = NULL;
ListIterator itr = NULL;
uint32_t count = NO_VAL;
char *tmp_info = NULL;
- acct_association_rec_t *object = (acct_association_rec_t *)in;
-
+ acct_association_rec_t *object = (acct_association_rec_t *)in;
+
if (rpc_version >= 4) {
if(!object) {
pack32(NO_VAL, buffer);
@@ -1956,7 +1956,7 @@ extern void pack_acct_association_rec(void *in, uint16_t rpc_version,
packnull(buffer);
return;
}
-
+
if(object->accounting_list)
count = list_count(object->accounting_list);
@@ -1965,7 +1965,7 @@ extern void pack_acct_association_rec(void *in, uint16_t rpc_version,
if(count && count != NO_VAL) {
itr = list_iterator_create(object->accounting_list);
while((acct_info = list_next(itr))) {
- pack_acct_accounting_rec(acct_info,
+ pack_acct_accounting_rec(acct_info,
rpc_version, buffer);
}
list_iterator_destroy(itr);
@@ -2018,7 +2018,7 @@ extern void pack_acct_association_rec(void *in, uint16_t rpc_version,
pack32(object->rgt, buffer);
pack32(object->uid, buffer);
- packstr(object->user, buffer);
+ packstr(object->user, buffer);
} else if (rpc_version == 3) {
if(!object) {
pack32(NO_VAL, buffer);
@@ -2058,7 +2058,7 @@ extern void pack_acct_association_rec(void *in, uint16_t rpc_version,
packnull(buffer);
return;
}
-
+
if(object->accounting_list)
count = list_count(object->accounting_list);
@@ -2067,7 +2067,7 @@ extern void pack_acct_association_rec(void *in, uint16_t rpc_version,
if(count && count != NO_VAL) {
itr = list_iterator_create(object->accounting_list);
while((acct_info = list_next(itr))) {
- pack_acct_accounting_rec(acct_info,
+ pack_acct_accounting_rec(acct_info,
rpc_version, buffer);
}
list_iterator_destroy(itr);
@@ -2120,7 +2120,7 @@ extern void pack_acct_association_rec(void *in, uint16_t rpc_version,
/* used shares which is taken out in 4 */
pack32(0, buffer);
- packstr(object->user, buffer);
+ packstr(object->user, buffer);
} else {
if(!object) {
pack32(NO_VAL, buffer);
@@ -2148,7 +2148,7 @@ extern void pack_acct_association_rec(void *in, uint16_t rpc_version,
packnull(buffer);
return;
}
-
+
if(object->accounting_list)
count = list_count(object->accounting_list);
@@ -2157,7 +2157,7 @@ extern void pack_acct_association_rec(void *in, uint16_t rpc_version,
if(count && count != NO_VAL) {
itr = list_iterator_create(object->accounting_list);
while((acct_info = list_next(itr))) {
- pack_acct_accounting_rec(acct_info,
+ pack_acct_accounting_rec(acct_info,
rpc_version, buffer);
}
list_iterator_destroy(itr);
@@ -2181,8 +2181,8 @@ extern void pack_acct_association_rec(void *in, uint16_t rpc_version,
/* used shares which is taken out in 4 */
pack32(0, buffer);
- packstr(object->user, buffer);
- }
+ packstr(object->user, buffer);
+ }
}
extern int unpack_acct_association_rec(void **object, uint16_t rpc_version,
@@ -2192,7 +2192,7 @@ extern int unpack_acct_association_rec(void **object, uint16_t rpc_version,
int i;
uint32_t count;
char *tmp_info = NULL;
- acct_association_rec_t *object_ptr =
+ acct_association_rec_t *object_ptr =
xmalloc(sizeof(acct_association_rec_t));
acct_accounting_rec_t *acct_info = NULL;
@@ -2208,10 +2208,10 @@ extern int unpack_acct_association_rec(void **object, uint16_t rpc_version,
for(i=0; i<count; i++) {
if(unpack_acct_accounting_rec(
(void **)&acct_info,
- rpc_version,
+ rpc_version,
buffer) == SLURM_ERROR)
goto unpack_error;
- list_append(object_ptr->accounting_list,
+ list_append(object_ptr->accounting_list,
acct_info);
}
}
@@ -2269,10 +2269,10 @@ extern int unpack_acct_association_rec(void **object, uint16_t rpc_version,
for(i=0; i<count; i++) {
if(unpack_acct_accounting_rec(
(void **)&acct_info,
- rpc_version,
+ rpc_version,
buffer) == SLURM_ERROR)
goto unpack_error;
- list_append(object_ptr->accounting_list,
+ list_append(object_ptr->accounting_list,
acct_info);
}
}
@@ -2333,10 +2333,10 @@ extern int unpack_acct_association_rec(void **object, uint16_t rpc_version,
for(i=0; i<count; i++) {
if(unpack_acct_accounting_rec(
(void **)&acct_info,
- rpc_version,
+ rpc_version,
buffer) == SLURM_ERROR)
goto unpack_error;
- list_append(object_ptr->accounting_list,
+ list_append(object_ptr->accounting_list,
acct_info);
}
}
@@ -2359,7 +2359,7 @@ extern int unpack_acct_association_rec(void **object, uint16_t rpc_version,
safe_unpack32(&object_ptr->parent_id, buffer);
safe_unpackstr_xmalloc(&object_ptr->partition, &uint32_tmp,
buffer);
-
+
safe_unpack32(&object_ptr->rgt, buffer);
safe_unpack32(&object_ptr->uid, buffer);
@@ -2367,7 +2367,7 @@ extern int unpack_acct_association_rec(void **object, uint16_t rpc_version,
safe_unpack32(&uint32_tmp, buffer);
safe_unpackstr_xmalloc(&object_ptr->user, &uint32_tmp, buffer);
- }
+ }
return SLURM_SUCCESS;
@@ -2380,10 +2380,10 @@ unpack_error:
extern void pack_acct_qos_rec(void *in, uint16_t rpc_version, Buf buffer)
{
ListIterator itr = NULL;
- acct_qos_rec_t *object = (acct_qos_rec_t *)in;
+ acct_qos_rec_t *object = (acct_qos_rec_t *)in;
uint32_t count = NO_VAL;
char *tmp_info = NULL;
-
+
if(rpc_version >= 6) {
if(!object) {
packnull(buffer);
@@ -2414,7 +2414,7 @@ extern void pack_acct_qos_rec(void *in, uint16_t rpc_version, Buf buffer)
packdouble(NO_VAL, buffer);
return;
}
- packstr(object->description, buffer);
+ packstr(object->description, buffer);
pack32(object->id, buffer);
pack64(object->grp_cpu_mins, buffer);
@@ -2431,10 +2431,10 @@ extern void pack_acct_qos_rec(void *in, uint16_t rpc_version, Buf buffer)
pack32(object->max_submit_jobs_pu, buffer);
pack32(object->max_wall_pj, buffer);
- packstr(object->name, buffer);
+ packstr(object->name, buffer);
pack_bit_str(object->preempt_bitstr, buffer);
-
+
if(object->preempt_list)
count = list_count(object->preempt_list);
@@ -2450,7 +2450,7 @@ extern void pack_acct_qos_rec(void *in, uint16_t rpc_version, Buf buffer)
count = NO_VAL;
pack32(object->priority, buffer);
-
+
packdouble(object->usage_factor, buffer);
} else if(rpc_version >= 5) {
if(!object) {
@@ -2484,7 +2484,7 @@ extern void pack_acct_qos_rec(void *in, uint16_t rpc_version, Buf buffer)
pack32(NO_VAL, buffer);
return;
}
- packstr(object->description, buffer);
+ packstr(object->description, buffer);
pack32(object->id, buffer);
pack64(object->grp_cpu_mins, buffer);
@@ -2501,7 +2501,7 @@ extern void pack_acct_qos_rec(void *in, uint16_t rpc_version, Buf buffer)
pack32(object->max_submit_jobs_pu, buffer);
pack32(object->max_wall_pj, buffer);
- packstr(object->name, buffer);
+ packstr(object->name, buffer);
/* These are here for the old preemptee preemptor
lists we could figure this out from the
@@ -2509,9 +2509,9 @@ extern void pack_acct_qos_rec(void *in, uint16_t rpc_version, Buf buffer)
before rpc_version 6 so just send NO_VALS */
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
-
+
pack32(object->priority, buffer);
-
+
packdouble(object->usage_factor, buffer);
if(object->user_limit_list)
@@ -2559,7 +2559,7 @@ extern void pack_acct_qos_rec(void *in, uint16_t rpc_version, Buf buffer)
pack32(NO_VAL, buffer);
return;
}
- packstr(object->description, buffer);
+ packstr(object->description, buffer);
pack32(object->id, buffer);
pack64(object->grp_cpu_mins, buffer);
@@ -2576,7 +2576,7 @@ extern void pack_acct_qos_rec(void *in, uint16_t rpc_version, Buf buffer)
pack32(object->max_submit_jobs_pu, buffer);
pack32(object->max_wall_pj, buffer);
- packstr(object->name, buffer);
+ packstr(object->name, buffer);
/* These are here for the old preemptee preemptor
lists we could figure this out from the
@@ -2584,9 +2584,9 @@ extern void pack_acct_qos_rec(void *in, uint16_t rpc_version, Buf buffer)
before rpc_version 6 so just send NO_VALS */
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
-
+
pack32(object->priority, buffer);
-
+
if(object->user_limit_list)
count = list_count(object->user_limit_list);
@@ -2609,10 +2609,10 @@ extern void pack_acct_qos_rec(void *in, uint16_t rpc_version, Buf buffer)
packnull(buffer);
return;
}
- packstr(object->description, buffer);
+ packstr(object->description, buffer);
pack32(object->id, buffer);
- packstr(object->name, buffer);
- }
+ packstr(object->name, buffer);
+ }
}
extern int unpack_acct_qos_rec(void **object, uint16_t rpc_version, Buf buffer)
@@ -2624,7 +2624,7 @@ extern int unpack_acct_qos_rec(void **object, uint16_t rpc_version, Buf buffer)
char *tmp_info = NULL;
*object = object_ptr;
-
+
init_acct_qos_rec(object_ptr);
if(rpc_version >= 6) {
@@ -2652,7 +2652,7 @@ extern int unpack_acct_qos_rec(void **object, uint16_t rpc_version, Buf buffer)
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->preempt_list =
+ object_ptr->preempt_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -2661,7 +2661,7 @@ extern int unpack_acct_qos_rec(void **object, uint16_t rpc_version, Buf buffer)
tmp_info);
}
}
-
+
safe_unpack32(&object_ptr->priority, buffer);
safe_unpackdouble(&object_ptr->usage_factor, buffer);
@@ -2688,7 +2688,7 @@ extern int unpack_acct_qos_rec(void **object, uint16_t rpc_version, Buf buffer)
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->preempt_list =
+ object_ptr->preempt_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -2718,7 +2718,7 @@ extern int unpack_acct_qos_rec(void **object, uint16_t rpc_version, Buf buffer)
if(count != NO_VAL) {
void *used_limits = NULL;
- object_ptr->user_limit_list =
+ object_ptr->user_limit_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
unpack_acct_used_limits(&used_limits,
@@ -2751,7 +2751,7 @@ extern int unpack_acct_qos_rec(void **object, uint16_t rpc_version, Buf buffer)
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->preempt_list =
+ object_ptr->preempt_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -2779,7 +2779,7 @@ extern int unpack_acct_qos_rec(void **object, uint16_t rpc_version, Buf buffer)
if(count != NO_VAL) {
void *used_limits = NULL;
- object_ptr->user_limit_list =
+ object_ptr->user_limit_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
unpack_acct_used_limits(&used_limits,
@@ -2825,7 +2825,7 @@ extern void pack_acct_reservation_rec(void *in, uint16_t rpc_version,
pack_time(0, buffer);
return;
}
-
+
pack64(object->alloc_secs, buffer);
packstr(object->assocs, buffer);
packstr(object->cluster, buffer);
@@ -2837,15 +2837,15 @@ extern void pack_acct_reservation_rec(void *in, uint16_t rpc_version,
packstr(object->nodes, buffer);
packstr(object->node_inx, buffer);
pack_time(object->time_end, buffer);
- pack_time(object->time_start, buffer);
- pack_time(object->time_start_prev, buffer);
+ pack_time(object->time_start, buffer);
+ pack_time(object->time_start_prev, buffer);
}
extern int unpack_acct_reservation_rec(void **object, uint16_t rpc_version,
Buf buffer)
{
uint32_t uint32_tmp;
- acct_reservation_rec_t *object_ptr =
+ acct_reservation_rec_t *object_ptr =
xmalloc(sizeof(acct_reservation_rec_t));
*object = object_ptr;
@@ -2861,8 +2861,8 @@ extern int unpack_acct_reservation_rec(void **object, uint16_t rpc_version,
safe_unpackstr_xmalloc(&object_ptr->nodes, &uint32_tmp, buffer);
safe_unpackstr_xmalloc(&object_ptr->node_inx, &uint32_tmp, buffer);
safe_unpack_time(&object_ptr->time_end, buffer);
- safe_unpack_time(&object_ptr->time_start, buffer);
- safe_unpack_time(&object_ptr->time_start_prev, buffer);
+ safe_unpack_time(&object_ptr->time_start, buffer);
+ safe_unpack_time(&object_ptr->time_start_prev, buffer);
return SLURM_SUCCESS;
@@ -2874,8 +2874,8 @@ unpack_error:
extern void pack_acct_txn_rec(void *in, uint16_t rpc_version, Buf buffer)
{
- acct_txn_rec_t *object = (acct_txn_rec_t *)in;
-
+ acct_txn_rec_t *object = (acct_txn_rec_t *)in;
+
if(rpc_version >= 3) {
if(!object) {
packnull(buffer);
@@ -2889,7 +2889,7 @@ extern void pack_acct_txn_rec(void *in, uint16_t rpc_version, Buf buffer)
packnull(buffer);
return;
}
-
+
packstr(object->accts, buffer);
pack16(object->action, buffer);
packstr(object->actor_name, buffer);
@@ -2909,14 +2909,14 @@ extern void pack_acct_txn_rec(void *in, uint16_t rpc_version, Buf buffer)
packnull(buffer);
return;
}
-
+
pack16(object->action, buffer);
packstr(object->actor_name, buffer);
pack32(object->id, buffer);
packstr(object->set_info, buffer);
pack_time(object->timestamp, buffer);
packstr(object->where_query, buffer);
- }
+ }
}
extern int unpack_acct_txn_rec(void **object, uint16_t rpc_version, Buf buffer)
@@ -2926,24 +2926,24 @@ extern int unpack_acct_txn_rec(void **object, uint16_t rpc_version, Buf buffer)
*object = object_ptr;
if (rpc_version >= 3) {
- safe_unpackstr_xmalloc(&object_ptr->accts,
+ safe_unpackstr_xmalloc(&object_ptr->accts,
&uint32_tmp, buffer);
safe_unpack16(&object_ptr->action, buffer);
- safe_unpackstr_xmalloc(&object_ptr->actor_name,
+ safe_unpackstr_xmalloc(&object_ptr->actor_name,
&uint32_tmp, buffer);
- safe_unpackstr_xmalloc(&object_ptr->clusters,
+ safe_unpackstr_xmalloc(&object_ptr->clusters,
&uint32_tmp, buffer);
safe_unpack32(&object_ptr->id, buffer);
safe_unpackstr_xmalloc(&object_ptr->set_info,
&uint32_tmp, buffer);
safe_unpack_time(&object_ptr->timestamp, buffer);
- safe_unpackstr_xmalloc(&object_ptr->users,
+ safe_unpackstr_xmalloc(&object_ptr->users,
&uint32_tmp, buffer);
safe_unpackstr_xmalloc(&object_ptr->where_query,
- &uint32_tmp, buffer);
+ &uint32_tmp, buffer);
} else {
safe_unpack16(&object_ptr->action, buffer);
- safe_unpackstr_xmalloc(&object_ptr->actor_name,
+ safe_unpackstr_xmalloc(&object_ptr->actor_name,
&uint32_tmp, buffer);
safe_unpack32(&object_ptr->id, buffer);
safe_unpackstr_xmalloc(&object_ptr->set_info,
@@ -2951,7 +2951,7 @@ extern int unpack_acct_txn_rec(void **object, uint16_t rpc_version, Buf buffer)
safe_unpack_time(&object_ptr->timestamp, buffer);
safe_unpackstr_xmalloc(&object_ptr->where_query,
&uint32_tmp, buffer);
- }
+ }
return SLURM_SUCCESS;
unpack_error:
@@ -2966,8 +2966,8 @@ extern void pack_acct_wckey_rec(void *in, uint16_t rpc_version, Buf buffer)
acct_accounting_rec_t *acct_info = NULL;
ListIterator itr = NULL;
uint32_t count = NO_VAL;
- acct_wckey_rec_t *object = (acct_wckey_rec_t *)in;
-
+ acct_wckey_rec_t *object = (acct_wckey_rec_t *)in;
+
if(!object) {
pack32(NO_VAL, buffer);
@@ -2982,7 +2982,7 @@ extern void pack_acct_wckey_rec(void *in, uint16_t rpc_version, Buf buffer)
packnull(buffer);
return;
}
-
+
if(object->accounting_list)
count = list_count(object->accounting_list);
@@ -2991,7 +2991,7 @@ extern void pack_acct_wckey_rec(void *in, uint16_t rpc_version, Buf buffer)
if(count && count != NO_VAL) {
itr = list_iterator_create(object->accounting_list);
while((acct_info = list_next(itr))) {
- pack_acct_accounting_rec(acct_info,
+ pack_acct_accounting_rec(acct_info,
rpc_version, buffer);
}
list_iterator_destroy(itr);
@@ -3002,11 +3002,11 @@ extern void pack_acct_wckey_rec(void *in, uint16_t rpc_version, Buf buffer)
pack32(object->id, buffer);
- packstr(object->name, buffer);
+ packstr(object->name, buffer);
pack32(object->uid, buffer);
- packstr(object->user, buffer);
+ packstr(object->user, buffer);
}
extern int unpack_acct_wckey_rec(void **object, uint16_t rpc_version,
@@ -3015,7 +3015,7 @@ extern int unpack_acct_wckey_rec(void **object, uint16_t rpc_version,
uint32_t uint32_tmp;
int i;
uint32_t count;
- acct_wckey_rec_t *object_ptr =
+ acct_wckey_rec_t *object_ptr =
xmalloc(sizeof(acct_wckey_rec_t));
acct_accounting_rec_t *acct_info = NULL;
@@ -3028,25 +3028,25 @@ extern int unpack_acct_wckey_rec(void **object, uint16_t rpc_version,
for(i=0; i<count; i++) {
if(unpack_acct_accounting_rec(
(void **)&acct_info,
- rpc_version,
+ rpc_version,
buffer) == SLURM_ERROR)
goto unpack_error;
- list_append(object_ptr->accounting_list,
+ list_append(object_ptr->accounting_list,
acct_info);
}
}
-
+
safe_unpackstr_xmalloc(&object_ptr->cluster, &uint32_tmp,
buffer);
-
+
safe_unpack32(&object_ptr->id, buffer);
safe_unpackstr_xmalloc(&object_ptr->name, &uint32_tmp, buffer);
safe_unpack32(&object_ptr->uid, buffer);
-
+
safe_unpackstr_xmalloc(&object_ptr->user, &uint32_tmp, buffer);
-
+
return SLURM_SUCCESS;
unpack_error:
@@ -3057,8 +3057,8 @@ unpack_error:
extern void pack_acct_archive_rec(void *in, uint16_t rpc_version, Buf buffer)
{
- acct_archive_rec_t *object = (acct_archive_rec_t *)in;
-
+ acct_archive_rec_t *object = (acct_archive_rec_t *)in;
+
if(!object) {
packnull(buffer);
packnull(buffer);
@@ -3073,7 +3073,7 @@ extern int unpack_acct_archive_rec(void **object, uint16_t rpc_version,
Buf buffer)
{
uint32_t uint32_tmp;
- acct_archive_rec_t *object_ptr =
+ acct_archive_rec_t *object_ptr =
xmalloc(sizeof(acct_archive_rec_t));
*object = object_ptr;
@@ -3109,12 +3109,12 @@ extern void pack_acct_user_cond(void *in, uint16_t rpc_version, Buf buffer)
pack16(0, buffer);
return;
}
-
+
pack16(object->admin_level, buffer);
- pack_acct_association_cond(object->assoc_cond,
+ pack_acct_association_cond(object->assoc_cond,
rpc_version, buffer);
-
+
if(object->def_acct_list)
count = list_count(object->def_acct_list);
@@ -3157,12 +3157,12 @@ extern void pack_acct_user_cond(void *in, uint16_t rpc_version, Buf buffer)
pack16(0, buffer);
return;
}
-
+
pack16(object->admin_level, buffer);
- pack_acct_association_cond(object->assoc_cond,
+ pack_acct_association_cond(object->assoc_cond,
rpc_version, buffer);
-
+
if(object->def_acct_list)
count = list_count(object->def_acct_list);
@@ -3191,12 +3191,12 @@ extern void pack_acct_user_cond(void *in, uint16_t rpc_version, Buf buffer)
pack16(0, buffer);
return;
}
-
+
pack16(object->admin_level, buffer);
- pack_acct_association_cond(object->assoc_cond,
+ pack_acct_association_cond(object->assoc_cond,
rpc_version, buffer);
-
+
if(object->def_acct_list)
count = list_count(object->def_acct_list);
@@ -3216,10 +3216,10 @@ extern void pack_acct_user_cond(void *in, uint16_t rpc_version, Buf buffer)
pack16(object->with_assocs, buffer);
pack16(object->with_coords, buffer);
pack16(object->with_deleted, buffer);
- }
+ }
}
-extern int unpack_acct_user_cond(void **object, uint16_t rpc_version,
+extern int unpack_acct_user_cond(void **object, uint16_t rpc_version,
Buf buffer)
{
uint32_t uint32_tmp;
@@ -3232,15 +3232,15 @@ extern int unpack_acct_user_cond(void **object, uint16_t rpc_version,
if(rpc_version >= 4) {
safe_unpack16(&object_ptr->admin_level, buffer);
-
+
if(unpack_acct_association_cond(
(void **)&object_ptr->assoc_cond,
rpc_version, buffer) == SLURM_ERROR)
goto unpack_error;
-
+
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->def_acct_list =
+ object_ptr->def_acct_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
@@ -3252,7 +3252,7 @@ extern int unpack_acct_user_cond(void **object, uint16_t rpc_version,
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->def_wckey_list =
+ object_ptr->def_wckey_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
@@ -3267,15 +3267,15 @@ extern int unpack_acct_user_cond(void **object, uint16_t rpc_version,
safe_unpack16(&object_ptr->with_wckeys, buffer);
} else if(rpc_version >= 3) {
safe_unpack16(&object_ptr->admin_level, buffer);
-
+
if(unpack_acct_association_cond(
(void **)&object_ptr->assoc_cond,
rpc_version, buffer) == SLURM_ERROR)
goto unpack_error;
-
+
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->def_acct_list =
+ object_ptr->def_acct_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
@@ -3289,15 +3289,15 @@ extern int unpack_acct_user_cond(void **object, uint16_t rpc_version,
safe_unpack16(&object_ptr->with_deleted, buffer);
} else {
safe_unpack16(&object_ptr->admin_level, buffer);
-
+
if(unpack_acct_association_cond(
(void **)&object_ptr->assoc_cond,
rpc_version, buffer) == SLURM_ERROR)
goto unpack_error;
-
+
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->def_acct_list =
+ object_ptr->def_acct_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
@@ -3311,9 +3311,9 @@ extern int unpack_acct_user_cond(void **object, uint16_t rpc_version,
safe_unpack16(&object_ptr->with_assocs, buffer);
safe_unpack16(&object_ptr->with_coords, buffer);
safe_unpack16(&object_ptr->with_deleted, buffer);
- }
+ }
return SLURM_SUCCESS;
-
+
unpack_error:
destroy_acct_user_cond(object_ptr);
*object = NULL;
@@ -3339,13 +3339,13 @@ extern void pack_acct_account_cond(void *in, uint16_t rpc_version, Buf buffer)
}
pack_acct_association_cond(object->assoc_cond,
rpc_version, buffer);
-
+
count = NO_VAL;
if(object->description_list)
count = list_count(object->description_list);
-
+
pack32(count, buffer);
-
+
if(count && count != NO_VAL) {
itr = list_iterator_create(object->description_list);
while((tmp_info = list_next(itr))) {
@@ -3354,12 +3354,12 @@ extern void pack_acct_account_cond(void *in, uint16_t rpc_version, Buf buffer)
list_iterator_destroy(itr);
}
count = NO_VAL;
-
+
if(object->organization_list)
count = list_count(object->organization_list);
-
+
pack32(count, buffer);
-
+
if(count && count != NO_VAL) {
itr = list_iterator_create(object->organization_list);
while((tmp_info = list_next(itr))) {
@@ -3368,10 +3368,10 @@ extern void pack_acct_account_cond(void *in, uint16_t rpc_version, Buf buffer)
list_iterator_destroy(itr);
}
count = NO_VAL;
-
+
pack16(object->with_assocs, buffer);
pack16(object->with_coords, buffer);
- pack16(object->with_deleted, buffer);
+ pack16(object->with_deleted, buffer);
} else {
if(!object) {
pack_acct_association_cond(NULL, rpc_version, buffer);
@@ -3385,13 +3385,13 @@ extern void pack_acct_account_cond(void *in, uint16_t rpc_version, Buf buffer)
}
pack_acct_association_cond(object->assoc_cond,
rpc_version, buffer);
-
+
count = NO_VAL;
if(object->description_list)
count = list_count(object->description_list);
-
+
pack32(count, buffer);
-
+
if(count && count != NO_VAL) {
itr = list_iterator_create(object->description_list);
while((tmp_info = list_next(itr))) {
@@ -3400,12 +3400,12 @@ extern void pack_acct_account_cond(void *in, uint16_t rpc_version, Buf buffer)
list_iterator_destroy(itr);
}
count = NO_VAL;
-
+
if(object->organization_list)
count = list_count(object->organization_list);
-
+
pack32(count, buffer);
-
+
if(count && count != NO_VAL) {
itr = list_iterator_create(object->organization_list);
while((tmp_info = list_next(itr))) {
@@ -3414,13 +3414,13 @@ extern void pack_acct_account_cond(void *in, uint16_t rpc_version, Buf buffer)
list_iterator_destroy(itr);
}
count = NO_VAL;
-
+
pack32(count, buffer);
-
+
pack16(object->with_assocs, buffer);
pack16(object->with_coords, buffer);
pack16(object->with_deleted, buffer);
- }
+ }
}
extern int unpack_acct_account_cond(void **object, uint16_t rpc_version,
@@ -3439,10 +3439,10 @@ extern int unpack_acct_account_cond(void **object, uint16_t rpc_version,
(void **)&object_ptr->assoc_cond,
rpc_version, buffer) == SLURM_ERROR)
goto unpack_error;
-
+
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->description_list =
+ object_ptr->description_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
@@ -3453,7 +3453,7 @@ extern int unpack_acct_account_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->organization_list =
+ object_ptr->organization_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
@@ -3471,10 +3471,10 @@ extern int unpack_acct_account_cond(void **object, uint16_t rpc_version,
(void **)&object_ptr->assoc_cond,
rpc_version, buffer) == SLURM_ERROR)
goto unpack_error;
-
+
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->description_list =
+ object_ptr->description_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
@@ -3485,7 +3485,7 @@ extern int unpack_acct_account_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->organization_list =
+ object_ptr->organization_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
@@ -3498,7 +3498,7 @@ extern int unpack_acct_account_cond(void **object, uint16_t rpc_version,
safe_unpack16(&object_ptr->with_assocs, buffer);
safe_unpack16(&object_ptr->with_coords, buffer);
safe_unpack16(&object_ptr->with_deleted, buffer);
- }
+ }
return SLURM_SUCCESS;
unpack_error:
@@ -3526,12 +3526,12 @@ extern void pack_acct_cluster_cond(void *in, uint16_t rpc_version, Buf buffer)
}
pack16(object->classification, buffer);
-
+
if(object->cluster_list)
count = list_count(object->cluster_list);
-
+
pack32(count, buffer);
-
+
if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
while((tmp_info = list_next(itr))) {
@@ -3540,10 +3540,10 @@ extern void pack_acct_cluster_cond(void *in, uint16_t rpc_version, Buf buffer)
list_iterator_destroy(itr);
}
count = NO_VAL;
-
+
pack_time(object->usage_end, buffer);
pack_time(object->usage_start, buffer);
-
+
pack16(object->with_usage, buffer);
pack16(object->with_deleted, buffer);
} else {
@@ -3555,12 +3555,12 @@ extern void pack_acct_cluster_cond(void *in, uint16_t rpc_version, Buf buffer)
pack16(0, buffer);
return;
}
-
+
if(object->cluster_list)
count = list_count(object->cluster_list);
-
+
pack32(count, buffer);
-
+
if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
while((tmp_info = list_next(itr))) {
@@ -3569,16 +3569,16 @@ extern void pack_acct_cluster_cond(void *in, uint16_t rpc_version, Buf buffer)
list_iterator_destroy(itr);
}
count = NO_VAL;
-
+
pack32(object->usage_end, buffer);
pack32(object->usage_start, buffer);
-
+
pack16(object->with_usage, buffer);
pack16(object->with_deleted, buffer);
- }
+ }
}
-extern int unpack_acct_cluster_cond(void **object, uint16_t rpc_version,
+extern int unpack_acct_cluster_cond(void **object, uint16_t rpc_version,
Buf buffer)
{
uint32_t uint32_tmp;
@@ -3633,7 +3633,7 @@ unpack_error:
return SLURM_ERROR;
}
-extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
+extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
Buf buffer)
{
char *tmp_info = NULL;
@@ -3667,7 +3667,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
-
+
pack32(NO_VAL, buffer);
pack_time(0, buffer);
@@ -3686,7 +3686,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->acct_list)
count = list_count(object->acct_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->acct_list);
@@ -3699,7 +3699,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->cluster_list)
count = list_count(object->cluster_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
@@ -3712,7 +3712,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->fairshare_list)
count = list_count(object->fairshare_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->fairshare_list);
@@ -3725,7 +3725,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->grp_cpu_mins_list)
count = list_count(object->grp_cpu_mins_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_cpu_mins_list);
@@ -3738,7 +3738,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->grp_cpus_list)
count = list_count(object->grp_cpus_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_cpus_list);
@@ -3751,7 +3751,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->grp_jobs_list)
count = list_count(object->grp_jobs_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_jobs_list);
@@ -3764,7 +3764,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->grp_nodes_list)
count = list_count(object->grp_nodes_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_nodes_list);
@@ -3777,7 +3777,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->grp_submit_jobs_list)
count = list_count(object->grp_submit_jobs_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(
@@ -3791,7 +3791,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->grp_wall_list)
count = list_count(object->grp_wall_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_wall_list);
@@ -3804,7 +3804,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->id_list)
count = list_count(object->id_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->id_list);
@@ -3816,7 +3816,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->max_cpu_mins_pj_list)
count = list_count(object->max_cpu_mins_pj_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(
@@ -3829,7 +3829,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
count = NO_VAL;
if(object->max_cpus_pj_list)
count = list_count(object->max_cpus_pj_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->max_cpus_pj_list);
@@ -3841,7 +3841,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
count = NO_VAL;
if(object->max_jobs_list)
count = list_count(object->max_jobs_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->max_jobs_list);
@@ -3853,7 +3853,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
count = NO_VAL;
if(object->max_nodes_pj_list)
count = list_count(object->max_nodes_pj_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->max_nodes_pj_list);
@@ -3865,7 +3865,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
count = NO_VAL;
if(object->max_submit_jobs_list)
count = list_count(object->max_submit_jobs_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(
@@ -3878,7 +3878,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
count = NO_VAL;
if(object->max_wall_pj_list)
count = list_count(object->max_wall_pj_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->max_wall_pj_list);
@@ -3888,10 +3888,10 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
list_iterator_destroy(itr);
}
count = NO_VAL;
-
+
if(object->partition_list)
count = list_count(object->partition_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->partition_list);
@@ -3904,7 +3904,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->parent_acct_list)
count = list_count(object->parent_acct_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->parent_acct_list);
@@ -3934,7 +3934,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->user_list)
count = list_count(object->user_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->user_list);
@@ -3976,7 +3976,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
-
+
pack32(NO_VAL, buffer);
pack32(0, buffer);
@@ -3995,7 +3995,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->acct_list)
count = list_count(object->acct_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->acct_list);
@@ -4008,7 +4008,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->cluster_list)
count = list_count(object->cluster_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
@@ -4021,7 +4021,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->fairshare_list)
count = list_count(object->fairshare_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->fairshare_list);
@@ -4034,7 +4034,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->grp_cpu_mins_list)
count = list_count(object->grp_cpu_mins_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_cpu_mins_list);
@@ -4047,7 +4047,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->grp_cpus_list)
count = list_count(object->grp_cpus_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_cpus_list);
@@ -4060,7 +4060,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->grp_jobs_list)
count = list_count(object->grp_jobs_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_jobs_list);
@@ -4073,7 +4073,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->grp_nodes_list)
count = list_count(object->grp_nodes_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_nodes_list);
@@ -4086,7 +4086,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->grp_submit_jobs_list)
count = list_count(object->grp_submit_jobs_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(
@@ -4100,7 +4100,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->grp_wall_list)
count = list_count(object->grp_wall_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_wall_list);
@@ -4113,7 +4113,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->id_list)
count = list_count(object->id_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->id_list);
@@ -4125,7 +4125,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->max_cpu_mins_pj_list)
count = list_count(object->max_cpu_mins_pj_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(
@@ -4138,7 +4138,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
count = NO_VAL;
if(object->max_cpus_pj_list)
count = list_count(object->max_cpus_pj_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->max_cpus_pj_list);
@@ -4150,7 +4150,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
count = NO_VAL;
if(object->max_jobs_list)
count = list_count(object->max_jobs_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->max_jobs_list);
@@ -4162,7 +4162,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
count = NO_VAL;
if(object->max_nodes_pj_list)
count = list_count(object->max_nodes_pj_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->max_nodes_pj_list);
@@ -4174,7 +4174,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
count = NO_VAL;
if(object->max_submit_jobs_list)
count = list_count(object->max_submit_jobs_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(
@@ -4187,7 +4187,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
count = NO_VAL;
if(object->max_wall_pj_list)
count = list_count(object->max_wall_pj_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->max_wall_pj_list);
@@ -4197,10 +4197,10 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
list_iterator_destroy(itr);
}
count = NO_VAL;
-
+
if(object->partition_list)
count = list_count(object->partition_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->partition_list);
@@ -4213,7 +4213,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->parent_acct_list)
count = list_count(object->parent_acct_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->parent_acct_list);
@@ -4243,7 +4243,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->user_list)
count = list_count(object->user_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->user_list);
@@ -4284,7 +4284,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->acct_list)
count = list_count(object->acct_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->acct_list);
@@ -4297,7 +4297,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->cluster_list)
count = list_count(object->cluster_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
@@ -4308,16 +4308,16 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if(object->fairshare_list
- && list_count(object->fairshare_list))
- pack32(atoi(list_peek(object->fairshare_list)),
+ if(object->fairshare_list
+ && list_count(object->fairshare_list))
+ pack32(atoi(list_peek(object->fairshare_list)),
buffer);
- else
+ else
pack32(count, buffer);
-
+
if(object->id_list)
count = list_count(object->id_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->id_list);
@@ -4326,37 +4326,37 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
}
}
count = NO_VAL;
-
+
if(object->max_cpu_mins_pj_list
- && list_count(object->max_cpu_mins_pj_list))
- pack32(atoi(list_peek(object->max_cpu_mins_pj_list)),
+ && list_count(object->max_cpu_mins_pj_list))
+ pack32(atoi(list_peek(object->max_cpu_mins_pj_list)),
buffer);
- else
+ else
pack32(count, buffer);
-
- if(object->max_jobs_list && list_count(object->max_jobs_list))
- pack32(atoi(list_peek(object->max_jobs_list)),
+
+ if(object->max_jobs_list && list_count(object->max_jobs_list))
+ pack32(atoi(list_peek(object->max_jobs_list)),
buffer);
- else
+ else
pack32(count, buffer);
if(object->max_nodes_pj_list
- && list_count(object->max_nodes_pj_list))
- pack32(atoi(list_peek(object->max_nodes_pj_list)),
+ && list_count(object->max_nodes_pj_list))
+ pack32(atoi(list_peek(object->max_nodes_pj_list)),
buffer);
- else
+ else
pack32(count, buffer);
- if(object->max_wall_pj_list
- && list_count(object->max_wall_pj_list))
- pack32(atoi(list_peek(object->max_wall_pj_list)),
+ if(object->max_wall_pj_list
+ && list_count(object->max_wall_pj_list))
+ pack32(atoi(list_peek(object->max_wall_pj_list)),
buffer);
- else
+ else
pack32(count, buffer);
if(object->partition_list)
count = list_count(object->partition_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->partition_list);
@@ -4367,11 +4367,11 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if(object->parent_acct_list
- && list_count(object->parent_acct_list))
- packstr(list_peek(object->parent_acct_list),
+ if(object->parent_acct_list
+ && list_count(object->parent_acct_list))
+ packstr(list_peek(object->parent_acct_list),
buffer);
- else
+ else
packnull(buffer);
pack32(object->usage_end, buffer);
@@ -4379,7 +4379,7 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
if(object->user_list)
count = list_count(object->user_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->user_list);
@@ -4394,10 +4394,10 @@ extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
pack16(object->with_deleted, buffer);
pack16(object->without_parent_info, buffer);
pack16(object->without_parent_limits, buffer);
- }
+ }
}
-extern int unpack_acct_association_cond(void **object,
+extern int unpack_acct_association_cond(void **object,
uint16_t rpc_version, Buf buffer)
{
uint32_t uint32_tmp;
@@ -4421,64 +4421,64 @@ extern int unpack_acct_association_cond(void **object,
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->cluster_list =
+ object_ptr->cluster_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
- list_append(object_ptr->cluster_list,
+ list_append(object_ptr->cluster_list,
tmp_info);
}
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->fairshare_list =
+ object_ptr->fairshare_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
- list_append(object_ptr->fairshare_list,
+ list_append(object_ptr->fairshare_list,
tmp_info);
}
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->grp_cpu_mins_list =
+ object_ptr->grp_cpu_mins_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
- list_append(object_ptr->grp_cpu_mins_list,
+ list_append(object_ptr->grp_cpu_mins_list,
tmp_info);
}
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->grp_cpus_list =
+ object_ptr->grp_cpus_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
- list_append(object_ptr->grp_cpus_list,
+ list_append(object_ptr->grp_cpus_list,
tmp_info);
}
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->grp_jobs_list =
+ object_ptr->grp_jobs_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
- list_append(object_ptr->grp_jobs_list,
+ list_append(object_ptr->grp_jobs_list,
tmp_info);
}
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->grp_nodes_list =
+ object_ptr->grp_nodes_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4489,23 +4489,23 @@ extern int unpack_acct_association_cond(void **object,
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->grp_submit_jobs_list =
+ object_ptr->grp_submit_jobs_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
- list_append(object_ptr->grp_submit_jobs_list,
+ list_append(object_ptr->grp_submit_jobs_list,
tmp_info);
}
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->grp_wall_list =
+ object_ptr->grp_wall_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
- list_append(object_ptr->grp_wall_list,
+ list_append(object_ptr->grp_wall_list,
tmp_info);
}
}
@@ -4514,15 +4514,15 @@ extern int unpack_acct_association_cond(void **object,
if(count != NO_VAL) {
object_ptr->id_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
- safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
+ safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
list_append(object_ptr->id_list, tmp_info);
}
}
-
+
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->max_cpu_mins_pj_list =
+ object_ptr->max_cpu_mins_pj_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4533,7 +4533,7 @@ extern int unpack_acct_association_cond(void **object,
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->max_cpus_pj_list =
+ object_ptr->max_cpus_pj_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4544,7 +4544,7 @@ extern int unpack_acct_association_cond(void **object,
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->max_jobs_list =
+ object_ptr->max_jobs_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4555,7 +4555,7 @@ extern int unpack_acct_association_cond(void **object,
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->max_nodes_pj_list =
+ object_ptr->max_nodes_pj_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4566,18 +4566,18 @@ extern int unpack_acct_association_cond(void **object,
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->max_submit_jobs_list =
+ object_ptr->max_submit_jobs_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
- list_append(object_ptr->max_submit_jobs_list,
+ list_append(object_ptr->max_submit_jobs_list,
tmp_info);
}
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->max_wall_pj_list =
+ object_ptr->max_wall_pj_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4589,7 +4589,7 @@ extern int unpack_acct_association_cond(void **object,
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->partition_list =
+ object_ptr->partition_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4601,7 +4601,7 @@ extern int unpack_acct_association_cond(void **object,
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->parent_acct_list =
+ object_ptr->parent_acct_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4626,7 +4626,7 @@ extern int unpack_acct_association_cond(void **object,
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->user_list =
+ object_ptr->user_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4654,64 +4654,64 @@ extern int unpack_acct_association_cond(void **object,
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->cluster_list =
+ object_ptr->cluster_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
- list_append(object_ptr->cluster_list,
+ list_append(object_ptr->cluster_list,
tmp_info);
}
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->fairshare_list =
+ object_ptr->fairshare_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
- list_append(object_ptr->fairshare_list,
+ list_append(object_ptr->fairshare_list,
tmp_info);
}
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->grp_cpu_mins_list =
+ object_ptr->grp_cpu_mins_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
- list_append(object_ptr->grp_cpu_mins_list,
+ list_append(object_ptr->grp_cpu_mins_list,
tmp_info);
}
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->grp_cpus_list =
+ object_ptr->grp_cpus_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
- list_append(object_ptr->grp_cpus_list,
+ list_append(object_ptr->grp_cpus_list,
tmp_info);
}
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->grp_jobs_list =
+ object_ptr->grp_jobs_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
- list_append(object_ptr->grp_jobs_list,
+ list_append(object_ptr->grp_jobs_list,
tmp_info);
}
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->grp_nodes_list =
+ object_ptr->grp_nodes_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4722,23 +4722,23 @@ extern int unpack_acct_association_cond(void **object,
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->grp_submit_jobs_list =
+ object_ptr->grp_submit_jobs_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
- list_append(object_ptr->grp_submit_jobs_list,
+ list_append(object_ptr->grp_submit_jobs_list,
tmp_info);
}
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->grp_wall_list =
+ object_ptr->grp_wall_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
- list_append(object_ptr->grp_wall_list,
+ list_append(object_ptr->grp_wall_list,
tmp_info);
}
}
@@ -4747,15 +4747,15 @@ extern int unpack_acct_association_cond(void **object,
if(count != NO_VAL) {
object_ptr->id_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
- safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
+ safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
list_append(object_ptr->id_list, tmp_info);
}
}
-
+
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->max_cpu_mins_pj_list =
+ object_ptr->max_cpu_mins_pj_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4766,7 +4766,7 @@ extern int unpack_acct_association_cond(void **object,
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->max_cpus_pj_list =
+ object_ptr->max_cpus_pj_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4777,7 +4777,7 @@ extern int unpack_acct_association_cond(void **object,
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->max_jobs_list =
+ object_ptr->max_jobs_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4788,7 +4788,7 @@ extern int unpack_acct_association_cond(void **object,
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->max_nodes_pj_list =
+ object_ptr->max_nodes_pj_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4799,18 +4799,18 @@ extern int unpack_acct_association_cond(void **object,
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->max_submit_jobs_list =
+ object_ptr->max_submit_jobs_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
- list_append(object_ptr->max_submit_jobs_list,
+ list_append(object_ptr->max_submit_jobs_list,
tmp_info);
}
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->max_wall_pj_list =
+ object_ptr->max_wall_pj_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4822,7 +4822,7 @@ extern int unpack_acct_association_cond(void **object,
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->partition_list =
+ object_ptr->partition_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4834,7 +4834,7 @@ extern int unpack_acct_association_cond(void **object,
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->parent_acct_list =
+ object_ptr->parent_acct_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4861,7 +4861,7 @@ extern int unpack_acct_association_cond(void **object,
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->user_list =
+ object_ptr->user_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4879,7 +4879,7 @@ extern int unpack_acct_association_cond(void **object,
} else {
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->acct_list =
+ object_ptr->acct_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4889,7 +4889,7 @@ extern int unpack_acct_association_cond(void **object,
}
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->cluster_list =
+ object_ptr->cluster_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4904,7 +4904,7 @@ extern int unpack_acct_association_cond(void **object,
*/
safe_unpack32(&count, buffer);
if(count && count != NO_VAL) {
- object_ptr->fairshare_list =
+ object_ptr->fairshare_list =
list_create(slurm_destroy_char);
list_append(object_ptr->fairshare_list,
xstrdup_printf("%u", count));
@@ -4914,15 +4914,15 @@ extern int unpack_acct_association_cond(void **object,
if(count && count != NO_VAL) {
object_ptr->id_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
- safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
+ safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
list_append(object_ptr->id_list, tmp_info);
}
}
-
+
safe_unpack32(&count, buffer);
if(count && count != NO_VAL) {
- object_ptr->max_cpu_mins_pj_list =
+ object_ptr->max_cpu_mins_pj_list =
list_create(slurm_destroy_char);
list_append(object_ptr->max_cpu_mins_pj_list,
xstrdup_printf("%u", count));
@@ -4930,7 +4930,7 @@ extern int unpack_acct_association_cond(void **object,
safe_unpack32(&count, buffer);
if(count && count != NO_VAL) {
- object_ptr->max_jobs_list =
+ object_ptr->max_jobs_list =
list_create(slurm_destroy_char);
list_append(object_ptr->max_jobs_list,
xstrdup_printf("%u", count));
@@ -4938,7 +4938,7 @@ extern int unpack_acct_association_cond(void **object,
safe_unpack32(&count, buffer);
if(count && count != NO_VAL) {
- object_ptr->max_nodes_pj_list =
+ object_ptr->max_nodes_pj_list =
list_create(slurm_destroy_char);
list_append(object_ptr->max_nodes_pj_list,
xstrdup_printf("%u", count));
@@ -4946,7 +4946,7 @@ extern int unpack_acct_association_cond(void **object,
safe_unpack32(&count, buffer);
if(count && count != NO_VAL) {
- object_ptr->max_wall_pj_list =
+ object_ptr->max_wall_pj_list =
list_create(slurm_destroy_char);
list_append(object_ptr->max_wall_pj_list,
xstrdup_printf("%u", count));
@@ -4954,7 +4954,7 @@ extern int unpack_acct_association_cond(void **object,
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->partition_list =
+ object_ptr->partition_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4966,7 +4966,7 @@ extern int unpack_acct_association_cond(void **object,
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp, buffer);
if(tmp_info) {
- object_ptr->parent_acct_list =
+ object_ptr->parent_acct_list =
list_create(slurm_destroy_char);
list_append(object_ptr->parent_acct_list, tmp_info);
}
@@ -4978,7 +4978,7 @@ extern int unpack_acct_association_cond(void **object,
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->user_list =
+ object_ptr->user_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4991,7 +4991,7 @@ extern int unpack_acct_association_cond(void **object,
safe_unpack16(&object_ptr->with_deleted, buffer);
safe_unpack16(&object_ptr->without_parent_info, buffer);
safe_unpack16(&object_ptr->without_parent_limits, buffer);
- }
+ }
return SLURM_SUCCESS;
@@ -5037,7 +5037,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->acct_list)
count = list_count(object->acct_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->acct_list);
@@ -5050,7 +5050,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->associd_list)
count = list_count(object->associd_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->associd_list);
@@ -5062,7 +5062,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->cluster_list)
count = list_count(object->cluster_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
@@ -5079,7 +5079,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->groupid_list)
count = list_count(object->groupid_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->groupid_list);
@@ -5088,12 +5088,12 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
}
}
count = NO_VAL;
-
+
pack32(object->nodes_max, buffer);
pack32(object->nodes_min, buffer);
if(object->partition_list)
count = list_count(object->partition_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->partition_list);
@@ -5106,7 +5106,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->resv_list)
count = list_count(object->resv_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->resv_list);
@@ -5119,7 +5119,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->resvid_list)
count = list_count(object->resvid_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->resvid_list);
@@ -5132,12 +5132,12 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->step_list)
count = list_count(object->step_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->step_list);
while((job = list_next(itr))) {
- pack_jobacct_selected_step(job, rpc_version,
+ pack_jobacct_selected_step(job, rpc_version,
buffer);
}
list_iterator_destroy(itr);
@@ -5146,7 +5146,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->state_list)
count = list_count(object->state_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->state_list);
@@ -5164,7 +5164,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->userid_list)
count = list_count(object->userid_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->userid_list);
@@ -5210,7 +5210,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->acct_list)
count = list_count(object->acct_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->acct_list);
@@ -5223,7 +5223,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->associd_list)
count = list_count(object->associd_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->associd_list);
@@ -5235,7 +5235,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->cluster_list)
count = list_count(object->cluster_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
@@ -5250,7 +5250,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->groupid_list)
count = list_count(object->groupid_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->groupid_list);
@@ -5259,10 +5259,10 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
}
}
count = NO_VAL;
-
+
if(object->partition_list)
count = list_count(object->partition_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->partition_list);
@@ -5275,7 +5275,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->resv_list)
count = list_count(object->resv_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->resv_list);
@@ -5288,7 +5288,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->resvid_list)
count = list_count(object->resvid_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->resvid_list);
@@ -5301,12 +5301,12 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->step_list)
count = list_count(object->step_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->step_list);
while((job = list_next(itr))) {
- pack_jobacct_selected_step(job, rpc_version,
+ pack_jobacct_selected_step(job, rpc_version,
buffer);
}
list_iterator_destroy(itr);
@@ -5315,7 +5315,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->state_list)
count = list_count(object->state_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->state_list);
@@ -5333,7 +5333,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->userid_list)
count = list_count(object->userid_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->userid_list);
@@ -5376,7 +5376,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->acct_list)
count = list_count(object->acct_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->acct_list);
@@ -5389,7 +5389,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->associd_list)
count = list_count(object->associd_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->associd_list);
@@ -5401,7 +5401,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->cluster_list)
count = list_count(object->cluster_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
@@ -5416,7 +5416,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->groupid_list)
count = list_count(object->groupid_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->groupid_list);
@@ -5425,10 +5425,10 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
}
}
count = NO_VAL;
-
+
if(object->partition_list)
count = list_count(object->partition_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->partition_list);
@@ -5441,12 +5441,12 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->step_list)
count = list_count(object->step_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->step_list);
while((job = list_next(itr))) {
- pack_jobacct_selected_step(job, rpc_version,
+ pack_jobacct_selected_step(job, rpc_version,
buffer);
}
list_iterator_destroy(itr);
@@ -5455,7 +5455,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->state_list)
count = list_count(object->state_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->state_list);
@@ -5471,7 +5471,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->userid_list)
count = list_count(object->userid_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->userid_list);
@@ -5512,7 +5512,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->acct_list)
count = list_count(object->acct_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->acct_list);
@@ -5525,7 +5525,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->associd_list)
count = list_count(object->associd_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->associd_list);
@@ -5537,7 +5537,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->cluster_list)
count = list_count(object->cluster_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
@@ -5552,7 +5552,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->groupid_list)
count = list_count(object->groupid_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->groupid_list);
@@ -5561,10 +5561,10 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
}
}
count = NO_VAL;
-
+
if(object->partition_list)
count = list_count(object->partition_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->partition_list);
@@ -5577,7 +5577,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->step_list)
count = list_count(object->step_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->step_list);
@@ -5591,7 +5591,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->state_list)
count = list_count(object->state_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->state_list);
@@ -5607,7 +5607,7 @@ extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->userid_list)
count = list_count(object->userid_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->userid_list);
@@ -5672,15 +5672,15 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->groupid_list =
+ object_ptr->groupid_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
- safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
+ safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
list_append(object_ptr->groupid_list, tmp_info);
}
}
-
+
safe_unpack32(&object_ptr->nodes_max, buffer);
safe_unpack32(&object_ptr->nodes_min, buffer);
@@ -5691,7 +5691,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
&uint32_tmp, buffer);
- list_append(object_ptr->partition_list,
+ list_append(object_ptr->partition_list,
tmp_info);
}
}
@@ -5703,7 +5703,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
&uint32_tmp, buffer);
- list_append(object_ptr->resv_list,
+ list_append(object_ptr->resv_list,
tmp_info);
}
}
@@ -5715,7 +5715,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
&uint32_tmp, buffer);
- list_append(object_ptr->resvid_list,
+ list_append(object_ptr->resvid_list,
tmp_info);
}
}
@@ -5741,7 +5741,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
list_append(object_ptr->state_list, tmp_info);
}
}
-
+
safe_unpack_time(&object_ptr->usage_end, buffer);
safe_unpack_time(&object_ptr->usage_start, buffer);
@@ -5750,7 +5750,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->userid_list =
+ object_ptr->userid_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -5761,7 +5761,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->wckey_list =
+ object_ptr->wckey_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -5809,15 +5809,15 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->groupid_list =
+ object_ptr->groupid_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
- safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
+ safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
list_append(object_ptr->groupid_list, tmp_info);
}
}
-
+
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
object_ptr->partition_list =
@@ -5825,7 +5825,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
&uint32_tmp, buffer);
- list_append(object_ptr->partition_list,
+ list_append(object_ptr->partition_list,
tmp_info);
}
}
@@ -5837,7 +5837,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
&uint32_tmp, buffer);
- list_append(object_ptr->resv_list,
+ list_append(object_ptr->resv_list,
tmp_info);
}
}
@@ -5849,7 +5849,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
&uint32_tmp, buffer);
- list_append(object_ptr->resvid_list,
+ list_append(object_ptr->resvid_list,
tmp_info);
}
}
@@ -5875,7 +5875,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
list_append(object_ptr->state_list, tmp_info);
}
}
-
+
safe_unpack_time(&object_ptr->usage_end, buffer);
safe_unpack_time(&object_ptr->usage_start, buffer);
@@ -5884,7 +5884,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->userid_list =
+ object_ptr->userid_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -5895,7 +5895,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->wckey_list =
+ object_ptr->wckey_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -5943,15 +5943,15 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->groupid_list =
+ object_ptr->groupid_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
- safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
+ safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
list_append(object_ptr->groupid_list, tmp_info);
}
}
-
+
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
object_ptr->partition_list =
@@ -5959,7 +5959,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
&uint32_tmp, buffer);
- list_append(object_ptr->partition_list,
+ list_append(object_ptr->partition_list,
tmp_info);
}
}
@@ -5985,7 +5985,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
list_append(object_ptr->state_list, tmp_info);
}
}
-
+
safe_unpack32(&uint32_tmp, buffer);
object_ptr->usage_end = uint32_tmp;
safe_unpack32(&uint32_tmp, buffer);
@@ -5993,7 +5993,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->userid_list =
+ object_ptr->userid_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -6004,7 +6004,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->wckey_list =
+ object_ptr->wckey_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -6051,15 +6051,15 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->groupid_list =
+ object_ptr->groupid_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
- safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
+ safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
list_append(object_ptr->groupid_list, tmp_info);
}
}
-
+
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
object_ptr->partition_list =
@@ -6067,7 +6067,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
&uint32_tmp, buffer);
- list_append(object_ptr->partition_list,
+ list_append(object_ptr->partition_list,
tmp_info);
}
}
@@ -6093,7 +6093,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
list_append(object_ptr->state_list, tmp_info);
}
}
-
+
safe_unpack32(&uint32_tmp, buffer);
object_ptr->usage_end = uint32_tmp;
safe_unpack32(&uint32_tmp, buffer);
@@ -6101,7 +6101,7 @@ extern int unpack_acct_job_cond(void **object, uint16_t rpc_version, Buf buffer)
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->userid_list =
+ object_ptr->userid_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -6138,7 +6138,7 @@ extern void pack_acct_qos_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->description_list)
count = list_count(object->description_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->description_list);
@@ -6151,7 +6151,7 @@ extern void pack_acct_qos_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->id_list)
count = list_count(object->id_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->id_list);
@@ -6162,7 +6162,7 @@ extern void pack_acct_qos_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if(object->name_list)
+ if(object->name_list)
count = list_count(object->name_list);
pack32(count, buffer);
@@ -6171,7 +6171,7 @@ extern void pack_acct_qos_cond(void *in, uint16_t rpc_version, Buf buffer)
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
}
- list_iterator_destroy(itr);
+ list_iterator_destroy(itr);
}
count = NO_VAL;
@@ -6243,10 +6243,10 @@ extern void pack_acct_reservation_cond(void *in, uint16_t rpc_version,
pack16(0, buffer);
return;
}
-
+
if(object->cluster_list)
count = list_count(object->cluster_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
@@ -6258,10 +6258,10 @@ extern void pack_acct_reservation_cond(void *in, uint16_t rpc_version,
count = NO_VAL;
pack16(object->flags, buffer);
-
+
if(object->id_list)
count = list_count(object->id_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->id_list);
@@ -6274,7 +6274,7 @@ extern void pack_acct_reservation_cond(void *in, uint16_t rpc_version,
if(object->name_list)
count = list_count(object->name_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->name_list);
@@ -6287,8 +6287,8 @@ extern void pack_acct_reservation_cond(void *in, uint16_t rpc_version,
packstr(object->nodes, buffer);
pack_time(object->time_end, buffer);
- pack_time(object->time_start, buffer);
- pack16(object->with_usage, buffer);
+ pack_time(object->time_start, buffer);
+ pack16(object->with_usage, buffer);
}
extern int unpack_acct_reservation_cond(void **object, uint16_t rpc_version,
@@ -6297,7 +6297,7 @@ extern int unpack_acct_reservation_cond(void **object, uint16_t rpc_version,
uint32_t uint32_tmp, count;
int i = 0;
char *tmp_info = NULL;
- acct_reservation_cond_t *object_ptr =
+ acct_reservation_cond_t *object_ptr =
xmalloc(sizeof(acct_reservation_cond_t));
*object = object_ptr;
@@ -6333,8 +6333,8 @@ extern int unpack_acct_reservation_cond(void **object, uint16_t rpc_version,
safe_unpackstr_xmalloc(&object_ptr->nodes, &uint32_tmp, buffer);
safe_unpack_time(&object_ptr->time_end, buffer);
- safe_unpack_time(&object_ptr->time_start, buffer);
- safe_unpack16(&object_ptr->with_usage, buffer);
+ safe_unpack_time(&object_ptr->time_start, buffer);
+ safe_unpack16(&object_ptr->with_usage, buffer);
return SLURM_SUCCESS;
@@ -6367,7 +6367,7 @@ extern void pack_acct_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
}
if(object->acct_list)
count = list_count(object->acct_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->acct_list);
@@ -6380,7 +6380,7 @@ extern void pack_acct_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->action_list)
count = list_count(object->action_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->action_list);
@@ -6391,7 +6391,7 @@ extern void pack_acct_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if(object->actor_list)
+ if(object->actor_list)
count = list_count(object->actor_list);
pack32(count, buffer);
@@ -6400,58 +6400,58 @@ extern void pack_acct_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
}
- list_iterator_destroy(itr);
+ list_iterator_destroy(itr);
}
count = NO_VAL;
if(object->cluster_list)
count = list_count(object->cluster_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
- }
+ }
list_iterator_destroy(itr);
}
count = NO_VAL;
if(object->id_list)
count = list_count(object->id_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->id_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
- }
+ }
list_iterator_destroy(itr);
}
count = NO_VAL;
if(object->info_list)
count = list_count(object->info_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->info_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
- }
+ }
list_iterator_destroy(itr);
}
count = NO_VAL;
if(object->name_list)
count = list_count(object->name_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->name_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
- }
+ }
list_iterator_destroy(itr);
}
count = NO_VAL;
@@ -6460,17 +6460,17 @@ extern void pack_acct_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
pack_time(object->time_start, buffer);
if(object->user_list)
count = list_count(object->user_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->user_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
- }
+ }
list_iterator_destroy(itr);
}
count = NO_VAL;
-
+
pack16(object->with_assoc_info, buffer);
} else if(rpc_version >= 3) {
if(!object) {
@@ -6488,7 +6488,7 @@ extern void pack_acct_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
}
if(object->acct_list)
count = list_count(object->acct_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->acct_list);
@@ -6501,7 +6501,7 @@ extern void pack_acct_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->action_list)
count = list_count(object->action_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->action_list);
@@ -6512,7 +6512,7 @@ extern void pack_acct_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if(object->actor_list)
+ if(object->actor_list)
count = list_count(object->actor_list);
pack32(count, buffer);
@@ -6521,58 +6521,58 @@ extern void pack_acct_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
}
- list_iterator_destroy(itr);
+ list_iterator_destroy(itr);
}
count = NO_VAL;
if(object->cluster_list)
count = list_count(object->cluster_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
- }
+ }
list_iterator_destroy(itr);
}
count = NO_VAL;
if(object->id_list)
count = list_count(object->id_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->id_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
- }
+ }
list_iterator_destroy(itr);
}
count = NO_VAL;
if(object->info_list)
count = list_count(object->info_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->info_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
- }
+ }
list_iterator_destroy(itr);
}
count = NO_VAL;
if(object->name_list)
count = list_count(object->name_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->name_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
- }
+ }
list_iterator_destroy(itr);
}
count = NO_VAL;
@@ -6581,17 +6581,17 @@ extern void pack_acct_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
pack32(object->time_start, buffer);
if(object->user_list)
count = list_count(object->user_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->user_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
- }
+ }
list_iterator_destroy(itr);
}
count = NO_VAL;
-
+
pack16(object->with_assoc_info, buffer);
} else {
if(!object) {
@@ -6604,7 +6604,7 @@ extern void pack_acct_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
}
if(object->action_list)
count = list_count(object->action_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->action_list);
@@ -6615,7 +6615,7 @@ extern void pack_acct_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if(object->actor_list)
+ if(object->actor_list)
count = list_count(object->actor_list);
pack32(count, buffer);
@@ -6624,26 +6624,26 @@ extern void pack_acct_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
}
- list_iterator_destroy(itr);
+ list_iterator_destroy(itr);
}
count = NO_VAL;
if(object->id_list)
count = list_count(object->id_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->id_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
- }
+ }
list_iterator_destroy(itr);
}
count = NO_VAL;
pack32(object->time_end, buffer);
pack32(object->time_start, buffer);
- }
+ }
}
extern int unpack_acct_txn_cond(void **object, uint16_t rpc_version, Buf buffer)
@@ -6680,7 +6680,7 @@ extern int unpack_acct_txn_cond(void **object, uint16_t rpc_version, Buf buffer)
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->actor_list =
+ object_ptr->actor_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
@@ -6772,7 +6772,7 @@ extern int unpack_acct_txn_cond(void **object, uint16_t rpc_version, Buf buffer)
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->actor_list =
+ object_ptr->actor_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
@@ -6855,7 +6855,7 @@ extern int unpack_acct_txn_cond(void **object, uint16_t rpc_version, Buf buffer)
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->actor_list =
+ object_ptr->actor_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
@@ -6913,7 +6913,7 @@ extern void pack_acct_wckey_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->cluster_list)
count = list_count(object->cluster_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
@@ -6926,7 +6926,7 @@ extern void pack_acct_wckey_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->id_list)
count = list_count(object->id_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->id_list);
@@ -6938,7 +6938,7 @@ extern void pack_acct_wckey_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->name_list)
count = list_count(object->name_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->name_list);
@@ -6954,7 +6954,7 @@ extern void pack_acct_wckey_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->user_list)
count = list_count(object->user_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->user_list);
@@ -6985,7 +6985,7 @@ extern void pack_acct_wckey_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->cluster_list)
count = list_count(object->cluster_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
@@ -6998,7 +6998,7 @@ extern void pack_acct_wckey_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->id_list)
count = list_count(object->id_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->id_list);
@@ -7010,7 +7010,7 @@ extern void pack_acct_wckey_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->name_list)
count = list_count(object->name_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->name_list);
@@ -7026,7 +7026,7 @@ extern void pack_acct_wckey_cond(void *in, uint16_t rpc_version, Buf buffer)
if(object->user_list)
count = list_count(object->user_list);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->user_list);
@@ -7056,12 +7056,12 @@ extern int unpack_acct_wckey_cond(void **object, uint16_t rpc_version,
if(rpc_version >= 5) {
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->cluster_list =
+ object_ptr->cluster_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
- list_append(object_ptr->cluster_list,
+ list_append(object_ptr->cluster_list,
tmp_info);
}
}
@@ -7070,15 +7070,15 @@ extern int unpack_acct_wckey_cond(void **object, uint16_t rpc_version,
if(count != NO_VAL) {
object_ptr->id_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
- safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
+ safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
list_append(object_ptr->id_list, tmp_info);
}
}
-
+
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->name_list =
+ object_ptr->name_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -7092,7 +7092,7 @@ extern int unpack_acct_wckey_cond(void **object, uint16_t rpc_version,
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->user_list =
+ object_ptr->user_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -7106,12 +7106,12 @@ extern int unpack_acct_wckey_cond(void **object, uint16_t rpc_version,
} else {
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->cluster_list =
+ object_ptr->cluster_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
- list_append(object_ptr->cluster_list,
+ list_append(object_ptr->cluster_list,
tmp_info);
}
}
@@ -7120,15 +7120,15 @@ extern int unpack_acct_wckey_cond(void **object, uint16_t rpc_version,
if(count != NO_VAL) {
object_ptr->id_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
- safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
+ safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
buffer);
list_append(object_ptr->id_list, tmp_info);
}
}
-
+
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->name_list =
+ object_ptr->name_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -7144,7 +7144,7 @@ extern int unpack_acct_wckey_cond(void **object, uint16_t rpc_version,
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->user_list =
+ object_ptr->user_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -7166,8 +7166,8 @@ unpack_error:
extern void pack_acct_archive_cond(void *in, uint16_t rpc_version, Buf buffer)
{
- acct_archive_cond_t *object = (acct_archive_cond_t *)in;
-
+ acct_archive_cond_t *object = (acct_archive_cond_t *)in;
+
if(!object) {
packnull(buffer);
pack16((uint16_t)NO_VAL, buffer);
@@ -7200,7 +7200,7 @@ extern int unpack_acct_archive_cond(void **object, uint16_t rpc_version,
Buf buffer)
{
uint32_t uint32_tmp;
- acct_archive_cond_t *object_ptr =
+ acct_archive_cond_t *object_ptr =
xmalloc(sizeof(acct_archive_cond_t));
*object = object_ptr;
@@ -7275,9 +7275,9 @@ extern void pack_acct_update_object(acct_update_object_t *object,
}
pack16(object->type, buffer);
- if(object->objects)
+ if(object->objects)
count = list_count(object->objects);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(object->objects);
@@ -7288,12 +7288,12 @@ extern void pack_acct_update_object(acct_update_object_t *object,
}
}
-extern int unpack_acct_update_object(acct_update_object_t **object,
+extern int unpack_acct_update_object(acct_update_object_t **object,
uint16_t rpc_version, Buf buffer)
{
int i;
uint32_t count;
- acct_update_object_t *object_ptr =
+ acct_update_object_t *object_ptr =
xmalloc(sizeof(acct_update_object_t));
void *acct_object = NULL;
int (*my_function) (void **object, uint16_t rpc_version, Buf buffer);
@@ -7346,7 +7346,7 @@ extern int unpack_acct_update_object(acct_update_object_t **object,
}
}
return SLURM_SUCCESS;
-
+
unpack_error:
destroy_acct_update_object(object_ptr);
*object = NULL;
@@ -7357,7 +7357,7 @@ extern char *acct_qos_str(List qos_list, uint32_t level)
{
ListIterator itr = NULL;
acct_qos_rec_t *qos = NULL;
-
+
if(!qos_list) {
error("We need a qos list to translate");
return NULL;
@@ -7398,7 +7398,7 @@ extern uint32_t str_2_acct_qos(List qos_list, char *level)
itr = list_iterator_create(qos_list);
while((qos = list_next(itr))) {
- if(!strncasecmp(working_level, qos->name,
+ if(!strncasecmp(working_level, qos->name,
strlen(working_level)))
break;
}
@@ -7439,12 +7439,12 @@ extern acct_admin_level_t str_2_acct_admin_level(char *level)
return ACCT_ADMIN_NONE;
} else if(!strncasecmp(level, "Operator", 1)) {
return ACCT_ADMIN_OPERATOR;
- } else if(!strncasecmp(level, "SuperUser", 1)
+ } else if(!strncasecmp(level, "SuperUser", 1)
|| !strncasecmp(level, "Admin", 1)) {
return ACCT_ADMIN_SUPER_USER;
} else {
- return ACCT_ADMIN_NOTSET;
- }
+ return ACCT_ADMIN_NOTSET;
+ }
}
/* This reorders the list into a alphabetical hierarchy returned in a
@@ -7458,7 +7458,7 @@ extern List get_hierarchical_sorted_assoc_list(List assoc_list)
_append_hierarchical_childern_ret_list(ret_list,
acct_hierarchical_rec_list);
list_destroy(acct_hierarchical_rec_list);
-
+
return ret_list;
}
@@ -7470,27 +7470,27 @@ extern List get_acct_hierarchical_rec_list(List assoc_list)
acct_hierarchical_rec_t *arch_rec = NULL;
acct_association_rec_t *assoc = NULL;
List total_assoc_list = list_create(NULL);
- List arch_rec_list =
+ List arch_rec_list =
list_create(destroy_acct_hierarchical_rec);
ListIterator itr, itr2;
itr = list_iterator_create(assoc_list);
itr2 = list_iterator_create(total_assoc_list);
-
+
while((assoc = list_next(itr))) {
- arch_rec =
+ arch_rec =
xmalloc(sizeof(acct_hierarchical_rec_t));
- arch_rec->childern =
+ arch_rec->childern =
list_create(destroy_acct_hierarchical_rec);
arch_rec->assoc = assoc;
-
+
/* To speed things up we are first looking if we have
a parent_id to look for. If that doesn't work see
if the last parent we had was what we are looking
for. Then if that isn't panning out look at the
last account parent. If still we don't have it we
will look for it in the list. If it isn't there we
- will just add it to the parent and call it good
+ will just add it to the parent and call it good
*/
if(!assoc->parent_id) {
arch_rec->sort_name = assoc->cluster;
@@ -7499,27 +7499,27 @@ extern List get_acct_hierarchical_rec_list(List assoc_list)
list_append(total_assoc_list, arch_rec);
continue;
- }
-
- if(assoc->user)
+ }
+
+ if(assoc->user)
arch_rec->sort_name = assoc->user;
- else
- arch_rec->sort_name = assoc->acct;
+ else
+ arch_rec->sort_name = assoc->acct;
if(last_parent && assoc->parent_id == last_parent->assoc->id) {
par_arch_rec = last_parent;
- } else if(last_acct_parent
+ } else if(last_acct_parent
&& assoc->parent_id == last_acct_parent->assoc->id) {
par_arch_rec = last_acct_parent;
} else {
list_iterator_reset(itr2);
while((par_arch_rec = list_next(itr2))) {
- if(assoc->parent_id
+ if(assoc->parent_id
== par_arch_rec->assoc->id) {
- if(assoc->user)
- last_parent = par_arch_rec;
- else
- last_parent
+ if(assoc->user)
+ last_parent = par_arch_rec;
+ else
+ last_parent
= last_acct_parent
= par_arch_rec;
break;
@@ -7530,9 +7530,9 @@ extern List get_acct_hierarchical_rec_list(List assoc_list)
if(!par_arch_rec) {
list_append(arch_rec_list, arch_rec);
last_parent = last_acct_parent = arch_rec;
- } else
+ } else
list_append(par_arch_rec->childern, arch_rec);
-
+
list_append(total_assoc_list, arch_rec);
}
list_iterator_destroy(itr);
@@ -7545,16 +7545,16 @@ extern List get_acct_hierarchical_rec_list(List assoc_list)
return arch_rec_list;
}
-/* IN/OUT: tree_list a list of acct_print_tree_t's */
+/* IN/OUT: tree_list a list of acct_print_tree_t's */
extern char *get_tree_acct_name(char *name, char *parent, List tree_list)
{
ListIterator itr = NULL;
acct_print_tree_t *acct_print_tree = NULL;
acct_print_tree_t *par_acct_print_tree = NULL;
- if(!tree_list)
+ if(!tree_list)
return NULL;
-
+
itr = list_iterator_create(tree_list);
while((acct_print_tree = list_next(itr))) {
/* we don't care about users in this list. They are
@@ -7564,34 +7564,34 @@ extern char *get_tree_acct_name(char *name, char *parent, List tree_list)
if(!strcmp(name, acct_print_tree->name))
break;
- else if(parent && !strcmp(parent, acct_print_tree->name))
+ else if(parent && !strcmp(parent, acct_print_tree->name))
par_acct_print_tree = acct_print_tree;
-
+
}
list_iterator_destroy(itr);
-
- if(parent && acct_print_tree)
+
+ if(parent && acct_print_tree)
return acct_print_tree->print_name;
-
+
acct_print_tree = xmalloc(sizeof(acct_print_tree_t));
acct_print_tree->name = xstrdup(name);
- if(par_acct_print_tree)
+ if(par_acct_print_tree)
acct_print_tree->spaces =
xstrdup_printf(" %s", par_acct_print_tree->spaces);
- else
+ else
acct_print_tree->spaces = xstrdup("");
-
+
/* user account */
if(name[0] == '|') {
acct_print_tree->print_name = xstrdup_printf(
- "%s%s", acct_print_tree->spaces, parent);
+ "%s%s", acct_print_tree->spaces, parent);
acct_print_tree->user = 1;
- } else
+ } else
acct_print_tree->print_name = xstrdup_printf(
- "%s%s", acct_print_tree->spaces, name);
-
+ "%s%s", acct_print_tree->spaces, name);
+
list_append(tree_list, acct_print_tree);
-
+
return acct_print_tree->print_name;
}
@@ -7626,7 +7626,7 @@ extern int set_qos_bitstr_from_list(bitstr_t *valid_qos, List qos_list)
(*(my_function))(valid_qos, bit);
}
list_iterator_destroy(itr);
-
+
return rc;
}
@@ -7653,9 +7653,9 @@ extern char *get_qos_complete_str_bitstr(List qos_list, bitstr_t *valid_qos)
list_sort(temp_list, (ListCmpF)slurm_sort_char_list_asc);
itr = list_iterator_create(temp_list);
while((temp_char = list_next(itr))) {
- if(print_this)
+ if(print_this)
xstrfmtcat(print_this, ",%s", temp_char);
- else
+ else
print_this = xstrdup(temp_char);
}
list_iterator_destroy(itr);
@@ -7690,10 +7690,10 @@ extern char *get_qos_complete_str(List qos_list, List num_qos_list)
}
temp_char = acct_qos_str(qos_list, atoi(temp_char));
if(temp_char) {
- if(option)
+ if(option)
list_append(temp_list, xstrdup_printf(
"%c%s", option, temp_char));
- else
+ else
list_append(temp_list, xstrdup(temp_char));
}
}
@@ -7701,9 +7701,9 @@ extern char *get_qos_complete_str(List qos_list, List num_qos_list)
list_sort(temp_list, (ListCmpF)slurm_sort_char_list_asc);
itr = list_iterator_create(temp_list);
while((temp_char = list_next(itr))) {
- if(print_this)
+ if(print_this)
xstrfmtcat(print_this, ",%s", temp_char);
- else
+ else
print_this = xstrdup(temp_char);
}
list_iterator_destroy(itr);
@@ -7763,12 +7763,12 @@ extern uint16_t str_2_classification(char *class)
type = ACCT_CLASS_CAPABILITY;
else if(slurm_strcasestr(class, "capap"))
type = ACCT_CLASS_CAPAPACITY;
-
- if(slurm_strcasestr(class, "*"))
- type |= ACCT_CLASSIFIED_FLAG;
- else if(slurm_strcasestr(class, "class"))
+
+ if(slurm_strcasestr(class, "*"))
+ type |= ACCT_CLASSIFIED_FLAG;
+ else if(slurm_strcasestr(class, "class"))
type |= ACCT_CLASSIFIED_FLAG;
-
+
return type;
}
@@ -7813,7 +7813,7 @@ extern uint16_t str_2_acct_problem(char *problem)
type = ACCT_PROBLEM_USER_NO_ASSOC;
else if(slurm_strcasestr(problem, "user no uid"))
type = ACCT_PROBLEM_USER_NO_UID;
-
+
return type;
}
@@ -7827,79 +7827,79 @@ extern void log_assoc_rec(acct_association_rec_t *assoc_ptr, List qos_list)
if(assoc_ptr->shares_raw == INFINITE)
debug2(" RawShares : NONE");
- else if(assoc_ptr->shares_raw != NO_VAL)
+ else if(assoc_ptr->shares_raw != NO_VAL)
debug2(" RawShares : %u", assoc_ptr->shares_raw);
- if(assoc_ptr->shares_norm != (double)NO_VAL)
+ if(assoc_ptr->shares_norm != (double)NO_VAL)
debug2(" NormalizedShares : %f", assoc_ptr->shares_norm);
- if(assoc_ptr->level_shares != NO_VAL)
+ if(assoc_ptr->level_shares != NO_VAL)
debug2(" LevelShares : %u", assoc_ptr->level_shares);
if(assoc_ptr->grp_cpu_mins == INFINITE)
debug2(" GrpCPUMins : NONE");
- else if(assoc_ptr->grp_cpu_mins != NO_VAL)
+ else if(assoc_ptr->grp_cpu_mins != NO_VAL)
debug2(" GrpCPUMins : %llu", assoc_ptr->grp_cpu_mins);
-
+
if(assoc_ptr->grp_cpus == INFINITE)
debug2(" GrpCPUs : NONE");
- else if(assoc_ptr->grp_cpus != NO_VAL)
+ else if(assoc_ptr->grp_cpus != NO_VAL)
debug2(" GrpCPUs : %u", assoc_ptr->grp_cpus);
-
- if(assoc_ptr->grp_jobs == INFINITE)
+
+ if(assoc_ptr->grp_jobs == INFINITE)
debug2(" GrpJobs : NONE");
- else if(assoc_ptr->grp_jobs != NO_VAL)
+ else if(assoc_ptr->grp_jobs != NO_VAL)
debug2(" GrpJobs : %u", assoc_ptr->grp_jobs);
-
+
if(assoc_ptr->grp_nodes == INFINITE)
debug2(" GrpNodes : NONE");
else if(assoc_ptr->grp_nodes != NO_VAL)
debug2(" GrpNodes : %u", assoc_ptr->grp_nodes);
-
- if(assoc_ptr->grp_submit_jobs == INFINITE)
+
+ if(assoc_ptr->grp_submit_jobs == INFINITE)
debug2(" GrpSubmitJobs : NONE");
- else if(assoc_ptr->grp_submit_jobs != NO_VAL)
+ else if(assoc_ptr->grp_submit_jobs != NO_VAL)
debug2(" GrpSubmitJobs : %u", assoc_ptr->grp_submit_jobs);
-
- if(assoc_ptr->grp_wall == INFINITE)
- debug2(" GrpWall : NONE");
+
+ if(assoc_ptr->grp_wall == INFINITE)
+ debug2(" GrpWall : NONE");
else if(assoc_ptr->grp_wall != NO_VAL) {
char time_buf[32];
- mins2time_str((time_t) assoc_ptr->grp_wall,
+ mins2time_str((time_t) assoc_ptr->grp_wall,
time_buf, sizeof(time_buf));
debug2(" GrpWall : %s", time_buf);
}
if(assoc_ptr->max_cpu_mins_pj == INFINITE)
debug2(" MaxCPUMins : NONE");
- else if(assoc_ptr->max_cpu_mins_pj != NO_VAL)
+ else if(assoc_ptr->max_cpu_mins_pj != NO_VAL)
debug2(" MaxCPUMins : %llu", assoc_ptr->max_cpu_mins_pj);
-
+
if(assoc_ptr->max_cpus_pj == INFINITE)
debug2(" MaxCPUs : NONE");
- else if(assoc_ptr->max_cpus_pj != NO_VAL)
+ else if(assoc_ptr->max_cpus_pj != NO_VAL)
debug2(" MaxCPUs : %u", assoc_ptr->max_cpus_pj);
-
- if(assoc_ptr->max_jobs == INFINITE)
+
+ if(assoc_ptr->max_jobs == INFINITE)
debug2(" MaxJobs : NONE");
- else if(assoc_ptr->max_jobs != NO_VAL)
+ else if(assoc_ptr->max_jobs != NO_VAL)
debug2(" MaxJobs : %u", assoc_ptr->max_jobs);
-
+
if(assoc_ptr->max_nodes_pj == INFINITE)
debug2(" MaxNodes : NONE");
else if(assoc_ptr->max_nodes_pj != NO_VAL)
debug2(" MaxNodes : %u", assoc_ptr->max_nodes_pj);
-
- if(assoc_ptr->max_submit_jobs == INFINITE)
+
+ if(assoc_ptr->max_submit_jobs == INFINITE)
debug2(" MaxSubmitJobs : NONE");
- else if(assoc_ptr->max_submit_jobs != NO_VAL)
+ else if(assoc_ptr->max_submit_jobs != NO_VAL)
debug2(" MaxSubmitJobs : %u", assoc_ptr->max_submit_jobs);
-
- if(assoc_ptr->max_wall_pj == INFINITE)
- debug2(" MaxWall : NONE");
+
+ if(assoc_ptr->max_wall_pj == INFINITE)
+ debug2(" MaxWall : NONE");
else if(assoc_ptr->max_wall_pj != NO_VAL) {
char time_buf[32];
- mins2time_str((time_t) assoc_ptr->max_wall_pj,
+ mins2time_str((time_t) assoc_ptr->max_wall_pj,
time_buf, sizeof(time_buf));
debug2(" MaxWall : %s", time_buf);
}
@@ -7907,7 +7907,7 @@ extern void log_assoc_rec(acct_association_rec_t *assoc_ptr, List qos_list)
if(assoc_ptr->qos_list) {
char *temp_char = get_qos_complete_str(qos_list,
assoc_ptr->qos_list);
- if(temp_char) {
+ if(temp_char) {
debug2(" Qos : %s", temp_char);
xfree(temp_char);
}
@@ -7933,16 +7933,16 @@ extern int slurm_acct_storage_init(char *loc)
{
int retval = SLURM_SUCCESS;
char *acct_storage_type = NULL;
-
+
slurm_mutex_lock( &g_acct_storage_context_lock );
if ( g_acct_storage_context )
goto done;
if(loc)
slurm_set_accounting_storage_loc(loc);
-
+
acct_storage_type = slurm_get_accounting_storage_type();
-
+
g_acct_storage_context = _acct_storage_context_create(
acct_storage_type);
if ( g_acct_storage_context == NULL ) {
@@ -8271,7 +8271,7 @@ extern List acct_storage_g_get_problems(void *db_conn, uint32_t uid,
(db_conn, uid, assoc_cond);
}
-extern List acct_storage_g_get_qos(void *db_conn, uint32_t uid,
+extern List acct_storage_g_get_qos(void *db_conn, uint32_t uid,
acct_qos_cond_t *qos_cond)
{
if (slurm_acct_storage_init(NULL) < 0)
@@ -8279,7 +8279,7 @@ extern List acct_storage_g_get_qos(void *db_conn, uint32_t uid,
return (*(g_acct_storage_context->ops.get_qos))(db_conn, uid, qos_cond);
}
-extern List acct_storage_g_get_wckeys(void *db_conn, uint32_t uid,
+extern List acct_storage_g_get_wckeys(void *db_conn, uint32_t uid,
acct_wckey_cond_t *wckey_cond)
{
if (slurm_acct_storage_init(NULL) < 0)
@@ -8288,7 +8288,7 @@ extern List acct_storage_g_get_wckeys(void *db_conn, uint32_t uid,
wckey_cond);
}
-extern List acct_storage_g_get_reservations(void *db_conn, uint32_t uid,
+extern List acct_storage_g_get_reservations(void *db_conn, uint32_t uid,
acct_reservation_cond_t *resv_cond)
{
if (slurm_acct_storage_init(NULL) < 0)
@@ -8297,7 +8297,7 @@ extern List acct_storage_g_get_reservations(void *db_conn, uint32_t uid,
resv_cond);
}
-extern List acct_storage_g_get_txn(void *db_conn, uint32_t uid,
+extern List acct_storage_g_get_txn(void *db_conn, uint32_t uid,
acct_txn_cond_t *txn_cond)
{
if (slurm_acct_storage_init(NULL) < 0)
@@ -8315,7 +8315,7 @@ extern int acct_storage_g_get_usage(void *db_conn, uint32_t uid,
(db_conn, uid, in, type, start, end);
}
-extern int acct_storage_g_roll_usage(void *db_conn,
+extern int acct_storage_g_roll_usage(void *db_conn,
time_t sent_start, time_t sent_end,
uint16_t archive_data)
{
@@ -8344,12 +8344,12 @@ extern int clusteracct_storage_g_node_up(void *db_conn,
{
if (slurm_acct_storage_init(NULL) < 0)
return SLURM_ERROR;
-
+
/* on some systems we need to make sure we don't say something
is completely up if there are cpus in an error state */
if(node_ptr->select_nodeinfo) {
uint16_t err_cpus = 0;
- select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
+ select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ERROR,
&err_cpus);
@@ -8363,8 +8363,8 @@ extern int clusteracct_storage_g_node_up(void *db_conn,
send_node.config_ptr = &config_rec;
send_node.cpus = err_cpus;
config_rec.cpus = err_cpus;
-
- send_node.node_state = NODE_STATE_ERROR;
+
+ send_node.node_state = NODE_STATE_ERROR;
return (*(g_acct_storage_context->ops.node_down))
(db_conn, cluster, &send_node,
@@ -8409,12 +8409,12 @@ extern int clusteracct_storage_g_register_ctld(
(db_conn, cluster, port);
}
-/*
- * load into the storage information about a job,
+/*
+ * load into the storage information about a job,
* typically when it begins execution, but possibly earlier
*/
extern int jobacct_storage_g_job_start (void *db_conn, char *cluster_name,
- struct job_record *job_ptr)
+ struct job_record *job_ptr)
{
if (slurm_acct_storage_init(NULL) < 0)
return SLURM_ERROR;
@@ -8437,7 +8437,7 @@ extern int jobacct_storage_g_job_start (void *db_conn, char *cluster_name,
db_conn, cluster_name, job_ptr);
}
-/*
+/*
* load into the storage the end of a job
*/
extern int jobacct_storage_g_job_complete (void *db_conn,
@@ -8448,7 +8448,7 @@ extern int jobacct_storage_g_job_complete (void *db_conn,
return (*(g_acct_storage_context->ops.job_complete))(db_conn, job_ptr);
}
-/*
+/*
* load into the storage the start of a job step
*/
extern int jobacct_storage_g_step_start (void *db_conn,
@@ -8459,7 +8459,7 @@ extern int jobacct_storage_g_step_start (void *db_conn,
return (*(g_acct_storage_context->ops.step_start))(db_conn, step_ptr);
}
-/*
+/*
* load into the storage the end of a job step
*/
extern int jobacct_storage_g_step_complete (void *db_conn,
@@ -8467,11 +8467,11 @@ extern int jobacct_storage_g_step_complete (void *db_conn,
{
if (slurm_acct_storage_init(NULL) < 0)
return SLURM_ERROR;
- return (*(g_acct_storage_context->ops.step_complete))(db_conn,
+ return (*(g_acct_storage_context->ops.step_complete))(db_conn,
step_ptr);
}
-/*
+/*
* load into the storage a suspention of a job
*/
extern int jobacct_storage_g_job_suspend (void *db_conn,
@@ -8482,8 +8482,8 @@ extern int jobacct_storage_g_job_suspend (void *db_conn,
return (*(g_acct_storage_context->ops.job_suspend))(db_conn, job_ptr);
}
-/*
- * get info from the storage
+/*
+ * get info from the storage
* returns List of job_rec_t *
* note List needs to be freed when called
*/
@@ -8496,8 +8496,8 @@ extern List jobacct_storage_g_get_jobs_cond(void *db_conn, uint32_t uid,
(db_conn, uid, job_cond);
}
-/*
- * expire old info from the storage
+/*
+ * expire old info from the storage
*/
extern int jobacct_storage_g_archive(void *db_conn,
acct_archive_cond_t *arch_cond)
@@ -8508,8 +8508,8 @@ extern int jobacct_storage_g_archive(void *db_conn,
(db_conn, arch_cond);
}
-/*
- * load expired info into the storage
+/*
+ * load expired info into the storage
*/
extern int jobacct_storage_g_archive_load(void *db_conn,
acct_archive_rec_t *arch_rec)
@@ -8517,11 +8517,11 @@ extern int jobacct_storage_g_archive_load(void *db_conn,
if (slurm_acct_storage_init(NULL) < 0)
return SLURM_ERROR;
return (*(g_acct_storage_context->ops.archive_load))(db_conn, arch_rec);
-
+
}
-/*
- * record shares used information for backup in case slurmctld restarts
+/*
+ * record shares used information for backup in case slurmctld restarts
* IN: account_list List of shares_used_object_t *
* RET: SLURM_SUCCESS on success SLURM_ERROR else
*/
@@ -8529,15 +8529,15 @@ extern int acct_storage_g_update_shares_used(void *db_conn, List acct_list)
{
if (slurm_acct_storage_init(NULL) < 0)
return SLURM_ERROR;
- return (*(g_acct_storage_context->ops.update_shares_used))(db_conn,
+ return (*(g_acct_storage_context->ops.update_shares_used))(db_conn,
acct_list);
}
-/*
+/*
* This should be called when a cluster does a cold start to flush out
* any jobs that were running during the restart so we don't have any
* jobs in the database "running" forever since no endtime will be
- * placed in there other wise.
+ * placed in there other wise.
* IN: char * = cluster name
* RET: SLURM_SUCCESS on success SLURM_ERROR else
*/
diff --git a/src/common/slurm_accounting_storage.h b/src/common/slurm_accounting_storage.h
index db86b7271a3fe4778fbfd29b8945fb7db40c363a..b320283400c0f920ca99073925ec6c07140f6773 100644
--- a/src/common/slurm_accounting_storage.h
+++ b/src/common/slurm_accounting_storage.h
@@ -6,38 +6,38 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
\*****************************************************************************/
-#ifndef _SLURM_ACCOUNTING_STORAGE_H
+#ifndef _SLURM_ACCOUNTING_STORAGE_H
#define _SLURM_ACCOUNTING_STORAGE_H
#include "src/common/list.h"
@@ -117,10 +117,10 @@ typedef struct {
List partition_list; /* list of char * */
List parent_acct_list; /* name of parent account */
- List qos_list; /* list of char * */
+ List qos_list; /* list of char * */
- time_t usage_end;
- time_t usage_start;
+ time_t usage_end;
+ time_t usage_start;
List user_list; /* list of char * */
@@ -138,9 +138,9 @@ typedef struct {
names */
List description_list; /* list of char * */
List organization_list; /* list of char * */
- uint16_t with_assocs;
- uint16_t with_coords;
- uint16_t with_deleted;
+ uint16_t with_assocs;
+ uint16_t with_coords;
+ uint16_t with_deleted;
} acct_account_cond_t;
typedef struct {
@@ -169,7 +169,7 @@ typedef struct acct_association_rec {
* underlying group of
* associations can run for */
uint32_t grp_cpus; /* max number of cpus the
- * underlying group of
+ * underlying group of
* associations can allocate at one time */
uint32_t grp_jobs; /* max number of jobs the
* underlying group of associations can run
@@ -181,30 +181,30 @@ typedef struct acct_association_rec {
* underlying group of
* associations can submit at
* one time */
- uint32_t grp_wall; /* total time in hours the
+ uint32_t grp_wall; /* total time in hours the
* underlying group of
* associations can run for */
-
+
uint32_t grp_used_cpus; /* count of active jobs in the group
* (DON'T PACK) */
uint32_t grp_used_nodes; /* count of active jobs in the group
* (DON'T PACK) */
double grp_used_wall; /* group count of time used in
* running jobs (DON'T PACK) */
-
+
uint32_t id; /* id identifing a combination of
* user-account-cluster(-partition) */
-
+
uint32_t level_shares; /* number of shares on this level of
* the tree (DON'T PACK) */
-
+
uint32_t lft; /* lft used for grouping sub
* associations and jobs as a left
* most container used with rgt */
-
- uint64_t max_cpu_mins_pj; /* max number of cpu seconds this
+
+ uint64_t max_cpu_mins_pj; /* max number of cpu seconds this
* association can have per job */
- uint32_t max_cpus_pj; /* max number of cpus this
+ uint32_t max_cpus_pj; /* max number of cpus this
* association can allocate per job */
uint32_t max_jobs; /* max number of jobs this association can run
* at one time */
@@ -214,18 +214,18 @@ typedef struct acct_association_rec {
submitted by association */
uint32_t max_wall_pj; /* longest time this
* association can run a job */
-
+
char *parent_acct; /* name of parent account */
struct acct_association_rec *parent_assoc_ptr; /* ptr to parent acct
* set in
- * slurmctld
+ * slurmctld
* (DON'T PACK) */
uint32_t parent_id; /* id of parent account */
- char *partition; /* optional partition in a cluster
+ char *partition; /* optional partition in a cluster
* associated to association */
-
+
List qos_list; /* list of char * */
-
+
uint32_t rgt; /* rgt used for grouping sub
* associations and jobs as a right
* most container used with lft */
@@ -234,7 +234,7 @@ typedef struct acct_association_rec {
uint32_t shares_raw; /* number of shares allocated to association */
uint32_t uid; /* user ID */
-
+
long double usage_efctv;/* effective, normalized usage (DON'T PACK) */
long double usage_norm; /* normalized usage (DON'T PACK) */
long double usage_raw; /* measure of resource usage (DON'T PACK) */
@@ -242,20 +242,20 @@ typedef struct acct_association_rec {
uint32_t used_jobs; /* count of active jobs (DON'T PACK) */
uint32_t used_submit_jobs; /* count of jobs pending or running
* (DON'T PACK) */
-
+
char *user; /* user associated to association */
bitstr_t *valid_qos; /* qos available for this association
* derived from the qos_list.
- * (DON'T PACK) */
+ * (DON'T PACK) */
} acct_association_rec_t;
typedef struct {
uint16_t classification; /* how this machine is classified */
List cluster_list; /* list of char * */
- time_t usage_end;
- time_t usage_start;
- uint16_t with_deleted;
- uint16_t with_usage;
+ time_t usage_end;
+ time_t usage_start;
+ uint16_t with_deleted;
+ uint16_t with_usage;
} acct_cluster_cond_t;
typedef struct {
@@ -290,8 +290,8 @@ typedef struct {
List resvid_list; /* list of char * */
List step_list; /* list of jobacct_selected_step_t */
List state_list; /* list of char * */
- time_t usage_end;
- time_t usage_start;
+ time_t usage_end;
+ time_t usage_start;
char *used_nodes; /* a ranged node string where jobs ran */
List userid_list; /* list of char * */
List wckey_list; /* list of char * */
@@ -314,7 +314,7 @@ typedef struct {
can allocate at one time */
uint32_t grp_jobs; /* max number of jobs this qos can run
* at one time */
- uint32_t grp_nodes; /* max number of nodes this qos
+ uint32_t grp_nodes; /* max number of nodes this qos
can allocate at once */
uint32_t grp_submit_jobs; /* max number of jobs this qos can submit at
* one time */
@@ -361,7 +361,7 @@ typedef struct {
List description_list; /* list of char * */
List id_list; /* list of char * */
List name_list; /* list of char * */
- uint16_t with_deleted;
+ uint16_t with_deleted;
} acct_qos_cond_t;
typedef struct {
@@ -391,7 +391,7 @@ typedef struct {
time_t time_start; /* start time of reservation */
time_t time_start_prev; /* If start time was changed this is
* the pervious start time. Needed
- * for accounting */
+ * for accounting */
} acct_reservation_rec_t;
/* Right now this is used in the acct_qos_rec_t structure. In the
@@ -409,10 +409,10 @@ typedef struct {
names */
List def_acct_list; /* list of char * */
List def_wckey_list; /* list of char * */
- uint16_t with_assocs;
- uint16_t with_coords;
- uint16_t with_deleted;
- uint16_t with_wckeys;
+ uint16_t with_assocs;
+ uint16_t with_coords;
+ uint16_t with_deleted;
+ uint16_t with_wckeys;
} acct_user_cond_t;
/* If there is something that can be altered here it will need to
@@ -440,8 +440,8 @@ typedef struct {
List id_list; /* list of char * */
List info_list; /* list of char * */
List name_list; /* list of char * */
- time_t time_end;
- time_t time_start;
+ time_t time_end;
+ time_t time_start;
List user_list; /* list of char * */
uint16_t with_assoc_info;
} acct_txn_cond_t;
@@ -459,7 +459,7 @@ typedef struct {
} acct_txn_rec_t;
typedef struct {
- List objects; /* depending on type */
+ List objects; /* depending on type */
uint16_t type; /* really acct_update_type_t but for
* packing purposes needs to be a
* uint16_t */
@@ -471,8 +471,8 @@ typedef struct {
List name_list; /* list of char * */
- time_t usage_end;
- time_t usage_start;
+ time_t usage_end;
+ time_t usage_start;
List user_list; /* list of char * */
@@ -506,7 +506,7 @@ typedef struct {
uint64_t over_secs; /* number of cpu seconds overcommitted */
uint64_t pdown_secs; /* number of cpu seconds planned down */
time_t period_start; /* when this record was started */
- uint64_t resv_secs; /* number of cpu seconds reserved */
+ uint64_t resv_secs; /* number of cpu seconds reserved */
} cluster_accounting_rec_t;
typedef struct {
@@ -592,15 +592,15 @@ extern void init_acct_qos_rec(acct_qos_rec_t *qos);
/* pack functions */
extern void pack_acct_user_rec(void *in, uint16_t rpc_version, Buf buffer);
-extern int unpack_acct_user_rec(void **object, uint16_t rpc_version,
+extern int unpack_acct_user_rec(void **object, uint16_t rpc_version,
Buf buffer);
extern void pack_acct_account_rec(void *in, uint16_t rpc_version, Buf buffer);
-extern int unpack_acct_account_rec(void **object, uint16_t rpc_version,
+extern int unpack_acct_account_rec(void **object, uint16_t rpc_version,
Buf buffer);
extern void pack_acct_coord_rec(void *in, uint16_t rpc_version, Buf buffer);
extern int unpack_acct_coord_rec(void **object, uint16_t rpc_version,
Buf buffer);
-extern void pack_cluster_accounting_rec(void *in, uint16_t rpc_version,
+extern void pack_cluster_accounting_rec(void *in, uint16_t rpc_version,
Buf buffer);
extern int unpack_cluster_accounting_rec(void **object, uint16_t rpc_version,
Buf buffer);
@@ -609,9 +609,9 @@ extern int unpack_acct_cluster_rec(void **object, uint16_t rpc_version,
Buf buffer);
extern void pack_acct_accounting_rec(void *in, uint16_t rpc_version,
Buf buffer);
-extern int unpack_acct_accounting_rec(void **object, uint16_t rpc_version,
+extern int unpack_acct_accounting_rec(void **object, uint16_t rpc_version,
Buf buffer);
-extern void pack_acct_association_rec(void *in, uint16_t rpc_version,
+extern void pack_acct_association_rec(void *in, uint16_t rpc_version,
Buf buffer);
extern int unpack_acct_association_rec(void **object, uint16_t rpc_version,
Buf buffer);
@@ -637,11 +637,11 @@ extern void pack_acct_account_cond(void *in, uint16_t rpc_version, Buf buffer);
extern int unpack_acct_account_cond(void **object, uint16_t rpc_version,
Buf buffer);
extern void pack_acct_cluster_cond(void *in, uint16_t rpc_version, Buf buffer);
-extern int unpack_acct_cluster_cond(void **object, uint16_t rpc_version,
+extern int unpack_acct_cluster_cond(void **object, uint16_t rpc_version,
Buf buffer);
extern void pack_acct_association_cond(void *in, uint16_t rpc_version,
Buf buffer);
-extern int unpack_acct_association_cond(void **object, uint16_t rpc_version,
+extern int unpack_acct_association_cond(void **object, uint16_t rpc_version,
Buf buffer);
extern void pack_acct_job_cond(void *in, uint16_t rpc_version, Buf buffer);
extern int unpack_acct_job_cond(void **object, uint16_t rpc_version,
@@ -663,7 +663,7 @@ extern void pack_acct_archive_cond(void *in, uint16_t rpc_version, Buf buffer);
extern int unpack_acct_archive_cond(void **object, uint16_t rpc_version,
Buf buffer);
-extern void pack_acct_update_object(acct_update_object_t *object,
+extern void pack_acct_update_object(acct_update_object_t *object,
uint16_t rpc_version, Buf buffer);
extern int unpack_acct_update_object(acct_update_object_t **object,
uint16_t rpc_version, Buf buffer);
@@ -674,7 +674,7 @@ extern int unpack_acct_used_limits(void **object,
extern void pack_update_shares_used(void *in, uint16_t rpc_version,
Buf buffer);
-extern int unpack_update_shares_used(void **object, uint16_t rpc_version,
+extern int unpack_update_shares_used(void **object, uint16_t rpc_version,
Buf buffer);
extern char *acct_qos_str(List qos_list, uint32_t level);
@@ -688,7 +688,7 @@ extern acct_admin_level_t str_2_acct_admin_level(char *level);
extern List get_hierarchical_sorted_assoc_list(List assoc_list);
extern List get_acct_hierarchical_rec_list(List assoc_list);
-/* IN/OUT: tree_list a list of acct_print_tree_t's */
+/* IN/OUT: tree_list a list of acct_print_tree_t's */
extern char *get_tree_acct_name(char *name, char *parent, List tree_list);
extern int set_qos_bitstr_from_list(bitstr_t *valid_qos, List qos_list);
@@ -712,7 +712,7 @@ extern int slurm_acct_storage_fini(void); /* unload the plugin */
* IN: conn_num - If running more than one connection to the database
* this can be used to tell which connection is doing what
* IN: rollback - maintain journal of changes to permit rollback
- * RET: pointer used to access db
+ * RET: pointer used to access db
*/
extern void *acct_storage_g_get_connection(bool make_agent, int conn_num,
bool rollback);
@@ -721,7 +721,7 @@ extern void *acct_storage_g_get_connection(bool make_agent, int conn_num,
* release connection to the storage unit
* IN/OUT: void ** pointer returned from
* acct_storage_g_get_connection() which will be freed.
- * RET: SLURM_SUCCESS on success SLURM_ERROR else
+ * RET: SLURM_SUCCESS on success SLURM_ERROR else
*/
extern int acct_storage_g_close_connection(void **db_conn);
@@ -729,212 +729,212 @@ extern int acct_storage_g_close_connection(void **db_conn);
* commit or rollback changes made without closing connection
* IN: void * pointer returned from acct_storage_g_get_connection()
* IN: bool - true will commit changes false will rollback
- * RET: SLURM_SUCCESS on success SLURM_ERROR else
+ * RET: SLURM_SUCCESS on success SLURM_ERROR else
*/
extern int acct_storage_g_commit(void *db_conn, bool commit);
-/*
- * add users to accounting system
+/*
+ * add users to accounting system
* IN: user_list List of acct_user_rec_t *
* RET: SLURM_SUCCESS on success SLURM_ERROR else
*/
-extern int acct_storage_g_add_users(void *db_conn, uint32_t uid,
+extern int acct_storage_g_add_users(void *db_conn, uint32_t uid,
List user_list);
-/*
- * add users as account coordinators
+/*
+ * add users as account coordinators
* IN: acct_list list of char *'s of names of accounts
* IN: acct_user_cond_t *user_cond
* RET: SLURM_SUCCESS on success SLURM_ERROR else
*/
extern int acct_storage_g_add_coord(void *db_conn, uint32_t uid,
- List acct_list,
+ List acct_list,
acct_user_cond_t *user_cond);
-/*
- * add accounts to accounting system
+/*
+ * add accounts to accounting system
* IN: account_list List of acct_account_rec_t *
* RET: SLURM_SUCCESS on success SLURM_ERROR else
*/
extern int acct_storage_g_add_accounts(void *db_conn, uint32_t uid,
List acct_list);
-/*
- * add clusters to accounting system
+/*
+ * add clusters to accounting system
* IN: cluster_list List of acct_cluster_rec_t *
* RET: SLURM_SUCCESS on success SLURM_ERROR else
*/
extern int acct_storage_g_add_clusters(void *db_conn, uint32_t uid,
List cluster_list);
-/*
- * add associations to accounting system
+/*
+ * add associations to accounting system
* IN: association_list List of acct_association_rec_t *
* RET: SLURM_SUCCESS on success SLURM_ERROR else
*/
-extern int acct_storage_g_add_associations(void *db_conn, uint32_t uid,
+extern int acct_storage_g_add_associations(void *db_conn, uint32_t uid,
List association_list);
-/*
- * add qos's to accounting system
+/*
+ * add qos's to accounting system
* IN: qos_list List of char *
* RET: SLURM_SUCCESS on success SLURM_ERROR else
*/
-extern int acct_storage_g_add_qos(void *db_conn, uint32_t uid,
+extern int acct_storage_g_add_qos(void *db_conn, uint32_t uid,
List qos_list);
-/*
- * add wckey's to accounting system
+/*
+ * add wckey's to accounting system
* IN: wckey_list List of acct_wckey_rec_t *
* RET: SLURM_SUCCESS on success SLURM_ERROR else
*/
-extern int acct_storage_g_add_wckeys(void *db_conn, uint32_t uid,
+extern int acct_storage_g_add_wckeys(void *db_conn, uint32_t uid,
List wckey_list);
-/*
- * add reservation's in accounting system
+/*
+ * add reservation's in accounting system
* IN: acct_reservation_rec_t *resv reservation to be added.
* RET: SLURM_SUCCESS on success SLURM_ERROR else
*/
-extern int acct_storage_g_add_reservation(void *db_conn,
+extern int acct_storage_g_add_reservation(void *db_conn,
acct_reservation_rec_t *resv);
-/*
- * modify existing users in the accounting system
+/*
+ * modify existing users in the accounting system
* IN: acct_user_cond_t *user_cond
* IN: acct_user_rec_t *user
* RET: List containing (char *'s) else NULL on error
*/
-extern List acct_storage_g_modify_users(void *db_conn, uint32_t uid,
+extern List acct_storage_g_modify_users(void *db_conn, uint32_t uid,
acct_user_cond_t *user_cond,
acct_user_rec_t *user);
-/*
- * modify existing accounts in the accounting system
+/*
+ * modify existing accounts in the accounting system
* IN: acct_acct_cond_t *acct_cond
* IN: acct_account_rec_t *acct
* RET: List containing (char *'s) else NULL on error
*/
-extern List acct_storage_g_modify_accounts(void *db_conn, uint32_t uid,
+extern List acct_storage_g_modify_accounts(void *db_conn, uint32_t uid,
acct_account_cond_t *acct_cond,
acct_account_rec_t *acct);
-/*
- * modify existing clusters in the accounting system
+/*
+ * modify existing clusters in the accounting system
* IN: acct_cluster_cond_t *cluster_cond
* IN: acct_cluster_rec_t *cluster
* RET: List containing (char *'s) else NULL on error
*/
-extern List acct_storage_g_modify_clusters(void *db_conn, uint32_t uid,
+extern List acct_storage_g_modify_clusters(void *db_conn, uint32_t uid,
acct_cluster_cond_t *cluster_cond,
acct_cluster_rec_t *cluster);
-/*
- * modify existing associations in the accounting system
+/*
+ * modify existing associations in the accounting system
* IN: acct_association_cond_t *assoc_cond
* IN: acct_association_rec_t *assoc
* RET: List containing (char *'s) else NULL on error
*/
extern List acct_storage_g_modify_associations(
- void *db_conn, uint32_t uid,
+ void *db_conn, uint32_t uid,
acct_association_cond_t *assoc_cond,
acct_association_rec_t *assoc);
-/*
- * modify existing qos in the accounting system
+/*
+ * modify existing qos in the accounting system
* IN: acct_qos_cond_t *qos_cond
* IN: acct_qos_rec_t *qos
* RET: List containing (char *'s) else NULL on error
*/
-extern List acct_storage_g_modify_qos(void *db_conn, uint32_t uid,
+extern List acct_storage_g_modify_qos(void *db_conn, uint32_t uid,
acct_qos_cond_t *qos_cond,
acct_qos_rec_t *qos);
-/*
- * modify existing wckey in the accounting system
+/*
+ * modify existing wckey in the accounting system
* IN: acct_wckey_cond_t *wckey_cond
* IN: acct_wckey_rec_t *wckey
* RET: List containing (char *'s) else NULL on error
*/
-extern List acct_storage_g_modify_wckeys(void *db_conn, uint32_t uid,
+extern List acct_storage_g_modify_wckeys(void *db_conn, uint32_t uid,
acct_wckey_cond_t *wckey_cond,
acct_wckey_rec_t *wckey);
-/*
- * modify reservation's in accounting system
- * IN: acct_reservation_rec_t *resv
+/*
+ * modify reservation's in accounting system
+ * IN: acct_reservation_rec_t *resv
* RET: SLURM_SUCCESS on success SLURM_ERROR else
*/
-extern int acct_storage_g_modify_reservation(void *db_conn,
+extern int acct_storage_g_modify_reservation(void *db_conn,
acct_reservation_rec_t *resv);
-/*
- * remove users from accounting system
+/*
+ * remove users from accounting system
* IN: acct_user_cond_t *user_cond
* RET: List containing (char *'s) else NULL on error
*/
-extern List acct_storage_g_remove_users(void *db_conn, uint32_t uid,
+extern List acct_storage_g_remove_users(void *db_conn, uint32_t uid,
acct_user_cond_t *user_cond);
-/*
+/*
* remove users from being a coordinator of an account
* IN: acct_list list of char *'s of names of accounts
* IN: acct_user_cond_t *user_cond
* RET: List containing (char *'s) else NULL on error
*/
-extern List acct_storage_g_remove_coord(void *db_conn, uint32_t uid,
+extern List acct_storage_g_remove_coord(void *db_conn, uint32_t uid,
List acct_list,
acct_user_cond_t *user_cond);
-/*
- * remove accounts from accounting system
+/*
+ * remove accounts from accounting system
* IN: acct_account_cond_t *acct_cond
* RET: List containing (char *'s) else NULL on error
*/
-extern List acct_storage_g_remove_accounts(void *db_conn, uint32_t uid,
+extern List acct_storage_g_remove_accounts(void *db_conn, uint32_t uid,
acct_account_cond_t *acct_cond);
-/*
- * remove clusters from accounting system
+/*
+ * remove clusters from accounting system
* IN: acct_cluster_cond_t *cluster_cond
* RET: List containing (char *'s) else NULL on error
*/
-extern List acct_storage_g_remove_clusters(void *db_conn, uint32_t uid,
+extern List acct_storage_g_remove_clusters(void *db_conn, uint32_t uid,
acct_cluster_cond_t *cluster_cond);
-/*
- * remove associations from accounting system
+/*
+ * remove associations from accounting system
* IN: acct_association_cond_t *assoc_cond
* RET: List containing (char *'s) else NULL on error
*/
extern List acct_storage_g_remove_associations(
void *db_conn, uint32_t uid, acct_association_cond_t *assoc_cond);
-/*
- * remove qos from accounting system
+/*
+ * remove qos from accounting system
* IN: acct_qos_cond_t *assoc_qos
* RET: List containing (char *'s) else NULL on error
*/
extern List acct_storage_g_remove_qos(
void *db_conn, uint32_t uid, acct_qos_cond_t *qos_cond);
-/*
- * remove wckey from accounting system
+/*
+ * remove wckey from accounting system
* IN: acct_wckey_cond_t *assoc_wckey
* RET: List containing (char *'s) else NULL on error
*/
extern List acct_storage_g_remove_wckeys(
void *db_conn, uint32_t uid, acct_wckey_cond_t *wckey_cond);
-/*
- * remove reservation's in accounting system
- * IN: acct_reservation_rec_t *resv
+/*
+ * remove reservation's in accounting system
+ * IN: acct_reservation_rec_t *resv
* RET: SLURM_SUCCESS on success SLURM_ERROR else
*/
-extern int acct_storage_g_remove_reservation(void *db_conn,
+extern int acct_storage_g_remove_reservation(void *db_conn,
acct_reservation_rec_t *resv);
-/*
- * get info from the storage
+/*
+ * get info from the storage
* IN: acct_user_cond_t *
* IN: params void *
* returns List of acct_user_rec_t *
@@ -943,8 +943,8 @@ extern int acct_storage_g_remove_reservation(void *db_conn,
extern List acct_storage_g_get_users(void *db_conn, uint32_t uid,
acct_user_cond_t *user_cond);
-/*
- * get info from the storage
+/*
+ * get info from the storage
* IN: acct_account_cond_t *
* IN: params void *
* returns List of acct_account_rec_t *
@@ -953,8 +953,8 @@ extern List acct_storage_g_get_users(void *db_conn, uint32_t uid,
extern List acct_storage_g_get_accounts(void *db_conn, uint32_t uid,
acct_account_cond_t *acct_cond);
-/*
- * get info from the storage
+/*
+ * get info from the storage
* IN: acct_cluster_cond_t *
* IN: params void *
* returns List of acct_cluster_rec_t *
@@ -964,15 +964,15 @@ extern List acct_storage_g_get_clusters(
void *db_conn, uint32_t uid, acct_cluster_cond_t *cluster_cond);
-/*
- * get info from the storage
+/*
+ * get info from the storage
* RET: List of config_key_pairs_t *
* note List needs to be freed when called
*/
extern List acct_storage_g_get_config(void *db_conn);
-/*
- * get info from the storage
+/*
+ * get info from the storage
* IN: acct_association_cond_t *
* RET: List of acct_association_rec_t *
* note List needs to be freed when called
@@ -980,8 +980,8 @@ extern List acct_storage_g_get_config(void *db_conn);
extern List acct_storage_g_get_associations(
void *db_conn, uint32_t uid, acct_association_cond_t *assoc_cond);
-/*
- * get info from the storage
+/*
+ * get info from the storage
* IN: acct_association_cond_t *
* RET: List of acct_association_rec_t *
* note List needs to be freed when called
@@ -989,8 +989,8 @@ extern List acct_storage_g_get_associations(
extern List acct_storage_g_get_problems(
void *db_conn, uint32_t uid, acct_association_cond_t *assoc_cond);
-/*
- * get info from the storage
+/*
+ * get info from the storage
* IN: acct_qos_cond_t *
* RET: List of acct_qos_rec_t *
* note List needs to be freed when called
@@ -998,8 +998,8 @@ extern List acct_storage_g_get_problems(
extern List acct_storage_g_get_qos(void *db_conn, uint32_t uid,
acct_qos_cond_t *qos_cond);
-/*
- * get info from the storage
+/*
+ * get info from the storage
* IN: acct_wckey_cond_t *
* RET: List of acct_wckey_rec_t *
* note List needs to be freed when called
@@ -1007,8 +1007,8 @@ extern List acct_storage_g_get_qos(void *db_conn, uint32_t uid,
extern List acct_storage_g_get_wckeys(void *db_conn, uint32_t uid,
acct_wckey_cond_t *wckey_cond);
-/*
- * get info from the storage
+/*
+ * get info from the storage
* IN: acct_reservation_cond_t *
* RET: List of acct_reservation_rec_t *
* note List needs to be freed when called
@@ -1016,8 +1016,8 @@ extern List acct_storage_g_get_wckeys(void *db_conn, uint32_t uid,
extern List acct_storage_g_get_reservations(void *db_conn, uint32_t uid,
acct_reservation_cond_t *resv_cond);
-/*
- * get info from the storage
+/*
+ * get info from the storage
* IN: acct_txn_cond_t *
* RET: List of acct_txn_rec_t *
* note List needs to be freed when called
@@ -1025,8 +1025,8 @@ extern List acct_storage_g_get_reservations(void *db_conn, uint32_t uid,
extern List acct_storage_g_get_txn(void *db_conn, uint32_t uid,
acct_txn_cond_t *txn_cond);
-/*
- * get info from the storage
+/*
+ * get info from the storage
* IN/OUT: in void * (acct_association_rec_t *) or
* (acct_wckey_rec_t *) with the id set
* IN: type what type is 'in'
@@ -1037,28 +1037,28 @@ extern List acct_storage_g_get_txn(void *db_conn, uint32_t uid,
extern int acct_storage_g_get_usage(
void *db_conn, uint32_t uid, void *in, int type,
time_t start, time_t end);
-/*
- * roll up data in the storage
+/*
+ * roll up data in the storage
* IN: sent_start (option time to do a re-roll or start from this point)
* IN: sent_end (option time to do a re-roll or end at this point)
* IN: archive_data (if 0 old data is not archived in a monthly rollup)
* RET: SLURM_SUCCESS on success SLURM_ERROR else
*/
-extern int acct_storage_g_roll_usage(void *db_conn,
+extern int acct_storage_g_roll_usage(void *db_conn,
time_t sent_start, time_t sent_end,
uint16_t archive_data);
-/*
- * record shares used information for backup in case slurmctld restarts
+/*
+ * record shares used information for backup in case slurmctld restarts
* IN: account_list List of shares_used_object_t *
* RET: SLURM_SUCCESS on success SLURM_ERROR else
*/
extern int acct_storage_g_update_shares_used(void *db_conn, List acct_list);
-/*
+/*
* This should be called when a cluster does a cold start to flush out
* any jobs that were running during the restart so we don't have any
* jobs in the database "running" forever since no endtime will be
- * placed in there other wise.
+ * placed in there other wise.
* IN: char * = cluster name
* RET: SLURM_SUCCESS on success SLURM_ERROR else
*/
@@ -1067,18 +1067,18 @@ extern int acct_storage_g_flush_jobs_on_cluster(
/*********************** CLUSTER ACCOUNTING STORAGE **************************/
-extern int clusteracct_storage_g_node_down(void *db_conn,
+extern int clusteracct_storage_g_node_down(void *db_conn,
char *cluster,
struct node_record *node_ptr,
time_t event_time,
char *reason);
-extern int clusteracct_storage_g_node_up(void *db_conn,
+extern int clusteracct_storage_g_node_up(void *db_conn,
char *cluster,
struct node_record *node_ptr,
time_t event_time);
-extern int clusteracct_storage_g_cluster_procs(void *db_conn,
+extern int clusteracct_storage_g_cluster_procs(void *db_conn,
char *cluster,
char *cluster_nodes,
uint32_t procs,
@@ -1087,8 +1087,8 @@ extern int clusteracct_storage_g_cluster_procs(void *db_conn,
extern int clusteracct_storage_g_register_ctld(
void *db_conn, char *cluster, uint16_t port);
-/*
- * get info from the storage
+/*
+ * get info from the storage
* IN/OUT: cluster_rec void * (acct_cluster_rec_t *) with the name set
* IN: start time stamp for records >=
* IN: end time stamp for records <
@@ -1099,54 +1099,54 @@ extern int clusteracct_storage_g_get_usage(
void *db_conn, uint32_t uid, void *cluster_rec, int type,
time_t start, time_t end);
-/*
+/*
* load into the storage the start of a job
*/
extern int jobacct_storage_g_job_start (void *db_conn, char *cluster_name,
struct job_record *job_ptr);
-/*
+/*
* load into the storage the end of a job
*/
-extern int jobacct_storage_g_job_complete (void *db_conn,
+extern int jobacct_storage_g_job_complete (void *db_conn,
struct job_record *job_ptr);
-/*
+/*
* load into the storage the start of a job step
*/
-extern int jobacct_storage_g_step_start (void *db_conn,
+extern int jobacct_storage_g_step_start (void *db_conn,
struct step_record *step_ptr);
-/*
+/*
* load into the storage the end of a job step
*/
-extern int jobacct_storage_g_step_complete (void *db_conn,
+extern int jobacct_storage_g_step_complete (void *db_conn,
struct step_record *step_ptr);
-/*
+/*
* load into the storage a suspention of a job
*/
-extern int jobacct_storage_g_job_suspend (void *db_conn,
+extern int jobacct_storage_g_job_suspend (void *db_conn,
struct job_record *job_ptr);
-/*
- * get info from the storage
+/*
+ * get info from the storage
* returns List of jobacct_job_rec_t *
* note List needs to be freed when called
*/
-extern List jobacct_storage_g_get_jobs_cond(void *db_conn, uint32_t uid,
+extern List jobacct_storage_g_get_jobs_cond(void *db_conn, uint32_t uid,
acct_job_cond_t *job_cond);
-/*
- * expire old info from the storage
+/*
+ * expire old info from the storage
*/
-extern int jobacct_storage_g_archive(void *db_conn,
+extern int jobacct_storage_g_archive(void *db_conn,
acct_archive_cond_t *arch_cond);
-/*
- * expire old info from the storage
+/*
+ * expire old info from the storage
*/
-extern int jobacct_storage_g_archive_load(void *db_conn,
+extern int jobacct_storage_g_archive_load(void *db_conn,
acct_archive_rec_t *arch_rec);
#endif /*_SLURM_ACCOUNTING_STORAGE_H*/
diff --git a/src/common/slurm_auth.c b/src/common/slurm_auth.c
index 873f63acb5b7150f5d52a3b74c7a346cd8e973df..401914a754f7193cde0a2842ec6b28b2130c7265 100644
--- a/src/common/slurm_auth.c
+++ b/src/common/slurm_auth.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jay Windley <jwindley@lnxi.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -143,13 +143,13 @@ slurm_auth_get_ops( slurm_auth_context_t c )
/* Find the correct plugin. */
c->cur_plugin = plugin_load_and_link(c->auth_type, n_syms, syms,
(void **) &c->ops);
- if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
+ if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
error("Couldn't find the specified plugin name for %s "
"looking at all files",
c->auth_type);
-
+
/* Get the plugin list, if needed. */
if ( c->plugin_list == NULL ) {
char *plugin_dir;
@@ -160,20 +160,20 @@ slurm_auth_get_ops( slurm_auth_context_t c )
}
plugrack_set_major_type( c->plugin_list, "auth" );
- plugrack_set_paranoia( c->plugin_list,
- PLUGRACK_PARANOIA_NONE,
+ plugrack_set_paranoia( c->plugin_list,
+ PLUGRACK_PARANOIA_NONE,
0 );
plugin_dir = slurm_get_plugin_dir();
plugrack_read_dir( c->plugin_list, plugin_dir );
xfree(plugin_dir);
}
-
+
/* Find the correct plugin. */
c->cur_plugin = plugrack_use_by_type( c->plugin_list, c->auth_type );
if ( c->cur_plugin == PLUGIN_INVALID_HANDLE ) {
error( "can't find a plugin for type %s", c->auth_type );
return NULL;
- }
+ }
/* Dereference the API. */
if ( plugin_get_syms( c->cur_plugin,
@@ -200,16 +200,16 @@ slurm_auth_marshal_args( void *hosts, int timeout )
static int timeout_idx = -1;
static int count = sizeof( auth_args ) / sizeof( struct _arg_desc ) - 1;
void **argv;
-
+
/* Get indices from descriptor, if we haven't already. */
if ( ( hostlist_idx == -1 ) &&
( timeout_idx == -1 ) ) {
hostlist_idx = arg_idx_by_name( auth_args, ARG_HOST_LIST );
- timeout_idx = arg_idx_by_name( auth_args, ARG_TIMEOUT );
+ timeout_idx = arg_idx_by_name( auth_args, ARG_TIMEOUT );
}
argv = xmalloc( count * sizeof( void * ) );
-
+
/* Marshal host list. Don't quite know how to do this yet. */
argv[ hostlist_idx ] = hosts;
@@ -245,14 +245,14 @@ slurm_auth_context_create( const char *auth_type )
/* Plugin rack is demand-loaded on first reference. */
c->plugin_list = NULL;
- c->cur_plugin = PLUGIN_INVALID_HANDLE;
+ c->cur_plugin = PLUGIN_INVALID_HANDLE;
return c;
}
static const char *
-slurm_auth_generic_errstr( int slurm_errno )
+slurm_auth_generic_errstr( int slurm_errno )
{
static struct {
int err;
@@ -283,7 +283,7 @@ slurm_auth_generic_errstr( int slurm_errno )
static int
_slurm_auth_context_destroy( slurm_auth_context_t c )
-{
+{
int rc = SLURM_SUCCESS;
/*
@@ -300,7 +300,7 @@ _slurm_auth_context_destroy( slurm_auth_context_t c )
xfree( c->auth_type );
xfree( c );
-
+
return rc;
}
@@ -309,10 +309,10 @@ slurm_auth_init( char *auth_type )
{
int retval = SLURM_SUCCESS;
char *auth_type_local = NULL;
-
+
slurm_mutex_lock( &context_lock );
- if ( g_context )
+ if ( g_context )
goto done;
if (auth_type == NULL) {
@@ -331,9 +331,9 @@ slurm_auth_init( char *auth_type )
retval = SLURM_ERROR;
goto done;
}
-
+
if ( slurm_auth_get_ops( g_context ) == NULL ) {
- error( "cannot resolve %s plugin operations",
+ error( "cannot resolve %s plugin operations",
auth_type );
_slurm_auth_context_destroy( g_context );
g_context = NULL;
@@ -366,7 +366,7 @@ slurm_auth_fini( void )
* context initialization includes a test for the completeness of
* the API function dispatcher.
*/
-
+
void *
g_slurm_auth_create( void *hosts, int timeout, char *auth_info )
{
@@ -382,7 +382,7 @@ g_slurm_auth_create( void *hosts, int timeout, char *auth_info )
if ( ( argv = slurm_auth_marshal_args( hosts, timeout ) ) == NULL ) {
return NULL;
}
-
+
ret = (*(g_context->ops.create))( argv, auth_info );
xfree( argv );
return ret;
@@ -415,7 +415,7 @@ g_slurm_auth_verify( void *cred, void *hosts, int timeout, char *auth_info )
if ( ( argv = slurm_auth_marshal_args( hosts, timeout ) ) == NULL ) {
return SLURM_ERROR;
}
-
+
ret = (*(g_context->ops.verify))( cred, auth_info );
xfree( argv );
return ret;
@@ -426,7 +426,7 @@ g_slurm_auth_get_uid( void *cred, char *auth_info )
{
if (( slurm_auth_init(NULL) < 0 ) || auth_dummy )
return SLURM_AUTH_NOBODY;
-
+
return (*(g_context->ops.get_uid))( cred, auth_info );
}
@@ -435,7 +435,7 @@ g_slurm_auth_get_gid( void *cred, char *auth_info )
{
if (( slurm_auth_init(NULL) < 0 ) || auth_dummy )
return SLURM_AUTH_NOBODY;
-
+
return (*(g_context->ops.get_gid))( cred, auth_info );
}
@@ -444,7 +444,7 @@ g_slurm_auth_pack( void *cred, Buf buf )
{
if ( slurm_auth_init(NULL) < 0 )
return SLURM_ERROR;
-
+
if ( auth_dummy )
return SLURM_SUCCESS;
@@ -456,7 +456,7 @@ g_slurm_auth_unpack( Buf buf )
{
if (( slurm_auth_init(NULL) < 0 ) || auth_dummy )
return NULL;
-
+
return (*(g_context->ops.unpack))( buf );
}
diff --git a/src/common/slurm_auth.h b/src/common/slurm_auth.h
index eee964c30e451b5e79bafe449c0d6d58dbf27d98..55c024dff6f92c3e9d5fd71d1e1983c589544024 100644
--- a/src/common/slurm_auth.h
+++ b/src/common/slurm_auth.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Kevin Tew <tew1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -138,7 +138,7 @@ int slurm_auth_context_destroy( slurm_auth_context_t ctxt );
/*
* Prepare the global context.
- * auth_type IN: authentication mechanism (e.g. "auth/munge") or
+ * auth_type IN: authentication mechanism (e.g. "auth/munge") or
* NULL to select based upon slurm_get_auth_type() results
*/
extern int slurm_auth_init( char *auth_type );
@@ -153,7 +153,7 @@ extern int slurm_auth_fini( void );
*/
extern void * g_slurm_auth_create( void *hosts, int timeout, char *auth_info );
extern int g_slurm_auth_destroy( void *cred );
-extern int g_slurm_auth_verify( void *cred, void *hosts, int timeout,
+extern int g_slurm_auth_verify( void *cred, void *hosts, int timeout,
char *auth_info );
extern uid_t g_slurm_auth_get_uid( void *cred, char *auth_info );
extern gid_t g_slurm_auth_get_gid( void *cred, char *auth_info );
diff --git a/src/common/slurm_cred.c b/src/common/slurm_cred.c
index 2c55de2914a15272aea829c623a9580551e82a48..86b9b4c16a5da6d41c6df901db96d81ef7a21b5f 100644
--- a/src/common/slurm_cred.c
+++ b/src/common/slurm_cred.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -71,9 +71,9 @@
typedef struct sbcast_cred sbcast_cred_t; /* opaque data type */
#endif
-/*
+/*
* Default credential information expiration window.
- * Long enough for loading user environment, running prolog,
+ * Long enough for loading user environment, running prolog,
* and dealing with the slurmd getting paged out of memory.
*/
#define DEFAULT_EXPIRATION_WINDOW 1200
@@ -81,9 +81,9 @@ typedef struct sbcast_cred sbcast_cred_t; /* opaque data type */
#define MAX_TIME 0x7fffffff
#define SBCAST_CACHE_SIZE 64
-/*
- * slurm job credential state
- *
+/*
+ * slurm job credential state
+ *
*/
typedef struct {
time_t ctime; /* Time that the cred was created */
@@ -113,9 +113,9 @@ enum ctx_type {
SLURM_CRED_VERIFIER
};
-/*
- * slurm sbcast credential state
- *
+/*
+ * slurm sbcast credential state
+ *
*/
struct sbcast_cred {
time_t ctime; /* Time that the cred was created */
@@ -184,19 +184,19 @@ struct slurm_job_credential {
/*
* WARNING: Do not change the order of these fields or add additional
* fields at the beginning of the structure. If you do, job accounting
- * plugins will stop working. If you need to add fields, add them
+ * plugins will stop working. If you need to add fields, add them
* at the end of the structure.
*/
typedef struct slurm_crypto_ops {
void *(*crypto_read_private_key) (const char *path);
void *(*crypto_read_public_key) (const char *path);
void (*crypto_destroy_key) (void *key);
- int (*crypto_sign) (void * key, char *buffer,
- int buf_size, char **sig_pp,
+ int (*crypto_sign) (void * key, char *buffer,
+ int buf_size, char **sig_pp,
unsigned int *sig_size_p);
- int (*crypto_verify_sign) (void * key, char *buffer,
- unsigned int buf_size,
- char *signature,
+ int (*crypto_verify_sign) (void * key, char *buffer,
+ unsigned int buf_size,
+ char *signature,
unsigned int sig_size);
const char *(*crypto_str_error) (int);
} slurm_crypto_ops_t;
@@ -287,12 +287,12 @@ _slurm_crypto_context_create( const char *crypto_type)
if ( c->crypto_type == NULL ) {
error( "can't make local copy of crypto type" );
xfree( c );
- return NULL;
+ return NULL;
}
/* Plugin rack is demand-loaded on first reference. */
- c->plugin_list = NULL;
- c->cur_plugin = PLUGIN_INVALID_HANDLE;
+ c->plugin_list = NULL;
+ c->cur_plugin = PLUGIN_INVALID_HANDLE;
c->crypto_errno = SLURM_SUCCESS;
return c;
@@ -340,17 +340,17 @@ _slurm_crypto_get_ops( slurm_crypto_context_t *c )
};
int n_syms = sizeof( syms ) / sizeof( char * );
int rc = 0;
-
+
/* Find the correct plugin. */
c->cur_plugin = plugin_load_and_link(c->crypto_type, n_syms, syms,
(void **) &c->ops);
- if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
+ if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
error("Couldn't find the specified plugin name for %s "
"looking at all files",
c->crypto_type);
-
+
/* Get the plugin list, if needed. */
if ( c->plugin_list == NULL ) {
char *plugin_dir;
@@ -361,21 +361,21 @@ _slurm_crypto_get_ops( slurm_crypto_context_t *c )
}
plugrack_set_major_type( c->plugin_list, "crypto" );
- plugrack_set_paranoia( c->plugin_list,
- PLUGRACK_PARANOIA_NONE,
+ plugrack_set_paranoia( c->plugin_list,
+ PLUGRACK_PARANOIA_NONE,
0 );
plugin_dir = slurm_get_plugin_dir();
plugrack_read_dir( c->plugin_list, plugin_dir );
xfree(plugin_dir);
}
-
+
/* Find the correct plugin. */
- c->cur_plugin =
+ c->cur_plugin =
plugrack_use_by_type( c->plugin_list, c->crypto_type );
if ( c->cur_plugin == PLUGIN_INVALID_HANDLE ) {
error( "can't find a plugin for type %s", c->crypto_type );
return NULL;
- }
+ }
/* Dereference the API. */
if ( (rc = plugin_get_syms( c->cur_plugin,
@@ -407,7 +407,7 @@ static int _slurm_crypto_init(void)
retval = SLURM_ERROR;
goto done;
}
-
+
if ( _slurm_crypto_get_ops( g_crypto_context ) == NULL ) {
error( "cannot resolve crypto plugin operations" );
_slurm_crypto_context_destroy( g_crypto_context );
@@ -443,11 +443,11 @@ extern int slurm_crypto_fini(void)
return SLURM_SUCCESS;
}
-slurm_cred_ctx_t
+slurm_cred_ctx_t
slurm_cred_creator_ctx_create(const char *path)
{
slurm_cred_ctx_t ctx = NULL;
-
+
if (_slurm_crypto_init() < 0)
return NULL;
@@ -471,7 +471,7 @@ fail:
}
-slurm_cred_ctx_t
+slurm_cred_ctx_t
slurm_cred_verifier_ctx_create(const char *path)
{
slurm_cred_ctx_t ctx = NULL;
@@ -531,7 +531,7 @@ slurm_cred_ctx_destroy(slurm_cred_ctx_t ctx)
return;
}
-int
+int
slurm_cred_ctx_set(slurm_cred_ctx_t ctx, slurm_cred_opt_t opt, ...)
{
int rc = SLURM_SUCCESS;
@@ -545,7 +545,7 @@ slurm_cred_ctx_set(slurm_cred_ctx_t ctx, slurm_cred_opt_t opt, ...)
xassert(ctx->magic == CRED_CTX_MAGIC);
switch (opt) {
- case SLURM_CRED_OPT_EXPIRY_WINDOW:
+ case SLURM_CRED_OPT_EXPIRY_WINDOW:
ctx->expiry_window = va_arg(ap, int);
break;
default:
@@ -576,7 +576,7 @@ slurm_cred_ctx_get(slurm_cred_ctx_t ctx, slurm_cred_opt_t opt, ...)
xassert(ctx->magic == CRED_CTX_MAGIC);
switch (opt) {
- case SLURM_CRED_OPT_EXPIRY_WINDOW:
+ case SLURM_CRED_OPT_EXPIRY_WINDOW:
intp = va_arg(ap, int *);
*intp = ctx->expiry_window;
break;
@@ -593,7 +593,7 @@ slurm_cred_ctx_get(slurm_cred_ctx_t ctx, slurm_cred_opt_t opt, ...)
return rc;
}
-int
+int
slurm_cred_ctx_key_update(slurm_cred_ctx_t ctx, const char *path)
{
if (_slurm_crypto_init() < 0)
@@ -655,7 +655,7 @@ slurm_cred_create(slurm_cred_ctx_t ctx, slurm_cred_arg_t *arg)
slurm_mutex_lock(&ctx->mutex);
xassert(ctx->magic == CRED_CTX_MAGIC);
xassert(ctx->type == SLURM_CRED_CREATOR);
- if (_slurm_cred_sign(ctx, cred) < 0)
+ if (_slurm_cred_sign(ctx, cred) < 0)
goto fail;
slurm_mutex_unlock(&ctx->mutex);
@@ -676,7 +676,7 @@ slurm_cred_copy(slurm_cred_t *cred)
slurm_cred_t *rcred = NULL;
xassert(cred != NULL);
-
+
slurm_mutex_lock(&cred->mutex);
rcred = _slurm_cred_alloc();
@@ -691,15 +691,15 @@ slurm_cred_copy(slurm_cred_t *cred)
#ifndef HAVE_BG
rcred->core_bitmap = bit_copy(cred->core_bitmap);
rcred->core_array_size = cred->core_array_size;
- rcred->cores_per_socket = xmalloc(sizeof(uint16_t) *
+ rcred->cores_per_socket = xmalloc(sizeof(uint16_t) *
rcred->core_array_size);
memcpy(rcred->cores_per_socket, cred->cores_per_socket,
(sizeof(uint16_t) * rcred->core_array_size));
- rcred->sockets_per_node = xmalloc(sizeof(uint16_t) *
+ rcred->sockets_per_node = xmalloc(sizeof(uint16_t) *
rcred->core_array_size);
memcpy(rcred->sockets_per_node, cred->sockets_per_node,
(sizeof(uint16_t) * rcred->core_array_size));
- cred->sock_core_rep_count = xmalloc(sizeof(uint32_t) *
+ cred->sock_core_rep_count = xmalloc(sizeof(uint32_t) *
rcred->core_array_size);
memcpy(rcred->sock_core_rep_count, cred->sock_core_rep_count,
(sizeof(uint32_t) * rcred->core_array_size));
@@ -711,7 +711,7 @@ slurm_cred_copy(slurm_cred_t *cred)
/* Assumes signature is a string,
* otherwise use xmalloc and strcpy here */
rcred->signature = xstrdup(cred->signature);
-
+
slurm_mutex_unlock(&cred->mutex);
slurm_mutex_unlock(&rcred->mutex);
@@ -780,7 +780,7 @@ slurm_cred_faker(slurm_cred_arg_t *arg)
slurm_mutex_unlock(&cred->mutex);
return cred;
-
+
}
void slurm_cred_free_args(slurm_cred_arg_t *arg)
@@ -820,15 +820,15 @@ slurm_cred_get_args(slurm_cred_t *cred, slurm_cred_arg_t *arg)
arg->job_hostlist = NULL;
#else
arg->core_bitmap = bit_copy(cred->core_bitmap);
- arg->cores_per_socket = xmalloc(sizeof(uint16_t) *
+ arg->cores_per_socket = xmalloc(sizeof(uint16_t) *
cred->core_array_size);
memcpy(arg->cores_per_socket, cred->cores_per_socket,
(sizeof(uint16_t) * cred->core_array_size));
- arg->sockets_per_node = xmalloc(sizeof(uint16_t) *
+ arg->sockets_per_node = xmalloc(sizeof(uint16_t) *
cred->core_array_size);
memcpy(arg->sockets_per_node, cred->sockets_per_node,
(sizeof(uint16_t) * cred->core_array_size));
- arg->sock_core_rep_count = xmalloc(sizeof(uint32_t) *
+ arg->sock_core_rep_count = xmalloc(sizeof(uint32_t) *
cred->core_array_size);
memcpy(arg->sock_core_rep_count, cred->sock_core_rep_count,
(sizeof(uint32_t) * cred->core_array_size));
@@ -841,7 +841,7 @@ slurm_cred_get_args(slurm_cred_t *cred, slurm_cred_arg_t *arg)
}
int
-slurm_cred_verify(slurm_cred_ctx_t ctx, slurm_cred_t *cred,
+slurm_cred_verify(slurm_cred_ctx_t ctx, slurm_cred_t *cred,
slurm_cred_arg_t *arg)
{
time_t now = time(NULL);
@@ -860,7 +860,7 @@ slurm_cred_verify(slurm_cred_ctx_t ctx, slurm_cred_t *cred,
xassert(ctx->type == SLURM_CRED_VERIFIER);
xassert(cred->magic == CRED_MAGIC);
- /* NOTE: the verification checks that the credential was
+ /* NOTE: the verification checks that the credential was
* created by SlurmUser or root */
if (_slurm_cred_verify_signature(ctx, cred) < 0) {
slurm_seterrno(ESLURMD_INVALID_JOB_CREDENTIAL);
@@ -904,15 +904,15 @@ slurm_cred_verify(slurm_cred_ctx_t ctx, slurm_cred_t *cred,
arg->job_hostlist = NULL;
#else
arg->core_bitmap = bit_copy(cred->core_bitmap);
- arg->cores_per_socket = xmalloc(sizeof(uint16_t) *
+ arg->cores_per_socket = xmalloc(sizeof(uint16_t) *
cred->core_array_size);
memcpy(arg->cores_per_socket, cred->cores_per_socket,
(sizeof(uint16_t) * cred->core_array_size));
- arg->sockets_per_node = xmalloc(sizeof(uint16_t) *
+ arg->sockets_per_node = xmalloc(sizeof(uint16_t) *
cred->core_array_size);
memcpy(arg->sockets_per_node, cred->sockets_per_node,
(sizeof(uint16_t) * cred->core_array_size));
- arg->sock_core_rep_count = xmalloc(sizeof(uint32_t) *
+ arg->sock_core_rep_count = xmalloc(sizeof(uint32_t) *
cred->core_array_size);
memcpy(arg->sock_core_rep_count, cred->sock_core_rep_count,
(sizeof(uint32_t) * cred->core_array_size));
@@ -965,7 +965,7 @@ slurm_cred_destroy(slurm_cred_t *cred)
bool
slurm_cred_jobid_cached(slurm_cred_ctx_t ctx, uint32_t jobid)
{
- bool retval = false;
+ bool retval = false;
xassert(ctx != NULL);
xassert(ctx->magic == CRED_CTX_MAGIC);
@@ -1002,7 +1002,7 @@ slurm_cred_insert_jobid(slurm_cred_ctx_t ctx, uint32_t jobid)
return SLURM_SUCCESS;
}
-int
+int
slurm_cred_rewind(slurm_cred_ctx_t ctx, slurm_cred_t *cred)
{
int rc = 0;
@@ -1014,12 +1014,12 @@ slurm_cred_rewind(slurm_cred_ctx_t ctx, slurm_cred_t *cred)
xassert(ctx->magic == CRED_CTX_MAGIC);
xassert(ctx->type == SLURM_CRED_VERIFIER);
- rc = list_delete_all(ctx->state_list,
+ rc = list_delete_all(ctx->state_list,
(ListFindF) _find_cred_state, cred);
slurm_mutex_unlock(&ctx->mutex);
- return (rc > 0 ? SLURM_SUCCESS : SLURM_FAILURE);
+ return (rc > 0 ? SLURM_SUCCESS : SLURM_FAILURE);
}
int
@@ -1073,7 +1073,7 @@ slurm_cred_begin_expiration(slurm_cred_ctx_t ctx, uint32_t jobid)
xassert(ctx->magic == CRED_CTX_MAGIC);
xassert(ctx->type == SLURM_CRED_VERIFIER);
- _clear_expired_job_states(ctx);
+ _clear_expired_job_states(ctx);
if (!(j = _find_job_state(ctx, jobid))) {
slurm_seterrno(ESRCH);
@@ -1238,7 +1238,7 @@ slurm_cred_unpack(Buf buffer)
safe_unpack16_array(&cred->sockets_per_node, &len, buffer);
if (len != cred->core_array_size)
goto unpack_error;
- safe_unpack32_array(&cred->sock_core_rep_count, &len,
+ safe_unpack32_array(&cred->sock_core_rep_count, &len,
buffer);
if (len != cred->core_array_size)
goto unpack_error;
@@ -1283,7 +1283,7 @@ slurm_cred_ctx_unpack(slurm_cred_ctx_t ctx, Buf buffer)
slurm_mutex_lock(&ctx->mutex);
- /*
+ /*
* Unpack job state list and cred state list from buffer
* appening them onto ctx->state_list and ctx->job_list.
*/
@@ -1316,11 +1316,11 @@ slurm_cred_print(slurm_cred_t *cred)
{
int i;
char str[128];
- info("Cred: core_bitmap %s",
+ info("Cred: core_bitmap %s",
bit_fmt(str, sizeof(str), cred->core_bitmap));
info("Cred: sockets_per_node, cores_per_socket, rep_count");
for (i=0; i<cred->core_array_size; i++) {
- info(" socks:%u cores:%u reps:%u",
+ info(" socks:%u cores:%u reps:%u",
cred->sockets_per_node[i],
cred->cores_per_socket[i],
cred->sock_core_rep_count[i]);
@@ -1333,7 +1333,7 @@ slurm_cred_print(slurm_cred_t *cred)
}
-static void
+static void
_verifier_ctx_init(slurm_cred_ctx_t ctx)
{
xassert(ctx != NULL);
@@ -1412,7 +1412,7 @@ _exkey_is_valid(slurm_cred_ctx_t ctx)
{
if (!ctx->exkey)
return false;
-
+
if (time(NULL) > ctx->exkey_exp) {
debug2("old job credential key slurmd expired");
(*(g_crypto_context->ops.crypto_destroy_key))(ctx->exkey);
@@ -1478,13 +1478,13 @@ _slurm_cred_sign(slurm_cred_ctx_t ctx, slurm_cred_t *cred)
buffer = init_buf(4096);
_pack_cred(cred, buffer);
- rc = (*(g_crypto_context->ops.crypto_sign))(ctx->key,
- get_buf_data(buffer), get_buf_offset(buffer),
+ rc = (*(g_crypto_context->ops.crypto_sign))(ctx->key,
+ get_buf_data(buffer), get_buf_offset(buffer),
&cred->signature, &cred->siglen);
free_buf(buffer);
if (rc) {
- error("Credential sign: %s",
+ error("Credential sign: %s",
(*(g_crypto_context->ops.crypto_str_error))(rc));
return SLURM_ERROR;
}
@@ -1501,18 +1501,18 @@ _slurm_cred_verify_signature(slurm_cred_ctx_t ctx, slurm_cred_t *cred)
buffer = init_buf(4096);
_pack_cred(cred, buffer);
- rc = (*(g_crypto_context->ops.crypto_verify_sign))(ctx->key,
+ rc = (*(g_crypto_context->ops.crypto_verify_sign))(ctx->key,
get_buf_data(buffer), get_buf_offset(buffer),
cred->signature, cred->siglen);
if (rc && _exkey_is_valid(ctx)) {
- rc = (*(g_crypto_context->ops.crypto_verify_sign))(ctx->exkey,
+ rc = (*(g_crypto_context->ops.crypto_verify_sign))(ctx->exkey,
get_buf_data(buffer), get_buf_offset(buffer),
cred->signature, cred->siglen);
}
free_buf(buffer);
if (rc) {
- error("Credential signature check: %s",
+ error("Credential signature check: %s",
(*(g_crypto_context->ops.crypto_str_error))(rc));
return SLURM_ERROR;
}
@@ -1539,9 +1539,9 @@ _pack_cred(slurm_cred_t *cred, Buf buffer)
pack_bit_fmt(cred->core_bitmap, buffer);
pack16(cred->core_array_size, buffer);
if (cred->core_array_size) {
- pack16_array(cred->cores_per_socket, cred->core_array_size,
+ pack16_array(cred->cores_per_socket, cred->core_array_size,
buffer);
- pack16_array(cred->sockets_per_node, cred->core_array_size,
+ pack16_array(cred->sockets_per_node, cred->core_array_size,
buffer);
pack32_array(cred->sock_core_rep_count, cred->core_array_size,
buffer);
@@ -1560,7 +1560,7 @@ _credential_replayed(slurm_cred_ctx_t ctx, slurm_cred_t *cred)
cred_state_t *s = NULL;
_clear_expired_credential_states(ctx);
-
+
i = list_iterator_create(ctx->state_list);
while ((s = list_next(i))) {
@@ -1576,7 +1576,7 @@ _credential_replayed(slurm_cred_ctx_t ctx, slurm_cred_t *cred)
* If we found a match, this credential is being replayed.
*/
if (s)
- return true;
+ return true;
/*
* Otherwise, save the credential state
@@ -1653,7 +1653,7 @@ _credential_revoked(slurm_cred_ctx_t ctx, slurm_cred_t *cred)
if (cred->ctime <= j->revoked) {
char buf[64];
- debug ("cred for %u revoked. expires at %s",
+ debug ("cred for %u revoked. expires at %s",
j->jobid, timestr (&j->expiration, buf, 64));
return true;
}
@@ -1767,7 +1767,7 @@ _clear_expired_credential_states(slurm_cred_ctx_t ctx)
}
-static void
+static void
_insert_cred_state(slurm_cred_ctx_t ctx, slurm_cred_t *cred)
{
cred_state_t *s = _cred_state_create(ctx, cred);
@@ -1822,7 +1822,7 @@ unpack_error:
}
-static void
+static void
_job_state_pack_one(job_state_t *j, Buf buffer)
{
pack32(j->jobid, buffer);
@@ -1856,10 +1856,10 @@ _job_state_unpack_one(Buf buffer)
t3[0] = '\0';
}
debug3("cred_unpack: job %u ctime:%s%s%s",
- j->jobid, timestr (&j->ctime, t1, 64), t2, t3);
+ j->jobid, timestr (&j->ctime, t1, 64), t2, t3);
if ((j->revoked) && (j->expiration == (time_t) MAX_TIME)) {
- info ("Warning: revoke on job %u has no expiration",
+ info ("Warning: revoke on job %u has no expiration",
j->jobid);
j->expiration = j->revoked + 600;
}
@@ -1946,7 +1946,7 @@ _job_state_unpack(slurm_cred_ctx_t ctx, Buf buffer)
if (!j->revoked || (j->revoked && (now < j->expiration)))
list_append(ctx->job_list, j);
else {
- debug3 ("not appending expired job %u state",
+ debug3 ("not appending expired job %u state",
j->jobid);
}
}
@@ -1974,7 +1974,7 @@ static void _pack_sbcast_cred(sbcast_cred_t *sbcast_cred, Buf buffer)
/* Create an sbcast credential for the specified job and nodes
* including digital signature.
* RET the sbcast credential or NULL on error */
-sbcast_cred_t *create_sbcast_cred(slurm_cred_ctx_t ctx,
+sbcast_cred_t *create_sbcast_cred(slurm_cred_ctx_t ctx,
uint32_t job_id, char *nodes)
{
Buf buffer;
@@ -2009,7 +2009,7 @@ sbcast_cred_t *create_sbcast_cred(slurm_cred_ctx_t ctx,
return sbcast_cred;
}
-/* Copy an sbcast credential created using create_sbcast_cred() or
+/* Copy an sbcast credential created using create_sbcast_cred() or
* unpack_sbcast_cred() */
sbcast_cred_t *copy_sbcast_cred(sbcast_cred_t *sbcast_cred)
{
@@ -2025,7 +2025,7 @@ sbcast_cred_t *copy_sbcast_cred(sbcast_cred_t *sbcast_cred)
return rcred;
}
-/* Delete an sbcast credential created using create_sbcast_cred() or
+/* Delete an sbcast credential created using create_sbcast_cred() or
* unpack_sbcast_cred() */
void delete_sbcast_cred(sbcast_cred_t *sbcast_cred)
{
@@ -2037,12 +2037,12 @@ void delete_sbcast_cred(sbcast_cred_t *sbcast_cred)
}
/* Extract contents of an sbcast credential verifying the digital signature.
- * NOTE: We can only perform the full credential validation once with
- * Munge without generating a credential replay error, so we only
- * verify the credential for block one. All others must have a
+ * NOTE: We can only perform the full credential validation once with
+ * Munge without generating a credential replay error, so we only
+ * verify the credential for block one. All others must have a
* recent signature on file (in our cache).
* RET 0 on success, -1 on error */
-int extract_sbcast_cred(slurm_cred_ctx_t ctx,
+int extract_sbcast_cred(slurm_cred_ctx_t ctx,
sbcast_cred_t *sbcast_cred, uint16_t block_no,
uint32_t *job_id, char **nodes)
{
@@ -2067,7 +2067,7 @@ int extract_sbcast_cred(slurm_cred_ctx_t ctx,
int rc;
buffer = init_buf(4096);
_pack_sbcast_cred(sbcast_cred, buffer);
- /* NOTE: the verification checks that the credential was
+ /* NOTE: the verification checks that the credential was
* created by SlurmUser or root */
rc = (*(g_crypto_context->ops.crypto_verify_sign))(ctx->key,
get_buf_data(buffer), get_buf_offset(buffer),
diff --git a/src/common/slurm_cred.h b/src/common/slurm_cred.h
index 5cef4f9a425ce7634b939a70157d2c071a450b27..19c5e6bc142433f4aa38ed37b6e0181f225ae0a3 100644
--- a/src/common/slurm_cred.h
+++ b/src/common/slurm_cred.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <grondona1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -68,7 +68,7 @@
/*
* The incomplete slurm_cred_t type is also defined in slurm_protocol_defs.h
- * so check to ensure that this header has not been included after
+ * so check to ensure that this header has not been included after
* slurm_protocol_defs.h:
*/
#ifndef __sbcast_cred_t_defined
@@ -76,7 +76,7 @@
typedef struct sbcast_cred *sbcast_cred_t; /* opaque data type */
#endif
-/*
+/*
* The slurm_cred_ctx_t incomplete type
*/
typedef struct slurm_cred_context * slurm_cred_ctx_t;
@@ -86,7 +86,7 @@ typedef struct slurm_cred_context * slurm_cred_ctx_t;
* Initialize current process for slurm credential creation.
*
* `privkey' contains the absolute path to the slurmctld private
- * key, which needs to be readable by the current process.
+ * key, which needs to be readable by the current process.
*
* Returns 0 for success, -1 on failure and sets errno to reason.
*
@@ -119,16 +119,16 @@ int slurm_cred_ctx_get(slurm_cred_ctx_t ctx, slurm_cred_opt_t opt, ...);
int slurm_cred_ctx_key_update(slurm_cred_ctx_t ctx, const char *keypath);
-/*
+/*
* Destroy a credential context, freeing associated memory.
*/
void slurm_cred_ctx_destroy(slurm_cred_ctx_t ctx);
/*
- * Pack and unpack slurm credential context.
+ * Pack and unpack slurm credential context.
*
* On pack() ctx is packed in machine-independent format into the
- * buffer, on unpack() the contents of the buffer are used to
+ * buffer, on unpack() the contents of the buffer are used to
* intialize the state of the context ctx.
*/
int slurm_cred_ctx_pack(slurm_cred_ctx_t ctx, Buf buffer);
@@ -138,7 +138,7 @@ int slurm_cred_ctx_unpack(slurm_cred_ctx_t ctx, Buf buffer);
/*
* Container for SLURM credential create and verify arguments
*
- * The core_bitmap, cores_per_socket, sockets_per_node, and
+ * The core_bitmap, cores_per_socket, sockets_per_node, and
* sock_core_rep_count is based upon the nodes allocated to the
* JOB, but the bits set in core_bitmap are those cores allocated
* to this STEP
@@ -206,7 +206,7 @@ int slurm_cred_get_args(slurm_cred_t *cred, slurm_cred_arg_t *arg);
* - Credential has not been revoked
* - Credential has not been replayed
*/
-int slurm_cred_verify(slurm_cred_ctx_t ctx, slurm_cred_t *cred,
+int slurm_cred_verify(slurm_cred_ctx_t ctx, slurm_cred_t *cred,
slurm_cred_arg_t *arg);
/*
@@ -232,11 +232,11 @@ void slurm_cred_handle_reissue(slurm_cred_ctx_t ctx, slurm_cred_t *cred);
int slurm_cred_revoke(slurm_cred_ctx_t ctx, uint32_t jobid, time_t time);
/*
- * Report if a all credentials for a give job id have been
+ * Report if a all credentials for a give job id have been
* revoked (i.e. has the job been killed)
- *
+ *
* If we are re-running the job, the new job credential is newer
- * than the revoke time, see "scontrol requeue", purge the old
+ * than the revoke time, see "scontrol requeue", purge the old
* job record and make like it never existed
*/
bool slurm_cred_revoked(slurm_cred_ctx_t ctx, slurm_cred_t *cred);
@@ -252,7 +252,7 @@ bool slurm_cred_revoked(slurm_cred_ctx_t ctx, slurm_cred_t *cred);
*
* ESRCH if jobid is not cached
* EEXIST if expiration period has already begun for jobid.
- *
+ *
*/
int slurm_cred_begin_expiration(slurm_cred_ctx_t ctx, uint32_t jobid);
@@ -289,7 +289,7 @@ slurm_cred_t *slurm_cred_unpack(Buf buffer);
* Get a pointer to the slurm credential signature
* (used by slurm IO connections to verify connecting agent)
*/
-int slurm_cred_get_signature(slurm_cred_t *cred, char **datap,
+int slurm_cred_get_signature(slurm_cred_t *cred, char **datap,
uint32_t *len);
/*
@@ -309,11 +309,11 @@ void slurm_cred_print(slurm_cred_t *cred);
* Functions to create, delete, pack, and unpack an sbcast credential
* Caller of extract_sbcast_cred() must xfree returned node string
*/
-sbcast_cred_t *create_sbcast_cred(slurm_cred_ctx_t ctx,
+sbcast_cred_t *create_sbcast_cred(slurm_cred_ctx_t ctx,
uint32_t job_id, char *nodes);
sbcast_cred_t *copy_sbcast_cred(sbcast_cred_t *sbcast_cred);
void delete_sbcast_cred(sbcast_cred_t *sbcast_cred);
-int extract_sbcast_cred(slurm_cred_ctx_t ctx,
+int extract_sbcast_cred(slurm_cred_ctx_t ctx,
sbcast_cred_t *sbcast_cred, uint16_t block_no,
uint32_t *job_id, char **nodes);
void pack_sbcast_cred(sbcast_cred_t *sbcast_cred, Buf buffer);
diff --git a/src/common/slurm_errno.c b/src/common/slurm_errno.c
index 5767a00d62c71f01b76f02bcf0ea043e1347d869..eb0a8c132d90e5a1c6b8d1b4555d0eb2427afd26 100644
--- a/src/common/slurm_errno.c
+++ b/src/common/slurm_errno.c
@@ -16,15 +16,15 @@
* 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
+ * 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
+ * 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
+ * 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
@@ -37,7 +37,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\*****************************************************************************/
-/* This implementation relies on "overloading" the libc errno by
+/* This implementation relies on "overloading" the libc errno by
* partitioning its domain into system (<1000) and SLURM (>=1000) values.
* SLURM API functions should call slurm_seterrno() to set errno to a value.
* API users should call slurm_strerror() to convert all errno values to
@@ -47,7 +47,7 @@
#if HAVE_CONFIG_H
#include "config.h"
#endif
-
+
#include <stdlib.h>
#include <errno.h>
#include <stdio.h>
@@ -71,13 +71,13 @@ static slurm_errtab_t slurm_errtab[] = {
{EINPROGRESS, "Operation now in progress"},
/* General Message error codes */
- { SLURM_UNEXPECTED_MSG_ERROR,
+ { SLURM_UNEXPECTED_MSG_ERROR,
"Unexpected message received" },
{ SLURM_COMMUNICATIONS_CONNECTION_ERROR,
"Communication connection failure" },
- { SLURM_COMMUNICATIONS_SEND_ERROR,
+ { SLURM_COMMUNICATIONS_SEND_ERROR,
"Message send failure" },
- { SLURM_COMMUNICATIONS_RECEIVE_ERROR,
+ { SLURM_COMMUNICATIONS_RECEIVE_ERROR,
"Message receive failure" },
{ SLURM_COMMUNICATIONS_SHUTDOWN_ERROR,
"Communication shutdown failure" },
@@ -119,7 +119,7 @@ static slurm_errtab_t slurm_errtab[] = {
"Invalid partition name specified" },
{ ESLURM_DEFAULT_PARTITION_NOT_SET,
"No partition specified or system default partition" },
- { ESLURM_ACCESS_DENIED,
+ { ESLURM_ACCESS_DENIED,
"Access/permission denied" },
{ ESLURM_JOB_MISSING_REQUIRED_PARTITION_GROUP,
"User's group not permitted to use this partition" },
@@ -133,11 +133,11 @@ static slurm_errtab_t slurm_errtab[] = {
"Unable to create job record, try again" },
{ ESLURM_JOB_MISSING_SIZE_SPECIFICATION,
"Job size specification needs to be provided" },
- { ESLURM_JOB_SCRIPT_MISSING,
+ { ESLURM_JOB_SCRIPT_MISSING,
"Job script not specified" },
- { ESLURM_USER_ID_MISSING,
+ { ESLURM_USER_ID_MISSING,
"Invalid user id" },
- { ESLURM_DUPLICATE_JOB_ID,
+ { ESLURM_DUPLICATE_JOB_ID,
"Duplicate job id" },
{ ESLURM_PATHNAME_TOO_LONG,
"Pathname of a file, directory or other parameter too long" },
@@ -147,33 +147,33 @@ static slurm_errtab_t slurm_errtab[] = {
"Requested node configuration is not available" },
{ ESLURM_REQUESTED_PART_CONFIG_UNAVAILABLE,
"Requested partition configuration not available now" },
- { ESLURM_NODES_BUSY,
+ { ESLURM_NODES_BUSY,
"Requested nodes are busy" },
- { ESLURM_INVALID_JOB_ID,
+ { ESLURM_INVALID_JOB_ID,
"Invalid job id specified" },
- { ESLURM_INVALID_NODE_NAME,
+ { ESLURM_INVALID_NODE_NAME,
"Invalid node name specified" },
{ ESLURM_WRITING_TO_FILE,
"I/O error writing script/environment to file" },
{ ESLURM_TRANSITION_STATE_NO_UPDATE,
"Job can not be altered now, try again later" },
- { ESLURM_ALREADY_DONE,
+ { ESLURM_ALREADY_DONE,
"Job/step already completing or completed" },
- { ESLURM_INTERCONNECT_FAILURE,
+ { ESLURM_INTERCONNECT_FAILURE,
"Error configuring interconnect" },
- { ESLURM_BAD_DIST,
+ { ESLURM_BAD_DIST,
"Task distribution specification invalid" },
- { ESLURM_JOB_PENDING,
+ { ESLURM_JOB_PENDING,
"Job is pending execution" },
- { ESLURM_BAD_TASK_COUNT,
+ { ESLURM_BAD_TASK_COUNT,
"Task count specification invalid" },
- { ESLURM_INVALID_JOB_CREDENTIAL,
+ { ESLURM_INVALID_JOB_CREDENTIAL,
"Error generating job credential" },
{ ESLURM_IN_STANDBY_MODE,
"Slurm backup controller in standby mode" },
- { ESLURM_INVALID_NODE_STATE,
+ { ESLURM_INVALID_NODE_STATE,
"Invalid node state specified" },
- { ESLURM_INVALID_FEATURE,
+ { ESLURM_INVALID_FEATURE,
"Invalid feature specification" },
{ ESLURM_INVALID_AUTHTYPE_CHANGE,
"AuthType change requires restart of all SLURM daemons and "
@@ -238,11 +238,11 @@ static slurm_errtab_t slurm_errtab[] = {
"Requested reservation is invalid" },
{ ESLURM_INVALID_TIME_VALUE,
"Invalid time specified" },
- { ESLURM_RESERVATION_BUSY,
+ { ESLURM_RESERVATION_BUSY,
"Requested reservation is in use" },
- { ESLURM_RESERVATION_NOT_USABLE,
+ { ESLURM_RESERVATION_NOT_USABLE,
"Requested reservation not usable now" },
- { ESLURM_RESERVATION_OVERLAP,
+ { ESLURM_RESERVATION_OVERLAP,
"Requested reservation overlaps with another reservation" },
{ ESLURM_PORTS_BUSY,
"Requires ports are in use" },
@@ -252,11 +252,11 @@ static slurm_errtab_t slurm_errtab[] = {
"SlurmctldProlog is still running" },
{ ESLURM_NO_STEPS,
"Job steps can not be run on this cluster" },
- { ESLURM_INVALID_BLOCK_STATE,
+ { ESLURM_INVALID_BLOCK_STATE,
"Invalid block state specified" },
- { ESLURM_INVALID_BLOCK_LAYOUT,
+ { ESLURM_INVALID_BLOCK_LAYOUT,
"Functionality not available with current block layout mode"},
- { ESLURM_INVALID_BLOCK_NAME,
+ { ESLURM_INVALID_BLOCK_NAME,
"Invalid block name specified" },
{ ESLURM_QOS_PREEMPTION_LOOP,
"QOS Preemption loop detected" },
@@ -265,21 +265,21 @@ static slurm_errtab_t slurm_errtab[] = {
/* slurmd error codes */
- { ESLRUMD_PIPE_ERROR_ON_TASK_SPAWN,
+ { ESLRUMD_PIPE_ERROR_ON_TASK_SPAWN,
"Pipe error on task spawn" },
- { ESLURMD_KILL_TASK_FAILED,
+ { ESLURMD_KILL_TASK_FAILED,
"Kill task failed" },
{ ESLURMD_UID_NOT_FOUND,
"User not found on host" },
{ ESLURMD_GID_NOT_FOUND,
"Group ID not found on host" },
- { ESLURMD_INVALID_JOB_CREDENTIAL,
+ { ESLURMD_INVALID_JOB_CREDENTIAL,
"Invalid job credential" },
- { ESLURMD_CREDENTIAL_REVOKED,
+ { ESLURMD_CREDENTIAL_REVOKED,
"Job credential revoked" },
- { ESLURMD_CREDENTIAL_EXPIRED,
+ { ESLURMD_CREDENTIAL_EXPIRED,
"Job credential expired" },
- { ESLURMD_CREDENTIAL_REPLAYED,
+ { ESLURMD_CREDENTIAL_REPLAYED,
"Job credential replayed" },
{ ESLURMD_CREATE_BATCH_DIR_ERROR,
"Slurmd could not create a batch directory" },
@@ -357,10 +357,10 @@ static slurm_errtab_t slurm_errtab[] = {
/* accounting errors */
{ ESLURM_DB_CONNECTION,
- "Unable to connect to database" }
+ "Unable to connect to database" }
};
-/*
+/*
* Linear search through table of errno values and strings,
* returns NULL on error, string on success.
*/
@@ -376,14 +376,14 @@ static char *_lookup_slurm_api_errtab(int errnum)
}
}
- if ((res == NULL) &&
+ if ((res == NULL) &&
(errnum >= ESLURM_JOBCOMP_MIN) &&
(errnum <= ESLURM_JOBCOMP_MAX))
res = g_slurm_jobcomp_strerror(errnum);
-#if 0
+#if 0
/* If needed, re-locate slurmctld/sched_plugin.[ch] into common */
- if ((res == NULL) &&
+ if ((res == NULL) &&
(errnum >= ESLURM_SCHED_MIN) &&
(errnum <= ESLURM_SCHED_MAX))
res = sched_strerror(errnum);
@@ -408,7 +408,7 @@ char *slurm_strerror(int errnum)
}
/*
- * Get errno
+ * Get errno
*/
int slurm_get_errno()
{
diff --git a/src/common/slurm_jobacct_gather.c b/src/common/slurm_jobacct_gather.c
index 98810b0c3a786810dccf85ef07947f3d7be9c69c..94be48631cdf908bb07f6b95ce01443c390827d3 100644
--- a/src/common/slurm_jobacct_gather.c
+++ b/src/common/slurm_jobacct_gather.c
@@ -1,39 +1,39 @@
/*****************************************************************************\
- * slurm_jobacct_gather.c - implementation-independent job accounting logging
+ * slurm_jobacct_gather.c - implementation-independent job accounting logging
* functions
*****************************************************************************
* Copyright (C) 2003-2007/ The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jay Windley <jwindley@lnxi.com>, Morris Jette <jette1@llnl.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* Copyright (C) 2005 Hewlett-Packard Development Company, L.P.
*
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -63,21 +63,21 @@
/*
* WARNING: Do not change the order of these fields or add additional
* fields at the beginning of the structure. If you do, job accounting
- * plugins will stop working. If you need to add fields, add them
+ * plugins will stop working. If you need to add fields, add them
* at the end of the structure.
*/
typedef struct slurm_jobacct_gather_ops {
jobacctinfo_t *(*jobacct_gather_create)(jobacct_id_t *jobacct_id);
void (*jobacct_gather_destroy) (jobacctinfo_t *jobacct);
- int (*jobacct_gather_setinfo) (jobacctinfo_t *jobacct,
- enum jobacct_data_type type,
+ int (*jobacct_gather_setinfo) (jobacctinfo_t *jobacct,
+ enum jobacct_data_type type,
void *data);
- int (*jobacct_gather_getinfo) (jobacctinfo_t *jobacct,
- enum jobacct_data_type type,
+ int (*jobacct_gather_getinfo) (jobacctinfo_t *jobacct,
+ enum jobacct_data_type type,
void *data);
void (*jobacct_gather_pack) (jobacctinfo_t *jobacct, Buf buffer);
int (*jobacct_gather_unpack) (jobacctinfo_t **jobacct, Buf buffer);
- void (*jobacct_gather_aggregate) (jobacctinfo_t *dest,
+ void (*jobacct_gather_aggregate) (jobacctinfo_t *dest,
jobacctinfo_t *from);
int (*jobacct_gather_startpoll) (uint16_t frequency);
int (*jobacct_gather_endpoll) ();
@@ -88,7 +88,7 @@ typedef struct slurm_jobacct_gather_ops {
int (*jobacct_gather_add_task) (pid_t pid, jobacct_id_t *jobacct_id);
jobacctinfo_t *(*jobacct_gather_stat_task)(pid_t pid);
jobacctinfo_t *(*jobacct_gather_remove_task)(pid_t pid);
- void (*jobacct_gather_2_sacct) (sacct_t *sacct,
+ void (*jobacct_gather_2_sacct) (sacct_t *sacct,
jobacctinfo_t *jobacct);
} slurm_jobacct_gather_ops_t;
@@ -129,12 +129,12 @@ _slurm_jobacct_gather_context_create( const char *jobacct_gather_type)
if ( c->jobacct_gather_type == NULL ) {
error( "can't make local copy of jobacct type" );
xfree( c );
- return NULL;
+ return NULL;
}
/* Plugin rack is demand-loaded on first reference. */
- c->plugin_list = NULL;
- c->cur_plugin = PLUGIN_INVALID_HANDLE;
+ c->plugin_list = NULL;
+ c->cur_plugin = PLUGIN_INVALID_HANDLE;
c->jobacct_gather_errno = SLURM_SUCCESS;
return c;
@@ -178,7 +178,7 @@ _slurm_jobacct_gather_get_ops( slurm_jobacct_gather_context_t *c )
"jobacct_gather_p_setinfo",
"jobacct_gather_p_getinfo",
"jobacct_gather_p_pack",
- "jobacct_gather_p_unpack",
+ "jobacct_gather_p_unpack",
"jobacct_gather_p_aggregate",
"jobacct_gather_p_startpoll",
"jobacct_gather_p_endpoll",
@@ -193,18 +193,18 @@ _slurm_jobacct_gather_get_ops( slurm_jobacct_gather_context_t *c )
};
int n_syms = sizeof( syms ) / sizeof( char * );
int rc = 0;
-
+
/* Find the correct plugin. */
c->cur_plugin = plugin_load_and_link(c->jobacct_gather_type,
n_syms, syms,
(void **) &c->ops);
- if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
+ if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
error("Couldn't find the specified plugin name for %s "
"looking at all files",
c->jobacct_gather_type);
-
+
/* Get the plugin list, if needed. */
if ( c->plugin_list == NULL ) {
char *plugin_dir;
@@ -215,22 +215,22 @@ _slurm_jobacct_gather_get_ops( slurm_jobacct_gather_context_t *c )
}
plugrack_set_major_type( c->plugin_list, "jobacct_gather" );
- plugrack_set_paranoia( c->plugin_list,
- PLUGRACK_PARANOIA_NONE,
+ plugrack_set_paranoia( c->plugin_list,
+ PLUGRACK_PARANOIA_NONE,
0 );
plugin_dir = slurm_get_plugin_dir();
plugrack_read_dir( c->plugin_list, plugin_dir );
xfree(plugin_dir);
}
-
+
/* Find the correct plugin. */
- c->cur_plugin =
+ c->cur_plugin =
plugrack_use_by_type( c->plugin_list, c->jobacct_gather_type );
if ( c->cur_plugin == PLUGIN_INVALID_HANDLE ) {
error( "can't find a plugin for type %s",
c->jobacct_gather_type );
return NULL;
- }
+ }
/* Dereference the API. */
if ( (rc = plugin_get_syms( c->cur_plugin,
@@ -257,14 +257,14 @@ static int _slurm_jobacct_gather_init(void)
goto done;
jobacct_gather_type = slurm_get_jobacct_gather_type();
- g_jobacct_gather_context = _slurm_jobacct_gather_context_create(
+ g_jobacct_gather_context = _slurm_jobacct_gather_context_create(
jobacct_gather_type);
if ( g_jobacct_gather_context == NULL ) {
error( "cannot create a context for %s", jobacct_gather_type );
retval = SLURM_ERROR;
goto done;
}
-
+
if ( _slurm_jobacct_gather_get_ops( g_jobacct_gather_context )
== NULL ) {
error( "cannot resolve job accounting plugin operations" );
@@ -307,13 +307,13 @@ extern jobacctinfo_t *jobacct_gather_g_create(jobacct_id_t *jobacct_id)
if (_slurm_jobacct_gather_init() < 0)
return jobacct;
-
+
slurm_mutex_lock( &g_jobacct_gather_context_lock );
if ( g_jobacct_gather_context )
jobacct = (*(g_jobacct_gather_context->
ops.jobacct_gather_create))(jobacct_id);
-
- slurm_mutex_unlock( &g_jobacct_gather_context_lock );
+
+ slurm_mutex_unlock( &g_jobacct_gather_context_lock );
return jobacct;
}
@@ -321,44 +321,44 @@ extern void jobacct_gather_g_destroy(jobacctinfo_t *jobacct)
{
if (_slurm_jobacct_gather_init() < 0)
return;
-
+
slurm_mutex_lock( &g_jobacct_gather_context_lock );
if ( g_jobacct_gather_context )
(*(g_jobacct_gather_context->ops.jobacct_gather_destroy))
(jobacct);
- slurm_mutex_unlock( &g_jobacct_gather_context_lock );
+ slurm_mutex_unlock( &g_jobacct_gather_context_lock );
return;
}
-extern int jobacct_gather_g_setinfo(jobacctinfo_t *jobacct,
+extern int jobacct_gather_g_setinfo(jobacctinfo_t *jobacct,
enum jobacct_data_type type, void *data)
{
int retval = SLURM_SUCCESS;
if (_slurm_jobacct_gather_init() < 0)
return SLURM_ERROR;
-
+
slurm_mutex_lock( &g_jobacct_gather_context_lock );
if ( g_jobacct_gather_context )
retval = (*(g_jobacct_gather_context->
ops.jobacct_gather_setinfo))(jobacct, type, data);
- slurm_mutex_unlock( &g_jobacct_gather_context_lock );
+ slurm_mutex_unlock( &g_jobacct_gather_context_lock );
return retval;
}
-extern int jobacct_gather_g_getinfo(jobacctinfo_t *jobacct,
+extern int jobacct_gather_g_getinfo(jobacctinfo_t *jobacct,
enum jobacct_data_type type, void *data)
{
int retval = SLURM_SUCCESS;
if (_slurm_jobacct_gather_init() < 0)
return SLURM_ERROR;
-
+
slurm_mutex_lock( &g_jobacct_gather_context_lock );
if ( g_jobacct_gather_context )
retval = (*(g_jobacct_gather_context->
ops.jobacct_gather_getinfo))(jobacct, type, data);
- slurm_mutex_unlock( &g_jobacct_gather_context_lock );
+ slurm_mutex_unlock( &g_jobacct_gather_context_lock );
return retval;
}
@@ -366,12 +366,12 @@ extern void jobacct_gather_g_pack(jobacctinfo_t *jobacct, Buf buffer)
{
if (_slurm_jobacct_gather_init() < 0)
return;
-
+
slurm_mutex_lock( &g_jobacct_gather_context_lock );
if ( g_jobacct_gather_context )
(*(g_jobacct_gather_context->ops.jobacct_gather_pack))
(jobacct, buffer);
- slurm_mutex_unlock( &g_jobacct_gather_context_lock );
+ slurm_mutex_unlock( &g_jobacct_gather_context_lock );
return;
}
@@ -381,12 +381,12 @@ extern int jobacct_gather_g_unpack(jobacctinfo_t **jobacct, Buf buffer)
if (_slurm_jobacct_gather_init() < 0)
return SLURM_ERROR;
-
+
slurm_mutex_lock( &g_jobacct_gather_context_lock );
if ( g_jobacct_gather_context )
retval = (*(g_jobacct_gather_context->
ops.jobacct_gather_unpack))(jobacct, buffer);
- slurm_mutex_unlock( &g_jobacct_gather_context_lock );
+ slurm_mutex_unlock( &g_jobacct_gather_context_lock );
return retval;
}
@@ -395,12 +395,12 @@ extern void jobacct_gather_g_aggregate(jobacctinfo_t *dest,
{
if (_slurm_jobacct_gather_init() < 0)
return;
-
+
slurm_mutex_lock( &g_jobacct_gather_context_lock );
if ( g_jobacct_gather_context )
(*(g_jobacct_gather_context->ops.jobacct_gather_aggregate))
(dest, from);
- slurm_mutex_unlock( &g_jobacct_gather_context_lock );
+ slurm_mutex_unlock( &g_jobacct_gather_context_lock );
return;
}
@@ -411,10 +411,10 @@ extern int jobacct_gather_g_startpoll(uint16_t frequency)
return SLURM_ERROR;
slurm_mutex_lock( &g_jobacct_gather_context_lock );
- if ( g_jobacct_gather_context )
+ if ( g_jobacct_gather_context )
retval = (*(g_jobacct_gather_context->ops.jobacct_gather_startpoll))
(frequency);
-
+
slurm_mutex_unlock( &g_jobacct_gather_context_lock );
return retval;
}
@@ -424,11 +424,11 @@ extern int jobacct_gather_g_endpoll()
int retval = SLURM_SUCCESS;
if (_slurm_jobacct_gather_init() < 0)
return SLURM_ERROR;
-
+
slurm_mutex_lock( &g_jobacct_gather_context_lock );
if ( g_jobacct_gather_context )
retval = (*(g_jobacct_gather_context->ops.jobacct_gather_endpoll))();
- slurm_mutex_unlock( &g_jobacct_gather_context_lock );
+ slurm_mutex_unlock( &g_jobacct_gather_context_lock );
return retval;
}
@@ -438,10 +438,10 @@ extern void jobacct_gather_g_change_poll(uint16_t frequency)
return;
slurm_mutex_lock( &g_jobacct_gather_context_lock );
- if ( g_jobacct_gather_context )
+ if ( g_jobacct_gather_context )
(*(g_jobacct_gather_context->ops.jobacct_gather_change_poll))
(frequency);
-
+
slurm_mutex_unlock( &g_jobacct_gather_context_lock );
}
@@ -449,11 +449,11 @@ extern void jobacct_gather_g_suspend_poll()
{
if (_slurm_jobacct_gather_init() < 0)
return;
-
+
slurm_mutex_lock( &g_jobacct_gather_context_lock );
if ( g_jobacct_gather_context )
(*(g_jobacct_gather_context->ops.jobacct_gather_suspend_poll))();
- slurm_mutex_unlock( &g_jobacct_gather_context_lock );
+ slurm_mutex_unlock( &g_jobacct_gather_context_lock );
return;
}
@@ -474,14 +474,14 @@ extern int jobacct_gather_g_set_proctrack_container_id(uint32_t id)
int retval = SLURM_SUCCESS;
if (_slurm_jobacct_gather_init() < 0)
return SLURM_ERROR;
-
+
slurm_mutex_lock( &g_jobacct_gather_context_lock );
if ( g_jobacct_gather_context )
retval = (*(g_jobacct_gather_context->ops.
jobacct_gather_set_proctrack_container_id))(id);
- slurm_mutex_unlock( &g_jobacct_gather_context_lock );
+ slurm_mutex_unlock( &g_jobacct_gather_context_lock );
return retval;
-
+
}
extern int jobacct_gather_g_add_task(pid_t pid, jobacct_id_t *jobacct_id)
@@ -489,12 +489,12 @@ extern int jobacct_gather_g_add_task(pid_t pid, jobacct_id_t *jobacct_id)
int retval = SLURM_SUCCESS;
if (_slurm_jobacct_gather_init() < 0)
return SLURM_ERROR;
-
+
slurm_mutex_lock( &g_jobacct_gather_context_lock );
if ( g_jobacct_gather_context )
retval = (*(g_jobacct_gather_context->
ops.jobacct_gather_add_task))(pid, jobacct_id);
- slurm_mutex_unlock( &g_jobacct_gather_context_lock );
+ slurm_mutex_unlock( &g_jobacct_gather_context_lock );
return retval;
}
@@ -503,12 +503,12 @@ extern jobacctinfo_t *jobacct_gather_g_stat_task(pid_t pid)
jobacctinfo_t *jobacct = NULL;
if (_slurm_jobacct_gather_init() < 0)
return jobacct;
-
+
slurm_mutex_lock( &g_jobacct_gather_context_lock );
if ( g_jobacct_gather_context )
jobacct = (*(g_jobacct_gather_context->
ops.jobacct_gather_stat_task))(pid);
- slurm_mutex_unlock( &g_jobacct_gather_context_lock );
+ slurm_mutex_unlock( &g_jobacct_gather_context_lock );
return jobacct;
}
@@ -517,12 +517,12 @@ extern jobacctinfo_t *jobacct_gather_g_remove_task(pid_t pid)
jobacctinfo_t *jobacct = NULL;
if (_slurm_jobacct_gather_init() < 0)
return jobacct;
-
+
slurm_mutex_lock( &g_jobacct_gather_context_lock );
if ( g_jobacct_gather_context )
jobacct = (*(g_jobacct_gather_context->
ops.jobacct_gather_remove_task))(pid);
- slurm_mutex_unlock( &g_jobacct_gather_context_lock );
+ slurm_mutex_unlock( &g_jobacct_gather_context_lock );
return jobacct;
}
@@ -530,11 +530,11 @@ extern void jobacct_gather_g_2_sacct(sacct_t *sacct, jobacctinfo_t *jobacct)
{
if (_slurm_jobacct_gather_init() < 0)
return;
-
+
slurm_mutex_lock( &g_jobacct_gather_context_lock );
if ( g_jobacct_gather_context )
(*(g_jobacct_gather_context->ops.jobacct_gather_2_sacct))
(sacct, jobacct);
- slurm_mutex_unlock( &g_jobacct_gather_context_lock );
+ slurm_mutex_unlock( &g_jobacct_gather_context_lock );
return;
}
diff --git a/src/common/slurm_jobacct_gather.h b/src/common/slurm_jobacct_gather.h
index e7faaa499f5da0ffc8160bb095a66ba3d6a8e306..dac9b4cbcde067a1da991bb2fe36b007ce3683ea 100644
--- a/src/common/slurm_jobacct_gather.h
+++ b/src/common/slurm_jobacct_gather.h
@@ -1,39 +1,39 @@
/*****************************************************************************\
- * slurm_jobacct_gather.h - implementation-independent job completion logging
+ * slurm_jobacct_gather.h - implementation-independent job completion logging
* API definitions
*****************************************************************************
* Copyright (C) 2003 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette@llnl.com> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* Copyright (C) 2005 Hewlett-Packard Development Company, L.P.
*
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -82,9 +82,9 @@ extern int slurm_jobacct_gather_fini(void); /* unload the plugin */
extern jobacctinfo_t *jobacct_gather_g_create(jobacct_id_t *jobacct_id);
extern void jobacct_gather_g_destroy(jobacctinfo_t *jobacct);
-extern int jobacct_gather_g_setinfo(jobacctinfo_t *jobacct,
+extern int jobacct_gather_g_setinfo(jobacctinfo_t *jobacct,
enum jobacct_data_type type, void *data);
-extern int jobacct_gather_g_getinfo(jobacctinfo_t *jobacct,
+extern int jobacct_gather_g_getinfo(jobacctinfo_t *jobacct,
enum jobacct_data_type type, void *data);
extern void jobacct_gather_g_pack(jobacctinfo_t *jobacct, Buf buffer);
extern int jobacct_gather_g_unpack(jobacctinfo_t **jobacct, Buf buffer);
diff --git a/src/common/slurm_jobcomp.c b/src/common/slurm_jobcomp.c
index 1815a0cb829315c6cf60c48279e03d0a12aafb6e..a3f60eda741d0a69f9d3822020ac7cda166e07c2 100644
--- a/src/common/slurm_jobcomp.c
+++ b/src/common/slurm_jobcomp.c
@@ -1,37 +1,37 @@
/*****************************************************************************\
- * slurm_jobcomp.c - implementation-independent job completion logging
+ * slurm_jobcomp.c - implementation-independent job completion logging
* functions
*****************************************************************************
* Copyright (C) 2003 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jay Windley <jwindley@lnxi.com>, Morris Jette <jette1@llnl.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -58,7 +58,7 @@
/*
* WARNING: Do not change the order of these fields or add additional
* fields at the beginning of the structure. If you do, job completion
- * logging plugins will stop working. If you need to add fields, add them
+ * logging plugins will stop working. If you need to add fields, add them
* at the end of the structure.
*/
typedef struct slurm_jobcomp_ops {
@@ -106,12 +106,12 @@ _slurm_jobcomp_context_create( const char *jobcomp_type)
if ( c->jobcomp_type == NULL ) {
debug3( "can't make local copy of jobcomp type" );
xfree( c );
- return NULL;
+ return NULL;
}
/* Plugin rack is demand-loaded on first reference. */
- c->plugin_list = NULL;
- c->cur_plugin = PLUGIN_INVALID_HANDLE;
+ c->plugin_list = NULL;
+ c->cur_plugin = PLUGIN_INVALID_HANDLE;
return c;
}
@@ -157,17 +157,17 @@ _slurm_jobcomp_get_ops( slurm_jobcomp_context_t c )
"slurm_jobcomp_archive"
};
int n_syms = sizeof( syms ) / sizeof( char * );
-
+
/* Find the correct plugin. */
c->cur_plugin = plugin_load_and_link(c->jobcomp_type, n_syms, syms,
(void **) &c->ops);
- if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
+ if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
error("Couldn't find the specified plugin name for %s "
"looking at all files",
c->jobcomp_type);
-
+
/* Get the plugin list, if needed. */
if ( c->plugin_list == NULL ) {
char *plugin_dir;
@@ -178,21 +178,21 @@ _slurm_jobcomp_get_ops( slurm_jobcomp_context_t c )
}
plugrack_set_major_type( c->plugin_list, "jobcomp" );
- plugrack_set_paranoia( c->plugin_list,
- PLUGRACK_PARANOIA_NONE,
+ plugrack_set_paranoia( c->plugin_list,
+ PLUGRACK_PARANOIA_NONE,
0 );
plugin_dir = slurm_get_plugin_dir();
plugrack_read_dir( c->plugin_list, plugin_dir );
xfree(plugin_dir);
}
-
+
/* Find the correct plugin. */
- c->cur_plugin =
+ c->cur_plugin =
plugrack_use_by_type( c->plugin_list, c->jobcomp_type );
if ( c->cur_plugin == PLUGIN_INVALID_HANDLE ) {
error( "can't find a plugin for type %s", c->jobcomp_type );
return NULL;
- }
+ }
/* Dereference the API. */
if ( plugin_get_syms( c->cur_plugin,
@@ -206,7 +206,7 @@ _slurm_jobcomp_get_ops( slurm_jobcomp_context_t c )
return &c->ops;
}
-extern void
+extern void
jobcomp_destroy_job(void *object)
{
jobcomp_job_rec_t *job = (jobcomp_job_rec_t *)object;
diff --git a/src/common/slurm_jobcomp.h b/src/common/slurm_jobcomp.h
index b56322853288c9e7f69e281bfb135fd963db741d..52486220d213afdb808a787824886b76a6d96cc4 100644
--- a/src/common/slurm_jobcomp.h
+++ b/src/common/slurm_jobcomp.h
@@ -1,37 +1,37 @@
/*****************************************************************************\
- * slurm_jobcomp.h - implementation-independent job completion logging
+ * slurm_jobcomp.h - implementation-independent job completion logging
* API definitions
*****************************************************************************
* Copyright (C) 2003 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.com> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -98,15 +98,15 @@ extern int g_slurm_jobcomp_errno(void);
/* convert job completion logger specific error code to a string */
extern char *g_slurm_jobcomp_strerror(int errnum);
-/*
- * get info from the storage
+/*
+ * get info from the storage
* returns List of jobcomp_job_rec_t *
* note List needs to be freed when called
*/
extern List g_slurm_jobcomp_get_jobs(acct_job_cond_t *job_cond);
-/*
- * expire old info from the storage
+/*
+ * expire old info from the storage
*/
extern int g_slurm_jobcomp_archive(acct_archive_cond_t *arch_cond);
diff --git a/src/common/slurm_priority.c b/src/common/slurm_priority.c
index bbf3eeb8ebaec2207a52c205cfa9b78a83a6684b..8db51b60d9f1fe81632ebd09f78ce589da73153b 100644
--- a/src/common/slurm_priority.c
+++ b/src/common/slurm_priority.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -61,7 +61,7 @@ typedef struct slurm_priority_context {
} slurm_priority_context_t;
static slurm_priority_context_t * g_priority_context = NULL;
-static pthread_mutex_t g_priority_context_lock =
+static pthread_mutex_t g_priority_context_lock =
PTHREAD_MUTEX_INITIALIZER;
/*
@@ -95,7 +95,7 @@ static slurm_priority_ops_t * _priority_get_ops(
/* Find the correct plugin. */
c->cur_plugin = plugin_load_and_link(c->priority_type, n_syms, syms,
(void **) &c->ops);
- if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
+ if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
error("Couldn't find the specified plugin name for %s "
@@ -122,7 +122,7 @@ static slurm_priority_ops_t * _priority_get_ops(
c->cur_plugin = plugrack_use_by_type( c->plugin_list,
c->priority_type );
if ( c->cur_plugin == PLUGIN_INVALID_HANDLE ) {
- error( "cannot find accounting_storage plugin for %s",
+ error( "cannot find accounting_storage plugin for %s",
c->priority_type );
return NULL;
}
@@ -191,14 +191,14 @@ extern int slurm_priority_init(void)
{
int retval = SLURM_SUCCESS;
char *priority_type = NULL;
-
+
slurm_mutex_lock( &g_priority_context_lock );
if ( g_priority_context )
goto done;
-
+
priority_type = slurm_get_priority_type();
-
+
g_priority_context = _priority_context_create(priority_type);
if ( g_priority_context == NULL ) {
error( "cannot create priority context for %s",
diff --git a/src/common/slurm_priority.h b/src/common/slurm_priority.h
index 2cbe02d07de12895d9e7c0eac88b0ef426084028..2039fd990ab7ee814fac3bb832c3c93f0a75e456 100644
--- a/src/common/slurm_priority.h
+++ b/src/common/slurm_priority.h
@@ -5,38 +5,38 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
\*****************************************************************************/
-#ifndef _SLURM_PRIORITY_H
+#ifndef _SLURM_PRIORITY_H
#define _SLURM_PRIORITY_H
#if HAVE_CONFIG_H
diff --git a/src/common/slurm_protocol_api.c b/src/common/slurm_protocol_api.c
index 3eba3f44d41e2f5030de6b581e020f56878cc2de..662f360d333fca1fbc7d00477684901651bcc96c 100644
--- a/src/common/slurm_protocol_api.c
+++ b/src/common/slurm_protocol_api.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Kevin Tew <tew1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -135,7 +135,7 @@ extern void slurm_api_set_conf_file(char *pathname)
}
/* slurm_api_set_default_config
- * called by the send_controller_msg function to insure that at least
+ * called by the send_controller_msg function to insure that at least
* the compiled in default slurm_protocol_config object is initialized
* RET int - return code
*/
@@ -449,7 +449,7 @@ uint32_t slurm_get_priority_decay_hl(void)
uint32_t priority_hl = NO_VAL;
slurm_ctl_conf_t *conf;
- if(slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
priority_hl = conf->priority_decay_hl;
@@ -468,7 +468,7 @@ bool slurm_get_priority_favor_small(void)
bool factor = 0;
slurm_ctl_conf_t *conf;
- if(slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
factor = conf->priority_favor_small;
@@ -488,7 +488,7 @@ uint32_t slurm_get_priority_max_age(void)
uint32_t age = NO_VAL;
slurm_ctl_conf_t *conf;
- if(slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
age = conf->priority_max_age;
@@ -507,7 +507,7 @@ uint16_t slurm_get_priority_reset_period(void)
uint16_t reset_period = (uint16_t) 0;
slurm_ctl_conf_t *conf;
- if(slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
reset_period = conf->priority_reset_period;
@@ -526,7 +526,7 @@ char *slurm_get_priority_type(void)
char *priority_type = NULL;
slurm_ctl_conf_t *conf;
- if(slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
priority_type = xstrdup(conf->priority_type);
@@ -545,7 +545,7 @@ uint32_t slurm_get_priority_weight_age(void)
uint32_t factor = NO_VAL;
slurm_ctl_conf_t *conf;
- if(slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
factor = conf->priority_weight_age;
@@ -565,7 +565,7 @@ uint32_t slurm_get_priority_weight_fairshare(void)
uint32_t factor = NO_VAL;
slurm_ctl_conf_t *conf;
- if(slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
factor = conf->priority_weight_fs;
@@ -585,7 +585,7 @@ uint32_t slurm_get_priority_weight_job_size(void)
uint32_t factor = NO_VAL;
slurm_ctl_conf_t *conf;
- if(slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
factor = conf->priority_weight_js;
@@ -604,7 +604,7 @@ uint32_t slurm_get_priority_weight_partition(void)
uint32_t factor = NO_VAL;
slurm_ctl_conf_t *conf;
- if(slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
factor = conf->priority_weight_part;
@@ -624,7 +624,7 @@ uint32_t slurm_get_priority_weight_qos(void)
uint32_t factor = NO_VAL;
slurm_ctl_conf_t *conf;
- if(slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
factor = conf->priority_weight_qos;
@@ -654,7 +654,7 @@ uint16_t slurm_get_private_data(void)
}
/* slurm_get_state_save_location
- * get state_save_location from slurmctld_conf object from slurmctld_conf object
+ * get state_save_location from slurmctld_conf object from slurmctld_conf object
* RET char * - state_save_location directory, MUST be xfreed by caller
*/
char *slurm_get_state_save_location(void)
@@ -723,7 +723,7 @@ char *slurm_get_cluster_name(void)
name = xstrdup(conf->cluster_name);
slurm_conf_unlock();
}
- return name;
+ return name;
}
/* slurm_get_crypto_type
@@ -862,7 +862,7 @@ extern int slurm_set_auth_type(char *auth_type)
if(slurmdbd_conf) {
xfree(slurmdbd_conf->auth_type);
- slurmdbd_conf->auth_type = xstrdup(auth_type);
+ slurmdbd_conf->auth_type = xstrdup(auth_type);
} else {
conf = slurm_conf_lock();
xfree(conf->authtype);
@@ -907,7 +907,7 @@ char *slurm_get_accounting_storage_type(void)
slurm_conf_unlock();
}
return accounting_type;
-
+
}
/* slurm_get_accounting_storage_user
@@ -926,7 +926,7 @@ char *slurm_get_accounting_storage_user(void)
storage_user = xstrdup(conf->accounting_storage_user);
slurm_conf_unlock();
}
- return storage_user;
+ return storage_user;
}
/* slurm_set_accounting_storage_user
@@ -946,7 +946,7 @@ int slurm_set_accounting_storage_user(char *user)
conf->accounting_storage_user = xstrdup(user);
slurm_conf_unlock();
}
- return 0;
+ return 0;
}
/* slurm_get_accounting_storage_backup_host
@@ -965,7 +965,7 @@ char *slurm_get_accounting_storage_backup_host(void)
storage_host = xstrdup(conf->accounting_storage_backup_host);
slurm_conf_unlock();
}
- return storage_host;
+ return storage_host;
}
/* slurm_get_accounting_storage_host
@@ -984,7 +984,7 @@ char *slurm_get_accounting_storage_host(void)
storage_host = xstrdup(conf->accounting_storage_host);
slurm_conf_unlock();
}
- return storage_host;
+ return storage_host;
}
/* slurm_set_accounting_storage_host
@@ -1004,7 +1004,7 @@ int slurm_set_accounting_storage_host(char *host)
conf->accounting_storage_host = xstrdup(host);
slurm_conf_unlock();
}
- return 0;
+ return 0;
}
/* slurm_get_accounting_storage_loc
@@ -1023,7 +1023,7 @@ char *slurm_get_accounting_storage_loc(void)
storage_loc = xstrdup(conf->accounting_storage_loc);
slurm_conf_unlock();
}
- return storage_loc;
+ return storage_loc;
}
/* slurm_set_accounting_storage_loc
@@ -1043,7 +1043,7 @@ int slurm_set_accounting_storage_loc(char *loc)
conf->accounting_storage_loc = xstrdup(loc);
slurm_conf_unlock();
}
- return 0;
+ return 0;
}
/* slurm_get_accounting_storage_enforce
@@ -1060,7 +1060,7 @@ int slurm_get_accounting_storage_enforce(void)
enforce = conf->accounting_storage_enforce;
slurm_conf_unlock();
}
- return enforce;
+ return enforce;
}
@@ -1076,14 +1076,14 @@ int slurm_get_is_association_based_accounting(void)
return 1;
} else {
conf = slurm_conf_lock();
- if(!strcasecmp(conf->accounting_storage_type,
+ if(!strcasecmp(conf->accounting_storage_type,
"accounting_storage/slurmdbd")
|| !strcasecmp(conf->accounting_storage_type,
- "accounting_storage/mysql"))
+ "accounting_storage/mysql"))
enforce = 1;
slurm_conf_unlock();
}
- return enforce;
+ return enforce;
}
@@ -1123,20 +1123,20 @@ static char *_global_auth_key(void)
if(slurmdbd_conf) {
if(slurmdbd_conf->auth_info) {
- if(strlen(slurmdbd_conf->auth_info) >
+ if(strlen(slurmdbd_conf->auth_info) >
sizeof(storage_pass))
fatal("AuthInfo is too long");
- strncpy(storage_pass, slurmdbd_conf->auth_info,
+ strncpy(storage_pass, slurmdbd_conf->auth_info,
sizeof(storage_pass));
storage_pass_ptr = storage_pass;
}
} else {
conf = slurm_conf_lock();
if(conf->accounting_storage_pass) {
- if(strlen(conf->accounting_storage_pass) >
+ if(strlen(conf->accounting_storage_pass) >
sizeof(storage_pass))
fatal("AccountingStoragePass is too long");
- strncpy(storage_pass, conf->accounting_storage_pass,
+ strncpy(storage_pass, conf->accounting_storage_pass,
sizeof(storage_pass));
storage_pass_ptr = storage_pass;
}
@@ -1163,7 +1163,7 @@ uint32_t slurm_get_accounting_storage_port(void)
slurm_conf_unlock();
}
return storage_port;
-
+
}
/* slurm_set_accounting_storage_port
@@ -1182,11 +1182,11 @@ int slurm_set_accounting_storage_port(uint32_t storage_port)
error("can't have storage port of 0");
return SLURM_ERROR;
}
-
+
conf->accounting_storage_port = storage_port;
slurm_conf_unlock();
}
- return 0;
+ return 0;
}
/* slurm_get_preempt_mode
@@ -1276,7 +1276,7 @@ char *slurm_get_jobcomp_loc(void)
jobcomp_loc = xstrdup(conf->job_comp_loc);
slurm_conf_unlock();
}
- return jobcomp_loc;
+ return jobcomp_loc;
}
/* slurm_get_jobcomp_user
@@ -1294,7 +1294,7 @@ char *slurm_get_jobcomp_user(void)
storage_user = xstrdup(conf->job_comp_user);
slurm_conf_unlock();
}
- return storage_user;
+ return storage_user;
}
/* slurm_get_jobcomp_host
@@ -1312,7 +1312,7 @@ char *slurm_get_jobcomp_host(void)
storage_host = xstrdup(conf->job_comp_host);
slurm_conf_unlock();
}
- return storage_host;
+ return storage_host;
}
/* slurm_get_jobcomp_pass
@@ -1330,7 +1330,7 @@ char *slurm_get_jobcomp_pass(void)
storage_pass = xstrdup(conf->job_comp_pass);
slurm_conf_unlock();
}
- return storage_pass;
+ return storage_pass;
}
/* slurm_get_jobcomp_port
@@ -1349,7 +1349,7 @@ uint32_t slurm_get_jobcomp_port(void)
slurm_conf_unlock();
}
return storage_port;
-
+
}
/* slurm_set_jobcomp_port
@@ -1367,7 +1367,7 @@ int slurm_set_jobcomp_port(uint32_t port)
error("can't have jobcomp port of 0");
return SLURM_ERROR;
}
-
+
conf->job_comp_port = port;
slurm_conf_unlock();
}
@@ -1471,7 +1471,7 @@ extern uint16_t slurm_get_root_filter(void)
{
uint16_t root_filter = 0;
slurm_ctl_conf_t *conf;
-
+
if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
@@ -1697,9 +1697,9 @@ static void _remap_slurmctld_errno(void)
* general message management functions used by slurmctld, slurmd
\**********************************************************************/
-/* In the socket implementation it creates a socket, binds to it, and
+/* In the socket implementation it creates a socket, binds to it, and
* listens for connections.
- *
+ *
* IN port - port to bind the msg server to
* RET slurm_fd - file descriptor of the connection created
*/
@@ -1711,7 +1711,7 @@ slurm_fd slurm_init_msg_engine_port(uint16_t port)
return _slurm_init_msg_engine(&addr);
}
-/* In the socket implementation it creates a socket, binds to it, and
+/* In the socket implementation it creates a socket, binds to it, and
* listens for connections.
*
* IN addr_name - address to bind the msg server to (NULL means any)
@@ -1734,10 +1734,10 @@ slurm_fd slurm_init_msg_engine_addrname_port(char *addr_name, uint16_t port)
return _slurm_init_msg_engine(&addr);
}
-/*
+/*
* Same as above, but initialize using a slurm address "addr"
*
- * IN addr - slurm_addr to bind the msg server to
+ * IN addr - slurm_addr to bind the msg server to
* RET slurm_fd - file descriptor of the connection created
*/
slurm_fd slurm_init_msg_engine(slurm_addr *addr)
@@ -1745,7 +1745,7 @@ slurm_fd slurm_init_msg_engine(slurm_addr *addr)
return _slurm_init_msg_engine(addr);
}
-/*
+/*
* Close an established message engine.
* Returns SLURM_SUCCESS or SLURM_FAILURE.
*
@@ -1760,7 +1760,7 @@ int slurm_shutdown_msg_engine(slurm_fd fd)
return rc;
}
-/*
+/*
* Close an established message connection.
* Returns SLURM_SUCCESS or SLURM_FAILURE.
*
@@ -1776,10 +1776,10 @@ int slurm_shutdown_msg_conn(slurm_fd fd)
* msg connection establishment functions used by msg clients
\**********************************************************************/
-/* In the bsd socket implementation it creates a SOCK_STREAM socket
- * and calls connect on it a SOCK_DGRAM socket called with connect
- * is defined to only receive messages from the address/port pair
- * argument of the connect call slurm_address - for now it is
+/* In the bsd socket implementation it creates a SOCK_STREAM socket
+ * and calls connect on it a SOCK_DGRAM socket called with connect
+ * is defined to only receive messages from the address/port pair
+ * argument of the connect call slurm_address - for now it is
* really just a sockaddr_in
* IN slurm_address - slurm_addr of the connection destination
* RET slurm_fd - file descriptor of the connection created
@@ -1789,7 +1789,7 @@ slurm_fd slurm_open_msg_conn(slurm_addr * slurm_address)
return _slurm_open_msg_conn(slurm_address);
}
-/* Calls connect to make a connection-less datagram connection to the
+/* Calls connect to make a connection-less datagram connection to the
* primary or secondary slurmctld message engine. If the controller
* is very busy the connect may fail, so retry a couple of times.
* OUT addr - address of controller contacted
@@ -1835,7 +1835,7 @@ slurm_fd slurm_open_controller_conn(slurm_addr *addr)
slurm_seterrno_ret(SLURMCTLD_COMMUNICATIONS_CONNECTION_ERROR);
}
-/* calls connect to make a connection-less datagram connection to the
+/* calls connect to make a connection-less datagram connection to the
* primary or secondary slurmctld message engine
* RET slurm_fd - file descriptor of the connection created
* IN dest - controller to contact, primary or secondary
@@ -1876,12 +1876,12 @@ slurm_fd slurm_open_controller_conn_spec(enum controller_id dest)
*/
void slurm_get_controller_addr_spec(enum controller_id dest, slurm_addr *addr)
{
- addr = (dest == PRIMARY_CONTROLLER) ?
- &proto_conf->primary_controller :
+ addr = (dest == PRIMARY_CONTROLLER) ?
+ &proto_conf->primary_controller :
&proto_conf->secondary_controller;
-}
+}
-/* In the bsd implmentation maps directly to a accept call
+/* In the bsd implmentation maps directly to a accept call
* IN open_fd - file descriptor to accept connection on
* OUT slurm_address - slurm_addr of the accepted connection
* RET slurm_fd - file descriptor of the connection created
@@ -1892,7 +1892,7 @@ slurm_fd slurm_accept_msg_conn(slurm_fd open_fd,
return _slurm_accept_msg_conn(open_fd, slurm_address);
}
-/* In the bsd implmentation maps directly to a close call, to close
+/* In the bsd implmentation maps directly to a close call, to close
* the socket that was accepted
* IN open_fd - an open file descriptor to close
* RET int - the return code
@@ -1907,7 +1907,7 @@ int slurm_close_accepted_conn(slurm_fd open_fd)
\**********************************************************************/
/*
- * NOTE: memory is allocated for the returned msg must be freed at
+ * NOTE: memory is allocated for the returned msg must be freed at
* some point using the slurm_free_functions.
* IN open_fd - file descriptor to receive msg on
* OUT msg - a slurm_msg struct to be filled in by the function
@@ -1927,10 +1927,10 @@ int slurm_receive_msg(slurm_fd fd, slurm_msg_t *msg, int timeout)
slurm_msg_t_init(msg);
msg->conn_fd = fd;
-
+
if (timeout <= 0)
/* convert secs to msec */
- timeout = slurm_get_msg_timeout() * 1000;
+ timeout = slurm_get_msg_timeout() * 1000;
else if(timeout > (slurm_get_msg_timeout() * 10000)) {
debug("You are receiving a message with very long "
@@ -1938,20 +1938,20 @@ int slurm_receive_msg(slurm_fd fd, slurm_msg_t *msg, int timeout)
} else if(timeout < 1000) {
error("You are receiving a message with a very short "
"timeout of %d msecs", timeout);
- }
-
+ }
+
/*
* Receive a msg. slurm_msg_recvfrom() will read the message
* length and allocate space on the heap for a buffer containing
- * the message.
+ * the message.
*/
if (_slurm_msg_recvfrom_timeout(fd, &buf, &buflen, 0, timeout) < 0) {
forward_init(&header.forward, NULL);
- rc = errno;
+ rc = errno;
goto total_return;
}
-
+
#if _DEBUG
_print_data (buf, buflen);
#endif
@@ -1962,14 +1962,14 @@ int slurm_receive_msg(slurm_fd fd, slurm_msg_t *msg, int timeout)
rc = SLURM_COMMUNICATIONS_RECEIVE_ERROR;
goto total_return;
}
-
+
if (check_header_version(&header) < 0) {
slurm_addr resp_addr;
char addr_str[32];
int uid = _unpack_msg_uid(buffer);
slurm_get_peer_addr(fd, &resp_addr);
slurm_print_slurm_addr(&resp_addr, addr_str, sizeof(addr_str));
- error("Invalid Protocol Version %u from uid=%d at %s",
+ error("Invalid Protocol Version %u from uid=%d at %s",
header.version, uid, addr_str);
free_buf(buffer);
rc = SLURM_PROTOCOL_VERSION_ERROR;
@@ -1983,14 +1983,14 @@ int slurm_receive_msg(slurm_fd fd, slurm_msg_t *msg, int timeout)
list_destroy(header.ret_list);
header.ret_list = NULL;
}
-
-
+
+
/* Forward message to other nodes */
if(header.forward.cnt > 0) {
error("We need to forward this to other nodes use "
"slurm_receive_msg_and_forward instead");
}
-
+
if ((auth_cred = g_slurm_auth_unpack(buffer)) == NULL) {
error( "authentication: %s ",
g_slurm_auth_errstr(g_slurm_auth_errno(NULL)));
@@ -1999,11 +1999,11 @@ int slurm_receive_msg(slurm_fd fd, slurm_msg_t *msg, int timeout)
goto total_return;
}
if(header.flags & SLURM_GLOBAL_AUTH_KEY) {
- rc = g_slurm_auth_verify( auth_cred, NULL, 2,
+ rc = g_slurm_auth_verify( auth_cred, NULL, 2,
_global_auth_key() );
} else
rc = g_slurm_auth_verify( auth_cred, NULL, 2, NULL );
-
+
if (rc != SLURM_SUCCESS) {
error( "authentication: %s ",
g_slurm_auth_errstr(g_slurm_auth_errno(auth_cred)));
@@ -2011,14 +2011,14 @@ int slurm_receive_msg(slurm_fd fd, slurm_msg_t *msg, int timeout)
free_buf(buffer);
rc = SLURM_PROTOCOL_AUTHENTICATION_ERROR;
goto total_return;
- }
+ }
/*
- * Unpack message body
+ * Unpack message body
*/
msg->msg_type = header.msg_type;
msg->flags = header.flags;
-
+
if ( (header.body_length > remaining_buf(buffer)) ||
(unpack_msg(msg, buffer) != SLURM_SUCCESS) ) {
(void) g_slurm_auth_destroy(auth_cred);
@@ -2026,15 +2026,15 @@ int slurm_receive_msg(slurm_fd fd, slurm_msg_t *msg, int timeout)
rc = ESLURM_PROTOCOL_INCOMPLETE_PACKET;
goto total_return;
}
-
+
msg->auth_cred = (void *)auth_cred;
free_buf(buffer);
rc = SLURM_SUCCESS;
-
+
total_return:
destroy_forward(&header.forward);
-
+
slurm_seterrno(rc);
if(rc != SLURM_SUCCESS) {
msg->auth_cred = (void *) NULL;
@@ -2044,7 +2044,7 @@ total_return:
rc = 0;
}
return rc;
-
+
}
/*
@@ -2074,10 +2074,10 @@ List slurm_receive_msgs(slurm_fd fd, int steps, int timeout)
slurm_msg_t_init(&msg);
msg.conn_fd = fd;
-
+
if(timeout <= 0) {
/* convert secs to msec */
- timeout = slurm_get_msg_timeout() * 1000;
+ timeout = slurm_get_msg_timeout() * 1000;
orig_timeout = timeout;
}
if(steps) {
@@ -2086,7 +2086,7 @@ List slurm_receive_msgs(slurm_fd fd, int steps, int timeout)
orig_timeout = (timeout -
(message_timeout*(steps-1)))/steps;
steps--;
- }
+ }
debug4("orig_timeout was %d we have %d steps and a timeout of %d",
orig_timeout, steps, timeout);
@@ -2096,28 +2096,28 @@ List slurm_receive_msgs(slurm_fd fd, int steps, int timeout)
if(orig_timeout >= (slurm_get_msg_timeout() * 10000)) {
debug("slurm_receive_msgs: "
"You are sending a message with timeout's greater "
- "than %d seconds, your's is %d seconds",
- (slurm_get_msg_timeout() * 10),
+ "than %d seconds, your's is %d seconds",
+ (slurm_get_msg_timeout() * 10),
(timeout/1000));
} else if(orig_timeout < 1000) {
debug("slurm_receive_msgs: "
"You are sending a message with a very short timeout of "
"%d milliseconds each step in the tree has %d "
"milliseconds", timeout, orig_timeout);
- }
-
+ }
+
/*
* Receive a msg. slurm_msg_recvfrom() will read the message
* length and allocate space on the heap for a buffer containing
- * the message.
+ * the message.
*/
if(_slurm_msg_recvfrom_timeout(fd, &buf, &buflen, 0, timeout) < 0) {
forward_init(&header.forward, NULL);
- rc = errno;
+ rc = errno;
goto total_return;
}
-
+
#if _DEBUG
_print_data (buf, buflen);
#endif
@@ -2128,14 +2128,14 @@ List slurm_receive_msgs(slurm_fd fd, int steps, int timeout)
rc = SLURM_COMMUNICATIONS_RECEIVE_ERROR;
goto total_return;
}
-
+
if(check_header_version(&header) < 0) {
slurm_addr resp_addr;
char addr_str[32];
int uid = _unpack_msg_uid(buffer);
slurm_get_peer_addr(fd, &resp_addr);
slurm_print_slurm_addr(&resp_addr, addr_str, sizeof(addr_str));
- error("Invalid Protocol Version %u from uid=%d at %s",
+ error("Invalid Protocol Version %u from uid=%d at %s",
header.version, uid, addr_str);
free_buf(buffer);
rc = SLURM_PROTOCOL_VERSION_ERROR;
@@ -2150,13 +2150,13 @@ List slurm_receive_msgs(slurm_fd fd, int steps, int timeout)
header.ret_cnt = 0;
header.ret_list = NULL;
}
-
+
/* Forward message to other nodes */
if(header.forward.cnt > 0) {
error("We need to forward this to other nodes use "
"slurm_receive_msg_and_forward instead");
}
-
+
if((auth_cred = g_slurm_auth_unpack(buffer)) == NULL) {
error( "authentication: %s ",
g_slurm_auth_errstr(g_slurm_auth_errno(NULL)));
@@ -2165,11 +2165,11 @@ List slurm_receive_msgs(slurm_fd fd, int steps, int timeout)
goto total_return;
}
if(header.flags & SLURM_GLOBAL_AUTH_KEY) {
- rc = g_slurm_auth_verify( auth_cred, NULL, 2,
+ rc = g_slurm_auth_verify( auth_cred, NULL, 2,
_global_auth_key() );
} else
rc = g_slurm_auth_verify( auth_cred, NULL, 2, NULL );
-
+
if(rc != SLURM_SUCCESS) {
error("authentication: %s ",
g_slurm_auth_errstr(g_slurm_auth_errno(auth_cred)));
@@ -2177,14 +2177,14 @@ List slurm_receive_msgs(slurm_fd fd, int steps, int timeout)
free_buf(buffer);
rc = SLURM_PROTOCOL_AUTHENTICATION_ERROR;
goto total_return;
- }
+ }
/*
- * Unpack message body
+ * Unpack message body
*/
msg.msg_type = header.msg_type;
msg.flags = header.flags;
-
+
if((header.body_length > remaining_buf(buffer)) ||
(unpack_msg(&msg, buffer) != SLURM_SUCCESS)) {
(void) g_slurm_auth_destroy(auth_cred);
@@ -2193,13 +2193,13 @@ List slurm_receive_msgs(slurm_fd fd, int steps, int timeout)
goto total_return;
}
g_slurm_auth_destroy(auth_cred);
-
+
free_buf(buffer);
rc = SLURM_SUCCESS;
-
+
total_return:
destroy_forward(&header.forward);
-
+
if(rc != SLURM_SUCCESS) {
if(ret_list) {
ret_data_info = xmalloc(sizeof(ret_data_info_t));
@@ -2219,14 +2219,14 @@ total_return:
ret_data_info->data = msg.data;
list_push(ret_list, ret_data_info);
}
-
-
+
+
errno = rc;
return ret_list;
-
+
}
-/* try to determine the UID associated with a message with different
+/* try to determine the UID associated with a message with different
* message header version, return -1 if we can't tell */
static int _unpack_msg_uid(Buf buffer)
{
@@ -2243,15 +2243,15 @@ static int _unpack_msg_uid(Buf buffer)
/*
* NOTE: memory is allocated for the returned msg and the returned list
- * both must be freed at some point using the slurm_free_functions
+ * both must be freed at some point using the slurm_free_functions
* and list_destroy function.
* IN open_fd - file descriptor to receive msg on
* IN/OUT msg - a slurm_msg struct to be filled in by the function
- * we use the orig_addr from this var for forwarding.
+ * we use the orig_addr from this var for forwarding.
* IN timeout - how long to wait in milliseconds
* RET int - returns 0 on success, -1 on failure and sets errno
*/
-int slurm_receive_msg_and_forward(slurm_fd fd, slurm_addr *orig_addr,
+int slurm_receive_msg_and_forward(slurm_fd fd, slurm_addr *orig_addr,
slurm_msg_t *msg, int timeout)
{
char *buf = NULL;
@@ -2265,7 +2265,7 @@ int slurm_receive_msg_and_forward(slurm_fd fd, slurm_addr *orig_addr,
if(msg->forward.init != FORWARD_INIT)
slurm_msg_t_init(msg);
- /* set msg connection fd to accepted fd. This allows
+ /* set msg connection fd to accepted fd. This allows
* possibility for slurmd_req () to close accepted connection
*/
msg->conn_fd = fd;
@@ -2280,31 +2280,31 @@ int slurm_receive_msg_and_forward(slurm_fd fd, slurm_addr *orig_addr,
if (timeout <= 0)
/* convert secs to msec */
- timeout = slurm_get_msg_timeout() * 1000;
-
+ timeout = slurm_get_msg_timeout() * 1000;
+
if(timeout >= (slurm_get_msg_timeout() * 10000)) {
debug("slurm_receive_msg_and_forward: "
"You are sending a message with timeout's greater "
- "than %d seconds, your's is %d seconds",
- (slurm_get_msg_timeout() * 10),
+ "than %d seconds, your's is %d seconds",
+ (slurm_get_msg_timeout() * 10),
(timeout/1000));
} else if(timeout < 1000) {
debug("slurm_receive_msg_and_forward: "
"You are sending a message with a very short timeout of "
"%d milliseconds", timeout);
- }
+ }
/*
* Receive a msg. slurm_msg_recvfrom() will read the message
* length and allocate space on the heap for a buffer containing
- * the message.
+ * the message.
*/
if (_slurm_msg_recvfrom_timeout(fd, &buf, &buflen, 0, timeout) < 0) {
forward_init(&header.forward, NULL);
- rc = errno;
+ rc = errno;
goto total_return;
}
-
+
#if _DEBUG
_print_data (buf, buflen);
#endif
@@ -2315,14 +2315,14 @@ int slurm_receive_msg_and_forward(slurm_fd fd, slurm_addr *orig_addr,
rc = SLURM_COMMUNICATIONS_RECEIVE_ERROR;
goto total_return;
}
-
+
if (check_header_version(&header) < 0) {
slurm_addr resp_addr;
char addr_str[32];
int uid = _unpack_msg_uid(buffer);
slurm_get_peer_addr(fd, &resp_addr);
slurm_print_slurm_addr(&resp_addr, addr_str, sizeof(addr_str));
- error("Invalid Protocol Version %u from uid=%d at %s",
+ error("Invalid Protocol Version %u from uid=%d at %s",
header.version, uid, addr_str);
free_buf(buffer);
rc = SLURM_PROTOCOL_VERSION_ERROR;
@@ -2343,7 +2343,7 @@ int slurm_receive_msg_and_forward(slurm_fd fd, slurm_addr *orig_addr,
/* list_destroy(header.ret_list); */
/* header.ret_list = NULL; */
/* } */
- /*
+ /*
* header.orig_addr will be set to where the first message
* came from if this is a forward else we set the
* header.orig_addr to our addr just incase we need to send it off.
@@ -2353,7 +2353,7 @@ int slurm_receive_msg_and_forward(slurm_fd fd, slurm_addr *orig_addr,
} else {
memcpy(&header.orig_addr, orig_addr, sizeof(slurm_addr));
}
-
+
/* Forward message to other nodes */
if(header.forward.cnt > 0) {
debug("forwarding to %u", header.forward.cnt);
@@ -2361,16 +2361,16 @@ int slurm_receive_msg_and_forward(slurm_fd fd, slurm_addr *orig_addr,
slurm_mutex_init(&msg->forward_struct->forward_mutex);
pthread_cond_init(&msg->forward_struct->notify, NULL);
- msg->forward_struct->forward_msg =
+ msg->forward_struct->forward_msg =
xmalloc(sizeof(forward_msg_t) * header.forward.cnt);
-
+
msg->forward_struct->buf_len = remaining_buf(buffer);
- msg->forward_struct->buf =
+ msg->forward_struct->buf =
xmalloc(sizeof(char) * msg->forward_struct->buf_len);
- memcpy(msg->forward_struct->buf,
- &buffer->head[buffer->processed],
+ memcpy(msg->forward_struct->buf,
+ &buffer->head[buffer->processed],
msg->forward_struct->buf_len);
-
+
msg->forward_struct->ret_list = msg->ret_list;
/* take out the amount of timeout from this hop */
msg->forward_struct->timeout = header.forward.timeout;
@@ -2378,15 +2378,15 @@ int slurm_receive_msg_and_forward(slurm_fd fd, slurm_addr *orig_addr,
msg->forward_struct->timeout = message_timeout;
msg->forward_struct->fwd_cnt = header.forward.cnt;
- debug3("forwarding messages to %u nodes with timeout of %d",
+ debug3("forwarding messages to %u nodes with timeout of %d",
msg->forward_struct->fwd_cnt,
msg->forward_struct->timeout);
-
+
if(forward_msg(msg->forward_struct, &header) == SLURM_ERROR) {
error("problem with forward msg");
}
}
-
+
if ((auth_cred = g_slurm_auth_unpack(buffer)) == NULL) {
error( "authentication: %s ",
g_slurm_auth_errstr(g_slurm_auth_errno(NULL)));
@@ -2395,11 +2395,11 @@ int slurm_receive_msg_and_forward(slurm_fd fd, slurm_addr *orig_addr,
goto total_return;
}
if(header.flags & SLURM_GLOBAL_AUTH_KEY) {
- rc = g_slurm_auth_verify( auth_cred, NULL, 2,
+ rc = g_slurm_auth_verify( auth_cred, NULL, 2,
_global_auth_key() );
} else
rc = g_slurm_auth_verify( auth_cred, NULL, 2, NULL );
-
+
if (rc != SLURM_SUCCESS) {
error( "authentication: %s ",
g_slurm_auth_errstr(g_slurm_auth_errno(auth_cred)));
@@ -2407,14 +2407,14 @@ int slurm_receive_msg_and_forward(slurm_fd fd, slurm_addr *orig_addr,
free_buf(buffer);
rc = SLURM_PROTOCOL_AUTHENTICATION_ERROR;
goto total_return;
- }
+ }
/*
- * Unpack message body
+ * Unpack message body
*/
msg->msg_type = header.msg_type;
msg->flags = header.flags;
-
+
if ( (header.body_length > remaining_buf(buffer)) ||
(unpack_msg(msg, buffer) != SLURM_SUCCESS) ) {
(void) g_slurm_auth_destroy(auth_cred);
@@ -2422,15 +2422,15 @@ int slurm_receive_msg_and_forward(slurm_fd fd, slurm_addr *orig_addr,
rc = ESLURM_PROTOCOL_INCOMPLETE_PACKET;
goto total_return;
}
-
+
msg->auth_cred = (void *) auth_cred;
free_buf(buffer);
rc = SLURM_SUCCESS;
-
+
total_return:
destroy_forward(&header.forward);
-
+
slurm_seterrno(rc);
if(rc != SLURM_SUCCESS) {
msg->msg_type = RESPONSE_FORWARD_FAILED;
@@ -2442,7 +2442,7 @@ total_return:
rc = 0;
}
return rc;
-
+
}
/**********************************************************************\
@@ -2464,7 +2464,7 @@ _pack_msg(slurm_msg_t *msg, header_t *hdr, Buf buffer)
/* update header with correct cred and msg lengths */
update_header(hdr, msglen);
-
+
/* repack updated header */
tmplen = get_buf_offset(buffer);
set_buf_offset(buffer, 0);
@@ -2472,7 +2472,7 @@ _pack_msg(slurm_msg_t *msg, header_t *hdr, Buf buffer)
set_buf_offset(buffer, tmplen);
}
-/*
+/*
* Send a slurm message over an open file descriptor `fd'
* Returns the size of the message sent in bytes, or -1 on failure.
*/
@@ -2483,8 +2483,8 @@ int slurm_send_node_msg(slurm_fd fd, slurm_msg_t * msg)
int rc;
void * auth_cred;
uint16_t auth_flags = SLURM_PROTOCOL_NO_FLAGS;
-
- /*
+
+ /*
* Initialize header with Auth credential and message type.
*/
if (msg->flags & SLURM_GLOBAL_AUTH_KEY) {
@@ -2505,14 +2505,14 @@ int slurm_send_node_msg(slurm_fd fd, slurm_msg_t * msg)
forward_wait(msg);
init_header(&header, msg, msg->flags);
-
+
/*
* Pack header into buffer for transmission
*/
buffer = init_buf(BUF_SIZE);
pack_header(&header, buffer);
-
- /*
+
+ /*
* Pack auth credential
*/
rc = g_slurm_auth_pack(auth_cred, buffer);
@@ -2523,7 +2523,7 @@ int slurm_send_node_msg(slurm_fd fd, slurm_msg_t * msg)
free_buf(buffer);
slurm_seterrno_ret(SLURM_PROTOCOL_AUTHENTICATION_ERROR);
}
-
+
/*
* Pack message into buffer
*/
@@ -2535,13 +2535,13 @@ int slurm_send_node_msg(slurm_fd fd, slurm_msg_t * msg)
/*
* Send message
*/
- rc = _slurm_msg_sendto( fd, get_buf_data(buffer),
+ rc = _slurm_msg_sendto( fd, get_buf_data(buffer),
get_buf_offset(buffer),
SLURM_PROTOCOL_NO_SEND_RECV_FLAGS );
-
- if (rc < 0)
+
+ if (rc < 0)
error("slurm_msg_sendto: %m");
-
+
free_buf(buffer);
return rc;
}
@@ -2561,10 +2561,10 @@ slurm_fd slurm_listen_stream(slurm_addr * slurm_address)
}
/* slurm_accept_stream
- * accepts a incomming stream connection on a stream server slurm_fd
+ * accepts a incomming stream connection on a stream server slurm_fd
* IN open_fd - file descriptor to accept connection on
* OUT slurm_address - slurm_addr of the accepted connection
- * RET slurm_fd - file descriptor of the accepted connection
+ * RET slurm_fd - file descriptor of the accepted connection
*/
slurm_fd slurm_accept_stream(slurm_fd open_fd, slurm_addr * slurm_address)
{
@@ -2627,7 +2627,7 @@ size_t slurm_read_stream_timeout(slurm_fd open_fd, char *buffer,
}
/* slurm_get_stream_addr
- * esentially a encapsilated get_sockname
+ * esentially a encapsilated get_sockname
* IN open_fd - file descriptor to retreive slurm_addr for
* OUT address - address that open_fd to bound to
*/
@@ -2690,7 +2690,7 @@ void slurm_set_addr_any(slurm_addr * slurm_address, uint16_t port)
* initializes the slurm_address with the supplied port and host name
* OUT slurm_address - slurm_addr to be filled in
* IN port - port in host order
- * IN host - hostname or dns name
+ * IN host - hostname or dns name
*/
void slurm_set_addr(slurm_addr * slurm_address, uint16_t port, char *host)
{
@@ -2711,7 +2711,7 @@ void reset_slurm_addr(slurm_addr * slurm_address, slurm_addr new_address)
* initializes the slurm_address with the supplied port and host
* OUT slurm_address - slurm_addr to be filled in
* IN port - port in host order
- * IN host - hostname or dns name
+ * IN host - hostname or dns name
*/
void slurm_set_addr_char(slurm_addr * slurm_address, uint16_t port,
char *host)
@@ -2719,7 +2719,7 @@ void slurm_set_addr_char(slurm_addr * slurm_address, uint16_t port,
_slurm_set_addr_char(slurm_address, port, host);
}
-/* slurm_get_addr
+/* slurm_get_addr
* given a slurm_address it returns its port and hostname
* IN slurm_address - slurm_addr to be queried
* OUT port - port number
@@ -2732,7 +2732,7 @@ void slurm_get_addr(slurm_addr * slurm_address, uint16_t * port,
_slurm_get_addr(slurm_address, port, host, buf_len);
}
-/* slurm_get_ip_str
+/* slurm_get_ip_str
* given a slurm_address it returns its port and ip address string
* IN slurm_address - slurm_addr to be queried
* OUT port - port number
@@ -2779,7 +2779,7 @@ void slurm_print_slurm_addr(slurm_addr * address, char *buf, size_t n)
* slurm_addr pack routines
\**********************************************************************/
-/*
+/*
* Pack just the message with no header and send back the buffer.
*/
Buf slurm_pack_msg_no_header(slurm_msg_t * msg)
@@ -2787,12 +2787,12 @@ Buf slurm_pack_msg_no_header(slurm_msg_t * msg)
Buf buffer = NULL;
buffer = init_buf(0);
-
+
/*
* Pack message into buffer
*/
pack_msg(msg, buffer);
-
+
return buffer;
}
@@ -2831,7 +2831,7 @@ void slurm_pack_slurm_addr_array(slurm_addr * slurm_address,
int i = 0;
uint32_t nl = htonl(size_val);
pack32(nl, buffer);
-
+
for (i = 0; i < size_val; i++) {
slurm_pack_slurm_addr(slurm_address + i, buffer);
}
@@ -2872,13 +2872,13 @@ unpack_error:
/**********************************************************************\
- * simplified communication routines
- * They open a connection do work then close the connection all within
+ * simplified communication routines
+ * They open a connection do work then close the connection all within
* the function
\**********************************************************************/
/* slurm_send_rc_msg
- * given the original request message this function sends a
+ * given the original request message this function sends a
* slurm_return_code message back to the client that made the request
* IN request_msg - slurm_msg the request msg
* IN rc - the return_code to send back to the client
@@ -2887,7 +2887,7 @@ int slurm_send_rc_msg(slurm_msg_t *msg, int rc)
{
slurm_msg_t resp_msg;
return_code_msg_t rc_msg;
-
+
if (msg->conn_fd < 0) {
slurm_seterrno(ENOTCONN);
return SLURM_ERROR;
@@ -2903,7 +2903,7 @@ int slurm_send_rc_msg(slurm_msg_t *msg, int rc)
resp_msg.forward_struct = msg->forward_struct;
resp_msg.ret_list = msg->ret_list;
resp_msg.orig_addr = msg->orig_addr;
-
+
/* send message */
return slurm_send_node_msg(msg->conn_fd, &resp_msg);
}
@@ -2917,11 +2917,11 @@ int slurm_send_rc_msg(slurm_msg_t *msg, int rc)
* RET int - returns 0 on success, -1 on failure and sets errno
*/
static int
-_send_and_recv_msg(slurm_fd fd, slurm_msg_t *req,
+_send_and_recv_msg(slurm_fd fd, slurm_msg_t *req,
slurm_msg_t *resp, int timeout)
{
int retry = 0;
- int rc = -1;
+ int rc = -1;
slurm_msg_t_init(resp);
if(slurm_send_node_msg(fd, req) >= 0) {
@@ -2931,9 +2931,9 @@ _send_and_recv_msg(slurm_fd fd, slurm_msg_t *req,
slurm_receive_msg if it is 0 */
rc = slurm_receive_msg(fd, resp, timeout);
}
-
- /*
+
+ /*
* Attempt to close an open connection
*/
while ((slurm_shutdown_msg_conn(fd) < 0) && (errno == EINTR) ) {
@@ -2947,14 +2947,14 @@ _send_and_recv_msg(slurm_fd fd, slurm_msg_t *req,
/*
* Send and recv a slurm request and response on the open slurm descriptor
- * with a list containing the responses of the children (if any) we
+ * with a list containing the responses of the children (if any) we
* forwarded the message to. List containing type (ret_data_info_t).
* IN fd - file descriptor to receive msg on
* IN req - a slurm_msg struct to be sent by the function
* IN timeout - how long to wait in milliseconds
* RET List - List containing the responses of the childern (if any) we
* forwarded the message to. List containing type
- * (ret_data_info_t).
+ * (ret_data_info_t).
*/
static List
_send_and_recv_msgs(slurm_fd fd, slurm_msg_t *req, int timeout)
@@ -2962,7 +2962,7 @@ _send_and_recv_msgs(slurm_fd fd, slurm_msg_t *req, int timeout)
int retry = 0;
List ret_list = NULL;
int steps = 0;
-
+
if (!req->forward.timeout) {
if(!timeout)
timeout = slurm_get_msg_timeout() * 1000;
@@ -2980,14 +2980,14 @@ _send_and_recv_msgs(slurm_fd fd, slurm_msg_t *req, int timeout)
steps = (req->forward.cnt+1)/slurm_get_tree_width();
timeout = (message_timeout*steps);
steps++;
-
+
timeout += (req->forward.timeout*steps);
}
ret_list = slurm_receive_msgs(fd, steps, timeout);
}
-
- /*
+
+ /*
* Attempt to close an open connection
*/
while ((slurm_shutdown_msg_conn(fd) < 0) && (errno == EINTR) ) {
@@ -3002,7 +3002,7 @@ _send_and_recv_msgs(slurm_fd fd, slurm_msg_t *req, int timeout)
/*
* slurm_send_recv_controller_msg
- * opens a connection to the controller, sends the controller a message,
+ * opens a connection to the controller, sends the controller a message,
* listens for the response, then closes the connection
* IN request_msg - slurm_msg request
* OUT response_msg - slurm_msg response
@@ -3026,30 +3026,30 @@ int slurm_send_recv_controller_msg(slurm_msg_t *req, slurm_msg_t *resp)
forward_init(&req->forward, NULL);
req->ret_list = NULL;
req->forward_struct = NULL;
-
+
if ((fd = slurm_open_controller_conn(&ctrl_addr)) < 0) {
rc = -1;
goto cleanup;
}
-
+
conf = slurm_conf_lock();
backup_controller_flag = conf->backup_controller ? true : false;
slurmctld_timeout = conf->slurmctld_timeout;
slurm_conf_unlock();
while(retry) {
- /* If the backup controller is in the process of assuming
+ /* If the backup controller is in the process of assuming
* control, we sleep and retry later */
retry = 0;
rc = _send_and_recv_msg(fd, req, resp, 0);
if (resp->auth_cred)
g_slurm_auth_destroy(resp->auth_cred);
- else
+ else
rc = -1;
if ((rc == 0)
&& (resp->msg_type == RESPONSE_SLURM_RC)
- && ((((return_code_msg_t *) resp->data)->return_code)
+ && ((((return_code_msg_t *) resp->data)->return_code)
== ESLURM_IN_STANDBY_MODE)
&& (backup_controller_flag)
&& (difftime(time(NULL), start_time)
@@ -3059,7 +3059,7 @@ int slurm_send_recv_controller_msg(slurm_msg_t *req, slurm_msg_t *resp)
"responding, sleep and retry");
slurm_free_return_code_msg(resp->data);
sleep(30);
- if ((fd = slurm_open_controller_conn(&ctrl_addr))
+ if ((fd = slurm_open_controller_conn(&ctrl_addr))
< 0) {
rc = -1;
} else {
@@ -3070,16 +3070,16 @@ int slurm_send_recv_controller_msg(slurm_msg_t *req, slurm_msg_t *resp)
if (rc == -1)
break;
}
-
+
cleanup:
- if (rc != 0)
- _remap_slurmctld_errno();
-
+ if (rc != 0)
+ _remap_slurmctld_errno();
+
return rc;
}
/* slurm_send_recv_node_msg
- * opens a connection to node, sends the node a message, listens
+ * opens a connection to node, sends the node a message, listens
* for the response, then closes the connection
* IN request_msg - slurm_msg request
* OUT response_msg - slurm_msg response
@@ -3092,14 +3092,14 @@ int slurm_send_recv_node_msg(slurm_msg_t *req, slurm_msg_t *resp, int timeout)
resp->auth_cred = NULL;
if ((fd = slurm_open_msg_conn(&req->address)) < 0)
- return -1;
-
+ return -1;
+
return _send_and_recv_msg(fd, req, resp, timeout);
}
/* slurm_send_only_controller_msg
- * opens a connection to the controller, sends the controller a
+ * opens a connection to the controller, sends the controller a
* message then, closes the connection
* IN request_msg - slurm_msg request
* RET int - return code
@@ -3126,7 +3126,7 @@ int slurm_send_only_controller_msg(slurm_msg_t *req)
rc = SLURM_SUCCESS;
}
- /*
+ /*
* Attempt to close an open connection
*/
while ( (slurm_shutdown_msg_conn(fd) < 0) && (errno == EINTR) ) {
@@ -3142,7 +3142,7 @@ cleanup:
return rc;
}
-/*
+/*
* Open a connection to the "address" specified in the slurm msg `req'
* Then, immediately close the connection w/out waiting for a reply.
*
@@ -3153,7 +3153,7 @@ int slurm_send_only_node_msg(slurm_msg_t *req)
int rc = SLURM_SUCCESS;
int retry = 0;
slurm_fd fd = -1;
-
+
if ((fd = slurm_open_msg_conn(&req->address)) < 0) {
return SLURM_SOCKET_ERROR;
}
@@ -3164,7 +3164,7 @@ int slurm_send_only_node_msg(slurm_msg_t *req)
debug3("slurm_send_only_node_msg: sent %d", rc);
rc = SLURM_SUCCESS;
}
- /*
+ /*
* Attempt to close an open connection
*/
while ( (slurm_shutdown_msg_conn(fd) < 0) && (errno == EINTR) ) {
@@ -3186,7 +3186,7 @@ int slurm_send_only_node_msg(slurm_msg_t *req)
* (if any) we forwarded the message to. List
* containing type (ret_data_info_t).
*/
-List slurm_send_recv_msgs(const char *nodelist, slurm_msg_t *msg,
+List slurm_send_recv_msgs(const char *nodelist, slurm_msg_t *msg,
int timeout, bool quiet)
{
List ret_list = NULL;
@@ -3201,7 +3201,7 @@ List slurm_send_recv_msgs(const char *nodelist, slurm_msg_t *msg,
error("slurm_send_recv_msgs: no nodelist given");
return NULL;
}
-
+
#ifdef HAVE_FRONT_END
{
char *name = NULL;
@@ -3237,7 +3237,7 @@ List slurm_send_recv_msgs(const char *nodelist, slurm_msg_t *msg,
* tree from the calling node. */
/* while((name = hostlist_shift(hl))) { */
-
+
/* if(slurm_conf_get_addr(name, &msg->address) == SLURM_ERROR) { */
/* if (quiet) { */
/* debug("slurm_send_recv_msgs: can't find " */
@@ -3253,7 +3253,7 @@ List slurm_send_recv_msgs(const char *nodelist, slurm_msg_t *msg,
/* free(name); */
/* continue; */
/* } */
-
+
/* if ((fd = slurm_open_msg_conn(&msg->address)) < 0) { */
/* if (quiet) */
/* debug("slurm_send_recv_msgs to %s: %m", name); */
@@ -3275,7 +3275,7 @@ List slurm_send_recv_msgs(const char *nodelist, slurm_msg_t *msg,
/* name, msg->forward.nodelist); */
/* } else */
/* debug3("sending to %s", name); */
-
+
/* if(!(ret_list = _send_and_recv_msgs(fd, msg, timeout))) { */
/* xfree(msg->forward.nodelist); */
/* if (quiet) { */
@@ -3318,7 +3318,7 @@ List slurm_send_recv_msgs(const char *nodelist, slurm_msg_t *msg,
/*
* Send a message to msg->address
- * Then return List containing type (ret_data_info_t).
+ * Then return List containing type (ret_data_info_t).
* IN msg - a slurm_msg struct to be sent by the function
* IN timeout - how long to wait in milliseconds
* RET List - List containing the responses of the childern
@@ -3333,7 +3333,7 @@ List slurm_send_addr_recv_msgs(slurm_msg_t *msg, char *name, int timeout)
ListIterator itr;
if ((fd = slurm_open_msg_conn(&msg->address)) < 0) {
- mark_as_failed_forward(&ret_list, name,
+ mark_as_failed_forward(&ret_list, name,
SLURM_COMMUNICATIONS_CONNECTION_ERROR);
errno = SLURM_COMMUNICATIONS_CONNECTION_ERROR;
return ret_list;
@@ -3347,7 +3347,7 @@ List slurm_send_addr_recv_msgs(slurm_msg_t *msg, char *name, int timeout)
return ret_list;
} else {
itr = list_iterator_create(ret_list);
- while((ret_data_info = list_next(itr)))
+ while((ret_data_info = list_next(itr)))
if(!ret_data_info->node_name) {
ret_data_info->node_name = xstrdup(name);
}
@@ -3382,25 +3382,25 @@ int slurm_send_recv_rc_msg_only_one(slurm_msg_t *req, int *rc, int timeout)
forward_init(&req->forward, NULL);
req->ret_list = NULL;
req->forward_struct = NULL;
-
+
if ((fd = slurm_open_msg_conn(&req->address)) < 0) {
return -1;
}
-
+
if(!_send_and_recv_msg(fd, req, &resp, timeout)) {
if(resp.auth_cred)
- g_slurm_auth_destroy(resp.auth_cred);
+ g_slurm_auth_destroy(resp.auth_cred);
*rc = slurm_get_return_code(resp.msg_type, resp.data);
slurm_free_msg_data(resp.msg_type, resp.data);
ret_c = 0;
- } else
+ } else
ret_c = -1;
return ret_c;
}
/*
* Send message to controller and get return code.
- * Make use of slurm_send_recv_controller_msg(), which handles
+ * Make use of slurm_send_recv_controller_msg(), which handles
* support for backup controller and retry during transistion.
*/
int slurm_send_recv_controller_rc_msg(slurm_msg_t *req, int *rc)
@@ -3415,17 +3415,17 @@ int slurm_send_recv_controller_rc_msg(slurm_msg_t *req, int *rc)
} else {
ret_c = -1;
}
-
+
return ret_c;
}
/* this is used to set how many nodes are going to be on each branch
- * of the tree.
+ * of the tree.
* IN total - total number of nodes to send to
* IN tree_width - how wide the tree should be on each hop
* RET int * - int array tree_width in length each space
* containing the number of nodes to send to each hop
- * on the span.
+ * on the span.
*/
extern int *set_span(int total, uint16_t tree_width)
@@ -3441,8 +3441,8 @@ extern int *set_span(int total, uint16_t tree_width)
//info("span count = %d", tree_width);
if(total <= tree_width) {
return span;
- }
-
+ }
+
while(left > 0) {
for(i = 0; i < tree_width; i++) {
if((tree_width-i) >= left) {
@@ -3515,7 +3515,7 @@ extern void convert_num_unit(float num, char *buf, int buf_size, int orig_type)
num /= 1024;
orig_type++;
}
-
+
if(orig_type < UNIT_NONE || orig_type > UNIT_PETA)
orig_type = UNIT_UNKNOWN;
i = (int)num;
@@ -3533,20 +3533,20 @@ extern int revert_num_unit(const char *buf)
{
char *unit = "\0KMGP\0";
int i = 1, j = 0, number = 0;
-
+
if(!buf)
return -1;
j = strlen(buf) - 1;
while(unit[i]) {
- if(toupper((int)buf[j]) == unit[i])
+ if(toupper((int)buf[j]) == unit[i])
break;
i++;
}
-
+
number = atoi(buf);
- if(unit[i])
+ if(unit[i])
number *= (i*1024);
-
+
return number;
}
diff --git a/src/common/slurm_protocol_api.h b/src/common/slurm_protocol_api.h
index cc6e6bbaa788b4f65581197a3365c48a94bd5c0e..3d62caac55e55d24e702ed295a69484140f8a00a 100644
--- a/src/common/slurm_protocol_api.h
+++ b/src/common/slurm_protocol_api.h
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * slurm_protocol_api.h - high-level slurm communication functions
+ * slurm_protocol_api.h - high-level slurm communication functions
* definitions
*****************************************************************************
* Copyright (C) 2002-2006 The Regents of the University of California.
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Kevin Tew <tew1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -83,7 +83,7 @@ enum {
};
/**********************************************************************\
- * protocol configuration functions
+ * protocol configuration functions
\**********************************************************************/
/* slurm_set_api_config
@@ -172,7 +172,7 @@ uint16_t inline slurm_get_msg_timeout(void);
extern void slurm_api_set_conf_file(char *pathname);
/* slurm_api_set_default_config
- * called by the send_controller_msg function to insure that at least
+ * called by the send_controller_msg function to insure that at least
* the compiled in default slurm_protocol_config object is initialized
* RET int - return code
*/
@@ -189,7 +189,7 @@ void inline slurm_api_clear_config(void);
char *slurm_get_health_check_program(void);
/* slurm_get_plugin_dir
- * get plugin directory from slurmctld_conf object from slurmctld_conf object
+ * get plugin directory from slurmctld_conf object from slurmctld_conf object
* RET char * - plugin directory, MUST be xfreed by caller
*/
char *slurm_get_plugin_dir(void);
@@ -261,7 +261,7 @@ uint32_t slurm_get_priority_weight_qos(void);
uint16_t slurm_get_private_data(void);
/* slurm_get_state_save_location
- * get state_save_location from slurmctld_conf object from slurmctld_conf object
+ * get state_save_location from slurmctld_conf object from slurmctld_conf object
* RET char * - state_save_location directory, MUST be xfreed by caller
*/
char *slurm_get_state_save_location(void);
@@ -496,13 +496,13 @@ extern uint16_t slurm_get_sched_port(void);
uint16_t inline slurm_get_slurmd_port(void);
/* slurm_get_slurm_user_id
- * returns slurm uid from slurmctld_conf object
+ * returns slurm uid from slurmctld_conf object
* RET uint32_t - slurm user id
*/
uint32_t slurm_get_slurm_user_id(void);
/* slurm_get_slurmd_user_id
- * returns slurmd uid from slurmctld_conf object
+ * returns slurmd uid from slurmctld_conf object
* RET uint32_t - slurmd user id
*/
uint32_t slurm_get_slurmd_user_id(void);
@@ -562,7 +562,7 @@ uint16_t slurm_get_task_plugin_param(void);
* general message management functions used by slurmctld, slurmd
\**********************************************************************/
-/* In the socket implementation it creates a socket, binds to it, and
+/* In the socket implementation it creates a socket, binds to it, and
* listens for connections.
*
* IN port - port to bind the msg server to
@@ -570,7 +570,7 @@ uint16_t slurm_get_task_plugin_param(void);
*/
slurm_fd inline slurm_init_msg_engine_port(uint16_t port);
-/* In the socket implementation it creates a socket, binds to it, and
+/* In the socket implementation it creates a socket, binds to it, and
* listens for connections.
*
* IN addr_name - address to bind the msg server to (NULL means any)
@@ -580,14 +580,14 @@ slurm_fd inline slurm_init_msg_engine_port(uint16_t port);
slurm_fd inline slurm_init_msg_engine_addrname_port(char *addr_name,
uint16_t port);
-/* In the socket implementation it creates a socket, binds to it, and
+/* In the socket implementation it creates a socket, binds to it, and
* listens for connections.
- * IN slurm_address - slurm_addr to bind the msg server to
+ * IN slurm_address - slurm_addr to bind the msg server to
* RET slurm_fd - file descriptor of the connection created
*/
slurm_fd inline slurm_init_msg_engine(slurm_addr * slurm_address);
-/* In the bsd implmentation maps directly to a accept call
+/* In the bsd implmentation maps directly to a accept call
* IN open_fd - file descriptor to accept connection on
* OUT slurm_address - slurm_addr of the accepted connection
* RET slurm_fd - file descriptor of the connection created
@@ -595,7 +595,7 @@ slurm_fd inline slurm_init_msg_engine(slurm_addr * slurm_address);
slurm_fd inline slurm_accept_msg_conn(slurm_fd open_fd,
slurm_addr * slurm_address);
-/* In the bsd implmentation maps directly to a close call, to close
+/* In the bsd implmentation maps directly to a close call, to close
* the socket that was accepted
* IN open_fd - an open file descriptor to close
* RET int - the return code
@@ -631,14 +631,14 @@ int slurm_receive_msg(slurm_fd fd, slurm_msg_t *msg, int timeout);
/*
* Receive a slurm message on the open slurm descriptor "fd" waiting
* at most "timeout" seconds for the message data. If timeout is
- * zero, a default timeout is used. Memory is allocated for the
- * returned list and must be freed at some point using the
+ * zero, a default timeout is used. Memory is allocated for the
+ * returned list and must be freed at some point using the
* list_destroy function.
*
* IN open_fd - file descriptor to receive msg on
* IN steps - how many steps down the tree we have to wait for
* IN timeout - how long to wait in milliseconds
- * RET List - List containing the responses of the childern (if any) we
+ * RET List - List containing the responses of the childern (if any) we
* forwarded the message to. List containing type
* (ret_data_info_t). NULL is returned on failure. and
* errno set.
@@ -653,7 +653,7 @@ List slurm_receive_msgs(slurm_fd fd, int steps, int timeout);
* zero, a default timeout is used. The 'resp' is the actual message
* received and contains the ret_list of it's childern and the
* forward_structure_t containing information about it's childern
- * also. Memory is allocated for the returned msg and the returned
+ * also. Memory is allocated for the returned msg and the returned
* list both must be freed at some point using the
* slurm_free_functions and list_destroy function.
*
@@ -662,7 +662,7 @@ List slurm_receive_msgs(slurm_fd fd, int steps, int timeout);
* IN timeout - how long to wait in milliseconds
* RET int - returns 0 on success, -1 on failure and sets errno
*/
-int slurm_receive_msg_and_forward(slurm_fd fd, slurm_addr *orig_addr,
+int slurm_receive_msg_and_forward(slurm_fd fd, slurm_addr *orig_addr,
slurm_msg_t *resp, int timeout);
/**********************************************************************\
@@ -681,7 +681,7 @@ int slurm_send_node_msg(slurm_fd open_fd, slurm_msg_t *msg);
* msg connection establishment functions used by msg clients
\**********************************************************************/
-/* calls connect to make a connection-less datagram connection to the
+/* calls connect to make a connection-less datagram connection to the
* primary or secondary slurmctld message engine
* OUT addr - address of controller contacted
* RET slurm_fd - file descriptor of the connection created
@@ -696,10 +696,10 @@ slurm_fd inline slurm_open_controller_conn_spec(enum controller_id dest);
*/
void slurm_get_controller_addr_spec(enum controller_id dest, slurm_addr *addr);
-/* In the bsd socket implementation it creates a SOCK_STREAM socket
- * and calls connect on it a SOCK_DGRAM socket called with connect
- * is defined to only receive messages from the address/port pair
- * argument of the connect call slurm_address - for now it is
+/* In the bsd socket implementation it creates a SOCK_STREAM socket
+ * and calls connect on it a SOCK_DGRAM socket called with connect
+ * is defined to only receive messages from the address/port pair
+ * argument of the connect call slurm_address - for now it is
* really just a sockaddr_in
* IN slurm_address - slurm_addr of the connection destination
* RET slurm_fd - file descriptor of the connection created
@@ -725,10 +725,10 @@ int inline slurm_shutdown_msg_conn(slurm_fd open_fd);
slurm_fd inline slurm_listen_stream(slurm_addr * slurm_address);
/* slurm_accept_stream
- * accepts a incomming stream connection on a stream server slurm_fd
+ * accepts a incomming stream connection on a stream server slurm_fd
* IN open_fd - file descriptor to accept connection on
* OUT slurm_address - slurm_addr of the accepted connection
- * RET slurm_fd - file descriptor of the accepted connection
+ * RET slurm_fd - file descriptor of the accepted connection
*/
slurm_fd inline slurm_accept_stream(slurm_fd open_fd,
slurm_addr * slurm_address);
@@ -776,7 +776,7 @@ size_t inline slurm_read_stream_timeout(slurm_fd open_fd,
int timeout);
/* slurm_get_stream_addr
- * esentially a encapsilated get_sockname
+ * esentially a encapsilated get_sockname
* IN open_fd - file descriptor to retreive slurm_addr for
* OUT address - address that open_fd to bound to
*/
@@ -814,7 +814,7 @@ void reset_slurm_addr(slurm_addr * slurm_address, slurm_addr new_address);
* initializes the slurm_address with the supplied port and ip_address
* OUT slurm_address - slurm_addr to be filled in
* IN port - port in host order
- * IN host - hostname or dns name
+ * IN host - hostname or dns name
*/
void inline slurm_set_addr(slurm_addr * slurm_address,
uint16_t port, char *host);
@@ -830,12 +830,12 @@ void inline slurm_set_addr_any(slurm_addr * slurm_address, uint16_t port);
* initializes the slurm_address with the supplied port and host
* OUT slurm_address - slurm_addr to be filled in
* IN port - port in host order
- * IN host - hostname or dns name
+ * IN host - hostname or dns name
*/
void inline slurm_set_addr_char(slurm_addr * slurm_address,
uint16_t port, char *host);
-/* slurm_get_addr
+/* slurm_get_addr
* given a slurm_address it returns to port and hostname
* IN slurm_address - slurm_addr to be queried
* OUT port - port number
@@ -845,7 +845,7 @@ void inline slurm_set_addr_char(slurm_addr * slurm_address,
void inline slurm_get_addr(slurm_addr * slurm_address,
uint16_t * port, char *host, uint32_t buf_len);
-/* slurm_get_ip_str
+/* slurm_get_ip_str
* given a slurm_address it returns its port and ip address string
* IN slurm_address - slurm_addr to be queried
* OUT port - port number
@@ -913,13 +913,13 @@ int inline slurm_unpack_slurm_addr_array(slurm_addr ** slurm_address,
uint32_t * size_val, Buf buffer);
/**********************************************************************\
- * simplified communication routines
- * They open a connection do work then close the connection all within
+ * simplified communication routines
+ * They open a connection do work then close the connection all within
* the function
\**********************************************************************/
/* slurm_send_rc_msg
- * given the original request message this function sends a
+ * given the original request message this function sends a
* slurm_return_code message back to the client that made the request
* IN request_msg - slurm_msg the request msg
* IN rc - the return_code to send back to the client
@@ -927,7 +927,7 @@ int inline slurm_unpack_slurm_addr_array(slurm_addr ** slurm_address,
int slurm_send_rc_msg(slurm_msg_t * request_msg, int rc);
/* slurm_send_recv_controller_msg
- * opens a connection to the controller, sends the controller a message,
+ * opens a connection to the controller, sends the controller a message,
* listens for the response, then closes the connection
* IN request_msg - slurm_msg request
* OUT response_msg - slurm_msg response
@@ -938,14 +938,14 @@ int slurm_send_recv_controller_msg(slurm_msg_t * request_msg,
/* slurm_send_recv_node_msg
* opens a connection to node,
- * and sends the nodes a message, listens
+ * and sends the nodes a message, listens
* for the response, then closes the connections
* IN request_msg - slurm_msg request
* OUT response_msg - slurm_msg response
* RET int - returns 0 on success, -1 on failure and sets errno
*/
-int slurm_send_recv_node_msg(slurm_msg_t * request_msg,
- slurm_msg_t * response_msg,
+int slurm_send_recv_node_msg(slurm_msg_t * request_msg,
+ slurm_msg_t * response_msg,
int timeout);
/*
@@ -964,7 +964,7 @@ List slurm_send_recv_msgs(const char *nodelist, slurm_msg_t *msg, int timeout,
/*
* Send a message to msg->address
- * Then return List containing type (ret_data_info_t).
+ * Then return List containing type (ret_data_info_t).
* IN msg - a slurm_msg struct to be sent by the function
* IN name - the name of the node the message is being sent to
* IN timeout - how long to wait in milliseconds
@@ -975,7 +975,7 @@ List slurm_send_recv_msgs(const char *nodelist, slurm_msg_t *msg, int timeout,
List slurm_send_addr_recv_msgs(slurm_msg_t *msg, char *name, int timeout);
/*
- * Same as above, but only to one node
+ * Same as above, but only to one node
* returns 0 on success, -1 on failure and sets errno
*/
@@ -988,7 +988,7 @@ int slurm_send_recv_rc_msg_only_one(slurm_msg_t *req, int *rc, int timeout);
int slurm_send_recv_controller_rc_msg(slurm_msg_t *req, int *rc);
/* slurm_send_only_controller_msg
- * opens a connection to the controller, sends the node a message then,
+ * opens a connection to the controller, sends the node a message then,
* closes the connection
* IN request_msg - slurm_msg request
* RET int - return code
@@ -996,7 +996,7 @@ int slurm_send_recv_controller_rc_msg(slurm_msg_t *req, int *rc);
int slurm_send_only_controller_msg(slurm_msg_t * request_msg);
/* slurm_send_only_node_msg
- * opens a connection to node, sends the node a message then,
+ * opens a connection to node, sends the node a message then,
* closes the connection
* IN request_msg - slurm_msg request
* RET int - return code
@@ -1029,6 +1029,6 @@ extern int revert_num_unit(const char *buf);
* NOTE: free the response using slurm_free_job_step_create_response_msg
*/
extern int slurm_job_step_create (
- job_step_create_request_msg_t *slurm_step_alloc_req_msg,
+ job_step_create_request_msg_t *slurm_step_alloc_req_msg,
job_step_create_response_msg_t **slurm_step_alloc_resp_msg);
#endif
diff --git a/src/common/slurm_protocol_common.h b/src/common/slurm_protocol_common.h
index 8e97e99cc4f55e59e375c6be65ebbc51ed24ba07..a4e1482f8bc89f561d39ebed2faa1127fcbd10c2 100644
--- a/src/common/slurm_protocol_common.h
+++ b/src/common/slurm_protocol_common.h
@@ -1,37 +1,37 @@
/*****************************************************************************\
- * slurm_protocol_common.h - slurm communications definitions common to
+ * slurm_protocol_common.h - slurm communications definitions common to
* all protocols
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Kevin Tew <tew1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -56,13 +56,13 @@
#define SLURM_PROTOCOL_DEFAULT_LISTEN_BACKLOG 128
/* used in interface methods */
-#define SLURM_PROTOCOL_FUNCTION_NOT_IMPLEMENTED -2
+#define SLURM_PROTOCOL_FUNCTION_NOT_IMPLEMENTED -2
/* max slurm message send and receive buffer size
* this may need to be increased to 350k-512k */
#define SLURM_PROTOCOL_MAX_MESSAGE_BUFFER_SIZE (512*1024)
-/* slurm protocol header defines, based upon config.h, 16 bits */
+/* slurm protocol header defines, based upon config.h, 16 bits */
/* A new SLURM_PROTOCOL_VERSION needs to be made each time the version
* changes so the slurmdbd can talk all versions for update messages.
* In slurm_protocol_util.h check_header_version(), and init_header()
@@ -72,7 +72,7 @@
#define SLURM_1_3_PROTOCOL_VERSION ((13 << 8) | 0)
/* used to set flags to empty */
-#define SLURM_PROTOCOL_NO_FLAGS 0
+#define SLURM_PROTOCOL_NO_FLAGS 0
#define SLURM_GLOBAL_AUTH_KEY 1
#if MONGO_IMPLEMENTATION
diff --git a/src/common/slurm_protocol_defs.c b/src/common/slurm_protocol_defs.c
index 7137790ed13927f2d8c904550cd4a96a3dae4555..fc02bc4d854afa289d5229c12e7e9bd9d104676e 100644
--- a/src/common/slurm_protocol_defs.c
+++ b/src/common/slurm_protocol_defs.c
@@ -1,6 +1,6 @@
/*****************************************************************************\
- * slurm_protocol_defs.c - functions for initializing and releasing
- * storage for RPC data structures. these are the functions used by
+ * slurm_protocol_defs.c - functions for initializing and releasing
+ * storage for RPC data structures. these are the functions used by
* the slurm daemons directly, not for user client use.
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
@@ -8,32 +8,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Kevin Tew <tew1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -79,7 +79,7 @@ static void _slurm_free_job_step_info_members (job_step_info_t * msg);
static void _make_lower(char *change);
/*
- * slurm_msg_t_init - initialize a slurm message
+ * slurm_msg_t_init - initialize a slurm message
* OUT msg - pointer to the slurm_msg_t structure which will be initialized
*/
extern void slurm_msg_t_init(slurm_msg_t *msg)
@@ -91,7 +91,7 @@ extern void slurm_msg_t_init(slurm_msg_t *msg)
forward_init(&msg->forward, NULL);
- return;
+ return;
}
/*
@@ -108,8 +108,8 @@ extern void slurm_msg_t_copy(slurm_msg_t *dest, slurm_msg_t *src)
dest->forward = src->forward;
dest->ret_list = src->ret_list;
dest->forward_struct = src->forward_struct;
- dest->orig_addr.sin_addr.s_addr = 0;
- return;
+ dest->orig_addr.sin_addr.s_addr = 0;
+ return;
}
extern void slurm_destroy_char(void *object)
@@ -157,7 +157,7 @@ extern int slurm_addto_char_list(List char_list, char *names)
name = xmalloc((i-start+1));
memcpy(name, names+start, (i-start));
//info("got %s %d", name, i-start);
-
+
while((tmp_char = list_next(itr))) {
if(!strcasecmp(tmp_char, name))
break;
@@ -167,16 +167,16 @@ extern int slurm_addto_char_list(List char_list, char *names)
This is needed for get associations
with qos.
*/
- if(tmp_char)
+ if(tmp_char)
list_delete_item(itr);
- else
+ else
count++;
-
+
_make_lower(name);
list_append(char_list, name);
-
+
list_iterator_reset(itr);
-
+
i++;
start = i;
if(!names[i]) {
@@ -195,23 +195,23 @@ extern int slurm_addto_char_list(List char_list, char *names)
if(!strcasecmp(tmp_char, name))
break;
}
-
+
/* If we get a duplicate remove the
first one and tack this on the end.
This is needed for get associations
with qos.
*/
- if(tmp_char)
+ if(tmp_char)
list_delete_item(itr);
- else
+ else
count++;
-
+
_make_lower(name);
list_append(char_list, name);
- }
+ }
list_iterator_destroy(itr);
return count;
-}
+}
extern int slurm_sort_char_list_asc(char *name_a, char *name_b)
{
@@ -221,7 +221,7 @@ extern int slurm_sort_char_list_asc(char *name_a, char *name_b)
return -1;
else if (diff > 0)
return 1;
-
+
return 0;
}
@@ -233,7 +233,7 @@ extern int slurm_sort_char_list_desc(char *name_a, char *name_b)
return -1;
else if (diff < 0)
return 1;
-
+
return 0;
}
@@ -566,7 +566,7 @@ void slurm_free_task_exit_msg(task_exit_msg_t * msg)
void slurm_free_launch_tasks_request_msg(launch_tasks_request_msg_t * msg)
{
int i;
-
+
if (msg == NULL)
return;
@@ -1281,10 +1281,10 @@ extern char *conn_type_string(enum connection_type conn_type)
extern char* node_use_string(enum node_use_type node_use)
{
switch (node_use) {
- case (SELECT_COPROCESSOR_MODE):
- return "COPROCESSOR";
- case (SELECT_VIRTUAL_NODE_MODE):
- return "VIRTUAL";
+ case (SELECT_COPROCESSOR_MODE):
+ return "COPROCESSOR";
+ case (SELECT_VIRTUAL_NODE_MODE):
+ return "VIRTUAL";
default:
break;
}
@@ -1299,10 +1299,10 @@ extern char *bg_block_state_string(uint16_t state)
#ifdef HAVE_BG
switch ((rm_partition_state_t)state) {
#ifdef HAVE_BGL
- case RM_PARTITION_BUSY:
+ case RM_PARTITION_BUSY:
return "BUSY";
#else
- case RM_PARTITION_REBOOTING:
+ case RM_PARTITION_REBOOTING:
return "REBOOTING";
#endif
case RM_PARTITION_CONFIGURING:
@@ -1330,7 +1330,7 @@ extern char *bg_block_state_string(uint16_t state)
* IN msg - pointer to allocation response message
* NOTE: buffer is loaded by slurm_allocate_resources
*/
-void slurm_free_resource_allocation_response_msg (
+void slurm_free_resource_allocation_response_msg (
resource_allocation_response_msg_t * msg)
{
if (msg) {
@@ -1343,7 +1343,7 @@ void slurm_free_resource_allocation_response_msg (
}
/*
- * slurm_free_sbcast_cred_msg - free slurm resource allocation response
+ * slurm_free_sbcast_cred_msg - free slurm resource allocation response
* message including an sbcast credential
* IN msg - pointer to response message from slurm_sbcast_lookup()
* NOTE: buffer is loaded by slurm_allocate_resources
@@ -1378,7 +1378,7 @@ void slurm_free_job_alloc_info_response_msg(job_alloc_info_response_msg_t *msg)
/*
- * slurm_free_job_step_create_response_msg - free slurm
+ * slurm_free_job_step_create_response_msg - free slurm
* job step create response message
* IN msg - pointer to job step create response message
* NOTE: buffer is loaded by slurm_job_step_create
@@ -1400,7 +1400,7 @@ void slurm_free_job_step_create_response_msg(
/*
- * slurm_free_submit_response_response_msg - free slurm
+ * slurm_free_submit_response_response_msg - free slurm
* job submit response message
* IN msg - pointer to job submit response message
* NOTE: buffer is loaded by slurm_submit_batch_job
@@ -1463,7 +1463,7 @@ void slurm_free_ctl_conf(slurm_ctl_conf_info_msg_t * config_ptr)
xfree(config_ptr->sched_params);
xfree(config_ptr->schedtype);
xfree(config_ptr->select_type);
- if(config_ptr->select_conf_key_pairs)
+ if(config_ptr->select_conf_key_pairs)
list_destroy((List)config_ptr->select_conf_key_pairs);
xfree(config_ptr->slurm_conf);
xfree(config_ptr->slurm_user_name);
@@ -1536,7 +1536,7 @@ static void _free_all_job_info(job_info_msg_t *msg)
}
/*
- * slurm_free_job_step_info_response_msg - free the job step
+ * slurm_free_job_step_info_response_msg - free the job step
* information response message
* IN msg - pointer to job step information response message
* NOTE: buffer is loaded by slurm_get_job_steps.
@@ -1602,8 +1602,8 @@ static void _free_all_node_info(node_info_msg_t *msg)
if ((msg == NULL) ||
(msg->node_array == NULL))
return;
-
- for (i = 0; i < msg->record_count; i++)
+
+ for (i = 0; i < msg->record_count; i++)
_slurm_free_node_info_members(&msg->node_array[i]);
}
@@ -1621,7 +1621,7 @@ static void _slurm_free_node_info_members(node_info_t * node)
/*
- * slurm_free_partition_info_msg - free the partition information
+ * slurm_free_partition_info_msg - free the partition information
* response message
* IN msg - pointer to partition information response message
* NOTE: buffer is loaded by slurm_load_partitions
@@ -1663,7 +1663,7 @@ static void _slurm_free_partition_info_members(partition_info_t * part)
}
/*
- * slurm_free_reserve_info_msg - free the reservation information
+ * slurm_free_reserve_info_msg - free the reservation information
* response message
* IN msg - pointer to reservation information response message
* NOTE: buffer is loaded by slurm_load_reservation
@@ -1708,7 +1708,7 @@ static void _slurm_free_reserve_info_members(reserve_info_t * resv)
}
/*
- * slurm_free_topo_info_msg - free the switch topology configuration
+ * slurm_free_topo_info_msg - free the switch topology configuration
* information response message
* IN msg - pointer to switch topology configuration response message
* NOTE: buffer is loaded by slurm_load_topo.
@@ -1776,11 +1776,11 @@ void slurm_free_set_debug_level_msg(set_debug_level_msg_t *msg)
xfree(msg);
}
-void inline slurm_destroy_association_shares_object(void *object)
+void inline slurm_destroy_association_shares_object(void *object)
{
- association_shares_object_t *obj_ptr =
+ association_shares_object_t *obj_ptr =
(association_shares_object_t *)object;
-
+
if(obj_ptr) {
xfree(obj_ptr->cluster);
xfree(obj_ptr->name);
@@ -1904,7 +1904,7 @@ extern int slurm_free_msg_data(slurm_msg_type_t type, void *data)
case REQUEST_UPDATE_PARTITION:
slurm_free_update_part_msg(data);
break;
- case REQUEST_DELETE_PARTITION:
+ case REQUEST_DELETE_PARTITION:
slurm_free_delete_part_msg(data);
break;
case REQUEST_CREATE_RESERVATION:
@@ -1912,7 +1912,7 @@ extern int slurm_free_msg_data(slurm_msg_type_t type, void *data)
slurm_free_resv_desc_msg(data);
break;
case REQUEST_DELETE_RESERVATION:
- case RESPONSE_CREATE_RESERVATION:
+ case RESPONSE_CREATE_RESERVATION:
slurm_free_resv_name_msg(data);
break;
case REQUEST_RESERVATION_INFO:
@@ -1977,13 +1977,13 @@ extern int slurm_free_msg_data(slurm_msg_type_t type, void *data)
break;
case REQUEST_KILL_TIMELIMIT:
slurm_free_timelimit_msg(data);
- break;
+ break;
case REQUEST_REATTACH_TASKS:
slurm_free_reattach_tasks_request_msg(data);
break;
case RESPONSE_REATTACH_TASKS:
slurm_free_reattach_tasks_response_msg(data);
- break;
+ break;
case REQUEST_SIGNAL_JOB:
slurm_free_signal_job_msg(data);
break;
@@ -2006,8 +2006,8 @@ extern int slurm_free_msg_data(slurm_msg_type_t type, void *data)
case REQUEST_SET_DEBUG_LEVEL:
slurm_free_set_debug_level_msg(data);
break;
- case SLURM_SUCCESS:
- case REQUEST_PING:
+ case SLURM_SUCCESS:
+ case REQUEST_PING:
case REQUEST_RECONFIGURE:
case REQUEST_CONTROL:
case REQUEST_TAKEOVER:
@@ -2027,7 +2027,7 @@ extern int slurm_free_msg_data(slurm_msg_type_t type, void *data)
break;
default:
error("invalid type trying to be freed %u", type);
- break;
+ break;
}
return SLURM_SUCCESS;
}
@@ -2060,7 +2060,7 @@ extern uint32_t slurm_get_return_code(slurm_msg_type_t type, void *data)
break;
default:
error("don't know the rc for type %u returning %u", type, rc);
- break;
+ break;
}
return rc;
}
@@ -2089,7 +2089,7 @@ static void _make_lower(char *change)
/* Validate SPANK specified job environment does not contain any invalid
* names. Log failures using info() */
-extern bool valid_spank_job_env(char **spank_job_env,
+extern bool valid_spank_job_env(char **spank_job_env,
uint32_t spank_job_env_size, uid_t uid)
{
int i;
diff --git a/src/common/slurm_protocol_defs.h b/src/common/slurm_protocol_defs.h
index a66088600ad341c034f2a2c2d708866b51c9698e..41672cb292974d3a1a021b22e7c3181da5e4e88c 100644
--- a/src/common/slurm_protocol_defs.h
+++ b/src/common/slurm_protocol_defs.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Kevin Tew <tew1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -40,7 +40,7 @@
#ifndef _SLURM_PROTOCOL_DEFS_H
#define _SLURM_PROTOCOL_DEFS_H
-#if HAVE_CONFIG_H
+#if HAVE_CONFIG_H
# include "config.h"
# if HAVE_INTTYPES_H
# include <inttypes.h>
@@ -162,7 +162,7 @@ typedef enum {
REQUEST_SET_DEBUG_LEVEL,
REQUEST_HEALTH_CHECK,
REQUEST_TAKEOVER,
-
+
REQUEST_BUILD_INFO = 2001,
RESPONSE_BUILD_INFO,
REQUEST_JOB_INFO,
@@ -299,7 +299,7 @@ typedef enum {
} slurm_credential_type_t;
/*****************************************************************************\
- * core api configuration struct
+ * core api configuration struct
\*****************************************************************************/
typedef struct forward {
uint16_t cnt; /* number of nodes to forward to */
@@ -318,7 +318,7 @@ typedef struct slurm_protocol_header {
uint32_t body_length;
uint16_t ret_cnt;
forward_t forward;
- slurm_addr orig_addr;
+ slurm_addr orig_addr;
List ret_list;
} header_t;
@@ -352,7 +352,7 @@ typedef struct slurm_msg {
uint16_t msg_type; /* really a slurm_msg_type_t but needs to be
* this way for packing purposes. message type */
uint16_t flags;
- slurm_addr address;
+ slurm_addr address;
slurm_fd conn_fd;
void *auth_cred;
void *data;
@@ -361,7 +361,7 @@ typedef struct slurm_msg {
/* The following were all added for the forward.c code */
forward_t forward;
forward_struct_t *forward_struct;
- slurm_addr orig_addr;
+ slurm_addr orig_addr;
List ret_list;
} slurm_msg_t;
@@ -370,7 +370,7 @@ typedef struct ret_data_info {
* this way for packing purposes. message type */
uint32_t err;
char *node_name;
- void *data; /* used to hold the return message data (i.e.
+ void *data; /* used to hold the return message data (i.e.
return_code_msg_t */
} ret_data_info_t;
@@ -574,10 +574,10 @@ typedef struct job_step_specs {
typedef struct job_step_create_response_msg {
uint32_t job_step_id; /* assigned job step id */
char *resv_ports; /* reserved ports */
- slurm_step_layout_t *step_layout; /* information about how the
+ slurm_step_layout_t *step_layout; /* information about how the
* step is laid out */
slurm_cred_t *cred; /* slurm job credential */
- switch_jobinfo_t *switch_job; /* switch context, opaque
+ switch_jobinfo_t *switch_job; /* switch context, opaque
* data structure */
} job_step_create_response_msg_t;
@@ -611,8 +611,8 @@ typedef struct launch_tasks_request_msg {
uint16_t task_dist; /* --distribution=, -m dist */
uint16_t task_flags;
uint32_t **global_task_ids;
- slurm_addr orig_addr; /* where message really came from for io */
-
+ slurm_addr orig_addr; /* where message really came from for io */
+
uint16_t user_managed_io; /* 0 for "normal" IO,
1 for "user manged" IO */
uint8_t open_mode; /* stdout/err append or truncate */
@@ -657,10 +657,10 @@ typedef struct return_code_msg {
/* Note: We include the node list here for reliable cleanup on XCPU systems.
*
- * Note: We include select_jobinfo here in addition to the job launch
+ * Note: We include select_jobinfo here in addition to the job launch
* RPC in order to insure reliable clean-up of a BlueGene partition in
- * the event of some launch failure or race condition preventing slurmd
- * from getting the MPIRUN_PARTITION at that time. It is needed for
+ * the event of some launch failure or race condition preventing slurmd
+ * from getting the MPIRUN_PARTITION at that time. It is needed for
* the job epilog. */
#define SIG_TIME_LIMIT 996 /* Dummy signal value i time limit reached */
#define SIG_ABORT 997 /* Dummy signal value to abort a job */
@@ -732,7 +732,7 @@ typedef struct batch_job_launch_msg {
uint32_t argc;
char **argv;
uint32_t envc; /* element count in environment */
- char **environment; /* environment variables to set for job,
+ char **environment; /* environment variables to set for job,
* name=value pairs, one per line */
select_jobinfo_t *select_jobinfo; /* opaque data type */
slurm_cred_t *cred;
@@ -766,7 +766,7 @@ typedef struct checkpoint_msg {
uint16_t data; /* operation specific data */
uint32_t job_id; /* slurm job_id */
uint32_t step_id; /* slurm step_id */
- char *image_dir; /* locate to store the context images.
+ char *image_dir; /* locate to store the context images.
* NULL for default */
} checkpoint_msg_t;
@@ -818,7 +818,7 @@ typedef struct file_bcast_msg {
sbcast_cred_t *cred; /* credential for the RPC */
uint32_t block_len; /* length of this data block */
char *block; /* data for this block */
-} file_bcast_msg_t;
+} file_bcast_msg_t;
typedef struct multi_core_data {
uint16_t min_sockets; /* minimum number of sockets per node required
@@ -885,7 +885,7 @@ typedef struct slurm_ctl_conf slurm_ctl_conf_info_msg_t;
\*****************************************************************************/
/*
- * slurm_msg_t_init - initialize a slurm message
+ * slurm_msg_t_init - initialize a slurm message
* OUT msg - pointer to the slurm_msg_t structure which will be initialized
*/
extern void slurm_msg_t_init (slurm_msg_t *msg);
@@ -959,19 +959,19 @@ void inline
slurm_free_job_step_create_request_msg(job_step_create_request_msg_t * msg);
void inline
slurm_free_job_step_create_response_msg(job_step_create_response_msg_t *msg);
-void inline
+void inline
slurm_free_complete_job_allocation_msg(complete_job_allocation_msg_t * msg);
void inline
slurm_free_complete_batch_script_msg(complete_batch_script_msg_t * msg);
-void inline
+void inline
slurm_free_launch_tasks_request_msg(launch_tasks_request_msg_t * msg);
-void inline
+void inline
slurm_free_launch_tasks_response_msg(launch_tasks_response_msg_t * msg);
void inline slurm_free_task_user_managed_io_stream_msg(
task_user_managed_io_msg_t *msg);
void inline slurm_free_task_exit_msg(task_exit_msg_t * msg);
void inline slurm_free_kill_tasks_msg(kill_tasks_msg_t * msg);
-void inline
+void inline
slurm_free_reattach_tasks_request_msg(reattach_tasks_request_msg_t * msg);
void inline
slurm_free_reattach_tasks_response_msg(reattach_tasks_response_msg_t * msg);
@@ -1037,7 +1037,7 @@ extern char *bg_block_state_string(uint16_t state);
/* Validate SPANK specified job environment does not contain any invalid
* names. Log failures using info() */
-extern bool valid_spank_job_env(char **spank_job_env,
+extern bool valid_spank_job_env(char **spank_job_env,
uint32_t spank_job_env_size, uid_t uid);
/* user needs to xfree after */
diff --git a/src/common/slurm_protocol_interface.h b/src/common/slurm_protocol_interface.h
index 22280876f54f7f44a354f0e4641f0763ba997081..5760a4e271019b30ef42c69e58fb0b6f6659b499 100644
--- a/src/common/slurm_protocol_interface.h
+++ b/src/common/slurm_protocol_interface.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Chris Dunlap <cdunlap@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -81,20 +81,20 @@
** Data Types **
\****************/
-typedef enum slurm_socket_type {
- SLURM_MESSAGE ,
- SLURM_STREAM
+typedef enum slurm_socket_type {
+ SLURM_MESSAGE ,
+ SLURM_STREAM
} slurm_socket_type_t;
/*******************************\
** MIDDLE LAYER FUNCTIONS **
\*******************************/
-/* The must have funtions are required to implement a low level plugin
- * for the slurm protocol the general purpose functions just wrap
- * standard socket calls, so if the underlying layer implements a
- * socket like interface, it can be used as a low level transport
- * plugin with slurm the _slurm_recv and _slurm_send functions are
+/* The must have funtions are required to implement a low level plugin
+ * for the slurm protocol the general purpose functions just wrap
+ * standard socket calls, so if the underlying layer implements a
+ * socket like interface, it can be used as a low level transport
+ * plugin with slurm the _slurm_recv and _slurm_send functions are
* also needed
*/
@@ -113,7 +113,7 @@ slurm_fd _slurm_create_socket (slurm_socket_type_t type) ;
/*****************/
/* _slurm_init_msg_engine
- * In the socket implementation it creates a socket, binds to it, and
+ * In the socket implementation it creates a socket, binds to it, and
* listens for connections.
* IN slurm_address - address to bind to
* RET file descriptor
@@ -121,10 +121,10 @@ slurm_fd _slurm_create_socket (slurm_socket_type_t type) ;
slurm_fd _slurm_init_msg_engine ( slurm_addr * slurm_address ) ;
/* _slurm_open_msg_conn
- * In the bsd socket implementation it creates a SOCK_STREAM socket
- * and calls connect on it a SOCK_DGRAM socket called with connect
- * is defined to only receive messages from the address/port pair
- * argument of the connect call slurm_address - for now it is
+ * In the bsd socket implementation it creates a SOCK_STREAM socket
+ * and calls connect on it a SOCK_DGRAM socket called with connect
+ * is defined to only receive messages from the address/port pair
+ * argument of the connect call slurm_address - for now it is
* really just a sockaddr_in
* IN slurm_address - address to bind to
* RET file descriptor
@@ -141,14 +141,14 @@ slurm_fd _slurm_open_msg_conn ( slurm_addr * slurm_address ) ;
*
* RET number of bytes read
*/
-ssize_t _slurm_msg_recvfrom(slurm_fd fd, char **pbuf, size_t *buflen,
+ssize_t _slurm_msg_recvfrom(slurm_fd fd, char **pbuf, size_t *buflen,
uint32_t flags);
/* _slurm_msg_recvfrom_timeout reads len bytes from file descriptor fd
* timing out after `timeout' milliseconds.
*
- */
-ssize_t _slurm_msg_recvfrom_timeout(slurm_fd fd, char **buf, size_t *len,
+ */
+ssize_t _slurm_msg_recvfrom_timeout(slurm_fd fd, char **buf, size_t *len,
uint32_t flags, int timeout);
/* _slurm_msg_sendto
@@ -159,25 +159,25 @@ ssize_t _slurm_msg_recvfrom_timeout(slurm_fd fd, char **buf, size_t *len,
* IN flags - communication specific flags
* RET number of bytes written
*/
-ssize_t _slurm_msg_sendto ( slurm_fd open_fd, char *buffer ,
+ssize_t _slurm_msg_sendto ( slurm_fd open_fd, char *buffer ,
size_t size , uint32_t flags ) ;
/* _slurm_msg_sendto_timeout is identical to _slurm_msg_sendto except
* IN timeout - maximum time to wait for a message in milliseconds */
-ssize_t _slurm_msg_sendto_timeout ( slurm_fd open_fd, char *buffer ,
+ssize_t _slurm_msg_sendto_timeout ( slurm_fd open_fd, char *buffer ,
size_t size , uint32_t flags, int timeout ) ;
/* _slurm_accept_msg_conn
- * In the bsd implmentation maps directly to a accept call
+ * In the bsd implmentation maps directly to a accept call
* IN open_fd - file descriptor to accept connection on
* OUT slurm_address - slurm_addr of the accepted connection
* RET slurm_fd - file descriptor of the connection created
*/
-slurm_fd _slurm_accept_msg_conn ( slurm_fd open_fd ,
+slurm_fd _slurm_accept_msg_conn ( slurm_fd open_fd ,
slurm_addr * slurm_address ) ;
/* _slurm_close_accepted_conn
- * In the bsd implmentation maps directly to a close call, to close
+ * In the bsd implmentation maps directly to a close call, to close
* the socket that was accepted
* IN open_fd - an open file descriptor to close
* RET int - the return code
@@ -196,12 +196,12 @@ int _slurm_close_accepted_conn ( slurm_fd open_fd ) ;
slurm_fd _slurm_listen_stream ( slurm_addr * slurm_address ) ;
/* _slurm_accept_stream
- * accepts a incomming stream connection on a stream server slurm_fd
+ * accepts a incomming stream connection on a stream server slurm_fd
* IN open_fd - file descriptor to accept connection on
* OUT slurm_address - slurm_addr of the accepted connection
- * RET slurm_fd - file descriptor of the accepted connection
+ * RET slurm_fd - file descriptor of the accepted connection
*/
-slurm_fd _slurm_accept_stream ( slurm_fd open_fd ,
+slurm_fd _slurm_accept_stream ( slurm_fd open_fd ,
slurm_addr * slurm_address ) ;
/* _slurm_open_stream
@@ -214,11 +214,11 @@ slurm_fd _slurm_accept_stream ( slurm_fd open_fd ,
slurm_fd _slurm_open_stream ( slurm_addr * slurm_address, bool retry ) ;
/* _slurm_get_stream_addr
- * esentially a encapsilated get_sockname
+ * esentially a encapsilated get_sockname
* IN open_fd - file descriptor to retreive slurm_addr for
* OUT address - address that open_fd to bound to
*/
-extern int _slurm_get_stream_addr ( slurm_fd open_fd ,
+extern int _slurm_get_stream_addr ( slurm_fd open_fd ,
slurm_addr * address ) ;
/* _slurm_close_stream
@@ -236,33 +236,33 @@ extern int _slurm_close_stream ( slurm_fd open_fd ) ;
extern inline int _slurm_set_stream_non_blocking ( slurm_fd open_fd ) ;
extern inline int _slurm_set_stream_blocking ( slurm_fd open_fd ) ;
-int _slurm_send_timeout ( slurm_fd open_fd, char *buffer ,
+int _slurm_send_timeout ( slurm_fd open_fd, char *buffer ,
size_t size , uint32_t flags, int timeout ) ;
-int _slurm_recv_timeout ( slurm_fd open_fd, char *buffer ,
+int _slurm_recv_timeout ( slurm_fd open_fd, char *buffer ,
size_t size , uint32_t flags, int timeout ) ;
-
+
/***************************/
/* slurm address functions */
/***************************/
/* build a slurm address bassed upon ip address and port number
* OUT slurm_address - the constructed slurm_address
- * IN port - port to be used
+ * IN port - port to be used
* IN ip_address - the IP address to connect with
*/
-extern void _slurm_set_addr_uint ( slurm_addr * slurm_address ,
+extern void _slurm_set_addr_uint ( slurm_addr * slurm_address ,
uint16_t port , uint32_t ip_address ) ;
/* resets the address field of a slurm_addr, port and family are unchanged */
-extern void _reset_slurm_addr ( slurm_addr * slurm_address ,
+extern void _reset_slurm_addr ( slurm_addr * slurm_address ,
slurm_addr new_address );
/* build a slurm address bassed upon host name and port number
* OUT slurm_address - the constructed slurm_address
- * IN port - port to be used
+ * IN port - port to be used
* IN host - name of host to connect with
*/
-extern void _slurm_set_addr_char ( slurm_addr * slurm_address ,
+extern void _slurm_set_addr_char ( slurm_addr * slurm_address ,
uint16_t port , char * host ) ;
/* given a slurm_address it returns its port and hostname
@@ -271,8 +271,8 @@ extern void _slurm_set_addr_char ( slurm_addr * slurm_address ,
* OUT host - hostname
* IN buf_len - length of hostname buffer
*/
-extern void _slurm_get_addr ( slurm_addr * slurm_address ,
- uint16_t * port , char * host ,
+extern void _slurm_get_addr ( slurm_addr * slurm_address ,
+ uint16_t * port , char * host ,
uint32_t buf_len ) ;
/* prints a slurm_addr into a buf
@@ -280,15 +280,15 @@ extern void _slurm_get_addr ( slurm_addr * slurm_address ,
* IN buf - space for string representation of slurm_addr
* IN n - max number of bytes to write (including NUL)
*/
-extern void _slurm_print_slurm_addr ( slurm_addr * address,
+extern void _slurm_print_slurm_addr ( slurm_addr * address,
char *buf, size_t n ) ;
/*****************************/
/* slurm addr pack functions */
/*****************************/
-extern void _slurm_pack_slurm_addr ( slurm_addr * slurm_address ,
+extern void _slurm_pack_slurm_addr ( slurm_addr * slurm_address ,
Buf buffer ) ;
-extern int _slurm_unpack_slurm_addr_no_alloc (
+extern int _slurm_unpack_slurm_addr_no_alloc (
slurm_addr * slurm_address , Buf buffer ) ;
@@ -309,14 +309,14 @@ extern int _slurm_socketpair (int __domain, int __type, int __protocol,
int __fds[2]) ;
/* Give the socket FD the local address ADDR (which is LEN bytes long). */
-extern int _slurm_bind (int __fd, struct sockaddr const * __addr,
+extern int _slurm_bind (int __fd, struct sockaddr const * __addr,
socklen_t __len) ;
/* Open a connection on socket FD to peer at ADDR (which LEN bytes long).
* For connectionless socket types, just set the default address to send to
* and the only address from which to accept transmissions.
* Return 0 on success, -1 for errors. */
-extern int _slurm_connect (int __fd, struct sockaddr const * __addr,
+extern int _slurm_connect (int __fd, struct sockaddr const * __addr,
socklen_t __len) ;
/* Prepare to accept connections on socket FD.
@@ -329,20 +329,20 @@ extern int _slurm_listen (int __fd, int __n) ;
* set *ADDR (which is *ADDR_LEN bytes long) to the address of the connecting
* peer and *ADDR_LEN to the address's actual length, and return the
* new socket's descriptor, or -1 for errors. */
-extern int _slurm_accept (int __fd, struct sockaddr * __addr,
+extern int _slurm_accept (int __fd, struct sockaddr * __addr,
socklen_t *__restrict __addr_len) ;
/* Put the local address of FD into *ADDR and its length in *LEN. */
-extern int _slurm_getsockname (int __fd, struct sockaddr * __addr,
+extern int _slurm_getsockname (int __fd, struct sockaddr * __addr,
socklen_t *__restrict __len) ;
/* Put the address of the peer connected to socket FD into *ADDR
* (which is *LEN bytes long), and its actual length into *LEN. */
-extern int _slurm_getpeername (int __fd, struct sockaddr * __addr,
+extern int _slurm_getpeername (int __fd, struct sockaddr * __addr,
socklen_t *__restrict __len) ;
/* Send N bytes of BUF to socket FD. Returns the number sent or -1. */
-extern ssize_t _slurm_send (int __fd, __const void *__buf,
+extern ssize_t _slurm_send (int __fd, __const void *__buf,
size_t __n, int __flags) ;
extern ssize_t _slurm_write (int __fd, __const void *__buf, size_t __n) ;
@@ -353,39 +353,39 @@ extern ssize_t _slurm_read (int __fd, void *__buf, size_t __n) ;
/* Send N bytes of BUF on socket FD to peer at address ADDR (which is
* ADDR_LEN bytes long). Returns the number sent, or -1 for errors. */
-extern ssize_t _slurm_sendto (int __fd, __const void *__buf, size_t __n,
- int __flags, struct sockaddr const * __addr,
+extern ssize_t _slurm_sendto (int __fd, __const void *__buf, size_t __n,
+ int __flags, struct sockaddr const * __addr,
socklen_t __addr_len) ;
/* Send a msg described MESSAGE on socket FD.
* Returns the number of bytes sent, or -1 for errors. */
-extern ssize_t _slurm_sendmsg (int __fd, __const struct msghdr *__msg,
+extern ssize_t _slurm_sendmsg (int __fd, __const struct msghdr *__msg,
int __flags) ;
/* Read N bytes into BUF through socket FD.
* If ADDR is not NULL, fill in *ADDR_LEN bytes of it with tha address of
* the sender, and store the actual size of the address in *ADDR_LEN.
* Returns the number of bytes read or -1 for errors. */
-extern ssize_t _slurm_recvfrom (int __fd, void *__restrict __buf,
- size_t __n, int __flags, struct sockaddr * __addr,
+extern ssize_t _slurm_recvfrom (int __fd, void *__restrict __buf,
+ size_t __n, int __flags, struct sockaddr * __addr,
socklen_t *__restrict __addr_len) ;
/* Send a msg described MESSAGE on socket FD.
* Returns the number of bytes read or -1 for errors. */
-extern ssize_t _slurm_recvmsg (int __fd, struct msghdr *__msg,
+extern ssize_t _slurm_recvmsg (int __fd, struct msghdr *__msg,
int __flags) ;
/* Put the current value for socket FD's option OPTNAME at protocol level LEVEL
* into OPTVAL (which is *OPTLEN bytes long), and set *OPTLEN to the value's
* actual length. Returns 0 on success, -1 for errors. */
-extern int _slurm_getsockopt (int __fd, int __level, int __optname,
- void *__restrict __optval,
+extern int _slurm_getsockopt (int __fd, int __level, int __optname,
+ void *__restrict __optval,
socklen_t *__restrict __optlen) ;
/* Set socket FD's option OPTNAME at protocol level LEVEL
* to *OPTVAL (which is OPTLEN bytes long).
* Returns 0 on success, -1 for errors. */
-extern int _slurm_setsockopt (int __fd, int __level, int __optname,
+extern int _slurm_setsockopt (int __fd, int __level, int __optname,
__const void *__optval, socklen_t __optlen) ;
/* Shut down all or part of the connection open on socket FD.
diff --git a/src/common/slurm_protocol_mongo_common.h b/src/common/slurm_protocol_mongo_common.h
index b94a891a8e0c11bf0b7c67fedca5b59d8d483f4f..b0d377f1b9a9c5e0b46b3d01dc70cb537a7fc374 100644
--- a/src/common/slurm_protocol_mongo_common.h
+++ b/src/common/slurm_protocol_mongo_common.h
@@ -1,38 +1,38 @@
/*****************************************************************************\
- * slurm_protocol_mongo_common.h - alternative communications protocol to
+ * slurm_protocol_mongo_common.h - alternative communications protocol to
* TCP sockets. As of 11/18/2002 it is unclear that this communications
* protocol will be fully developed.
****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Kevin Tew <tew1@llnl.gov>
+ * Written by Kevin Tew <tew1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -60,25 +60,25 @@
#define SLURM_INADDR_ANY 0x00000000
/* LINUX SPECIFIC */
-/* this is the slurm equivalent of the operating system file descriptor,
+/* this is the slurm equivalent of the operating system file descriptor,
* which in linux is just an int */
typedef uint32_t slurm_fd ;
/* this is the slurm equivalent of the BSD sockets sockaddr */
-typedef struct mongo_addr_t slurm_addr ;
+typedef struct mongo_addr_t slurm_addr ;
/* this is the slurm equivalent of the BSD sockets fd_set */
typedef fd_set slurm_fd_set ;
/*struct kevin {
int16_t family ;
uint16_t port ;
uint32_t address ;
- char pad[16 - sizeof ( int16_t ) -
+ char pad[16 - sizeof ( int16_t ) -
sizeof (uint16_t) - sizeof (uint32_t) ] ;
} ;
*/
/* SLURM datatypes */
-/* this is a custom data type to describe the slurm msg type type
+/* this is a custom data type to describe the slurm msg type type
* that is placed in the slurm protocol header
* while just an short now, it may change in the future */
/* Now defined in ../../src/common/slurm_protocol_defs.h
diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index 51d0987bda08a2402b4b671fdadb27a0551988c5..a31f18f5af8d453e6125bfc9994244ed850c728e 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Kevin Tew <tew1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -114,7 +114,7 @@ static void
_pack_job_alloc_info_response_msg(job_alloc_info_response_msg_t * msg,
Buf buffer);
static int
-_unpack_job_alloc_info_response_msg(job_alloc_info_response_msg_t ** msg,
+_unpack_job_alloc_info_response_msg(job_alloc_info_response_msg_t ** msg,
Buf buffer);
static void _pack_submit_response_msg(submit_response_msg_t * msg,
@@ -159,14 +159,14 @@ static void _pack_job_step_create_response_msg(
static int _unpack_job_step_create_response_msg(
job_step_create_response_msg_t ** msg, Buf buffer);
-static void _pack_part_info_request_msg(part_info_request_msg_t * msg,
+static void _pack_part_info_request_msg(part_info_request_msg_t * msg,
Buf buffer);
-static int _unpack_part_info_request_msg(part_info_request_msg_t **
+static int _unpack_part_info_request_msg(part_info_request_msg_t **
msg, Buf buffer);
-static void _pack_resv_info_request_msg(resv_info_request_msg_t * msg,
+static void _pack_resv_info_request_msg(resv_info_request_msg_t * msg,
Buf buffer);
-static int _unpack_resv_info_request_msg(resv_info_request_msg_t **
+static int _unpack_resv_info_request_msg(resv_info_request_msg_t **
msg, Buf buffer);
static int _unpack_partition_info_msg(partition_info_msg_t ** msg,
@@ -220,7 +220,7 @@ static int _unpack_task_exit_msg(task_exit_msg_t ** msg_ptr, Buf buffer);
static void _pack_job_alloc_info_msg(job_alloc_info_msg_t * job_desc_ptr,
Buf buffer);
static int
-_unpack_job_alloc_info_msg(job_alloc_info_msg_t **job_desc_buffer_ptr,
+_unpack_job_alloc_info_msg(job_alloc_info_msg_t **job_desc_buffer_ptr,
Buf buffer);
static void _pack_return_code_msg(return_code_msg_t * msg, Buf buffer);
@@ -231,9 +231,9 @@ static void _pack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t * build_ptr,
static int _unpack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t **
build_buffer_ptr, Buf buffer);
-static void _pack_job_info_request_msg(job_info_request_msg_t *
+static void _pack_job_info_request_msg(job_info_request_msg_t *
msg, Buf buffer);
-static int _unpack_job_info_request_msg(job_info_request_msg_t**
+static int _unpack_job_info_request_msg(job_info_request_msg_t**
msg, Buf buffer);
static void _pack_block_info_req_msg(block_info_request_msg_t *
@@ -292,15 +292,15 @@ static void _pack_ret_list(List ret_list, uint16_t size_val, Buf buffer);
static int _unpack_ret_list(List *ret_list, uint16_t size_val, Buf buffer);
static void _pack_job_id_request_msg(job_id_request_msg_t * msg, Buf buffer);
-static int
+static int
_unpack_job_id_request_msg(job_id_request_msg_t ** msg, Buf buffer);
static void _pack_job_id_response_msg(job_id_response_msg_t * msg, Buf buffer);
-static int _unpack_job_id_response_msg(job_id_response_msg_t ** msg,
+static int _unpack_job_id_response_msg(job_id_response_msg_t ** msg,
Buf buffer);
static void _pack_job_step_kill_msg(job_step_kill_msg_t * msg, Buf buffer);
-static int _unpack_job_step_kill_msg(job_step_kill_msg_t ** msg_ptr,
+static int _unpack_job_step_kill_msg(job_step_kill_msg_t ** msg_ptr,
Buf buffer);
static void _pack_srun_exec_msg(srun_exec_msg_t * msg, Buf buffer);
@@ -310,16 +310,16 @@ static void _pack_srun_ping_msg(srun_ping_msg_t * msg, Buf buffer);
static int _unpack_srun_ping_msg(srun_ping_msg_t ** msg_ptr, Buf buffer);
static void _pack_srun_node_fail_msg(srun_node_fail_msg_t * msg, Buf buffer);
-static int _unpack_srun_node_fail_msg(srun_node_fail_msg_t ** msg_ptr,
+static int _unpack_srun_node_fail_msg(srun_node_fail_msg_t ** msg_ptr,
Buf buffer);
-static void _pack_srun_step_missing_msg(srun_step_missing_msg_t * msg,
+static void _pack_srun_step_missing_msg(srun_step_missing_msg_t * msg,
Buf buffer);
-static int _unpack_srun_step_missing_msg(srun_step_missing_msg_t ** msg_ptr,
+static int _unpack_srun_step_missing_msg(srun_step_missing_msg_t ** msg_ptr,
Buf buffer);
static void _pack_srun_timeout_msg(srun_timeout_msg_t * msg, Buf buffer);
-static int _unpack_srun_timeout_msg(srun_timeout_msg_t ** msg_ptr,
+static int _unpack_srun_timeout_msg(srun_timeout_msg_t ** msg_ptr,
Buf buffer);
static void _pack_srun_user_msg(srun_user_msg_t * msg, Buf buffer);
@@ -329,15 +329,15 @@ static void _pack_checkpoint_msg(checkpoint_msg_t *msg, Buf buffer);
static int _unpack_checkpoint_msg(checkpoint_msg_t **msg_ptr, Buf buffer);
static void _pack_checkpoint_resp_msg(checkpoint_resp_msg_t *msg, Buf buffer);
-static int _unpack_checkpoint_resp_msg(checkpoint_resp_msg_t **msg_ptr,
+static int _unpack_checkpoint_resp_msg(checkpoint_resp_msg_t **msg_ptr,
Buf buffer);
static void _pack_checkpoint_comp(checkpoint_comp_msg_t *msg, Buf buffer);
-static int _unpack_checkpoint_comp(checkpoint_comp_msg_t **msg_ptr,
+static int _unpack_checkpoint_comp(checkpoint_comp_msg_t **msg_ptr,
Buf buffer);
static void _pack_checkpoint_task_comp(checkpoint_task_comp_msg_t *msg, Buf buffer);
-static int _unpack_checkpoint_task_comp(checkpoint_task_comp_msg_t **msg_ptr,
+static int _unpack_checkpoint_task_comp(checkpoint_task_comp_msg_t **msg_ptr,
Buf buffer);
static void _pack_suspend_msg(suspend_msg_t *msg, Buf buffer);
@@ -370,14 +370,14 @@ static void _pack_job_notify(job_notify_msg_t *msg, Buf buffer);
static int _unpack_job_notify(job_notify_msg_t **msg_ptr, Buf buffer);
static void _pack_set_debug_level_msg(set_debug_level_msg_t * msg, Buf buffer);
-static int _unpack_set_debug_level_msg(set_debug_level_msg_t ** msg_ptr,
+static int _unpack_set_debug_level_msg(set_debug_level_msg_t ** msg_ptr,
Buf buffer);
static void _pack_will_run_response_msg(will_run_response_msg_t *msg, Buf buffer);
-static int _unpack_will_run_response_msg(will_run_response_msg_t ** msg_ptr,
+static int _unpack_will_run_response_msg(will_run_response_msg_t ** msg_ptr,
Buf buffer);
-static void _pack_accounting_update_msg(accounting_update_msg_t *msg,
+static void _pack_accounting_update_msg(accounting_update_msg_t *msg,
Buf buffer);
static int _unpack_accounting_update_msg(accounting_update_msg_t **msg,
Buf buffer);
@@ -392,7 +392,7 @@ static int _unpack_topo_info_msg(topo_info_response_msg_t **msg,
Buf buffer);
static void _pack_job_sbcast_cred_msg(job_sbcast_cred_msg_t *msg, Buf buffer);
-static int _unpack_job_sbcast_cred_msg(job_sbcast_cred_msg_t **msg,
+static int _unpack_job_sbcast_cred_msg(job_sbcast_cred_msg_t **msg,
Buf buffer);
/* pack_header
@@ -404,7 +404,7 @@ static int _unpack_job_sbcast_cred_msg(job_sbcast_cred_msg_t **msg,
void
pack_header(header_t * header, Buf buffer)
{
-
+
pack16((uint16_t)header->version, buffer);
pack16((uint16_t)header->flags, buffer);
pack16((uint16_t)header->msg_type, buffer);
@@ -414,10 +414,10 @@ pack_header(header_t * header, Buf buffer)
packstr(header->forward.nodelist, buffer);
pack32((uint32_t)header->forward.timeout, buffer);
}
- pack16((uint16_t)header->ret_cnt, buffer);
+ pack16((uint16_t)header->ret_cnt, buffer);
if(header->ret_cnt > 0) {
_pack_ret_list(header->ret_list,
- header->ret_cnt, buffer);
+ header->ret_cnt, buffer);
}
slurm_pack_slurm_addr(&header->orig_addr, buffer);
}
@@ -442,13 +442,13 @@ unpack_header(header_t * header, Buf buffer)
safe_unpack16(&header->msg_type, buffer);
safe_unpack32(&header->body_length, buffer);
safe_unpack16(&header->forward.cnt, buffer);
- if (header->forward.cnt > 0) {
- safe_unpackstr_xmalloc(&header->forward.nodelist,
+ if (header->forward.cnt > 0) {
+ safe_unpackstr_xmalloc(&header->forward.nodelist,
&uint32_tmp, buffer);
safe_unpack32(&header->forward.timeout, buffer);
- }
-
- safe_unpack16(&header->ret_cnt, buffer);
+ }
+
+ safe_unpack16(&header->ret_cnt, buffer);
if(header->ret_cnt > 0) {
if(_unpack_ret_list(&(header->ret_list),
header->ret_cnt, buffer))
@@ -457,7 +457,7 @@ unpack_header(header_t * header, Buf buffer)
header->ret_list = NULL;
}
slurm_unpack_slurm_addr_no_alloc(&header->orig_addr, buffer);
-
+
return SLURM_SUCCESS;
unpack_error:
@@ -472,7 +472,7 @@ unpack_error:
/* pack_msg
* packs a generic slurm protocol message body
* IN msg - the body structure to pack (note: includes message type)
- * IN/OUT buffer - destination of the pack, contains pointers that are
+ * IN/OUT buffer - destination of the pack, contains pointers that are
* automatically updated
* RET 0 or error code
*/
@@ -512,7 +512,7 @@ pack_msg(slurm_msg_t const *msg, Buf buffer)
break;
case MESSAGE_NODE_REGISTRATION_STATUS:
_pack_node_registration_status_msg(
- (slurm_node_registration_status_msg_t *) msg->data,
+ (slurm_node_registration_status_msg_t *) msg->data,
buffer);
break;
case REQUEST_RESOURCE_ALLOCATION:
@@ -545,7 +545,7 @@ pack_msg(slurm_msg_t const *msg, Buf buffer)
_pack_shutdown_msg((shutdown_msg_t *) msg->data, buffer);
break;
case RESPONSE_SUBMIT_BATCH_JOB:
- _pack_submit_response_msg((submit_response_msg_t *)
+ _pack_submit_response_msg((submit_response_msg_t *)
msg->data, buffer);
break;
case RESPONSE_JOB_ALLOCATION_INFO_LITE:
@@ -602,7 +602,7 @@ pack_msg(slurm_msg_t const *msg, Buf buffer)
break;
case REQUEST_LAUNCH_TASKS:
_pack_launch_tasks_request_msg(
- (launch_tasks_request_msg_t *) msg->data,
+ (launch_tasks_request_msg_t *) msg->data,
buffer);
break;
case RESPONSE_LAUNCH_TASKS:
@@ -627,11 +627,11 @@ pack_msg(slurm_msg_t const *msg, Buf buffer)
*) msg->data, buffer);
break;
case REQUEST_JOB_INFO:
- _pack_job_info_request_msg((job_info_request_msg_t *)
+ _pack_job_info_request_msg((job_info_request_msg_t *)
msg->data, buffer);
break;
case REQUEST_CANCEL_JOB_STEP:
- _pack_job_step_kill_msg((job_step_kill_msg_t *)
+ _pack_job_step_kill_msg((job_step_kill_msg_t *)
msg->data, buffer);
break;
case REQUEST_COMPLETE_JOB_ALLOCATION:
@@ -647,14 +647,14 @@ pack_msg(slurm_msg_t const *msg, Buf buffer)
buffer);
break;
case MESSAGE_STAT_JOBACCT:
- _pack_stat_jobacct_msg((stat_jobacct_msg_t *) msg->data,
+ _pack_stat_jobacct_msg((stat_jobacct_msg_t *) msg->data,
buffer);
break;
case REQUEST_STEP_LAYOUT:
_pack_job_step_id_msg((job_step_id_msg_t *)msg->data, buffer);
break;
case RESPONSE_STEP_LAYOUT:
- pack_slurm_step_layout((slurm_step_layout_t *)msg->data,
+ pack_slurm_step_layout((slurm_step_layout_t *)msg->data,
buffer);
break;
case REQUEST_SIGNAL_JOB:
@@ -731,7 +731,7 @@ pack_msg(slurm_msg_t const *msg, Buf buffer)
_pack_srun_ping_msg((srun_ping_msg_t *)msg->data, buffer);
break;
case SRUN_NODE_FAIL:
- _pack_srun_node_fail_msg((srun_node_fail_msg_t *)msg->data,
+ _pack_srun_node_fail_msg((srun_node_fail_msg_t *)msg->data,
buffer);
break;
case SRUN_STEP_MISSING:
@@ -748,16 +748,16 @@ pack_msg(slurm_msg_t const *msg, Buf buffer)
_pack_checkpoint_msg((checkpoint_msg_t *)msg->data, buffer);
break;
case REQUEST_CHECKPOINT_COMP:
- _pack_checkpoint_comp((checkpoint_comp_msg_t *)msg->data,
+ _pack_checkpoint_comp((checkpoint_comp_msg_t *)msg->data,
buffer);
break;
case REQUEST_CHECKPOINT_TASK_COMP:
- _pack_checkpoint_task_comp((checkpoint_task_comp_msg_t *)msg->data,
+ _pack_checkpoint_task_comp((checkpoint_task_comp_msg_t *)msg->data,
buffer);
break;
case RESPONSE_CHECKPOINT:
case RESPONSE_CHECKPOINT_COMP:
- _pack_checkpoint_resp_msg((checkpoint_resp_msg_t *)msg->data,
+ _pack_checkpoint_resp_msg((checkpoint_resp_msg_t *)msg->data,
buffer);
break;
case REQUEST_SUSPEND:
@@ -850,7 +850,7 @@ pack_msg(slurm_msg_t const *msg, Buf buffer)
/* unpack_msg
* unpacks a generic slurm protocol message body
* OUT msg - the body structure to unpack (note: includes message type)
- * IN/OUT buffer - source of the unpack, contains pointers that are
+ * IN/OUT buffer - source of the unpack, contains pointers that are
* automatically updated
* RET 0 or error code
*/
@@ -859,7 +859,7 @@ unpack_msg(slurm_msg_t * msg, Buf buffer)
{
int rc = SLURM_SUCCESS;
msg->data = NULL; /* Initialize to no data for now */
-
+
switch (msg->msg_type) {
case REQUEST_NODE_INFO:
rc = _unpack_node_info_request_msg((node_info_request_msg_t **)
@@ -996,12 +996,12 @@ unpack_msg(slurm_msg_t * msg, Buf buffer)
break;
case REQUEST_REATTACH_TASKS:
rc = _unpack_reattach_tasks_request_msg(
- (reattach_tasks_request_msg_t **) & msg->data,
+ (reattach_tasks_request_msg_t **) & msg->data,
buffer);
break;
case RESPONSE_REATTACH_TASKS:
rc = _unpack_reattach_tasks_response_msg(
- (reattach_tasks_response_msg_t **)
+ (reattach_tasks_response_msg_t **)
& msg->data, buffer);
break;
case REQUEST_SIGNAL_TASKS:
@@ -1045,11 +1045,11 @@ unpack_msg(slurm_msg_t * msg, Buf buffer)
(stat_jobacct_msg_t **) &(msg->data), buffer);
break;
case REQUEST_STEP_LAYOUT:
- _unpack_job_step_id_msg((job_step_id_msg_t **)&msg->data,
+ _unpack_job_step_id_msg((job_step_id_msg_t **)&msg->data,
buffer);
break;
case RESPONSE_STEP_LAYOUT:
- unpack_slurm_step_layout((slurm_step_layout_t **)&msg->data,
+ unpack_slurm_step_layout((slurm_step_layout_t **)&msg->data,
buffer);
break;
case REQUEST_SIGNAL_JOB:
@@ -1059,11 +1059,11 @@ unpack_msg(slurm_msg_t * msg, Buf buffer)
case REQUEST_ABORT_JOB:
case REQUEST_KILL_TIMELIMIT:
case REQUEST_TERMINATE_JOB:
- rc = _unpack_kill_job_msg((kill_job_msg_t **) & (msg->data),
+ rc = _unpack_kill_job_msg((kill_job_msg_t **) & (msg->data),
buffer);
break;
case MESSAGE_EPILOG_COMPLETE:
- rc = _unpack_epilog_comp_msg((epilog_complete_msg_t **)
+ rc = _unpack_epilog_comp_msg((epilog_complete_msg_t **)
& (msg->data), buffer);
break;
case REQUEST_UPDATE_JOB_TIME:
@@ -1126,12 +1126,12 @@ unpack_msg(slurm_msg_t * msg, Buf buffer)
buffer);
break;
case SRUN_EXEC:
- rc = _unpack_srun_exec_msg((srun_exec_msg_t **) & msg->data,
+ rc = _unpack_srun_exec_msg((srun_exec_msg_t **) & msg->data,
buffer);
break;
case SRUN_JOB_COMPLETE:
case SRUN_PING:
- rc = _unpack_srun_ping_msg((srun_ping_msg_t **) & msg->data,
+ rc = _unpack_srun_ping_msg((srun_ping_msg_t **) & msg->data,
buffer);
break;
case SRUN_NODE_FAIL:
@@ -1168,7 +1168,7 @@ unpack_msg(slurm_msg_t * msg, Buf buffer)
& msg->data, buffer);
break;
case REQUEST_SUSPEND:
- rc = _unpack_suspend_msg((suspend_msg_t **) &msg->data,
+ rc = _unpack_suspend_msg((suspend_msg_t **) &msg->data,
buffer);
break;
@@ -1213,7 +1213,7 @@ unpack_msg(slurm_msg_t * msg, Buf buffer)
break;
case PMI_KVS_PUT_REQ:
case PMI_KVS_GET_RESP:
- rc = _unpack_kvs_data((struct kvs_comm_set **) &msg->data,
+ rc = _unpack_kvs_data((struct kvs_comm_set **) &msg->data,
buffer);
break;
case PMI_KVS_GET_REQ:
@@ -1227,7 +1227,7 @@ unpack_msg(slurm_msg_t * msg, Buf buffer)
case RESPONSE_TRIGGER_GET:
case REQUEST_TRIGGER_SET:
case REQUEST_TRIGGER_CLEAR:
- rc = _unpack_trigger_msg((trigger_info_msg_t **)
+ rc = _unpack_trigger_msg((trigger_info_msg_t **)
&msg->data, buffer);
break;
case RESPONSE_SLURMD_STATUS:
@@ -1285,7 +1285,7 @@ static void _pack_assoc_shares_object(void *in, Buf buffer)
pack64(0, buffer);
pack16(0, buffer);
-
+
return;
}
@@ -1313,7 +1313,7 @@ static int _unpack_assoc_shares_object(void **object, Buf buffer)
*object = (void *) object_ptr;
safe_unpack32(&object_ptr->assoc_id, buffer);
-
+
safe_unpackstr_xmalloc(&object_ptr->cluster, &uint32_tmp, buffer);
safe_unpackstr_xmalloc(&object_ptr->name, &uint32_tmp, buffer);
safe_unpackstr_xmalloc(&object_ptr->parent, &uint32_tmp, buffer);
@@ -1343,7 +1343,7 @@ static void _pack_shares_request_msg(shares_request_msg_t * msg, Buf buffer)
xassert(msg != NULL);
- if(msg->acct_list)
+ if(msg->acct_list)
count = list_count(msg->acct_list);
pack32(count, buffer);
if(count && count != NO_VAL) {
@@ -1356,7 +1356,7 @@ static void _pack_shares_request_msg(shares_request_msg_t * msg, Buf buffer)
count = NO_VAL;
- if(msg->user_list)
+ if(msg->user_list)
count = list_count(msg->user_list);
pack32(count, buffer);
if(count && count != NO_VAL) {
@@ -1416,12 +1416,12 @@ static void _pack_shares_response_msg(shares_response_msg_t * msg, Buf buffer)
uint32_t count = NO_VAL;
xassert(msg != NULL);
- if(msg->assoc_shares_list)
+ if(msg->assoc_shares_list)
count = list_count(msg->assoc_shares_list);
pack32(count, buffer);
if(count && count != NO_VAL) {
itr = list_iterator_create(msg->assoc_shares_list);
- while((share = list_next(itr)))
+ while((share = list_next(itr)))
_pack_assoc_shares_object(share, buffer);
list_iterator_destroy(itr);
}
@@ -1444,10 +1444,10 @@ static int _unpack_shares_response_msg(shares_response_msg_t ** msg,
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
- object_ptr->assoc_shares_list =
+ object_ptr->assoc_shares_list =
list_create(slurm_destroy_association_shares_object);
for(i=0; i<count; i++) {
- if(_unpack_assoc_shares_object(&tmp_info, buffer)
+ if(_unpack_assoc_shares_object(&tmp_info, buffer)
!= SLURM_SUCCESS)
goto unpack_error;
list_append(object_ptr->assoc_shares_list, tmp_info);
@@ -1520,7 +1520,7 @@ unpack_error:
return SLURM_ERROR;
}
-static void
+static void
_pack_priority_factors_request_msg(priority_factors_request_msg_t * msg,
Buf buffer)
{
@@ -1794,7 +1794,7 @@ _pack_resource_allocation_response_msg(resource_allocation_response_msg_t *
}
pack32(msg->node_cnt, buffer);
-
+
select_g_select_jobinfo_pack(msg->select_jobinfo, buffer);
}
@@ -1831,7 +1831,7 @@ _unpack_resource_allocation_response_msg(resource_allocation_response_msg_t
}
safe_unpack32(&tmp_ptr->node_cnt, buffer);
-
+
if (select_g_select_jobinfo_unpack(&tmp_ptr->select_jobinfo, buffer))
goto unpack_error;
@@ -1867,7 +1867,7 @@ _pack_job_alloc_info_response_msg(job_alloc_info_response_msg_t * msg,
}
static int
-_unpack_job_alloc_info_response_msg(job_alloc_info_response_msg_t ** msg,
+_unpack_job_alloc_info_response_msg(job_alloc_info_response_msg_t ** msg,
Buf buffer)
{
uint32_t uint32_tmp;
@@ -2352,7 +2352,7 @@ _unpack_kill_job_msg(kill_job_msg_t ** msg, Buf buffer)
safe_unpackstr_xmalloc(&(tmp_ptr->nodes), &uint32_tmp, buffer);
if (select_g_select_jobinfo_unpack(&tmp_ptr->select_jobinfo, buffer))
goto unpack_error;
- safe_unpackstr_array(&(tmp_ptr->spank_job_env),
+ safe_unpackstr_array(&(tmp_ptr->spank_job_env),
&tmp_ptr->spank_job_env_size, buffer);
return SLURM_SUCCESS;
@@ -2395,7 +2395,7 @@ unpack_error:
return SLURM_ERROR;
}
-static void
+static void
_pack_epilog_comp_msg(epilog_complete_msg_t * msg, Buf buffer)
{
xassert(msg != NULL);
@@ -2406,7 +2406,7 @@ _pack_epilog_comp_msg(epilog_complete_msg_t * msg, Buf buffer)
switch_g_pack_node_info(msg->switch_nodeinfo, buffer);
}
-static int
+static int
_unpack_epilog_comp_msg(epilog_complete_msg_t ** msg, Buf buffer)
{
epilog_complete_msg_t *tmp_ptr;
@@ -2481,7 +2481,7 @@ _unpack_job_step_create_response_msg(job_step_create_response_msg_t ** msg,
{
job_step_create_response_msg_t *tmp_ptr = NULL;
uint32_t uint32_tmp;
-
+
/* alloc memory for structure */
xassert(msg != NULL);
tmp_ptr = xmalloc(sizeof(job_step_create_response_msg_t));
@@ -2491,7 +2491,7 @@ _unpack_job_step_create_response_msg(job_step_create_response_msg_t ** msg,
safe_unpack32(&tmp_ptr->job_step_id, buffer);
if (unpack_slurm_step_layout(&tmp_ptr->step_layout, buffer))
goto unpack_error;
-
+
if (!(tmp_ptr->cred = slurm_cred_unpack(buffer)))
goto unpack_error;
@@ -2553,7 +2553,7 @@ _unpack_partition_info_members(partition_info_t * part, Buf buffer)
safe_unpack32(&part->max_nodes, buffer);
safe_unpack32(&part->min_nodes, buffer);
safe_unpack32(&part->total_nodes, buffer);
-
+
safe_unpack32(&part->total_cpus, buffer);
safe_unpack16(&part->default_part, buffer);
safe_unpack16(&part->disable_root_jobs, buffer);
@@ -2658,7 +2658,7 @@ unpack_error:
/* _unpack_job_step_info_members
* unpacks a set of slurm job step info for one job step
* OUT step - pointer to the job step info buffer
- * IN/OUT buffer - source of the unpack, contains pointers that are
+ * IN/OUT buffer - source of the unpack, contains pointers that are
* automatically updated
*/
static int
@@ -2690,7 +2690,7 @@ _unpack_job_step_info_members(job_step_info_t * step, Buf buffer)
step->node_inx = bitfmt2int(node_inx_str);
xfree(node_inx_str);
}
-
+
return SLURM_SUCCESS;
unpack_error:
@@ -2770,7 +2770,7 @@ unpack_error:
/* _unpack_job_info_members
* unpacks a set of slurm job info for one job
* OUT job - pointer to the job info buffer
- * IN/OUT buffer - source of the unpack, contains pointers that are
+ * IN/OUT buffer - source of the unpack, contains pointers that are
* automatically updated
*/
static int
@@ -2878,7 +2878,7 @@ _unpack_job_info_members(job_info_t * job, Buf buffer)
job->ntasks_per_core = mc_ptr->ntasks_per_core;
xfree(mc_ptr);
}
-
+
return SLURM_SUCCESS;
unpack_error:
@@ -2939,7 +2939,7 @@ _pack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t * build_ptr, Buf buffer)
packstr(build_ptr->job_acct_gather_type, buffer);
packstr(build_ptr->job_ckpt_dir, buffer);
-
+
packstr(build_ptr->job_comp_host, buffer);
packstr(build_ptr->job_comp_loc, buffer);
packstr(build_ptr->job_comp_pass, buffer);
@@ -3008,9 +3008,9 @@ _pack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t * build_ptr, Buf buffer)
pack16(build_ptr->sched_time_slice, buffer);
packstr(build_ptr->schedtype, buffer);
packstr(build_ptr->select_type, buffer);
- if(build_ptr->select_conf_key_pairs)
+ if(build_ptr->select_conf_key_pairs)
count = list_count((List)build_ptr->select_conf_key_pairs);
-
+
pack32(count, buffer);
if(count && count != NO_VAL) {
ListIterator itr = list_iterator_create(
@@ -3023,7 +3023,7 @@ _pack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t * build_ptr, Buf buffer)
list_iterator_destroy(itr);
}
count = NO_VAL;
-
+
pack16(build_ptr->select_type_param, buffer);
packstr(build_ptr->slurm_conf, buffer);
@@ -3096,18 +3096,18 @@ _unpack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t **
safe_unpack_time(&build_ptr->last_update, buffer);
safe_unpack16(&build_ptr->accounting_storage_enforce, buffer);
- safe_unpackstr_xmalloc(&build_ptr->accounting_storage_backup_host,
+ safe_unpackstr_xmalloc(&build_ptr->accounting_storage_backup_host,
&uint32_tmp, buffer);
- safe_unpackstr_xmalloc(&build_ptr->accounting_storage_host,
+ safe_unpackstr_xmalloc(&build_ptr->accounting_storage_host,
&uint32_tmp, buffer);
safe_unpackstr_xmalloc(&build_ptr->accounting_storage_loc,
&uint32_tmp, buffer);
- safe_unpackstr_xmalloc(&build_ptr->accounting_storage_pass,
+ safe_unpackstr_xmalloc(&build_ptr->accounting_storage_pass,
&uint32_tmp, buffer);
safe_unpack32(&build_ptr->accounting_storage_port, buffer);
- safe_unpackstr_xmalloc(&build_ptr->accounting_storage_type,
+ safe_unpackstr_xmalloc(&build_ptr->accounting_storage_type,
&uint32_tmp, buffer);
- safe_unpackstr_xmalloc(&build_ptr->accounting_storage_user,
+ safe_unpackstr_xmalloc(&build_ptr->accounting_storage_user,
&uint32_tmp, buffer);
safe_unpackstr_xmalloc(&build_ptr->authtype, &uint32_tmp, buffer);
@@ -3135,7 +3135,7 @@ _unpack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t **
safe_unpackstr_xmalloc(&build_ptr->epilog, &uint32_tmp, buffer);
safe_unpack32(&build_ptr->epilog_msg_time, buffer);
- safe_unpackstr_xmalloc(&build_ptr->epilog_slurmctld, &uint32_tmp,
+ safe_unpackstr_xmalloc(&build_ptr->epilog_slurmctld, &uint32_tmp,
buffer);
safe_unpack16(&build_ptr->fast_schedule, buffer);
@@ -3198,7 +3198,7 @@ _unpack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t **
safe_unpack16(&build_ptr->priority_favor_small, buffer);
safe_unpack32(&build_ptr->priority_max_age, buffer);
safe_unpack16(&build_ptr->priority_reset_period, buffer);
- safe_unpackstr_xmalloc(&build_ptr->priority_type, &uint32_tmp,
+ safe_unpackstr_xmalloc(&build_ptr->priority_type, &uint32_tmp,
buffer);
safe_unpack32(&build_ptr->priority_weight_age, buffer);
safe_unpack32(&build_ptr->priority_weight_fs, buffer);
@@ -3207,10 +3207,10 @@ _unpack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t **
safe_unpack32(&build_ptr->priority_weight_qos, buffer);
safe_unpack16(&build_ptr->private_data, buffer);
- safe_unpackstr_xmalloc(&build_ptr->proctrack_type, &uint32_tmp,
+ safe_unpackstr_xmalloc(&build_ptr->proctrack_type, &uint32_tmp,
buffer);
safe_unpackstr_xmalloc(&build_ptr->prolog, &uint32_tmp, buffer);
- safe_unpackstr_xmalloc(&build_ptr->prolog_slurmctld, &uint32_tmp,
+ safe_unpackstr_xmalloc(&build_ptr->prolog_slurmctld, &uint32_tmp,
buffer);
safe_unpack16(&build_ptr->propagate_prio_process, buffer);
safe_unpackstr_xmalloc(&build_ptr->propagate_rlimits,
@@ -3225,7 +3225,7 @@ _unpack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t **
safe_unpack16(&build_ptr->resv_over_run, buffer);
safe_unpack16(&build_ptr->ret2service, buffer);
- safe_unpackstr_xmalloc(&build_ptr->salloc_default_command,
+ safe_unpackstr_xmalloc(&build_ptr->salloc_default_command,
&uint32_tmp, buffer);
safe_unpackstr_xmalloc(&build_ptr->sched_params, &uint32_tmp, buffer);
safe_unpack16(&build_ptr->schedport, buffer);
@@ -3247,7 +3247,7 @@ _unpack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t **
}
build_ptr->select_conf_key_pairs = (void *)tmp_list;
}
-
+
safe_unpack16(&build_ptr->select_type_param, buffer);
safe_unpackstr_xmalloc(&build_ptr->slurm_conf,
@@ -3299,7 +3299,7 @@ _unpack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t **
safe_unpackstr_xmalloc(&build_ptr->task_plugin, &uint32_tmp, buffer);
safe_unpack16(&build_ptr->task_plugin_param, buffer);
safe_unpackstr_xmalloc(&build_ptr->tmp_fs, &uint32_tmp, buffer);
- safe_unpackstr_xmalloc(&build_ptr->topology_plugin, &uint32_tmp,
+ safe_unpackstr_xmalloc(&build_ptr->topology_plugin, &uint32_tmp,
buffer);
safe_unpack16(&build_ptr->track_wckey, buffer);
safe_unpack16(&build_ptr->tree_width, buffer);
@@ -3325,9 +3325,9 @@ unpack_error:
}
/* _pack_job_desc_msg
- * packs a job_desc struct
+ * packs a job_desc struct
* IN job_desc_ptr - pointer to the job descriptor to pack
- * IN/OUT buffer - destination of the pack, contains pointers that are
+ * IN/OUT buffer - destination of the pack, contains pointers that are
* automatically updated
*/
static void
@@ -3365,7 +3365,7 @@ _pack_job_desc_msg(job_desc_msg_t * job_desc_ptr, Buf buffer)
packstr(job_desc_ptr->exc_nodes, buffer);
packstr_array(job_desc_ptr->environment, job_desc_ptr->env_size,
buffer);
- packstr_array(job_desc_ptr->spank_job_env,
+ packstr_array(job_desc_ptr->spank_job_env,
job_desc_ptr->spank_job_env_size, buffer);
packstr(job_desc_ptr->script, buffer);
packstr_array(job_desc_ptr->argv, job_desc_ptr->argc, buffer);
@@ -3415,22 +3415,22 @@ _pack_job_desc_msg(job_desc_msg_t * job_desc_ptr, Buf buffer)
packstr(job_desc_ptr->wckey, buffer);
if(job_desc_ptr->select_jobinfo) {
- select_g_select_jobinfo_pack(job_desc_ptr->select_jobinfo,
+ select_g_select_jobinfo_pack(job_desc_ptr->select_jobinfo,
buffer);
} else {
job_desc_ptr->select_jobinfo = select_g_select_jobinfo_alloc();
#ifdef HAVE_BG
if(job_desc_ptr->geometry[0] != (uint16_t) NO_VAL)
select_g_select_jobinfo_set(
- job_desc_ptr->select_jobinfo,
- SELECT_JOBDATA_GEOMETRY,
+ job_desc_ptr->select_jobinfo,
+ SELECT_JOBDATA_GEOMETRY,
job_desc_ptr->geometry);
#endif
-
+
if (job_desc_ptr->conn_type != (uint16_t) NO_VAL)
select_g_select_jobinfo_set(
- job_desc_ptr->select_jobinfo,
- SELECT_JOBDATA_CONN_TYPE,
+ job_desc_ptr->select_jobinfo,
+ SELECT_JOBDATA_CONN_TYPE,
&(job_desc_ptr->conn_type));
if (job_desc_ptr->reboot != (uint16_t) NO_VAL)
select_g_select_jobinfo_set(
@@ -3439,31 +3439,31 @@ _pack_job_desc_msg(job_desc_msg_t * job_desc_ptr, Buf buffer)
&(job_desc_ptr->reboot));
if (job_desc_ptr->rotate != (uint16_t) NO_VAL)
select_g_select_jobinfo_set(
- job_desc_ptr->select_jobinfo,
- SELECT_JOBDATA_ROTATE,
+ job_desc_ptr->select_jobinfo,
+ SELECT_JOBDATA_ROTATE,
&(job_desc_ptr->rotate));
if (job_desc_ptr->blrtsimage) {
select_g_select_jobinfo_set(
- job_desc_ptr->select_jobinfo,
- SELECT_JOBDATA_BLRTS_IMAGE,
+ job_desc_ptr->select_jobinfo,
+ SELECT_JOBDATA_BLRTS_IMAGE,
job_desc_ptr->blrtsimage);
}
if (job_desc_ptr->linuximage)
select_g_select_jobinfo_set(
- job_desc_ptr->select_jobinfo,
- SELECT_JOBDATA_LINUX_IMAGE,
+ job_desc_ptr->select_jobinfo,
+ SELECT_JOBDATA_LINUX_IMAGE,
job_desc_ptr->linuximage);
if (job_desc_ptr->mloaderimage)
select_g_select_jobinfo_set(
- job_desc_ptr->select_jobinfo,
- SELECT_JOBDATA_MLOADER_IMAGE,
+ job_desc_ptr->select_jobinfo,
+ SELECT_JOBDATA_MLOADER_IMAGE,
job_desc_ptr->mloaderimage);
if (job_desc_ptr->ramdiskimage)
select_g_select_jobinfo_set(
- job_desc_ptr->select_jobinfo,
- SELECT_JOBDATA_RAMDISK_IMAGE,
+ job_desc_ptr->select_jobinfo,
+ SELECT_JOBDATA_RAMDISK_IMAGE,
job_desc_ptr->ramdiskimage);
- select_g_select_jobinfo_pack(job_desc_ptr->select_jobinfo,
+ select_g_select_jobinfo_pack(job_desc_ptr->select_jobinfo,
buffer);
select_g_select_jobinfo_free(job_desc_ptr->select_jobinfo);
}
@@ -3472,7 +3472,7 @@ _pack_job_desc_msg(job_desc_msg_t * job_desc_ptr, Buf buffer)
/* _unpack_job_desc_msg
* unpacks a job_desc struct
* OUT job_desc_buffer_ptr - place to put pointer to allocated job desc struct
- * IN/OUT buffer - source of the unpack, contains pointers that are
+ * IN/OUT buffer - source of the unpack, contains pointers that are
* automatically updated
*/
static int
@@ -3561,13 +3561,13 @@ _unpack_job_desc_msg(job_desc_msg_t ** job_desc_buffer_ptr, Buf buffer)
safe_unpackstr_xmalloc(&job_desc_ptr->licenses, &uint32_tmp, buffer);
safe_unpack16(&job_desc_ptr->mail_type, buffer);
safe_unpackstr_xmalloc(&job_desc_ptr->mail_user, &uint32_tmp, buffer);
- safe_unpackstr_xmalloc(&job_desc_ptr->reservation, &uint32_tmp,
+ safe_unpackstr_xmalloc(&job_desc_ptr->reservation, &uint32_tmp,
buffer);
safe_unpack16(&job_desc_ptr->warn_signal, buffer);
safe_unpack16(&job_desc_ptr->warn_time, buffer);
safe_unpackstr_xmalloc(&job_desc_ptr->wckey, &uint32_tmp, buffer);
- if (select_g_select_jobinfo_unpack(&job_desc_ptr->select_jobinfo,
+ if (select_g_select_jobinfo_unpack(&job_desc_ptr->select_jobinfo,
buffer))
goto unpack_error;
@@ -3874,9 +3874,9 @@ _pack_launch_tasks_request_msg(launch_tasks_request_msg_t * msg, Buf buffer)
for(i=0; i<msg->nnodes; i++) {
pack16(msg->tasks_to_launch[i], buffer);
pack16(msg->cpus_allocated[i], buffer);
- pack32_array(msg->global_task_ids[i],
- (uint32_t) msg->tasks_to_launch[i],
- buffer);
+ pack32_array(msg->global_task_ids[i],
+ (uint32_t) msg->tasks_to_launch[i],
+ buffer);
}
pack16(msg->num_resp_port, buffer);
for(i = 0; i < msg->num_resp_port; i++)
@@ -3928,7 +3928,7 @@ _unpack_launch_tasks_request_msg(launch_tasks_request_msg_t **
xassert(msg_ptr != NULL);
msg = xmalloc(sizeof(launch_tasks_request_msg_t));
*msg_ptr = msg;
-
+
safe_unpack32(&msg->job_id, buffer);
safe_unpack32(&msg->job_step_id, buffer);
safe_unpack32(&msg->nprocs, buffer);
@@ -3948,9 +3948,9 @@ _unpack_launch_tasks_request_msg(launch_tasks_request_msg_t **
for(i=0; i<msg->nnodes; i++) {
safe_unpack16(&msg->tasks_to_launch[i], buffer);
safe_unpack16(&msg->cpus_allocated[i], buffer);
- safe_unpack32_array(&msg->global_task_ids[i],
- &uint32_tmp,
- buffer);
+ safe_unpack32_array(&msg->global_task_ids[i],
+ &uint32_tmp,
+ buffer);
if (msg->tasks_to_launch[i] != (uint16_t) uint32_tmp)
goto unpack_error;
@@ -3963,7 +3963,7 @@ _unpack_launch_tasks_request_msg(launch_tasks_request_msg_t **
}
slurm_unpack_slurm_addr_no_alloc(&msg->orig_addr, buffer);
safe_unpackstr_array(&msg->env, &msg->envc, buffer);
- safe_unpackstr_array(&msg->spank_job_env, &msg->spank_job_env_size,
+ safe_unpackstr_array(&msg->spank_job_env, &msg->spank_job_env_size,
buffer);
safe_unpackstr_xmalloc(&msg->cwd, &uint32_tmp, buffer);
safe_unpack16(&msg->cpu_bind_type, buffer);
@@ -3991,7 +3991,7 @@ _unpack_launch_tasks_request_msg(launch_tasks_request_msg_t **
safe_unpackstr_xmalloc(&msg->task_prolog, &uint32_tmp, buffer);
safe_unpackstr_xmalloc(&msg->task_epilog, &uint32_tmp, buffer);
safe_unpack16(&msg->slurmd_debug, buffer);
-
+
switch_alloc_jobinfo(&msg->switch_job);
if (switch_unpack_jobinfo(msg->switch_job, buffer) < 0) {
error("switch_unpack_jobinfo: %m");
@@ -4003,7 +4003,7 @@ _unpack_launch_tasks_request_msg(launch_tasks_request_msg_t **
error("Unable to unpack extra job options: %m");
goto unpack_error;
}
- safe_unpackstr_xmalloc(&msg->complete_nodelist, &uint32_tmp, buffer);
+ safe_unpackstr_xmalloc(&msg->complete_nodelist, &uint32_tmp, buffer);
safe_unpack8(&msg->open_mode, buffer);
safe_unpack8(&msg->pty, buffer);
@@ -4095,7 +4095,7 @@ _unpack_checkpoint_tasks_msg(checkpoint_tasks_msg_t ** msg_ptr, Buf buffer)
safe_unpack32(&msg->job_step_id, buffer);
safe_unpack_time(&msg->timestamp, buffer);
safe_unpackstr_xmalloc(&msg->image_dir, &uint32_tmp, buffer);
-
+
return SLURM_SUCCESS;
unpack_error:
@@ -4130,7 +4130,7 @@ unpack_error:
/* _pack_job_step_kill_msg
* packs a slurm job step signal message
* IN msg - pointer to the job step signal message
- * IN/OUT buffer - destination of the pack, contains pointers that are
+ * IN/OUT buffer - destination of the pack, contains pointers that are
* automatically updated
*/
static void
@@ -4145,7 +4145,7 @@ _pack_job_step_kill_msg(job_step_kill_msg_t * msg, Buf buffer)
/* _unpack_job_step_kill_msg
* unpacks a slurm job step signal message
* OUT msg_ptr - pointer to the job step signal message buffer
- * IN/OUT buffer - source of the unpack, contains pointers that are
+ * IN/OUT buffer - source of the unpack, contains pointers that are
* automatically updated
*/
static int
@@ -4227,24 +4227,24 @@ unpack_error:
return SLURM_ERROR;
}
-static void
+static void
_pack_stat_jobacct_msg(stat_jobacct_msg_t * msg, Buf buffer)
{
pack32((uint32_t)msg->job_id, buffer);
pack32((uint32_t)msg->return_code, buffer);
pack32((uint32_t)msg->step_id, buffer);
pack32((uint32_t)msg->num_tasks, buffer);
- jobacct_gather_g_pack(msg->jobacct, buffer);
+ jobacct_gather_g_pack(msg->jobacct, buffer);
}
-static int
+static int
_unpack_stat_jobacct_msg(stat_jobacct_msg_t ** msg_ptr, Buf buffer)
{
stat_jobacct_msg_t *msg;
-
+
msg = xmalloc(sizeof(stat_jobacct_msg_t));
- *msg_ptr = msg;
+ *msg_ptr = msg;
safe_unpack32(&msg->job_id, buffer);
safe_unpack32(&msg->return_code, buffer);
@@ -4262,7 +4262,7 @@ unpack_error:
}
-static void
+static void
_pack_job_step_id_msg(job_step_id_msg_t * msg, Buf buffer)
{
pack32((uint32_t)msg->job_id, buffer);
@@ -4270,17 +4270,17 @@ _pack_job_step_id_msg(job_step_id_msg_t * msg, Buf buffer)
}
-static int
+static int
_unpack_job_step_id_msg(job_step_id_msg_t ** msg_ptr, Buf buffer)
{
job_step_id_msg_t *msg;
-
+
msg = xmalloc(sizeof(job_step_id_msg_t));
- *msg_ptr = msg;
+ *msg_ptr = msg;
safe_unpack32(&msg->job_id, buffer);
safe_unpack32(&msg->step_id, buffer);
-
+
return SLURM_SUCCESS;
unpack_error:
@@ -4291,7 +4291,7 @@ unpack_error:
}
-static void
+static void
_pack_step_complete_msg(step_complete_msg_t * msg, Buf buffer)
{
pack32((uint32_t)msg->job_id, buffer);
@@ -4306,10 +4306,10 @@ static int
_unpack_step_complete_msg(step_complete_msg_t ** msg_ptr, Buf buffer)
{
step_complete_msg_t *msg;
-
+
msg = xmalloc(sizeof(step_complete_msg_t));
*msg_ptr = msg;
-
+
safe_unpack32(&msg->job_id, buffer);
safe_unpack32(&msg->job_step_id, buffer);
safe_unpack32(&msg->range_first, buffer);
@@ -4334,7 +4334,7 @@ _pack_job_info_request_msg(job_info_request_msg_t * msg, Buf buffer)
}
static int
-_unpack_job_info_request_msg(job_info_request_msg_t** msg,
+_unpack_job_info_request_msg(job_info_request_msg_t** msg,
Buf buffer)
{
job_info_request_msg_t*job_info;
@@ -4359,7 +4359,7 @@ _pack_block_info_req_msg(block_info_request_msg_t *msg, Buf buffer)
}
static int
-_unpack_block_info_req_msg(block_info_request_msg_t **msg,
+_unpack_block_info_req_msg(block_info_request_msg_t **msg,
Buf buffer)
{
block_info_request_msg_t *node_sel_info;
@@ -4500,13 +4500,13 @@ _pack_ret_list(List ret_list,
ListIterator itr;
ret_data_info_t *ret_data_info = NULL;
slurm_msg_t msg;
-
+
itr = list_iterator_create(ret_list);
while((ret_data_info = list_next(itr))) {
pack32((uint32_t)ret_data_info->err, buffer);
pack16((uint16_t)ret_data_info->type, buffer);
packstr(ret_data_info->node_name, buffer);
-
+
msg.msg_type = ret_data_info->type;
msg.data = ret_data_info->data;
pack_msg(&msg, buffer);
@@ -4523,14 +4523,14 @@ _unpack_ret_list(List *ret_list,
ret_data_info_t *ret_data_info = NULL;
slurm_msg_t msg;
*ret_list = list_create(destroy_data_info);
-
+
for (i=0; i<size_val; i++) {
ret_data_info = xmalloc(sizeof(ret_data_info_t));
list_push(*ret_list, ret_data_info);
-
+
safe_unpack32((uint32_t *)&ret_data_info->err, buffer);
safe_unpack16(&ret_data_info->type, buffer);
- safe_unpackstr_xmalloc(&ret_data_info->node_name,
+ safe_unpackstr_xmalloc(&ret_data_info->node_name,
&uint32_tmp, buffer);
msg.msg_type = ret_data_info->type;
if (unpack_msg(&msg, buffer) != SLURM_SUCCESS)
@@ -4542,7 +4542,7 @@ _unpack_ret_list(List *ret_list,
unpack_error:
if (ret_data_info && ret_data_info->type) {
- error("_unpack_ret_list: message type %u, record %d of %u",
+ error("_unpack_ret_list: message type %u, record %d of %u",
ret_data_info->type, i, size_val);
}
list_destroy(*ret_list);
@@ -4626,11 +4626,11 @@ _unpack_batch_job_launch_msg(batch_job_launch_msg_t ** msg, Buf buffer)
safe_unpack32(&launch_msg_ptr->num_cpu_groups, buffer);
if (launch_msg_ptr->num_cpu_groups) {
- safe_unpack16_array(&(launch_msg_ptr->cpus_per_node),
+ safe_unpack16_array(&(launch_msg_ptr->cpus_per_node),
&uint32_tmp, buffer);
if (launch_msg_ptr->num_cpu_groups != uint32_tmp)
goto unpack_error;
- safe_unpack32_array(&(launch_msg_ptr->cpu_count_reps),
+ safe_unpack32_array(&(launch_msg_ptr->cpu_count_reps),
&uint32_tmp, buffer);
if (launch_msg_ptr->num_cpu_groups != uint32_tmp)
goto unpack_error;
@@ -4743,7 +4743,7 @@ _pack_srun_exec_msg(srun_exec_msg_t * msg, Buf buffer)
packstr_array(msg->argv, msg->argc, buffer);
}
-static int
+static int
_unpack_srun_exec_msg(srun_exec_msg_t ** msg_ptr, Buf buffer)
{
srun_exec_msg_t * msg;
@@ -4772,7 +4772,7 @@ _pack_srun_ping_msg(srun_ping_msg_t * msg, Buf buffer)
pack32((uint32_t)msg ->step_id , buffer ) ;
}
-static int
+static int
_unpack_srun_ping_msg(srun_ping_msg_t ** msg_ptr, Buf buffer)
{
srun_ping_msg_t * msg;
@@ -4791,7 +4791,7 @@ unpack_error:
return SLURM_ERROR;
}
-static void
+static void
_pack_srun_node_fail_msg(srun_node_fail_msg_t * msg, Buf buffer)
{
xassert ( msg != NULL );
@@ -4801,7 +4801,7 @@ _pack_srun_node_fail_msg(srun_node_fail_msg_t * msg, Buf buffer)
packstr(msg->nodelist, buffer ) ;
}
-static int
+static int
_unpack_srun_node_fail_msg(srun_node_fail_msg_t ** msg_ptr, Buf buffer)
{
uint32_t uint32_tmp;
@@ -4823,7 +4823,7 @@ unpack_error:
return SLURM_ERROR;
}
-static void
+static void
_pack_srun_step_missing_msg(srun_step_missing_msg_t * msg, Buf buffer)
{
xassert ( msg != NULL );
@@ -4833,7 +4833,7 @@ _pack_srun_step_missing_msg(srun_step_missing_msg_t * msg, Buf buffer)
packstr(msg->nodelist, buffer ) ;
}
-static int
+static int
_unpack_srun_step_missing_msg(srun_step_missing_msg_t ** msg_ptr, Buf buffer)
{
uint32_t uint32_tmp;
@@ -4893,7 +4893,7 @@ _pack_srun_timeout_msg(srun_timeout_msg_t * msg, Buf buffer)
pack_time ( msg -> timeout, buffer );
}
-static int
+static int
_unpack_srun_timeout_msg(srun_timeout_msg_t ** msg_ptr, Buf buffer)
{
srun_timeout_msg_t * msg;
@@ -5112,7 +5112,7 @@ static void _pack_file_bcast(file_bcast_msg_t * msg , Buf buffer )
xassert ( msg != NULL );
grow_buf(buffer, msg->block_len);
-
+
pack16 ( msg->block_no, buffer );
pack16 ( msg->last_block, buffer );
pack16 ( msg->force, buffer );
@@ -5197,15 +5197,15 @@ static int _unpack_trigger_msg(trigger_info_msg_t ** msg_ptr , Buf buffer)
for (i=0; i<msg->record_count; i++) {
safe_unpack32(&msg->trigger_array[i].trig_id, buffer);
safe_unpack16(&msg->trigger_array[i].res_type, buffer);
- safe_unpackstr_xmalloc(&msg->trigger_array[i].res_id,
+ safe_unpackstr_xmalloc(&msg->trigger_array[i].res_id,
&uint32_tmp, buffer);
safe_unpack16(&msg->trigger_array[i].trig_type, buffer);
safe_unpack16(&msg->trigger_array[i].offset, buffer);
safe_unpack32(&msg->trigger_array[i].user_id, buffer);
- safe_unpackstr_xmalloc(&msg->trigger_array[i].program,
+ safe_unpackstr_xmalloc(&msg->trigger_array[i].program,
&uint32_tmp, buffer);
}
- *msg_ptr = msg;
+ *msg_ptr = msg;
return SLURM_SUCCESS;
unpack_error:
@@ -5224,7 +5224,7 @@ static void _pack_kvs_host_rec(struct kvs_hosts *msg_ptr, Buf buffer)
static int _unpack_kvs_host_rec(struct kvs_hosts *msg_ptr, Buf buffer)
{
uint32_t uint32_tmp;
-
+
safe_unpack16(&msg_ptr->task_id, buffer);
safe_unpack16(&msg_ptr->port, buffer);
safe_unpackstr_xmalloc(&msg_ptr->hostname, &uint32_tmp, buffer);
@@ -5259,9 +5259,9 @@ static int _unpack_kvs_rec(struct kvs_comm **msg_ptr, Buf buffer)
msg->kvs_keys = xmalloc(sizeof(char *) * msg->kvs_cnt);
msg->kvs_values = xmalloc(sizeof(char *) * msg->kvs_cnt);
for (i=0; i<msg->kvs_cnt; i++) {
- safe_unpackstr_xmalloc(&msg->kvs_keys[i],
+ safe_unpackstr_xmalloc(&msg->kvs_keys[i],
&uint32_tmp, buffer);
- safe_unpackstr_xmalloc(&msg->kvs_values[i],
+ safe_unpackstr_xmalloc(&msg->kvs_values[i],
&uint32_tmp, buffer);
}
return SLURM_SUCCESS;
@@ -5279,7 +5279,7 @@ static void _pack_kvs_data(struct kvs_comm_set *msg_ptr, Buf buffer)
_pack_kvs_host_rec(&msg_ptr->kvs_host_ptr[i], buffer);
pack16(msg_ptr->kvs_comm_recs, buffer);
- for (i=0; i<msg_ptr->kvs_comm_recs; i++)
+ for (i=0; i<msg_ptr->kvs_comm_recs; i++)
_pack_kvs_rec(msg_ptr->kvs_comm_ptr[i], buffer);
}
@@ -5300,7 +5300,7 @@ static int _unpack_kvs_data(struct kvs_comm_set **msg_ptr, Buf buffer)
}
safe_unpack16(&msg->kvs_comm_recs, buffer);
- msg->kvs_comm_ptr = xmalloc(sizeof(struct kvs_comm) *
+ msg->kvs_comm_ptr = xmalloc(sizeof(struct kvs_comm) *
msg->kvs_comm_recs);
for (i=0; i<msg->kvs_comm_recs; i++) {
if (_unpack_kvs_rec(&msg->kvs_comm_ptr[i], buffer))
@@ -5354,7 +5354,7 @@ unpack_error:
return SLURM_ERROR;
}
-extern void
+extern void
pack_multi_core_data (multi_core_data_t *multi_core, Buf buffer)
{
if (multi_core == NULL) {
@@ -5373,7 +5373,7 @@ pack_multi_core_data (multi_core_data_t *multi_core, Buf buffer)
pack16(multi_core->plane_size, buffer);
}
-extern int
+extern int
unpack_multi_core_data (multi_core_data_t **mc_ptr, Buf buffer)
{
uint8_t flag;
@@ -5504,20 +5504,20 @@ static int
_unpack_set_debug_level_msg(set_debug_level_msg_t ** msg_ptr, Buf buffer)
{
set_debug_level_msg_t *msg;
-
+
msg = xmalloc(sizeof(set_debug_level_msg_t));
*msg_ptr = msg;
-
+
safe_unpack32(&msg->debug_level, buffer);
return SLURM_SUCCESS;
-
+
unpack_error:
slurm_free_set_debug_level_msg(msg);
*msg_ptr = NULL;
return SLURM_ERROR;
}
-static void
+static void
_pack_will_run_response_msg(will_run_response_msg_t *msg, Buf buffer)
{
uint32_t count = NO_VAL, *job_id_ptr;
@@ -5621,9 +5621,9 @@ static int _unpack_accounting_update_msg(accounting_update_msg_t **msg,
goto unpack_error;
list_append(msg_ptr->update_list, rec);
}
-
+
return SLURM_SUCCESS;
-
+
unpack_error:
slurm_free_accounting_update_msg(msg_ptr);
*msg = NULL;
@@ -5654,28 +5654,28 @@ static int _unpack_topo_info_msg(topo_info_response_msg_t **msg,
*msg = msg_ptr;
safe_unpack32(&msg_ptr->record_count, buffer);
- msg_ptr->topo_array = xmalloc(sizeof(topo_info_t) *
+ msg_ptr->topo_array = xmalloc(sizeof(topo_info_t) *
msg_ptr->record_count);
for (i=0; i<msg_ptr->record_count; i++) {
safe_unpack16(&msg_ptr->topo_array[i].level, buffer);
safe_unpack32(&msg_ptr->topo_array[i].link_speed, buffer);
- safe_unpackstr_xmalloc(&msg_ptr->topo_array[i].name,
+ safe_unpackstr_xmalloc(&msg_ptr->topo_array[i].name,
&uint32_tmp, buffer);
- safe_unpackstr_xmalloc(&msg_ptr->topo_array[i].nodes,
+ safe_unpackstr_xmalloc(&msg_ptr->topo_array[i].nodes,
&uint32_tmp, buffer);
- safe_unpackstr_xmalloc(&msg_ptr->topo_array[i].switches,
+ safe_unpackstr_xmalloc(&msg_ptr->topo_array[i].switches,
&uint32_tmp, buffer);
}
-
+
return SLURM_SUCCESS;
-
+
unpack_error:
slurm_free_topo_info_msg(msg_ptr);
*msg = NULL;
return SLURM_ERROR;
}
-/* template
+/* template
void pack_ ( * msg , Buf buffer )
{
xassert ( msg != NULL );
diff --git a/src/common/slurm_protocol_pack.h b/src/common/slurm_protocol_pack.h
index 67d8439ada433b1224bb7399bdaa2807bb7bc1d2..6ba4a3fe0480cac04b31099738e4ce46d6c44c13 100644
--- a/src/common/slurm_protocol_pack.h
+++ b/src/common/slurm_protocol_pack.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Kevin Tew <tew1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -85,7 +85,7 @@ extern int unpack_header ( header_t * header , Buf buffer );
/* pack_msg
* packs a generic slurm protocol message body
* IN msg - the body structure to pack (note: includes message type)
- * IN/OUT buffer - destination of the pack, contains pointers that are
+ * IN/OUT buffer - destination of the pack, contains pointers that are
* automatically updated
* RET 0 or error code
*/
@@ -94,7 +94,7 @@ extern int pack_msg ( slurm_msg_t const * msg , Buf buffer );
/* unpack_msg
* unpacks a generic slurm protocol message body
* OUT msg - the body structure to unpack (note: includes message type)
- * IN/OUT buffer - source of the unpack, contains pointers that are
+ * IN/OUT buffer - source of the unpack, contains pointers that are
* automatically updated
* RET 0 or error code
*/
@@ -107,7 +107,7 @@ extern int unpack_msg ( slurm_msg_t * msgi , Buf buffer );
/* pack_job_credential
* packs a slurm job credential
* IN cred - pointer to the credential
- * IN/OUT buffer - destination of the pack, contains pointers that are
+ * IN/OUT buffer - destination of the pack, contains pointers that are
* automatically updated
*/
/* void pack_job_credential ( slurm_job_credential_t* cred , Buf buffer ) ;*/
@@ -115,7 +115,7 @@ extern int unpack_msg ( slurm_msg_t * msgi , Buf buffer );
/* unpack_job_credential
* unpacks a slurm job credential
* OUT cred - pointer to the credential pointer
- * IN/OUT buffer - source of the unpack, contains pointers that are
+ * IN/OUT buffer - source of the unpack, contains pointers that are
* automatically updated
* RET 0 or error code
*/
@@ -124,7 +124,7 @@ extern int unpack_msg ( slurm_msg_t * msgi , Buf buffer );
/* pack_job_step_info
* packs a slurm job steps info
* IN step - pointer to the job step info
- * IN/OUT buffer - destination of the pack, contains pointers that are
+ * IN/OUT buffer - destination of the pack, contains pointers that are
* automatically updated
*/
/* void pack_job_step_info ( job_step_info_t* step, Buf buffer ); */
@@ -132,9 +132,9 @@ extern int unpack_msg ( slurm_msg_t * msgi , Buf buffer );
/* pack_job_step_info_members
* pack selected fields of the description of a job into a buffer
* IN job_id, step_id, user_id, start_time, partition, nodes - job info
- * IN/OUT buffer - destination of the pack, contains pointers that are
+ * IN/OUT buffer - destination of the pack, contains pointers that are
* automatically updated
- */
+ */
/* void pack_job_step_info_members( uint32_t job_id, uint32_t step_id, */
/* uint32_t user_id, uint32_t num_tasks, time_t start_time, */
/* char *partition, char *nodes, char *name, char *network, */
diff --git a/src/common/slurm_protocol_socket_common.h b/src/common/slurm_protocol_socket_common.h
index 15909be7c1c1c0ab47d2539cd36a8171075353e1..82d6841e3c441e88bfcac11aa16ed15bfc22d2fa 100644
--- a/src/common/slurm_protocol_socket_common.h
+++ b/src/common/slurm_protocol_socket_common.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Kevin Tew <tew1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -59,7 +59,7 @@
#define SLURM_INADDR_ANY 0x00000000
/* LINUX SPECIFIC */
-/* this is the slurm equivalent of the operating system file descriptor,
+/* this is the slurm equivalent of the operating system file descriptor,
* which in linux is just an int */
typedef int32_t slurm_fd ;
@@ -77,7 +77,7 @@ typedef fd_set _slurm_fd_set ;
int16_t family ;
uint16_t port ;
uint32_t address ;
- char pad[16 - sizeof ( int16_t ) - sizeof (uint16_t) -
+ char pad[16 - sizeof ( int16_t ) - sizeof (uint16_t) -
sizeof (uint32_t) ] ;
} ;
*/
diff --git a/src/common/slurm_protocol_socket_implementation.c b/src/common/slurm_protocol_socket_implementation.c
index c6356af197e45f320ba69c0fb805018afcb35b95..60d703d5c619d67768d43c7e02c92632917533cc 100644
--- a/src/common/slurm_protocol_socket_implementation.c
+++ b/src/common/slurm_protocol_socket_implementation.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * slurm_protocol_socket_implementation.c - slurm communications interfaces
+ * slurm_protocol_socket_implementation.c - slurm communications interfaces
* based upon sockets.
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Kevin Tew <tew1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -94,7 +94,7 @@
* MIDDLE LAYER MSG FUNCTIONS
****************************************************************/
-/*
+/*
* Return time in msec since "start time"
*/
static int _tot_wait (struct timeval *start_time)
@@ -121,12 +121,12 @@ slurm_fd _slurm_open_msg_conn ( slurm_addr * slurm_address )
slurm_fd _slurm_accept_msg_conn (slurm_fd fd, slurm_addr *addr)
{
return _slurm_accept_stream(fd, addr);
-}
+}
/*
- * Pick a random port number to use. Use this if the system
- * selected port can't connect. This may indicate that the
- * port/address of both the client and server match a defunct
+ * Pick a random port number to use. Use this if the system
+ * selected port can't connect. This may indicate that the
+ * port/address of both the client and server match a defunct
* socket record in TIME_WAIT state.
*/
static void _sock_bind_wild(int sockfd)
@@ -153,37 +153,37 @@ static void _sock_bind_wild(int sockfd)
}
return;
}
-
-/*
+
+/*
* This would be a no-op in a message implementation
*/
-int _slurm_close_accepted_conn (slurm_fd fd)
+int _slurm_close_accepted_conn (slurm_fd fd)
{
return _slurm_close (fd);
}
-ssize_t _slurm_msg_recvfrom(slurm_fd fd, char **pbuf, size_t *lenp,
+ssize_t _slurm_msg_recvfrom(slurm_fd fd, char **pbuf, size_t *lenp,
uint32_t flags)
{
- return _slurm_msg_recvfrom_timeout(fd, pbuf, lenp, flags,
+ return _slurm_msg_recvfrom_timeout(fd, pbuf, lenp, flags,
(slurm_get_msg_timeout() * 1000));
}
-ssize_t _slurm_msg_recvfrom_timeout(slurm_fd fd, char **pbuf, size_t *lenp,
+ssize_t _slurm_msg_recvfrom_timeout(slurm_fd fd, char **pbuf, size_t *lenp,
uint32_t flags, int tmout)
{
ssize_t len;
uint32_t msglen;
- len = _slurm_recv_timeout( fd, (char *)&msglen,
+ len = _slurm_recv_timeout( fd, (char *)&msglen,
sizeof(msglen), 0, tmout );
- if (len < ((ssize_t) sizeof(msglen)))
+ if (len < ((ssize_t) sizeof(msglen)))
return SLURM_ERROR;
msglen = ntohl(msglen);
-
- if (msglen > MAX_MSG_SIZE)
+
+ if (msglen > MAX_MSG_SIZE)
slurm_seterrno_ret(SLURM_PROTOCOL_INSANE_MSG_LENGTH);
/*
@@ -198,34 +198,34 @@ ssize_t _slurm_msg_recvfrom_timeout(slurm_fd fd, char **pbuf, size_t *lenp,
}
*lenp = msglen;
-
+
return (ssize_t) msglen;
}
-ssize_t _slurm_msg_sendto(slurm_fd fd, char *buffer, size_t size,
+ssize_t _slurm_msg_sendto(slurm_fd fd, char *buffer, size_t size,
uint32_t flags)
{
- return _slurm_msg_sendto_timeout( fd, buffer, size, flags,
+ return _slurm_msg_sendto_timeout( fd, buffer, size, flags,
(slurm_get_msg_timeout() * 1000));
}
-ssize_t _slurm_msg_sendto_timeout(slurm_fd fd, char *buffer, size_t size,
+ssize_t _slurm_msg_sendto_timeout(slurm_fd fd, char *buffer, size_t size,
uint32_t flags, int timeout)
{
int len;
uint32_t usize;
SigFunc *ohandler;
- /*
- * Ignore SIGPIPE so that send can return a error code if the
- * other side closes the socket
+ /*
+ * Ignore SIGPIPE so that send can return a error code if the
+ * other side closes the socket
*/
ohandler = xsignal(SIGPIPE, SIG_IGN);
usize = htonl(size);
- if ((len = _slurm_send_timeout(
- fd, (char *)&usize, sizeof(usize), 0,
+ if ((len = _slurm_send_timeout(
+ fd, (char *)&usize, sizeof(usize), 0,
timeout)) < 0)
goto done;
@@ -240,7 +240,7 @@ ssize_t _slurm_msg_sendto_timeout(slurm_fd fd, char *buffer, size_t size,
/* Send slurm message with timeout
* RET message size (as specified in argument) or SLURM_ERROR on error */
-int _slurm_send_timeout(slurm_fd fd, char *buf, size_t size,
+int _slurm_send_timeout(slurm_fd fd, char *buf, size_t size,
uint32_t flags, int timeout)
{
int rc;
@@ -270,7 +270,7 @@ int _slurm_send_timeout(slurm_fd fd, char *buf, size_t size,
}
if ((rc = poll(&ufds, 1, timeleft)) <= 0) {
- if ((rc == 0) || (errno == EINTR) || (errno == EAGAIN))
+ if ((rc == 0) || (errno == EINTR) || (errno == EAGAIN))
continue;
else {
debug("_slurm_send_timeout at %d of %d, "
@@ -287,26 +287,26 @@ int _slurm_send_timeout(slurm_fd fd, char *buf, size_t size,
* If not then exit out and notify the sender. This
* is here since a write doesn't always tell you the
* socket is gone, but getting 0 back from a
- * nonblocking read means just that.
+ * nonblocking read means just that.
*/
if (ufds.revents & POLLERR) {
debug("_slurm_send_timeout: Socket POLLERR");
slurm_seterrno(ENOTCONN);
sent = SLURM_ERROR;
- goto done;
+ goto done;
}
if ((ufds.revents & POLLHUP) || (ufds.revents & POLLNVAL) ||
(_slurm_recv(fd, &temp, 1, flags) == 0)) {
debug2("_slurm_send_timeout: Socket no longer there");
slurm_seterrno(ENOTCONN);
sent = SLURM_ERROR;
- goto done;
+ goto done;
}
if ((ufds.revents & POLLOUT) != POLLOUT) {
error("_slurm_send_timeout: Poll failure, revents:%d",
ufds.revents);
}
-
+
rc = _slurm_send(fd, &buf[sent], (size - sent), flags);
if (rc < 0) {
if (errno == EINTR)
@@ -342,12 +342,12 @@ int _slurm_send_timeout(slurm_fd fd, char *buf, size_t size,
}
return sent;
-
+
}
/* Get slurm message with timeout
* RET message size (as specified in argument) or SLURM_ERROR on error */
-int _slurm_recv_timeout(slurm_fd fd, char *buffer, size_t size,
+int _slurm_recv_timeout(slurm_fd fd, char *buffer, size_t size,
uint32_t flags, int timeout )
{
int rc;
@@ -384,7 +384,7 @@ int _slurm_recv_timeout(slurm_fd fd, char *buffer, size_t size,
recvlen, size, strerror(errno));
slurm_seterrno(
SLURM_COMMUNICATIONS_RECEIVE_ERROR);
- recvlen = SLURM_ERROR;
+ recvlen = SLURM_ERROR;
goto done;
}
}
@@ -393,13 +393,13 @@ int _slurm_recv_timeout(slurm_fd fd, char *buffer, size_t size,
debug("_slurm_recv_timeout: Socket POLLERR");
slurm_seterrno(ENOTCONN);
recvlen = SLURM_ERROR;
- goto done;
+ goto done;
}
if ((ufds.revents & POLLHUP) || (ufds.revents & POLLNVAL)) {
debug2("_slurm_recv_timeout: Socket no longer there");
slurm_seterrno(ENOTCONN);
recvlen = SLURM_ERROR;
- goto done;
+ goto done;
}
if ((ufds.revents & POLLIN) != POLLIN) {
error("_slurm_recv_timeout: Poll failure, revents:%d",
@@ -417,7 +417,7 @@ int _slurm_recv_timeout(slurm_fd fd, char *buffer, size_t size,
recvlen, size, strerror(errno));
slurm_seterrno(
SLURM_COMMUNICATIONS_RECEIVE_ERROR);
- recvlen = SLURM_ERROR;
+ recvlen = SLURM_ERROR;
goto done;
}
}
@@ -463,28 +463,28 @@ slurm_fd _slurm_listen_stream(slurm_addr *addr)
rc = _slurm_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sz1);
if (rc < 0) {
error("setsockopt SO_REUSEADDR failed: %m");
- goto error;
+ goto error;
}
rc = _slurm_bind(fd, (struct sockaddr const *) addr, sizeof(*addr));
if (rc < 0) {
error("Error binding slurm stream socket: %m");
- goto error;
+ goto error;
}
if (_slurm_listen(fd, SLURM_PROTOCOL_DEFAULT_LISTEN_BACKLOG) < 0) {
error( "Error listening on slurm stream socket: %m" ) ;
rc = SLURM_ERROR;
- goto error;
+ goto error;
}
-
+
return fd;
error:
if ((_slurm_close_stream(fd) < 0) && (errno == EINTR))
_slurm_close_stream(fd); /* try again */
return rc;
-
+
}
slurm_fd _slurm_accept_stream(slurm_fd fd, slurm_addr *addr)
@@ -522,7 +522,7 @@ slurm_fd _slurm_open_stream(slurm_addr *addr, bool retry)
_sock_bind_wild(fd);
}
- rc = _slurm_connect(fd, (struct sockaddr const *)addr,
+ rc = _slurm_connect(fd, (struct sockaddr const *)addr,
sizeof(*addr));
if (rc >= 0) /* success */
break;
@@ -565,7 +565,7 @@ int _slurm_set_stream_non_blocking(slurm_fd fd)
return SLURM_SUCCESS;
}
-int _slurm_set_stream_blocking(slurm_fd fd)
+int _slurm_set_stream_blocking(slurm_fd fd)
{
fd_set_blocking(fd);
return SLURM_SUCCESS;
@@ -574,18 +574,18 @@ int _slurm_set_stream_blocking(slurm_fd fd)
extern int _slurm_socket (int __domain, int __type, int __protocol)
{
return socket ( __domain, __type, __protocol ) ;
-}
+}
extern slurm_fd _slurm_create_socket ( slurm_socket_type_t type )
{
switch ( type )
{
case SLURM_STREAM :
- return _slurm_socket ( AF_INET, SOCK_STREAM,
+ return _slurm_socket ( AF_INET, SOCK_STREAM,
IPPROTO_TCP) ;
break;
case SLURM_MESSAGE :
- return _slurm_socket ( AF_INET, SOCK_DGRAM,
+ return _slurm_socket ( AF_INET, SOCK_DGRAM,
IPPROTO_UDP ) ;
break;
default :
@@ -597,31 +597,31 @@ extern slurm_fd _slurm_create_socket ( slurm_socket_type_t type )
* protocol PROTOCOL, which are connected to each other, and put file
* descriptors for them in FDS[0] and FDS[1]. If PROTOCOL is zero,
* one will be chosen automatically. Returns 0 on success, -1 for errors. */
-extern int _slurm_socketpair (int __domain, int __type,
+extern int _slurm_socketpair (int __domain, int __type,
int __protocol, int __fds[2])
{
return SLURM_PROTOCOL_FUNCTION_NOT_IMPLEMENTED ;
}
/* Give the socket FD the local address ADDR (which is LEN bytes long). */
-extern int _slurm_bind (int __fd, struct sockaddr const * __addr,
+extern int _slurm_bind (int __fd, struct sockaddr const * __addr,
socklen_t __len)
{
return bind ( __fd , __addr , __len ) ;
}
/* Put the local address of FD into *ADDR and its length in *LEN. */
-extern int _slurm_getsockname (int __fd, struct sockaddr * __addr,
+extern int _slurm_getsockname (int __fd, struct sockaddr * __addr,
socklen_t *__restrict __len)
{
- return getsockname ( __fd , __addr , __len ) ;
+ return getsockname ( __fd , __addr , __len ) ;
}
/* Open a connection on socket FD to peer at ADDR (which LEN bytes long).
* For connectionless socket types, just set the default address to send to
* and the only address from which to accept transmissions.
* Return 0 on success, -1 for errors. */
-extern int _slurm_connect (int __fd, struct sockaddr const * __addr,
+extern int _slurm_connect (int __fd, struct sockaddr const * __addr,
socklen_t __len)
{
#if 0
@@ -631,7 +631,7 @@ extern int _slurm_connect (int __fd, struct sockaddr const * __addr,
* may be very long when syncookies are enabled on the server.
*
* Timeouts in excess of 3 minutes have been observed, resulting
- * in serious problems for slurmctld. Making the connect call
+ * in serious problems for slurmctld. Making the connect call
* non-blocking and polling seems to fix the problem. */
int rc, flags, err;
socklen_t len;
@@ -696,14 +696,14 @@ done:
/* Put the address of the peer connected to socket FD into *ADDR
* (which is *LEN bytes long), and its actual length into *LEN. */
-extern int _slurm_getpeername (int __fd, struct sockaddr * __addr,
+extern int _slurm_getpeername (int __fd, struct sockaddr * __addr,
socklen_t *__restrict __len)
{
return getpeername ( __fd , __addr , __len ) ;
}
/* Send N bytes of BUF to socket FD. Returns the number sent or -1. */
-extern ssize_t _slurm_send (int __fd, __const void *__buf, size_t __n,
+extern ssize_t _slurm_send (int __fd, __const void *__buf, size_t __n,
int __flags)
{
return send ( __fd , __buf , __n , __flags ) ;
@@ -718,8 +718,8 @@ extern ssize_t _slurm_recv (int __fd, void *__buf, size_t __n, int __flags)
/* Send N bytes of BUF on socket FD to peer at address ADDR (which is
* ADDR_LEN bytes long). Returns the number sent, or -1 for errors. */
-extern ssize_t _slurm_sendto (int __fd, __const void *__buf, size_t __n,
- int __flags, struct sockaddr const * __addr,
+extern ssize_t _slurm_sendto (int __fd, __const void *__buf, size_t __n,
+ int __flags, struct sockaddr const * __addr,
socklen_t __addr_len)
{
return sendto ( __fd , __buf , __n , __flags , __addr, __addr_len) ;
@@ -728,9 +728,9 @@ extern ssize_t _slurm_sendto (int __fd, __const void *__buf, size_t __n,
* If ADDR is not NULL, fill in *ADDR_LEN bytes of it with tha address of
* the sender, and store the actual size of the address in *ADDR_LEN.
* Returns the number of bytes read or -1 for errors. */
-extern ssize_t _slurm_recvfrom (int __fd, void *__restrict __buf,
- size_t __n, int __flags,
- struct sockaddr * __addr,
+extern ssize_t _slurm_recvfrom (int __fd, void *__restrict __buf,
+ size_t __n, int __flags,
+ struct sockaddr * __addr,
socklen_t *__restrict __addr_len)
{
return recvfrom ( __fd , __buf , __n , __flags , __addr, __addr_len) ;
@@ -738,7 +738,7 @@ extern ssize_t _slurm_recvfrom (int __fd, void *__restrict __buf,
/* Send a msg described MESSAGE on socket FD.
* Returns the number of bytes sent, or -1 for errors. */
-extern ssize_t _slurm_sendmsg (int __fd, __const struct msghdr *__msg,
+extern ssize_t _slurm_sendmsg (int __fd, __const struct msghdr *__msg,
int __flags)
{
return sendmsg ( __fd , __msg , __flags ) ;
@@ -754,8 +754,8 @@ extern ssize_t _slurm_recvmsg (int __fd, struct msghdr *__msg, int __flags)
/* Put the current value for socket FD's option OPTNAME at protocol level LEVEL
* into OPTVAL (which is *OPTLEN bytes long), and set *OPTLEN to the value's
* actual length. Returns 0 on success, -1 for errors. */
-extern int _slurm_getsockopt (int __fd, int __level, int __optname,
- void *__restrict __optval,
+extern int _slurm_getsockopt (int __fd, int __level, int __optname,
+ void *__restrict __optval,
socklen_t *__restrict __optlen)
{
return getsockopt ( __fd , __level , __optname , __optval , __optlen ) ;
@@ -764,7 +764,7 @@ extern int _slurm_getsockopt (int __fd, int __level, int __optname,
/* Set socket FD's option OPTNAME at protocol level LEVEL
* to *OPTVAL (which is OPTLEN bytes long).
* Returns 0 on success, -1 for errors. */
-extern int _slurm_setsockopt (int __fd, int __level, int __optname,
+extern int _slurm_setsockopt (int __fd, int __level, int __optname,
__const void *__optval, socklen_t __optlen)
{
return setsockopt ( __fd , __level , __optname , __optval , __optlen ) ;
@@ -784,7 +784,7 @@ extern int _slurm_listen (int __fd, int __n)
* set *ADDR (which is *ADDR_LEN bytes long) to the address of the connecting
* peer and *ADDR_LEN to the address's actual length, and return the
* new socket's descriptor, or -1 for errors. */
-extern int _slurm_accept (int __fd, struct sockaddr * __addr,
+extern int _slurm_accept (int __fd, struct sockaddr * __addr,
socklen_t *__restrict __addr_len)
{
return accept ( __fd , __addr , __addr_len ) ;
@@ -856,7 +856,7 @@ void _slurm_set_addr_char (slurm_addr * addr, uint16_t port, char *host)
int h_err = 0;
char * h_buf[4096];
- /*
+ /*
* If NULL hostname passed in, we only update the port
* of addr
*/
@@ -873,11 +873,11 @@ void _slurm_set_addr_char (slurm_addr * addr, uint16_t port, char *host)
error("Unable to resolve \"%s\": %s", host, hstrerror(h_err));
addr->sin_family = 0;
addr->sin_port = 0;
- }
+ }
return;
}
-void _slurm_get_addr (slurm_addr *addr, uint16_t *port, char *host,
+void _slurm_get_addr (slurm_addr *addr, uint16_t *port, char *host,
unsigned int buflen )
{
struct hostent *he;
@@ -886,7 +886,7 @@ void _slurm_get_addr (slurm_addr *addr, uint16_t *port, char *host,
char * tmp_s_addr = (char *) &addr->sin_addr.s_addr;
int len = sizeof(addr->sin_addr.s_addr);
- he = get_host_by_addr( tmp_s_addr, len, AF_SLURM,
+ he = get_host_by_addr( tmp_s_addr, len, AF_SLURM,
(void *) &h_buf, sizeof(h_buf), &h_err );
if (he != NULL) {
@@ -896,7 +896,7 @@ void _slurm_get_addr (slurm_addr *addr, uint16_t *port, char *host,
error("Lookup failed: %s", host_strerror(h_err));
*port = 0;
strncpy(host, "", buflen);
- }
+ }
return;
}
@@ -907,7 +907,7 @@ void _slurm_print_slurm_addr ( slurm_addr * address, char *buf, size_t n )
/* warning: silently truncates */
snprintf(buf, n, "%s:%d", addrbuf, ntohs(address->sin_port));
}
-
+
void _slurm_pack_slurm_addr(slurm_addr *addr, Buf buffer)
{
pack32( ntohl( addr->sin_addr.s_addr ), buffer );
diff --git a/src/common/slurm_protocol_util.c b/src/common/slurm_protocol_util.c
index 90f34b5f1050ebbc3c9eedec12cc014470f33f5c..fee9a19c9e64fc82a0e72cf5ca12e8930e8da22a 100644
--- a/src/common/slurm_protocol_util.c
+++ b/src/common/slurm_protocol_util.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Kevin Tew <tew1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -47,9 +47,9 @@
#include "src/common/xmalloc.h"
#include "src/slurmdbd/read_config.h"
-/*
- * check_header_version checks to see that the specified header was sent
- * from a node running the same version of the protocol as the current node
+/*
+ * check_header_version checks to see that the specified header was sent
+ * from a node running the same version of the protocol as the current node
* IN header - the message header received
* RET - SLURM error code
*/
@@ -67,7 +67,7 @@ int check_header_version(header_t * header)
}
/*
- * init_header - simple function to create a header, always insuring that
+ * init_header - simple function to create a header, always insuring that
* an accurate version string is inserted
* OUT header - the message header to be send
* IN msg_type - type of message to be send
@@ -90,9 +90,9 @@ void init_header(header_t *header, slurm_msg_t *msg,
header->version = SLURM_2_0_PROTOCOL_VERSION;
else
header->version = SLURM_1_3_PROTOCOL_VERSION;
- } else
+ } else
header->version = SLURM_PROTOCOL_VERSION;
-
+
header->flags = flags;
header->msg_type = msg->msg_type;
header->body_length = 0; /* over-written later */
@@ -108,7 +108,7 @@ void init_header(header_t *header, slurm_msg_t *msg,
/*
* update_header - update a message header with the message len
* OUT header - the message header to update
- * IN msg_length - length of message to be send
+ * IN msg_length - length of message to be send
*/
void update_header(header_t * header, uint32_t msg_length)
{
diff --git a/src/common/slurm_protocol_util.h b/src/common/slurm_protocol_util.h
index c4385574f7e2fd1e1483616f4945bebae257fe57..6027fc00ae1310904ec135c5a8fc83add80086ee 100644
--- a/src/common/slurm_protocol_util.h
+++ b/src/common/slurm_protocol_util.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Kevin Tew <tew1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -58,31 +58,31 @@
#include "src/common/slurm_protocol_pack.h"
#include "src/common/slurm_protocol_common.h"
-/*
- * check_header_version checks to see that the specified header was sent
- * from a node running the same version of the protocol as the current node
+/*
+ * check_header_version checks to see that the specified header was sent
+ * from a node running the same version of the protocol as the current node
* IN header - the message header received
* RET - SLURM error code
*/
extern int check_header_version(header_t * header);
/*
- * init_header - simple function to create a header, always insuring that
+ * init_header - simple function to create a header, always insuring that
* an accurate version string is inserted
* OUT header - the message header to be send
* IN msg_type - type of message to be send
* IN flags - message flags to be send
*/
-extern void
+extern void
init_header(header_t * header, slurm_msg_t *msg, uint16_t flags);
/*
* update_header - update a message header with the message len
* OUT header - the message header to update
- * IN msg_length - length of message to be send
+ * IN msg_length - length of message to be send
*/
-extern void
+extern void
update_header(header_t * header, uint32_t msg_length);
diff --git a/src/common/slurm_resource_info.c b/src/common/slurm_resource_info.c
index 958d6adb95880b71bef148076c212580f1a3def7..6896fe0c19620ac72b8121b1651253132cdc5033 100644
--- a/src/common/slurm_resource_info.c
+++ b/src/common/slurm_resource_info.c
@@ -1,20 +1,20 @@
/*****************************************************************************\
- * slurm_resource_info.c - Functions to determine number of available resources
+ * slurm_resource_info.c - Functions to determine number of available resources
* $Id: slurm_resource_info.c,v 1.12 2006/10/04 21:52:24 palermo Exp $
*****************************************************************************
* Copyright (C) 2006 Hewlett-Packard Development Company, L.P.
* Written by Susanne M. Balle, <susanne.balle@hp.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
@@ -30,7 +30,7 @@
* 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.
@@ -112,9 +112,9 @@ int slurm_get_avail_procs(const uint16_t min_sockets,
const uint16_t ntaskspernode,
const uint16_t ntaskspersocket,
const uint16_t ntaskspercore,
- uint16_t *cpus,
- uint16_t *sockets,
- uint16_t *cores,
+ uint16_t *cpus,
+ uint16_t *sockets,
+ uint16_t *cores,
uint16_t *threads,
const uint16_t *alloc_cores,
const select_type_plugin_info_t cr_type,
@@ -146,24 +146,24 @@ int slurm_get_avail_procs(const uint16_t min_sockets,
info("get_avail_procs %u %s HW_ sockets %u cores %u threads %u",
job_id, name, *sockets, *cores, *threads);
info("get_avail_procs %u %s Ntask node %u sockets %u core %u",
- job_id, name, ntaskspernode, ntaskspersocket,
+ job_id, name, ntaskspernode, ntaskspersocket,
ntaskspercore);
info("get_avail_procs %u %s cr_type %d cpus %u alloc_ c %u s %u",
job_id, name, cr_type, *cpus, allocated_cores,
allocated_sockets);
for (i = 0; alloc_cores && i < *sockets; i++)
- info("get_avail_procs %u %s alloc_cores[%d] = %u",
+ info("get_avail_procs %u %s alloc_cores[%d] = %u",
job_id, name, i, alloc_cores[i]);
#endif
allocated_cpus = allocated_cores * (*threads);
switch(cr_type) {
/* For the following CR types, nodes have no notion of socket, core,
- and thread. Only one level of logical processors */
+ and thread. Only one level of logical processors */
case SELECT_TYPE_INFO_NONE:
/* Default for select/linear */
case CR_CPU:
case CR_CPU_MEMORY:
-
+
if (*cpus >= allocated_cpus)
*cpus -= allocated_cpus;
else {
@@ -198,7 +198,7 @@ int slurm_get_avail_procs(const uint16_t min_sockets,
max_avail_cpus += tmp_diff;
}
}
- }
+ }
if (min_sockets > *sockets) {
*cpus = 0;
@@ -250,7 +250,7 @@ int slurm_get_avail_procs(const uint16_t min_sockets,
if (min_sockets > *sockets)
*cpus = 0;
-
+
/*** compute an overall maximum cpu count honoring ntasks* ***/
max_cpus = *threads;
if (ntaskspercore > 0) {
@@ -269,9 +269,9 @@ int slurm_get_avail_procs(const uint16_t min_sockets,
max_cpus = MIN(max_cpus, max_avail_cpus);
break;
}
-
+
/*** factor cpus_per_task into max_cpus ***/
- max_cpus *= cpus_per_task;
+ max_cpus *= cpus_per_task;
/*** round down available based on cpus_per_task ***/
avail_cpus = (*cpus / cpus_per_task) * cpus_per_task;
avail_cpus = MIN(avail_cpus, max_cpus);
@@ -407,7 +407,7 @@ void slurm_print_cpu_bind_help(void)
*
* returns -1 on error, 0 otherwise
*/
-int slurm_verify_cpu_bind(const char *arg, char **cpu_bind,
+int slurm_verify_cpu_bind(const char *arg, char **cpu_bind,
cpu_bind_type_t *flags)
{
char *buf, *p, *tok;
@@ -542,8 +542,8 @@ int slurm_verify_cpu_bind(const char *arg, char **cpu_bind,
}
} else if ((strcasecmp(tok, "socket") == 0) ||
(strcasecmp(tok, "sockets") == 0)) {
- if (task_plugin_param &
- (CPU_BIND_NONE | CPU_BIND_TO_CORES |
+ if (task_plugin_param &
+ (CPU_BIND_NONE | CPU_BIND_TO_CORES |
CPU_BIND_TO_THREADS | CPU_BIND_TO_LDOMS)) {
error("--cpu_bind=sockets incompatible with "
"TaskPluginParam configuration "
@@ -554,8 +554,8 @@ int slurm_verify_cpu_bind(const char *arg, char **cpu_bind,
CPU_BIND_TO_SOCKETS);
} else if ((strcasecmp(tok, "core") == 0) ||
(strcasecmp(tok, "cores") == 0)) {
- if (task_plugin_param &
- (CPU_BIND_NONE | CPU_BIND_TO_SOCKETS |
+ if (task_plugin_param &
+ (CPU_BIND_NONE | CPU_BIND_TO_SOCKETS |
CPU_BIND_TO_THREADS | CPU_BIND_TO_LDOMS)) {
error("--cpu_bind=cores incompatible with "
"TaskPluginParam configuration "
@@ -566,8 +566,8 @@ int slurm_verify_cpu_bind(const char *arg, char **cpu_bind,
CPU_BIND_TO_CORES);
} else if ((strcasecmp(tok, "thread") == 0) ||
(strcasecmp(tok, "threads") == 0)) {
- if (task_plugin_param &
- (CPU_BIND_NONE | CPU_BIND_TO_SOCKETS |
+ if (task_plugin_param &
+ (CPU_BIND_NONE | CPU_BIND_TO_SOCKETS |
CPU_BIND_TO_CORES | CPU_BIND_TO_LDOMS)) {
error("--cpu_bind=threads incompatible with "
"TaskPluginParam configuration "
@@ -578,8 +578,8 @@ int slurm_verify_cpu_bind(const char *arg, char **cpu_bind,
CPU_BIND_TO_THREADS);
} else if ((strcasecmp(tok, "ldom") == 0) ||
(strcasecmp(tok, "ldoms") == 0)) {
- if (task_plugin_param &
- (CPU_BIND_NONE | CPU_BIND_TO_SOCKETS |
+ if (task_plugin_param &
+ (CPU_BIND_NONE | CPU_BIND_TO_SOCKETS |
CPU_BIND_TO_CORES | CPU_BIND_TO_THREADS)) {
error("--cpu_bind=threads incompatible with "
"TaskPluginParam configuration "
@@ -628,7 +628,7 @@ void slurm_print_mem_bind_help(void)
*
* returns -1 on error, 0 otherwise
*/
-int slurm_verify_mem_bind(const char *arg, char **mem_bind,
+int slurm_verify_mem_bind(const char *arg, char **mem_bind,
mem_bind_type_t *flags)
{
char *buf, *p, *tok;
@@ -654,7 +654,7 @@ int slurm_verify_mem_bind(const char *arg, char **mem_bind,
if (strcasecmp(tok, "help") == 0) {
slurm_print_mem_bind_help();
return 1;
-
+
} else if ((strcasecmp(tok, "q") == 0) ||
(strcasecmp(tok, "quiet") == 0)) {
*flags &= ~MEM_BIND_VERBOSE;
diff --git a/src/common/slurm_resource_info.h b/src/common/slurm_resource_info.h
index a4a24c33fa228c72b931e44285e30f6c124dac19..c1a0743ffd54174d81693eb4e4b1b7c16b1f7596 100644
--- a/src/common/slurm_resource_info.h
+++ b/src/common/slurm_resource_info.h
@@ -1,20 +1,20 @@
/*****************************************************************************\
- * resource_info.h - Functions to determine number of available resources
+ * resource_info.h - Functions to determine number of available resources
* $Id: slurm_resource_info.h,v 1.6 2006/10/04 18:53:13 palermo Exp $
*****************************************************************************
* Copyright (C) 2006 Hewlett-Packard Development Company, L.P.
* Written by Susanne M. Balle, <susanne.balle@hp.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
@@ -30,7 +30,7 @@
* 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.
@@ -56,9 +56,9 @@ int slurm_get_avail_procs(const uint16_t minsockets,
const uint16_t ntaskspernode,
const uint16_t ntaskspersocket,
const uint16_t ntaskspercore,
- uint16_t *cpus,
- uint16_t *sockets,
- uint16_t *cores,
+ uint16_t *cpus,
+ uint16_t *sockets,
+ uint16_t *cores,
uint16_t *threads,
const uint16_t *alloc_cores,
const select_type_plugin_info_t cr_type,
@@ -70,9 +70,9 @@ void slurm_print_mem_bind_help(void);
void slurm_sprint_cpu_bind_type(char *str, cpu_bind_type_t cpu_bind_type);
void slurm_sprint_mem_bind_type(char *str, mem_bind_type_t mem_bind_type);
-int slurm_verify_cpu_bind(const char *arg, char **cpu_bind,
+int slurm_verify_cpu_bind(const char *arg, char **cpu_bind,
cpu_bind_type_t *flags);
-int slurm_verify_mem_bind(const char *arg, char **mem_bind,
+int slurm_verify_mem_bind(const char *arg, char **mem_bind,
mem_bind_type_t *flags);
#endif /* !_RES_INFO_H */
diff --git a/src/common/slurm_rlimits_info.c b/src/common/slurm_rlimits_info.c
index 43cea165beb3e48a0d1f94df8241eebd5498050b..28683d00a5e281694a922b23a04397f9eaf06265 100644
--- a/src/common/slurm_rlimits_info.c
+++ b/src/common/slurm_rlimits_info.c
@@ -14,15 +14,15 @@
* 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
+ * 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
+ * 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
@@ -142,7 +142,7 @@ parse_rlimits( char *rlimits_str, int propagate_flag )
}
/*
- * Since parse_rlimits may be called multiple times, we
+ * Since parse_rlimits may be called multiple times, we
* need to reinitialize the propagate flags when individual
* rlimits are specified.
*/
diff --git a/src/common/slurm_rlimits_info.h b/src/common/slurm_rlimits_info.h
index 2abac295c1d91c7151c98e6e155e5b08e2c89695..34270610075aeead4a0cdd88bc519358e2c809d4 100644
--- a/src/common/slurm_rlimits_info.h
+++ b/src/common/slurm_rlimits_info.h
@@ -14,15 +14,15 @@
* 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
+ * 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
+ * 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
@@ -44,12 +44,12 @@
* Values for the propagate rlimits flag.
*/
#define PROPAGATE_RLIMITS 1 /* The default is to propagate rlimits */
-#define NO_PROPAGATE_RLIMITS 0
+#define NO_PROPAGATE_RLIMITS 0
struct slurm_rlimits_info {
int resource; /* Values: RLIMIT_NPROC, RLIMIT_MEMLOCK, ... */
char *name; /* String: "NPROC", "MEMLOCK", ... */
- int propagate_flag; /* PROPAGATE_RLIMITS or NO_PROPAGATE_RLIMITS */
+ int propagate_flag; /* PROPAGATE_RLIMITS or NO_PROPAGATE_RLIMITS */
};
typedef struct slurm_rlimits_info slurm_rlimits_info_t;
diff --git a/src/common/slurm_selecttype_info.c b/src/common/slurm_selecttype_info.c
index 937fbd48eab42df685ca4c08ce25bc3673c494a1..74fdfec82efa018d770f2e1e0192fb631eb52bab 100644
--- a/src/common/slurm_selecttype_info.c
+++ b/src/common/slurm_selecttype_info.c
@@ -5,16 +5,16 @@
* Copyright (C) 2006 Hewlett-Packard Development Company, L.P.
* Written by Susanne M. Balle, <susanne.balle@hp.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
@@ -30,7 +30,7 @@
* 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.
@@ -47,10 +47,10 @@
*
* Return SLURM_SUCCESS on success, or SLURM_ERROR otherwise
*/
-int parse_select_type_param(char *select_type_parameters,
+int parse_select_type_param(char *select_type_parameters,
select_type_plugin_info_t *param)
{
- int rc = SLURM_SUCCESS;
+ int rc = SLURM_SUCCESS;
char *str_parameters, *st_str = NULL;
@@ -72,7 +72,7 @@ int parse_select_type_param(char *select_type_parameters,
} else if (strcasecmp(str_parameters, "CR_CPU_Memory") == 0) {
*param = CR_CPU_MEMORY;
} else {
- error("Bad SelectTypeParameter: %s\n",
+ error("Bad SelectTypeParameter: %s\n",
str_parameters );
rc = SLURM_ERROR;
xfree(st_str);
@@ -81,6 +81,6 @@ int parse_select_type_param(char *select_type_parameters,
} while ((str_parameters = strtok(NULL,",")));
}
xfree(st_str);
-
+
return rc;
}
diff --git a/src/common/slurm_selecttype_info.h b/src/common/slurm_selecttype_info.h
index 2e410e91548b227ad1b1d23a9ac159affe0719ef..9509c7fb36c332a23ab6a9bae368c643b6ce9b7f 100644
--- a/src/common/slurm_selecttype_info.h
+++ b/src/common/slurm_selecttype_info.h
@@ -5,16 +5,16 @@
* Copyright (C) 2006 Hewlett-Packard Development Company, L.P.
* Written by Susanne M. Balle, <susanne.balle@hp.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
@@ -30,7 +30,7 @@
* 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.
@@ -44,7 +44,7 @@
#include <string.h>
#include <slurm/slurm.h>
-int parse_select_type_param(char *select_type_parameters,
+int parse_select_type_param(char *select_type_parameters,
select_type_plugin_info_t *param);
#endif /*__SLURM_SELECTTYPE_INFO_H__*/
diff --git a/src/common/slurm_step_layout.c b/src/common/slurm_step_layout.c
index 3fbcd3d8fe468097e92a217acf691c8c83b11bfa..52d91bef3e201b4293d50ffc35ebf3143a0dde5c 100644
--- a/src/common/slurm_step_layout.c
+++ b/src/common/slurm_step_layout.c
@@ -7,21 +7,21 @@
* Written by Chris Holmes, <cholmes@hp.com>, who borrowed heavily
* from other parts of SLURM.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -55,15 +55,15 @@
#include "src/common/node_select.h"
/* build maps for task layout on nodes */
-static int _init_task_layout(slurm_step_layout_t *step_layout,
- const char *arbitrary_nodes,
+static int _init_task_layout(slurm_step_layout_t *step_layout,
+ const char *arbitrary_nodes,
uint16_t *cpus_per_node, uint32_t *cpu_count_reps,
uint16_t cpus_per_task,
uint16_t task_dist, uint16_t plane_size);
-static int _task_layout_block(slurm_step_layout_t *step_layout,
+static int _task_layout_block(slurm_step_layout_t *step_layout,
uint16_t *cpus);
-static int _task_layout_cyclic(slurm_step_layout_t *step_layout,
+static int _task_layout_cyclic(slurm_step_layout_t *step_layout,
uint16_t *cpus);
static int _task_layout_plane(slurm_step_layout_t *step_layout,
uint16_t *cpus);
@@ -74,32 +74,32 @@ static int _task_layout_hostfile(slurm_step_layout_t *step_layout,
-/*
- * slurm_step_layout_create - determine how many tasks of a job will be
- * run on each node. Distribution is influenced
- * by number of cpus on each host.
+/*
+ * slurm_step_layout_create - determine how many tasks of a job will be
+ * run on each node. Distribution is influenced
+ * by number of cpus on each host.
* IN tlist - hostlist corresponding to task layout
* IN cpus_per_node - cpus per node
* IN cpu_count_reps - how many nodes have same cpu count
- * IN num_hosts - number of hosts we have
+ * IN num_hosts - number of hosts we have
* IN num_tasks - number of tasks to distribute across these cpus
* IN cpus_per_task - number of cpus per task
- * IN task_dist - type of distribution we are using
+ * IN task_dist - type of distribution we are using
* IN plane_size - plane size (only needed for the plane distribution)
* RET a pointer to an slurm_step_layout_t structure
* NOTE: allocates memory that should be xfreed by caller
*/
slurm_step_layout_t *slurm_step_layout_create(
const char *tlist,
- uint16_t *cpus_per_node, uint32_t *cpu_count_reps,
- uint32_t num_hosts,
+ uint16_t *cpus_per_node, uint32_t *cpu_count_reps,
+ uint32_t num_hosts,
uint32_t num_tasks,
uint16_t cpus_per_task,
uint16_t task_dist,
uint16_t plane_size)
{
char *arbitrary_nodes = NULL;
- slurm_step_layout_t *step_layout =
+ slurm_step_layout_t *step_layout =
xmalloc(sizeof(slurm_step_layout_t));
step_layout->task_dist = task_dist;
@@ -120,7 +120,7 @@ slurm_step_layout_t *slurm_step_layout_create(
}
step_layout->task_cnt = num_tasks;
-
+
#ifdef HAVE_FRONT_END /* Limited job step support */
/* All jobs execute through front-end on Blue Gene.
* Normally we would not permit execution of job steps,
@@ -135,10 +135,10 @@ slurm_step_layout_t *slurm_step_layout_create(
step_layout->node_cnt = num_hosts;
#endif
- if(_init_task_layout(step_layout, arbitrary_nodes,
- cpus_per_node, cpu_count_reps,
+ if(_init_task_layout(step_layout, arbitrary_nodes,
+ cpus_per_node, cpu_count_reps,
cpus_per_task,
- task_dist, plane_size)
+ task_dist, plane_size)
!= SLURM_SUCCESS) {
slurm_step_layout_destroy(step_layout);
step_layout = NULL;
@@ -147,26 +147,26 @@ slurm_step_layout_t *slurm_step_layout_create(
return step_layout;
}
-/*
+/*
* fake_slurm_step_layout_create - used when you don't allocate a job from the
- * controller does not set up anything
- * that should really be used with a switch.
- * Or to really lay out tasks any any certain fashion.
+ * controller does not set up anything
+ * that should really be used with a switch.
+ * Or to really lay out tasks any any certain fashion.
* IN tlist - hostlist corresponding to task layout
* IN cpus_per_node - cpus per node NULL if no allocation
* IN cpu_count_reps - how many nodes have same cpu count NULL if no allocation
- * IN node_cnt - number of nodes we have
- * IN task_cnt - number of tasks to distribute across these cpus 0
+ * IN node_cnt - number of nodes we have
+ * IN task_cnt - number of tasks to distribute across these cpus 0
* if using cpus_per_node
* RET a pointer to an slurm_step_layout_t structure
* NOTE: allocates memory that should be xfreed by caller
*/
slurm_step_layout_t *fake_slurm_step_layout_create(
const char *tlist,
- uint16_t *cpus_per_node,
+ uint16_t *cpus_per_node,
uint32_t *cpu_count_reps,
- uint32_t node_cnt,
- uint32_t task_cnt)
+ uint32_t node_cnt,
+ uint32_t task_cnt)
{
uint32_t cpn = 1;
int cpu_cnt = 0, cpu_inx = 0, i, j;
@@ -185,7 +185,7 @@ slurm_step_layout_t *fake_slurm_step_layout_create(
/* make out how many cpus there are on each node */
if(task_cnt > 0)
cpn = (task_cnt + node_cnt - 1) / node_cnt;
-
+
step_layout = xmalloc(sizeof(slurm_step_layout_t));
step_layout->node_list = xstrdup(tlist);
step_layout->node_cnt = node_cnt;
@@ -198,13 +198,13 @@ slurm_step_layout_t *fake_slurm_step_layout_create(
for (i=0; i<step_layout->node_cnt; i++) {
if(cpus_per_node && cpu_count_reps) {
step_layout->tasks[i] = cpus_per_node[cpu_inx];
- step_layout->tids[i] = xmalloc(sizeof(uint32_t) *
+ step_layout->tids[i] = xmalloc(sizeof(uint32_t) *
step_layout->tasks[i]);
-
- for (j=0; j<step_layout->tasks[i]; j++)
- step_layout->tids[i][j] =
+
+ for (j=0; j<step_layout->tasks[i]; j++)
+ step_layout->tids[i][j] =
step_layout->task_cnt++;
-
+
if ((++cpu_cnt) >= cpu_count_reps[cpu_inx]) {
/* move to next record */
cpu_inx++;
@@ -216,11 +216,11 @@ slurm_step_layout_t *fake_slurm_step_layout_create(
step_layout->tids[i] = NULL;
} else {
step_layout->tasks[i] = cpn;
- step_layout->tids[i] =
+ step_layout->tids[i] =
xmalloc(sizeof(uint32_t) * cpn);
-
+
for (j=0; j<cpn; j++) {
- step_layout->tids[i][j] =
+ step_layout->tids[i][j] =
step_layout->task_cnt++;
if(step_layout->task_cnt >= task_cnt) {
step_layout->tasks[i] = j + 1;
@@ -239,7 +239,7 @@ slurm_step_layout_t *fake_slurm_step_layout_create(
/* SLURM_ERROR) { */
/* error("fake_slurm_step_layout_create: " */
/* "we didn't get an addr for host %s.", name); */
-
+
/* } */
/* free(name); */
}
@@ -259,7 +259,7 @@ extern slurm_step_layout_t *slurm_step_layout_copy(
{
slurm_step_layout_t *layout;
int i=0;
- if(!step_layout)
+ if(!step_layout)
return NULL;
layout = xmalloc(sizeof(slurm_step_layout_t));
@@ -267,33 +267,33 @@ extern slurm_step_layout_t *slurm_step_layout_copy(
layout->node_cnt = step_layout->node_cnt;
layout->task_cnt = step_layout->task_cnt;
layout->task_dist = step_layout->task_dist;
-
+
/* layout->node_addr = xmalloc(sizeof(slurm_addr) * layout->node_cnt); */
/* memcpy(layout->node_addr, step_layout->node_addr, */
/* (sizeof(slurm_addr) * layout->node_cnt)); */
layout->tasks = xmalloc(sizeof(uint16_t) * layout->node_cnt);
- memcpy(layout->tasks, step_layout->tasks,
+ memcpy(layout->tasks, step_layout->tasks,
(sizeof(uint16_t) * layout->node_cnt));
layout->tids = xmalloc(sizeof(uint32_t *) * layout->node_cnt);
for (i=0; i<layout->node_cnt; i++) {
layout->tids[i] = xmalloc(sizeof(uint32_t) * layout->tasks[i]);
- memcpy(layout->tids[i], step_layout->tids[i],
+ memcpy(layout->tids[i], step_layout->tids[i],
(sizeof(uint32_t) * layout->tasks[i]));
}
-
+
return layout;
}
-extern void pack_slurm_step_layout(slurm_step_layout_t *step_layout,
+extern void pack_slurm_step_layout(slurm_step_layout_t *step_layout,
Buf buffer)
{
uint16_t i = 0;
if(step_layout)
i=1;
-
- pack16(i, buffer);
+
+ pack16(i, buffer);
if(!i)
return;
packstr(step_layout->node_list, buffer);
@@ -304,7 +304,7 @@ extern void pack_slurm_step_layout(slurm_step_layout_t *step_layout,
/* step_layout->node_cnt, buffer); */
for(i=0; i<step_layout->node_cnt; i++) {
- pack32_array(step_layout->tids[i], step_layout->tasks[i],
+ pack32_array(step_layout->tids[i], step_layout->tasks[i],
buffer);
}
}
@@ -315,8 +315,8 @@ extern int unpack_slurm_step_layout(slurm_step_layout_t **layout, Buf buffer)
uint32_t num_tids, uint32_tmp;
slurm_step_layout_t *step_layout = NULL;
int i;
-
- safe_unpack16(&uint16_tmp, buffer);
+
+ safe_unpack16(&uint16_tmp, buffer);
if(!uint16_tmp)
return SLURM_SUCCESS;
@@ -331,23 +331,23 @@ extern int unpack_slurm_step_layout(slurm_step_layout_t **layout, Buf buffer)
safe_unpack32(&step_layout->node_cnt, buffer);
safe_unpack32(&step_layout->task_cnt, buffer);
safe_unpack16(&step_layout->task_dist, buffer);
-
+
/* if (slurm_unpack_slurm_addr_array(&(step_layout->node_addr), */
/* &uint32_tmp, buffer)) */
/* goto unpack_error; */
/* if (uint32_tmp != step_layout->node_cnt) */
/* goto unpack_error; */
-
+
step_layout->tasks = xmalloc(sizeof(uint32_t) * step_layout->node_cnt);
- step_layout->tids = xmalloc(sizeof(uint32_t *)
+ step_layout->tids = xmalloc(sizeof(uint32_t *)
* step_layout->node_cnt);
for(i = 0; i < step_layout->node_cnt; i++) {
- safe_unpack32_array(&(step_layout->tids[i]),
+ safe_unpack32_array(&(step_layout->tids[i]),
&num_tids,
buffer);
step_layout->tasks[i] = num_tids;
}
-
+
return SLURM_SUCCESS;
unpack_error:
@@ -368,10 +368,10 @@ extern int slurm_step_layout_destroy(slurm_step_layout_t *step_layout)
xfree(step_layout->tids[i]);
}
xfree(step_layout->tids);
-
+
xfree(step_layout);
}
-
+
return SLURM_SUCCESS;
}
@@ -380,8 +380,8 @@ int slurm_step_layout_host_id (slurm_step_layout_t *s, int taskid)
int i, j;
if (taskid > s->task_cnt - 1)
return SLURM_ERROR;
- for (i=0; i < s->node_cnt; i++)
- for (j=0; j<s->tasks[i]; j++)
+ for (i=0; i < s->node_cnt; i++)
+ for (j=0; j<s->tasks[i]; j++)
if(s->tids[i][j] == taskid)
return i;
@@ -391,10 +391,10 @@ int slurm_step_layout_host_id (slurm_step_layout_t *s, int taskid)
char *slurm_step_layout_host_name (slurm_step_layout_t *s, int taskid)
{
int hostid = slurm_step_layout_host_id (s, taskid);
-
+
if (hostid < 0)
return NULL;
-
+
return nodelist_nth_host(s->node_list, hostid);
}
@@ -422,21 +422,21 @@ static int _init_task_layout(slurm_step_layout_t *step_layout,
step_layout->plane_size = plane_size;
- step_layout->tasks = xmalloc(sizeof(uint16_t)
+ step_layout->tasks = xmalloc(sizeof(uint16_t)
* step_layout->node_cnt);
- step_layout->tids = xmalloc(sizeof(uint32_t *)
+ step_layout->tids = xmalloc(sizeof(uint32_t *)
* step_layout->node_cnt);
#ifndef HAVE_BG
hl = hostlist_create(step_layout->node_list);
- /* make sure the number of nodes we think we have
+ /* make sure the number of nodes we think we have
* is the correct number */
i = hostlist_count(hl);
if(step_layout->node_cnt > i)
step_layout->node_cnt = i;
hostlist_destroy(hl);
#endif
- debug("laying out the %u tasks on %u hosts %s\n",
+ debug("laying out the %u tasks on %u hosts %s\n",
step_layout->task_cnt, step_layout->node_cnt,
step_layout->node_list);
if(step_layout->node_cnt < 1) {
@@ -450,7 +450,7 @@ static int _init_task_layout(slurm_step_layout_t *step_layout,
/* error("hostlist incomplete for this job request"); */
/* hostlist_destroy(hl); */
/* return SLURM_ERROR; */
-/* } */
+/* } */
/* debug2("host %d = %s", i, name); */
/* free(name); */
cpus[i] = (cpus_per_node[cpu_inx] / cpus_per_task);
@@ -467,7 +467,7 @@ static int _init_task_layout(slurm_step_layout_t *step_layout,
cpu_cnt = 0;
}
}
-
+
if ((task_dist == SLURM_DIST_CYCLIC) ||
(task_dist == SLURM_DIST_CYCLIC_CYCLIC) ||
(task_dist == SLURM_DIST_CYCLIC_BLOCK))
@@ -495,7 +495,7 @@ static int _task_layout_hostfile(slurm_step_layout_t *step_layout,
char *host_task = NULL;
hostlist_t job_alloc_hosts = NULL;
hostlist_t step_alloc_hosts = NULL;
-
+
debug2("job list is %s", step_layout->node_list);
job_alloc_hosts = hostlist_create(step_layout->node_list);
itr = hostlist_iterator_create(job_alloc_hosts);
@@ -503,14 +503,14 @@ static int _task_layout_hostfile(slurm_step_layout_t *step_layout,
error("no hostlist given for arbitrary dist");
return SLURM_ERROR;
}
-
+
debug2("list is %s", arbitrary_nodes);
step_alloc_hosts = hostlist_create(arbitrary_nodes);
if(hostlist_count(step_alloc_hosts) != step_layout->task_cnt) {
error("Asked for %u tasks have %d in the nodelist. "
"Check your nodelist, or set the -n option to be %d",
- step_layout->task_cnt,
- hostlist_count(step_alloc_hosts),
+ step_layout->task_cnt,
+ hostlist_count(step_alloc_hosts),
hostlist_count(step_alloc_hosts));
return SLURM_ERROR;
}
@@ -524,14 +524,14 @@ static int _task_layout_hostfile(slurm_step_layout_t *step_layout,
}
free(host_task);
if(task_cnt >= step_layout->task_cnt)
- break;
+ break;
}
debug3("%s got %u tasks\n",
host,
step_layout->tasks[i]);
if(step_layout->tasks[i] == 0)
goto reset_hosts;
- step_layout->tids[i] = xmalloc(sizeof(uint32_t)
+ step_layout->tids[i] = xmalloc(sizeof(uint32_t)
* step_layout->tasks[i]);
taskid = 0;
j = 0;
@@ -548,7 +548,7 @@ static int _task_layout_hostfile(slurm_step_layout_t *step_layout,
}
i++;
reset_hosts:
- hostlist_iterator_reset(itr_task);
+ hostlist_iterator_reset(itr_task);
free(host);
if(i > step_layout->task_cnt)
break;
@@ -562,7 +562,7 @@ static int _task_layout_hostfile(slurm_step_layout_t *step_layout,
step_layout->task_cnt, task_cnt);
return SLURM_ERROR;
}
-
+
return SLURM_SUCCESS;
}
#endif
@@ -594,7 +594,7 @@ static int _task_layout_block(slurm_step_layout_t *step_layout, uint16_t *cpus)
/* now distribute the tasks */
taskid = 0;
for (i=0; i < step_layout->node_cnt; i++) {
- step_layout->tids[i] = xmalloc(sizeof(uint32_t)
+ step_layout->tids[i] = xmalloc(sizeof(uint32_t)
* step_layout->tasks[i]);
for (j=0; j<step_layout->tasks[i]; j++) {
step_layout->tids[i][j] = taskid;
@@ -617,22 +617,22 @@ static int _task_layout_block(slurm_step_layout_t *step_layout, uint16_t *cpus)
* 10 11 all processors allocated now
* 12 13 14 15 etc.
*/
-static int _task_layout_cyclic(slurm_step_layout_t *step_layout,
+static int _task_layout_cyclic(slurm_step_layout_t *step_layout,
uint16_t *cpus)
{
int i, j, taskid = 0;
bool over_subscribe = false;
for (i=0; i<step_layout->node_cnt; i++) {
- step_layout->tids[i] = xmalloc(sizeof(uint32_t)
+ step_layout->tids[i] = xmalloc(sizeof(uint32_t)
* step_layout->task_cnt);
}
for (j=0; taskid<step_layout->task_cnt; j++) { /* cycle counter */
bool space_remaining = false;
- for (i=0; ((i<step_layout->node_cnt)
+ for (i=0; ((i<step_layout->node_cnt)
&& (taskid<step_layout->task_cnt)); i++) {
if ((j<cpus[i]) || over_subscribe) {
- step_layout->tids[i][step_layout->tasks[i]] =
+ step_layout->tids[i][step_layout->tasks[i]] =
taskid;
taskid++;
step_layout->tasks[i]++;
@@ -647,13 +647,13 @@ static int _task_layout_cyclic(slurm_step_layout_t *step_layout,
}
-/*
+/*
* The plane distribution results in a block cyclic of block size
- * "plane_size".
- * The plane distribution does not do any workload balancing and
+ * "plane_size".
+ * The plane distribution does not do any workload balancing and
* just use the user specified blocksize: "plane_size".
- * This distribution does not take the hardware (number of CPUs
- * per node) into account when computing the number of tasks per
+ * This distribution does not take the hardware (number of CPUs
+ * per node) into account when computing the number of tasks per
* hosts.
* For example:
* plane_size = 2
@@ -686,12 +686,12 @@ static int _task_layout_plane(slurm_step_layout_t *step_layout,
taskid = 0;
for (j=0; taskid<step_layout->task_cnt; j++) { /* cycle counter */
- for (i=0; ((i<step_layout->node_cnt)
+ for (i=0; ((i<step_layout->node_cnt)
&& (taskid<step_layout->task_cnt)); i++) {
/* assign a block of 'plane_size' tasks to this node */
for (k=0; ((k<step_layout->plane_size)
&& (taskid<step_layout->task_cnt)); k++) {
- step_layout->tids[i][step_layout->tasks[i]] =
+ step_layout->tids[i][step_layout->tasks[i]] =
taskid;
taskid++;
step_layout->tasks[i]++;
@@ -700,7 +700,7 @@ static int _task_layout_plane(slurm_step_layout_t *step_layout,
}
if (taskid != step_layout->task_cnt) {
- error("_task_layout_plane: Mismatch in task count (%d != %d) ",
+ error("_task_layout_plane: Mismatch in task count (%d != %d) ",
taskid, step_layout->task_cnt);
return SLURM_ERROR;
}
@@ -710,16 +710,16 @@ static int _task_layout_plane(slurm_step_layout_t *step_layout,
for (i=0; i < step_layout->node_cnt; i++) {
info("tasks[%d]: %u", i, step_layout->tasks[i]);
}
-
+
for (i=0; i < step_layout->node_cnt; i++) {
info ("Host %d _plane_ # of tasks %u", i, step_layout->tasks[i]);
for (j=0; j<step_layout->tasks[i]; j++) {
- info ("Host %d _plane_ localid %d taskid %u",
+ info ("Host %d _plane_ localid %d taskid %u",
i, j, step_layout->tids[i][j]);
}
}
-#endif
-
+#endif
+
return SLURM_SUCCESS;
}
diff --git a/src/common/slurm_step_layout.h b/src/common/slurm_step_layout.h
index 76d942edaf51c9e2ad7896ac2456954f0ac7f9de..11dde8a78e5b85627e128b2874c152308ff64a78 100644
--- a/src/common/slurm_step_layout.h
+++ b/src/common/slurm_step_layout.h
@@ -7,21 +7,21 @@
* Written by Chris Holmes, <cholmes@hp.com>, who borrowed heavily
* from other parts of SLURM.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -47,49 +47,49 @@
#include "src/common/hostlist.h"
#include "src/common/pack.h"
-/*
- * slurm_step_layout_create - determine how many tasks of a job will be
- * run on each node. Distribution is influenced
- * by number of cpus on each host.
+/*
+ * slurm_step_layout_create - determine how many tasks of a job will be
+ * run on each node. Distribution is influenced
+ * by number of cpus on each host.
* IN tlist - hostlist corresponding to task layout
* IN cpus_per_node - cpus per node
* IN cpu_count_reps - how many nodes have same cpu count
- * IN node_cnt - number of nodes we have
+ * IN node_cnt - number of nodes we have
* IN task_cnt - number of tasks to distribute across these cpus
* IN cpus_per_task - number of cpus per task
- * IN task_dist - type of distribution we are using
+ * IN task_dist - type of distribution we are using
* IN plane_size - plane size (only needed for the plane distribution)
* RET a pointer to an slurm_step_layout_t structure
* NOTE: allocates memory that should be xfreed by caller
*/
extern slurm_step_layout_t *slurm_step_layout_create(const char *tlist,
- uint16_t *cpus_per_node,
+ uint16_t *cpus_per_node,
uint32_t *cpu_count_reps,
- uint32_t node_cnt,
+ uint32_t node_cnt,
uint32_t task_cnt,
uint16_t cpus_per_task,
uint16_t task_dist,
uint16_t plane_size);
-/*
+/*
* fake_slurm_step_layout_create - used when you don't allocate a job from the
- * controller does not set up anything
- * that should really be used with a switch.
- * Or to really lay out tasks any any certain fashion.
+ * controller does not set up anything
+ * that should really be used with a switch.
+ * Or to really lay out tasks any any certain fashion.
* IN tlist - hostlist corresponding to task layout
* IN cpus_per_node - cpus per node NULL if no allocation
* IN cpu_count_reps - how many nodes have same cpu count NULL if no allocation
- * IN node_cnt - number of nodes we have
- * IN task_cnt - number of tasks to distribute across these cpus 0
+ * IN node_cnt - number of nodes we have
+ * IN task_cnt - number of tasks to distribute across these cpus 0
* if using cpus_per_node
* RET a pointer to an slurm_step_layout_t structure
* NOTE: allocates memory that should be xfreed by caller
*/
extern slurm_step_layout_t *fake_slurm_step_layout_create(
const char *tlist,
- uint16_t *cpus_per_node,
+ uint16_t *cpus_per_node,
uint32_t *cpu_count_reps,
- uint32_t node_cnt,
+ uint32_t node_cnt,
uint32_t task_cnt);
/* copys structure for step layout */
@@ -97,7 +97,7 @@ extern slurm_step_layout_t *slurm_step_layout_copy(
slurm_step_layout_t *step_layout);
/* pack and unpack structure */
-extern void pack_slurm_step_layout(slurm_step_layout_t *step_layout,
+extern void pack_slurm_step_layout(slurm_step_layout_t *step_layout,
Buf buffer);
extern int unpack_slurm_step_layout(slurm_step_layout_t **layout, Buf buffer);
diff --git a/src/common/slurm_strcasestr.c b/src/common/slurm_strcasestr.c
index f4e34b740ce738158d01329fdaf55ce68cae7ec5..14794a1ad21e83b7ccc01bb04cff9540f795a44a 100644
--- a/src/common/slurm_strcasestr.c
+++ b/src/common/slurm_strcasestr.c
@@ -50,7 +50,7 @@ slurm_strcasestr(char *haystack, char *needle)
for (hay_inx=0; hay_inx<hay_size; hay_inx++) {
for (need_inx=0; need_inx<need_size; need_inx++) {
- if (tolower((int) hay_ptr[need_inx]) !=
+ if (tolower((int) hay_ptr[need_inx]) !=
tolower((int) needle [need_inx]))
break; /* mis-match */
}
diff --git a/src/common/slurm_topology.c b/src/common/slurm_topology.c
index f50059acca55e3503e59935d1dd543df6f5bb995..f93fe1b23253eb6296d9ec0c20f7dcf758ddd85d 100644
--- a/src/common/slurm_topology.c
+++ b/src/common/slurm_topology.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -93,13 +93,13 @@ slurm_topo_get_ops( slurm_topo_context_t *c )
/* Find the correct plugin. */
c->cur_plugin = plugin_load_and_link(c->topo_type, n_syms, syms,
(void **) &c->ops);
- if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
+ if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
error("Couldn't find the specified plugin name for %s "
"looking at all files",
c->topo_type);
-
+
/* Get plugin list. */
if ( c->plugin_list == NULL ) {
char *plugin_dir;
@@ -197,7 +197,7 @@ slurm_topo_init( void )
{
int retval = SLURM_SUCCESS;
char *topo_type = NULL;
-
+
slurm_mutex_lock( &g_topo_context_lock );
if ( g_topo_context )
diff --git a/src/common/slurm_topology.h b/src/common/slurm_topology.h
index 5f84b3047cd90e7a58e25e010179bb4c814992e9..7b144c8f59360c90ed2e984d0766c34178c9609a 100644
--- a/src/common/slurm_topology.h
+++ b/src/common/slurm_topology.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -50,7 +50,7 @@ struct switch_record {
int level; /* level in hierarchy, leaf=0 */
uint32_t link_speed; /* link speed, arbitrary units */
char *name; /* switch name */
- bitstr_t *node_bitmap; /* bitmap of all nodes descended from
+ bitstr_t *node_bitmap; /* bitmap of all nodes descended from
* this switch */
char *nodes; /* name if direct descendent nodes */
char *switches; /* name if direct descendent switches */
@@ -72,7 +72,7 @@ int slurm_topo_init( void );
/*
* Terminate the topology plugin.
- *
+ *
* Returns a SLURM errno.
*/
extern int slurm_topo_fini(void);
@@ -90,10 +90,10 @@ extern int slurm_topo_fini(void);
extern int slurm_topo_build_config( void );
/*
- * slurm_topo_get_node_addr - build node address and the associated pattern
+ * slurm_topo_get_node_addr - build node address and the associated pattern
* based on the topology information
*/
-extern int slurm_topo_get_node_addr( char* node_name, char** addr,
+extern int slurm_topo_get_node_addr( char* node_name, char** addr,
char** pattern );
#endif /*__SLURM_CONTROLLER_TOPO_PLUGIN_API_H__*/
diff --git a/src/common/slurm_xlator.h b/src/common/slurm_xlator.h
index 450e2f0d8e3f9693231305227d68b556b54508f2..32ad06e6bf20630402d375c7cd1d571720355c57 100644
--- a/src/common/slurm_xlator.h
+++ b/src/common/slurm_xlator.h
@@ -2,61 +2,61 @@
* slurm_xlator.h - Definitions required to translate SLURM function names
* to aliases containing a prefix of "slurm_".
*
- * This is required because some SLURM functions have common names
- * (e.g. "debug" and "info"). If a user application defines these functions
- * and uses SLURM APIs, they could link to the user function rather than
- * the SLURM function. By renaming the functions, inappropriate linking
+ * This is required because some SLURM functions have common names
+ * (e.g. "debug" and "info"). If a user application defines these functions
+ * and uses SLURM APIs, they could link to the user function rather than
+ * the SLURM function. By renaming the functions, inappropriate linking
* should be avoided.
*
* All SLURM functions referenced from the switch, auth, and mpi plugins should
- * have aliases established. Functions not referenced from the plugins
+ * have aliases established. Functions not referenced from the plugins
* need not be aliased.
*
* To use this header file:
- * 1. In the module containing the exported function code, establish an
- * alias for each of the functions after they are defined.
+ * 1. In the module containing the exported function code, establish an
+ * alias for each of the functions after they are defined.
* #include "src/common/macros.h"
- * strong_alias(<name>, slurm_<name>);
- * 2. For each function, change it's name then include the appropriate
+ * strong_alias(<name>, slurm_<name>);
+ * 2. For each function, change it's name then include the appropriate
* header file with definitions.
* #define <name> slurm_<name>
* 3. In the plugin modules using the functions, include this header file
* and remove other slurm header files (they should all be in this header).
- * This logic will have the plugin link only to the function names with
+ * This logic will have the plugin link only to the function names with
* the "slurm_" prefix.
*
- * NOTE: Not all operating systems support this function aliasing (e.g. AIX).
+ * NOTE: Not all operating systems support this function aliasing (e.g. AIX).
*****************************************************************************
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <grondona1@llnl.gov>, Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -207,7 +207,7 @@
#define debug3 slurm_debug3
/* macros.h functions
- * None exported today.
+ * None exported today.
* The header file used only for #define values. */
/* net.[ch] functions */
@@ -259,14 +259,14 @@
#define sort_key_pairs slurm_sort_key_pairs
/* slurm_auth.[ch] functions
- * None exported today.
+ * None exported today.
* The header file used only for #define values. */
/* strlcpy.[ch] functions */
#define strlcpy slurm_strlcpy
/* switch.[ch] functions
- * None exported today.
+ * None exported today.
* The header file used only for #define values. */
/* xassert.[ch] functions */
diff --git a/src/common/slurmdbd_defs.c b/src/common/slurmdbd_defs.c
index 25235b5b39279b76c49c98aa26f4050ed870202c..e697935ba0dd668deb539fca46915e9f4872b8b2 100644
--- a/src/common/slurmdbd_defs.c
+++ b/src/common/slurmdbd_defs.c
@@ -5,38 +5,38 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
\*****************************************************************************/
-#if HAVE_CONFIG_H
+#if HAVE_CONFIG_H
# include "config.h"
# if HAVE_INTTYPES_H
# include <inttypes.h>
@@ -128,7 +128,7 @@ static int _tot_wait (struct timeval *start_time);
* make_agent IN - make agent to process RPCs if set
* rollback IN - keep journal and permit rollback if set
* Returns SLURM_SUCCESS or an error code */
-extern int slurm_open_slurmdbd_conn(char *auth_info, bool make_agent,
+extern int slurm_open_slurmdbd_conn(char *auth_info, bool make_agent,
bool rollback)
{
int tmp_errno = SLURM_SUCCESS;
@@ -148,7 +148,7 @@ extern int slurm_open_slurmdbd_conn(char *auth_info, bool make_agent,
tmp_errno = errno;
}
slurm_mutex_unlock(&slurmdbd_lock);
-
+
slurm_mutex_lock(&agent_lock);
if (make_agent && ((agent_tid == 0) || (agent_list == NULL)))
_create_agent();
@@ -156,11 +156,11 @@ extern int slurm_open_slurmdbd_conn(char *auth_info, bool make_agent,
_load_dbd_state();
slurm_mutex_unlock(&agent_lock);
-
+
if(tmp_errno) {
errno = tmp_errno;
return tmp_errno;
- } else if (slurmdbd_fd < 0)
+ } else if (slurmdbd_fd < 0)
return SLURM_ERROR;
else
return SLURM_SUCCESS;
@@ -190,7 +190,7 @@ extern int slurm_close_slurmdbd_conn(void)
/* Send an RPC to the SlurmDBD and wait for the return code reply.
* The RPC will not be queued if an error occurs.
* Returns SLURM_SUCCESS or an error code */
-extern int slurm_send_slurmdbd_recv_rc_msg(uint16_t rpc_version,
+extern int slurm_send_slurmdbd_recv_rc_msg(uint16_t rpc_version,
slurmdbd_msg_t *req, int *resp_code)
{
int rc;
@@ -204,8 +204,8 @@ extern int slurm_send_slurmdbd_recv_rc_msg(uint16_t rpc_version,
if (rc != SLURM_SUCCESS) {
; /* error message already sent */
} else if (resp->msg_type != DBD_RC) {
- error("slurmdbd: response is not type DBD_RC: %s(%u)",
- slurmdbd_msg_type_2_str(resp->msg_type, 1),
+ error("slurmdbd: response is not type DBD_RC: %s(%u)",
+ slurmdbd_msg_type_2_str(resp->msg_type, 1),
resp->msg_type);
rc = SLURM_ERROR;
} else { /* resp->msg_type == DBD_RC */
@@ -217,8 +217,8 @@ extern int slurm_send_slurmdbd_recv_rc_msg(uint16_t rpc_version,
if(!comment)
comment = slurm_strerror(msg->return_code);
debug("slurmdbd: Issue with call %s(%u): %u(%s)",
- slurmdbd_msg_type_2_str(msg->sent_type, 1),
- msg->sent_type, msg->return_code,
+ slurmdbd_msg_type_2_str(msg->sent_type, 1),
+ msg->sent_type, msg->return_code,
comment);
}
slurmdbd_free_rc_msg(rpc_version, msg);
@@ -232,8 +232,8 @@ extern int slurm_send_slurmdbd_recv_rc_msg(uint16_t rpc_version,
* The RPC will not be queued if an error occurs.
* The "resp" message must be freed by the caller.
* Returns SLURM_SUCCESS or an error code */
-extern int slurm_send_recv_slurmdbd_msg(uint16_t rpc_version,
- slurmdbd_msg_t *req,
+extern int slurm_send_recv_slurmdbd_msg(uint16_t rpc_version,
+ slurmdbd_msg_t *req,
slurmdbd_msg_t *resp)
{
int rc = SLURM_SUCCESS, read_timeout;
@@ -253,7 +253,7 @@ extern int slurm_send_recv_slurmdbd_msg(uint16_t rpc_version,
if (slurmdbd_fd < 0) {
/* Either slurm_open_slurmdbd_conn() was not executed or
* the connection to Slurm DBD has been closed */
- if(req->msg_type == DBD_GET_CONFIG)
+ if(req->msg_type == DBD_GET_CONFIG)
_open_slurmdbd_fd(0);
else
_open_slurmdbd_fd(1);
@@ -278,29 +278,29 @@ extern int slurm_send_recv_slurmdbd_msg(uint16_t rpc_version,
buffer = _recv_msg(read_timeout);
if (buffer == NULL) {
- error("slurmdbd: Getting response to message type %u",
+ error("slurmdbd: Getting response to message type %u",
req->msg_type);
rc = SLURM_ERROR;
goto end_it;
}
-
+
rc = unpack_slurmdbd_msg(rpc_version, resp, buffer);
/* check for the rc of the start job message */
- if (rc == SLURM_SUCCESS && resp->msg_type == DBD_ID_RC)
+ if (rc == SLURM_SUCCESS && resp->msg_type == DBD_ID_RC)
rc = ((dbd_id_rc_msg_t *)resp->data)->return_code;
-
+
free_buf(buffer);
end_it:
pthread_cond_signal(&slurmdbd_cond);
slurm_mutex_unlock(&slurmdbd_lock);
-
+
return rc;
}
/* Send an RPC to the SlurmDBD. Do not wait for the reply. The RPC
* will be queued and processed later if the SlurmDBD is not responding.
* NOTE: slurm_open_slurmdbd_conn() must have been called with make_agent set
- *
+ *
* Returns SLURM_SUCCESS or an error code */
extern int slurm_send_slurmdbd_msg(uint16_t rpc_version, slurmdbd_msg_t *req)
{
@@ -308,7 +308,7 @@ extern int slurm_send_slurmdbd_msg(uint16_t rpc_version, slurmdbd_msg_t *req)
int cnt, rc = SLURM_SUCCESS;
static time_t syslog_time = 0;
-
+
buffer = pack_slurmdbd_msg(rpc_version, req);
slurm_mutex_lock(&agent_lock);
@@ -371,7 +371,7 @@ static void _open_slurmdbd_fd(bool need_db)
again:
slurm_set_addr(&dbd_addr, slurmdbd_port, slurmdbd_host);
if (dbd_addr.sin_port == 0)
- error("Unable to locate SlurmDBD host %s:%u",
+ error("Unable to locate SlurmDBD host %s:%u",
slurmdbd_host, slurmdbd_port);
else {
slurmdbd_fd = slurm_open_msg_conn(&dbd_addr);
@@ -382,9 +382,9 @@ again:
if(try_backup) {
try_backup = false;
xfree(slurmdbd_host);
- if((slurmdbd_host =
+ if((slurmdbd_host =
slurm_get_accounting_storage_backup_host()))
- goto again;
+ goto again;
}
} else {
int rc;
@@ -400,7 +400,7 @@ again:
} else {
error("slurmdbd: Sending DbdInit msg: %m");
_close_slurmdbd_fd();
- }
+ }
}
}
xfree(slurmdbd_host);
@@ -431,7 +431,7 @@ extern Buf pack_slurmdbd_msg(uint16_t rpc_version, slurmdbd_msg_t *req)
case DBD_GOT_USERS:
case DBD_GOT_CONFIG:
slurmdbd_pack_list_msg(
- rpc_version, req->msg_type,
+ rpc_version, req->msg_type,
(dbd_list_msg_t *)req->data, buffer);
break;
case DBD_ADD_ACCOUNT_COORDS:
@@ -446,7 +446,7 @@ extern Buf pack_slurmdbd_msg(uint16_t rpc_version, slurmdbd_msg_t *req)
case DBD_CLUSTER_PROCS:
case DBD_FLUSH_JOBS:
slurmdbd_pack_cluster_procs_msg(
- rpc_version,
+ rpc_version,
(dbd_cluster_procs_msg_t *)req->data, buffer);
break;
case DBD_GET_ACCOUNTS:
@@ -482,18 +482,18 @@ extern Buf pack_slurmdbd_msg(uint16_t rpc_version, slurmdbd_msg_t *req)
break;
case DBD_GET_JOBS:
slurmdbd_pack_get_jobs_msg(
- rpc_version,
+ rpc_version,
(dbd_get_jobs_msg_t *)req->data, buffer);
break;
case DBD_INIT:
slurmdbd_pack_init_msg(rpc_version,
- (dbd_init_msg_t *)req->data, buffer,
+ (dbd_init_msg_t *)req->data, buffer,
slurmdbd_auth_info);
break;
case DBD_FINI:
slurmdbd_pack_fini_msg(rpc_version,
(dbd_fini_msg_t *)req->data, buffer);
- break;
+ break;
case DBD_JOB_COMPLETE:
slurmdbd_pack_job_complete_msg(rpc_version,
(dbd_job_comp_msg_t *)req->data,
@@ -501,14 +501,14 @@ extern Buf pack_slurmdbd_msg(uint16_t rpc_version, slurmdbd_msg_t *req)
break;
case DBD_JOB_START:
slurmdbd_pack_job_start_msg(rpc_version,
- (dbd_job_start_msg_t *)req->data,
+ (dbd_job_start_msg_t *)req->data,
buffer);
break;
case DBD_ID_RC:
slurmdbd_pack_id_rc_msg(
rpc_version,
(dbd_id_rc_msg_t *)req->data, buffer);
- break;
+ break;
case DBD_JOB_SUSPEND:
slurmdbd_pack_job_suspend_msg(
rpc_version,
@@ -573,13 +573,13 @@ extern Buf pack_slurmdbd_msg(uint16_t rpc_version, slurmdbd_msg_t *req)
return buffer;
}
-extern int unpack_slurmdbd_msg(uint16_t rpc_version,
+extern int unpack_slurmdbd_msg(uint16_t rpc_version,
slurmdbd_msg_t *resp, Buf buffer)
{
int rc = SLURM_SUCCESS;
-
+
safe_unpack16(&resp->msg_type, buffer);
-
+
switch (resp->msg_type) {
case DBD_ADD_ACCOUNTS:
case DBD_ADD_ASSOCS:
@@ -647,7 +647,7 @@ extern int unpack_slurmdbd_msg(uint16_t rpc_version,
case DBD_GOT_WCKEY_USAGE:
rc = slurmdbd_unpack_usage_msg(
rpc_version,
- resp->msg_type, (dbd_usage_msg_t **)&resp->data,
+ resp->msg_type, (dbd_usage_msg_t **)&resp->data,
buffer);
break;
case DBD_GET_JOBS:
@@ -658,14 +658,14 @@ extern int unpack_slurmdbd_msg(uint16_t rpc_version,
case DBD_INIT:
rc = slurmdbd_unpack_init_msg(rpc_version,
(dbd_init_msg_t **)&resp->data,
- buffer,
+ buffer,
slurmdbd_auth_info);
break;
case DBD_FINI:
rc = slurmdbd_unpack_fini_msg(rpc_version,
(dbd_fini_msg_t **)&resp->data,
buffer);
- break;
+ break;
case DBD_JOB_COMPLETE:
rc = slurmdbd_unpack_job_complete_msg(
rpc_version,
@@ -680,7 +680,7 @@ extern int unpack_slurmdbd_msg(uint16_t rpc_version,
rc = slurmdbd_unpack_id_rc_msg(
rpc_version,
(dbd_id_rc_msg_t **)&resp->data, buffer);
- break;
+ break;
case DBD_JOB_SUSPEND:
rc = slurmdbd_unpack_job_suspend_msg(
rpc_version,
@@ -890,7 +890,7 @@ extern slurmdbd_msg_type_t str_2_slurmdbd_msg_type(char *msg_type)
} else if(!strcasecmp(msg_type, "Got Config")) {
return DBD_GOT_CONFIG;
} else {
- return NO_VAL;
+ return NO_VAL;
}
return NO_VAL;
@@ -1363,7 +1363,7 @@ static int _send_fini_msg(void)
_send_msg(buffer);
free_buf(buffer);
-
+
return SLURM_SUCCESS;
}
@@ -1457,7 +1457,7 @@ static int _get_return_code(uint16_t rpc_version, int read_timeout)
error("slurmdbd: unpack message error");
break;
case DBD_RC:
- if (slurmdbd_unpack_rc_msg(rpc_version,
+ if (slurmdbd_unpack_rc_msg(rpc_version,
&msg, buffer) == SLURM_SUCCESS) {
rc = msg->return_code;
if (rc != SLURM_SUCCESS) {
@@ -1482,7 +1482,7 @@ static int _get_return_code(uint16_t rpc_version, int read_timeout)
msg->sent_type, 1),
msg->sent_type,
msg->comment);
-
+
}
slurmdbd_free_rc_msg(rpc_version, msg);
} else
@@ -1525,7 +1525,7 @@ static Buf _recv_msg(int read_timeout)
while (msg_size > offset) {
if (!_fd_readable(slurmdbd_fd, read_timeout))
break; /* problem with this socket */
- msg_read = read(slurmdbd_fd, (msg + offset),
+ msg_read = read(slurmdbd_fd, (msg + offset),
(msg_size - offset));
if (msg_read <= 0) {
error("slurmdbd: read: %m");
@@ -1535,7 +1535,7 @@ static Buf _recv_msg(int read_timeout)
}
if (msg_size != offset) {
if (agent_shutdown == 0) {
- error("slurmdbd: only read %d of %d bytes",
+ error("slurmdbd: only read %d of %d bytes",
offset, msg_size);
} /* else in shutdown mode */
xfree(msg);
@@ -1560,7 +1560,7 @@ static int _tot_wait (struct timeval *start_time)
return msec_delay;
}
-/* Wait until a file is readable,
+/* Wait until a file is readable,
* RET false if can not be read */
static bool _fd_readable(slurm_fd fd, int read_timeout)
{
@@ -1595,7 +1595,7 @@ static bool _fd_readable(slurm_fd fd, int read_timeout)
return false;
}
if ((ufds.revents & POLLIN) == 0) {
- error("SlurmDBD connection %d events %d",
+ error("SlurmDBD connection %d events %d",
fd, ufds.revents);
return false;
}
@@ -1605,7 +1605,7 @@ static bool _fd_readable(slurm_fd fd, int read_timeout)
return false;
}
-/* Wait until a file is writeable,
+/* Wait until a file is writeable,
* RET 1 if file can be written now,
* 0 if can not be written to within 5 seconds
* -1 if file has been closed POLLHUP
@@ -1637,7 +1637,7 @@ static int _fd_writeable(slurm_fd fd)
* If not then exit out and notify the sender. This
* is here since a write doesn't always tell you the
* socket is gone, but getting 0 back from a
- * nonblocking read means just that.
+ * nonblocking read means just that.
*/
if (ufds.revents & POLLHUP || (recv(fd, &temp, 1, 0) == 0)) {
debug2("SlurmDBD connection is closed");
@@ -1652,7 +1652,7 @@ static int _fd_writeable(slurm_fd fd)
return 0;
}
if ((ufds.revents & POLLOUT) == 0) {
- error("SlurmDBD connection %d events %d",
+ error("SlurmDBD connection %d events %d",
fd, ufds.revents);
return 0;
}
@@ -1705,9 +1705,9 @@ static void _shutdown_agent(void)
break;
}
- /* On rare occasions agent thread may not end quickly,
- * perhaps due to communication problems with slurmdbd.
- * Cancel it and join before returning or we could remove
+ /* On rare occasions agent thread may not end quickly,
+ * perhaps due to communication problems with slurmdbd.
+ * Cancel it and join before returning or we could remove
* and leave the agent without valid data */
if (pthread_kill(agent_tid, 0) == 0) {
error("slurmdbd: agent failed to shutdown gracefully");
@@ -1741,7 +1741,7 @@ static void *_agent(void *x)
static time_t fail_time = 0;
int sigarray[] = {SIGUSR1, 0};
int read_timeout = SLURMDBD_TIMEOUT * 1000;
-
+
/* Prepare to catch SIGUSR1 to interrupt pending
* I/O and terminate in a timely fashion. */
xsignal(SIGUSR1, _sig_handler);
@@ -1752,8 +1752,8 @@ static void *_agent(void *x)
if(halt_agent)
pthread_cond_wait(&slurmdbd_cond, &slurmdbd_lock);
- if ((slurmdbd_fd < 0) &&
- (difftime(time(NULL), fail_time) >= 10)) {
+ if ((slurmdbd_fd < 0) &&
+ (difftime(time(NULL), fail_time) >= 10)) {
/* The connection to Slurm DBD is not open */
_open_slurmdbd_fd(1);
if (slurmdbd_fd < 0)
@@ -1789,12 +1789,12 @@ static void *_agent(void *x)
if(slurmdbd_fd >= 0 && running_cache)
pthread_cond_signal(&assoc_cache_cond);
slurm_mutex_unlock(&assoc_cache_mutex);
-
+
continue;
}
/* NOTE: agent_lock is clear here, so we can add more
- * requests to the queue while waiting for this RPC to
+ * requests to the queue while waiting for this RPC to
* complete. */
rc = _send_msg(buffer);
if (rc != SLURM_SUCCESS) {
@@ -1815,7 +1815,7 @@ static void *_agent(void *x)
}
}
slurm_mutex_unlock(&slurmdbd_lock);
-
+
slurm_mutex_lock(&assoc_cache_mutex);
if(slurmdbd_fd >= 0 && running_cache)
pthread_cond_signal(&assoc_cache_cond);
@@ -1894,7 +1894,7 @@ static void _load_dbd_state(void)
char *dbd_fname;
Buf buffer;
int fd, recovered = 0;
-
+
dbd_fname = slurm_get_state_save_location();
xstrcat(dbd_fname, "/dbd.messages");
fd = open(dbd_fname, O_RDONLY);
@@ -1915,7 +1915,7 @@ static void _load_dbd_state(void)
fatal("slurmdbd: list_enqueue, no memory");
recovered++;
}
-
+
verbose("slurmdbd: recovered %d pending RPCs", recovered);
(void) close(fd);
(void) unlink(dbd_fname); /* clear save state */
@@ -1949,7 +1949,7 @@ static int _save_dbd_rec(int fd, Buf buffer)
error("slurmdbd: state save error: %m");
return SLURM_ERROR;
}
- }
+ }
size = sizeof(magic);
wrote = write(fd, &magic, size);
@@ -2048,7 +2048,7 @@ static int _purge_job_start_req(void)
/****************************************************************************\
* Free data structures
\****************************************************************************/
-void inline slurmdbd_free_acct_coord_msg(uint16_t rpc_version,
+void inline slurmdbd_free_acct_coord_msg(uint16_t rpc_version,
dbd_acct_coord_msg_t *msg)
{
if(msg) {
@@ -2061,7 +2061,7 @@ void inline slurmdbd_free_acct_coord_msg(uint16_t rpc_version,
}
}
-void inline slurmdbd_free_cluster_procs_msg(uint16_t rpc_version,
+void inline slurmdbd_free_cluster_procs_msg(uint16_t rpc_version,
dbd_cluster_procs_msg_t *msg)
{
if (msg) {
@@ -2071,7 +2071,7 @@ void inline slurmdbd_free_cluster_procs_msg(uint16_t rpc_version,
}
}
-void inline slurmdbd_free_rec_msg(uint16_t rpc_version,
+void inline slurmdbd_free_rec_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_rec_msg_t *msg)
{
@@ -2094,7 +2094,7 @@ void inline slurmdbd_free_rec_msg(uint16_t rpc_version,
}
}
-void inline slurmdbd_free_cond_msg(uint16_t rpc_version,
+void inline slurmdbd_free_cond_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_cond_msg_t *msg)
{
@@ -2149,7 +2149,7 @@ void inline slurmdbd_free_cond_msg(uint16_t rpc_version,
}
}
-void inline slurmdbd_free_get_jobs_msg(uint16_t rpc_version,
+void inline slurmdbd_free_get_jobs_msg(uint16_t rpc_version,
dbd_get_jobs_msg_t *msg)
{
if (msg) {
@@ -2163,19 +2163,19 @@ void inline slurmdbd_free_get_jobs_msg(uint16_t rpc_version,
}
}
-void inline slurmdbd_free_init_msg(uint16_t rpc_version,
+void inline slurmdbd_free_init_msg(uint16_t rpc_version,
dbd_init_msg_t *msg)
{
xfree(msg);
}
-void inline slurmdbd_free_fini_msg(uint16_t rpc_version,
+void inline slurmdbd_free_fini_msg(uint16_t rpc_version,
dbd_fini_msg_t *msg)
{
xfree(msg);
}
-void inline slurmdbd_free_job_complete_msg(uint16_t rpc_version,
+void inline slurmdbd_free_job_complete_msg(uint16_t rpc_version,
dbd_job_comp_msg_t *msg)
{
if (msg) {
@@ -2184,7 +2184,7 @@ void inline slurmdbd_free_job_complete_msg(uint16_t rpc_version,
}
}
-void inline slurmdbd_free_job_start_msg(uint16_t rpc_version,
+void inline slurmdbd_free_job_start_msg(uint16_t rpc_version,
dbd_job_start_msg_t *msg)
{
if (msg) {
@@ -2200,19 +2200,19 @@ void inline slurmdbd_free_job_start_msg(uint16_t rpc_version,
}
}
-void inline slurmdbd_free_id_rc_msg(uint16_t rpc_version,
+void inline slurmdbd_free_id_rc_msg(uint16_t rpc_version,
dbd_id_rc_msg_t *msg)
{
xfree(msg);
}
-void inline slurmdbd_free_job_suspend_msg(uint16_t rpc_version,
+void inline slurmdbd_free_job_suspend_msg(uint16_t rpc_version,
dbd_job_suspend_msg_t *msg)
{
xfree(msg);
}
-void inline slurmdbd_free_list_msg(uint16_t rpc_version,
+void inline slurmdbd_free_list_msg(uint16_t rpc_version,
dbd_list_msg_t *msg)
{
if (msg) {
@@ -2222,13 +2222,13 @@ void inline slurmdbd_free_list_msg(uint16_t rpc_version,
}
}
-void inline slurmdbd_free_modify_msg(uint16_t rpc_version,
+void inline slurmdbd_free_modify_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_modify_msg_t *msg)
{
void (*destroy_cond) (void *object);
void (*destroy_rec) (void *object);
-
+
if (msg) {
switch(type) {
case DBD_MODIFY_ACCOUNTS:
@@ -2255,7 +2255,7 @@ void inline slurmdbd_free_modify_msg(uint16_t rpc_version,
fatal("Unknown modify type");
return;
}
-
+
if(msg->cond)
(*(destroy_cond))(msg->cond);
if(msg->rec)
@@ -2264,7 +2264,7 @@ void inline slurmdbd_free_modify_msg(uint16_t rpc_version,
}
}
-void inline slurmdbd_free_node_state_msg(uint16_t rpc_version,
+void inline slurmdbd_free_node_state_msg(uint16_t rpc_version,
dbd_node_state_msg_t *msg)
{
if (msg) {
@@ -2275,7 +2275,7 @@ void inline slurmdbd_free_node_state_msg(uint16_t rpc_version,
}
}
-void inline slurmdbd_free_rc_msg(uint16_t rpc_version,
+void inline slurmdbd_free_rc_msg(uint16_t rpc_version,
dbd_rc_msg_t *msg)
{
if(msg) {
@@ -2284,7 +2284,7 @@ void inline slurmdbd_free_rc_msg(uint16_t rpc_version,
}
}
-void inline slurmdbd_free_register_ctld_msg(uint16_t rpc_version,
+void inline slurmdbd_free_register_ctld_msg(uint16_t rpc_version,
dbd_register_ctld_msg_t *msg)
{
if(msg) {
@@ -2293,13 +2293,13 @@ void inline slurmdbd_free_register_ctld_msg(uint16_t rpc_version,
}
}
-void inline slurmdbd_free_roll_usage_msg(uint16_t rpc_version,
+void inline slurmdbd_free_roll_usage_msg(uint16_t rpc_version,
dbd_roll_usage_msg_t *msg)
{
xfree(msg);
}
-void inline slurmdbd_free_step_complete_msg(uint16_t rpc_version,
+void inline slurmdbd_free_step_complete_msg(uint16_t rpc_version,
dbd_step_comp_msg_t *msg)
{
if (msg) {
@@ -2308,7 +2308,7 @@ void inline slurmdbd_free_step_complete_msg(uint16_t rpc_version,
}
}
-void inline slurmdbd_free_step_start_msg(uint16_t rpc_version,
+void inline slurmdbd_free_step_start_msg(uint16_t rpc_version,
dbd_step_start_msg_t *msg)
{
if (msg) {
@@ -2319,7 +2319,7 @@ void inline slurmdbd_free_step_start_msg(uint16_t rpc_version,
}
}
-void inline slurmdbd_free_usage_msg(uint16_t rpc_version,
+void inline slurmdbd_free_usage_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_usage_msg_t *msg)
{
@@ -2362,7 +2362,7 @@ slurmdbd_pack_acct_coord_msg(uint16_t rpc_version,
if(msg->acct_list)
count = list_count(msg->acct_list);
-
+
pack32(count, buffer);
if(count) {
itr = list_iterator_create(msg->acct_list);
@@ -2377,7 +2377,7 @@ slurmdbd_pack_acct_coord_msg(uint16_t rpc_version,
}
int inline
-slurmdbd_unpack_acct_coord_msg(uint16_t rpc_version,
+slurmdbd_unpack_acct_coord_msg(uint16_t rpc_version,
dbd_acct_coord_msg_t **msg, Buf buffer)
{
uint32_t uint32_tmp;
@@ -2396,7 +2396,7 @@ slurmdbd_unpack_acct_coord_msg(uint16_t rpc_version,
}
}
- if(unpack_acct_user_cond((void *)&msg_ptr->cond, rpc_version, buffer)
+ if(unpack_acct_user_cond((void *)&msg_ptr->cond, rpc_version, buffer)
== SLURM_ERROR)
goto unpack_error;
return SLURM_SUCCESS;
@@ -2408,7 +2408,7 @@ unpack_error:
}
void inline
-slurmdbd_pack_cluster_procs_msg(uint16_t rpc_version,
+slurmdbd_pack_cluster_procs_msg(uint16_t rpc_version,
dbd_cluster_procs_msg_t *msg, Buf buffer)
{
if(rpc_version >= 5) {
@@ -2454,7 +2454,7 @@ unpack_error:
return SLURM_ERROR;
}
-void inline slurmdbd_pack_rec_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_rec_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_rec_msg_t *msg, Buf buffer)
{
@@ -2474,7 +2474,7 @@ void inline slurmdbd_pack_rec_msg(uint16_t rpc_version,
(*(my_function))(msg->rec, rpc_version, buffer);
}
-int inline slurmdbd_unpack_rec_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_rec_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_rec_msg_t **msg, Buf buffer)
{
@@ -2497,7 +2497,7 @@ int inline slurmdbd_unpack_rec_msg(uint16_t rpc_version,
if((*(my_function))(&msg_ptr->rec, rpc_version, buffer) == SLURM_ERROR)
goto unpack_error;
-
+
return SLURM_SUCCESS;
unpack_error:
@@ -2506,7 +2506,7 @@ unpack_error:
return SLURM_ERROR;
}
-void inline slurmdbd_pack_cond_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_cond_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_cond_msg_t *msg, Buf buffer)
{
@@ -2558,7 +2558,7 @@ void inline slurmdbd_pack_cond_msg(uint16_t rpc_version,
(*(my_function))(msg->cond, rpc_version, buffer);
}
-int inline slurmdbd_unpack_cond_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_cond_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_cond_msg_t **msg, Buf buffer)
{
@@ -2613,7 +2613,7 @@ int inline slurmdbd_unpack_cond_msg(uint16_t rpc_version,
if((*(my_function))(&msg_ptr->cond, rpc_version, buffer) == SLURM_ERROR)
goto unpack_error;
-
+
return SLURM_SUCCESS;
unpack_error:
@@ -2638,9 +2638,9 @@ void inline slurmdbd_pack_get_jobs_msg(uint16_t rpc_version,
pack_time(msg->last_update, buffer);
- if(msg->selected_steps)
+ if(msg->selected_steps)
i = list_count(msg->selected_steps);
-
+
pack32(i, buffer);
if(i) {
itr = list_iterator_create(msg->selected_steps);
@@ -2651,9 +2651,9 @@ void inline slurmdbd_pack_get_jobs_msg(uint16_t rpc_version,
}
i = 0;
- if(msg->selected_parts)
+ if(msg->selected_parts)
i = list_count(msg->selected_parts);
-
+
pack32(i, buffer);
if(i) {
itr = list_iterator_create(msg->selected_parts);
@@ -2714,8 +2714,8 @@ unpack_error:
return SLURM_ERROR;
}
-void inline
-slurmdbd_pack_init_msg(uint16_t rpc_version, dbd_init_msg_t *msg,
+void inline
+slurmdbd_pack_init_msg(uint16_t rpc_version, dbd_init_msg_t *msg,
Buf buffer, char *auth_info)
{
int rc;
@@ -2741,7 +2741,7 @@ slurmdbd_pack_init_msg(uint16_t rpc_version, dbd_init_msg_t *msg,
}
}
-int inline
+int inline
slurmdbd_unpack_init_msg(uint16_t rpc_version, dbd_init_msg_t **msg,
Buf buffer, char *auth_info)
{
@@ -2750,7 +2750,7 @@ slurmdbd_unpack_init_msg(uint16_t rpc_version, dbd_init_msg_t **msg,
dbd_init_msg_t *msg_ptr = xmalloc(sizeof(dbd_init_msg_t));
*msg = msg_ptr;
int rc = SLURM_SUCCESS;
-
+
safe_unpack16(&msg_ptr->rollback, buffer);
safe_unpack16(&msg_ptr->version, buffer);
auth_cred = g_slurm_auth_unpack(buffer);
@@ -2779,14 +2779,14 @@ unpack_error:
return rc;
}
-void inline
+void inline
slurmdbd_pack_fini_msg(uint16_t rpc_version, dbd_fini_msg_t *msg, Buf buffer)
{
pack16(msg->close_conn, buffer);
pack16(msg->commit, buffer);
}
-int inline
+int inline
slurmdbd_unpack_fini_msg(uint16_t rpc_version, dbd_fini_msg_t **msg, Buf buffer)
{
dbd_fini_msg_t *msg_ptr = xmalloc(sizeof(dbd_fini_msg_t));
@@ -2803,8 +2803,8 @@ unpack_error:
return SLURM_ERROR;
}
-void inline
-slurmdbd_pack_job_complete_msg(uint16_t rpc_version,
+void inline
+slurmdbd_pack_job_complete_msg(uint16_t rpc_version,
dbd_job_comp_msg_t *msg, Buf buffer)
{
if(rpc_version >= 6) {
@@ -2831,7 +2831,7 @@ slurmdbd_pack_job_complete_msg(uint16_t rpc_version,
}
}
-int inline
+int inline
slurmdbd_unpack_job_complete_msg(uint16_t rpc_version,
dbd_job_comp_msg_t **msg, Buf buffer)
{
@@ -2869,8 +2869,8 @@ unpack_error:
return SLURM_ERROR;
}
-void inline
-slurmdbd_pack_job_start_msg(uint16_t rpc_version,
+void inline
+slurmdbd_pack_job_start_msg(uint16_t rpc_version,
dbd_job_start_msg_t *msg, Buf buffer)
{
if(rpc_version >= 5) {
@@ -2894,8 +2894,8 @@ slurmdbd_pack_job_start_msg(uint16_t rpc_version,
pack32(msg->resv_id, buffer);
pack_time(msg->start_time, buffer);
pack_time(msg->submit_time, buffer);
- pack32(msg->timelimit, buffer);
- pack32(msg->uid, buffer);
+ pack32(msg->timelimit, buffer);
+ pack32(msg->uid, buffer);
packstr(msg->wckey, buffer);
} else if(rpc_version >= 3) {
packstr(msg->account, buffer);
@@ -2915,7 +2915,7 @@ slurmdbd_pack_job_start_msg(uint16_t rpc_version,
pack32(msg->req_cpus, buffer);
pack_time(msg->start_time, buffer);
pack_time(msg->submit_time, buffer);
- pack32(msg->uid, buffer);
+ pack32(msg->uid, buffer);
} else {
packstr(msg->account, buffer);
pack32(msg->alloc_cpus, buffer);
@@ -2934,10 +2934,10 @@ slurmdbd_pack_job_start_msg(uint16_t rpc_version,
pack_time(msg->start_time, buffer);
pack_time(msg->submit_time, buffer);
pack32(msg->uid, buffer);
- }
+ }
}
-int inline
+int inline
slurmdbd_unpack_job_start_msg(uint16_t rpc_version,
dbd_job_start_msg_t **msg, Buf buffer)
{
@@ -2967,8 +2967,8 @@ slurmdbd_unpack_job_start_msg(uint16_t rpc_version,
safe_unpack32(&msg_ptr->resv_id, buffer);
safe_unpack_time(&msg_ptr->start_time, buffer);
safe_unpack_time(&msg_ptr->submit_time, buffer);
- safe_unpack32(&msg_ptr->timelimit, buffer);
- safe_unpack32(&msg_ptr->uid, buffer);
+ safe_unpack32(&msg_ptr->timelimit, buffer);
+ safe_unpack32(&msg_ptr->uid, buffer);
safe_unpackstr_xmalloc(&msg_ptr->wckey, &uint32_tmp, buffer);
} else if(rpc_version >= 3) {
char *temp = NULL, *jname = NULL;
@@ -2990,7 +2990,7 @@ slurmdbd_unpack_job_start_msg(uint16_t rpc_version,
safe_unpack32(&msg_ptr->req_cpus, buffer);
safe_unpack_time(&msg_ptr->start_time, buffer);
safe_unpack_time(&msg_ptr->submit_time, buffer);
- safe_unpack32(&msg_ptr->uid, buffer);
+ safe_unpack32(&msg_ptr->uid, buffer);
/* first set the jname to the msg_ptr->name */
jname = xstrdup(msg_ptr->name);
@@ -3000,11 +3000,11 @@ slurmdbd_unpack_job_start_msg(uint16_t rpc_version,
if(strrchr(jname, '\"') != temp) {
error("job %u has quotes in it's name '%s', "
"no way to get correct wckey, "
- "setting name to 'bad_name'",
+ "setting name to 'bad_name'",
msg_ptr->job_id, jname);
xfree(jname);
jname = xstrdup("bad_name");
- } else {
+ } else {
/* if we have a wckey set the " to NULL to
* end the jname */
temp[0] = '\0';
@@ -3035,8 +3035,8 @@ slurmdbd_unpack_job_start_msg(uint16_t rpc_version,
safe_unpack_time(&msg_ptr->start_time, buffer);
safe_unpack_time(&msg_ptr->submit_time, buffer);
safe_unpack32(&msg_ptr->uid, buffer);
- }
-
+ }
+
return SLURM_SUCCESS;
unpack_error:
@@ -3045,16 +3045,16 @@ unpack_error:
return SLURM_ERROR;
}
-void inline
-slurmdbd_pack_id_rc_msg(uint16_t rpc_version,
+void inline
+slurmdbd_pack_id_rc_msg(uint16_t rpc_version,
dbd_id_rc_msg_t *msg, Buf buffer)
{
pack32(msg->id, buffer);
pack32(msg->return_code, buffer);
}
-int inline
-slurmdbd_unpack_id_rc_msg(uint16_t rpc_version,
+int inline
+slurmdbd_unpack_id_rc_msg(uint16_t rpc_version,
dbd_id_rc_msg_t **msg, Buf buffer)
{
dbd_id_rc_msg_t *msg_ptr = xmalloc(sizeof(dbd_id_rc_msg_t));
@@ -3069,7 +3069,7 @@ unpack_error:
return SLURM_ERROR;
}
-void inline
+void inline
slurmdbd_pack_job_suspend_msg(uint16_t rpc_version,
dbd_job_suspend_msg_t *msg, Buf buffer)
{
@@ -3081,7 +3081,7 @@ slurmdbd_pack_job_suspend_msg(uint16_t rpc_version,
pack_time(msg->suspend_time, buffer);
}
-int inline
+int inline
slurmdbd_unpack_job_suspend_msg(uint16_t rpc_version,
dbd_job_suspend_msg_t **msg, Buf buffer)
{
@@ -3157,10 +3157,10 @@ void inline slurmdbd_pack_list_msg(uint16_t rpc_version,
}
if(msg->my_list) {
count = list_count(msg->my_list);
- pack32(count, buffer);
+ pack32(count, buffer);
} else {
// to let user know there wasn't a list (error)
- pack32((uint32_t)-1, buffer);
+ pack32((uint32_t)-1, buffer);
}
if(count) {
itr = list_iterator_create(msg->my_list);
@@ -3171,7 +3171,7 @@ void inline slurmdbd_pack_list_msg(uint16_t rpc_version,
}
}
-int inline slurmdbd_unpack_list_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_list_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_list_msg_t **msg, Buf buffer)
{
@@ -3299,7 +3299,7 @@ void inline slurmdbd_pack_modify_msg(uint16_t rpc_version,
(*(my_rec))(msg->rec, rpc_version, buffer);
}
-int inline slurmdbd_unpack_modify_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_modify_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_modify_msg_t **msg, Buf buffer)
{
@@ -3340,7 +3340,7 @@ int inline slurmdbd_unpack_modify_msg(uint16_t rpc_version,
goto unpack_error;
if((*(my_rec))(&msg_ptr->rec, rpc_version, buffer) == SLURM_ERROR)
goto unpack_error;
-
+
return SLURM_SUCCESS;
unpack_error:
@@ -3349,7 +3349,7 @@ unpack_error:
return SLURM_ERROR;
}
-void inline
+void inline
slurmdbd_pack_node_state_msg(uint16_t rpc_version,
dbd_node_state_msg_t *msg, Buf buffer)
{
@@ -3382,7 +3382,7 @@ slurmdbd_unpack_node_state_msg(uint16_t rpc_version,
*msg = msg_ptr;
if(rpc_version >= 5) {
- safe_unpackstr_xmalloc(&msg_ptr->cluster_name,
+ safe_unpackstr_xmalloc(&msg_ptr->cluster_name,
&uint32_tmp, buffer);
safe_unpack32(&msg_ptr->cpu_count, buffer);
safe_unpackstr_xmalloc(&msg_ptr->hostlist, &uint32_tmp, buffer);
@@ -3391,13 +3391,13 @@ slurmdbd_unpack_node_state_msg(uint16_t rpc_version,
safe_unpack_time(&msg_ptr->event_time, buffer);
safe_unpack16(&msg_ptr->state, buffer);
} else {
- safe_unpackstr_xmalloc(&msg_ptr->cluster_name,
+ safe_unpackstr_xmalloc(&msg_ptr->cluster_name,
&uint32_tmp, buffer);
safe_unpack32(&msg_ptr->cpu_count, buffer);
safe_unpackstr_xmalloc(&msg_ptr->hostlist, &uint32_tmp, buffer);
safe_unpackstr_xmalloc(&msg_ptr->reason, &uint32_tmp, buffer);
safe_unpack16(&msg_ptr->new_state, buffer);
- safe_unpack_time(&msg_ptr->event_time, buffer);
+ safe_unpack_time(&msg_ptr->event_time, buffer);
}
return SLURM_SUCCESS;
@@ -3408,7 +3408,7 @@ unpack_error:
return SLURM_ERROR;
}
-void inline
+void inline
slurmdbd_pack_rc_msg(uint16_t rpc_version,
dbd_rc_msg_t *msg, Buf buffer)
{
@@ -3417,7 +3417,7 @@ slurmdbd_pack_rc_msg(uint16_t rpc_version,
pack16(msg->sent_type, buffer);
}
-int inline
+int inline
slurmdbd_unpack_rc_msg(uint16_t rpc_version,
dbd_rc_msg_t **msg, Buf buffer)
{
@@ -3435,7 +3435,7 @@ unpack_error:
return SLURM_ERROR;
}
-void inline
+void inline
slurmdbd_pack_register_ctld_msg(uint16_t rpc_version,
dbd_register_ctld_msg_t *msg, Buf buffer)
{
@@ -3443,7 +3443,7 @@ slurmdbd_pack_register_ctld_msg(uint16_t rpc_version,
pack16(msg->port, buffer);
}
-int inline
+int inline
slurmdbd_unpack_register_ctld_msg(uint16_t rpc_version,
dbd_register_ctld_msg_t **msg, Buf buffer)
{
@@ -3461,7 +3461,7 @@ unpack_error:
return SLURM_ERROR;
}
-void inline
+void inline
slurmdbd_pack_roll_usage_msg(uint16_t rpc_version,
dbd_roll_usage_msg_t *msg, Buf buffer)
{
@@ -3474,7 +3474,7 @@ slurmdbd_pack_roll_usage_msg(uint16_t rpc_version,
}
}
-int inline
+int inline
slurmdbd_unpack_roll_usage_msg(uint16_t rpc_version,
dbd_roll_usage_msg_t **msg, Buf buffer)
{
@@ -3490,14 +3490,14 @@ slurmdbd_unpack_roll_usage_msg(uint16_t rpc_version,
safe_unpack_time(&msg_ptr->start, buffer);
}
return SLURM_SUCCESS;
-
+
unpack_error:
slurmdbd_free_roll_usage_msg(rpc_version, msg_ptr);
*msg = NULL;
return SLURM_ERROR;
}
-void inline
+void inline
slurmdbd_pack_step_complete_msg(uint16_t rpc_version,
dbd_step_comp_msg_t *msg, Buf buffer)
{
@@ -3514,7 +3514,7 @@ slurmdbd_pack_step_complete_msg(uint16_t rpc_version,
pack32(msg->total_procs, buffer);
}
-int inline
+int inline
slurmdbd_unpack_step_complete_msg(uint16_t rpc_version,
dbd_step_comp_msg_t **msg, Buf buffer)
{
@@ -3539,7 +3539,7 @@ unpack_error:
return SLURM_ERROR;
}
-void inline
+void inline
slurmdbd_pack_step_start_msg(uint16_t rpc_version, dbd_step_start_msg_t *msg,
Buf buffer)
{
@@ -3570,7 +3570,7 @@ slurmdbd_pack_step_start_msg(uint16_t rpc_version, dbd_step_start_msg_t *msg,
}
}
-int inline
+int inline
slurmdbd_unpack_step_start_msg(uint16_t rpc_version,
dbd_step_start_msg_t **msg, Buf buffer)
{
@@ -3600,7 +3600,7 @@ slurmdbd_unpack_step_start_msg(uint16_t rpc_version,
safe_unpack_time(&msg_ptr->start_time, buffer);
safe_unpack_time(&msg_ptr->job_submit_time, buffer);
safe_unpack32(&msg_ptr->step_id, buffer);
- safe_unpack32(&msg_ptr->total_procs, buffer);
+ safe_unpack32(&msg_ptr->total_procs, buffer);
}
return SLURM_SUCCESS;
@@ -3634,7 +3634,7 @@ void inline slurmdbd_pack_usage_msg(uint16_t rpc_version,
fatal("Unknown pack type");
return;
}
-
+
(*(my_rec))(msg->rec, rpc_version, buffer);
pack_time(msg->start, buffer);
pack_time(msg->end, buffer);
@@ -3674,7 +3674,7 @@ int inline slurmdbd_unpack_usage_msg(uint16_t rpc_version,
unpack_time(&msg_ptr->start, buffer);
unpack_time(&msg_ptr->end, buffer);
-
+
return SLURM_SUCCESS;
unpack_error:
diff --git a/src/common/slurmdbd_defs.h b/src/common/slurmdbd_defs.h
index f55a06c34c7ed2874c10634de0564cda870a3222..06e95f2cd32fdef7074f0c8747c906ef20cd6ca8 100644
--- a/src/common/slurmdbd_defs.h
+++ b/src/common/slurmdbd_defs.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -39,7 +39,7 @@
#ifndef _SLURMDBD_DEFS_H
#define _SLURMDBD_DEFS_H
-#if HAVE_CONFIG_H
+#if HAVE_CONFIG_H
# include "config.h"
# if HAVE_INTTYPES_H
# include <inttypes.h>
@@ -59,16 +59,16 @@
#include "src/common/slurm_accounting_storage.h"
/*
- * SLURMDBD_VERSION is the version of the slurmdbd protocol currently
+ * SLURMDBD_VERSION is the version of the slurmdbd protocol currently
* being used (i.e. this code). Increment this value whenever an
* RPC is modified. When modifing an existing RPC copy the old
* version and the create a new pack/unpack for the new rpc_version.
- *
+ *
* SLURMDBD_VERSION_MIN is the minimum protocol version which slurmdbd
* will accept. Messages being sent to the slurmdbd from commands
- * or daemons using older versions of the protocol will be
+ * or daemons using older versions of the protocol will be
* rejected. Increment this value and discard the code processing
- * that msg_type only after all systems have been upgraded. Don't
+ * that msg_type only after all systems have been upgraded. Don't
* remove entries from slurmdbd_msg_type_t or the numbering scheme
* will break (the enum value of a msg_type would change).
*
@@ -218,7 +218,7 @@ typedef struct dbd_get_jobs_msg {
} dbd_get_jobs_msg_t;
typedef struct dbd_init_msg {
- uint16_t rollback; /* to allow rollbacks or not */
+ uint16_t rollback; /* to allow rollbacks or not */
uint16_t version; /* protocol version */
uint32_t uid; /* UID originating connection,
* filled by authtentication plugin*/
@@ -227,7 +227,7 @@ typedef struct dbd_init_msg {
typedef struct dbd_fini_msg {
uint16_t close_conn; /* to close connection 1, 0 will keep
connection open */
- uint16_t commit; /* to rollback(0) or commit(1) changes */
+ uint16_t commit; /* to rollback(0) or commit(1) changes */
} dbd_fini_msg_t;
typedef struct dbd_job_comp_msg {
@@ -249,7 +249,7 @@ typedef struct dbd_job_start_msg {
char * account; /* Account name for those not running
* with associations */
uint32_t alloc_cpus; /* count of allocated processors */
- uint32_t alloc_nodes; /* how many nodes used in job */
+ uint32_t alloc_nodes; /* how many nodes used in job */
uint32_t assoc_id; /* accounting association id */
char * cluster; /* cluster job is being ran on */
char * block_id; /* Bluegene block id */
@@ -349,7 +349,7 @@ typedef struct dbd_step_start_msg {
char * nodes; /* hosts allocated to the step */
char * node_inx; /* bitmap index of hosts allocated to
* the step */
- uint32_t node_cnt; /* how many nodes used in step */
+ uint32_t node_cnt; /* how many nodes used in step */
time_t start_time; /* step start time */
time_t job_submit_time;/* job submit time needed to find job record
* in db */
@@ -376,7 +376,7 @@ extern pthread_cond_t assoc_cache_cond; /* assoc cache condition */
* make_agent IN - make agent to process RPCs if set
* rollback IN - keep journal and permit rollback if set
* Returns SLURM_SUCCESS or an error code */
-extern int slurm_open_slurmdbd_conn(char *auth_info, bool make_agent,
+extern int slurm_open_slurmdbd_conn(char *auth_info, bool make_agent,
bool rollback);
/* Close the SlurmDBD socket connection */
@@ -385,7 +385,7 @@ extern int slurm_close_slurmdbd_conn();
/* Send an RPC to the SlurmDBD. Do not wait for the reply. The RPC
* will be queued and processed later if the SlurmDBD is not responding.
* NOTE: slurm_open_slurmdbd_conn() must have been called with make_agent set
- *
+ *
* Returns SLURM_SUCCESS or an error code */
extern int slurm_send_slurmdbd_msg(uint16_t rpc_version,
slurmdbd_msg_t *req);
@@ -395,7 +395,7 @@ extern int slurm_send_slurmdbd_msg(uint16_t rpc_version,
* The "resp" message must be freed by the caller.
* Returns SLURM_SUCCESS or an error code */
extern int slurm_send_recv_slurmdbd_msg(uint16_t rpc_version,
- slurmdbd_msg_t *req,
+ slurmdbd_msg_t *req,
slurmdbd_msg_t *resp);
/* Send an RPC to the SlurmDBD and wait for the return code reply.
@@ -405,7 +405,7 @@ extern int slurm_send_slurmdbd_recv_rc_msg(uint16_t rpc_version,
slurmdbd_msg_t *req, int *rc);
extern Buf pack_slurmdbd_msg(uint16_t rpc_version, slurmdbd_msg_t *req);
-extern int unpack_slurmdbd_msg(uint16_t rpc_version,
+extern int unpack_slurmdbd_msg(uint16_t rpc_version,
slurmdbd_msg_t *resp, Buf buffer);
extern slurmdbd_msg_type_t str_2_slurmdbd_msg_type(char *msg_type);
@@ -415,169 +415,169 @@ extern char *slurmdbd_msg_type_2_str(slurmdbd_msg_type_t msg_type,
/*****************************************************************************\
* Free various SlurmDBD message structures
\*****************************************************************************/
-void inline slurmdbd_free_acct_coord_msg(uint16_t rpc_version,
+void inline slurmdbd_free_acct_coord_msg(uint16_t rpc_version,
dbd_acct_coord_msg_t *msg);
-void inline slurmdbd_free_cluster_procs_msg(uint16_t rpc_version,
+void inline slurmdbd_free_cluster_procs_msg(uint16_t rpc_version,
dbd_cluster_procs_msg_t *msg);
-void inline slurmdbd_free_rec_msg(uint16_t rpc_version,
+void inline slurmdbd_free_rec_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_rec_msg_t *msg);
-void inline slurmdbd_free_cond_msg(uint16_t rpc_version,
+void inline slurmdbd_free_cond_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_cond_msg_t *msg);
-void inline slurmdbd_free_get_jobs_msg(uint16_t rpc_version,
+void inline slurmdbd_free_get_jobs_msg(uint16_t rpc_version,
dbd_get_jobs_msg_t *msg);
-void inline slurmdbd_free_init_msg(uint16_t rpc_version,
+void inline slurmdbd_free_init_msg(uint16_t rpc_version,
dbd_init_msg_t *msg);
-void inline slurmdbd_free_fini_msg(uint16_t rpc_version,
+void inline slurmdbd_free_fini_msg(uint16_t rpc_version,
dbd_fini_msg_t *msg);
-void inline slurmdbd_free_job_complete_msg(uint16_t rpc_version,
+void inline slurmdbd_free_job_complete_msg(uint16_t rpc_version,
dbd_job_comp_msg_t *msg);
-void inline slurmdbd_free_job_start_msg(uint16_t rpc_version,
+void inline slurmdbd_free_job_start_msg(uint16_t rpc_version,
dbd_job_start_msg_t *msg);
-void inline slurmdbd_free_id_rc_msg(uint16_t rpc_version,
+void inline slurmdbd_free_id_rc_msg(uint16_t rpc_version,
dbd_id_rc_msg_t *msg);
-void inline slurmdbd_free_job_suspend_msg(uint16_t rpc_version,
+void inline slurmdbd_free_job_suspend_msg(uint16_t rpc_version,
dbd_job_suspend_msg_t *msg);
-void inline slurmdbd_free_list_msg(uint16_t rpc_version,
+void inline slurmdbd_free_list_msg(uint16_t rpc_version,
dbd_list_msg_t *msg);
-void inline slurmdbd_free_modify_msg(uint16_t rpc_version,
+void inline slurmdbd_free_modify_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_modify_msg_t *msg);
-void inline slurmdbd_free_node_state_msg(uint16_t rpc_version,
+void inline slurmdbd_free_node_state_msg(uint16_t rpc_version,
dbd_node_state_msg_t *msg);
-void inline slurmdbd_free_rc_msg(uint16_t rpc_version,
+void inline slurmdbd_free_rc_msg(uint16_t rpc_version,
dbd_rc_msg_t *msg);
-void inline slurmdbd_free_register_ctld_msg(uint16_t rpc_version,
+void inline slurmdbd_free_register_ctld_msg(uint16_t rpc_version,
dbd_register_ctld_msg_t *msg);
-void inline slurmdbd_free_roll_usage_msg(uint16_t rpc_version,
+void inline slurmdbd_free_roll_usage_msg(uint16_t rpc_version,
dbd_roll_usage_msg_t *msg);
-void inline slurmdbd_free_step_complete_msg(uint16_t rpc_version,
+void inline slurmdbd_free_step_complete_msg(uint16_t rpc_version,
dbd_step_comp_msg_t *msg);
-void inline slurmdbd_free_step_start_msg(uint16_t rpc_version,
+void inline slurmdbd_free_step_start_msg(uint16_t rpc_version,
dbd_step_start_msg_t *msg);
-void inline slurmdbd_free_usage_msg(uint16_t rpc_version,
+void inline slurmdbd_free_usage_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_usage_msg_t *msg);
/*****************************************************************************\
* Pack various SlurmDBD message structures into a buffer
\*****************************************************************************/
-void inline slurmdbd_pack_acct_coord_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_acct_coord_msg(uint16_t rpc_version,
dbd_acct_coord_msg_t *msg,
Buf buffer);
-void inline slurmdbd_pack_cluster_procs_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_cluster_procs_msg(uint16_t rpc_version,
dbd_cluster_procs_msg_t *msg,
Buf buffer);
-void inline slurmdbd_pack_rec_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_rec_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_rec_msg_t *msg, Buf buffer);
-void inline slurmdbd_pack_cond_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_cond_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_cond_msg_t *msg, Buf buffer);
-void inline slurmdbd_pack_get_jobs_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_get_jobs_msg(uint16_t rpc_version,
dbd_get_jobs_msg_t *msg, Buf buffer);
-void inline slurmdbd_pack_init_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_init_msg(uint16_t rpc_version,
dbd_init_msg_t *msg, Buf buffer,
char *auth_info);
-void inline slurmdbd_pack_fini_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_fini_msg(uint16_t rpc_version,
dbd_fini_msg_t *msg, Buf buffer);
-void inline slurmdbd_pack_job_complete_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_job_complete_msg(uint16_t rpc_version,
dbd_job_comp_msg_t *msg,
Buf buffer);
-void inline slurmdbd_pack_job_start_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_job_start_msg(uint16_t rpc_version,
dbd_job_start_msg_t *msg,
Buf buffer);
-void inline slurmdbd_pack_id_rc_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_id_rc_msg(uint16_t rpc_version,
dbd_id_rc_msg_t *msg,
Buf buffer);
-void inline slurmdbd_pack_job_suspend_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_job_suspend_msg(uint16_t rpc_version,
dbd_job_suspend_msg_t *msg,
Buf buffer);
-void inline slurmdbd_pack_list_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_list_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_list_msg_t *msg, Buf buffer);
-void inline slurmdbd_pack_modify_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_modify_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_modify_msg_t *msg, Buf buffer);
-void inline slurmdbd_pack_node_state_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_node_state_msg(uint16_t rpc_version,
dbd_node_state_msg_t *msg,
Buf buffer);
-void inline slurmdbd_pack_rc_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_rc_msg(uint16_t rpc_version,
dbd_rc_msg_t *msg, Buf buffer);
-void inline slurmdbd_pack_register_ctld_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_register_ctld_msg(uint16_t rpc_version,
dbd_register_ctld_msg_t *msg,
Buf buffer);
-void inline slurmdbd_pack_roll_usage_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_roll_usage_msg(uint16_t rpc_version,
dbd_roll_usage_msg_t *msg, Buf buffer);
-void inline slurmdbd_pack_step_complete_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_step_complete_msg(uint16_t rpc_version,
dbd_step_comp_msg_t *msg,
Buf buffer);
-void inline slurmdbd_pack_step_start_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_step_start_msg(uint16_t rpc_version,
dbd_step_start_msg_t *msg,
Buf buffer);
-void inline slurmdbd_pack_usage_msg(uint16_t rpc_version,
+void inline slurmdbd_pack_usage_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_usage_msg_t *msg, Buf buffer);
/*****************************************************************************\
* Unpack various SlurmDBD message structures from a buffer
\*****************************************************************************/
-int inline slurmdbd_unpack_acct_coord_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_acct_coord_msg(uint16_t rpc_version,
dbd_acct_coord_msg_t **msg,
Buf buffer);
-int inline slurmdbd_unpack_cluster_procs_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_cluster_procs_msg(uint16_t rpc_version,
dbd_cluster_procs_msg_t **msg,
Buf buffer);
-int inline slurmdbd_unpack_rec_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_rec_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_rec_msg_t **msg, Buf buffer);
-int inline slurmdbd_unpack_cond_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_cond_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_cond_msg_t **msg, Buf buffer);
-int inline slurmdbd_unpack_get_jobs_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_get_jobs_msg(uint16_t rpc_version,
dbd_get_jobs_msg_t **msg, Buf buffer);
-int inline slurmdbd_unpack_init_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_init_msg(uint16_t rpc_version,
dbd_init_msg_t **msg, Buf buffer,
char *auth_info);
-int inline slurmdbd_unpack_fini_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_fini_msg(uint16_t rpc_version,
dbd_fini_msg_t **msg, Buf buffer);
-int inline slurmdbd_unpack_job_complete_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_job_complete_msg(uint16_t rpc_version,
dbd_job_comp_msg_t **msg,
Buf buffer);
-int inline slurmdbd_unpack_job_start_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_job_start_msg(uint16_t rpc_version,
dbd_job_start_msg_t **msg,
Buf buffer);
-int inline slurmdbd_unpack_id_rc_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_id_rc_msg(uint16_t rpc_version,
dbd_id_rc_msg_t **msg,
Buf buffer);
-int inline slurmdbd_unpack_job_suspend_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_job_suspend_msg(uint16_t rpc_version,
dbd_job_suspend_msg_t **msg,
Buf buffer);
-int inline slurmdbd_unpack_list_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_list_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_list_msg_t **msg, Buf buffer);
-int inline slurmdbd_unpack_modify_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_modify_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_modify_msg_t **msg, Buf buffer);
-int inline slurmdbd_unpack_node_state_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_node_state_msg(uint16_t rpc_version,
dbd_node_state_msg_t **msg,
Buf buffer);
-int inline slurmdbd_unpack_rc_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_rc_msg(uint16_t rpc_version,
dbd_rc_msg_t **msg, Buf buffer);
-int inline slurmdbd_unpack_register_ctld_msg(uint16_t rpc_version,
- dbd_register_ctld_msg_t **msg,
+int inline slurmdbd_unpack_register_ctld_msg(uint16_t rpc_version,
+ dbd_register_ctld_msg_t **msg,
Buf buffer);
-int inline slurmdbd_unpack_roll_usage_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_roll_usage_msg(uint16_t rpc_version,
dbd_roll_usage_msg_t **msg,
Buf buffer);
-int inline slurmdbd_unpack_step_complete_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_step_complete_msg(uint16_t rpc_version,
dbd_step_comp_msg_t **msg,
Buf buffer);
-int inline slurmdbd_unpack_step_start_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_step_start_msg(uint16_t rpc_version,
dbd_step_start_msg_t **msg,
Buf buffer);
-int inline slurmdbd_unpack_usage_msg(uint16_t rpc_version,
+int inline slurmdbd_unpack_usage_msg(uint16_t rpc_version,
slurmdbd_msg_type_t type,
dbd_usage_msg_t **msg,
Buf buffer);
diff --git a/src/common/stepd_api.c b/src/common/stepd_api.c
index 1096faa7d27486cce64b572005da90b45286528f..760c79eac26a3ddb39d3e4484004be0242446b9b 100644
--- a/src/common/stepd_api.c
+++ b/src/common/stepd_api.c
@@ -8,32 +8,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Christopher Morrone <morrone2@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -168,7 +168,7 @@ _guess_nodename()
char host[256];
char *nodename = NULL;
- if (gethostname_short(host, 256) != 0)
+ if (gethostname_short(host, 256) != 0)
return NULL;
nodename = slurm_conf_get_nodename(host);
@@ -188,7 +188,7 @@ _guess_nodename()
* slurmd on one node (unusual outside of development environments), you
* will get one of the local NodeNames more-or-less at random.
*
- * Returns a socket descriptor for the opened socket on success,
+ * Returns a socket descriptor for the opened socket on success,
* and -1 on error.
*/
int
@@ -497,7 +497,7 @@ _sockname_regex(regex_t *re, const char *filename,
free(match);
return 0;
-}
+}
/*
* Scan for available running slurm step daemons by checking
@@ -613,11 +613,11 @@ stepd_cleanup_sockets(const char *directory, const char *nodename)
path = NULL;
xstrfmtcat(path, "%s/%s", directory, ent->d_name);
- verbose("Cleaning up stray job step %u.%u",
+ verbose("Cleaning up stray job step %u.%u",
jobid, stepid);
/* signal the slurmstepd to terminate its step */
- fd = stepd_connect((char *) directory, (char *) nodename,
+ fd = stepd_connect((char *) directory, (char *) nodename,
jobid, stepid);
if (fd == -1) {
debug("Unable to connect to socket %s", path);
@@ -827,25 +827,25 @@ rwfail:
/*
*
- * Returns jobacctinfo_t struct on success, NULL on error.
+ * Returns jobacctinfo_t struct on success, NULL on error.
* jobacctinfo_t must be freed after calling this function.
*/
-int
+int
stepd_stat_jobacct(int fd, stat_jobacct_msg_t *sent, stat_jobacct_msg_t *resp)
{
int req = MESSAGE_STAT_JOBACCT;
int rc = SLURM_SUCCESS;
//jobacctinfo_t *jobacct = NULL;
int tasks = 0;
- debug("Entering stepd_stat_jobacct for job %u.%u",
+ debug("Entering stepd_stat_jobacct for job %u.%u",
sent->job_id, sent->step_id);
safe_write(fd, &req, sizeof(int));
-
+
/* Receive the jobacct struct and return */
resp->jobacct = jobacct_gather_g_create(NULL);
-
+
rc = jobacct_gather_g_getinfo(resp->jobacct, JOBACCT_DATA_PIPE, &fd);
-
+
safe_read(fd, &tasks, sizeof(int));
resp->num_tasks = tasks;
return rc;
diff --git a/src/common/stepd_api.h b/src/common/stepd_api.h
index 032fc81387a44698a550e882e5057a5119b543d6..f33a2914951956eb631d9ec20f04eb8b20ebefbd 100644
--- a/src/common/stepd_api.h
+++ b/src/common/stepd_api.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Christopher Morrone <morrone2@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -111,7 +111,7 @@ int stepd_terminate(int fd);
* slurmd on one node (unusual outside of development environments), you
* will get one of the local NodeNames more-or-less at random.
*
- * Returns a socket descriptor for the opened socket on success,
+ * Returns a socket descriptor for the opened socket on success,
* and -1 on error.
*/
int stepd_connect(const char *directory, const char *nodename,
@@ -142,7 +142,7 @@ int stepd_checkpoint(int fd, time_t timestamp, char *image_dir);
/*
* Send a signal to a single task in a job step.
*/
-int stepd_signal_task_local(int fd, int signal, int ltaskid);
+int stepd_signal_task_local(int fd, int signal, int ltaskid);
/*
* Send a signal to a single task in a job step.
@@ -219,10 +219,10 @@ int stepd_completion(int fd, step_complete_msg_t *sent);
/*
*
- * Returns SLURM_SUCCESS on success or SLURM_ERROR on error.
+ * Returns SLURM_SUCCESS on success or SLURM_ERROR on error.
* resp receives a jobacctinfo_t which must be freed if SUCCESS.
*/
-int stepd_stat_jobacct(int fd, stat_jobacct_msg_t *sent,
+int stepd_stat_jobacct(int fd, stat_jobacct_msg_t *sent,
stat_jobacct_msg_t *resp);
diff --git a/src/common/strlcpy.c b/src/common/strlcpy.c
index 6a757ced7cb3a08f4afc5ca3c7e4717484b3b005..e2d6eaf9d6d07bdc1e19598430b52c9ef2b40fd1 100644
--- a/src/common/strlcpy.c
+++ b/src/common/strlcpy.c
@@ -42,8 +42,8 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp
#include "src/common/strlcpy.h"
/*
- * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
- * for details.
+ * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
+ * for details.
*/
strong_alias(strlcpy, slurm_strlcpy);
diff --git a/src/common/switch.c b/src/common/switch.c
index 4ef150c28f9cf57ba6576795ccce1109a2469f81..6395284a60c232dd3cb881c63793fbd6ce1b7023 100644
--- a/src/common/switch.c
+++ b/src/common/switch.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -53,7 +53,7 @@
/*
* WARNING: Do not change the order of these fields or add additional
* fields at the beginning of the structure. If you do, job completion
- * logging plugins will stop working. If you need to add fields, add them
+ * logging plugins will stop working. If you need to add fields, add them
* at the end of the structure.
*/
typedef struct slurm_switch_ops {
@@ -63,20 +63,20 @@ typedef struct slurm_switch_ops {
int (*alloc_jobinfo) ( switch_jobinfo_t **jobinfo );
int (*build_jobinfo) ( switch_jobinfo_t *jobinfo,
char *nodelist,
- uint16_t *tasks_per_node,
- int cyclic_alloc,
+ uint16_t *tasks_per_node,
+ int cyclic_alloc,
char *network);
switch_jobinfo_t *(*copy_jobinfo) ( switch_jobinfo_t *jobinfo );
void (*free_jobinfo) ( switch_jobinfo_t *jobinfo );
- int (*pack_jobinfo) ( switch_jobinfo_t *jobinfo,
+ int (*pack_jobinfo) ( switch_jobinfo_t *jobinfo,
Buf buffer );
- int (*unpack_jobinfo) ( switch_jobinfo_t *jobinfo,
+ int (*unpack_jobinfo) ( switch_jobinfo_t *jobinfo,
Buf buffer );
int (*get_jobinfo) ( switch_jobinfo_t *switch_job,
int key, void *data);
- void (*print_jobinfo) ( FILE *fp,
+ void (*print_jobinfo) ( FILE *fp,
switch_jobinfo_t *jobinfo );
- char * (*string_jobinfo) ( switch_jobinfo_t *jobinfo,
+ char * (*string_jobinfo) ( switch_jobinfo_t *jobinfo,
char *buf, size_t size);
int (*node_init) ( void );
int (*node_fini) ( void );
@@ -85,12 +85,12 @@ typedef struct slurm_switch_ops {
uid_t uid );
int (*job_fini) ( switch_jobinfo_t *jobinfo );
int (*job_postfini) ( switch_jobinfo_t *jobinfo,
- uid_t pgid,
- uint32_t job_id,
+ uid_t pgid,
+ uint32_t job_id,
uint32_t step_id );
- int (*job_attach) ( switch_jobinfo_t *jobinfo,
- char ***env, uint32_t nodeid,
- uint32_t procid, uint32_t nnodes,
+ int (*job_attach) ( switch_jobinfo_t *jobinfo,
+ char ***env, uint32_t nodeid,
+ uint32_t procid, uint32_t nnodes,
uint32_t nprocs, uint32_t rank);
char * (*switch_strerror) ( int errnum );
int (*switch_errno) ( void );
@@ -183,7 +183,7 @@ _slurm_switch_context_destroy( slurm_switch_context_t *c )
/*
* Resolve the operations from the plugin.
*/
-static slurm_switch_ops_t *
+static slurm_switch_ops_t *
_slurm_switch_get_ops( slurm_switch_context_t *c )
{
/*
@@ -232,20 +232,20 @@ _slurm_switch_get_ops( slurm_switch_context_t *c )
/* Find the correct plugin. */
c->cur_plugin = plugin_load_and_link(c->switch_type, n_syms, syms,
(void **) &c->ops);
- if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
+ if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
error("Couldn't find the specified plugin name for %s "
"looking at all files",
c->switch_type);
-
+
/* Get the plugin list, if needed. */
if ( c->plugin_list == NULL ) {
char *plugin_dir;
c->plugin_list = plugrack_create();
if ( c->plugin_list == NULL ) {
verbose( "Unable to create a plugin manager" );
- return NULL;
+ return NULL;
}
plugrack_set_major_type( c->plugin_list, "switch" );
@@ -351,14 +351,14 @@ extern int switch_alloc_jobinfo(switch_jobinfo_t **jobinfo)
return (*(g_context->ops.alloc_jobinfo))( jobinfo );
}
-extern int switch_build_jobinfo(switch_jobinfo_t *jobinfo,
- char *nodelist, uint16_t *tasks_per_node,
+extern int switch_build_jobinfo(switch_jobinfo_t *jobinfo,
+ char *nodelist, uint16_t *tasks_per_node,
int cyclic_alloc, char *network)
{
if ( switch_init() < 0 )
return SLURM_ERROR;
- return (*(g_context->ops.build_jobinfo))( jobinfo, nodelist,
+ return (*(g_context->ops.build_jobinfo))( jobinfo, nodelist,
tasks_per_node, cyclic_alloc, network );
}
@@ -394,7 +394,7 @@ extern int switch_unpack_jobinfo(switch_jobinfo_t *jobinfo, Buf buffer)
return (*(g_context->ops.unpack_jobinfo))( jobinfo, buffer );
}
-extern int switch_g_get_jobinfo(switch_jobinfo_t *jobinfo,
+extern int switch_g_get_jobinfo(switch_jobinfo_t *jobinfo,
int data_type, void *data)
{
if ( switch_init() < 0 )
@@ -460,18 +460,18 @@ extern int interconnect_fini(switch_jobinfo_t *jobinfo)
return (*(g_context->ops.job_fini)) (jobinfo);
}
-extern int interconnect_postfini(switch_jobinfo_t *jobinfo, uid_t pgid,
+extern int interconnect_postfini(switch_jobinfo_t *jobinfo, uid_t pgid,
uint32_t job_id, uint32_t step_id )
{
if ( switch_init() < 0 )
return SLURM_ERROR;
- return (*(g_context->ops.job_postfini)) (jobinfo, pgid,
+ return (*(g_context->ops.job_postfini)) (jobinfo, pgid,
job_id, step_id);
}
extern int interconnect_attach(switch_jobinfo_t *jobinfo, char ***env,
- uint32_t nodeid, uint32_t procid, uint32_t nnodes,
+ uint32_t nodeid, uint32_t procid, uint32_t nnodes,
uint32_t nprocs, uint32_t gid)
{
if ( switch_init() < 0 )
@@ -500,7 +500,7 @@ extern char *switch_strerror(int errnum)
/*
* node switch state monitoring functions
- * required for IBM Federation switch
+ * required for IBM Federation switch
*/
extern int switch_g_clear_node_state(void)
{
@@ -526,7 +526,7 @@ extern int switch_g_build_node_info(switch_node_info_t *switch_node)
return (*(g_context->ops.build_nodeinfo))( switch_node );
}
-extern int switch_g_pack_node_info(switch_node_info_t *switch_node,
+extern int switch_g_pack_node_info(switch_node_info_t *switch_node,
Buf buffer)
{
if ( switch_init() < 0 )
diff --git a/src/common/switch.h b/src/common/switch.h
index b52a33824345c0f43905e86e6439803515cb014f..758289758ec0efd43060f25d34913b61f27c6526 100644
--- a/src/common/switch.h
+++ b/src/common/switch.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -123,8 +123,8 @@ extern int switch_alloc_jobinfo (switch_jobinfo_t **jobinfo);
* IN network - plugin-specific network info (e.g. protocol)
* NOTE: storage must be freed using g_switch_free_jobinfo
*/
-extern int switch_build_jobinfo (switch_jobinfo_t *jobinfo,
- char *nodelist, uint16_t *tasks_per_node,
+extern int switch_build_jobinfo (switch_jobinfo_t *jobinfo,
+ char *nodelist, uint16_t *tasks_per_node,
int cyclic_alloc, char *network);
/* copy a switch job credential
@@ -160,11 +160,11 @@ extern int switch_unpack_jobinfo(switch_jobinfo_t *jobinfo, Buf buffer);
* OUT data - the desired data from the credential
* RET - slurm error code
*/
-extern int switch_g_get_jobinfo(switch_jobinfo_t *jobinfo,
+extern int switch_g_get_jobinfo(switch_jobinfo_t *jobinfo,
int data_type, void *data);
/*
- * Note that the job step associated with the specified nodelist
+ * Note that the job step associated with the specified nodelist
* has completed execution.
*/
extern int switch_g_job_step_complete(switch_jobinfo_t *jobinfo,
@@ -172,17 +172,17 @@ extern int switch_g_job_step_complete(switch_jobinfo_t *jobinfo,
/*
* Note that the job step has completed execution on the specified
- * nodelist. The job step is not necessarily completed on all
- * nodes, but switch resources associated with it on the specified
- * nodes are no longer in use.
+ * nodelist. The job step is not necessarily completed on all
+ * nodes, but switch resources associated with it on the specified
+ * nodes are no longer in use.
*/
extern int switch_g_job_step_part_comp(switch_jobinfo_t *jobinfo,
char *nodelist);
/*
- * Return TRUE if the switch plugin processes partial job step
- * completion calls (i.e. switch_g_job_step_part_comp). Support
- * of partition completions is compute intensive, so it should
+ * Return TRUE if the switch plugin processes partial job step
+ * completion calls (i.e. switch_g_job_step_part_comp). Support
+ * of partition completions is compute intensive, so it should
* be avoided unless switch resources are in short supply (e.g.
* switch/federation). Otherwise return FALSE.
*/
@@ -226,7 +226,7 @@ extern char *switch_sprint_jobinfo( switch_jobinfo_t *jobinfo,
extern int interconnect_node_init(void);
/*
- * Finalize interconnect on node.
+ * Finalize interconnect on node.
*
* This function is called once as slurmd exits (slurmd will wait for
* this function to return before continuing the exit process)
@@ -248,24 +248,24 @@ extern int interconnect_node_fini(void);
* fork N procs -----------+--- interconnect_attach
* wait all | exec mpi process
* interconnect_fini* |
- * interconnect_postfini |
+ * interconnect_postfini |
* |
*
* [ *Note: interconnect_fini() is run as the uid of the job owner, not root ]
*/
/*
- * Prepare node for job.
+ * Prepare node for job.
*
* pre is run as root in the first slurmd process, the so called job
* manager. This function can be used to perform any initialization
* that needs to be performed in the same process as interconnect_fini()
- *
+ *
*/
extern int interconnect_preinit(switch_jobinfo_t *jobinfo);
-/*
- * initialize interconnect on node for job. This function is run from the
+/*
+ * initialize interconnect on node for job. This function is run from the
* 2nd slurmd process (some interconnect implementations may require
* interconnect init functions to be executed from a separate process
* than the process executing interconnect_fini() [e.g. QsNet])
@@ -289,16 +289,16 @@ extern int interconnect_fini(switch_jobinfo_t *jobinfo);
* that need to be run with root privileges should be run from this
* function.
*/
-extern int interconnect_postfini(switch_jobinfo_t *jobinfo, uid_t pgid,
+extern int interconnect_postfini(switch_jobinfo_t *jobinfo, uid_t pgid,
uint32_t job_id, uint32_t step_id );
-/*
+/*
* attach process to interconnect
- * (Called from within the process, so it is appropriate to set
+ * (Called from within the process, so it is appropriate to set
* interconnect specific environment variables here)
*/
extern int interconnect_attach(switch_jobinfo_t *jobinfo, char ***env,
- uint32_t nodeid, uint32_t procid, uint32_t nnodes,
+ uint32_t nodeid, uint32_t procid, uint32_t nnodes,
uint32_t nprocs, uint32_t rank);
/*
@@ -307,7 +307,7 @@ extern int interconnect_attach(switch_jobinfo_t *jobinfo, char ***env,
extern int switch_g_clear_node_state(void);
/*
- * Initialize slurmd step switch state
+ * Initialize slurmd step switch state
*/
extern int switch_g_slurmd_step_init(void);
@@ -317,20 +317,20 @@ extern int switch_g_slurmd_step_init(void);
extern int switch_g_alloc_node_info(switch_node_info_t **switch_node);
/*
- * Fill in a previously allocated switch state record for the node on which
- * this function is executed.
+ * Fill in a previously allocated switch state record for the node on which
+ * this function is executed.
*/
extern int switch_g_build_node_info(switch_node_info_t *switch_node);
-/*
- * Pack the data associated with a node's switch state into a buffer
+/*
+ * Pack the data associated with a node's switch state into a buffer
* for network transmission.
*/
-extern int switch_g_pack_node_info(switch_node_info_t *switch_node,
+extern int switch_g_pack_node_info(switch_node_info_t *switch_node,
Buf buffer);
/*
- * Unpack the data associated with a node's switch state record
+ * Unpack the data associated with a node's switch state record
* from a buffer.
*/
extern int switch_g_unpack_node_info(switch_node_info_t *switch_node,
diff --git a/src/common/timers.c b/src/common/timers.c
index d16cbacc56830de984100970d98326c824590aa6..bf3e4d81c1ca4a991f7e7969d3680ea20782a71c 100644
--- a/src/common/timers.c
+++ b/src/common/timers.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -48,7 +48,7 @@
* IN len_tv_str - size of tv_str in bytes
* IN from - where the function was called form
*/
-inline void diff_tv_str(struct timeval *tv1,struct timeval *tv2,
+inline void diff_tv_str(struct timeval *tv1,struct timeval *tv2,
char *tv_str, int len_tv_str, char *from,
long limit)
{
diff --git a/src/common/timers.h b/src/common/timers.h
index e7fb6cc91623c2bf129d5f046a52ba47cea6538c..817126ca914095eb09b90f98f41a020b629e7cab 100644
--- a/src/common/timers.h
+++ b/src/common/timers.h
@@ -3,34 +3,34 @@
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Morris Jette <jette1@llnl.gov> and Kevin Tew <tew1@llnl.gov>
+ * Written by Morris Jette <jette1@llnl.gov> and Kevin Tew <tew1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -59,7 +59,7 @@
* OUT tv_str - place to put delta time in format "usec=%ld"
* IN len_tv_str - size of tv_str in bytes
* IN from - Name to be printed on long diffs
- * IN limit - limit to wait
+ * IN limit - limit to wait
*/
extern inline void diff_tv_str(struct timeval *tv1,struct timeval *tv2,
char *tv_str, int len_tv_str, char *from,
diff --git a/src/common/uid.c b/src/common/uid.c
index 86fdf600da8f5aff9898e552e9ac2db9e62c0853..4796d6e70828e93a79815df70fb50cb10072fbca 100644
--- a/src/common/uid.c
+++ b/src/common/uid.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/common/uid.h b/src/common/uid.h
index 13cd3b62a5a6c97f068cf6f1bb899ffd1d865f63..c83f640ba383c1d8f6df383390c3d0b807a73bb4 100644
--- a/src/common/uid.h
+++ b/src/common/uid.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -44,7 +44,7 @@
#include <unistd.h>
/*
- * In an ideal world, we could use sysconf(_SC_GETPW_R_SIZE_MAX) to get the
+ * In an ideal world, we could use sysconf(_SC_GETPW_R_SIZE_MAX) to get the
* maximum buffer size neede for getpwnam_r(), but if there is no maximum
* value configured, the value returned is 1024, which can too small.
* Diito for _SC_GETGR_R_SIZE_MAX. Use 64k byte buffer by default.
@@ -54,14 +54,14 @@
/*
* Return validated uid_t for string in ``name'' which contains
* either the UID number or user name
- *
+ *
* Returns uid int uidp after verifying presence in /etc/passwd, or
* -1 on failure.
*/
int uid_from_string (char *name, uid_t *uidp);
/*
- * Return the primary group id for a given user id, or
+ * Return the primary group id for a given user id, or
* (gid_t) -1 on failure.
*/
gid_t gid_from_uid (uid_t uid);
@@ -71,8 +71,8 @@ gid_t gid_from_uid (uid_t uid);
*/
int gid_from_string (char *name, gid_t *gidp);
-/*
- * Translate uid to user name,
+/*
+ * Translate uid to user name,
* NOTE: xfree the return value
*/
char *uid_to_string (uid_t uid);
diff --git a/src/common/unsetenv.c b/src/common/unsetenv.c
index bc5c3def0008192acb0aaf74f281546a72a02d71..1ae4a2a14b48ad1a9b3e2da249ead9155dd720de 100644
--- a/src/common/unsetenv.c
+++ b/src/common/unsetenv.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/common/unsetenv.h b/src/common/unsetenv.h
index a8b998132b9f25ecd21b8f7c666c53e7d3ec7e97..a2e031b6940963667b26715221c9806068a64f20 100644
--- a/src/common/unsetenv.h
+++ b/src/common/unsetenv.h
@@ -15,15 +15,15 @@
* 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
+ * 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
+ * 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
diff --git a/src/common/util-net.c b/src/common/util-net.c
index a2e8e66d40ee01da605b4714fe63d373a05fbadd..344d01b486e2d2cc5b8ea71bcc6aa861d019a74b 100644
--- a/src/common/util-net.c
+++ b/src/common/util-net.c
@@ -5,31 +5,31 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Chris Dunlap <cdunlap@llnl.gov>.
* UCRL-CODE-2002-009.
- *
+ *
* This file is part of ConMan, a remote console management program.
* For details, see <http://www.llnl.gov/linux/conman/>.
- *
+ *
* ConMan 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
+ * 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
+ * version. If you delete this exception statement from all source files in
* the program, then also delete it here.
- *
+ *
* ConMan 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 ConMan; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/src/common/util-net.h b/src/common/util-net.h
index 120f713c6209be383ee9afb0c09048b75c08d370..39b93f8a6023fcd3ea5c3b7d21598ed218b80c4e 100644
--- a/src/common/util-net.h
+++ b/src/common/util-net.h
@@ -5,31 +5,31 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Chris Dunlap <cdunlap@llnl.gov>.
* UCRL-CODE-2002-009.
- *
+ *
* This file is part of ConMan, a remote console management program.
* For details, see <http://www.llnl.gov/linux/conman/>.
- *
+ *
* ConMan 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
+ * 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
+ * version. If you delete this exception statement from all source files in
* the program, then also delete it here.
- *
+ *
* ConMan 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 ConMan; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -115,7 +115,7 @@ int inet_pton(int family, const char *str, void *addr);
#ifndef HAVE_INET_NTOP
const char * inet_ntop(int family, const void *addr, char *str, size_t len);
-/*
+/*
* Convert an Internet address in binary network format for interface
* type (family) in the socket address structure specified by (addr),
* storing the result in the buffer (str) of length (len).
diff --git a/src/common/write_labelled_message.c b/src/common/write_labelled_message.c
index 6d379bcd25d5cb6b4d6af8d5c6e525e531f20e9b..3bec7938f61bbf4f8ec41405e2859adb3da3d262 100644
--- a/src/common/write_labelled_message.c
+++ b/src/common/write_labelled_message.c
@@ -3,35 +3,35 @@
*****************************************************************************
* Copyright (C) 2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Christopher J. Morrone <morrone2@llnl.gov> and
+ * Written by Christopher J. Morrone <morrone2@llnl.gov> and
* David Bremer <dbremer@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -172,6 +172,6 @@ static int _write_line(int fd, void *buf, int len)
left -= n;
ptr += n;
}
-
+
return len;
}
diff --git a/src/common/write_labelled_message.h b/src/common/write_labelled_message.h
index 6deaa0a5caa10412fb66babbdbe749f299a316a3..52044b867e6feee63fcaa4d803e34776f8060b1c 100644
--- a/src/common/write_labelled_message.h
+++ b/src/common/write_labelled_message.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by David Bremer <dbremer@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -46,7 +46,7 @@
* buf is the char buffer to write
* len is the buffer length in bytes
* taskid is will be used in the label
- * label if true, prepend each line of the buffer with a
+ * label if true, prepend each line of the buffer with a
* label for the task id
* label_width is the number of digits to use for the task id
*
diff --git a/src/common/xassert.c b/src/common/xassert.c
index cfc4288a59584e424a9d4d7b58b1c61e1d905f15..116212edee56d9d6d0253e4b4d7aafb4feb2508a 100644
--- a/src/common/xassert.c
+++ b/src/common/xassert.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * xassert.c - replacement for assert which sends error to log instead
+ * xassert.c - replacement for assert which sends error to log instead
* of stderr
* $Id$
*****************************************************************************
@@ -17,15 +17,15 @@
* 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
+ * 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
+ * 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
@@ -49,8 +49,8 @@
#include "src/common/macros.h"
/*
- * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
- * for details.
+ * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
+ * for details.
*/
void __xassert_failed(char *expr, const char *file, int line, char *func);
strong_alias(__xassert_failed, slurm_xassert_failed);
diff --git a/src/common/xassert.h b/src/common/xassert.h
index 7f2e4182312c40259d749e9db496cc68e4ce4df4..2cf072f6455c32f974dfe00109b61ef4c617ac85 100644
--- a/src/common/xassert.h
+++ b/src/common/xassert.h
@@ -18,15 +18,15 @@
* 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
+ * 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
+ * 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
@@ -57,13 +57,13 @@
# define xassert(__ex) _STMT_START { \
(__ex) ? ((void)0) : \
__xassert_failed(__STRING(__ex), __FILE__, __LINE__, __CURRENT_FUNC__);\
- } _STMT_END
+ } _STMT_END
/* This prints the assertion failed message to the slurm log facility
* (see log.h) and aborts the calling program
* (messages go to stderr if log is not initialized)
*/
-extern void __xassert_failed(char *, const char *, int, const char *)
+extern void __xassert_failed(char *, const char *, int, const char *)
__NORETURN_ATTR;
#endif /* NDEBUG. */
diff --git a/src/common/xmalloc.c b/src/common/xmalloc.c
index bce96f242aaf0d0a2136c2f9b3c44f3bf97ed2da..49e111125a804242d96ae75e92ccfbfadabd6428 100644
--- a/src/common/xmalloc.c
+++ b/src/common/xmalloc.c
@@ -6,35 +6,35 @@
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Jim Garlick <garlick1@llnl.gov> and
+ * Written by Jim Garlick <garlick1@llnl.gov> and
* Mark Grondona <mgrondona@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -60,16 +60,16 @@
# define MALLOC_LOCK() pthread_mutex_lock(&malloc_lock)
# define MALLOC_UNLOCK() pthread_mutex_unlock(&malloc_lock)
#else
-# define MALLOC_LOCK()
-# define MALLOC_UNLOCK()
+# define MALLOC_LOCK()
+# define MALLOC_UNLOCK()
#endif
#if NDEBUG
# define xmalloc_assert(expr) ((void) (0))
#else
-static void malloc_assert_failed(char *, const char *, int,
- const char *, const char *);
+static void malloc_assert_failed(char *, const char *, int,
+ const char *, const char *);
# define xmalloc_assert(expr) _STMT_START { \
(expr) ? ((void)(0)) : \
malloc_assert_failed(__STRING(expr), file, line, func, \
@@ -84,7 +84,7 @@ static void malloc_assert_failed(char *, const char *, int,
* RETURN pointer to allocate heap space
*/
void *slurm_xmalloc(size_t size, const char *file, int line, const char *func)
-{
+{
void *new;
int *p;
@@ -94,9 +94,9 @@ void *slurm_xmalloc(size_t size, const char *file, int line, const char *func)
p = (int *)malloc(size + 2*sizeof(int));
MALLOC_UNLOCK();
if (!p) {
- /* don't call log functions here, we're probably OOM
+ /* don't call log functions here, we're probably OOM
*/
- fprintf(log_fp(), "%s:%d: %s: xmalloc(%d) failed\n",
+ fprintf(log_fp(), "%s:%d: %s: xmalloc(%d) failed\n",
file, line, func, (int)size);
exit(1);
}
@@ -111,9 +111,9 @@ void *slurm_xmalloc(size_t size, const char *file, int line, const char *func)
/*
* same as above, except return NULL on malloc failure instead of exiting
*/
-void *slurm_try_xmalloc(size_t size, const char *file, int line,
+void *slurm_try_xmalloc(size_t size, const char *file, int line,
const char *func)
-{
+{
void *new;
int *p;
@@ -132,13 +132,13 @@ void *slurm_try_xmalloc(size_t size, const char *file, int line,
return new;
}
-/*
+/*
* "Safe" version of realloc(). Args are different: pass in a pointer to
* the object to be realloced instead of the object itself.
* item (IN/OUT) double-pointer to allocated space
* newsize (IN) requested size
*/
-void * slurm_xrealloc(void **item, size_t newsize,
+void * slurm_xrealloc(void **item, size_t newsize,
const char *file, int line, const char *func)
{
int *p = NULL;
@@ -151,14 +151,14 @@ void * slurm_xrealloc(void **item, size_t newsize,
p = (int *)*item - 2;
/* magic cookie still there? */
- xmalloc_assert(p[0] == XMALLOC_MAGIC);
+ xmalloc_assert(p[0] == XMALLOC_MAGIC);
old_size = p[1];
MALLOC_LOCK();
p = (int *)realloc(p, newsize + 2*sizeof(int));
MALLOC_UNLOCK();
- if (p == NULL)
+ if (p == NULL)
goto error;
if (old_size < newsize) {
@@ -173,7 +173,7 @@ void * slurm_xrealloc(void **item, size_t newsize,
p = (int *)malloc(newsize + 2*sizeof(int));
MALLOC_UNLOCK();
- if (p == NULL)
+ if (p == NULL)
goto error;
memset(&p[2], 0, newsize);
@@ -185,16 +185,16 @@ void * slurm_xrealloc(void **item, size_t newsize,
return *item;
error:
- fprintf(log_fp(), "%s:%d: %s: xrealloc(%d) failed\n",
+ fprintf(log_fp(), "%s:%d: %s: xrealloc(%d) failed\n",
file, line, func, (int)newsize);
abort();
}
-/*
+/*
* same as above, but return <= 0 on malloc() failure instead of aborting.
* `*item' will be unchanged.
*/
-int slurm_try_xrealloc(void **item, size_t newsize,
+int slurm_try_xrealloc(void **item, size_t newsize,
const char *file, int line, const char *func)
{
int *p = NULL;
@@ -207,14 +207,14 @@ int slurm_try_xrealloc(void **item, size_t newsize,
p = (int *)*item - 2;
/* magic cookie still there? */
- xmalloc_assert(p[0] == XMALLOC_MAGIC);
+ xmalloc_assert(p[0] == XMALLOC_MAGIC);
old_size = p[1];
MALLOC_LOCK();
p = (int *)realloc(p, newsize + 2*sizeof(int));
MALLOC_UNLOCK();
- if (p == NULL)
+ if (p == NULL)
return 0;
if (old_size < newsize) {
@@ -229,7 +229,7 @@ int slurm_try_xrealloc(void **item, size_t newsize,
p = (int *)malloc(newsize + 2*sizeof(int));
MALLOC_UNLOCK();
- if (p == NULL)
+ if (p == NULL)
return 0;
memset(&p[2], 0, newsize);
@@ -249,12 +249,12 @@ int slurm_try_xrealloc(void **item, size_t newsize,
int slurm_xsize(void *item, const char *file, int line, const char *func)
{
int *p = (int *)item - 2;
- xmalloc_assert(item != NULL);
- xmalloc_assert(p[0] == XMALLOC_MAGIC);
+ xmalloc_assert(item != NULL);
+ xmalloc_assert(p[0] == XMALLOC_MAGIC);
return p[1];
}
-/*
+/*
* Free which takes a pointer to object to free, which it turns into a null
* object.
* item (IN/OUT) double-pointer to allocated space
@@ -264,7 +264,7 @@ void slurm_xfree(void **item, const char *file, int line, const char *func)
if (*item != NULL) {
int *p = (int *)*item - 2;
/* magic cookie still there? */
- xmalloc_assert(p[0] == XMALLOC_MAGIC);
+ xmalloc_assert(p[0] == XMALLOC_MAGIC);
p[0] = 0; /* make sure xfree isn't called twice */
MALLOC_LOCK();
free(p);
@@ -274,7 +274,7 @@ void slurm_xfree(void **item, const char *file, int line, const char *func)
}
#ifndef NDEBUG
-static void malloc_assert_failed(char *expr, const char *file,
+static void malloc_assert_failed(char *expr, const char *file,
int line, const char *caller, const char *func)
{
error("%s() Error: from %s:%d: %s(): Assertion (%s) failed",
diff --git a/src/common/xmalloc.h b/src/common/xmalloc.h
index 98551611deecac3cb053b04e3d6c2c89366b4a8f..588f648e26af291c9a52d438478f95e3b0449c1a 100644
--- a/src/common/xmalloc.h
+++ b/src/common/xmalloc.h
@@ -7,35 +7,35 @@
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Jim Garlick <garlick1@llnl.gov> and
+ * Written by Jim Garlick <garlick1@llnl.gov> and
* Mark Grondona <mgrondona@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -57,19 +57,19 @@
* when there is an error allocating the memory.
*
* xrealloc(p, newsize) changes the size of the block pointed to by p to the
- * value of newsize. Newly allocated memory is not zeroed. If p is NULL,
- * xrealloc() performs the same function as `p = xmalloc(newsize)'. If p
- * is not NULL, it is required to have been initialized with a call to
+ * value of newsize. Newly allocated memory is not zeroed. If p is NULL,
+ * xrealloc() performs the same function as `p = xmalloc(newsize)'. If p
+ * is not NULL, it is required to have been initialized with a call to
* [try_]xmalloc() or [try_]xrealloc().
*
* try_xrealloc(p, newsize) is the same as above, but returns <= 0 if the
* there is an error allocating the requested memory.
- *
+ *
* xfree(p) frees the memory block pointed to by p. The memory must have been
* initialized with a call to [try_]xmalloc() or [try_]xrealloc().
*
* xsize(p) returns the current size of the memory allocation pointed to by
- * p. The memory must have been allocated with [try_]xmalloc() or
+ * p. The memory must have been allocated with [try_]xmalloc() or
* [try_]xrealloc().
*
\*****************************************************************************/
diff --git a/src/common/xsignal.c b/src/common/xsignal.c
index f9b0a1f77dbcd84e3945d2aff585f64c8483a62f..3edb13c24754cff26a7e10c464a9309f7f98f8c7 100644
--- a/src/common/xsignal.c
+++ b/src/common/xsignal.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -51,8 +51,8 @@
#include "src/common/xassert.h"
/*
- * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
- * for details.
+ * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
+ * for details.
*/
strong_alias(xsignal, slurm_xsignal);
strong_alias(xsignal_save_mask, slurm_xsignal_save_mask);
@@ -91,7 +91,7 @@ _sigmask(int how, sigset_t *set, sigset_t *oset)
}
-/*
+/*
* Fill in the sigset_t with the list of signals in the
* the (zero-terminated) array of signals `sigarray.'
*/
diff --git a/src/common/xsignal.h b/src/common/xsignal.h
index 6b555ca5c18741c434579caf8bf027986ba8df9d..bd760fd6e7cc835c751368c43d91e6312b6f413a 100644
--- a/src/common/xsignal.h
+++ b/src/common/xsignal.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -44,7 +44,7 @@
typedef void SigFunc(int);
-/*
+/*
* Install a signal handler in the POSIX way, but with BSD signal() semantics
*/
SigFunc *xsignal(int signo, SigFunc *);
@@ -60,11 +60,11 @@ int xsignal_save_mask(sigset_t *set);
int xsignal_set_mask(sigset_t *set);
/*
- * Add the list of signals given in the signal array `sigarray'
+ * Add the list of signals given in the signal array `sigarray'
* to the current list of signals masked in the process.
*
- * sigarray is a zero-terminated array of signal numbers,
- * e.g. { SIGINT, SIGTERM, ... , 0 }
+ * sigarray is a zero-terminated array of signal numbers,
+ * e.g. { SIGINT, SIGTERM, ... , 0 }
*
* Returns SLURM_SUCCESS or SLURM_ERROR.
*
diff --git a/src/common/xstring.c b/src/common/xstring.c
index a360bbeaa357fa8d9f43278744746d6d088e5532..7ae5df560f6ddef97594b552a32543f15b50fe9d 100644
--- a/src/common/xstring.c
+++ b/src/common/xstring.c
@@ -1,12 +1,12 @@
/*****************************************************************************\
- * xstring.c - heap-oriented string manipulation functions with "safe"
+ * xstring.c - heap-oriented string manipulation functions with "safe"
* string expansion as needed.
******************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jim Garlick <garlick@llnl.gov>
* Mark Grondona <grondona@llnl.gov>, et al.
- *
+ *
* CODE-OCEC-09-009. All rights reserved.
*
* This file is part of SLURM, a resource management program.
@@ -18,15 +18,15 @@
* 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
+ * 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
+ * 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
@@ -69,8 +69,8 @@
#define XFGETS_CHUNKSIZE 64
/*
- * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
- * for details.
+ * Define slurm-specific aliases for use by plugins, see slurm_xlator.h
+ * for details.
*/
strong_alias(_xstrcat, slurm_xstrcat);
strong_alias(_xstrcatchar, slurm_xstrcatchar);
@@ -111,21 +111,21 @@ static void makespace(char **str, int needed)
}
}
-/*
+/*
* Concatenate str2 onto str1, expanding str1 as needed.
* str1 (IN/OUT) target string (pointer to in case of expansion)
* str2 (IN) source string
*/
void _xstrcat(char **str1, const char *str2)
{
- if (str2 == NULL)
+ if (str2 == NULL)
str2 = "(null)";
makespace(str1, strlen(str2));
strcat(*str1, str2);
}
-/*
+/*
* append one char to str and null terminate
*/
static void strcatchar(char *str, char c)
@@ -136,7 +136,7 @@ static void strcatchar(char *str, char c)
str[len] = '\0';
}
-/*
+/*
* Add a character to str, expanding str1 as needed.
* str1 (IN/OUT) target string (pointer to in case of expansion)
* size (IN/OUT) size of str1 (pointer to in case of expansion)
@@ -161,8 +161,8 @@ void _xslurm_strerrorcat(char **buf)
xstrcat(*buf, err);
}
-/*
- * append strftime of fmt to buffer buf, expand buf as needed
+/*
+ * append strftime of fmt to buffer buf, expand buf as needed
*
*/
void _xstrftimecat(char **buf, const char *fmt)
@@ -181,7 +181,7 @@ void _xstrftimecat(char **buf, const char *fmt)
if (fmt == NULL)
fmt = default_fmt;
- if (time(&t) == (time_t) -1)
+ if (time(&t) == (time_t) -1)
fprintf(stderr, "time() failed\n");
if (!localtime_r(&t, &tm))
@@ -206,7 +206,7 @@ int _xstrfmtcat(char **str, const char *fmt, ...)
int n, size = 100;
char *p = NULL;
va_list ap;
-
+
if((p = xmalloc(size)) == NULL)
return 0;
while(1) {
@@ -257,7 +257,7 @@ void _xmemcat(char **str, char *start, char *end)
xstrcat(*str, buf);
}
-/*
+/*
* Replacement for libc basename
* path (IN) path possibly containing '/' characters
* RETURN last component of path
@@ -268,7 +268,7 @@ char * xbasename(char *path)
p = strrchr(path , '/');
return (p ? (p + 1) : path);
-}
+}
/*
* Duplicate a string.
@@ -305,7 +305,7 @@ char *xstrdup_printf(const char *fmt, ...)
int n, size = 100;
char *p = NULL;
va_list ap;
-
+
if((p = xmalloc(size)) == NULL)
return NULL;
while(1) {
@@ -360,16 +360,16 @@ long int xstrntol(const char *str, char **endptr, size_t n, int base)
long int number = 0;
char *new_str = xstrndup(str, n);
- if(!new_str)
+ if(!new_str)
goto end_it;
-
+
number = strtol(new_str, endptr, base);
xfree(new_str);
end_it:
return number;
}
-/*
+/*
* Find the first instance of a sub-string "pattern" in the string "str",
* and replace it with the string "replacement".
* str (IN/OUT) target string (pointer to in case of expansion)
@@ -403,7 +403,7 @@ void _xstrsubstitute(char **str, const char *pattern, const char *replacement)
xfree(end_copy);
}
-/*
+/*
* Remove first instance of quotes that surround a string in "str",
* and return the result without the quotes
* str (IN) target string (pointer to in case of expansion)
@@ -431,7 +431,7 @@ char *xstrstrip(char *str)
while(str[i]) {
if(quote && str[i] == quote_c) {
found = 1;
- break;
+ break;
}
i++;
}
@@ -448,7 +448,7 @@ char *xstrstrip(char *str)
* Returns an xmalloc'd string containing the hostname
* of the local machine. The hostname contains only
* the short version of the hostname (e.g. "linux123.foo.bar"
- * becomes "linux123")
+ * becomes "linux123")
*
* Returns NULL on error.
*/
diff --git a/src/common/xstring.h b/src/common/xstring.h
index ec1fe44e2cec6c75d79013006b4abbdd9b2fec98..7c7147f615134cb9c0cb0d271692ba6b384a92cd 100644
--- a/src/common/xstring.h
+++ b/src/common/xstring.h
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * xstring.h - "safe" string processing functions with automatic memory
+ * xstring.h - "safe" string processing functions with automatic memory
* management
******************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
@@ -16,15 +16,15 @@
* 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
+ * 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
+ * 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
@@ -58,21 +58,21 @@
**
** space is allocated with xmalloc/xrealloc, so caller must use
** xfree to free.
-**
+**
*/
-/*
+/*
** cat str2 onto str1, expanding str1 as necessary
*/
void _xstrcat(char **str1, const char *str2);
-/*
-** concatenate one char, `c', onto str1, expanding str1 as needed
+/*
+** concatenate one char, `c', onto str1, expanding str1 as needed
*/
void _xstrcatchar(char **str1, char c);
/*
-** concatenate stringified errno onto str
+** concatenate stringified errno onto str
*/
void _xslurm_strerrorcat(char **str);
@@ -90,7 +90,7 @@ int _xstrfmtcat(char **str, const char *fmt, ...);
/*
** concatenate range of memory from start to end (not including end)
-** onto str.
+** onto str.
*/
void _xmemcat(char **str, char *start, char *end);
@@ -125,7 +125,7 @@ char *xbasename(char *path);
*/
void _xstrsubstitute(char **str, const char *pattern, const char *replacement);
-/*
+/*
* Remove all quotes that surround a string in the string "str",
* str (IN) target string (pointer to in case of expansion)
* increased (IN/OUT) current position in "str"
@@ -137,13 +137,13 @@ char *xstrstrip(char *str);
* Returns an xmalloc'd string containing the hostname
* of the local machine. The hostname contains only
* the short version of the hostname (e.g. "linux123.foo.bar"
- * becomes "linux123")
+ * becomes "linux123")
*
* Returns NULL on error.
*/
char *xshort_hostname(void);
-/*
+/*
* Return true if all characters in a string are whitespace characters,
* otherwise return false. ("str" must be terminated by a null character)
*/
diff --git a/src/database/Makefile.am b/src/database/Makefile.am
index 790a8b820d42e9b35cf551a9eb8a016f827bd621..8bd82e8da1694f423c9ea36e83471107cbeb8f67 100644
--- a/src/database/Makefile.am
+++ b/src/database/Makefile.am
@@ -1,4 +1,4 @@
-# Makefile for database library
+# Makefile for database library
AUTOMAKE_OPTIONS = foreign
@@ -18,7 +18,7 @@ endif
if WITH_PGSQL
PGSQL_LIB = libslurm_pgsql.la
libslurm_pgsql_la_SOURCES = pgsql_common.c pgsql_common.h
-libslurm_pgsql_la_LIBADD = $(PGSQL_LIBS)
+libslurm_pgsql_la_LIBADD = $(PGSQL_LIBS)
libslurm_pgsql_la_LDFLAGS = $(LIB_LDFLAGS)
libslurm_pgsql_la_CFLAGS = $(PGSQL_CFLAGS)
else
diff --git a/src/database/Makefile.in b/src/database/Makefile.in
index 683b9f9265f9ce001a25f3f7f8b8fdefac83eadf..fb4e7d7d6e77aa661a5184ea204a7a5ba2de7877 100644
--- a/src/database/Makefile.in
+++ b/src/database/Makefile.in
@@ -15,7 +15,7 @@
@SET_MAKE@
-# Makefile for database library
+# Makefile for database library
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@@ -327,7 +327,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
@WITH_PGSQL_FALSE@PGSQL_LIB =
@WITH_PGSQL_TRUE@PGSQL_LIB = libslurm_pgsql.la
@WITH_PGSQL_TRUE@libslurm_pgsql_la_SOURCES = pgsql_common.c pgsql_common.h
-@WITH_PGSQL_TRUE@libslurm_pgsql_la_LIBADD = $(PGSQL_LIBS)
+@WITH_PGSQL_TRUE@libslurm_pgsql_la_LIBADD = $(PGSQL_LIBS)
@WITH_PGSQL_TRUE@libslurm_pgsql_la_LDFLAGS = $(LIB_LDFLAGS)
@WITH_PGSQL_TRUE@libslurm_pgsql_la_CFLAGS = $(PGSQL_CFLAGS)
@WITH_PGSQL_FALSE@EXTRA_libslurm_pgsql_la_SOURCES = pgsql_common.c pgsql_common.h
diff --git a/src/database/mysql_common.c b/src/database/mysql_common.c
index edace7f48b92520c748d6bd14e874533a30cc33d..032a708b74b90d01612018cca162149efab4c3f4 100644
--- a/src/database/mysql_common.c
+++ b/src/database/mysql_common.c
@@ -5,32 +5,32 @@
* Copyright (C) 2004-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -58,13 +58,13 @@ static MYSQL_RES *_get_first_result(MYSQL *mysql_db)
/* did current statement return data? */
if((result = mysql_store_result(mysql_db)))
return result;
-
+
/* more results? -1 = no, >0 = error, 0 = yes (keep looping) */
if ((rc = mysql_next_result(mysql_db)) > 0)
debug3("error: Could not execute statement %d\n", rc);
-
+
} while (rc == 0);
-
+
return NULL;
}
@@ -84,7 +84,7 @@ static MYSQL_RES *_get_last_result(MYSQL *mysql_db)
if ((rc = mysql_next_result(mysql_db)) > 0)
debug3("error: Could not execute statement %d\n", rc);
} while (rc == 0);
-
+
return last_result;
}
@@ -108,7 +108,7 @@ static int _mysql_make_table_current(MYSQL *mysql_db, char *table_name,
char *temp = NULL;
DEF_TIMERS;
-
+
/* figure out the keys in the table */
query = xstrdup_printf("show index from %s", table_name);
if(!(result = mysql_db_query_ret(mysql_db, query, 0))) {
@@ -199,10 +199,10 @@ static int _mysql_make_table_current(MYSQL *mysql_db, char *table_name,
info("dropping column %s from table %s", col, table_name);
xstrfmtcat(query, " drop %s,", col);
}
-
+
list_iterator_destroy(itr);
list_destroy(columns);
-
+
if((temp = strstr(ending, "primary key ("))) {
int open = 0, close =0;
int end = 0;
@@ -225,7 +225,7 @@ static int _mysql_make_table_current(MYSQL *mysql_db, char *table_name,
}
xstrfmtcat(query, " add %s,", primary_key);
xstrfmtcat(correct_query, " add %s,", primary_key);
-
+
xfree(primary_key);
}
}
@@ -270,9 +270,9 @@ static int _mysql_make_table_current(MYSQL *mysql_db, char *table_name,
table_defs_table, query);
MYSQL_RES *result = NULL;
MYSQL_ROW row;
-
+
run_update = 1;
-
+
if((result = mysql_db_query_ret(mysql_db, query2, 0))) {
if((row = mysql_fetch_row(result)))
run_update = 0;
@@ -285,14 +285,14 @@ static int _mysql_make_table_current(MYSQL *mysql_db, char *table_name,
if(run_update || adding) {
time_t now = time(NULL);
char *query2 = NULL;
-
+
debug("Table %s has changed. Updating...", table_name);
if(mysql_db_query(mysql_db, query)) {
xfree(query);
return SLURM_ERROR;
}
-
+
query2 = xstrdup_printf("insert into %s (creation_time, "
"mod_time, table_name, definition) "
"values (%d, %d, \"%s\", \"%s\") "
@@ -321,7 +321,7 @@ static int _create_db(char *db_name, mysql_db_info_t *db_info)
char create_line[50];
MYSQL *mysql_db = NULL;
int rc = SLURM_ERROR;
-
+
MYSQL *db_ptr = NULL;
char *db_host = NULL;
@@ -332,7 +332,7 @@ static int _create_db(char *db_name, mysql_db_info_t *db_info)
#endif
if(!(mysql_db = mysql_init(mysql_db)))
fatal("mysql_init failed: %s", mysql_error(mysql_db));
-
+
db_host = db_info->host;
db_ptr = mysql_real_connect(mysql_db,
db_host, db_info->user,
@@ -343,7 +343,7 @@ static int _create_db(char *db_name, mysql_db_info_t *db_info)
info("Connection failed to host = %s "
"user = %s port = %u",
db_host, db_info->user,
- db_info->port);
+ db_info->port);
db_host = db_info->backup;
db_ptr = mysql_real_connect(mysql_db, db_host,
db_info->user,
@@ -399,7 +399,7 @@ extern int mysql_get_db_connection(MYSQL **mysql_db, char *db_name,
{
int rc = SLURM_SUCCESS;
bool storage_init = false;
-
+
char *db_host = db_info->host;
if(!(*mysql_db = mysql_init(*mysql_db)))
@@ -432,7 +432,7 @@ extern int mysql_get_db_connection(MYSQL **mysql_db, char *db_name,
db_host = db_info->backup;
continue;
}
-
+
rc = ESLURM_DB_CONNECTION;
break;
}
@@ -442,7 +442,7 @@ extern int mysql_get_db_connection(MYSQL **mysql_db, char *db_name,
}
}
- errno = rc;
+ errno = rc;
return rc;
}
@@ -480,7 +480,7 @@ extern int mysql_clear_results(MYSQL *mysql_db)
/* did current statement return data? */
if((result = mysql_store_result(mysql_db)))
mysql_free_result(result);
-
+
/* more results? -1 = no, >0 = error, 0 = yes (keep looping) */
if ((rc = mysql_next_result(mysql_db)) > 0)
error("Could not execute statement %d %s\n",
@@ -491,7 +491,7 @@ extern int mysql_clear_results(MYSQL *mysql_db)
if(rc > 0) {
errno = rc;
return SLURM_ERROR;
- }
+ }
return SLURM_SUCCESS;
}
@@ -504,7 +504,7 @@ extern int mysql_db_query(MYSQL *mysql_db, char *query)
slurm_mutex_lock(&mysql_lock);
#endif
/* clear out the old results so we don't get a 2014 error */
- mysql_clear_results(mysql_db);
+ mysql_clear_results(mysql_db);
//try_again:
if(mysql_query(mysql_db, query)) {
error("mysql_query failed: %d %s\n%s",
@@ -519,7 +519,7 @@ extern int mysql_db_query(MYSQL *mysql_db, char *query)
the calling program is the only way to handle this.
If anyone in the future figures out a way to handle
this, super. Until then we will need to restart the
- calling program if you ever get this error.
+ calling program if you ever get this error.
*/
return SLURM_ERROR;
@@ -534,7 +534,7 @@ extern int mysql_db_query(MYSQL *mysql_db, char *query)
extern int mysql_db_ping(MYSQL *mysql_db)
{
/* clear out the old results so we don't get a 2014 error */
- mysql_clear_results(mysql_db);
+ mysql_clear_results(mysql_db);
return mysql_ping(mysql_db);
}
@@ -544,7 +544,7 @@ extern int mysql_db_commit(MYSQL *mysql_db)
slurm_mutex_lock(&mysql_lock);
#endif
/* clear out the old results so we don't get a 2014 error */
- mysql_clear_results(mysql_db);
+ mysql_clear_results(mysql_db);
if(mysql_commit(mysql_db)) {
error("mysql_commit failed: %d %s",
mysql_errno(mysql_db),
@@ -567,7 +567,7 @@ extern int mysql_db_rollback(MYSQL *mysql_db)
slurm_mutex_lock(&mysql_lock);
#endif
/* clear out the old results so we don't get a 2014 error */
- mysql_clear_results(mysql_db);
+ mysql_clear_results(mysql_db);
if(mysql_rollback(mysql_db)) {
error("mysql_commit failed: %d %s",
mysql_errno(mysql_db),
@@ -589,7 +589,7 @@ extern int mysql_db_rollback(MYSQL *mysql_db)
extern MYSQL_RES *mysql_db_query_ret(MYSQL *mysql_db, char *query, bool last)
{
MYSQL_RES *result = NULL;
-
+
if(mysql_db_query(mysql_db, query) != SLURM_ERROR) {
if(last)
result = _get_last_result(mysql_db);
@@ -597,7 +597,7 @@ extern MYSQL_RES *mysql_db_query_ret(MYSQL *mysql_db, char *query, bool last)
result = _get_first_result(mysql_db);
if(!result && mysql_field_count(mysql_db)) {
/* should have returned data */
- error("We should have gotten a result: %s",
+ error("We should have gotten a result: %s",
mysql_error(mysql_db));
}
}
@@ -608,28 +608,28 @@ extern MYSQL_RES *mysql_db_query_ret(MYSQL *mysql_db, char *query, bool last)
extern int mysql_db_query_check_after(MYSQL *mysql_db, char *query)
{
int rc = SLURM_SUCCESS;
-
- if((rc = mysql_db_query(mysql_db, query)) != SLURM_ERROR)
+
+ if((rc = mysql_db_query(mysql_db, query)) != SLURM_ERROR)
rc = mysql_clear_results(mysql_db);
-
+
return rc;
}
extern int mysql_insert_ret_id(MYSQL *mysql_db, char *query)
{
int new_id = 0;
-
+
if(mysql_db_query(mysql_db, query) != SLURM_ERROR) {
new_id = mysql_insert_id(mysql_db);
if(!new_id) {
/* should have new id */
- error("We should have gotten a new id: %s",
+ error("We should have gotten a new id: %s",
mysql_error(mysql_db));
}
}
return new_id;
-
+
}
extern int mysql_db_create_table(MYSQL *mysql_db, char *table_name,
@@ -661,13 +661,13 @@ extern int mysql_db_create_table(MYSQL *mysql_db, char *table_name,
xfree(query);
return SLURM_ERROR;
}
- xfree(query);
+ xfree(query);
query = xstrdup_printf("create table if not exists %s (%s %s",
table_name, fields->name, fields->options);
i=1;
fields++;
-
+
while(fields && fields->name) {
xstrfmtcat(query, ", %s %s", fields->name, fields->options);
fields++;
@@ -682,8 +682,8 @@ extern int mysql_db_create_table(MYSQL *mysql_db, char *table_name,
xfree(query);
return SLURM_ERROR;
}
- xfree(query);
-
+ xfree(query);
+
return _mysql_make_table_current(mysql_db, table_name,
first_field, ending);
}
diff --git a/src/database/mysql_common.h b/src/database/mysql_common.h
index e1b1e111455dd540d20d764b6944c290bc7ceca2..ea416df26c4b80053659b0038fbb728cb9346860 100644
--- a/src/database/mysql_common.h
+++ b/src/database/mysql_common.h
@@ -5,32 +5,32 @@
* Copyright (C) 2004-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -67,11 +67,11 @@ typedef struct {
} mysql_conn_t;
typedef struct {
- char *backup;
- uint32_t port;
- char *host;
- char *user;
- char *pass;
+ char *backup;
+ uint32_t port;
+ char *host;
+ char *user;
+ char *pass;
} mysql_db_info_t;
typedef struct {
diff --git a/src/database/pgsql_common.c b/src/database/pgsql_common.c
index af20b8249f5db9dffdaa6e15fa16b4c88e3686a8..28cec651e2fbc4066f370f6cdbd09ea8671ac2e7 100644
--- a/src/database/pgsql_common.c
+++ b/src/database/pgsql_common.c
@@ -5,32 +5,32 @@
* Copyright (C) 2004-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -110,7 +110,7 @@ extern int pgsql_get_db_connection(PGconn **pgsql_db, char *db_name,
while(!storage_init) {
*pgsql_db = PQconnectdb(connect_line);
-
+
if(PQstatus(*pgsql_db) != CONNECTION_OK) {
if(!strcmp(PQerrorMessage(*pgsql_db),
"no password supplied")) {
@@ -118,14 +118,14 @@ extern int pgsql_get_db_connection(PGconn **pgsql_db, char *db_name,
fatal("This Postgres connection needs "
"a password. It doesn't appear to "
"like blank ones");
- }
-
+ }
+
info("Database %s not created. Creating", db_name);
pgsql_close_db_connection(pgsql_db);
- _create_db(db_name, db_info);
+ _create_db(db_name, db_info);
} else {
storage_init = true;
- }
+ }
}
xfree(connect_line);
return rc;
@@ -136,27 +136,27 @@ extern int pgsql_close_db_connection(PGconn **pgsql_db)
if(pgsql_db && *pgsql_db) {
PQfinish(*pgsql_db);
*pgsql_db = NULL;
- }
+ }
return SLURM_SUCCESS;
}
extern int pgsql_db_query(PGconn *pgsql_db, char *query)
{
PGresult *result = NULL;
-
+
if(!pgsql_db)
fatal("You haven't inited this storage yet.");
-
- if(!(result = pgsql_db_query_ret(pgsql_db, query)))
+
+ if(!(result = pgsql_db_query_ret(pgsql_db, query)))
return SLURM_ERROR;
-
+
PQclear(result);
return SLURM_SUCCESS;
}
extern int pgsql_db_commit(PGconn *pgsql_db)
{
- return pgsql_db_query(pgsql_db, "COMMIT WORK");
+ return pgsql_db_query(pgsql_db, "COMMIT WORK");
}
extern int pgsql_db_rollback(PGconn *pgsql_db)
@@ -168,7 +168,7 @@ extern int pgsql_db_rollback(PGconn *pgsql_db)
extern PGresult *pgsql_db_query_ret(PGconn *pgsql_db, char *query)
{
PGresult *result = NULL;
-
+
if(!pgsql_db)
fatal("You haven't inited this storage yet.");
@@ -176,7 +176,7 @@ extern PGresult *pgsql_db_query_ret(PGconn *pgsql_db, char *query)
if(PQresultStatus(result) != PGRES_COMMAND_OK
&& PQresultStatus(result) != PGRES_TUPLES_OK) {
- error("PQexec failed: %d %s", PQresultStatus(result),
+ error("PQexec failed: %d %s", PQresultStatus(result),
PQerrorMessage(pgsql_db));
info("query was %s", query);
PQclear(result);
@@ -195,25 +195,25 @@ extern int pgsql_insert_ret_id(PGconn *pgsql_db, char *sequence_name,
if(pgsql_db_query(pgsql_db, query) != SLURM_ERROR) {
char *new_query = xstrdup_printf(
"select last_value from %s", sequence_name);
-
+
if((result = pgsql_db_query_ret(pgsql_db, new_query))) {
new_id = atoi(PQgetvalue(result, 0, 0));
- PQclear(result);
+ PQclear(result);
}
xfree(new_query);
if(!new_id) {
/* should have new id */
- error("We should have gotten a new id: %s",
+ error("We should have gotten a new id: %s",
PQerrorMessage(pgsql_db));
}
}
slurm_mutex_unlock(&pgsql_lock);
-
+
return new_id;
-
+
}
-extern int pgsql_db_create_table(PGconn *pgsql_db,
+extern int pgsql_db_create_table(PGconn *pgsql_db,
char *table_name, storage_field_t *fields,
char *ending)
{
@@ -226,9 +226,9 @@ extern int pgsql_db_create_table(PGconn *pgsql_db,
i=0;
while(fields && fields->name) {
next = xstrdup_printf(" %s %s",
- fields->name,
+ fields->name,
fields->options);
- if(i)
+ if(i)
xstrcat(tmp, ",");
xstrcat(tmp, next);
xfree(next);
@@ -288,7 +288,7 @@ extern int pgsql_db_make_table_current(PGconn *pgsql_db, char *table_name,
if(!strcmp("serial", fields[i].options)) {
i++;
continue;
- }
+ }
opt_part = xstrdup(fields[i].options);
original_ptr = opt_part;
opt_part = strtok_r(opt_part, " ", &temp_char);
@@ -326,17 +326,17 @@ extern int pgsql_db_make_table_current(PGconn *pgsql_db, char *table_name,
break;
}
}
-
+
temp_char = NULL;
if(!found) {
info("adding column %s", fields[i].name);
- if(default_str)
+ if(default_str)
xstrfmtcat(temp_char,
" default %s", default_str);
-
- if(not_null)
+
+ if(not_null)
xstrcat(temp_char, " not null");
-
+
xstrfmtcat(query,
" add %s %s",
fields[i].name, type);
@@ -344,20 +344,20 @@ extern int pgsql_db_make_table_current(PGconn *pgsql_db, char *table_name,
xstrcat(query, temp_char);
xstrcat(query, ",");
} else {
- if(default_str)
+ if(default_str)
xstrfmtcat(temp_char,
" alter %s set default %s,",
fields[i].name, default_str);
- else
+ else
xstrfmtcat(temp_char,
" alter %s drop default,",
fields[i].name);
-
- if(not_null)
+
+ if(not_null)
xstrfmtcat(temp_char,
" alter %s set not null,",
fields[i].name);
- else
+ else
xstrfmtcat(temp_char,
" alter %s drop not null,",
fields[i].name);
@@ -367,7 +367,7 @@ extern int pgsql_db_make_table_current(PGconn *pgsql_db, char *table_name,
xfree(temp_char);
xfree(default_str);
xfree(type);
-
+
i++;
}
list_iterator_destroy(itr);
@@ -379,7 +379,7 @@ extern int pgsql_db_make_table_current(PGconn *pgsql_db, char *table_name,
return SLURM_ERROR;
}
xfree(query);
-
+
END_TIMER2("make table current");
return SLURM_SUCCESS;
}
diff --git a/src/database/pgsql_common.h b/src/database/pgsql_common.h
index 2f01da72af3661f2e167a180418de27b3b0ee824..11ab0e0a6bfa671e6b6c1fb6c98c1c4ce310d32a 100644
--- a/src/database/pgsql_common.h
+++ b/src/database/pgsql_common.h
@@ -5,32 +5,32 @@
* Copyright (C) 2004-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -66,10 +66,10 @@ typedef struct {
} pgsql_conn_t;
typedef struct {
- uint32_t port;
- char *host;
- char *user;
- char *pass;
+ uint32_t port;
+ char *host;
+ char *user;
+ char *pass;
} pgsql_db_info_t;
typedef struct {
@@ -92,10 +92,10 @@ extern int pgsql_db_rollback(PGconn *pgsql_db);
extern PGresult *pgsql_db_query_ret(PGconn *pgsql_db, char *query);
-extern int pgsql_insert_ret_id(PGconn *pgsql_db,
+extern int pgsql_insert_ret_id(PGconn *pgsql_db,
char *sequence_name, char *query);
-extern int pgsql_db_create_table(PGconn *pgsql_db,
+extern int pgsql_db_create_table(PGconn *pgsql_db,
char *table_name, storage_field_t *fields,
char *ending);
diff --git a/src/plugins/accounting_storage/filetxt/Makefile.am b/src/plugins/accounting_storage/filetxt/Makefile.am
index b05f7f62c477f915b70336b842c78c891e920155..85a83d5eb88437e473031fad75c239c4e07ff0fe 100644
--- a/src/plugins/accounting_storage/filetxt/Makefile.am
+++ b/src/plugins/accounting_storage/filetxt/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/accounting_storage/filetxt/Makefile.in b/src/plugins/accounting_storage/filetxt/Makefile.in
index f978f02723a44892a913434ae6b9c29cefcad76f..1846cc726325bc2f6d36f37f29540ad18a571c39 100644
--- a/src/plugins/accounting_storage/filetxt/Makefile.in
+++ b/src/plugins/accounting_storage/filetxt/Makefile.in
@@ -314,7 +314,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = accounting_storage_filetxt.la
accounting_storage_filetxt_la_SOURCES = accounting_storage_filetxt.c \
diff --git a/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c b/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c
index 8c0696cad2faf19ad8edf4fe267b7f0b09d51d52..34317619edbf59b6f0d51c2c9ca54138ad382931 100644
--- a/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c
+++ b/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c
@@ -7,32 +7,32 @@
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -61,14 +61,14 @@
* where <application> is a description of the intended application of
* the plugin (e.g., "jobacct" for SLURM job completion logging) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load job completion logging plugins if the plugin_type string has a
+ * only load job completion logging plugins if the plugin_type string has a
* prefix of "jobacct/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
* of the plugin. If major and minor revisions are desired, the major
* version number may be multiplied by a suitable magnitude constant such
* as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum versions for their plugins as the job accounting API
+ * minimum versions for their plugins as the job accounting API
* matures.
*/
const char plugin_name[] = "Accounting storage FileTxt plugin";
@@ -79,7 +79,7 @@ static int LOGFILE_FD;
static pthread_mutex_t logfile_lock = PTHREAD_MUTEX_INITIALIZER;
static int storage_init;
/* Format of the JOB_STEP record */
-const char *_jobstep_format =
+const char *_jobstep_format =
"%d "
"%u " /* stepid */
"%d " /* completion status */
@@ -132,9 +132,9 @@ const char *_jobstep_format =
* Print the record to the log file.
*/
-static int _print_record(struct job_record *job_ptr,
+static int _print_record(struct job_record *job_ptr,
time_t time, char *data)
-{
+{
static int rc=SLURM_SUCCESS;
char *block_id = NULL;
if(!job_ptr->details) {
@@ -144,10 +144,10 @@ static int _print_record(struct job_record *job_ptr,
debug2("_print_record, job=%u, \"%s\"",
job_ptr->job_id, data);
#ifdef HAVE_BG
- select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_BLOCK_ID,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo,
+ SELECT_JOBDATA_BLOCK_ID,
&block_id);
-
+
#endif
if(!block_id)
block_id = xstrdup("-");
@@ -157,7 +157,7 @@ static int _print_record(struct job_record *job_ptr,
if (fprintf(LOGFILE,
"%u %s %d %d %u %u %s - %s\n",
job_ptr->job_id, job_ptr->partition,
- (int)job_ptr->details->submit_time, (int)time,
+ (int)job_ptr->details->submit_time, (int)time,
job_ptr->user_id, job_ptr->group_id, block_id, data)
< 0)
rc=SLURM_ERROR;
@@ -177,11 +177,11 @@ static int _print_record(struct job_record *job_ptr,
extern int init ( void )
{
static int first = 1;
- char *log_file = NULL;
+ char *log_file = NULL;
int rc = SLURM_SUCCESS;
mode_t prot = 0600;
struct stat statbuf;
-
+
if(slurmdbd_conf) {
fatal("The filetxt plugin should not "
"be run from the slurmdbd. "
@@ -201,7 +201,7 @@ extern int init ( void )
slurm_mutex_lock( &logfile_lock );
if (LOGFILE)
fclose(LOGFILE);
-
+
if (*log_file != '/')
fatal("JobAcctLogfile must specify an "
"absolute pathname");
@@ -215,10 +215,10 @@ extern int init ( void )
slurm_mutex_unlock( &logfile_lock );
return SLURM_ERROR;
} else
- chmod(log_file, prot);
-
+ chmod(log_file, prot);
+
xfree(log_file);
-
+
if (setvbuf(LOGFILE, NULL, _IOLBF, 0))
error("setvbuf() failed");
LOGFILE_FD = fileno(LOGFILE);
@@ -288,19 +288,19 @@ extern int acct_storage_p_add_associations(void *db_conn, uint32_t uid,
return SLURM_SUCCESS;
}
-extern int acct_storage_p_add_qos(void *db_conn, uint32_t uid,
+extern int acct_storage_p_add_qos(void *db_conn, uint32_t uid,
List qos_list)
{
return SLURM_SUCCESS;
}
-extern int acct_storage_p_add_wckeys(void *db_conn, uint32_t uid,
+extern int acct_storage_p_add_wckeys(void *db_conn, uint32_t uid,
List wckey_list)
{
return SLURM_SUCCESS;
}
-extern int acct_storage_p_add_reservation(void *db_conn,
+extern int acct_storage_p_add_reservation(void *db_conn,
acct_reservation_rec_t *resv)
{
return SLURM_SUCCESS;
@@ -348,7 +348,7 @@ extern List acct_storage_p_modify_wckeys(void *db_conn, uint32_t uid,
return SLURM_SUCCESS;
}
-extern int acct_storage_p_modify_reservation(void *db_conn,
+extern int acct_storage_p_modify_reservation(void *db_conn,
acct_reservation_rec_t *resv)
{
return SLURM_SUCCESS;
@@ -361,7 +361,7 @@ extern List acct_storage_p_remove_users(void *db_conn, uint32_t uid,
}
extern List acct_storage_p_remove_coord(void *db_conn, uint32_t uid,
- List acct_list,
+ List acct_list,
acct_user_cond_t *user_q)
{
return SLURM_SUCCESS;
@@ -385,19 +385,19 @@ extern List acct_storage_p_remove_associations(void *db_conn, uint32_t uid,
return SLURM_SUCCESS;
}
-extern List acct_storage_p_remove_qos(void *db_conn, uint32_t uid,
+extern List acct_storage_p_remove_qos(void *db_conn, uint32_t uid,
acct_qos_cond_t *qos_cond)
{
return NULL;
}
-extern List acct_storage_p_remove_wckeys(void *db_conn, uint32_t uid,
+extern List acct_storage_p_remove_wckeys(void *db_conn, uint32_t uid,
acct_wckey_cond_t *wckey_cond)
{
return NULL;
}
-extern int acct_storage_p_remove_reservation(void *db_conn,
+extern int acct_storage_p_remove_reservation(void *db_conn,
acct_reservation_rec_t *resv)
{
return SLURM_SUCCESS;
@@ -471,7 +471,7 @@ extern int acct_storage_p_get_usage(void *db_conn, uid_t uid,
return rc;
}
-extern int acct_storage_p_roll_usage(void *db_conn,
+extern int acct_storage_p_roll_usage(void *db_conn,
time_t sent_start, time_t sent_end,
uint16_t archive_data)
{
@@ -512,14 +512,14 @@ extern int clusteracct_storage_p_cluster_procs(void *db_conn,
}
extern int clusteracct_storage_p_get_usage(
- void *db_conn, uid_t uid,
+ void *db_conn, uid_t uid,
acct_cluster_rec_t *cluster_rec, int type, time_t start, time_t end)
{
return SLURM_SUCCESS;
}
-/*
+/*
* load into the storage the start of a job
*/
extern int jobacct_storage_p_job_start(void *db_conn, char *cluster_name,
@@ -552,7 +552,7 @@ extern int jobacct_storage_p_job_start(void *db_conn, char *cluster_name,
if (job_ptr->name && job_ptr->name[0]) {
jname = xstrdup(job_ptr->name);
- for (i=0; jname[i]; i++)
+ for (i=0; jname[i]; i++)
if (isspace(jname[i]))
jname[i]='_';
} else {
@@ -582,12 +582,12 @@ extern int jobacct_storage_p_job_start(void *db_conn, char *cluster_name,
nodes, account);
rc = _print_record(job_ptr, job_ptr->start_time, buf);
-
+
xfree(jname);
return rc;
}
-/*
+/*
* load into the storage the end of a job
*/
extern int jobacct_storage_p_job_complete(void *db_conn,
@@ -598,7 +598,7 @@ extern int jobacct_storage_p_job_complete(void *db_conn,
debug("jobacct init was not called or it failed");
return SLURM_ERROR;
}
-
+
debug2("jobacct_job_complete() called");
if (job_ptr->end_time == 0) {
debug("jobacct: job %u never started", job_ptr->job_id);
@@ -611,11 +611,11 @@ extern int jobacct_storage_p_job_complete(void *db_conn,
(int) (job_ptr->end_time - job_ptr->start_time),
job_ptr->job_state & JOB_STATE_BASE,
job_ptr->requid, job_ptr->exit_code);
-
+
return _print_record(job_ptr, job_ptr->end_time, buf);
}
-/*
+/*
* load into the storage the start of a job step
*/
extern int jobacct_storage_p_step_start(void *db_conn,
@@ -629,7 +629,7 @@ extern int jobacct_storage_p_step_start(void *db_conn,
#endif
float float_tmp = 0;
char *account;
-
+
if(!storage_init) {
debug("jobacct init was not called or it failed");
return SLURM_ERROR;
@@ -637,24 +637,24 @@ extern int jobacct_storage_p_step_start(void *db_conn,
#ifdef HAVE_BG
cpus = step_ptr->job_ptr->num_procs;
- select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
- SELECT_JOBDATA_IONODES,
+ select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
+ SELECT_JOBDATA_IONODES,
&ionodes);
if(ionodes) {
- snprintf(node_list, BUFFER_SIZE,
+ snprintf(node_list, BUFFER_SIZE,
"%s[%s]", step_ptr->job_ptr->nodes, ionodes);
xfree(ionodes);
} else
snprintf(node_list, BUFFER_SIZE, "%s",
step_ptr->job_ptr->nodes);
-
+
#else
if(!step_ptr->step_layout || !step_ptr->step_layout->task_cnt) {
cpus = step_ptr->job_ptr->total_procs;
snprintf(node_list, BUFFER_SIZE, "%s", step_ptr->job_ptr->nodes);
} else {
cpus = step_ptr->step_layout->task_cnt;
- snprintf(node_list, BUFFER_SIZE, "%s",
+ snprintf(node_list, BUFFER_SIZE, "%s",
step_ptr->step_layout->node_list);
}
#endif
@@ -714,11 +714,11 @@ extern int jobacct_storage_p_step_start(void *db_conn,
0, /* min cpu node */
account,
step_ptr->job_ptr->requid); /* requester user id */
-
+
return _print_record(step_ptr->job_ptr, step_ptr->start_time, buf);
}
-/*
+/*
* load into the storage the end of a job step
*/
extern int jobacct_storage_p_step_complete(void *db_conn,
@@ -744,7 +744,7 @@ extern int jobacct_storage_p_step_complete(void *db_conn,
debug("jobacct init was not called or it failed");
return SLURM_ERROR;
}
-
+
now = time(NULL);
if (jobacct == NULL) {
@@ -752,7 +752,7 @@ extern int jobacct_storage_p_step_complete(void *db_conn,
memset(&dummy_jobacct, 0, sizeof(dummy_jobacct));
jobacct = &dummy_jobacct;
}
-
+
if ((elapsed=now-step_ptr->start_time)<0)
elapsed=0; /* For *very* short jobs, if clock is wrong */
@@ -767,25 +767,25 @@ extern int jobacct_storage_p_step_complete(void *db_conn,
#ifdef HAVE_BG
cpus = step_ptr->job_ptr->num_procs;
- select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
- SELECT_JOBDATA_IONODES,
+ select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
+ SELECT_JOBDATA_IONODES,
&ionodes);
if(ionodes) {
- snprintf(node_list, BUFFER_SIZE,
+ snprintf(node_list, BUFFER_SIZE,
"%s[%s]", step_ptr->job_ptr->nodes, ionodes);
xfree(ionodes);
} else
- snprintf(node_list, BUFFER_SIZE, "%s",
+ snprintf(node_list, BUFFER_SIZE, "%s",
step_ptr->job_ptr->nodes);
-
+
#else
if(!step_ptr->step_layout || !step_ptr->step_layout->task_cnt) {
cpus = step_ptr->job_ptr->total_procs;
snprintf(node_list, BUFFER_SIZE, "%s", step_ptr->job_ptr->nodes);
-
+
} else {
cpus = step_ptr->step_layout->task_cnt;
- snprintf(node_list, BUFFER_SIZE, "%s",
+ snprintf(node_list, BUFFER_SIZE, "%s",
step_ptr->step_layout->node_list);
}
#endif
@@ -798,10 +798,10 @@ extern int jobacct_storage_p_step_complete(void *db_conn,
ave_pages = jobacct->tot_pages;
ave_pages /= cpus;
ave_cpu = jobacct->tot_cpu;
- ave_cpu /= cpus;
+ ave_cpu /= cpus;
ave_cpu /= 100;
}
-
+
if(jobacct->min_cpu != (uint32_t)NO_VAL) {
ave_cpu2 = jobacct->min_cpu;
ave_cpu2 /= 100;
@@ -821,10 +821,10 @@ extern int jobacct_storage_p_step_complete(void *db_conn,
cpus, /* number of cpus */
elapsed, /* elapsed seconds */
/* total cputime seconds */
- jobacct->user_cpu_sec
+ jobacct->user_cpu_sec
+ jobacct->sys_cpu_sec,
/* total cputime seconds */
- jobacct->user_cpu_usec
+ jobacct->user_cpu_usec
+ jobacct->sys_cpu_usec,
jobacct->user_cpu_sec, /* user seconds */
jobacct->user_cpu_usec,/* user microseconds */
@@ -864,11 +864,11 @@ extern int jobacct_storage_p_step_complete(void *db_conn,
jobacct->min_cpu_id.nodeid, /* min cpu task */
account,
step_ptr->job_ptr->requid); /* requester user id */
-
- return _print_record(step_ptr->job_ptr, now, buf);
+
+ return _print_record(step_ptr->job_ptr, now, buf);
}
-/*
+/*
* load into the storage a suspention of a job
*/
extern int jobacct_storage_p_suspend(void *db_conn,
@@ -882,30 +882,30 @@ extern int jobacct_storage_p_suspend(void *db_conn,
debug("jobacct init was not called or it failed");
return SLURM_ERROR;
}
-
+
/* tell what time has passed */
if(!now)
now = job_ptr->start_time;
temp = now;
now = time(NULL);
-
+
if ((elapsed=now-temp) < 0)
elapsed=0; /* For *very* short jobs, if clock is wrong */
-
+
/* here we are really just going for a marker in time to tell when
- * the process was suspended or resumed (check job state), we don't
+ * the process was suspended or resumed (check job state), we don't
* really need to keep track of anything else */
snprintf(buf, BUFFER_SIZE, "%d %d %d",
JOB_SUSPEND,
elapsed,
job_ptr->job_state & JOB_STATE_BASE);/* job status */
-
+
return _print_record(job_ptr, now, buf);
}
-/*
- * get info from the storage
+/*
+ * get info from the storage
* returns List of jobacct_job_rec_t *
* note List needs to be freed when called
*/
@@ -915,20 +915,20 @@ extern List jobacct_storage_p_get_jobs_cond(void *db_conn, uid_t uid,
return filetxt_jobacct_process_get_jobs(job_cond);
}
-/*
- * expire old info from the storage
+/*
+ * expire old info from the storage
*/
extern int jobacct_storage_p_archive(void *db_conn,
acct_archive_cond_t *arch_cond)
{
return filetxt_jobacct_process_archive(arch_cond);
-
+
}
-/*
- * load old info into the storage
+/*
+ * load old info into the storage
*/
-extern int jobacct_storage_p_archive_load(void *db_conn,
+extern int jobacct_storage_p_archive_load(void *db_conn,
acct_archive_rec_t *arch_rec)
{
return SLURM_ERROR;
diff --git a/src/plugins/accounting_storage/filetxt/filetxt_jobacct_process.c b/src/plugins/accounting_storage/filetxt/filetxt_jobacct_process.c
index 19e88d09fafeefd7ac3c1e1ca50b969ef4f8aac8..eb02872e5fade438f11bdd75fdcbcf66189b3e03 100644
--- a/src/plugins/accounting_storage/filetxt/filetxt_jobacct_process.c
+++ b/src/plugins/accounting_storage/filetxt/filetxt_jobacct_process.c
@@ -7,32 +7,32 @@
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -107,7 +107,7 @@ typedef struct {
char *stepname;
enum job_states status;
int32_t exitcode;
- uint32_t ntasks;
+ uint32_t ntasks;
uint32_t ncpus;
uint32_t elapsed;
time_t end;
@@ -121,22 +121,22 @@ typedef struct {
/* Fields common to all records */
enum { F_JOB = 0,
- F_PARTITION,
- F_JOB_SUBMIT,
- F_TIMESTAMP,
- F_UID,
- F_GID,
- F_BLOCKID,
- F_RESERVED2,
- F_RECTYPE,
+ F_PARTITION,
+ F_JOB_SUBMIT,
+ F_TIMESTAMP,
+ F_UID,
+ F_GID,
+ F_BLOCKID,
+ F_RESERVED2,
+ F_RECTYPE,
HEADER_LENGTH
};
/* JOB_START fields */
enum { F_JOBNAME = HEADER_LENGTH,
- F_TRACK_STEPS,
- F_PRIORITY,
- F_NCPUS,
+ F_TRACK_STEPS,
+ F_PRIORITY,
+ F_NCPUS,
F_NODES,
F_JOB_ACCOUNT,
JOB_START_LENGTH
@@ -250,7 +250,7 @@ static jobacct_step_rec_t *_create_jobacct_step_rec(
filetxt_step_rec_t *filetxt_step)
{
jobacct_step_rec_t *jobacct_step = create_jobacct_step_rec();
-
+
jobacct_step->elapsed = filetxt_step->elapsed;
jobacct_step->end = filetxt_step->header.timestamp;
jobacct_step->exitcode = filetxt_step->exitcode;
@@ -300,10 +300,10 @@ static jobacct_job_rec_t *_create_jobacct_job_rec(
}
list_iterator_destroy(itr);
return NULL; /* no match */
- }
-
+ }
+
foundstate:
-
+
no_cond:
jobacct_job = create_jobacct_job_rec();
jobacct_job->associd = 0;
@@ -350,7 +350,7 @@ no_cond:
list_iterator_destroy(itr);
}
jobacct_job->submit = filetxt_job->header.job_submit;
-
+
jobacct_job->sys_cpu_sec = filetxt_job->rusage.ru_stime.tv_sec;
jobacct_job->sys_cpu_usec = filetxt_job->rusage.ru_stime.tv_usec;
jobacct_job->tot_cpu_sec = filetxt_job->tot_cpu_sec;
@@ -360,7 +360,7 @@ no_cond:
jobacct_job->user = NULL;
jobacct_job->user_cpu_sec = filetxt_job->rusage.ru_utime.tv_sec;
jobacct_job->user_cpu_usec = filetxt_job->rusage.ru_utime.tv_usec;
-
+
return jobacct_job;
}
@@ -487,7 +487,7 @@ static int _cmp_jrec(const void *a1, const void *a2) {
else if (j1->job == j2->job) {
if(j1->job_submit == j2->job_submit)
return 0;
- else
+ else
return 1;
}
return 1;
@@ -518,16 +518,16 @@ static void _do_fdump(char* f[], int lc)
"recordType",/* F_RECTYPE */
NULL};
- char *start[] = {"jobName", /* F_JOBNAME */
+ char *start[] = {"jobName", /* F_JOBNAME */
"TrackSteps", /* F_TRACK_STEPS */
"priority", /* F_PRIORITY */
"ncpus", /* F_NCPUS */
"nodeList", /* F_NODES */
"account", /* F_JOB_ACCOUNT */
NULL};
-
+
char *step[] = {"jobStep", /* F_JOBSTEP */
- "status", /* F_STATUS */
+ "status", /* F_STATUS */
"exitcode", /* F_EXITCODE */
"ntasks", /* F_NTASKS */
"ncpus", /* F_STEPNCPUS */
@@ -573,21 +573,21 @@ static void _do_fdump(char* f[], int lc)
"account", /* F_STEP_ACCOUNT */
"requid", /* F_STEP_REQUID */
NULL};
-
+
char *suspend[] = {"Suspend/Run time", /* F_TOT_ELAPSED */
- "status", /* F_STATUS */
- NULL};
+ "status", /* F_STATUS */
+ NULL};
char *term[] = {"totElapsed", /* F_TOT_ELAPSED */
- "status", /* F_STATUS */
+ "status", /* F_STATUS */
"requid", /* F_JOB_REQUID */
"exitcode", /* F_EXITCODE */
- NULL};
-
+ NULL};
+
i = atoi(f[F_RECTYPE]);
printf("\n------- Line %d %s -------\n", lc, _convert_type(i));
- for(j=0; j < HEADER_LENGTH; j++)
+ for(j=0; j < HEADER_LENGTH; j++)
printf("%12s: %s\n", header[j], f[j]);
switch(i) {
case JOB_START:
@@ -607,17 +607,17 @@ static void _do_fdump(char* f[], int lc)
break;
default:
while(f[j]) {
- printf(" Field[%02d]: %s\n", j, f[j]);
+ printf(" Field[%02d]: %s\n", j, f[j]);
j++;
}
return;
}
-
+
for(i=HEADER_LENGTH; i < j; i++)
- printf("%12s: %s\n", type[i-HEADER_LENGTH], f[i]);
+ printf("%12s: %s\n", type[i-HEADER_LENGTH], f[i]);
}
-static filetxt_job_rec_t *_find_job_record(List job_list,
+static filetxt_job_rec_t *_find_job_record(List job_list,
filetxt_header_t header,
int type)
{
@@ -632,12 +632,12 @@ static filetxt_job_rec_t *_find_job_record(List job_list,
job = NULL;
break;
}
-
+
if(job->header.job_submit == BATCH_JOB_TIMESTAMP) {
job->header.job_submit = header.job_submit;
break;
}
-
+
if(job->header.job_submit == header.job_submit)
break;
else {
@@ -664,7 +664,7 @@ static filetxt_step_rec_t *_find_step_record(filetxt_job_rec_t *job,
if(!list_count(job->steps))
return step;
-
+
itr = list_iterator_create(job->steps);
while((step = (filetxt_step_rec_t *)list_next(itr)) != NULL) {
if (step->stepnum == stepnum)
@@ -694,7 +694,7 @@ static int _parse_line(char *f[], void **data, int len)
filetxt_step_rec_t **step = (filetxt_step_rec_t **)data;
filetxt_header_t header;
_parse_header(f, &header);
-
+
switch(i) {
case JOB_START:
*job = _create_filetxt_job_rec(header);
@@ -753,19 +753,19 @@ static int _parse_line(char *f[], void **data, int len)
(*step)->rusage.ru_nivcsw = atoi(f[F_NIVCSW]);
(*step)->sacct.max_vsize = atoi(f[F_MAX_VSIZE]);
if(len > F_STEPNODES) {
- (*step)->sacct.max_vsize_id.taskid =
+ (*step)->sacct.max_vsize_id.taskid =
atoi(f[F_MAX_VSIZE_TASK]);
(*step)->sacct.ave_vsize = atof(f[F_AVE_VSIZE]);
(*step)->sacct.max_rss = atoi(f[F_MAX_RSS]);
- (*step)->sacct.max_rss_id.taskid =
+ (*step)->sacct.max_rss_id.taskid =
atoi(f[F_MAX_RSS_TASK]);
(*step)->sacct.ave_rss = atof(f[F_AVE_RSS]);
(*step)->sacct.max_pages = atoi(f[F_MAX_PAGES]);
- (*step)->sacct.max_pages_id.taskid =
+ (*step)->sacct.max_pages_id.taskid =
atoi(f[F_MAX_PAGES_TASK]);
(*step)->sacct.ave_pages = atof(f[F_AVE_PAGES]);
(*step)->sacct.min_cpu = atof(f[F_MIN_CPU]);
- (*step)->sacct.min_cpu_id.taskid =
+ (*step)->sacct.min_cpu_id.taskid =
atoi(f[F_MIN_CPU_TASK]);
(*step)->sacct.ave_cpu = atof(f[F_AVE_CPU]);
(*step)->stepname = xstrdup(f[F_STEPNAME]);
@@ -786,13 +786,13 @@ static int _parse_line(char *f[], void **data, int len)
(*step)->nodes = NULL;
}
if(len > F_MIN_CPU_NODE) {
- (*step)->sacct.max_vsize_id.nodeid =
+ (*step)->sacct.max_vsize_id.nodeid =
atoi(f[F_MAX_VSIZE_NODE]);
- (*step)->sacct.max_rss_id.nodeid =
+ (*step)->sacct.max_rss_id.nodeid =
atoi(f[F_MAX_RSS_NODE]);
- (*step)->sacct.max_pages_id.nodeid =
+ (*step)->sacct.max_pages_id.nodeid =
atoi(f[F_MAX_PAGES_NODE]);
- (*step)->sacct.min_cpu_id.nodeid =
+ (*step)->sacct.min_cpu_id.nodeid =
atoi(f[F_MIN_CPU_NODE]);
} else {
(*step)->sacct.max_vsize_id.nodeid = NO_VAL;
@@ -809,10 +809,10 @@ static int _parse_line(char *f[], void **data, int len)
case JOB_TERMINATED:
*job = _create_filetxt_job_rec(header);
(*job)->elapsed = atoi(f[F_TOT_ELAPSED]);
- (*job)->status = atoi(f[F_STATUS]);
- if(len > F_JOB_REQUID)
+ (*job)->status = atoi(f[F_STATUS]);
+ if(len > F_JOB_REQUID)
(*job)->requid = atoi(f[F_JOB_REQUID]);
- if(len > F_JOB_EXITCODE)
+ if(len > F_JOB_EXITCODE)
(*job)->exitcode = atoi(f[F_JOB_EXITCODE]);
break;
default:
@@ -830,7 +830,7 @@ static void _process_start(List job_list, char *f[], int lc,
_parse_line(f, (void **)&temp, len);
job = _find_job_record(job_list, temp->header, JOB_START);
- if (job) {
+ if (job) {
/* in slurm we can get 2 start records one for submit
* and one for start, so look at the last one */
xfree(job->jobname);
@@ -846,24 +846,24 @@ static void _process_start(List job_list, char *f[], int lc,
_destroy_filetxt_job_rec(temp);
return;
}
-
+
job = temp;
job->show_full = show_full;
list_append(job_list, job);
job->job_start_seen = 1;
-
+
}
static void _process_step(List job_list, char *f[], int lc,
int show_full, int len)
{
filetxt_job_rec_t *job = NULL;
-
+
filetxt_step_rec_t *step = NULL;
filetxt_step_rec_t *temp = NULL;
_parse_line(f, (void **)&temp, len);
-
+
job = _find_job_record(job_list, temp->header, JOB_STEP);
if (temp->stepnum == -2) {
@@ -878,9 +878,9 @@ static void _process_step(List job_list, char *f[], int lc,
temp->header.jobnum, temp->stepnum, lc);
}
job->show_full = show_full;
-
+
if ((step = _find_step_record(job, temp->stepnum))) {
-
+
if (temp->status == JOB_RUNNING) {
_destroy_filetxt_step_rec(temp);
return;/* if "R" record preceded by F or CD; unusual */
@@ -890,7 +890,7 @@ static void _process_step(List job_list, char *f[], int lc,
"Conflicting JOB_STEP record for "
"jobstep %u.%u at line %d "
"-- ignoring it\n",
- step->header.jobnum,
+ step->header.jobnum,
step->stepnum, lc);
_destroy_filetxt_step_rec(temp);
return;
@@ -923,14 +923,14 @@ static void _process_step(List job_list, char *f[], int lc,
different. If it is different print out
the step separate.
*/
- if(list_count(job->steps) > 1)
+ if(list_count(job->steps) > 1)
job->track_steps = 1;
else if(step && step->stepname && job->jobname) {
if(strcmp(step->stepname, job->jobname))
job->track_steps = 1;
}
}
-
+
if(job->header.timestamp == 0)
job->header.timestamp = step->header.timestamp;
job->job_step_seen = 1;
@@ -939,9 +939,9 @@ static void _process_step(List job_list, char *f[], int lc,
xfree(job->nodes);
job->nodes = xstrdup(step->nodes);
}
-
-got_step:
-
+
+got_step:
+
if (job->job_terminated_seen == 0) { /* If the job is still running,
this is the most recent
status */
@@ -963,17 +963,17 @@ static void _process_suspend(List job_list, char *f[], int lc,
if (!job) { /* fake it for now */
job = _create_filetxt_job_rec(temp->header);
job->jobname = xstrdup("(unknown)");
- }
-
+ }
+
job->show_full = show_full;
- if (job->status == JOB_SUSPENDED)
+ if (job->status == JOB_SUSPENDED)
job->elapsed -= temp->elapsed;
//job->header.timestamp = temp->header.timestamp;
job->status = temp->status;
_destroy_filetxt_job_rec(temp);
}
-
+
static void _process_terminated(List job_list, char *f[], int lc,
int show_full, int len)
{
@@ -994,7 +994,7 @@ static void _process_terminated(List job_list, char *f[], int lc,
/* multiple node failures - extra TERMINATED records */
debug("Note: Duplicate JOB_TERMINATED "
"record (nf) for job %u at "
- "line %d\n",
+ "line %d\n",
temp->header.jobnum, lc);
/* JOB_TERMINATED/NF records may be preceded
* by a JOB_TERMINATED/CA record; NF is much
@@ -1003,11 +1003,11 @@ static void _process_terminated(List job_list, char *f[], int lc,
job->status = temp->status;
goto finished;
}
-
+
fprintf(stderr,
"Conflicting JOB_TERMINATED record (%s) for "
"job %u at line %d -- ignoring it\n",
- job_state_string(temp->status),
+ job_state_string(temp->status),
job->header.jobnum, lc);
goto finished;
}
@@ -1020,7 +1020,7 @@ static void _process_terminated(List job_list, char *f[], int lc,
if(list_count(job->steps) > 1)
job->track_steps = 1;
job->show_full = show_full;
-
+
finished:
_destroy_filetxt_job_rec(temp);
}
@@ -1047,7 +1047,7 @@ extern List filetxt_jobacct_process_get_jobs(acct_job_cond_t *job_cond)
List job_list = list_create(_destroy_filetxt_job_rec);
filein = slurm_get_accounting_storage_loc();
-
+
/* we grab the fdump only for the filetxt plug through the
FDUMP_FLAG on the job_cond->duplicates variable. We didn't
add this extra field to the structure since it only applies
@@ -1056,12 +1056,12 @@ extern List filetxt_jobacct_process_get_jobs(acct_job_cond_t *job_cond)
if(job_cond) {
fdump_flag = job_cond->duplicates & FDUMP_FLAG;
job_cond->duplicates &= (~FDUMP_FLAG);
- if(!job_cond->duplicates)
+ if(!job_cond->duplicates)
itr2 = list_iterator_create(ret_job_list);
}
fd = _open_log_file(filein);
-
+
while (fgets(line, BUFFER_SIZE, fd)) {
lc++;
fptr = line; /* break the record into NULL-
@@ -1073,16 +1073,16 @@ extern List filetxt_jobacct_process_get_jobs(acct_job_cond_t *job_cond)
fptr = strstr(f[i], "\n");
if (fptr)
*fptr = 0;
- break;
+ break;
} else
*fptr++ = 0;
}
f[++i] = 0;
-
+
if(i < HEADER_LENGTH) {
continue;
}
-
+
rec_type = atoi(f[F_RECTYPE]);
job_id = atoi(f[F_JOB]);
uid = atoi(f[F_UID]);
@@ -1109,7 +1109,7 @@ extern List filetxt_jobacct_process_get_jobs(acct_job_cond_t *job_cond)
}
list_iterator_destroy(itr);
continue; /* no match */
- }
+ }
founduid:
if (job_cond->groupid_list
@@ -1123,7 +1123,7 @@ extern List filetxt_jobacct_process_get_jobs(acct_job_cond_t *job_cond)
}
list_iterator_destroy(itr);
continue; /* no match */
- }
+ }
foundgid:
if (job_cond->step_list
@@ -1137,12 +1137,12 @@ extern List filetxt_jobacct_process_get_jobs(acct_job_cond_t *job_cond)
show_full = 1;
list_iterator_destroy(itr);
goto foundjob;
- } else if (rec_type != JOB_STEP
+ } else if (rec_type != JOB_STEP
|| selected_step->stepid
== step_id) {
list_iterator_destroy(itr);
goto foundjob;
- }
+ }
}
list_iterator_destroy(itr);
continue; /* no match */
@@ -1150,11 +1150,11 @@ extern List filetxt_jobacct_process_get_jobs(acct_job_cond_t *job_cond)
show_full = 1;
}
foundjob:
-
+
if (job_cond->partition_list
&& list_count(job_cond->partition_list)) {
itr = list_iterator_create(job_cond->partition_list);
- while((object = list_next(itr)))
+ while((object = list_next(itr)))
if (!strcasecmp(f[F_PARTITION], object)) {
list_iterator_destroy(itr);
goto foundp;
@@ -1169,14 +1169,14 @@ extern List filetxt_jobacct_process_get_jobs(acct_job_cond_t *job_cond)
}
no_cond:
-
+
/* Build suitable tables with all the data */
switch(rec_type) {
case JOB_START:
if(i < F_JOB_ACCOUNT) {
error("Bad data on a Job Start\n");
_show_rec(f);
- } else
+ } else
_process_start(job_list, f, lc, show_full, i);
break;
case JOB_STEP:
@@ -1208,24 +1208,24 @@ extern List filetxt_jobacct_process_get_jobs(acct_job_cond_t *job_cond)
break;
}
}
-
+
if (ferror(fd)) {
perror(filein);
exit(1);
- }
+ }
fclose(fd);
itr = list_iterator_create(job_list);
-
+
while((filetxt_job = list_next(itr))) {
- jobacct_job_rec_t *jobacct_job =
+ jobacct_job_rec_t *jobacct_job =
_create_jobacct_job_rec(filetxt_job, job_cond);
if(jobacct_job) {
jobacct_job_rec_t *curr_job = NULL;
if(itr2) {
list_iterator_reset(itr2);
while((curr_job = list_next(itr2))) {
- if (curr_job->jobid ==
+ if (curr_job->jobid ==
jobacct_job->jobid) {
list_delete_item(itr2);
info("removing job %d", jobacct_job->jobid);
@@ -1244,7 +1244,7 @@ extern List filetxt_jobacct_process_get_jobs(acct_job_cond_t *job_cond)
list_destroy(job_list);
xfree(filein);
-
+
return ret_job_list;
}
@@ -1278,7 +1278,7 @@ extern int filetxt_jobacct_process_archive(acct_archive_cond_t *arch_cond)
ListIterator itr = NULL;
ListIterator itr2 = NULL;
acct_job_cond_t *job_cond = NULL;
-
+
/* Figure out our expiration date */
time_t expiry;
@@ -1293,7 +1293,7 @@ extern int filetxt_jobacct_process_archive(acct_archive_cond_t *arch_cond)
filein = slurm_get_accounting_storage_loc();
else
filein = arch_cond->archive_script;
-
+
expiry = time(NULL) - job_cond->usage_end;
debug("Purging jobs completed prior to %d\n", (int)expiry);
@@ -1340,39 +1340,39 @@ extern int filetxt_jobacct_process_archive(acct_archive_cond_t *arch_cond)
terminated strings */
exp_rec = xmalloc(sizeof(expired_rec_t));
exp_rec->line = xstrdup(line);
-
+
for (i = 0; i < EXPIRE_READ_LENGTH; i++) {
f[i] = fptr;
fptr = strstr(fptr, " ");
if (fptr == NULL)
- break;
+ break;
else
*fptr++ = 0;
}
-
+
exp_rec->job = atoi(f[F_JOB]);
exp_rec->job_submit = atoi(f[F_JOB_SUBMIT]);
-
+
rec_type = atoi(f[F_RECTYPE]);
/* Odd, but complain some other time */
if (rec_type == JOB_TERMINATED) {
if (expiry < atoi(f[F_TIMESTAMP])) {
list_append(keep_list, exp_rec);
- continue;
+ continue;
}
if (job_cond->partition_list
&& list_count(job_cond->partition_list)) {
itr = list_iterator_create(
job_cond->partition_list);
- while((object = list_next(itr)))
+ while((object = list_next(itr)))
if (!strcasecmp(f[F_PARTITION], object))
break;
-
+
list_iterator_destroy(itr);
if(!object)
continue; /* no match */
}
-
+
list_append(exp_list, exp_rec);
debug2("Selected: %8d %d",
exp_rec->job,
@@ -1389,13 +1389,13 @@ extern int filetxt_jobacct_process_archive(acct_archive_cond_t *arch_cond)
sprintf(logfile_name, "%s.expired", filein);
new_file = stat(logfile_name, &statbuf);
if ((expired_logfile = fopen(logfile_name, "a"))==NULL) {
- error("Error while opening %s",
+ error("Error while opening %s",
logfile_name);
perror("");
xfree(logfile_name);
goto finished;
}
-
+
if (new_file) { /* By default, the expired file looks like the log */
chmod(logfile_name, prot);
if(chown(logfile_name, uid, gid) == -1)
@@ -1417,7 +1417,7 @@ extern int filetxt_jobacct_process_archive(acct_archive_cond_t *arch_cond)
error("2 Couldn't change ownership of %s to %u:%u",
logfile_name, uid, gid);
/* Use line buffering to allow us to safely write
- * to the log file at the same time as slurmctld. */
+ * to the log file at the same time as slurmctld. */
if (setvbuf(new_logfile, NULL, _IOLBF, 0)) {
perror("setvbuf()");
fclose(expired_logfile);
@@ -1426,7 +1426,7 @@ extern int filetxt_jobacct_process_archive(acct_archive_cond_t *arch_cond)
list_sort(exp_list, (ListCmpF) _cmp_jrec);
list_sort(keep_list, (ListCmpF) _cmp_jrec);
-
+
/* if (params->opt_verbose > 2) { */
/* error("--- contents of exp_list ---"); */
/* itr = list_iterator_create(exp_list); */
@@ -1445,7 +1445,7 @@ extern int filetxt_jobacct_process_archive(acct_archive_cond_t *arch_cond)
while((exp_rec = list_next(itr))) {
itr2 = list_iterator_create(other_list);
while((exp_rec2 = list_next(itr2))) {
- if((exp_rec2->job != exp_rec->job)
+ if((exp_rec2->job != exp_rec->job)
|| (exp_rec2->job_submit != exp_rec->job_submit))
continue;
if (fputs(exp_rec2->line, expired_logfile)<0) {
@@ -1464,11 +1464,11 @@ extern int filetxt_jobacct_process_archive(acct_archive_cond_t *arch_cond)
list_iterator_destroy(itr);
fclose(expired_logfile);
goto finished2;
- }
+ }
}
list_iterator_destroy(itr);
fclose(expired_logfile);
-
+
/* write the new log */
itr = list_iterator_create(keep_list);
while((exp_rec = list_next(itr))) {
@@ -1490,10 +1490,10 @@ extern int filetxt_jobacct_process_archive(acct_archive_cond_t *arch_cond)
perror("writing keep_logfile");
list_iterator_destroy(itr);
goto finished2;
- }
+ }
}
list_iterator_destroy(itr);
-
+
/* write records in other_list to new log */
itr = list_iterator_create(other_list);
while((exp_rec = list_next(itr))) {
@@ -1504,7 +1504,7 @@ extern int filetxt_jobacct_process_archive(acct_archive_cond_t *arch_cond)
}
}
list_iterator_destroy(itr);
-
+
if (rename(filein, old_logfile_name)) {
perror("renaming logfile to .old.");
goto finished2;
@@ -1512,7 +1512,7 @@ extern int filetxt_jobacct_process_archive(acct_archive_cond_t *arch_cond)
if (rename(logfile_name, filein)) {
perror("renaming new logfile");
/* undo it? */
- if (!rename(old_logfile_name, filein))
+ if (!rename(old_logfile_name, filein))
error("Please correct the problem "
"and try again");
else
@@ -1566,7 +1566,7 @@ finished2:
}
finished:
xfree(filein);
-
+
fclose(fd);
list_destroy(exp_list);
list_destroy(keep_list);
diff --git a/src/plugins/accounting_storage/filetxt/filetxt_jobacct_process.h b/src/plugins/accounting_storage/filetxt/filetxt_jobacct_process.h
index f7186a3dbf4ddf90601f9a3a96876ecabc376be8..c02f59ece782337e584446eb3d2ae1d5982ba793 100644
--- a/src/plugins/accounting_storage/filetxt/filetxt_jobacct_process.h
+++ b/src/plugins/accounting_storage/filetxt/filetxt_jobacct_process.h
@@ -7,32 +7,32 @@
* Copyright (C) 2004-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c b/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
index a821f867ed420c6caac789bb1c9aa9ea81e860c7..05a70b177d0bfba3c008ae445277b127e8f3f36f 100644
--- a/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
+++ b/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
@@ -7,37 +7,37 @@
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
*****************************************************************************
- * Notes on mysql configuration
+ * Notes on mysql configuration
* Assumes mysql is installed as user root
* Assumes SlurmUser is configured as user slurm
* # mysqladmin create <db_name>
@@ -75,14 +75,14 @@
* the plugin (e.g., "accounting_storage" for SLURM job completion
* logging) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load job completion logging plugins if the plugin_type string has a
+ * only load job completion logging plugins if the plugin_type string has a
* prefix of "accounting_storage/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
* of the plugin. If major and minor revisions are desired, the major
* version number may be multiplied by a suitable magnitude constant such
* as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum versions for their plugins as the job accounting API
+ * minimum versions for their plugins as the job accounting API
* matures.
*/
const char plugin_name[] = "Accounting storage MYSQL plugin";
@@ -131,14 +131,14 @@ static char *default_qos_str = NULL;
extern int acct_storage_p_commit(mysql_conn_t *mysql_conn, bool commit);
extern int acct_storage_p_add_associations(mysql_conn_t *mysql_conn,
- uint32_t uid,
+ uint32_t uid,
List association_list);
-extern int acct_storage_p_add_wckeys(mysql_conn_t *mysql_conn, uint32_t uid,
+extern int acct_storage_p_add_wckeys(mysql_conn_t *mysql_conn, uint32_t uid,
List wckey_list);
extern List acct_storage_p_get_associations(
- mysql_conn_t *mysql_conn, uid_t uid,
+ mysql_conn_t *mysql_conn, uid_t uid,
acct_association_cond_t *assoc_cond);
extern List acct_storage_p_get_wckeys(mysql_conn_t *mysql_conn, uid_t uid,
@@ -153,12 +153,12 @@ extern int clusteracct_storage_p_get_usage(
acct_cluster_rec_t *cluster_rec, slurmdbd_msg_type_t type,
time_t start, time_t end);
-extern List acct_storage_p_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
+extern List acct_storage_p_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
List acct_list,
acct_user_cond_t *user_cond);
extern List acct_storage_p_remove_wckeys(mysql_conn_t *mysql_conn,
- uint32_t uid,
+ uint32_t uid,
acct_wckey_cond_t *wckey_cond);
static int _set_qos_cnt(MYSQL *db_conn)
@@ -172,12 +172,12 @@ static int _set_qos_cnt(MYSQL *db_conn)
return SLURM_ERROR;
}
xfree(query);
-
+
if(!(row = mysql_fetch_row(result))) {
mysql_free_result(result);
return SLURM_ERROR;
}
-
+
/* Set the current qos_count on the system for
generating bitstr of that length. Since 0 isn't
possible as an id we add 1 to the total to burn 0 and
@@ -196,7 +196,7 @@ static char *_get_cluster_from_associd(mysql_conn_t *mysql_conn,
char *query = NULL;
MYSQL_RES *result = NULL;
MYSQL_ROW row;
-
+
/* Just so we don't have to keep a
cache of the associations around we
will just query the db for the cluster
@@ -209,18 +209,18 @@ static char *_get_cluster_from_associd(mysql_conn_t *mysql_conn,
debug4("%d(%d) query\n%s",
mysql_conn->conn, __LINE__, query);
- if(!(result =
+ if(!(result =
mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
return NULL;
}
xfree(query);
-
+
if((row = mysql_fetch_row(result)))
cluster = xstrdup(row[0]);
mysql_free_result(result);
-
+
return cluster;
}
@@ -230,7 +230,7 @@ static char *_get_user_from_associd(mysql_conn_t *mysql_conn, uint32_t associd)
char *query = NULL;
MYSQL_RES *result = NULL;
MYSQL_ROW row;
-
+
/* Just so we don't have to keep a
cache of the associations around we
will just query the db for the user
@@ -243,22 +243,22 @@ static char *_get_user_from_associd(mysql_conn_t *mysql_conn, uint32_t associd)
debug4("%d(%d) query\n%s",
mysql_conn->conn, __LINE__, query);
- if(!(result =
+ if(!(result =
mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
return NULL;
}
xfree(query);
-
+
if((row = mysql_fetch_row(result)))
user = xstrdup(row[0]);
mysql_free_result(result);
-
+
return user;
}
-static uint32_t _get_wckeyid(mysql_conn_t *mysql_conn, char **name,
+static uint32_t _get_wckeyid(mysql_conn_t *mysql_conn, char **name,
uid_t uid, char *cluster, uint32_t associd)
{
uint32_t wckeyid = 0;
@@ -295,9 +295,9 @@ static uint32_t _get_wckeyid(mysql_conn_t *mysql_conn, char **name,
xfree(user);
goto no_wckeyid;
}
-
+
if(user_rec.default_wckey)
- *name = xstrdup_printf("*%s",
+ *name = xstrdup_printf("*%s",
user_rec.default_wckey);
else
*name = xstrdup_printf("*");
@@ -313,9 +313,9 @@ static uint32_t _get_wckeyid(mysql_conn_t *mysql_conn, char **name,
NULL) != SLURM_SUCCESS) {
List wckey_list = NULL;
acct_wckey_rec_t *wckey_ptr = NULL;
-
+
wckey_list = list_create(destroy_acct_wckey_rec);
-
+
wckey_ptr = xmalloc(sizeof(acct_wckey_rec_t));
wckey_ptr->name = xstrdup((*name));
wckey_ptr->user = xstrdup(user);
@@ -328,7 +328,7 @@ static uint32_t _get_wckeyid(mysql_conn_t *mysql_conn, char **name,
sure this was the slurm user before
calling this */
if(acct_storage_p_add_wckeys(
- mysql_conn,
+ mysql_conn,
slurm_get_slurm_user_id(),
wckey_list)
== SLURM_SUCCESS)
@@ -337,7 +337,7 @@ static uint32_t _get_wckeyid(mysql_conn_t *mysql_conn, char **name,
assoc_mgr_fill_in_wckey(mysql_conn, &wckey_rec,
ACCOUNTING_ENFORCE_WCKEYS,
NULL);
-
+
list_destroy(wckey_list);
}
xfree(user);
@@ -348,14 +348,14 @@ no_wckeyid:
return wckeyid;
}
-static int _preemption_loop(mysql_conn_t *mysql_conn, int begin_qosid,
+static int _preemption_loop(mysql_conn_t *mysql_conn, int begin_qosid,
bitstr_t *preempt_bitstr)
{
acct_qos_rec_t qos_rec;
int rc = 0, i=0;
xassert(preempt_bitstr);
-
+
/* check in the preempt list for all qos's preempted */
for(i=0; i<bit_size(preempt_bitstr); i++) {
if(!bit_test(preempt_bitstr, i))
@@ -368,7 +368,7 @@ static int _preemption_loop(mysql_conn_t *mysql_conn, int begin_qosid,
NULL);
/* check if the begin_qosid is preempted by this qos
* if so we have a loop */
- if(qos_rec.preempt_bitstr
+ if(qos_rec.preempt_bitstr
&& bit_test(qos_rec.preempt_bitstr, begin_qosid)) {
error("QOS id %d has a loop at QOS %s",
begin_qosid, qos_rec.name);
@@ -402,7 +402,7 @@ static int _set_usage_information(char **usage_table, slurmdbd_msg_type_t type,
return SLURM_ERROR;
}
end_tm.tm_hour = 0;
- end = mktime(&end_tm);
+ end = mktime(&end_tm);
} else {
if(!localtime_r(&end, &end_tm)) {
error("Couldn't get localtime from user end %d",
@@ -413,7 +413,7 @@ static int _set_usage_information(char **usage_table, slurmdbd_msg_type_t type,
end_tm.tm_sec = 0;
end_tm.tm_min = 0;
end_tm.tm_isdst = -1;
- end = mktime(&end_tm);
+ end = mktime(&end_tm);
if(!start) {
if(!localtime_r(&my_time, &start_tm)) {
@@ -423,7 +423,7 @@ static int _set_usage_information(char **usage_table, slurmdbd_msg_type_t type,
}
start_tm.tm_hour = 0;
start_tm.tm_mday--;
- start = mktime(&start_tm);
+ start = mktime(&start_tm);
} else {
if(!localtime_r(&start, &start_tm)) {
error("Couldn't get localtime from user start %d",
@@ -434,7 +434,7 @@ static int _set_usage_information(char **usage_table, slurmdbd_msg_type_t type,
start_tm.tm_sec = 0;
start_tm.tm_min = 0;
start_tm.tm_isdst = -1;
- start = mktime(&start_tm);
+ start = mktime(&start_tm);
if(end-start < 3600) {
end = start + 3600;
@@ -461,11 +461,11 @@ static int _set_usage_information(char **usage_table, slurmdbd_msg_type_t type,
my_usage_table = cluster_hour_table;
break;
default:
- error("Bad type given for hour usage %d %s", type,
+ error("Bad type given for hour usage %d %s", type,
slurmdbd_msg_type_2_str(type, 1));
break;
}
- } else if(start_tm.tm_mday == 0 && end_tm.tm_mday == 0
+ } else if(start_tm.tm_mday == 0 && end_tm.tm_mday == 0
&& (end-start > 86400)) {
switch (type) {
case DBD_GET_ASSOC_USAGE:
@@ -478,7 +478,7 @@ static int _set_usage_information(char **usage_table, slurmdbd_msg_type_t type,
my_usage_table = cluster_month_table;
break;
default:
- error("Bad type given for month usage %d %s", type,
+ error("Bad type given for month usage %d %s", type,
slurmdbd_msg_type_2_str(type, 1));
break;
}
@@ -498,18 +498,18 @@ static char *_fix_double_quotes(char *str)
if(!str)
return NULL;
-
+
while(str[i]) {
if(str[i] == '"') {
char *tmp = xstrndup(str+start, i-start);
xstrfmtcat(fixed, "%s\\\"", tmp);
xfree(tmp);
start = i+1;
- }
-
+ }
+
i++;
}
-
+
if((i-start) > 0) {
char *tmp = xstrndup(str+start, i-start);
xstrcat(fixed, tmp);
@@ -545,10 +545,10 @@ static int _setup_association_limits(acct_association_rec_t *assoc,
char **cols, char **vals,
char **extra, qos_level_t qos_level,
bool get_fs)
-{
+{
if(!assoc)
return SLURM_ERROR;
-
+
if((int)assoc->shares_raw >= 0) {
xstrcat(*cols, ", fairshare");
xstrfmtcat(*vals, ", %u", assoc->shares_raw);
@@ -558,7 +558,7 @@ static int _setup_association_limits(acct_association_rec_t *assoc,
xstrcat(*vals, ", 1");
xstrcat(*extra, ", fairshare=1");
assoc->shares_raw = 1;
- }
+ }
if((int)assoc->grp_cpu_mins >= 0) {
xstrcat(*cols, ", grp_cpu_mins");
@@ -570,7 +570,7 @@ static int _setup_association_limits(acct_association_rec_t *assoc,
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", grp_cpu_mins=NULL");
}
-
+
if((int)assoc->grp_cpus >= 0) {
xstrcat(*cols, ", grp_cpus");
xstrfmtcat(*vals, ", %u", assoc->grp_cpus);
@@ -645,7 +645,7 @@ static int _setup_association_limits(acct_association_rec_t *assoc,
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", max_cpus_per_job=NULL");
}
-
+
if((int)assoc->max_jobs >= 0) {
xstrcat(*cols, ", max_jobs");
xstrfmtcat(*vals, ", %u", assoc->max_jobs);
@@ -654,7 +654,7 @@ static int _setup_association_limits(acct_association_rec_t *assoc,
} else if((int)assoc->max_jobs == INFINITE) {
xstrcat(*cols, ", max_jobs");
xstrcat(*vals, ", NULL");
- xstrcat(*extra, ", max_jobs=NULL");
+ xstrcat(*extra, ", max_jobs=NULL");
}
if((int)assoc->max_nodes_pj >= 0) {
@@ -692,7 +692,7 @@ static int _setup_association_limits(acct_association_rec_t *assoc,
/* when modifying the qos it happens in the actual function
since we have to wait until we hear about the parent first. */
- if(qos_level == QOS_LEVEL_MODIFY)
+ if(qos_level == QOS_LEVEL_MODIFY)
goto end_qos;
if(assoc->qos_list && list_count(assoc->qos_list)) {
@@ -700,9 +700,9 @@ static int _setup_association_limits(acct_association_rec_t *assoc,
char *qos_val = NULL;
char *tmp_char = NULL;
int set = 0;
- ListIterator qos_itr =
+ ListIterator qos_itr =
list_iterator_create(assoc->qos_list);
-
+
while((tmp_char = list_next(qos_itr))) {
/* we don't want to include blank names */
if(!tmp_char[0])
@@ -714,15 +714,15 @@ static int _setup_association_limits(acct_association_rec_t *assoc,
}
xstrfmtcat(qos_val, ",%s", tmp_char);
}
-
+
list_iterator_destroy(qos_itr);
if(qos_val) {
- xstrfmtcat(*cols, ", %s", qos_type);
- xstrfmtcat(*vals, ", '%s'", qos_val);
- xstrfmtcat(*extra, ", %s=\"%s\"", qos_type, qos_val);
+ xstrfmtcat(*cols, ", %s", qos_type);
+ xstrfmtcat(*vals, ", '%s'", qos_val);
+ xstrfmtcat(*extra, ", %s=\"%s\"", qos_type, qos_val);
xfree(qos_val);
}
- } else if((qos_level == QOS_LEVEL_SET) && default_qos_str) {
+ } else if((qos_level == QOS_LEVEL_SET) && default_qos_str) {
/* Add default qos to the account */
xstrcat(*cols, ", qos");
xstrfmtcat(*vals, ", '%s'", default_qos_str);
@@ -745,10 +745,10 @@ end_qos:
static int _setup_qos_limits(acct_qos_rec_t *qos,
char **cols, char **vals,
char **extra, char **added_preempt)
-{
+{
if(!qos)
return SLURM_ERROR;
-
+
if(qos->description) {
xstrcat(*cols, ", description");
xstrfmtcat(*vals, ", \"%s\"", qos->description);
@@ -763,8 +763,8 @@ static int _setup_qos_limits(acct_qos_rec_t *qos,
} else if ((int)qos->priority == INFINITE) {
xstrcat(*cols, ", priority");
xstrcat(*vals, ", NULL");
- xstrcat(*extra, ", priority=NULL");
- }
+ xstrcat(*extra, ", priority=NULL");
+ }
if((int)qos->grp_cpu_mins >= 0) {
xstrcat(*cols, ", grp_cpu_mins");
@@ -776,7 +776,7 @@ static int _setup_qos_limits(acct_qos_rec_t *qos,
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", grp_cpu_mins=NULL");
}
-
+
if((int)qos->grp_cpus >= 0) {
xstrcat(*cols, ", grp_cpus");
xstrfmtcat(*vals, ", %u", qos->grp_cpus);
@@ -851,7 +851,7 @@ static int _setup_qos_limits(acct_qos_rec_t *qos,
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", max_cpus_per_job=NULL");
}
-
+
if((int)qos->max_jobs_pu >= 0) {
xstrcat(*cols, ", max_jobs_per_user");
xstrfmtcat(*vals, ", %u", qos->max_jobs_pu);
@@ -860,7 +860,7 @@ static int _setup_qos_limits(acct_qos_rec_t *qos,
} else if((int)qos->max_jobs_pu == INFINITE) {
xstrcat(*cols, ", max_jobs_per_user");
xstrcat(*vals, ", NULL");
- xstrcat(*extra, ", max_jobs_per_user=NULL");
+ xstrcat(*extra, ", max_jobs_per_user=NULL");
}
if((int)qos->max_nodes_pj >= 0) {
@@ -899,15 +899,15 @@ static int _setup_qos_limits(acct_qos_rec_t *qos,
if(qos->preempt_list && list_count(qos->preempt_list)) {
char *preempt_val = NULL;
char *tmp_char = NULL, *begin_preempt = NULL;
- ListIterator preempt_itr =
+ ListIterator preempt_itr =
list_iterator_create(qos->preempt_list);
-
+
xstrcat(*cols, ", preempt");
begin_preempt = xstrdup("preempt");
while((tmp_char = list_next(preempt_itr))) {
- if(tmp_char[0] == '-') {
+ if(tmp_char[0] == '-') {
xstrfmtcat(preempt_val,
"replace(%s, ',%s', '')",
begin_preempt, tmp_char+1);
@@ -917,7 +917,7 @@ static int _setup_qos_limits(acct_qos_rec_t *qos,
xstrfmtcat(preempt_val,
"concat("
"replace(%s, ',%s', ''), ',%s')",
- begin_preempt,
+ begin_preempt,
tmp_char+1, tmp_char+1);
if(added_preempt)
xstrfmtcat(*added_preempt, ",%s",
@@ -934,10 +934,10 @@ static int _setup_qos_limits(acct_qos_rec_t *qos,
}
list_iterator_destroy(preempt_itr);
- xstrfmtcat(*vals, ", \"%s\"", preempt_val);
- xstrfmtcat(*extra, ", preempt=\"%s\"", preempt_val);
+ xstrfmtcat(*vals, ", \"%s\"", preempt_val);
+ xstrfmtcat(*extra, ", preempt=\"%s\"", preempt_val);
xfree(preempt_val);
- }
+ }
if((int)qos->usage_factor >= 0) {
xstrcat(*cols, ", usage_factor");
@@ -956,7 +956,7 @@ static int _setup_qos_limits(acct_qos_rec_t *qos,
static int _setup_resv_limits(acct_reservation_rec_t *resv,
char **cols, char **vals,
char **extra)
-{
+{
/* strip off the action item from the flags */
if(resv->assocs) {
@@ -977,13 +977,13 @@ static int _setup_resv_limits(acct_reservation_rec_t *resv,
if(resv->cpus != (uint32_t)NO_VAL) {
xstrcat(*cols, ", cpus");
xstrfmtcat(*vals, ", %u", resv->cpus);
- xstrfmtcat(*extra, ", cpus=%u", resv->cpus);
+ xstrfmtcat(*extra, ", cpus=%u", resv->cpus);
}
-
+
if(resv->flags != (uint16_t)NO_VAL) {
xstrcat(*cols, ", flags");
xstrfmtcat(*vals, ", %u", resv->flags);
- xstrfmtcat(*extra, ", flags=%u", resv->flags);
+ xstrfmtcat(*extra, ", flags=%u", resv->flags);
}
if(resv->name) {
@@ -991,32 +991,32 @@ static int _setup_resv_limits(acct_reservation_rec_t *resv,
xstrfmtcat(*vals, ", \"%s\"", resv->name);
xstrfmtcat(*extra, ", name=\"%s\"", resv->name);
}
-
+
if(resv->nodes) {
xstrcat(*cols, ", nodelist");
xstrfmtcat(*vals, ", \"%s\"", resv->nodes);
xstrfmtcat(*extra, ", nodelist=\"%s\"", resv->nodes);
}
-
+
if(resv->node_inx) {
xstrcat(*cols, ", node_inx");
xstrfmtcat(*vals, ", \"%s\"", resv->node_inx);
xstrfmtcat(*extra, ", node_inx=\"%s\"", resv->node_inx);
}
-
+
if(resv->time_end) {
xstrcat(*cols, ", end");
xstrfmtcat(*vals, ", %u", resv->time_end);
- xstrfmtcat(*extra, ", end=%u", resv->time_end);
+ xstrfmtcat(*extra, ", end=%u", resv->time_end);
}
if(resv->time_start) {
xstrcat(*cols, ", start");
xstrfmtcat(*vals, ", %u", resv->time_start);
- xstrfmtcat(*extra, ", start=%u", resv->time_start);
+ xstrfmtcat(*extra, ", start=%u", resv->time_start);
}
-
+
return SLURM_SUCCESS;
}
/* when doing a select on this all the select should have a prefix of
@@ -1034,7 +1034,7 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
/* we need to check this first so we can update the
with_sub_accts if needed since this the qos_list is a
- parent thing
+ parent thing
*/
if(assoc_cond->qos_list && list_count(assoc_cond->qos_list)) {
/* we have to do the same thing as with_sub_accts does
@@ -1066,13 +1066,13 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrfmtcat(*extra, ", %s as t2 where "
"(t1.lft between t2.lft and t2.rgt) &&",
assoc_table);
- } else
+ } else
xstrcat(*extra, " where");
-
- if(assoc_cond->with_deleted)
+
+ if(assoc_cond->with_deleted)
xstrfmtcat(*extra, " (%s.deleted=0 || %s.deleted=1)",
prefix, prefix);
- else
+ else
xstrfmtcat(*extra, " %s.deleted=0", prefix);
if(assoc_cond->acct_list && list_count(assoc_cond->acct_list)) {
@@ -1080,7 +1080,7 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->acct_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.acct=\"%s\"", prefix, object);
set = 1;
@@ -1094,7 +1094,7 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->cluster_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.cluster=\"%s\"", prefix, object);
set = 1;
@@ -1109,9 +1109,9 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->fairshare_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
- xstrfmtcat(*extra, "%s.fairshare=\"%s\"",
+ xstrfmtcat(*extra, "%s.fairshare=\"%s\"",
prefix, object);
set = 1;
}
@@ -1125,9 +1125,9 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->grp_cpu_mins_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
- xstrfmtcat(*extra, "%s.grp_cpu_mins=\"%s\"",
+ xstrfmtcat(*extra, "%s.grp_cpu_mins=\"%s\"",
prefix, object);
set = 1;
}
@@ -1141,9 +1141,9 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->grp_cpus_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
- xstrfmtcat(*extra, "%s.grp_cpus=\"%s\"",
+ xstrfmtcat(*extra, "%s.grp_cpus=\"%s\"",
prefix, object);
set = 1;
}
@@ -1157,7 +1157,7 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->grp_jobs_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.grp_jobs=\"%s\"",
prefix, object);
@@ -1173,7 +1173,7 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->grp_nodes_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.grp_nodes=\"%s\"",
prefix, object);
@@ -1189,7 +1189,7 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->grp_submit_jobs_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.grp_submit_jobs=\"%s\"",
prefix, object);
@@ -1205,9 +1205,9 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->grp_wall_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
- xstrfmtcat(*extra, "%s.grp_wall=\"%s\"",
+ xstrfmtcat(*extra, "%s.grp_wall=\"%s\"",
prefix, object);
set = 1;
}
@@ -1221,9 +1221,9 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->max_cpu_mins_pj_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
- xstrfmtcat(*extra, "%s.max_cpu_mins_per_job=\"%s\"",
+ xstrfmtcat(*extra, "%s.max_cpu_mins_per_job=\"%s\"",
prefix, object);
set = 1;
}
@@ -1237,9 +1237,9 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->max_cpus_pj_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
- xstrfmtcat(*extra, "%s.max_cpus_per_job=\"%s\"",
+ xstrfmtcat(*extra, "%s.max_cpus_per_job=\"%s\"",
prefix, object);
set = 1;
}
@@ -1253,9 +1253,9 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->max_jobs_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
- xstrfmtcat(*extra, "%s.max_jobs=\"%s\"",
+ xstrfmtcat(*extra, "%s.max_jobs=\"%s\"",
prefix, object);
set = 1;
}
@@ -1269,9 +1269,9 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->max_nodes_pj_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
- xstrfmtcat(*extra, "%s.max_nodes_per_job=\"%s\"",
+ xstrfmtcat(*extra, "%s.max_nodes_per_job=\"%s\"",
prefix, object);
set = 1;
}
@@ -1285,9 +1285,9 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->max_submit_jobs_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
- xstrfmtcat(*extra, "%s.max_submit_jobs=\"%s\"",
+ xstrfmtcat(*extra, "%s.max_submit_jobs=\"%s\"",
prefix, object);
set = 1;
}
@@ -1301,7 +1301,7 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->max_wall_pj_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra,
"%s.max_wall_duration_per_job=\"%s\"",
@@ -1311,13 +1311,13 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
list_iterator_destroy(itr);
xstrcat(*extra, ")");
}
-
+
if(assoc_cond->user_list && list_count(assoc_cond->user_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->user_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.user=\"%s\"", prefix, object);
set = 1;
@@ -1330,13 +1330,13 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrfmtcat(*extra, " && (%s.user!='')", prefix);
}
- if(assoc_cond->partition_list
+ if(assoc_cond->partition_list
&& list_count(assoc_cond->partition_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->partition_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.partition=\"%s\"",
prefix, object);
@@ -1351,7 +1351,7 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->id_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.id=%s", prefix, object);
set = 1;
@@ -1359,14 +1359,14 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
list_iterator_destroy(itr);
xstrcat(*extra, ")");
}
-
+
if(assoc_cond->parent_acct_list
&& list_count(assoc_cond->parent_acct_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->parent_acct_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.parent_acct=\"%s\"",
prefix, object);
@@ -1390,10 +1390,10 @@ static int _setup_wckey_cond_limits(acct_wckey_cond_t *wckey_cond,
if(!wckey_cond)
return 0;
- if(wckey_cond->with_deleted)
+ if(wckey_cond->with_deleted)
xstrfmtcat(*extra, " where (%s.deleted=0 || %s.deleted=1)",
prefix, prefix);
- else
+ else
xstrfmtcat(*extra, " where %s.deleted=0", prefix);
if(wckey_cond->name_list && list_count(wckey_cond->name_list)) {
@@ -1401,7 +1401,7 @@ static int _setup_wckey_cond_limits(acct_wckey_cond_t *wckey_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(wckey_cond->name_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.name=\"%s\"", prefix, object);
set = 1;
@@ -1415,7 +1415,7 @@ static int _setup_wckey_cond_limits(acct_wckey_cond_t *wckey_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(wckey_cond->cluster_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.cluster=\"%s\"", prefix, object);
set = 1;
@@ -1429,7 +1429,7 @@ static int _setup_wckey_cond_limits(acct_wckey_cond_t *wckey_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(wckey_cond->id_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.id=%s", prefix, object);
set = 1;
@@ -1437,13 +1437,13 @@ static int _setup_wckey_cond_limits(acct_wckey_cond_t *wckey_cond,
list_iterator_destroy(itr);
xstrcat(*extra, ")");
}
-
+
if(wckey_cond->user_list && list_count(wckey_cond->user_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(wckey_cond->user_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.user=\"%s\"", prefix, object);
set = 1;
@@ -1475,7 +1475,7 @@ static int _setup_resv_cond_limits(acct_reservation_cond_t *resv_cond,
xstrcat(*extra, " where (");
itr = list_iterator_create(resv_cond->cluster_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.cluster=\"%s\"", prefix, object);
set = 1;
@@ -1492,7 +1492,7 @@ static int _setup_resv_cond_limits(acct_reservation_cond_t *resv_cond,
xstrcat(*extra, " where (");
itr = list_iterator_create(resv_cond->id_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.id=%s", prefix, object);
set = 1;
@@ -1500,7 +1500,7 @@ static int _setup_resv_cond_limits(acct_reservation_cond_t *resv_cond,
list_iterator_destroy(itr);
xstrcat(*extra, ")");
}
-
+
if(resv_cond->name_list && list_count(resv_cond->name_list)) {
set = 0;
if(*extra)
@@ -1509,7 +1509,7 @@ static int _setup_resv_cond_limits(acct_reservation_cond_t *resv_cond,
xstrcat(*extra, " where (");
itr = list_iterator_create(resv_cond->name_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.name=\"%s\"", prefix, object);
set = 1;
@@ -1526,7 +1526,7 @@ static int _setup_resv_cond_limits(acct_reservation_cond_t *resv_cond,
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
- xstrfmtcat(*extra,
+ xstrfmtcat(*extra,
"(t1.start < %d "
"&& (t1.end >= %d || t1.end = 0)))",
resv_cond->time_end, resv_cond->time_start);
@@ -1535,7 +1535,7 @@ static int _setup_resv_cond_limits(acct_reservation_cond_t *resv_cond,
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
- xstrfmtcat(*extra,
+ xstrfmtcat(*extra,
"(t1.start < %d))", resv_cond->time_end);
}
@@ -1550,16 +1550,16 @@ static uint32_t _get_parent_id(
MYSQL_RES *result = NULL;
MYSQL_ROW row;
char *query = NULL;
-
- xassert(parent);
+
+ xassert(parent);
xassert(cluster);
query = xstrdup_printf("select id from %s where user='' "
"and deleted = 0 and acct=\"%s\" "
- "and cluster=\"%s\";",
+ "and cluster=\"%s\";",
assoc_table, parent, cluster);
debug4("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
-
+
if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 1))) {
xfree(query);
return 0;
@@ -1568,8 +1568,8 @@ static uint32_t _get_parent_id(
if((row = mysql_fetch_row(result))) {
if(row[0])
- parent_id = atoi(row[0]);
- } else
+ parent_id = atoi(row[0]);
+ } else
error("no association for parent %s on cluster %s",
parent, cluster);
mysql_free_result(result);
@@ -1587,10 +1587,10 @@ static int _set_assoc_lft_rgt(
xassert(assoc->id);
- query = xstrdup_printf("select lft, rgt from %s where id=%u;",
+ query = xstrdup_printf("select lft, rgt from %s where id=%u;",
assoc_table, assoc->id);
debug4("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
-
+
if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 1))) {
xfree(query);
return 0;
@@ -1599,11 +1599,11 @@ static int _set_assoc_lft_rgt(
if((row = mysql_fetch_row(result))) {
if(row[0])
- assoc->lft = atoi(row[0]);
+ assoc->lft = atoi(row[0]);
if(row[1])
- assoc->rgt = atoi(row[1]);
+ assoc->rgt = atoi(row[1]);
rc = SLURM_SUCCESS;
- } else
+ } else
error("no association (%u)", assoc->id);
mysql_free_result(result);
@@ -1633,17 +1633,17 @@ static int _set_assoc_limits_for_add(
xassert(assoc);
- if(assoc->parent_acct)
+ if(assoc->parent_acct)
parent = assoc->parent_acct;
- else if(assoc->user)
+ else if(assoc->user)
parent = assoc->acct;
- else
+ else
return SLURM_SUCCESS;
-
+
query = xstrdup_printf("call get_parent_limits(\"%s\", "
"\"%s\", \"%s\", %u);"
"select @par_id, @mj, @msj, @mcpj, "
- "@mnpj, @mwpj, @mcmpj, @qos, @delta_qos;",
+ "@mnpj, @mwpj, @mcmpj, @qos, @delta_qos;",
assoc_table, parent, assoc->cluster, 0);
debug4("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 1))) {
@@ -1651,11 +1651,11 @@ static int _set_assoc_limits_for_add(
return SLURM_ERROR;
}
xfree(query);
-
- if(!(row = mysql_fetch_row(result)))
+
+ if(!(row = mysql_fetch_row(result)))
goto end_it;
-
- if(row[ASSOC_REQ_MJ] && assoc->max_jobs == NO_VAL)
+
+ if(row[ASSOC_REQ_MJ] && assoc->max_jobs == NO_VAL)
assoc->max_jobs = atoi(row[ASSOC_REQ_MJ]);
if(row[ASSOC_REQ_MSJ] && assoc->max_submit_jobs == NO_VAL)
assoc->max_submit_jobs = atoi(row[ASSOC_REQ_MSJ]);
@@ -1692,7 +1692,7 @@ static int _set_assoc_limits_for_add(
goto end_it;
}
list_flush(assoc->qos_list);
- } else
+ } else
assoc->qos_list = list_create(slurm_destroy_char);
if(row[ASSOC_REQ_QOS][0])
@@ -1705,7 +1705,7 @@ static int _set_assoc_limits_for_add(
slurm_addto_char_list(assoc->qos_list, qos_delta+1);
xfree(qos_delta);
}
-
+
end_it:
mysql_free_result(result);
@@ -1713,7 +1713,7 @@ end_it:
}
/* This function will take the object given and free it later so it
- * needed to be removed from a list if in one before
+ * needed to be removed from a list if in one before
*/
static int _addto_update_list(List update_list, acct_update_type_t type,
void *object)
@@ -1738,13 +1738,13 @@ static int _addto_update_list(List update_list, acct_update_type_t type,
removed first in the calling code */
list_prepend(update_object->objects, object);
return SLURM_SUCCESS;
- }
+ }
update_object = xmalloc(sizeof(acct_update_object_t));
list_append(update_list, update_object);
update_object->type = type;
-
+
switch(type) {
case ACCT_MODIFY_USER:
case ACCT_ADD_USER:
@@ -1794,7 +1794,7 @@ static int _move_account(mysql_conn_t *mysql_conn, uint32_t lft, uint32_t rgt,
int diff = 0;
int width = 0;
char *query = xstrdup_printf(
- "SELECT lft from %s "
+ "SELECT lft from %s "
"where cluster=\"%s\" && acct=\"%s\" && user='';",
assoc_table,
cluster, parent);
@@ -1820,7 +1820,7 @@ static int _move_account(mysql_conn_t *mysql_conn, uint32_t lft, uint32_t rgt,
"Nothing to do.");
return ESLURM_SAME_PARENT_ACCOUNT;
}
-
+
width = (rgt - lft + 1);
/* every thing below needs to be a %d not a %u because we are
@@ -1885,7 +1885,7 @@ static int _move_parent(mysql_conn_t *mysql_conn, uid_t uid,
MYSQL_ROW row;
char *query = NULL;
int rc = SLURM_SUCCESS;
-
+
/* first we need to see if we are going to make a child of this
* account the new parent. If so we need to move that child to this
* accounts parent and then do the move.
@@ -1896,7 +1896,7 @@ static int _move_parent(mysql_conn_t *mysql_conn, uid_t uid,
assoc_table, lft, rgt,
new_parent);
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
- if(!(result =
+ if(!(result =
mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
@@ -1912,10 +1912,10 @@ static int _move_parent(mysql_conn_t *mysql_conn, uid_t uid,
mysql_free_result(result);
- if(rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
return rc;
-
- /* now move the one we wanted to move in the first place
+
+ /* now move the one we wanted to move in the first place
* We need to get the new lft and rgts though since they may
* have changed.
*/
@@ -1923,7 +1923,7 @@ static int _move_parent(mysql_conn_t *mysql_conn, uid_t uid,
"select lft, rgt from %s where id=%s;",
assoc_table, id);
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
- if(!(result =
+ if(!(result =
mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
@@ -1951,9 +1951,9 @@ static int _last_affected_rows(MYSQL *mysql_db)
do {
result = mysql_store_result(mysql_db);
- if (result)
+ if (result)
mysql_free_result(result);
- else
+ else
if (mysql_field_count(mysql_db) == 0) {
status = mysql_affected_rows(mysql_db);
if(status > 0)
@@ -1962,7 +1962,7 @@ static int _last_affected_rows(MYSQL *mysql_db)
if ((status = mysql_next_result(mysql_db)) > 0)
debug3("Could not execute statement\n");
} while (status == 0);
-
+
return rows;
}
@@ -1975,7 +1975,7 @@ static int _modify_common(mysql_conn_t *mysql_conn,
char *user_name,
char *table,
char *cond_char,
- char *vals)
+ char *vals)
{
char *query = NULL;
int rc = SLURM_SUCCESS;
@@ -1985,12 +1985,12 @@ static int _modify_common(mysql_conn_t *mysql_conn,
if(vals[1])
tmp_vals = _fix_double_quotes(vals+2);
- xstrfmtcat(query,
+ xstrfmtcat(query,
"update %s set mod_time=%d%s "
"where deleted=0 && %s;",
table, now, vals,
cond_char);
- xstrfmtcat(query,
+ xstrfmtcat(query,
"insert into %s "
"(timestamp, action, name, actor, info) "
"values (%d, %d, \"%s\", \"%s\", \"%s\");",
@@ -1998,7 +1998,7 @@ static int _modify_common(mysql_conn_t *mysql_conn,
now, type, tmp_cond_char, user_name, tmp_vals);
xfree(tmp_cond_char);
xfree(tmp_vals);
- debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
+ debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
@@ -2007,7 +2007,7 @@ static int _modify_common(mysql_conn_t *mysql_conn,
mysql_db_rollback(mysql_conn->db_conn);
}
list_flush(mysql_conn->update_list);
-
+
return SLURM_ERROR;
}
@@ -2016,7 +2016,7 @@ static int _modify_common(mysql_conn_t *mysql_conn,
/* Used to get all the users inside a lft and rgt set. This is just
* to send the user all the associations that are being modified from
- * a previous change to it's parent.
+ * a previous change to it's parent.
*/
static int _modify_unset_users(mysql_conn_t *mysql_conn,
acct_association_rec_t *assoc,
@@ -2046,7 +2046,7 @@ static int _modify_unset_users(mysql_conn_t *mysql_conn,
"lft",
"rgt"
};
-
+
enum {
ASSOC_ID,
ASSOC_USER,
@@ -2070,7 +2070,7 @@ static int _modify_unset_users(mysql_conn_t *mysql_conn,
return SLURM_ERROR;
for(i=0; i<ASSOC_COUNT; i++) {
- if(i)
+ if(i)
xstrcat(object, ", ");
xstrcat(object, assoc_req_inx[i]);
}
@@ -2108,40 +2108,40 @@ static int _modify_unset_users(mysql_conn_t *mysql_conn,
if(!row[ASSOC_MSJ] && assoc->max_submit_jobs != NO_VAL) {
mod_assoc->max_submit_jobs = assoc->max_submit_jobs;
modified = 1;
- }
+ }
if(!row[ASSOC_MNPJ] && assoc->max_nodes_pj != NO_VAL) {
mod_assoc->max_nodes_pj = assoc->max_nodes_pj;
modified = 1;
- }
-
+ }
+
if(!row[ASSOC_MCPJ] && assoc->max_cpus_pj != NO_VAL) {
mod_assoc->max_cpus_pj = assoc->max_cpus_pj;
modified = 1;
- }
-
+ }
+
if(!row[ASSOC_MWPJ] && assoc->max_wall_pj != NO_VAL) {
mod_assoc->max_wall_pj = assoc->max_wall_pj;
modified = 1;
}
-
+
if(!row[ASSOC_MCMPJ] && assoc->max_cpu_mins_pj != NO_VAL) {
mod_assoc->max_cpu_mins_pj = assoc->max_cpu_mins_pj;
modified = 1;
- }
+ }
if(!row[ASSOC_QOS][0] && assoc->qos_list) {
List delta_qos_list = NULL;
char *qos_char = NULL, *delta_char = NULL;
ListIterator delta_itr = NULL;
- ListIterator qos_itr =
+ ListIterator qos_itr =
list_iterator_create(assoc->qos_list);
if(row[ASSOC_DELTA_QOS][0]) {
delta_qos_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(delta_qos_list,
row[ASSOC_DELTA_QOS]+1);
- delta_itr =
+ delta_itr =
list_iterator_create(delta_qos_list);
}
@@ -2152,14 +2152,14 @@ static int _modify_unset_users(mysql_conn_t *mysql_conn,
*/
while((qos_char = list_next(qos_itr))) {
if(delta_itr && qos_char[0] != '=') {
- while((delta_char =
+ while((delta_char =
list_next(delta_itr))) {
-
- if((qos_char[0]
+
+ if((qos_char[0]
!= delta_char[0])
- && (!strcmp(qos_char+1,
- delta_char+1)))
- break;
+ && (!strcmp(qos_char+1,
+ delta_char+1)))
+ break;
}
list_iterator_reset(delta_itr);
if(delta_char)
@@ -2171,7 +2171,7 @@ static int _modify_unset_users(mysql_conn_t *mysql_conn,
list_iterator_destroy(qos_itr);
if(delta_itr)
list_iterator_destroy(delta_itr);
- if(list_count(mod_assoc->qos_list)
+ if(list_count(mod_assoc->qos_list)
|| !list_count(assoc->qos_list))
modified = 1;
else {
@@ -2200,7 +2200,7 @@ static int _modify_unset_users(mysql_conn_t *mysql_conn,
}
/* We do want to send all user accounts though */
mod_assoc->shares_raw = NO_VAL;
- if(row[ASSOC_PART][0]) {
+ if(row[ASSOC_PART][0]) {
// see if there is a partition name
object = xstrdup_printf(
"C = %-10s A = %-20s U = %-9s P = %s",
@@ -2209,25 +2209,25 @@ static int _modify_unset_users(mysql_conn_t *mysql_conn,
} else {
object = xstrdup_printf(
"C = %-10s A = %-20s U = %-9s",
- row[ASSOC_CLUSTER],
- row[ASSOC_ACCT],
+ row[ASSOC_CLUSTER],
+ row[ASSOC_ACCT],
row[ASSOC_USER]);
}
-
+
list_append(ret_list, object);
if(moved_parent)
destroy_acct_association_rec(mod_assoc);
else
- if(_addto_update_list(mysql_conn->update_list,
+ if(_addto_update_list(mysql_conn->update_list,
ACCT_MODIFY_ASSOC,
mod_assoc)
- != SLURM_SUCCESS)
+ != SLURM_SUCCESS)
error("couldn't add to "
"the update list");
- } else
+ } else
destroy_acct_association_rec(mod_assoc);
-
+
}
mysql_free_result(result);
@@ -2250,7 +2250,7 @@ static bool _check_jobs_before_remove(mysql_conn_t *mysql_conn,
"%s as t2 where t1.lft between "
"t2.lft and t2.rgt && (%s) "
"and t0.associd=t1.id limit 1;",
- job_table, assoc_table, assoc_table,
+ job_table, assoc_table, assoc_table,
assoc_char);
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
@@ -2281,7 +2281,7 @@ static bool _check_jobs_before_remove_assoc(mysql_conn_t *mysql_conn,
query = xstrdup_printf("select t1.associd from %s as t1, "
"%s as t2 where (%s) "
"and t1.associd=t2.id limit 1;",
- job_table, assoc_table,
+ job_table, assoc_table,
assoc_char);
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
@@ -2337,7 +2337,7 @@ static int _remove_common(mysql_conn_t *mysql_conn,
char *user_name,
char *table,
char *name_char,
- char *assoc_char)
+ char *assoc_char)
{
int rc = SLURM_SUCCESS;
char *query = NULL;
@@ -2363,7 +2363,7 @@ static int _remove_common(mysql_conn_t *mysql_conn,
has_jobs = _check_jobs_before_remove(mysql_conn, assoc_char);
} else {
has_jobs = _check_jobs_before_remove_assoc(mysql_conn,
- name_char);
+ name_char);
}
/* we want to remove completely all that is less than a day old */
if(!has_jobs && table != assoc_table) {
@@ -2378,8 +2378,8 @@ static int _remove_common(mysql_conn_t *mysql_conn,
"update %s set mod_time=%d, deleted=1 "
"where deleted=0 && (%s);",
table, now, name_char);
-
- xstrfmtcat(query,
+
+ xstrfmtcat(query,
"insert into %s (timestamp, action, name, actor) "
"values (%d, %d, \"%s\", \"%s\");",
txn_table,
@@ -2394,13 +2394,13 @@ static int _remove_common(mysql_conn_t *mysql_conn,
mysql_db_rollback(mysql_conn->db_conn);
}
list_flush(mysql_conn->update_list);
-
+
return SLURM_ERROR;
} else if((table == acct_coord_table)
|| (table == qos_table)
|| (table == wckey_table))
return SLURM_SUCCESS;
-
+
/* mark deleted=1 or remove completely the accounting tables
*/
if(table != assoc_table) {
@@ -2424,7 +2424,7 @@ static int _remove_common(mysql_conn_t *mysql_conn,
"t2.lft and t2.rgt && t1.deleted=0 "
" && t2.deleted=0;",
assoc_table, assoc_table, assoc_char);
-
+
debug3("%d(%d) query\n%s",
mysql_conn->conn, __LINE__, query);
if(!(result = mysql_db_query_ret(
@@ -2451,13 +2451,13 @@ static int _remove_common(mysql_conn_t *mysql_conn,
}
rem_assoc = xmalloc(sizeof(acct_association_rec_t));
rem_assoc->id = atoi(row[0]);
- if(_addto_update_list(mysql_conn->update_list,
+ if(_addto_update_list(mysql_conn->update_list,
ACCT_REMOVE_ASSOC,
- rem_assoc) != SLURM_SUCCESS)
+ rem_assoc) != SLURM_SUCCESS)
error("couldn't add to the update list");
}
mysql_free_result(result);
- } else
+ } else
loc_assoc_char = assoc_char;
if(!loc_assoc_char) {
@@ -2467,7 +2467,7 @@ static int _remove_common(mysql_conn_t *mysql_conn,
/* We should not have to delete from usage table, only flag since we
* only delete things that are typos.
- */
+ */
xstrfmtcat(query,
"update %s set mod_time=%d, deleted=1 where (%s);"
"update %s set mod_time=%d, deleted=1 where (%s);"
@@ -2502,7 +2502,7 @@ static int _remove_common(mysql_conn_t *mysql_conn,
query = xstrdup_printf("select id from %s as t1 where "
"creation_time>%d && (%s);",
assoc_table, day_old, loc_assoc_char);
-
+
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
@@ -2518,7 +2518,7 @@ static int _remove_common(mysql_conn_t *mysql_conn,
while((row = mysql_fetch_row(result))) {
MYSQL_RES *result2 = NULL;
MYSQL_ROW row2;
-
+
/* we have to do this one at a time since the lft's and rgt's
change. If you think you need to remove this make
sure your new way can handle changing lft and rgt's
@@ -2544,13 +2544,13 @@ static int _remove_common(mysql_conn_t *mysql_conn,
xstrfmtcat(query,
"delete quick from %s where lft between %s AND %s;",
assoc_table, row2[0], row2[1]);
-
+
xstrfmtcat(query,
"UPDATE %s SET rgt = rgt - %s WHERE rgt > %s;"
"UPDATE %s SET lft = lft - %s WHERE lft > %s;",
assoc_table, row2[2], row2[1],
assoc_table, row2[2], row2[1]);
-
+
mysql_free_result(result2);
debug3("%d(%d) query\n%s",
@@ -2600,21 +2600,21 @@ just_update:
}
list_flush(mysql_conn->update_list);
}
-
+
return rc;
}
/* Fill in all the users that are coordinator for this account. This
* will fill in if there are coordinators from a parent account also.
*/
-static int _get_account_coords(mysql_conn_t *mysql_conn,
+static int _get_account_coords(mysql_conn_t *mysql_conn,
acct_account_rec_t *acct)
{
char *query = NULL;
acct_coord_rec_t *coord = NULL;
MYSQL_RES *result = NULL;
MYSQL_ROW row;
-
+
if(!acct) {
error("We need a account to fill in.");
return SLURM_ERROR;
@@ -2622,11 +2622,11 @@ static int _get_account_coords(mysql_conn_t *mysql_conn,
if(!acct->coordinators)
acct->coordinators = list_create(destroy_acct_coord_rec);
-
+
query = xstrdup_printf(
"select user from %s where acct=\"%s\" && deleted=0",
acct_coord_table, acct->name);
-
+
if(!(result =
mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
@@ -2640,7 +2640,7 @@ static int _get_account_coords(mysql_conn_t *mysql_conn,
coord->direct = 1;
}
mysql_free_result(result);
-
+
query = xstrdup_printf("select distinct t0.user from %s as t0, "
"%s as t1, %s as t2 where t0.acct=t1.acct && "
"t1.lft<t2.lft && t1.rgt>t2.lft && "
@@ -2681,11 +2681,11 @@ static int _get_user_coords(mysql_conn_t *mysql_conn, acct_user_rec_t *user)
if(!user->coord_accts)
user->coord_accts = list_create(destroy_acct_coord_rec);
-
+
query = xstrdup_printf(
"select acct from %s where user=\"%s\" && deleted=0",
acct_coord_table, user->name);
-
+
if(!(result =
mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
@@ -2697,9 +2697,9 @@ static int _get_user_coords(mysql_conn_t *mysql_conn, acct_user_rec_t *user)
list_append(user->coord_accts, coord);
coord->name = xstrdup(row[0]);
coord->direct = 1;
- if(query)
+ if(query)
xstrcat(query, " || ");
- else
+ else
query = xstrdup_printf(
"select distinct t1.acct from "
"%s as t1, %s as t2 where t1.deleted=0 && ",
@@ -2732,9 +2732,9 @@ static int _get_user_coords(mysql_conn_t *mysql_conn, acct_user_rec_t *user)
break;
}
list_iterator_reset(itr);
- if(coord)
+ if(coord)
continue;
-
+
coord = xmalloc(sizeof(acct_coord_rec_t));
list_append(user->coord_accts, coord);
coord->name = xstrdup(row[0]);
@@ -2749,7 +2749,7 @@ static int _get_user_coords(mysql_conn_t *mysql_conn, acct_user_rec_t *user)
/* Used in job functions for getting the database index based off the
* submit time, job and assoc id. 0 is returned if none is found
*/
-static int _get_db_index(MYSQL *db_conn,
+static int _get_db_index(MYSQL *db_conn,
time_t submit, uint32_t jobid, uint32_t associd)
{
MYSQL_RES *result = NULL;
@@ -2775,7 +2775,7 @@ static int _get_db_index(MYSQL *db_conn,
}
db_index = atoi(row[0]);
mysql_free_result(result);
-
+
return db_index;
}
@@ -2783,7 +2783,7 @@ static int _get_db_index(MYSQL *db_conn,
user or not.
*/
static int _get_usage_for_list(mysql_conn_t *mysql_conn,
- slurmdbd_msg_type_t type, List object_list,
+ slurmdbd_msg_type_t type, List object_list,
time_t start, time_t end)
{
int rc = SLURM_SUCCESS;
@@ -2804,7 +2804,7 @@ static int _get_usage_for_list(mysql_conn_t *mysql_conn,
/* Since for id in association table we
use t3 and in wckey table we use t1 we can't define it here */
char **usage_req_inx = NULL;
-
+
enum {
USAGE_ID,
USAGE_START,
@@ -2929,7 +2929,7 @@ static int _get_usage_for_list(mysql_conn_t *mysql_conn,
list_append(usage_list, accounting_rec);
}
mysql_free_result(result);
-
+
u_itr = list_iterator_create(usage_list);
itr = list_iterator_create(object_list);
while((object = list_next(itr))) {
@@ -2958,7 +2958,7 @@ static int _get_usage_for_list(mysql_conn_t *mysql_conn,
continue;
break;
}
-
+
while((accounting_rec = list_next(u_itr))) {
if(id == accounting_rec->id) {
list_append(acct_list, accounting_rec);
@@ -2981,8 +2981,8 @@ static int _get_usage_for_list(mysql_conn_t *mysql_conn,
list_iterator_reset(u_itr);
}
list_iterator_destroy(itr);
- list_iterator_destroy(u_itr);
-
+ list_iterator_destroy(u_itr);
+
if(list_count(usage_list))
error("we have %d records not added "
"to the association list",
@@ -3001,11 +3001,11 @@ static mysql_db_info_t *_mysql_acct_create_db_info()
db_info->port = DEFAULT_MYSQL_PORT;
slurm_set_accounting_storage_port(db_info->port);
}
- db_info->host = slurm_get_accounting_storage_host();
+ db_info->host = slurm_get_accounting_storage_host();
db_info->backup = slurm_get_accounting_storage_backup_host();
-
- db_info->user = slurm_get_accounting_storage_user();
- db_info->pass = slurm_get_accounting_storage_pass();
+
+ db_info->user = slurm_get_accounting_storage_user();
+ db_info->pass = slurm_get_accounting_storage_pass();
return db_info;
}
@@ -3019,7 +3019,7 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
{ "deleted", "tinyint default 0" },
{ "acct", "tinytext not null" },
{ "user", "tinytext not null" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t acct_table_fields[] = {
@@ -3029,7 +3029,7 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
{ "name", "tinytext not null" },
{ "description", "text not null" },
{ "organization", "text not null" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t assoc_table_fields[] = {
@@ -3059,7 +3059,7 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
{ "grp_cpu_mins", "bigint default NULL" },
{ "qos", "blob not null default ''" },
{ "delta_qos", "blob not null default ''" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t assoc_usage_table_fields[] = {
@@ -3069,7 +3069,7 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
{ "id", "int not null" },
{ "period_start", "int unsigned not null" },
{ "alloc_cpu_secs", "bigint default 0" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t cluster_table_fields[] = {
@@ -3081,7 +3081,7 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
{ "control_port", "int unsigned not null default 0" },
{ "rpc_version", "smallint unsigned not null default 0" },
{ "classification", "smallint unsigned default 0" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t cluster_usage_table_fields[] = {
@@ -3097,7 +3097,7 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
{ "idle_cpu_secs", "bigint default 0" },
{ "resv_cpu_secs", "bigint default 0" },
{ "over_cpu_secs", "bigint default 0" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t event_table_fields[] = {
@@ -3109,7 +3109,7 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
{ "period_end", "int unsigned default 0 not null" },
{ "reason", "tinytext not null" },
{ "cluster_nodes", "text not null default ''" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t job_table_fields[] = {
@@ -3131,14 +3131,14 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
{ "end", "int unsigned default 0 not null" },
{ "suspended", "int unsigned default 0 not null" },
{ "timelimit", "int unsigned default 0 not null" },
- { "name", "tinytext not null" },
+ { "name", "tinytext not null" },
{ "track_steps", "tinyint not null" },
- { "state", "smallint not null" },
+ { "state", "smallint not null" },
{ "comp_code", "int default 0 not null" },
{ "priority", "int not null" },
- { "req_cpus", "int unsigned not null" },
- { "alloc_cpus", "int unsigned not null" },
- { "alloc_nodes", "int unsigned not null" },
+ { "req_cpus", "int unsigned not null" },
+ { "alloc_cpus", "int unsigned not null" },
+ { "alloc_nodes", "int unsigned not null" },
{ "nodelist", "text" },
{ "node_inx", "text" },
{ "kill_requid", "int default -1 not null" },
@@ -3151,7 +3151,7 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
{ "hourly_rollup", "int unsigned default 0 not null" },
{ "daily_rollup", "int unsigned default 0 not null" },
{ "monthly_rollup", "int unsigned default 0 not null" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t qos_table_fields[] = {
@@ -3159,8 +3159,8 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
{ "mod_time", "int unsigned default 0 not null" },
{ "deleted", "tinyint default 0" },
{ "id", "int not null auto_increment" },
- { "name", "tinytext not null" },
- { "description", "text" },
+ { "name", "tinytext not null" },
+ { "description", "text" },
{ "max_jobs_per_user", "int default NULL" },
{ "max_submit_jobs_per_user", "int default NULL" },
{ "max_cpus_per_job", "int default NULL" },
@@ -3176,7 +3176,7 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
{ "preempt", "text not null default ''" },
{ "priority", "int default 0" },
{ "usage_factor", "double default 1.0 not null" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t resv_table_fields[] = {
@@ -3191,7 +3191,7 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
{ "start", "int unsigned default 0 not null"},
{ "end", "int unsigned default 0 not null" },
{ "flags", "smallint default 0 not null" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t step_table_fields[] = {
@@ -3239,7 +3239,7 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
{ "associd", "int not null" },
{ "start", "int unsigned default 0 not null" },
{ "end", "int unsigned default 0 not null" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t txn_table_fields[] = {
@@ -3249,7 +3249,7 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
{ "name", "text not null" },
{ "actor", "tinytext not null" },
{ "info", "blob" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t user_table_fields[] = {
@@ -3260,7 +3260,7 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
{ "default_acct", "tinytext not null" },
{ "default_wckey", "tinytext not null default ''" },
{ "admin_level", "smallint default 1 not null" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t wckey_table_fields[] = {
@@ -3271,7 +3271,7 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
{ "name", "tinytext not null default ''" },
{ "cluster", "tinytext not null" },
{ "user", "tinytext not null" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t wckey_usage_table_fields[] = {
@@ -3283,10 +3283,10 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
{ "alloc_cpu_secs", "bigint default 0" },
{ "resv_cpu_secs", "bigint default 0" },
{ "over_cpu_secs", "bigint default 0" },
- { NULL, NULL}
+ { NULL, NULL}
};
- char *get_parent_proc =
+ char *get_parent_proc =
"drop procedure if exists get_parent_limits; "
"create procedure get_parent_limits("
"my_table text, acct text, cluster text, without_limits int) "
@@ -3302,8 +3302,8 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
"set @delta_qos = ''; "
"set @my_acct = acct; "
"if without_limits then "
- "set @mj = 0; "
- "set @msj = 0; "
+ "set @mj = 0; "
+ "set @msj = 0; "
"set @mcpj = 0; "
"set @mnpj = 0; "
"set @mwpj = 0; "
@@ -3375,7 +3375,7 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
if(mysql_db_create_table(db_conn, assoc_month_table,
assoc_usage_table_fields,
- ", primary key (id, period_start))")
+ ", primary key (id, period_start))")
== SLURM_ERROR)
return SLURM_ERROR;
@@ -3422,12 +3422,12 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
return SLURM_ERROR;
if(mysql_db_create_table(db_conn, last_ran_table,
- last_ran_table_fields,
+ last_ran_table_fields,
")") == SLURM_ERROR)
return SLURM_ERROR;
if(mysql_db_create_table(db_conn, qos_table,
- qos_table_fields,
+ qos_table_fields,
", primary key (id), "
"unique index (name(20)))")
== SLURM_ERROR)
@@ -3438,12 +3438,12 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
List char_list = list_create(slurm_destroy_char);
char *qos = NULL;
ListIterator itr = NULL;
- slurm_addto_char_list(char_list,
+ slurm_addto_char_list(char_list,
slurmdbd_conf->default_qos);
/* NOTE: you can not use list_pop, or list_push
anywhere either, since mysql is
exporting something of the same type as a macro,
- which messes everything up
+ which messes everything up
(my_list.h is the bad boy).
*/
itr = list_iterator_create(char_list);
@@ -3461,8 +3461,8 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
if(!qos_id)
fatal("problem added qos '%s", qos);
xstrfmtcat(default_qos_str, ",%d", qos_id);
- xfree(query);
- }
+ xfree(query);
+ }
list_iterator_destroy(itr);
list_destroy(char_list);
} else {
@@ -3478,9 +3478,9 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
qos_id = mysql_insert_ret_id(db_conn, query);
if(!qos_id)
fatal("problem added qos 'normal");
-
+
xstrfmtcat(default_qos_str, ",%d", qos_id);
- xfree(query);
+ xfree(query);
}
if(_set_qos_cnt(db_conn) != SLURM_SUCCESS)
@@ -3488,18 +3488,18 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
}
if(mysql_db_create_table(db_conn, step_table,
- step_table_fields,
+ step_table_fields,
", primary key (id, stepid))") == SLURM_ERROR)
return SLURM_ERROR;
if(mysql_db_create_table(db_conn, resv_table,
- resv_table_fields,
+ resv_table_fields,
", primary key (id, start, cluster(20)))")
== SLURM_ERROR)
return SLURM_ERROR;
if(mysql_db_create_table(db_conn, suspend_table,
- suspend_table_fields,
+ suspend_table_fields,
")") == SLURM_ERROR)
return SLURM_ERROR;
@@ -3532,7 +3532,7 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
if(mysql_db_create_table(db_conn, wckey_month_table,
wckey_usage_table_fields,
- ", primary key (id, period_start))")
+ ", primary key (id, period_start))")
== SLURM_ERROR)
return SLURM_ERROR;
@@ -3549,16 +3549,16 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
"admin_level) values (0, %d, 'root', 'root', %u) "
"on duplicate key update name='root';",
user_table, now, ACCT_ADMIN_SUPER_USER, now);
- xstrfmtcat(query,
+ xstrfmtcat(query,
"insert into %s (creation_time, mod_time, name, "
"description, organization) values (0, %d, 'root', "
"'default root account', 'root') on duplicate key "
"update name='root';",
- acct_table, now);
+ acct_table, now);
//debug3("%s", query);
mysql_db_query(db_conn, query);
- xfree(query);
+ xfree(query);
return rc;
}
@@ -3613,8 +3613,8 @@ extern int init ( void )
}
debug2("mysql_connect() called for db %s", mysql_db_name);
-
- if(mysql_get_db_connection(&db_conn, mysql_db_name, mysql_db_info)
+
+ if(mysql_get_db_connection(&db_conn, mysql_db_name, mysql_db_info)
!= SLURM_SUCCESS)
fatal("The database must be up when starting "
"the MYSQL plugin.");
@@ -3625,15 +3625,15 @@ extern int init ( void )
if(rc == SLURM_SUCCESS)
verbose("%s loaded", plugin_name);
- else
+ else
verbose("%s failed", plugin_name);
-
+
return rc;
}
extern int fini ( void )
{
- destroy_mysql_db_info(mysql_db_info);
+ destroy_mysql_db_info(mysql_db_info);
xfree(mysql_db_name);
xfree(default_qos_str);
mysql_cleanup();
@@ -3644,12 +3644,12 @@ extern void *acct_storage_p_get_connection(bool make_agent, int conn_num,
bool rollback)
{
mysql_conn_t *mysql_conn = xmalloc(sizeof(mysql_conn_t));
-
+
if(!mysql_db_info)
init();
debug2("acct_storage_p_get_connection: request new connection");
-
+
mysql_conn->rollback = rollback;
mysql_conn->conn = conn_num;
mysql_conn->update_list = list_create(destroy_acct_update_object);
@@ -3659,7 +3659,7 @@ extern void *acct_storage_p_get_connection(bool make_agent, int conn_num,
mysql_db_name, mysql_db_info);
if(mysql_conn->db_conn) {
- if(rollback)
+ if(rollback)
mysql_autocommit(mysql_conn->db_conn, 0);
}
@@ -3695,7 +3695,7 @@ extern int acct_storage_p_commit(mysql_conn_t *mysql_conn, bool commit)
error("commit failed");
}
}
-
+
if(commit && list_count(mysql_conn->update_list)) {
int rc;
char *query = NULL;
@@ -3710,7 +3710,7 @@ extern int acct_storage_p_commit(mysql_conn_t *mysql_conn, bool commit)
memset(&msg, 0, sizeof(accounting_update_msg_t));
msg.update_list = mysql_conn->update_list;
-
+
xstrfmtcat(query, "select control_host, control_port, "
"name, rpc_version "
"from %s where deleted=0 && control_port != 0",
@@ -3736,9 +3736,9 @@ extern int acct_storage_p_commit(mysql_conn_t *mysql_conn, bool commit)
req.msg_type = ACCOUNTING_UPDATE_MSG;
if(slurmdbd_conf)
req.flags = SLURM_GLOBAL_AUTH_KEY;
- req.data = &msg;
+ req.data = &msg;
slurm_msg_t_init(&resp);
-
+
rc = slurm_send_recv_node_msg(&req, &resp, 0);
if ((rc != 0) || !resp.auth_cred) {
error("update cluster: %m to %s at %s(%s)",
@@ -3749,16 +3749,16 @@ extern int acct_storage_p_commit(mysql_conn_t *mysql_conn, bool commit)
}
if (resp.auth_cred)
g_slurm_auth_destroy(resp.auth_cred);
-
+
switch (resp.msg_type) {
case RESPONSE_SLURM_RC:
rc = ((return_code_msg_t *)resp.data)->
return_code;
- slurm_free_return_code_msg(resp.data);
+ slurm_free_return_code_msg(resp.data);
break;
default:
break;
- }
+ }
//info("got rc of %d", rc);
}
mysql_free_result(result);
@@ -3813,7 +3813,7 @@ extern int acct_storage_p_commit(mysql_conn_t *mysql_conn, bool commit)
}
list_iterator_destroy(itr);
- if(get_qos_count)
+ if(get_qos_count)
_set_qos_cnt(mysql_conn->db_conn);
}
@@ -3849,22 +3849,22 @@ extern int acct_storage_p_add_users(mysql_conn_t *mysql_conn, uint32_t uid,
continue;
}
xstrcat(cols, "creation_time, mod_time, name, default_acct");
- xstrfmtcat(vals, "%d, %d, '%s', '%s'",
- now, now, object->name, object->default_acct);
+ xstrfmtcat(vals, "%d, %d, '%s', '%s'",
+ now, now, object->name, object->default_acct);
xstrfmtcat(extra, ", default_acct='%s'",
object->default_acct);
-
+
if(object->admin_level != ACCT_ADMIN_NOTSET) {
xstrcat(cols, ", admin_level");
xstrfmtcat(vals, ", %u", object->admin_level);
- xstrfmtcat(extra, ", admin_level=%u",
- object->admin_level);
+ xstrfmtcat(extra, ", admin_level=%u",
+ object->admin_level);
}
if(object->default_wckey) {
xstrcat(cols, ", default_wckey");
xstrfmtcat(vals, ", \"%s\"", object->default_wckey);
- xstrfmtcat(extra, ", default_wckey=\"%s\"",
+ xstrfmtcat(extra, ", default_wckey=\"%s\"",
object->default_wckey);
}
@@ -3892,19 +3892,19 @@ extern int acct_storage_p_add_users(mysql_conn_t *mysql_conn, uint32_t uid,
}
if(_addto_update_list(mysql_conn->update_list, ACCT_ADD_USER,
- object) == SLURM_SUCCESS)
+ object) == SLURM_SUCCESS)
list_remove(itr);
-
+
/* we always have a ', ' as the first 2 chars */
tmp_extra = _fix_double_quotes(extra+2);
if(txn_query)
- xstrfmtcat(txn_query,
+ xstrfmtcat(txn_query,
", (%d, %u, \"%s\", \"%s\", \"%s\")",
now, DBD_ADD_USERS, object->name,
user_name, tmp_extra);
else
- xstrfmtcat(txn_query,
+ xstrfmtcat(txn_query,
"insert into %s "
"(timestamp, action, name, actor, info) "
"values (%d, %u, \"%s\", \"%s\", \"%s\")",
@@ -3913,7 +3913,7 @@ extern int acct_storage_p_add_users(mysql_conn_t *mysql_conn, uint32_t uid,
user_name, tmp_extra);
xfree(tmp_extra);
xfree(extra);
-
+
if(object->assoc_list)
list_transfer(assoc_list, object->assoc_list);
@@ -3958,7 +3958,7 @@ extern int acct_storage_p_add_users(mysql_conn_t *mysql_conn, uint32_t uid,
return rc;
}
-extern int acct_storage_p_add_coord(mysql_conn_t *mysql_conn, uint32_t uid,
+extern int acct_storage_p_add_coord(mysql_conn_t *mysql_conn, uint32_t uid,
List acct_list, acct_user_cond_t *user_cond)
{
char *query = NULL, *user = NULL, *acct = NULL;
@@ -3967,10 +3967,10 @@ extern int acct_storage_p_add_coord(mysql_conn_t *mysql_conn, uint32_t uid,
time_t now = time(NULL);
int rc = SLURM_SUCCESS;
acct_user_rec_t *user_rec = NULL;
-
- if(!user_cond || !user_cond->assoc_cond
- || !user_cond->assoc_cond->user_list
- || !list_count(user_cond->assoc_cond->user_list)
+
+ if(!user_cond || !user_cond->assoc_cond
+ || !user_cond->assoc_cond->user_list
+ || !list_count(user_cond->assoc_cond->user_list)
|| !acct_list || !list_count(acct_list)) {
error("we need something to add");
return SLURM_ERROR;
@@ -3984,7 +3984,7 @@ extern int acct_storage_p_add_coord(mysql_conn_t *mysql_conn, uint32_t uid,
itr2 = list_iterator_create(acct_list);
while((user = list_next(itr))) {
while((acct = list_next(itr2))) {
- if(query)
+ if(query)
xstrfmtcat(query, ", (%d, %d, \"%s\", \"%s\")",
now, now, acct, user);
else
@@ -3992,16 +3992,16 @@ extern int acct_storage_p_add_coord(mysql_conn_t *mysql_conn, uint32_t uid,
"insert into %s (creation_time, "
"mod_time, acct, user) values "
"(%d, %d, \"%s\", \"%s\")",
- acct_coord_table,
- now, now, acct, user);
+ acct_coord_table,
+ now, now, acct, user);
if(txn_query)
- xstrfmtcat(txn_query,
+ xstrfmtcat(txn_query,
", (%d, %u, \"%s\", \"%s\", \"%s\")",
now, DBD_ADD_ACCOUNT_COORDS, user,
user_name, acct);
else
- xstrfmtcat(txn_query,
+ xstrfmtcat(txn_query,
"insert into %s "
"(timestamp, action, name, "
"actor, info) "
@@ -4018,7 +4018,7 @@ extern int acct_storage_p_add_coord(mysql_conn_t *mysql_conn, uint32_t uid,
list_iterator_destroy(itr2);
if(query) {
- xstrfmtcat(query,
+ xstrfmtcat(query,
" on duplicate key update mod_time=%d, deleted=0;%s",
now, txn_query);
debug3("%d(%d) query\n%s",
@@ -4026,7 +4026,7 @@ extern int acct_storage_p_add_coord(mysql_conn_t *mysql_conn, uint32_t uid,
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
xfree(txn_query);
-
+
if(rc != SLURM_SUCCESS) {
error("Couldn't add cluster hour rollup");
return rc;
@@ -4037,16 +4037,16 @@ extern int acct_storage_p_add_coord(mysql_conn_t *mysql_conn, uint32_t uid,
user_rec = xmalloc(sizeof(acct_user_rec_t));
user_rec->name = xstrdup(user);
_get_user_coords(mysql_conn, user_rec);
- _addto_update_list(mysql_conn->update_list,
+ _addto_update_list(mysql_conn->update_list,
ACCT_ADD_COORD, user_rec);
}
list_iterator_destroy(itr);
}
-
+
return SLURM_SUCCESS;
}
-extern int acct_storage_p_add_accts(mysql_conn_t *mysql_conn, uint32_t uid,
+extern int acct_storage_p_add_accts(mysql_conn_t *mysql_conn, uint32_t uid,
List acct_list)
{
ListIterator itr = NULL;
@@ -4056,7 +4056,7 @@ extern int acct_storage_p_add_accts(mysql_conn_t *mysql_conn, uint32_t uid,
time_t now = time(NULL);
char *user_name = NULL;
char *extra = NULL, *tmp_extra = NULL;
-
+
int affect_rows = 0;
List assoc_list = list_create(destroy_acct_association_rec);
@@ -4069,7 +4069,7 @@ extern int acct_storage_p_add_accts(mysql_conn_t *mysql_conn, uint32_t uid,
if(!object->name || !object->description
|| !object->organization) {
error("We need an account name, description, and "
- "organization to add. %s %s %s",
+ "organization to add. %s %s %s",
object->name, object->description,
object->organization);
rc = SLURM_ERROR;
@@ -4077,12 +4077,12 @@ extern int acct_storage_p_add_accts(mysql_conn_t *mysql_conn, uint32_t uid,
}
xstrcat(cols, "creation_time, mod_time, name, "
"description, organization");
- xstrfmtcat(vals, "%d, %d, \"%s\", \"%s\", \"%s\"",
- now, now, object->name,
- object->description, object->organization);
+ xstrfmtcat(vals, "%d, %d, \"%s\", \"%s\", \"%s\"",
+ now, now, object->name,
+ object->description, object->organization);
xstrfmtcat(extra, ", description=\"%s\", organization=\"%s\"",
- object->description, object->organization);
-
+ object->description, object->organization);
+
query = xstrdup_printf(
"insert into %s (%s) values (%s) "
"on duplicate key update deleted=0, mod_time=%d %s;",
@@ -4112,12 +4112,12 @@ extern int acct_storage_p_add_accts(mysql_conn_t *mysql_conn, uint32_t uid,
tmp_extra = _fix_double_quotes(extra+2);
if(txn_query)
- xstrfmtcat(txn_query,
+ xstrfmtcat(txn_query,
", (%d, %u, \"%s\", \"%s\", \"%s\")",
now, DBD_ADD_ACCOUNTS, object->name,
user_name, tmp_extra);
else
- xstrfmtcat(txn_query,
+ xstrfmtcat(txn_query,
"insert into %s "
"(timestamp, action, name, actor, info) "
"values (%d, %u, \"%s\", \"%s\", \"%s\")",
@@ -4126,7 +4126,7 @@ extern int acct_storage_p_add_accts(mysql_conn_t *mysql_conn, uint32_t uid,
user_name, tmp_extra);
xfree(tmp_extra);
xfree(extra);
-
+
if(!object->assoc_list)
continue;
@@ -4134,7 +4134,7 @@ extern int acct_storage_p_add_accts(mysql_conn_t *mysql_conn, uint32_t uid,
}
list_iterator_destroy(itr);
xfree(user_name);
-
+
if(rc != SLURM_ERROR) {
if(txn_query) {
xstrcat(txn_query, ";");
@@ -4161,13 +4161,13 @@ extern int acct_storage_p_add_accts(mysql_conn_t *mysql_conn, uint32_t uid,
return rc;
}
-extern int acct_storage_p_add_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
+extern int acct_storage_p_add_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
List cluster_list)
{
ListIterator itr = NULL;
int rc = SLURM_SUCCESS;
acct_cluster_rec_t *object = NULL;
- char *cols = NULL, *vals = NULL, *extra = NULL,
+ char *cols = NULL, *vals = NULL, *extra = NULL,
*query = NULL, *tmp_extra = NULL;
time_t now = time(NULL);
char *user_name = NULL;
@@ -4195,16 +4195,16 @@ extern int acct_storage_p_add_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
now, now, object->name);
xstrfmtcat(extra, ", mod_time=%d", now);
if(object->root_assoc)
- _setup_association_limits(object->root_assoc, &cols,
+ _setup_association_limits(object->root_assoc, &cols,
&vals, &extra,
QOS_LEVEL_SET, 1);
- xstrfmtcat(query,
+ xstrfmtcat(query,
"insert into %s (creation_time, mod_time, "
"name, classification) "
"values (%d, %d, \"%s\", %u) "
"on duplicate key update deleted=0, mod_time=%d, "
"control_host='', control_port=0;",
- cluster_table,
+ cluster_table,
now, now, object->name, object->classification,
now);
debug3("%d(%d) query\n%s",
@@ -4242,7 +4242,7 @@ extern int acct_storage_p_add_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
assoc_table, cols,
vals,
extra);
-
+
xfree(cols);
xfree(vals);
debug3("%d(%d) query\n%s",
@@ -4265,10 +4265,10 @@ extern int acct_storage_p_add_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
"insert into %s "
"(timestamp, action, name, actor, info) "
"values (%d, %u, \"%s\", \"%s\", \"%s\");",
- txn_table, now, DBD_ADD_CLUSTERS,
+ txn_table, now, DBD_ADD_CLUSTERS,
object->name, user_name, tmp_extra);
- xfree(tmp_extra);
- xfree(extra);
+ xfree(tmp_extra);
+ xfree(extra);
debug4("%d(%d) query\n%s",
mysql_conn->conn, __LINE__, query);
@@ -4281,12 +4281,12 @@ extern int acct_storage_p_add_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
/* Add user root by default to run from the root
* association. This gets popped off so we need to
- * read it every time here.
+ * read it every time here.
*/
assoc = xmalloc(sizeof(acct_association_rec_t));
init_acct_association_rec(assoc);
list_append(assoc_list, assoc);
-
+
assoc->cluster = xstrdup(object->name);
assoc->user = xstrdup("root");
assoc->acct = xstrdup("root");
@@ -4314,7 +4314,7 @@ extern int acct_storage_p_add_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
}
extern int acct_storage_p_add_associations(mysql_conn_t *mysql_conn,
- uint32_t uid,
+ uint32_t uid,
List association_list)
{
ListIterator itr = NULL;
@@ -4342,7 +4342,7 @@ extern int acct_storage_p_add_associations(mysql_conn_t *mysql_conn,
"rgt",
"deleted"
};
-
+
enum {
MASSOC_ID,
MASSOC_PACCT,
@@ -4379,11 +4379,11 @@ extern int acct_storage_p_add_associations(mysql_conn_t *mysql_conn,
}
xstrcat(cols, "creation_time, mod_time, cluster, acct");
- xstrfmtcat(vals, "%d, %d, \"%s\", \"%s\"",
- now, now, object->cluster, object->acct);
- xstrfmtcat(update,
+ xstrfmtcat(vals, "%d, %d, \"%s\", \"%s\"",
+ now, now, object->cluster, object->acct);
+ xstrfmtcat(update,
"where cluster=\"%s\" && acct=\"%s\"",
- object->cluster, object->acct);
+ object->cluster, object->acct);
xstrfmtcat(extra, ", mod_time=%d, cluster=\"%s\", "
"acct=\"%s\"", now, object->cluster, object->acct);
@@ -4392,12 +4392,12 @@ extern int acct_storage_p_add_associations(mysql_conn_t *mysql_conn,
xstrfmtcat(vals, ", \"%s\"", parent);
xstrfmtcat(extra, ", parent_acct=\"%s\", user=\"\"",
parent);
- xstrfmtcat(update, " && user=\"\"");
+ xstrfmtcat(update, " && user=\"\"");
} else {
char *part = object->partition;
xstrcat(cols, ", user");
- xstrfmtcat(vals, ", \"%s\"", object->user);
- xstrfmtcat(update, " && user=\"%s\"", object->user);
+ xstrfmtcat(vals, ", \"%s\"", object->user);
+ xstrfmtcat(update, " && user=\"%s\"", object->user);
xstrfmtcat(extra, ", user=\"%s\"", object->user);
/* We need to give a partition whether it be
@@ -4411,16 +4411,16 @@ extern int acct_storage_p_add_associations(mysql_conn_t *mysql_conn,
xstrfmtcat(extra, ", partition=\"%s\"", part);
}
- _setup_association_limits(object, &cols, &vals, &extra,
+ _setup_association_limits(object, &cols, &vals, &extra,
QOS_LEVEL_NONE, 1);
for(i=0; i<MASSOC_COUNT; i++) {
- if(i)
+ if(i)
xstrcat(tmp_char, ", ");
xstrcat(tmp_char, massoc_req_inx[i]);
}
-
- xstrfmtcat(query,
+
+ xstrfmtcat(query,
"select distinct %s from %s %s order by lft "
"FOR UPDATE;",
tmp_char, assoc_table, update);
@@ -4450,10 +4450,10 @@ extern int acct_storage_p_add_associations(mysql_conn_t *mysql_conn,
* instead of the slow ones that require an update
* every time. There is a incr check outside of the
* loop to catch everything on the last spin of the
- * while.
- */
+ * while.
+ */
if(!old_parent || !old_cluster
- || strcasecmp(parent, old_parent)
+ || strcasecmp(parent, old_parent)
|| strcasecmp(object->cluster, old_cluster)) {
char *sel_query = xstrdup_printf(
"SELECT lft FROM %s WHERE "
@@ -4462,7 +4462,7 @@ extern int acct_storage_p_add_associations(mysql_conn_t *mysql_conn,
assoc_table,
parent, object->cluster);
MYSQL_RES *sel_result = NULL;
-
+
if(incr) {
char *up_query = xstrdup_printf(
"UPDATE %s SET rgt = rgt+%d "
@@ -4477,8 +4477,8 @@ extern int acct_storage_p_add_associations(mysql_conn_t *mysql_conn,
assoc_table, incr,
my_left,
assoc_table);
- debug3("%d(%d) query\n%s",
- mysql_conn->conn,
+ debug3("%d(%d) query\n%s",
+ mysql_conn->conn,
__LINE__, up_query);
rc = mysql_db_query(
mysql_conn->db_conn,
@@ -4508,7 +4508,7 @@ extern int acct_storage_p_add_associations(mysql_conn_t *mysql_conn,
rc = SLURM_ERROR;
break;
}
-
+
if(!(row = mysql_fetch_row(sel_result))) {
error("Couldn't get left from query\n",
sel_query);
@@ -4536,7 +4536,7 @@ extern int acct_storage_p_add_associations(mysql_conn_t *mysql_conn,
"values (%s, %d, %d, 2);",
assoc_table, cols,
vals, my_left+(incr-1), my_left+incr);
-
+
/* definantly works but slow */
/* xstrfmtcat(query, */
/* "SELECT @myLeft := lft FROM %s WHERE " */
@@ -4573,10 +4573,10 @@ extern int acct_storage_p_add_associations(mysql_conn_t *mysql_conn,
* check for the parent and move if needed.
*/
assoc_id = atoi(row[MASSOC_ID]);
- if(object->parent_acct
+ if(object->parent_acct
&& strcasecmp(object->parent_acct,
row[MASSOC_PACCT])) {
-
+
/* We need to move the parent! */
if(_move_parent(mysql_conn, uid,
atoi(row[MASSOC_LFT]),
@@ -4597,7 +4597,7 @@ extern int acct_storage_p_add_associations(mysql_conn_t *mysql_conn,
xstrfmtcat(query,
"update %s set deleted=0, "
"id=LAST_INSERT_ID(id)%s %s;",
- assoc_table,
+ assoc_table,
extra, update);
}
mysql_free_result(result);
@@ -4633,7 +4633,7 @@ extern int acct_storage_p_add_associations(mysql_conn_t *mysql_conn,
|| strcmp(parent, last_parent)
|| strcmp(object->cluster, last_cluster))) {
uint32_t tmp32 = 0;
- if((tmp32 = _get_parent_id(mysql_conn,
+ if((tmp32 = _get_parent_id(mysql_conn,
parent,
object->cluster))) {
my_par_id = tmp32;
@@ -4643,7 +4643,7 @@ extern int acct_storage_p_add_associations(mysql_conn_t *mysql_conn,
}
}
object->parent_id = my_par_id;
-
+
if(!moved_parent) {
_set_assoc_limits_for_add(mysql_conn, object);
if(!object->lft)
@@ -4659,17 +4659,17 @@ extern int acct_storage_p_add_associations(mysql_conn_t *mysql_conn,
tmp_extra = _fix_double_quotes(extra+2);
if(txn_query)
- xstrfmtcat(txn_query,
+ xstrfmtcat(txn_query,
", (%d, %d, '%d', \"%s\", \"%s\")",
now, DBD_ADD_ASSOCS, assoc_id, user_name,
tmp_extra);
else
- xstrfmtcat(txn_query,
+ xstrfmtcat(txn_query,
"insert into %s "
"(timestamp, action, name, actor, info) "
"values (%d, %d, '%d', \"%s\", \"%s\")",
txn_table,
- now, DBD_ADD_ASSOCS, assoc_id, user_name,
+ now, DBD_ADD_ASSOCS, assoc_id, user_name,
tmp_extra);
xfree(tmp_extra);
xfree(extra);
@@ -4700,7 +4700,7 @@ extern int acct_storage_p_add_associations(mysql_conn_t *mysql_conn,
xfree(up_query);
if(rc != SLURM_SUCCESS)
error("Couldn't do update 2");
-
+
}
end_it:
@@ -4734,8 +4734,8 @@ end_it:
* want to rewrite code to make it happen
*/
//memset(&assoc_cond, 0, sizeof(acct_association_cond_t));
-
- if(!(assoc_list =
+
+ if(!(assoc_list =
acct_storage_p_get_associations(mysql_conn,
uid, NULL)))
return rc;
@@ -4749,9 +4749,9 @@ end_it:
*/
itr = list_iterator_create(assoc_list);
while((assoc = list_next(itr))) {
- if(_addto_update_list(mysql_conn->update_list,
+ if(_addto_update_list(mysql_conn->update_list,
ACCT_MODIFY_ASSOC,
- assoc) == SLURM_SUCCESS)
+ assoc) == SLURM_SUCCESS)
list_remove(itr);
}
list_iterator_destroy(itr);
@@ -4764,11 +4764,11 @@ end_it:
}
list_flush(mysql_conn->update_list);
}
-
+
return rc;
}
-extern int acct_storage_p_add_qos(mysql_conn_t *mysql_conn, uint32_t uid,
+extern int acct_storage_p_add_qos(mysql_conn_t *mysql_conn, uint32_t uid,
List qos_list)
{
ListIterator itr = NULL;
@@ -4794,8 +4794,8 @@ extern int acct_storage_p_add_qos(mysql_conn_t *mysql_conn, uint32_t uid,
continue;
}
xstrcat(cols, "creation_time, mod_time, name");
- xstrfmtcat(vals, "%d, %d, \"%s\"",
- now, now, object->name);
+ xstrfmtcat(vals, "%d, %d, \"%s\"",
+ now, now, object->name);
xstrfmtcat(extra, ", mod_time=%d", now);
_setup_qos_limits(object, &cols, &vals, &extra, &added_preempt);
@@ -4805,7 +4805,7 @@ extern int acct_storage_p_add_qos(mysql_conn_t *mysql_conn, uint32_t uid,
xfree(added_preempt);
}
- xstrfmtcat(query,
+ xstrfmtcat(query,
"insert into %s (%s) values (%s) "
"on duplicate key update deleted=0, "
"id=LAST_INSERT_ID(id)%s;",
@@ -4834,7 +4834,7 @@ extern int acct_storage_p_add_qos(mysql_conn_t *mysql_conn, uint32_t uid,
xfree(vals);
continue;
}
-
+
/* we always have a ', ' as the first 2 chars */
tmp_extra = _fix_double_quotes(extra+2);
@@ -4856,13 +4856,13 @@ extern int acct_storage_p_add_qos(mysql_conn_t *mysql_conn, uint32_t uid,
if(rc != SLURM_SUCCESS) {
error("Couldn't add txn");
} else {
- if(_addto_update_list(mysql_conn->update_list,
+ if(_addto_update_list(mysql_conn->update_list,
ACCT_ADD_QOS,
- object) == SLURM_SUCCESS)
+ object) == SLURM_SUCCESS)
list_remove(itr);
added++;
}
-
+
}
list_iterator_destroy(itr);
xfree(user_name);
@@ -4877,7 +4877,7 @@ extern int acct_storage_p_add_qos(mysql_conn_t *mysql_conn, uint32_t uid,
return rc;
}
-extern int acct_storage_p_add_wckeys(mysql_conn_t *mysql_conn, uint32_t uid,
+extern int acct_storage_p_add_wckeys(mysql_conn_t *mysql_conn, uint32_t uid,
List wckey_list)
{
ListIterator itr = NULL;
@@ -4903,18 +4903,18 @@ extern int acct_storage_p_add_wckeys(mysql_conn_t *mysql_conn, uint32_t uid,
continue;
}
xstrcat(cols, "creation_time, mod_time, cluster, user");
- xstrfmtcat(vals, "%d, %d, \"%s\", \"%s\"",
- now, now, object->cluster, object->user);
- xstrfmtcat(extra, ", mod_time=%d, cluster=\"%s\", user=\"%s\"",
- now, object->cluster, object->user);
+ xstrfmtcat(vals, "%d, %d, \"%s\", \"%s\"",
+ now, now, object->cluster, object->user);
+ xstrfmtcat(extra, ", mod_time=%d, cluster=\"%s\", user=\"%s\"",
+ now, object->cluster, object->user);
if(object->name) {
xstrcat(cols, ", name");
- xstrfmtcat(vals, ", \"%s\"", object->name);
- xstrfmtcat(extra, ", name=\"%s\"", object->name);
+ xstrfmtcat(vals, ", \"%s\"", object->name);
+ xstrfmtcat(extra, ", name=\"%s\"", object->name);
}
- xstrfmtcat(query,
+ xstrfmtcat(query,
"insert into %s (%s) values (%s) "
"on duplicate key update deleted=0, "
"id=LAST_INSERT_ID(id)%s;",
@@ -4964,13 +4964,13 @@ extern int acct_storage_p_add_wckeys(mysql_conn_t *mysql_conn, uint32_t uid,
if(rc != SLURM_SUCCESS) {
error("Couldn't add txn");
} else {
- if(_addto_update_list(mysql_conn->update_list,
+ if(_addto_update_list(mysql_conn->update_list,
ACCT_ADD_WCKEY,
- object) == SLURM_SUCCESS)
+ object) == SLURM_SUCCESS)
list_remove(itr);
added++;
}
-
+
}
list_iterator_destroy(itr);
xfree(user_name);
@@ -4989,7 +4989,7 @@ extern int acct_storage_p_add_reservation(mysql_conn_t *mysql_conn,
acct_reservation_rec_t *resv)
{
int rc = SLURM_SUCCESS;
- char *cols = NULL, *vals = NULL, *extra = NULL,
+ char *cols = NULL, *vals = NULL, *extra = NULL,
*query = NULL;//, *tmp_extra = NULL;
if(!resv) {
@@ -5011,7 +5011,7 @@ extern int acct_storage_p_add_reservation(mysql_conn_t *mysql_conn,
}
_setup_resv_limits(resv, &cols, &vals, &extra);
-
+
xstrfmtcat(query,
"insert into %s (id, cluster%s) values (%u, '%s'%s) "
"on duplicate key update deleted=0%s;",
@@ -5019,20 +5019,20 @@ extern int acct_storage_p_add_reservation(mysql_conn_t *mysql_conn,
vals, extra);
debug3("%d(%d) query\n%s",
mysql_conn->conn, __LINE__, query);
-
+
if((rc = mysql_db_query(mysql_conn->db_conn, query)
== SLURM_SUCCESS))
rc = mysql_clear_results(mysql_conn->db_conn);
-
+
xfree(query);
xfree(cols);
xfree(vals);
xfree(extra);
-
+
return rc;
}
-extern List acct_storage_p_modify_users(mysql_conn_t *mysql_conn, uint32_t uid,
+extern List acct_storage_p_modify_users(mysql_conn_t *mysql_conn, uint32_t uid,
acct_user_cond_t *user_cond,
acct_user_rec_t *user)
{
@@ -5062,7 +5062,7 @@ extern List acct_storage_p_modify_users(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, " && (");
itr = list_iterator_create(user_cond->assoc_cond->user_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name=\"%s\"", object);
set = 1;
@@ -5076,7 +5076,7 @@ extern List acct_storage_p_modify_users(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, " && (");
itr = list_iterator_create(user_cond->def_acct_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "default_acct=\"%s\"", object);
set = 1;
@@ -5084,13 +5084,13 @@ extern List acct_storage_p_modify_users(mysql_conn_t *mysql_conn, uint32_t uid,
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
+
if(user_cond->def_wckey_list && list_count(user_cond->def_wckey_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(user_cond->def_wckey_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "default_wckey=\"%s\"", object);
set = 1;
@@ -5098,7 +5098,7 @@ extern List acct_storage_p_modify_users(mysql_conn_t *mysql_conn, uint32_t uid,
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
+
if(user_cond->admin_level != ACCT_ADMIN_NOTSET) {
xstrfmtcat(extra, " && admin_level=%u", user_cond->admin_level);
}
@@ -5130,7 +5130,7 @@ extern List acct_storage_p_modify_users(mysql_conn_t *mysql_conn, uint32_t uid,
ret_list = list_create(slurm_destroy_char);
while((row = mysql_fetch_row(result))) {
acct_user_rec_t *user_rec = NULL;
-
+
object = xstrdup(row[0]);
list_append(ret_list, object);
if(!rc) {
@@ -5170,12 +5170,12 @@ extern List acct_storage_p_modify_users(mysql_conn_t *mysql_conn, uint32_t uid,
list_destroy(ret_list);
ret_list = NULL;
}
-
+
return ret_list;
}
extern List acct_storage_p_modify_accounts(
- mysql_conn_t *mysql_conn, uint32_t uid,
+ mysql_conn_t *mysql_conn, uint32_t uid,
acct_account_cond_t *acct_cond,
acct_account_rec_t *acct)
{
@@ -5199,14 +5199,14 @@ extern List acct_storage_p_modify_accounts(
return NULL;
xstrcat(extra, "where deleted=0");
- if(acct_cond->assoc_cond
- && acct_cond->assoc_cond->acct_list
+ if(acct_cond->assoc_cond
+ && acct_cond->assoc_cond->acct_list
&& list_count(acct_cond->assoc_cond->acct_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(acct_cond->assoc_cond->acct_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name=\"%s\"", object);
set = 1;
@@ -5215,13 +5215,13 @@ extern List acct_storage_p_modify_accounts(
xstrcat(extra, ")");
}
- if(acct_cond->description_list
+ if(acct_cond->description_list
&& list_count(acct_cond->description_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(acct_cond->description_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "description=\"%s\"", object);
set = 1;
@@ -5229,14 +5229,14 @@ extern List acct_storage_p_modify_accounts(
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
- if(acct_cond->organization_list
+
+ if(acct_cond->organization_list
&& list_count(acct_cond->organization_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(acct_cond->organization_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "organization=\"%s\"", object);
set = 1;
@@ -5244,7 +5244,7 @@ extern List acct_storage_p_modify_accounts(
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
+
if(acct->description)
xstrfmtcat(vals, ", description=\"%s\"", acct->description);
if(acct->organization)
@@ -5301,15 +5301,15 @@ extern List acct_storage_p_modify_accounts(
errno = SLURM_ERROR;
ret_list = NULL;
}
-
+
xfree(name_char);
xfree(vals);
return ret_list;
}
-extern List acct_storage_p_modify_clusters(mysql_conn_t *mysql_conn,
- uint32_t uid,
+extern List acct_storage_p_modify_clusters(mysql_conn_t *mysql_conn,
+ uint32_t uid,
acct_cluster_cond_t *cluster_cond,
acct_cluster_rec_t *cluster)
{
@@ -5328,7 +5328,7 @@ extern List acct_storage_p_modify_clusters(mysql_conn_t *mysql_conn,
/* If you need to alter the default values of the cluster use
* modify_associations since this is used only for registering
- * the controller when it loads
+ * the controller when it loads
*/
if(!cluster_cond || !cluster) {
@@ -5346,7 +5346,7 @@ extern List acct_storage_p_modify_clusters(mysql_conn_t *mysql_conn,
xstrcat(extra, " && (");
itr = list_iterator_create(cluster_cond->cluster_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name='%s'", object);
set = 1;
@@ -5380,7 +5380,7 @@ extern List acct_storage_p_modify_clusters(mysql_conn_t *mysql_conn,
}
if(cluster->classification) {
- xstrfmtcat(vals, ", classification=%u",
+ xstrfmtcat(vals, ", classification=%u",
cluster->classification);
}
@@ -5479,7 +5479,7 @@ extern List acct_storage_p_modify_clusters(mysql_conn_t *mysql_conn,
fd = slurm_open_msg_conn(&ctld_address);
if (fd < 0) {
error("can not open socket back to slurmctld "
- "%s(%u): %m", cluster->control_host,
+ "%s(%u): %m", cluster->control_host,
cluster->control_port);
} else {
slurm_msg_t out_msg;
@@ -5512,7 +5512,7 @@ end_it:
}
extern List acct_storage_p_modify_associations(
- mysql_conn_t *mysql_conn, uint32_t uid,
+ mysql_conn_t *mysql_conn, uint32_t uid,
acct_association_cond_t *assoc_cond,
acct_association_rec_t *assoc)
{
@@ -5542,7 +5542,7 @@ extern List acct_storage_p_modify_associations(
"rgt",
"qos",
};
-
+
enum {
MASSOC_ID,
MASSOC_ACCT,
@@ -5579,9 +5579,9 @@ extern List acct_storage_p_modify_associations(
* check it below after the query.
*/
if((uid == slurmdbd_conf->slurm_user_id || uid == 0)
- || assoc_mgr_get_admin_level(mysql_conn, uid)
- >= ACCT_ADMIN_OPERATOR)
- is_admin = 1;
+ || assoc_mgr_get_admin_level(mysql_conn, uid)
+ >= ACCT_ADMIN_OPERATOR)
+ is_admin = 1;
else {
if(assoc_mgr_fill_in_user(mysql_conn, &user, 1, NULL)
!= SLURM_SUCCESS) {
@@ -5614,7 +5614,7 @@ extern List acct_storage_p_modify_associations(
} else if (!assoc_cond->user_list) {
debug4("no user specified looking at accounts");
xstrcat(extra, " && user = '' ");
- }
+ }
_setup_association_limits(assoc, &tmp_char1, &tmp_char2,
&vals, QOS_LEVEL_MODIFY, 0);
@@ -5629,7 +5629,7 @@ extern List acct_storage_p_modify_associations(
}
for(i=0; i<MASSOC_COUNT; i++) {
- if(i)
+ if(i)
xstrcat(object, ", ");
xstrfmtcat(object, "t1.%s", massoc_req_inx[i]);
}
@@ -5701,15 +5701,15 @@ extern List acct_storage_p_modify_associations(
"are not coordinators of "
"parent account \"%s\".",
user.name, user.uid,
- row[MASSOC_ACCT],
+ row[MASSOC_ACCT],
row[MASSOC_PACCT]);
else
error("User %s(%d) does not have the "
"ability to modify the account "
"(%s).",
- user.name, user.uid,
+ user.name, user.uid,
row[MASSOC_ACCT]);
-
+
if(mysql_conn->rollback) {
mysql_db_rollback(
mysql_conn->db_conn);
@@ -5722,7 +5722,7 @@ extern List acct_storage_p_modify_associations(
}
}
- if(row[MASSOC_PART][0]) {
+ if(row[MASSOC_PART][0]) {
// see if there is a partition name
object = xstrdup_printf(
"C = %-10s A = %-20s U = %-9s P = %s",
@@ -5731,7 +5731,7 @@ extern List acct_storage_p_modify_associations(
} else if(row[MASSOC_USER][0]){
object = xstrdup_printf(
"C = %-10s A = %-20s U = %-9s",
- row[MASSOC_CLUSTER], row[MASSOC_ACCT],
+ row[MASSOC_CLUSTER], row[MASSOC_ACCT],
row[MASSOC_USER]);
} else {
if(assoc->parent_acct) {
@@ -5755,7 +5755,7 @@ extern List acct_storage_p_modify_associations(
continue;
} else if(rc != SLURM_SUCCESS)
break;
-
+
moved_parent = 1;
}
if(row[MASSOC_PACCT][0]) {
@@ -5771,7 +5771,7 @@ extern List acct_storage_p_modify_associations(
account_type = 1;
}
list_append(ret_list, object);
-
+
if(!set) {
xstrfmtcat(name_char, "(id=%s", row[MASSOC_ID]);
set = 1;
@@ -5805,12 +5805,12 @@ extern List acct_storage_p_modify_associations(
if(!row[MASSOC_USER][0])
mod_assoc->parent_acct = xstrdup(assoc->parent_acct);
if(assoc->qos_list && list_count(assoc->qos_list)) {
- ListIterator new_qos_itr =
+ ListIterator new_qos_itr =
list_iterator_create(assoc->qos_list);
char *new_qos = NULL, *tmp_qos = NULL;
-
+
mod_assoc->qos_list = list_create(slurm_destroy_char);
-
+
while((new_qos = list_next(new_qos_itr))) {
if(new_qos[0] == '-' || new_qos[0] == '+') {
list_append(mod_assoc->qos_list,
@@ -5819,7 +5819,7 @@ extern List acct_storage_p_modify_associations(
list_append(mod_assoc->qos_list,
xstrdup_printf("=%s",
new_qos));
- }
+ }
if(set_qos_vals)
continue;
@@ -5836,7 +5836,7 @@ extern List acct_storage_p_modify_associations(
"concat(replace(replace("
"delta_qos, ',+%s', ''), "
"',-%s', ''), ',%s'), '')",
- new_qos+1, new_qos+1,
+ new_qos+1, new_qos+1,
new_qos+1, new_qos);
} else if(new_qos[0] == '+') {
xstrfmtcat(vals,
@@ -5849,27 +5849,27 @@ extern List acct_storage_p_modify_associations(
"delta_qos, ',+%s', ''), "
"',-%s', ''), ',%s'), '')",
new_qos+1, new_qos+1,
- new_qos+1, new_qos+1,
+ new_qos+1, new_qos+1,
new_qos);
- } else if(new_qos[0])
+ } else if(new_qos[0])
xstrfmtcat(tmp_qos, ",%s", new_qos);
else
xstrcat(tmp_qos, "");
-
+
}
list_iterator_destroy(new_qos_itr);
- if(!set_qos_vals && tmp_qos)
+ if(!set_qos_vals && tmp_qos)
xstrfmtcat(vals, ", qos='%s', delta_qos=''",
- tmp_qos);
+ tmp_qos);
xfree(tmp_qos);
set_qos_vals=1;
}
- if(_addto_update_list(mysql_conn->update_list,
+ if(_addto_update_list(mysql_conn->update_list,
ACCT_MODIFY_ASSOC,
- mod_assoc) != SLURM_SUCCESS)
+ mod_assoc) != SLURM_SUCCESS)
error("couldn't add to the update list");
if(account_type) {
_modify_unset_users(mysql_conn,
@@ -5884,7 +5884,7 @@ extern List acct_storage_p_modify_associations(
mysql_free_result(result);
if(assoc->parent_acct) {
- if(((rc == ESLURM_INVALID_PARENT_ACCOUNT)
+ if(((rc == ESLURM_INVALID_PARENT_ACCOUNT)
|| (rc == ESLURM_SAME_PARENT_ACCOUNT))
&& list_count(ret_list))
rc = SLURM_SUCCESS;
@@ -5946,8 +5946,8 @@ extern List acct_storage_p_modify_associations(
*/
//memset(&local_assoc_cond, 0, sizeof(acct_association_cond_t));
-
- if(!(local_assoc_list =
+
+ if(!(local_assoc_list =
acct_storage_p_get_associations(mysql_conn,
uid, NULL)))
return ret_list;
@@ -5961,15 +5961,15 @@ extern List acct_storage_p_modify_associations(
*/
local_itr = list_iterator_create(local_assoc_list);
while((local_assoc = list_next(local_itr))) {
- if(_addto_update_list(mysql_conn->update_list,
+ if(_addto_update_list(mysql_conn->update_list,
ACCT_MODIFY_ASSOC,
- local_assoc) == SLURM_SUCCESS)
+ local_assoc) == SLURM_SUCCESS)
list_remove(local_itr);
}
list_iterator_destroy(local_itr);
- list_destroy(local_assoc_list);
+ list_destroy(local_assoc_list);
}
-
+
end_it:
xfree(name_char);
xfree(vals);
@@ -5977,7 +5977,7 @@ end_it:
return ret_list;
}
-extern List acct_storage_p_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
+extern List acct_storage_p_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
acct_qos_cond_t *qos_cond,
acct_qos_rec_t *qos)
{
@@ -6004,14 +6004,14 @@ extern List acct_storage_p_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
return NULL;
xstrcat(extra, "where deleted=0");
-
- if(qos_cond->description_list
+
+ if(qos_cond->description_list
&& list_count(qos_cond->description_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(qos_cond->description_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "description=\"%s\"", object);
set = 1;
@@ -6020,13 +6020,13 @@ extern List acct_storage_p_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if(qos_cond->id_list
+ if(qos_cond->id_list
&& list_count(qos_cond->id_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(qos_cond->id_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "id=\"%s\"", object);
set = 1;
@@ -6034,14 +6034,14 @@ extern List acct_storage_p_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
+
if(qos_cond->name_list
&& list_count(qos_cond->name_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(qos_cond->name_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name=\"%s\"", object);
set = 1;
@@ -6049,7 +6049,7 @@ extern List acct_storage_p_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
+
_setup_qos_limits(qos, &tmp_char1, &tmp_char2, &vals, &added_preempt);
if(added_preempt) {
preempt_bitstr = bit_alloc(g_qos_count);
@@ -6091,7 +6091,7 @@ extern List acct_storage_p_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
} else {
xstrfmtcat(name_char, " || name='%s'", object);
}
-
+
qos_rec = xmalloc(sizeof(acct_qos_rec_t));
qos_rec->name = xstrdup(object);
@@ -6112,7 +6112,7 @@ extern List acct_storage_p_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
qos_rec->priority = qos->priority;
if(qos->preempt_list) {
- ListIterator new_preempt_itr =
+ ListIterator new_preempt_itr =
list_iterator_create(qos->preempt_list);
char *new_preempt = NULL;
@@ -6140,7 +6140,7 @@ extern List acct_storage_p_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
atoi(new_preempt));
}
}
- list_iterator_destroy(new_preempt_itr);
+ list_iterator_destroy(new_preempt_itr);
}
_addto_update_list(mysql_conn->update_list, ACCT_MODIFY_QOS,
@@ -6149,7 +6149,7 @@ extern List acct_storage_p_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
mysql_free_result(result);
FREE_NULL_BITMAP(preempt_bitstr);
-
+
if(row) {
xfree(vals);
xfree(name_char);
@@ -6181,12 +6181,12 @@ extern List acct_storage_p_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
list_destroy(ret_list);
ret_list = NULL;
}
-
+
return ret_list;
}
extern List acct_storage_p_modify_wckeys(mysql_conn_t *mysql_conn,
- uint32_t uid,
+ uint32_t uid,
acct_wckey_cond_t *wckey_cond,
acct_wckey_rec_t *wckey)
{
@@ -6199,7 +6199,7 @@ extern int acct_storage_p_modify_reservation(mysql_conn_t *mysql_conn,
MYSQL_RES *result = NULL;
MYSQL_ROW row;
int rc = SLURM_SUCCESS;
- char *cols = NULL, *vals = NULL, *extra = NULL,
+ char *cols = NULL, *vals = NULL, *extra = NULL,
*query = NULL;//, *tmp_extra = NULL;
time_t start = 0, now = time(NULL);
int i;
@@ -6243,19 +6243,19 @@ extern int acct_storage_p_modify_reservation(mysql_conn_t *mysql_conn,
error("We need a cluster name to edit a reservation.");
return SLURM_ERROR;
}
-
+
if(!resv->time_start_prev) {
error("We need a time to check for last "
"start of reservation.");
return SLURM_ERROR;
}
-
+
for(i=0; i<RESV_COUNT; i++) {
- if(i)
+ if(i)
xstrcat(cols, ", ");
xstrcat(cols, resv_req_inx[i]);
}
-
+
/* check for both the last start and the start because most
likely the start time hasn't changed, but something else
may have since the last time we did an update to the
@@ -6264,7 +6264,7 @@ extern int acct_storage_p_modify_reservation(mysql_conn_t *mysql_conn,
"and (start=%d || start=%d) and cluster='%s' "
"and deleted=0 order by start desc "
"limit 1 FOR UPDATE;",
- cols, resv_table, resv->id,
+ cols, resv_table, resv->id,
resv->time_start, resv->time_start_prev,
resv->cluster);
try_again:
@@ -6293,24 +6293,24 @@ try_again:
"and start <= %d and cluster='%s' "
"and deleted=0 order by start desc "
"limit 1;",
- cols, resv_table, resv->id,
+ cols, resv_table, resv->id,
resv->time_end, resv->cluster);
set = 1;
goto try_again;
}
goto end_it;
- }
-
+ }
+
start = atoi(row[RESV_START]);
-
+
xfree(query);
xfree(cols);
-
+
set = 0;
-
+
/* check differences here */
-
- if(!resv->name
+
+ if(!resv->name
&& row[RESV_NAME] && row[RESV_NAME][0])
// if this changes we just update the
// record, no need to create a new one since
@@ -6323,23 +6323,23 @@ try_again:
else if(row[RESV_ASSOCS] && row[RESV_ASSOCS][0])
resv->assocs = xstrdup(row[RESV_ASSOCS]);
- if(resv->cpus != (uint32_t)NO_VAL)
+ if(resv->cpus != (uint32_t)NO_VAL)
set = 1;
- else
+ else
resv->cpus = atoi(row[RESV_CPU]);
-
- if(resv->flags != (uint16_t)NO_VAL)
+
+ if(resv->flags != (uint16_t)NO_VAL)
set = 1;
else
resv->flags = atoi(row[RESV_FLAGS]);
-
- if(resv->nodes)
+
+ if(resv->nodes)
set = 1;
else if(row[RESV_NODES] && row[RESV_NODES][0]) {
resv->nodes = xstrdup(row[RESV_NODES]);
resv->node_inx = xstrdup(row[RESV_NODE_INX]);
}
-
+
if(!resv->time_end)
resv->time_end = atoi(row[RESV_END]);
@@ -6380,22 +6380,22 @@ try_again:
debug3("%d(%d) query\n%s",
mysql_conn->conn, __LINE__, query);
-
+
if((rc = mysql_db_query(mysql_conn->db_conn, query)
== SLURM_SUCCESS))
rc = mysql_clear_results(mysql_conn->db_conn);
-
+
end_it:
-
+
xfree(query);
xfree(cols);
xfree(vals);
xfree(extra);
-
+
return rc;
}
-extern List acct_storage_p_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
+extern List acct_storage_p_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
acct_user_cond_t *user_cond)
{
ListIterator itr = NULL;
@@ -6413,7 +6413,7 @@ extern List acct_storage_p_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
acct_user_cond_t user_coord_cond;
acct_association_cond_t assoc_cond;
acct_wckey_cond_t wckey_cond;
-
+
if(!user_cond) {
error("we need something to remove");
return NULL;
@@ -6430,7 +6430,7 @@ extern List acct_storage_p_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, " && (");
itr = list_iterator_create(user_cond->assoc_cond->user_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name=\"%s\"", object);
set = 1;
@@ -6444,7 +6444,7 @@ extern List acct_storage_p_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, " && (");
itr = list_iterator_create(user_cond->def_acct_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "default_acct=\"%s\"", object);
set = 1;
@@ -6452,13 +6452,13 @@ extern List acct_storage_p_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
+
if(user_cond->def_wckey_list && list_count(user_cond->def_wckey_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(user_cond->def_wckey_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "default_wckey=\"%s\"", object);
set = 1;
@@ -6466,7 +6466,7 @@ extern List acct_storage_p_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
+
if(user_cond->admin_level != ACCT_ADMIN_NOTSET) {
xstrfmtcat(extra, " && admin_level=%u", user_cond->admin_level);
}
@@ -6497,7 +6497,7 @@ extern List acct_storage_p_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
while((row = mysql_fetch_row(result))) {
char *object = xstrdup(row[0]);
acct_user_rec_t *user_rec = NULL;
-
+
list_append(ret_list, object);
list_append(assoc_cond.user_list, object);
@@ -6564,12 +6564,12 @@ extern List acct_storage_p_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
error("Couldn't remove user coordinators");
list_destroy(ret_list);
return NULL;
- }
+ }
return ret_list;
}
-extern List acct_storage_p_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
+extern List acct_storage_p_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
List acct_list,
acct_user_cond_t *user_cond)
{
@@ -6609,9 +6609,9 @@ extern List acct_storage_p_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
* check it below after the query.
*/
if((uid == slurmdbd_conf->slurm_user_id || uid == 0)
- || assoc_mgr_get_admin_level(mysql_conn, uid)
- >= ACCT_ADMIN_OPERATOR)
- is_admin = 1;
+ || assoc_mgr_get_admin_level(mysql_conn, uid)
+ >= ACCT_ADMIN_OPERATOR)
+ is_admin = 1;
else {
if(assoc_mgr_fill_in_user(mysql_conn, &user, 1, NULL)
!= SLURM_SUCCESS) {
@@ -6641,10 +6641,10 @@ extern List acct_storage_p_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, " && (");
else
xstrcat(extra, "(");
-
+
itr = list_iterator_create(user_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "user=\"%s\"", object);
set = 1;
@@ -6662,7 +6662,7 @@ extern List acct_storage_p_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
itr = list_iterator_create(acct_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "acct=\"%s\"", object);
set = 1;
@@ -6670,7 +6670,7 @@ extern List acct_storage_p_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
+
if(!extra) {
errno = SLURM_ERROR;
debug3("No conditions given");
@@ -6728,11 +6728,11 @@ extern List acct_storage_p_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
list_append(user_list, xstrdup(row[0]));
last_user = row[0];
}
- list_append(ret_list, xstrdup_printf("U = %-9s A = %-10s",
+ list_append(ret_list, xstrdup_printf("U = %-9s A = %-10s",
row[0], row[1]));
}
mysql_free_result(result);
-
+
user_name = uid_to_string((uid_t) uid);
rc = _remove_common(mysql_conn, DBD_REMOVE_ACCOUNT_COORDS, now,
user_name, acct_coord_table, extra, NULL);
@@ -6751,7 +6751,7 @@ extern List acct_storage_p_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
user_rec = xmalloc(sizeof(acct_user_rec_t));
user_rec->name = xstrdup(last_user);
_get_user_coords(mysql_conn, user_rec);
- _addto_update_list(mysql_conn->update_list,
+ _addto_update_list(mysql_conn->update_list,
ACCT_REMOVE_COORD, user_rec);
}
list_iterator_destroy(itr);
@@ -6760,7 +6760,7 @@ extern List acct_storage_p_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
return ret_list;
}
-extern List acct_storage_p_remove_accts(mysql_conn_t *mysql_conn, uint32_t uid,
+extern List acct_storage_p_remove_accts(mysql_conn_t *mysql_conn, uint32_t uid,
acct_account_cond_t *acct_cond)
{
ListIterator itr = NULL;
@@ -6785,14 +6785,14 @@ extern List acct_storage_p_remove_accts(mysql_conn_t *mysql_conn, uint32_t uid,
return NULL;
xstrcat(extra, "where deleted=0");
- if(acct_cond->assoc_cond
- && acct_cond->assoc_cond->acct_list
+ if(acct_cond->assoc_cond
+ && acct_cond->assoc_cond->acct_list
&& list_count(acct_cond->assoc_cond->acct_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(acct_cond->assoc_cond->acct_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name=\"%s\"", object);
set = 1;
@@ -6801,13 +6801,13 @@ extern List acct_storage_p_remove_accts(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if(acct_cond->description_list
+ if(acct_cond->description_list
&& list_count(acct_cond->description_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(acct_cond->description_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "description=\"%s\"", object);
set = 1;
@@ -6815,14 +6815,14 @@ extern List acct_storage_p_remove_accts(mysql_conn_t *mysql_conn, uint32_t uid,
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
+
if(acct_cond->organization_list
&& list_count(acct_cond->organization_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(acct_cond->organization_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "organization=\"%s\"", object);
set = 1;
@@ -6830,7 +6830,7 @@ extern List acct_storage_p_remove_accts(mysql_conn_t *mysql_conn, uint32_t uid,
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
+
if(!extra) {
error("Nothing to remove");
return NULL;
@@ -6889,7 +6889,7 @@ extern List acct_storage_p_remove_accts(mysql_conn_t *mysql_conn, uint32_t uid,
}
extern List acct_storage_p_remove_clusters(mysql_conn_t *mysql_conn,
- uint32_t uid,
+ uint32_t uid,
acct_cluster_cond_t *cluster_cond)
{
ListIterator itr = NULL;
@@ -6921,7 +6921,7 @@ extern List acct_storage_p_remove_clusters(mysql_conn_t *mysql_conn,
xstrcat(extra, " && (");
itr = list_iterator_create(cluster_cond->cluster_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name=\"%s\"", object);
set = 1;
@@ -7020,7 +7020,7 @@ extern List acct_storage_p_remove_clusters(mysql_conn_t *mysql_conn,
}
extern List acct_storage_p_remove_associations(
- mysql_conn_t *mysql_conn, uint32_t uid,
+ mysql_conn_t *mysql_conn, uint32_t uid,
acct_association_cond_t *assoc_cond)
{
ListIterator itr = NULL;
@@ -7036,7 +7036,7 @@ extern List acct_storage_p_remove_associations(
MYSQL_ROW row;
acct_user_rec_t user;
- /* if this changes you will need to edit the corresponding
+ /* if this changes you will need to edit the corresponding
* enum below also t1 is step_table */
char *rassoc_req_inx[] = {
"id",
@@ -7046,7 +7046,7 @@ extern List acct_storage_p_remove_associations(
"user",
"partition"
};
-
+
enum {
RASSOC_ID,
RASSOC_ACCT,
@@ -7080,9 +7080,9 @@ extern List acct_storage_p_remove_associations(
* check it below after the query.
*/
if((uid == slurmdbd_conf->slurm_user_id || uid == 0)
- || assoc_mgr_get_admin_level(mysql_conn, uid)
- >= ACCT_ADMIN_OPERATOR)
- is_admin = 1;
+ || assoc_mgr_get_admin_level(mysql_conn, uid)
+ >= ACCT_ADMIN_OPERATOR)
+ is_admin = 1;
else {
if(assoc_mgr_fill_in_user(mysql_conn, &user, 1, NULL)
!= SLURM_SUCCESS) {
@@ -7107,7 +7107,7 @@ extern List acct_storage_p_remove_associations(
set = _setup_association_cond_limits(assoc_cond, &extra);
for(i=0; i<RASSOC_COUNT; i++) {
- if(i)
+ if(i)
xstrcat(object, ", ");
xstrcat(object, rassoc_req_inx[i]);
}
@@ -7121,7 +7121,7 @@ extern List acct_storage_p_remove_associations(
xfree(query);
return NULL;
}
-
+
rc = 0;
while((row = mysql_fetch_row(result))) {
if(!rc) {
@@ -7194,7 +7194,7 @@ extern List acct_storage_p_remove_associations(
goto end_it;
}
}
- if(row[RASSOC_PART][0]) {
+ if(row[RASSOC_PART][0]) {
// see if there is a partition name
object = xstrdup_printf(
"C = %-10s A = %-10s U = %-9s P = %s",
@@ -7203,7 +7203,7 @@ extern List acct_storage_p_remove_associations(
} else if(row[RASSOC_USER][0]){
object = xstrdup_printf(
"C = %-10s A = %-10s U = %-9s",
- row[RASSOC_CLUSTER], row[RASSOC_ACCT],
+ row[RASSOC_CLUSTER], row[RASSOC_ACCT],
row[RASSOC_USER]);
} else {
if(row[RASSOC_PACCT][0]) {
@@ -7228,9 +7228,9 @@ extern List acct_storage_p_remove_associations(
rem_assoc = xmalloc(sizeof(acct_association_rec_t));
init_acct_association_rec(rem_assoc);
rem_assoc->id = atoi(row[RASSOC_ID]);
- if(_addto_update_list(mysql_conn->update_list,
+ if(_addto_update_list(mysql_conn->update_list,
ACCT_REMOVE_ASSOC,
- rem_assoc) != SLURM_SUCCESS)
+ rem_assoc) != SLURM_SUCCESS)
error("couldn't add to the update list");
}
@@ -7251,7 +7251,7 @@ end_it:
mysql_db_rollback(mysql_conn->db_conn);
}
list_flush(mysql_conn->update_list);
-
+
if(ret_list) {
list_destroy(ret_list);
ret_list = NULL;
@@ -7261,7 +7261,7 @@ end_it:
return NULL;
}
-extern List acct_storage_p_remove_qos(mysql_conn_t *mysql_conn, uint32_t uid,
+extern List acct_storage_p_remove_qos(mysql_conn_t *mysql_conn, uint32_t uid,
acct_qos_cond_t *qos_cond)
{
ListIterator itr = NULL;
@@ -7285,13 +7285,13 @@ extern List acct_storage_p_remove_qos(mysql_conn_t *mysql_conn, uint32_t uid,
return NULL;
xstrcat(extra, "where deleted=0");
- if(qos_cond->description_list
+ if(qos_cond->description_list
&& list_count(qos_cond->description_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(qos_cond->description_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "description=\"%s\"", object);
set = 1;
@@ -7300,13 +7300,13 @@ extern List acct_storage_p_remove_qos(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if(qos_cond->id_list
+ if(qos_cond->id_list
&& list_count(qos_cond->id_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(qos_cond->id_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "id=\"%s\"", object);
set = 1;
@@ -7314,14 +7314,14 @@ extern List acct_storage_p_remove_qos(mysql_conn_t *mysql_conn, uint32_t uid,
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
+
if(qos_cond->name_list
&& list_count(qos_cond->name_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(qos_cond->name_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name=\"%s\"", object);
set = 1;
@@ -7329,7 +7329,7 @@ extern List acct_storage_p_remove_qos(mysql_conn_t *mysql_conn, uint32_t uid,
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
+
if(!extra) {
error("Nothing to remove");
return NULL;
@@ -7352,12 +7352,12 @@ extern List acct_storage_p_remove_qos(mysql_conn_t *mysql_conn, uint32_t uid,
if(!name_char)
xstrfmtcat(name_char, "id=\"%s\"", row[0]);
else
- xstrfmtcat(name_char, " || id=\"%s\"", row[0]);
+ xstrfmtcat(name_char, " || id=\"%s\"", row[0]);
if(!assoc_char)
xstrfmtcat(assoc_char, "qos=\"%s\"", row[0]);
else
- xstrfmtcat(assoc_char, " || qos=\"%s\"", row[0]);
- xstrfmtcat(extra,
+ xstrfmtcat(assoc_char, " || qos=\"%s\"", row[0]);
+ xstrfmtcat(extra,
", qos=replace(qos, ',%s', '')"
", delta_qos=replace(delta_qos, ',+%s', '')"
", delta_qos=replace(delta_qos, ',-%s', '')",
@@ -7395,7 +7395,7 @@ extern List acct_storage_p_remove_qos(mysql_conn_t *mysql_conn, uint32_t uid,
list_destroy(ret_list);
return NULL;
}
-
+
user_name = uid_to_string((uid_t) uid);
rc = _remove_common(mysql_conn, DBD_REMOVE_QOS, now,
user_name, qos_table, name_char, assoc_char);
@@ -7405,13 +7405,13 @@ extern List acct_storage_p_remove_qos(mysql_conn_t *mysql_conn, uint32_t uid,
if (rc == SLURM_ERROR) {
list_destroy(ret_list);
return NULL;
- }
+ }
return ret_list;
}
extern List acct_storage_p_remove_wckeys(mysql_conn_t *mysql_conn,
- uint32_t uid,
+ uint32_t uid,
acct_wckey_cond_t *wckey_cond)
{
List ret_list = NULL;
@@ -7458,12 +7458,12 @@ empty:
if(!name_char)
xstrfmtcat(name_char, "id=\"%s\"", row[0]);
else
- xstrfmtcat(name_char, " || id=\"%s\"", row[0]);
+ xstrfmtcat(name_char, " || id=\"%s\"", row[0]);
if(!assoc_char)
xstrfmtcat(assoc_char, "wckeyid=\"%s\"", row[0]);
else
- xstrfmtcat(assoc_char, " || wckeyid=\"%s\"", row[0]);
-
+ xstrfmtcat(assoc_char, " || wckeyid=\"%s\"", row[0]);
+
wckey_rec = xmalloc(sizeof(acct_wckey_rec_t));
/* we only need id when removing no real need to init */
wckey_rec->id = atoi(row[0]);
@@ -7516,9 +7516,9 @@ extern int acct_storage_p_remove_reservation(mysql_conn_t *mysql_conn,
/* first delete the resv that hasn't happened yet. */
query = xstrdup_printf("delete from %s where start > %d "
"and id=%u and start=%d "
- "and cluster='%s';",
+ "and cluster='%s';",
resv_table, resv->time_start_prev,
- resv->id,
+ resv->id,
resv->time_start, resv->cluster);
/* then update the remaining ones with a deleted flag and end
* time of the time_start_prev which is set to when the
@@ -7529,25 +7529,25 @@ extern int acct_storage_p_remove_reservation(mysql_conn_t *mysql_conn,
resv_table, resv->time_start_prev,
resv->id, resv->time_start,
resv->cluster);
-
+
debug3("%d(%d) query\n%s",
mysql_conn->conn, __LINE__, query);
-
+
if((rc = mysql_db_query(mysql_conn->db_conn, query)
== SLURM_SUCCESS))
rc = mysql_clear_results(mysql_conn->db_conn);
-
+
xfree(query);
-
+
return rc;
}
-extern List acct_storage_p_get_users(mysql_conn_t *mysql_conn, uid_t uid,
+extern List acct_storage_p_get_users(mysql_conn_t *mysql_conn, uid_t uid,
acct_user_cond_t *user_cond)
{
- char *query = NULL;
- char *extra = NULL;
- char *tmp = NULL;
+ char *query = NULL;
+ char *extra = NULL;
+ char *tmp = NULL;
List user_list = NULL;
ListIterator itr = NULL;
char *object = NULL;
@@ -7594,35 +7594,35 @@ extern List acct_storage_p_get_users(mysql_conn_t *mysql_conn, uid_t uid,
* check it below after the query.
*/
if((uid == slurmdbd_conf->slurm_user_id || uid == 0)
- || assoc_mgr_get_admin_level(mysql_conn, uid)
- >= ACCT_ADMIN_OPERATOR)
- is_admin = 1;
+ || assoc_mgr_get_admin_level(mysql_conn, uid)
+ >= ACCT_ADMIN_OPERATOR)
+ is_admin = 1;
else {
assoc_mgr_fill_in_user(mysql_conn, &user, 1,
NULL);
}
}
}
-
+
if(!user_cond) {
xstrcat(extra, "where deleted=0");
goto empty;
- }
-
- if(user_cond->with_deleted)
+ }
+
+ if(user_cond->with_deleted)
xstrcat(extra, "where (deleted=0 || deleted=1)");
else
xstrcat(extra, "where deleted=0");
-
- if(user_cond->assoc_cond &&
+
+ if(user_cond->assoc_cond &&
user_cond->assoc_cond->user_list
&& list_count(user_cond->assoc_cond->user_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(user_cond->assoc_cond->user_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name=\"%s\"", object);
set = 1;
@@ -7636,7 +7636,7 @@ extern List acct_storage_p_get_users(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, " && (");
itr = list_iterator_create(user_cond->def_acct_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "default_acct=\"%s\"", object);
set = 1;
@@ -7644,13 +7644,13 @@ extern List acct_storage_p_get_users(mysql_conn_t *mysql_conn, uid_t uid,
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
+
if(user_cond->def_wckey_list && list_count(user_cond->def_wckey_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(user_cond->def_wckey_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "default_wckey=\"%s\"", object);
set = 1;
@@ -7658,14 +7658,14 @@ extern List acct_storage_p_get_users(mysql_conn_t *mysql_conn, uid_t uid,
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
+
if(user_cond->admin_level != ACCT_ADMIN_NOTSET) {
xstrfmtcat(extra, " && admin_level=%u",
user_cond->admin_level);
}
empty:
/* This is here to make sure we are looking at only this user
- * if this flag is set.
+ * if this flag is set.
*/
if(!is_admin && (private_data & PRIVATE_DATA_USERS)) {
xstrfmtcat(extra, " && name=\"%s\"", user.name);
@@ -7680,7 +7680,7 @@ empty:
query = xstrdup_printf("select %s from %s %s", tmp, user_table, extra);
xfree(tmp);
xfree(extra);
-
+
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
@@ -7704,7 +7704,7 @@ empty:
user->default_wckey = xstrdup("");
user->admin_level = atoi(row[USER_REQ_AL]);
-
+
/* user id will be set on the client since this could be on a
* different machine where this user may not exist or
* may have a different uid
@@ -7714,7 +7714,7 @@ empty:
/* else */
/* user->uid = passwd_ptr->pw_uid; */
- if(user_cond && user_cond->with_coords)
+ if(user_cond && user_cond->with_coords)
_get_user_coords(mysql_conn, user);
}
mysql_free_result(result);
@@ -7728,11 +7728,11 @@ empty:
/* Make sure we don't get any non-user associations
* this is done by at least having a user_list
* defined */
- if(!user_cond->assoc_cond)
- user_cond->assoc_cond =
+ if(!user_cond->assoc_cond)
+ user_cond->assoc_cond =
xmalloc(sizeof(acct_association_cond_t));
- if(!user_cond->assoc_cond->user_list)
+ if(!user_cond->assoc_cond->user_list)
user_cond->assoc_cond->user_list = list_create(NULL);
assoc_list = acct_storage_p_get_associations(
@@ -7747,9 +7747,9 @@ empty:
assoc_itr = list_iterator_create(assoc_list);
while((user = list_next(itr))) {
while((assoc = list_next(assoc_itr))) {
- if(strcmp(assoc->user, user->name))
+ if(strcmp(assoc->user, user->name))
continue;
-
+
if(!user->assoc_list)
user->assoc_list = list_create(
destroy_acct_association_rec);
@@ -7778,7 +7778,7 @@ get_wckeys:
user_cond->assoc_cond->user_list;
wckey_cond.cluster_list =
user_cond->assoc_cond->cluster_list;
- }
+ }
wckey_list = acct_storage_p_get_wckeys(
mysql_conn, uid, &wckey_cond);
@@ -7791,9 +7791,9 @@ get_wckeys:
wckey_itr = list_iterator_create(wckey_list);
while((user = list_next(itr))) {
while((wckey = list_next(wckey_itr))) {
- if(strcmp(wckey->user, user->name))
+ if(strcmp(wckey->user, user->name))
continue;
-
+
if(!user->wckey_list)
user->wckey_list = list_create(
destroy_acct_wckey_rec);
@@ -7814,9 +7814,9 @@ get_wckeys:
extern List acct_storage_p_get_accts(mysql_conn_t *mysql_conn, uid_t uid,
acct_account_cond_t *acct_cond)
{
- char *query = NULL;
- char *extra = NULL;
- char *tmp = NULL;
+ char *query = NULL;
+ char *extra = NULL;
+ char *tmp = NULL;
List acct_list = NULL;
ListIterator itr = NULL;
char *object = NULL;
@@ -7862,40 +7862,40 @@ extern List acct_storage_p_get_accts(mysql_conn_t *mysql_conn, uid_t uid,
* check it below after the query.
*/
if((uid == slurmdbd_conf->slurm_user_id || uid == 0)
- || assoc_mgr_get_admin_level(mysql_conn, uid)
- >= ACCT_ADMIN_OPERATOR)
- is_admin = 1;
+ || assoc_mgr_get_admin_level(mysql_conn, uid)
+ >= ACCT_ADMIN_OPERATOR)
+ is_admin = 1;
else {
assoc_mgr_fill_in_user(mysql_conn, &user, 1,
NULL);
}
- if(!is_admin && (!user.coord_accts
+ if(!is_admin && (!user.coord_accts
|| !list_count(user.coord_accts))) {
errno = ESLURM_ACCESS_DENIED;
return NULL;
}
}
}
-
+
if(!acct_cond) {
xstrcat(extra, "where deleted=0");
goto empty;
- }
+ }
- if(acct_cond->with_deleted)
+ if(acct_cond->with_deleted)
xstrcat(extra, "where (deleted=0 || deleted=1)");
else
xstrcat(extra, "where deleted=0");
- if(acct_cond->assoc_cond
- && acct_cond->assoc_cond->acct_list
+ if(acct_cond->assoc_cond
+ && acct_cond->assoc_cond->acct_list
&& list_count(acct_cond->assoc_cond->acct_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(acct_cond->assoc_cond->acct_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name=\"%s\"", object);
set = 1;
@@ -7910,7 +7910,7 @@ extern List acct_storage_p_get_accts(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, " && (");
itr = list_iterator_create(acct_cond->description_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "description=\"%s\"", object);
set = 1;
@@ -7918,14 +7918,14 @@ extern List acct_storage_p_get_accts(mysql_conn_t *mysql_conn, uid_t uid,
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
- if(acct_cond->organization_list
+
+ if(acct_cond->organization_list
&& list_count(acct_cond->organization_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(acct_cond->organization_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "organization=\"%s\"", object);
set = 1;
@@ -7933,7 +7933,7 @@ extern List acct_storage_p_get_accts(mysql_conn_t *mysql_conn, uid_t uid,
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
+
empty:
xfree(tmp);
@@ -7959,7 +7959,7 @@ empty:
xstrfmtcat(extra, " && (name=\"%s\"",
coord->name);
}
- }
+ }
list_iterator_destroy(itr);
if(set)
xstrcat(extra,")");
@@ -7968,7 +7968,7 @@ empty:
query = xstrdup_printf("select %s from %s %s", tmp, acct_table, extra);
xfree(tmp);
xfree(extra);
-
+
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
@@ -7978,13 +7978,13 @@ empty:
xfree(query);
acct_list = list_create(destroy_acct_account_rec);
-
+
if(acct_cond && acct_cond->with_assocs) {
/* We are going to be freeing the inners of
this list in the acct->name so we don't
free it here
*/
- if(acct_cond->assoc_cond->acct_list)
+ if(acct_cond->assoc_cond->acct_list)
list_destroy(acct_cond->assoc_cond->acct_list);
acct_cond->assoc_cond->acct_list = list_create(NULL);
}
@@ -8030,9 +8030,9 @@ empty:
assoc_itr = list_iterator_create(assoc_list);
while((acct = list_next(itr))) {
while((assoc = list_next(assoc_itr))) {
- if(strcmp(assoc->acct, acct->name))
+ if(strcmp(assoc->acct, acct->name))
continue;
-
+
if(!acct->assoc_list)
acct->assoc_list = list_create(
destroy_acct_association_rec);
@@ -8052,12 +8052,12 @@ empty:
return acct_list;
}
-extern List acct_storage_p_get_clusters(mysql_conn_t *mysql_conn, uid_t uid,
+extern List acct_storage_p_get_clusters(mysql_conn_t *mysql_conn, uid_t uid,
acct_cluster_cond_t *cluster_cond)
{
- char *query = NULL;
- char *extra = NULL;
- char *tmp = NULL;
+ char *query = NULL;
+ char *extra = NULL;
+ char *tmp = NULL;
List cluster_list = NULL;
ListIterator itr = NULL;
char *object = NULL;
@@ -8091,24 +8091,24 @@ extern List acct_storage_p_get_clusters(mysql_conn_t *mysql_conn, uid_t uid,
if(_check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
-
+
if(!cluster_cond) {
xstrcat(extra, "where deleted=0");
goto empty;
}
- if(cluster_cond->with_deleted)
+ if(cluster_cond->with_deleted)
xstrcat(extra, "where (deleted=0 || deleted=1)");
else
xstrcat(extra, "where deleted=0");
- if(cluster_cond->cluster_list
+ if(cluster_cond->cluster_list
&& list_count(cluster_cond->cluster_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(cluster_cond->cluster_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name=\"%s\"", object);
set = 1;
@@ -8126,11 +8126,11 @@ empty:
xstrfmtcat(tmp, ", %s", cluster_req_inx[i]);
}
- query = xstrdup_printf("select %s from %s %s",
+ query = xstrdup_printf("select %s from %s %s",
tmp, cluster_table, extra);
xfree(tmp);
xfree(extra);
-
+
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
@@ -8192,7 +8192,7 @@ empty:
if(row2[1] && row2[1][0])
cluster->nodes = xstrdup(row2[1]);
}
- mysql_free_result(result2);
+ mysql_free_result(result2);
}
mysql_free_result(result);
@@ -8200,7 +8200,7 @@ empty:
list_destroy(assoc_cond.cluster_list);
return cluster_list;
}
-
+
assoc_cond.acct_list = list_create(NULL);
list_append(assoc_cond.acct_list, "root");
@@ -8213,16 +8213,16 @@ empty:
list_destroy(assoc_cond.acct_list);
list_destroy(assoc_cond.user_list);
- if(!assoc_list)
+ if(!assoc_list)
return cluster_list;
-
+
itr = list_iterator_create(cluster_list);
assoc_itr = list_iterator_create(assoc_list);
while((cluster = list_next(itr))) {
while((assoc = list_next(assoc_itr))) {
- if(strcmp(assoc->cluster, cluster->name))
+ if(strcmp(assoc->cluster, cluster->name))
continue;
-
+
if(cluster->root_assoc) {
debug("This cluster %s already has "
"an association.");
@@ -8236,7 +8236,7 @@ empty:
list_iterator_destroy(itr);
list_iterator_destroy(assoc_itr);
if(list_count(assoc_list))
- error("I have %d left over associations",
+ error("I have %d left over associations",
list_count(assoc_list));
list_destroy(assoc_list);
@@ -8244,13 +8244,13 @@ empty:
}
extern List acct_storage_p_get_associations(mysql_conn_t *mysql_conn,
- uid_t uid,
+ uid_t uid,
acct_association_cond_t *assoc_cond)
{
//DEF_TIMERS;
- char *query = NULL;
- char *extra = NULL;
- char *tmp = NULL;
+ char *query = NULL;
+ char *extra = NULL;
+ char *tmp = NULL;
List assoc_list = NULL;
List delta_qos_list = NULL;
ListIterator itr = NULL;
@@ -8370,9 +8370,9 @@ extern List acct_storage_p_get_associations(mysql_conn_t *mysql_conn,
* check it below after the query.
*/
if((uid == slurmdbd_conf->slurm_user_id || uid == 0)
- || assoc_mgr_get_admin_level(mysql_conn, uid)
- >= ACCT_ADMIN_OPERATOR)
- is_admin = 1;
+ || assoc_mgr_get_admin_level(mysql_conn, uid)
+ >= ACCT_ADMIN_OPERATOR)
+ is_admin = 1;
else {
assoc_mgr_fill_in_user(mysql_conn, &user, 1,
NULL);
@@ -8383,7 +8383,7 @@ extern List acct_storage_p_get_associations(mysql_conn_t *mysql_conn,
set = _setup_association_cond_limits(assoc_cond, &extra);
with_raw_qos = assoc_cond->with_raw_qos;
- with_usage = assoc_cond->with_usage;
+ with_usage = assoc_cond->with_usage;
without_parent_limits = assoc_cond->without_parent_limits;
without_parent_info = assoc_cond->without_parent_info;
@@ -8393,13 +8393,13 @@ empty:
for(i=1; i<ASSOC_REQ_COUNT; i++) {
xstrfmtcat(tmp, ", t1.%s", assoc_req_inx[i]);
}
-
+
/* this is here to make sure we are looking at only this user
* if this flag is set. We also include any accounts they may be
* coordinator of.
*/
if(!is_admin && (private_data & PRIVATE_DATA_USERS)) {
- query = xstrdup_printf("select lft from %s where user=\"%s\"",
+ query = xstrdup_printf("select lft from %s where user=\"%s\"",
assoc_table, user.name);
if(user.coord_accts) {
acct_coord_rec_t *coord = NULL;
@@ -8430,15 +8430,15 @@ empty:
" && ((%s between lft and rgt)",
row[0]);
}
- }
+ }
if(set)
xstrcat(extra,")");
mysql_free_result(result);
}
-
+
//START_TIMER;
query = xstrdup_printf("select distinct %s from %s as t1%s "
- "order by cluster,lft;",
+ "order by cluster,lft;",
tmp, assoc_table, extra);
xfree(tmp);
xfree(extra);
@@ -8459,7 +8459,7 @@ empty:
MYSQL_ROW row2;
list_append(assoc_list, assoc);
-
+
assoc->id = atoi(row[ASSOC_REQ_ID]);
assoc->lft = atoi(row[ASSOC_REQ_LFT]);
assoc->rgt = atoi(row[ASSOC_REQ_RGT]);
@@ -8499,7 +8499,7 @@ empty:
assoc->grp_cpu_mins = INFINITE;
parent_acct = row[ASSOC_REQ_ACCT];
- if(!without_parent_info
+ if(!without_parent_info
&& row[ASSOC_REQ_PARENT][0]) {
assoc->parent_acct = xstrdup(row[ASSOC_REQ_PARENT]);
parent_acct = row[ASSOC_REQ_PARENT];
@@ -8518,14 +8518,14 @@ empty:
assoc->shares_raw = 1;
if(!without_parent_info && parent_acct &&
- (!last_acct || !last_cluster
+ (!last_acct || !last_cluster
|| strcmp(parent_acct, last_acct)
|| strcmp(row[ASSOC_REQ_CLUSTER], last_cluster))) {
query = xstrdup_printf(
"call get_parent_limits(\"%s\", "
"\"%s\", \"%s\", %u);"
"select @par_id, @mj, @msj, @mcpj, "
- "@mnpj, @mwpj, @mcmpj, @qos, @delta_qos;",
+ "@mnpj, @mwpj, @mcmpj, @qos, @delta_qos;",
assoc_table, parent_acct,
row[ASSOC_REQ_CLUSTER],
without_parent_limits);
@@ -8537,7 +8537,7 @@ empty:
break;
}
xfree(query);
-
+
if(!(row2 = mysql_fetch_row(result2))) {
parent_id = 0;
goto no_parent_limits;
@@ -8550,46 +8550,46 @@ empty:
atoi(row2[ASSOC2_REQ_MCMPJ]);
else
parent_mcmpj = INFINITE;
-
+
if(row2[ASSOC2_REQ_MCPJ])
parent_mcpj =
atoi(row2[ASSOC2_REQ_MCPJ]);
else
parent_mcpj = INFINITE;
-
+
if(row2[ASSOC2_REQ_MJ])
parent_mj = atoi(row2[ASSOC2_REQ_MJ]);
else
parent_mj = INFINITE;
-
+
if(row2[ASSOC2_REQ_MNPJ])
parent_mnpj =
atoi(row2[ASSOC2_REQ_MNPJ]);
else
parent_mnpj = INFINITE;
-
+
if(row2[ASSOC2_REQ_MWPJ])
parent_mwpj =
atoi(row2[ASSOC2_REQ_MWPJ]);
else
parent_mwpj = INFINITE;
-
+
if(row2[ASSOC2_REQ_MCMPJ])
parent_mcmpj =
atoll(row2[ASSOC2_REQ_MCMPJ]);
- else
+ else
parent_mcmpj = INFINITE;
xfree(parent_qos);
if(row2[ASSOC2_REQ_QOS][0])
parent_qos =
xstrdup(row2[ASSOC2_REQ_QOS]);
- else
+ else
parent_qos = NULL;
xfree(parent_delta_qos);
if(row2[ASSOC2_REQ_DELTA_QOS][0])
- xstrcat(parent_delta_qos,
+ xstrcat(parent_delta_qos,
row2[ASSOC2_REQ_DELTA_QOS]);
else
parent_delta_qos = NULL;
@@ -8615,25 +8615,25 @@ empty:
assoc->max_submit_jobs = parent_msj;
if(row[ASSOC_REQ_MCPJ])
- assoc->max_cpus_pj =
+ assoc->max_cpus_pj =
atoi(row[ASSOC_REQ_MCPJ]);
else
assoc->max_cpus_pj = parent_mcpj;
if(row[ASSOC_REQ_MNPJ])
- assoc->max_nodes_pj =
+ assoc->max_nodes_pj =
atoi(row[ASSOC_REQ_MNPJ]);
else
assoc->max_nodes_pj = parent_mnpj;
if(row[ASSOC_REQ_MWPJ])
- assoc->max_wall_pj =
+ assoc->max_wall_pj =
atoi(row[ASSOC_REQ_MWPJ]);
else
assoc->max_wall_pj = parent_mwpj;
if(row[ASSOC_REQ_MCMPJ])
- assoc->max_cpu_mins_pj =
+ assoc->max_cpu_mins_pj =
atoi(row[ASSOC_REQ_MCMPJ]);
else
assoc->max_cpu_mins_pj = parent_mcmpj;
@@ -8645,8 +8645,8 @@ empty:
* and a delta qos so if you have a qos don't worry
* about the delta.
*/
-
- if(row[ASSOC_REQ_QOS][0])
+
+ if(row[ASSOC_REQ_QOS][0])
slurm_addto_char_list(assoc->qos_list,
row[ASSOC_REQ_QOS]+1);
else {
@@ -8655,17 +8655,17 @@ empty:
*/
/* add the parents first */
- if(parent_qos)
+ if(parent_qos)
slurm_addto_char_list(assoc->qos_list,
parent_qos+1);
/* then add the parents delta */
- if(parent_delta_qos)
+ if(parent_delta_qos)
slurm_addto_char_list(delta_qos_list,
parent_delta_qos+1);
/* now add the associations */
- if(row[ASSOC_REQ_DELTA_QOS][0])
+ if(row[ASSOC_REQ_DELTA_QOS][0])
slurm_addto_char_list(
delta_qos_list,
row[ASSOC_REQ_DELTA_QOS]+1);
@@ -8679,12 +8679,12 @@ empty:
list_transfer(assoc->qos_list, delta_qos_list);
list_flush(delta_qos_list);
} else if(list_count(delta_qos_list)) {
- ListIterator curr_qos_itr =
+ ListIterator curr_qos_itr =
list_iterator_create(assoc->qos_list);
- ListIterator new_qos_itr =
+ ListIterator new_qos_itr =
list_iterator_create(delta_qos_list);
char *new_qos = NULL, *curr_qos = NULL;
-
+
while((new_qos = list_next(new_qos_itr))) {
if(new_qos[0] == '-') {
while((curr_qos =
@@ -8717,18 +8717,18 @@ empty:
list_iterator_destroy(curr_qos_itr);
list_flush(delta_qos_list);
}
-
+
assoc->parent_id = parent_id;
-
+
//info("parent id is %d", assoc->parent_id);
//log_assoc_rec(assoc);
}
- if(with_usage && assoc_list)
+ if(with_usage && assoc_list)
_get_usage_for_list(mysql_conn, DBD_GET_ASSOC_USAGE,
assoc_list, assoc_cond->usage_start,
assoc_cond->usage_end);
-
+
mysql_free_result(result);
list_destroy(delta_qos_list);
@@ -8743,7 +8743,7 @@ extern List acct_storage_p_get_problems(mysql_conn_t *mysql_conn, uint32_t uid,
acct_association_cond_t *assoc_cond)
{
List ret_list = NULL;
-
+
if(_check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
@@ -8774,9 +8774,9 @@ extern List acct_storage_p_get_config(void *db_conn)
extern List acct_storage_p_get_qos(mysql_conn_t *mysql_conn, uid_t uid,
acct_qos_cond_t *qos_cond)
{
- char *query = NULL;
- char *extra = NULL;
- char *tmp = NULL;
+ char *query = NULL;
+ char *extra = NULL;
+ char *tmp = NULL;
List qos_list = NULL;
ListIterator itr = NULL;
char *object = NULL;
@@ -8832,25 +8832,25 @@ extern List acct_storage_p_get_qos(mysql_conn_t *mysql_conn, uid_t uid,
return NULL;
-
+
if(!qos_cond) {
xstrcat(extra, "where deleted=0");
goto empty;
- }
-
- if(qos_cond->with_deleted)
+ }
+
+ if(qos_cond->with_deleted)
xstrcat(extra, "where (deleted=0 || deleted=1)");
else
xstrcat(extra, "where deleted=0");
-
- if(qos_cond->description_list
+
+ if(qos_cond->description_list
&& list_count(qos_cond->description_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(qos_cond->description_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "description=\"%s\"", object);
set = 1;
@@ -8859,13 +8859,13 @@ extern List acct_storage_p_get_qos(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, ")");
}
- if(qos_cond->id_list
+ if(qos_cond->id_list
&& list_count(qos_cond->id_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(qos_cond->id_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "id=\"%s\"", object);
set = 1;
@@ -8873,14 +8873,14 @@ extern List acct_storage_p_get_qos(mysql_conn_t *mysql_conn, uid_t uid,
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
+
if(qos_cond->name_list
&& list_count(qos_cond->name_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(qos_cond->name_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name=\"%s\"", object);
set = 1;
@@ -8900,7 +8900,7 @@ empty:
query = xstrdup_printf("select %s from %s %s", tmp, qos_table, extra);
xfree(tmp);
xfree(extra);
-
+
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
@@ -8919,7 +8919,7 @@ empty:
qos->description = xstrdup(row[QOS_REQ_DESC]);
qos->id = atoi(row[QOS_REQ_ID]);
-
+
if(row[QOS_REQ_NAME] && row[QOS_REQ_NAME][0])
qos->name = xstrdup(row[QOS_REQ_NAME]);
@@ -8993,9 +8993,9 @@ extern List acct_storage_p_get_wckeys(mysql_conn_t *mysql_conn, uid_t uid,
acct_wckey_cond_t *wckey_cond)
{
//DEF_TIMERS;
- char *query = NULL;
- char *extra = NULL;
- char *tmp = NULL;
+ char *query = NULL;
+ char *extra = NULL;
+ char *tmp = NULL;
List wckey_list = NULL;
int set = 0;
int i=0, is_admin=1;
@@ -9049,9 +9049,9 @@ extern List acct_storage_p_get_wckeys(mysql_conn_t *mysql_conn, uid_t uid,
* check it below after the query.
*/
if((uid == slurmdbd_conf->slurm_user_id || uid == 0)
- || assoc_mgr_get_admin_level(mysql_conn, uid)
- >= ACCT_ADMIN_OPERATOR)
- is_admin = 1;
+ || assoc_mgr_get_admin_level(mysql_conn, uid)
+ >= ACCT_ADMIN_OPERATOR)
+ is_admin = 1;
else {
assoc_mgr_fill_in_user(mysql_conn, &user,
1, NULL);
@@ -9069,17 +9069,17 @@ empty:
for(i=1; i<WCKEY_REQ_COUNT; i++) {
xstrfmtcat(tmp, ", t1.%s", wckey_req_inx[i]);
}
-
+
/* this is here to make sure we are looking at only this user
* if this flag is set. We also include any accounts they may be
* coordinator of.
*/
- if(!is_admin && (private_data & PRIVATE_DATA_USERS))
+ if(!is_admin && (private_data & PRIVATE_DATA_USERS))
xstrfmtcat(extra, " && t1.user='%s'", user.name);
-
+
//START_TIMER;
query = xstrdup_printf("select distinct %s from %s as t1%s "
- "order by name, cluster, user;",
+ "order by name, cluster, user;",
tmp, wckey_table, extra);
xfree(tmp);
xfree(extra);
@@ -9092,11 +9092,11 @@ empty:
xfree(query);
wckey_list = list_create(destroy_acct_wckey_rec);
-
+
while((row = mysql_fetch_row(result))) {
acct_wckey_rec_t *wckey = xmalloc(sizeof(acct_wckey_rec_t));
list_append(wckey_list, wckey);
-
+
wckey->id = atoi(row[WCKEY_REQ_ID]);
wckey->user = xstrdup(row[WCKEY_REQ_USER]);
@@ -9110,11 +9110,11 @@ empty:
}
mysql_free_result(result);
- if(with_usage && wckey_list)
+ if(with_usage && wckey_list)
_get_usage_for_list(mysql_conn, DBD_GET_WCKEY_USAGE,
wckey_list, wckey_cond->usage_start,
wckey_cond->usage_end);
-
+
//END_TIMER2("get_wckeys");
return wckey_list;
@@ -9124,9 +9124,9 @@ extern List acct_storage_p_get_reservations(mysql_conn_t *mysql_conn, uid_t uid,
acct_reservation_cond_t *resv_cond)
{
//DEF_TIMERS;
- char *query = NULL;
- char *extra = NULL;
- char *tmp = NULL;
+ char *query = NULL;
+ char *extra = NULL;
+ char *tmp = NULL;
List resv_list = NULL;
int set = 0;
int i=0, is_admin=1;
@@ -9191,9 +9191,9 @@ extern List acct_storage_p_get_reservations(mysql_conn_t *mysql_conn, uid_t uid,
* check it below after the query.
*/
if((uid == slurmdbd_conf->slurm_user_id || uid == 0)
- || assoc_mgr_get_admin_level(mysql_conn, uid)
- >= ACCT_ADMIN_OPERATOR)
- is_admin = 1;
+ || assoc_mgr_get_admin_level(mysql_conn, uid)
+ >= ACCT_ADMIN_OPERATOR)
+ is_admin = 1;
else {
error("Only admins can look at "
"reservation usage");
@@ -9225,10 +9225,10 @@ empty:
for(i=1; i<RESV_REQ_COUNT; i++) {
xstrfmtcat(tmp, ", t1.%s", resv_req_inx[i]);
}
-
+
//START_TIMER;
query = xstrdup_printf("select distinct %s from %s as t1%s "
- "order by cluster, name;",
+ "order by cluster, name;",
tmp, resv_table, extra);
xfree(tmp);
xfree(extra);
@@ -9240,9 +9240,9 @@ empty:
return NULL;
}
xfree(query);
-
+
resv_list = list_create(destroy_acct_reservation_rec);
-
+
while((row = mysql_fetch_row(result))) {
acct_reservation_rec_t *resv =
xmalloc(sizeof(acct_reservation_rec_t));
@@ -9252,10 +9252,10 @@ empty:
if(!good_nodes_from_inx(local_cluster_list, &curr_cluster,
row[RESV_REQ_NODE_INX], start))
continue;
-
+
resv->id = atoi(row[RESV_REQ_ID]);
if(with_usage) {
- if(!job_cond.resvid_list)
+ if(!job_cond.resvid_list)
job_cond.resvid_list = list_create(NULL);
list_append(job_cond.resvid_list, row[RESV_REQ_ID]);
}
@@ -9274,14 +9274,14 @@ empty:
if(with_usage && resv_list && list_count(resv_list)) {
List job_list = mysql_jobacct_process_get_jobs(
- mysql_conn, uid, &job_cond);
+ mysql_conn, uid, &job_cond);
ListIterator itr = NULL, itr2 = NULL;
jobacct_job_rec_t *job = NULL;
acct_reservation_rec_t *resv = NULL;
if(!job_list || !list_count(job_list))
goto no_jobs;
-
+
itr = list_iterator_create(job_list);
itr2 = list_iterator_create(resv_list);
while((job = list_next(itr))) {
@@ -9295,15 +9295,15 @@ empty:
have to make sure we get the time
in the correct record.
*/
- if(resv->id != job->resvid)
+ if(resv->id != job->resvid)
continue;
set = 1;
if(start < resv->time_start)
start = resv->time_start;
- if(!end || end > resv->time_end)
+ if(!end || end > resv->time_end)
end = resv->time_end;
-
+
if((elapsed = (end - start)) < 1)
continue;
@@ -9316,14 +9316,14 @@ empty:
error("we got a job %u with no reservation "
"associatied with it?", job->jobid);
}
- }
-
+ }
+
list_iterator_destroy(itr2);
list_iterator_destroy(itr);
no_jobs:
if(job_list)
list_destroy(job_list);
- }
+ }
if(job_cond.resvid_list) {
list_destroy(job_cond.resvid_list);
@@ -9340,11 +9340,11 @@ empty:
extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
acct_txn_cond_t *txn_cond)
{
- char *query = NULL;
- char *assoc_extra = NULL;
- char *name_extra = NULL;
- char *extra = NULL;
- char *tmp = NULL;
+ char *query = NULL;
+ char *assoc_extra = NULL;
+ char *name_extra = NULL;
+ char *extra = NULL;
+ char *tmp = NULL;
List txn_list = NULL;
ListIterator itr = NULL;
char *object = NULL;
@@ -9375,7 +9375,7 @@ extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
if(_check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
- if(!txn_cond)
+ if(!txn_cond)
goto empty;
/* handle query for associations first */
@@ -9388,7 +9388,7 @@ extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
if(name_extra)
xstrcat(name_extra, " && (");
- else
+ else
xstrcat(name_extra, " (");
itr = list_iterator_create(txn_cond->acct_list);
while((object = list_next(itr))) {
@@ -9407,7 +9407,7 @@ extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
}
list_iterator_destroy(itr);
xstrcat(assoc_extra, ")");
- xstrcat(name_extra, ")");
+ xstrcat(name_extra, ")");
}
if(txn_cond->cluster_list && list_count(txn_cond->cluster_list)) {
@@ -9419,12 +9419,12 @@ extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
if(name_extra)
xstrcat(name_extra, " && (");
- else
+ else
xstrcat(name_extra, "(");
-
+
itr = list_iterator_create(txn_cond->cluster_list);
while((object = list_next(itr))) {
- if(set) {
+ if(set) {
xstrcat(assoc_extra, " || ");
xstrcat(name_extra, " || ");
}
@@ -9438,21 +9438,21 @@ extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
}
list_iterator_destroy(itr);
xstrcat(assoc_extra, ")");
- xstrcat(name_extra, ")");
+ xstrcat(name_extra, ")");
}
if(txn_cond->user_list && list_count(txn_cond->user_list)) {
set = 0;
- if(assoc_extra)
+ if(assoc_extra)
xstrcat(assoc_extra, " && (");
else
xstrcat(assoc_extra, " where (");
if(name_extra)
xstrcat(name_extra, " && (");
- else
+ else
xstrcat(name_extra, "(");
-
+
itr = list_iterator_create(txn_cond->user_list);
while((object = list_next(itr))) {
if(set) {
@@ -9470,7 +9470,7 @@ extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
}
list_iterator_destroy(itr);
xstrcat(assoc_extra, ")");
- xstrcat(name_extra, ")");
+ xstrcat(name_extra, ")");
}
if(assoc_extra) {
@@ -9485,7 +9485,7 @@ extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
return NULL;
}
xfree(query);
-
+
if(extra)
xstrcat(extra, " && (");
else
@@ -9497,12 +9497,12 @@ extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
if(name_extra) {
xstrfmtcat(extra, "(%s) || (", name_extra);
xfree(name_extra);
- } else
- xstrcat(extra, "(");
+ } else
+ xstrcat(extra, "(");
while((row = mysql_fetch_row(result))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
-
+
xstrfmtcat(extra, "(name like '%%id=%s %%' "
"|| name like '%%id=%s)' "
"|| name=%s)",
@@ -9516,7 +9516,7 @@ extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
}
mysql_free_result(result);
}
-
+
/*******************************************/
if(txn_cond->action_list && list_count(txn_cond->action_list)) {
@@ -9527,7 +9527,7 @@ extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, " where (");
itr = list_iterator_create(txn_cond->action_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "action=\"%s\"", object);
set = 1;
@@ -9544,7 +9544,7 @@ extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, " where (");
itr = list_iterator_create(txn_cond->actor_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "actor=\"%s\"", object);
set = 1;
@@ -9571,7 +9571,7 @@ extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
return NULL;
}
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "id=%s", object);
set = 1;
@@ -9588,7 +9588,7 @@ extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, " where (");
itr = list_iterator_create(txn_cond->info_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "info like '%%%s%%'", object);
set = 1;
@@ -9596,7 +9596,7 @@ extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
list_iterator_destroy(itr);
xstrcat(extra, ")");
}
-
+
if(txn_cond->name_list && list_count(txn_cond->name_list)) {
set = 0;
if(extra)
@@ -9605,7 +9605,7 @@ extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, " where (");
itr = list_iterator_create(txn_cond->name_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name like '%%%s%%'", object);
set = 1;
@@ -9619,7 +9619,7 @@ extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
- xstrfmtcat(extra, "timestamp < %d && timestamp >= %d)",
+ xstrfmtcat(extra, "timestamp < %d && timestamp >= %d)",
txn_cond->time_end, txn_cond->time_start);
} else if(txn_cond->time_start) {
if(extra)
@@ -9627,7 +9627,7 @@ extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
else
xstrcat(extra, " where (");
xstrfmtcat(extra, "timestamp >= %d)", txn_cond->time_start);
-
+
} else if(txn_cond->time_end) {
if(extra)
xstrcat(extra, " && (");
@@ -9639,10 +9639,10 @@ extern List acct_storage_p_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
/* make sure we can get the max length out of the database
* when grouping the names
*/
- if(txn_cond->with_assoc_info)
- mysql_db_query(mysql_conn->db_conn,
+ if(txn_cond->with_assoc_info)
+ mysql_db_query(mysql_conn->db_conn,
"set session group_concat_max_len=65536;");
-
+
empty:
xfree(tmp);
xstrfmtcat(tmp, "%s", txn_req_inx[i]);
@@ -9669,12 +9669,12 @@ empty:
xfree(query);
txn_list = list_create(destroy_acct_txn_rec);
-
+
while((row = mysql_fetch_row(result))) {
acct_txn_rec_t *txn = xmalloc(sizeof(acct_txn_rec_t));
list_append(txn_list, txn);
-
+
txn->action = atoi(row[TXN_REQ_ACTION]);
txn->actor_name = xstrdup(row[TXN_REQ_ACTOR]);
txn->id = atoi(row[TXN_REQ_ID]);
@@ -9688,7 +9688,7 @@ empty:
|| txn->action == DBD_REMOVE_ASSOCS)) {
MYSQL_RES *result2 = NULL;
MYSQL_ROW row2;
-
+
query = xstrdup_printf(
"select "
"group_concat(distinct user order by user), "
@@ -9696,7 +9696,7 @@ empty:
"group_concat(distinct cluster "
"order by cluster) from %s where %s",
assoc_table, row[TXN_REQ_NAME]);
- debug4("%d(%d) query\n%s", mysql_conn->conn,
+ debug4("%d(%d) query\n%s", mysql_conn->conn,
__LINE__, query);
if(!(result2 = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
@@ -9713,7 +9713,7 @@ empty:
if(row2[2] && row2[2][0])
txn->clusters = xstrdup(row2[2]);
}
- mysql_free_result(result2);
+ mysql_free_result(result2);
}
}
mysql_free_result(result);
@@ -9741,7 +9741,7 @@ extern int acct_storage_p_get_usage(mysql_conn_t *mysql_conn, uid_t uid,
uint32_t id = NO_VAL;
char **usage_req_inx = NULL;
-
+
enum {
USAGE_ID,
USAGE_START,
@@ -9812,22 +9812,22 @@ extern int acct_storage_p_get_usage(mysql_conn_t *mysql_conn, uid_t uid,
* check it below after the query.
*/
if((uid == slurmdbd_conf->slurm_user_id || uid == 0)
- || assoc_mgr_get_admin_level(mysql_conn, uid)
- >= ACCT_ADMIN_OPERATOR)
- is_admin = 1;
+ || assoc_mgr_get_admin_level(mysql_conn, uid)
+ >= ACCT_ADMIN_OPERATOR)
+ is_admin = 1;
else {
assoc_mgr_fill_in_user(mysql_conn, &user, 1,
NULL);
}
-
+
if(!is_admin) {
ListIterator itr = NULL;
acct_coord_rec_t *coord = NULL;
- if(username &&
- !strcmp(acct_assoc->user, user.name))
+ if(username &&
+ !strcmp(acct_assoc->user, user.name))
goto is_user;
-
+
if(type != DBD_GET_ASSOC_USAGE)
goto bad_user;
@@ -9839,20 +9839,20 @@ extern int acct_storage_p_get_usage(mysql_conn_t *mysql_conn, uid_t uid,
if(!acct_assoc->acct) {
debug("No account name given "
"in association.");
- goto bad_user;
+ goto bad_user;
}
-
+
itr = list_iterator_create(user.coord_accts);
while((coord = list_next(itr))) {
- if(!strcasecmp(coord->name,
+ if(!strcasecmp(coord->name,
acct_assoc->acct))
break;
}
list_iterator_destroy(itr);
-
- if(coord)
+
+ if(coord)
goto is_user;
-
+
bad_user:
errno = ESLURM_ACCESS_DENIED;
return SLURM_ERROR;
@@ -9917,11 +9917,11 @@ is_user:
list_append((*my_list), accounting_rec);
}
mysql_free_result(result);
-
+
return rc;
}
-extern int acct_storage_p_roll_usage(mysql_conn_t *mysql_conn,
+extern int acct_storage_p_roll_usage(mysql_conn_t *mysql_conn,
time_t sent_start, time_t sent_end,
uint16_t archive_data)
{
@@ -9946,7 +9946,7 @@ extern int acct_storage_p_roll_usage(mysql_conn_t *mysql_conn,
"daily_rollup",
"monthly_rollup"
};
-
+
enum {
UPDATE_HOUR,
UPDATE_DAY,
@@ -9966,21 +9966,21 @@ extern int acct_storage_p_roll_usage(mysql_conn_t *mysql_conn,
query = xstrdup_printf("select %s from %s",
tmp, last_ran_table);
xfree(tmp);
-
- debug4("%d(%d) query\n%s", mysql_conn->conn,
+
+ debug4("%d(%d) query\n%s", mysql_conn->conn,
__LINE__, query);
if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
}
-
+
xfree(query);
row = mysql_fetch_row(result);
if(row) {
last_hour = atoi(row[UPDATE_HOUR]);
last_day = atoi(row[UPDATE_DAY]);
- last_month = atoi(row[UPDATE_MONTH]);
+ last_month = atoi(row[UPDATE_MONTH]);
mysql_free_result(result);
} else {
time_t now = time(NULL);
@@ -9995,8 +9995,8 @@ extern int acct_storage_p_roll_usage(mysql_conn_t *mysql_conn,
"(hourly_rollup, daily_rollup, monthly_rollup) "
"values (@PS, @PS, @PS);",
now, event_table, last_ran_table);
-
- debug3("%d(%d) query\n%s", mysql_conn->conn,
+
+ debug3("%d(%d) query\n%s", mysql_conn->conn,
__LINE__, query);
mysql_free_result(result);
if(!(result = mysql_db_query_ret(
@@ -10012,12 +10012,12 @@ extern int acct_storage_p_roll_usage(mysql_conn_t *mysql_conn,
mysql_free_result(result);
return SLURM_SUCCESS;
}
-
+
last_hour = last_day = last_month = atoi(row[0]);
mysql_free_result(result);
}
}
-
+
if(!my_time)
my_time = time(NULL);
@@ -10041,7 +10041,7 @@ extern int acct_storage_p_roll_usage(mysql_conn_t *mysql_conn,
error("Couldn't get localtime from hour start %d", last_hour);
return SLURM_ERROR;
}
-
+
if(!localtime_r(&my_time, &end_tm)) {
error("Couldn't get localtime from hour end %d", my_time);
return SLURM_ERROR;
@@ -10065,14 +10065,14 @@ extern int acct_storage_p_roll_usage(mysql_conn_t *mysql_conn,
/* info("hour start %s", ctime(&start_time)); */
/* info("hour end %s", ctime(&end_time)); */
/* info("diff is %d", end_time-start_time); */
-
+
slurm_mutex_lock(&rollup_lock);
global_last_rollup = end_time;
slurm_mutex_unlock(&rollup_lock);
if(end_time-start_time > 0) {
START_TIMER;
- if((rc = mysql_hourly_rollup(mysql_conn, start_time, end_time))
+ if((rc = mysql_hourly_rollup(mysql_conn, start_time, end_time))
!= SLURM_SUCCESS)
return rc;
END_TIMER3("hourly_rollup", 5000000);
@@ -10081,7 +10081,7 @@ extern int acct_storage_p_roll_usage(mysql_conn_t *mysql_conn,
query = xstrdup_printf("update %s set hourly_rollup=%d",
last_ran_table, end_time);
} else {
- debug2("no need to run this hour %d <= %d",
+ debug2("no need to run this hour %d <= %d",
end_time, start_time);
}
@@ -10105,11 +10105,11 @@ extern int acct_storage_p_roll_usage(mysql_conn_t *mysql_conn,
if(end_time-start_time > 0) {
START_TIMER;
if((rc = mysql_daily_rollup(mysql_conn, start_time, end_time,
- archive_data))
+ archive_data))
!= SLURM_SUCCESS)
return rc;
END_TIMER2("daily_rollup");
- if(query && !sent_end)
+ if(query && !sent_end)
xstrfmtcat(query, ", daily_rollup=%d", end_time);
else if(!sent_end)
query = xstrdup_printf("update %s set daily_rollup=%d",
@@ -10151,7 +10151,7 @@ extern int acct_storage_p_roll_usage(mysql_conn_t *mysql_conn,
return rc;
END_TIMER2("monthly_rollup");
- if(query && !sent_end)
+ if(query && !sent_end)
xstrfmtcat(query, ", monthly_rollup=%d", end_time);
else if(!sent_end)
query = xstrdup_printf(
@@ -10161,7 +10161,7 @@ extern int acct_storage_p_roll_usage(mysql_conn_t *mysql_conn,
debug2("no need to run this month %d <= %d",
end_time, start_time);
}
-
+
if(query) {
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
@@ -10170,7 +10170,7 @@ extern int acct_storage_p_roll_usage(mysql_conn_t *mysql_conn,
return rc;
}
-extern int clusteracct_storage_p_node_down(mysql_conn_t *mysql_conn,
+extern int clusteracct_storage_p_node_down(mysql_conn_t *mysql_conn,
char *cluster,
struct node_record *node_ptr,
time_t event_time, char *reason)
@@ -10197,7 +10197,7 @@ extern int clusteracct_storage_p_node_down(mysql_conn_t *mysql_conn,
my_reason = reason;
else
my_reason = node_ptr->reason;
-
+
debug2("inserting %s(%s) with %u cpus", node_ptr->name, cluster, cpus);
query = xstrdup_printf(
@@ -10219,7 +10219,7 @@ extern int clusteracct_storage_p_node_down(mysql_conn_t *mysql_conn,
"values (\"%s\", %u, \"%s\", %u, %d, \"%s\") "
"on duplicate key "
"update period_end=0;",
- event_table, node_ptr->name, node_ptr->node_state, cluster,
+ event_table, node_ptr->name, node_ptr->node_state, cluster,
cpus, event_time, my_reason);
debug4("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
@@ -10227,7 +10227,7 @@ extern int clusteracct_storage_p_node_down(mysql_conn_t *mysql_conn,
return rc;
}
-extern int clusteracct_storage_p_node_up(mysql_conn_t *mysql_conn,
+extern int clusteracct_storage_p_node_up(mysql_conn_t *mysql_conn,
char *cluster,
struct node_record *node_ptr,
time_t event_time)
@@ -10251,7 +10251,7 @@ extern int clusteracct_storage_p_node_up(mysql_conn_t *mysql_conn,
/* This is only called when not running from the slurmdbd so we can
* assumes some things like rpc_version.
*/
-extern int clusteracct_storage_p_register_ctld(mysql_conn_t *mysql_conn,
+extern int clusteracct_storage_p_register_ctld(mysql_conn_t *mysql_conn,
char *cluster,
uint16_t port)
{
@@ -10260,19 +10260,19 @@ extern int clusteracct_storage_p_register_ctld(mysql_conn_t *mysql_conn,
char hostname[255];
time_t now = time(NULL);
- if(slurmdbd_conf)
+ if(slurmdbd_conf)
fatal("clusteracct_storage_g_register_ctld "
"should never be called from the slurmdbd.");
-
+
if(_check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
-
+
info("Registering slurmctld for cluster %s at port %u in database.",
cluster, port);
gethostname(hostname, sizeof(hostname));
/* check if we are running on the backup controller */
- if(slurmctld_conf.backup_controller
+ if(slurmctld_conf.backup_controller
&& !strcmp(slurmctld_conf.backup_controller, hostname)) {
address = slurmctld_conf.backup_addr;
} else
@@ -10285,7 +10285,7 @@ extern int clusteracct_storage_p_register_ctld(mysql_conn_t *mysql_conn,
cluster_table, now, address, port,
SLURMDBD_VERSION,
cluster);
- xstrfmtcat(query,
+ xstrfmtcat(query,
"insert into %s "
"(timestamp, action, name, actor, info) "
"values (%d, %d, \"%s\", \"%s\", \"%s %u\");",
@@ -10294,11 +10294,11 @@ extern int clusteracct_storage_p_register_ctld(mysql_conn_t *mysql_conn,
slurmctld_conf.slurm_user_name, address, port);
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
-
+
return mysql_db_query(mysql_conn->db_conn, query);
}
-extern int clusteracct_storage_p_cluster_procs(mysql_conn_t *mysql_conn,
+extern int clusteracct_storage_p_cluster_procs(mysql_conn_t *mysql_conn,
char *cluster,
char *cluster_nodes,
uint32_t procs,
@@ -10369,11 +10369,11 @@ extern int clusteracct_storage_p_cluster_procs(mysql_conn_t *mysql_conn,
"update the database.");
goto end_it;
}
- } else
+ } else
goto end_it;
} else
debug("%s has changed from %s cpus to %u",
- cluster, row[0], procs);
+ cluster, row[0], procs);
/* reset all the entries for this cluster since the procs
changed some of the downed nodes may have gone away.
@@ -10425,7 +10425,7 @@ extern int clusteracct_storage_p_get_usage(
"cpu_count",
"period_start"
};
-
+
enum {
CLUSTER_ACPU,
CLUSTER_DCPU,
@@ -10472,7 +10472,7 @@ extern int clusteracct_storage_p_get_usage(
if(!cluster_rec->accounting_list)
cluster_rec->accounting_list =
list_create(destroy_cluster_accounting_rec);
-
+
while((row = mysql_fetch_row(result))) {
cluster_accounting_rec_t *accounting_rec =
xmalloc(sizeof(cluster_accounting_rec_t));
@@ -10491,10 +10491,10 @@ extern int clusteracct_storage_p_get_usage(
return rc;
}
-/*
+/*
* load into the storage the start of a job
*/
-extern int jobacct_storage_p_job_start(mysql_conn_t *mysql_conn,
+extern int jobacct_storage_p_job_start(mysql_conn_t *mysql_conn,
char *cluster_name,
struct job_record *job_ptr)
{
@@ -10517,7 +10517,7 @@ extern int jobacct_storage_p_job_start(mysql_conn_t *mysql_conn,
if(_check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
-
+
debug2("mysql_jobacct_job_start() called");
/* See what we are hearing about here if no start time. If
@@ -10525,7 +10525,7 @@ extern int jobacct_storage_p_job_start(mysql_conn_t *mysql_conn,
* need to reset it to look at this job. */
if(!check_time) {
check_time = job_ptr->details->begin_time;
-
+
if(!check_time)
check_time = job_ptr->details->submit_time;
}
@@ -10542,8 +10542,8 @@ extern int jobacct_storage_p_job_start(mysql_conn_t *mysql_conn,
"submit=%d and eligible=%d "
"and start=%d;",
job_table, job_ptr->job_id,
- job_ptr->details->submit_time,
- job_ptr->details->begin_time,
+ job_ptr->details->submit_time,
+ job_ptr->details->begin_time,
job_ptr->start_time);
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
if(!(result =
@@ -10569,11 +10569,11 @@ extern int jobacct_storage_p_job_start(mysql_conn_t *mysql_conn,
"now hearing about it.",
ctime(&check_time),
job_ptr->job_id, cluster_name);
- else if(job_ptr->details->begin_time)
+ else if(job_ptr->details->begin_time)
debug("Need to reroll usage from %sJob %u "
"from %s became eligible then and we are just "
"now hearing about it.",
- ctime(&check_time),
+ ctime(&check_time),
job_ptr->job_id, cluster_name);
else
debug("Need to reroll usage from %sJob %u "
@@ -10581,10 +10581,10 @@ extern int jobacct_storage_p_job_start(mysql_conn_t *mysql_conn,
"now hearing about it.",
ctime(&check_time),
job_ptr->job_id, cluster_name);
-
+
global_last_rollup = check_time;
slurm_mutex_unlock(&rollup_lock);
-
+
query = xstrdup_printf("update %s set hourly_rollup=%d, "
"daily_rollup=%d, monthly_rollup=%d",
last_ran_table, check_time,
@@ -10604,14 +10604,14 @@ no_rollup_change:
}
- if (job_ptr->name && job_ptr->name[0])
+ if (job_ptr->name && job_ptr->name[0])
jname = job_ptr->name;
else {
jname = "allocation";
track_steps = 1;
}
-
- if (job_ptr->nodes && job_ptr->nodes[0])
+
+ if (job_ptr->nodes && job_ptr->nodes[0])
nodes = job_ptr->nodes;
else
nodes = "None assigned";
@@ -10627,28 +10627,28 @@ no_rollup_change:
char temp_bit[BUF_SIZE];
if(job_ptr->node_bitmap) {
- node_inx = bit_fmt(temp_bit, sizeof(temp_bit),
+ node_inx = bit_fmt(temp_bit, sizeof(temp_bit),
job_ptr->node_bitmap);
}
#ifdef HAVE_BG
- select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_BLOCK_ID,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo,
+ SELECT_JOBDATA_BLOCK_ID,
&block_id);
- select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_NODE_CNT,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo,
+ SELECT_JOBDATA_NODE_CNT,
&node_cnt);
#else
node_cnt = job_ptr->node_cnt;
-#endif
+#endif
}
/* if there is a start_time get the wckeyid */
- if(job_ptr->start_time && job_ptr->assoc_id)
+ if(job_ptr->start_time && job_ptr->assoc_id)
wckeyid = _get_wckeyid(mysql_conn, &job_ptr->wckey,
job_ptr->user_id, cluster_name,
job_ptr->assoc_id);
-
-
+
+
/* We need to put a 0 for 'end' incase of funky job state
* files from a hot start of the controllers we call
* job_start on jobs we may still know about after
@@ -10657,7 +10657,7 @@ no_rollup_change:
*/
if(!job_ptr->db_index) {
if(!job_ptr->details->begin_time)
- job_ptr->details->begin_time =
+ job_ptr->details->begin_time =
job_ptr->details->submit_time;
query = xstrdup_printf(
"insert into %s "
@@ -10665,42 +10665,42 @@ no_rollup_change:
"gid, nodelist, resvid, timelimit, ",
job_table);
- if(cluster_name)
+ if(cluster_name)
xstrcat(query, "cluster, ");
- if(job_ptr->account)
+ if(job_ptr->account)
xstrcat(query, "account, ");
- if(job_ptr->partition)
+ if(job_ptr->partition)
xstrcat(query, "partition, ");
- if(block_id)
+ if(block_id)
xstrcat(query, "blockid, ");
- if(job_ptr->wckey)
+ if(job_ptr->wckey)
xstrcat(query, "wckey, ");
- if(node_inx)
+ if(node_inx)
xstrcat(query, "node_inx, ");
-
- xstrfmtcat(query,
+
+ xstrfmtcat(query,
"eligible, submit, start, name, track_steps, "
"state, priority, req_cpus, "
"alloc_cpus, alloc_nodes) "
"values (%u, %u, %u, %u, %u, \"%s\", %u, %u, ",
job_ptr->job_id, job_ptr->assoc_id, wckeyid,
- job_ptr->user_id, job_ptr->group_id, nodes,
+ job_ptr->user_id, job_ptr->group_id, nodes,
job_ptr->resv_id, job_ptr->time_limit);
-
- if(cluster_name)
+
+ if(cluster_name)
xstrfmtcat(query, "\"%s\", ", cluster_name);
- if(job_ptr->account)
+ if(job_ptr->account)
xstrfmtcat(query, "\"%s\", ", job_ptr->account);
- if(job_ptr->partition)
+ if(job_ptr->partition)
xstrfmtcat(query, "\"%s\", ", job_ptr->partition);
- if(block_id)
+ if(block_id)
xstrfmtcat(query, "\"%s\", ", block_id);
- if(job_ptr->wckey)
+ if(job_ptr->wckey)
xstrfmtcat(query, "\"%s\", ", job_ptr->wckey);
- if(node_inx)
+ if(node_inx)
xstrfmtcat(query, "\"%s\", ", node_inx);
- xstrfmtcat(query,
+ xstrfmtcat(query,
"%d, %d, %d, \"%s\", %u, %u, %u, %u, %u, %u) "
"on duplicate key update "
"id=LAST_INSERT_ID(id), state=%u, "
@@ -10716,18 +10716,18 @@ no_rollup_change:
job_ptr->assoc_id, wckeyid, job_ptr->resv_id,
job_ptr->time_limit);
- if(job_ptr->account)
+ if(job_ptr->account)
xstrfmtcat(query, ", account=\"%s\"", job_ptr->account);
- if(job_ptr->partition)
+ if(job_ptr->partition)
xstrfmtcat(query, ", partition=\"%s\"",
job_ptr->partition);
if(block_id)
xstrfmtcat(query, ", blockid=\"%s\"", block_id);
- if(job_ptr->wckey)
+ if(job_ptr->wckey)
xstrfmtcat(query, ", wckey=\"%s\"", job_ptr->wckey);
- if(node_inx)
+ if(node_inx)
xstrfmtcat(query, ", node_inx=\"%s\"", node_inx);
-
+
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
try_again:
if(!(job_ptr->db_index = mysql_insert_ret_id(
@@ -10746,19 +10746,19 @@ no_rollup_change:
rc = SLURM_ERROR;
}
} else {
- query = xstrdup_printf("update %s set nodelist=\"%s\", ",
+ query = xstrdup_printf("update %s set nodelist=\"%s\", ",
job_table, nodes);
- if(job_ptr->account)
+ if(job_ptr->account)
xstrfmtcat(query, "account=\"%s\", ", job_ptr->account);
- if(job_ptr->partition)
+ if(job_ptr->partition)
xstrfmtcat(query, "partition=\"%s\", ",
job_ptr->partition);
if(block_id)
xstrfmtcat(query, "blockid=\"%s\", ", block_id);
- if(job_ptr->wckey)
+ if(job_ptr->wckey)
xstrfmtcat(query, "wckey=\"%s\", ", job_ptr->wckey);
- if(node_inx)
+ if(node_inx)
xstrfmtcat(query, "node_inx=\"%s\", ", node_inx);
xstrfmtcat(query, "start=%d, name=\"%s\", state=%u, "
@@ -10767,9 +10767,9 @@ no_rollup_change:
"where id=%d",
(int)job_ptr->start_time,
jname, job_ptr->job_state & JOB_STATE_BASE,
- job_ptr->total_procs, node_cnt,
+ job_ptr->total_procs, node_cnt,
job_ptr->assoc_id, wckeyid,
- job_ptr->resv_id, job_ptr->time_limit,
+ job_ptr->resv_id, job_ptr->time_limit,
job_ptr->db_index);
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
@@ -10782,17 +10782,17 @@ no_rollup_change:
return rc;
}
-/*
+/*
* load into the storage the end of a job
*/
-extern int jobacct_storage_p_job_complete(mysql_conn_t *mysql_conn,
+extern int jobacct_storage_p_job_complete(mysql_conn_t *mysql_conn,
struct job_record *job_ptr)
{
char *query = NULL, *nodes = NULL;
int rc=SLURM_SUCCESS;
time_t start_time = job_ptr->start_time;
- if (!job_ptr->db_index
+ if (!job_ptr->db_index
&& (!job_ptr->details || !job_ptr->details->submit_time)) {
error("jobacct_storage_p_job_complete: "
"Not inputing this job, it has no submit time.");
@@ -10802,7 +10802,7 @@ extern int jobacct_storage_p_job_complete(mysql_conn_t *mysql_conn,
if(_check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
debug2("mysql_jobacct_job_complete() called");
-
+
/* If we get an error with this just fall through to avoid an
* infinite loop
*/
@@ -10810,13 +10810,13 @@ extern int jobacct_storage_p_job_complete(mysql_conn_t *mysql_conn,
debug("mysql_jobacct: job %u never started", job_ptr->job_id);
return SLURM_SUCCESS;
} else if(start_time > job_ptr->end_time)
- start_time = 0;
-
+ start_time = 0;
+
slurm_mutex_lock(&rollup_lock);
if(job_ptr->end_time < global_last_rollup) {
global_last_rollup = job_ptr->end_time;
slurm_mutex_unlock(&rollup_lock);
-
+
query = xstrdup_printf("update %s set hourly_rollup=%d, "
"daily_rollup=%d, monthly_rollup=%d",
last_ran_table, job_ptr->end_time,
@@ -10854,21 +10854,21 @@ extern int jobacct_storage_p_job_complete(mysql_conn_t *mysql_conn,
"nodelist=\"%s\", comp_code=%d, "
"kill_requid=%d where id=%d",
job_table, (int)start_time,
- (int)job_ptr->end_time,
+ (int)job_ptr->end_time,
job_ptr->job_state & JOB_STATE_BASE,
nodes, job_ptr->exit_code,
job_ptr->requid, job_ptr->db_index);
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
-
+
return rc;
}
-/*
+/*
* load into the storage the start of a job step
*/
-extern int jobacct_storage_p_step_start(mysql_conn_t *mysql_conn,
+extern int jobacct_storage_p_step_start(mysql_conn_t *mysql_conn,
struct step_record *step_ptr)
{
int cpus = 0, tasks = 0, nodes = 0, task_dist = 0;
@@ -10880,7 +10880,7 @@ extern int jobacct_storage_p_step_start(mysql_conn_t *mysql_conn,
#endif
char *query = NULL;
- if (!step_ptr->job_ptr->db_index
+ if (!step_ptr->job_ptr->db_index
&& (!step_ptr->job_ptr->details
|| !step_ptr->job_ptr->details->submit_time)) {
error("jobacct_storage_p_step_start: "
@@ -10902,23 +10902,23 @@ extern int jobacct_storage_p_step_start(mysql_conn_t *mysql_conn,
char temp_bit[BUF_SIZE];
if(step_ptr->step_node_bitmap) {
- node_inx = bit_fmt(temp_bit, sizeof(temp_bit),
+ node_inx = bit_fmt(temp_bit, sizeof(temp_bit),
step_ptr->step_node_bitmap);
}
#ifdef HAVE_BG
tasks = cpus = step_ptr->job_ptr->num_procs;
- select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
- SELECT_JOBDATA_IONODES,
+ select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
+ SELECT_JOBDATA_IONODES,
&ionodes);
if(ionodes) {
- snprintf(node_list, BUFFER_SIZE,
+ snprintf(node_list, BUFFER_SIZE,
"%s[%s]", step_ptr->job_ptr->nodes, ionodes);
xfree(ionodes);
} else
snprintf(node_list, BUFFER_SIZE, "%s",
step_ptr->job_ptr->nodes);
- select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
- SELECT_JOBDATA_NODE_CNT,
+ select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
+ SELECT_JOBDATA_NODE_CNT,
&nodes);
#else
if(!step_ptr->step_layout || !step_ptr->step_layout->task_cnt) {
@@ -10927,18 +10927,18 @@ extern int jobacct_storage_p_step_start(mysql_conn_t *mysql_conn,
step_ptr->job_ptr->nodes);
nodes = step_ptr->job_ptr->node_cnt;
} else {
- cpus = step_ptr->cpu_count;
+ cpus = step_ptr->cpu_count;
tasks = step_ptr->step_layout->task_cnt;
nodes = step_ptr->step_layout->node_cnt;
task_dist = step_ptr->step_layout->task_dist;
- snprintf(node_list, BUFFER_SIZE, "%s",
+ snprintf(node_list, BUFFER_SIZE, "%s",
step_ptr->step_layout->node_list);
}
#endif
}
if(!step_ptr->job_ptr->db_index) {
- if(!(step_ptr->job_ptr->db_index =
+ if(!(step_ptr->job_ptr->db_index =
_get_db_index(mysql_conn->db_conn,
step_ptr->job_ptr->details->submit_time,
step_ptr->job_ptr->job_id,
@@ -10967,10 +10967,10 @@ extern int jobacct_storage_p_step_start(mysql_conn_t *mysql_conn,
"tasks=%d, end=0, state=%d, "
"nodelist=\"%s\", node_inx=\"%s\", task_dist=%d",
step_table, step_ptr->job_ptr->db_index,
- step_ptr->step_id,
+ step_ptr->step_id,
(int)step_ptr->start_time, step_ptr->name,
JOB_RUNNING, cpus, nodes, tasks, node_list, node_inx, task_dist,
- cpus, nodes, tasks, JOB_RUNNING,
+ cpus, nodes, tasks, JOB_RUNNING,
node_list, node_inx, task_dist);
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
@@ -10979,10 +10979,10 @@ extern int jobacct_storage_p_step_start(mysql_conn_t *mysql_conn,
return rc;
}
-/*
+/*
* load into the storage the end of a job step
*/
-extern int jobacct_storage_p_step_complete(mysql_conn_t *mysql_conn,
+extern int jobacct_storage_p_step_complete(mysql_conn_t *mysql_conn,
struct step_record *step_ptr)
{
time_t now;
@@ -10997,7 +10997,7 @@ extern int jobacct_storage_p_step_complete(mysql_conn_t *mysql_conn,
int rc =SLURM_SUCCESS;
uint32_t exit_code = 0;
- if (!step_ptr->job_ptr->db_index
+ if (!step_ptr->job_ptr->db_index
&& (!step_ptr->job_ptr->details
|| !step_ptr->job_ptr->details->submit_time)) {
error("jobacct_storage_p_step_complete: "
@@ -11022,20 +11022,20 @@ extern int jobacct_storage_p_step_complete(mysql_conn_t *mysql_conn,
now = time(NULL);
#ifdef HAVE_BG
tasks = cpus = step_ptr->job_ptr->num_procs;
-
+
#else
if(!step_ptr->step_layout || !step_ptr->step_layout->task_cnt)
tasks = cpus = step_ptr->job_ptr->total_procs;
else {
- cpus = step_ptr->cpu_count;
+ cpus = step_ptr->cpu_count;
tasks = step_ptr->step_layout->task_cnt;
}
#endif
}
-
+
if ((elapsed=now-step_ptr->start_time)<0)
elapsed=0; /* For *very* short jobs, if clock is wrong */
-
+
exit_code = step_ptr->exit_code;
if (exit_code == NO_VAL) {
comp_status = JOB_CANCELLED;
@@ -11044,7 +11044,7 @@ extern int jobacct_storage_p_step_complete(mysql_conn_t *mysql_conn,
comp_status = JOB_FAILED;
else
comp_status = JOB_COMPLETE;
-
+
/* figure out the ave of the totals sent */
if(cpus > 0) {
ave_vsize = jobacct->tot_vsize;
@@ -11054,17 +11054,17 @@ extern int jobacct_storage_p_step_complete(mysql_conn_t *mysql_conn,
ave_pages = jobacct->tot_pages;
ave_pages /= cpus;
ave_cpu = jobacct->tot_cpu;
- ave_cpu /= cpus;
+ ave_cpu /= cpus;
ave_cpu /= 100;
}
-
+
if(jobacct->min_cpu != NO_VAL) {
ave_cpu2 = jobacct->min_cpu;
ave_cpu2 /= 100;
}
if(!step_ptr->job_ptr->db_index) {
- if(!(step_ptr->job_ptr->db_index =
+ if(!(step_ptr->job_ptr->db_index =
_get_db_index(mysql_conn->db_conn,
step_ptr->job_ptr->details->submit_time,
step_ptr->job_ptr->job_id,
@@ -11099,10 +11099,10 @@ extern int jobacct_storage_p_step_complete(mysql_conn_t *mysql_conn,
"where id=%d and stepid=%u",
step_table, (int)now,
comp_status,
- step_ptr->requid,
+ step_ptr->requid,
exit_code,
/* user seconds */
- jobacct->user_cpu_sec,
+ jobacct->user_cpu_sec,
/* user microseconds */
jobacct->user_cpu_usec,
/* system seconds */
@@ -11129,14 +11129,14 @@ extern int jobacct_storage_p_step_complete(mysql_conn_t *mysql_conn,
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
-
+
return rc;
}
-/*
+/*
* load into the storage a suspention of a job
*/
-extern int jobacct_storage_p_suspend(mysql_conn_t *mysql_conn,
+extern int jobacct_storage_p_suspend(mysql_conn_t *mysql_conn,
struct job_record *job_ptr)
{
char *query = NULL;
@@ -11169,7 +11169,7 @@ extern int jobacct_storage_p_suspend(mysql_conn_t *mysql_conn,
xstrfmtcat(query,
"update %s set suspended=%d-suspended, state=%d "
"where id=%d;",
- job_table, (int)job_ptr->suspend_time,
+ job_table, (int)job_ptr->suspend_time,
job_ptr->job_state & JOB_STATE_BASE,
job_ptr->db_index);
if(suspended)
@@ -11181,10 +11181,10 @@ extern int jobacct_storage_p_suspend(mysql_conn_t *mysql_conn,
else
xstrfmtcat(query,
"update %s set end=%d where id=%u && end=0;",
- suspend_table, (int)job_ptr->suspend_time,
+ suspend_table, (int)job_ptr->suspend_time,
job_ptr->db_index);
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
-
+
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
@@ -11192,50 +11192,50 @@ extern int jobacct_storage_p_suspend(mysql_conn_t *mysql_conn,
xstrfmtcat(query,
"update %s set suspended=%u-suspended, "
"state=%d where id=%u and end=0",
- step_table, (int)job_ptr->suspend_time,
+ step_table, (int)job_ptr->suspend_time,
job_ptr->job_state, job_ptr->db_index);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
}
-
+
return rc;
}
-/*
- * get info from the storage
+/*
+ * get info from the storage
* returns List of job_rec_t *
* note List needs to be freed when called
*/
-extern List jobacct_storage_p_get_jobs_cond(mysql_conn_t *mysql_conn,
- uid_t uid,
+extern List jobacct_storage_p_get_jobs_cond(mysql_conn_t *mysql_conn,
+ uid_t uid,
acct_job_cond_t *job_cond)
{
List job_list = NULL;
-
+
if(_check_connection(mysql_conn) != SLURM_SUCCESS) {
return NULL;
}
- job_list = mysql_jobacct_process_get_jobs(mysql_conn, uid, job_cond);
+ job_list = mysql_jobacct_process_get_jobs(mysql_conn, uid, job_cond);
return job_list;
}
-/*
- * expire old info from the storage
+/*
+ * expire old info from the storage
*/
-extern int jobacct_storage_p_archive(mysql_conn_t *mysql_conn,
+extern int jobacct_storage_p_archive(mysql_conn_t *mysql_conn,
acct_archive_cond_t *arch_cond)
{
if(_check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
-
+
return mysql_jobacct_process_archive(mysql_conn, arch_cond);
}
-/*
- * load old info into the storage
+/*
+ * load old info into the storage
*/
-extern int jobacct_storage_p_archive_load(mysql_conn_t *mysql_conn,
+extern int jobacct_storage_p_archive_load(mysql_conn_t *mysql_conn,
acct_archive_rec_t *arch_rec)
{
if(_check_connection(mysql_conn) != SLURM_SUCCESS)
@@ -11244,7 +11244,7 @@ extern int jobacct_storage_p_archive_load(mysql_conn_t *mysql_conn,
return mysql_jobacct_process_archive_load(mysql_conn, arch_rec);
}
-extern int acct_storage_p_update_shares_used(mysql_conn_t *mysql_conn,
+extern int acct_storage_p_update_shares_used(mysql_conn_t *mysql_conn,
List shares_used)
{
/* No plans to have the database hold the used shares */
@@ -11266,7 +11266,7 @@ extern int acct_storage_p_flush_jobs_on_cluster(
return ESLURM_DB_CONNECTION;
/* First we need to get the id's and states so we can clean up
- * the suspend table and the step table
+ * the suspend table and the step table
*/
query = xstrdup_printf(
"select distinct t1.id, t1.state from %s as t1 where "
@@ -11284,19 +11284,19 @@ extern int acct_storage_p_flush_jobs_on_cluster(
while((row = mysql_fetch_row(result))) {
int state = atoi(row[1]);
if(state == JOB_SUSPENDED) {
- if(suspended_char)
+ if(suspended_char)
xstrfmtcat(suspended_char, " || id=%s", row[0]);
else
xstrfmtcat(suspended_char, "id=%s", row[0]);
}
-
- if(id_char)
+
+ if(id_char)
xstrfmtcat(id_char, " || id=%s", row[0]);
else
xstrfmtcat(id_char, "id=%s", row[0]);
}
mysql_free_result(result);
-
+
if(suspended_char) {
xstrfmtcat(query,
"update %s set suspended=%d-suspended where %s;",
@@ -11327,7 +11327,7 @@ extern int acct_storage_p_flush_jobs_on_cluster(
if(query) {
debug3("%d(%d) query\n%s",
mysql_conn->conn, __LINE__, query);
-
+
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
}
diff --git a/src/plugins/accounting_storage/mysql/mysql_jobacct_process.c b/src/plugins/accounting_storage/mysql/mysql_jobacct_process.c
index ccfdedfde7e53038d136df865f5a3c9f38a56263..4d9fcf6909849e911cc01937aa2fc2859170c00c 100644
--- a/src/plugins/accounting_storage/mysql/mysql_jobacct_process.c
+++ b/src/plugins/accounting_storage/mysql/mysql_jobacct_process.c
@@ -8,32 +8,32 @@
* Copyright (C) 2004-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -71,13 +71,13 @@ static void _state_time_string(char **extra, uint32_t state,
case JOB_PENDING:
if(start) {
if(!end) {
- xstrfmtcat(*extra,
+ xstrfmtcat(*extra,
"(t1.eligible && (!t1.start || "
"(%d between "
"t1.eligible and t1.start)))",
start);
} else {
- xstrfmtcat(*extra,
+ xstrfmtcat(*extra,
"(t1.eligible && ((%d between "
"t1.eligible and t1.start) || "
"(t1.eligible between %d and %d)))",
@@ -95,12 +95,12 @@ static void _state_time_string(char **extra, uint32_t state,
case JOB_RUNNING:
if(start) {
if(!end) {
- xstrfmtcat(*extra,
+ xstrfmtcat(*extra,
"(t1.start && (!t1.end || "
"(%d between t1.start and t1.end)))",
start);
} else {
- xstrfmtcat(*extra,
+ xstrfmtcat(*extra,
"(t1.start && "
"((%d between t1.start and t1.end) "
"|| (t1.start between %d and %d)))",
@@ -117,14 +117,14 @@ static void _state_time_string(char **extra, uint32_t state,
case JOB_TIMEOUT:
case JOB_NODE_FAIL:
default:
- xstrfmtcat(*extra, "(t1.state='%u' && (t1.end && ", state);
+ xstrfmtcat(*extra, "(t1.state='%u' && (t1.end && ", state);
if(start) {
if(!end) {
xstrfmtcat(*extra, "(t1.end >= %d)))", start);
} else {
- xstrfmtcat(*extra,
+ xstrfmtcat(*extra,
"(t1.end between %d and %d)))",
- start, end);
+ start, end);
}
} else if(end) {
xstrfmtcat(*extra, "(t1.end <= %d)))", end);
@@ -198,10 +198,10 @@ static int _write_archive_file(MYSQL_RES *result, int start_col, int col_count,
"%4.4u-%2.2u-%2.2u"
"T%2.2u:%2.2u:%2.2u",
(time_tm.tm_year + 1900),
- (time_tm.tm_mon+1),
+ (time_tm.tm_mon+1),
time_tm.tm_mday,
time_tm.tm_hour,
- time_tm.tm_min,
+ time_tm.tm_min,
time_tm.tm_sec);
localtime_r((time_t *)&curr_end, &time_tm);
@@ -209,10 +209,10 @@ static int _write_archive_file(MYSQL_RES *result, int start_col, int col_count,
"%4.4u-%2.2u-%2.2u"
"T%2.2u:%2.2u:%2.2u",
(time_tm.tm_year + 1900),
- (time_tm.tm_mon+1),
+ (time_tm.tm_mon+1),
time_tm.tm_mday,
time_tm.tm_hour,
- time_tm.tm_min,
+ time_tm.tm_min,
time_tm.tm_sec);
/* write the buffer to file */
@@ -223,7 +223,7 @@ static int _write_archive_file(MYSQL_RES *result, int start_col, int col_count,
debug("Storing event archive at %s", reg_file);
old_file = xstrdup_printf("%s.old", reg_file);
new_file = xstrdup_printf("%s.new", reg_file);
-
+
fd = creat(new_file, 0600);
if (fd < 0) {
error("Can't save archive, "
@@ -232,10 +232,10 @@ static int _write_archive_file(MYSQL_RES *result, int start_col, int col_count,
rc = errno;
xfree(insert);
break;
- }
+ }
values = xstrdup_printf("%s\nvalues\n(", insert);
}
-
+
xstrfmtcat(values, "'%s'", row[0]);
for(i=1; i<col_count; i++) {
xstrfmtcat(values, ", '%s'", row[i]);
@@ -245,8 +245,8 @@ static int _write_archive_file(MYSQL_RES *result, int start_col, int col_count,
xstrcat(values, ", '1')");
else
xstrcat(values, ")");
-
- if(!fd
+
+ if(!fd
|| ((rc = _write_to_file(fd, values)) != SLURM_SUCCESS)) {
xfree(values);
break;
@@ -266,7 +266,7 @@ static int _write_archive_file(MYSQL_RES *result, int start_col, int col_count,
fsync(fd);
close(fd);
-
+
if (rc)
(void) unlink(new_file);
else { /* file shuffle */
@@ -350,7 +350,7 @@ static int _archive_script(acct_archive_cond_t *arch_cond, time_t last_submit)
time_tm.tm_mon -= arch_cond->purge_job;
time_tm.tm_isdst = -1;
curr_end = mktime(&time_tm);
-
+
env_array_append_fmt(&env, "SLURM_ARCHIVE_JOBS", "%u",
arch_cond->archive_jobs);
env_array_append_fmt (&env, "SLURM_ARCHIVE_LAST_JOB", "%d",
@@ -414,8 +414,8 @@ extern List setup_cluster_list_with_inx(mysql_conn_t *mysql_conn,
hostlist_iterator_t h_itr = NULL;
char *object = NULL;
char *query = NULL;
-
- if(!job_cond || !job_cond->used_nodes)
+
+ if(!job_cond || !job_cond->used_nodes)
return NULL;
if(!job_cond->cluster_list || list_count(job_cond->cluster_list) != 1) {
@@ -424,7 +424,7 @@ extern List setup_cluster_list_with_inx(mysql_conn_t *mysql_conn,
"you are asking for.");
return NULL;
}
-
+
temp_hl = hostlist_create(job_cond->used_nodes);
if(!hostlist_count(temp_hl)) {
error("we didn't get any real hosts to look for.");
@@ -444,12 +444,12 @@ extern List setup_cluster_list_with_inx(mysql_conn_t *mysql_conn,
if(!job_cond->usage_end)
job_cond->usage_end = now;
- xstrfmtcat(query,
+ xstrfmtcat(query,
" && ((period_start < %d) "
"&& (period_end >= %d || period_end = 0))",
job_cond->usage_end, job_cond->usage_start);
}
-
+
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
@@ -467,11 +467,11 @@ extern List setup_cluster_list_with_inx(mysql_conn_t *mysql_conn,
local_cluster->hl = hostlist_create(row[0]);
local_cluster->start = atoi(row[1]);
local_cluster->end = atoi(row[2]);
- local_cluster->asked_bitmap =
+ local_cluster->asked_bitmap =
bit_alloc(hostlist_count(local_cluster->hl));
while((host = hostlist_next(h_itr))) {
if((loc = hostlist_find(
- local_cluster->hl, host)) != -1)
+ local_cluster->hl, host)) != -1)
bit_set(local_cluster->asked_bitmap, loc);
free(host);
}
@@ -482,7 +482,7 @@ extern List setup_cluster_list_with_inx(mysql_conn_t *mysql_conn,
local_cluster->end = now;
(*curr_cluster) = local_cluster;
}
- } else
+ } else
_destroy_local_cluster(local_cluster);
}
mysql_free_result(result);
@@ -499,7 +499,7 @@ no_hosts:
return local_cluster_list;
}
-extern int good_nodes_from_inx(List local_cluster_list,
+extern int good_nodes_from_inx(List local_cluster_list,
void **object, char *node_inx,
int submit)
{
@@ -514,7 +514,7 @@ extern int good_nodes_from_inx(List local_cluster_list,
if((submit < (*curr_cluster)->start)
|| (submit > (*curr_cluster)->end)) {
local_cluster_t *local_cluster = NULL;
-
+
ListIterator itr =
list_iterator_create(local_cluster_list);
while((local_cluster = list_next(itr))) {
@@ -550,14 +550,14 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
if(!job_cond)
return 0;
-
+
/* THIS ASSOCID CHECK ALWAYS NEEDS TO BE FIRST!!!!!!! */
if(job_cond->associd_list && list_count(job_cond->associd_list)) {
set = 0;
xstrfmtcat(*extra, ", %s as t3 where (", assoc_table);
itr = list_iterator_create(job_cond->associd_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "t3.id=%s", object);
set = 1;
@@ -566,7 +566,7 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
xstrcat(*extra, ")");
table_level="t3";
/* just incase the association is gone */
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "t3.id is null) && "
"(t2.lft between t3.lft and t3.rgt "
@@ -581,7 +581,7 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
xstrcat(*extra, " where (");
itr = list_iterator_create(job_cond->acct_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "t1.account='%s'", object);
set = 1;
@@ -599,7 +599,7 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
itr = list_iterator_create(job_cond->userid_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "t1.uid='%s'", object);
set = 1;
@@ -616,7 +616,7 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
xstrcat(*extra, " where (");
itr = list_iterator_create(job_cond->groupid_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "t1.gid='%s'", object);
set = 1;
@@ -633,7 +633,7 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
xstrcat(*extra, " where (");
itr = list_iterator_create(job_cond->partition_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "t1.partition='%s'", object);
set = 1;
@@ -653,20 +653,20 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
if(job_cond->cluster_list
&& list_count(job_cond->cluster_list)) {
-
+
itr = list_iterator_create(job_cond->cluster_list);
while((object = list_next(itr))) {
- if(my_set)
+ if(my_set)
xstrcat(query, " || ");
xstrfmtcat(query, "cluster='%s'", object);
my_set = 1;
}
list_iterator_destroy(itr);
- }
+ }
if(my_set)
xstrcat(query, ") && (");
-
+
itr = list_iterator_create(job_cond->resv_list);
while((object = list_next(itr))) {
if(my_set)
@@ -683,7 +683,7 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
goto no_resv;
}
xfree(query);
- if(!job_cond->resvid_list)
+ if(!job_cond->resvid_list)
job_cond->resvid_list = list_create(slurm_destroy_char);
while((row = mysql_fetch_row(result))) {
list_append(job_cond->resvid_list, xstrdup(row[0]));
@@ -717,7 +717,7 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
xstrcat(*extra, " where (");
itr = list_iterator_create(job_cond->step_list);
while((selected_step = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "t1.jobid=%u", selected_step->jobid);
set = 1;
@@ -735,11 +735,11 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
if(job_cond->cpus_max) {
xstrfmtcat(*extra, "(t1.alloc_cpus between %u and %u))",
job_cond->cpus_min, job_cond->cpus_max);
-
+
} else {
xstrfmtcat(*extra, "(t1.alloc_cpus='%u'))",
job_cond->cpus_min);
-
+
}
}
@@ -750,14 +750,14 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
xstrcat(*extra, " where (");
if(job_cond->nodes_max) {
- xstrfmtcat(*extra,
+ xstrfmtcat(*extra,
"(t1.alloc_nodes between %u and %u))",
job_cond->nodes_min, job_cond->nodes_max);
-
+
} else {
xstrfmtcat(*extra, "(t1.alloc_nodes='%u'))",
job_cond->nodes_min);
-
+
}
}
if(job_cond->state_list && list_count(job_cond->state_list)) {
@@ -769,10 +769,10 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
itr = list_iterator_create(job_cond->state_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
- _state_time_string(extra, atoi(object),
- job_cond->usage_start,
+ _state_time_string(extra, atoi(object),
+ job_cond->usage_start,
job_cond->usage_end);
set = 1;
}
@@ -786,23 +786,23 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
-
+
if(!job_cond->usage_end)
- xstrfmtcat(*extra,
+ xstrfmtcat(*extra,
"(t1.end >= %d || t1.end = 0))",
job_cond->usage_start);
else
- xstrfmtcat(*extra,
+ xstrfmtcat(*extra,
"(t1.eligible < %d "
"&& (t1.end >= %d || t1.end = 0)))",
- job_cond->usage_end,
+ job_cond->usage_end,
job_cond->usage_start);
} else if(job_cond->usage_end) {
if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
- xstrfmtcat(*extra,
+ xstrfmtcat(*extra,
"(t1.eligible < %d))", job_cond->usage_end);
}
}
@@ -817,16 +817,16 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
itr = list_iterator_create(job_cond->cluster_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
- xstrfmtcat(*extra,
- "(t1.cluster='%s' || %s.cluster='%s')",
+ xstrfmtcat(*extra,
+ "(t1.cluster='%s' || %s.cluster='%s')",
object, table_level, object);
set = 1;
}
list_iterator_destroy(itr);
xstrcat(*extra, ")");
- }
+ }
if(job_cond->wckey_list && list_count(job_cond->wckey_list)) {
set = 0;
@@ -837,7 +837,7 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
itr = list_iterator_create(job_cond->wckey_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "t1.wckey='%s'", object);
set = 1;
@@ -852,9 +852,9 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
acct_job_cond_t *job_cond)
{
- char *query = NULL;
- char *extra = NULL;
- char *tmp = NULL;
+ char *query = NULL;
+ char *extra = NULL;
+ char *tmp = NULL;
jobacct_selected_step_t *selected_step = NULL;
ListIterator itr = NULL;
int set = 0, is_admin=1;
@@ -870,9 +870,9 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
acct_user_rec_t user;
local_cluster_t *curr_cluster = NULL;
List local_cluster_list = NULL;
- int only_pending = 0;
+ int only_pending = 0;
- /* if this changes you will need to edit the corresponding
+ /* if this changes you will need to edit the corresponding
* enum below also t1 is job_table */
char *job_req_inx[] = {
"t1.id",
@@ -944,10 +944,10 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
JOB_REQ_CLUSTER,
JOB_REQ_ACCOUNT,
JOB_REQ_LFT,
- JOB_REQ_COUNT
+ JOB_REQ_COUNT
};
- /* if this changes you will need to edit the corresponding
+ /* if this changes you will need to edit the corresponding
* enum below also t1 is step_table */
char *step_req_inx[] = {
"t1.stepid",
@@ -1042,9 +1042,9 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
* check it below after the query.
*/
if((uid == slurmdbd_conf->slurm_user_id || uid == 0)
- || assoc_mgr_get_admin_level(mysql_conn, uid)
- >= ACCT_ADMIN_OPERATOR)
- is_admin = 1;
+ || assoc_mgr_get_admin_level(mysql_conn, uid)
+ >= ACCT_ADMIN_OPERATOR)
+ is_admin = 1;
else {
assoc_mgr_fill_in_user(mysql_conn, &user, 1,
NULL);
@@ -1085,7 +1085,7 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
* coordinator of.
*/
if(!is_admin && (private_data & PRIVATE_DATA_JOBS)) {
- query = xstrdup_printf("select lft from %s where user='%s'",
+ query = xstrdup_printf("select lft from %s where user='%s'",
assoc_table, user.name);
if(user.coord_accts) {
acct_coord_rec_t *coord = NULL;
@@ -1122,18 +1122,18 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
row[0], table_level,
table_level);
else
- xstrfmtcat(extra,
+ xstrfmtcat(extra,
" where ((%s between %s.lft "
"and %s.rgt)",
row[0], table_level,
table_level);
}
- }
+ }
if(set)
xstrcat(extra,")");
mysql_free_result(result);
}
-
+
query = xstrdup_printf("select %s from %s as t1 left join %s as t2 "
"on t1.associd=t2.id",
tmp, job_table, assoc_table);
@@ -1142,11 +1142,11 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(query, extra);
xfree(extra);
}
-
+
/* Here we want to order them this way in such a way so it is
- easy to look for duplicates
+ easy to look for duplicates
*/
- if(job_cond && !job_cond->duplicates)
+ if(job_cond && !job_cond->duplicates)
xstrcat(query, " order by t1.cluster, jobid, submit desc");
else
xstrcat(query, " order by t1.cluster, submit desc");
@@ -1170,7 +1170,7 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
if(job_cond && !job_cond->duplicates && curr_id == last_id)
continue;
-
+
last_id = curr_id;
/* check the bitmap to see if this is one of the jobs
@@ -1179,7 +1179,7 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
(void **)&curr_cluster,
row[JOB_REQ_NODE_INX], submit))
continue;
-
+
job = create_jobacct_job_rec();
list_append(job_list, job);
@@ -1200,10 +1200,10 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
job->cluster = xstrdup(row[JOB_REQ_CLUSTER]);
else if(row[JOB_REQ_CLUSTER1] && row[JOB_REQ_CLUSTER1][0])
job->cluster = xstrdup(row[JOB_REQ_CLUSTER1]);
-
- if(row[JOB_REQ_USER_NAME])
+
+ if(row[JOB_REQ_USER_NAME])
job->user = xstrdup(row[JOB_REQ_USER_NAME]);
- else
+ else
job->uid = atoi(row[JOB_REQ_UID]);
if(row[JOB_REQ_LFT])
@@ -1234,12 +1234,12 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
if(job->start && (job->start < job_cond->usage_start))
job->start = job_cond->usage_start;
- if(!job->end || job->end > job_cond->usage_end)
+ if(!job->end || job->end > job_cond->usage_end)
job->end = job_cond->usage_end;
if(!job->start)
job->start = job->end;
-
+
job->elapsed = job->end - job->start;
if(row[JOB_REQ_SUSPENDED]) {
@@ -1252,11 +1252,11 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
"|| end = 0)) && id=%s "
"order by start",
suspend_table,
- job_cond->usage_end,
+ job_cond->usage_end,
job_cond->usage_start,
id);
-
- debug4("%d(%d) query\n%s",
+
+ debug4("%d(%d) query\n%s",
mysql_conn->conn, __LINE__, query);
if(!(result2 = mysql_db_query_ret(
mysql_conn->db_conn,
@@ -1269,31 +1269,31 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
while((row2 = mysql_fetch_row(result2))) {
int local_start =
atoi(row2[0]);
- int local_end =
+ int local_end =
atoi(row2[1]);
-
+
if(!local_start)
continue;
-
+
if(job->start > local_start)
local_start = job->start;
if(job->end < local_end)
local_end = job->end;
-
+
if((local_end - local_start) < 1)
continue;
-
- job->elapsed -=
+
+ job->elapsed -=
(local_end - local_start);
- job->suspended +=
+ job->suspended +=
(local_end - local_start);
}
- mysql_free_result(result2);
+ mysql_free_result(result2);
}
} else {
job->suspended = atoi(row[JOB_REQ_SUSPENDED]);
-
+
/* fix the suspended number to be correct */
if(job->state == JOB_SUSPENDED)
job->suspended = now - job->suspended;
@@ -1326,17 +1326,17 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
xfree(job->nodes);
job->nodes = xstrdup("(unknown)");
}
-
+
job->track_steps = atoi(row[JOB_REQ_TRACKSTEPS]);
job->priority = atoi(row[JOB_REQ_PRIORITY]);
job->req_cpus = atoi(row[JOB_REQ_REQ_CPUS]);
job->requid = atoi(row[JOB_REQ_KILL_REQUID]);
job->qos = atoi(row[JOB_REQ_QOS]);
job->show_full = 1;
-
+
if(only_pending || (job_cond && job_cond->without_steps))
goto skip_steps;
-
+
if(job_cond && job_cond->step_list
&& list_count(job_cond->step_list)) {
set = 0;
@@ -1349,12 +1349,12 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
job->show_full = 1;
break;
}
-
- if(set)
+
+ if(set)
xstrcat(extra, " || ");
- else
+ else
xstrcat(extra, " && (");
-
+
xstrfmtcat(extra, "t1.stepid=%u",
selected_step->stepid);
set = 1;
@@ -1365,19 +1365,19 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, ")");
}
for(i=0; i<STEP_REQ_COUNT; i++) {
- if(i)
+ if(i)
xstrcat(tmp, ", ");
xstrcat(tmp, step_req_inx[i]);
}
query = xstrdup_printf("select %s from %s t1 where t1.id=%s",
tmp, step_table, id);
xfree(tmp);
-
+
if(extra) {
xstrcat(query, extra);
xfree(extra);
}
-
+
//info("query = %s", query);
if(!(step_result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
@@ -1388,10 +1388,10 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
return NULL;
}
xfree(query);
-
+
/* Querying the steps in the fashion was faster than
doing only 1 query and then matching the steps up
- later with the job.
+ later with the job.
*/
while ((step_row = mysql_fetch_row(step_result))) {
/* check the bitmap to see if this is one of the steps
@@ -1401,7 +1401,7 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
step_row[STEP_REQ_NODE_INX],
submit))
continue;
-
+
step = create_jobacct_step_rec();
step->job_ptr = job;
if(!job->first_step_ptr)
@@ -1421,7 +1421,7 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
step->ntasks = step->ncpus;
step->start = atoi(step_row[STEP_REQ_START]);
-
+
step->end = atoi(step_row[STEP_REQ_END]);
/* if the job has ended end the step also */
if(!step->end && job_ended) {
@@ -1431,15 +1431,15 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
if(job_cond && !job_cond->without_usage_truncation
&& job_cond->usage_start) {
- if(step->start
+ if(step->start
&& (step->start < job_cond->usage_start))
step->start = job_cond->usage_start;
-
+
if(!step->start && step->end)
step->start = step->end;
-
- if(!step->end
- || (step->end > job_cond->usage_end))
+
+ if(!step->end
+ || (step->end > job_cond->usage_end))
step->end = job_cond->usage_end;
}
@@ -1460,44 +1460,44 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
atoi(step_row[STEP_REQ_USER_USEC]);
step->sys_cpu_sec = atoi(step_row[STEP_REQ_SYS_SEC]);
step->sys_cpu_usec = atoi(step_row[STEP_REQ_SYS_USEC]);
- job->tot_cpu_sec +=
- step->tot_cpu_sec +=
+ job->tot_cpu_sec +=
+ step->tot_cpu_sec +=
step->user_cpu_sec + step->sys_cpu_sec;
- job->tot_cpu_usec +=
- step->tot_cpu_usec +=
+ job->tot_cpu_usec +=
+ step->tot_cpu_usec +=
step->user_cpu_usec + step->sys_cpu_usec;
step->sacct.max_vsize =
atoi(step_row[STEP_REQ_MAX_VSIZE]);
- step->sacct.max_vsize_id.taskid =
+ step->sacct.max_vsize_id.taskid =
atoi(step_row[STEP_REQ_MAX_VSIZE_TASK]);
- step->sacct.ave_vsize =
+ step->sacct.ave_vsize =
atof(step_row[STEP_REQ_AVE_VSIZE]);
step->sacct.max_rss =
atoi(step_row[STEP_REQ_MAX_RSS]);
- step->sacct.max_rss_id.taskid =
+ step->sacct.max_rss_id.taskid =
atoi(step_row[STEP_REQ_MAX_RSS_TASK]);
- step->sacct.ave_rss =
+ step->sacct.ave_rss =
atof(step_row[STEP_REQ_AVE_RSS]);
step->sacct.max_pages =
atoi(step_row[STEP_REQ_MAX_PAGES]);
- step->sacct.max_pages_id.taskid =
+ step->sacct.max_pages_id.taskid =
atoi(step_row[STEP_REQ_MAX_PAGES_TASK]);
step->sacct.ave_pages =
atof(step_row[STEP_REQ_AVE_PAGES]);
step->sacct.min_cpu =
atof(step_row[STEP_REQ_MIN_CPU]);
- step->sacct.min_cpu_id.taskid =
+ step->sacct.min_cpu_id.taskid =
atoi(step_row[STEP_REQ_MIN_CPU_TASK]);
step->sacct.ave_cpu = atof(step_row[STEP_REQ_AVE_CPU]);
step->stepname = xstrdup(step_row[STEP_REQ_NAME]);
step->nodes = xstrdup(step_row[STEP_REQ_NODELIST]);
- step->sacct.max_vsize_id.nodeid =
+ step->sacct.max_vsize_id.nodeid =
atoi(step_row[STEP_REQ_MAX_VSIZE_NODE]);
- step->sacct.max_rss_id.nodeid =
+ step->sacct.max_rss_id.nodeid =
atoi(step_row[STEP_REQ_MAX_RSS_NODE]);
- step->sacct.max_pages_id.nodeid =
+ step->sacct.max_pages_id.nodeid =
atoi(step_row[STEP_REQ_MAX_PAGES_NODE]);
- step->sacct.min_cpu_id.nodeid =
+ step->sacct.min_cpu_id.nodeid =
atoi(step_row[STEP_REQ_MIN_CPU_NODE]);
step->requid = atoi(step_row[STEP_REQ_KILL_REQUID]);
@@ -1512,14 +1512,14 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, uid_t uid,
different. If it is different print out
the step separate.
*/
- if(list_count(job->steps) > 1)
+ if(list_count(job->steps) > 1)
job->track_steps = 1;
else if(step && step->stepname && job->jobname) {
- if(strcmp(step->stepname, job->jobname))
+ if(strcmp(step->stepname, job->jobname))
job->track_steps = 1;
}
}
- skip_steps:
+ skip_steps:
/* need to reset here to make the above test valid */
step = NULL;
}
@@ -1543,7 +1543,7 @@ extern int mysql_jobacct_process_archive(mysql_conn_t *mysql_conn,
// DEF_TIMERS;
- /* if this changes you will need to edit the corresponding
+ /* if this changes you will need to edit the corresponding
* enum below */
char *event_req_inx[] = {
"node_name",
@@ -1556,7 +1556,7 @@ extern int mysql_jobacct_process_archive(mysql_conn_t *mysql_conn,
"cluster_nodes",
};
- /* if this changes you will need to edit the corresponding
+ /* if this changes you will need to edit the corresponding
* enum below */
char *job_req_inx[] = {
"id",
@@ -1590,7 +1590,7 @@ extern int mysql_jobacct_process_archive(mysql_conn_t *mysql_conn,
"qos"
};
- /* if this changes you will need to edit the corresponding
+ /* if this changes you will need to edit the corresponding
* enum below */
char *step_req_inx[] = {
"id",
@@ -1631,7 +1631,7 @@ extern int mysql_jobacct_process_archive(mysql_conn_t *mysql_conn,
};
- /* if this changes you will need to edit the corresponding
+ /* if this changes you will need to edit the corresponding
* enum below */
char *suspend_req_inx[] = {
"id",
@@ -1682,7 +1682,7 @@ extern int mysql_jobacct_process_archive(mysql_conn_t *mysql_conn,
JOB_REQ_NODE_INX,
JOB_REQ_KILL_REQUID,
JOB_REQ_QOS,
- JOB_REQ_COUNT
+ JOB_REQ_COUNT
};
enum {
@@ -1750,7 +1750,7 @@ extern int mysql_jobacct_process_archive(mysql_conn_t *mysql_conn,
last_submit = mktime(&time_tm);
last_submit--;
debug("archive: adjusted last submit is (%d)", last_submit);
-
+
if(arch_cond->archive_script)
return _archive_script(arch_cond, last_submit);
else if(!arch_cond->archive_dir) {
@@ -1760,7 +1760,7 @@ extern int mysql_jobacct_process_archive(mysql_conn_t *mysql_conn,
if(arch_cond->purge_event) {
/* remove all data from step table that was older than
- * period_start * arch_cond->purge_event.
+ * period_start * arch_cond->purge_event.
*/
/* use localtime to avoid any daylight savings issues */
if(!localtime_r(&last_submit, &time_tm)) {
@@ -1777,13 +1777,13 @@ extern int mysql_jobacct_process_archive(mysql_conn_t *mysql_conn,
curr_end = mktime(&time_tm);
curr_end--;
- debug4("from %d - %d months purging events from before %d",
+ debug4("from %d - %d months purging events from before %d",
last_submit, arch_cond->purge_event, curr_end);
-
+
if(arch_cond->archive_events) {
char *insert = NULL;
MYSQL_RES *result = NULL;
-
+
xfree(tmp);
xstrfmtcat(tmp, "%s", event_req_inx[0]);
for(i=1; i<EVENT_REQ_COUNT; i++) {
@@ -1801,7 +1801,7 @@ extern int mysql_jobacct_process_archive(mysql_conn_t *mysql_conn,
insert = xstrdup_printf("insert into %s (%s) ",
event_table, tmp);
xfree(tmp);
-
+
// START_TIMER;
debug3("%d(%d) query\n%s", mysql_conn->conn,
__LINE__, query);
@@ -1823,9 +1823,9 @@ extern int mysql_jobacct_process_archive(mysql_conn_t *mysql_conn,
rc = _write_archive_file(
result, EVENT_REQ_START, EVENT_REQ_COUNT,
- curr_end, arch_cond->archive_dir,
+ curr_end, arch_cond->archive_dir,
"event", insert, false);
-
+
xfree(insert);
mysql_free_result(result);
@@ -1848,7 +1848,7 @@ exit_events:
if(arch_cond->purge_suspend) {
/* remove all data from step table that was older than
- * period_start * arch_cond->purge_suspend.
+ * period_start * arch_cond->purge_suspend.
*/
/* use localtime to avoid any daylight savings issues */
if(!localtime_r(&last_submit, &time_tm)) {
@@ -1865,13 +1865,13 @@ exit_events:
curr_end = mktime(&time_tm);
curr_end--;
- debug4("from %d - %d months purging suspend from before %d",
+ debug4("from %d - %d months purging suspend from before %d",
last_submit, arch_cond->purge_suspend, curr_end);
-
+
if(arch_cond->archive_suspend) {
char *insert = NULL;
MYSQL_RES *result = NULL;
-
+
xfree(tmp);
xstrfmtcat(tmp, "%s", suspend_req_inx[0]);
for(i=1; i<SUSPEND_REQ_COUNT; i++) {
@@ -1888,7 +1888,7 @@ exit_events:
insert = xstrdup_printf("insert into %s (%s) ",
suspend_table, tmp);
xfree(tmp);
-
+
// START_TIMER;
debug3("%d(%d) query\n%s", mysql_conn->conn,
__LINE__, query);
@@ -1910,9 +1910,9 @@ exit_events:
rc = _write_archive_file(
result, SUSPEND_REQ_START, SUSPEND_REQ_COUNT,
- curr_end, arch_cond->archive_dir,
+ curr_end, arch_cond->archive_dir,
"suspend", insert, false);
-
+
xfree(insert);
mysql_free_result(result);
@@ -1935,7 +1935,7 @@ exit_suspend:
if(arch_cond->purge_step) {
/* remove all data from step table that was older than
- * start * arch_cond->purge_step.
+ * start * arch_cond->purge_step.
*/
/* use localtime to avoid any daylight savings issues */
if(!localtime_r(&last_submit, &time_tm)) {
@@ -1952,9 +1952,9 @@ exit_suspend:
curr_end = mktime(&time_tm);
curr_end--;
- debug4("from %d - %d months purging steps from before %d",
+ debug4("from %d - %d months purging steps from before %d",
last_submit, arch_cond->purge_step, curr_end);
-
+
if(arch_cond->archive_steps) {
char *insert = NULL;
MYSQL_RES *result = NULL;
@@ -1977,7 +1977,7 @@ exit_suspend:
insert = xstrdup_printf("insert into %s (%s) ",
step_table, tmp);
xfree(tmp);
-
+
// START_TIMER;
debug3("%d(%d) query\n%s", mysql_conn->conn,
__LINE__, query);
@@ -1996,12 +1996,12 @@ exit_suspend:
mysql_free_result(result);
goto exit_steps;
}
-
+
rc = _write_archive_file(
result, STEP_REQ_START, STEP_REQ_COUNT,
- curr_end, arch_cond->archive_dir,
+ curr_end, arch_cond->archive_dir,
"step", insert, true);
-
+
xfree(insert);
mysql_free_result(result);
@@ -2021,10 +2021,10 @@ exit_suspend:
}
}
exit_steps:
-
+
if(arch_cond->purge_job) {
/* remove all data from step table that was older than
- * last_submit * arch_cond->purge_job.
+ * last_submit * arch_cond->purge_job.
*/
/* use localtime to avoid any daylight savings issues */
if(!localtime_r(&last_submit, &time_tm)) {
@@ -2041,13 +2041,13 @@ exit_steps:
curr_end = mktime(&time_tm);
curr_end--;
- debug4("from %d - %d months purging jobs from before %d",
+ debug4("from %d - %d months purging jobs from before %d",
last_submit, arch_cond->purge_job, curr_end);
if(arch_cond->archive_jobs) {
char *insert = NULL;
MYSQL_RES *result = NULL;
-
+
xfree(tmp);
xstrfmtcat(tmp, "%s", job_req_inx[0]);
for(i=1; i<JOB_REQ_COUNT; i++) {
@@ -2084,12 +2084,12 @@ exit_steps:
mysql_free_result(result);
goto exit_jobs;
}
-
+
rc = _write_archive_file(
result, JOB_REQ_SUBMIT, JOB_REQ_COUNT,
- curr_end, arch_cond->archive_dir,
+ curr_end, arch_cond->archive_dir,
"job", insert, true);
-
+
xfree(insert);
mysql_free_result(result);
@@ -2131,7 +2131,7 @@ extern int mysql_jobacct_process_archive_load(mysql_conn_t *mysql_conn,
int data_allocated, data_read = 0;
int state_fd = open(arch_rec->archive_file, O_RDONLY);
if (state_fd < 0) {
- info("No archive file (%s) to recover",
+ info("No archive file (%s) to recover",
arch_rec->archive_file);
error_code = ENOENT;
} else {
@@ -2144,7 +2144,7 @@ extern int mysql_jobacct_process_archive_load(mysql_conn_t *mysql_conn,
if (errno == EINTR)
continue;
else {
- error("Read error on %s: %m",
+ error("Read error on %s: %m",
arch_rec->archive_file);
break;
}
@@ -2170,14 +2170,14 @@ extern int mysql_jobacct_process_archive_load(mysql_conn_t *mysql_conn,
error("It doesn't appear we have anything to load.");
return SLURM_ERROR;
}
-
+
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, data);
error_code = mysql_db_query_check_after(mysql_conn->db_conn, data);
xfree(data);
if(error_code != SLURM_SUCCESS) {
error("Couldn't load old data");
return SLURM_ERROR;
- }
+ }
return SLURM_SUCCESS;
}
diff --git a/src/plugins/accounting_storage/mysql/mysql_jobacct_process.h b/src/plugins/accounting_storage/mysql/mysql_jobacct_process.h
index 4adc1c3a62cc3bc2875cd76d0749a6e58c58b9f7..7d707c5fa871c34f082f78d079e4ddc0dcb1256f 100644
--- a/src/plugins/accounting_storage/mysql/mysql_jobacct_process.h
+++ b/src/plugins/accounting_storage/mysql/mysql_jobacct_process.h
@@ -7,32 +7,32 @@
* Copyright (C) 2004-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -82,7 +82,7 @@ extern char *wckey_table;
extern List setup_cluster_list_with_inx(mysql_conn_t *mysql_conn,
acct_job_cond_t *job_cond,
void **curr_cluster);
-extern int good_nodes_from_inx(List local_cluster_list,
+extern int good_nodes_from_inx(List local_cluster_list,
void **object, char *node_inx,
int submit);
extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
diff --git a/src/plugins/accounting_storage/mysql/mysql_problems.c b/src/plugins/accounting_storage/mysql/mysql_problems.c
index 3459644512f7ee55163e52e83b632bbf01de3557..f5100fedd6985f9d5ea1c78851099b4f9952aee1 100644
--- a/src/plugins/accounting_storage/mysql/mysql_problems.c
+++ b/src/plugins/accounting_storage/mysql/mysql_problems.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -58,7 +58,7 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->acct_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "acct=\"%s\"", object);
set = 1;
@@ -72,7 +72,7 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->cluster_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "cluster=\"%s\"", object);
set = 1;
@@ -86,7 +86,7 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->user_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "user=\"%s\"", object);
set = 1;
@@ -99,13 +99,13 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
xstrcat(*extra, " && (user!='')");
}
- if(assoc_cond->partition_list
+ if(assoc_cond->partition_list
&& list_count(assoc_cond->partition_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->partition_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "partition=\"%s\"", object);
set = 1;
@@ -113,7 +113,7 @@ static int _setup_association_cond_limits(acct_association_cond_t *assoc_cond,
list_iterator_destroy(itr);
xstrcat(*extra, ")");
}
-
+
return set;
}
@@ -131,7 +131,7 @@ extern int mysql_acct_no_assocs(mysql_conn_t *mysql_conn,
query = xstrdup_printf("select name from %s where deleted=0",
acct_table);
- if(assoc_cond &&
+ if(assoc_cond &&
assoc_cond->acct_list && list_count(assoc_cond->acct_list)) {
int set = 0;
ListIterator itr = NULL;
@@ -139,7 +139,7 @@ extern int mysql_acct_no_assocs(mysql_conn_t *mysql_conn,
xstrcat(query, " && (");
itr = list_iterator_create(assoc_cond->acct_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(query, " || ");
xstrfmtcat(query, "name=\"%s\"", object);
set = 1;
@@ -162,7 +162,7 @@ extern int mysql_acct_no_assocs(mysql_conn_t *mysql_conn,
/* See if we have at least 1 association in the system */
query = xstrdup_printf("select distinct id from %s "
"where deleted=0 && "
- "acct='%s' limit 1;",
+ "acct='%s' limit 1;",
assoc_table, row[0]);
if(!(result2 = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
@@ -171,18 +171,18 @@ extern int mysql_acct_no_assocs(mysql_conn_t *mysql_conn,
break;
}
xfree(query);
-
+
cnt = mysql_num_rows(result2);
mysql_free_result(result2);
- if(cnt)
+ if(cnt)
continue;
-
+
assoc = xmalloc(sizeof(acct_association_rec_t));
list_append(ret_list, assoc);
assoc->id = ACCT_PROBLEM_ACCT_NO_ASSOC;
- assoc->acct = xstrdup(row[0]);
+ assoc->acct = xstrdup(row[0]);
}
mysql_free_result(result);
@@ -232,7 +232,7 @@ extern int mysql_acct_no_users(mysql_conn_t *mysql_conn,
/* only get the account associations */
query = xstrdup_printf("select distinct %s from %s %s "
"&& user='' && lft=(rgt-1)"
- "order by cluster,acct;",
+ "order by cluster,acct;",
tmp, assoc_table, extra);
xfree(tmp);
xfree(extra);
@@ -249,7 +249,7 @@ extern int mysql_acct_no_users(mysql_conn_t *mysql_conn,
xmalloc(sizeof(acct_association_rec_t));
list_append(ret_list, assoc);
-
+
assoc->id = ACCT_PROBLEM_ACCT_NO_USERS;
if(row[ASSOC_REQ_USER][0])
@@ -257,9 +257,9 @@ extern int mysql_acct_no_users(mysql_conn_t *mysql_conn,
assoc->acct = xstrdup(row[ASSOC_REQ_ACCT]);
assoc->cluster = xstrdup(row[ASSOC_REQ_CLUSTER]);
- if(row[ASSOC_REQ_PARENT][0])
+ if(row[ASSOC_REQ_PARENT][0])
assoc->parent_acct = xstrdup(row[ASSOC_REQ_PARENT]);
-
+
if(row[ASSOC_REQ_PART][0])
assoc->partition = xstrdup(row[ASSOC_REQ_PART]);
}
@@ -280,7 +280,7 @@ extern int mysql_user_no_assocs_or_no_uid(mysql_conn_t *mysql_conn,
query = xstrdup_printf("select name from %s where deleted=0",
user_table);
- if(assoc_cond &&
+ if(assoc_cond &&
assoc_cond->user_list && list_count(assoc_cond->user_list)) {
int set = 0;
ListIterator itr = NULL;
@@ -288,7 +288,7 @@ extern int mysql_user_no_assocs_or_no_uid(mysql_conn_t *mysql_conn,
xstrcat(query, " && (");
itr = list_iterator_create(assoc_cond->user_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(query, " || ");
xstrfmtcat(query, "name=\"%s\"", object);
set = 1;
@@ -313,17 +313,17 @@ extern int mysql_user_no_assocs_or_no_uid(mysql_conn_t *mysql_conn,
if (uid_from_string (row[0], &pw_uid) < 0) {
assoc = xmalloc(sizeof(acct_association_rec_t));
list_append(ret_list, assoc);
-
+
assoc->id = ACCT_PROBLEM_USER_NO_UID;
- assoc->user = xstrdup(row[0]);
-
+ assoc->user = xstrdup(row[0]);
+
continue;
}
/* See if we have at least 1 association in the system */
query = xstrdup_printf("select distinct id from %s "
"where deleted=0 && "
- "user='%s' limit 1;",
+ "user='%s' limit 1;",
assoc_table, row[0]);
if(!(result2 = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
@@ -332,18 +332,18 @@ extern int mysql_user_no_assocs_or_no_uid(mysql_conn_t *mysql_conn,
break;
}
xfree(query);
-
+
cnt = mysql_num_rows(result2);
mysql_free_result(result2);
- if(cnt)
+ if(cnt)
continue;
-
+
assoc = xmalloc(sizeof(acct_association_rec_t));
list_append(ret_list, assoc);
assoc->id = ACCT_PROBLEM_USER_NO_ASSOC;
- assoc->user = xstrdup(row[0]);
+ assoc->user = xstrdup(row[0]);
}
mysql_free_result(result);
diff --git a/src/plugins/accounting_storage/mysql/mysql_problems.h b/src/plugins/accounting_storage/mysql/mysql_problems.h
index 553e737b94627a63c5cbdd7a5424e58be90e3824..c37fbfd4774845688969fa2f803dedb03a276694 100644
--- a/src/plugins/accounting_storage/mysql/mysql_problems.h
+++ b/src/plugins/accounting_storage/mysql/mysql_problems.h
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -44,13 +44,13 @@
#include "mysql_jobacct_process.h"
extern int mysql_acct_no_assocs(mysql_conn_t *mysql_conn,
- acct_association_cond_t *assoc_cond,
+ acct_association_cond_t *assoc_cond,
List ret_list);
extern int mysql_acct_no_users(mysql_conn_t *mysql_conn,
- acct_association_cond_t *assoc_cond,
+ acct_association_cond_t *assoc_cond,
List ret_list);
extern int mysql_user_no_assocs_or_no_uid(
- mysql_conn_t *mysql_conn, acct_association_cond_t *assoc_cond,
+ mysql_conn_t *mysql_conn, acct_association_cond_t *assoc_cond,
List ret_list);
#endif
diff --git a/src/plugins/accounting_storage/mysql/mysql_rollup.c b/src/plugins/accounting_storage/mysql/mysql_rollup.c
index 1033f7243db71f8b0728beb393bc79c922cbe8de..514a0349ec34f6918ee00c6432aee3486254bc36 100644
--- a/src/plugins/accounting_storage/mysql/mysql_rollup.c
+++ b/src/plugins/accounting_storage/mysql/mysql_rollup.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -151,7 +151,7 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
"alloc_cpus",
"req_cpus",
"resvid"
-
+
};
char *job_str = NULL;
enum {
@@ -245,7 +245,7 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
debug3("curr hour is now %d-%d", curr_start, curr_end);
/* info("start %s", ctime(&curr_start)); */
/* info("end %s", ctime(&curr_end)); */
-
+
/* first get the events during this time. All that is
* except things with the maintainance flag set in the
* state. We handle those later with the reservations.
@@ -266,16 +266,16 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
return SLURM_ERROR;
}
xfree(query);
-
+
while((row = mysql_fetch_row(result))) {
int row_start = atoi(row[EVENT_REQ_START]);
int row_end = atoi(row[EVENT_REQ_END]);
int row_cpu = atoi(row[EVENT_REQ_CPU]);
-
+
if(row_start < curr_start)
row_start = curr_start;
-
- if(!row_end || row_end > curr_end)
+
+ if(!row_end || row_end > curr_end)
row_end = curr_end;
/* Don't worry about it if the time is less
@@ -295,7 +295,7 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
last_c_usage = c_usage;
break;
}
- }
+ }
}
/* this means we are a cluster registration
@@ -310,14 +310,14 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
if(!c_usage) {
c_usage = xmalloc(
sizeof(local_cluster_usage_t));
- c_usage->name =
+ c_usage->name =
xstrdup(row[EVENT_REQ_CLUSTER]);
c_usage->cpu_count = row_cpu;
c_usage->total_time =
(row_end - row_start) * row_cpu;
c_usage->start = row_start;
c_usage->end = row_end;
- list_append(cluster_usage_list,
+ list_append(cluster_usage_list,
c_usage);
last_c_usage = c_usage;
} else {
@@ -327,7 +327,7 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
c_usage->end = row_end;
}
continue;
- }
+ }
/* only record down time for the cluster we
are looking for. If it was during this
@@ -340,10 +340,10 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
local_start = c_usage->start;
if(c_usage->end < local_end)
local_end = c_usage->end;
-
+
if((local_end - local_start) > 0) {
seconds = (local_end - local_start);
-
+
/* info("node %s adds " */
/* "(%d)(%d-%d) * %d = %d " */
/* "to %d", */
@@ -373,7 +373,7 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
return SLURM_ERROR;
}
xfree(query);
-
+
/* If a reservation overlaps another reservation we
total up everything here as if they didn't but when
calculating the total time for a cluster we will
@@ -393,8 +393,8 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
if(row_start < curr_start)
row_start = curr_start;
-
- if(!row_end || row_end > curr_end)
+
+ if(!row_end || row_end > curr_end)
row_end = curr_end;
/* Don't worry about it if the time is less
@@ -407,7 +407,7 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
r_usage->id = atoi(row[RESV_REQ_ID]);
r_usage->local_assocs = list_create(slurm_destroy_char);
- slurm_addto_char_list(r_usage->local_assocs,
+ slurm_addto_char_list(r_usage->local_assocs,
row[RESV_REQ_ASSOCS]);
r_usage->cluster = xstrdup(row[RESV_REQ_CLUSTER]);
@@ -421,7 +421,7 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
there we will use this as allocated time on
the system. If the reservation was a
maintenance then we add the time to planned
- down time.
+ down time.
*/
if(last_c_usage && !strcmp(last_c_usage->name,
r_usage->cluster)) {
@@ -434,14 +434,14 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
last_c_usage = c_usage;
break;
}
- }
+ }
}
/* only record time for the clusters that have
registered. This continue should rarely if
ever happen.
*/
- if(!c_usage)
+ if(!c_usage)
continue;
else if(row_flags & RESERVE_FLAG_MAINT)
c_usage->pd_cpu += r_usage->total_time;
@@ -458,7 +458,7 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
"(eligible < %d && (end >= %d "
"|| end = 0)) "
"order by associd, eligible",
- job_str, job_table,
+ job_str, job_table,
curr_end, curr_start);
debug3("%d(%d) query\n%s", mysql_conn->conn, __LINE__, query);
@@ -468,7 +468,7 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
return SLURM_ERROR;
}
xfree(query);
-
+
while((row = mysql_fetch_row(result))) {
int job_id = atoi(row[JOB_REQ_JOBID]);
int assoc_id = atoi(row[JOB_REQ_ASSOCID]);
@@ -480,19 +480,19 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
int row_acpu = atoi(row[JOB_REQ_ACPU]);
int row_rcpu = atoi(row[JOB_REQ_RCPU]);
seconds = 0;
-
+
if(row_start && (row_start < curr_start))
row_start = curr_start;
if(!row_start && row_end)
row_start = row_end;
- if(!row_end || row_end > curr_end)
+ if(!row_end || row_end > curr_end)
row_end = curr_end;
- if(!row_start || ((row_end - row_start) < 1))
+ if(!row_start || ((row_end - row_start) < 1))
goto calc_cluster;
-
+
seconds = (row_end - row_start);
if(row[JOB_REQ_SUSPENDED]) {
@@ -507,7 +507,7 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
suspend_str, suspend_table,
curr_end, curr_start,
row[JOB_REQ_DB_INX]);
-
+
debug4("%d(%d) query\n%s",
mysql_conn->conn, __LINE__, query);
if(!(result2 = mysql_db_query_ret(
@@ -520,7 +520,7 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
while((row2 = mysql_fetch_row(result2))) {
int local_start =
atoi(row2[SUSPEND_REQ_START]);
- int local_end =
+ int local_end =
atoi(row2[SUSPEND_REQ_END]);
if(!local_start)
@@ -542,27 +542,27 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
debug4("This job (%u) was suspended "
"the entire hour", job_id);
continue;
- }
+ }
if(last_id != assoc_id) {
a_usage = xmalloc(sizeof(local_id_usage_t));
a_usage->id = assoc_id;
list_append(assoc_usage_list, a_usage);
last_id = assoc_id;
- }
-
+ }
+
a_usage->a_cpu += seconds * row_acpu;
- if(!track_wckey)
+ if(!track_wckey)
goto calc_cluster;
/* do the wckey calculation */
if(last_wckeyid != wckey_id) {
list_iterator_reset(w_itr);
- while((w_usage = list_next(w_itr)))
- if(w_usage->id == wckey_id)
+ while((w_usage = list_next(w_itr)))
+ if(w_usage->id == wckey_id)
break;
-
+
if(!w_usage) {
w_usage = xmalloc(
sizeof(local_id_usage_t));
@@ -570,15 +570,15 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
list_append(wckey_usage_list,
w_usage);
}
-
+
last_wckeyid = wckey_id;
}
w_usage->a_cpu += seconds * row_acpu;
/* do the cluster allocated calculation */
calc_cluster:
- if(!row[JOB_REQ_CLUSTER] || !row[JOB_REQ_CLUSTER][0])
+ if(!row[JOB_REQ_CLUSTER] || !row[JOB_REQ_CLUSTER][0])
continue;
-
+
/* first figure out the reservation */
if(resv_id) {
if(seconds <= 0)
@@ -616,7 +616,7 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
r_usage->start;
if(r_usage->end < temp_end)
temp_end = r_usage->end;
-
+
if((temp_end - temp_start)
> 0) {
r_usage->a_cpu +=
@@ -640,16 +640,16 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
last_c_usage = c_usage;
break;
}
- }
+ }
}
/* only record time for the clusters that have
registered. This continue should rarely if
ever happen.
*/
- if(!c_usage)
+ if(!c_usage)
continue;
-
+
if(row_start && (seconds > 0)) {
/* info("%d assoc %d adds " */
/* "(%d)(%d-%d) * %d = %d " */
@@ -661,10 +661,10 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
/* row_acpu, */
/* seconds * row_acpu, */
/* row_acpu); */
-
+
c_usage->a_cpu += seconds * row_acpu;
- }
-
+ }
+
/* now reserved time */
if(!row_start || (row_start >= c_usage->start)) {
row_end = row_start;
@@ -673,11 +673,11 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
row_start = c_usage->start;
if(c_usage->end < row_end)
row_end = c_usage->end;
-
+
if((row_end - row_start) > 0) {
seconds = (row_end - row_start)
* row_rcpu;
-
+
/* info("%d assoc %d reserved " */
/* "(%d)(%d-%d) * %d = %d " */
/* "to %d", */
@@ -705,7 +705,7 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
if(idle <= 0)
continue;
-
+
/* now divide that time by the number of
associations in the reservation and add
them to each association */
@@ -732,8 +732,8 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
a_usage->id = associd;
list_append(assoc_usage_list, a_usage);
last_id = associd;
- }
-
+ }
+
a_usage->a_cpu += seconds;
}
list_iterator_destroy(tmp_itr);
@@ -743,7 +743,7 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
list_iterator_reset(c_itr);
while((c_usage = list_next(c_itr))) {
uint64_t total_used = 0;
-
+
/* sanity check to make sure we don't have more
allocated cpus than possible. */
if(c_usage->total_time < c_usage->a_cpu) {
@@ -773,7 +773,7 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
"> %llu) for "
"cluster %s(%d) from %s - %s",
c_usage->a_cpu, c_usage->d_cpu,
- c_usage->pd_cpu, total_used,
+ c_usage->pd_cpu, total_used,
c_usage->total_time,
c_usage->name, c_usage->cpu_count,
start_char, end_char);
@@ -784,7 +784,7 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
down to what ever is left from the
allocated. */
c_usage->pd_cpu = 0;
- c_usage->d_cpu =
+ c_usage->d_cpu =
c_usage->total_time - c_usage->a_cpu;
total_used = c_usage->a_cpu +
@@ -809,7 +809,7 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
if((int64_t)c_usage->r_cpu < 0)
c_usage->r_cpu = 0;
}
-
+
/* info("cluster %s(%d) down %d alloc %d " */
/* "resv %d idle %d over %d " */
/* "total= %d = %d from %s", */
@@ -823,18 +823,18 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
/* ctime(&c_usage->start)); */
/* info("to %s", ctime(&c_usage->end)); */
if(query) {
- xstrfmtcat(query,
+ xstrfmtcat(query,
", (%d, %d, '%s', %d, %d, "
"%llu, %llu, %llu, "
"%llu, %llu, %llu)",
- now, now,
- c_usage->name, c_usage->start,
+ now, now,
+ c_usage->name, c_usage->start,
c_usage->cpu_count, c_usage->a_cpu,
c_usage->d_cpu, c_usage->pd_cpu,
c_usage->i_cpu, c_usage->o_cpu,
- c_usage->r_cpu);
+ c_usage->r_cpu);
} else {
- xstrfmtcat(query,
+ xstrfmtcat(query,
"insert into %s (creation_time, "
"mod_time, cluster, period_start, "
"cpu_count, alloc_cpu_secs, "
@@ -844,12 +844,12 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
"values (%d, %d, '%s', %d, %d, "
"%llu, %llu, %llu, "
"%llu, %llu, %llu)",
- cluster_hour_table, now, now,
- c_usage->name, c_usage->start,
+ cluster_hour_table, now, now,
+ c_usage->name, c_usage->start,
c_usage->cpu_count,
- c_usage->a_cpu, c_usage->d_cpu,
+ c_usage->a_cpu, c_usage->d_cpu,
c_usage->pd_cpu, c_usage->i_cpu,
- c_usage->o_cpu, c_usage->r_cpu);
+ c_usage->o_cpu, c_usage->r_cpu);
}
}
@@ -858,7 +858,7 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
so we don't go testing again and again.
*/
if(query) {
- xstrfmtcat(query,
+ xstrfmtcat(query,
" on duplicate key update "
"mod_time=%d, cpu_count=VALUES(cpu_count), "
"alloc_cpu_secs=VALUES(alloc_cpu_secs), "
@@ -884,29 +884,29 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
/* a_usage->id, last_id, */
/* a_usage->a_cpu); */
if(query) {
- xstrfmtcat(query,
+ xstrfmtcat(query,
", (%d, %d, %d, %d, %llu)",
- now, now,
+ now, now,
a_usage->id, curr_start,
- a_usage->a_cpu);
+ a_usage->a_cpu);
} else {
- xstrfmtcat(query,
+ xstrfmtcat(query,
"insert into %s (creation_time, "
"mod_time, id, period_start, "
"alloc_cpu_secs) values "
"(%d, %d, %d, %d, %llu)",
- assoc_hour_table, now, now,
+ assoc_hour_table, now, now,
a_usage->id, curr_start,
- a_usage->a_cpu);
+ a_usage->a_cpu);
}
}
if(query) {
- xstrfmtcat(query,
+ xstrfmtcat(query,
" on duplicate key update "
"mod_time=%d, "
"alloc_cpu_secs=VALUES(alloc_cpu_secs);",
now);
-
+
debug3("%d(%d) query\n%s",
mysql_conn->conn, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
@@ -926,29 +926,29 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
/* w_usage->id, last_id, */
/* w_usage->a_cpu); */
if(query) {
- xstrfmtcat(query,
+ xstrfmtcat(query,
", (%d, %d, %d, %d, %llu)",
- now, now,
+ now, now,
w_usage->id, curr_start,
- w_usage->a_cpu);
+ w_usage->a_cpu);
} else {
- xstrfmtcat(query,
+ xstrfmtcat(query,
"insert into %s (creation_time, "
"mod_time, id, period_start, "
"alloc_cpu_secs) values "
"(%d, %d, %d, %d, %llu)",
- wckey_hour_table, now, now,
+ wckey_hour_table, now, now,
w_usage->id, curr_start,
- w_usage->a_cpu);
+ w_usage->a_cpu);
}
}
if(query) {
- xstrfmtcat(query,
+ xstrfmtcat(query,
" on duplicate key update "
"mod_time=%d, "
"alloc_cpu_secs=VALUES(alloc_cpu_secs);",
now);
-
+
debug3("%d(%d) query\n%s",
mysql_conn->conn, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
@@ -968,15 +968,15 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn,
curr_end = curr_start + add_sec;
}
end_it:
- xfree(suspend_str);
- xfree(event_str);
+ xfree(suspend_str);
+ xfree(event_str);
xfree(job_str);
xfree(resv_str);
list_iterator_destroy(a_itr);
list_iterator_destroy(c_itr);
list_iterator_destroy(w_itr);
list_iterator_destroy(r_itr);
-
+
list_destroy(assoc_usage_list);
list_destroy(cluster_usage_list);
list_destroy(wckey_usage_list);
@@ -986,7 +986,7 @@ end_it:
/* info("stop end %s", ctime(&curr_end)); */
return rc;
}
-extern int mysql_daily_rollup(mysql_conn_t *mysql_conn,
+extern int mysql_daily_rollup(mysql_conn_t *mysql_conn,
time_t start, time_t end, uint16_t archive_data)
{
/* can't just add 86400 since daylight savings starts and ends every
@@ -1082,7 +1082,7 @@ extern int mysql_daily_rollup(mysql_conn_t *mysql_conn,
start_tm.tm_isdst = -1;
curr_end = mktime(&start_tm);
}
-
+
/* info("stop start %s", ctime(&curr_start)); */
/* info("stop end %s", ctime(&curr_end)); */
@@ -1190,7 +1190,7 @@ extern int mysql_monthly_rollup(mysql_conn_t *mysql_conn,
if(!archive_data)
return SLURM_SUCCESS;
- if(!slurmdbd_conf)
+ if(!slurmdbd_conf)
return SLURM_SUCCESS;
memset(&arch_cond, 0, sizeof(arch_cond));
diff --git a/src/plugins/accounting_storage/mysql/mysql_rollup.h b/src/plugins/accounting_storage/mysql/mysql_rollup.h
index bfa1bdbbbed3dae0bbbe8c42449a8a905ed1e456..12da08caec20e0e716d0921c67a00110ca25d0b7 100644
--- a/src/plugins/accounting_storage/mysql/mysql_rollup.h
+++ b/src/plugins/accounting_storage/mysql/mysql_rollup.h
@@ -8,32 +8,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/plugins/accounting_storage/none/Makefile.am b/src/plugins/accounting_storage/none/Makefile.am
index 122e92c28f1c84fc6c31f28300b60910399e18f5..338e0c6a5ae63af3e25c47a3750ac556f0b9e434 100644
--- a/src/plugins/accounting_storage/none/Makefile.am
+++ b/src/plugins/accounting_storage/none/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/accounting_storage/none/Makefile.in b/src/plugins/accounting_storage/none/Makefile.in
index 5a1bf678530d5c42091dc246a2b1dce3d428f664..3daedd5eb0755be9912094bea5c7c3015943db58 100644
--- a/src/plugins/accounting_storage/none/Makefile.in
+++ b/src/plugins/accounting_storage/none/Makefile.in
@@ -313,7 +313,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = accounting_storage_none.la
accounting_storage_none_la_SOURCES = accounting_storage_none.c
diff --git a/src/plugins/accounting_storage/none/accounting_storage_none.c b/src/plugins/accounting_storage/none/accounting_storage_none.c
index ed86e42446a4ac43b9362d44f73a781f775ca435..4dcaaeacfc0046208e5400bd64b4e3e1082212ba 100644
--- a/src/plugins/accounting_storage/none/accounting_storage_none.c
+++ b/src/plugins/accounting_storage/none/accounting_storage_none.c
@@ -7,32 +7,32 @@
* Copyright (C) 2008 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -59,14 +59,14 @@
* where <application> is a description of the intended application of
* the plugin (e.g., "jobacct" for SLURM job completion logging) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load job completion logging plugins if the plugin_type string has a
+ * only load job completion logging plugins if the plugin_type string has a
* prefix of "jobacct/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
* of the plugin. If major and minor revisions are desired, the major
* version number may be multiplied by a suitable magnitude constant such
* as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum versions for their plugins as the job accounting API
+ * minimum versions for their plugins as the job accounting API
* matures.
*/
const char plugin_name[] = "Accounting storage NOT INVOKED plugin";
@@ -134,13 +134,13 @@ extern int acct_storage_p_add_associations(void *db_conn, uint32_t uid,
return SLURM_SUCCESS;
}
-extern int acct_storage_p_add_qos(void *db_conn, uint32_t uid,
+extern int acct_storage_p_add_qos(void *db_conn, uint32_t uid,
List qos_list)
{
return SLURM_SUCCESS;
}
-extern int acct_storage_p_add_wckeys(void *db_conn, uint32_t uid,
+extern int acct_storage_p_add_wckeys(void *db_conn, uint32_t uid,
List wckey_list)
{
return SLURM_SUCCESS;
@@ -207,7 +207,7 @@ extern List acct_storage_p_remove_users(void *db_conn, uint32_t uid,
}
extern List acct_storage_p_remove_coord(void *db_conn, uint32_t uid,
- List acct_list,
+ List acct_list,
acct_user_cond_t *user_q)
{
return SLURM_SUCCESS;
@@ -231,13 +231,13 @@ extern List acct_storage_p_remove_associations(void *db_conn, uint32_t uid,
return SLURM_SUCCESS;
}
-extern List acct_storage_p_remove_qos(void *db_conn, uint32_t uid,
+extern List acct_storage_p_remove_qos(void *db_conn, uint32_t uid,
acct_qos_cond_t *qos_cond)
{
return NULL;
}
-extern List acct_storage_p_remove_wckeys(void *db_conn, uint32_t uid,
+extern List acct_storage_p_remove_wckeys(void *db_conn, uint32_t uid,
acct_wckey_cond_t *wckey_cond)
{
return NULL;
@@ -317,7 +317,7 @@ extern int acct_storage_p_get_usage(void *db_conn, uid_t uid,
return rc;
}
-extern int acct_storage_p_roll_usage(void *db_conn,
+extern int acct_storage_p_roll_usage(void *db_conn,
time_t sent_start, time_t sent_end,
uint16_t archive_data)
{
@@ -365,7 +365,7 @@ extern int clusteracct_storage_p_get_usage(
return SLURM_SUCCESS;
}
-/*
+/*
* load into the storage the start of a job
*/
extern int jobacct_storage_p_job_start(void *db_conn, char *cluster_name,
@@ -374,7 +374,7 @@ extern int jobacct_storage_p_job_start(void *db_conn, char *cluster_name,
return SLURM_SUCCESS;
}
-/*
+/*
* load into the storage the end of a job
*/
extern int jobacct_storage_p_job_complete(void *db_conn,
@@ -383,7 +383,7 @@ extern int jobacct_storage_p_job_complete(void *db_conn,
return SLURM_SUCCESS;
}
-/*
+/*
* load into the storage the start of a job step
*/
extern int jobacct_storage_p_step_start(void *db_conn,
@@ -392,7 +392,7 @@ extern int jobacct_storage_p_step_start(void *db_conn,
return SLURM_SUCCESS;
}
-/*
+/*
* load into the storage the end of a job step
*/
extern int jobacct_storage_p_step_complete(void *db_conn,
@@ -401,7 +401,7 @@ extern int jobacct_storage_p_step_complete(void *db_conn,
return SLURM_SUCCESS;
}
-/*
+/*
* load into the storage a suspention of a job
*/
extern int jobacct_storage_p_suspend(void *db_conn,
@@ -410,8 +410,8 @@ extern int jobacct_storage_p_suspend(void *db_conn,
return SLURM_SUCCESS;
}
-/*
- * get info from the storage
+/*
+ * get info from the storage
* returns List of jobacct_job_rec_t *
* note List needs to be freed when called
*/
@@ -421,8 +421,8 @@ extern List jobacct_storage_p_get_jobs_cond(void *db_conn, uid_t uid,
return NULL;
}
-/*
- * expire old info from the storage
+/*
+ * expire old info from the storage
*/
extern int jobacct_storage_p_archive(void *db_conn,
acct_archive_cond_t *arch_cond)
@@ -430,10 +430,10 @@ extern int jobacct_storage_p_archive(void *db_conn,
return SLURM_SUCCESS;
}
-/*
- * load old info into the storage
+/*
+ * load old info into the storage
*/
-extern int jobacct_storage_p_archive_load(void *db_conn,
+extern int jobacct_storage_p_archive_load(void *db_conn,
acct_archive_rec_t *arch_rec)
{
return SLURM_SUCCESS;
diff --git a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
index cad400023c342be2cf743450b50a3a6189096a56..cbc8dc827a6201725ea9ee395db90fe3ead53897 100644
--- a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
+++ b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
@@ -7,32 +7,32 @@
* Copyright (C) 2008 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -61,14 +61,14 @@
* where <application> is a description of the intended application of
* the plugin (e.g., "jobacct" for SLURM job completion logging) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load job completion logging plugins if the plugin_type string has a
+ * only load job completion logging plugins if the plugin_type string has a
* prefix of "jobacct/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
* of the plugin. If major and minor revisions are desired, the major
* version number may be multiplied by a suitable magnitude constant such
* as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum versions for their plugins as the job accounting API
+ * minimum versions for their plugins as the job accounting API
* matures.
*/
const char plugin_name[] = "Accounting storage PGSQL plugin";
@@ -80,7 +80,7 @@ typedef void PGconn;
static pgsql_db_info_t *pgsql_db_info = NULL;
static char *pgsql_db_name = NULL;
-
+
char *acct_coord_table = "acct_coord_table";
char *acct_table = "acct_table";
char *assoc_day_table = "assoc_day_usage_table";
@@ -115,7 +115,7 @@ static int _get_db_index(PGconn *acct_pgsql_db,
}
xfree(query);
-
+
if(!PQntuples(result)) {
PQclear(result);
error("We can't get a db_index for this combo, "
@@ -123,9 +123,9 @@ static int _get_db_index(PGconn *acct_pgsql_db,
(int)submit, jobid, associd);
return -1;
}
- db_index = atoi(PQgetvalue(result, 0, 0));
+ db_index = atoi(PQgetvalue(result, 0, 0));
PQclear(result);
-
+
return db_index;
}
@@ -143,8 +143,8 @@ static pgsql_db_info_t *_pgsql_acct_create_db_info()
db_info->host = slurm_get_accounting_storage_host();
if(!db_info->host)
db_info->host = xstrdup("localhost");
- db_info->user = slurm_get_accounting_storage_user();
- db_info->pass = slurm_get_accounting_storage_pass();
+ db_info->user = slurm_get_accounting_storage_user();
+ db_info->pass = slurm_get_accounting_storage_pass();
return db_info;
}
@@ -157,7 +157,7 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
{ "deleted", "smallint default 0" },
{ "acct", "text not null" },
{ "user_name", "text not null" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t acct_table_fields[] = {
@@ -168,7 +168,7 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
{ "description", "text not null" },
{ "organization", "text not null" },
{ "qos", "text not null" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t assoc_table_fields[] = {
@@ -188,7 +188,7 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
{ "max_nodes_per_job", "int default NULL" },
{ "max_wall_duration_per_job", "int default NULL" },
{ "max_cpu_seconds_per_job", "int default NULL" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t assoc_usage_table_fields[] = {
@@ -198,7 +198,7 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
{ "associd", "int not null" },
{ "period_start", "bigint not null" },
{ "alloc_cpu_secs", "bigint default 0" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t cluster_table_fields[] = {
@@ -208,7 +208,7 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
{ "name", "text not null" },
{ "control_host", "text not null" },
{ "control_port", "int not null" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t cluster_usage_table_fields[] = {
@@ -223,7 +223,7 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
{ "idle_cpu_secs", "bigint default 0" },
{ "resv_cpu_secs", "bigint default 0" },
{ "over_cpu_secs", "bigint default 0" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t event_table_fields[] = {
@@ -233,7 +233,7 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
{ "period_start", "bigint not null" },
{ "period_end", "bigint default 0 not null" },
{ "reason", "text not null" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t job_table_fields[] = {
@@ -252,13 +252,13 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
{ "start", "bigint default 0 not null" },
{ "endtime", "bigint default 0 not null" },
{ "suspended", "bigint default 0 not null" },
- { "name", "text not null" },
+ { "name", "text not null" },
{ "track_steps", "smallint not null" },
- { "state", "smallint not null" },
+ { "state", "smallint not null" },
{ "comp_code", "int default 0 not null" },
{ "priority", "bigint not null" },
- { "req_cpus", "int not null" },
- { "alloc_cpus", "int not null" },
+ { "req_cpus", "int not null" },
+ { "alloc_cpus", "int not null" },
{ "nodelist", "text" },
{ "kill_requid", "integer default -1 not null" },
{ "qos", "smallint default 0" },
@@ -269,7 +269,7 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
{ "hourly_rollup", "bigint default 0 not null" },
{ "daily_rollup", "bigint default 0 not null" },
{ "monthly_rollup", "bigint default 0 not null" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t qos_table_fields[] = {
@@ -277,9 +277,9 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
{ "mod_time", "bigint default 0" },
{ "deleted", "smallint default 0" },
{ "id", "serial" },
- { "name", "text not null" },
- { "description", "text" },
- { NULL, NULL}
+ { "name", "text not null" },
+ { "description", "text" },
+ { NULL, NULL}
};
storage_field_t step_table_fields[] = {
@@ -322,7 +322,7 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
{ "associd", "bigint not null" },
{ "start", "bigint default 0 not null" },
{ "endtime", "bigint default 0 not null" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t txn_table_fields[] = {
@@ -332,7 +332,7 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
{ "name", "text not null" },
{ "actor", "text not null" },
{ "info", "text not null" },
- { NULL, NULL}
+ { NULL, NULL}
};
storage_field_t user_table_fields[] = {
@@ -343,7 +343,7 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
{ "default_acct", "text not null" },
{ "qos", "smallint default 1 not null" },
{ "admin_level", "smallint default 1 not null" },
- { NULL, NULL}
+ { NULL, NULL}
};
int i = 0, job_found = 0;
@@ -369,84 +369,84 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
for (i = 0; i < PQntuples(result); i++) {
if(!acct_coord_found &&
- !strcmp(acct_coord_table, PQgetvalue(result, i, 0)))
+ !strcmp(acct_coord_table, PQgetvalue(result, i, 0)))
acct_coord_found = 1;
else if(!acct_found &&
- !strcmp(acct_table, PQgetvalue(result, i, 0)))
+ !strcmp(acct_table, PQgetvalue(result, i, 0)))
acct_found = 1;
else if(!assoc_found &&
- !strcmp(assoc_table, PQgetvalue(result, i, 0)))
+ !strcmp(assoc_table, PQgetvalue(result, i, 0)))
assoc_found = 1;
else if(!assoc_day_found &&
- !strcmp(assoc_day_table, PQgetvalue(result, i, 0)))
+ !strcmp(assoc_day_table, PQgetvalue(result, i, 0)))
assoc_day_found = 1;
else if(!assoc_hour_found &&
- !strcmp(assoc_hour_table, PQgetvalue(result, i, 0)))
+ !strcmp(assoc_hour_table, PQgetvalue(result, i, 0)))
assoc_hour_found = 1;
else if(!assoc_month_found &&
- !strcmp(assoc_month_table, PQgetvalue(result, i, 0)))
+ !strcmp(assoc_month_table, PQgetvalue(result, i, 0)))
assoc_month_found = 1;
else if(!cluster_found &&
- !strcmp(cluster_table, PQgetvalue(result, i, 0)))
+ !strcmp(cluster_table, PQgetvalue(result, i, 0)))
cluster_found = 1;
else if(!cluster_day_found &&
- !strcmp(cluster_day_table, PQgetvalue(result, i, 0)))
+ !strcmp(cluster_day_table, PQgetvalue(result, i, 0)))
cluster_day_found = 1;
else if(!cluster_hour_found &&
- !strcmp(cluster_hour_table, PQgetvalue(result, i, 0)))
+ !strcmp(cluster_hour_table, PQgetvalue(result, i, 0)))
cluster_hour_found = 1;
else if(!cluster_month_found &&
- !strcmp(cluster_month_table, PQgetvalue(result, i, 0)))
+ !strcmp(cluster_month_table, PQgetvalue(result, i, 0)))
cluster_month_found = 1;
else if(!event_found &&
- !strcmp(event_table, PQgetvalue(result, i, 0)))
+ !strcmp(event_table, PQgetvalue(result, i, 0)))
event_found = 1;
else if(!job_found &&
- !strcmp(job_table, PQgetvalue(result, i, 0)))
+ !strcmp(job_table, PQgetvalue(result, i, 0)))
job_found = 1;
else if(!last_ran_found &&
- !strcmp(last_ran_table, PQgetvalue(result, i, 0)))
+ !strcmp(last_ran_table, PQgetvalue(result, i, 0)))
last_ran_found = 1;
else if(!qos_found &&
- !strcmp(qos_table, PQgetvalue(result, i, 0)))
+ !strcmp(qos_table, PQgetvalue(result, i, 0)))
qos_found = 1;
else if(!step_found &&
- !strcmp(step_table, PQgetvalue(result, i, 0)))
+ !strcmp(step_table, PQgetvalue(result, i, 0)))
step_found = 1;
else if(!suspend_found &&
- !strcmp(suspend_table, PQgetvalue(result, i, 0)))
+ !strcmp(suspend_table, PQgetvalue(result, i, 0)))
suspend_found = 1;
else if(!txn_found &&
- !strcmp(txn_table, PQgetvalue(result, i, 0)))
+ !strcmp(txn_table, PQgetvalue(result, i, 0)))
txn_found = 1;
else if(!user_found &&
- !strcmp(user_table, PQgetvalue(result, i, 0)))
+ !strcmp(user_table, PQgetvalue(result, i, 0)))
user_found = 1;
}
PQclear(result);
if(!acct_coord_found) {
- if(pgsql_db_create_table(acct_pgsql_db,
- acct_coord_table,
+ if(pgsql_db_create_table(acct_pgsql_db,
+ acct_coord_table,
acct_coord_table_fields,
", unique (acct, user_name))")
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if(pgsql_db_make_table_current(acct_pgsql_db,
+ if(pgsql_db_make_table_current(acct_pgsql_db,
acct_coord_table,
acct_coord_table_fields))
return SLURM_ERROR;
}
if(!acct_found) {
- if(pgsql_db_create_table(acct_pgsql_db,
+ if(pgsql_db_create_table(acct_pgsql_db,
acct_table, acct_table_fields,
- ", unique (name))")
+ ", unique (name))")
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if(pgsql_db_make_table_current(acct_pgsql_db,
+ if(pgsql_db_make_table_current(acct_pgsql_db,
acct_table,
acct_table_fields))
return SLURM_ERROR;
@@ -454,14 +454,14 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
if(!assoc_day_found) {
if(pgsql_db_create_table(
- acct_pgsql_db,
+ acct_pgsql_db,
assoc_day_table,
assoc_usage_table_fields,
", unique (associd, period_start))")
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if(pgsql_db_make_table_current(acct_pgsql_db,
+ if(pgsql_db_make_table_current(acct_pgsql_db,
assoc_day_table,
assoc_usage_table_fields))
return SLURM_ERROR;
@@ -469,14 +469,14 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
if(!assoc_hour_found) {
if(pgsql_db_create_table(
- acct_pgsql_db,
+ acct_pgsql_db,
assoc_hour_table,
assoc_usage_table_fields,
", unique (associd, period_start))")
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if(pgsql_db_make_table_current(acct_pgsql_db,
+ if(pgsql_db_make_table_current(acct_pgsql_db,
assoc_hour_table,
assoc_usage_table_fields))
return SLURM_ERROR;
@@ -484,14 +484,14 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
if(!assoc_month_found) {
if(pgsql_db_create_table(
- acct_pgsql_db,
+ acct_pgsql_db,
assoc_month_table,
assoc_usage_table_fields,
", unique (associd, period_start))")
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if(pgsql_db_make_table_current(acct_pgsql_db,
+ if(pgsql_db_make_table_current(acct_pgsql_db,
assoc_month_table,
assoc_usage_table_fields))
return SLURM_ERROR;
@@ -499,13 +499,13 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
if(!assoc_found) {
if(pgsql_db_create_table(
- acct_pgsql_db,
+ acct_pgsql_db,
assoc_table, assoc_table_fields,
- ", unique (user_name, acct, cluster, partition))")
+ ", unique (user_name, acct, cluster, partition))")
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if(pgsql_db_make_table_current(acct_pgsql_db,
+ if(pgsql_db_make_table_current(acct_pgsql_db,
assoc_table,
assoc_table_fields))
return SLURM_ERROR;
@@ -513,14 +513,14 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
if(!cluster_day_found) {
if(pgsql_db_create_table(
- acct_pgsql_db,
- cluster_day_table,
+ acct_pgsql_db,
+ cluster_day_table,
cluster_usage_table_fields,
", unique (cluster, period_start))")
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if(pgsql_db_make_table_current(acct_pgsql_db,
+ if(pgsql_db_make_table_current(acct_pgsql_db,
cluster_day_table,
cluster_usage_table_fields))
return SLURM_ERROR;
@@ -528,14 +528,14 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
if(!cluster_hour_found) {
if(pgsql_db_create_table(
- acct_pgsql_db,
- cluster_hour_table,
+ acct_pgsql_db,
+ cluster_hour_table,
cluster_usage_table_fields,
", unique (cluster, period_start))")
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if(pgsql_db_make_table_current(acct_pgsql_db,
+ if(pgsql_db_make_table_current(acct_pgsql_db,
cluster_hour_table,
cluster_usage_table_fields))
return SLURM_ERROR;
@@ -543,135 +543,135 @@ static int _pgsql_acct_check_tables(PGconn *acct_pgsql_db,
if(!cluster_month_found) {
if(pgsql_db_create_table(
- acct_pgsql_db,
- cluster_month_table,
+ acct_pgsql_db,
+ cluster_month_table,
cluster_usage_table_fields,
", unique (cluster, period_start))")
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if(pgsql_db_make_table_current(acct_pgsql_db,
+ if(pgsql_db_make_table_current(acct_pgsql_db,
cluster_month_table,
cluster_usage_table_fields))
return SLURM_ERROR;
}
if(!cluster_found) {
- if(pgsql_db_create_table(acct_pgsql_db,
+ if(pgsql_db_create_table(acct_pgsql_db,
cluster_table, cluster_table_fields,
", unique (name))")
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if(pgsql_db_make_table_current(acct_pgsql_db,
+ if(pgsql_db_make_table_current(acct_pgsql_db,
cluster_table,
cluster_table_fields))
return SLURM_ERROR;
}
if(!event_found) {
- if(pgsql_db_create_table(acct_pgsql_db,
+ if(pgsql_db_create_table(acct_pgsql_db,
event_table, event_table_fields,
", unique (node_name, "
"cluster, period_start))")
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if(pgsql_db_make_table_current(acct_pgsql_db,
+ if(pgsql_db_make_table_current(acct_pgsql_db,
event_table,
event_table_fields))
return SLURM_ERROR;
}
if(!job_found) {
- if(pgsql_db_create_table(acct_pgsql_db,
+ if(pgsql_db_create_table(acct_pgsql_db,
job_table, job_table_fields,
", unique (jobid, associd, submit))")
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if(pgsql_db_make_table_current(acct_pgsql_db,
+ if(pgsql_db_make_table_current(acct_pgsql_db,
job_table,
job_table_fields))
return SLURM_ERROR;
}
-
+
if(!last_ran_found) {
- if(pgsql_db_create_table(acct_pgsql_db,
+ if(pgsql_db_create_table(acct_pgsql_db,
last_ran_table, last_ran_table_fields,
")")
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if(pgsql_db_make_table_current(acct_pgsql_db,
+ if(pgsql_db_make_table_current(acct_pgsql_db,
last_ran_table,
last_ran_table_fields))
return SLURM_ERROR;
}
if(!qos_found) {
- if(pgsql_db_create_table(acct_pgsql_db,
+ if(pgsql_db_create_table(acct_pgsql_db,
qos_table, qos_table_fields,
", unique (name))")
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if(pgsql_db_make_table_current(acct_pgsql_db,
+ if(pgsql_db_make_table_current(acct_pgsql_db,
step_table,
step_table_fields))
return SLURM_ERROR;
}
if(!step_found) {
- if(pgsql_db_create_table(acct_pgsql_db,
+ if(pgsql_db_create_table(acct_pgsql_db,
step_table, step_table_fields,
", unique (id, stepid))")
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if(pgsql_db_make_table_current(acct_pgsql_db,
+ if(pgsql_db_make_table_current(acct_pgsql_db,
step_table,
step_table_fields))
return SLURM_ERROR;
}
if(!suspend_found) {
- if(pgsql_db_create_table(acct_pgsql_db,
+ if(pgsql_db_create_table(acct_pgsql_db,
suspend_table, suspend_table_fields,
")")
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if(pgsql_db_make_table_current(acct_pgsql_db,
+ if(pgsql_db_make_table_current(acct_pgsql_db,
suspend_table,
suspend_table_fields))
return SLURM_ERROR;
}
if(!txn_found) {
- if(pgsql_db_create_table(acct_pgsql_db,
+ if(pgsql_db_create_table(acct_pgsql_db,
txn_table, txn_table_fields,
", unique (id))")
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if(pgsql_db_make_table_current(acct_pgsql_db,
+ if(pgsql_db_make_table_current(acct_pgsql_db,
txn_table,
txn_table_fields))
return SLURM_ERROR;
}
if(!user_found) {
- if(pgsql_db_create_table(acct_pgsql_db,
+ if(pgsql_db_create_table(acct_pgsql_db,
user_table, user_table_fields,
", unique (name))")
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if(pgsql_db_make_table_current(acct_pgsql_db,
+ if(pgsql_db_make_table_current(acct_pgsql_db,
user_table,
user_table_fields))
return SLURM_ERROR;
@@ -695,7 +695,7 @@ extern int init ( void )
#else
fatal("No Postgres database was found on the machine. "
"Please check the config.log from the run of configure "
- "and run again.");
+ "and run again.");
#endif
/* since this can be loaded from many different places
only tell us once. */
@@ -727,7 +727,7 @@ extern int init ( void )
}
#ifdef HAVE_PGSQL
- pgsql_db_info = _pgsql_acct_create_db_info();
+ pgsql_db_info = _pgsql_acct_create_db_info();
location = slurm_get_accounting_storage_loc();
if(!location)
@@ -751,9 +751,9 @@ extern int init ( void )
}
debug2("pgsql_connect() called for db %s", pgsql_db_name);
-
+
pgsql_get_db_connection(&acct_pgsql_db, pgsql_db_name, pgsql_db_info);
-
+
rc = _pgsql_acct_check_tables(acct_pgsql_db, pgsql_db_info->user);
pgsql_close_db_connection(&acct_pgsql_db);
#endif
@@ -761,16 +761,16 @@ extern int init ( void )
only tell us once. */
if(rc == SLURM_SUCCESS)
verbose("%s loaded", plugin_name);
- else
+ else
verbose("%s failed", plugin_name);
-
+
return rc;
}
extern int fini ( void )
{
#ifdef HAVE_PGSQL
- destroy_pgsql_db_info(pgsql_db_info);
+ destroy_pgsql_db_info(pgsql_db_info);
xfree(pgsql_db_name);
return SLURM_SUCCESS;
#else
@@ -783,12 +783,12 @@ extern void *acct_storage_p_get_connection(bool make_agent, int conn_num,
{
#ifdef HAVE_PGSQL
PGconn *acct_pgsql_db = NULL;
-
+
if(!pgsql_db_info)
init();
-
+
debug2("acct_storage_p_get_connection: request new connection");
-
+
pgsql_get_db_connection(&acct_pgsql_db, pgsql_db_name, pgsql_db_info);
if(acct_pgsql_db)
errno = SLURM_SUCCESS;
@@ -803,7 +803,7 @@ extern int acct_storage_p_close_connection(PGconn **acct_pgsql_db)
#ifdef HAVE_PGSQL
if(acct_pgsql_db && *acct_pgsql_db)
pgsql_close_db_connection(acct_pgsql_db);
-
+
return SLURM_SUCCESS;
#else
return SLURM_ERROR;
@@ -833,7 +833,7 @@ extern int acct_storage_p_add_accts(PGconn *acct_pgsql_db, uint32_t uid,
return SLURM_SUCCESS;
}
-extern int acct_storage_p_add_clusters(PGconn *acct_pgsql_db, uint32_t uid,
+extern int acct_storage_p_add_clusters(PGconn *acct_pgsql_db, uint32_t uid,
List cluster_list)
{
return SLURM_SUCCESS;
@@ -845,19 +845,19 @@ extern int acct_storage_p_add_associations(PGconn *acct_pgsql_db, uint32_t uid,
return SLURM_SUCCESS;
}
-extern int acct_storage_p_add_qos(PGconn *acct_pgsql_db, uint32_t uid,
+extern int acct_storage_p_add_qos(PGconn *acct_pgsql_db, uint32_t uid,
List qos_list)
{
return SLURM_SUCCESS;
}
-extern int acct_storage_p_add_wckeys(PGconn *acct_pgsql_db, uint32_t uid,
+extern int acct_storage_p_add_wckeys(PGconn *acct_pgsql_db, uint32_t uid,
List wckey_list)
{
return SLURM_SUCCESS;
}
-extern int acct_storage_p_add_reservation(PGconn *acct_pgsql_db,
+extern int acct_storage_p_add_reservation(PGconn *acct_pgsql_db,
acct_reservation_rec_t *resv)
{
return SLURM_SUCCESS;
@@ -906,7 +906,7 @@ extern List acct_storage_p_modify_wckeys(PGconn *acct_pgsql_db, uint32_t uid,
return SLURM_SUCCESS;
}
-extern int acct_storage_p_modify_reservation(PGconn *acct_pgsql_db,
+extern int acct_storage_p_modify_reservation(PGconn *acct_pgsql_db,
acct_reservation_rec_t *resv)
{
return SLURM_SUCCESS;
@@ -944,19 +944,19 @@ extern List acct_storage_p_remove_associations(
return SLURM_SUCCESS;
}
-extern List acct_storage_p_remove_qos(void *db_conn, uint32_t uid,
+extern List acct_storage_p_remove_qos(void *db_conn, uint32_t uid,
acct_qos_cond_t *qos_cond)
{
return NULL;
}
-extern List acct_storage_p_remove_wckeys(void *db_conn, uint32_t uid,
+extern List acct_storage_p_remove_wckeys(void *db_conn, uint32_t uid,
acct_wckey_cond_t *wckey_cond)
{
return NULL;
}
-extern int acct_storage_p_remove_reservation(PGconn *acct_pgsql_db,
+extern int acct_storage_p_remove_reservation(PGconn *acct_pgsql_db,
acct_reservation_rec_t *resv)
{
return SLURM_SUCCESS;
@@ -1030,7 +1030,7 @@ extern int acct_storage_p_get_usage(PGconn *acct_pgsql_db, uid_t uid,
return rc;
}
-extern int acct_storage_p_roll_usage(PGconn *acct_pgsql_db,
+extern int acct_storage_p_roll_usage(PGconn *acct_pgsql_db,
time_t sent_start, time_t sent_end,
uint16_t archive_data)
{
@@ -1059,7 +1059,7 @@ extern int clusteracct_storage_p_node_down(PGconn *acct_pgsql_db,
my_reason = reason;
else
my_reason = node_ptr->reason;
-
+
query = xstrdup_printf(
"update %s set period_end=%d where cluster='%s' "
"and period_end=0 and node_name='%s'",
@@ -1073,7 +1073,7 @@ extern int clusteracct_storage_p_node_down(PGconn *acct_pgsql_db,
"insert into %s "
"(node_name, cluster, cpu_count, period_start, reason) "
"values ('%s', '%s', %u, %d, '%s')",
- event_table, node_ptr->name, cluster,
+ event_table, node_ptr->name, cluster,
cpus, event_time, my_reason);
rc = pgsql_db_query(acct_pgsql_db, query);
xfree(query);
@@ -1134,7 +1134,7 @@ extern int clusteracct_storage_p_cluster_procs(PGconn *acct_pgsql_db,
/* Record the processor count */
#if _DEBUG
slurm_make_time_str(&event_time, tmp_buff, sizeof(tmp_buff));
- info("cluster_acct_procs: %s has %u total CPUs at %s",
+ info("cluster_acct_procs: %s has %u total CPUs at %s",
cluster, procs, tmp_buff);
#endif
query = xstrdup_printf(
@@ -1192,10 +1192,10 @@ extern int clusteracct_storage_p_get_usage(
return SLURM_SUCCESS;
}
-/*
+/*
* load into the storage the start of a job
*/
-extern int jobacct_storage_p_job_start(PGconn *acct_pgsql_db,
+extern int jobacct_storage_p_job_start(PGconn *acct_pgsql_db,
char *cluster_name,
struct job_record *job_ptr)
{
@@ -1224,7 +1224,7 @@ extern int jobacct_storage_p_job_start(PGconn *acct_pgsql_db,
priority = (job_ptr->priority == NO_VAL) ?
-1L : (long) job_ptr->priority;
- if (job_ptr->name && job_ptr->name[0])
+ if (job_ptr->name && job_ptr->name[0])
jname = xstrdup(job_ptr->name);
else {
jname = xstrdup("allocation");
@@ -1242,8 +1242,8 @@ extern int jobacct_storage_p_job_start(PGconn *acct_pgsql_db,
if(slurmdbd_conf) {
block_id = xstrdup(job_ptr->comment);
} else {
- select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_BLOCK_ID,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo,
+ SELECT_JOBDATA_BLOCK_ID,
&block_id);
}
@@ -1253,36 +1253,36 @@ extern int jobacct_storage_p_job_start(PGconn *acct_pgsql_db,
"(jobid, associd, uid, gid, nodelist, ",
job_table);
- if(cluster_name)
+ if(cluster_name)
xstrcat(query, "cluster, ");
- if(job_ptr->account)
+ if(job_ptr->account)
xstrcat(query, "account, ");
- if(job_ptr->partition)
+ if(job_ptr->partition)
xstrcat(query, "partition, ");
- if(block_id)
+ if(block_id)
xstrcat(query, "blockid, ");
- if(job_ptr->wckey)
+ if(job_ptr->wckey)
xstrcat(query, "wckey, ");
-
- xstrfmtcat(query,
+
+ xstrfmtcat(query,
"eligible, submit, start, name, track_steps, "
"state, priority, req_cpus, alloc_cpus) "
"values (%u, %u, %u, %u, '%s', ",
job_ptr->job_id, job_ptr->assoc_id,
job_ptr->user_id, job_ptr->group_id, nodes);
-
- if(cluster_name)
+
+ if(cluster_name)
xstrfmtcat(query, "'%s', ", cluster_name);
- if(job_ptr->account)
+ if(job_ptr->account)
xstrfmtcat(query, "'%s', ", job_ptr->account);
- if(job_ptr->partition)
+ if(job_ptr->partition)
xstrfmtcat(query, "'%s', ", job_ptr->partition);
- if(block_id)
+ if(block_id)
xstrfmtcat(query, "'%s', ", block_id);
- if(job_ptr->wckey)
+ if(job_ptr->wckey)
xstrfmtcat(query, "\"%s\", ", job_ptr->wckey);
-
- xstrfmtcat(query,
+
+ xstrfmtcat(query,
"%d, %d, %d, '%s', %u, %u, %u, %u, %u)",
(int)job_ptr->details->begin_time,
(int)job_ptr->details->submit_time,
@@ -1292,7 +1292,7 @@ extern int jobacct_storage_p_job_start(PGconn *acct_pgsql_db,
priority, job_ptr->num_procs,
job_ptr->total_procs);
try_again:
- if(!(job_ptr->db_index = pgsql_insert_ret_id(acct_pgsql_db,
+ if(!(job_ptr->db_index = pgsql_insert_ret_id(acct_pgsql_db,
"job_table_id_seq",
query))) {
if(!reinit) {
@@ -1308,18 +1308,18 @@ extern int jobacct_storage_p_job_start(PGconn *acct_pgsql_db,
rc = SLURM_ERROR;
}
} else {
- query = xstrdup_printf("update %s set nodelist='%s', ",
+ query = xstrdup_printf("update %s set nodelist='%s', ",
job_table, nodes);
- if(job_ptr->account)
+ if(job_ptr->account)
xstrfmtcat(query, "account='%s', ",
job_ptr->account);
- if(job_ptr->partition)
+ if(job_ptr->partition)
xstrfmtcat(query, "partition='%s', ",
job_ptr->partition);
if(block_id)
xstrfmtcat(query, "blockid='%s', ", block_id);
- if(job_ptr->wckey)
+ if(job_ptr->wckey)
xstrfmtcat(query, ", wckey=\"%s\"", job_ptr->wckey);
xstrfmtcat(query, "start=%d, name='%s', state=%u, "
@@ -1333,14 +1333,14 @@ extern int jobacct_storage_p_job_start(PGconn *acct_pgsql_db,
xfree(block_id);
xfree(jname);
xfree(query);
-
+
return rc;
#else
return SLURM_ERROR;
#endif
}
-/*
+/*
* load into the storage the end of a job
*/
extern int jobacct_storage_p_job_complete(PGconn *acct_pgsql_db,
@@ -1349,8 +1349,8 @@ extern int jobacct_storage_p_job_complete(PGconn *acct_pgsql_db,
#ifdef HAVE_PGSQL
char *query = NULL, *nodes = NULL;
int rc=SLURM_SUCCESS;
-
- if (!job_ptr->db_index
+
+ if (!job_ptr->db_index
&& (!job_ptr->details || !job_ptr->details->submit_time)) {
error("jobacct_storage_p_job_complete: "
"Not inputing this job, it has no submit time.");
@@ -1362,18 +1362,18 @@ extern int jobacct_storage_p_job_complete(PGconn *acct_pgsql_db,
pgsql_db_name, pgsql_db_info))
return SLURM_ERROR;
}
-
+
debug3("pgsql_jobacct_job_complete() called");
if (job_ptr->end_time == 0) {
debug("pgsql_jobacct: job %u never started", job_ptr->job_id);
return SLURM_ERROR;
- }
-
+ }
+
if (job_ptr->nodes && job_ptr->nodes[0])
nodes = job_ptr->nodes;
else
nodes = "None assigned";
-
+
if(!job_ptr->db_index) {
if(!(job_ptr->db_index =
_get_db_index(acct_pgsql_db,
@@ -1396,7 +1396,7 @@ extern int jobacct_storage_p_job_complete(PGconn *acct_pgsql_db,
"nodelist='%s', comp_code=%d, "
"kill_requid=%d where id=%d",
job_table, (int)job_ptr->start_time,
- (int)job_ptr->end_time,
+ (int)job_ptr->end_time,
job_ptr->job_state & JOB_STATE_BASE,
nodes, job_ptr->exit_code,
job_ptr->requid, job_ptr->db_index);
@@ -1409,7 +1409,7 @@ extern int jobacct_storage_p_job_complete(PGconn *acct_pgsql_db,
#endif
}
-/*
+/*
* load into the storage the start of a job step
*/
extern int jobacct_storage_p_step_start(PGconn *acct_pgsql_db,
@@ -1423,8 +1423,8 @@ extern int jobacct_storage_p_step_start(PGconn *acct_pgsql_db,
char *ionodes = NULL;
#endif
char *query = NULL;
-
- if (!step_ptr->job_ptr->db_index
+
+ if (!step_ptr->job_ptr->db_index
&& (!step_ptr->job_ptr->details
|| !step_ptr->job_ptr->details->submit_time)) {
error("jobacct_storage_p_step_start: "
@@ -1445,17 +1445,17 @@ extern int jobacct_storage_p_step_start(PGconn *acct_pgsql_db,
} else {
#ifdef HAVE_BG
cpus = step_ptr->job_ptr->num_procs;
- select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
- SELECT_JOBDATA_IONODES,
+ select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
+ SELECT_JOBDATA_IONODES,
&ionodes);
if(ionodes) {
- snprintf(node_list, BUFFER_SIZE,
+ snprintf(node_list, BUFFER_SIZE,
"%s[%s]", step_ptr->job_ptr->nodes, ionodes);
xfree(ionodes);
} else
snprintf(node_list, BUFFER_SIZE, "%s",
step_ptr->job_ptr->nodes);
-
+
#else
if(!step_ptr->step_layout || !step_ptr->step_layout->task_cnt) {
cpus = step_ptr->job_ptr->total_procs;
@@ -1463,19 +1463,19 @@ extern int jobacct_storage_p_step_start(PGconn *acct_pgsql_db,
step_ptr->job_ptr->nodes);
} else {
cpus = step_ptr->step_layout->task_cnt;
- snprintf(node_list, BUFFER_SIZE, "%s",
+ snprintf(node_list, BUFFER_SIZE, "%s",
step_ptr->step_layout->node_list);
}
#endif
}
if(!step_ptr->job_ptr->db_index) {
- step_ptr->job_ptr->db_index =
+ step_ptr->job_ptr->db_index =
_get_db_index(acct_pgsql_db,
step_ptr->job_ptr->details->submit_time,
step_ptr->job_ptr->job_id,
step_ptr->job_ptr->assoc_id);
- if(step_ptr->job_ptr->db_index == -1)
+ if(step_ptr->job_ptr->db_index == -1)
return SLURM_ERROR;
}
/* we want to print a -1 for the requid so leave it a
@@ -1485,7 +1485,7 @@ extern int jobacct_storage_p_step_start(PGconn *acct_pgsql_db,
"cpus, nodelist) "
"values (%d, %u, %u, 0, '%s', %d, %u, '%s')",
step_table, step_ptr->job_ptr->db_index,
- step_ptr->step_id,
+ step_ptr->step_id,
(int)step_ptr->start_time, step_ptr->name,
JOB_RUNNING, cpus, node_list);
rc = pgsql_db_query(acct_pgsql_db, query);
@@ -1497,7 +1497,7 @@ extern int jobacct_storage_p_step_start(PGconn *acct_pgsql_db,
#endif
}
-/*
+/*
* load into the storage the end of a job step
*/
extern int jobacct_storage_p_step_complete(PGconn *acct_pgsql_db,
@@ -1516,7 +1516,7 @@ extern int jobacct_storage_p_step_complete(PGconn *acct_pgsql_db,
int rc =SLURM_SUCCESS;
uint32_t exit_code;
- if (!step_ptr->job_ptr->db_index
+ if (!step_ptr->job_ptr->db_index
&& (!step_ptr->job_ptr->details
|| !step_ptr->job_ptr->details->submit_time)) {
error("jobacct_storage_p_step_complete: "
@@ -1529,7 +1529,7 @@ extern int jobacct_storage_p_step_complete(PGconn *acct_pgsql_db,
pgsql_db_name, pgsql_db_info))
return SLURM_ERROR;
}
-
+
if (jobacct == NULL) {
/* JobAcctGather=jobacct_gather/none, no data to process */
memset(&dummy_jobacct, 0, sizeof(dummy_jobacct));
@@ -1544,11 +1544,11 @@ extern int jobacct_storage_p_step_complete(PGconn *acct_pgsql_db,
now = time(NULL);
#ifdef HAVE_BG
cpus = step_ptr->job_ptr->num_procs;
-
+
#else
if(!step_ptr->step_layout || !step_ptr->step_layout->task_cnt)
cpus = step_ptr->job_ptr->total_procs;
- else
+ else
cpus = step_ptr->step_layout->task_cnt;
#endif
}
@@ -1574,22 +1574,22 @@ extern int jobacct_storage_p_step_complete(PGconn *acct_pgsql_db,
ave_pages = jobacct->tot_pages;
ave_pages /= cpus;
ave_cpu = jobacct->tot_cpu;
- ave_cpu /= cpus;
+ ave_cpu /= cpus;
ave_cpu /= 100;
}
-
+
if(jobacct->min_cpu != (uint32_t)NO_VAL) {
ave_cpu2 = jobacct->min_cpu;
ave_cpu2 /= 100;
}
if(!step_ptr->job_ptr->db_index) {
- step_ptr->job_ptr->db_index =
+ step_ptr->job_ptr->db_index =
_get_db_index(acct_pgsql_db,
step_ptr->job_ptr->details->submit_time,
step_ptr->job_ptr->job_id,
step_ptr->job_ptr->assoc_id);
- if(step_ptr->job_ptr->db_index == -1)
+ if(step_ptr->job_ptr->db_index == -1)
return SLURM_ERROR;
}
@@ -1609,10 +1609,10 @@ extern int jobacct_storage_p_step_complete(PGconn *acct_pgsql_db,
"where id=%u and stepid=%u",
step_table, (int)now,
comp_status,
- step_ptr->requid,
- exit_code,
+ step_ptr->requid,
+ exit_code,
/* user seconds */
- jobacct->user_cpu_sec,
+ jobacct->user_cpu_sec,
/* user microseconds */
jobacct->user_cpu_usec,
/* system seconds */
@@ -1638,14 +1638,14 @@ extern int jobacct_storage_p_step_complete(PGconn *acct_pgsql_db,
step_ptr->job_ptr->db_index, step_ptr->step_id);
rc = pgsql_db_query(acct_pgsql_db, query);
xfree(query);
-
+
return rc;
#else
return SLURM_ERROR;
#endif
}
-/*
+/*
* load into the storage a suspention of a job
*/
extern int jobacct_storage_p_suspend(PGconn *acct_pgsql_db,
@@ -1654,26 +1654,26 @@ extern int jobacct_storage_p_suspend(PGconn *acct_pgsql_db,
#ifdef HAVE_PGSQL
char query[1024];
int rc = SLURM_SUCCESS;
-
+
if(!acct_pgsql_db || PQstatus(acct_pgsql_db) != CONNECTION_OK) {
if(!pgsql_get_db_connection(&acct_pgsql_db,
pgsql_db_name, pgsql_db_info))
return SLURM_ERROR;
}
-
+
if(!job_ptr->db_index) {
job_ptr->db_index = _get_db_index(acct_pgsql_db,
job_ptr->details->submit_time,
job_ptr->job_id,
job_ptr->assoc_id);
- if(job_ptr->db_index == -1)
+ if(job_ptr->db_index == -1)
return SLURM_ERROR;
}
snprintf(query, sizeof(query),
"update %s set suspended=%u-suspended, state=%d "
"where id=%u",
- job_table, (int)job_ptr->suspend_time,
+ job_table, (int)job_ptr->suspend_time,
job_ptr->job_state & JOB_STATE_BASE,
job_ptr->db_index);
rc = pgsql_db_query(acct_pgsql_db, query);
@@ -1681,23 +1681,23 @@ extern int jobacct_storage_p_suspend(PGconn *acct_pgsql_db,
snprintf(query, sizeof(query),
"update %s set suspended=%u-suspended, "
"state=%d where id=%u and endtime=0",
- step_table, (int)job_ptr->suspend_time,
+ step_table, (int)job_ptr->suspend_time,
job_ptr->job_state, job_ptr->db_index);
- rc = pgsql_db_query(acct_pgsql_db, query);
+ rc = pgsql_db_query(acct_pgsql_db, query);
}
-
+
return rc;
#else
return SLURM_ERROR;
#endif
}
-/*
- * get info from the storage
+/*
+ * get info from the storage
* returns List of job_rec_t *
* note List needs to be freed when called
*/
-extern List jobacct_storage_p_get_jobs_cond(PGconn *acct_pgsql_db, uid_t uid,
+extern List jobacct_storage_p_get_jobs_cond(PGconn *acct_pgsql_db, uid_t uid,
acct_job_cond_t *job_cond)
{
List job_list = NULL;
@@ -1708,13 +1708,13 @@ extern List jobacct_storage_p_get_jobs_cond(PGconn *acct_pgsql_db, uid_t uid,
return job_list;
}
- job_list = pgsql_jobacct_process_get_jobs(acct_pgsql_db, job_cond);
+ job_list = pgsql_jobacct_process_get_jobs(acct_pgsql_db, job_cond);
#endif
return job_list;
}
-/*
- * expire old info from the storage
+/*
+ * expire old info from the storage
*/
extern int jobacct_storage_p_archive(PGconn *acct_pgsql_db,
acct_archive_cond_t *arch_cond)
@@ -1731,10 +1731,10 @@ extern int jobacct_storage_p_archive(PGconn *acct_pgsql_db,
return SLURM_ERROR;
}
-/*
- * load old info into the storage
+/*
+ * load old info into the storage
*/
-extern int jobacct_storage_p_archive_load(void *db_conn,
+extern int jobacct_storage_p_archive_load(void *db_conn,
acct_archive_rec_t *arch_rec)
{
return SLURM_SUCCESS;
diff --git a/src/plugins/accounting_storage/pgsql/pgsql_jobacct_process.c b/src/plugins/accounting_storage/pgsql/pgsql_jobacct_process.c
index 12f6b8e5c2f9e6ae3466da6509003acf10f52042..eb99eb2cc955d91488b3b94a1df48e50722235f0 100644
--- a/src/plugins/accounting_storage/pgsql/pgsql_jobacct_process.c
+++ b/src/plugins/accounting_storage/pgsql/pgsql_jobacct_process.c
@@ -7,32 +7,32 @@
* Copyright (C) 2004-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -50,9 +50,9 @@ extern List pgsql_jobacct_process_get_jobs(PGconn *acct_pgsql_db,
acct_job_cond_t *job_cond)
{
- char *query = NULL;
- char *extra = NULL;
- char *tmp = NULL;
+ char *query = NULL;
+ char *extra = NULL;
+ char *tmp = NULL;
char *object = NULL;
jobacct_selected_step_t *selected_step = NULL;
ListIterator itr = NULL;
@@ -64,8 +64,8 @@ extern List pgsql_jobacct_process_get_jobs(PGconn *acct_pgsql_db,
jobacct_step_rec_t *step = NULL;
time_t now = time(NULL);
List job_list = list_create(destroy_jobacct_job_rec);
-
- /* if this changes you will need to edit the corresponding
+
+ /* if this changes you will need to edit the corresponding
* enum below also t1 is job_table */
char *job_req_inx[] = {
"t1.id",
@@ -97,7 +97,7 @@ extern List pgsql_jobacct_process_get_jobs(PGconn *acct_pgsql_db,
"t2.lft"
};
- /* if this changes you will need to edit the corresponding
+ /* if this changes you will need to edit the corresponding
* enum below also t1 is step_table */
char *step_req_inx[] = {
"t1.stepid",
@@ -160,7 +160,7 @@ extern List pgsql_jobacct_process_get_jobs(PGconn *acct_pgsql_db,
JOB_REQ_USER_NAME,
JOB_REQ_CLUSTER,
JOB_REQ_LFT,
- JOB_REQ_COUNT
+ JOB_REQ_COUNT
};
enum {
STEP_REQ_STEPID,
@@ -205,7 +205,7 @@ extern List pgsql_jobacct_process_get_jobs(PGconn *acct_pgsql_db,
xstrfmtcat(extra, ", %s as t3 where (");
itr = list_iterator_create(job_cond->associd_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " or ");
xstrfmtcat(extra, "t1.associd=%s", object);
set = 1;
@@ -214,7 +214,7 @@ extern List pgsql_jobacct_process_get_jobs(PGconn *acct_pgsql_db,
xstrcat(extra, ")");
table_level="t3";
/* just incase the association is gone */
- if(set)
+ if(set)
xstrcat(extra, " or ");
xstrfmtcat(extra, "t3.id is null) and "
"(t2.lft between t3.lft and t3.rgt "
@@ -229,7 +229,7 @@ extern List pgsql_jobacct_process_get_jobs(PGconn *acct_pgsql_db,
xstrcat(extra, " where (");
itr = list_iterator_create(job_cond->acct_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " or ");
xstrfmtcat(extra, "t1.acct='%s'", object);
set = 1;
@@ -246,7 +246,7 @@ extern List pgsql_jobacct_process_get_jobs(PGconn *acct_pgsql_db,
xstrcat(extra, " where (");
itr = list_iterator_create(job_cond->groupid_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " or ");
xstrfmtcat(extra, "t1.gid=", object);
set = 1;
@@ -264,7 +264,7 @@ extern List pgsql_jobacct_process_get_jobs(PGconn *acct_pgsql_db,
itr = list_iterator_create(job_cond->userid_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " or ");
xstrfmtcat(extra, "t1.uid='%s'", object);
set = 1;
@@ -281,7 +281,7 @@ extern List pgsql_jobacct_process_get_jobs(PGconn *acct_pgsql_db,
xstrcat(extra, " where (");
itr = list_iterator_create(job_cond->partition_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " or ");
xstrfmtcat(extra, "t1.partition='%s'", object);
set = 1;
@@ -298,7 +298,7 @@ extern List pgsql_jobacct_process_get_jobs(PGconn *acct_pgsql_db,
xstrcat(extra, " where (");
itr = list_iterator_create(job_cond->step_list);
while((selected_step = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " or ");
xstrfmtcat(extra, "t1.jobid=%u", selected_step->jobid);
set = 1;
@@ -315,7 +315,7 @@ extern List pgsql_jobacct_process_get_jobs(PGconn *acct_pgsql_db,
xstrcat(extra, " and (");
else
xstrcat(extra, " where (");
- xstrfmtcat(extra,
+ xstrfmtcat(extra,
"(t1.eligible < %d and (endtime >= %d "
"or endtime = 0)))",
job_cond->usage_end, job_cond->usage_start);
@@ -330,7 +330,7 @@ extern List pgsql_jobacct_process_get_jobs(PGconn *acct_pgsql_db,
itr = list_iterator_create(job_cond->state_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " or ");
xstrfmtcat(extra, "t1.state='%s'", object);
set = 1;
@@ -349,24 +349,24 @@ extern List pgsql_jobacct_process_get_jobs(PGconn *acct_pgsql_db,
itr = list_iterator_create(job_cond->cluster_list);
while((object = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " or ");
xstrfmtcat(extra,
- "(t1.cluster='%s' or %s.cluster='%s')",
+ "(t1.cluster='%s' or %s.cluster='%s')",
object, table_level, object);
set = 1;
}
list_iterator_destroy(itr);
}
-no_cond:
+no_cond:
xfree(tmp);
xstrfmtcat(tmp, "%s", job_req_inx[0]);
for(i=1; i<JOB_REQ_COUNT; i++) {
xstrfmtcat(tmp, ", %s", job_req_inx[i]);
}
-
+
query = xstrdup_printf("select %s from %s as t1 left join %s as t2 "
"on t1.associd=t2.id",
tmp, job_table, assoc_table);
@@ -376,9 +376,9 @@ no_cond:
xfree(extra);
}
/* Here we want to order them this way in such a way so it is
- easy to look for duplicates
+ easy to look for duplicates
*/
- if(job_cond && !job_cond->duplicates)
+ if(job_cond && !job_cond->duplicates)
xstrcat(query, " order by jobid, submit desc");
debug3("query\n%s", query);
@@ -397,12 +397,12 @@ no_cond:
if(job_cond && !job_cond->duplicates && curr_id == last_id)
continue;
-
+
last_id = curr_id;
job = create_jobacct_job_rec();
- job->alloc_cpus = atoi(PQgetvalue(result, i,
+ job->alloc_cpus = atoi(PQgetvalue(result, i,
JOB_REQ_ALLOC_CPUS));
job->associd = atoi(PQgetvalue(result, i, JOB_REQ_ASSOCID));
job->cluster = xstrdup(PQgetvalue(result, i, JOB_REQ_CLUSTER));
@@ -410,11 +410,11 @@ no_cond:
xfree(job->cluster);
job->cluster = xstrdup(
PQgetvalue(result, i, JOB_REQ_CLUSTER1));
- if(job->cluster && !job->cluster[0])
+ if(job->cluster && !job->cluster[0])
xfree(job->cluster);
}
job->user = xstrdup(PQgetvalue(result, i, JOB_REQ_USER_NAME));
- if(!job->user || !job->user[0])
+ if(!job->user || !job->user[0])
job->uid = atoi(PQgetvalue(result, i, JOB_REQ_UID));
job->lft = atoi(PQgetvalue(result, i, JOB_REQ_LFT));
@@ -423,12 +423,12 @@ no_cond:
job->lft = (uint32_t)NO_VAL;
job->account = xstrdup(PQgetvalue(result, i, JOB_REQ_ACCOUNT));
- if(job->account && !job->account[0])
+ if(job->account && !job->account[0])
xfree(job->account);
job->blockid = xstrdup(PQgetvalue(result, i,
JOB_REQ_BLOCKID));
- if(!job->blockid || !job->blockid[0])
+ if(!job->blockid || !job->blockid[0])
xfree(job->blockid);
job->eligible = atoi(PQgetvalue(result, i, JOB_REQ_SUBMIT));
job->submit = atoi(PQgetvalue(result, i, JOB_REQ_SUBMIT));
@@ -447,12 +447,12 @@ no_cond:
if(job->start && (job->start < job_cond->usage_start))
job->start = job_cond->usage_start;
- if(!job->end || job->end > job_cond->usage_end)
+ if(!job->end || job->end > job_cond->usage_end)
job->end = job_cond->usage_end;
if(!job->start && job->end)
job->start = job->end;
-
+
job->elapsed = job->end - job->start;
if(atoi(PQgetvalue(result, i, JOB_REQ_SUSPENDED))) {
@@ -465,10 +465,10 @@ no_cond:
"and end = 0)) && id=%s "
"order by start",
suspend_table,
- job_cond->usage_end,
+ job_cond->usage_end,
job_cond->usage_start,
id);
-
+
debug4("query\n%s", query);
if(!(result2 = pgsql_db_query_ret(
acct_pgsql_db, query))) {
@@ -480,23 +480,23 @@ no_cond:
for (i2 = 0; i2 < PQntuples(result2); i2++) {
int local_start =
atoi(PQgetvalue(result, i2, 0));
- int local_end =
+ int local_end =
atoi(PQgetvalue(result, i2, 1));
-
+
if(!local_start)
continue;
-
+
if(job->start > local_start)
local_start = job->start;
if(job->end < local_end)
local_end = job->end;
-
+
if((local_end - local_start) < 1)
continue;
-
- job->elapsed -=
+
+ job->elapsed -=
(local_end - local_start);
- job->suspended +=
+ job->suspended +=
(local_end - local_start);
}
PQclear(result2);
@@ -542,7 +542,7 @@ no_cond:
list_append(job_list, job);
- if(job_cond && job_cond->step_list &&
+ if(job_cond && job_cond->step_list &&
list_count(job_cond->step_list)) {
set = 0;
itr = list_iterator_create(job_cond->step_list);
@@ -554,12 +554,12 @@ no_cond:
job->show_full = 1;
break;
}
-
- if(set)
+
+ if(set)
xstrcat(extra, " or ");
- else
+ else
xstrcat(extra, " and (");
-
+
xstrfmtcat(extra, "t1.stepid=%u",
selected_step->stepid);
set = 1;
@@ -570,20 +570,20 @@ no_cond:
xstrcat(extra, ")");
}
for(j=0; j<STEP_REQ_COUNT; j++) {
- if(j)
+ if(j)
xstrcat(tmp, ", ");
xstrcat(tmp, step_req_inx[j]);
}
-
+
query = xstrdup_printf("select %s from %s t1 where t1.id=%s",
tmp, step_table, id);
xfree(tmp);
-
+
if(extra) {
xstrcat(query, extra);
xfree(extra);
}
-
+
//info("query = %s", query);
if(!(step_result = pgsql_db_query_ret(acct_pgsql_db, query))) {
xfree(query);
@@ -621,15 +621,15 @@ no_cond:
if(job_cond && !job_cond->without_usage_truncation
&& job_cond->usage_start) {
- if(step->start
+ if(step->start
&& (step->start < job_cond->usage_start))
step->start = job_cond->usage_start;
-
+
if(!step->start && step->end)
step->start = step->end;
-
- if(!step->end
- || (step->end > job_cond->usage_end))
+
+ if(!step->end
+ || (step->end > job_cond->usage_end))
step->end = job_cond->usage_end;
}
@@ -654,11 +654,11 @@ no_cond:
PQgetvalue(step_result, j, STEP_REQ_SYS_SEC));
step->sys_cpu_usec = atoi(
PQgetvalue(step_result, j, STEP_REQ_SYS_USEC));
- job->tot_cpu_sec +=
- step->tot_cpu_sec +=
+ job->tot_cpu_sec +=
+ step->tot_cpu_sec +=
step->user_cpu_sec + step->sys_cpu_sec;
- job->tot_cpu_usec +=
- step->tot_cpu_usec +=
+ job->tot_cpu_usec +=
+ step->tot_cpu_usec +=
step->user_cpu_usec + step->sys_cpu_usec;
step->sacct.max_vsize = atoi(
PQgetvalue(step_result, j,
@@ -716,7 +716,7 @@ no_cond:
step->sacct.min_cpu_id.nodeid = atoi(
PQgetvalue(step_result, j,
STEP_REQ_MIN_CPU_NODE));
-
+
step->requid = atoi(PQgetvalue(step_result, j,
STEP_REQ_KILL_REQUID));
}
@@ -730,7 +730,7 @@ no_cond:
different. If it is different print out
the step separate.
*/
- if(list_count(job->steps) > 1)
+ if(list_count(job->steps) > 1)
job->track_steps = 1;
else if(step && step->stepname && job->jobname) {
if(strcmp(step->stepname, job->jobname))
@@ -741,7 +741,7 @@ no_cond:
step = NULL;
}
PQclear(result);
-
+
return job_list;
}
@@ -753,8 +753,8 @@ extern int pgsql_jobacct_process_archive(PGconn *acct_pgsql_db,
extern int pgsql_jobacct_process_archive_load(PGconn *acct_pgsql_db,
acct_archive_rec_t *arch_rec)
-{
+{
return SLURM_SUCCESS;
}
-#endif
+#endif
diff --git a/src/plugins/accounting_storage/pgsql/pgsql_jobacct_process.h b/src/plugins/accounting_storage/pgsql/pgsql_jobacct_process.h
index d12ed58276f146183a5327ff5988a5e232981823..367c70ffc4b0d79fe70b7e765204a7e664e4ee75 100644
--- a/src/plugins/accounting_storage/pgsql/pgsql_jobacct_process.h
+++ b/src/plugins/accounting_storage/pgsql/pgsql_jobacct_process.h
@@ -7,32 +7,32 @@
* Copyright (C) 2004-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/plugins/accounting_storage/slurmdbd/Makefile.am b/src/plugins/accounting_storage/slurmdbd/Makefile.am
index ab90155fed30a942090b1b298e9c2ea31573f626..c52d160847f31daa5cd23fe10e91768b4fe05fc1 100644
--- a/src/plugins/accounting_storage/slurmdbd/Makefile.am
+++ b/src/plugins/accounting_storage/slurmdbd/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/accounting_storage/slurmdbd/Makefile.in b/src/plugins/accounting_storage/slurmdbd/Makefile.in
index 7dd866b6cbc71cf67a44cc9d76ac6127edd252ad..19e6cbf6cdba6244bbf034e61cdd09879a0910b6 100644
--- a/src/plugins/accounting_storage/slurmdbd/Makefile.in
+++ b/src/plugins/accounting_storage/slurmdbd/Makefile.in
@@ -314,7 +314,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = accounting_storage_slurmdbd.la
diff --git a/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c b/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c
index 7993b9151cea467401ce7db3bd16054e2354e901..6e6c7b66117f70ddbb1bf071855e91d6be031b57 100644
--- a/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c
+++ b/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c
@@ -5,32 +5,32 @@
* Copyright (C) 2008 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -80,14 +80,14 @@
* where <application> is a description of the intended application of
* the plugin (e.g., "jobacct" for SLURM job completion logging) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load job completion logging plugins if the plugin_type string has a
+ * only load job completion logging plugins if the plugin_type string has a
* prefix of "jobacct/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
* of the plugin. If major and minor revisions are desired, the major
* version number may be multiplied by a suitable magnitude constant such
* as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum versions for their plugins as the job accounting API
+ * minimum versions for their plugins as the job accounting API
* matures.
*/
const char plugin_name[] = "Accounting storage SLURMDBD plugin";
@@ -133,13 +133,13 @@ extern int fini ( void )
extern void *acct_storage_p_get_connection(bool make_agent, int conn_num,
bool rollback)
{
- if(!slurmdbd_auth_info)
+ if(!slurmdbd_auth_info)
init();
if(slurm_open_slurmdbd_conn(slurmdbd_auth_info,
- make_agent, rollback) == SLURM_SUCCESS)
+ make_agent, rollback) == SLURM_SUCCESS)
errno = SLURM_SUCCESS;
-
+
return NULL;
}
@@ -181,7 +181,7 @@ extern int acct_storage_p_add_users(void *db_conn, uint32_t uid, List user_list)
req.msg_type = DBD_ADD_USERS;
req.data = &get_msg;
- rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
+ rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
if(resp_code != SLURM_SUCCESS)
@@ -203,7 +203,7 @@ extern int acct_storage_p_add_coord(void *db_conn, uint32_t uid,
req.msg_type = DBD_ADD_ACCOUNT_COORDS;
req.data = &get_msg;
- rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
+ rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
if(resp_code != SLURM_SUCCESS)
@@ -289,10 +289,10 @@ extern int acct_storage_p_add_qos(void *db_conn, uint32_t uid,
req.data = &get_msg;
rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
-
+
if(resp_code != SLURM_SUCCESS)
rc = resp_code;
-
+
return rc;
}
@@ -310,14 +310,14 @@ extern int acct_storage_p_add_wckeys(void *db_conn, uint32_t uid,
req.data = &get_msg;
rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
-
+
if(resp_code != SLURM_SUCCESS)
rc = resp_code;
-
+
return rc;
}
-extern int acct_storage_p_add_reservation(void *db_conn,
+extern int acct_storage_p_add_reservation(void *db_conn,
acct_reservation_rec_t *resv)
{
slurmdbd_msg_t req;
@@ -332,7 +332,7 @@ extern int acct_storage_p_add_reservation(void *db_conn,
rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
-
+
if(resp_code != SLURM_SUCCESS)
rc = resp_code;
@@ -368,7 +368,7 @@ extern List acct_storage_p_modify_users(void *db_conn, uint32_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_LIST) {
- error("slurmdbd: response type not DBD_GOT_LIST: %u",
+ error("slurmdbd: response type not DBD_GOT_LIST: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -409,7 +409,7 @@ extern List acct_storage_p_modify_accounts(void *db_conn, uint32_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_LIST) {
- error("slurmdbd: response type not DBD_GOT_LIST: %u",
+ error("slurmdbd: response type not DBD_GOT_LIST: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -452,7 +452,7 @@ extern List acct_storage_p_modify_clusters(void *db_conn, uint32_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_LIST) {
- error("slurmdbd: response type not DBD_GOT_LIST: %u",
+ error("slurmdbd: response type not DBD_GOT_LIST: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -496,7 +496,7 @@ extern List acct_storage_p_modify_associations(
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_LIST) {
- error("slurmdbd: response type not DBD_GOT_LIST: %u",
+ error("slurmdbd: response type not DBD_GOT_LIST: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -537,7 +537,7 @@ extern List acct_storage_p_modify_qos(void *db_conn, uint32_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_LIST) {
- error("slurmdbd: response type not DBD_GOT_LIST: %u",
+ error("slurmdbd: response type not DBD_GOT_LIST: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -578,7 +578,7 @@ extern List acct_storage_p_modify_wckeys(void *db_conn, uint32_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_LIST) {
- error("slurmdbd: response type not DBD_GOT_LIST: %u",
+ error("slurmdbd: response type not DBD_GOT_LIST: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -590,7 +590,7 @@ extern List acct_storage_p_modify_wckeys(void *db_conn, uint32_t uid,
return ret_list;
}
-extern int acct_storage_p_modify_reservation(void *db_conn,
+extern int acct_storage_p_modify_reservation(void *db_conn,
acct_reservation_rec_t *resv)
{
slurmdbd_msg_t req;
@@ -605,7 +605,7 @@ extern int acct_storage_p_modify_reservation(void *db_conn,
rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
-
+
if(resp_code != SLURM_SUCCESS)
rc = resp_code;
@@ -640,7 +640,7 @@ extern List acct_storage_p_remove_users(void *db_conn, uint32_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_LIST) {
- error("slurmdbd: response type not DBD_GOT_LIST: %u",
+ error("slurmdbd: response type not DBD_GOT_LIST: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -682,7 +682,7 @@ extern List acct_storage_p_remove_coord(void *db_conn, uint32_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_LIST) {
- error("slurmdbd: response type not DBD_GOT_LIST: %u",
+ error("slurmdbd: response type not DBD_GOT_LIST: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -722,7 +722,7 @@ extern List acct_storage_p_remove_accts(void *db_conn, uint32_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_LIST) {
- error("slurmdbd: response type not DBD_GOT_LIST: %u",
+ error("slurmdbd: response type not DBD_GOT_LIST: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -762,7 +762,7 @@ extern List acct_storage_p_remove_clusters(void *db_conn, uint32_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_LIST) {
- error("slurmdbd: response type not DBD_GOT_LIST: %u",
+ error("slurmdbd: response type not DBD_GOT_LIST: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -804,7 +804,7 @@ extern List acct_storage_p_remove_associations(
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_LIST) {
- error("slurmdbd: response type not DBD_GOT_LIST: %u",
+ error("slurmdbd: response type not DBD_GOT_LIST: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -846,7 +846,7 @@ extern List acct_storage_p_remove_qos(
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_LIST) {
- error("slurmdbd: response type not DBD_GOT_LIST: %u",
+ error("slurmdbd: response type not DBD_GOT_LIST: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -888,7 +888,7 @@ extern List acct_storage_p_remove_wckeys(
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_LIST) {
- error("slurmdbd: response type not DBD_GOT_LIST: %u",
+ error("slurmdbd: response type not DBD_GOT_LIST: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -900,7 +900,7 @@ extern List acct_storage_p_remove_wckeys(
return ret_list;
}
-extern int acct_storage_p_remove_reservation(void *db_conn,
+extern int acct_storage_p_remove_reservation(void *db_conn,
acct_reservation_rec_t *resv)
{
slurmdbd_msg_t req;
@@ -915,7 +915,7 @@ extern int acct_storage_p_remove_reservation(void *db_conn,
rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
-
+
if(resp_code != SLURM_SUCCESS)
rc = resp_code;
@@ -933,7 +933,7 @@ extern List acct_storage_p_get_users(void *db_conn, uid_t uid,
memset(&get_msg, 0, sizeof(dbd_cond_msg_t));
get_msg.cond = user_cond;
-
+
req.msg_type = DBD_GET_USERS;
req.data = &get_msg;
rc = slurm_send_recv_slurmdbd_msg(SLURMDBD_VERSION, &req, &resp);
@@ -949,7 +949,7 @@ extern List acct_storage_p_get_users(void *db_conn, uid_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_USERS) {
- error("slurmdbd: response type not DBD_GOT_USERS: %u",
+ error("slurmdbd: response type not DBD_GOT_USERS: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -972,7 +972,7 @@ extern List acct_storage_p_get_accts(void *db_conn, uid_t uid,
memset(&get_msg, 0, sizeof(dbd_cond_msg_t));
get_msg.cond = acct_cond;
-
+
req.msg_type = DBD_GET_ACCOUNTS;
req.data = &get_msg;
rc = slurm_send_recv_slurmdbd_msg(SLURMDBD_VERSION, &req, &resp);
@@ -988,7 +988,7 @@ extern List acct_storage_p_get_accts(void *db_conn, uid_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_ACCOUNTS) {
- error("slurmdbd: response type not DBD_GOT_ACCOUNTS: %u",
+ error("slurmdbd: response type not DBD_GOT_ACCOUNTS: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -1012,7 +1012,7 @@ extern List acct_storage_p_get_clusters(void *db_conn, uid_t uid,
memset(&get_msg, 0, sizeof(dbd_cond_msg_t));
get_msg.cond = cluster_cond;
-
+
req.msg_type = DBD_GET_CLUSTERS;
req.data = &get_msg;
rc = slurm_send_recv_slurmdbd_msg(SLURMDBD_VERSION, &req, &resp);
@@ -1028,7 +1028,7 @@ extern List acct_storage_p_get_clusters(void *db_conn, uid_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_CLUSTERS) {
- error("slurmdbd: response type not DBD_GOT_CLUSTERS: %u",
+ error("slurmdbd: response type not DBD_GOT_CLUSTERS: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -1047,7 +1047,7 @@ extern List acct_storage_p_get_config(void)
dbd_list_msg_t *got_msg;
int rc;
List ret_list = NULL;
-
+
req.msg_type = DBD_GET_CONFIG;
req.data = NULL;
rc = slurm_send_recv_slurmdbd_msg(SLURMDBD_VERSION, &req, &resp);
@@ -1063,7 +1063,7 @@ extern List acct_storage_p_get_config(void)
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_CONFIG) {
- error("slurmdbd: response type not DBD_GOT_CONFIG: %u",
+ error("slurmdbd: response type not DBD_GOT_CONFIG: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -1086,7 +1086,7 @@ extern List acct_storage_p_get_associations(void *db_conn, uid_t uid,
memset(&get_msg, 0, sizeof(dbd_cond_msg_t));
get_msg.cond = assoc_cond;
-
+
req.msg_type = DBD_GET_ASSOCS;
req.data = &get_msg;
rc = slurm_send_recv_slurmdbd_msg(SLURMDBD_VERSION, &req, &resp);
@@ -1102,7 +1102,7 @@ extern List acct_storage_p_get_associations(void *db_conn, uid_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_ASSOCS) {
- error("slurmdbd: response type not DBD_GOT_ASSOCS: %u",
+ error("slurmdbd: response type not DBD_GOT_ASSOCS: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -1125,7 +1125,7 @@ extern List acct_storage_p_get_problems(void *db_conn, uid_t uid,
memset(&get_msg, 0, sizeof(dbd_cond_msg_t));
get_msg.cond = assoc_cond;
-
+
req.msg_type = DBD_GET_PROBS;
req.data = &get_msg;
rc = slurm_send_recv_slurmdbd_msg(SLURMDBD_VERSION, &req, &resp);
@@ -1141,7 +1141,7 @@ extern List acct_storage_p_get_problems(void *db_conn, uid_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_PROBS) {
- error("slurmdbd: response type not DBD_GOT_PROBS: %u",
+ error("slurmdbd: response type not DBD_GOT_PROBS: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -1180,7 +1180,7 @@ extern List acct_storage_p_get_qos(void *db_conn, uid_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_QOS) {
- error("slurmdbd: response type not DBD_GOT_QOS: %u",
+ error("slurmdbd: response type not DBD_GOT_QOS: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -1190,7 +1190,7 @@ extern List acct_storage_p_get_qos(void *db_conn, uid_t uid,
*/
if(!got_msg->my_list)
ret_list = list_create(NULL);
- else
+ else
ret_list = got_msg->my_list;
got_msg->my_list = NULL;
slurmdbd_free_list_msg(SLURMDBD_VERSION, got_msg);
@@ -1226,7 +1226,7 @@ extern List acct_storage_p_get_wckeys(void *db_conn, uid_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_WCKEYS) {
- error("slurmdbd: response type not DBD_GOT_WCKEYS: %u",
+ error("slurmdbd: response type not DBD_GOT_WCKEYS: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -1236,7 +1236,7 @@ extern List acct_storage_p_get_wckeys(void *db_conn, uid_t uid,
*/
if(!got_msg->my_list)
ret_list = list_create(NULL);
- else
+ else
ret_list = got_msg->my_list;
got_msg->my_list = NULL;
slurmdbd_free_list_msg(SLURMDBD_VERSION, got_msg);
@@ -1272,7 +1272,7 @@ extern List acct_storage_p_get_reservations(void *mysql_conn, uid_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_RESVS) {
- error("slurmdbd: response type not DBD_GOT_RESVS: %u",
+ error("slurmdbd: response type not DBD_GOT_RESVS: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -1282,7 +1282,7 @@ extern List acct_storage_p_get_reservations(void *mysql_conn, uid_t uid,
*/
if(!got_msg->my_list)
ret_list = list_create(NULL);
- else
+ else
ret_list = got_msg->my_list;
got_msg->my_list = NULL;
slurmdbd_free_list_msg(SLURMDBD_VERSION, got_msg);
@@ -1318,7 +1318,7 @@ extern List acct_storage_p_get_txn(void *db_conn, uid_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_TXN) {
- error("slurmdbd: response type not DBD_GOT_TXN: %u",
+ error("slurmdbd: response type not DBD_GOT_TXN: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -1347,7 +1347,7 @@ extern int acct_storage_p_get_usage(void *db_conn, uid_t uid,
get_msg.start = start;
get_msg.end = end;
req.msg_type = type;
-
+
switch (type) {
case DBD_GET_ASSOC_USAGE:
my_list = &got_assoc->accounting_list;
@@ -1360,7 +1360,7 @@ extern int acct_storage_p_get_usage(void *db_conn, uid_t uid,
return SLURM_ERROR;
break;
}
-
+
req.data = &get_msg;
rc = slurm_send_recv_slurmdbd_msg(SLURMDBD_VERSION, &req, &resp);
@@ -1374,9 +1374,9 @@ extern int acct_storage_p_get_usage(void *db_conn, uid_t uid,
} else
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
- } else if (resp.msg_type != DBD_GOT_ASSOC_USAGE
+ } else if (resp.msg_type != DBD_GOT_ASSOC_USAGE
&& resp.msg_type != DBD_GOT_WCKEY_USAGE) {
- error("slurmdbd: response type not DBD_GOT_ASSOC_USAGE: %u",
+ error("slurmdbd: response type not DBD_GOT_ASSOC_USAGE: %u",
resp.msg_type);
} else {
got_msg = (dbd_usage_msg_t *) resp.data;
@@ -1404,14 +1404,14 @@ extern int acct_storage_p_get_usage(void *db_conn, uid_t uid,
return rc;
}
-extern int acct_storage_p_roll_usage(void *db_conn,
+extern int acct_storage_p_roll_usage(void *db_conn,
time_t sent_start, time_t sent_end,
uint16_t archive_data)
{
slurmdbd_msg_t req;
dbd_roll_usage_msg_t get_msg;
int rc, resp_code;
-
+
memset(&get_msg, 0, sizeof(dbd_roll_usage_msg_t));
get_msg.end = sent_end;
get_msg.start = sent_start;
@@ -1554,7 +1554,7 @@ extern int clusteracct_storage_p_get_usage(
get_msg.end = end;
req.msg_type = DBD_GET_CLUSTER_USAGE;
-
+
req.data = &get_msg;
rc = slurm_send_recv_slurmdbd_msg(SLURMDBD_VERSION, &req, &resp);
@@ -1569,7 +1569,7 @@ extern int clusteracct_storage_p_get_usage(
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_CLUSTER_USAGE) {
- error("slurmdbd: response type not DBD_GOT_CLUSTER_USAGE: %u",
+ error("slurmdbd: response type not DBD_GOT_CLUSTER_USAGE: %u",
resp.msg_type);
} else {
got_msg = (dbd_usage_msg_t *) resp.data;
@@ -1584,7 +1584,7 @@ extern int clusteracct_storage_p_get_usage(
return rc;
}
-/*
+/*
* load into the storage the start of a job
*/
extern int jobacct_storage_p_job_start(void *db_conn, char *cluster_name,
@@ -1603,24 +1603,24 @@ extern int jobacct_storage_p_job_start(void *db_conn, char *cluster_name,
return SLURM_ERROR;
}
memset(&req, 0, sizeof(dbd_job_start_msg_t));
-
+
req.alloc_cpus = job_ptr->total_procs;
req.cluster = cluster_name;
req.account = job_ptr->account;
req.assoc_id = job_ptr->assoc_id;
#ifdef HAVE_BG
- select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_BLOCK_ID,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo,
+ SELECT_JOBDATA_BLOCK_ID,
&block_id);
- select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_NODE_CNT,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo,
+ SELECT_JOBDATA_NODE_CNT,
&req.alloc_nodes);
#else
req.alloc_nodes = job_ptr->node_cnt;
#endif
req.block_id = block_id;
req.db_index = job_ptr->db_index;
- if (job_ptr->details)
+ if (job_ptr->details)
req.eligible_time = job_ptr->details->begin_time;
req.gid = job_ptr->group_id;
req.job_id = job_ptr->job_id;
@@ -1628,7 +1628,7 @@ extern int jobacct_storage_p_job_start(void *db_conn, char *cluster_name,
req.name = job_ptr->name;
req.nodes = job_ptr->nodes;
if(job_ptr->node_bitmap) {
- req.node_inx = bit_fmt(temp_bit, sizeof(temp_bit),
+ req.node_inx = bit_fmt(temp_bit, sizeof(temp_bit),
job_ptr->node_bitmap);
}
@@ -1647,7 +1647,7 @@ extern int jobacct_storage_p_job_start(void *db_conn, char *cluster_name,
msg.data = &req;
/* if we already have the db_index don't wait around for it
- * again just send the message
+ * again just send the message
*/
if(req.db_index) {
if (slurm_send_slurmdbd_msg(SLURMDBD_VERSION, &msg) < 0) {
@@ -1656,7 +1656,7 @@ extern int jobacct_storage_p_job_start(void *db_conn, char *cluster_name,
}
xfree(block_id);
return SLURM_SUCCESS;
- }
+ }
/* If we don't have the db_index we need to wait for it to be
* used in the other submissions for this job.
@@ -1668,7 +1668,7 @@ extern int jobacct_storage_p_job_start(void *db_conn, char *cluster_name,
return SLURM_ERROR;
}
} else if (msg_rc.msg_type != DBD_ID_RC) {
- error("slurmdbd: response type not DBD_ID_RC: %u",
+ error("slurmdbd: response type not DBD_ID_RC: %u",
msg_rc.msg_type);
} else {
resp = (dbd_id_rc_msg_t *) msg_rc.data;
@@ -1678,11 +1678,11 @@ extern int jobacct_storage_p_job_start(void *db_conn, char *cluster_name,
slurmdbd_free_id_rc_msg(SLURMDBD_VERSION, resp);
}
xfree(block_id);
-
+
return rc;
}
-/*
+/*
* load into the storage the end of a job
*/
extern int jobacct_storage_p_job_complete(void *db_conn,
@@ -1691,7 +1691,7 @@ extern int jobacct_storage_p_job_complete(void *db_conn,
slurmdbd_msg_t msg;
dbd_job_comp_msg_t req;
- if (!job_ptr->db_index
+ if (!job_ptr->db_index
&& (!job_ptr->details || !job_ptr->details->submit_time)) {
error("jobacct_storage_p_job_complete: "
"Not inputing this job, it has no submit time.");
@@ -1721,7 +1721,7 @@ extern int jobacct_storage_p_job_complete(void *db_conn,
return SLURM_SUCCESS;
}
-/*
+/*
* load into the storage the start of a job step
*/
extern int jobacct_storage_p_step_start(void *db_conn,
@@ -1737,19 +1737,19 @@ extern int jobacct_storage_p_step_start(void *db_conn,
char *ionodes = NULL;
cpus = tasks = step_ptr->job_ptr->num_procs;
- select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
- SELECT_JOBDATA_IONODES,
+ select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
+ SELECT_JOBDATA_IONODES,
&ionodes);
if (ionodes) {
- snprintf(node_list, BUFFER_SIZE,
+ snprintf(node_list, BUFFER_SIZE,
"%s[%s]", step_ptr->job_ptr->nodes, ionodes);
xfree(ionodes);
} else {
snprintf(node_list, BUFFER_SIZE, "%s",
step_ptr->job_ptr->nodes);
}
- select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
- SELECT_JOBDATA_NODE_CNT,
+ select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
+ SELECT_JOBDATA_NODE_CNT,
&nodes);
#else
if (!step_ptr->step_layout || !step_ptr->step_layout->task_cnt) {
@@ -1758,16 +1758,16 @@ extern int jobacct_storage_p_step_start(void *db_conn,
step_ptr->job_ptr->nodes);
nodes = step_ptr->job_ptr->node_cnt;
} else {
- cpus = step_ptr->cpu_count;
+ cpus = step_ptr->cpu_count;
tasks = step_ptr->step_layout->task_cnt;
nodes = step_ptr->step_layout->node_cnt;
task_dist = step_ptr->step_layout->task_dist;
- snprintf(node_list, BUFFER_SIZE, "%s",
+ snprintf(node_list, BUFFER_SIZE, "%s",
step_ptr->step_layout->node_list);
}
#endif
- if (!step_ptr->job_ptr->db_index
+ if (!step_ptr->job_ptr->db_index
&& (!step_ptr->job_ptr->details
|| !step_ptr->job_ptr->details->submit_time)) {
error("jobacct_storage_p_step_start: "
@@ -1781,8 +1781,8 @@ extern int jobacct_storage_p_step_start(void *db_conn,
req.job_id = step_ptr->job_ptr->job_id;
req.name = step_ptr->name;
req.nodes = node_list;
- if(step_ptr->step_node_bitmap) {
- req.node_inx = bit_fmt(temp_bit, sizeof(temp_bit),
+ if(step_ptr->step_node_bitmap) {
+ req.node_inx = bit_fmt(temp_bit, sizeof(temp_bit),
step_ptr->step_node_bitmap);
}
req.node_cnt = nodes;
@@ -1805,7 +1805,7 @@ extern int jobacct_storage_p_step_start(void *db_conn,
return SLURM_SUCCESS;
}
-/*
+/*
* load into the storage the end of a job step
*/
extern int jobacct_storage_p_step_complete(void *db_conn,
@@ -1820,32 +1820,32 @@ extern int jobacct_storage_p_step_complete(void *db_conn,
char *ionodes = NULL;
cpus = tasks = step_ptr->job_ptr->num_procs;
- select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
- SELECT_JOBDATA_IONODES,
+ select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
+ SELECT_JOBDATA_IONODES,
&ionodes);
if (ionodes) {
- snprintf(node_list, BUFFER_SIZE,
+ snprintf(node_list, BUFFER_SIZE,
"%s[%s]", step_ptr->job_ptr->nodes, ionodes);
xfree(ionodes);
} else {
snprintf(node_list, BUFFER_SIZE, "%s",
step_ptr->job_ptr->nodes);
}
-
+
#else
if (!step_ptr->step_layout || !step_ptr->step_layout->task_cnt) {
cpus = tasks = step_ptr->job_ptr->total_procs;
- snprintf(node_list, BUFFER_SIZE, "%s",
+ snprintf(node_list, BUFFER_SIZE, "%s",
step_ptr->job_ptr->nodes);
} else {
- cpus = step_ptr->cpu_count;
+ cpus = step_ptr->cpu_count;
tasks = step_ptr->step_layout->task_cnt;
- snprintf(node_list, BUFFER_SIZE, "%s",
+ snprintf(node_list, BUFFER_SIZE, "%s",
step_ptr->step_layout->node_list);
}
#endif
- if (!step_ptr->job_ptr->db_index
+ if (!step_ptr->job_ptr->db_index
&& (!step_ptr->job_ptr->details
|| !step_ptr->job_ptr->details->submit_time)) {
error("jobacct_storage_p_step_complete: "
@@ -1878,7 +1878,7 @@ extern int jobacct_storage_p_step_complete(void *db_conn,
return SLURM_SUCCESS;
}
-/*
+/*
* load into the storage a suspention of a job
*/
extern int jobacct_storage_p_suspend(void *db_conn,
@@ -1888,7 +1888,7 @@ extern int jobacct_storage_p_suspend(void *db_conn,
dbd_job_suspend_msg_t req;
memset(&req, 0, sizeof(dbd_job_suspend_msg_t));
-
+
req.assoc_id = job_ptr->assoc_id;
req.job_id = job_ptr->job_id;
req.db_index = job_ptr->db_index;
@@ -1905,8 +1905,8 @@ extern int jobacct_storage_p_suspend(void *db_conn,
return SLURM_SUCCESS;
}
-/*
- * get info from the storage
+/*
+ * get info from the storage
* returns List of job_rec_t *
* note List needs to be freed when called
*/
@@ -1918,7 +1918,7 @@ extern List jobacct_storage_p_get_jobs_cond(void *db_conn, uid_t uid,
dbd_list_msg_t *got_msg;
int rc;
List job_list = NULL;
-
+
memset(&get_msg, 0, sizeof(dbd_cond_msg_t));
get_msg.cond = job_cond;
@@ -1938,7 +1938,7 @@ extern List jobacct_storage_p_get_jobs_cond(void *db_conn, uid_t uid,
error("%s", msg->comment);
slurmdbd_free_rc_msg(SLURMDBD_VERSION, msg);
} else if (resp.msg_type != DBD_GOT_JOBS) {
- error("slurmdbd: response type not DBD_GOT_JOBS: %u",
+ error("slurmdbd: response type not DBD_GOT_JOBS: %u",
resp.msg_type);
} else {
got_msg = (dbd_list_msg_t *) resp.data;
@@ -1950,7 +1950,7 @@ extern List jobacct_storage_p_get_jobs_cond(void *db_conn, uid_t uid,
return job_list;
}
-/*
+/*
* Expire old info from the storage
* Not applicable for any database
*/
@@ -1976,7 +1976,7 @@ extern int jobacct_storage_p_archive(void *db_conn,
dbd_rc_msg_t *msg = resp.data;
rc = msg->return_code;
- if(msg->return_code == SLURM_SUCCESS)
+ if(msg->return_code == SLURM_SUCCESS)
info("%s", msg->comment);
else
error("%s", msg->comment);
@@ -1989,15 +1989,15 @@ extern int jobacct_storage_p_archive(void *db_conn,
return rc;
}
-/*
- * load old info into the storage
+/*
+ * load old info into the storage
*/
-extern int jobacct_storage_p_archive_load(void *db_conn,
+extern int jobacct_storage_p_archive_load(void *db_conn,
acct_archive_rec_t *arch_rec)
{
slurmdbd_msg_t req, resp;
int rc = SLURM_SUCCESS;
-
+
req.msg_type = DBD_ARCHIVE_LOAD;
req.data = arch_rec;
@@ -2009,7 +2009,7 @@ extern int jobacct_storage_p_archive_load(void *db_conn,
dbd_rc_msg_t *msg = resp.data;
rc = msg->return_code;
- if(msg->return_code == SLURM_SUCCESS)
+ if(msg->return_code == SLURM_SUCCESS)
info("%s", msg->comment);
else
error("%s", msg->comment);
diff --git a/src/plugins/auth/authd/Makefile.am b/src/plugins/auth/authd/Makefile.am
index 1453ef0d9f96a3c36cb08b5c241adaca4acb812a..6d943cf19261bbe06b0933b1f25e58a35a526048 100644
--- a/src/plugins/auth/authd/Makefile.am
+++ b/src/plugins/auth/authd/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/auth/authd/Makefile.in b/src/plugins/auth/authd/Makefile.in
index 9bc15babd7efbdcf272bcc4cb43132ab0c07e57a..5590cf49dabe1465f7cad3a47c9f7fb7e760c0ec 100644
--- a/src/plugins/auth/authd/Makefile.in
+++ b/src/plugins/auth/authd/Makefile.in
@@ -312,7 +312,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
# Add your plugin to this line, following the naming conventions.
diff --git a/src/plugins/auth/authd/auth_authd.c b/src/plugins/auth/authd/auth_authd.c
index e39cf2fc486d432492faa013c9c180c479bdeac5..498043b8846d6848513ece8df71c4889b119b975 100644
--- a/src/plugins/auth/authd/auth_authd.c
+++ b/src/plugins/auth/authd/auth_authd.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Kevin Tew <tew1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -86,8 +86,8 @@
* only load authentication plugins if the plugin_type string has a prefix
* of "auth/".
*
- * plugin_version - specifies the version number of the plugin.
- * min_plug_version - specifies the minumum version number of incomming
+ * plugin_version - specifies the version number of the plugin.
+ * min_plug_version - specifies the minumum version number of incomming
* messages that this plugin can accept
*/
const char plugin_name[] = "Brent Chun's authd authentication plugin";
@@ -126,7 +126,7 @@ enum {
int init( void )
{
const arg_desc_t *desc;
-
+
verbose( "authd authentication module initializing" );
if ( ( desc = slurm_auth_get_arg_desc() ) == NULL ) {
@@ -138,7 +138,7 @@ int init( void )
error( "Required argument 'Timeout' not provided" );
return SLURM_ERROR;
}
-
+
return SLURM_SUCCESS;
}
@@ -150,7 +150,7 @@ extern int fini ( void )
slurm_auth_credential_t *
slurm_auth_create( void *argv[], char *auth_info )
{
- int ttl;
+ int ttl;
int rc;
slurm_auth_credential_t *cred;
@@ -191,7 +191,7 @@ slurm_auth_create( void *argv[], char *auth_info )
xfree( cred );
return NULL;
}
-
+
return cred;
}
@@ -229,7 +229,7 @@ slurm_auth_verify( slurm_auth_credential_t *cred, char *auth_info )
}
/* XXX check to see if user is valid on the system. */
-
+
return SLURM_SUCCESS;
}
@@ -273,7 +273,7 @@ slurm_auth_pack( slurm_auth_credential_t *cred, Buf buf )
*/
packmem( (char *) plugin_type, strlen( plugin_type ) + 1, buf );
pack32( plugin_version, buf );
-
+
pack32( (uint32_t) cred->cred.uid, buf );
pack32( (uint32_t) cred->cred.gid, buf );
pack_time( cred->cred.valid_from, buf );
@@ -289,7 +289,7 @@ slurm_auth_unpack( Buf buf )
{
slurm_auth_credential_t *cred = NULL;
uint16_t sig_size; /* ignored */
- uint32_t version, tmpint;
+ uint32_t version, tmpint;
char *data;
if ( buf == NULL ) {
@@ -297,7 +297,7 @@ slurm_auth_unpack( Buf buf )
return NULL;
}
-
+
/* Check the plugin type. */
safe_unpackmem_ptr( &data, &sig_size, buf );
if ( strcmp( data, plugin_type ) != 0 ) {
@@ -352,7 +352,7 @@ slurm_auth_print( slurm_auth_credential_t *cred, FILE *fp )
cred->sig.data[ 2 ], cred->sig.data[ 3 ] );
verbose( "END AUTHD CREDENTIAL\n" );
- return SLURM_SUCCESS;
+ return SLURM_SUCCESS;
}
diff --git a/src/plugins/auth/munge/Makefile.am b/src/plugins/auth/munge/Makefile.am
index f8ce899c70f757417c6f6b4d5a2beb420f395fb1..baafe57d001961d9a8a3244fa0df53d8b580453b 100644
--- a/src/plugins/auth/munge/Makefile.am
+++ b/src/plugins/auth/munge/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(MUNGE_CPPFLAGS)
diff --git a/src/plugins/auth/munge/Makefile.in b/src/plugins/auth/munge/Makefile.in
index 162d35ae8ce47d8cbff82e0a92476725a2fc86f0..8bb3bf9b0321bc2054915e172c3563dd9f5770e7 100644
--- a/src/plugins/auth/munge/Makefile.in
+++ b/src/plugins/auth/munge/Makefile.in
@@ -313,7 +313,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(MUNGE_CPPFLAGS)
# Add your plugin to this line, following the naming conventions.
diff --git a/src/plugins/auth/munge/auth_munge.c b/src/plugins/auth/munge/auth_munge.c
index 81f3f85fa7c8580288dc5f45cbde73f54d415258..2667c4b21b282f868419cda4f4f1eadd02ca5ff7 100644
--- a/src/plugins/auth/munge/auth_munge.c
+++ b/src/plugins/auth/munge/auth_munge.c
@@ -5,34 +5,34 @@
* Copyright (C) 2002-2007 The Regents of the University of California.
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Mark Grondona <mgrondona@llnl.gov>
+ * Written by Mark Grondona <mgrondona@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -96,8 +96,8 @@
* only load authentication plugins if the plugin_type string has a prefix
* of "auth/".
*
- * plugin_version - specifies the version number of the plugin.
- * min_plug_version - specifies the minumum version number of incomming
+ * plugin_version - specifies the version number of the plugin.
+ * min_plug_version - specifies the minumum version number of incomming
* messages that this plugin can accept
*/
const char plugin_name[] = "auth plugin for Munge "
@@ -115,7 +115,7 @@ enum {
SLURM_AUTH_UNPACK = SLURM_AUTH_FIRST_LOCAL_ERROR
};
-/*
+/*
* The Munge implementation of the slurm AUTH credential
*/
typedef struct _slurm_auth_credential {
@@ -160,9 +160,9 @@ static int _decode_cred(slurm_auth_credential_t *c, char *socket);
*/
int init ( void )
{
- host_list_idx = arg_idx_by_name( slurm_auth_get_arg_desc(),
+ host_list_idx = arg_idx_by_name( slurm_auth_get_arg_desc(),
ARG_HOST_LIST );
- if (host_list_idx == -1)
+ if (host_list_idx == -1)
return SLURM_ERROR;
verbose("%s loaded", plugin_name);
@@ -217,8 +217,8 @@ slurm_auth_create( void *argv[], char *socket )
xassert(cred->magic = MUNGE_MAGIC);
/*
- * Temporarily block SIGALARM to avoid misleading
- * "Munged communication error" from libmunge if we
+ * Temporarily block SIGALARM to avoid misleading
+ * "Munged communication error" from libmunge if we
* happen to time out the connection in this secion of
* code.
*/
@@ -256,7 +256,7 @@ slurm_auth_destroy( slurm_auth_credential_t *cred )
xassert(cred->magic == MUNGE_MAGIC);
/*
- * Note: Munge cred string and application-specific data in
+ * Note: Munge cred string and application-specific data in
* "buf" not encoded with xmalloc()
*/
if (cred->m_str)
@@ -283,10 +283,10 @@ slurm_auth_verify( slurm_auth_credential_t *c, char *socket )
xassert(c->magic == MUNGE_MAGIC);
- if (c->verified)
+ if (c->verified)
return SLURM_SUCCESS;
- if (_decode_cred(c, socket) < 0)
+ if (_decode_cred(c, socket) < 0)
return SLURM_ERROR;
return SLURM_SUCCESS;
@@ -349,7 +349,7 @@ slurm_auth_pack( slurm_auth_credential_t *cred, Buf buf )
cred->cr_errno = SLURM_AUTH_BADARG;
return SLURM_ERROR;
}
-
+
xassert(cred->magic == MUNGE_MAGIC);
/*
@@ -377,17 +377,17 @@ slurm_auth_unpack( Buf buf )
char *type;
uint32_t size;
uint32_t version;
-
+
if ( buf == NULL ) {
plugin_errno = SLURM_AUTH_BADARG;
return NULL;
}
-
+
/*
* Get the authentication type.
*/
safe_unpackmem_ptr( &type, &size, buf );
-
+
if (( type == NULL ) ||
( strcmp( type, plugin_type ) != 0 )) {
plugin_errno = SLURM_AUTH_MISMATCH;
@@ -480,19 +480,19 @@ slurm_auth_errstr( int slurm_errno )
* Decode the munge encoded credential `m_str' placing results, if validated,
* into slurm credential `c'
*/
-static int
+static int
_decode_cred(slurm_auth_credential_t *c, char *socket)
{
int retry = 2;
munge_err_t e;
munge_ctx_t ctx;
- if (c == NULL)
+ if (c == NULL)
return SLURM_ERROR;
xassert(c->magic == MUNGE_MAGIC);
- if (c->verified)
+ if (c->verified)
return SLURM_SUCCESS;
if ((ctx = munge_ctx_create()) == NULL) {
@@ -507,7 +507,7 @@ _decode_cred(slurm_auth_credential_t *c, char *socket)
}
again:
- if ((e = munge_decode(c->m_str, ctx, &c->buf, &c->len, &c->uid,
+ if ((e = munge_decode(c->m_str, ctx, &c->buf, &c->len, &c->uid,
&c->gid))) {
if ((e == EMUNGE_SOCKET) && retry--) {
error ("Munge decode failed: %s (retrying ...)",
@@ -522,12 +522,12 @@ _decode_cred(slurm_auth_credential_t *c, char *socket)
if (e != EMUNGE_CRED_REPLAYED) {
#endif
/*
- * Print any valid credential data
+ * Print any valid credential data
*/
error ("Munge decode failed: %s",
munge_ctx_strerror(ctx));
- _print_cred(ctx);
-
+ _print_cred(ctx);
+
c->cr_errno = e + MUNGE_ERRNO_OFFSET;
#ifdef MULTIPLE_SLURMD
} else {
@@ -628,7 +628,7 @@ _print_cred_info(munge_info_t *mi)
/*
* Print credential information.
*/
-static void
+static void
_print_cred(munge_ctx_t ctx)
{
munge_info_t *mi = cred_info_create(ctx);
diff --git a/src/plugins/auth/none/Makefile.am b/src/plugins/auth/none/Makefile.am
index 89f520333b2f745e9660c683a1d1a59eb684d437..238a90d1a1499648ac7c37344286f7f65cff02c1 100644
--- a/src/plugins/auth/none/Makefile.am
+++ b/src/plugins/auth/none/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/auth/none/Makefile.in b/src/plugins/auth/none/Makefile.in
index 85d8acaecb861fd4dbd9a867b28a9425c7a6aa16..40ab7c9f44c6d49f58de25a8a48ff2d4dc23d194 100644
--- a/src/plugins/auth/none/Makefile.in
+++ b/src/plugins/auth/none/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = auth_none.la
diff --git a/src/plugins/auth/none/auth_none.c b/src/plugins/auth/none/auth_none.c
index 36241002a7053b0eb656a035f6b447d26dff4a6d..780dae36da4c433b33b80a26f9e5b9d8b8419c41 100644
--- a/src/plugins/auth/none/auth_none.c
+++ b/src/plugins/auth/none/auth_none.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Kevin Tew <tew1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -89,8 +89,8 @@
* only load authentication plugins if the plugin_type string has a prefix
* of "auth/".
*
- * plugin_version - specifies the version number of the plugin.
- * min_plug_version - specifies the minumum version number of incomming
+ * plugin_version - specifies the version number of the plugin.
+ * min_plug_version - specifies the minumum version number of incomming
* messages that this plugin can accept
*/
const char plugin_name[] = "Null authentication plugin";
@@ -176,7 +176,7 @@ slurm_auth_create( void *argv[], char *auth_info )
{
slurm_auth_credential_t *cred;
- cred = ((slurm_auth_credential_t *)
+ cred = ((slurm_auth_credential_t *)
xmalloc( sizeof( slurm_auth_credential_t ) ));
cred->cr_errno = SLURM_SUCCESS;
cred->uid = geteuid();
@@ -251,7 +251,7 @@ slurm_auth_pack( slurm_auth_credential_t *cred, Buf buf )
plugin_errno = SLURM_AUTH_BADARG;
return SLURM_ERROR;
}
-
+
/*
* Prefix the credential with a description of the credential
* type so that it can be sanity-checked at the receiving end.
@@ -279,7 +279,7 @@ slurm_auth_unpack( Buf buf )
uint32_t tmpint;
uint32_t version;
uint32_t size;
-
+
if ( buf == NULL ) {
plugin_errno = SLURM_AUTH_BADARG;
return NULL;
diff --git a/src/plugins/checkpoint/aix/Makefile.am b/src/plugins/checkpoint/aix/Makefile.am
index 7baac412e47a67d1dfced9afc27dda08cf2251aa..071c72dbf2abf3cfab7f359a1108829f26a17850 100644
--- a/src/plugins/checkpoint/aix/Makefile.am
+++ b/src/plugins/checkpoint/aix/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/checkpoint/aix/Makefile.in b/src/plugins/checkpoint/aix/Makefile.in
index be3778e9d25234c4f0f91d3452bc0cd163bc5b3a..e8c97b92c2bff2ba2561dc3f92ca6faf7339ab6a 100644
--- a/src/plugins/checkpoint/aix/Makefile.in
+++ b/src/plugins/checkpoint/aix/Makefile.in
@@ -316,7 +316,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
# AIX checkpoint plugin.
diff --git a/src/plugins/checkpoint/aix/checkpoint_aix.c b/src/plugins/checkpoint/aix/checkpoint_aix.c
index 48b72fb871e849c6217ee4aabd6fadf8a350ca21..74d9ae3d8afc287deda5b6e2d90e573b8bbbb92a 100644
--- a/src/plugins/checkpoint/aix/checkpoint_aix.c
+++ b/src/plugins/checkpoint/aix/checkpoint_aix.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -70,7 +70,7 @@
/* These are defined here so when we link with something other than
* the slurmctld we will have these symbols defined. They will get
- * overwritten when linking with the slurmctld.
+ * overwritten when linking with the slurmctld.
*/
struct node_record *node_record_table_ptr = NULL;
int node_record_count = 0;
@@ -87,7 +87,7 @@ struct check_job_info {
static void _send_sig(uint32_t job_id, uint32_t step_id, uint16_t signal,
char *node_name, slurm_addr node_addr);
-static int _step_sig(struct step_record * step_ptr, uint16_t wait,
+static int _step_sig(struct step_record * step_ptr, uint16_t wait,
uint16_t signal, uint16_t sig_timeout);
/* checkpoint request timeout processing */
@@ -130,7 +130,7 @@ static void _ckpt_signal_step(struct ckpt_timeout_info *rec);
* where <application> is a description of the intended application of
* the plugin (e.g., "checkpoint" for SLURM checkpoint) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load checkpoint plugins if the plugin_type string has a
+ * only load checkpoint plugins if the plugin_type string has a
* prefix of "checkpoint/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
@@ -186,9 +186,9 @@ extern int fini ( void )
* The remainder of this file implements the standard SLURM checkpoint API.
*/
-extern int slurm_ckpt_op (uint32_t job_id, uint32_t step_id,
+extern int slurm_ckpt_op (uint32_t job_id, uint32_t step_id,
struct step_record *step_ptr, uint16_t op,
- uint16_t data, char *image_dir, time_t * event_time,
+ uint16_t data, char *image_dir, time_t * event_time,
uint32_t *error_code, char **error_msg )
{
int rc = SLURM_SUCCESS;
@@ -275,7 +275,7 @@ extern int slurm_ckpt_comp ( struct step_record * step_ptr, time_t event_time,
return ESLURM_ALREADY_DONE;
if (error_code > check_ptr->error_code) {
- info("slurm_ckpt_comp for step %u.%u error %u: %s",
+ info("slurm_ckpt_comp for step %u.%u error %u: %s",
step_ptr->job_ptr->job_id, step_ptr->step_id,
error_code, error_msg);
check_ptr->error_code = error_code;
@@ -284,7 +284,7 @@ extern int slurm_ckpt_comp ( struct step_record * step_ptr, time_t event_time,
return SLURM_SUCCESS;
}
- /* We need an error-free reply from each compute node,
+ /* We need an error-free reply from each compute node,
* plus POE itself to note completion */
if (check_ptr->reply_cnt++ == check_ptr->node_cnt) {
time_t now = time(NULL);
@@ -296,7 +296,7 @@ extern int slurm_ckpt_comp ( struct step_record * step_ptr, time_t event_time,
_ckpt_dequeue_timeout(step_ptr->job_ptr->job_id,
step_ptr->step_id, event_time);
}
- return SLURM_SUCCESS;
+ return SLURM_SUCCESS;
}
extern int slurm_ckpt_alloc_job(check_jobinfo_t *jobinfo)
@@ -313,9 +313,9 @@ extern int slurm_ckpt_free_job(check_jobinfo_t jobinfo)
extern int slurm_ckpt_pack_job(check_jobinfo_t jobinfo, Buf buffer)
{
- struct check_job_info *check_ptr =
+ struct check_job_info *check_ptr =
(struct check_job_info *)jobinfo;
-
+
pack16(check_ptr->disabled, buffer);
pack16(check_ptr->node_cnt, buffer);
pack16(check_ptr->reply_cnt, buffer);
@@ -342,8 +342,8 @@ extern int slurm_ckpt_unpack_job(check_jobinfo_t jobinfo, Buf buffer)
safe_unpack32(&check_ptr->error_code, buffer);
safe_unpackstr_xmalloc(&check_ptr->error_msg, &uint32_tmp, buffer);
safe_unpack_time(&check_ptr->time_stamp, buffer);
-
- return SLURM_SUCCESS;
+
+ return SLURM_SUCCESS;
unpack_error:
xfree(check_ptr->error_msg);
@@ -351,7 +351,7 @@ extern int slurm_ckpt_unpack_job(check_jobinfo_t jobinfo, Buf buffer)
}
/* Send a signal RPC to a specific node */
-static void _send_sig(uint32_t job_id, uint32_t step_id, uint16_t signal,
+static void _send_sig(uint32_t job_id, uint32_t step_id, uint16_t signal,
char *node_name, slurm_addr node_addr)
{
agent_arg_t *agent_args;
@@ -372,9 +372,9 @@ static void _send_sig(uint32_t job_id, uint32_t step_id, uint16_t signal,
agent_queue_request(agent_args);
}
-/* Send specified signal only to the process launched on node 0.
+/* Send specified signal only to the process launched on node 0.
* If the request times out, send sig_timeout. */
-static int _step_sig(struct step_record * step_ptr, uint16_t wait,
+static int _step_sig(struct step_record * step_ptr, uint16_t wait,
uint16_t signal, uint16_t sig_timeout)
{
struct check_job_info *check_ptr;
@@ -402,10 +402,10 @@ static int _step_sig(struct step_record * step_ptr, uint16_t wait,
_send_sig(step_ptr->job_ptr->job_id, step_ptr->step_id,
signal, node_record_table_ptr[i].name,
node_record_table_ptr[i].slurm_addr);
- _ckpt_enqueue_timeout(step_ptr->job_ptr->job_id,
- step_ptr->step_id, check_ptr->time_stamp,
+ _ckpt_enqueue_timeout(step_ptr->job_ptr->job_id,
+ step_ptr->step_id, check_ptr->time_stamp,
sig_timeout, wait, node_record_table_ptr[i].name,
- node_record_table_ptr[i].slurm_addr);
+ node_record_table_ptr[i].slurm_addr);
}
if (!check_ptr->node_cnt) {
@@ -442,7 +442,7 @@ static void *_ckpt_agent_thr(void *arg)
while ((rec = list_next(iter))) {
if (rec->end_time > now)
continue;
- info("checkpoint timeout for %u.%u",
+ info("checkpoint timeout for %u.%u",
rec->job_id, rec->step_id);
_ckpt_signal_step(rec);
list_delete_item(iter);
@@ -460,7 +460,7 @@ static void _ckpt_signal_step(struct ckpt_timeout_info *rec)
}
/* Queue a checkpoint request timeout */
-static void _ckpt_enqueue_timeout(uint32_t job_id, uint32_t step_id,
+static void _ckpt_enqueue_timeout(uint32_t job_id, uint32_t step_id,
time_t start_time, uint16_t signal, uint16_t wait_time,
char *node_name, slurm_addr node_addr)
{
@@ -488,7 +488,7 @@ static void _ckpt_enqueue_timeout(uint32_t job_id, uint32_t step_id,
static void _ckpt_timeout_free(void *rec)
{
struct ckpt_timeout_info *ckpt_rec = (struct ckpt_timeout_info *)rec;
-
+
if (ckpt_rec) {
xfree(ckpt_rec->node_name);
xfree(ckpt_rec);
@@ -519,7 +519,7 @@ static void _ckpt_dequeue_timeout(uint32_t job_id, uint32_t step_id,
slurm_mutex_unlock(&ckpt_agent_mutex);
}
-extern int slurm_ckpt_task_comp ( struct step_record * step_ptr,
+extern int slurm_ckpt_task_comp ( struct step_record * step_ptr,
uint32_t task_id, time_t event_time,
uint32_t error_code, char *error_msg )
{
diff --git a/src/plugins/checkpoint/blcr/Makefile.am b/src/plugins/checkpoint/blcr/Makefile.am
index bf629b6ca2c9ecaf93e4ea57a5246f973c56b2a8..91de9cfbb03142289f322739920c3fddfa0cda61 100644
--- a/src/plugins/checkpoint/blcr/Makefile.am
+++ b/src/plugins/checkpoint/blcr/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/checkpoint/blcr/Makefile.in b/src/plugins/checkpoint/blcr/Makefile.in
index 1cac8cd1b7fa39345d54788f68762b778bda4a52..7ed4d578ce35f457b43cfd37dfa371b8753bdd6f 100644
--- a/src/plugins/checkpoint/blcr/Makefile.in
+++ b/src/plugins/checkpoint/blcr/Makefile.in
@@ -321,7 +321,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
@WITH_BLCR_TRUE@pkglib_LTLIBRARIES = checkpoint_blcr.la
@WITH_BLCR_TRUE@checkpoint_blcr_la_SOURCES = checkpoint_blcr.c
diff --git a/src/plugins/checkpoint/blcr/checkpoint_blcr.c b/src/plugins/checkpoint/blcr/checkpoint_blcr.c
index ba66d0f7fab36e27a6aa5f93eab87807fce8f060..cc940b63c48d4a708d7bffd8c1fb1216bf6a6e8a 100644
--- a/src/plugins/checkpoint/blcr/checkpoint_blcr.c
+++ b/src/plugins/checkpoint/blcr/checkpoint_blcr.c
@@ -6,31 +6,31 @@
* Copyright (C) 2007-2009 National University of Defense Technology, China.
* Written by Hongia Cao.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <http://www.llnl.gov/linux/slurm/>.
- *
+ *
* 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
+ * 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
+ * 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.
@@ -93,7 +93,7 @@ struct ckpt_req {
uint16_t sig_done;
};
-static void _send_sig(uint32_t job_id, uint32_t step_id, uint16_t signal,
+static void _send_sig(uint32_t job_id, uint32_t step_id, uint16_t signal,
char *nodelist);
static void _send_sig(uint32_t job_id, uint32_t step_id,
uint16_t signal, char *nodelist);
@@ -133,7 +133,7 @@ static pthread_cond_t ckpt_agent_cond = PTHREAD_COND_INITIALIZER;
* where <application> is a description of the intended application of
* the plugin (e.g., "checkpoint" for SLURM checkpoint) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load checkpoint plugins if the plugin_type string has a
+ * only load checkpoint plugins if the plugin_type string has a
* prefix of "checkpoint/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
@@ -166,9 +166,9 @@ extern int fini ( void )
/*
* The remainder of this file implements the standard SLURM checkpoint API.
*/
-extern int slurm_ckpt_op (uint32_t job_id, uint32_t step_id,
+extern int slurm_ckpt_op (uint32_t job_id, uint32_t step_id,
struct step_record *step_ptr, uint16_t op,
- uint16_t data, char *image_dir, time_t * event_time,
+ uint16_t data, char *image_dir, time_t * event_time,
uint32_t *error_code, char **error_msg )
{
int rc = SLURM_SUCCESS;
@@ -225,7 +225,7 @@ extern int slurm_ckpt_op (uint32_t job_id, uint32_t step_id,
rc = EALREADY;
break;
}
-
+
check_ptr->time_stamp = time(NULL);
check_ptr->error_code = 0;
xfree(check_ptr->error_msg);
@@ -246,14 +246,14 @@ extern int slurm_ckpt_op (uint32_t job_id, uint32_t step_id,
req_ptr->sig_done = done_sig;
slurm_attr_init(&attr);
- if (pthread_attr_setdetachstate(&attr,
+ if (pthread_attr_setdetachstate(&attr,
PTHREAD_CREATE_DETACHED)) {
error("pthread_attr_setdetachstate: %m");
rc = errno;
break;
}
-
- if (pthread_create(&ckpt_agent_tid, &attr, _ckpt_agent_thr,
+
+ if (pthread_create(&ckpt_agent_tid, &attr, _ckpt_agent_thr,
req_ptr)) {
error("pthread_create: %m");
rc = errno;
@@ -262,7 +262,7 @@ extern int slurm_ckpt_op (uint32_t job_id, uint32_t step_id,
slurm_attr_destroy(&attr);
break;
-
+
case CHECK_RESTART:
if (step_id != SLURM_BATCH_SCRIPT) {
rc = ESLURM_NOT_SUPPORTED;
@@ -272,7 +272,7 @@ extern int slurm_ckpt_op (uint32_t job_id, uint32_t step_id,
rc = ESLURM_NOT_SUPPORTED;
/* TODO: save job script */
break;
-
+
case CHECK_ERROR:
xassert(error_code);
xassert(error_msg);
@@ -292,15 +292,15 @@ extern int slurm_ckpt_comp ( struct step_record * step_ptr, time_t event_time,
uint32_t error_code, char *error_msg )
{
error("checkpoint/blcr: slurm_ckpt_comp not implemented");
- return SLURM_FAILURE;
+ return SLURM_FAILURE;
}
-extern int slurm_ckpt_task_comp ( struct step_record * step_ptr,
- uint32_t task_id, time_t event_time,
+extern int slurm_ckpt_task_comp ( struct step_record * step_ptr,
+ uint32_t task_id, time_t event_time,
uint32_t error_code, char *error_msg )
{
error("checkpoint/blcr: slurm_ckpt_task_comp not implemented");
- return SLURM_FAILURE;
+ return SLURM_FAILURE;
}
extern int slurm_ckpt_alloc_job(check_jobinfo_t *jobinfo)
@@ -323,9 +323,9 @@ extern int slurm_ckpt_free_job(check_jobinfo_t jobinfo)
extern int slurm_ckpt_pack_job(check_jobinfo_t jobinfo, Buf buffer)
{
- struct check_job_info *check_ptr =
+ struct check_job_info *check_ptr =
(struct check_job_info *)jobinfo;
-
+
pack16(check_ptr->disabled, buffer);
pack_time(check_ptr->time_stamp, buffer);
pack32(check_ptr->error_code, buffer);
@@ -344,8 +344,8 @@ extern int slurm_ckpt_unpack_job(check_jobinfo_t jobinfo, Buf buffer)
safe_unpack_time(&check_ptr->time_stamp, buffer);
safe_unpack32(&check_ptr->error_code, buffer);
safe_unpackstr_xmalloc(&check_ptr->error_msg, &uint32_tmp, buffer);
-
- return SLURM_SUCCESS;
+
+ return SLURM_SUCCESS;
unpack_error:
xfree(check_ptr->error_msg);
@@ -355,7 +355,7 @@ extern int slurm_ckpt_unpack_job(check_jobinfo_t jobinfo, Buf buffer)
extern int slurm_ckpt_stepd_prefork(slurmd_job_t *job)
{
char *old_env = NULL, *new_env = NULL, *ptr = NULL, *save_ptr = NULL;
-
+
/*
* I was thinking that a thread can be created here to
* communicate with the tasks via sockets/pipes.
@@ -402,7 +402,7 @@ extern int slurm_ckpt_signal_tasks(slurmd_job_t *job, char *image_dir)
int i;
char c;
- debug3("checkpoint/blcr: slurm_ckpt_signal_tasks: image_dir=%s",
+ debug3("checkpoint/blcr: slurm_ckpt_signal_tasks: image_dir=%s",
image_dir);
/*
* the tasks must be checkpointed concurrently.
@@ -465,7 +465,7 @@ extern int slurm_ckpt_signal_tasks(slurmd_job_t *job, char *image_dir)
"failed to chdir: %m");
exit(errno);
}
-
+
argv[0] = cr_checkpoint_path;
argv[1] = pid;
argv[2] = context_file;
@@ -504,7 +504,7 @@ extern int slurm_ckpt_restart_task(slurmd_job_t *job, char *image_dir, int gtid)
char *argv[3];
char context_file[MAX_PATH_LEN];
- /* jobid and stepid must NOT be spelled here,
+ /* jobid and stepid must NOT be spelled here,
* since it is a new job/step */
if (job->batch) {
sprintf(context_file, "%s/script.ckpt", image_dir);
@@ -524,7 +524,7 @@ extern int slurm_ckpt_restart_task(slurmd_job_t *job, char *image_dir, int gtid)
/* Send a signal RPC to a list of nodes */
-static void _send_sig(uint32_t job_id, uint32_t step_id, uint16_t signal,
+static void _send_sig(uint32_t job_id, uint32_t step_id, uint16_t signal,
char *nodelist)
{
agent_arg_t *agent_args;
@@ -553,7 +553,7 @@ static void *_ckpt_agent_thr(void *arg)
struct ckpt_req *req = (struct ckpt_req *)arg;
int rc;
/* Locks: write job */
- slurmctld_lock_t job_write_lock = {
+ slurmctld_lock_t job_write_lock = {
NO_LOCK, WRITE_LOCK, NO_LOCK, NO_LOCK };
struct job_record *job_ptr;
struct step_record *step_ptr;
@@ -570,12 +570,12 @@ static void *_ckpt_agent_thr(void *arg)
debug3("checkpoint/blcr: sending checkpoint tasks request to %u.%u",
req->job_id, req->step_id);
-
+
rc = checkpoint_tasks(req->job_id, req->step_id, req->begin_time,
req->image_dir, req->wait, req->nodelist);
lock_slurmctld(job_write_lock);
-
+
job_ptr = find_job_record(req->job_id);
if (!job_ptr) {
error("_ckpt_agent_thr: job finished");
@@ -598,13 +598,13 @@ static void *_ckpt_agent_thr(void *arg)
out:
unlock_slurmctld(job_write_lock);
-
+
if (req->sig_done) {
- _send_sig(req->job_id, req->step_id, req->sig_done,
+ _send_sig(req->job_id, req->step_id, req->sig_done,
req->nodelist);
}
- _on_ckpt_complete(req->gid, req->uid, req->job_id, req->step_id,
+ _on_ckpt_complete(req->gid, req->uid, req->job_id, req->step_id,
req->image_dir, rc);
slurm_mutex_lock(&ckpt_agent_mutex);
@@ -622,7 +622,7 @@ static void *_ckpt_agent_thr(void *arg)
static void _ckpt_req_free(void *ptr)
{
struct ckpt_req *req = (struct ckpt_req *)ptr;
-
+
if (req) {
xfree(req->image_dir);
xfree(req->nodelist);
@@ -648,11 +648,11 @@ static int _on_ckpt_complete(uint32_t group_id, uint32_t user_id,
error ("_on_ckpt_complete: fork: %m");
return SLURM_ERROR;
}
-
+
if (cpid == 0) {
/*
- * We don't fork and wait the child process because the job
- * read lock is held. It could take minutes to delete/move
+ * We don't fork and wait the child process because the job
+ * read lock is held. It could take minutes to delete/move
* the checkpoint image files. So there is a race condition
* of the user requesting another checkpoint before SCCH
* finishes.
@@ -668,7 +668,7 @@ static int _on_ckpt_complete(uint32_t group_id, uint32_t user_id,
char str_job[11];
char str_step[11];
char str_err[11];
-
+
/*
* XXX: if slurmctld is running as root, we must setuid here.
* But what if slurmctld is running as SlurmUser?
diff --git a/src/plugins/checkpoint/none/Makefile.am b/src/plugins/checkpoint/none/Makefile.am
index 48fb803c7e86e8b86e1944690bdaf537ec79e1b3..1ce67ad0608a11796469ca8d77720394ccc651cd 100644
--- a/src/plugins/checkpoint/none/Makefile.am
+++ b/src/plugins/checkpoint/none/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/checkpoint/none/Makefile.in b/src/plugins/checkpoint/none/Makefile.in
index b3cb11b7af7275561c538ccd5e51de16ba62d84c..5ef4b7e17e59888be121ffad86295d6fcc3d82dd 100644
--- a/src/plugins/checkpoint/none/Makefile.in
+++ b/src/plugins/checkpoint/none/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = checkpoint_none.la
diff --git a/src/plugins/checkpoint/none/checkpoint_none.c b/src/plugins/checkpoint/none/checkpoint_none.c
index b05b00dd27f7e9a8a18dd983c61c9783a49a0590..4e4259c51bd31218476900241ec0bc3312196321 100644
--- a/src/plugins/checkpoint/none/checkpoint_none.c
+++ b/src/plugins/checkpoint/none/checkpoint_none.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -73,7 +73,7 @@
* where <application> is a description of the intended application of
* the plugin (e.g., "checkpoint" for SLURM checkpoint) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load checkpoint plugins if the plugin_type string has a
+ * only load checkpoint plugins if the plugin_type string has a
* prefix of "checkpoint/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
@@ -104,9 +104,9 @@ extern int fini ( void )
* The remainder of this file implements the standard SLURM checkpoint API.
*/
-extern int slurm_ckpt_op (uint32_t job_id, uint32_t step_id,
+extern int slurm_ckpt_op (uint32_t job_id, uint32_t step_id,
struct step_record *step_ptr, uint16_t op,
- uint16_t data, char *image_dir, time_t * event_time,
+ uint16_t data, char *image_dir, time_t * event_time,
uint32_t *error_code, char **error_msg )
{
return ESLURM_NOT_SUPPORTED;
@@ -138,8 +138,8 @@ extern int slurm_ckpt_unpack_job(check_jobinfo_t jobinfo, Buf buffer)
return SLURM_SUCCESS;
}
-extern int slurm_ckpt_task_comp (struct step_record * step_ptr,
- uint32_t task_id, time_t event_time,
+extern int slurm_ckpt_task_comp (struct step_record * step_ptr,
+ uint32_t task_id, time_t event_time,
uint32_t error_code, char *error_msg )
{
return SLURM_SUCCESS;
diff --git a/src/plugins/checkpoint/ompi/Makefile.am b/src/plugins/checkpoint/ompi/Makefile.am
index b80b0d190d956137668925aed5363bafb3cbb3e9..e2f5f74b594a582be2e94aab18b3c505c66d00c9 100644
--- a/src/plugins/checkpoint/ompi/Makefile.am
+++ b/src/plugins/checkpoint/ompi/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/checkpoint/ompi/Makefile.in b/src/plugins/checkpoint/ompi/Makefile.in
index 6f48bfdec49e932a691c7dc3db02a424b29998b9..d65314dbb0fa16940968dcd2d9da7e77a0b79de6 100644
--- a/src/plugins/checkpoint/ompi/Makefile.in
+++ b/src/plugins/checkpoint/ompi/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = checkpoint_ompi.la
diff --git a/src/plugins/checkpoint/ompi/checkpoint_ompi.c b/src/plugins/checkpoint/ompi/checkpoint_ompi.c
index 513fc93f289c2199f69dc3007a28dc43cd6db370..a69ce989aa9ddb67995a0d68b7e2e58839983c8a 100644
--- a/src/plugins/checkpoint/ompi/checkpoint_ompi.c
+++ b/src/plugins/checkpoint/ompi/checkpoint_ompi.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -89,7 +89,7 @@ static int _ckpt_step(struct step_record * step_ptr, uint16_t wait, int vacate);
* where <application> is a description of the intended application of
* the plugin (e.g., "checkpoint" for SLURM checkpoint) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load checkpoint plugins if the plugin_type string has a
+ * only load checkpoint plugins if the plugin_type string has a
* prefix of "checkpoint/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
@@ -123,9 +123,9 @@ extern int fini ( void )
* The remainder of this file implements the standard SLURM checkpoint API.
*/
-extern int slurm_ckpt_op (uint32_t job_id, uint32_t step_id,
+extern int slurm_ckpt_op (uint32_t job_id, uint32_t step_id,
struct step_record *step_ptr, uint16_t op,
- uint16_t data, char *image_dir, time_t * event_time,
+ uint16_t data, char *image_dir, time_t * event_time,
uint32_t *error_code, char **error_msg )
{
int rc = SLURM_SUCCESS;
@@ -192,7 +192,7 @@ extern int slurm_ckpt_op (uint32_t job_id, uint32_t step_id,
extern int slurm_ckpt_comp (struct step_record * step_ptr, time_t event_time,
uint32_t error_code, char *error_msg)
{
-/* FIXME: How do we tell when checkpoint completes?
+/* FIXME: How do we tell when checkpoint completes?
* Add another RPC from srun to slurmctld?
* Where is this called from? */
struct check_job_info *check_ptr;
@@ -208,7 +208,7 @@ extern int slurm_ckpt_comp (struct step_record * step_ptr, time_t event_time,
return ESLURM_ALREADY_DONE;
if (error_code > check_ptr->error_code) {
- info("slurm_ckpt_comp for step %u.%u error %u: %s",
+ info("slurm_ckpt_comp for step %u.%u error %u: %s",
step_ptr->job_ptr->job_id, step_ptr->step_id,
error_code, error_msg);
check_ptr->error_code = error_code;
@@ -228,7 +228,7 @@ extern int slurm_ckpt_comp (struct step_record * step_ptr, time_t event_time,
check_ptr->reply_cnt++;
check_ptr->time_stamp = now;
- return SLURM_SUCCESS;
+ return SLURM_SUCCESS;
}
extern int slurm_ckpt_alloc_job(check_jobinfo_t *jobinfo)
@@ -245,9 +245,9 @@ extern int slurm_ckpt_free_job(check_jobinfo_t jobinfo)
extern int slurm_ckpt_pack_job(check_jobinfo_t jobinfo, Buf buffer)
{
- struct check_job_info *check_ptr =
+ struct check_job_info *check_ptr =
(struct check_job_info *)jobinfo;
-
+
pack16(check_ptr->disabled, buffer);
pack16(check_ptr->reply_cnt, buffer);
pack16(check_ptr->wait_time, buffer);
@@ -272,8 +272,8 @@ extern int slurm_ckpt_unpack_job(check_jobinfo_t jobinfo, Buf buffer)
safe_unpack32(&check_ptr->error_code, buffer);
safe_unpackstr_xmalloc(&check_ptr->error_msg, &uint32_tmp, buffer);
safe_unpack_time(&check_ptr->time_stamp, buffer);
-
- return SLURM_SUCCESS;
+
+ return SLURM_SUCCESS;
unpack_error:
xfree(check_ptr->error_msg);
@@ -307,12 +307,12 @@ static int _ckpt_step(struct step_record * step_ptr, uint16_t wait, int vacate)
srun_exec(step_ptr, argv);
check_ptr->time_stamp = time(NULL);
check_ptr->wait_time = wait;
- info("checkpoint requested for job %u.%u",
+ info("checkpoint requested for job %u.%u",
job_ptr->job_id, step_ptr->step_id);
return SLURM_SUCCESS;
}
-extern int slurm_ckpt_task_comp ( struct step_record * step_ptr,
+extern int slurm_ckpt_task_comp ( struct step_record * step_ptr,
uint32_t task_id, time_t event_time,
uint32_t error_code, char *error_msg )
{
diff --git a/src/plugins/checkpoint/xlch/Makefile.am b/src/plugins/checkpoint/xlch/Makefile.am
index 67c1f5c6439093d747003766e26b15988db307dd..4f06518c613eac167f80edb6668eda5d9a4200dd 100644
--- a/src/plugins/checkpoint/xlch/Makefile.am
+++ b/src/plugins/checkpoint/xlch/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/checkpoint/xlch/Makefile.in b/src/plugins/checkpoint/xlch/Makefile.in
index 605326ef768390d12d9702301cc9dcd2d2f8b4ef..e204357ae13b26dbbbde3b9055723a0f8db8e4e7 100644
--- a/src/plugins/checkpoint/xlch/Makefile.in
+++ b/src/plugins/checkpoint/xlch/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = checkpoint_xlch.la
checkpoint_xlch_la_SOURCES = checkpoint_xlch.c
diff --git a/src/plugins/checkpoint/xlch/checkpoint_xlch.c b/src/plugins/checkpoint/xlch/checkpoint_xlch.c
index 9852e1ed6b90d5f2ce22d2063eda3c0752d89247..f0627a264a60c0c32a108e128a0ee2153cf6e27c 100644
--- a/src/plugins/checkpoint/xlch/checkpoint_xlch.c
+++ b/src/plugins/checkpoint/xlch/checkpoint_xlch.c
@@ -6,32 +6,32 @@
* Copyright (C) 2007-2009 National University of Defense Technology, China.
* Written by Hongia Cao.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -85,10 +85,10 @@ struct check_job_info {
pthread_mutex_t mutex;
};
-static void _send_sig(uint32_t job_id, uint32_t step_id, uint16_t signal,
+static void _send_sig(uint32_t job_id, uint32_t step_id, uint16_t signal,
char *nodelist);
-static int _step_ckpt(struct step_record * step_ptr, uint16_t wait,
+static int _step_ckpt(struct step_record * step_ptr, uint16_t wait,
char *image_dir, uint16_t sig_timeout);
/* checkpoint request timeout processing */
@@ -104,7 +104,7 @@ struct ckpt_timeout_info {
char* nodelist;
};
static void *_ckpt_agent_thr(void *arg);
-static void _ckpt_enqueue_timeout(uint32_t job_id, uint32_t step_id,
+static void _ckpt_enqueue_timeout(uint32_t job_id, uint32_t step_id,
time_t start_time, uint16_t signal,
uint16_t wait_time, char *nodelist);
static void _ckpt_dequeue_timeout(uint32_t job_id, uint32_t step_id,
@@ -135,7 +135,7 @@ static char *scch_path = SLURM_PREFIX "/sbin/scch";
* where <application> is a description of the intended application of
* the plugin (e.g., "checkpoint" for SLURM checkpoint) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load checkpoint plugins if the plugin_type string has a
+ * only load checkpoint plugins if the plugin_type string has a
* prefix of "checkpoint/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
@@ -191,9 +191,9 @@ extern int fini ( void )
* The remainder of this file implements the standard SLURM checkpoint API.
*/
-extern int slurm_ckpt_op (uint32_t job_id, uint32_t step_id,
+extern int slurm_ckpt_op (uint32_t job_id, uint32_t step_id,
struct step_record *step_ptr, uint16_t op,
- uint16_t data, char *image_dir, time_t * event_time,
+ uint16_t data, char *image_dir, time_t * event_time,
uint32_t *error_code, char **error_msg )
{
int rc = SLURM_SUCCESS;
@@ -202,14 +202,14 @@ extern int slurm_ckpt_op (uint32_t job_id, uint32_t step_id,
/* checkpoint/xlch does not support checkpoint batch jobs */
if (step_id == SLURM_BATCH_SCRIPT)
return ESLURM_NOT_SUPPORTED;
-
+
xassert(step_ptr);
check_ptr = (struct check_job_info *) step_ptr->check_job;
check_ptr->task_cnt = step_ptr->step_layout->task_cnt; /* set it early */
xassert(check_ptr);
slurm_mutex_lock (&check_ptr->mutex);
-
+
switch (op) {
case CHECK_ABLE:
if (check_ptr->disabled)
@@ -277,7 +277,7 @@ extern int slurm_ckpt_comp ( struct step_record * step_ptr, time_t event_time,
uint32_t error_code, char *error_msg )
{
error("checkpoint/xlch: slurm_ckpt_comp not implemented");
- return ESLURM_NOT_SUPPORTED;
+ return ESLURM_NOT_SUPPORTED;
}
extern int slurm_ckpt_task_comp ( struct step_record * step_ptr, uint32_t task_id,
@@ -298,7 +298,7 @@ extern int slurm_ckpt_task_comp ( struct step_record * step_ptr, uint32_t task_i
slurm_mutex_lock (&check_ptr->mutex);
/*
- * for now we do not use event_time to identify operation and always
+ * for now we do not use event_time to identify operation and always
* set it 0
* TODO: consider send event_time to the task via sigqueue().
*/
@@ -311,9 +311,9 @@ extern int slurm_ckpt_task_comp ( struct step_record * step_ptr, uint32_t task_i
rc = ESLURM_ALREADY_DONE;
goto out;
}
-
+
if ((uint16_t)task_id >= check_ptr->task_cnt) {
- error("invalid task_id %u, task_cnt: %hu", task_id,
+ error("invalid task_id %u, task_cnt: %hu", task_id,
check_ptr->task_cnt);
rc = EINVAL;
goto out;
@@ -343,11 +343,11 @@ extern int slurm_ckpt_task_comp ( struct step_record * step_ptr, uint32_t task_i
FREE_NULL_BITMAP (check_ptr->replied);
if (check_ptr->sig_done) {
- info ("checkpoint step %u.%hu done, sending signal %hu",
+ info ("checkpoint step %u.%hu done, sending signal %hu",
step_ptr->job_ptr->job_id,
step_ptr->step_id, check_ptr->sig_done);
_send_sig(step_ptr->job_ptr->job_id, step_ptr->step_id,
- check_ptr->sig_done,
+ check_ptr->sig_done,
step_ptr->step_layout->node_list);
}
@@ -358,7 +358,7 @@ extern int slurm_ckpt_task_comp ( struct step_record * step_ptr, uint32_t task_i
out:
slurm_mutex_unlock (&check_ptr->mutex);
- return rc;
+ return rc;
}
extern int slurm_ckpt_alloc_job(check_jobinfo_t *jobinfo)
@@ -384,9 +384,9 @@ extern int slurm_ckpt_free_job(check_jobinfo_t jobinfo)
extern int slurm_ckpt_pack_job(check_jobinfo_t jobinfo, Buf buffer)
{
- struct check_job_info *check_ptr =
+ struct check_job_info *check_ptr =
(struct check_job_info *)jobinfo;
-
+
pack16(check_ptr->disabled, buffer);
pack16(check_ptr->task_cnt, buffer);
pack16(check_ptr->reply_cnt, buffer);
@@ -423,8 +423,8 @@ extern int slurm_ckpt_unpack_job(check_jobinfo_t jobinfo, Buf buffer)
safe_unpack32(&check_ptr->error_code, buffer);
safe_unpackstr_xmalloc(&check_ptr->error_msg, &uint32_tmp, buffer);
safe_unpack_time(&check_ptr->time_stamp, buffer);
-
- return SLURM_SUCCESS;
+
+ return SLURM_SUCCESS;
unpack_error:
xfree(check_ptr->error_msg);
@@ -432,7 +432,7 @@ extern int slurm_ckpt_unpack_job(check_jobinfo_t jobinfo, Buf buffer)
}
/* Send a signal RPC to a list of nodes */
-static void _send_sig(uint32_t job_id, uint32_t step_id, uint16_t signal,
+static void _send_sig(uint32_t job_id, uint32_t step_id, uint16_t signal,
char *nodelist)
{
agent_arg_t *agent_args;
@@ -474,7 +474,7 @@ static int _step_ckpt(struct step_record * step_ptr, uint16_t wait,
return ESLURM_DISABLED;
if (!check_ptr->task_cnt) {
- error("_step_ckpt: job %u.%u has no tasks to checkpoint",
+ error("_step_ckpt: job %u.%u has no tasks to checkpoint",
job_ptr->job_id,
step_ptr->step_id);
return ESLURM_INVALID_NODE_NAME;
@@ -484,11 +484,11 @@ static int _step_ckpt(struct step_record * step_ptr, uint16_t wait,
checkpoint_tasks(step_ptr->job_ptr->job_id, step_ptr->step_id,
check_ptr->time_stamp, image_dir, wait, nodelist);
-
- _ckpt_enqueue_timeout(step_ptr->job_ptr->job_id,
- step_ptr->step_id, check_ptr->time_stamp,
- sig_timeout, check_ptr->wait_time, nodelist);
-
+
+ _ckpt_enqueue_timeout(step_ptr->job_ptr->job_id,
+ step_ptr->step_id, check_ptr->time_stamp,
+ sig_timeout, check_ptr->wait_time, nodelist);
+
info("checkpoint requested for job %u.%u", job_ptr->job_id,
step_ptr->step_id);
xfree (nodelist);
@@ -522,7 +522,7 @@ static void *_ckpt_agent_thr(void *arg)
while ((rec = list_next(iter))) {
if (rec->end_time > now)
continue;
- info("checkpoint timeout for %u.%u",
+ info("checkpoint timeout for %u.%u",
rec->job_id, rec->step_id);
_ckpt_signal_step(rec);
list_delete_item(iter);
@@ -534,7 +534,7 @@ static void *_ckpt_agent_thr(void *arg)
}
/* Queue a checkpoint request timeout */
-static void _ckpt_enqueue_timeout(uint32_t job_id, uint32_t step_id,
+static void _ckpt_enqueue_timeout(uint32_t job_id, uint32_t step_id,
time_t start_time, uint16_t signal,
uint16_t wait_time, char *nodelist)
{
@@ -561,7 +561,7 @@ static void _ckpt_enqueue_timeout(uint32_t job_id, uint32_t step_id,
static void _ckpt_timeout_free(void *rec)
{
struct ckpt_timeout_info *ckpt_rec = (struct ckpt_timeout_info *)rec;
-
+
if (ckpt_rec) {
xfree(ckpt_rec->nodelist);
xfree(ckpt_rec);
@@ -608,11 +608,11 @@ static int _on_ckpt_complete(struct step_record *step_ptr, uint32_t error_code)
error ("_on_ckpt_complete: fork: %m");
return SLURM_ERROR;
}
-
+
if (cpid == 0) {
/*
- * We don't fork and wait the child process because the job
- * read lock is held. It could take minutes to delete/move
+ * We don't fork and wait the child process because the job
+ * read lock is held. It could take minutes to delete/move
* the checkpoint image files. So there is a race condition
* of the user requesting another checkpoint before SCCH
* finishes.
@@ -628,7 +628,7 @@ static int _on_ckpt_complete(struct step_record *step_ptr, uint32_t error_code)
char str_job[11];
char str_step[11];
char str_err[11];
-
+
/*
* XXX: if slurmctld is running as root, we must setuid here.
* But what if slurmctld is running as SlurmUser?
@@ -646,11 +646,11 @@ static int _on_ckpt_complete(struct step_record *step_ptr, uint32_t error_code)
exit(127);
}
}
- snprintf(str_job, sizeof(str_job), "%u",
+ snprintf(str_job, sizeof(str_job), "%u",
step_ptr->job_ptr->job_id);
- snprintf(str_step, sizeof(str_step), "%hu",
+ snprintf(str_step, sizeof(str_step), "%hu",
step_ptr->step_id);
- snprintf(str_err, sizeof(str_err), "%u",
+ snprintf(str_err, sizeof(str_err), "%u",
error_code);
args[0] = scch_path;
@@ -691,7 +691,7 @@ extern int slurm_ckpt_signal_tasks(void *slurmd_job)
extern int slurm_ckpt_restart_task(void *slurmd_job, char *image_dir, int gtid)
{
char buf[256];
-
+
if (snprintf(buf, sizeof(buf), "%s/task.%d.ckpt", image_dir, gtid) >= sizeof(buf)) {
error("slurm buffer size too small");
return SLURM_FAILURE;
diff --git a/src/plugins/crypto/munge/Makefile.am b/src/plugins/crypto/munge/Makefile.am
index 319f41728d5c94ba66e108700f6d2e75f09116e4..12d0f74d97eeebd852cc9c74eeb1b7b6c9dbbf40 100644
--- a/src/plugins/crypto/munge/Makefile.am
+++ b/src/plugins/crypto/munge/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(MUNGE_CPPFLAGS)
diff --git a/src/plugins/crypto/munge/Makefile.in b/src/plugins/crypto/munge/Makefile.in
index 73acf66d9e791c828baa543a792f8c8cfcd72fcb..51274c0ddad67ee25561b8f2b26a2231430368d0 100644
--- a/src/plugins/crypto/munge/Makefile.in
+++ b/src/plugins/crypto/munge/Makefile.in
@@ -313,7 +313,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(MUNGE_CPPFLAGS)
# Add your plugin to this line, following the naming conventions.
diff --git a/src/plugins/crypto/munge/crypto_munge.c b/src/plugins/crypto/munge/crypto_munge.c
index bcc2b3c1072fb4e79a34574c841322830db97596..639561aba17710ed680204db08ce09cea09f9035 100644
--- a/src/plugins/crypto/munge/crypto_munge.c
+++ b/src/plugins/crypto/munge/crypto_munge.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark A. Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -119,7 +119,7 @@ extern int init ( void )
}
/*
- * fini() is called when the plugin is unloaded,
+ * fini() is called when the plugin is unloaded,
* free any global memory allocations here to avoid memory leaks.
*/
extern int fini ( void )
@@ -153,7 +153,7 @@ crypto_read_private_key(const char *path)
* as non-privileged users cannot get at the contents of job
* credentials.
*/
- err = munge_ctx_set(ctx, MUNGE_OPT_UID_RESTRICTION,
+ err = munge_ctx_set(ctx, MUNGE_OPT_UID_RESTRICTION,
slurm_get_slurmd_user_id());
if (err != EMUNGE_SUCCESS) {
@@ -192,8 +192,8 @@ crypto_str_error(int errnum)
/* NOTE: Caller must xfree the signature returned by sig_pp */
extern int
-crypto_sign(void * key, char *buffer, int buf_size, char **sig_pp,
- unsigned int *sig_size_p)
+crypto_sign(void * key, char *buffer, int buf_size, char **sig_pp,
+ unsigned int *sig_size_p)
{
char *cred;
munge_err_t err;
@@ -206,12 +206,12 @@ crypto_sign(void * key, char *buffer, int buf_size, char **sig_pp,
*sig_size_p = strlen(cred) + 1;
*sig_pp = xstrdup(cred);
- free(cred);
+ free(cred);
return 0;
}
extern int
-crypto_verify_sign(void * key, char *buffer, unsigned int buf_size,
+crypto_verify_sign(void * key, char *buffer, unsigned int buf_size,
char *signature, unsigned int sig_size)
{
uid_t uid;
@@ -222,7 +222,7 @@ crypto_verify_sign(void * key, char *buffer, unsigned int buf_size,
munge_err_t err;
err = munge_decode(signature, (munge_ctx_t) key,
- &buf_out, &buf_out_size,
+ &buf_out, &buf_out_size,
&uid, &gid);
if (err != EMUNGE_SUCCESS) {
diff --git a/src/plugins/crypto/openssl/Makefile.am b/src/plugins/crypto/openssl/Makefile.am
index b55b6a3449bc00035c2928481e981a9c7d898ac2..3765f8fb9a0a150b6ef8e3593c14ffca74c7d7a9 100644
--- a/src/plugins/crypto/openssl/Makefile.am
+++ b/src/plugins/crypto/openssl/Makefile.am
@@ -8,7 +8,7 @@ else
openssl_lib =
endif
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) $(SSL_CPPFLAGS) -I$(top_srcdir)/src/common
diff --git a/src/plugins/crypto/openssl/Makefile.in b/src/plugins/crypto/openssl/Makefile.in
index 2023bebb955e9aa5bd7db3b0d90eca0256f465ea..cf7c7bd812bb4fc550cf1b803273a9cf1b0f4ec4 100644
--- a/src/plugins/crypto/openssl/Makefile.in
+++ b/src/plugins/crypto/openssl/Makefile.in
@@ -320,7 +320,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
@HAVE_OPENSSL_FALSE@openssl_lib =
@HAVE_OPENSSL_TRUE@openssl_lib = crypto_openssl.la
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) $(SSL_CPPFLAGS) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = $(openssl_lib)
@HAVE_OPENSSL_TRUE@crypto_openssl_la_SOURCES = crypto_openssl.c
diff --git a/src/plugins/crypto/openssl/crypto_openssl.c b/src/plugins/crypto/openssl/crypto_openssl.c
index b8da00bb8c0e3b4e123a42fc564a7e2eb7f5bd92..2f8097a1feeda2b88b61479bb9417048c104b264 100644
--- a/src/plugins/crypto/openssl/crypto_openssl.c
+++ b/src/plugins/crypto/openssl/crypto_openssl.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark A. Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -106,7 +106,7 @@ extern int init ( void )
}
/*
- * fini() is called when the plugin is unloaded,
+ * fini() is called when the plugin is unloaded,
* free any global memory allocations here to avoid memory leaks.
*/
extern int fini ( void )
@@ -157,7 +157,7 @@ crypto_read_public_key(const char *path)
if (!PEM_read_PUBKEY(fp, &pk, NULL, NULL)) {
fclose(fp);
return NULL;
- }
+ }
fclose(fp);
return (void *) pk;
@@ -173,13 +173,13 @@ crypto_str_error(int errnum)
loaded = 1;
}
- return (char *) ERR_reason_error_string(ERR_get_error());
+ return (char *) ERR_reason_error_string(ERR_get_error());
}
/* NOTE: Caller must xfree the signature returned by sig_pp */
extern int
-crypto_sign(void * key, char *buffer, int buf_size, char **sig_pp,
- unsigned int *sig_size_p)
+crypto_sign(void * key, char *buffer, int buf_size, char **sig_pp,
+ unsigned int *sig_size_p)
{
EVP_MD_CTX ectx;
int rc = SLURM_SUCCESS;
@@ -193,7 +193,7 @@ crypto_sign(void * key, char *buffer, int buf_size, char **sig_pp,
EVP_SignInit(&ectx, EVP_sha1());
EVP_SignUpdate(&ectx, buffer, buf_size);
- if (!(EVP_SignFinal(&ectx, (unsigned char *)*sig_pp, sig_size_p,
+ if (!(EVP_SignFinal(&ectx, (unsigned char *)*sig_pp, sig_size_p,
(EVP_PKEY *) key))) {
rc = SLURM_ERROR;
}
@@ -207,7 +207,7 @@ crypto_sign(void * key, char *buffer, int buf_size, char **sig_pp,
}
extern int
-crypto_verify_sign(void * key, char *buffer, unsigned int buf_size,
+crypto_verify_sign(void * key, char *buffer, unsigned int buf_size,
char *signature, unsigned int sig_size)
{
EVP_MD_CTX ectx;
@@ -216,7 +216,7 @@ crypto_verify_sign(void * key, char *buffer, unsigned int buf_size,
EVP_VerifyInit(&ectx, EVP_sha1());
EVP_VerifyUpdate(&ectx, buffer, buf_size);
- rc = EVP_VerifyFinal(&ectx, (unsigned char *) signature,
+ rc = EVP_VerifyFinal(&ectx, (unsigned char *) signature,
sig_size, (EVP_PKEY *) key);
if (rc <= 0)
rc = SLURM_ERROR;
diff --git a/src/plugins/jobacct_gather/aix/Makefile.am b/src/plugins/jobacct_gather/aix/Makefile.am
index 4ceb3a62bfe41d5e2dfc7b1875b2eb976271b7ca..ccaf67b1bf80ef62fc4aa82d936878f19dbefcec 100644
--- a/src/plugins/jobacct_gather/aix/Makefile.am
+++ b/src/plugins/jobacct_gather/aix/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
@@ -11,7 +11,7 @@ pkglib_LTLIBRARIES = jobacct_gather_aix.la
# Null job completion logging plugin.
jobacct_gather_aix_la_SOURCES = jobacct_gather_aix.c \
$(top_builddir)/src/slurmd/common/proctrack.c \
- $(top_builddir)/src/slurmd/common/proctrack.h
+ $(top_builddir)/src/slurmd/common/proctrack.h
jobacct_gather_aix_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
diff --git a/src/plugins/jobacct_gather/aix/Makefile.in b/src/plugins/jobacct_gather/aix/Makefile.in
index 236533c9a6b1d36ff975e16de7be829f8f81ee0e..9c22eadf4b9277a936aaf8293e94d6f172f6d847 100644
--- a/src/plugins/jobacct_gather/aix/Makefile.in
+++ b/src/plugins/jobacct_gather/aix/Makefile.in
@@ -311,14 +311,14 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = jobacct_gather_aix.la
# Null job completion logging plugin.
jobacct_gather_aix_la_SOURCES = jobacct_gather_aix.c \
$(top_builddir)/src/slurmd/common/proctrack.c \
- $(top_builddir)/src/slurmd/common/proctrack.h
+ $(top_builddir)/src/slurmd/common/proctrack.h
jobacct_gather_aix_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
all: all-am
diff --git a/src/plugins/jobacct_gather/aix/jobacct_gather_aix.c b/src/plugins/jobacct_gather/aix/jobacct_gather_aix.c
index ab461450d700c5cb1eb6a66b424015ab79b434d5..375f27f62b7a081872b88ea57a63c10360708b0e 100644
--- a/src/plugins/jobacct_gather/aix/jobacct_gather_aix.c
+++ b/src/plugins/jobacct_gather/aix/jobacct_gather_aix.c
@@ -6,32 +6,32 @@
* Written by Andy Riebs, <andy.riebs@hp.com>, who borrowed heavily
* from other parts of SLURM, and Danny Auble, <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -72,20 +72,20 @@
* where <application> is a description of the intended application of
* the plugin (e.g., "jobacct" for SLURM job completion logging) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load job completion logging plugins if the plugin_type string has a
+ * only load job completion logging plugins if the plugin_type string has a
* prefix of "jobacct/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
* of the plugin. If major and minor revisions are desired, the major
* version number may be multiplied by a suitable magnitude constant such
* as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum versions for their plugins as the job accounting API
+ * minimum versions for their plugins as the job accounting API
* matures.
*/
const char plugin_name[] = "Job accounting gather AIX plugin";
const char plugin_type[] = "jobacct_gather/aix";
const uint32_t plugin_version = 100;
-
+
/* Other useful declarations */
#ifdef HAVE_AIX
typedef struct prec { /* process record */
@@ -109,14 +109,14 @@ static void *_watch_tasks(void *arg);
static void _destroy_prec(void *object);
/* system call to get process table */
-extern int getprocs(struct procsinfo *procinfo, int, struct fdsinfo *,
+extern int getprocs(struct procsinfo *procinfo, int, struct fdsinfo *,
int, pid_t *, int);
/* procinfo: pointer to array of procinfo struct */
/* nproc: number of user procinfo struct */
/* sizproc: size of expected procinfo structure */
-/*
+/*
* _get_offspring_data() -- collect memory usage data for the offspring
*
* For each process that lists <pid> as its parent, add its memory
@@ -128,7 +128,7 @@ extern int getprocs(struct procsinfo *procinfo, int, struct fdsinfo *,
* should be added. Even as we recurse, this will
* always be the prec for the base of the family
* tree.
- * pid The process for which we are currently looking
+ * pid The process for which we are currently looking
* for offspring.
*
* OUT: none.
@@ -141,13 +141,13 @@ static void _get_offspring_data(List prec_list, prec_t *ancestor, pid_t pid)
{
ListIterator itr;
prec_t *prec = NULL;
-
+
itr = list_iterator_create(prec_list);
while((prec = list_next(itr))) {
if (prec->ppid == pid) {
_get_offspring_data(prec_list, ancestor, prec->pid);
- debug2("adding %d to %d rss = %f vsize = %f",
- prec->pid, ancestor->pid,
+ debug2("adding %d to %d rss = %f vsize = %f",
+ prec->pid, ancestor->pid,
prec->rss, prec->vsize);
ancestor->usec += prec->usec;
ancestor->ssec += prec->ssec;
@@ -157,7 +157,7 @@ static void _get_offspring_data(List prec_list, prec_t *ancestor, pid_t pid)
}
}
list_iterator_destroy(itr);
-
+
return;
}
@@ -175,7 +175,7 @@ static void _get_offspring_data(List prec_list, prec_t *ancestor, pid_t pid)
* is a Linux-style stat entry. We disregard the data if they look
* wrong.
*/
-static void _get_process_data()
+static void _get_process_data()
{
struct procsinfo proc;
pid_t *pids = NULL;
@@ -189,17 +189,17 @@ static void _get_process_data()
List prec_list = NULL;
ListIterator itr;
ListIterator itr2;
-
+
if(!pgid_plugin && cont_id == (uint32_t)NO_VAL) {
debug("cont_id hasn't been set yet not running poll");
- return;
+ return;
}
if(processing) {
debug("already running, returning");
return;
}
-
+
processing = 1;
prec_list = list_create(_destroy_prec);
@@ -212,12 +212,12 @@ static void _get_process_data()
}
for (i = 0; i < npids; i++) {
pid = pids[i];
- if(!getprocs(&proc, sizeof(proc), 0, 0, &pid, 1))
+ if(!getprocs(&proc, sizeof(proc), 0, 0, &pid, 1))
continue; /* Assume the process went away */
prec = xmalloc(sizeof(prec_t));
list_append(prec_list, prec);
prec->pid = proc.pi_pid;
- prec->ppid = proc.pi_ppid;
+ prec->ppid = proc.pi_ppid;
prec->usec = proc.pi_ru.ru_utime.tv_sec +
proc.pi_ru.ru_utime.tv_usec * 1e-6;
prec->ssec = proc.pi_ru.ru_stime.tv_sec +
@@ -236,7 +236,7 @@ static void _get_process_data()
prec = xmalloc(sizeof(prec_t));
list_append(prec_list, prec);
prec->pid = proc.pi_pid;
- prec->ppid = proc.pi_ppid;
+ prec->ppid = proc.pi_ppid;
prec->usec = proc.pi_ru.ru_utime.tv_sec +
proc.pi_ru.ru_utime.tv_usec * 1e-6;
prec->ssec = proc.pi_ru.ru_stime.tv_sec +
@@ -253,7 +253,7 @@ static void _get_process_data()
}
if(!list_count(prec_list))
goto finished;
-
+
slurm_mutex_lock(&jobacct_lock);
if(!task_list || !list_count(task_list)) {
slurm_mutex_unlock(&jobacct_lock);
@@ -266,35 +266,35 @@ static void _get_process_data()
//debug2("pid %d ? %d", prec->ppid, jobacct->pid);
if (prec->pid == jobacct->pid) {
/* find all my descendents */
- _get_offspring_data(prec_list, prec,
+ _get_offspring_data(prec_list, prec,
prec->pid);
-
+
/* tally their usage */
- jobacct->max_rss = jobacct->tot_rss =
+ jobacct->max_rss = jobacct->tot_rss =
MAX(jobacct->max_rss, (int)prec->rss);
total_job_mem += jobacct->max_rss;
- jobacct->max_vsize = jobacct->tot_vsize =
- MAX(jobacct->max_vsize,
+ jobacct->max_vsize = jobacct->tot_vsize =
+ MAX(jobacct->max_vsize,
(int)prec->vsize);
jobacct->max_pages = jobacct->tot_pages =
MAX(jobacct->max_pages, prec->pages);
- jobacct->min_cpu = jobacct->tot_cpu =
+ jobacct->min_cpu = jobacct->tot_cpu =
MAX(jobacct->min_cpu,
(prec->usec + prec->ssec));
debug2("%d size now %d %d time %d",
- jobacct->pid, jobacct->max_rss,
+ jobacct->pid, jobacct->max_rss,
jobacct->max_vsize, jobacct->tot_cpu);
-
+
break;
}
}
list_iterator_destroy(itr2);
}
- list_iterator_destroy(itr);
+ list_iterator_destroy(itr);
slurm_mutex_unlock(&jobacct_lock);
if (job_mem_limit) {
- debug("Job %u memory used:%u limit:%u KB",
+ debug("Job %u memory used:%u limit:%u KB",
acct_job_id, total_job_mem, job_mem_limit);
}
if (acct_job_id && job_mem_limit &&
@@ -306,7 +306,7 @@ static void _get_process_data()
finished:
list_destroy(prec_list);
- processing = 0;
+ processing = 0;
return;
}
@@ -318,7 +318,7 @@ static void _acct_kill_job(void)
job_step_kill_msg_t req;
slurm_msg_t_init(&msg);
- /*
+ /*
* Request message:
*/
req.job_id = acct_job_id;
@@ -336,15 +336,15 @@ static void _acct_kill_job(void)
* IN, OUT: Irrelevant; this is invoked by pthread_create()
*/
-static void *_watch_tasks(void *arg)
+static void *_watch_tasks(void *arg)
{
while(!jobacct_shutdown) { /* Do this until shutdown is requested */
if(!jobacct_suspended) {
- _get_process_data(); /* Update the data */
+ _get_process_data(); /* Update the data */
}
sleep(freq);
- }
+ }
return NULL;
}
@@ -400,14 +400,14 @@ extern void jobacct_gather_p_destroy(struct jobacctinfo *jobacct)
jobacct_common_free_jobacct(jobacct);
}
-extern int jobacct_gather_p_setinfo(struct jobacctinfo *jobacct,
+extern int jobacct_gather_p_setinfo(struct jobacctinfo *jobacct,
enum jobacct_data_type type, void *data)
{
return jobacct_common_setinfo(jobacct, type, data);
-
+
}
-extern int jobacct_gather_p_getinfo(struct jobacctinfo *jobacct,
+extern int jobacct_gather_p_getinfo(struct jobacctinfo *jobacct,
enum jobacct_data_type type, void *data)
{
return jobacct_common_getinfo(jobacct, type, data);
@@ -438,17 +438,17 @@ extern void jobacct_gather_p_aggregate(struct jobacctinfo *dest,
extern int jobacct_gather_p_startpoll(uint16_t frequency)
{
int rc = SLURM_SUCCESS;
-
+
#ifdef HAVE_AIX
pthread_attr_t attr;
pthread_t _watch_tasks_thread_id;
debug("%s loaded", plugin_name);
-
+
debug("jobacct: frequency = %d", frequency);
-
+
jobacct_shutdown = false;
-
+
if (frequency == 0) { /* don't want dynamic monitoring? */
debug2("jobacct AIX dynamic logging disabled");
return rc;
@@ -457,19 +457,19 @@ extern int jobacct_gather_p_startpoll(uint16_t frequency)
freq = frequency;
pagesize = getpagesize()/1024;
task_list = list_create(jobacct_common_free_jobacct);
-
+
/* create polling thread */
slurm_attr_init(&attr);
if (pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED))
error("pthread_attr_setdetachstate error %m");
-
+
if (pthread_create(&_watch_tasks_thread_id, &attr,
&_watch_tasks, NULL)) {
debug("jobacct failed to create _watch_tasks "
"thread: %m");
frequency = 0;
}
- else
+ else
debug3("jobacct AIX dynamic logging enabled");
slurm_attr_destroy(&attr);
#else
@@ -531,7 +531,7 @@ extern struct jobacctinfo *jobacct_gather_p_remove_task(pid_t pid)
return jobacct_common_remove_task(pid);
}
-extern void jobacct_gather_p_2_sacct(sacct_t *sacct,
+extern void jobacct_gather_p_2_sacct(sacct_t *sacct,
struct jobacctinfo *jobacct)
{
jobacct_common_2_sacct(sacct, jobacct);
diff --git a/src/plugins/jobacct_gather/linux/Makefile.am b/src/plugins/jobacct_gather/linux/Makefile.am
index 8a9451752beec52e946e5594492fca01d612a684..5d066eaee5e8f4a6584d44a77c7e6532b14ec9a4 100644
--- a/src/plugins/jobacct_gather/linux/Makefile.am
+++ b/src/plugins/jobacct_gather/linux/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
@@ -11,7 +11,7 @@ pkglib_LTLIBRARIES = jobacct_gather_linux.la
# Null job completion logging plugin.
jobacct_gather_linux_la_SOURCES = jobacct_gather_linux.c \
$(top_builddir)/src/slurmd/common/proctrack.c \
- $(top_builddir)/src/slurmd/common/proctrack.h
+ $(top_builddir)/src/slurmd/common/proctrack.h
jobacct_gather_linux_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
diff --git a/src/plugins/jobacct_gather/linux/Makefile.in b/src/plugins/jobacct_gather/linux/Makefile.in
index 4ca7fa7b3878619be5cc2f393e555be4149fc071..d61a566ff6885fc92b6a5e7966cfb9489f0a2825 100644
--- a/src/plugins/jobacct_gather/linux/Makefile.in
+++ b/src/plugins/jobacct_gather/linux/Makefile.in
@@ -313,14 +313,14 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = jobacct_gather_linux.la
# Null job completion logging plugin.
jobacct_gather_linux_la_SOURCES = jobacct_gather_linux.c \
$(top_builddir)/src/slurmd/common/proctrack.c \
- $(top_builddir)/src/slurmd/common/proctrack.h
+ $(top_builddir)/src/slurmd/common/proctrack.h
jobacct_gather_linux_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
all: all-am
diff --git a/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c b/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c
index bfd0a22c79d9fcc4e059a46fd94902c5bd5d3913..7c76aa7ec58dfd99f453a429524ac1cfe5c8bf0f 100644
--- a/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c
+++ b/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c
@@ -5,32 +5,32 @@
* Written by Andy Riebs, <andy.riebs@hp.com>, who borrowed heavily
* from other parts of SLURM, and Danny Auble, <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -67,14 +67,14 @@
* where <application> is a description of the intended application of
* the plugin (e.g., "jobacct" for SLURM job completion logging) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load job completion logging plugins if the plugin_type string has a
+ * only load job completion logging plugins if the plugin_type string has a
* prefix of "jobacct/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
* of the plugin. If major and minor revisions are desired, the major
* version number may be multiplied by a suitable magnitude constant such
* as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum versions for their plugins as the job accounting API
+ * minimum versions for their plugins as the job accounting API
* matures.
*/
const char plugin_name[] = "Job accounting gather LINUX plugin";
@@ -106,7 +106,7 @@ static int _get_process_data_line(int in, prec_t *prec);
static void *_watch_tasks(void *arg);
static void _destroy_prec(void *object);
-/*
+/*
* _get_offspring_data() -- collect memory usage data for the offspring
*
* For each process that lists <pid> as its parent, add its memory
@@ -118,7 +118,7 @@ static void _destroy_prec(void *object);
* should be added. Even as we recurse, this will
* always be the prec for the base of the family
* tree.
- * pid The process for which we are currently looking
+ * pid The process for which we are currently looking
* for offspring.
*
* OUT: none.
@@ -129,7 +129,7 @@ static void _destroy_prec(void *object);
*/
static void
_get_offspring_data(List prec_list, prec_t *ancestor, pid_t pid) {
-
+
ListIterator itr;
prec_t *prec = NULL;
@@ -137,7 +137,7 @@ _get_offspring_data(List prec_list, prec_t *ancestor, pid_t pid) {
while((prec = list_next(itr))) {
if (prec->ppid == pid) {
#if _DEBUG
- info("pid:%u ppid:%u rss:%d KB",
+ info("pid:%u ppid:%u rss:%d KB",
prec->pid, prec->ppid, prec->rss);
#endif
_get_offspring_data(prec_list, ancestor, prec->pid);
@@ -186,7 +186,7 @@ static void _get_process_data() {
if(!pgid_plugin && cont_id == (uint32_t)NO_VAL) {
debug("cont_id hasn't been set yet not running poll");
- return;
+ return;
}
if(processing) {
@@ -215,22 +215,22 @@ static void _get_process_data() {
* fopen() above and before the fcntl() below,
* then the user task may have this extra file
* open, which can cause problems for
- * checkpoint/restart, but this should be a very rare
+ * checkpoint/restart, but this should be a very rare
* problem in practice.
- */
+ */
fd = fileno(stat_fp);
fcntl(fd, F_SETFD, FD_CLOEXEC);
-
+
prec = xmalloc(sizeof(prec_t));
if (_get_process_data_line(fd, prec))
list_append(prec_list, prec);
- else
+ else
xfree(prec);
fclose(stat_fp);
}
} else {
slurm_mutex_lock(&reading_mutex);
-
+
if (slash_proc_open) {
rewinddir(slash_proc);
} else {
@@ -243,9 +243,9 @@ static void _get_process_data() {
slash_proc_open=1;
}
strcpy(proc_stat_file, "/proc/");
-
+
while ((slash_proc_entry = readdir(slash_proc))) {
-
+
/* Save a few cyles by simulating
strcat(statFileName, slash_proc_entry->d_name);
strcat(statFileName, "/stat");
@@ -256,22 +256,22 @@ static void _get_process_data() {
iptr = slash_proc_entry->d_name;
i = 0;
do {
- if((*iptr < '0')
+ if((*iptr < '0')
|| ((*optr++ = *iptr++) > '9')) {
i = -1;
break;
}
} while (*iptr);
-
+
if(i == -1)
continue;
iptr = (char*)"/stat";
-
+
do {
*optr++ = *iptr++;
} while (*iptr);
*optr = 0;
-
+
if ((stat_fp = fopen(proc_stat_file,"r"))==NULL)
continue; /* Assume the process went away */
/*
@@ -281,27 +281,27 @@ static void _get_process_data() {
* fopen() above and before the fcntl() below,
* then the user task may have this extra file
* open, which can cause problems for
- * checkpoint/restart, but this should be a very rare
+ * checkpoint/restart, but this should be a very rare
* problem in practice.
- */
+ */
fd = fileno(stat_fp);
fcntl(fd, F_SETFD, FD_CLOEXEC);
prec = xmalloc(sizeof(prec_t));
if (_get_process_data_line(fd, prec))
list_append(prec_list, prec);
- else
+ else
xfree(prec);
fclose(stat_fp);
}
slurm_mutex_unlock(&reading_mutex);
-
+
}
if (!list_count(prec_list)) {
goto finished; /* We have no business being here! */
}
-
+
slurm_mutex_lock(&jobacct_lock);
if(!task_list || !list_count(task_list)) {
slurm_mutex_unlock(&jobacct_lock);
@@ -314,25 +314,25 @@ static void _get_process_data() {
while((prec = list_next(itr2))) {
if (prec->pid == jobacct->pid) {
#if _DEBUG
- info("pid:%u ppid:%u rss:%d KB",
+ info("pid:%u ppid:%u rss:%d KB",
prec->pid, prec->ppid, prec->rss);
#endif
/* find all my descendents */
- _get_offspring_data(prec_list,
+ _get_offspring_data(prec_list,
prec, prec->pid);
/* tally their usage */
- jobacct->max_rss = jobacct->tot_rss =
+ jobacct->max_rss = jobacct->tot_rss =
MAX(jobacct->max_rss, prec->rss);
total_job_mem += prec->rss;
- jobacct->max_vsize = jobacct->tot_vsize =
+ jobacct->max_vsize = jobacct->tot_vsize =
MAX(jobacct->max_vsize, prec->vsize);
jobacct->max_pages = jobacct->tot_pages =
MAX(jobacct->max_pages, prec->pages);
- jobacct->min_cpu = jobacct->tot_cpu =
- MAX(jobacct->min_cpu,
+ jobacct->min_cpu = jobacct->tot_cpu =
+ MAX(jobacct->min_cpu,
(prec->usec + prec->ssec));
debug2("%d mem size %u %u time %u",
- jobacct->pid, jobacct->max_rss,
+ jobacct->pid, jobacct->max_rss,
jobacct->max_vsize, jobacct->tot_cpu);
break;
}
@@ -343,10 +343,10 @@ static void _get_process_data() {
slurm_mutex_unlock(&jobacct_lock);
if (job_mem_limit) {
- debug("Job %u memory used:%u limit:%u KB",
+ debug("Job %u memory used:%u limit:%u KB",
acct_job_id, total_job_mem, job_mem_limit);
}
- if (acct_job_id && job_mem_limit &&
+ if (acct_job_id && job_mem_limit &&
(total_job_mem > job_mem_limit)) {
error("Job %u exceeded %u KB memory limit, being killed",
acct_job_id, job_mem_limit);
@@ -355,7 +355,7 @@ static void _get_process_data() {
finished:
list_destroy(prec_list);
- processing = 0;
+ processing = 0;
return;
}
@@ -366,7 +366,7 @@ static void _acct_kill_job(void)
job_step_kill_msg_t req;
slurm_msg_t_init(&msg);
- /*
+ /*
* Request message:
*/
req.job_id = acct_job_id;
@@ -387,9 +387,9 @@ static void _acct_kill_job(void)
* RETVAL: ==0 - no valid data
* !=0 - data are valid
*
- * Based upon stat2proc() from the ps command. It can handle arbitrary executable
- * file basenames for `cmd', i.e. those with embedded whitespace or embedded ')'s.
- * Such names confuse %s (see scanf(3)), so the string is split and %39c is used
+ * Based upon stat2proc() from the ps command. It can handle arbitrary executable
+ * file basenames for `cmd', i.e. those with embedded whitespace or embedded ')'s.
+ * Such names confuse %s (see scanf(3)), so the string is split and %39c is used
* instead. (except for embedded ')' "(%[^)]c)" would work.
*/
static int _get_process_data_line(int in, prec_t *prec) {
@@ -449,19 +449,19 @@ static void _task_sleep(int rem)
static void *_watch_tasks(void *arg)
{
- /* Give chance for processes to spawn before starting
- * the polling. This should largely eliminate the
- * the chance of having /proc open when the tasks are
+ /* Give chance for processes to spawn before starting
+ * the polling. This should largely eliminate the
+ * the chance of having /proc open when the tasks are
* spawned, which would prevent a valid checkpoint/restart
* with some systems */
_task_sleep(1);
while(!jobacct_shutdown) { /* Do this until shutdown is requested */
if(!jobacct_suspended) {
- _get_process_data(); /* Update the data */
+ _get_process_data(); /* Update the data */
}
_task_sleep(freq);
- }
+ }
return NULL;
}
@@ -515,14 +515,14 @@ extern void jobacct_gather_p_destroy(struct jobacctinfo *jobacct)
jobacct_common_free_jobacct(jobacct);
}
-extern int jobacct_gather_p_setinfo(struct jobacctinfo *jobacct,
+extern int jobacct_gather_p_setinfo(struct jobacctinfo *jobacct,
enum jobacct_data_type type, void *data)
{
return jobacct_common_setinfo(jobacct, type, data);
-
+
}
-extern int jobacct_gather_p_getinfo(struct jobacctinfo *jobacct,
+extern int jobacct_gather_p_getinfo(struct jobacctinfo *jobacct,
enum jobacct_data_type type, void *data)
{
return jobacct_common_getinfo(jobacct, type, data);
@@ -553,18 +553,18 @@ extern void jobacct_gather_p_aggregate(struct jobacctinfo *dest,
extern int jobacct_gather_p_startpoll(uint16_t frequency)
{
int rc = SLURM_SUCCESS;
-
+
pthread_attr_t attr;
pthread_t _watch_tasks_thread_id;
-
+
debug("%s loaded", plugin_name);
debug("jobacct-gather: frequency = %d", frequency);
-
+
jobacct_shutdown = false;
task_list = list_create(jobacct_common_free_jobacct);
-
+
if (frequency == 0) { /* don't want dynamic monitoring? */
debug2("jobacct-gather LINUX dynamic logging disabled");
return rc;
@@ -575,17 +575,17 @@ extern int jobacct_gather_p_startpoll(uint16_t frequency)
slurm_attr_init(&attr);
if (pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED))
error("pthread_attr_setdetachstate error %m");
-
+
if (pthread_create(&_watch_tasks_thread_id, &attr,
&_watch_tasks, NULL)) {
debug("jobacct-gather failed to create _watch_tasks "
"thread: %m");
frequency = 0;
}
- else
+ else
debug3("jobacct-gather LINUX dynamic logging enabled");
slurm_attr_destroy(&attr);
-
+
return rc;
}
@@ -596,7 +596,7 @@ extern int jobacct_gather_p_endpoll()
list_destroy(task_list);
task_list = NULL;
slurm_mutex_unlock(&jobacct_lock);
-
+
if (slash_proc) {
slurm_mutex_lock(&reading_mutex);
(void) closedir(slash_proc);
@@ -604,7 +604,7 @@ extern int jobacct_gather_p_endpoll()
}
jobacct_shutdown = true;
-
+
return SLURM_SUCCESS;
}
@@ -651,7 +651,7 @@ extern struct jobacctinfo *jobacct_gather_p_remove_task(pid_t pid)
return jobacct_common_remove_task(pid);
}
-extern void jobacct_gather_p_2_sacct(sacct_t *sacct,
+extern void jobacct_gather_p_2_sacct(sacct_t *sacct,
struct jobacctinfo *jobacct)
{
jobacct_common_2_sacct(sacct, jobacct);
diff --git a/src/plugins/jobacct_gather/none/Makefile.am b/src/plugins/jobacct_gather/none/Makefile.am
index 08c8420b0a6245474a6920cc2ee4fbfaf8373044..84ec9ffdac03ee42e686b14e7373257edb8a8bc0 100644
--- a/src/plugins/jobacct_gather/none/Makefile.am
+++ b/src/plugins/jobacct_gather/none/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/jobacct_gather/none/Makefile.in b/src/plugins/jobacct_gather/none/Makefile.in
index 364e38f7b74a6b36fae03ee2f66a7013af5aff02..4da4209a49a7d82cbea9bd23dee9087669721222 100644
--- a/src/plugins/jobacct_gather/none/Makefile.in
+++ b/src/plugins/jobacct_gather/none/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = jobacct_gather_none.la
diff --git a/src/plugins/jobacct_gather/none/jobacct_gather_none.c b/src/plugins/jobacct_gather/none/jobacct_gather_none.c
index 16afda5a08df03b2bd6e48adffba7e2fd247d72f..1ced7a60fb598bd30827045a77fb31c9f7bc14fb 100644
--- a/src/plugins/jobacct_gather/none/jobacct_gather_none.c
+++ b/src/plugins/jobacct_gather/none/jobacct_gather_none.c
@@ -5,32 +5,32 @@
* Copyright (C) 2005 Hewlett-Packard Development Company, L.P.
* Written by Andy Riebs, <andy.riebs@hp.com>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -60,14 +60,14 @@
* where <application> is a description of the intended application of
* the plugin (e.g., "jobacct" for SLURM job completion logging) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load job completion logging plugins if the plugin_type string has a
+ * only load job completion logging plugins if the plugin_type string has a
* prefix of "jobacct/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
* of the plugin. If major and minor revisions are desired, the major
* version number may be multiplied by a suitable magnitude constant such
* as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum versions for their plugins as the job accounting API
+ * minimum versions for their plugins as the job accounting API
* matures.
*/
const char plugin_name[] = "Job accounting gather NOT_INVOKED plugin";
@@ -99,14 +99,14 @@ extern void jobacct_gather_p_destroy(struct jobacctinfo *jobacct)
return;
}
-extern int jobacct_gather_p_setinfo(struct jobacctinfo *jobacct,
+extern int jobacct_gather_p_setinfo(struct jobacctinfo *jobacct,
enum jobacct_data_type type, void *data)
{
return SLURM_SUCCESS;
-
+
}
-extern int jobacct_gather_p_getinfo(struct jobacctinfo *jobacct,
+extern int jobacct_gather_p_getinfo(struct jobacctinfo *jobacct,
enum jobacct_data_type type, void *data)
{
return SLURM_SUCCESS;
@@ -175,7 +175,7 @@ extern jobacctinfo_t *jobacct_gather_p_remove_task(pid_t pid)
return NULL;
}
-extern void jobacct_gather_p_2_sacct(sacct_t *sacct,
+extern void jobacct_gather_p_2_sacct(sacct_t *sacct,
struct jobacctinfo *jobacct)
{
return;
diff --git a/src/plugins/jobcomp/filetxt/Makefile.am b/src/plugins/jobcomp/filetxt/Makefile.am
index 0967681839473cbd24f497109ce519ecbe35dc11..dc958ba7f7c23f46a8d8655ee427d8205196e561 100644
--- a/src/plugins/jobcomp/filetxt/Makefile.am
+++ b/src/plugins/jobcomp/filetxt/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/jobcomp/filetxt/Makefile.in b/src/plugins/jobcomp/filetxt/Makefile.in
index 2a3c7f1df2bf03001cde4c93076028e8192fa201..bb4a4d63e7ac9da9b0f4243847c46fbaac3cd68a 100644
--- a/src/plugins/jobcomp/filetxt/Makefile.in
+++ b/src/plugins/jobcomp/filetxt/Makefile.in
@@ -312,7 +312,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = jobcomp_filetxt.la
diff --git a/src/plugins/jobcomp/filetxt/filetxt_jobcomp_process.c b/src/plugins/jobcomp/filetxt/filetxt_jobcomp_process.c
index 3a4b17450b67b5f91a1a6fb754f9777e05b2c005..4db3627dc4fbea8bc6952c6f4217020836384159 100644
--- a/src/plugins/jobcomp/filetxt/filetxt_jobcomp_process.c
+++ b/src/plugins/jobcomp/filetxt/filetxt_jobcomp_process.c
@@ -7,32 +7,32 @@
* Copyright (C) 2004-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -116,9 +116,9 @@ static jobcomp_job_rec_t *_parse_line(List job_info_list)
job->end_time = xstrdup(jobcomp_info->val);
} else if(!strcasecmp("Userid", jobcomp_info->name)) {
temp = strstr(jobcomp_info->val, "(");
- if(!temp)
+ if(!temp)
job->uid = atoi(jobcomp_info->val);
- *temp++ = 0;
+ *temp++ = 0;
temp2 = temp;
temp = strstr(temp, ")");
if(!temp) {
@@ -131,9 +131,9 @@ static jobcomp_job_rec_t *_parse_line(List job_info_list)
}
} else if(!strcasecmp("GroupId", jobcomp_info->name)) {
temp = strstr(jobcomp_info->val, "(");
- if(!temp)
+ if(!temp)
job->gid = atoi(jobcomp_info->val);
- *temp++ = 0;
+ *temp++ = 0;
temp2 = temp;
temp = strstr(temp, ")");
if(!temp) {
@@ -178,7 +178,7 @@ static jobcomp_job_rec_t *_parse_line(List job_info_list)
}
}
list_iterator_destroy(itr);
-
+
return job;
}
@@ -210,13 +210,13 @@ extern List filetxt_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
}
filein = slurm_get_jobcomp_loc();
- fd = _open_log_file(filein);
+ fd = _open_log_file(filein);
while (fgets(line, BUFFER_SIZE, fd)) {
lc++;
fptr = line; /* break the record into NULL-
terminated strings */
- if(job_info_list)
+ if(job_info_list)
list_destroy(job_info_list);
jobid = 0;
partition = NULL;
@@ -230,18 +230,18 @@ extern List filetxt_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
*fptr++ = 0;
jobcomp_info->val = fptr;
fptr = strstr(fptr, " ");
- if(!strcasecmp("JobId", jobcomp_info->name))
+ if(!strcasecmp("JobId", jobcomp_info->name))
jobid = atoi(jobcomp_info->val);
else if(!strcasecmp("Partition",
- jobcomp_info->name))
+ jobcomp_info->name))
partition = jobcomp_info->val;
-
-
+
+
if(!fptr) {
fptr = strstr(jobcomp_info->val, "\n");
if (fptr)
*fptr = 0;
- break;
+ break;
} else {
*fptr++ = 0;
if(*fptr == '\n') {
@@ -250,9 +250,9 @@ extern List filetxt_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
}
}
}
-
+
if (job_cond->step_list && list_count(job_cond->step_list)) {
- if(!jobid)
+ if(!jobid)
continue;
itr = list_iterator_create(job_cond->step_list);
while((selected_step = list_next(itr))) {
@@ -266,13 +266,13 @@ extern List filetxt_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
continue; /* no match */
}
foundjob:
-
+
if (job_cond->partition_list
&& list_count(job_cond->partition_list)) {
- if(!partition)
+ if(!partition)
continue;
itr = list_iterator_create(job_cond->partition_list);
- while((selected_part = list_next(itr)))
+ while((selected_part = list_next(itr)))
if (!strcasecmp(selected_part, partition)) {
list_iterator_destroy(itr);
goto foundp;
@@ -281,27 +281,27 @@ extern List filetxt_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
continue; /* no match */
}
foundp:
-
+
if (fdump_flag) {
_do_fdump(job_info_list, lc);
continue;
}
-
-
+
+
job = _parse_line(job_info_list);
-
+
if(job)
list_append(job_list, job);
}
- if(job_info_list)
+ if(job_info_list)
list_destroy(job_info_list);
-
+
if (ferror(fd)) {
perror(filein);
xfree(filein);
exit(1);
- }
+ }
fclose(fd);
xfree(filein);
diff --git a/src/plugins/jobcomp/filetxt/filetxt_jobcomp_process.h b/src/plugins/jobcomp/filetxt/filetxt_jobcomp_process.h
index 3d2c54380fc55133b87e715a879a07bc609cd580..e4097cd9c783edce51daa87b4c3ecdb401583bd6 100644
--- a/src/plugins/jobcomp/filetxt/filetxt_jobcomp_process.h
+++ b/src/plugins/jobcomp/filetxt/filetxt_jobcomp_process.h
@@ -7,32 +7,32 @@
* Copyright (C) 2004-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/plugins/jobcomp/filetxt/jobcomp_filetxt.c b/src/plugins/jobcomp/filetxt/jobcomp_filetxt.c
index 1bfb0b281b41521dad23fa013462b7430a1d4d14..5e2127c6ddfcd4c649a82b4f4b32c80ef130d6e3 100644
--- a/src/plugins/jobcomp/filetxt/jobcomp_filetxt.c
+++ b/src/plugins/jobcomp/filetxt/jobcomp_filetxt.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -78,14 +78,14 @@
* where <application> is a description of the intended application of
* the plugin (e.g., "jobcomp" for SLURM job completion logging) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load job completion logging plugins if the plugin_type string has a
+ * only load job completion logging plugins if the plugin_type string has a
* prefix of "jobcomp/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
* of the plugin. If major and minor revisions are desired, the major
* version number may be multiplied by a suitable magnitude constant such
* as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum versions for their plugins as the job completion logging API
+ * minimum versions for their plugins as the job completion logging API
* matures.
*/
const char plugin_name[] = "Job completion text file logging plugin";
@@ -95,7 +95,7 @@ const uint32_t plugin_version = 100;
#define JOB_FORMAT "JobId=%lu UserId=%s(%lu) GroupId=%s(%lu) Name=%s JobState=%s Partition=%s "\
"TimeLimit=%s StartTime=%s EndTime=%s NodeList=%s NodeCnt=%u ProcCnt=%u "\
"WorkDir=%s %s\n"
-
+
/* Type for error string table entries */
typedef struct {
int xe_number;
@@ -147,7 +147,7 @@ _get_group_name(uint32_t group_id, char *group_name, int buf_size)
snprintf(group_name, buf_size, "%s", cache_name);
}
-/*
+/*
* Linear search through table of errno values and strings,
* returns NULL on error, string on success.
*/
@@ -228,8 +228,8 @@ static void _make_time_str (time_t *time, char *string, int size)
* schedulers management of SLURM. */
snprintf(string, size,
"%4.4u-%2.2u-%2.2uT%2.2u:%2.2u:%2.2u",
- (time_tm.tm_year + 1900), (time_tm.tm_mon+1),
- time_tm.tm_mday, time_tm.tm_hour, time_tm.tm_min,
+ (time_tm.tm_year + 1900), (time_tm.tm_mon+1),
+ time_tm.tm_mday, time_tm.tm_hour, time_tm.tm_min,
time_tm.tm_sec);
#else
/* Format MM/DD-HH:MM:SS */
@@ -262,10 +262,10 @@ extern int slurm_jobcomp_log_record ( struct job_record *job_ptr )
if (job_ptr->time_limit == INFINITE)
strcpy(lim_str, "UNLIMITED");
else
- snprintf(lim_str, sizeof(lim_str), "%lu",
+ snprintf(lim_str, sizeof(lim_str), "%lu",
(unsigned long) job_ptr->time_limit);
- /* Job will typically be COMPLETING when this is called.
+ /* Job will typically be COMPLETING when this is called.
* We remove the flags to get the eventual completion state:
* JOB_FAILED, JOB_TIMEOUT, etc. */
job_state = job_ptr->job_state & JOB_STATE_BASE;
@@ -282,11 +282,11 @@ extern int slurm_jobcomp_log_record ( struct job_record *job_ptr )
select_buf, sizeof(select_buf), SELECT_PRINT_MIXED);
snprintf(job_rec, sizeof(job_rec), JOB_FORMAT,
- (unsigned long) job_ptr->job_id, usr_str,
- (unsigned long) job_ptr->user_id, grp_str,
- (unsigned long) job_ptr->group_id, job_ptr->name,
- job_state_string(job_state),
- job_ptr->partition, lim_str, start_str,
+ (unsigned long) job_ptr->job_id, usr_str,
+ (unsigned long) job_ptr->user_id, grp_str,
+ (unsigned long) job_ptr->group_id, job_ptr->name,
+ job_state_string(job_state),
+ job_ptr->partition, lim_str, start_str,
end_str, job_ptr->nodes, job_ptr->node_cnt,
job_ptr->total_procs, work_dir,
select_buf);
@@ -321,20 +321,20 @@ extern char *slurm_jobcomp_strerror( int errnum )
return (res ? res : strerror(errnum));
}
-/*
- * get info from the database
+/*
+ * get info from the database
* in/out job_list List of job_rec_t *
* note List needs to be freed when called
*/
extern List slurm_jobcomp_get_jobs(acct_job_cond_t *job_cond)
{
- return filetxt_jobcomp_process_get_jobs(job_cond);
+ return filetxt_jobcomp_process_get_jobs(job_cond);
}
-/*
- * expire old info from the database
+/*
+ * expire old info from the database
*/
extern int slurm_jobcomp_archive(acct_archive_cond_t *arch_cond)
{
- return filetxt_jobcomp_process_archive(arch_cond);
+ return filetxt_jobcomp_process_archive(arch_cond);
}
diff --git a/src/plugins/jobcomp/mysql/jobcomp_mysql.c b/src/plugins/jobcomp/mysql/jobcomp_mysql.c
index a809fd9c57d29bf8dd5dae2a48b2c1d16e0d8c96..2e91823e5567b9261c1530823bb9a8b828e528cc 100644
--- a/src/plugins/jobcomp/mysql/jobcomp_mysql.c
+++ b/src/plugins/jobcomp/mysql/jobcomp_mysql.c
@@ -7,32 +7,32 @@
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -65,14 +65,14 @@
* where <application> is a description of the intended application of
* the plugin (e.g., "jobacct" for SLURM job completion logging) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load job completion logging plugins if the plugin_type string has a
+ * only load job completion logging plugins if the plugin_type string has a
* prefix of "jobacct/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
* of the plugin. If major and minor revisions are desired, the major
* version number may be multiplied by a suitable magnitude constant such
* as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum versions for their plugins as the job accounting API
+ * minimum versions for their plugins as the job accounting API
* matures.
*/
const char plugin_name[] = "Job completion MYSQL plugin";
@@ -91,11 +91,11 @@ storage_field_t jobcomp_table_fields[] = {
{ "group_name", "tinytext not null" },
{ "name", "tinytext not null" },
{ "state", "smallint not null" },
- { "partition", "tinytext not null" },
+ { "partition", "tinytext not null" },
{ "timelimit", "tinytext not null" },
- { "starttime", "int unsigned default 0 not null" },
+ { "starttime", "int unsigned default 0 not null" },
{ "endtime", "int unsigned default 0 not null" },
- { "nodelist", "text" },
+ { "nodelist", "text" },
{ "nodecnt", "int unsigned not null" },
{ "proc_cnt", "int unsigned not null" },
{ "connect_type", "tinytext" },
@@ -135,9 +135,9 @@ static mysql_db_info_t *_mysql_jobcomp_create_db_info()
db_info->port = DEFAULT_MYSQL_PORT;
slurm_set_jobcomp_port(db_info->port);
}
- db_info->host = slurm_get_jobcomp_host();
- db_info->user = slurm_get_jobcomp_user();
- db_info->pass = slurm_get_jobcomp_pass();
+ db_info->host = slurm_get_jobcomp_host();
+ db_info->user = slurm_get_jobcomp_user();
+ db_info->pass = slurm_get_jobcomp_pass();
return db_info;
}
@@ -191,7 +191,7 @@ static char *_get_group_name(uint32_t group_id)
return ret_name;
}
-/*
+/*
* Linear search through table of errno values and strings,
* returns NULL on error, string on success.
*/
@@ -225,7 +225,7 @@ extern int init ( void )
} else {
debug4("%s loaded", plugin_name);
}
-
+
return SLURM_SUCCESS;
}
@@ -244,10 +244,10 @@ extern int slurm_jobcomp_set_location(char *location)
int rc = SLURM_SUCCESS;
char *db_name = NULL;
int i = 0;
-
+
if(jobcomp_mysql_db && mysql_ping(jobcomp_mysql_db) == 0)
return SLURM_SUCCESS;
-
+
if(!location)
db_name = DEFAULT_JOB_COMP_DB;
else {
@@ -260,21 +260,21 @@ extern int slurm_jobcomp_set_location(char *location)
}
i++;
}
- if(location[i])
+ if(location[i])
db_name = DEFAULT_JOB_COMP_DB;
else
db_name = location;
}
-
+
debug2("mysql_connect() called for db %s", db_name);
-
+
mysql_get_db_connection(&jobcomp_mysql_db, db_name, db_info);
-
+
rc = _mysql_jobcomp_check_tables();
destroy_mysql_db_info(db_info);
- if(rc == SLURM_SUCCESS)
+ if(rc == SLURM_SUCCESS)
debug("Jobcomp database init finished");
else
debug("Jobcomp database init failed");
@@ -305,10 +305,10 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
if (job_ptr->time_limit == INFINITE)
strcpy(lim_str, "UNLIMITED");
else
- snprintf(lim_str, sizeof(lim_str), "%lu",
+ snprintf(lim_str, sizeof(lim_str), "%lu",
(unsigned long) job_ptr->time_limit);
- /* Job will typically be COMPLETING when this is called.
+ /* Job will typically be COMPLETING when this is called.
* We remove the flags to get the eventual completion state:
* JOB_FAILED, JOB_TIMEOUT, etc. */
job_state = job_ptr->job_state & JOB_STATE_BASE;
@@ -339,7 +339,7 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
jobcomp_table);
if(job_ptr->nodes)
- xstrcat(query, ", nodelist");
+ xstrcat(query, ", nodelist");
if(connect_type)
xstrcat(query, ", connect_type");
if(reboot)
@@ -361,9 +361,9 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
job_state, job_ptr->total_procs, job_ptr->partition, lim_str,
(int)job_ptr->start_time, (int)job_ptr->end_time,
job_ptr->node_cnt);
-
+
if(job_ptr->nodes)
- xstrfmtcat(query, ", '%s'", job_ptr->nodes);
+ xstrfmtcat(query, ", '%s'", job_ptr->nodes);
if(connect_type) {
xstrfmtcat(query, ", '%s'", connect_type);
@@ -413,15 +413,15 @@ extern char *slurm_jobcomp_strerror(int errnum)
return (res ? res : strerror(errnum));
}
-/*
- * get info from the storage
+/*
+ * get info from the storage
* in/out job_list List of job_rec_t *
* note List needs to be freed when called
*/
extern List slurm_jobcomp_get_jobs(acct_job_cond_t *job_cond)
{
List job_list = NULL;
-
+
if(!jobcomp_mysql_db || mysql_ping(jobcomp_mysql_db) != 0) {
char *loc = slurm_get_jobcomp_loc();
if(slurm_jobcomp_set_location(loc) == SLURM_ERROR) {
@@ -431,13 +431,13 @@ extern List slurm_jobcomp_get_jobs(acct_job_cond_t *job_cond)
xfree(loc);
}
- job_list = mysql_jobcomp_process_get_jobs(job_cond);
+ job_list = mysql_jobcomp_process_get_jobs(job_cond);
return job_list;
}
-/*
- * expire old info from the storage
+/*
+ * expire old info from the storage
*/
extern int slurm_jobcomp_archive(acct_archive_cond_t *arch_cond)
{
diff --git a/src/plugins/jobcomp/mysql/mysql_jobcomp_process.c b/src/plugins/jobcomp/mysql/mysql_jobcomp_process.c
index 37b6ce03e8152e8d6ef6312ddd76bec7599fe1cb..94ea50dde593b71512c4cbe5ecf69173cc5ee843 100644
--- a/src/plugins/jobcomp/mysql/mysql_jobcomp_process.c
+++ b/src/plugins/jobcomp/mysql/mysql_jobcomp_process.c
@@ -7,32 +7,32 @@
* Copyright (C) 2004-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -47,9 +47,9 @@
#include "mysql_jobcomp_process.h"
static void _do_fdump(MYSQL_ROW row, int lc)
-{
+{
int i = 0;
- printf("\n------- Line %d -------\n", lc);
+ printf("\n------- Line %d -------\n", lc);
while(jobcomp_table_fields[i].name) {
printf("%12s: %s\n", jobcomp_table_fields[i].name, row[i]);
i++;
@@ -61,9 +61,9 @@ static void _do_fdump(MYSQL_ROW row, int lc)
extern List mysql_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
{
- char *query = NULL;
- char *extra = NULL;
- char *tmp = NULL;
+ char *query = NULL;
+ char *extra = NULL;
+ char *tmp = NULL;
char *selected_part = NULL;
jobacct_selected_step_t *selected_step = NULL;
ListIterator itr = NULL;
@@ -87,13 +87,13 @@ extern List mysql_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
fdump_flag = job_cond->duplicates & FDUMP_FLAG;
job_cond->duplicates &= (~FDUMP_FLAG);
}
-
+
if(job_cond->step_list && list_count(job_cond->step_list)) {
set = 0;
xstrcat(extra, " where (");
itr = list_iterator_create(job_cond->step_list);
while((selected_step = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
tmp = xstrdup_printf("jobid=%d",
selected_step->jobid);
@@ -111,10 +111,10 @@ extern List mysql_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
-
+
itr = list_iterator_create(job_cond->partition_list);
while((selected_part = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
tmp = xstrdup_printf("partition='%s'",
selected_part);
@@ -128,12 +128,12 @@ extern List mysql_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
i = 0;
while(jobcomp_table_fields[i].name) {
- if(i)
+ if(i)
xstrcat(tmp, ", ");
xstrcat(tmp, jobcomp_table_fields[i].name);
i++;
}
-
+
query = xstrdup_printf("select %s from %s", tmp, jobcomp_table);
xfree(tmp);
@@ -163,16 +163,16 @@ extern List mysql_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
job->jobid = atoi(row[JOBCOMP_REQ_JOBID]);
job->partition = xstrdup(row[JOBCOMP_REQ_PARTITION]);
temp_time = atoi(row[JOBCOMP_REQ_STARTTIME]);
- slurm_make_time_str(&temp_time,
- time_str,
+ slurm_make_time_str(&temp_time,
+ time_str,
sizeof(time_str));
-
+
job->start_time = xstrdup(time_str);
temp_time = atoi(row[JOBCOMP_REQ_ENDTIME]);
- slurm_make_time_str(&temp_time,
- time_str,
+ slurm_make_time_str(&temp_time,
+ time_str,
sizeof(time_str));
-
+
job->end_time = xstrdup(time_str);
if(row[JOBCOMP_REQ_UID])
job->uid = atoi(row[JOBCOMP_REQ_UID]);
@@ -199,9 +199,9 @@ extern List mysql_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
job->blockid = xstrdup(row[JOBCOMP_REQ_BLOCKID]);
list_append(job_list, job);
}
-
+
mysql_free_result(result);
-
+
return job_list;
}
diff --git a/src/plugins/jobcomp/mysql/mysql_jobcomp_process.h b/src/plugins/jobcomp/mysql/mysql_jobcomp_process.h
index dcc017a046ca3eec9ed982c78dee6a1d063015d6..517be55b44edbc4296221bc14fe5eac650784b49 100644
--- a/src/plugins/jobcomp/mysql/mysql_jobcomp_process.h
+++ b/src/plugins/jobcomp/mysql/mysql_jobcomp_process.h
@@ -7,32 +7,32 @@
* Copyright (C) 2004-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -79,7 +79,7 @@ enum {
JOBCOMP_REQ_GEOMETRY,
JOBCOMP_REQ_START,
JOBCOMP_REQ_BLOCKID,
- JOBCOMP_REQ_COUNT
+ JOBCOMP_REQ_COUNT
};
extern List mysql_jobcomp_process_get_jobs(acct_job_cond_t *job_cond);
diff --git a/src/plugins/jobcomp/none/Makefile.am b/src/plugins/jobcomp/none/Makefile.am
index 75fac02ac7fa834a2190e0266368f9d0e2f64cd0..fa713024073be1c3c249069d003786cb17c7e6d1 100644
--- a/src/plugins/jobcomp/none/Makefile.am
+++ b/src/plugins/jobcomp/none/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/jobcomp/none/Makefile.in b/src/plugins/jobcomp/none/Makefile.in
index 532bb5a1122fbf7af5efa40320cdc516a9d9e973..1b9a654741a31fbc66cc5a48faff1224446b4534 100644
--- a/src/plugins/jobcomp/none/Makefile.in
+++ b/src/plugins/jobcomp/none/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = jobcomp_none.la
diff --git a/src/plugins/jobcomp/none/jobcomp_none.c b/src/plugins/jobcomp/none/jobcomp_none.c
index 304539726c7274e45df67b93d27c2cef9e322d61..af005a1520c257faf5a24c69e237b2f165ce3d62 100644
--- a/src/plugins/jobcomp/none/jobcomp_none.c
+++ b/src/plugins/jobcomp/none/jobcomp_none.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -72,14 +72,14 @@
* where <application> is a description of the intended application of
* the plugin (e.g., "jobcomp" for SLURM job completion logging) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load job completion logging plugins if the plugin_type string has a
+ * only load job completion logging plugins if the plugin_type string has a
* prefix of "jobcomp/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
* of the plugin. If major and minor revisions are desired, the major
* version number may be multiplied by a suitable magnitude constant such
* as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum versions for their plugins as the job completion logging API
+ * minimum versions for their plugins as the job completion logging API
* matures.
*/
const char plugin_name[] = "Job completion logging NONE plugin";
diff --git a/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c b/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c
index 62b5b7034c2412f77bd0db696d66e9548123dc17..b7c8cedad580e24710fa419eda63bf281116db65 100644
--- a/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c
+++ b/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c
@@ -7,32 +7,32 @@
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -65,14 +65,14 @@
* where <application> is a description of the intended application of
* the plugin (e.g., "jobacct" for SLURM job completion logging) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load job completion logging plugins if the plugin_type string has a
+ * only load job completion logging plugins if the plugin_type string has a
* prefix of "jobacct/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
* of the plugin. If major and minor revisions are desired, the major
* version number may be multiplied by a suitable magnitude constant such
* as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum versions for their plugins as the job accounting API
+ * minimum versions for their plugins as the job accounting API
* matures.
*/
const char plugin_name[] = "Job completion POSTGRESQL plugin";
@@ -90,11 +90,11 @@ storage_field_t jobcomp_table_fields[] = {
{ "group_name", "text not null" },
{ "name", "text not null" },
{ "state", "smallint not null" },
- { "partition", "text not null" },
+ { "partition", "text not null" },
{ "timelimit", "text not null" },
- { "starttime", "bigint default 0 not null" },
+ { "starttime", "bigint default 0 not null" },
{ "endtime", "bigint default 0 not null" },
- { "nodelist", "text" },
+ { "nodelist", "text" },
{ "nodecnt", "integer not null" },
{ "proc_cnt", "integer not null" },
{ "connect_type", "text" },
@@ -135,8 +135,8 @@ static pgsql_db_info_t *_pgsql_jobcomp_create_db_info()
slurm_set_jobcomp_port(db_info->port);
}
db_info->host = slurm_get_jobcomp_host();
- db_info->user = slurm_get_jobcomp_user();
- db_info->pass = slurm_get_jobcomp_pass();
+ db_info->user = slurm_get_jobcomp_user();
+ db_info->pass = slurm_get_jobcomp_pass();
return db_info;
}
@@ -157,8 +157,8 @@ static int _pgsql_jobcomp_check_tables(char *user)
xfree(query);
for (i = 0; i < PQntuples(result); i++) {
- if(!job_found
- && !strcmp(jobcomp_table, PQgetvalue(result, i, 0)))
+ if(!job_found
+ && !strcmp(jobcomp_table, PQgetvalue(result, i, 0)))
job_found = 1;
}
PQclear(result);
@@ -213,7 +213,7 @@ static char *_get_group_name(uint32_t group_id)
return ret_name;
}
-/*
+/*
* Linear search through table of errno values and strings,
* returns NULL on error, string on success.
*/
@@ -266,10 +266,10 @@ extern int slurm_jobcomp_set_location(char *location)
int rc = SLURM_SUCCESS;
char *db_name = NULL;
int i = 0;
-
- if(jobcomp_pgsql_db && PQstatus(jobcomp_pgsql_db) == CONNECTION_OK)
+
+ if(jobcomp_pgsql_db && PQstatus(jobcomp_pgsql_db) == CONNECTION_OK)
return SLURM_SUCCESS;
-
+
if(!location)
db_name = DEFAULT_JOB_COMP_DB;
else {
@@ -282,21 +282,21 @@ extern int slurm_jobcomp_set_location(char *location)
}
i++;
}
- if(location[i])
+ if(location[i])
db_name = DEFAULT_JOB_COMP_DB;
else
db_name = location;
}
-
+
debug2("pgsql_connect() called for db %s", db_name);
-
+
pgsql_get_db_connection(&jobcomp_pgsql_db, db_name, db_info);
-
+
rc = _pgsql_jobcomp_check_tables(db_info->user);
destroy_pgsql_db_info(db_info);
- if(rc == SLURM_SUCCESS)
+ if(rc == SLURM_SUCCESS)
debug("Jobcomp database init finished");
else
debug("Jobcomp database init failed");
@@ -327,14 +327,14 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
if (job_ptr->time_limit == INFINITE)
strcpy(lim_str, "UNLIMITED");
else
- snprintf(lim_str, sizeof(lim_str), "%lu",
+ snprintf(lim_str, sizeof(lim_str), "%lu",
(unsigned long) job_ptr->time_limit);
- /* Job will typically be COMPLETING when this is called.
+ /* Job will typically be COMPLETING when this is called.
* We remove the flags to get the eventual completion state:
* JOB_FAILED, JOB_TIMEOUT, etc. */
job_state = job_ptr->job_state & JOB_STATE_BASE;
-
+
connect_type = select_g_select_jobinfo_xstrdup(job_ptr->select_jobinfo,
SELECT_PRINT_CONNECTION);
reboot = select_g_select_jobinfo_xstrdup(job_ptr->select_jobinfo,
@@ -361,7 +361,7 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
jobcomp_table);
if(job_ptr->nodes)
- xstrcat(query, ", nodelist");
+ xstrcat(query, ", nodelist");
if(connect_type)
xstrcat(query, ", connect_type");
if(reboot)
@@ -384,9 +384,9 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
job_state, job_ptr->total_procs, job_ptr->partition, lim_str,
(int)job_ptr->start_time, (int)job_ptr->end_time,
job_ptr->node_cnt);
-
+
if(job_ptr->nodes)
- xstrfmtcat(query, ", '%s'", job_ptr->nodes);
+ xstrfmtcat(query, ", '%s'", job_ptr->nodes);
if(connect_type) {
xstrfmtcat(query, ", '%s'", connect_type);
@@ -436,8 +436,8 @@ extern char *slurm_jobcomp_strerror(int errnum)
return (res ? res : strerror(errnum));
}
-/*
- * get info from the storage
+/*
+ * get info from the storage
* in/out job_list List of job_rec_t *
* note List needs to be freed when called
*/
@@ -454,13 +454,13 @@ extern List slurm_jobcomp_get_jobs(acct_job_cond_t *job_cond)
xfree(loc);
}
- job_list = pgsql_jobcomp_process_get_jobs(job_cond);
+ job_list = pgsql_jobcomp_process_get_jobs(job_cond);
return job_list;
}
-/*
- * expire old info from the storage
+/*
+ * expire old info from the storage
*/
extern int slurm_jobcomp_archive(acct_archive_cond_t *arch_cond)
{
diff --git a/src/plugins/jobcomp/pgsql/pgsql_jobcomp_process.c b/src/plugins/jobcomp/pgsql/pgsql_jobcomp_process.c
index ef93a4f51db8c8e03a511ef3dec5d809357154e6..40f163ff946b6c63c3943f839dec47669684eaed 100644
--- a/src/plugins/jobcomp/pgsql/pgsql_jobcomp_process.c
+++ b/src/plugins/jobcomp/pgsql/pgsql_jobcomp_process.c
@@ -7,32 +7,32 @@
* Copyright (C) 2004-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -49,9 +49,9 @@
static void _do_fdump(PGresult *result, int lc)
{
int i = 0;
- printf("\n------- Line %d -------\n", lc);
+ printf("\n------- Line %d -------\n", lc);
while(jobcomp_table_fields[i].name) {
- printf("%12s: %s\n", jobcomp_table_fields[i].name,
+ printf("%12s: %s\n", jobcomp_table_fields[i].name,
PQgetvalue(result, lc, i));
i++;
}
@@ -62,9 +62,9 @@ static void _do_fdump(PGresult *result, int lc)
extern List pgsql_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
{
- char *query = NULL;
- char *extra = NULL;
- char *tmp = NULL;
+ char *query = NULL;
+ char *extra = NULL;
+ char *tmp = NULL;
char *selected_part = NULL;
jobacct_selected_step_t *selected_step = NULL;
ListIterator itr = NULL;
@@ -92,7 +92,7 @@ extern List pgsql_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
xstrcat(extra, " where (");
itr = list_iterator_create(job_cond->step_list);
while((selected_step = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
tmp = xstrdup_printf("jobid=%d",
selected_step->jobid);
@@ -110,10 +110,10 @@ extern List pgsql_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
-
+
itr = list_iterator_create(job_cond->partition_list);
while((selected_part = list_next(itr))) {
- if(set)
+ if(set)
xstrcat(extra, " || ");
tmp = xstrdup_printf("partition='%s'",
selected_part);
@@ -127,12 +127,12 @@ extern List pgsql_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
i = 0;
while(jobcomp_table_fields[i].name) {
- if(i)
+ if(i)
xstrcat(tmp, ", ");
xstrcat(tmp, jobcomp_table_fields[i].name);
i++;
}
-
+
query = xstrdup_printf("select %s from %s", tmp, jobcomp_table);
xfree(tmp);
@@ -148,32 +148,32 @@ extern List pgsql_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
return NULL;
}
xfree(query);
-
+
job_list = list_create(jobcomp_destroy_job);
for (i = 0; i < PQntuples(result); i++) {
-
+
if (fdump_flag) {
_do_fdump(result, i);
continue;
}
job = xmalloc(sizeof(jobcomp_job_rec_t));
if(PQgetvalue(result, i, JOBCOMP_REQ_JOBID))
- job->jobid =
+ job->jobid =
atoi(PQgetvalue(result, i, JOBCOMP_REQ_JOBID));
job->partition =
xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_PARTITION));
temp_time = atoi(PQgetvalue(result, i, JOBCOMP_REQ_STARTTIME));
- slurm_make_time_str(&temp_time,
- time_str,
+ slurm_make_time_str(&temp_time,
+ time_str,
sizeof(time_str));
job->start_time = xstrdup(time_str);
-
+
temp_time = atoi(PQgetvalue(result, i, JOBCOMP_REQ_ENDTIME));
- slurm_make_time_str(&temp_time,
- time_str,
+ slurm_make_time_str(&temp_time,
+ time_str,
sizeof(time_str));
job->end_time = xstrdup(time_str);
-
+
if(PQgetvalue(result, i, JOBCOMP_REQ_UID))
job->uid =
atoi(PQgetvalue(result, i, JOBCOMP_REQ_UID));
@@ -182,7 +182,7 @@ extern List pgsql_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
if(PQgetvalue(result, i, JOBCOMP_REQ_GID))
job->gid =
atoi(PQgetvalue(result, i, JOBCOMP_REQ_GID));
- job->gid_name =
+ job->gid_name =
xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_GROUP_NAME));
job->jobname =
xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_NAME));
@@ -199,7 +199,7 @@ extern List pgsql_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_TIMELIMIT));
if(PQgetvalue(result, i, JOBCOMP_REQ_MAXPROCS))
job->max_procs =
- atoi(PQgetvalue(result, i,
+ atoi(PQgetvalue(result, i,
JOBCOMP_REQ_MAXPROCS));
job->blockid =
xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_BLOCKID));
@@ -209,13 +209,13 @@ extern List pgsql_jobcomp_process_get_jobs(acct_job_cond_t *job_cond)
xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_REBOOT));
job->rotate =
xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_ROTATE));
- job->geo =
+ job->geo =
xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_GEOMETRY));
job->bg_start_point =
xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_START));
list_append(job_list, job);
}
-
+
PQclear(result);
return job_list;
}
diff --git a/src/plugins/jobcomp/pgsql/pgsql_jobcomp_process.h b/src/plugins/jobcomp/pgsql/pgsql_jobcomp_process.h
index 124d32339b641e1ef707db4f7a3ccc3c6ab55e8f..a0395703816868bfd37f84721b4961715b37ce3b 100644
--- a/src/plugins/jobcomp/pgsql/pgsql_jobcomp_process.h
+++ b/src/plugins/jobcomp/pgsql/pgsql_jobcomp_process.h
@@ -7,32 +7,32 @@
* Copyright (C) 2004-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -79,7 +79,7 @@ enum {
JOBCOMP_REQ_GEOMETRY,
JOBCOMP_REQ_START,
JOBCOMP_REQ_BLOCKID,
- JOBCOMP_REQ_COUNT
+ JOBCOMP_REQ_COUNT
};
extern List pgsql_jobcomp_process_get_jobs(acct_job_cond_t *job_cond);
diff --git a/src/plugins/jobcomp/script/Makefile.am b/src/plugins/jobcomp/script/Makefile.am
index eae162b656f727d3a4a4fa1d27e16ebcfc37e1a2..d96c907882a954a22621a429873e74a3ed31ea47 100644
--- a/src/plugins/jobcomp/script/Makefile.am
+++ b/src/plugins/jobcomp/script/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/jobcomp/script/Makefile.in b/src/plugins/jobcomp/script/Makefile.in
index 740fc4d8e451c8da1de304dc2c2bb5c67dd9d7de..dd94273fb6d59a1438924aa8a71ec1d79196feb1 100644
--- a/src/plugins/jobcomp/script/Makefile.in
+++ b/src/plugins/jobcomp/script/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = jobcomp_script.la
diff --git a/src/plugins/jobcomp/script/jobcomp_script.c b/src/plugins/jobcomp/script/jobcomp_script.c
index 690cf60ef1a3879a9ab915a0fbd2f3a231c8de86..dc1ad54820b5236cffe045d93e44c79287334e17 100644
--- a/src/plugins/jobcomp/script/jobcomp_script.c
+++ b/src/plugins/jobcomp/script/jobcomp_script.c
@@ -6,32 +6,32 @@
* University
* Written by Nathan Huff <nhuff@acm.org>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -57,7 +57,7 @@
* BlueGene specific environment variables:
* BLOCKID Name of Block ID
* CONNECT_TYPE Connection type: small, torus or mesh
- * GEOMETRY Requested geometry of the job, "#x#x#" where "#"
+ * GEOMETRY Requested geometry of the job, "#x#x#" where "#"
* represents the X, Y and Z dimension sizes
\*****************************************************************************/
@@ -115,14 +115,14 @@
* where <application> is a description of the intended application of
* the plugin (e.g., "jobcomp" for SLURM job completion logging) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load job completion logging plugins if the plugin_type string has a
+ * only load job completion logging plugins if the plugin_type string has a
* prefix of "jobcomp/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
* of the plugin. If major and minor revisions are desired, the major
* version number may be multiplied by a suitable magnitude constant such
* as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum versions for their plugins as the job completion logging API
+ * minimum versions for their plugins as the job completion logging API
* matures.
*/
const char plugin_name[] = "Job completion logging script plugin";
@@ -259,7 +259,7 @@ static void _jobcomp_info_destroy (struct jobcomp_info *j)
/*
* Check if the script exists and if we can execute it.
*/
-static int
+static int
_check_script_permissions(char * path)
{
struct stat st;
@@ -292,7 +292,7 @@ static char ** _extend_env (char ***envp)
(*envp)[newcnt - 1] = NULL;
ep = &((*envp)[newcnt - 2]);
- /*
+ /*
* Find last non-NULL entry
*/
while (*ep == NULL)
@@ -320,7 +320,7 @@ static int _env_append (char ***envp, const char *name, const char *val)
return (0);
}
-static int _env_append_fmt (char ***envp, const char *name,
+static int _env_append_fmt (char ***envp, const char *name,
const char *fmt, ...)
{
char val[1024];
@@ -366,7 +366,7 @@ static char ** _create_environment (struct jobcomp_info *job)
if (job->limit == INFINITE)
_env_append (&env, "LIMIT", "UNLIMITED");
- else
+ else
_env_append_fmt (&env, "LIMIT", "%lu", job->limit);
if ((tz = getenv ("TZ")))
@@ -407,7 +407,7 @@ static void _jobcomp_child (char * script, struct jobcomp_info *job)
tmpdir = "/tmp";
#endif
/*
- * Reinitialize log so we can log any errors for
+ * Reinitialize log so we can log any errors for
* diagnosis
*/
log_reinit ();
@@ -457,7 +457,7 @@ static int _jobcomp_exec_child (char *script, struct jobcomp_info *job)
if (waitpid(pid, &status, 0) < 0)
error ("jobcomp/script: waitpid: %m");
- if (WEXITSTATUS(status))
+ if (WEXITSTATUS(status))
error ("jobcomp/script: script %s exited with status %d\n",
script, WEXITSTATUS(status));
@@ -468,7 +468,7 @@ static int _jobcomp_exec_child (char *script, struct jobcomp_info *job)
/*
* Thread function that executes a script
*/
-static void * _script_agent (void *args)
+static void * _script_agent (void *args)
{
while (1) {
struct jobcomp_info *job;
@@ -527,7 +527,7 @@ extern int init (void)
slurm_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
pthread_create(&script_thread, &attr, _script_agent, NULL);
-
+
pthread_mutex_unlock(&thread_flag_mutex);
slurm_attr_destroy(&attr);
@@ -547,7 +547,7 @@ extern int slurm_jobcomp_set_location (char * location)
xfree(script);
script = xstrdup(location);
-
+
return SLURM_SUCCESS;
}
@@ -557,7 +557,7 @@ int slurm_jobcomp_log_record (struct job_record *record)
debug3("Entering slurm_jobcomp_log_record");
- if (!(job = _jobcomp_info_create (record)))
+ if (!(job = _jobcomp_info_create (record)))
return error ("jobcomp/script: Failed to create job info!");
pthread_mutex_lock(&comp_list_mutex);
@@ -620,8 +620,8 @@ extern int fini ( void )
return rc;
}
-/*
- * get info from the storage
+/*
+ * get info from the storage
* in/out job_list List of job_rec_t *
* note List needs to be freed when called
*/
@@ -632,8 +632,8 @@ extern List slurm_jobcomp_get_jobs(acct_job_cond_t *job_cond)
return NULL;
}
-/*
- * expire old info from the storage
+/*
+ * expire old info from the storage
*/
extern int slurm_jobcomp_archive(acct_archive_cond_t *archive_cond)
{
diff --git a/src/plugins/mpi/lam/Makefile.am b/src/plugins/mpi/lam/Makefile.am
index 112981723083f4a472179133d980f0dba0845bbe..5b71327ba0386f2d7a363cbaa5f731d4e3ddeb41 100644
--- a/src/plugins/mpi/lam/Makefile.am
+++ b/src/plugins/mpi/lam/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/mpi/lam/Makefile.in b/src/plugins/mpi/lam/Makefile.in
index 53dad7e2fd6e14ba1827aa5880a9ee45a9085264..ebd90e292d2b1692d4caaf3c398c4c0f749e9e43 100644
--- a/src/plugins/mpi/lam/Makefile.in
+++ b/src/plugins/mpi/lam/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = mpi_lam.la
mpi_lam_la_SOURCES = mpi_lam.c lam.h
diff --git a/src/plugins/mpi/lam/lam.h b/src/plugins/mpi/lam/lam.h
index 1c20e4af79095fa14245e3069f900b320939f28c..837fdba4529f5cc7938ef6f1d2c05dbc91d187b3 100644
--- a/src/plugins/mpi/lam/lam.h
+++ b/src/plugins/mpi/lam/lam.h
@@ -1,37 +1,37 @@
/*****************************************************************************\
- ** lam.h - Library routines for initiating jobs on with lam type mpi
+ ** lam.h - Library routines for initiating jobs on with lam type mpi
** $Id: mpi_gmpi.c,v 1.7 2005/06/07 18:25:32 morrone Exp $
*****************************************************************************
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/plugins/mpi/lam/mpi_lam.c b/src/plugins/mpi/lam/mpi_lam.c
index 61d87ef329036f2f52cc050caf64b8efa4ca6dba..4f8de9476006ef3050acc4d78469ca8347a9a063 100644
--- a/src/plugins/mpi/lam/mpi_lam.c
+++ b/src/plugins/mpi/lam/mpi_lam.c
@@ -1,37 +1,37 @@
/*****************************************************************************\
- ** mpi_lam.c - Library routines for initiating jobs on with lam type mpi
+ ** mpi_lam.c - Library routines for initiating jobs on with lam type mpi
** $Id: mpi_gmpi.c,v 1.7 2005/06/07 18:25:32 morrone Exp $
*****************************************************************************
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -66,7 +66,7 @@
* <application>/<method>
*
* where <application> is a description of the intended application of
- * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
+ * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
* of how this plugin satisfies that application. SLURM will only load
* a switch plugin if the plugin_type string has a prefix of "switch/".
*
diff --git a/src/plugins/mpi/mpich1_p4/Makefile.am b/src/plugins/mpi/mpich1_p4/Makefile.am
index 3bfd2f2591603911bbbf6c5177f0acd6ea2de7e9..b0344b998bdd1f4990b5ab44ca43a49436eca09f 100644
--- a/src/plugins/mpi/mpich1_p4/Makefile.am
+++ b/src/plugins/mpi/mpich1_p4/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/mpi/mpich1_p4/Makefile.in b/src/plugins/mpi/mpich1_p4/Makefile.in
index 6892822f2be233f9eb757065dcbb21e684dcdcc7..5a1433858b4ab359e0449a23f743d1a9af1de05d 100644
--- a/src/plugins/mpi/mpich1_p4/Makefile.in
+++ b/src/plugins/mpi/mpich1_p4/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = mpi_mpich1_p4.la
diff --git a/src/plugins/mpi/mpich1_p4/mpich1_p4.c b/src/plugins/mpi/mpich1_p4/mpich1_p4.c
index edcf17b987e51f41ca4bdddbf7db183b5a290059..c6105376b9ca917af1ed5e8dc08cc5193686d6ec 100644
--- a/src/plugins/mpi/mpich1_p4/mpich1_p4.c
+++ b/src/plugins/mpi/mpich1_p4/mpich1_p4.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -73,7 +73,7 @@
* <application>/<method>
*
* where <application> is a description of the intended application of
- * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
+ * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
* of how this plugin satisfies that application. SLURM will only load
* a switch plugin if the plugin_type string has a prefix of "switch/".
*
@@ -87,17 +87,17 @@ const char plugin_name[] = "mpi MPICH1_P4 plugin";
const char plugin_type[] = "mpi/mpich1_p4";
const uint32_t plugin_version = 100;
-/* communication for master port info */
+/* communication for master port info */
pthread_t p4_tid = (pthread_t) -1;
int p4_fd1 = -1, p4_fd2 = -1;
-/*
- * These vars are used to break the mpi thread out of a poll call, exit,
- * and allow the main thread to do a timed wait for that exit
+/*
+ * These vars are used to break the mpi thread out of a poll call, exit,
+ * and allow the main thread to do a timed wait for that exit
*/
static int shutdown_pipe[2];
static bool shutdown_complete; /* Set true when mpi thr about to exit */
-static int shutdown_timeout; /* Num secs for main thread to wait for
+static int shutdown_timeout; /* Num secs for main thread to wait for
mpi thread to finish */
static pthread_mutex_t shutdown_lock;
static pthread_cond_t shutdown_cond;
@@ -119,7 +119,7 @@ int p_mpi_hook_slurmstepd_task (const mpi_plugin_client_info_t *job,
free(tmp);
}
hostlist_destroy(hl);
- env_array_overwrite_fmt(env, "SLURM_MPICH_NODELIST", "%s",
+ env_array_overwrite_fmt(env, "SLURM_MPICH_NODELIST", "%s",
host_str);
xfree(host_str);
}
@@ -183,7 +183,7 @@ static void *mpich1_thr(void *arg)
ufds[0].events = POLLIN;
ufds[1].fd = shutdown_pipe[0];
ufds[1].events = POLLIN;
-
+
while (1) {
if (p4_tid == (pthread_t) -1)
goto done;
@@ -224,7 +224,7 @@ static void *mpich1_thr(void *arg)
if (ufds[1].revents & POLLIN) {
goto done;
}
-
+
new_fd = accept(p4_fd2, &cli_addr, &cli_len);
if (new_fd < 0)
continue;
@@ -309,7 +309,7 @@ p_mpi_hook_client_prelaunch(mpi_plugin_client_info_t *job, char ***env)
slurm_attr_destroy(&attr);
env_array_overwrite_fmt(env, "SLURM_MPICH_PORT1", "%hu", port1);
env_array_overwrite_fmt(env, "SLURM_MPICH_PORT2", "%hu", port2);
- debug("mpich_p4 plugin listening on fd=%d,%d ports=%d,%d",
+ debug("mpich_p4 plugin listening on fd=%d,%d ports=%d,%d",
p4_fd1, p4_fd2, port1, port2);
/* only return NULL on error */
@@ -328,9 +328,9 @@ int p_mpi_hook_client_fini(mpi_plugin_client_state_t *state)
int n;
/*
- * Write to the pipe to break the mpi thread out of a poll
+ * Write to the pipe to break the mpi thread out of a poll
* (or leave the poll immediately after it is called) and exit.
- * Do a timed wait for the mpi thread to shut down, or just
+ * Do a timed wait for the mpi thread to shut down, or just
* exit if the mpi thread cannot respond.
*/
n = write(shutdown_pipe[1], &tmp, 1);
@@ -345,7 +345,7 @@ int p_mpi_hook_client_fini(mpi_plugin_client_state_t *state)
break;
}
pthread_cond_timedwait(
- &shutdown_cond,
+ &shutdown_cond,
&shutdown_lock, &ts);
}
slurm_mutex_unlock(&shutdown_lock);
diff --git a/src/plugins/mpi/mpich1_shmem/Makefile.am b/src/plugins/mpi/mpich1_shmem/Makefile.am
index 99c1ba0bec1e07108ce1c697fceb39b9a59fe6c1..63000a35f1a3cad2dc2e1c5ef14ea5d4d8ff59ea 100644
--- a/src/plugins/mpi/mpich1_shmem/Makefile.am
+++ b/src/plugins/mpi/mpich1_shmem/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/mpi/mpich1_shmem/Makefile.in b/src/plugins/mpi/mpich1_shmem/Makefile.in
index e741d4cb62ca7167b3c48d335f39174a545a23e6..93e7833260cca6070ca8eccfee73157d534295a7 100644
--- a/src/plugins/mpi/mpich1_shmem/Makefile.in
+++ b/src/plugins/mpi/mpich1_shmem/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = mpi_mpich1_shmem.la
mpi_mpich1_shmem_la_SOURCES = mpich1_shmem.c
diff --git a/src/plugins/mpi/mpich1_shmem/mpich1_shmem.c b/src/plugins/mpi/mpich1_shmem/mpich1_shmem.c
index e853b946b6b7c2d7133266112cc937acdb082463..2357d5c2a3f3fe5200db149b3d17ff41aab31db3 100644
--- a/src/plugins/mpi/mpich1_shmem/mpich1_shmem.c
+++ b/src/plugins/mpi/mpich1_shmem/mpich1_shmem.c
@@ -1,37 +1,37 @@
/*****************************************************************************\
- ** mpich1_shmem.c - Library routines for initiating mpich1 jobs using
+ ** mpich1_shmem.c - Library routines for initiating mpich1 jobs using
** shared memory model
*****************************************************************************
* Copyright (C) 2004-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -66,7 +66,7 @@
* <application>/<method>
*
* where <application> is a description of the intended application of
- * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
+ * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
* of how this plugin satisfies that application. SLURM will only load
* a switch plugin if the plugin_type string has a prefix of "switch/".
*
diff --git a/src/plugins/mpi/mpichgm/Makefile.am b/src/plugins/mpi/mpichgm/Makefile.am
index 8e281e6c35d5951012bdf1a419107f7536cd273b..5db34be7885f8f13330b9bfd62d804387cc463fc 100644
--- a/src/plugins/mpi/mpichgm/Makefile.am
+++ b/src/plugins/mpi/mpichgm/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/mpi/mpichgm/Makefile.in b/src/plugins/mpi/mpichgm/Makefile.in
index f928ae1e57196380a5dac859a7dc7726acb89601..b7e63027b2802167b921162dac26848f4b7e003b 100644
--- a/src/plugins/mpi/mpichgm/Makefile.in
+++ b/src/plugins/mpi/mpichgm/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = mpi_mpichgm.la
diff --git a/src/plugins/mpi/mpichgm/mpi_mpichgm.c b/src/plugins/mpi/mpichgm/mpi_mpichgm.c
index 581da3578941e0f4fd8bdff328721262a84944d6..7175960ec002b67aea6d146c8cb16286093fcd9c 100644
--- a/src/plugins/mpi/mpichgm/mpi_mpichgm.c
+++ b/src/plugins/mpi/mpichgm/mpi_mpichgm.c
@@ -1,37 +1,37 @@
/*****************************************************************************\
- ** mpi_mpichgm.c - Library routines for initiating jobs on with gmpi type mpi
+ ** mpi_mpichgm.c - Library routines for initiating jobs on with gmpi type mpi
** $Id$
*****************************************************************************
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -67,7 +67,7 @@
* <application>/<method>
*
* where <application> is a description of the intended application of
- * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
+ * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
* of how this plugin satisfies that application. SLURM will only load
* a switch plugin if the plugin_type string has a prefix of "switch/".
*
@@ -87,13 +87,13 @@ int p_mpi_hook_slurmstepd_task(const mpi_plugin_task_info_t *job,
char addrbuf[1024];
char *p;
char *addr = getenvp(*env, "SLURM_LAUNCH_NODE_IPADDR");
-
+
debug("Using mpi/mpich-gm");
slurm_print_slurm_addr (job->self, addrbuf, sizeof(addrbuf));
-
+
if ((p = strchr (addrbuf, ':')) != NULL)
*p = '\0';
-
+
env_array_overwrite_fmt(env, "GMPI_MASTER", "%s", addr);
env_array_overwrite_fmt(env, "GMPI_SLAVE", "%s", addrbuf);
env_array_overwrite_fmt(env, "GMPI_ID", "%u", job->gtaskid);
@@ -108,7 +108,7 @@ int p_mpi_hook_slurmstepd_task(const mpi_plugin_task_info_t *job,
env_array_overwrite_fmt(env, "MXMPI_RECV", "%s", "hybrid");
}
debug2("init for mpi rank %u\n", job->gtaskid);
-
+
return SLURM_SUCCESS;
}
diff --git a/src/plugins/mpi/mpichgm/mpichgm.c b/src/plugins/mpi/mpichgm/mpichgm.c
index bcf59938a8a467b8e272126b5391dc54d006de91..dd777cd37ec4e503881e5bb1bea8e1c094a9dd4d 100644
--- a/src/plugins/mpi/mpichgm/mpichgm.c
+++ b/src/plugins/mpi/mpichgm/mpichgm.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Takao Hatazaki <takao.hatazaki@hp.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -135,7 +135,7 @@ static int _gmpi_establish_map(gmpi_state_t *st)
char *p, *rbuf = NULL, *gmap = NULL, *lmap = NULL, *map = NULL;
char tmp[128];
gm_slave_t *slave_data = NULL, *dp;
-
+
/*
* Collect info from slaves.
* Will never finish unless slaves are GMPI processes.
@@ -149,7 +149,7 @@ static int _gmpi_establish_map(gmpi_state_t *st)
slave_data[i].defined = 0;
i = 0;
rbuf = (char *)xmalloc(GMPI_RECV_BUF_LEN);
-
+
while (i < nprocs) {
newfd = accept(accfd, (struct sockaddr *)&addr, &addrlen);
if (newfd == -1) {
@@ -304,7 +304,7 @@ static void *_gmpi_thr(void *arg)
debug3("GMPI master thread pid=%lu", (unsigned long) getpid());
_gmpi_establish_map(st);
-
+
debug3("GMPI master thread is waiting for ABORT message.");
_gmpi_wait_abort(st);
@@ -369,7 +369,7 @@ gmpi_thr_create(const mpi_plugin_client_info_t *job, char ***env)
env_array_overwrite_fmt(env, "GMPI_PORT", "%hu", port);
env_array_overwrite_fmt(env, "GMPI_MAGIC", "%u", job->jobid);
- env_array_overwrite_fmt(env, "GMPI_NP", "%d",
+ env_array_overwrite_fmt(env, "GMPI_NP", "%d",
job->step_layout->task_cnt);
env_array_overwrite_fmt(env, "GMPI_SHMEM", "1");
/* FIXME for multi-board config. */
@@ -383,7 +383,7 @@ gmpi_thr_create(const mpi_plugin_client_info_t *job, char ***env)
job->step_layout->task_cnt);
/* FIXME for multi-board config. */
env_array_overwrite_fmt(env, "MXMPI_BOARD", "-1");
-
+
/* for MACOSX to override default malloc */
env_array_overwrite_fmt(env, "DYLD_FORCE_FLAT_NAMESPACE", "1");
@@ -397,14 +397,14 @@ gmpi_thr_create(const mpi_plugin_client_info_t *job, char ***env)
/*
* Warning: This pthread_cancel/pthread_join is a little unsafe. The thread is
* not joinable, so on most systems the join will fail, then the thread's state
- * will be destroyed, possibly before the thread has actually stopped. In
+ * will be destroyed, possibly before the thread has actually stopped. In
* practice the thread will usually be waiting on an accept call when it gets
- * cancelled. If the mpi thread has a mutex locked when it is cancelled--while
+ * cancelled. If the mpi thread has a mutex locked when it is cancelled--while
* using the "info" or "error" functions for logging--the caller will deadlock.
* See mpich1_p4.c or mvapich.c for code that shuts down cleanly by letting
* the mpi thread wait on a poll call, and creating a pipe that the poll waits
- * on, which can be written to by the main thread to tell the mpi thread to
- * exit. Also see rev 18654 of mpichmx.c, on
+ * on, which can be written to by the main thread to tell the mpi thread to
+ * exit. Also see rev 18654 of mpichmx.c, on
* branches/slurm-2.1.mpi.plugin.cleanup for an implementation. There were no
* myrinet systems available for testing, which is why I couldn't complete the
* patch for this plugin. -djb
diff --git a/src/plugins/mpi/mpichgm/mpichgm.h b/src/plugins/mpi/mpichgm/mpichgm.h
index f6a1d2e72652df912898e1b9f8d85a9be9a0a8b1..19e0cbe555aa301ee8457989edf9172d13d656ee 100644
--- a/src/plugins/mpi/mpichgm/mpichgm.h
+++ b/src/plugins/mpi/mpichgm/mpichgm.h
@@ -1,37 +1,37 @@
/*****************************************************************************\
- ** mpichgm.h - Library routines for initiating jobs on with gmpi type mpi
+ ** mpichgm.h - Library routines for initiating jobs on with gmpi type mpi
** $Id$
*****************************************************************************
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/plugins/mpi/mpichmx/Makefile.am b/src/plugins/mpi/mpichmx/Makefile.am
index c0bbfaf2bf02d6f843dfaf419c05b047033e8384..42bfd8727e41d73565b89cde19fba34a36477b29 100644
--- a/src/plugins/mpi/mpichmx/Makefile.am
+++ b/src/plugins/mpi/mpichmx/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/mpi/mpichmx/Makefile.in b/src/plugins/mpi/mpichmx/Makefile.in
index 99c9e7da0d47f70ae450f1f7ce8828c1187a1806..5154615209a647d7ff2c9ad812cb1840e3503cc3 100644
--- a/src/plugins/mpi/mpichmx/Makefile.in
+++ b/src/plugins/mpi/mpichmx/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = mpi_mpichmx.la
diff --git a/src/plugins/mpi/mpichmx/mpi_mpichmx.c b/src/plugins/mpi/mpichmx/mpi_mpichmx.c
index 780f25a2817e13f8747578a2786435e604383e0d..e35b4766ebe2b56995b539ee4a7e11bd3e19e293 100644
--- a/src/plugins/mpi/mpichmx/mpi_mpichmx.c
+++ b/src/plugins/mpi/mpichmx/mpi_mpichmx.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -66,7 +66,7 @@
* <application>/<method>
*
* where <application> is a description of the intended application of
- * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
+ * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
* of how this plugin satisfies that application. SLURM will only load
* a switch plugin if the plugin_type string has a prefix of "switch/".
*
@@ -86,13 +86,13 @@ int p_mpi_hook_slurmstepd_task(const mpi_plugin_task_info_t *job,
char addrbuf[1024];
char *p;
char *addr = getenvp(*env, "SLURM_LAUNCH_NODE_IPADDR");
-
+
debug("Using mpi/mpich-gm");
slurm_print_slurm_addr (job->self, addrbuf, sizeof(addrbuf));
-
+
if ((p = strchr (addrbuf, ':')) != NULL)
*p = '\0';
-
+
env_array_overwrite_fmt(env, "GMPI_MASTER", "%s", addr);
env_array_overwrite_fmt(env, "GMPI_SLAVE", "%s", addrbuf);
env_array_overwrite_fmt(env, "GMPI_ID", "%u", job->gtaskid);
@@ -107,7 +107,7 @@ int p_mpi_hook_slurmstepd_task(const mpi_plugin_task_info_t *job,
env_array_overwrite_fmt(env, "MXMPI_RECV", "%s", "hybrid");
}
debug2("init for mpi rank %u\n", job->gtaskid);
-
+
return SLURM_SUCCESS;
}
diff --git a/src/plugins/mpi/mpichmx/mpichmx.c b/src/plugins/mpi/mpichmx/mpichmx.c
index 0c1a29d6a9547f6971d4d4135c21eccef48b4cbf..b0fa098953aef0d9fe018979f8ac41c53450f3b1 100644
--- a/src/plugins/mpi/mpichmx/mpichmx.c
+++ b/src/plugins/mpi/mpichmx/mpichmx.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Takao Hatazaki <takao.hatazaki@hp.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -101,7 +101,7 @@ static int _gmpi_parse_init_recv_msg(mpi_plugin_client_info_t *job, char *rbuf,
fatal("GMPI id is out of range");
#if 0
/* Unlike GM ports, MX endpoints can be 0,
- * Pere Munt, BSC-CMS */
+ * Pere Munt, BSC-CMS */
if (port_board_id == 0)
fatal("MPI id=%d was unable to open a GM port", id);
#endif
@@ -138,7 +138,7 @@ static int _gmpi_establish_map(gmpi_state_t *st)
char *p, *rbuf = NULL, *gmap = NULL, *lmap = NULL, *map = NULL;
char tmp[128];
gm_slave_t *slave_data = NULL, *dp;
-
+
/*
* Collect info from slaves.
* Will never finish unless slaves are GMPI processes.
@@ -152,7 +152,7 @@ static int _gmpi_establish_map(gmpi_state_t *st)
slave_data[i].defined = 0;
i = 0;
rbuf = (char *)xmalloc(GMPI_RECV_BUF_LEN);
-
+
while (i < nprocs) {
newfd = accept(accfd, (struct sockaddr *)&addr, &addrlen);
if (newfd == -1) {
@@ -307,7 +307,7 @@ static void *_gmpi_thr(void *arg)
debug3("GMPI master thread pid=%lu", (unsigned long) getpid());
_gmpi_establish_map(st);
-
+
debug3("GMPI master thread is waiting for ABORT message.");
_gmpi_wait_abort(st);
@@ -372,7 +372,7 @@ gmpi_thr_create(const mpi_plugin_client_info_t *job, char ***env)
env_array_overwrite_fmt(env, "GMPI_PORT", "%hu", port);
env_array_overwrite_fmt(env, "GMPI_MAGIC", "%u", job->jobid);
- env_array_overwrite_fmt(env, "GMPI_NP", "%d",
+ env_array_overwrite_fmt(env, "GMPI_NP", "%d",
job->step_layout->task_cnt);
env_array_overwrite_fmt(env, "GMPI_SHMEM", "1");
/* FIXME for multi-board config. */
@@ -386,7 +386,7 @@ gmpi_thr_create(const mpi_plugin_client_info_t *job, char ***env)
job->step_layout->task_cnt);
/* FIXME for multi-board config. */
env_array_overwrite_fmt(env, "MXMPI_BOARD", "-1");
-
+
/* for MACOSX to override default malloc */
env_array_overwrite_fmt(env, "DYLD_FORCE_FLAT_NAMESPACE", "1");
@@ -401,14 +401,14 @@ gmpi_thr_create(const mpi_plugin_client_info_t *job, char ***env)
/*
* Warning: This pthread_cancel/pthread_join is a little unsafe. The thread is
* not joinable, so on most systems the join will fail, then the thread's state
- * will be destroyed, possibly before the thread has actually stopped. In
+ * will be destroyed, possibly before the thread has actually stopped. In
* practice the thread will usually be waiting on an accept call when it gets
- * cancelled. If the mpi thread has a mutex locked when it is cancelled--while
+ * cancelled. If the mpi thread has a mutex locked when it is cancelled--while
* using the "info" or "error" functions for logging--the caller will deadlock.
* See mpich1_p4.c or mvapich.c for code that shuts down cleanly by letting
* the mpi thread wait on a poll call, and creating a pipe that the poll waits
- * on, which can be written to by the main thread to tell the mpi thread to
- * exit. Also see rev 18654 of mpichmx.c, on
+ * on, which can be written to by the main thread to tell the mpi thread to
+ * exit. Also see rev 18654 of mpichmx.c, on
* branches/slurm-2.1.mpi.plugin.cleanup for an implementation. There were no
* myrinet systems available for testing, which is why I couldn't complete the
* patch for this plugin. -djb
diff --git a/src/plugins/mpi/mpichmx/mpichmx.h b/src/plugins/mpi/mpichmx/mpichmx.h
index 8cb2b879a775de0ce7f182cb98d69196d2db2862..087ab3a7284ec131989dfc290325d820940b2be9 100644
--- a/src/plugins/mpi/mpichmx/mpichmx.h
+++ b/src/plugins/mpi/mpichmx/mpichmx.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/plugins/mpi/mvapich/Makefile.am b/src/plugins/mpi/mvapich/Makefile.am
index 69d6d69d59eb2da4d77f456014dc6d97f72ecb95..05fb7c5ec20c8d77f1f6c51defc97f157f4e40f1 100644
--- a/src/plugins/mpi/mvapich/Makefile.am
+++ b/src/plugins/mpi/mvapich/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/mpi/mvapich/Makefile.in b/src/plugins/mpi/mvapich/Makefile.in
index 9f9329ec77b71fb49418f1fbad6e745aabf247a0..16cf137e54aa0a5dcaa9e82a6883fbea5583ea82 100644
--- a/src/plugins/mpi/mvapich/Makefile.in
+++ b/src/plugins/mpi/mvapich/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = mpi_mvapich.la
mpi_mvapich_la_SOURCES = mpi_mvapich.c mvapich.c mvapich.h\
diff --git a/src/plugins/mpi/mvapich/mpi_mvapich.c b/src/plugins/mpi/mvapich/mpi_mvapich.c
index 0807052c825bbd04ab0216e5dd6b6b46bad5abea..44c321a369fad560d06bda0f3dc9e344c19930f5 100644
--- a/src/plugins/mpi/mvapich/mpi_mvapich.c
+++ b/src/plugins/mpi/mvapich/mpi_mvapich.c
@@ -1,38 +1,38 @@
/*****************************************************************************\
** mpi_mvapich.c - Library routines for initiating jobs on with mvapich
- ** type mpi.
+ ** type mpi.
*****************************************************************************
* Copyright (C) 2004-2007 The Regents of the University of California.
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -67,7 +67,7 @@
* <application>/<method>
*
* where <application> is a description of the intended application of
- * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
+ * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
* of how this plugin satisfies that application. SLURM will only load
* a switch plugin if the plugin_type string has a prefix of "switch/".
*
@@ -100,17 +100,17 @@ int p_mpi_hook_slurmstepd_task (const mpi_plugin_task_info_t *job,
*/
for (i = 0; i < job->ntasks; i++)
xstrcat (processes, "x:");
-
+
env_array_overwrite_fmt(env, "MPIRUN_PROCESSES", "%s", processes);
- /*
+ /*
* Some mvapich versions will ignore MPIRUN_PROCESSES If
* the following env var is set.
*/
env_array_overwrite_fmt(env, "NOT_USE_TOTALVIEW", "1");
/*
- * Set VIADEV_ENABLE_AFFINITY=0 so that mvapich doesn't
+ * Set VIADEV_ENABLE_AFFINITY=0 so that mvapich doesn't
* override SLURM's CPU affinity. (Unless this var is
* already set in user env)
*/
diff --git a/src/plugins/mpi/mvapich/mvapich.c b/src/plugins/mpi/mvapich/mvapich.c
index 8a2365163761dd5b13915bf898cdbc56703e4c01..407389d7f493e33d39649d7e7d246a1e94a49039 100644
--- a/src/plugins/mpi/mvapich/mvapich.c
+++ b/src/plugins/mpi/mvapich/mvapich.c
@@ -5,32 +5,32 @@
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -61,17 +61,17 @@
/*
* 2008-07-03:
- *
+ *
* This version of mvapich.c has been tested against the following
* protocol versions:
- *
+ *
* Version 8: (pmgr_collective): mvapich-1.0.1, mvapich-1.0
* Version 5: mvapich-0.9.9 r1760, mvapich-0.9.7-mlx2.2.0
* Version 3: mvapich-0.9.8
*/
/* NOTE: MVAPICH has changed protocols without changing version numbers.
- * This makes support of MVAPICH very difficult.
+ * This makes support of MVAPICH very difficult.
* Support for the following versions have been validated:
*
* For MVAPICH-GEN2-1.0-103, set MVAPICH_VERSION_REQUIRES_PIDS to 2
@@ -120,7 +120,7 @@ enum mv_init_state
*/
struct mvapich_info
{
- int do_poll;
+ int do_poll;
enum mv_init_state state; /* Initialization state */
int nread; /* Amount of data read so far */
int nwritten; /* Amount of data written */
@@ -135,7 +135,7 @@ struct mvapich_info
int addrlen; /* Length of addr array in bytes */
int *addr; /* This process' address array, which for
- * process rank N in an M process job
+ * process rank N in an M process job
* looks like:
*
* qp0,qp1,..,lid,qpN+1,..,qpM-1, hostid
@@ -172,7 +172,7 @@ struct mvapich_state {
int shutdown_pipe[2]; /* Write to this pipe to interrupt poll calls */
bool shutdown_complete; /* Set true when mpi thr about to exit */
- int shutdown_timeout; /* Num secs for main thread to wait for
+ int shutdown_timeout; /* Num secs for main thread to wait for
mpi thread to finish */
pthread_mutex_t shutdown_lock;
@@ -184,7 +184,7 @@ struct mvapich_state {
/*
* MVAPICH poll structure used by mvapich_poll_next, etc.
*/
-struct mvapich_poll
+struct mvapich_poll
{
mvapich_state_t *st;
struct mvapich_info **mvmap;
@@ -221,7 +221,7 @@ void mvapich_thr_exit(mvapich_state_t *st);
static int mvapich_requires_pids (mvapich_state_t *st)
{
- if ( st->protocol_version == MVAPICH_VERSION_REQUIRES_PIDS
+ if ( st->protocol_version == MVAPICH_VERSION_REQUIRES_PIDS
|| st->protocol_version == 5
|| st->protocol_version == 6 )
return (1);
@@ -229,7 +229,7 @@ static int mvapich_requires_pids (mvapich_state_t *st)
}
/*
- * Return the number of ms left until the MVAPICH startup
+ * Return the number of ms left until the MVAPICH startup
* timeout expires.
*/
static int startup_timeout (mvapich_state_t *st)
@@ -343,8 +343,8 @@ static void report_absent_tasks (mvapich_state_t *st, int check_do_poll)
int nhosts = hostlist_count (hosts);
hostlist_ranged_string (tasks, 4096, r);
hostlist_ranged_string (hosts, 4096, h);
- error ("mvapich: timeout: waiting on rank%s %s on host%s %s.\n",
- nranks > 1 ? "s" : "", r,
+ error ("mvapich: timeout: waiting on rank%s %s on host%s %s.\n",
+ nranks > 1 ? "s" : "", r,
nhosts > 1 ? "s" : "", h);
}
@@ -385,14 +385,14 @@ static void mvapich_poll_reset (struct mvapich_poll *mp)
/*
* Reset mvapich_info do_poll attribute.
*/
- for (i = 0; i < mp->st->nprocs; i++)
+ for (i = 0; i < mp->st->nprocs; i++)
mp->st->mvarray[i]->do_poll = 1;
return;
}
/*
- * Create an mvapich_poll object, used to poll all mvapich
+ * Create an mvapich_poll object, used to poll all mvapich
* file descriptors for read/write activity
*
* Resets do_poll for all mvapich_info objects in mvarray to 1.
@@ -434,7 +434,7 @@ static int mvapich_poll_internal (struct mvapich_poll *mp)
/*
* Poll for next available mvapich_info object with read/write activity
- *
+ *
* Returns NULL when no more mvapich fds need to be polled.
*
* The caller is responsible for updating mvi->do_poll to indicate
@@ -479,13 +479,13 @@ again:
if (mp->nfds == 0)
return (NULL);
- mvapich_debug3 ("mvapich_poll_next (nfds=%d, timeout=%d)\n",
+ mvapich_debug3 ("mvapich_poll_next (nfds=%d, timeout=%d)\n",
mp->nfds, startup_timeout (st));
if ((rc = mvapich_poll_internal (mp)) < 0)
mvapich_terminate_job (st, "mvapich_poll_next: %m");
else if (rc == 0) {
/*
- * If we timed out, then report all tasks that we were
+ * If we timed out, then report all tasks that we were
* still waiting for.
*/
report_absent_tasks (st, 1);
@@ -495,7 +495,7 @@ again:
/*
* Loop through poll fds and return first mvapich_info object
- * we find that has the requested read/write activity.
+ * we find that has the requested read/write activity.
* When found, we update the loop counter, and return
* the corresponding mvapich_info object.
*
@@ -514,7 +514,7 @@ again:
}
-static int mvapich_poll (mvapich_state_t *st, struct mvapich_info *mvi,
+static int mvapich_poll (mvapich_state_t *st, struct mvapich_info *mvi,
int write) {
int rc = 0;
struct pollfd pfds[1];
@@ -529,7 +529,7 @@ static int mvapich_poll (mvapich_state_t *st, struct mvapich_info *mvi,
return (-1);
}
- /*
+ /*
* If poll() timed out, forcibly kill job and exit instead of
* waiting longer for remote IO, process exit, etc.
*/
@@ -537,9 +537,9 @@ static int mvapich_poll (mvapich_state_t *st, struct mvapich_info *mvi,
if (mvi->rank >= 0) {
slurm_step_layout_t *sl = st->job->step_layout;
const char *host = slurm_step_layout_host_name (sl, mvi->rank);
- error("Timeout waiting to read from MPI rank %d [on %s]. Exiting.",
+ error("Timeout waiting to read from MPI rank %d [on %s]. Exiting.",
mvi->rank, host);
- }
+ }
else {
report_absent_tasks (st, 0);
}
@@ -642,7 +642,7 @@ static int mvapich_read_n (mvapich_state_t *st, struct mvapich_info *mvi,
if (mvapich_poll (st, mvi, 0) < 0)
return (-1);
- if ((n = read (mvi->fd, p, nleft)) < 0) {
+ if ((n = read (mvi->fd, p, nleft)) < 0) {
if (errno == EAGAIN || errno == EINTR)
continue;
return (-1);
@@ -650,7 +650,7 @@ static int mvapich_read_n (mvapich_state_t *st, struct mvapich_info *mvi,
if (n == 0) { /* unexpected EOF */
error ("mvapich: rank %d: "
- "Unexpected EOF (%dB left to read)",
+ "Unexpected EOF (%dB left to read)",
mvi->rank, nleft);
return (-1);
}
@@ -683,14 +683,14 @@ static int mvapich_abort_sends_rank (mvapich_state_t *st)
* The format of the information sent back to each process is:
*
* for rank N in M process job:
- *
+ *
* lid info : lid0,lid1,...lidM-1
* qp info : qp0, qp1, ..., -1, qpN+1, ...,qpM-1
* hostids : hostid0,hostid1,...,hostidM-1
*
* total of 3*nprocs ints.
*
- */
+ */
static void mvapich_bcast_addrs (mvapich_state_t *st)
{
struct mvapich_info *m;
@@ -721,8 +721,8 @@ static void mvapich_bcast_addrs (mvapich_state_t *st)
/*
* qp array is tailored to each process.
*/
- for (j = 0; j < st->nprocs; j++)
- out_addrs[st->nprocs + j] =
+ for (j = 0; j < st->nprocs; j++)
+ out_addrs[st->nprocs + j] =
(i == j) ? -1 : st->mvarray[j]->addr[i];
mvapich_debug3 ("writing addrs to task %d", i);
@@ -735,7 +735,7 @@ static void mvapich_bcast_addrs (mvapich_state_t *st)
*/
if (mvapich_requires_pids (st)) {
for (j = 0; j < st->nprocs; j++)
- mvapich_write_n (st, m,
+ mvapich_write_n (st, m,
&st->mvarray[j]->pid, st->mvarray[j]->pidlen);
}
@@ -764,7 +764,7 @@ static void mvapich_bcast_hostids (mvapich_state_t *st)
mvapich_debug ("bcasting hostids\n");
mp = mvapich_poll_create (st);
while ((mvi = mvapich_poll_next (mp, 0))) {
- if (mvapich_write (mvi, hostids, len) < 0)
+ if (mvapich_write (mvi, hostids, len) < 0)
mvapich_terminate_job (st, "write hostid rank %d: %m", mvi->rank);
}
xfree (hostids);
@@ -778,7 +778,7 @@ static void mvapich_bcast_hostids (mvapich_state_t *st)
mvapich_poll_reset (mp);
while ((mvi = mvapich_poll_next (mp, 1))) {
int co = 1, rc;
- mvapich_debug3 ("reading connect once value from rank %d fd=%d\n",
+ mvapich_debug3 ("reading connect once value from rank %d fd=%d\n",
mvi->rank, mvi->fd);
if ((rc = read (mvi->fd, &co, sizeof (int))) <= 0) {
mvapich_debug2 ("reading connect once value rc=%d: %m\n", rc);
@@ -804,7 +804,7 @@ static int mvapich_send (mvapich_state_t *st, void* buf, int size, int rank)
static int mvapich_recv (mvapich_state_t *st, void* buf, int size, int rank)
{
struct mvapich_info *mvi = st->mvarray [rank];
- return (mvapich_read_n (st, mvi, buf, size));
+ return (mvapich_read_n (st, mvi, buf, size));
}
/* Scatter data in buf to ranks using chunks of size bytes */
@@ -849,7 +849,7 @@ static int mvapich_allgatherbcast (mvapich_state_t *st, void* buf, int size)
static int mvapich_alltoallbcast (mvapich_state_t *st, void* buf, int size)
{
int pbufsize = size * st->nprocs;
- void* pbuf = xmalloc(pbufsize);
+ void* pbuf = xmalloc(pbufsize);
int i, src, rc = 0;
int n = 0;
@@ -893,10 +893,10 @@ static int recv_common_value (mvapich_state_t *st, int *valp, int rank)
return (0);
}
-/*
+/*
* PMGR_BCAST (root, size of message, then message data (from root only))
*/
-static int process_pmgr_bcast (mvapich_state_t *st, int *rootp, int *sizep,
+static int process_pmgr_bcast (mvapich_state_t *st, int *rootp, int *sizep,
void ** bufp, int rank)
{
if (recv_common_value (st, rootp, rank) < 0)
@@ -906,8 +906,8 @@ static int process_pmgr_bcast (mvapich_state_t *st, int *rootp, int *sizep,
if (rank != *rootp)
return (0);
- /*
- * Recv data from root
+ /*
+ * Recv data from root
*/
*bufp = xmalloc (*sizep);
mvapich_debug3 ("PMGR_BCAST: recv from root\n");
@@ -921,7 +921,7 @@ static int process_pmgr_bcast (mvapich_state_t *st, int *rootp, int *sizep,
/*
* PMGR_GATHER (root, size of message, then message data)
*/
-static int process_pmgr_gather (mvapich_state_t *st, int *rootp,
+static int process_pmgr_gather (mvapich_state_t *st, int *rootp,
int *sizep, void **bufp, int rank)
{
if (recv_common_value (st, rootp, rank) < 0)
@@ -942,7 +942,7 @@ static int process_pmgr_gather (mvapich_state_t *st, int *rootp,
/*
* PMGR_SCATTER (root, size of message, then message data)
*/
-static int process_pmgr_scatter (mvapich_state_t *st, int *rootp,
+static int process_pmgr_scatter (mvapich_state_t *st, int *rootp,
int *sizep, void **bufp, int rank)
{
if (recv_common_value (st, rootp, rank) < 0)
@@ -954,7 +954,7 @@ static int process_pmgr_scatter (mvapich_state_t *st, int *rootp,
if (*bufp == NULL)
*bufp = xmalloc (*sizep * st->nprocs);
- mvapich_debug3 ("PMGR_SCATTER: recv from rank %d", rank);
+ mvapich_debug3 ("PMGR_SCATTER: recv from rank %d", rank);
if (mvapich_recv(st, *bufp, (*sizep) * st->nprocs, rank) < 0) {
error ("mvapich: PMGR_SCATTER: rank %d: recv: %m", rank);
return (-1);
@@ -965,7 +965,7 @@ static int process_pmgr_scatter (mvapich_state_t *st, int *rootp,
/*
* PMGR_ALLGATHER (size of message, then message data)
*/
-static int process_pmgr_allgather (mvapich_state_t *st, int *sizep,
+static int process_pmgr_allgather (mvapich_state_t *st, int *sizep,
void **bufp, int rank)
{
if (recv_common_value (st, sizep, rank) < 0)
@@ -984,7 +984,7 @@ static int process_pmgr_allgather (mvapich_state_t *st, int *sizep,
/*
* PMGR_ALLTOALL (size of message, then message data)
*/
-static int process_pmgr_alltoall (mvapich_state_t *st, int *sizep,
+static int process_pmgr_alltoall (mvapich_state_t *st, int *sizep,
void **bufp, int rank)
{
if (recv_common_value (st, sizep, rank) < 0)
@@ -993,7 +993,7 @@ static int process_pmgr_alltoall (mvapich_state_t *st, int *sizep,
if (*bufp == NULL)
*bufp = xmalloc (*sizep * st->nprocs * st->nprocs);
mvapich_debug3 ("PMGR_ALLTOALL: recv from rank %d\n", rank);
- if (mvapich_recv ( st,
+ if (mvapich_recv ( st,
*bufp + (*sizep * st->nprocs)*rank,
*sizep * st->nprocs, rank ) < 0) {
error ("mvapich: PMGR_ALLTOALL: recv: rank %d: %m", rank);
@@ -1004,8 +1004,8 @@ static int process_pmgr_alltoall (mvapich_state_t *st, int *sizep,
}
-static int mvapich_process_op (mvapich_state_t *st,
- struct mvapich_info *mvi, int *rootp, int *opcodep,
+static int mvapich_process_op (mvapich_state_t *st,
+ struct mvapich_info *mvi, int *rootp, int *opcodep,
void **bufp, int *sizep)
{
int rank, code, opcode = -1;
@@ -1013,7 +1013,7 @@ static int mvapich_process_op (mvapich_state_t *st,
// read in opcode
if (recv_common_value (st, opcodep, mvi->rank) < 0) {
- error ("mvapich: rank %d: Failed to read opcode: %m",
+ error ("mvapich: rank %d: Failed to read opcode: %m",
mvi->rank);
return (-1);
}
@@ -1045,19 +1045,19 @@ static int mvapich_process_op (mvapich_state_t *st,
if (process_pmgr_bcast (st, rootp, sizep, bufp, mvi->rank) < 0)
return (-1);
break;
- case 5: // PMGR_GATHER
+ case 5: // PMGR_GATHER
if (process_pmgr_gather (st, rootp, sizep, bufp, mvi->rank) < 0)
return (-1);
break;
- case 6: // PMGR_SCATTER
+ case 6: // PMGR_SCATTER
if (process_pmgr_scatter (st, rootp, sizep, bufp, mvi->rank) < 0)
return (-1);
break;
- case 7: // PMGR_ALLGATHER
+ case 7: // PMGR_ALLGATHER
if (process_pmgr_allgather (st, sizep, bufp, mvi->rank) < 0)
return (-1);
break;
- case 8: // PMGR_ALLTOALL
+ case 8: // PMGR_ALLTOALL
if (process_pmgr_alltoall (st, sizep, bufp, mvi->rank) < 0)
return (-1);
break;
@@ -1153,7 +1153,7 @@ static int mvapich_pmgr_loop (mvapich_state_t *st)
}
-/*
+/*
* This function carries out pmgr_collective operations to
* bootstrap MPI. These collective operations are modeled after
* MPI collectives -- all tasks must call them in the same order
@@ -1173,7 +1173,7 @@ static int mvapich_pmgr_loop (mvapich_state_t *st)
*/
static int mvapich_processops (mvapich_state_t *st)
{
- /* Until a 'CLOSE' or 'ABORT' message is seen, we continuously
+ /* Until a 'CLOSE' or 'ABORT' message is seen, we continuously
* loop processing ops
*/
mvapich_debug ("Initiated PMGR processing\n");
@@ -1197,7 +1197,7 @@ static void mvapich_barrier (mvapich_state_t *st)
struct mvapich_info *m;
struct mvapich_poll *mp;
/*
- * Simple barrier to wait for qp's to come up.
+ * Simple barrier to wait for qp's to come up.
* Once all processes have written their rank over the socket,
* simply write their rank right back to them.
*/
@@ -1216,7 +1216,7 @@ static void mvapich_barrier (mvapich_state_t *st)
return;
}
-static void
+static void
mvapich_print_abort_message (mvapich_state_t *st, int rank,
int dest, char *msg, int msglen)
{
@@ -1230,14 +1230,14 @@ mvapich_print_abort_message (mvapich_state_t *st, int rank,
}
if (msg && (msglen > 0)) {
- /*
+ /*
* Remove trailing newline if it exists (syslog will add newline)
*/
if (msg [msglen - 1] == '\n')
msg [msglen - 1] = '\0';
msgstr = msg;
- }
+ }
else {
msgstr = "";
msglen = 0;
@@ -1256,22 +1256,22 @@ mvapich_print_abort_message (mvapich_state_t *st, int rank,
* so that system administrators know about possible HW events.
*/
openlog ("srun", 0, LOG_USER);
- syslog (LOG_WARNING,
+ syslog (LOG_WARNING,
"MVAPICH ABORT [jobid=%u.%u src=%d(%s) dst=%d(%s)]: %s",
- st->job->jobid, st->job->stepid,
+ st->job->jobid, st->job->stepid,
rank, host, dest, dsthost, msgstr);
closelog();
} else {
- info ("mvapich: %M: ABORT from MPI rank %d [on %s]",
+ info ("mvapich: %M: ABORT from MPI rank %d [on %s]",
rank, host);
/*
* Log the abort event to syslog
* so that system administrators know about possible HW events.
*/
openlog ("srun", 0, LOG_USER);
- syslog (LOG_WARNING,
+ syslog (LOG_WARNING,
"MVAPICH ABORT [jobid=%u.%u src=%d(%s) dst=-1()]: %s",
- st->job->jobid, st->job->stepid,
+ st->job->jobid, st->job->stepid,
rank, host, msgstr);
closelog();
@@ -1297,7 +1297,7 @@ static int mvapich_abort_timeout (void)
/*
- * Returns file descriptor from which to read abort message,
+ * Returns file descriptor from which to read abort message,
* -1 on error, or exits if shutdown message is received
*/
@@ -1319,10 +1319,10 @@ static int mvapich_abort_accept (mvapich_state_t *st)
pfds[1].fd = st->shutdown_pipe[0];
pfds[1].events = POLLIN;
- mvapich_debug3 ("Polling to accept MPI_ABORT timeout=%d",
+ mvapich_debug3 ("Polling to accept MPI_ABORT timeout=%d",
mvapich_abort_timeout ());
- /*
+ /*
* limit cancellation to the long periods waiting on this poll
*/
while ((rc = poll (pfds, 2, mvapich_abort_timeout ())) < 0) {
@@ -1332,7 +1332,7 @@ static int mvapich_abort_accept (mvapich_state_t *st)
return (-1);
}
- /*
+ /*
* If poll() timed out, forcibly kill job and exit instead of
* waiting longer for remote IO, process exit, etc.
*/
@@ -1380,7 +1380,7 @@ static void mvapich_wait_for_abort(mvapich_state_t *st)
}
/*
- * If we read both src/dest rank, then also try to
+ * If we read both src/dest rank, then also try to
* read an error message. If this fails, msglen will
* stay zero and no message will be printed.
*/
@@ -1472,7 +1472,7 @@ static int mvapich_read_item (struct mvapich_info *mvi, void *buf, size_t size)
if (errno == EAGAIN)
return (EAGAIN);
else {
- error ("mvapich: %d: nread=%d, read (%d, %lx, size=%d, nleft=%d): %m",
+ error ("mvapich: %d: nread=%d, read (%d, %lx, size=%d, nleft=%d): %m",
mvi->rank, mvi->nread, mvi->fd, buf, size, nleft);
return (-1);
}
@@ -1482,7 +1482,7 @@ static int mvapich_read_item (struct mvapich_info *mvi, void *buf, size_t size)
if (mvi->nread == size) {
mvi->nread = 0;
mvi->state++;
- }
+ }
return (0);
}
@@ -1490,18 +1490,18 @@ static int mvapich_read_item (struct mvapich_info *mvi, void *buf, size_t size)
/*
* Process initial mvapich states to read items such as
* version, rank, hostidlen, hostids... and so on.
- *
+ *
* Current state is tracked int he mvapich_info object itself
* and state transitions happen automatically in mvapich_read_item()
* when the current item is completely read. Early exit from
* the state processing may occur based on protocol version.
* Similarly, some protocol version may enter state processing
* at a different point.
- *
+ *
* State processing is considered complete when state == MV_INIT_DONE.
*
- */
-static int mvapich_info_process_init (mvapich_state_t *st,
+ */
+static int mvapich_info_process_init (mvapich_state_t *st,
struct mvapich_info *mvi)
{
int rc = 0;
@@ -1519,7 +1519,7 @@ again:
if (st->protocol_version < 0)
st->protocol_version = mvi->version;
- mvapich_debug2 ("fd %d: reading mvapich rank. version = %d",
+ mvapich_debug2 ("fd %d: reading mvapich rank. version = %d",
mvi->fd, mvi->version);
rc = mvapich_read_item (mvi, &mvi->rank, sizeof (int));
@@ -1547,17 +1547,17 @@ again:
case MV_READ_HOSTID:
if (mvi->hostidlen != sizeof (int)) {
error ("mvapich: rank %d: unexpected hostidlen = %d\n",
- mvi->rank, mvi->hostidlen);
+ mvi->rank, mvi->hostidlen);
return (-1);
}
- mvapich_debug2 ("rank %d: reading hostid. hostidlen = %d",
+ mvapich_debug2 ("rank %d: reading hostid. hostidlen = %d",
mvi->rank, mvi->hostidlen);
rc = mvapich_read_item (mvi, &mvi->hostid, mvi->hostidlen);
if (mvi->state != MV_READ_ADDRLEN || mvi->version > 3)
break;
-
+
case MV_READ_ADDRLEN:
mvapich_debug2 ("rank %d: read addrlen.", mvi->rank);
@@ -1567,7 +1567,7 @@ again:
break;
case MV_READ_ADDRS:
- mvapich_debug2 ("rank %d: read addr. addrlen = %d",
+ mvapich_debug2 ("rank %d: read addr. addrlen = %d",
mvi->rank, mvi->addrlen);
mvi->addr = xmalloc (mvi->addrlen);
@@ -1585,7 +1585,7 @@ again:
break;
case MV_READ_PID:
- mvapich_debug2 ("rank %d: read pid: pidlen = %d",
+ mvapich_debug2 ("rank %d: read pid: pidlen = %d",
mvi->rank, mvi->pidlen);
mvi->pid = xmalloc (mvi->pidlen);
@@ -1607,13 +1607,13 @@ again:
/*
* Protocol version 4,5,6: Done after reading HOSTID
*/
- if (mvi->state == MV_READ_ADDRLEN && mvi->version >= 5)
+ if (mvi->state == MV_READ_ADDRLEN && mvi->version >= 5)
mvi->state = MV_INIT_DONE;
/*
* Protocol version 8: Done after reading RANK
*/
- if (mvi->state == MV_READ_HOSTIDLEN && mvi->version == 8)
+ if (mvi->state == MV_READ_HOSTIDLEN && mvi->version == 8)
mvi->state = MV_INIT_DONE;
return (rc);
@@ -1633,7 +1633,7 @@ static int mvapich_accept_new (mvapich_state_t *st)
* Accept as many new connections as possible
*/
while (1) {
- if ( ((fd = slurm_accept_msg_conn (st->fd, &addr)) < 0)
+ if ( ((fd = slurm_accept_msg_conn (st->fd, &addr)) < 0)
&& errno == EAGAIN) {
mvapich_debug2 ("mvapich: accept new: %m");
return (0);
@@ -1666,11 +1666,11 @@ static int mvapich_accept_new (mvapich_state_t *st)
/*
* Accept new connections on st->fd and process them with the
- * function [fn]. The poll loop preferentially handles incoming
- * connections to avoid exceeding the socket listen queue, which can
- * be quite likely when launching very large jobs.
- *
- * When there are no connections waiting, and existing connections register
+ * function [fn]. The poll loop preferentially handles incoming
+ * connections to avoid exceeding the socket listen queue, which can
+ * be quite likely when launching very large jobs.
+ *
+ * When there are no connections waiting, and existing connections register
* read activity, these connections are processed using [fn], until
* such time as the mvapich_info state == MV_INIT_DONE.
*
@@ -1678,8 +1678,8 @@ static int mvapich_accept_new (mvapich_state_t *st)
* -1 on an error
* Exits if st->shutdown_pipe is written to
*/
-static int
-mvapich_initialize_connections (mvapich_state_t *st,
+static int
+mvapich_initialize_connections (mvapich_state_t *st,
int (fn) (mvapich_state_t *, struct mvapich_info *) )
{
int i, j;
@@ -1689,7 +1689,7 @@ mvapich_initialize_connections (mvapich_state_t *st,
int printonce = 0;
struct mvapich_info **mvmap;
struct pollfd *fds;
-
+
fds = xmalloc ((st->nprocs+2) * sizeof (struct pollfd));
mvmap = xmalloc (st->nprocs * sizeof (struct mvapich_info *));
st->nconnected = 0;
@@ -1716,7 +1716,7 @@ mvapich_initialize_connections (mvapich_state_t *st,
ncompleted = 0;
if (st->nconnected < st->nprocs)
- mvapich_debug2 ("Waiting for connection %d/%d\n",
+ mvapich_debug2 ("Waiting for connection %d/%d\n",
st->nconnected + 1, st->nprocs);
for (i = 0; i < st->nconnected; i++) {
@@ -1735,7 +1735,7 @@ mvapich_initialize_connections (mvapich_state_t *st,
if (st->nconnected == st->nprocs && !printonce) {
mvapich_debug ("Got %d connections.\n", st->nprocs);
- do_timings (st, "Accept %d connection%s%s",
+ do_timings (st, "Accept %d connection%s%s",
st->nprocs, st->nprocs == 1 ? "" : "s",
st->protocol_phase ? " (phase 2)" : "");
printonce = 1;
@@ -1776,7 +1776,7 @@ mvapich_initialize_connections (mvapich_state_t *st,
* Preferentially accept new connections.
*/
if (fds[0].revents == POLLIN) {
- if ((rc = mvapich_accept_new (st)) < 0)
+ if ((rc = mvapich_accept_new (st)) < 0)
break;
continue;
}
@@ -1787,7 +1787,7 @@ mvapich_initialize_connections (mvapich_state_t *st,
*/
for (i = 0; i < st->nconnected; i++) {
if (fds[i+2].revents == POLLIN) {
- if ((rc = (*fn) (st, mvmap[i])) < 0)
+ if ((rc = (*fn) (st, mvmap[i])) < 0)
goto out;
}
}
@@ -1809,7 +1809,7 @@ static int mvapich_phase_two (mvapich_state_t *st)
/*
* For phase 2, start reading addrlen for all tasks:
*/
- for (i = 0; i < st->nprocs; i++)
+ for (i = 0; i < st->nprocs; i++)
st->mvarray[i]->state = MV_READ_ADDRLEN;
mvapich_debug ("Reading addrs from all tasks");
@@ -1818,7 +1818,7 @@ static int mvapich_phase_two (mvapich_state_t *st)
mvapich_info_process_init (st, mvi);
- if (mvi->state == MV_INIT_DONE)
+ if (mvi->state == MV_INIT_DONE)
mvi->do_poll = 0;
}
mvapich_poll_destroy (mp);
@@ -1843,7 +1843,7 @@ static int read_phase2_header (mvapich_state_t *st, struct mvapich_info *mvi)
if ((rc = mvapich_read (mvi, &mvi->rank, sizeof (mvi->rank))) < 0)
error ("mvapich_read: %m");
/*
- * mvapich_read resets do_poll if we're done reading.
+ * mvapich_read resets do_poll if we're done reading.
* Use this to set our state to MV_INIT_DONE so we don't continue
* to poll on this fd.
*/
@@ -1881,7 +1881,7 @@ static int mvapich_handle_phase_two (mvapich_state_t *st)
/*
* Accept all incoming connections and read the header (rank).
*/
- if (mvapich_initialize_connections (st, read_phase2_header) < 0)
+ if (mvapich_initialize_connections (st, read_phase2_header) < 0)
mvapich_terminate_job (st, "Failed to initialize phase 2");
do_timings (st, "Phase 2 reconnect");
@@ -1920,11 +1920,11 @@ static void mvapich_connection_init (mvapich_state_t *st)
/*
* Get initial connections and read task header information:
*/
- if (mvapich_initialize_connections (st, mvapich_info_process_init) < 0)
+ if (mvapich_initialize_connections (st, mvapich_info_process_init) < 0)
goto fail;
/*
- * Sort mvarray in rank order. The rest of the startup code
+ * Sort mvarray in rank order. The rest of the startup code
* expects this.
*/
mva = xmalloc (st->nprocs * sizeof (*mva));
@@ -1958,7 +1958,7 @@ static void mvapich_close_fds (mvapich_state_t *st)
}
/*
- * This separate mvapich thread handles the MVAPICH startup
+ * This separate mvapich thread handles the MVAPICH startup
* protocol (tries to handle the many versions of it...).
*/
static void *mvapich_thr(void *arg)
@@ -1974,7 +1974,7 @@ static void *mvapich_thr(void *arg)
* Process subsequent phases of various protocol versions.
*/
if (st->protocol_version == 8) {
- if (mvapich_processops (st) < 0)
+ if (mvapich_processops (st) < 0)
mvapich_terminate_job (st, "mvapich_processops failed.");
}
else {
@@ -2188,15 +2188,15 @@ extern mvapich_state_t *mvapich_thr_create(const mpi_plugin_client_info_t *job,
/*
* The main thread calls this function to terminate the mpi thread and clean
- * up. A write to this pipe will break the mpi thread out of one of two poll
+ * up. A write to this pipe will break the mpi thread out of one of two poll
* calls--the wait for mpi abort messages and the wait for initial connections.
- * The mpi thread will spend most of its time in the first location if this
- * is an mpi job, and the second location if this is not an mpi job. When the
- * mpi thread sees activity on this pipe, it will set st->shutdown_complete =
+ * The mpi thread will spend most of its time in the first location if this
+ * is an mpi job, and the second location if this is not an mpi job. When the
+ * mpi thread sees activity on this pipe, it will set st->shutdown_complete =
* true and then pthread_exit(). If the mpi thread is not blocked on either of
- * those polls, and does not reach either poll within st->shutdown_timeout
+ * those polls, and does not reach either poll within st->shutdown_timeout
* secs, the main thread returns. The main thread could call pthread_cancel
- * if it can't shutdown nicely, but there's a danger the thread could be
+ * if it can't shutdown nicely, but there's a danger the thread could be
* cancelled while it has a mutex locked, especially while logging.
*/
extern int mvapich_thr_destroy(mvapich_state_t *st)
@@ -2218,7 +2218,7 @@ extern int mvapich_thr_destroy(mvapich_state_t *st)
break;
}
pthread_cond_timedwait(
- &st->shutdown_cond,
+ &st->shutdown_cond,
&st->shutdown_lock, &ts);
}
slurm_mutex_unlock(&st->shutdown_lock);
@@ -2240,7 +2240,7 @@ void mvapich_thr_exit(mvapich_state_t *st)
pthread_cond_signal(&st->shutdown_cond);
pthread_mutex_unlock(&st->shutdown_lock);
-
+
pthread_exit(NULL);
}
diff --git a/src/plugins/mpi/mvapich/mvapich.h b/src/plugins/mpi/mvapich/mvapich.h
index 5caf3891ee30d274fbed88e42135f4b87e70a06d..e0a115f0d186721a2f3ceb4741618157e4d0df2e 100644
--- a/src/plugins/mpi/mvapich/mvapich.h
+++ b/src/plugins/mpi/mvapich/mvapich.h
@@ -1,37 +1,37 @@
/*****************************************************************************\
** mpi_mvapich.h - Library routines for initiating jobs on with mvapich
- ** type mpi.
+ ** type mpi.
*****************************************************************************
* Copyright (C) 2004-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/plugins/mpi/none/Makefile.am b/src/plugins/mpi/none/Makefile.am
index f3551bea5071cb2266453f9d2d2026095ecd8e39..005df962e6bd43ab4f459de9963c87743ffa86ce 100644
--- a/src/plugins/mpi/none/Makefile.am
+++ b/src/plugins/mpi/none/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/mpi/none/Makefile.in b/src/plugins/mpi/none/Makefile.in
index 46d79045dc25af323f2eeb7267e058ffe1e489c5..4948f31772f86ad96b5a6d24fbf51f9a5df6b467 100644
--- a/src/plugins/mpi/none/Makefile.in
+++ b/src/plugins/mpi/none/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = mpi_none.la
diff --git a/src/plugins/mpi/none/mpi_none.c b/src/plugins/mpi/none/mpi_none.c
index 8ed26b3670a9f26facbebfccc17d536f854407d5..bf67887b2ccb8a3c3553463ff090922346e4577e 100644
--- a/src/plugins/mpi/none/mpi_none.c
+++ b/src/plugins/mpi/none/mpi_none.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -68,7 +68,7 @@
* <application>/<method>
*
* where <application> is a description of the intended application of
- * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
+ * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
* of how this plugin satisfies that application. SLURM will only load
* a switch plugin if the plugin_type string has a prefix of "switch/".
*
diff --git a/src/plugins/mpi/openmpi/Makefile.am b/src/plugins/mpi/openmpi/Makefile.am
index 2db28cf7b7a1b3ae87ce5e4c268f7c15e27ec27b..44d705345b904f62b9a2f7de77d51dd18cfa3f30 100644
--- a/src/plugins/mpi/openmpi/Makefile.am
+++ b/src/plugins/mpi/openmpi/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/mpi/openmpi/Makefile.in b/src/plugins/mpi/openmpi/Makefile.in
index 6b268ed89fa747e368bab648cb66436be4a015ae..b0d90ba20f36b4740b103cd861ec6599d5a81865 100644
--- a/src/plugins/mpi/openmpi/Makefile.in
+++ b/src/plugins/mpi/openmpi/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = mpi_openmpi.la
diff --git a/src/plugins/mpi/openmpi/mpi_openmpi.c b/src/plugins/mpi/openmpi/mpi_openmpi.c
index 4ac55561b70af2f879c80bcf7d4d3858cfac5de5..de66e956016aaf85ee65ed86bf516837caa74429 100644
--- a/src/plugins/mpi/openmpi/mpi_openmpi.c
+++ b/src/plugins/mpi/openmpi/mpi_openmpi.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Christopher J. Morrone <morrone2@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -68,7 +68,7 @@
* <application>/<method>
*
* where <application> is a description of the intended application of
- * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
+ * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
* of how this plugin satisfies that application. SLURM will only load
* a switch plugin if the plugin_type string has a prefix of "switch/".
*
diff --git a/src/plugins/preempt/none/Makefile.am b/src/plugins/preempt/none/Makefile.am
index c334187cec85a0e20442a494b56e55302d872975..b5671fb03da0d817fd4d5fc498f3721e3b6cca3b 100644
--- a/src/plugins/preempt/none/Makefile.am
+++ b/src/plugins/preempt/none/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/preempt/none/Makefile.in b/src/plugins/preempt/none/Makefile.in
index 0c676b59dfeeb52d38e2ff3c8c88bc604244d5f0..688e420d4b9ff1eb37c0037dffaf8cf2266070d1 100644
--- a/src/plugins/preempt/none/Makefile.in
+++ b/src/plugins/preempt/none/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = preempt_none.la
preempt_none_la_SOURCES = preempt_none.c
diff --git a/src/plugins/preempt/none/preempt_none.c b/src/plugins/preempt/none/preempt_none.c
index 6074c419e3eee4c5c62186347cdee7954b9af6b0..dfc2092531da00ce13a4a717e1f7a467d1134512 100644
--- a/src/plugins/preempt/none/preempt_none.c
+++ b/src/plugins/preempt/none/preempt_none.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/plugins/preempt/partition_prio/Makefile.am b/src/plugins/preempt/partition_prio/Makefile.am
index a46416349aa827fd445a0801f2acb4a301fd02a9..9053dc56097690a9a8a3f23e84e55b3b7e2e457a 100644
--- a/src/plugins/preempt/partition_prio/Makefile.am
+++ b/src/plugins/preempt/partition_prio/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/preempt/partition_prio/Makefile.in b/src/plugins/preempt/partition_prio/Makefile.in
index 528f72fb13e712cf566e8088117c1420913e788d..4a36b540531c7ebf34bb89c57b1540b25d6c0135 100644
--- a/src/plugins/preempt/partition_prio/Makefile.in
+++ b/src/plugins/preempt/partition_prio/Makefile.in
@@ -313,7 +313,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = preempt_partition_prio.la
preempt_partition_prio_la_SOURCES = preempt_partition_prio.c
diff --git a/src/plugins/preempt/partition_prio/preempt_partition_prio.c b/src/plugins/preempt/partition_prio/preempt_partition_prio.c
index 5a5a66f11c37474e8723b5e98c6be39715d1c682..1d8f7a8f1e5a8f4c3ee7badd228c5bf158663729 100644
--- a/src/plugins/preempt/partition_prio/preempt_partition_prio.c
+++ b/src/plugins/preempt/partition_prio/preempt_partition_prio.c
@@ -1,37 +1,37 @@
/*****************************************************************************\
- * preempt_partition_prio.c - job preemption plugin that selects preemptable
+ * preempt_partition_prio.c - job preemption plugin that selects preemptable
* jobs based upon their partition's priority.
*****************************************************************************
* Copyright (C) 2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -85,17 +85,17 @@ extern List find_preemptable_jobs(struct job_record *job_ptr)
return preemptee_job_list;
}
if (!IS_JOB_PENDING(job_ptr)) {
- error("find_preemptable_jobs: job %u not pending",
+ error("find_preemptable_jobs: job %u not pending",
job_ptr->job_id);
return preemptee_job_list;
}
if (job_ptr->part_ptr == NULL) {
- error("find_preemptable_jobs: job %u has NULL partition ptr",
+ error("find_preemptable_jobs: job %u has NULL partition ptr",
job_ptr->job_id);
return preemptee_job_list;
}
if (job_ptr->part_ptr->node_bitmap == NULL) {
- error("find_preemptable_jobs: partition %s node_bitmap=NULL",
+ error("find_preemptable_jobs: partition %s node_bitmap=NULL",
job_ptr->part_ptr->name);
return preemptee_job_list;
}
@@ -109,7 +109,7 @@ extern List find_preemptable_jobs(struct job_record *job_ptr)
(job_p->part_ptr->priority >= job_ptr->part_ptr->priority))
continue;
if ((job_p->node_bitmap == NULL) ||
- (bit_overlap(job_p->node_bitmap,
+ (bit_overlap(job_p->node_bitmap,
job_ptr->part_ptr->node_bitmap) == 0))
continue;
diff --git a/src/plugins/preempt/qos/Makefile.am b/src/plugins/preempt/qos/Makefile.am
index 9c4edd7184ad44833d10e7e3707e9b3c773174ee..9ed16cd4ee07af8db18d746e79cbd34fcb3f1a90 100644
--- a/src/plugins/preempt/qos/Makefile.am
+++ b/src/plugins/preempt/qos/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/preempt/qos/Makefile.in b/src/plugins/preempt/qos/Makefile.in
index 256afb317b50471322d272a5fb085ea54f722d39..2cc64e2b4af7c0ef4f0792fe8bfb0d048da0a25f 100644
--- a/src/plugins/preempt/qos/Makefile.in
+++ b/src/plugins/preempt/qos/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = preempt_qos.la
preempt_qos_la_SOURCES = preempt_qos.c
diff --git a/src/plugins/preempt/qos/preempt_qos.c b/src/plugins/preempt/qos/preempt_qos.c
index 29e6911aa2554fc292382eefebb051725e7025ac..da528b8910bd82ee698a09b0fdc52ef1835bd4d7 100644
--- a/src/plugins/preempt/qos/preempt_qos.c
+++ b/src/plugins/preempt/qos/preempt_qos.c
@@ -1,37 +1,37 @@
/*****************************************************************************\
- * preempt_qos.c - job preemption plugin that selects preemptable
+ * preempt_qos.c - job preemption plugin that selects preemptable
* jobs based upon their Quality Of Service (QOS).
*****************************************************************************
* Copyright (C) 2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -52,7 +52,7 @@ const char plugin_type[] = "preempt/qos";
const uint32_t plugin_version = 100;
static uint32_t _gen_job_prio(struct job_record *job_ptr);
-static bool _qos_preemptable(struct job_record *preemptee,
+static bool _qos_preemptable(struct job_record *preemptee,
struct job_record *preemptor);
static int _sort_by_prio (void *x, void *y);
@@ -88,17 +88,17 @@ extern List find_preemptable_jobs(struct job_record *job_ptr)
return preemptee_job_list;
}
if (!IS_JOB_PENDING(job_ptr)) {
- error("find_preemptable_jobs: job %u not pending",
+ error("find_preemptable_jobs: job %u not pending",
job_ptr->job_id);
return preemptee_job_list;
}
if (job_ptr->part_ptr == NULL) {
- error("find_preemptable_jobs: job %u has NULL partition ptr",
+ error("find_preemptable_jobs: job %u has NULL partition ptr",
job_ptr->job_id);
return preemptee_job_list;
}
if (job_ptr->part_ptr->node_bitmap == NULL) {
- error("find_preemptable_jobs: partition %s node_bitmap=NULL",
+ error("find_preemptable_jobs: partition %s node_bitmap=NULL",
job_ptr->part_ptr->name);
return preemptee_job_list;
}
@@ -108,11 +108,11 @@ extern List find_preemptable_jobs(struct job_record *job_ptr)
while ((job_p = (struct job_record *) list_next(job_iterator))) {
if (!IS_JOB_RUNNING(job_p) && !IS_JOB_SUSPENDED(job_p))
continue;
- if (!_qos_preemptable(job_p, job_ptr))
+ if (!_qos_preemptable(job_p, job_ptr))
continue;
-
+
if ((job_p->node_bitmap == NULL) ||
- (bit_overlap(job_p->node_bitmap,
+ (bit_overlap(job_p->node_bitmap,
job_ptr->part_ptr->node_bitmap) == 0))
continue;
@@ -131,7 +131,7 @@ extern List find_preemptable_jobs(struct job_record *job_ptr)
return preemptee_job_list;
}
-static bool _qos_preemptable(struct job_record *preemptee,
+static bool _qos_preemptable(struct job_record *preemptee,
struct job_record *preemptor)
{
acct_qos_rec_t *qos_ee = preemptee->qos_ptr;
@@ -141,7 +141,7 @@ static bool _qos_preemptable(struct job_record *preemptee,
(qos_or->preempt_bitstr == NULL) ||
!bit_test(qos_or->preempt_bitstr, qos_ee->id))
return false;
-
+
return true;
}
diff --git a/src/plugins/priority/basic/Makefile.am b/src/plugins/priority/basic/Makefile.am
index 48a2a7b58644e3c61a6791d9a8f53e356c98d86b..cd7b44668af0244b136bc528e28aa84eb3a7c55d 100644
--- a/src/plugins/priority/basic/Makefile.am
+++ b/src/plugins/priority/basic/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/priority/basic/Makefile.in b/src/plugins/priority/basic/Makefile.in
index 72c9748520a6bc53bdc62dc7f807c80079efc8fd..ff480937054262450fb27fefcfb2d1942964d925 100644
--- a/src/plugins/priority/basic/Makefile.in
+++ b/src/plugins/priority/basic/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = priority_basic.la
diff --git a/src/plugins/priority/basic/priority_basic.c b/src/plugins/priority/basic/priority_basic.c
index 93cf56837a47db41b8df1691675dff91d7537908..35ee75b71a7e210dbf1acfe3527376edfe8d837d 100644
--- a/src/plugins/priority/basic/priority_basic.c
+++ b/src/plugins/priority/basic/priority_basic.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -71,14 +71,14 @@
* where <application> is a description of the intended application of
* the plugin (e.g., "jobcomp" for SLURM job completion logging) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load job completion logging plugins if the plugin_type string has a
+ * only load job completion logging plugins if the plugin_type string has a
* prefix of "jobcomp/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
* of the plugin. If major and minor revisions are desired, the major
* version number may be multiplied by a suitable magnitude constant such
* as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum versions for their plugins as the job completion logging API
+ * minimum versions for their plugins as the job completion logging API
* matures.
*/
const char plugin_name[] = "Priority BASIC plugin";
@@ -125,11 +125,11 @@ extern uint32_t priority_p_set(uint32_t last_prio, struct job_record *job_ptr)
extern void priority_p_reconfig()
{
-
+
return;
}
-extern int priority_p_set_max_cluster_usage(uint32_t procs, uint32_t half_life)
+extern int priority_p_set_max_cluster_usage(uint32_t procs, uint32_t half_life)
{
return SLURM_SUCCESS;
}
diff --git a/src/plugins/priority/multifactor/Makefile.am b/src/plugins/priority/multifactor/Makefile.am
index 1fd4972fe633cfb5816741ea78dbb34a0c6b4003..52783a1b9f7502a33b8d76270dbe78716dd1c73d 100644
--- a/src/plugins/priority/multifactor/Makefile.am
+++ b/src/plugins/priority/multifactor/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/priority/multifactor/Makefile.in b/src/plugins/priority/multifactor/Makefile.in
index 796ec9a561e1e2deb9b3ac46213f2128b546e30a..822a3fd6bc948b0fbbe12f7e6e344f3497d83f1f 100644
--- a/src/plugins/priority/multifactor/Makefile.in
+++ b/src/plugins/priority/multifactor/Makefile.in
@@ -312,7 +312,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = priority_multifactor.la
diff --git a/src/plugins/priority/multifactor/priority_multifactor.c b/src/plugins/priority/multifactor/priority_multifactor.c
index 74ba7e08a4ada2d514143622b0895c3d044e9c21..1dd0c2f00710a23b683f69a92f36405aa8494974 100644
--- a/src/plugins/priority/multifactor/priority_multifactor.c
+++ b/src/plugins/priority/multifactor/priority_multifactor.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -86,14 +86,14 @@
* where <application> is a description of the intended application of
* the plugin (e.g., "jobcomp" for SLURM job completion logging) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load job completion logging plugins if the plugin_type string has a
+ * only load job completion logging plugins if the plugin_type string has a
* prefix of "jobcomp/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
* of the plugin. If major and minor revisions are desired, the major
* version number may be multiplied by a suitable magnitude constant such
* as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum versions for their plugins as the job completion logging API
+ * minimum versions for their plugins as the job completion logging API
* matures.
*/
const char plugin_name[] = "Priority MULTIFACTOR plugin";
@@ -164,7 +164,7 @@ static int _apply_decay(double decay_factor)
}
/*
- * reset usage_raw, and grp_used_wall on all associations
+ * reset usage_raw, and grp_used_wall on all associations
* This should be called every PriorityUsageResetPeriod
* RET: SLURM_SUCCESS on SUCCESS, SLURM_ERROR else.
*/
@@ -235,7 +235,7 @@ static void _read_last_decay_ran(time_t *last_ran, time_t *last_reset)
if (errno == EINTR)
continue;
else {
- error("Read error on %s: %m",
+ error("Read error on %s: %m",
state_file);
break;
}
@@ -338,7 +338,7 @@ static int _write_last_decay_ran(time_t last_ran, time_t last_reset)
* calculate all the non-user associations now. When a user submits a
* job, that norm_fairshare is calculated. Here we will set the
* usage_efctv to NO_VAL for users to not have to calculate a bunch
- * of things that will never be used.
+ * of things that will never be used.
*
* NOTE: acct_mgr_association_lock must be locked before this is called.
*/
@@ -347,7 +347,7 @@ static int _set_children_usage_efctv(List childern_list)
acct_association_rec_t *assoc = NULL;
ListIterator itr = NULL;
- if(!childern_list || !list_count(childern_list))
+ if(!childern_list || !list_count(childern_list))
return SLURM_SUCCESS;
itr = list_iterator_create(childern_list);
@@ -448,7 +448,7 @@ static void _get_priority_factors(time_t start_time, struct job_record *job_ptr,
* Also the variable total_cpus doesn't exist
* yet so that would need to be defined.
*/
-
+
if(favor_small) {
factors->priority_js = (double)(node_record_count
- job_ptr->details->min_nodes)
@@ -673,7 +673,7 @@ static void *_decay_thread(void *no_data)
decay_factor = 1 - (0.693 / decay_hl);
else
decay_factor = 1;
-
+
reconfig = 0;
}
@@ -694,18 +694,18 @@ static void *_decay_thread(void *no_data)
case PRIORITY_RESET_QUARTERLY:
case PRIORITY_RESET_YEARLY:
if(next_reset == 0) {
- next_reset = _next_reset(reset_period,
+ next_reset = _next_reset(reset_period,
last_reset);
}
if(now >= next_reset) {
_reset_usage();
last_reset = next_reset;
- next_reset = _next_reset(reset_period,
+ next_reset = _next_reset(reset_period,
last_reset);
}
}
- if(!last_ran)
+ if(!last_ran)
goto get_usage;
else
run_delta = (start_time - last_ran);
@@ -732,39 +732,39 @@ static void *_decay_thread(void *no_data)
/* apply new usage */
if(!IS_JOB_PENDING(job_ptr) &&
job_ptr->start_time && job_ptr->assoc_ptr) {
- acct_qos_rec_t *qos =
+ acct_qos_rec_t *qos =
(acct_qos_rec_t *)job_ptr->qos_ptr;
- acct_association_rec_t *assoc =
+ acct_association_rec_t *assoc =
(acct_association_rec_t *)
job_ptr->assoc_ptr;
time_t start_period = last_ran;
time_t end_period = start_time;
double run_decay = 0;
- if(job_ptr->start_time > start_period)
+ if(job_ptr->start_time > start_period)
start_period = job_ptr->start_time;
- if(job_ptr->end_time
- && (end_period > job_ptr->end_time))
+ if(job_ptr->end_time
+ && (end_period > job_ptr->end_time))
end_period = job_ptr->end_time;
run_delta = (int)end_period - (int)start_period;
/* job already has been accounted for
go to next */
- if(run_delta < 1)
+ if(run_delta < 1)
continue;
debug4("job %u ran for %d seconds",
job_ptr->job_id, run_delta);
/* get the time in decayed fashion */
- run_decay = run_delta
+ run_decay = run_delta
* pow(decay_factor, (double)run_delta);
real_decay = run_decay
* (double)job_ptr->total_procs;
-
+
/* now apply the usage factor for this
qos */
if(qos) {
@@ -783,8 +783,8 @@ static void *_decay_thread(void *no_data)
while(assoc) {
/* we don't want to make the
root assoc responsible for
- keeping track of time
- */
+ keeping track of time
+ */
if (assoc == assoc_mgr_root_assoc)
break;
assoc->grp_used_wall += run_decay;
@@ -794,29 +794,29 @@ static void *_decay_thread(void *no_data)
"assoc %u (user='%s' acct='%s') "
"raw usage is now %Lf. Group "
"wall added %d making it %d.",
- real_decay, assoc->id,
+ real_decay, assoc->id,
assoc->user, assoc->acct,
assoc->usage_raw, run_delta,
assoc->grp_used_wall);
-
+
assoc = assoc->parent_assoc_ptr;
}
slurm_mutex_unlock(&assoc_mgr_association_lock);
}
- /*
+ /*
* This means the job is held, 0, or a system
* hold, 1. Continue also if the job is not
* pending. There is no reason to set the
* priority if the job isn't pending.
- */
+ */
if((job_ptr->priority <= 1) || !IS_JOB_PENDING(job_ptr))
continue;
-
+
job_ptr->priority =
_get_priority_internal(start_time, job_ptr);
- debug2("priority for job %u is now %u",
+ debug2("priority for job %u is now %u",
job_ptr->job_id, job_ptr->priority);
}
list_iterator_destroy(itr);
@@ -827,7 +827,7 @@ static void *_decay_thread(void *no_data)
slurm_mutex_lock(&assoc_mgr_association_lock);
_set_children_usage_efctv(assoc_mgr_root_assoc->childern_list);
slurm_mutex_unlock(&assoc_mgr_association_lock);
-
+
last_ran = start_time;
_write_last_decay_ran(last_ran, last_reset);
@@ -950,7 +950,7 @@ int init ( void )
if (pthread_create(&decay_handler_thread, &thread_attr,
_decay_thread, NULL))
fatal("pthread_create error %m");
-
+
/* This is here to join the decay thread so we don't core
dump if in the sleep, since there is no other place to join
we have to create another thread to do it.
@@ -959,7 +959,7 @@ int init ( void )
if (pthread_create(&cleanup_handler_thread, &thread_attr,
_cleanup_thread, NULL))
fatal("pthread_create error %m");
-
+
slurm_attr_destroy(&thread_attr);
} else {
if(weight_fs)
@@ -968,7 +968,7 @@ int init ( void )
"The priority/multifactor plugin requires "
"this information to run correctly. Please "
"check your database connection and try again.");
-
+
calc_fairshare = 0;
}
@@ -985,7 +985,7 @@ int fini ( void )
debug("Waiting for decay thread to finish.");
slurm_mutex_lock(&decay_lock);
-
+
/* cancel the decay thread and then join the cleanup thread */
if(decay_handler_thread)
pthread_cancel(decay_handler_thread);
@@ -1011,7 +1011,7 @@ extern void priority_p_reconfig()
reconfig = 1;
_internal_setup();
debug2("%s reconfigured", plugin_name);
-
+
return;
}
@@ -1058,7 +1058,7 @@ extern void priority_p_set_assoc_usage(acct_association_rec_t *assoc)
xassert(assoc_mgr_root_assoc);
xassert(assoc_mgr_root_assoc->usage_raw);
xassert(assoc->parent_assoc_ptr);
-
+
assoc->usage_norm = assoc->usage_raw / assoc_mgr_root_assoc->usage_raw;
debug4("Normalized usage for %s %s off %s %Lf / %Lf = %Lf",
child, child_str, assoc->parent_assoc_ptr->acct,
@@ -1067,9 +1067,9 @@ extern void priority_p_set_assoc_usage(acct_association_rec_t *assoc)
/* This is needed in case someone changes the half-life on the
fly and now we have used more time than is available under
the new config */
- if (assoc->usage_norm > 1.0)
+ if (assoc->usage_norm > 1.0)
assoc->usage_norm = 1.0;
-
+
if (assoc->parent_assoc_ptr == assoc_mgr_root_assoc) {
assoc->usage_efctv = assoc->usage_norm;
debug4("Effective usage for %s %s off %s %Lf %Lf",
@@ -1079,7 +1079,7 @@ extern void priority_p_set_assoc_usage(acct_association_rec_t *assoc)
assoc->usage_efctv = assoc->usage_norm +
((assoc->parent_assoc_ptr->usage_efctv -
assoc->usage_norm) *
- assoc->shares_raw /
+ assoc->shares_raw /
(long double)assoc->level_shares);
debug4("Effective usage for %s %s off %s "
"%Lf + ((%Lf - %Lf) * %d / %d) = %Lf",
@@ -1116,7 +1116,7 @@ extern List priority_p_get_priority_factors_list(
itr = list_iterator_create(job_list);
while ((job_ptr = list_next(itr))) {
/*
- * We are only looking for pending jobs
+ * We are only looking for pending jobs
*/
if(!IS_JOB_PENDING(job_ptr))
continue;
@@ -1132,12 +1132,12 @@ extern List priority_p_get_priority_factors_list(
*/
if(job_ptr->priority <= 1)
continue;
-
+
if (_filter_job(job_ptr, req_job_list, req_user_list))
continue;
-
+
obj = xmalloc(sizeof(priority_factors_object_t));
-
+
_get_priority_factors(start_time, job_ptr, obj, true);
obj->job_id = job_ptr->job_id;
obj->user_id = job_ptr->user_id;
diff --git a/src/plugins/proctrack/Makefile.am b/src/plugins/proctrack/Makefile.am
index 79c8d34b6d5420fa91fd9c259249f351813caabc..8a1b50d4d4bd0d3b6bb53d8fc859730e66751adf 100644
--- a/src/plugins/proctrack/Makefile.am
+++ b/src/plugins/proctrack/Makefile.am
@@ -1,7 +1,7 @@
# Makefile for proctrack plugins
if HAVE_AIX_PROCTRACK
-AIX_PROCTRACK = aix
+AIX_PROCTRACK = aix
endif
if HAVE_SGI_JOB
diff --git a/src/plugins/proctrack/Makefile.in b/src/plugins/proctrack/Makefile.in
index 29f78fb3b32bba052ad36f63d3c885b70ad9ab00..b4fb9e6d499c040549577192437b6817ff819b71 100644
--- a/src/plugins/proctrack/Makefile.in
+++ b/src/plugins/proctrack/Makefile.in
@@ -305,7 +305,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-@HAVE_AIX_PROCTRACK_TRUE@AIX_PROCTRACK = aix
+@HAVE_AIX_PROCTRACK_TRUE@AIX_PROCTRACK = aix
@HAVE_SGI_JOB_TRUE@SGI_JOB = sgi_job
@HAVE_LUA_TRUE@LUA = lua
SUBDIRS = $(AIX_PROCTRACK) $(SGI_JOB) $(LUA) pgid linuxproc rms
diff --git a/src/plugins/proctrack/aix/Makefile.am b/src/plugins/proctrack/aix/Makefile.am
index b9dd4610d42d33d5082cbc5eebc59275653ecd5b..e0ffda3bf20b1be2e25d3cc6b49c8e64eb46e865 100644
--- a/src/plugins/proctrack/aix/Makefile.am
+++ b/src/plugins/proctrack/aix/Makefile.am
@@ -3,7 +3,7 @@
AUTOMAKE_OPTIONS = foreign
PLUGIN_FLAGS = -Wl,-bI:$(PROCTRACKDIR)/proctrackext.exp\
- -module -avoid-version --export-dynamic
+ -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/proctrack/aix/Makefile.in b/src/plugins/proctrack/aix/Makefile.in
index 0cfb81ce238031cc0152634a96ca2976be62e701..28106a0f0e713ed97300f9bcb414dd26891c52f5 100644
--- a/src/plugins/proctrack/aix/Makefile.in
+++ b/src/plugins/proctrack/aix/Makefile.in
@@ -312,7 +312,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
PLUGIN_FLAGS = -Wl,-bI:$(PROCTRACKDIR)/proctrackext.exp\
- -module -avoid-version --export-dynamic
+ -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = proctrack_aix.la
diff --git a/src/plugins/proctrack/aix/proctrack_aix.c b/src/plugins/proctrack/aix/proctrack_aix.c
index 5eaa97126054334f140cde44c3df8b4b336e99a9..e4e3f39f5a4bb436e88879977ddbaeaa9ceb23a8 100644
--- a/src/plugins/proctrack/aix/proctrack_aix.c
+++ b/src/plugins/proctrack/aix/proctrack_aix.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -76,14 +76,14 @@
* where <application> is a description of the intended application of
* the plugin (e.g., "jobcomp" for SLURM job completion logging) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load job completion logging plugins if the plugin_type string has a
+ * only load job completion logging plugins if the plugin_type string has a
* prefix of "jobcomp/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
* of the plugin. If major and minor revisions are desired, the major
* version number may be multiplied by a suitable magnitude constant such
* as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum versions for their plugins as the job completion logging API
+ * minimum versions for their plugins as the job completion logging API
* matures.
*/
const char plugin_name[] = "Process tracking via AIX kernel extension plugin";
diff --git a/src/plugins/proctrack/linuxproc/Makefile.am b/src/plugins/proctrack/linuxproc/Makefile.am
index 4ae166c365c3b3d38e66ccb68591459efb95b895..bb07731f0f23fb23c221a6b0635d7d3b9cf85ef4 100644
--- a/src/plugins/proctrack/linuxproc/Makefile.am
+++ b/src/plugins/proctrack/linuxproc/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/proctrack/linuxproc/Makefile.in b/src/plugins/proctrack/linuxproc/Makefile.in
index a915a2b56b6663d381153865118244e346294ba2..8b212b78c9c5e82eed476bdee0a52178f4619004 100644
--- a/src/plugins/proctrack/linuxproc/Makefile.in
+++ b/src/plugins/proctrack/linuxproc/Makefile.in
@@ -312,7 +312,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = proctrack_linuxproc.la
diff --git a/src/plugins/proctrack/linuxproc/kill_tree.c b/src/plugins/proctrack/linuxproc/kill_tree.c
index 08773f72334cd7375f696421d3b1da9901132d11..41836c113c3b934bdf7cccc15cc1bef1a8acf82d 100644
--- a/src/plugins/proctrack/linuxproc/kill_tree.c
+++ b/src/plugins/proctrack/linuxproc/kill_tree.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Takao Hatazaki <takao.hatazaki@hp.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -118,7 +118,7 @@ static void _push_to_hashtbl(pid_t ppid, pid_t pid,
ppids = ppids->next;
}
newppid = _alloc_ppid(ppid, pid, is_usercmd, cmd, hashtbl[idx]);
- hashtbl[idx] = newppid;
+ hashtbl[idx] = newppid;
}
static int get_myname(char *s)
@@ -187,7 +187,7 @@ static xppid_t **_build_hashtbl()
close(fd);
/* Record cmd for debugging purpose */
- _push_to_hashtbl((pid_t)ppid, (pid_t)pid,
+ _push_to_hashtbl((pid_t)ppid, (pid_t)pid,
strcmp(myname, cmd), cmd, hashtbl);
}
closedir(dir);
@@ -290,7 +290,7 @@ extern int kill_proc_tree(pid_t top, int sig)
if ((hashtbl = _build_hashtbl()) == NULL)
return -1;
-
+
list = _get_list(top, NULL, hashtbl);
rc = _kill_proclist(list, sig);
_destroy_hashtbl(hashtbl);
@@ -300,7 +300,7 @@ extern int kill_proc_tree(pid_t top, int sig)
/*
- * Return the pid of the process named "process_name"
+ * Return the pid of the process named "process_name"
* which is the ancestor of "process".
*/
extern pid_t find_ancestor(pid_t process, char *process_name)
diff --git a/src/plugins/proctrack/linuxproc/kill_tree.h b/src/plugins/proctrack/linuxproc/kill_tree.h
index 4129505c8d51ee17b6e41491d018e2609199353b..dbe048a1234839395114b758f859209b178aa31e 100644
--- a/src/plugins/proctrack/linuxproc/kill_tree.h
+++ b/src/plugins/proctrack/linuxproc/kill_tree.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Takao Hatazaki <takao.hatazaki@hp.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/plugins/proctrack/linuxproc/proctrack_linuxproc.c b/src/plugins/proctrack/linuxproc/proctrack_linuxproc.c
index 1e1b63a9f5d9f3e6462fba268b07da5c429a394a..d2d6e5f6dfce68e230a30c48f43b37496b693c71 100644
--- a/src/plugins/proctrack/linuxproc/proctrack_linuxproc.c
+++ b/src/plugins/proctrack/linuxproc/proctrack_linuxproc.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -73,14 +73,14 @@
* where <application> is a description of the intended application of
* the plugin (e.g., "jobcomp" for SLURM job completion logging) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load job completion logging plugins if the plugin_type string has a
+ * only load job completion logging plugins if the plugin_type string has a
* prefix of "jobcomp/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
* of the plugin. If major and minor revisions are desired, the major
* version number may be multiplied by a suitable magnitude constant such
* as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum versions for their plugins as the job completion logging API
+ * minimum versions for their plugins as the job completion logging API
* matures.
*/
const char plugin_name[] = "Process tracking via linux /proc";
diff --git a/src/plugins/proctrack/pgid/Makefile.am b/src/plugins/proctrack/pgid/Makefile.am
index ddc8c436bd2e76caa21d5652c293dfb383ed41c3..2624070de39c9dafc7bec020892f162330215b59 100644
--- a/src/plugins/proctrack/pgid/Makefile.am
+++ b/src/plugins/proctrack/pgid/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/proctrack/pgid/Makefile.in b/src/plugins/proctrack/pgid/Makefile.in
index 9cd125c0b68e2032d653f5b07d51ce0e3c830763..2250eebf0a75b3bdcc4da11af9fa35f0a06195da 100644
--- a/src/plugins/proctrack/pgid/Makefile.in
+++ b/src/plugins/proctrack/pgid/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = proctrack_pgid.la
diff --git a/src/plugins/proctrack/pgid/proctrack_pgid.c b/src/plugins/proctrack/pgid/proctrack_pgid.c
index fc27dfb573ba7f2125b16eb7aa80881b0d0f3fb5..570e3844ab2ceec45aac62f5e901893a5686bf77 100644
--- a/src/plugins/proctrack/pgid/proctrack_pgid.c
+++ b/src/plugins/proctrack/pgid/proctrack_pgid.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -79,14 +79,14 @@
* where <application> is a description of the intended application of
* the plugin (e.g., "jobcomp" for SLURM job completion logging) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load job completion logging plugins if the plugin_type string has a
+ * only load job completion logging plugins if the plugin_type string has a
* prefix of "jobcomp/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
* of the plugin. If major and minor revisions are desired, the major
* version number may be multiplied by a suitable magnitude constant such
* as 100 or 1000. Various SLURM versions will likely require a certain
- * minimum versions for their plugins as the job completion logging API
+ * minimum versions for their plugins as the job completion logging API
* matures.
*/
const char plugin_name[] = "Process tracking via process group ID plugin";
@@ -124,7 +124,7 @@ extern int slurm_container_add ( slurmd_job_t *job, pid_t pid )
extern int slurm_container_signal ( uint32_t id, int signal )
{
pid_t pid = (pid_t) id;
-
+
if (!id) /* no container ID */
return ESRCH;
@@ -132,7 +132,7 @@ extern int slurm_container_signal ( uint32_t id, int signal )
error("slurm_signal_container would kill caller!");
return ESRCH;
}
-
+
return (int)killpg(pid, signal);
}
diff --git a/src/plugins/proctrack/rms/Makefile.am b/src/plugins/proctrack/rms/Makefile.am
index a15492c50b20abbb246f9705a99cd3f936891720..4dc679c0115e133c1e907e68e5a4bc759f414824 100644
--- a/src/plugins/proctrack/rms/Makefile.am
+++ b/src/plugins/proctrack/rms/Makefile.am
@@ -2,16 +2,16 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
if HAVE_ELAN
pkglib_LTLIBRARIES = proctrack_rms.la
else
-pkglib_LTLIBRARIES =
+pkglib_LTLIBRARIES =
endif
proctrack_rms_la_SOURCES = proctrack_rms.c
-proctrack_rms_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+proctrack_rms_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
proctrack_rms_la_LIBADD = -lrmscall
diff --git a/src/plugins/proctrack/rms/Makefile.in b/src/plugins/proctrack/rms/Makefile.in
index 5c44e4d21f035b1b5493254eb96efecc69201130..eeb72d6da433ff6f37afc5eb5536a6fc40548d0d 100644
--- a/src/plugins/proctrack/rms/Makefile.in
+++ b/src/plugins/proctrack/rms/Makefile.in
@@ -312,12 +312,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
@HAVE_ELAN_FALSE@pkglib_LTLIBRARIES =
@HAVE_ELAN_TRUE@pkglib_LTLIBRARIES = proctrack_rms.la
proctrack_rms_la_SOURCES = proctrack_rms.c
-proctrack_rms_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+proctrack_rms_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
proctrack_rms_la_LIBADD = -lrmscall
all: all-am
diff --git a/src/plugins/proctrack/rms/proctrack_rms.c b/src/plugins/proctrack/rms/proctrack_rms.c
index 0e56f0349635df354a0c75857e3f0082281a2261..9f01412b636c137aaa991136a67096039d4e21a1 100644
--- a/src/plugins/proctrack/rms/proctrack_rms.c
+++ b/src/plugins/proctrack/rms/proctrack_rms.c
@@ -4,32 +4,32 @@
* Copyright (C) 2005 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -80,7 +80,7 @@ extern int fini (void)
/*
- * When proctrack/rms is used in conjunction with switch/elan,
+ * When proctrack/rms is used in conjunction with switch/elan,
* slurm_container_create will not normally create the program description.
* It just retrieves the prgid created in switch/elan.
*
@@ -302,7 +302,7 @@ _prg_destructor_fork()
waitpid(pid, (int *)NULL, 0);
return fdpair[1];
}
-
+
/****************************************/
/* fork again so the destructor process
* will not be a child of the slurmd
@@ -373,7 +373,7 @@ _prg_destructor_send(int fd, int prgid)
{
debug3("_prg_destructor_send %d", prgid);
if (write (fd, &prgid, sizeof(prgid)) != sizeof(prgid)) {
- error ("_prg_destructor_send failed: %m");
+ error ("_prg_destructor_send failed: %m");
}
/* Deliberately avoid closing fd. When this process exits, it
will close fd signalling to the child process that it is
diff --git a/src/plugins/proctrack/sgi_job/Makefile.am b/src/plugins/proctrack/sgi_job/Makefile.am
index b01a1ef207e83c46fecc5d9f60471e86eaecab61..3fddd6068a6dc8cd10c0779d6a4eeb0f7b02d9da 100644
--- a/src/plugins/proctrack/sgi_job/Makefile.am
+++ b/src/plugins/proctrack/sgi_job/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = - -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = - -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
@@ -10,5 +10,5 @@ pkglib_LTLIBRARIES = proctrack_sgi_job.la
proctrack_sgi_job_la_SOURCES = proctrack_sgi_job.c
proctrack_sgi_job_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(OTHER_FLAGS)
-# Don't need to add -ljob because we dlopen the .so to avoid
+# Don't need to add -ljob because we dlopen the .so to avoid
# symbol collisions with slurm functions
diff --git a/src/plugins/proctrack/sgi_job/Makefile.in b/src/plugins/proctrack/sgi_job/Makefile.in
index fb454a58c3363b25cc6b01f9a09919c5791f03f8..7bdc241fdccfd867bcb4d46a839724adde98ebbb 100644
--- a/src/plugins/proctrack/sgi_job/Makefile.in
+++ b/src/plugins/proctrack/sgi_job/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = - -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = - -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = proctrack_sgi_job.la
proctrack_sgi_job_la_SOURCES = proctrack_sgi_job.c
@@ -620,7 +620,7 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
-# Don't need to add -ljob because we dlopen the .so to avoid
+# Don't need to add -ljob because we dlopen the .so to avoid
# symbol collisions with slurm functions
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/src/plugins/proctrack/sgi_job/proctrack_sgi_job.c b/src/plugins/proctrack/sgi_job/proctrack_sgi_job.c
index 23a46aeed414f06c957b85205e179ff0a1afdc03..2d655b2e73f0ba97ba737f83dacb115b4037ac6a 100644
--- a/src/plugins/proctrack/sgi_job/proctrack_sgi_job.c
+++ b/src/plugins/proctrack/sgi_job/proctrack_sgi_job.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -64,7 +64,7 @@ const char plugin_name[] = "Process tracking via SGI job module";
const char plugin_type[] = "proctrack/sgi_job";
const uint32_t plugin_version = 90;
-/*
+/*
* We can't include <job.h> since its prototypes conflict with some
* of SLURM's. Instead, put important function protypes and
* the jid_t typedef here:
@@ -81,7 +81,7 @@ typedef int (*getpidlist_f)(jid_t jid, pid_t *pid, int bufsize);
typedef int (*getpidcnt_f) (jid_t jid);
/*
- * Handle to libjob.so
+ * Handle to libjob.so
*/
static void *libjob_handle = NULL;
@@ -205,7 +205,7 @@ int slurm_container_create (slurmd_job_t *job)
return SLURM_ERROR;
}
debug ("created jid 0x%08lx\n", jid);
-
+
return SLURM_SUCCESS;
}
@@ -227,7 +227,7 @@ int slurm_container_add (slurmd_job_t *job, pid_t pid)
int slurm_container_signal (uint32_t id, int sig)
{
- if ( (_job_killjid ((jid_t) id, sig) < 0)
+ if ( (_job_killjid ((jid_t) id, sig) < 0)
&& (errno != ENODATA) && (errno != EBADF) )
return (SLURM_ERROR);
return (SLURM_SUCCESS);
@@ -249,7 +249,7 @@ uint32_t slurm_container_find (pid_t pid)
if ((jid = _job_getjid (pid)) == (jid_t) -1)
return ((uint32_t) 0);
-
+
return ((uint32_t) jid);
}
@@ -281,7 +281,7 @@ int slurm_container_get_pids(uint32_t cont_id, pid_t **pids, int *npids)
pidcnt = _job_getpidcnt((jid_t)cont_id);
if (pidcnt > 0) {
- /*
+ /*
* FIXME - The "+ 128" is a rough attempt to allow for
* the fact that _job_getpidcnt() followed by _job_get_pidlist
* is not atomic.
diff --git a/src/plugins/sched/backfill/Makefile.am b/src/plugins/sched/backfill/Makefile.am
index c1a316b65e56e5349c86d508da822081eca83fb6..242b693c4e82d84f730496e8e566906eff5348bb 100644
--- a/src/plugins/sched/backfill/Makefile.am
+++ b/src/plugins/sched/backfill/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign
CXXFLAGS = -fexceptions
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/sched/backfill/Makefile.in b/src/plugins/sched/backfill/Makefile.in
index 8f6385bda2bcf646692b01e9b2077562940f5428..0208129938145a55476ebd30968eba76f5cacf9b 100644
--- a/src/plugins/sched/backfill/Makefile.in
+++ b/src/plugins/sched/backfill/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = sched_backfill.la
sched_backfill_la_SOURCES = backfill_wrapper.c \
diff --git a/src/plugins/sched/backfill/backfill.c b/src/plugins/sched/backfill/backfill.c
index 9fda840420a538bb99bbfac8a345803a4e064f46..b55ed20a3120cf9822d00cdbb0383513c64ac43f 100644
--- a/src/plugins/sched/backfill/backfill.c
+++ b/src/plugins/sched/backfill/backfill.c
@@ -1,17 +1,17 @@
/*****************************************************************************\
- * backfill.c - simple backfill scheduler plugin.
+ * backfill.c - simple backfill scheduler plugin.
*
* If a partition is does not have root only access and nodes are not shared
* then raise the priority of pending jobs if doing so does not adversely
* effect the expected initiation of any higher priority job. We do not alter
- * a job's required or excluded node list, so this is a conservative
+ * a job's required or excluded node list, so this is a conservative
* algorithm.
*
- * For example, consider a cluster "lx[01-08]" with one job executing on
- * nodes "lx[01-04]". The highest priority pending job requires five nodes
- * including "lx05". The next highest priority pending job requires any
- * three nodes. Without explicitly forcing the second job to use nodes
- * "lx[06-08]", we can't start it without possibly delaying the higher
+ * For example, consider a cluster "lx[01-08]" with one job executing on
+ * nodes "lx[01-04]". The highest priority pending job requires five nodes
+ * including "lx05". The next highest priority pending job requires any
+ * three nodes. Without explicitly forcing the second job to use nodes
+ * "lx[06-08]", we can't start it without possibly delaying the higher
* priority job.
*****************************************************************************
* Copyright (C) 2003-2007 The Regents of the University of California.
@@ -19,32 +19,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -101,18 +101,18 @@ static int max_backfill_job_cnt = 50;
# endif
#endif
-/* Set __DEBUG to get detailed logging for this thread without
+/* Set __DEBUG to get detailed logging for this thread without
* detailed logging for the entire slurmctld daemon */
#define __DEBUG 0
-/* Do not build job/resource/time record for more than this
+/* Do not build job/resource/time record for more than this
* far in the future, in seconds, currently one day */
#define BACKFILL_WINDOW (24 * 60 * 60)
/*********************** local functions *********************/
-static void _add_reservation(uint32_t start_time, uint32_t end_reserve,
- bitstr_t *res_bitmap,
- node_space_map_t *node_space,
+static void _add_reservation(uint32_t start_time, uint32_t end_reserve,
+ bitstr_t *res_bitmap,
+ node_space_map_t *node_space,
int *node_space_recs);
static void _attempt_backfill(void);
static void _diff_tv_str(struct timeval *tv1,struct timeval *tv2,
@@ -139,7 +139,7 @@ static void _dump_node_space_table(node_space_map_t *node_space_ptr)
slurm_make_time_str(&node_space_ptr[i].end_time,
end_buf, sizeof(end_buf));
node_list = bitmap2node_name(node_space_ptr[i].avail_bitmap);
- info("Begin:%s End:%s Nodes:%s",
+ info("Begin:%s End:%s Nodes:%s",
begin_buf, end_buf, node_list);
xfree(node_list);
if ((i = node_space_ptr[i].next) == 0)
@@ -235,7 +235,7 @@ static int _try_sched(struct job_record *job_ptr, bitstr_t **avail_bitmap,
/* Ideally schedule the job feature by feature,
* but I don't want to add that complexity here
* right now, so clear the feature counts and try
- * to schedule. This will work if there is only
+ * to schedule. This will work if there is only
* one feature count. It should work fairly well
* in cases where there are multiple feature
* counts. */
@@ -249,7 +249,7 @@ static int _try_sched(struct job_record *job_ptr, bitstr_t **avail_bitmap,
list_size = list_count(detail_ptr->feature_list);
feat_cnt_orig = xmalloc(sizeof(uint16_t) * list_size);
feat_iter = list_iterator_create(detail_ptr->feature_list);
- while ((feat_ptr =
+ while ((feat_ptr =
(struct feature_record *) list_next(feat_iter))) {
high_cnt = MAX(high_cnt, feat_ptr->count);
feat_cnt_orig[i++] = feat_ptr->count;
@@ -257,23 +257,23 @@ static int _try_sched(struct job_record *job_ptr, bitstr_t **avail_bitmap,
}
list_iterator_destroy(feat_iter);
- if ((job_req_node_filter(job_ptr, *avail_bitmap) !=
+ if ((job_req_node_filter(job_ptr, *avail_bitmap) !=
SLURM_SUCCESS) ||
(bit_set_count(*avail_bitmap) < high_cnt)) {
rc = ESLURM_NODES_BUSY;
} else {
- preemptee_candidates =
+ preemptee_candidates =
slurm_find_preemptable_jobs(job_ptr);
- rc = select_g_job_test(job_ptr, *avail_bitmap,
+ rc = select_g_job_test(job_ptr, *avail_bitmap,
high_cnt, max_nodes, req_nodes,
- SELECT_MODE_WILL_RUN,
+ SELECT_MODE_WILL_RUN,
preemptee_candidates, NULL);
}
/* Restore the feature counts */
i = 0;
feat_iter = list_iterator_create(detail_ptr->feature_list);
- while ((feat_ptr =
+ while ((feat_ptr =
(struct feature_record *) list_next(feat_iter))) {
feat_ptr->count = feat_cnt_orig[i++];
}
@@ -290,16 +290,16 @@ static int _try_sched(struct job_record *job_ptr, bitstr_t **avail_bitmap,
tmp_bitmap = bit_copy(*avail_bitmap);
rc = select_g_job_test(job_ptr, *avail_bitmap, min_nodes,
max_nodes, req_nodes,
- SELECT_MODE_WILL_RUN,
+ SELECT_MODE_WILL_RUN,
preemptee_candidates, NULL);
job_ptr->details->shared = orig_shared;
if (((rc != SLURM_SUCCESS) || (job_ptr->start_time > now)) &&
(orig_shared != 0)) {
FREE_NULL_BITMAP(*avail_bitmap);
*avail_bitmap= tmp_bitmap;
- rc = select_g_job_test(job_ptr, *avail_bitmap,
+ rc = select_g_job_test(job_ptr, *avail_bitmap,
min_nodes, max_nodes, req_nodes,
- SELECT_MODE_WILL_RUN,
+ SELECT_MODE_WILL_RUN,
preemptee_candidates, NULL);
} else
FREE_NULL_BITMAP(tmp_bitmap);
@@ -334,13 +334,13 @@ extern void *backfill_agent(void *args)
if (sched_params && (tmp_ptr=strstr(sched_params, "interval=")))
backfill_interval = atoi(tmp_ptr + 9);
if (backfill_interval < 1) {
- fatal("Invalid backfill scheduler interval: %d",
+ fatal("Invalid backfill scheduler interval: %d",
backfill_interval);
}
if (sched_params && (tmp_ptr=strstr(sched_params, "max_job_bf=")))
max_backfill_job_cnt = atoi(tmp_ptr + 11);
if (max_backfill_job_cnt < 1) {
- fatal("Invalid backfill scheduler max_job_bf: %d",
+ fatal("Invalid backfill scheduler max_job_bf: %d",
max_backfill_job_cnt);
}
@@ -400,7 +400,7 @@ static void _attempt_backfill(void)
sort_job_queue(job_queue, job_queue_size);
- node_space = xmalloc(sizeof(node_space_map_t) *
+ node_space = xmalloc(sizeof(node_space_map_t) *
(max_backfill_job_cnt + 3));
node_space[0].begin_time = now;
node_space[0].end_time = now + BACKFILL_WINDOW;
@@ -490,7 +490,7 @@ static void _attempt_backfill(void)
if (node_space[j].end_time <= start_res)
;
else if (node_space[j].begin_time <= end_time) {
- bit_and(avail_bitmap,
+ bit_and(avail_bitmap,
node_space[j].avail_bitmap);
} else
break;
@@ -500,7 +500,7 @@ static void _attempt_backfill(void)
if (job_ptr->details->exc_node_bitmap) {
bit_not(job_ptr->details->exc_node_bitmap);
- bit_and(avail_bitmap,
+ bit_and(avail_bitmap,
job_ptr->details->exc_node_bitmap);
bit_not(job_ptr->details->exc_node_bitmap);
}
@@ -523,7 +523,7 @@ static void _attempt_backfill(void)
resv_bitmap = bit_copy(avail_bitmap);
bit_not(resv_bitmap);
- j = _try_sched(job_ptr, &avail_bitmap,
+ j = _try_sched(job_ptr, &avail_bitmap,
min_nodes, max_nodes, req_nodes);
if (j != SLURM_SUCCESS) {
if((time(NULL) - now) >= sched_timeout) {
@@ -537,7 +537,7 @@ static void _attempt_backfill(void)
job_ptr->start_time = MAX(job_ptr->start_time, start_res);
if (job_ptr->start_time <= now) {
int rc = _start_job(job_ptr, resv_bitmap);
- if (rc == ESLURM_ACCOUNTING_POLICY)
+ if (rc == ESLURM_ACCOUNTING_POLICY)
continue;
else if (rc != SLURM_SUCCESS)
/* Planned to start job, but something bad
@@ -559,7 +559,7 @@ static void _attempt_backfill(void)
*/
end_reserve = job_ptr->start_time + (time_limit * 60);
bit_not(avail_bitmap);
- _add_reservation(job_ptr->start_time, end_reserve,
+ _add_reservation(job_ptr->start_time, end_reserve,
avail_bitmap, node_space, &node_space_recs);
#if __DEBUG
_dump_node_space_table(node_space);
@@ -597,7 +597,7 @@ static int _start_job(struct job_record *job_ptr, bitstr_t *resv_bitmap)
rc = select_nodes(job_ptr, false, NULL);
bit_free(job_ptr->details->exc_node_bitmap);
job_ptr->details->exc_node_bitmap = orig_exc_nodes;
- if (rc == SLURM_SUCCESS) {
+ if (rc == SLURM_SUCCESS) {
/* job initiated */
last_job_update = time(NULL);
info("backfill: Started JobId=%u on %s",
@@ -616,7 +616,7 @@ static int _start_job(struct job_record *job_ptr, bitstr_t *resv_bitmap)
bit_not(resv_bitmap);
node_list = bitmap2node_name(resv_bitmap);
/* This happens when a job has sharing disabled and
- * a selected node is still completing some job,
+ * a selected node is still completing some job,
* which should be a temporary situation. */
verbose("backfill: Failed to start JobId=%u on %s: %s",
job_ptr->job_id, node_list, slurm_strerror(rc));
@@ -664,9 +664,9 @@ static bool _more_work (void)
}
/* Create a reservation for a job in the future */
-static void _add_reservation(uint32_t start_time, uint32_t end_reserve,
- bitstr_t *res_bitmap,
- node_space_map_t *node_space,
+static void _add_reservation(uint32_t start_time, uint32_t end_reserve,
+ bitstr_t *res_bitmap,
+ node_space_map_t *node_space,
int *node_space_recs)
{
bool placed = false;
@@ -679,7 +679,7 @@ static void _add_reservation(uint32_t start_time, uint32_t end_reserve,
node_space[i].begin_time = start_time;
node_space[i].end_time = node_space[j].end_time;
node_space[j].end_time = start_time;
- node_space[i].avail_bitmap =
+ node_space[i].avail_bitmap =
bit_copy(node_space[j].avail_bitmap);
node_space[i].next = node_space[j].next;
node_space[j].next = i;
@@ -699,7 +699,7 @@ static void _add_reservation(uint32_t start_time, uint32_t end_reserve,
node_space[i].end_time = node_space[j].
end_time;
node_space[j].end_time = end_reserve;
- node_space[i].avail_bitmap =
+ node_space[i].avail_bitmap =
bit_copy(node_space[j].avail_bitmap);
node_space[i].next = node_space[j].next;
node_space[j].next = i;
diff --git a/src/plugins/sched/backfill/backfill.h b/src/plugins/sched/backfill/backfill.h
index 2088af4efd647d215a412f41524b91e905bcbbcb..02d7c4ad3d7e587cdae498fd90b57b3b5c966838 100644
--- a/src/plugins/sched/backfill/backfill.h
+++ b/src/plugins/sched/backfill/backfill.h
@@ -1,37 +1,37 @@
/*****************************************************************************\
- * backfill.h - header for simple backfill scheduler plugin.
+ * backfill.h - header for simple backfill scheduler plugin.
*****************************************************************************
* Copyright (C) 2003-2007 The Regents of the University of California.
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/plugins/sched/backfill/backfill_wrapper.c b/src/plugins/sched/backfill/backfill_wrapper.c
index 43370669c08e79a0db4874ed154356496c39588c..c7a47bf382f2f84f9fa0806b115ec46206159bfa 100644
--- a/src/plugins/sched/backfill/backfill_wrapper.c
+++ b/src/plugins/sched/backfill/backfill_wrapper.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jay Windley <jwindley@lnxi.com>, Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -142,7 +142,7 @@ slurm_sched_plugin_freealloc( struct job_record *job_ptr )
/* TAG( slurm_sched_plugin_initial_priority ) */
/**************************************************************************/
uint32_t
-slurm_sched_plugin_initial_priority( uint32_t last_prio,
+slurm_sched_plugin_initial_priority( uint32_t last_prio,
struct job_record *job_ptr )
{
return priority_g_set(last_prio, job_ptr);
diff --git a/src/plugins/sched/builtin/Makefile.am b/src/plugins/sched/builtin/Makefile.am
index 7fa480d50f8e378630d9dfee7784637b35541a41..56cc1a4bbf003e26fb41803d6d19f961dfaabd84 100644
--- a/src/plugins/sched/builtin/Makefile.am
+++ b/src/plugins/sched/builtin/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign
CXXFLAGS = -fexceptions
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/sched/builtin/Makefile.in b/src/plugins/sched/builtin/Makefile.in
index a58df0c6c73ab654934afd94f74ee453c292e2d5..d1762d28cd45f91659e4b0941a95f6e4bb2c040e 100644
--- a/src/plugins/sched/builtin/Makefile.in
+++ b/src/plugins/sched/builtin/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = sched_builtin.la
sched_builtin_la_SOURCES = builtin_wrapper.c
diff --git a/src/plugins/sched/builtin/builtin_wrapper.c b/src/plugins/sched/builtin/builtin_wrapper.c
index bcd3935bbcd35fbd269f4f751e4442c0a4f0bd7c..611b21c8161ff7ff80f2adbbe2bf47cc70ba3536 100644
--- a/src/plugins/sched/builtin/builtin_wrapper.c
+++ b/src/plugins/sched/builtin/builtin_wrapper.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Kevin Tew <tew1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -105,7 +105,7 @@ slurm_sched_plugin_freealloc( struct job_record *job_ptr )
/**************************************************************************/
-/* TAG( slurm_sched_plugin_initial_priority ) */
+/* TAG( slurm_sched_plugin_initial_priority ) */
/**************************************************************************/
uint32_t
slurm_sched_plugin_initial_priority( uint32_t last_prio,
diff --git a/src/plugins/sched/hold/Makefile.am b/src/plugins/sched/hold/Makefile.am
index 2058f2b5c4dc6395f4cc946fa9ec515b90dcaa8b..8787797100ef345244558b9dc476f1ecf1f28f51 100644
--- a/src/plugins/sched/hold/Makefile.am
+++ b/src/plugins/sched/hold/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign
CXXFLAGS = -fexceptions
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/sched/hold/Makefile.in b/src/plugins/sched/hold/Makefile.in
index dc8c8a7ad339932ecc8984e1502c41a94d4d2183..4cd235054832252945d92fdd8c967127e67ee08f 100644
--- a/src/plugins/sched/hold/Makefile.in
+++ b/src/plugins/sched/hold/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = sched_hold.la
sched_hold_la_SOURCES = hold_wrapper.c
diff --git a/src/plugins/sched/hold/hold_wrapper.c b/src/plugins/sched/hold/hold_wrapper.c
index 20d1e50c59338f7dcb0880e32a4d0d80d953247b..0bc203a2e74619cea57f98e77bfe7fe9395420e6 100644
--- a/src/plugins/sched/hold/hold_wrapper.c
+++ b/src/plugins/sched/hold/hold_wrapper.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -110,7 +110,7 @@ slurm_sched_plugin_freealloc( struct job_record *job_ptr )
/**************************************************************************/
-/* TAG( slurm_sched_plugin_initial_priority ) */
+/* TAG( slurm_sched_plugin_initial_priority ) */
/**************************************************************************/
uint32_t
slurm_sched_plugin_initial_priority( uint32_t last_prio,
diff --git a/src/plugins/sched/wiki/Makefile.am b/src/plugins/sched/wiki/Makefile.am
index ba054203a77b030fadf5a9e26c88fe68e9cfa78a..70c23917adb8f70118ce8308690f144260790d26 100644
--- a/src/plugins/sched/wiki/Makefile.am
+++ b/src/plugins/sched/wiki/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign
CXXFLAGS = -fexceptions
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/sched/wiki/Makefile.in b/src/plugins/sched/wiki/Makefile.in
index 47ff0c516130b2fe27fb92f0aea30933f462a1bd..f1e228aa94fd159e4a49277b5c02930dee6b9f64 100644
--- a/src/plugins/sched/wiki/Makefile.in
+++ b/src/plugins/sched/wiki/Makefile.in
@@ -313,7 +313,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = sched_wiki.la
sched_wiki_la_SOURCES = \
diff --git a/src/plugins/sched/wiki/cancel_job.c b/src/plugins/sched/wiki/cancel_job.c
index 1deb25f9c0844ff85ff4eed005dd41e448bfa2db..63741d8e29f7b579b7802ff9791931e1897a0ba5 100644
--- a/src/plugins/sched/wiki/cancel_job.c
+++ b/src/plugins/sched/wiki/cancel_job.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -81,7 +81,7 @@ extern int cancel_job(char *cmd_ptr, int *err_code, char **err_msg)
error("wiki: CANCELJOB has invalid TYPE");
return -1;
}
-
+
if (cancel_type == TYPE_ADMIN) {
if (_cancel_job(jobid, err_code, err_msg) != 0)
return -1;
@@ -90,7 +90,7 @@ extern int cancel_job(char *cmd_ptr, int *err_code, char **err_msg)
return -1;
}
- snprintf(reply_msg, sizeof(reply_msg),
+ snprintf(reply_msg, sizeof(reply_msg),
"job %u cancelled successfully", jobid);
*err_msg = reply_msg;
return 0;
diff --git a/src/plugins/sched/wiki/crypto.c b/src/plugins/sched/wiki/crypto.c
index 153c2ef57bc6c4a0b75e602dbf26183127f5b9eb..34fd4149c20c9db3eb66e328f82bf9a816ecc863 100644
--- a/src/plugins/sched/wiki/crypto.c
+++ b/src/plugins/sched/wiki/crypto.c
@@ -1,7 +1,7 @@
/*****************************************************************************\
* crypto.c - DES cryptographic routines.
*****************************************************************************
- * Produced by Cluster Resources, Inc., no rights reserved.
+ * Produced by Cluster Resources, Inc., no rights reserved.
\*****************************************************************************/
#include <stdint.h>
#include <stdio.h>
@@ -16,14 +16,14 @@
* DESCRIPTION
* Compute a DES digest for a CRC according to a particular
* key.
- *
+ *
* ARGUMENTS
* lword (in/out) - The CRC to encode, which becomes the first
* lexical segment of the checksum.
* irword (in/out ) - The key with which to encode the CRC,
* which becomes the second lexical segment of
* the checksum.
- *
+ *
* RETURNS
* None.
*
@@ -68,11 +68,11 @@ static void des( uint32_t *lword, uint32_t *irword )
**************************************************************
* DESCRIPTION
* Compute a cyclic redundancy check (CRC) character-wise.
- *
+ *
* ARGUMENTS
* crc (in) - The CRC computed thus far.
* onech (in) - The character to be added to the CRC.
- *
+ *
* RETURNS
* The new CRC value.
*
@@ -102,7 +102,7 @@ static uint16_t compute_crc( uint16_t crc, uint8_t onech )
* DESCRIPTION
* Compute a Wiki checksum for the current message contents
* and return the result as a Wiki name-value pair.
- *
+ *
* ARGUMENTS
* sum (out) - The string in which to store the resulting
* checksum.
@@ -110,7 +110,7 @@ static uint16_t compute_crc( uint16_t crc, uint8_t onech )
* coordinated with the scheduler so that they
* both use the same value. It is a string of
* ASCII decimal digits.
- *
+ *
* RETURNS
* None.
**************************************************************/
diff --git a/src/plugins/sched/wiki/crypto.h b/src/plugins/sched/wiki/crypto.h
index ddb989b96a9aaf90dccf18af85a88bc5174da5be..8fa1b1d3250defa0f59ab8ebe1f7e3f57a364adb 100644
--- a/src/plugins/sched/wiki/crypto.h
+++ b/src/plugins/sched/wiki/crypto.h
@@ -1,7 +1,7 @@
/*****************************************************************************\
* crypto.h - DES cryptographic routines.
*****************************************************************************
- * Produced by Cluster Resources, Inc., no rights reserved.
+ * Produced by Cluster Resources, Inc., no rights reserved.
\*****************************************************************************/
#include <stdint.h>
diff --git a/src/plugins/sched/wiki/get_jobs.c b/src/plugins/sched/wiki/get_jobs.c
index 5546d6fb0b36da186e3de5592a58e84e74f399fa..e9f785c0bd6408c348cc4723f049782e192396b3 100644
--- a/src/plugins/sched/wiki/get_jobs.c
+++ b/src/plugins/sched/wiki/get_jobs.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -77,7 +77,7 @@ static char * _task_list(struct job_record *job_ptr);
* [HOSTLIST=<node1:node2>;] list of required nodes, if any
* [STARTDATE=<uts>;] earliest start time, if any
* [TASKLIST=<node1:node2>;] nodes in use, if running or completing
- * [RFEATURES=<features>;] required features, if any,
+ * [RFEATURES=<features>;] required features, if any,
* NOTE: OR operator not supported
* [REJMESSAGE=<str>;] reason job is not running, if any
* UPDATETIME=<uts>; time last active
@@ -262,7 +262,7 @@ static char * _dump_job(struct job_record *job_ptr, time_t update_time)
xstrcat(buf, tmp);
}
- snprintf(tmp, sizeof(tmp),
+ snprintf(tmp, sizeof(tmp),
"UPDATETIME=%u;WCLIMIT=%u;TASKS=%u;",
(uint32_t) job_ptr->time_last_active,
(uint32_t) _get_job_time_limit(job_ptr),
@@ -407,7 +407,7 @@ static uint32_t _get_job_min_mem(struct job_record *job_ptr)
}
static uint32_t _get_job_min_disk(struct job_record *job_ptr)
-
+
{
if (job_ptr->details)
return job_ptr->details->job_min_tmp_disk;
@@ -447,7 +447,7 @@ static uint32_t _get_job_tasks(struct job_record *job_ptr)
task_cnt = 1;
if (job_ptr->details) {
task_cnt = MAX(task_cnt,
- (_get_job_min_nodes(job_ptr) *
+ (_get_job_min_nodes(job_ptr) *
job_ptr->details->
ntasks_per_node));
}
@@ -466,16 +466,16 @@ static uint32_t _get_job_time_limit(struct job_record *job_ptr)
return (limit * 60); /* seconds, not minutes */
}
-/* NOTE: if job has already completed, we append "EXITCODE=#" to
+/* NOTE: if job has already completed, we append "EXITCODE=#" to
* the state name */
static char * _get_job_state(struct job_record *job_ptr)
{
if (IS_JOB_COMPLETING(job_ptr)) {
/* Give configured KillWait+10 for job
- * to clear out, then then consider job
- * done. Moab will allocate jobs to
- * nodes that are already Idle. */
- int age = (int) difftime(time(NULL),
+ * to clear out, then then consider job
+ * done. Moab will allocate jobs to
+ * nodes that are already Idle. */
+ int age = (int) difftime(time(NULL),
job_ptr->end_time);
if (age < (kill_wait+10))
return "Running";
@@ -535,7 +535,7 @@ static uint32_t _get_job_suspend_time(struct job_record *job_ptr)
{
if (IS_JOB_SUSPENDED(job_ptr)) {
time_t now = time(NULL);
- return (uint32_t) difftime(now,
+ return (uint32_t) difftime(now,
job_ptr->suspend_time);
}
return (uint32_t) 0;
@@ -587,7 +587,7 @@ static char * _task_list(struct job_record *job_ptr)
for (i=0; i<job_resrcs_ptr->nhosts; i++) {
host = hostlist_shift(hl);
if (host == NULL) {
- error("bad node_cnt for job %u (%s, %d)",
+ error("bad node_cnt for job %u (%s, %d)",
job_ptr->job_id, job_ptr->nodes,
job_ptr->node_cnt);
break;
diff --git a/src/plugins/sched/wiki/get_nodes.c b/src/plugins/sched/wiki/get_nodes.c
index 38f44ef1b480365d2a6f99a141724a3ee311a44f..5f2312f324e379f415f809430fc1b5aa12298b8c 100644
--- a/src/plugins/sched/wiki/get_nodes.c
+++ b/src/plugins/sched/wiki/get_nodes.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -159,7 +159,7 @@ static char * _dump_node(struct node_record *node_ptr, time_t update_time)
return NULL;
snprintf(tmp, sizeof(tmp), "%s:STATE=%s;",
- node_ptr->name,
+ node_ptr->name,
_get_node_state(node_ptr));
xstrcat(buf, tmp);
@@ -214,7 +214,7 @@ static char * _get_node_state(struct node_record *node_ptr)
if (!got_select_type) {
char * select_type = slurm_get_select_type();
- if (select_type &&
+ if (select_type &&
(strcasecmp(select_type, "select/linear") == 0))
node_allocations = true;
else
@@ -238,6 +238,6 @@ static char * _get_node_state(struct node_record *node_ptr)
}
if (IS_NODE_IDLE(node_ptr))
return "Idle";
-
+
return "Unknown";
}
diff --git a/src/plugins/sched/wiki/hostlist.c b/src/plugins/sched/wiki/hostlist.c
index efb365fff00288c8a96356d0111c8d64cab2b4c8..a4d6368632bac11ddc392a59a6f1a957caf09a03 100644
--- a/src/plugins/sched/wiki/hostlist.c
+++ b/src/plugins/sched/wiki/hostlist.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -76,7 +76,7 @@ static char * _task_list_exp(struct job_record *job_ptr);
*/
extern char * moab2slurm_task_list(char *moab_tasklist, int *task_cnt)
{
- char *slurm_tasklist = NULL, *host = NULL, *tmp1 = NULL,
+ char *slurm_tasklist = NULL, *host = NULL, *tmp1 = NULL,
*tmp2 = NULL, *tok = NULL, *tok_p = NULL;
int i, reps;
hostlist_t hl;
@@ -90,7 +90,7 @@ extern char * moab2slurm_task_list(char *moab_tasklist, int *task_cnt)
*task_cnt = 0;
- /* Moab format 2 if string contains '*' or '[' */
+ /* Moab format 2 if string contains '*' or '[' */
tmp1 = strchr(moab_tasklist, (int) '*');
if (tmp1 == NULL)
tmp1 = strchr(moab_tasklist, (int) '[');
@@ -105,7 +105,7 @@ extern char * moab2slurm_task_list(char *moab_tasklist, int *task_cnt)
(*task_cnt)++;
} else if (slurm_tasklist[i] == ',')
(*task_cnt)++;
- }
+ }
return slurm_tasklist;
}
@@ -174,7 +174,7 @@ static char * _task_list(struct job_record *job_ptr)
job_resrcs_ptr->node_bitmap);
node_inx = bit_ffs(job_resrcs_ptr->node_bitmap);
} else {
- for (node_inx++; node_inx<node_record_count;
+ for (node_inx++; node_inx<node_record_count;
node_inx++) {
if (bit_test(job_resrcs_ptr->node_bitmap,
node_inx))
@@ -222,7 +222,7 @@ static void _append_hl_buf(char **buf, hostlist_t *hl_tmp, int *reps)
}
/* Note that host_str may be of this form "alpha,beta". We want
- * to record this as "alpha*#:beta*#" and NOT "alpha,beta*#".
+ * to record this as "alpha*#:beta*#" and NOT "alpha,beta*#".
* NOTE: Do not break up command within brackets (e.g. "tux[1,2-4]") */
if (*buf)
sep = ":";
diff --git a/src/plugins/sched/wiki/job_modify.c b/src/plugins/sched/wiki/job_modify.c
index 918799a23ce328c28c7a6699d26c65dd9085d2b8..ee602aec88eb5b6a89966bad18b0acbd553db755 100644
--- a/src/plugins/sched/wiki/job_modify.c
+++ b/src/plugins/sched/wiki/job_modify.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -56,9 +56,9 @@ extern void null_term(char *str)
}
}
-static int _job_modify(uint32_t jobid, char *bank_ptr,
+static int _job_modify(uint32_t jobid, char *bank_ptr,
char *depend_ptr, char *new_hostlist,
- uint32_t new_node_cnt, char *part_name_ptr,
+ uint32_t new_node_cnt, char *part_name_ptr,
uint32_t new_time_limit)
{
struct job_record *job_ptr;
@@ -77,10 +77,10 @@ static int _job_modify(uint32_t jobid, char *bank_ptr,
if (depend_ptr) {
int rc = update_job_dependency(job_ptr, depend_ptr);
if (rc == SLURM_SUCCESS) {
- info("wiki: changed job %u dependency to %s",
+ info("wiki: changed job %u dependency to %s",
jobid, depend_ptr);
} else {
- error("wiki: changing job %u dependency to %s",
+ error("wiki: changing job %u dependency to %s",
jobid, depend_ptr);
return EINVAL;
}
diff --git a/src/plugins/sched/wiki/msg.c b/src/plugins/sched/wiki/msg.c
index 6e69cc38653b9d10d6c9cccecee7b86dee32937d..5d96d720dcc6cc4b096a7238f3401f1b751de2f3 100644
--- a/src/plugins/sched/wiki/msg.c
+++ b/src/plugins/sched/wiki/msg.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -91,7 +91,7 @@ extern int spawn_msg_thread(void)
parse_wiki_config();
slurm_attr_init(&thread_attr_msg);
- if (pthread_create(&msg_thread_id, &thread_attr_msg,
+ if (pthread_create(&msg_thread_id, &thread_attr_msg,
_msg_thread, NULL))
fatal("pthread_create %m");
@@ -114,7 +114,7 @@ extern void term_msg_thread(void)
thread_shutdown = true;
/* Open and close a connection to the wiki listening port.
- * Allows slurm_accept_msg_conn() to return in
+ * Allows slurm_accept_msg_conn() to return in
* _msg_thread() so that it can check the thread_shutdown
* flag.
*/
@@ -183,8 +183,8 @@ static void *_msg_thread(void *no_data)
close(new_fd);
break;
}
- /* It would be nice to create a pthread for each new
- * RPC, but that leaks memory on some systems when
+ /* It would be nice to create a pthread for each new
+ * RPC, but that leaks memory on some systems when
* done from a plugin.
* FIXME: Maintain a pool of and reuse them. */
err_code = 0;
@@ -232,7 +232,7 @@ static char * _get_wiki_conf_path(void)
/*****************************************************************************\
* parse_wiki_config - Results go into global variables
* RET SLURM_SUCESS or error code
- *
+ *
* wiki_conf options
* JobPriority=hold|run
* AuthKey=number
@@ -247,7 +247,7 @@ extern int parse_wiki_config(void)
{"ExcludePartitions", S_P_STRING},
{"HidePartitionJobs", S_P_STRING},
{"JobAggregationTime", S_P_UINT16},
- {"JobPriority", S_P_STRING},
+ {"JobPriority", S_P_STRING},
{NULL} };
s_p_hashtbl_t *tbl;
char *exclude_partitions, *hide_partitions;
@@ -266,7 +266,7 @@ extern int parse_wiki_config(void)
if (conf->backup_addr) {
strncpy(e_host_bu, conf->backup_addr,
sizeof(e_host));
- }
+ }
kill_wait = conf->kill_wait;
slurm_conf_unlock();
@@ -298,7 +298,7 @@ extern int parse_wiki_config(void)
xfree(key);
}
s_p_get_uint16(&e_port, "EPort", tbl);
- s_p_get_uint16(&job_aggregation_time, "JobAggregationTime", tbl);
+ s_p_get_uint16(&job_aggregation_time, "JobAggregationTime", tbl);
if (s_p_get_string(&exclude_partitions, "ExcludePartitions", tbl)) {
char *tok = NULL, *tok_p = NULL;
@@ -309,7 +309,7 @@ extern int parse_wiki_config(void)
error("ExcludePartitions has too many entries "
"skipping %s and later entries");
break;
- }
+ }
exclude_part_ptr[i] = find_part_record(tok);
if (exclude_part_ptr[i])
i++;
@@ -328,7 +328,7 @@ extern int parse_wiki_config(void)
error("HidePartitionJobs has too many entries "
"skipping %s and later entries");
break;
- }
+ }
hide_part_ptr[i] = find_part_record(tok);
if (hide_part_ptr[i])
i++;
@@ -344,7 +344,7 @@ extern int parse_wiki_config(void)
else if (strcasecmp(priority_mode, "run") == 0)
init_prio_mode = PRIO_DECREMENT;
else
- error("Invalid value for JobPriority in wiki.conf");
+ error("Invalid value for JobPriority in wiki.conf");
xfree(priority_mode);
}
s_p_hashtbl_destroy(tbl);
@@ -357,7 +357,7 @@ extern int parse_wiki_config(void)
info("EPort = %u", e_port);
info("JobAggregationTime = %u sec", job_aggregation_time);
info("JobPriority = %s", init_prio_mode ? "run" : "hold");
- info("KillWait = %u sec", kill_wait);
+ info("KillWait = %u sec", kill_wait);
for (i=0; i<EXC_PART_CNT; i++) {
if (!exclude_part_ptr[i])
continue;
@@ -421,7 +421,7 @@ static size_t _read_bytes(int fd, char *buf, const size_t size)
bytes_remaining -= bytes_read;
ptr += bytes_read;
}
-
+
return size;
}
@@ -443,9 +443,9 @@ static size_t _write_bytes(int fd, char *buf, const size_t size)
}
/*****************************************************************************\
- * Read a message (request) from specified file descriptor
+ * Read a message (request) from specified file descriptor
*
- * RET - The message which must be xfreed or
+ * RET - The message which must be xfreed or
* NULL on error
\*****************************************************************************/
static char * _recv_msg(slurm_fd new_fd)
@@ -484,7 +484,7 @@ static char * _recv_msg(slurm_fd new_fd)
}
/*****************************************************************************\
- * Send a message (response) to specified file descriptor
+ * Send a message (response) to specified file descriptor
*
* RET - Number of data bytes written (excludes header)
\*****************************************************************************/
@@ -525,7 +525,7 @@ static int _parse_msg(char *msg, char **req)
char *cmd_ptr = strstr(msg, "CMD=");
time_t ts, now = time(NULL);
uint32_t delta_t;
-
+
if ((auth_key[0] == '\0') && cmd_ptr) {
/* No authentication required */
*req = cmd_ptr;
@@ -552,7 +552,7 @@ static int _parse_msg(char *msg, char **req)
error("wiki: request lacks TS=");
return -1;
}
- ts = strtoul((ts_ptr+3), NULL, 10);
+ ts = strtoul((ts_ptr+3), NULL, 10);
if (ts < now)
delta_t = (uint32_t) difftime(now, ts);
else
@@ -560,14 +560,14 @@ static int _parse_msg(char *msg, char **req)
if (delta_t > 300) {
err_code = -350;
err_msg = "TS value too far from NOW";
- error("wiki: TimeStamp too far from NOW (%u secs)",
+ error("wiki: TimeStamp too far from NOW (%u secs)",
delta_t);
return -1;
}
#if 0
/* Old wiki interface does not require checksum
- * (actually a cryptographic signature) on incomming
+ * (actually a cryptographic signature) on incomming
* messages. NOTE: This is not secure! */
if (auth_key[0] != '\0') {
char sum[20]; /* format is "CK=%08x08x" */
@@ -612,7 +612,7 @@ static void _proc_msg(slurm_fd new_fd, char *msg)
cmd_ptr = strstr(req, "CMD=");
if (cmd_ptr == NULL) {
err_code = -300;
- err_msg = "request lacks CMD";
+ err_msg = "request lacks CMD";
error("wiki: request lacks CMD");
goto resp_msg;
}
@@ -679,7 +679,7 @@ static void _send_reply(slurm_fd new_fd, char *response)
xfree(tmp);
}
- snprintf(buf, i, "CK=dummy67890123456 TS=%u AUTH=%s DT=%s",
+ snprintf(buf, i, "CK=dummy67890123456 TS=%u AUTH=%s DT=%s",
(uint32_t) time(NULL), uname, response);
checksum(sum, auth_key, (buf+20)); /* overwrite "CK=dummy..." above */
memcpy(buf, sum, 19);
diff --git a/src/plugins/sched/wiki/msg.h b/src/plugins/sched/wiki/msg.h
index 13cd14335fae0d687c20433be9edfbea9b738b35..3443d8869da7cfd62b8692b78cfce3d28f86879b 100644
--- a/src/plugins/sched/wiki/msg.h
+++ b/src/plugins/sched/wiki/msg.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -39,12 +39,12 @@
/*
* Two modes of operation are currently supported for job prioritization:
*
- * PRIO_HOLD: Wiki is a polling scheduler, so the initial priority is always
- * zero to keep SLURM from spontaneously starting the job. The scheduler will
- * suggest which job's priority should be made non-zero and thus allowed to
+ * PRIO_HOLD: Wiki is a polling scheduler, so the initial priority is always
+ * zero to keep SLURM from spontaneously starting the job. The scheduler will
+ * suggest which job's priority should be made non-zero and thus allowed to
* proceed.
*
- * PRIO_DECREMENT: Set the job priority to one less than the last job and let
+ * PRIO_DECREMENT: Set the job priority to one less than the last job and let
* Wiki change priorities of jobs as desired to re-order the queue
*/
@@ -112,7 +112,7 @@ extern char * get_wiki_conf(void);
*/
extern void null_term(char *str);
-/* Functions called from within msg.c (rather than creating a bunch
+/* Functions called from within msg.c (rather than creating a bunch
* more header files with one function definition each */
extern int cancel_job(char *cmd_ptr, int *err_code, char **err_msg);
extern int get_jobs(char *cmd_ptr, int *err_code, char **err_msg);
diff --git a/src/plugins/sched/wiki/resume_job.c b/src/plugins/sched/wiki/resume_job.c
index 6b0f79b0f992fa0821fc6c57fce79c69755b606a..ea83de64f4c0cf648a98c0a6db063e4c53c63dc2 100644
--- a/src/plugins/sched/wiki/resume_job.c
+++ b/src/plugins/sched/wiki/resume_job.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/plugins/sched/wiki/sched_wiki.c b/src/plugins/sched/wiki/sched_wiki.c
index d7270af8f996cc774c76c13e11c1bb2dfdfbb71e..96a1f2c90cc052750ce8d385ae71013ab3af3042 100644
--- a/src/plugins/sched/wiki/sched_wiki.c
+++ b/src/plugins/sched/wiki/sched_wiki.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -96,7 +96,7 @@ extern int slurm_sched_plugin_freealloc( struct job_record *job_ptr )
/**************************************************************************/
-/* TAG( slurm_sched_plugin_initial_priority ) */
+/* TAG( slurm_sched_plugin_initial_priority ) */
/**************************************************************************/
extern uint32_t
slurm_sched_plugin_initial_priority( uint32_t last_prio,
@@ -111,7 +111,7 @@ slurm_sched_plugin_initial_priority( uint32_t last_prio,
if (exclude_part_ptr[i] == NULL)
break;
if (exclude_part_ptr[i] == job_ptr->part_ptr) {
- debug("Scheduiling job %u directly (no Maui)",
+ debug("Scheduiling job %u directly (no Maui)",
job_ptr->job_id);
return (exclude_prio--);
}
@@ -119,7 +119,7 @@ slurm_sched_plugin_initial_priority( uint32_t last_prio,
return 0;
}
- if (init_prio_mode == PRIO_DECREMENT)
+ if (init_prio_mode == PRIO_DECREMENT)
return priority_g_set(last_prio, job_ptr);
return 0;
diff --git a/src/plugins/sched/wiki/start_job.c b/src/plugins/sched/wiki/start_job.c
index e19d8179264e10572a9170b1e5e60182be5e2abc..38b6d9c8d7a7d407ac9be248a44f7399b66b4329 100644
--- a/src/plugins/sched/wiki/start_job.c
+++ b/src/plugins/sched/wiki/start_job.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -45,7 +45,7 @@
#include "src/slurmctld/slurmctld.h"
#include "src/slurmctld/state_save.h"
-static int _start_job(uint32_t jobid, int task_cnt, char *hostlist,
+static int _start_job(uint32_t jobid, int task_cnt, char *hostlist,
char *tasklist, int *err_code, char **err_msg);
/* Start a job:
@@ -108,11 +108,11 @@ extern int start_job(char *cmd_ptr, int *err_code, char **err_msg)
return -1;
}
- rc = _start_job(jobid, task_cnt, host_string, tasklist,
+ rc = _start_job(jobid, task_cnt, host_string, tasklist,
err_code, err_msg);
xfree(tasklist);
if (rc == 0) {
- snprintf(reply_msg, sizeof(reply_msg),
+ snprintf(reply_msg, sizeof(reply_msg),
"job %u started successfully", jobid);
*err_msg = reply_msg;
}
@@ -129,7 +129,7 @@ extern int start_job(char *cmd_ptr, int *err_code, char **err_msg)
* err_code (OUT) - Moab error code
* err_msg (OUT) - Moab error message
*/
-static int _start_job(uint32_t jobid, int task_cnt, char *hostlist,
+static int _start_job(uint32_t jobid, int task_cnt, char *hostlist,
char *tasklist, int *err_code, char **err_msg)
{
int rc = 0, old_task_cnt = 1;
@@ -249,7 +249,7 @@ static int _start_job(uint32_t jobid, int task_cnt, char *hostlist,
save_req_bitmap = job_ptr->details->req_node_bitmap;
job_ptr->details->req_node_bitmap = new_bitmap;
old_task_cnt = job_ptr->num_procs;
- job_ptr->num_procs = MAX(task_cnt, old_task_cnt);
+ job_ptr->num_procs = MAX(task_cnt, old_task_cnt);
job_ptr->priority = 100000000;
fini: unlock_slurmctld(job_write_lock);
diff --git a/src/plugins/sched/wiki/suspend_job.c b/src/plugins/sched/wiki/suspend_job.c
index 6e6ad9796b872214627dde7ac4e2434c7c6b55f9..9d50dc6a6d3952ceb94d9265691039e3930b9e9e 100644
--- a/src/plugins/sched/wiki/suspend_job.c
+++ b/src/plugins/sched/wiki/suspend_job.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/plugins/sched/wiki2/Makefile.am b/src/plugins/sched/wiki2/Makefile.am
index 24a352673dd28adbadba95190fc0b92c4a1a6cee..19c026a5e0a6f632c6e96a2985bf8ecf1d3f03d4 100644
--- a/src/plugins/sched/wiki2/Makefile.am
+++ b/src/plugins/sched/wiki2/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign
CXXFLAGS = -fexceptions
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/sched/wiki2/Makefile.in b/src/plugins/sched/wiki2/Makefile.in
index bc124009a622c7f7a9d103da246541360a10ad29..bb1a62dc2f270ad226183b0135c24b9377a9c76c 100644
--- a/src/plugins/sched/wiki2/Makefile.in
+++ b/src/plugins/sched/wiki2/Makefile.in
@@ -316,7 +316,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = sched_wiki2.la
sched_wiki2_la_SOURCES = \
diff --git a/src/plugins/sched/wiki2/cancel_job.c b/src/plugins/sched/wiki2/cancel_job.c
index 921eb5516980df515a190101947f561cd9140750..95ff9e10406937276343fef101c2757f73858f8d 100644
--- a/src/plugins/sched/wiki2/cancel_job.c
+++ b/src/plugins/sched/wiki2/cancel_job.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -43,7 +43,7 @@
#define TYPE_ADMIN 0
#define TYPE_TIMEOUT 1
-static int _cancel_job(uint32_t jobid, char *comment_ptr,
+static int _cancel_job(uint32_t jobid, char *comment_ptr,
int *err_code, char **err_msg);
static int _timeout_job(uint32_t jobid, char *comment_ptr,
int *err_code, char **err_msg);
@@ -126,7 +126,7 @@ extern int cancel_job(char *cmd_ptr, int *err_code, char **err_msg)
error("wiki: CANCELJOB has invalid TYPE");
return -1;
}
-
+
if (cancel_type == TYPE_ADMIN) {
if (_cancel_job(jobid, comment_ptr, err_code, err_msg) != 0)
return -1;
@@ -135,7 +135,7 @@ extern int cancel_job(char *cmd_ptr, int *err_code, char **err_msg)
return -1;
}
- snprintf(reply_msg, sizeof(reply_msg),
+ snprintf(reply_msg, sizeof(reply_msg),
"job %u cancelled successfully", jobid);
*err_msg = reply_msg;
return 0;
@@ -175,7 +175,7 @@ static int _cancel_job(uint32_t jobid, char *comment_ptr,
if (slurm_rc != SLURM_SUCCESS) {
*err_code = -700;
*err_msg = slurm_strerror(slurm_rc);
- error("wiki: Failed to cancel job %u: %s",
+ error("wiki: Failed to cancel job %u: %s",
jobid, slurm_strerror(slurm_rc));
rc = -1;
goto fini;
diff --git a/src/plugins/sched/wiki2/crypto.c b/src/plugins/sched/wiki2/crypto.c
index 153c2ef57bc6c4a0b75e602dbf26183127f5b9eb..34fd4149c20c9db3eb66e328f82bf9a816ecc863 100644
--- a/src/plugins/sched/wiki2/crypto.c
+++ b/src/plugins/sched/wiki2/crypto.c
@@ -1,7 +1,7 @@
/*****************************************************************************\
* crypto.c - DES cryptographic routines.
*****************************************************************************
- * Produced by Cluster Resources, Inc., no rights reserved.
+ * Produced by Cluster Resources, Inc., no rights reserved.
\*****************************************************************************/
#include <stdint.h>
#include <stdio.h>
@@ -16,14 +16,14 @@
* DESCRIPTION
* Compute a DES digest for a CRC according to a particular
* key.
- *
+ *
* ARGUMENTS
* lword (in/out) - The CRC to encode, which becomes the first
* lexical segment of the checksum.
* irword (in/out ) - The key with which to encode the CRC,
* which becomes the second lexical segment of
* the checksum.
- *
+ *
* RETURNS
* None.
*
@@ -68,11 +68,11 @@ static void des( uint32_t *lword, uint32_t *irword )
**************************************************************
* DESCRIPTION
* Compute a cyclic redundancy check (CRC) character-wise.
- *
+ *
* ARGUMENTS
* crc (in) - The CRC computed thus far.
* onech (in) - The character to be added to the CRC.
- *
+ *
* RETURNS
* The new CRC value.
*
@@ -102,7 +102,7 @@ static uint16_t compute_crc( uint16_t crc, uint8_t onech )
* DESCRIPTION
* Compute a Wiki checksum for the current message contents
* and return the result as a Wiki name-value pair.
- *
+ *
* ARGUMENTS
* sum (out) - The string in which to store the resulting
* checksum.
@@ -110,7 +110,7 @@ static uint16_t compute_crc( uint16_t crc, uint8_t onech )
* coordinated with the scheduler so that they
* both use the same value. It is a string of
* ASCII decimal digits.
- *
+ *
* RETURNS
* None.
**************************************************************/
diff --git a/src/plugins/sched/wiki2/crypto.h b/src/plugins/sched/wiki2/crypto.h
index ddb989b96a9aaf90dccf18af85a88bc5174da5be..8fa1b1d3250defa0f59ab8ebe1f7e3f57a364adb 100644
--- a/src/plugins/sched/wiki2/crypto.h
+++ b/src/plugins/sched/wiki2/crypto.h
@@ -1,7 +1,7 @@
/*****************************************************************************\
* crypto.h - DES cryptographic routines.
*****************************************************************************
- * Produced by Cluster Resources, Inc., no rights reserved.
+ * Produced by Cluster Resources, Inc., no rights reserved.
\*****************************************************************************/
#include <stdint.h>
diff --git a/src/plugins/sched/wiki2/event.c b/src/plugins/sched/wiki2/event.c
index 41fc23f0e6a82094597f2399499558a189ed13c9..faa6292036e570a5d0a577dc70c6efb2cb88b426 100644
--- a/src/plugins/sched/wiki2/event.c
+++ b/src/plugins/sched/wiki2/event.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -58,7 +58,7 @@ static int _open_fd(time_t now)
slurm_set_addr(&moab_event_addr, e_port, e_host);
event_addr_set = 1;
if (e_host_bu[0] != '\0') {
- slurm_set_addr(&moab_event_addr_bu, e_port,
+ slurm_set_addr(&moab_event_addr_bu, e_port,
e_host_bu);
event_addr_set = 2;
}
@@ -147,7 +147,7 @@ extern int event_notify(int event_code, char *desc)
verbose("wiki event_notification sent: %s", desc);
last_notify_time = now;
rc = 0;
- /* Dave Jackson says to leave the connection
+ /* Dave Jackson says to leave the connection
* open, but Moab isn't. Without the _close_fd()
* here, the next write() generates a broken pipe
* error. Just remove the _close_fd() and this
@@ -164,7 +164,7 @@ extern int event_notify(int event_code, char *desc)
_close_fd();
if (errno == EPIPE) {
- /* If Moab closed the socket we get an EPIPE,
+ /* If Moab closed the socket we get an EPIPE,
* retry once */
continue;
} else {
diff --git a/src/plugins/sched/wiki2/get_jobs.c b/src/plugins/sched/wiki2/get_jobs.c
index e7f2f8306832b38391a7c4b5204d84322dccd431..b6974b8c9bfb466922ebf421ae6db6a892817a22 100644
--- a/src/plugins/sched/wiki2/get_jobs.c
+++ b/src/plugins/sched/wiki2/get_jobs.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -50,7 +50,7 @@
static char * _dump_all_jobs(int *job_cnt, time_t update_time);
static char * _dump_job(struct job_record *job_ptr, time_t update_time);
-static void _get_job_comment(struct job_record *job_ptr,
+static void _get_job_comment(struct job_record *job_ptr,
char *buffer, int buf_size);
static uint16_t _get_job_cpus_per_task(struct job_record *job_ptr);
static uint32_t _get_job_end_time(struct job_record *job_ptr);
@@ -91,7 +91,7 @@ reject_msg_t reject_msgs[REJECT_MSG_MAX];
* ARG=<cnt>#<JOBID>;
* STATE=<state>; Moab equivalent job state
* [EXITCODE=<number>;] Job exit code, if completed
- * [RFEATURES=<features>;] required features, if any,
+ * [RFEATURES=<features>;] required features, if any,
* NOTE: OR operator not supported
* [HOSTLIST=<node1:node2>;] list of required nodes, if any
* [STARTDATE=<uts>;] earliest start time, if any
@@ -312,7 +312,7 @@ static char * _dump_job(struct job_record *job_ptr, time_t update_time)
if (job_ptr->batch_flag == 0)
xstrcat(buf, "FLAGS=INTERACTIVE;");
- snprintf(tmp, sizeof(tmp),
+ snprintf(tmp, sizeof(tmp),
"UPDATETIME=%u;WCLIMIT=%u;TASKS=%u;",
(uint32_t) job_ptr->time_last_active,
(uint32_t) _get_job_time_limit(job_ptr),
@@ -394,7 +394,7 @@ static char * _dump_job(struct job_record *job_ptr, time_t update_time)
return buf;
}
-static void _get_job_comment(struct job_record *job_ptr,
+static void _get_job_comment(struct job_record *job_ptr,
char *buffer, int buf_size)
{
int size, sharing = 0;
@@ -435,7 +435,7 @@ static void _get_job_comment(struct job_record *job_ptr,
/* TPN = tasks per node */
if (job_ptr->details && (job_ptr->details->ntasks_per_node != 0)) {
size += snprintf((buffer + size), (buf_size - size),
- "%sTPN:%u", field_sep,
+ "%sTPN:%u", field_sep,
job_ptr->details->ntasks_per_node);
field_sep = "?";
}
@@ -474,7 +474,7 @@ static uint32_t _get_job_min_mem(struct job_record *job_ptr)
}
static uint32_t _get_job_min_disk(struct job_record *job_ptr)
-
+
{
if (job_ptr->details)
return job_ptr->details->job_min_tmp_disk;
@@ -497,7 +497,7 @@ static uint32_t _get_job_max_nodes(struct job_record *job_ptr)
if (job_ptr->details->max_nodes) {
max_nodes = job_ptr->details->max_nodes;
if (job_ptr->part_ptr->max_nodes != INFINITE) {
- max_nodes = MIN(max_nodes,
+ max_nodes = MIN(max_nodes,
job_ptr->part_ptr->max_nodes);
}
} else if (job_ptr->part_ptr->max_nodes == INFINITE)
@@ -541,7 +541,7 @@ static uint32_t _get_job_tasks(struct job_record *job_ptr)
task_cnt = 1;
if (job_ptr->details) {
task_cnt = MAX(task_cnt,
- (_get_job_min_nodes(job_ptr) *
+ (_get_job_min_nodes(job_ptr) *
job_ptr->details->
ntasks_per_node));
}
@@ -556,7 +556,7 @@ static uint32_t _get_job_time_limit(struct job_record *job_ptr)
if ((limit == NO_VAL) && (job_ptr->part_ptr)) {
/* Job will get partition's time limit when schedule.
- * The partition's limit can change between now and
+ * The partition's limit can change between now and
* job initiation time. */
limit = job_ptr->part_ptr->max_time;
}
@@ -567,7 +567,7 @@ static uint32_t _get_job_time_limit(struct job_record *job_ptr)
return (limit * 60); /* seconds, not minutes */
}
-/* NOTE: if job has already completed, we append "EXITCODE=#" to
+/* NOTE: if job has already completed, we append "EXITCODE=#" to
* the state name */
static char * _get_job_state(struct job_record *job_ptr)
{
@@ -576,10 +576,10 @@ static char * _get_job_state(struct job_record *job_ptr)
if (IS_JOB_COMPLETING(job_ptr)) {
/* Give configured KillWait+10 for job
- * to clear out, then then consider job
- * done. Moab will allocate jobs to
- * nodes that are already Idle. */
- int age = (int) difftime(time(NULL),
+ * to clear out, then then consider job
+ * done. Moab will allocate jobs to
+ * nodes that are already Idle. */
+ int age = (int) difftime(time(NULL),
job_ptr->end_time);
if (age < (kill_wait+10))
return "Running";
@@ -642,7 +642,7 @@ static uint32_t _get_job_suspend_time(struct job_record *job_ptr)
{
if (IS_JOB_SUSPENDED(job_ptr)) {
time_t now = time(NULL);
- return (uint32_t) difftime(now,
+ return (uint32_t) difftime(now,
job_ptr->suspend_time);
}
return (uint32_t) 0;
diff --git a/src/plugins/sched/wiki2/get_nodes.c b/src/plugins/sched/wiki2/get_nodes.c
index 6589d1aae2b124621d4b4d0ecfc04e3ff5de98bf..f45b920280c1c9a4437ff08e92fad339d0e49d87 100644
--- a/src/plugins/sched/wiki2/get_nodes.c
+++ b/src/plugins/sched/wiki2/get_nodes.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -43,10 +43,10 @@
#include "src/slurmctld/slurmctld.h"
static char * _dump_all_nodes(int *node_cnt, time_t update_time);
-static char * _dump_node(struct node_record *node_ptr, hostlist_t hl,
+static char * _dump_node(struct node_record *node_ptr, hostlist_t hl,
time_t update_time);
static char * _get_node_state(struct node_record *node_ptr);
-static int _same_info(struct node_record *node1_ptr,
+static int _same_info(struct node_record *node1_ptr,
struct node_record *node2_ptr, time_t update_time);
static int _str_cmp(char *s1, char *s2);
@@ -113,11 +113,11 @@ extern int get_nodes(char *cmd_ptr, int *err_code, char **err_msg)
while ((node_name = hostset_shift(slurm_hostset))) {
node_ptr = find_node_record(node_name);
if (node_ptr == NULL) {
- error("sched/wiki2: bad hostname %s",
+ error("sched/wiki2: bad hostname %s",
node_name);
continue;
}
- tmp_buf = _dump_node(node_ptr, NULL,
+ tmp_buf = _dump_node(node_ptr, NULL,
update_time);
if (node_rec_cnt > 0)
xstrcat(buf, "#");
@@ -173,7 +173,7 @@ static char * _dump_all_nodes(int *node_cnt, time_t update_time)
}
continue;
} else {
- tmp_buf = _dump_node(uniq_node_ptr, hl,
+ tmp_buf = _dump_node(uniq_node_ptr, hl,
update_time);
hostlist_destroy(hl);
hl = hostlist_create(node_ptr->name);
@@ -209,7 +209,7 @@ static char * _dump_all_nodes(int *node_cnt, time_t update_time)
* RET 0 of node1 is NULL or their parameters are the same
* >0 otherwise
*/
-static int _same_info(struct node_record *node1_ptr,
+static int _same_info(struct node_record *node1_ptr,
struct node_record *node2_ptr, time_t update_time)
{
int i;
@@ -248,11 +248,11 @@ static int _same_info(struct node_record *node1_ptr,
if (slurmctld_conf.fast_schedule) {
/* config from slurm.conf */
- if ((node1_ptr->config_ptr->real_memory !=
+ if ((node1_ptr->config_ptr->real_memory !=
node2_ptr->config_ptr->real_memory) ||
- (node1_ptr->config_ptr->tmp_disk !=
+ (node1_ptr->config_ptr->tmp_disk !=
node2_ptr->config_ptr->tmp_disk) ||
- (node1_ptr->config_ptr->cpus !=
+ (node1_ptr->config_ptr->cpus !=
node2_ptr->config_ptr->cpus))
return 9;
} else {
@@ -261,13 +261,13 @@ static int _same_info(struct node_record *node1_ptr,
(node1_ptr->cpus != node2_ptr->cpus))
return 10;
}
- if (_str_cmp(node1_ptr->config_ptr->feature,
+ if (_str_cmp(node1_ptr->config_ptr->feature,
node2_ptr->config_ptr->feature))
return 11;
return 0;
}
-static char * _dump_node(struct node_record *node_ptr, hostlist_t hl,
+static char * _dump_node(struct node_record *node_ptr, hostlist_t hl,
time_t update_time)
{
char tmp[16*1024], *buf = NULL;
@@ -301,7 +301,7 @@ static char * _dump_node(struct node_record *node_ptr, hostlist_t hl,
xstrcat(buf, tmp);
xfree(reason);
}
-
+
if (update_time > last_node_update)
return buf;
@@ -315,7 +315,7 @@ static char * _dump_node(struct node_record *node_ptr, hostlist_t hl,
for (i=0; i<node_ptr->part_cnt; i++) {
if (i == 0)
xstrcat(buf, "CCLASS=");
- snprintf(tmp, sizeof(tmp), "[%s:%u]",
+ snprintf(tmp, sizeof(tmp), "[%s:%u]",
node_ptr->part_pptr[i]->name,
cpu_cnt);
xstrcat(buf, tmp);
@@ -374,7 +374,7 @@ static char * _get_node_state(struct node_record *node_ptr)
if (!got_select_type) {
char * select_type = slurm_get_select_type();
- if (select_type &&
+ if (select_type &&
(strcasecmp(select_type, "select/linear") == 0))
node_allocations = true;
else
@@ -400,7 +400,7 @@ static char * _get_node_state(struct node_record *node_ptr)
}
if (IS_NODE_IDLE(node_ptr))
return "Idle";
-
+
return "Unknown";
}
diff --git a/src/plugins/sched/wiki2/hostlist.c b/src/plugins/sched/wiki2/hostlist.c
index 8818ff211a92fb39f1f62d9ab967d49edb4b31b4..a4d6368632bac11ddc392a59a6f1a957caf09a03 100644
--- a/src/plugins/sched/wiki2/hostlist.c
+++ b/src/plugins/sched/wiki2/hostlist.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -90,7 +90,7 @@ extern char * moab2slurm_task_list(char *moab_tasklist, int *task_cnt)
*task_cnt = 0;
- /* Moab format 2 if string contains '*' or '[' */
+ /* Moab format 2 if string contains '*' or '[' */
tmp1 = strchr(moab_tasklist, (int) '*');
if (tmp1 == NULL)
tmp1 = strchr(moab_tasklist, (int) '[');
@@ -222,7 +222,7 @@ static void _append_hl_buf(char **buf, hostlist_t *hl_tmp, int *reps)
}
/* Note that host_str may be of this form "alpha,beta". We want
- * to record this as "alpha*#:beta*#" and NOT "alpha,beta*#".
+ * to record this as "alpha*#:beta*#" and NOT "alpha,beta*#".
* NOTE: Do not break up command within brackets (e.g. "tux[1,2-4]") */
if (*buf)
sep = ":";
diff --git a/src/plugins/sched/wiki2/initialize.c b/src/plugins/sched/wiki2/initialize.c
index 4314b2901b044352ee40ecb91a3165ba9ccefa46..a89c2151de43ce615b7c6116bb802d0d79e214c2 100644
--- a/src/plugins/sched/wiki2/initialize.c
+++ b/src/plugins/sched/wiki2/initialize.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -92,7 +92,7 @@ extern int initialize_wiki(char *cmd_ptr, int *err_code, char **err_msg)
else
use_ptr = "F";
snprintf(reply_msg, sizeof(reply_msg),
- "EPORT=%u USEHOSTEXP=%s",
+ "EPORT=%u USEHOSTEXP=%s",
e_port, use_ptr);
*err_msg = reply_msg;
return 0;
diff --git a/src/plugins/sched/wiki2/job_add_task.c b/src/plugins/sched/wiki2/job_add_task.c
index 4671a19aaad9b53f097ab32a3f9abfe300fd0b10..956c12f009268e55842dcfa32a40b2acd9171d02 100644
--- a/src/plugins/sched/wiki2/job_add_task.c
+++ b/src/plugins/sched/wiki2/job_add_task.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/plugins/sched/wiki2/job_modify.c b/src/plugins/sched/wiki2/job_modify.c
index 07691b3f385145eb598d0fab8926da59b68f8471..44d6aabcfca6ad24412719b44eea7eb1140f4e8e 100644
--- a/src/plugins/sched/wiki2/job_modify.c
+++ b/src/plugins/sched/wiki2/job_modify.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -58,9 +58,9 @@ extern void null_term(char *str)
}
}
-static int _job_modify(uint32_t jobid, char *bank_ptr,
+static int _job_modify(uint32_t jobid, char *bank_ptr,
char *depend_ptr, char *new_hostlist,
- uint32_t new_node_cnt, char *part_name_ptr,
+ uint32_t new_node_cnt, char *part_name_ptr,
uint32_t new_time_limit, char *name_ptr,
char *start_ptr, char *feature_ptr, char *env_ptr)
{
@@ -81,10 +81,10 @@ static int _job_modify(uint32_t jobid, char *bank_ptr,
if (depend_ptr) {
int rc = update_job_dependency(job_ptr, depend_ptr);
if (rc == SLURM_SUCCESS) {
- info("wiki: changed job %u dependency to %s",
+ info("wiki: changed job %u dependency to %s",
jobid, depend_ptr);
} else {
- error("wiki: changing job %u dependency to %s",
+ error("wiki: changing job %u dependency to %s",
jobid, depend_ptr);
return EINVAL;
}
@@ -105,7 +105,7 @@ static int _job_modify(uint32_t jobid, char *bank_ptr,
if (env_ptr[i] == '=') {
if (have_equal) {
error("wiki: setting job %u invalid "
- "environment variables: %s",
+ "environment variables: %s",
jobid, env_ptr);
return EINVAL;
}
@@ -115,7 +115,7 @@ static int _job_modify(uint32_t jobid, char *bank_ptr,
if (env_ptr[i] == '\0') {
error("wiki: setting job %u "
"invalid environment "
- "variables: %s",
+ "variables: %s",
jobid, env_ptr);
return EINVAL;
}
@@ -132,7 +132,7 @@ static int _job_modify(uint32_t jobid, char *bank_ptr,
if (env_ptr[i] == '\0') {
error("wiki: setting job %u "
"invalid environment "
- "variables: %s",
+ "variables: %s",
jobid, env_ptr);
return EINVAL;
}
@@ -149,19 +149,19 @@ static int _job_modify(uint32_t jobid, char *bank_ptr,
if (isspace(env_ptr[i]) || (env_ptr[i] == ',')) {
if (!have_equal) {
error("wiki: setting job %u invalid "
- "environment variables: %s",
+ "environment variables: %s",
jobid, env_ptr);
return EINVAL;
}
old_sep[0] = env_ptr[i];
env_ptr[i] = '\0';
- xrealloc(job_ptr->details->env_sup,
+ xrealloc(job_ptr->details->env_sup,
sizeof(char *) *
(job_ptr->details->env_cnt+1));
job_ptr->details->env_sup
[job_ptr->details->env_cnt++] =
xstrdup(&env_ptr[begin]);
- info("wiki: for job %u add env: %s",
+ info("wiki: for job %u add env: %s",
jobid, &env_ptr[begin]);
env_ptr[i] = old_sep[0];
if (isspace(old_sep[0]))
@@ -192,7 +192,7 @@ static int _job_modify(uint32_t jobid, char *bank_ptr,
if (feature_ptr) {
if (IS_JOB_PENDING(job_ptr) && (job_ptr->details)) {
- info("wiki: change job %u features to %s",
+ info("wiki: change job %u features to %s",
jobid, feature_ptr);
job_ptr->details->features = xstrdup(feature_ptr);
last_job_update = now;
@@ -207,7 +207,7 @@ static int _job_modify(uint32_t jobid, char *bank_ptr,
char *end_ptr;
uint32_t begin_time = strtol(start_ptr, &end_ptr, 10);
if (IS_JOB_PENDING(job_ptr) && (job_ptr->details)) {
- info("wiki: change job %u begin time to %u",
+ info("wiki: change job %u begin time to %u",
jobid, begin_time);
job_ptr->details->begin_time = begin_time;
last_job_update = now;
@@ -279,12 +279,12 @@ static int _job_modify(uint32_t jobid, char *bank_ptr,
}
host_fini: if (rc) {
- info("wiki: change job %u invalid hostlist %s",
+ info("wiki: change job %u invalid hostlist %s",
jobid, new_hostlist);
xfree(job_ptr->details->req_nodes);
return EINVAL;
} else {
- info("wiki: change job %u hostlist %s",
+ info("wiki: change job %u hostlist %s",
jobid, new_hostlist);
update_accounting = true;
}
@@ -316,13 +316,13 @@ host_fini: if (rc) {
if (new_node_cnt) {
job_desc_msg_t job_desc;
-
+
memset(&job_desc, 0, sizeof(job_desc_msg_t));
-
+
job_desc.min_nodes = new_node_cnt;
job_desc.max_nodes = NO_VAL;
job_desc.select_jobinfo = select_g_select_jobinfo_alloc();
-
+
select_g_alter_node_cnt(SELECT_SET_NODE_CNT, &job_desc);
select_g_select_jobinfo_free(job_desc.select_jobinfo);
@@ -331,7 +331,7 @@ host_fini: if (rc) {
job_ptr->details->min_nodes = job_desc.min_nodes;
if (job_ptr->details->max_nodes
&& (job_ptr->details->max_nodes < job_desc.min_nodes))
- job_ptr->details->max_nodes =
+ job_ptr->details->max_nodes =
job_desc.min_nodes;
info("wiki: change job %u min_nodes to %u",
jobid, new_node_cnt);
@@ -350,7 +350,7 @@ host_fini: if (rc) {
if (update_accounting) {
if (job_ptr->details && job_ptr->details->begin_time) {
- /* Update job record in accounting to reflect
+ /* Update job record in accounting to reflect
* the changes */
jobacct_storage_g_job_start(
acct_db_conn, slurmctld_cluster_name, job_ptr);
@@ -456,7 +456,7 @@ extern int job_modify_wiki(char *cmd_ptr, int *err_code, char **err_msg)
start_ptr[12] = ':';
start_ptr += 13;
null_term(start_ptr);
- }
+ }
if (nodes_ptr) {
nodes_ptr[5] = ':';
nodes_ptr += 6;
diff --git a/src/plugins/sched/wiki2/job_notify.c b/src/plugins/sched/wiki2/job_notify.c
index 7aa80a7e499ebb9f0ca1fa3ae072443f18819a04..09b819cc9ee9a228a88f1e0c1cb9f67a0f5889bf 100644
--- a/src/plugins/sched/wiki2/job_notify.c
+++ b/src/plugins/sched/wiki2/job_notify.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -59,7 +59,7 @@ static int _job_notify(uint32_t jobid, char *msg_ptr)
return SLURM_SUCCESS;
}
-/* Notify a job via arbitrary message:
+/* Notify a job via arbitrary message:
* CMD=NOTIFYJOB ARG=<jobid> MSG=<string>
* RET 0 on success, -1 on failure */
extern int job_notify_wiki(char *cmd_ptr, int *err_code, char **err_msg)
diff --git a/src/plugins/sched/wiki2/job_release_task.c b/src/plugins/sched/wiki2/job_release_task.c
index b0b825f87204cd4af8b176bbf06e632b43337a1a..e5f7fe78a522b1360452dadf94bcedc0be88d3e0 100644
--- a/src/plugins/sched/wiki2/job_release_task.c
+++ b/src/plugins/sched/wiki2/job_release_task.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/plugins/sched/wiki2/job_requeue.c b/src/plugins/sched/wiki2/job_requeue.c
index 539aa994244875d1cee6e9dc5fec5b6f3d0000f3..995dc23e0257a4a7e92ef7faa2c8ad70dd49459f 100644
--- a/src/plugins/sched/wiki2/job_requeue.c
+++ b/src/plugins/sched/wiki2/job_requeue.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -78,7 +78,7 @@ extern int job_requeue_wiki(char *cmd_ptr, int *err_code, char **err_msg)
}
/* We need to clear the required node list here.
- * If the job was submitted with srun and a
+ * If the job was submitted with srun and a
* required node list, it gets lost here. */
job_ptr = find_job_record(jobid);
if (job_ptr && job_ptr->details) {
diff --git a/src/plugins/sched/wiki2/job_signal.c b/src/plugins/sched/wiki2/job_signal.c
index fc12f41c57272b555aaf7ea17d2b8b4da189cd02..9586103691c3243ba2517344664c36d646915ba0 100644
--- a/src/plugins/sched/wiki2/job_signal.c
+++ b/src/plugins/sched/wiki2/job_signal.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -41,7 +41,7 @@
#include "src/slurmctld/locks.h"
#include "src/slurmctld/slurmctld.h"
-/* translate a signal value to the numeric value, sig_ptr value
+/* translate a signal value to the numeric value, sig_ptr value
* can have three different forms:
* 1. A number
* 2. SIGUSR1 (or other suffix)
@@ -158,7 +158,7 @@ extern int job_signal_wiki(char *cmd_ptr, int *err_code, char **err_msg)
if (slurm_rc != SLURM_SUCCESS) {
*err_code = -700;
*err_msg = slurm_strerror(slurm_rc);
- error("wiki: Failed to signal job %u: %s",
+ error("wiki: Failed to signal job %u: %s",
jobid, slurm_strerror(slurm_rc));
return -1;
}
diff --git a/src/plugins/sched/wiki2/job_will_run.c b/src/plugins/sched/wiki2/job_will_run.c
index 85e12fbbb4a0054b1bc9e75ea14b3c0f7e0262dd..62ad4fe6e39829df5fade6c489691b041ea8df83 100644
--- a/src/plugins/sched/wiki2/job_will_run.c
+++ b/src/plugins/sched/wiki2/job_will_run.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -49,20 +49,20 @@
#define MAX_JOB_QUEUE 20
static void _preempt_list_del(void *x);
-static char * _will_run_test(uint32_t jobid, time_t start_time,
+static char * _will_run_test(uint32_t jobid, time_t start_time,
char *node_list, int *err_code, char **err_msg);
-static char * _will_run_test2(uint32_t jobid, time_t start_time,
- char *node_list,
+static char * _will_run_test2(uint32_t jobid, time_t start_time,
+ char *node_list,
uint32_t *preemptee, int preemptee_cnt,
int *err_code, char **err_msg);
/*
* job_will_run - Determine if, when and where a priority ordered list of jobs
- * can be initiated with the currently running jobs as a
+ * can be initiated with the currently running jobs as a
* backgorund
* cmd_ptr IN - CMD=JOBWILLRUN ARG=JOBID=<JOBID>[@<TIME>],<AVAIL_NODES>
* err_code OUT - 0 on success or some error code
* err_msg OUT - error message if any of the specified jobs can not be started
- * at the specified time (if given) on the available nodes.
+ * at the specified time (if given) on the available nodes.
* Otherwise information on when and where the pending jobs
* will be initiated
* ARG=<JOBID>:<PROCS>@<TIME>,<USED_NODES>
@@ -109,7 +109,7 @@ extern int job_will_run(char *cmd_ptr, int *err_code, char **err_msg)
avail_nodes = tmp_char + 1;
lock_slurmctld(job_write_lock);
- buf = _will_run_test(jobid, start_time, avail_nodes,
+ buf = _will_run_test(jobid, start_time, avail_nodes,
err_code, err_msg);
unlock_slurmctld(job_write_lock);
@@ -124,7 +124,7 @@ extern int job_will_run(char *cmd_ptr, int *err_code, char **err_msg)
return 0;
}
-static char * _will_run_test(uint32_t jobid, time_t start_time,
+static char * _will_run_test(uint32_t jobid, time_t start_time,
char *node_list, int *err_code, char **err_msg)
{
struct job_record *job_ptr = NULL;
@@ -195,7 +195,7 @@ static char * _will_run_test(uint32_t jobid, time_t start_time,
else {
*err_code = -730;
*err_msg = "Job's partition has no nodes";
- error("wiki: no nodes in partition %s for job %u",
+ error("wiki: no nodes in partition %s for job %u",
part_ptr->name, jobid);
FREE_NULL_BITMAP(avail_bitmap);
return NULL;
@@ -206,7 +206,7 @@ static char * _will_run_test(uint32_t jobid, time_t start_time,
*err_code = -730;
*err_msg = "Job's required features not available "
"on selected nodes";
- error("wiki: job %u not runnable on hosts=%s",
+ error("wiki: job %u not runnable on hosts=%s",
jobid, node_list);
FREE_NULL_BITMAP(avail_bitmap);
return NULL;
@@ -217,11 +217,11 @@ static char * _will_run_test(uint32_t jobid, time_t start_time,
bit_not(job_ptr->details->exc_node_bitmap);
}
if ((job_ptr->details->req_node_bitmap) &&
- (!bit_super_set(job_ptr->details->req_node_bitmap,
+ (!bit_super_set(job_ptr->details->req_node_bitmap,
avail_bitmap))) {
*err_code = -730;
*err_msg = "Job's required nodes not available";
- error("wiki: job %u not runnable on hosts=%s",
+ error("wiki: job %u not runnable on hosts=%s",
jobid, node_list);
FREE_NULL_BITMAP(avail_bitmap);
return NULL;
@@ -231,7 +231,7 @@ static char * _will_run_test(uint32_t jobid, time_t start_time,
if (job_ptr->details->max_nodes == 0)
max_nodes = part_ptr->max_nodes;
else
- max_nodes = MIN(job_ptr->details->max_nodes,
+ max_nodes = MIN(job_ptr->details->max_nodes,
part_ptr->max_nodes);
max_nodes = MIN(max_nodes, 500000); /* prevent overflows */
if (job_ptr->details->max_nodes)
@@ -242,7 +242,7 @@ static char * _will_run_test(uint32_t jobid, time_t start_time,
/* job's min_nodes exceeds partitions max_nodes */
*err_code = -730;
*err_msg = "Job's min_nodes > max_nodes";
- error("wiki: job %u not runnable on hosts=%s",
+ error("wiki: job %u not runnable on hosts=%s",
jobid, node_list);
FREE_NULL_BITMAP(avail_bitmap);
return NULL;
@@ -251,9 +251,9 @@ static char * _will_run_test(uint32_t jobid, time_t start_time,
preemptee_candidates = slurm_find_preemptable_jobs(job_ptr);
orig_start_time = job_ptr->start_time;
- rc = select_g_job_test(job_ptr, avail_bitmap,
- min_nodes, max_nodes, req_nodes,
- SELECT_MODE_WILL_RUN,
+ rc = select_g_job_test(job_ptr, avail_bitmap,
+ min_nodes, max_nodes, req_nodes,
+ SELECT_MODE_WILL_RUN,
preemptee_candidates, NULL);
if (preemptee_candidates)
list_destroy(preemptee_candidates);
@@ -266,7 +266,7 @@ static char * _will_run_test(uint32_t jobid, time_t start_time,
xstrcat(reply_msg, "STARTINFO=");
#ifdef HAVE_BG
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_NODE_CNT,
+ SELECT_JOBDATA_NODE_CNT,
&proc_cnt);
#else
@@ -290,14 +290,14 @@ static char * _will_run_test(uint32_t jobid, time_t start_time,
}
/*
- * job_will_run2 - Determine if, when and where a pending job can be
+ * job_will_run2 - Determine if, when and where a pending job can be
* initiated with the currently running jobs either preempted
* or left running as on other resources
* cmd_ptr IN - CMD=JOBWILLRUN ARG=<JOBID> [STARTTIME=<TIME>]
* NODES=<AVAIL_NODES> [PREEMPT=<JOBID1>[,<JOBID2> ..]]
* err_code OUT - 0 on success or some error code
* err_msg OUT - error message if any of the specified jobs can not be started
- * at the specified time (if given) on the available nodes.
+ * at the specified time (if given) on the available nodes.
* Otherwise information on when and where the pending jobs
* will be initiated
* ARG=<JOBID> TASKS=<CPU_COUNT> STARTTIME=<TIME>
@@ -387,8 +387,8 @@ extern int job_will_run2(char *cmd_ptr, int *err_code, char **err_msg)
}
lock_slurmctld(job_write_lock);
- buf = _will_run_test2(jobid, start_time, avail_nodes,
- preemptee, preemptee_cnt,
+ buf = _will_run_test2(jobid, start_time, avail_nodes,
+ preemptee, preemptee_cnt,
err_code, err_msg);
unlock_slurmctld(job_write_lock);
@@ -405,8 +405,8 @@ extern int job_will_run2(char *cmd_ptr, int *err_code, char **err_msg)
return 0;
}
-static char * _will_run_test2(uint32_t jobid, time_t start_time,
- char *node_list,
+static char * _will_run_test2(uint32_t jobid, time_t start_time,
+ char *node_list,
uint32_t *preemptee, int preemptee_cnt,
int *err_code, char **err_msg)
{
@@ -477,7 +477,7 @@ static char * _will_run_test2(uint32_t jobid, time_t start_time,
else {
*err_code = -730;
*err_msg = "Job's partition has no nodes";
- error("wiki: no nodes in partition %s for job %u",
+ error("wiki: no nodes in partition %s for job %u",
part_ptr->name, jobid);
FREE_NULL_BITMAP(avail_bitmap);
return NULL;
@@ -488,7 +488,7 @@ static char * _will_run_test2(uint32_t jobid, time_t start_time,
*err_code = -730;
*err_msg = "Job's required features not available "
"on selected nodes";
- error("wiki: job %u not runnable on hosts=%s",
+ error("wiki: job %u not runnable on hosts=%s",
jobid, node_list);
FREE_NULL_BITMAP(avail_bitmap);
return NULL;
@@ -499,11 +499,11 @@ static char * _will_run_test2(uint32_t jobid, time_t start_time,
bit_not(job_ptr->details->exc_node_bitmap);
}
if ((job_ptr->details->req_node_bitmap) &&
- (!bit_super_set(job_ptr->details->req_node_bitmap,
+ (!bit_super_set(job_ptr->details->req_node_bitmap,
avail_bitmap))) {
*err_code = -730;
*err_msg = "Job's required nodes not available";
- error("wiki: job %u not runnable on hosts=%s",
+ error("wiki: job %u not runnable on hosts=%s",
jobid, node_list);
FREE_NULL_BITMAP(avail_bitmap);
return NULL;
@@ -513,7 +513,7 @@ static char * _will_run_test2(uint32_t jobid, time_t start_time,
if (job_ptr->details->max_nodes == 0)
max_nodes = part_ptr->max_nodes;
else
- max_nodes = MIN(job_ptr->details->max_nodes,
+ max_nodes = MIN(job_ptr->details->max_nodes,
part_ptr->max_nodes);
max_nodes = MIN(max_nodes, 500000); /* prevent overflows */
if (job_ptr->details->max_nodes)
@@ -524,7 +524,7 @@ static char * _will_run_test2(uint32_t jobid, time_t start_time,
/* job's min_nodes exceeds partitions max_nodes */
*err_code = -730;
*err_msg = "Job's min_nodes > max_nodes";
- error("wiki: job %u not runnable on hosts=%s",
+ error("wiki: job %u not runnable on hosts=%s",
jobid, node_list);
FREE_NULL_BITMAP(avail_bitmap);
return NULL;
@@ -535,7 +535,7 @@ static char * _will_run_test2(uint32_t jobid, time_t start_time,
for (i=0; i<preemptee_cnt; i++) {
pre_ptr = find_job_record(preemptee[i]);
if (pre_ptr) {
- pre_pptr = xmalloc(sizeof(struct
+ pre_pptr = xmalloc(sizeof(struct
job_record *));
pre_pptr[0] = pre_ptr;
list_append(preemptee_candidates, pre_pptr);
@@ -544,8 +544,8 @@ static char * _will_run_test2(uint32_t jobid, time_t start_time,
}
orig_start_time = job_ptr->start_time;
- rc = select_g_job_test(job_ptr, avail_bitmap, min_nodes, max_nodes,
- req_nodes, SELECT_MODE_WILL_RUN,
+ rc = select_g_job_test(job_ptr, avail_bitmap, min_nodes, max_nodes,
+ req_nodes, SELECT_MODE_WILL_RUN,
preemptee_candidates, &preempted_jobs);
if (preemptee_candidates)
list_destroy(preemptee_candidates);
@@ -555,12 +555,12 @@ static char * _will_run_test2(uint32_t jobid, time_t start_time,
uint32_t pre_cnt = 0, proc_cnt = 0;
#ifdef HAVE_BG
- select_g_select_jobinfo_get(job_ptr->select_jobinfo,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_NODE_CNT, &proc_cnt);
#else
proc_cnt = job_ptr->total_procs;
#endif
- snprintf(tmp_str, sizeof(tmp_str),
+ snprintf(tmp_str, sizeof(tmp_str),
"STARTINFO=%u TASKS=%u STARTTIME=%u NODES=",
job_ptr->job_id, proc_cnt,
(uint32_t) job_ptr->start_time);
@@ -575,7 +575,7 @@ static char * _will_run_test2(uint32_t jobid, time_t start_time,
sep = ",";
else
sep = " PREEMPT=";
- snprintf(tmp_str, sizeof(tmp_str), "%s%u",
+ snprintf(tmp_str, sizeof(tmp_str), "%s%u",
sep, pre_pptr[0]->job_id);
xstrcat(reply_msg, tmp_str);
xfree(pre_pptr);
@@ -600,12 +600,12 @@ static void _preempt_list_del(void *x)
}
/*
- * bitmap2wiki_node_name - given a bitmap, build a list of colon separated
- * node names (if we can't use node range expressions), or the
+ * bitmap2wiki_node_name - given a bitmap, build a list of colon separated
+ * node names (if we can't use node range expressions), or the
* normal slurm node name expression
*
* IN bitmap - bitmap pointer
- * RET pointer to node list or NULL on error
+ * RET pointer to node list or NULL on error
* globals: node_record_table_ptr - pointer to node table
* NOTE: the caller must xfree the returned pointer when no longer required
*/
@@ -616,7 +616,7 @@ extern char * bitmap2wiki_node_name(bitstr_t *bitmap)
if (use_host_exp)
return bitmap2node_name(bitmap);
-
+
if (bitmap == NULL)
return xstrdup("");
diff --git a/src/plugins/sched/wiki2/msg.c b/src/plugins/sched/wiki2/msg.c
index aa0855ae918bb3bc60eb21135ecf52ce25a02e5c..39ff39f23490a2469730e0464befaf7cb17b7e4b 100644
--- a/src/plugins/sched/wiki2/msg.c
+++ b/src/plugins/sched/wiki2/msg.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -47,7 +47,7 @@
#define _DEBUG 0
/* When a remote socket closes on AIX, we have seen poll() return EAGAIN
- * indefinitely for a pending write request. Rather than locking up
+ * indefinitely for a pending write request. Rather than locking up
* slurmctld's wiki interface, abort after MAX_RETRIES poll() failures. */
#define MAX_RETRIES 10
@@ -98,7 +98,7 @@ extern int spawn_msg_thread(void)
parse_wiki_config();
slurm_attr_init(&thread_attr_msg);
- if (pthread_create(&msg_thread_id, &thread_attr_msg,
+ if (pthread_create(&msg_thread_id, &thread_attr_msg,
_msg_thread, NULL))
fatal("pthread_create %m");
@@ -191,8 +191,8 @@ static void *_msg_thread(void *no_data)
close(new_fd);
break;
}
- /* It would be nice to create a pthread for each new
- * RPC, but that leaks memory on some systems when
+ /* It would be nice to create a pthread for each new
+ * RPC, but that leaks memory on some systems when
* done from a plugin.
* FIXME: Maintain a pool of pthreads and reuse them. */
err_code = 0;
@@ -241,7 +241,7 @@ static char * _get_wiki_conf_path(void)
/*****************************************************************************\
* parse_wiki_config - Results go into global variables
* RET SLURM_SUCCESS or error code
- *
+ *
* See "man wiki.conf" for details.
\*****************************************************************************/
extern int parse_wiki_config(void)
@@ -274,7 +274,7 @@ extern int parse_wiki_config(void)
if (conf->backup_addr) {
strncpy(e_host_bu, conf->backup_addr,
sizeof(e_host));
- }
+ }
kill_wait = conf->kill_wait;
first_job_id = conf->first_job_id;
slurm_conf_unlock();
@@ -307,7 +307,7 @@ extern int parse_wiki_config(void)
xfree(key);
}
s_p_get_uint16(&e_port, "EPort", tbl);
- s_p_get_uint16(&job_aggregation_time, "JobAggregationTime", tbl);
+ s_p_get_uint16(&job_aggregation_time, "JobAggregationTime", tbl);
if (s_p_get_string(&exclude_partitions, "ExcludePartitions", tbl)) {
char *tok = NULL, *tok_p = NULL;
@@ -318,7 +318,7 @@ extern int parse_wiki_config(void)
error("ExcludePartitions has too many entries "
"skipping %s and later entries");
break;
- }
+ }
exclude_part_ptr[i] = find_part_record(tok);
if (exclude_part_ptr[i])
i++;
@@ -337,7 +337,7 @@ extern int parse_wiki_config(void)
error("HidePartitionJobs has too many entries "
"skipping %s and later entries");
break;
- }
+ }
hide_part_ptr[i] = find_part_record(tok);
if (hide_part_ptr[i])
i++;
@@ -353,7 +353,7 @@ extern int parse_wiki_config(void)
else if (strcasecmp(priority_mode, "run") == 0)
init_prio_mode = PRIO_DECREMENT;
else
- error("Invalid value for JobPriority in wiki.conf");
+ error("Invalid value for JobPriority in wiki.conf");
xfree(priority_mode);
}
@@ -386,7 +386,7 @@ extern int parse_wiki_config(void)
}
/*
- * Return a string containing any scheduling plugin configuration information
+ * Return a string containing any scheduling plugin configuration information
* that we want to expose via "scontrol show configuration".
* NOTE: the caller must xfree the returned pointer
*/
@@ -446,7 +446,7 @@ static size_t _read_bytes(int fd, char *buf, size_t size)
continue;
if ((ufds.revents & POLLIN) == 0) /* some poll error */
break;
-
+
bytes_read = read(fd, ptr, bytes_remaining);
if (bytes_read <= 0)
break;
@@ -454,7 +454,7 @@ static size_t _read_bytes(int fd, char *buf, size_t size)
size += bytes_read;
ptr += bytes_read;
}
-
+
return size;
}
@@ -498,9 +498,9 @@ static size_t _write_bytes(int fd, char *buf, size_t size)
}
/*****************************************************************************\
- * Read a message (request) from specified file descriptor
+ * Read a message (request) from specified file descriptor
*
- * RET - The message which must be xfreed or
+ * RET - The message which must be xfreed or
* NULL on error
\*****************************************************************************/
static char * _recv_msg(slurm_fd new_fd)
@@ -539,7 +539,7 @@ static char * _recv_msg(slurm_fd new_fd)
}
/*****************************************************************************\
- * Send a message (response) to specified file descriptor
+ * Send a message (response) to specified file descriptor
*
* RET - Number of data bytes written (excludes header)
\*****************************************************************************/
@@ -581,7 +581,7 @@ static int _parse_msg(char *msg, char **req)
char *cmd_ptr = strstr(msg, "CMD=");
time_t ts, now = time(NULL);
uint32_t delta_t;
-
+
if ((auth_key[0] == '\0') && cmd_ptr) {
/* No authentication required */
*req = cmd_ptr;
@@ -608,7 +608,7 @@ static int _parse_msg(char *msg, char **req)
error("wiki: request lacks TS=");
return -1;
}
- ts = strtoul((ts_ptr+3), NULL, 10);
+ ts = strtoul((ts_ptr+3), NULL, 10);
if (ts < now)
delta_t = (uint32_t) difftime(now, ts);
else
@@ -616,7 +616,7 @@ static int _parse_msg(char *msg, char **req)
if (delta_t > 300) {
err_code = -350;
err_msg = "TS value too far from NOW";
- error("wiki: TimeStamp too far from NOW (%u secs)",
+ error("wiki: TimeStamp too far from NOW (%u secs)",
delta_t);
return -1;
}
@@ -662,7 +662,7 @@ static void _proc_msg(slurm_fd new_fd, char *msg)
cmd_ptr = strstr(req, "CMD=");
if (cmd_ptr == NULL) {
err_code = -300;
- err_msg = "request lacks CMD";
+ err_msg = "request lacks CMD";
error("wiki: request lacks CMD");
goto resp_msg;
}
@@ -757,7 +757,7 @@ static void _send_reply(slurm_fd new_fd, char *response)
xfree(tmp);
}
- snprintf(buf, i, "CK=dummy67890123456 TS=%u AUTH=%s DT=%s",
+ snprintf(buf, i, "CK=dummy67890123456 TS=%u AUTH=%s DT=%s",
(uint32_t) time(NULL), uname, response);
checksum(sum, auth_key, (buf+20)); /* overwrite "CK=dummy..." above */
memcpy(buf, sum, 19);
diff --git a/src/plugins/sched/wiki2/msg.h b/src/plugins/sched/wiki2/msg.h
index 508044a7422c646c2e75d2fb1db88478aa15efa4..d5261f2535ba45637b9da31f1752207890ce201f 100644
--- a/src/plugins/sched/wiki2/msg.h
+++ b/src/plugins/sched/wiki2/msg.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -39,12 +39,12 @@
/*
* Two modes of operation are currently supported for job prioritization:
*
- * PRIO_HOLD: Wiki is a polling scheduler, so the initial priority is always
- * zero to keep SLURM from spontaneously starting the job. The scheduler will
- * suggest which job's priority should be made non-zero and thus allowed to
+ * PRIO_HOLD: Wiki is a polling scheduler, so the initial priority is always
+ * zero to keep SLURM from spontaneously starting the job. The scheduler will
+ * suggest which job's priority should be made non-zero and thus allowed to
* proceed.
*
- * PRIO_DECREMENT: Set the job priority to one less than the last job and let
+ * PRIO_DECREMENT: Set the job priority to one less than the last job and let
* Wiki change priorities of jobs as desired to re-order the queue
*/
@@ -104,12 +104,12 @@ extern uint16_t kill_wait;
extern uint16_t use_host_exp;
/*
- * bitmap2wiki_node_name - given a bitmap, build a list of colon separated
- * node names (if we can't use node range expressions), or the
+ * bitmap2wiki_node_name - given a bitmap, build a list of colon separated
+ * node names (if we can't use node range expressions), or the
* normal slurm node name expression
*
* IN bitmap - bitmap pointer
- * RET pointer to node list or NULL on error
+ * RET pointer to node list or NULL on error
* globals: node_record_table_ptr - pointer to node table
* NOTE: the caller must xfree the returned pointer when no longer required
*/
@@ -136,7 +136,7 @@ extern int spawn_msg_thread(void);
extern void term_msg_thread(void);
/*
- * Return a string containing any scheduling plugin configuration information
+ * Return a string containing any scheduling plugin configuration information
* that we want to expose via "scontrol show configuration".
* NOTE: the caller must xfree the returned pointer
*/
@@ -149,7 +149,7 @@ extern void null_term(char *str);
/*
- * Functions called from within msg.c (rather than creating a bunch
+ * Functions called from within msg.c (rather than creating a bunch
* more header files with one function definition each)
*/
extern int cancel_job(char *cmd_ptr, int *err_code, char **err_msg);
diff --git a/src/plugins/sched/wiki2/resume_job.c b/src/plugins/sched/wiki2/resume_job.c
index 6b0f79b0f992fa0821fc6c57fce79c69755b606a..ea83de64f4c0cf648a98c0a6db063e4c53c63dc2 100644
--- a/src/plugins/sched/wiki2/resume_job.c
+++ b/src/plugins/sched/wiki2/resume_job.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/plugins/sched/wiki2/sched_wiki.c b/src/plugins/sched/wiki2/sched_wiki.c
index 5f8f6fa305d51587b3d13f419e840a0fbfa24d04..f73b7d5e809130de06e6fd3bff27635057326c56 100644
--- a/src/plugins/sched/wiki2/sched_wiki.c
+++ b/src/plugins/sched/wiki2/sched_wiki.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -96,10 +96,10 @@ extern int slurm_sched_plugin_freealloc( struct job_record *job_ptr )
/**************************************************************************/
-/* TAG( slurm_sched_plugin_initial_priority ) */
+/* TAG( slurm_sched_plugin_initial_priority ) */
/**************************************************************************/
-extern uint32_t
-slurm_sched_plugin_initial_priority( uint32_t last_prio,
+extern uint32_t
+slurm_sched_plugin_initial_priority( uint32_t last_prio,
struct job_record *job_ptr )
{
(void) event_notify(1234, "Job submit");
@@ -113,7 +113,7 @@ slurm_sched_plugin_initial_priority( uint32_t last_prio,
if (exclude_part_ptr[i] == NULL)
break;
if (exclude_part_ptr[i] == job_ptr->part_ptr) {
- debug("Scheduiling job %u directly (no Moab)",
+ debug("Scheduiling job %u directly (no Moab)",
job_ptr->job_id);
return (exclude_prio--);
}
@@ -121,9 +121,9 @@ slurm_sched_plugin_initial_priority( uint32_t last_prio,
return 0;
}
- if (init_prio_mode == PRIO_DECREMENT)
+ if (init_prio_mode == PRIO_DECREMENT)
return priority_g_set(last_prio, job_ptr);
-
+
return 0;
}
diff --git a/src/plugins/sched/wiki2/start_job.c b/src/plugins/sched/wiki2/start_job.c
index 67ff755102f810a03b73712f9b01c527bddf083c..352eb3273560548616b867c756684cf8740bba71 100644
--- a/src/plugins/sched/wiki2/start_job.c
+++ b/src/plugins/sched/wiki2/start_job.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -45,8 +45,8 @@
#include "src/slurmctld/slurmctld.h"
#include "src/slurmctld/state_save.h"
-static int _start_job(uint32_t jobid, int task_cnt, char *hostlist,
- char *tasklist, char *comment_ptr,
+static int _start_job(uint32_t jobid, int task_cnt, char *hostlist,
+ char *tasklist, char *comment_ptr,
int *err_code, char **err_msg);
/* Start a job:
@@ -153,7 +153,7 @@ extern int start_job(char *cmd_ptr, int *err_code, char **err_msg)
err_code, err_msg);
xfree(tasklist);
if (rc == 0) {
- snprintf(reply_msg, sizeof(reply_msg),
+ snprintf(reply_msg, sizeof(reply_msg),
"job %u started successfully", jobid);
*err_msg = reply_msg;
}
@@ -171,8 +171,8 @@ extern int start_job(char *cmd_ptr, int *err_code, char **err_msg)
* err_code (OUT) - Moab error code
* err_msg (OUT) - Moab error message
*/
-static int _start_job(uint32_t jobid, int task_cnt, char *hostlist,
- char *tasklist, char *comment_ptr,
+static int _start_job(uint32_t jobid, int task_cnt, char *hostlist,
+ char *tasklist, char *comment_ptr,
int *err_code, char **err_msg)
{
int rc = 0, old_task_cnt = 1;
@@ -303,7 +303,7 @@ static int _start_job(uint32_t jobid, int task_cnt, char *hostlist,
save_req_bitmap = job_ptr->details->req_node_bitmap;
job_ptr->details->req_node_bitmap = new_bitmap;
old_task_cnt = job_ptr->num_procs;
- job_ptr->num_procs = MAX(task_cnt, old_task_cnt);
+ job_ptr->num_procs = MAX(task_cnt, old_task_cnt);
job_ptr->priority = 100000000;
fini: unlock_slurmctld(job_write_lock);
@@ -318,7 +318,7 @@ static int _start_job(uint32_t jobid, int task_cnt, char *hostlist,
if (job_ptr->job_id != jobid)
job_ptr = find_job_record(jobid);
- if (job_ptr && (job_ptr->job_id == jobid) &&
+ if (job_ptr && (job_ptr->job_id == jobid) &&
(!IS_JOB_RUNNING(job_ptr))) {
uint16_t wait_reason = 0;
char *wait_string;
diff --git a/src/plugins/sched/wiki2/suspend_job.c b/src/plugins/sched/wiki2/suspend_job.c
index 6e6ad9796b872214627dde7ac4e2434c7c6b55f9..9d50dc6a6d3952ceb94d9265691039e3930b9e9e 100644
--- a/src/plugins/sched/wiki2/suspend_job.c
+++ b/src/plugins/sched/wiki2/suspend_job.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/plugins/select/bluegene/block_allocator/Makefile.am b/src/plugins/select/bluegene/block_allocator/Makefile.am
index 5f74086f7bbd596e9fe8b3a6181c6f2c95685665..3a1bf6708eab00b340ec8610d5ba3f7d4c1b894a 100644
--- a/src/plugins/select/bluegene/block_allocator/Makefile.am
+++ b/src/plugins/select/bluegene/block_allocator/Makefile.am
@@ -7,12 +7,12 @@ INCLUDES = -I$(top_srcdir) $(BG_INCLUDES)
# making a .la
-noinst_LTLIBRARIES = libbluegene_block_allocator.la
+noinst_LTLIBRARIES = libbluegene_block_allocator.la
libbluegene_block_allocator_la_SOURCES = \
block_allocator.c bridge_linker.c block_allocator.h bridge_linker.h
libbluegene_block_allocator_la_LDFLAGS = \
- $(LIB_LDFLAGS) -lm
+ $(LIB_LDFLAGS) -lm
if BLUEGENE_LOADED
diff --git a/src/plugins/select/bluegene/block_allocator/Makefile.in b/src/plugins/select/bluegene/block_allocator/Makefile.in
index a16f4469840dc3b14063110515c97b5128f21d87..e095cc2f423a560403a5bf5e866da4d21e0bf2b6 100644
--- a/src/plugins/select/bluegene/block_allocator/Makefile.in
+++ b/src/plugins/select/bluegene/block_allocator/Makefile.in
@@ -307,12 +307,12 @@ CLEANFILES = core.*
INCLUDES = -I$(top_srcdir) $(BG_INCLUDES)
# making a .la
-noinst_LTLIBRARIES = libbluegene_block_allocator.la
+noinst_LTLIBRARIES = libbluegene_block_allocator.la
libbluegene_block_allocator_la_SOURCES = \
block_allocator.c bridge_linker.c block_allocator.h bridge_linker.h
libbluegene_block_allocator_la_LDFLAGS = \
- $(LIB_LDFLAGS) -lm
+ $(LIB_LDFLAGS) -lm
@BLUEGENE_LOADED_TRUE@wire_testSOURCES = wire_test.c block_allocator.h
@BLUEGENE_LOADED_TRUE@wire_test_LDADD = libbluegene_block_allocator.la \
diff --git a/src/plugins/select/bluegene/block_allocator/block_allocator.c b/src/plugins/select/bluegene/block_allocator/block_allocator.c
index a4ba6ab5946f915f579b03bc91e28ce24a0cd5e5..d701b069688f145d1268e74643ef2f9fd173887c 100644
--- a/src/plugins/select/bluegene/block_allocator/block_allocator.c
+++ b/src/plugins/select/bluegene/block_allocator/block_allocator.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * block_allocator.c - Assorted functions for layout of bluegene blocks,
+ * block_allocator.c - Assorted functions for layout of bluegene blocks,
* wiring, mapping for smap, etc.
* $Id$
*****************************************************************************
@@ -7,32 +7,32 @@
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Dan Phung <phung4@llnl.gov>, Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -82,10 +82,10 @@ int REAL_DIM_SIZE[BA_SYSTEM_DIMENSIONS] = {0};
s_p_options_t bg_conf_file_options[] = {
#ifdef HAVE_BGL
- {"BlrtsImage", S_P_STRING},
+ {"BlrtsImage", S_P_STRING},
{"LinuxImage", S_P_STRING},
{"RamDiskImage", S_P_STRING},
- {"AltBlrtsImage", S_P_ARRAY, parse_image, NULL},
+ {"AltBlrtsImage", S_P_ARRAY, parse_image, NULL},
{"AltLinuxImage", S_P_ARRAY, parse_image, NULL},
{"AltRamDiskImage", S_P_ARRAY, parse_image, NULL},
#else
@@ -131,16 +131,16 @@ static int _check_for_options(ba_request_t* ba_request);
static int _append_geo(int *geo, List geos, int rotate);
/* */
-static int _fill_in_coords(List results, List start_list,
+static int _fill_in_coords(List results, List start_list,
int *geometry, int conn_type);
/* */
static int _copy_the_path(List nodes, ba_switch_t *curr_switch,
- ba_switch_t *mark_switch,
+ ba_switch_t *mark_switch,
int source, int dim);
/* */
-static int _find_yz_path(ba_node_t *ba_node, int *first,
+static int _find_yz_path(ba_node_t *ba_node, int *first,
int *geometry, int conn_type);
#endif /* HAVE_BG */
@@ -158,7 +158,7 @@ static int _emulate_ext_wiring(ba_node_t *grid);
static void _new_ba_node(ba_node_t *ba_node, int *coord,
bool track_down_nodes);
/** */
-static int _reset_the_path(ba_switch_t *curr_switch, int source,
+static int _reset_the_path(ba_switch_t *curr_switch, int source,
int target, int dim);
/** */
static void _create_ba_system(void);
@@ -174,11 +174,11 @@ static int _find_match(ba_request_t* ba_request, List results);
static bool _node_used(ba_node_t* ba_node, int x_size);
/* */
-static void _switch_config(ba_node_t* source, ba_node_t* target, int dim,
+static void _switch_config(ba_node_t* source, ba_node_t* target, int dim,
int port_src, int port_tar);
/* */
-static int _set_external_wires(int dim, int count, ba_node_t* source,
+static int _set_external_wires(int dim, int count, ba_node_t* source,
ba_node_t* target);
/* */
@@ -186,24 +186,24 @@ static char *_set_internal_wires(List nodes, int size, int conn_type);
/* */
static int _find_x_path(List results, ba_node_t *ba_node, int *start,
- int x_size, int found, int conn_type,
+ int x_size, int found, int conn_type,
block_algo_t algo);
/* */
static int _remove_node(List results, int *node_tar);
/* */
-static int _find_next_free_using_port_2(ba_switch_t *curr_switch,
- int source_port,
- List nodes, int dim,
+static int _find_next_free_using_port_2(ba_switch_t *curr_switch,
+ int source_port,
+ List nodes, int dim,
int count);
/* */
/* static int _find_passthrough(ba_switch_t *curr_switch, int source_port, */
/* List nodes, int dim, */
/* int count, int highest_phys_x); */
/* */
-static int _finish_torus(List results,
- ba_switch_t *curr_switch, int source_port,
+static int _finish_torus(List results,
+ ba_switch_t *curr_switch, int source_port,
int dim, int count, int *start);
/* */
static int *_set_best_path();
@@ -231,13 +231,13 @@ extern char *ba_passthroughs_string(uint16_t passthrough)
else
xstrcat(pass, "Z");
}
-
+
return pass;
}
extern int parse_blockreq(void **dest, slurm_parser_enum_t type,
- const char *key, const char *value,
+ const char *key, const char *value,
const char *line, char **leftover)
{
s_p_options_t block_options[] = {
@@ -286,7 +286,7 @@ extern int parse_blockreq(void **dest, slurm_parser_enum_t type,
s_p_get_string(&n->ramdiskimage, "IoloadImage", tbl);
#endif
s_p_get_string(&n->mloaderimage, "MloaderImage", tbl);
-
+
s_p_get_string(&tmp, "Type", tbl);
if (!tmp || !strcasecmp(tmp,"TORUS"))
n->conn_type = SELECT_TORUS;
@@ -295,7 +295,7 @@ extern int parse_blockreq(void **dest, slurm_parser_enum_t type,
else
n->conn_type = SELECT_SMALL;
xfree(tmp);
-
+
if (!s_p_get_uint16(&n->small32, "32CNBlocks", tbl)) {
#ifdef HAVE_BGL
s_p_get_uint16(&n->small32, "Nodecards", tbl);
@@ -339,7 +339,7 @@ extern void destroy_blockreq(void *ptr)
}
extern int parse_image(void **dest, slurm_parser_enum_t type,
- const char *key, const char *value,
+ const char *key, const char *value,
const char *line, char **leftover)
{
s_p_options_t image_options[] = {
@@ -354,7 +354,7 @@ extern int parse_image(void **dest, slurm_parser_enum_t type,
tbl = s_p_hashtbl_create(image_options);
s_p_parse_line(tbl, *leftover, leftover);
-
+
n = xmalloc(sizeof(image_t));
n->name = xstrdup(value);
n->def = false;
@@ -375,7 +375,7 @@ extern int parse_image(void **dest, slurm_parser_enum_t type,
list_append(n->groups, image_group);
j=i;
j++;
- }
+ }
}
if(j != i) {
image_group = xmalloc(sizeof(image_group_t));
@@ -384,7 +384,7 @@ extern int parse_image(void **dest, slurm_parser_enum_t type,
if (gid_from_string (image_group->name,
&image_group->gid) < 0)
fatal("Invalid bluegene.conf parameter "
- "Groups=%s",
+ "Groups=%s",
image_group->name);
else
debug3("adding group %s %d", image_group->name,
@@ -433,10 +433,10 @@ extern void destroy_ba_node(void *ptr)
* create a block request. Note that if the geometry is given,
* then size is ignored. If elongate is true, the algorithm will try
* to fit that a block of cubic shape and then it will try other
- * elongated geometries. (ie, 2x2x2 -> 4x2x1 -> 8x1x1).
- *
- * IN/OUT - ba_request: structure to allocate and fill in.
- *
+ * elongated geometries. (ie, 2x2x2 -> 4x2x1 -> 8x1x1).
+ *
+ * IN/OUT - ba_request: structure to allocate and fill in.
+ *
* ALL below IN's need to be set within the ba_request before the call
* if you want them to be used.
* ALL below OUT's are set and returned within the ba_request.
@@ -481,23 +481,23 @@ extern int new_ba_request(ba_request_t* ba_request)
geo[X] = ba_request->geometry[X];
geo[Y] = ba_request->geometry[Y];
geo[Z] = ba_request->geometry[Z];
- if(ba_request->deny_pass == (uint16_t)NO_VAL)
+ if(ba_request->deny_pass == (uint16_t)NO_VAL)
ba_request->deny_pass = ba_deny_pass;
-
+
deny_pass = &ba_request->deny_pass;
-
- if(geo[X] != (uint16_t)NO_VAL) {
+
+ if(geo[X] != (uint16_t)NO_VAL) {
for (i=0; i<BA_SYSTEM_DIMENSIONS; i++){
- if ((geo[i] < 1)
+ if ((geo[i] < 1)
|| (geo[i] > DIM_SIZE[i])){
error("new_ba_request Error, "
"request geometry is invalid %d can't be "
- "%d, DIMS are %c%c%c",
+ "%d, DIMS are %c%c%c",
i,
geo[i],
alpha_num[DIM_SIZE[X]],
alpha_num[DIM_SIZE[Y]],
- alpha_num[DIM_SIZE[Z]]);
+ alpha_num[DIM_SIZE[Z]]);
return 0;
}
}
@@ -508,35 +508,35 @@ extern int new_ba_request(ba_request_t* ba_request)
ba_request->size = sz;
sz=0;
}
-
+
if(ba_request->elongate || sz) {
sz=1;
/* decompose the size into a cubic geometry */
ba_request->rotate= 1;
- ba_request->elongate = 1;
-
- for (i=0; i<BA_SYSTEM_DIMENSIONS; i++) {
+ ba_request->elongate = 1;
+
+ for (i=0; i<BA_SYSTEM_DIMENSIONS; i++) {
total_sz *= DIM_SIZE[i];
geo[i] = 1;
}
-
+
if(ba_request->size==1) {
- _append_geo(geo,
+ _append_geo(geo,
ba_request->elongate_geos,
ba_request->rotate);
goto endit;
}
-
+
if(ba_request->size<=DIM_SIZE[Y]) {
geo[X] = 1;
geo[Y] = ba_request->size;
geo[Z] = 1;
sz=ba_request->size;
- _append_geo(geo,
- ba_request->elongate_geos,
+ _append_geo(geo,
+ ba_request->elongate_geos,
ba_request->rotate);
}
-
+
i = ba_request->size/4;
if(!(ba_request->size%2)
&& i <= DIM_SIZE[Y]
@@ -550,9 +550,9 @@ extern int new_ba_request(ba_request_t* ba_request)
ba_request->elongate_geos,
ba_request->rotate);
}
-
+
if(ba_request->size > total_sz || ba_request->size < 1) {
- return 0;
+ return 0;
}
sz = ba_request->size % (DIM_SIZE[Y] * DIM_SIZE[Z]);
if(!sz) {
@@ -571,59 +571,59 @@ extern int new_ba_request(ba_request_t* ba_request)
"while I am trying to request %d midplanes",
__LINE__, geo[X], geo[Y], geo[Z],
ba_request->size);
- }
-// startagain:
+ }
+// startagain:
picked=0;
for(i=0; i<DIM_SIZE[X]; i++)
checked[i]=0;
-
+
for (i=0; i<BA_SYSTEM_DIMENSIONS; i++) {
total_sz *= DIM_SIZE[i];
geo[i] = 1;
}
-
+
sz = 1;
picked=0;
- tryagain:
+ tryagain:
size2 = ba_request->size;
//messedup:
- for (i=picked; i<BA_SYSTEM_DIMENSIONS; i++) {
- if(size2 <= 1)
+ for (i=picked; i<BA_SYSTEM_DIMENSIONS; i++) {
+ if(size2 <= 1)
break;
-
+
sz = size2 % DIM_SIZE[i];
if(!sz) {
- geo[i] = DIM_SIZE[i];
+ geo[i] = DIM_SIZE[i];
size2 /= DIM_SIZE[i];
} else if (size2 > DIM_SIZE[i]) {
for(i2=(DIM_SIZE[i]-1); i2 > 1; i2--) {
- /* go through each number to see if
- the size is divisable by a smaller
- number that is
+ /* go through each number to see if
+ the size is divisable by a smaller
+ number that is
good in the other dims. */
if (!(size2%i2) && !checked[i2]) {
size2 /= i2;
-
+
if(i==0)
checked[i2]=1;
-
+
if(i2<DIM_SIZE[i]) {
geo[i] = i2;
} else {
goto tryagain;
}
- if((i2-1)!=1 &&
+ if((i2-1)!=1 &&
i!=(BA_SYSTEM_DIMENSIONS-1))
break;
- }
- }
+ }
+ }
/* This size can not be made into a
block return. If you want to try
until we find the next largest block
uncomment the code below and the goto
above. If a user specifies a max
node count the job will never
- run.
+ run.
*/
if(i2==1) {
if(!list_count(
@@ -636,28 +636,28 @@ extern int new_ba_request(ba_request_t* ba_request)
/* goto startagain; */
}
} else {
- geo[i] = sz;
+ geo[i] = sz;
break;
- }
+ }
}
if((geo[X]*geo[Y]) <= DIM_SIZE[Y]) {
ba_request->geometry[X] = 1;
ba_request->geometry[Y] = geo[X] * geo[Y];
ba_request->geometry[Z] = geo[Z];
- _append_geo(ba_request->geometry,
- ba_request->elongate_geos,
+ _append_geo(ba_request->geometry,
+ ba_request->elongate_geos,
ba_request->rotate);
}
if((geo[X]*geo[Z]) <= DIM_SIZE[Y]) {
ba_request->geometry[X] = 1;
ba_request->geometry[Y] = geo[Y];
- ba_request->geometry[Z] = geo[X] * geo[Z];
- _append_geo(ba_request->geometry,
- ba_request->elongate_geos,
- ba_request->rotate);
-
+ ba_request->geometry[Z] = geo[X] * geo[Z];
+ _append_geo(ba_request->geometry,
+ ba_request->elongate_geos,
+ ba_request->rotate);
+
}
/* Make sure geo[X] is even and then see if we can get
@@ -666,7 +666,7 @@ extern int new_ba_request(ba_request_t* ba_request)
if(geo[Y] == 1) {
ba_request->geometry[Y] = geo[X]/2;
messed_with = 1;
- } else
+ } else
ba_request->geometry[Y] = geo[Y];
if(!messed_with && geo[Z] == 1) {
messed_with = 1;
@@ -676,13 +676,13 @@ extern int new_ba_request(ba_request_t* ba_request)
if(messed_with) {
messed_with = 0;
ba_request->geometry[X] = 2;
- _append_geo(ba_request->geometry,
- ba_request->elongate_geos,
+ _append_geo(ba_request->geometry,
+ ba_request->elongate_geos,
ba_request->rotate);
}
}
if(geo[X] == DIM_SIZE[X]
- && (geo[Y] < DIM_SIZE[Y]
+ && (geo[Y] < DIM_SIZE[Y]
|| geo[Z] < DIM_SIZE[Z])) {
if(DIM_SIZE[Y]<DIM_SIZE[Z]) {
i = DIM_SIZE[Y];
@@ -709,27 +709,27 @@ extern int new_ba_request(ba_request_t* ba_request)
ba_request->geometry[X]++;
messed_with = 1;
break;
- }
- }
+ }
+ }
if(messed_with) {
messed_with = 0;
- _append_geo(ba_request->geometry,
- ba_request->elongate_geos,
+ _append_geo(ba_request->geometry,
+ ba_request->elongate_geos,
ba_request->rotate);
}
}
-
+
if((geo[X]*geo[Y]*geo[Z]) == ba_request->size)
- _append_geo(geo,
- ba_request->elongate_geos,
+ _append_geo(geo,
+ ba_request->elongate_geos,
ba_request->rotate);
else
error("%d I was just trying to add a geo of %d%d%d "
"while I am trying to request %d midplanes",
__LINE__, geo[X], geo[Y], geo[Z],
ba_request->size);
-
- /* see if We can find a cube or square root of the
+
+ /* see if We can find a cube or square root of the
size to make an easy cube */
for(i=0;i<BA_SYSTEM_DIMENSIONS-1;i++) {
sz = powf((float)ba_request->size,
@@ -737,22 +737,22 @@ extern int new_ba_request(ba_request_t* ba_request)
if(pow(sz,(BA_SYSTEM_DIMENSIONS-i))==ba_request->size)
break;
}
-
+
if(i<BA_SYSTEM_DIMENSIONS-1) {
/* we found something that looks like a cube! */
i3=i;
- for (i=0; i<i3; i++)
- geo[i] = 1;
-
- for (i=i3; i<BA_SYSTEM_DIMENSIONS; i++)
- if(sz<=DIM_SIZE[i])
- geo[i] = sz;
+ for (i=0; i<i3; i++)
+ geo[i] = 1;
+
+ for (i=i3; i<BA_SYSTEM_DIMENSIONS; i++)
+ if(sz<=DIM_SIZE[i])
+ geo[i] = sz;
else
goto endit;
-
+
if((geo[X]*geo[Y]*geo[Z]) == ba_request->size)
- _append_geo(geo,
- ba_request->elongate_geos,
+ _append_geo(geo,
+ ba_request->elongate_geos,
ba_request->rotate);
else
error("%d I was just trying to add "
@@ -760,10 +760,10 @@ extern int new_ba_request(ba_request_t* ba_request)
"while I am trying to request "
"%d midplanes",
__LINE__, geo[X], geo[Y], geo[Z],
- ba_request->size);
- }
+ ba_request->size);
+ }
}
-
+
endit:
if(!(geo_ptr = list_peek(ba_request->elongate_geos)))
return 0;
@@ -776,39 +776,39 @@ endit:
for (i=0; i<BA_SYSTEM_DIMENSIONS; i++)
sz *= ba_request->geometry[i];
ba_request->size = sz;
-
+
#else
int geo[BA_SYSTEM_DIMENSIONS] = {0};
-
+
ba_request->rotate_count= 0;
ba_request->elongate_count = 0;
ba_request->elongate_geos = list_create(_destroy_geo);
geo[X] = ba_request->geometry[X];
-
- if(geo[X] != NO_VAL) {
+
+ if(geo[X] != NO_VAL) {
for (i=0; i<BA_SYSTEM_DIMENSIONS; i++){
- if ((geo[i] < 1)
+ if ((geo[i] < 1)
|| (geo[i] > DIM_SIZE[i])){
error("new_ba_request Error, "
- "request geometry is invalid %d",
- geo[i]);
+ "request geometry is invalid %d",
+ geo[i]);
return 0;
}
}
-
+
ba_request->size = ba_request->geometry[X];
} else if (ba_request->size) {
ba_request->geometry[X] = ba_request->size;
} else
return 0;
-
+
#endif
return 1;
}
/**
- * delete a block request
+ * delete a block request
*/
extern void delete_ba_request(void *arg)
{
@@ -823,13 +823,13 @@ extern void delete_ba_request(void *arg)
xfree(ba_request->linuximage);
xfree(ba_request->mloaderimage);
xfree(ba_request->ramdiskimage);
-
+
xfree(ba_request);
}
}
/**
- * print a block request
+ * print a block request
*/
extern void print_ba_request(ba_request_t* ba_request)
{
@@ -862,10 +862,10 @@ extern int empty_null_destroy_list(void *arg, void *key)
/**
* Initialize internal structures by either reading previous block
* configurations from a file or by running the graph solver.
- *
- * IN: node_info_msg_t * can be null,
+ *
+ * IN: node_info_msg_t * can be null,
* should be from slurm_load_node().
- *
+ *
* return: void.
*/
extern void ba_init(node_info_msg_t *node_info_ptr, bool sanity_check)
@@ -880,22 +880,22 @@ extern void ba_init(node_info_msg_t *node_info_ptr, bool sanity_check)
slurm_conf_node_t *node = NULL, **ptr_array;
int count, number;
int end[BA_SYSTEM_DIMENSIONS];
-
+
#ifdef HAVE_BG_FILES
rm_size3D_t bp_size;
int rc = 0;
#endif /* HAVE_BG_FILES */
-
+
#endif /* HAVE_3D */
/* We only need to initialize once, so return if already done so. */
if (_initialized){
return;
}
-
+
#ifdef HAVE_BG_FILES
bridge_init();
-#endif
+#endif
/* make the letters array only contain letters upper and lower
* (62) */
y = 'A';
@@ -914,25 +914,25 @@ extern void ba_init(node_info_msg_t *node_info_ptr, bool sanity_check)
for (x = 0; x < 6; x++) {
if(z == 4)
z++;
- colors[x] = z;
+ colors[x] = z;
z++;
}
-
+
best_count=BEST_COUNT_INIT;
if(ba_system_ptr)
_delete_ba_system();
-
+
ba_system_ptr = (ba_system_t *) xmalloc(sizeof(ba_system_t));
-
+
ba_system_ptr->num_of_proc = 0;
-
+
if(node_info_ptr!=NULL) {
#ifdef HAVE_3D
for (i = 0; i < node_info_ptr->record_count; i++) {
node_ptr = &node_info_ptr->node_array[i];
start = 0;
-
+
if(!node_ptr->name) {
DIM_SIZE[X] = 0;
DIM_SIZE[Y] = 0;
@@ -943,17 +943,17 @@ extern void ba_init(node_info_msg_t *node_info_ptr, bool sanity_check)
numeric = node_ptr->name;
while (numeric) {
if (numeric[0] < '0' || numeric[0] > 'Z'
- || (numeric[0] > '9'
+ || (numeric[0] > '9'
&& numeric[0] < 'A')) {
numeric++;
continue;
}
- start = xstrntol(numeric, NULL,
+ start = xstrntol(numeric, NULL,
BA_SYSTEM_DIMENSIONS,
HOSTLIST_BASE);
break;
}
-
+
temp = start / (HOSTLIST_BASE * HOSTLIST_BASE);
if (DIM_SIZE[X] < temp)
DIM_SIZE[X] = temp;
@@ -976,7 +976,7 @@ extern void ba_init(node_info_msg_t *node_info_ptr, bool sanity_check)
DIM_SIZE[X] = node_info_ptr->record_count;
#endif
ba_system_ptr->num_of_proc = node_info_ptr->record_count;
- }
+ }
#ifdef HAVE_3D
node_info_error:
@@ -985,14 +985,14 @@ node_info_error:
count = slurm_conf_nodename_array(&ptr_array);
if (count == 0)
fatal("No NodeName information available!");
-
+
for (i = 0; i < count; i++) {
node = ptr_array[i];
j = 0;
while (node->nodenames[j] != '\0') {
if ((node->nodenames[j] == '['
|| node->nodenames[j] == ',')
- && (node->nodenames[j+8] == ']'
+ && (node->nodenames[j+8] == ']'
|| node->nodenames[j+8] == ',')
&& (node->nodenames[j+4] == 'x'
|| node->nodenames[j+4] == '-')) {
@@ -1012,10 +1012,10 @@ node_info_error:
number = xstrntol(node->nodenames + j,
NULL, BA_SYSTEM_DIMENSIONS,
HOSTLIST_BASE);
-
- end[X] = number
+
+ end[X] = number
/ (HOSTLIST_BASE * HOSTLIST_BASE);
- end[Y] = (number
+ end[Y] = (number
% (HOSTLIST_BASE * HOSTLIST_BASE))
/ HOSTLIST_BASE;
end[Z] = (number % HOSTLIST_BASE);
@@ -1027,9 +1027,9 @@ node_info_error:
if(node->nodenames[j] != ',')
break;
- }
+ }
}
- if ((DIM_SIZE[X]==0) && (DIM_SIZE[Y]==0) && (DIM_SIZE[Z]==0))
+ if ((DIM_SIZE[X]==0) && (DIM_SIZE[Y]==0) && (DIM_SIZE[Z]==0))
info("are you sure you only have 1 midplane? %s",
node->nodenames);
DIM_SIZE[X]++;
@@ -1053,12 +1053,12 @@ node_info_error:
"the api was. The return code was %d", rc);
return;
}
-
+
if ((bg != NULL)
- && ((rc = bridge_get_data(bg, RM_Msize, &bp_size))
+ && ((rc = bridge_get_data(bg, RM_Msize, &bp_size))
== STATUS_OK)) {
verbose("BlueGene configured with "
- "%d x %d x %d base blocks",
+ "%d x %d x %d base blocks",
bp_size.X, bp_size.Y, bp_size.Z);
REAL_DIM_SIZE[X] = bp_size.X;
REAL_DIM_SIZE[Y] = bp_size.Y;
@@ -1077,30 +1077,30 @@ node_info_error:
alpha_num[bp_size.Z]);
}
} else {
- error("bridge_get_data(RM_Msize): %d", rc);
+ error("bridge_get_data(RM_Msize): %d", rc);
}
}
#endif
- debug("We are using %c x %c x %c of the system.",
+ debug("We are using %c x %c x %c of the system.",
alpha_num[DIM_SIZE[X]],
alpha_num[DIM_SIZE[Y]],
alpha_num[DIM_SIZE[Z]]);
-
-#else
+
+#else
if (DIM_SIZE[X]==0) {
debug("Setting default system dimensions");
DIM_SIZE[X]=100;
- }
+ }
#endif
if(!ba_system_ptr->num_of_proc)
- ba_system_ptr->num_of_proc =
- DIM_SIZE[X]
+ ba_system_ptr->num_of_proc =
+ DIM_SIZE[X]
#ifdef HAVE_3D
- * DIM_SIZE[Y]
+ * DIM_SIZE[Y]
* DIM_SIZE[Z]
-#endif
+#endif
;
_create_ba_system();
@@ -1137,17 +1137,17 @@ extern void init_wires()
source = &ba_system_ptr->grid[x];
#endif
for(i=0; i<NUM_PORTS_PER_NODE; i++) {
- _switch_config(source, source,
+ _switch_config(source, source,
X, i, i);
- _switch_config(source, source,
+ _switch_config(source, source,
Y, i, i);
- _switch_config(source, source,
+ _switch_config(source, source,
Z, i, i);
}
}
}
}
-#ifdef HAVE_BG_FILES
+#ifdef HAVE_BG_FILES
_set_external_wires(0,0,NULL,NULL);
if(!bp_map_list) {
if(set_bp_map() == -1) {
@@ -1155,13 +1155,13 @@ extern void init_wires()
}
}
#endif
-
+
_wires_initialized = true;
return;
}
-/**
+/**
* destroy all the internal (global) data structs.
*/
extern void ba_fini()
@@ -1194,10 +1194,10 @@ extern void ba_fini()
}
-/*
+/*
* set the node in the internal configuration as in, or not in use,
* along with the current state of the node.
- *
+ *
* IN ba_node: ba_node_t to update state
* IN state: new state of ba_node_t
*/
@@ -1213,18 +1213,18 @@ extern void ba_update_node_state(ba_node_t *ba_node, uint16_t state)
}
#ifdef HAVE_BG
- debug2("ba_update_node_state: new state of [%c%c%c] is %s",
+ debug2("ba_update_node_state: new state of [%c%c%c] is %s",
alpha_num[ba_node->coord[X]], alpha_num[ba_node->coord[Y]],
- alpha_num[ba_node->coord[Z]], node_state_string(state));
+ alpha_num[ba_node->coord[Z]], node_state_string(state));
#else
- debug2("ba_update_node_state: new state of [%d] is %s",
+ debug2("ba_update_node_state: new state of [%d] is %s",
ba_node->coord[X],
- node_state_string(state));
+ node_state_string(state));
#endif
/* basically set the node as used */
if((node_base_state == NODE_STATE_DOWN)
- || (node_flags & (NODE_STATE_DRAIN | NODE_STATE_FAIL)))
+ || (node_flags & (NODE_STATE_DRAIN | NODE_STATE_FAIL)))
ba_node->used = true;
else
ba_node->used = false;
@@ -1232,23 +1232,23 @@ extern void ba_update_node_state(ba_node_t *ba_node, uint16_t state)
ba_node->state = state;
}
-/*
+/*
* copy info from a ba_node, a direct memcpy of the ba_node_t
- *
+ *
* IN ba_node: node to be copied
* Returned ba_node_t *: copied info must be freed with destroy_ba_node
*/
extern ba_node_t *ba_copy_node(ba_node_t *ba_node)
{
ba_node_t *new_ba_node = xmalloc(sizeof(ba_node_t));
-
+
memcpy(new_ba_node, ba_node, sizeof(ba_node_t));
return new_ba_node;
}
-/*
+/*
* copy the path of the nodes given
- *
+ *
* IN nodes List of ba_node_t *'s: nodes to be copied
* OUT dest_nodes List of ba_node_t *'s: filled in list of nodes
* wiring.
@@ -1257,14 +1257,14 @@ extern ba_node_t *ba_copy_node(ba_node_t *ba_node)
extern int copy_node_path(List nodes, List *dest_nodes)
{
int rc = SLURM_ERROR;
-
+
#ifdef HAVE_BG
ListIterator itr = NULL;
ListIterator itr2 = NULL;
ba_node_t *ba_node = NULL, *new_ba_node = NULL;
int dim;
- ba_switch_t *curr_switch = NULL, *new_switch = NULL;
-
+ ba_switch_t *curr_switch = NULL, *new_switch = NULL;
+
if(!nodes)
return SLURM_ERROR;
if(!*dest_nodes)
@@ -1276,27 +1276,27 @@ extern int copy_node_path(List nodes, List *dest_nodes)
while((new_ba_node = list_next(itr2))) {
if (ba_node->coord[X] == new_ba_node->coord[X] &&
ba_node->coord[Y] == new_ba_node->coord[Y] &&
- ba_node->coord[Z] == new_ba_node->coord[Z])
+ ba_node->coord[Z] == new_ba_node->coord[Z])
break; /* we found it */
}
list_iterator_destroy(itr2);
-
+
if(!new_ba_node) {
debug3("adding %c%c%c as a new node",
- alpha_num[ba_node->coord[X]],
+ alpha_num[ba_node->coord[X]],
alpha_num[ba_node->coord[Y]],
alpha_num[ba_node->coord[Z]]);
new_ba_node = ba_copy_node(ba_node);
_new_ba_node(new_ba_node, ba_node->coord, false);
list_push(*dest_nodes, new_ba_node);
-
+
}
new_ba_node->used = true;
- for(dim=0;dim<BA_SYSTEM_DIMENSIONS;dim++) {
+ for(dim=0;dim<BA_SYSTEM_DIMENSIONS;dim++) {
curr_switch = &ba_node->axis_switch[dim];
new_switch = &new_ba_node->axis_switch[dim];
if(curr_switch->int_wire[0].used) {
- if(!_copy_the_path(*dest_nodes,
+ if(!_copy_the_path(*dest_nodes,
curr_switch, new_switch,
0, dim)) {
rc = SLURM_ERROR;
@@ -1304,22 +1304,22 @@ extern int copy_node_path(List nodes, List *dest_nodes)
}
}
}
-
+
}
list_iterator_destroy(itr);
rc = SLURM_SUCCESS;
-#endif
+#endif
return rc;
}
-/*
+/*
* Try to allocate a block.
- *
+ *
* IN - ba_request: allocation request
* OUT - results: List of results of the allocation request. Each
* list entry will be a coordinate. allocate_block will create the
* list, but the caller must destroy it.
- *
+ *
* return: success or error of request
*/
extern int allocate_block(ba_request_t* ba_request, List results)
@@ -1334,7 +1334,7 @@ extern int allocate_block(ba_request_t* ba_request, List results)
error("allocate_block Error, request not initialized");
return 0;
}
-
+
// _backup_ba_system();
if (_find_match(ba_request, results)){
return 1;
@@ -1344,7 +1344,7 @@ extern int allocate_block(ba_request_t* ba_request, List results)
}
-/*
+/*
* Admin wants to remove a previous allocation.
* will allow Admin to delete a previous allocation retrival by letter code.
*/
@@ -1353,9 +1353,9 @@ extern int remove_block(List nodes, int new_count)
int dim;
ba_node_t* curr_ba_node = NULL;
ba_node_t* ba_node = NULL;
- ba_switch_t *curr_switch = NULL;
+ ba_switch_t *curr_switch = NULL;
ListIterator itr;
-
+
itr = list_iterator_create(nodes);
while((curr_ba_node = (ba_node_t*) list_next(itr))) {
/* since the list that comes in might not be pointers
@@ -1371,7 +1371,7 @@ extern int remove_block(List nodes, int new_count)
ba_node->used = false;
ba_node->color = 7;
ba_node->letter = '.';
- for(dim=0;dim<BA_SYSTEM_DIMENSIONS;dim++) {
+ for(dim=0;dim<BA_SYSTEM_DIMENSIONS;dim++) {
curr_switch = &ba_node->axis_switch[dim];
if(curr_switch->int_wire[0].used) {
_reset_the_path(curr_switch, 0, 1, dim);
@@ -1383,15 +1383,15 @@ extern int remove_block(List nodes, int new_count)
} else if(new_count == -1)
color_count--;
else
- color_count=new_count;
+ color_count=new_count;
if(color_count < 0)
color_count = 0;
return 1;
}
-/*
- * Admin wants to change something about a previous allocation.
- * will allow Admin to change previous allocation by giving the
+/*
+ * Admin wants to change something about a previous allocation.
+ * will allow Admin to change previous allocation by giving the
* letter code for the allocation and the variable to alter
* (Not currently used in the system, update this if it is)
*/
@@ -1402,13 +1402,13 @@ extern int alter_block(List nodes, int conn_type)
/* ba_switch_t *curr_switch = NULL; */
/* int size=0; */
/* char *name = NULL; */
-/* ListIterator results_i; */
+/* ListIterator results_i; */
return SLURM_ERROR;
/* results_i = list_iterator_create(nodes); */
/* while ((ba_node = list_next(results_i)) != NULL) { */
/* ba_node->used = false; */
-
+
/* for(dim=0;dim<BA_SYSTEM_DIMENSIONS;dim++) { */
/* curr_switch = &ba_node->axis_switch[dim]; */
/* if(curr_switch->int_wire[0].used) { */
@@ -1426,7 +1426,7 @@ extern int alter_block(List nodes, int conn_type)
/* } */
}
-/*
+/*
* After a block is deleted or altered following allocations must
* be redone to make sure correct path will be used in the real system
* (Not currently used in the system, update this if it is)
@@ -1442,7 +1442,7 @@ extern int redo_block(List nodes, int *geo, int conn_type, int new_count)
remove_block(nodes, new_count);
list_delete_all(nodes, &empty_null_destroy_list, "");
-
+
name = set_bg_block(nodes, ba_node->coord, geo, conn_type);
if(!name)
return SLURM_ERROR;
@@ -1471,7 +1471,7 @@ extern int check_and_set_node_list(List nodes)
#ifdef HAVE_BG
int i, j;
- ba_switch_t *ba_switch = NULL, *curr_ba_switch = NULL;
+ ba_switch_t *ba_switch = NULL, *curr_ba_switch = NULL;
ba_node_t *ba_node = NULL, *curr_ba_node = NULL;
ListIterator itr = NULL;
@@ -1479,17 +1479,17 @@ extern int check_and_set_node_list(List nodes)
return rc;
itr = list_iterator_create(nodes);
- while((ba_node = list_next(itr))) {
+ while((ba_node = list_next(itr))) {
/* info("checking %c%c%c", */
/* ba_node->coord[X], */
/* ba_node->coord[Y], */
/* ba_node->coord[Z]); */
-
+
curr_ba_node = &ba_system_ptr->
grid[ba_node->coord[X]]
[ba_node->coord[Y]]
[ba_node->coord[Z]];
-
+
if(ba_node->used && curr_ba_node->used) {
/* Only error if the midplane isn't already
* marked down or in a error state outside of
@@ -1502,7 +1502,7 @@ extern int check_and_set_node_list(List nodes)
&& (base_state != NODE_STATE_DOWN)) {
debug4("I have already been to "
"this node %c%c%c %s",
- alpha_num[ba_node->coord[X]],
+ alpha_num[ba_node->coord[X]],
alpha_num[ba_node->coord[Y]],
alpha_num[ba_node->coord[Z]],
node_state_string(curr_ba_node->state));
@@ -1510,26 +1510,26 @@ extern int check_and_set_node_list(List nodes)
goto end_it;
}
}
-
- if(ba_node->used)
- curr_ba_node->used = true;
+
+ if(ba_node->used)
+ curr_ba_node->used = true;
for(i=0; i<BA_SYSTEM_DIMENSIONS; i++) {
ba_switch = &ba_node->axis_switch[i];
curr_ba_switch = &curr_ba_node->axis_switch[i];
//info("checking dim %d", i);
-
+
for(j=0; j<NUM_PORTS_PER_NODE; j++) {
//info("checking port %d", j);
-
- if(ba_switch->int_wire[j].used
+
+ if(ba_switch->int_wire[j].used
&& curr_ba_switch->int_wire[j].used
&& j != curr_ba_switch->
int_wire[j].port_tar) {
debug4("%c%c%c dim %d port %d "
"is already in use to %d",
- alpha_num[ba_node->coord[X]],
+ alpha_num[ba_node->coord[X]],
alpha_num[ba_node->coord[Y]],
- alpha_num[ba_node->coord[Z]],
+ alpha_num[ba_node->coord[Z]],
i,
j,
curr_ba_switch->
@@ -1548,7 +1548,7 @@ extern int check_and_set_node_list(List nodes)
/* j, */
/* ba_switch->int_wire[j].port_tar); */
curr_ba_switch->int_wire[j].used = 1;
- curr_ba_switch->int_wire[j].port_tar
+ curr_ba_switch->int_wire[j].port_tar
= ba_switch->int_wire[j].port_tar;
}
}
@@ -1562,8 +1562,8 @@ end_it:
/*
* Used to find, and set up midplanes and the wires in the virtual
- * system and return them in List results
- *
+ * system and return them in List results
+ *
* IN/OUT results - a list with a NULL destroyer filled in with
* midplanes and wires set to create the block with the api. If
* only interested in the hostlist NULL can be excepted also.
@@ -1574,7 +1574,7 @@ end_it:
* RET char * - hostlist of midplanes results represent must be
* xfreed. NULL on failure
*/
-extern char *set_bg_block(List results, int *start,
+extern char *set_bg_block(List results, int *start,
int *geometry, int conn_type)
{
char *name = NULL;
@@ -1585,7 +1585,7 @@ extern char *set_bg_block(List results, int *start,
#ifdef HAVE_3D
- if(start[X]>=DIM_SIZE[X]
+ if(start[X]>=DIM_SIZE[X]
|| start[Y]>=DIM_SIZE[Y]
|| start[Z]>=DIM_SIZE[Z])
return NULL;
@@ -1594,7 +1594,7 @@ extern char *set_bg_block(List results, int *start,
error("problem with geometry %c%c%c, needs to be at least 111",
alpha_num[geometry[X]],
alpha_num[geometry[Y]],
- alpha_num[geometry[Z]]);
+ alpha_num[geometry[Z]]);
return NULL;
}
//info("looking at %d%d%d", geometry[X], geometry[Y], geometry[Z]);
@@ -1605,9 +1605,9 @@ extern char *set_bg_block(List results, int *start,
if(start[X]>=DIM_SIZE[X])
return NULL;
size = geometry[X];
- ba_node = &ba_system_ptr->grid[start[X]];
+ ba_node = &ba_system_ptr->grid[start[X]];
#endif
-
+
if(!ba_node)
return NULL;
@@ -1636,11 +1636,11 @@ extern char *set_bg_block(List results, int *start,
ba_node->color);
color_count++;
}
- goto end_it;
+ goto end_it;
}
found = _find_x_path(results, ba_node,
- ba_node->coord,
- geometry[X],
+ ba_node->coord,
+ geometry[X],
1,
conn_type, BLOCK_ALGO_FIRST);
@@ -1666,16 +1666,16 @@ extern char *set_bg_block(List results, int *start,
list_append(start_list, ba_node);
}
list_iterator_destroy(itr);
-
- if(!_fill_in_coords(results,
- start_list,
- geometry,
+
+ if(!_fill_in_coords(results,
+ start_list,
+ geometry,
conn_type)) {
list_destroy(start_list);
goto end_it;
}
- list_destroy(start_list);
-#endif
+ list_destroy(start_list);
+#endif
} else {
goto end_it;
}
@@ -1695,7 +1695,7 @@ end_it:
xfree(name);
}
- return name;
+ return name;
}
/*
@@ -1717,7 +1717,7 @@ extern int reset_ba_system(bool track_down_nodes)
coord[X] = x;
coord[Y] = y;
coord[Z] = z;
- _new_ba_node(&ba_system_ptr->grid[x][y][z],
+ _new_ba_node(&ba_system_ptr->grid[x][y][z],
coord, track_down_nodes);
}
#else
@@ -1726,7 +1726,7 @@ extern int reset_ba_system(bool track_down_nodes)
#endif
}
-
+
return 1;
}
@@ -1738,7 +1738,7 @@ extern int reset_ba_system(bool track_down_nodes)
* RET: SLURM_SUCCESS on success, or SLURM_ERROR on error
*
* Note: Need to call reset_all_removed_bps before starting another
- * allocation attempt after
+ * allocation attempt after
*/
extern int removable_set_bps(char *bps)
{
@@ -1756,7 +1756,7 @@ extern int removable_set_bps(char *bps)
if ((bps[j] == '[' || bps[j] == ',')
&& (bps[j+8] == ']' || bps[j+8] == ',')
&& (bps[j+4] == 'x' || bps[j+4] == '-')) {
-
+
j++;
number = xstrntol(bps + j, NULL, BA_SYSTEM_DIMENSIONS,
HOSTLIST_BASE);
@@ -1782,13 +1782,13 @@ extern int removable_set_bps(char *bps)
}
}
}
-
+
if(bps[j] != ',')
break;
j--;
} else if((bps[j] >= '0' && bps[j] <= '9')
|| (bps[j] >= 'A' && bps[j] <= 'Z')) {
-
+
number = xstrntol(bps + j, NULL, BA_SYSTEM_DIMENSIONS,
HOSTLIST_BASE);
x = number / (HOSTLIST_BASE * HOSTLIST_BASE);
@@ -1798,7 +1798,7 @@ extern int removable_set_bps(char *bps)
j+=3;
if(!ba_system_ptr->grid[x][y][z].used)
ba_system_ptr->grid[x][y][z].used = 2;
-
+
if(bps[j] != ',')
break;
j--;
@@ -1821,7 +1821,7 @@ extern int reset_all_removed_bps()
#ifdef HAVE_3D
int y, z;
for (y = 0; y < DIM_SIZE[Y]; y++)
- for (z = 0; z < DIM_SIZE[Z]; z++)
+ for (z = 0; z < DIM_SIZE[Z]; z++)
if(ba_system_ptr->grid[x][y][z].used == 2)
ba_system_ptr->grid[x][y][z].used = 0;
#else
@@ -1858,17 +1858,17 @@ extern int set_all_bps_except(char *bps)
start = 0;
while (numeric) {
if (numeric[0] < '0' || numeric[0] > 'Z'
- || (numeric[0] > '9'
+ || (numeric[0] > '9'
&& numeric[0] < 'A')) {
numeric++;
continue;
}
- start = xstrntol(numeric, NULL,
+ start = xstrntol(numeric, NULL,
BA_SYSTEM_DIMENSIONS,
HOSTLIST_BASE);
break;
}
-
+
temp = start / (HOSTLIST_BASE * HOSTLIST_BASE);
x = temp;
#ifdef HAVE_3D
@@ -1878,11 +1878,11 @@ extern int set_all_bps_except(char *bps)
temp = start % HOSTLIST_BASE;
z = temp;
if((ba_system_ptr->grid[x][y][z].state == NODE_STATE_UNKNOWN)
- || (ba_system_ptr->grid[x][y][z].state == NODE_STATE_IDLE))
+ || (ba_system_ptr->grid[x][y][z].state == NODE_STATE_IDLE))
ba_system_ptr->grid[x][y][z].state = NODE_STATE_END;
#else
if((ba_system_ptr->grid[x].state == NODE_STATE_UNKNOWN)
- || (ba_system_ptr->grid[x].state == NODE_STATE_IDLE))
+ || (ba_system_ptr->grid[x].state == NODE_STATE_IDLE))
ba_system_ptr->grid[x].state = NODE_STATE_END;
#endif
free(host);
@@ -1897,7 +1897,7 @@ extern int set_all_bps_except(char *bps)
== NODE_STATE_END) {
ba_system_ptr->grid[x][y][z].state
= NODE_STATE_IDLE;
- ba_system_ptr->grid[x][y][z].used =
+ ba_system_ptr->grid[x][y][z].used =
false;
} else if(!ba_system_ptr->grid[x][y][z].used) {
ba_system_ptr->grid[x][y][z].used = 2;
@@ -1923,7 +1923,7 @@ extern void init_grid(node_info_msg_t * node_info_ptr)
{
node_info_t *node_ptr = NULL;
int x, i = 0;
- /* For systems with more than 62 active jobs or BG blocks,
+ /* For systems with more than 62 active jobs or BG blocks,
* we just repeat letters */
#ifdef HAVE_3D
@@ -1932,16 +1932,16 @@ extern void init_grid(node_info_msg_t * node_info_ptr)
for (y = 0; y < DIM_SIZE[Y]; y++)
for (z = 0; z < DIM_SIZE[Z]; z++) {
if(node_info_ptr!=NULL) {
- node_ptr =
+ node_ptr =
&node_info_ptr->node_array[i];
ba_system_ptr->grid[x][y][z].color = 7;
if (IS_NODE_DOWN(node_ptr)
|| IS_NODE_DRAIN(node_ptr)) {
ba_system_ptr->
- grid[x][y][z].color
+ grid[x][y][z].color
= 0;
ba_system_ptr->
- grid[x][y][z].letter
+ grid[x][y][z].letter
= '#';
if(_initialized) {
ba_update_node_state(
@@ -1955,13 +1955,13 @@ extern void init_grid(node_info_msg_t * node_info_ptr)
ba_system_ptr->grid[x][y][z].
letter = '.';
}
- ba_system_ptr->grid[x][y][z].state
+ ba_system_ptr->grid[x][y][z].state
= node_ptr->node_state;
} else {
ba_system_ptr->grid[x][y][z].color = 7;
- ba_system_ptr->grid[x][y][z].letter
+ ba_system_ptr->grid[x][y][z].letter
= '.';
- ba_system_ptr->grid[x][y][z].state =
+ ba_system_ptr->grid[x][y][z].state =
NODE_STATE_IDLE;
}
ba_system_ptr->grid[x][y][z].index = i++;
@@ -2067,14 +2067,14 @@ extern int set_bp_map(void)
return -1;
}
#endif
-
+
if (!bg) {
if((rc = bridge_get_bg(&bg)) != STATUS_OK) {
error("bridge_get_BG(): %d", rc);
return -1;
}
}
-
+
if ((rc = bridge_get_data(bg, RM_BPNum, &bp_num)) != STATUS_OK) {
error("bridge_get_data(RM_BPNum): %d", rc);
bp_num = 0;
@@ -2095,9 +2095,9 @@ extern int set_bp_map(void)
break;
}
}
-
+
bp_map = (ba_bp_map_t *) xmalloc(sizeof(ba_bp_map_t));
-
+
if ((rc = bridge_get_data(my_bp, RM_BPID, &bp_id))
!= STATUS_OK) {
xfree(bp_map);
@@ -2109,19 +2109,19 @@ extern int set_bp_map(void)
error("No BP ID was returned from database");
continue;
}
-
+
if ((rc = bridge_get_data(my_bp, RM_BPLoc, &bp_loc))
!= STATUS_OK) {
xfree(bp_map);
error("bridge_get_data(RM_BPLoc): %d", rc);
continue;
}
-
+
bp_map->bp_id = xstrdup(bp_id);
bp_map->coord[X] = bp_loc.X;
bp_map->coord[Y] = bp_loc.Y;
bp_map->coord[Z] = bp_loc.Z;
-
+
number = xstrntol(bp_id+1, NULL,
BA_SYSTEM_DIMENSIONS, HOSTLIST_BASE);
/* no longer needed for calculation */
@@ -2133,19 +2133,19 @@ extern int set_bp_map(void)
/* [bp_loc.Y] */
/* [bp_loc.Z].phys_x = */
/* number / (HOSTLIST_BASE * HOSTLIST_BASE); */
-
+
list_push(bp_map_list, bp_map);
-
- free(bp_id);
+
+ free(bp_id);
}
#endif
_bp_map_initialized = true;
return 1;
-
+
}
/*
- * find a base blocks bg location
+ * find a base blocks bg location
*/
extern int *find_bp_loc(char* bp_id)
{
@@ -2170,14 +2170,14 @@ extern int *find_bp_loc(char* bp_id)
check[4] = '\0';
}
}
-
+
if((check[1] < '0' || check[1] > '9')
|| (check[2] < '0' || check[2] > '9')
|| (check[3] < '0' || check[3] > '9')) {
error("%s is not a valid Rack-Midplane (i.e. R000)", bp_id);
goto cleanup;
}
-
+
#else
if(check[3] != '-') {
xfree(check);
@@ -2192,10 +2192,10 @@ extern int *find_bp_loc(char* bp_id)
goto cleanup;
}
#endif
-
+
itr = list_iterator_create(bp_map_list);
- while ((bp_map = list_next(itr)))
- if (!strcasecmp(bp_map->bp_id, check))
+ while ((bp_map = list_next(itr)))
+ if (!strcasecmp(bp_map->bp_id, check))
break; /* we found it */
list_iterator_destroy(itr);
@@ -2213,7 +2213,7 @@ cleanup:
}
/*
- * find a rack/midplace location
+ * find a rack/midplace location
*/
extern char *find_bp_rack_mid(char* xyz)
{
@@ -2246,14 +2246,14 @@ extern char *find_bp_rack_mid(char* xyz)
if(set_bp_map() == -1)
return NULL;
}
-
+
itr = list_iterator_create(bp_map_list);
while ((bp_map = list_next(itr)) != NULL)
if (bp_map->coord[X] == coord[X] &&
bp_map->coord[Y] == coord[Y] &&
- bp_map->coord[Z] == coord[Z])
+ bp_map->coord[Z] == coord[Z])
break; /* we found it */
-
+
list_iterator_destroy(itr);
if(bp_map != NULL)
return bp_map->bp_id;
@@ -2266,7 +2266,7 @@ extern char *find_bp_rack_mid(char* xyz)
}
/*
- * set the used wires in the virtual system for a block from the real system
+ * set the used wires in the virtual system for a block from the real system
*/
extern int load_block_wiring(char *bg_block_id)
{
@@ -2280,29 +2280,29 @@ extern int load_block_wiring(char *bg_block_id)
char *switchid = NULL;
rm_connection_t curr_conn;
int dim;
- ba_switch_t *ba_switch = NULL;
+ ba_switch_t *ba_switch = NULL;
int *geo = NULL;
-
+
debug3("getting info for block %s\n", bg_block_id);
-
+
if ((rc = bridge_get_block(bg_block_id, &block_ptr)) != STATUS_OK) {
- error("bridge_get_block(%s): %s",
- bg_block_id,
+ error("bridge_get_block(%s): %s",
+ bg_block_id,
bg_err_str(rc));
return SLURM_ERROR;
- }
-
+ }
+
if ((rc = bridge_get_data(block_ptr, RM_PartitionSwitchNum,
&switch_cnt)) != STATUS_OK) {
error("bridge_get_data(RM_PartitionSwitchNum): %s",
bg_err_str(rc));
return SLURM_ERROR;
- }
+ }
if(!switch_cnt) {
debug4("no switch_cnt");
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionFirstBP,
- &curr_bp))
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionFirstBP,
+ &curr_bp))
!= STATUS_OK) {
error("bridge_get_data: "
"RM_PartitionFirstBP: %s",
@@ -2310,13 +2310,13 @@ extern int load_block_wiring(char *bg_block_id)
return SLURM_ERROR;
}
if ((rc = bridge_get_data(curr_bp, RM_BPID, &switchid))
- != STATUS_OK) {
+ != STATUS_OK) {
error("bridge_get_data: RM_SwitchBPID: %s",
bg_err_str(rc));
return SLURM_ERROR;
- }
+ }
- geo = find_bp_loc(switchid);
+ geo = find_bp_loc(switchid);
if(!geo) {
error("find_bp_loc: bpid %s not known", switchid);
return SLURM_ERROR;
@@ -2326,9 +2326,9 @@ extern int load_block_wiring(char *bg_block_id)
}
for (i=0; i<switch_cnt; i++) {
if(i) {
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionNextSwitch,
- &curr_switch))
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionNextSwitch,
+ &curr_switch))
!= STATUS_OK) {
error("bridge_get_data: "
"RM_PartitionNextSwitch: %s",
@@ -2336,9 +2336,9 @@ extern int load_block_wiring(char *bg_block_id)
return SLURM_ERROR;
}
} else {
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionFirstSwitch,
- &curr_switch))
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionFirstSwitch,
+ &curr_switch))
!= STATUS_OK) {
error("bridge_get_data: "
"RM_PartitionFirstSwitch: %s",
@@ -2347,41 +2347,41 @@ extern int load_block_wiring(char *bg_block_id)
}
}
if ((rc = bridge_get_data(curr_switch, RM_SwitchDim, &dim))
- != STATUS_OK) {
+ != STATUS_OK) {
error("bridge_get_data: RM_SwitchDim: %s",
bg_err_str(rc));
return SLURM_ERROR;
- }
- if ((rc = bridge_get_data(curr_switch, RM_SwitchBPID,
+ }
+ if ((rc = bridge_get_data(curr_switch, RM_SwitchBPID,
&switchid))
- != STATUS_OK) {
+ != STATUS_OK) {
error("bridge_get_data: RM_SwitchBPID: %s",
bg_err_str(rc));
return SLURM_ERROR;
- }
+ }
geo = find_bp_loc(switchid);
if(!geo) {
error("find_bp_loc: bpid %s not known", switchid);
return SLURM_ERROR;
}
-
+
if ((rc = bridge_get_data(curr_switch, RM_SwitchConnNum, &cnt))
- != STATUS_OK) {
+ != STATUS_OK) {
error("bridge_get_data: RM_SwitchBPID: %s",
bg_err_str(rc));
return SLURM_ERROR;
}
- debug3("switch id = %s dim %d conns = %d",
+ debug3("switch id = %s dim %d conns = %d",
switchid, dim, cnt);
ba_switch = &ba_system_ptr->
grid[geo[X]][geo[Y]][geo[Z]].axis_switch[dim];
for (j=0; j<cnt; j++) {
if(j) {
if ((rc = bridge_get_data(
- curr_switch,
- RM_SwitchNextConnection,
- &curr_conn))
+ curr_switch,
+ RM_SwitchNextConnection,
+ &curr_conn))
!= STATUS_OK) {
error("bridge_get_data: "
"RM_SwitchNextConnection: %s",
@@ -2390,9 +2390,9 @@ extern int load_block_wiring(char *bg_block_id)
}
} else {
if ((rc = bridge_get_data(
- curr_switch,
+ curr_switch,
RM_SwitchFirstConnection,
- &curr_conn))
+ &curr_conn))
!= STATUS_OK) {
error("bridge_get_data: "
"RM_SwitchFirstConnection: %s",
@@ -2411,11 +2411,11 @@ extern int load_block_wiring(char *bg_block_id)
curr_conn.p1 = 4;
break;
default:
- error("1 unknown port %d",
+ error("1 unknown port %d",
_port_enum(curr_conn.p1));
return SLURM_ERROR;
}
-
+
switch(curr_conn.p2) {
case RM_PORT_S0:
curr_conn.p2 = 0;
@@ -2427,7 +2427,7 @@ extern int load_block_wiring(char *bg_block_id)
curr_conn.p2 = 5;
break;
default:
- error("2 unknown port %d",
+ error("2 unknown port %d",
_port_enum(curr_conn.p2));
return SLURM_ERROR;
}
@@ -2443,11 +2443,11 @@ extern int load_block_wiring(char *bg_block_id)
return SLURM_ERROR;
}
ba_system_ptr->grid[geo[X]][geo[Y]][geo[Z]].
- used = true;
+ used = true;
}
debug4("connection going from %d -> %d",
curr_conn.p1, curr_conn.p2);
-
+
if(ba_switch->int_wire[curr_conn.p1].used) {
debug("%c%c%c dim %d port %d "
"is already in use",
@@ -2459,9 +2459,9 @@ extern int load_block_wiring(char *bg_block_id)
return SLURM_ERROR;
}
ba_switch->int_wire[curr_conn.p1].used = 1;
- ba_switch->int_wire[curr_conn.p1].port_tar
+ ba_switch->int_wire[curr_conn.p1].port_tar
= curr_conn.p2;
-
+
if(ba_switch->int_wire[curr_conn.p2].used) {
debug("%c%c%c dim %d port %d "
"is already in use",
@@ -2473,7 +2473,7 @@ extern int load_block_wiring(char *bg_block_id)
return SLURM_ERROR;
}
ba_switch->int_wire[curr_conn.p2].used = 1;
- ba_switch->int_wire[curr_conn.p2].port_tar
+ ba_switch->int_wire[curr_conn.p2].port_tar
= curr_conn.p1;
}
}
@@ -2482,7 +2482,7 @@ extern int load_block_wiring(char *bg_block_id)
#else
return SLURM_ERROR;
#endif
-
+
}
/*
@@ -2501,32 +2501,32 @@ extern List get_and_set_block_wiring(char *bg_block_id)
char *switchid = NULL;
rm_connection_t curr_conn;
int dim;
- ba_node_t *ba_node = NULL;
- ba_switch_t *ba_switch = NULL;
+ ba_node_t *ba_node = NULL;
+ ba_switch_t *ba_switch = NULL;
int *geo = NULL;
List results = list_create(destroy_ba_node);
ListIterator itr = NULL;
-
+
debug3("getting info for block %s\n", bg_block_id);
-
+
if ((rc = bridge_get_block(bg_block_id, &block_ptr)) != STATUS_OK) {
- error("bridge_get_block(%s): %s",
- bg_block_id,
+ error("bridge_get_block(%s): %s",
+ bg_block_id,
bg_err_str(rc));
goto end_it;
- }
-
+ }
+
if ((rc = bridge_get_data(block_ptr, RM_PartitionSwitchNum,
&switch_cnt)) != STATUS_OK) {
error("bridge_get_data(RM_PartitionSwitchNum): %s",
bg_err_str(rc));
goto end_it;
- }
+ }
if(!switch_cnt) {
debug4("no switch_cnt");
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionFirstBP,
- &curr_bp))
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionFirstBP,
+ &curr_bp))
!= STATUS_OK) {
error("bridge_get_data: "
"RM_PartitionFirstBP: %s",
@@ -2534,13 +2534,13 @@ extern List get_and_set_block_wiring(char *bg_block_id)
goto end_it;
}
if ((rc = bridge_get_data(curr_bp, RM_BPID, &switchid))
- != STATUS_OK) {
+ != STATUS_OK) {
error("bridge_get_data: RM_SwitchBPID: %s",
bg_err_str(rc));
goto end_it;
- }
+ }
- geo = find_bp_loc(switchid);
+ geo = find_bp_loc(switchid);
if(!geo) {
error("find_bp_loc: bpid %s not known", switchid);
goto end_it;
@@ -2550,15 +2550,15 @@ extern List get_and_set_block_wiring(char *bg_block_id)
ba_node->coord[X] = geo[X];
ba_node->coord[Y] = geo[Y];
ba_node->coord[Z] = geo[Z];
-
+
ba_node->used = TRUE;
return results;
}
for (i=0; i<switch_cnt; i++) {
if(i) {
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionNextSwitch,
- &curr_switch))
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionNextSwitch,
+ &curr_switch))
!= STATUS_OK) {
error("bridge_get_data: "
"RM_PartitionNextSwitch: %s",
@@ -2566,9 +2566,9 @@ extern List get_and_set_block_wiring(char *bg_block_id)
goto end_it;
}
} else {
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionFirstSwitch,
- &curr_switch))
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionFirstSwitch,
+ &curr_switch))
!= STATUS_OK) {
error("bridge_get_data: "
"RM_PartitionFirstSwitch: %s",
@@ -2577,45 +2577,45 @@ extern List get_and_set_block_wiring(char *bg_block_id)
}
}
if ((rc = bridge_get_data(curr_switch, RM_SwitchDim, &dim))
- != STATUS_OK) {
+ != STATUS_OK) {
error("bridge_get_data: RM_SwitchDim: %s",
bg_err_str(rc));
goto end_it;
- }
- if ((rc = bridge_get_data(curr_switch, RM_SwitchBPID,
+ }
+ if ((rc = bridge_get_data(curr_switch, RM_SwitchBPID,
&switchid))
- != STATUS_OK) {
+ != STATUS_OK) {
error("bridge_get_data: RM_SwitchBPID: %s",
bg_err_str(rc));
goto end_it;
- }
+ }
geo = find_bp_loc(switchid);
if(!geo) {
error("find_bp_loc: bpid %s not known", switchid);
goto end_it;
}
-
+
if ((rc = bridge_get_data(curr_switch, RM_SwitchConnNum, &cnt))
- != STATUS_OK) {
+ != STATUS_OK) {
error("bridge_get_data: RM_SwitchBPID: %s",
bg_err_str(rc));
goto end_it;
}
- debug3("switch id = %s dim %d conns = %d",
+ debug3("switch id = %s dim %d conns = %d",
switchid, dim, cnt);
-
+
itr = list_iterator_create(results);
while((ba_node = list_next(itr))) {
if (ba_node->coord[X] == geo[X] &&
ba_node->coord[Y] == geo[Y] &&
- ba_node->coord[Z] == geo[Z])
+ ba_node->coord[Z] == geo[Z])
break; /* we found it */
}
list_iterator_destroy(itr);
if(!ba_node) {
ba_node = xmalloc(sizeof(ba_node_t));
-
+
list_push(results, ba_node);
ba_node->coord[X] = geo[X];
ba_node->coord[Y] = geo[Y];
@@ -2625,9 +2625,9 @@ extern List get_and_set_block_wiring(char *bg_block_id)
for (j=0; j<cnt; j++) {
if(j) {
if ((rc = bridge_get_data(
- curr_switch,
- RM_SwitchNextConnection,
- &curr_conn))
+ curr_switch,
+ RM_SwitchNextConnection,
+ &curr_conn))
!= STATUS_OK) {
error("bridge_get_data: "
"RM_SwitchNextConnection: %s",
@@ -2636,9 +2636,9 @@ extern List get_and_set_block_wiring(char *bg_block_id)
}
} else {
if ((rc = bridge_get_data(
- curr_switch,
+ curr_switch,
RM_SwitchFirstConnection,
- &curr_conn))
+ &curr_conn))
!= STATUS_OK) {
error("bridge_get_data: "
"RM_SwitchFirstConnection: %s",
@@ -2657,11 +2657,11 @@ extern List get_and_set_block_wiring(char *bg_block_id)
curr_conn.p1 = 4;
break;
default:
- error("1 unknown port %d",
+ error("1 unknown port %d",
_port_enum(curr_conn.p1));
goto end_it;
}
-
+
switch(curr_conn.p2) {
case RM_PORT_S0:
curr_conn.p2 = 0;
@@ -2673,7 +2673,7 @@ extern List get_and_set_block_wiring(char *bg_block_id)
curr_conn.p2 = 5;
break;
default:
- error("2 unknown port %d",
+ error("2 unknown port %d",
_port_enum(curr_conn.p2));
goto end_it;
}
@@ -2687,11 +2687,11 @@ extern List get_and_set_block_wiring(char *bg_block_id)
alpha_num[geo[Z]]);
goto end_it;
}
- ba_node->used = true;
+ ba_node->used = true;
}
debug4("connection going from %d -> %d",
curr_conn.p1, curr_conn.p2);
-
+
if(ba_switch->int_wire[curr_conn.p1].used) {
debug("%c%c%c dim %d port %d "
"is already in use",
@@ -2703,9 +2703,9 @@ extern List get_and_set_block_wiring(char *bg_block_id)
goto end_it;
}
ba_switch->int_wire[curr_conn.p1].used = 1;
- ba_switch->int_wire[curr_conn.p1].port_tar
+ ba_switch->int_wire[curr_conn.p1].port_tar
= curr_conn.p2;
-
+
if(ba_switch->int_wire[curr_conn.p2].used) {
debug("%c%c%c dim %d port %d "
"is already in use",
@@ -2717,7 +2717,7 @@ extern List get_and_set_block_wiring(char *bg_block_id)
goto end_it;
}
ba_switch->int_wire[curr_conn.p2].used = 1;
- ba_switch->int_wire[curr_conn.p2].port_tar
+ ba_switch->int_wire[curr_conn.p2].port_tar
= curr_conn.p1;
}
}
@@ -2728,14 +2728,14 @@ end_it:
#else
return NULL;
#endif
-
+
}
/* */
extern int validate_coord(int *coord)
{
#ifdef HAVE_BG_FILES
- if(coord[X]>=REAL_DIM_SIZE[X]
+ if(coord[X]>=REAL_DIM_SIZE[X]
|| coord[Y]>=REAL_DIM_SIZE[Y]
|| coord[Z]>=REAL_DIM_SIZE[Z]) {
error("got coord %c%c%c greater than system dims "
@@ -2749,7 +2749,7 @@ extern int validate_coord(int *coord)
return 0;
}
- if(coord[X]>=DIM_SIZE[X]
+ if(coord[X]>=DIM_SIZE[X]
|| coord[Y]>=DIM_SIZE[Y]
|| coord[Z]>=DIM_SIZE[Z]) {
debug4("got coord %c%c%c greater than what we are using "
@@ -2775,10 +2775,10 @@ extern int validate_coord(int *coord)
static void _bp_map_list_del(void *object)
{
ba_bp_map_t *bp_map = (ba_bp_map_t *)object;
-
+
if (bp_map) {
xfree(bp_map->bp_id);
- xfree(bp_map);
+ xfree(bp_map);
}
}
@@ -2815,7 +2815,7 @@ static int _port_enum(int port)
* This function is here to check options for rotating and elongating
* and set up the request based on the count of each option
*/
-static int _check_for_options(ba_request_t* ba_request)
+static int _check_for_options(ba_request_t* ba_request)
{
int temp;
int set=0;
@@ -2825,14 +2825,14 @@ static int _check_for_options(ba_request_t* ba_request)
if(ba_request->rotate) {
rotate_again:
debug2("Rotating! %d",ba_request->rotate_count);
-
+
if (ba_request->rotate_count==(BA_SYSTEM_DIMENSIONS-1)) {
temp=ba_request->geometry[X];
ba_request->geometry[X]=ba_request->geometry[Z];
ba_request->geometry[Z]=temp;
ba_request->rotate_count++;
set=1;
-
+
} else if(ba_request->rotate_count<(BA_SYSTEM_DIMENSIONS*2)) {
temp=ba_request->geometry[X];
ba_request->geometry[X]=ba_request->geometry[Y];
@@ -2840,10 +2840,10 @@ static int _check_for_options(ba_request_t* ba_request)
ba_request->geometry[Z]=temp;
ba_request->rotate_count++;
set=1;
- } else
+ } else
ba_request->rotate = false;
if(set) {
- if(ba_request->geometry[X]<=DIM_SIZE[X]
+ if(ba_request->geometry[X]<=DIM_SIZE[X]
&& ba_request->geometry[Y]<=DIM_SIZE[Y]
&& ba_request->geometry[Z]<=DIM_SIZE[Z])
return 1;
@@ -2858,7 +2858,7 @@ static int _check_for_options(ba_request_t* ba_request)
debug2("Elongating! %d",ba_request->elongate_count);
ba_request->rotate_count=0;
ba_request->rotate = true;
-
+
set = 0;
itr = list_iterator_create(ba_request->elongate_geos);
for(set=0; set<=ba_request->elongate_count; set++)
@@ -2870,28 +2870,28 @@ static int _check_for_options(ba_request_t* ba_request)
ba_request->geometry[X] = geo[X];
ba_request->geometry[Y] = geo[Y];
ba_request->geometry[Z] = geo[Z];
- if(ba_request->geometry[X]<=DIM_SIZE[X]
+ if(ba_request->geometry[X]<=DIM_SIZE[X]
&& ba_request->geometry[Y]<=DIM_SIZE[Y]
&& ba_request->geometry[Z]<=DIM_SIZE[Z]) {
return 1;
- } else
+ } else
goto elongate_again;
-
+
}
return 0;
}
-/*
+/*
* grab all the geometries that we can get and append them to the list geos
*/
-static int _append_geo(int *geometry, List geos, int rotate)
+static int _append_geo(int *geometry, List geos, int rotate)
{
ListIterator itr;
int *geo_ptr = NULL;
int *geo = NULL;
int temp_geo;
int i, j;
-
+
if(rotate) {
for (i = (BA_SYSTEM_DIMENSIONS - 1); i >= 0; i--) {
for (j = 1; j <= i; j++) {
@@ -2911,11 +2911,11 @@ static int _append_geo(int *geometry, List geos, int rotate)
&& geometry[Y] == geo_ptr[Y]
&& geometry[Z] == geo_ptr[Z])
break;
-
+
}
list_iterator_destroy(itr);
- if(geo_ptr == NULL) {
+ if(geo_ptr == NULL) {
geo = xmalloc(sizeof(int)*BA_SYSTEM_DIMENSIONS);
geo[X] = geometry[X];
geo[Y] = geometry[Y];
@@ -2943,7 +2943,7 @@ static int _append_geo(int *geometry, List geos, int rotate)
* Y and Z coords.
* IN geometry - What the block looks like
* IN conn_type - Mesh or Torus
- *
+ *
* RET: 0 on failure 1 on success
*/
static int _fill_in_coords(List results, List start_list,
@@ -2954,16 +2954,16 @@ static int _fill_in_coords(List results, List start_list,
int rc = 1;
ListIterator itr = NULL;
int y=0, z=0;
- ba_switch_t *curr_switch = NULL;
- ba_switch_t *next_switch = NULL;
-
+ ba_switch_t *curr_switch = NULL;
+ ba_switch_t *next_switch = NULL;
+
if(!start_list || !results)
return 0;
/* go through the start_list and add all the midplanes */
itr = list_iterator_create(start_list);
- while((check_node = (ba_node_t*) list_next(itr))) {
+ while((check_node = (ba_node_t*) list_next(itr))) {
curr_switch = &check_node->axis_switch[X];
-
+
for(y=0; y<geometry[Y]; y++) {
if((check_node->coord[Y]+y) >= DIM_SIZE[Y]) {
rc = 0;
@@ -2990,13 +2990,13 @@ static int _fill_in_coords(List results, List start_list,
alpha_num[ba_node->coord[Z]]);
list_append(results, ba_node);
next_switch = &ba_node->axis_switch[X];
-
+
/* since we are going off the
* main system we can send NULL
* here
*/
- _copy_the_path(NULL, curr_switch,
- next_switch,
+ _copy_the_path(NULL, curr_switch,
+ next_switch,
0, X);
} else {
rc = 0;
@@ -3004,18 +3004,18 @@ static int _fill_in_coords(List results, List start_list,
}
}
}
-
+
}
list_iterator_destroy(itr);
itr = list_iterator_create(start_list);
check_node = (ba_node_t*) list_next(itr);
list_iterator_destroy(itr);
-
+
itr = list_iterator_create(results);
while((ba_node = (ba_node_t*) list_next(itr))) {
- if(!_find_yz_path(ba_node,
- check_node->coord,
- geometry,
+ if(!_find_yz_path(ba_node,
+ check_node->coord,
+ geometry,
conn_type)){
rc = 0;
goto failed;
@@ -3035,8 +3035,8 @@ static int _fill_in_coords(List results, List start_list,
}
failed:
- list_iterator_destroy(itr);
-
+ list_iterator_destroy(itr);
+
return rc;
}
@@ -3045,9 +3045,9 @@ failed:
* starting port on a dimension.
*
* IN/OUT: nodes - Local list of midplanes you are keeping track of. If
- * you visit any new midplanes a copy from ba_system_grid
+ * you visit any new midplanes a copy from ba_system_grid
* will be added to the list. If NULL the path will be
- * set in mark_switch of the main virtual system (ba_system_grid).
+ * set in mark_switch of the main virtual system (ba_system_grid).
* IN: curr_switch - The switch you want to copy the path of
* IN/OUT: mark_switch - The switch you want to fill in. On success
* this switch will contain a complete path from the curr_switch
@@ -3058,32 +3058,32 @@ failed:
*
* RET: on success 1, on error 0
*/
-static int _copy_the_path(List nodes, ba_switch_t *curr_switch,
- ba_switch_t *mark_switch,
+static int _copy_the_path(List nodes, ba_switch_t *curr_switch,
+ ba_switch_t *mark_switch,
int source, int dim)
{
int *node_tar;
int *mark_node_tar;
int *node_curr;
int port_tar, port_tar1;
- ba_switch_t *next_switch = NULL;
- ba_switch_t *next_mark_switch = NULL;
-
+ ba_switch_t *next_switch = NULL;
+ ba_switch_t *next_mark_switch = NULL;
+
/* Copy the source used and port_tar */
- mark_switch->int_wire[source].used =
+ mark_switch->int_wire[source].used =
curr_switch->int_wire[source].used;
- mark_switch->int_wire[source].port_tar =
+ mark_switch->int_wire[source].port_tar =
curr_switch->int_wire[source].port_tar;
port_tar = curr_switch->int_wire[source].port_tar;
-
+
/* Now to the same thing from the other end */
- mark_switch->int_wire[port_tar].used =
+ mark_switch->int_wire[port_tar].used =
curr_switch->int_wire[port_tar].used;
- mark_switch->int_wire[port_tar].port_tar =
+ mark_switch->int_wire[port_tar].port_tar =
curr_switch->int_wire[port_tar].port_tar;
port_tar1 = port_tar;
-
+
/* follow the path */
node_curr = curr_switch->ext_wire[0].node_tar;
node_tar = curr_switch->ext_wire[port_tar].node_tar;
@@ -3093,24 +3093,24 @@ static int _copy_the_path(List nodes, ba_switch_t *curr_switch,
alpha_num[node_curr[X]],
alpha_num[node_curr[Y]],
alpha_num[node_curr[Z]],
- source,
+ source,
alpha_num[node_tar[X]],
alpha_num[node_tar[Y]],
alpha_num[node_tar[Z]],
- port_tar);
-
+ port_tar);
+
if(port_tar == 1) {
/* found the end of the line */
- mark_switch->int_wire[1].used =
+ mark_switch->int_wire[1].used =
curr_switch->int_wire[1].used;
- mark_switch->int_wire[1].port_tar =
+ mark_switch->int_wire[1].port_tar =
curr_switch->int_wire[1].port_tar;
return 1;
}
-
+
mark_node_tar = mark_switch->ext_wire[port_tar].node_tar;
port_tar = curr_switch->ext_wire[port_tar].port_tar;
-
+
if(node_curr[X] == node_tar[X]
&& node_curr[Y] == node_tar[Y]
&& node_curr[Z] == node_tar[Z]) {
@@ -3118,7 +3118,7 @@ static int _copy_the_path(List nodes, ba_switch_t *curr_switch,
happen */
debug5("something bad happened!! "
"we are on %c%c%c and are going to it "
- "from port %d - > %d",
+ "from port %d - > %d",
alpha_num[node_curr[X]],
alpha_num[node_curr[Y]],
alpha_num[node_curr[Z]],
@@ -3144,7 +3144,7 @@ static int _copy_the_path(List nodes, ba_switch_t *curr_switch,
while((ba_node = list_next(itr))) {
if (ba_node->coord[X] == mark_node_tar[X] &&
ba_node->coord[Y] == mark_node_tar[Y] &&
- ba_node->coord[Z] == mark_node_tar[Z])
+ ba_node->coord[Z] == mark_node_tar[Z])
break; /* we found it */
}
list_iterator_destroy(itr);
@@ -3157,12 +3157,12 @@ static int _copy_the_path(List nodes, ba_switch_t *curr_switch,
_new_ba_node(ba_node, mark_node_tar, false);
list_push(nodes, ba_node);
debug4("haven't seen %c%c%c adding it",
- alpha_num[ba_node->coord[X]],
+ alpha_num[ba_node->coord[X]],
alpha_num[ba_node->coord[Y]],
alpha_num[ba_node->coord[Z]]);
}
next_mark_switch = &ba_node->axis_switch[dim];
-
+
}
/* Keep going until we reach the end of the line */
@@ -3170,13 +3170,13 @@ static int _copy_the_path(List nodes, ba_switch_t *curr_switch,
port_tar, dim);
}
-static int _find_yz_path(ba_node_t *ba_node, int *first,
+static int _find_yz_path(ba_node_t *ba_node, int *first,
int *geometry, int conn_type)
{
ba_node_t *next_node = NULL;
int *node_tar = NULL;
- ba_switch_t *dim_curr_switch = NULL;
- ba_switch_t *dim_next_switch = NULL;
+ ba_switch_t *dim_curr_switch = NULL;
+ ba_switch_t *dim_next_switch = NULL;
int i2;
int count = 0;
@@ -3187,15 +3187,15 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
alpha_num[ba_node->coord[X]],
alpha_num[ba_node->coord[Y]],
alpha_num[ba_node->coord[Z]]);
-
+
dim_curr_switch = &ba_node->axis_switch[i2];
if(dim_curr_switch->int_wire[2].used) {
debug5("returning here");
return 0;
}
-
+
node_tar = dim_curr_switch->ext_wire[2].node_tar;
-
+
next_node = &ba_system_ptr->
grid[node_tar[X]][node_tar[Y]][node_tar[Z]];
dim_next_switch = &next_node->axis_switch[i2];
@@ -3203,7 +3203,7 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
alpha_num[next_node->coord[X]],
alpha_num[next_node->coord[Y]],
alpha_num[next_node->coord[Z]]);
-
+
if(dim_next_switch->int_wire[5].used) {
debug3("returning here 2");
return 0;
@@ -3218,10 +3218,10 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
* with 5 -> 1. If we have all the midplanes
* we need then we go through and finish the
* torus if needed
- */
- if(node_tar[i2] < first[i2])
+ */
+ if(node_tar[i2] < first[i2])
count = node_tar[i2]+(DIM_SIZE[i2]-first[i2]);
- else
+ else
count = (node_tar[i2]-first[i2]);
if(count == geometry[i2]) {
@@ -3240,10 +3240,10 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
if(deny_pass
&& (node_tar[i2] != first[i2])) {
- if(i2 == 1)
+ if(i2 == 1)
*deny_pass |=
PASS_FOUND_Y;
- else
+ else
*deny_pass |=
PASS_FOUND_Z;
}
@@ -3253,14 +3253,14 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
i2,
node_tar[i2],
first[i2]);
-
+
if(dim_curr_switch->
int_wire[2].used) {
debug4("returning "
"here 3");
return 0;
- }
-
+ }
+
dim_curr_switch->
int_wire[2].used = 1;
dim_curr_switch->
@@ -3272,8 +3272,8 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
dim_curr_switch->
int_wire[5].
port_tar = 2;
-
-
+
+
node_tar = dim_curr_switch->
ext_wire[2].node_tar;
next_node = &ba_system_ptr->
@@ -3281,17 +3281,17 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
[node_tar[X]]
[node_tar[Y]]
[node_tar[Z]];
- dim_curr_switch =
+ dim_curr_switch =
&next_node->
axis_switch[i2];
}
-
+
debug4("back to first on dim %d "
"at %d looking for %d",
i2,
node_tar[i2],
first[i2]);
-
+
dim_curr_switch->
int_wire[5].used = 1;
dim_curr_switch->
@@ -3304,10 +3304,10 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
int_wire[1].
port_tar = 5;
}
-
+
} else if (count < geometry[i2]) {
- if(conn_type == SELECT_TORUS ||
- (conn_type == SELECT_MESH &&
+ if(conn_type == SELECT_TORUS ||
+ (conn_type == SELECT_MESH &&
(node_tar[i2] != first[i2]))) {
dim_curr_switch->
int_wire[0].used = 1;
@@ -3320,7 +3320,7 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
dim_curr_switch->
int_wire[2].
port_tar = 0;
-
+
dim_next_switch->int_wire[5].used
= 1;
dim_next_switch->
@@ -3345,14 +3345,14 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
0 -> 1 port correctly. We should probably
find out why this was happening in the
first place though. A reproducer was to
- have
+ have
BPs=[310x323] Type=TORUS
BPs=[200x233] Type=TORUS
BPs=[300x303] Type=TORUS
BPs=[100x133] Type=TORUS
BPs=[000x033] Type=TORUS
BPs=[400x433] Type=TORUS
- and then add
+ and then add
BPs=[330x333] Type=TORUS
*/
@@ -3387,33 +3387,33 @@ static int _emulate_ext_wiring(ba_node_t *grid)
#ifdef HAVE_3D
int y,z;
init_wires();
-
+
for(x=0;x<DIM_SIZE[X];x++) {
for(y=0;y<DIM_SIZE[Y];y++) {
for(z=0;z<DIM_SIZE[Z];z++) {
source = &grid[x][y][z];
-
+
if(x<(DIM_SIZE[X]-1)) {
target = &grid[x+1][y][z];
} else
target = &grid[0][y][z];
- _set_external_wires(X, x, source,
+ _set_external_wires(X, x, source,
target);
-
- if(y<(DIM_SIZE[Y]-1))
+
+ if(y<(DIM_SIZE[Y]-1))
target = &grid[x][y+1][z];
- else
+ else
target = &grid[x][0][z];
-
- _set_external_wires(Y, y, source,
+
+ _set_external_wires(Y, y, source,
target);
- if(z<(DIM_SIZE[Z]-1))
+ if(z<(DIM_SIZE[Z]-1))
target = &grid[x][y][z+1];
- else
+ else
target = &grid[x][y][0];
-
- _set_external_wires(Z, z, source,
+
+ _set_external_wires(Z, z, source,
target);
}
}
@@ -3422,7 +3422,7 @@ static int _emulate_ext_wiring(ba_node_t *grid)
for(x=0;x<DIM_SIZE[X];x++) {
source = &grid[x];
target = &grid[x+1];
- _set_external_wires(X, x, source,
+ _set_external_wires(X, x, source,
target);
}
#endif
@@ -3431,13 +3431,13 @@ static int _emulate_ext_wiring(ba_node_t *grid)
#endif
-static int _reset_the_path(ba_switch_t *curr_switch, int source,
+static int _reset_the_path(ba_switch_t *curr_switch, int source,
int target, int dim)
{
int *node_tar;
int *node_curr;
int port_tar, port_tar1;
- ba_switch_t *next_switch = NULL;
+ ba_switch_t *next_switch = NULL;
if(source < 0 || source > NUM_PORTS_PER_NODE) {
fatal("source port was %d can only be 0->%d",
@@ -3458,7 +3458,7 @@ static int _reset_the_path(ba_switch_t *curr_switch, int source,
fatal("port_tar port was %d can only be 0->%d",
source, NUM_PORTS_PER_NODE);
}
-
+
port_tar1 = port_tar;
curr_switch->int_wire[source].port_tar = source;
curr_switch->int_wire[port_tar].used = 0;
@@ -3515,20 +3515,20 @@ static void _new_ba_node(ba_node_t *ba_node, int *coord, bool track_down_nodes)
{
int i,j;
uint16_t node_base_state = ba_node->state & NODE_STATE_BASE;
-
+
if(((node_base_state != NODE_STATE_DOWN)
- && !(ba_node->state & NODE_STATE_DRAIN)) || !track_down_nodes)
+ && !(ba_node->state & NODE_STATE_DRAIN)) || !track_down_nodes)
ba_node->used = false;
for (i=0; i<BA_SYSTEM_DIMENSIONS; i++){
ba_node->coord[i] = coord[i];
-
+
for(j=0;j<NUM_PORTS_PER_NODE;j++) {
- ba_node->axis_switch[i].int_wire[j].used = 0;
+ ba_node->axis_switch[i].int_wire[j].used = 0;
if(i!=X) {
- if(j==3 || j==4)
+ if(j==3 || j==4)
ba_node->axis_switch[i].int_wire[j].
- used = 1;
+ used = 1;
}
ba_node->axis_switch[i].int_wire[j].port_tar = j;
}
@@ -3539,27 +3539,27 @@ static void _create_ba_system(void)
{
int x;
int coord[BA_SYSTEM_DIMENSIONS];
-
+
#ifdef HAVE_3D
int y,z;
- ba_system_ptr->grid = (ba_node_t***)
+ ba_system_ptr->grid = (ba_node_t***)
xmalloc(sizeof(ba_node_t**) * DIM_SIZE[X]);
#else
- ba_system_ptr->grid = (ba_node_t*)
+ ba_system_ptr->grid = (ba_node_t*)
xmalloc(sizeof(ba_node_t) * DIM_SIZE[X]);
#endif
for (x=0; x<DIM_SIZE[X]; x++) {
#ifdef HAVE_3D
- ba_system_ptr->grid[x] = (ba_node_t**)
+ ba_system_ptr->grid[x] = (ba_node_t**)
xmalloc(sizeof(ba_node_t*) * DIM_SIZE[Y]);
for (y=0; y<DIM_SIZE[Y]; y++) {
- ba_system_ptr->grid[x][y] = (ba_node_t*)
+ ba_system_ptr->grid[x][y] = (ba_node_t*)
xmalloc(sizeof(ba_node_t) * DIM_SIZE[Z]);
for (z=0; z<DIM_SIZE[Z]; z++){
coord[X] = x;
coord[Y] = y;
coord[Z] = z;
- _new_ba_node(&ba_system_ptr->grid[x][y][z],
+ _new_ba_node(&ba_system_ptr->grid[x][y][z],
coord, true);
}
}
@@ -3580,18 +3580,18 @@ static void _delete_ba_system(void)
if (!ba_system_ptr){
return;
}
-
+
if(ba_system_ptr->grid) {
#ifdef HAVE_BG
for (x=0; x<DIM_SIZE[X]; x++) {
for (y=0; y<DIM_SIZE[Y]; y++)
xfree(ba_system_ptr->grid[x][y]);
-
+
xfree(ba_system_ptr->grid[x]);
}
#endif
-
-
+
+
xfree(ba_system_ptr->grid);
}
xfree(ba_system_ptr);
@@ -3607,7 +3607,7 @@ static void _delete_path_list(void *object)
return;
}
-/**
+/**
* algorithm for finding match
*/
static int _find_match(ba_request_t *ba_request, List results)
@@ -3622,11 +3622,11 @@ static int _find_match(ba_request_t *ba_request, List results)
char *name=NULL;
int startx = (start[X]-1);
int *geo_ptr;
-
+
if(startx == -1)
startx = DIM_SIZE[X]-1;
if(ba_request->start_req) {
- if(ba_request->start[X]>=DIM_SIZE[X]
+ if(ba_request->start[X]>=DIM_SIZE[X]
#ifdef HAVE_BG
|| ba_request->start[Y]>=DIM_SIZE[Y]
|| ba_request->start[Z]>=DIM_SIZE[Z]
@@ -3638,7 +3638,7 @@ static int _find_match(ba_request_t *ba_request, List results)
}
}
x=0;
-
+
/* set up the geo here */
if(!(geo_ptr = list_peek(ba_request->elongate_geos)))
return 0;
@@ -3648,7 +3648,7 @@ static int _find_match(ba_request_t *ba_request, List results)
ba_request->geometry[Y] = geo_ptr[Y];
ba_request->geometry[Z] = geo_ptr[Z];
- if(ba_request->geometry[X]>DIM_SIZE[X]
+ if(ba_request->geometry[X]>DIM_SIZE[X]
#ifdef HAVE_3D
|| ba_request->geometry[Y]>DIM_SIZE[Y]
|| ba_request->geometry[Z]>DIM_SIZE[Z]
@@ -3684,7 +3684,7 @@ start_again:
alpha_num[start[Z]]
#endif
);
-
+
ba_node = &ba_system_ptr->
grid[start[X]]
#ifdef HAVE_3D
@@ -3700,32 +3700,32 @@ start_again:
alpha_num[start[Z]],
alpha_num[ba_request->geometry[X]],
alpha_num[ba_request->geometry[Y]],
- alpha_num[ba_request->geometry[Z]],
+ alpha_num[ba_request->geometry[Z]],
ba_request->conn_type);
name = set_bg_block(results,
- start,
- ba_request->geometry,
+ start,
+ ba_request->geometry,
ba_request->conn_type);
if(name) {
ba_request->save_name = xstrdup(name);
xfree(name);
return 1;
}
-
+
if(results) {
remove_block(results, color_count);
list_delete_all(results,
&empty_null_destroy_list, "");
}
- if(ba_request->start_req)
+ if(ba_request->start_req)
goto requested_end;
//exit(0);
debug2("trying something else");
-
+
}
-
+
#ifdef HAVE_3D
-
+
if((DIM_SIZE[Z]-start[Z]-1)
>= ba_request->geometry[Z])
start[Z]++;
@@ -3759,14 +3759,14 @@ start_again:
}
goto new_node;
#endif
- }
+ }
requested_end:
debug2("1 can't allocate");
-
+
return 0;
}
-/*
+/*
* Used to check if midplane is usable in the block we are creating
*
* IN: ba_node - node to check if is used
@@ -3778,13 +3778,13 @@ static bool _node_used(ba_node_t* ba_node, int x_size)
ba_switch_t* ba_switch = NULL;
/* if we've used this node in another block already */
if (!ba_node || ba_node->used) {
- debug4("node %c%c%c used",
+ debug4("node %c%c%c used",
alpha_num[ba_node->coord[X]],
alpha_num[ba_node->coord[Y]],
alpha_num[ba_node->coord[Z]]);
return true;
}
- /* Check If we've used this node's switches completely in another
+ /* Check If we've used this node's switches completely in another
block already. Right now we are only needing to look at
the X dim since it is the only one with extra wires. This
can be set up to do all the dim's if in the future if it is
@@ -3793,7 +3793,7 @@ static bool _node_used(ba_node_t* ba_node, int x_size)
if(x_size > 1) {
/* get the switch of the X Dimension */
ba_switch = &ba_node->axis_switch[X];
-
+
/* If both of these ports are used then the node
is in use since there are no more wires we
can use since these can not connect to each
@@ -3807,13 +3807,13 @@ static bool _node_used(ba_node_t* ba_node, int x_size)
return true;
}
}
-
+
return false;
}
-static void _switch_config(ba_node_t* source, ba_node_t* target, int dim,
+static void _switch_config(ba_node_t* source, ba_node_t* target, int dim,
int port_src, int port_tar)
{
ba_switch_t* config = NULL, *config_tar = NULL;
@@ -3821,25 +3821,25 @@ static void _switch_config(ba_node_t* source, ba_node_t* target, int dim,
if (!source || !target)
return;
-
+
config = &source->axis_switch[dim];
config_tar = &target->axis_switch[dim];
for(i=0;i<BA_SYSTEM_DIMENSIONS;i++) {
/* Set the coord of the source target node to the target */
config->ext_wire[port_src].node_tar[i] = target->coord[i];
-
+
/* Set the coord of the target back to the source */
config_tar->ext_wire[port_tar].node_tar[i] = source->coord[i];
}
/* Set the port of the source target node to the target */
config->ext_wire[port_src].port_tar = port_tar;
-
+
/* Set the port of the target back to the source */
config_tar->ext_wire[port_tar].port_tar = port_src;
}
-static int _set_external_wires(int dim, int count, ba_node_t* source,
+static int _set_external_wires(int dim, int count, ba_node_t* source,
ba_node_t* target)
{
#ifdef HAVE_BG_FILES
@@ -3871,25 +3871,25 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
error("Can't access DB2 library, run from service node");
return -1;
}
-
+
if (!bg) {
if((rc = bridge_get_bg(&bg)) != STATUS_OK) {
error("bridge_get_BG(): %d", rc);
return -1;
}
}
-
- if (bg == NULL)
+
+ if (bg == NULL)
return -1;
-
+
if ((rc = bridge_get_data(bg, RM_WireNum, &wire_num)) != STATUS_OK) {
error("bridge_get_data(RM_BPNum): %d", rc);
wire_num = 0;
}
/* find out system wires on each bp */
-
+
for (i=0; i<wire_num; i++) {
-
+
if (i) {
if ((rc = bridge_get_data(bg, RM_NextWire, &my_wire))
!= STATUS_OK) {
@@ -3908,13 +3908,13 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
error("bridge_get_data(RM_FirstWire): %d", rc);
break;
}
-
+
if(!wire_id) {
error("No Wire ID was returned from database");
continue;
}
- if(wire_id[UNDER_POS] != '_')
+ if(wire_id[UNDER_POS] != '_')
continue;
switch(wire_id[0]) {
case 'X':
@@ -3931,7 +3931,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
error("Wire_id isn't correct %s",wire_id);
continue;
}
-
+
memset(&from_node, 0, sizeof(from_node));
memset(&to_node, 0, sizeof(to_node));
strncpy(from_node, wire_id+2, NODE_LEN-1);
@@ -3979,12 +3979,12 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
target = &ba_system_ptr->
grid[coord[X]][coord[Y]][coord[Z]];
- _switch_config(source,
- target,
- dim,
+ _switch_config(source,
+ target,
+ dim,
_port_enum(from_port),
- _port_enum(to_port));
-
+ _port_enum(to_port));
+
debug3("dim %d from %c%c%c %d -> %c%c%c %d",
dim,
alpha_num[source->coord[X]],
@@ -3992,7 +3992,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
alpha_num[source->coord[Z]],
_port_enum(from_port),
alpha_num[target->coord[X]],
- alpha_num[target->coord[Y]],
+ alpha_num[target->coord[Y]],
alpha_num[target->coord[Z]],
_port_enum(to_port));
}
@@ -4006,7 +4006,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
_switch_config(source, source, dim, 4, 4);
return 1;
}
-
+
#ifdef HAVE_BG
/* set up x */
/* always 2->5 of next. If it is the last it will go to the first.*/
@@ -4028,7 +4028,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
[source->coord[Z]];
/* 4->3 of 0th */
_switch_config(source, target, dim, 4, 3);
- break;
+ break;
case 2:
/* 2nd Node */
target = &ba_system_ptr->grid[3]
@@ -4078,7 +4078,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
[source->coord[Z]];
/* 4->3 of 1st */
_switch_config(source, target, dim, 4, 3);
-
+
break;
default:
fatal("got %d for a count on a %d X-dim system",
@@ -4100,7 +4100,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
[source->coord[Z]];
/* 4->3 of previous */
_switch_config(source, target, dim, 4, 3);
- break;
+ break;
case 2:
/* 2nd Node */
target = &ba_system_ptr->grid[7]
@@ -4123,7 +4123,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
[source->coord[Y]]
[source->coord[Z]];
/* 4->3 of 3rd */
- _switch_config(source, target, dim, 4, 3);
+ _switch_config(source, target, dim, 4, 3);
break;
case 7:
/* 7th Node */
@@ -4131,7 +4131,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
[source->coord[Y]]
[source->coord[Z]];
/* 4->3 of 2nd */
- _switch_config(source, target, dim, 4, 3);
+ _switch_config(source, target, dim, 4, 3);
break;
default:
fatal("got %d for a count on a %d X-dim system",
@@ -4157,7 +4157,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
/* 4->3 of 7th and back */
_switch_config(source, target, dim, 4, 3);
_switch_config(target, source, dim, 4, 3);
- break;
+ break;
case 2:
/* 2nd Node */
target = &ba_system_ptr->grid[6]
@@ -4182,7 +4182,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
[source->coord[Y]]
[source->coord[Z]];
/* 4->3 of 0th */
- _switch_config(source, target, dim, 4, 3);
+ _switch_config(source, target, dim, 4, 3);
break;
default:
fatal("got %d for a count on a %d X-dim system",
@@ -4215,10 +4215,10 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
* from 4->3 and back again
*/
temp_num = 12 - (count - 1);
- if(temp_num < 5)
+ if(temp_num < 5)
fatal("node %d shouldn't go to %d",
count, temp_num);
-
+
target = &ba_system_ptr->grid[temp_num]
[source->coord[Y]]
[source->coord[Z]];
@@ -4234,7 +4234,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
[source->coord[Z]];
/* 4->3 of previous */
_switch_config(source, target, dim, 4, 3);
- break;
+ break;
default:
fatal("got %d for a count on a %d X-dim system",
count, DIM_SIZE[X]);
@@ -4257,7 +4257,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
#endif /* HAVE_BG_FILES */
return 1;
}
-
+
static char *_set_internal_wires(List nodes, int size, int conn_type)
{
ba_node_t* ba_node[size+1];
@@ -4276,7 +4276,7 @@ static char *_set_internal_wires(List nodes, int size, int conn_type)
hostlist = hostlist_create(NULL);
itr = list_iterator_create(nodes);
while((ba_node[count] = list_next(itr))) {
- snprintf(temp_name, sizeof(temp_name), "%c%c%c",
+ snprintf(temp_name, sizeof(temp_name), "%c%c%c",
alpha_num[ba_node[count]->coord[X]],
alpha_num[ba_node[count]->coord[Y]],
alpha_num[ba_node[count]->coord[Z]]);
@@ -4285,9 +4285,9 @@ static char *_set_internal_wires(List nodes, int size, int conn_type)
hostlist_push(hostlist, temp_name);
}
list_iterator_destroy(itr);
-
+
start = ba_node[0]->coord;
- end = ba_node[count-1]->coord;
+ end = ba_node[count-1]->coord;
hostlist_ranged_string(hostlist, BUFSIZE, name);
hostlist_destroy(hostlist);
@@ -4320,17 +4320,17 @@ static char *_set_internal_wires(List nodes, int size, int conn_type)
}
if(set)
- color_count++;
+ color_count++;
return name;
-}
+}
/*
* Used to find a complete path based on the conn_type for an x dim.
* When starting to wire a block together this should be called first.
*
* IN/OUT: results - contains the number of midplanes we are
- * potentially going to use in the X dim.
+ * potentially going to use in the X dim.
* IN: ba_node - current node we are looking at and have already added
* to results.
* IN: start - coordinates of the first midplane (so we know when when
@@ -4342,13 +4342,13 @@ static char *_set_internal_wires(List nodes, int size, int conn_type)
*
* RET: 0 on failure, 1 on success
*/
-static int _find_x_path(List results, ba_node_t *ba_node,
- int *start, int x_size,
- int found, int conn_type, block_algo_t algo)
+static int _find_x_path(List results, ba_node_t *ba_node,
+ int *start, int x_size,
+ int found, int conn_type, block_algo_t algo)
{
- ba_switch_t *curr_switch = NULL;
- ba_switch_t *next_switch = NULL;
-
+ ba_switch_t *curr_switch = NULL;
+ ba_switch_t *next_switch = NULL;
+
int port_tar = 0;
int source_port=0;
int target_port=1;
@@ -4374,10 +4374,10 @@ static int _find_x_path(List results, ba_node_t *ba_node,
* connections in this path */
if(conn_type == SELECT_TORUS) {
curr_switch->int_wire[source_port].used = 1;
- curr_switch->int_wire[source_port].port_tar =
+ curr_switch->int_wire[source_port].port_tar =
target_port;
curr_switch->int_wire[target_port].used = 1;
- curr_switch->int_wire[target_port].port_tar =
+ curr_switch->int_wire[target_port].port_tar =
source_port;
}
return 1;
@@ -4392,8 +4392,8 @@ static int _find_x_path(List results, ba_node_t *ba_node,
} else {
error("Unknown algo %d", algo);
return 0;
- }
-
+ }
+
debug4("Algo(%d) found - %d", algo, found);
/* Check the 2 ports we can leave though in ports_to_try */
@@ -4401,7 +4401,7 @@ static int _find_x_path(List results, ba_node_t *ba_node,
/* info("trying port %d", ports_to_try[i]); */
/* check to make sure it isn't used */
if(!curr_switch->int_wire[ports_to_try[i]].used) {
- /* looking at the next node on the switch
+ /* looking at the next node on the switch
and it's port we are going to */
node_tar = curr_switch->
ext_wire[ports_to_try[i]].node_tar;
@@ -4418,8 +4418,8 @@ static int _find_x_path(List results, ba_node_t *ba_node,
/* port_tar); */
/* check to see if we are back at the start of the
block */
- if((node_tar[X] == start[X]
- && node_tar[Y] == start[Y]
+ if((node_tar[X] == start[X]
+ && node_tar[Y] == start[Y]
&& node_tar[Z] == start[Z])) {
broke = 1;
goto broke_it;
@@ -4442,12 +4442,12 @@ static int _find_x_path(List results, ba_node_t *ba_node,
alpha_num[node_tar[X]],
alpha_num[node_tar[Y]],
alpha_num[node_tar[Z]]);
- if((node_tar[X] == next_node->coord[X]
+ if((node_tar[X] == next_node->coord[X]
&& node_tar[Y] == next_node->coord[Y]
&& node_tar[Z] == next_node->coord[Z])) {
not_first = 1;
break;
- }
+ }
}
list_iterator_destroy(itr);
if(not_first && found < DIM_SIZE[X]) {
@@ -4455,9 +4455,9 @@ static int _find_x_path(List results, ba_node_t *ba_node,
algo);
not_first = 0;
continue;
- }
+ }
not_first = 0;
-
+
broke_it:
next_node = &ba_system_ptr->grid[node_tar[X]]
#ifdef HAVE_3D
@@ -4495,8 +4495,8 @@ static int _find_x_path(List results, ba_node_t *ba_node,
list_flush(path);
else
path = list_create(_delete_path_list);
-
- _finish_torus(results,
+
+ _finish_torus(results,
curr_switch, 0, X, 0, start);
if(best_count < BEST_COUNT_INIT) {
@@ -4531,9 +4531,9 @@ static int _find_x_path(List results, ba_node_t *ba_node,
itr = list_iterator_create(results);
while((check_node = list_next(itr))) {
if((node_tar[X] == check_node->coord[X]
- && node_tar[Y] ==
+ && node_tar[Y] ==
check_node->coord[Y]
- && node_tar[Z] ==
+ && node_tar[Z] ==
check_node->coord[Z])) {
break;
}
@@ -4546,7 +4546,7 @@ static int _find_x_path(List results, ba_node_t *ba_node,
alpha_num[next_node->coord[X]],
alpha_num[next_node->coord[Y]],
alpha_num[next_node->coord[Z]]);
-#endif
+#endif
list_append(results, next_node);
} else {
#ifdef HAVE_BG
@@ -4562,8 +4562,8 @@ static int _find_x_path(List results, ba_node_t *ba_node,
found++;
/* look for the next closest midplane */
- if(!_find_x_path(results, next_node,
- start, x_size,
+ if(!_find_x_path(results, next_node,
+ start, x_size,
found, conn_type, algo)) {
_remove_node(results, next_node->coord);
found--;
@@ -4584,7 +4584,7 @@ static int _find_x_path(List results, ba_node_t *ba_node,
alpha_num[node_tar[Z]],
port_tar,
target_port);
-#endif
+#endif
curr_switch->int_wire[source_port].used
= 1;
curr_switch->int_wire
@@ -4593,9 +4593,9 @@ static int _find_x_path(List results, ba_node_t *ba_node,
curr_switch->int_wire
[ports_to_try[i]].used = 1;
curr_switch->int_wire
- [ports_to_try[i]].port_tar
+ [ports_to_try[i]].port_tar
= source_port;
-
+
next_switch->int_wire[port_tar].used
= 1;
next_switch->int_wire[port_tar].port_tar
@@ -4607,7 +4607,7 @@ static int _find_x_path(List results, ba_node_t *ba_node,
= port_tar;
return 1;
}
- }
+ }
}
}
@@ -4623,19 +4623,19 @@ static int _find_x_path(List results, ba_node_t *ba_node,
alpha_num[ba_node->coord[Y]],
alpha_num[ba_node->coord[Z]]);
#endif
-
+
if(best_path)
list_flush(best_path);
else
best_path = list_create(_delete_path_list);
-
+
if(path)
list_flush(path);
else
path = list_create(_delete_path_list);
-
+
_find_next_free_using_port_2(curr_switch, 0, results, X, 0);
-
+
if(best_count < BEST_COUNT_INIT) {
debug3("Algo(%d) yes found next free %d", algo,
best_count);
@@ -4653,9 +4653,9 @@ static int _find_x_path(List results, ba_node_t *ba_node,
[node_tar[Z]]
#endif
;
-
+
next_switch = &next_node->axis_switch[X];
-
+
#ifdef HAVE_BG
debug3("Algo(%d) found %d looking at %c%c%c "
"going to %c%c%c %d",
@@ -4667,10 +4667,10 @@ static int _find_x_path(List results, ba_node_t *ba_node,
alpha_num[node_tar[Y]],
alpha_num[node_tar[Z]],
port_tar);
-#endif
+#endif
list_append(results, next_node);
found++;
- if(_find_x_path(results, next_node,
+ if(_find_x_path(results, next_node,
start, x_size, found,
conn_type, algo)) {
return 1;
@@ -4681,8 +4681,8 @@ static int _find_x_path(List results, ba_node_t *ba_node,
debug3("Algo(%d) couldn't finish "
"the path off this one", algo);
}
- }
-
+ }
+
debug3("Algo(%d) couldn't find path", algo);
return 0;
}
@@ -4696,13 +4696,13 @@ static int _remove_node(List results, int *node_tar)
{
ListIterator itr;
ba_node_t *ba_node = NULL;
-
+
itr = list_iterator_create(results);
while((ba_node = (ba_node_t*) list_next(itr))) {
-
+
#ifdef HAVE_BG
- if(node_tar[X] == ba_node->coord[X]
- && node_tar[Y] == ba_node->coord[Y]
+ if(node_tar[X] == ba_node->coord[X]
+ && node_tar[Y] == ba_node->coord[Y]
&& node_tar[Z] == ba_node->coord[Z]) {
debug3("removing %c%c%c from list",
alpha_num[node_tar[X]],
@@ -4724,14 +4724,14 @@ static int _remove_node(List results, int *node_tar)
return 1;
}
-static int _find_next_free_using_port_2(ba_switch_t *curr_switch,
- int source_port,
- List nodes,
- int dim,
- int count)
+static int _find_next_free_using_port_2(ba_switch_t *curr_switch,
+ int source_port,
+ List nodes,
+ int dim,
+ int count)
{
- ba_switch_t *next_switch = NULL;
- ba_path_switch_t *path_add =
+ ba_switch_t *next_switch = NULL;
+ ba_path_switch_t *path_add =
(ba_path_switch_t *) xmalloc(sizeof(ba_path_switch_t));
ba_path_switch_t *path_switch = NULL;
ba_path_switch_t *temp_switch = NULL;
@@ -4743,7 +4743,7 @@ static int _find_next_free_using_port_2(ba_switch_t *curr_switch,
int used = 0;
int broke = 0;
ba_node_t *ba_node = NULL;
-
+
ListIterator itr;
static bool found = false;
@@ -4757,14 +4757,14 @@ static int _find_next_free_using_port_2(ba_switch_t *curr_switch,
if(count>=best_count)
goto return_0;
-
+
itr = list_iterator_create(nodes);
while((ba_node = (ba_node_t*) list_next(itr))) {
-
- if(node_tar[X] == ba_node->coord[X]
+
+ if(node_tar[X] == ba_node->coord[X]
#ifdef HAVE_3D
- && node_tar[Y] == ba_node->coord[Y]
- && node_tar[Z] == ba_node->coord[Z]
+ && node_tar[Y] == ba_node->coord[Y]
+ && node_tar[Z] == ba_node->coord[Z]
#endif
)
{
@@ -4773,7 +4773,7 @@ static int _find_next_free_using_port_2(ba_switch_t *curr_switch,
}
}
list_iterator_destroy(itr);
-
+
if(!broke && count>0 &&
!ba_system_ptr->grid[node_tar[X]]
#ifdef HAVE_3D
@@ -4781,30 +4781,30 @@ static int _find_next_free_using_port_2(ba_switch_t *curr_switch,
[node_tar[Z]]
#endif
.used) {
-
+
#ifdef HAVE_BG
debug3("this one not found %c%c%c",
alpha_num[node_tar[X]],
alpha_num[node_tar[Y]],
alpha_num[node_tar[Z]]);
-#endif
+#endif
broke = 0;
-
+
if((source_port%2))
target_port=1;
-
+
list_flush(best_path);
-
+
found = true;
path_add->out = target_port;
list_push(path, path_add);
-
+
itr = list_iterator_create(path);
while((path_switch = (ba_path_switch_t*) list_next(itr))){
-
- temp_switch = (ba_path_switch_t *)
+
+ temp_switch = (ba_path_switch_t *)
xmalloc(sizeof(ba_path_switch_t));
-
+
temp_switch->geometry[X] = path_switch->geometry[X];
#ifdef HAVE_BG
temp_switch->geometry[Y] = path_switch->geometry[Y];
@@ -4818,23 +4818,23 @@ static int _find_next_free_using_port_2(ba_switch_t *curr_switch,
list_iterator_destroy(itr);
best_count = count;
return 1;
- }
+ }
used=0;
if(!curr_switch->int_wire[port_to_try].used) {
itr = list_iterator_create(path);
- while((path_switch =
+ while((path_switch =
(ba_path_switch_t*) list_next(itr))){
-
- if(((path_switch->geometry[X] == node_src[X])
+
+ if(((path_switch->geometry[X] == node_src[X])
#ifdef HAVE_BG
- && (path_switch->geometry[Y]
+ && (path_switch->geometry[Y]
== node_src[Y])
- && (path_switch->geometry[Z]
+ && (path_switch->geometry[Z]
== node_tar[Z])
#endif
)) {
-
+
if( path_switch->out
== port_to_try) {
used = 1;
@@ -4843,29 +4843,29 @@ static int _find_next_free_using_port_2(ba_switch_t *curr_switch,
}
}
list_iterator_destroy(itr);
-
+
/* check to see if wire 0 is used with this port */
if(curr_switch->
ext_wire[port_to_try].node_tar[X]
- == curr_switch->ext_wire[0].node_tar[X]
+ == curr_switch->ext_wire[0].node_tar[X]
#ifdef HAVE_3D
&& curr_switch->
- ext_wire[port_to_try].node_tar[Y]
- == curr_switch->ext_wire[0].node_tar[Y]
+ ext_wire[port_to_try].node_tar[Y]
+ == curr_switch->ext_wire[0].node_tar[Y]
&& curr_switch->
- ext_wire[port_to_try].node_tar[Z]
+ ext_wire[port_to_try].node_tar[Z]
== curr_switch->ext_wire[0].node_tar[Z]
#endif
) {
used = 1;
}
-
+
if(!used) {
port_tar = curr_switch->
ext_wire[port_to_try].port_tar;
node_tar = curr_switch->
ext_wire[port_to_try].node_tar;
-
+
next_switch = &ba_system_ptr->
grid[node_tar[X]]
#ifdef HAVE_3D
@@ -4873,11 +4873,11 @@ static int _find_next_free_using_port_2(ba_switch_t *curr_switch,
[node_tar[Z]]
#endif
.axis_switch[X];
-
+
count++;
path_add->out = port_to_try;
list_push(path, path_add);
- _find_next_free_using_port_2(next_switch,
+ _find_next_free_using_port_2(next_switch,
port_tar, nodes,
dim, count);
while((temp_switch = list_pop(path)) != path_add){
@@ -4896,11 +4896,11 @@ return_0:
* should both be set up before calling this function.
*
* IN: curr_switch -
- * IN: source_port -
+ * IN: source_port -
* IN: dim -
* IN: count -
* IN: start -
- *
+ *
* RET: 0 on failure, 1 on success
*
* Sets up global variable best_path, and best_count. On success
@@ -4908,7 +4908,7 @@ return_0:
* to apply this path to the main system (ba_system_ptr)
*/
-static int _finish_torus(List results,
+static int _finish_torus(List results,
ba_switch_t *curr_switch, int source_port,
int dim, int count, int *start)
{
@@ -4944,22 +4944,22 @@ static int _finish_torus(List results,
&& node_tar[Z] == start[Z]
#endif
) {
-
+
if((source_port%2))
target_port=1;
if(!curr_switch->int_wire[target_port].used) {
-
+
list_flush(best_path);
-
+
found = true;
path_add->out = target_port;
list_push(path, path_add);
-
+
itr = list_iterator_create(path);
while((path_switch = list_next(itr))) {
-
+
temp_switch = xmalloc(sizeof(ba_path_switch_t));
-
+
temp_switch->geometry[X] =
path_switch->geometry[X];
#ifdef HAVE_BG
@@ -4978,18 +4978,18 @@ static int _finish_torus(List results,
return 1;
}
}
-
+
if(source_port==0 || source_port==3 || source_port==5) {
ports_to_try[0] = 4;
ports_to_try[1] = 2;
}
-
+
for(i=0;i<2;i++) {
used=0;
if(!curr_switch->int_wire[ports_to_try[i]].used) {
itr = list_iterator_create(path);
while((path_switch = list_next(itr))){
-
+
if(((path_switch->geometry[X] == node_src[X])
#ifdef HAVE_BG
&& (path_switch->geometry[Y]
@@ -5044,13 +5044,13 @@ static int _finish_torus(List results,
alpha_num[node_tar[X]],
alpha_num[node_tar[Y]],
alpha_num[node_tar[Z]]);
- if((node_tar[X] == next_node->coord[X])
- && (node_tar[Y]
+ if((node_tar[X] == next_node->coord[X])
+ && (node_tar[Y]
== next_node->coord[Y])
- && (node_tar[Z]
+ && (node_tar[Z]
== next_node->coord[Z])) {
break;
- }
+ }
}
list_iterator_destroy(itr);
if(next_node) {
@@ -5069,12 +5069,12 @@ static int _finish_torus(List results,
[node_tar[Z]]
#endif
.axis_switch[dim];
-
-
+
+
count++;
path_add->out = ports_to_try[i];
list_push(path, path_add);
- _finish_torus(results, next_switch, port_tar,
+ _finish_torus(results, next_switch, port_tar,
dim, count, start);
while((temp_switch = list_pop(path))
!= path_add){
@@ -5098,7 +5098,7 @@ static int *_set_best_path()
{
ListIterator itr;
ba_path_switch_t *path_switch = NULL;
- ba_switch_t *curr_switch = NULL;
+ ba_switch_t *curr_switch = NULL;
int *geo = NULL;
if(!best_path)
@@ -5121,18 +5121,18 @@ static int *_set_best_path()
curr_switch = &ba_system_ptr->grid
[path_switch->geometry[X]]
[path_switch->geometry[Y]]
- [path_switch->geometry[Z]].
+ [path_switch->geometry[Z]].
axis_switch[path_switch->dim];
#else
curr_switch = &ba_system_ptr->grid[path_switch->geometry[X]].
axis_switch[path_switch->dim];
#endif
-
+
curr_switch->int_wire[path_switch->in].used = 1;
- curr_switch->int_wire[path_switch->in].port_tar =
+ curr_switch->int_wire[path_switch->in].port_tar =
path_switch->out;
curr_switch->int_wire[path_switch->out].used = 1;
- curr_switch->int_wire[path_switch->out].port_tar =
+ curr_switch->int_wire[path_switch->out].port_tar =
path_switch->in;
}
list_iterator_destroy(itr);
@@ -5144,8 +5144,8 @@ static int *_set_best_path()
static int _set_one_dim(int *start, int *end, int *coord)
{
int dim;
- ba_switch_t *curr_switch = NULL;
-
+ ba_switch_t *curr_switch = NULL;
+
for(dim=0;dim<BA_SYSTEM_DIMENSIONS;dim++) {
if(start[dim]==end[dim]) {
curr_switch = &ba_system_ptr->grid[coord[X]]
@@ -5155,7 +5155,7 @@ static int _set_one_dim(int *start, int *end, int *coord)
#endif
.axis_switch[dim];
- if(!curr_switch->int_wire[0].used
+ if(!curr_switch->int_wire[0].used
&& !curr_switch->int_wire[1].used) {
curr_switch->int_wire[0].used = 1;
curr_switch->int_wire[0].port_tar = 1;
@@ -5167,7 +5167,7 @@ static int _set_one_dim(int *start, int *end, int *coord)
return 1;
}
-static void _destroy_geo(void *object)
+static void _destroy_geo(void *object)
{
int *geo_ptr = (int *)object;
xfree(geo_ptr);
diff --git a/src/plugins/select/bluegene/block_allocator/block_allocator.h b/src/plugins/select/bluegene/block_allocator/block_allocator.h
index 59d13601733e4db3e32024be2e04facbd33e172c..b1fa5067e522b3d2c681d05ac4b6a89eb02d3ce7 100644
--- a/src/plugins/select/bluegene/block_allocator/block_allocator.h
+++ b/src/plugins/select/bluegene/block_allocator/block_allocator.h
@@ -1,36 +1,36 @@
/*****************************************************************************\
* block_allocator.h
- *
+ *
*****************************************************************************
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Dan Phung <phung4@llnl.gov>, Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -69,28 +69,28 @@ enum {X, Y, Z};
/* */
-/*
- * structure that holds switch path information for finding the wiring
+/*
+ * structure that holds switch path information for finding the wiring
* path without setting the configuration.
*
* - dim - Which Axis it is on
* - geometry - node location
* - in - ingress port.
* - out - egress port.
- *
+ *
*/
typedef struct {
int dim;
int geometry[BA_SYSTEM_DIMENSIONS];
- int in;
+ int in;
int out;
-} ba_path_switch_t;
+} ba_path_switch_t;
-/*
+/*
* structure that holds the configuration settings for each request
*/
typedef struct {
- bitstr_t *avail_node_bitmap; /* pointer to available nodes */
+ bitstr_t *avail_node_bitmap; /* pointer to available nodes */
#ifdef HAVE_BGL
char *blrtsimage; /* BlrtsImage for this block */
#endif
@@ -136,7 +136,7 @@ typedef struct {
block */
int start_req; /* state there was a start
request */
-} ba_request_t;
+} ba_request_t;
/* structure filled in from reading bluegene.conf file for block
* creation */
@@ -185,9 +185,9 @@ typedef struct {
gid_t gid;
} image_group_t;
-/*
+/*
* structure that holds the configuration settings for each connection
- *
+ *
* - node_tar - coords of where the next hop is externally
* interanlly - nothing.
* exteranlly - location of next hop.
@@ -195,25 +195,25 @@ typedef struct {
* interanlly - always going to something within the switch.
* exteranlly - always going to the next hop outside the switch.
* - used - weather or not the connection is used.
- *
+ *
*/
-typedef struct
+typedef struct
{
/* target label */
int node_tar[BA_SYSTEM_DIMENSIONS];
- /* target port */
+ /* target port */
int port_tar;
- bool used;
+ bool used;
} ba_connection_t;
-/*
+/*
* structure that holds the configuration settings for each switch
- * which pretty much means the wiring information
+ * which pretty much means the wiring information
* - int_wire - keeps details of where the wires are attached
* interanlly.
* - ext_wire - keeps details of where the wires are attached
* exteranlly.
- *
+ *
*/
typedef struct
{
@@ -226,7 +226,7 @@ typedef struct
*/
typedef struct {
/* a switch for each dimensions */
- ba_switch_t axis_switch[BA_SYSTEM_DIMENSIONS];
+ ba_switch_t axis_switch[BA_SYSTEM_DIMENSIONS];
/* coordinates of midplane */
int coord[BA_SYSTEM_DIMENSIONS];
/* color of letter used in smap */
@@ -234,8 +234,8 @@ typedef struct {
/* midplane index used for easy look up of the miplane */
int index;
/* letter used in smap */
- char letter;
-// int phys_x; // no longer needed
+ char letter;
+// int phys_x; // no longer needed
int state;
/* set if using this midplane in a block */
uint16_t used;
@@ -259,7 +259,7 @@ typedef struct {
*/
typedef struct {
char *bp_id;
- int coord[BA_SYSTEM_DIMENSIONS];
+ int coord[BA_SYSTEM_DIMENSIONS];
} ba_bp_map_t;
/* Global */
@@ -280,14 +280,14 @@ extern char *ba_passthroughs_string(uint16_t passthrough);
/* Parse a block request from the bluegene.conf file */
extern int parse_blockreq(void **dest, slurm_parser_enum_t type,
- const char *key, const char *value,
+ const char *key, const char *value,
const char *line, char **leftover);
extern void destroy_blockreq(void *ptr);
/* Parse imagine information from blugene.conf file */
extern int parse_image(void **dest, slurm_parser_enum_t type,
- const char *key, const char *value,
+ const char *key, const char *value,
const char *line, char **leftover);
extern void destroy_image_group_list(void *ptr);
@@ -298,10 +298,10 @@ extern void destroy_ba_node(void *ptr);
* create a block request. Note that if the geometry is given,
* then size is ignored. If elongate is true, the algorithm will try
* to fit that a block of cubic shape and then it will try other
- * elongated geometries. (ie, 2x2x2 -> 4x2x1 -> 8x1x1).
- *
- * IN/OUT - ba_request: structure to allocate and fill in.
- *
+ * elongated geometries. (ie, 2x2x2 -> 4x2x1 -> 8x1x1).
+ *
+ * IN/OUT - ba_request: structure to allocate and fill in.
+ *
* ALL below IN's need to be set within the ba_request before the call
* if you want them to be used.
* ALL below OUT's are set and returned within the ba_request.
@@ -327,7 +327,7 @@ extern void destroy_ba_node(void *ptr);
extern int new_ba_request(ba_request_t* ba_request);
/*
- * delete a block request
+ * delete a block request
*/
extern void delete_ba_request(void *arg);
@@ -338,18 +338,18 @@ extern void delete_ba_request(void *arg);
extern int empty_null_destroy_list(void *arg, void *key);
/*
- * print a block request
+ * print a block request
*/
extern void print_ba_request(ba_request_t* ba_request);
/*
* Initialize internal structures by either reading previous block
* configurations from a file or by running the graph solver.
- *
- * IN: node_info_msg_t * can be null,
+ *
+ * IN: node_info_msg_t * can be null,
* should be from slurm_load_node().
* IN: load_bridge: whiether or not to get bridge information
- *
+ *
* return: void.
*/
extern void ba_init(node_info_msg_t *node_info_ptr, bool load_bridge);
@@ -361,31 +361,31 @@ extern void ba_init(node_info_msg_t *node_info_ptr, bool load_bridge);
*/
extern void init_wires();
-/*
+/*
* destroy all the internal (global) data structs.
*/
extern void ba_fini();
-/*
+/*
* set the node in the internal configuration as in, or not in use,
* along with the current state of the node.
- *
+ *
* IN ba_node: ba_node_t to update state
* IN state: new state of ba_node_t
*/
extern void ba_update_node_state(ba_node_t *ba_node, uint16_t state);
-/*
+/*
* copy info from a ba_node, a direct memcpy of the ba_node_t
- *
+ *
* IN ba_node: node to be copied
* Returned ba_node_t *: copied info must be freed with destroy_ba_node
*/
extern ba_node_t *ba_copy_node(ba_node_t *ba_node);
-/*
+/*
* copy the path of the nodes given
- *
+ *
* IN nodes List of ba_node_t *'s: nodes to be copied
* OUT dest_nodes List of ba_node_t *'s: filled in list of nodes
* wiring.
@@ -393,33 +393,33 @@ extern ba_node_t *ba_copy_node(ba_node_t *ba_node);
*/
extern int copy_node_path(List nodes, List *dest_nodes);
-/*
+/*
* Try to allocate a block.
- *
+ *
* IN - ba_request: allocation request
* OUT - results: List of results of the allocation request. Each
* list entry will be a coordinate. allocate_block will create the
* list, but the caller must destroy it.
- *
+ *
* return: success or error of request
*/
extern int allocate_block(ba_request_t* ba_request, List results);
-/*
+/*
* Admin wants to remove a previous allocation.
* will allow Admin to delete a previous allocation retrival by letter code.
*/
extern int remove_block(List nodes, int new_count);
-/*
- * Admin wants to change something about a previous allocation.
- * will allow Admin to change previous allocation by giving the
+/*
+ * Admin wants to change something about a previous allocation.
+ * will allow Admin to change previous allocation by giving the
* letter code for the allocation and the variable to alter
* (Not currently used in the system, update this if it is)
*/
extern int alter_block(List nodes, int conn_type);
-/*
+/*
* After a block is deleted or altered following allocations must
* be redone to make sure correct path will be used in the real system
* (Not currently used in the system, update this if it is)
@@ -443,8 +443,8 @@ extern int check_and_set_node_list(List nodes);
/*
* Used to find, and set up midplanes and the wires in the virtual
- * system and return them in List results
- *
+ * system and return them in List results
+ *
* IN/OUT results - a list with a NULL destroyer filled in with
* midplanes and wires set to create the block with the api. If
* only interested in the hostlist NULL can be excepted also.
@@ -454,7 +454,7 @@ extern int check_and_set_node_list(List nodes);
* RET char * - hostlist of midplanes results represent must be
* xfreed. NULL on failure
*/
-extern char *set_bg_block(List results, int *start,
+extern char *set_bg_block(List results, int *start,
int *geometry, int conn_type);
/*
@@ -471,7 +471,7 @@ extern int reset_ba_system(bool track_down_nodes);
* RET: SLURM_SUCCESS on success, or SLURM_ERROR on error
*
* Note: Need to call reset_all_removed_bps before starting another
- * allocation attempt after
+ * allocation attempt after
*/
extern int removable_set_bps(char *bps);
@@ -521,7 +521,7 @@ extern int *find_bp_loc(char* bp_id);
extern char *find_bp_rack_mid(char* xyz);
/*
- * set the used wires in the virtual system for a block from the real system
+ * set the used wires in the virtual system for a block from the real system
*/
extern int load_block_wiring(char *bg_block_id);
diff --git a/src/plugins/select/bluegene/block_allocator/bridge_linker.c b/src/plugins/select/bluegene/block_allocator/bridge_linker.c
index 00bf33b89cf73a67060b6326c4c2052899819c62..9fd11f69e7231ba642c5c6505b3e60d596095027 100644
--- a/src/plugins/select/bluegene/block_allocator/bridge_linker.c
+++ b/src/plugins/select/bluegene/block_allocator/bridge_linker.c
@@ -1,36 +1,36 @@
/*****************************************************************************\
* bridge_linker.c
- *
+ *
*****************************************************************************
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Dan Phung <phung4@llnl.gov>, Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -45,23 +45,23 @@ typedef struct {
status_t (*set_serial)(const rm_serial_t serial);
status_t (*get_bg)(my_bluegene_t **bg);
status_t (*add_partition)(rm_partition_t *partition);
- status_t (*get_partition)(pm_partition_id_t pid,
+ status_t (*get_partition)(pm_partition_id_t pid,
rm_partition_t **partition);
status_t (*get_partition_info)(pm_partition_id_t pid,
rm_partition_t **partition);
- status_t (*modify_partition)(pm_partition_id_t pid,
+ status_t (*modify_partition)(pm_partition_id_t pid,
enum rm_modify_op op, const void *data);
status_t (*set_part_owner)(pm_partition_id_t pid, const char *name);
status_t (*add_part_user)(pm_partition_id_t pid, const char *name);
status_t (*remove_part_user)(pm_partition_id_t pid, const char *name);
status_t (*remove_partition)(pm_partition_id_t pid);
- status_t (*get_partitions)(rm_partition_state_flag_t flag,
+ status_t (*get_partitions)(rm_partition_state_flag_t flag,
rm_partition_list_t **part_list);
- status_t (*get_partitions_info)(rm_partition_state_flag_t flag,
+ status_t (*get_partitions_info)(rm_partition_state_flag_t flag,
rm_partition_list_t **part_list);
status_t (*get_job)(db_job_id_t dbJobId, rm_job_t **job);
status_t (*get_jobs)(rm_job_state_flag_t flag, rm_job_list_t **jobs);
- status_t (*remove_job)(db_job_id_t jid);
+ status_t (*remove_job)(db_job_id_t jid);
status_t (*get_nodecards)(rm_bp_id_t bpid,
rm_nodecard_list_t **nc_list);
status_t (*new_nodecard)(rm_nodecard_t **nodecard);
@@ -75,24 +75,24 @@ typedef struct {
status_t (*free_job)(rm_job_t *job);
status_t (*free_bg)(my_bluegene_t *bg);
status_t (*free_partition_list)(rm_partition_list_t *part_list);
- status_t (*free_job_list)(rm_job_list_t *job_list);
+ status_t (*free_job_list)(rm_job_list_t *job_list);
status_t (*free_nodecard_list)(rm_nodecard_list_t *nc_list);
status_t (*get_data)(rm_element_t* element,
enum rm_specification field, void *data);
- status_t (*set_data)(rm_element_t* element,
+ status_t (*set_data)(rm_element_t* element,
enum rm_specification field, void *data);
-
+
/* all the jm functions */
status_t (*signal_job)(db_job_id_t jid, rm_signal_t sig);
status_t (*cancel_job)(db_job_id_t jid);
-
+
/* all the pm functions */
status_t (*create_partition)(pm_partition_id_t pid);
#ifndef HAVE_BGL
status_t (*reboot_partition)(pm_partition_id_t pid);
#endif
status_t (*destroy_partition)(pm_partition_id_t pid);
-
+
/* set say message stuff */
void (*set_log_params)(FILE * stream, unsigned int level);
@@ -103,11 +103,11 @@ bridge_api_t bridge_api;
bool initialized = false;
bool have_db2 = true;
void *handle = NULL;
-
+
int _get_syms(int n_syms, const char *names[], void *ptrs[])
{
int i, count;
-#ifdef HAVE_BGL
+#ifdef HAVE_BGL
#ifdef BG_DB2_SO
void *db_handle = NULL;
db_handle = dlopen (BG_DB2_SO, RTLD_LAZY);
@@ -132,7 +132,7 @@ int _get_syms(int n_syms, const char *names[], void *ptrs[])
#else
fatal("No BG_BRIDGE_SO is set, can't run.");
#endif
-
+
dlerror(); /* Clear any existing error */
count = 0;
for ( i = 0; i < n_syms; ++i ) {
@@ -244,7 +244,7 @@ extern int bridge_init()
fatal("No BG_SERIAL is set, can't run.");
#endif
return 1;
-
+
}
extern int bridge_fini()
@@ -252,7 +252,7 @@ extern int bridge_fini()
if(handle)
dlclose(handle);
initialized = false;
-
+
return SLURM_SUCCESS;
}
@@ -273,7 +273,7 @@ extern status_t bridge_add_block(rm_partition_t *partition)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.add_partition))(partition);
slurm_mutex_unlock(&api_file_mutex);
@@ -281,13 +281,13 @@ extern status_t bridge_add_block(rm_partition_t *partition)
}
-extern status_t bridge_get_block(pm_partition_id_t pid,
+extern status_t bridge_get_block(pm_partition_id_t pid,
rm_partition_t **partition)
{
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.get_partition))(pid, partition);
slurm_mutex_unlock(&api_file_mutex);
@@ -295,7 +295,7 @@ extern status_t bridge_get_block(pm_partition_id_t pid,
}
-extern status_t bridge_get_block_info(pm_partition_id_t pid,
+extern status_t bridge_get_block_info(pm_partition_id_t pid,
rm_partition_t **partition)
{
int rc = CONNECTION_ERROR;
@@ -305,14 +305,14 @@ extern status_t bridge_get_block_info(pm_partition_id_t pid,
/* this is here to make sure we don't lock up things with
polling and the long running get_BG call */
rc = pthread_mutex_trylock(&api_file_mutex);
- if (rc == EBUSY)
+ if (rc == EBUSY)
return rc;
else if(rc) {
errno = rc;
error("%s:%d %s: pthread_mutex_trylock(): %m",
- __FILE__, __LINE__, __CURRENT_FUNC__);
+ __FILE__, __LINE__, __CURRENT_FUNC__);
}
-
+
//slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.get_partition_info))(pid, partition);
slurm_mutex_unlock(&api_file_mutex);
@@ -320,26 +320,26 @@ extern status_t bridge_get_block_info(pm_partition_id_t pid,
}
-extern status_t bridge_modify_block(pm_partition_id_t pid,
+extern status_t bridge_modify_block(pm_partition_id_t pid,
enum rm_modify_op op, const void *data)
{
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.modify_partition))(pid, op, data);
slurm_mutex_unlock(&api_file_mutex);
return rc;
}
-
+
extern status_t bridge_set_block_owner(pm_partition_id_t pid, const char *name)
{
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.set_part_owner))(pid, name);
slurm_mutex_unlock(&api_file_mutex);
@@ -352,7 +352,7 @@ extern status_t bridge_add_block_user(pm_partition_id_t pid, const char *name)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.add_part_user))(pid, name);
slurm_mutex_unlock(&api_file_mutex);
@@ -360,13 +360,13 @@ extern status_t bridge_add_block_user(pm_partition_id_t pid, const char *name)
}
-extern status_t bridge_remove_block_user(pm_partition_id_t pid,
+extern status_t bridge_remove_block_user(pm_partition_id_t pid,
const char *name)
{
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.remove_part_user))(pid, name);
slurm_mutex_unlock(&api_file_mutex);
@@ -379,7 +379,7 @@ extern status_t bridge_remove_block(pm_partition_id_t pid)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.remove_partition))(pid);
slurm_mutex_unlock(&api_file_mutex);
@@ -387,13 +387,13 @@ extern status_t bridge_remove_block(pm_partition_id_t pid)
}
-extern status_t bridge_get_blocks(rm_partition_state_flag_t flag,
+extern status_t bridge_get_blocks(rm_partition_state_flag_t flag,
rm_partition_list_t **part_list)
{
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.get_partitions))(flag, part_list);
slurm_mutex_unlock(&api_file_mutex);
@@ -401,13 +401,13 @@ extern status_t bridge_get_blocks(rm_partition_state_flag_t flag,
}
-extern status_t bridge_get_blocks_info(rm_partition_state_flag_t flag,
+extern status_t bridge_get_blocks_info(rm_partition_state_flag_t flag,
rm_partition_list_t **part_list)
{
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.get_partitions_info))(flag, part_list);
slurm_mutex_unlock(&api_file_mutex);
@@ -420,7 +420,7 @@ extern status_t bridge_get_job(db_job_id_t dbJobId, rm_job_t **job)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.get_job))(dbJobId, job);
slurm_mutex_unlock(&api_file_mutex);
@@ -433,7 +433,7 @@ extern status_t bridge_get_jobs(rm_job_state_flag_t flag, rm_job_list_t **jobs)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.get_jobs))(flag, jobs);
slurm_mutex_unlock(&api_file_mutex);
@@ -446,7 +446,7 @@ extern status_t bridge_remove_job(db_job_id_t jid)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.remove_job))(jid);
slurm_mutex_unlock(&api_file_mutex);
@@ -454,13 +454,13 @@ extern status_t bridge_remove_job(db_job_id_t jid)
}
-extern status_t bridge_get_nodecards(rm_bp_id_t bpid,
+extern status_t bridge_get_nodecards(rm_bp_id_t bpid,
rm_nodecard_list_t **nc_list)
{
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.get_nodecards))(bpid, nc_list);
slurm_mutex_unlock(&api_file_mutex);
@@ -473,7 +473,7 @@ extern status_t bridge_new_nodecard(rm_nodecard_t **nodecard)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.new_nodecard))(nodecard);
slurm_mutex_unlock(&api_file_mutex);
@@ -486,7 +486,7 @@ extern status_t bridge_free_nodecard(rm_nodecard_t *nodecard)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.free_nodecard))(nodecard);
slurm_mutex_unlock(&api_file_mutex);
@@ -500,7 +500,7 @@ extern status_t bridge_new_ionode(rm_ionode_t **ionode)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.new_ionode))(ionode);
slurm_mutex_unlock(&api_file_mutex);
@@ -513,7 +513,7 @@ extern status_t bridge_free_ionode(rm_ionode_t *ionode)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.free_ionode))(ionode);
slurm_mutex_unlock(&api_file_mutex);
@@ -527,7 +527,7 @@ extern status_t bridge_new_block(rm_partition_t **partition)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.new_partition))(partition);
slurm_mutex_unlock(&api_file_mutex);
@@ -540,7 +540,7 @@ extern status_t bridge_free_block(rm_partition_t *partition)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.free_partition))(partition);
slurm_mutex_unlock(&api_file_mutex);
@@ -553,7 +553,7 @@ extern status_t bridge_free_job(rm_job_t *job)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.free_job))(job);
slurm_mutex_unlock(&api_file_mutex);
@@ -566,7 +566,7 @@ extern status_t bridge_free_bg(my_bluegene_t *bg)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.free_bg))(bg);
slurm_mutex_unlock(&api_file_mutex);
@@ -579,7 +579,7 @@ extern status_t bridge_free_block_list(rm_partition_list_t *part_list)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.free_partition_list))(part_list);
slurm_mutex_unlock(&api_file_mutex);
@@ -592,20 +592,20 @@ extern status_t bridge_free_job_list(rm_job_list_t *job_list)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.free_job_list))(job_list);
slurm_mutex_unlock(&api_file_mutex);
return rc;
}
-
+
extern status_t bridge_free_nodecard_list(rm_nodecard_list_t *nc_list)
{
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.free_nodecard_list))(nc_list);
slurm_mutex_unlock(&api_file_mutex);
@@ -619,7 +619,7 @@ extern status_t bridge_get_data(rm_element_t* element,
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.get_data))(element, field, data);
slurm_mutex_unlock(&api_file_mutex);
@@ -627,13 +627,13 @@ extern status_t bridge_get_data(rm_element_t* element,
}
-extern status_t bridge_set_data(rm_element_t* element,
+extern status_t bridge_set_data(rm_element_t* element,
enum rm_specification field, void *data)
{
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.set_data))(element, field, data);
slurm_mutex_unlock(&api_file_mutex);
@@ -647,7 +647,7 @@ extern status_t bridge_signal_job(db_job_id_t jid, rm_signal_t sig)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.signal_job))(jid, sig);
slurm_mutex_unlock(&api_file_mutex);
@@ -660,7 +660,7 @@ extern status_t bridge_cancel_job(db_job_id_t jid)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.cancel_job))(jid);
slurm_mutex_unlock(&api_file_mutex);
@@ -674,7 +674,7 @@ extern status_t bridge_create_block(pm_partition_id_t pid)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.create_partition))(pid);
slurm_mutex_unlock(&api_file_mutex);
@@ -688,7 +688,7 @@ extern status_t bridge_reboot_block(pm_partition_id_t pid)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.reboot_partition))(pid);
slurm_mutex_unlock(&api_file_mutex);
@@ -702,7 +702,7 @@ extern status_t bridge_destroy_block(pm_partition_id_t pid)
int rc = CONNECTION_ERROR;
if(!bridge_init())
return rc;
-
+
slurm_mutex_lock(&api_file_mutex);
rc = (*(bridge_api.destroy_partition))(pid);
slurm_mutex_unlock(&api_file_mutex);
@@ -718,21 +718,21 @@ extern int bridge_set_log_params(char *api_file_name, unsigned int level)
if(!bridge_init())
return SLURM_ERROR;
-
+
slurm_mutex_lock(&api_file_mutex);
- if(fp)
+ if(fp)
fp2 = fp;
-
+
fp = fopen(api_file_name, "a");
-
- if (fp == NULL) {
- error("can't open file for bridgeapi.log at %s: %m",
+
+ if (fp == NULL) {
+ error("can't open file for bridgeapi.log at %s: %m",
api_file_name);
rc = SLURM_ERROR;
goto end_it;
}
-
+
(*(bridge_api.set_log_params))(fp, level);
/* In the libraries linked to from the bridge there are stderr
messages send which we would miss unless we dup this to the
diff --git a/src/plugins/select/bluegene/block_allocator/bridge_linker.h b/src/plugins/select/bluegene/block_allocator/bridge_linker.h
index 8408c6e2a792541ae13d170e0e3befe22f3135b3..236b2739e489fa01e1d66260d8a1c4c6629a40bd 100644
--- a/src/plugins/select/bluegene/block_allocator/bridge_linker.h
+++ b/src/plugins/select/bluegene/block_allocator/bridge_linker.h
@@ -1,36 +1,36 @@
/*****************************************************************************\
* bridge_linker.h
- *
+ *
*****************************************************************************
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Dan Phung <phung4@llnl.gov>, Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -72,25 +72,25 @@ extern int bridge_fini();
extern status_t bridge_get_bg(my_bluegene_t **bg);
extern status_t bridge_add_block(rm_partition_t *partition);
-extern status_t bridge_get_block(pm_partition_id_t pid,
+extern status_t bridge_get_block(pm_partition_id_t pid,
rm_partition_t **partition);
-extern status_t bridge_get_block_info(pm_partition_id_t pid,
+extern status_t bridge_get_block_info(pm_partition_id_t pid,
rm_partition_t **partition);
-extern status_t bridge_modify_block(pm_partition_id_t pid,
+extern status_t bridge_modify_block(pm_partition_id_t pid,
enum rm_modify_op op, const void *data);
extern status_t bridge_set_block_owner(pm_partition_id_t, const char *);
extern status_t bridge_add_block_user(pm_partition_id_t, const char *);
extern status_t bridge_remove_block_user(pm_partition_id_t, const char *);
extern status_t bridge_remove_block(pm_partition_id_t pid);
-extern status_t bridge_get_blocks(rm_partition_state_flag_t flag,
+extern status_t bridge_get_blocks(rm_partition_state_flag_t flag,
rm_partition_list_t **part_list);
-extern status_t bridge_get_blocks_info(rm_partition_state_flag_t flag,
+extern status_t bridge_get_blocks_info(rm_partition_state_flag_t flag,
rm_partition_list_t **part_list);
extern status_t bridge_get_job(db_job_id_t dbJobId, rm_job_t **job);
extern status_t bridge_get_jobs(rm_job_state_flag_t flag,
rm_job_list_t **jobs);
-extern status_t bridge_remove_job(db_job_id_t jid);
-extern status_t bridge_get_nodecards(rm_bp_id_t bpid,
+extern status_t bridge_remove_job(db_job_id_t jid);
+extern status_t bridge_get_nodecards(rm_bp_id_t bpid,
rm_nodecard_list_t **nc_list);
extern status_t bridge_new_nodecard(rm_nodecard_t **nodecard);
extern status_t bridge_free_nodecard(rm_nodecard_t *nodecard);
@@ -103,11 +103,11 @@ extern status_t bridge_free_block(rm_partition_t *partition);
extern status_t bridge_free_job(rm_job_t *job);
extern status_t bridge_free_bg(my_bluegene_t *bg);
extern status_t bridge_free_block_list(rm_partition_list_t *part_list);
-extern status_t bridge_free_job_list(rm_job_list_t *job_list);
+extern status_t bridge_free_job_list(rm_job_list_t *job_list);
extern status_t bridge_free_nodecard_list(rm_nodecard_list_t *nc_list);
extern status_t bridge_get_data(rm_element_t* element,
enum rm_specification field, void *data);
-extern status_t bridge_set_data(rm_element_t* element,
+extern status_t bridge_set_data(rm_element_t* element,
enum rm_specification field, void *data);
/* all the jm functions */
diff --git a/src/plugins/select/bluegene/block_allocator/wire_test.c b/src/plugins/select/bluegene/block_allocator/wire_test.c
index d8dd196300fb79bde16262e98f07b88a7c06d1fa..dfe1d3bd63f7f501c1ae686a997cd5e29cea1d08 100644
--- a/src/plugins/select/bluegene/block_allocator/wire_test.c
+++ b/src/plugins/select/bluegene/block_allocator/wire_test.c
@@ -1,37 +1,37 @@
/*****************************************************************************\
- * wire_test.c - used to debug and test wires on any given system.
+ * wire_test.c - used to debug and test wires on any given system.
*
* $Id: block_allocator.c 17495 2009-05-14 16:49:52Z da $
*****************************************************************************
* Copyright (C) 2004 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -51,7 +51,7 @@
/** */
int main(int argc, char** argv)
{
- ba_request_t *request = (ba_request_t*) xmalloc(sizeof(ba_request_t));
+ ba_request_t *request = (ba_request_t*) xmalloc(sizeof(ba_request_t));
log_options_t log_opts = LOG_OPTS_INITIALIZER;
int debug_level = 5;
@@ -61,9 +61,9 @@ int main(int argc, char** argv)
log_opts.stderr_level = debug_level;
log_opts.logfile_level = debug_level;
log_opts.syslog_level = debug_level;
-
+
log_alter(log_opts, LOG_DAEMON, "/dev/null");
-
+
DIM_SIZE[X]=0;
DIM_SIZE[Y]=0;
DIM_SIZE[Z]=0;
@@ -71,7 +71,7 @@ int main(int argc, char** argv)
slurm_conf_reinit(NULL);
ba_init(NULL, 1);
init_wires(NULL);
-
+
/* [010x831] */
/* results = list_create(NULL); */
/* request->geometry[0] = 9; */
@@ -141,7 +141,7 @@ int main(int argc, char** argv)
}
list_destroy(results);
-
+
int dim,j;
int x,y,z;
int startx=0;
@@ -154,7 +154,7 @@ int main(int argc, char** argv)
for(x=startx;x<endx;x++) {
for(y=starty;y<endy;y++) {
for(z=startz;z<endz;z++) {
- ba_node_t *curr_node =
+ ba_node_t *curr_node =
&(ba_system_ptr->grid[x][y][z]);
info("Node %c%c%c Used = %d Letter = %c",
alpha_num[x],alpha_num[y],alpha_num[z],
@@ -195,6 +195,6 @@ int main(int argc, char** argv)
/* ba_fini(); */
/* delete_ba_request(request); */
-
+
return 0;
}
diff --git a/src/plugins/select/bluegene/plugin/Makefile.am b/src/plugins/select/bluegene/plugin/Makefile.am
index d6f1b374d2b13ef60cd758a387690f600244dd73..5855e32d4472c86d56ce16f008d11f9244d5bc76 100644
--- a/src/plugins/select/bluegene/plugin/Makefile.am
+++ b/src/plugins/select/bluegene/plugin/Makefile.am
@@ -30,11 +30,11 @@ select_bluegene_la_SOURCES = select_bluegene.c \
select_bluegene_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
-select_bluegene_la_LIBADD = ../block_allocator/libbluegene_block_allocator.la
+select_bluegene_la_LIBADD = ../block_allocator/libbluegene_block_allocator.la
# MPIRUN dynamic lib.
-libsched_if64_la_SOURCES = libsched_if64.c
+libsched_if64_la_SOURCES = libsched_if64.c
libsched_if64_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
@@ -45,10 +45,10 @@ slurm_prolog_LDADD = $(top_builddir)/src/api/libslurmhelper.la
slurm_epilog_LDADD = $(top_builddir)/src/api/libslurmhelper.la
sfree_SOURCES = sfree.c sfree.h opts.c \
../block_allocator/bridge_linker.c \
- ../block_allocator/bridge_linker.h
+ ../block_allocator/bridge_linker.h
slurm_prolog_SOURCES = slurm_prolog.c
slurm_epilog_SOURCES = slurm_epilog.c
-sfree_LDFLAGS = -export-dynamic -lm $(CMD_LDFLAGS)
+sfree_LDFLAGS = -export-dynamic -lm $(CMD_LDFLAGS)
slurm_prolog_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
slurm_epilog_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
diff --git a/src/plugins/select/bluegene/plugin/Makefile.in b/src/plugins/select/bluegene/plugin/Makefile.in
index 7b9a3f30f0c4582e27ce55efe3e4dca21964ce61..3e3561be0093ffaa44621318b701bd52134411f0 100644
--- a/src/plugins/select/bluegene/plugin/Makefile.in
+++ b/src/plugins/select/bluegene/plugin/Makefile.in
@@ -400,21 +400,21 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES)
@BLUEGENE_LOADED_TRUE@ ../wrap_rm_api.h
@BLUEGENE_LOADED_TRUE@select_bluegene_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
-@BLUEGENE_LOADED_TRUE@select_bluegene_la_LIBADD = ../block_allocator/libbluegene_block_allocator.la
+@BLUEGENE_LOADED_TRUE@select_bluegene_la_LIBADD = ../block_allocator/libbluegene_block_allocator.la
# MPIRUN dynamic lib.
-@BLUEGENE_LOADED_TRUE@libsched_if64_la_SOURCES = libsched_if64.c
+@BLUEGENE_LOADED_TRUE@libsched_if64_la_SOURCES = libsched_if64.c
@BLUEGENE_LOADED_TRUE@libsched_if64_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
@BLUEGENE_LOADED_TRUE@sfree_LDADD = $(top_builddir)/src/api/libslurmhelper.la
@BLUEGENE_LOADED_TRUE@slurm_prolog_LDADD = $(top_builddir)/src/api/libslurmhelper.la
@BLUEGENE_LOADED_TRUE@slurm_epilog_LDADD = $(top_builddir)/src/api/libslurmhelper.la
@BLUEGENE_LOADED_TRUE@sfree_SOURCES = sfree.c sfree.h opts.c \
@BLUEGENE_LOADED_TRUE@ ../block_allocator/bridge_linker.c \
-@BLUEGENE_LOADED_TRUE@ ../block_allocator/bridge_linker.h
+@BLUEGENE_LOADED_TRUE@ ../block_allocator/bridge_linker.h
@BLUEGENE_LOADED_TRUE@slurm_prolog_SOURCES = slurm_prolog.c
@BLUEGENE_LOADED_TRUE@slurm_epilog_SOURCES = slurm_epilog.c
-@BLUEGENE_LOADED_TRUE@sfree_LDFLAGS = -export-dynamic -lm $(CMD_LDFLAGS)
+@BLUEGENE_LOADED_TRUE@sfree_LDFLAGS = -export-dynamic -lm $(CMD_LDFLAGS)
@BLUEGENE_LOADED_TRUE@slurm_prolog_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
@BLUEGENE_LOADED_TRUE@slurm_epilog_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
@BLUEGENE_LOADED_FALSE@EXTRA_select_bluegene_la_SOURCES = select_bluegene.c \
diff --git a/src/plugins/select/bluegene/plugin/bg_block_info.c b/src/plugins/select/bluegene/plugin/bg_block_info.c
index 892122017ea3842a2f18966e14cf521a37ef5ae4..912c22f75d40a42b1695436a1e9c2aa6073130c2 100644
--- a/src/plugins/select/bluegene/plugin/bg_block_info.c
+++ b/src/plugins/select/bluegene/plugin/bg_block_info.c
@@ -6,32 +6,32 @@
* Copyright (C) 2004-2006 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -89,15 +89,15 @@ static int _block_is_deallocating(bg_record_t *bg_record)
if(bg_record->modifying)
return SLURM_SUCCESS;
-
+
user_name = xstrdup(bg_conf->slurm_user_name);
- if(remove_all_users(bg_record->bg_block_id, NULL)
+ if(remove_all_users(bg_record->bg_block_id, NULL)
== REMOVE_USER_ERR) {
error("Something happened removing "
- "users from block %s",
+ "users from block %s",
bg_record->bg_block_id);
- }
-
+ }
+
if(bg_record->target_name && bg_record->user_name) {
if(!strcmp(bg_record->target_name, user_name)) {
if(strcmp(bg_record->target_name, bg_record->user_name)
@@ -106,7 +106,7 @@ static int _block_is_deallocating(bg_record_t *bg_record)
xmalloc(sizeof(freeit));
freeit->jobid = jobid;
list_push(kill_job_list, freeit);
-
+
error("Block %s was in a ready state "
"for user %s but is being freed. "
"Job %d was lost.",
@@ -137,12 +137,12 @@ static int _block_is_deallocating(bg_record_t *bg_record)
}
if(remove_from_bg_list(bg_lists->job_running, bg_record)
- == SLURM_SUCCESS)
- num_unused_cpus += bg_record->cpu_cnt;
+ == SLURM_SUCCESS)
+ num_unused_cpus += bg_record->cpu_cnt;
remove_from_bg_list(bg_lists->booted, bg_record);
xfree(user_name);
-
+
return SLURM_SUCCESS;
}
static void _destroy_kill_struct(void *object)
@@ -159,7 +159,7 @@ static void _destroy_kill_struct(void *object)
/*
* check to see if block is ready to execute. Meaning
- * User is added to the list of users able to run, and no one
+ * User is added to the list of users able to run, and no one
* else is running on the block.
*
* NOTE: This happens in parallel with srun and slurmd spawning
@@ -171,18 +171,18 @@ extern int block_ready(struct job_record *job_ptr)
int rc = 1;
char *block_id = NULL;
bg_record_t *bg_record = NULL;
-
+
rc = select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_BLOCK_ID, &block_id);
if (rc == SLURM_SUCCESS) {
slurm_mutex_lock(&block_state_mutex);
bg_record = find_bg_record_in_list(bg_lists->main, block_id);
-
+
if(bg_record) {
if(bg_record->job_running != job_ptr->job_id) {
rc = 0;
} else if ((bg_record->user_uid == job_ptr->user_id)
- && (bg_record->state
+ && (bg_record->state
== RM_PARTITION_READY)) {
rc = 1;
} else if (bg_record->user_uid != job_ptr->user_id)
@@ -205,7 +205,7 @@ extern int block_ready(struct job_record *job_ptr)
/* info("returning %d for job %u %d %d", */
/* rc, job_ptr->job_id, READY_JOB_ERROR, READY_JOB_FATAL); */
return rc;
-}
+}
/* Pack all relevent information about a block */
extern void pack_block(bg_record_t *bg_record, Buf buffer)
@@ -224,7 +224,7 @@ extern void pack_block(bg_record_t *bg_record, Buf buffer)
packstr(bg_record->nodes, buffer);
pack32((uint32_t)bg_record->node_cnt, buffer);
#ifdef HAVE_BGL
- pack16((uint16_t)bg_record->node_use, buffer);
+ pack16((uint16_t)bg_record->node_use, buffer);
#endif
packstr(bg_record->user_name, buffer);
@@ -249,20 +249,20 @@ extern int update_block_list()
ListIterator itr = NULL;
slurmctld_lock_t job_write_lock = {
NO_LOCK, WRITE_LOCK, WRITE_LOCK, NO_LOCK };
-
+
if(!kill_job_list)
kill_job_list = list_create(_destroy_kill_struct);
- if(!bg_lists->main)
+ if(!bg_lists->main)
return updated;
-
+
slurm_mutex_lock(&block_state_mutex);
itr = list_iterator_create(bg_lists->main);
while ((bg_record = (bg_record_t *) list_next(itr)) != NULL) {
if(!bg_record->bg_block_id)
continue;
name = bg_record->bg_block_id;
- if ((rc = bridge_get_block_info(name, &block_ptr))
+ if ((rc = bridge_get_block_info(name, &block_ptr))
!= STATUS_OK) {
if(bg_conf->layout_mode == LAYOUT_DYNAMIC) {
switch(rc) {
@@ -292,12 +292,12 @@ extern int update_block_list()
break;
}
- error("bridge_get_block_info(%s): %s",
- name,
+ error("bridge_get_block_info(%s): %s",
+ name,
bg_err_str(rc));
continue;
}
-
+
#ifdef HAVE_BGL
if ((rc = bridge_get_data(block_ptr, RM_PartitionMode,
&node_use))
@@ -309,14 +309,14 @@ extern int update_block_list()
} else if(bg_record->node_use != node_use) {
debug("node_use of Block %s was %d "
"and now is %d",
- bg_record->bg_block_id,
- bg_record->node_use,
+ bg_record->bg_block_id,
+ bg_record->node_use,
node_use);
bg_record->node_use = node_use;
updated = 1;
}
#else
- if((bg_record->node_cnt < bg_conf->bp_node_cnt)
+ if((bg_record->node_cnt < bg_conf->bp_node_cnt)
|| (bg_conf->bp_node_cnt == bg_conf->nodecard_node_cnt)) {
char *mode = NULL;
uint16_t conn_type = SELECT_SMALL;
@@ -348,18 +348,18 @@ extern int update_block_list()
}
free(mode);
}
-
+
if(bg_record->conn_type != conn_type) {
debug("mode of small Block %s was %u "
"and now is %u",
- bg_record->bg_block_id,
- bg_record->conn_type,
+ bg_record->bg_block_id,
+ bg_record->conn_type,
conn_type);
bg_record->conn_type = conn_type;
updated = 1;
}
}
-#endif
+#endif
if ((rc = bridge_get_data(block_ptr, RM_PartitionState,
&state))
!= STATUS_OK) {
@@ -367,18 +367,18 @@ extern int update_block_list()
bg_err_str(rc));
updated = -1;
goto next_block;
- } else if(bg_record->job_running != BLOCK_ERROR_STATE
+ } else if(bg_record->job_running != BLOCK_ERROR_STATE
//plugin set error
&& bg_record->state != state) {
int skipped_dealloc = 0;
debug("state of Block %s was %d and now is %d",
- bg_record->bg_block_id,
- bg_record->state,
+ bg_record->bg_block_id,
+ bg_record->state,
state);
- /*
- check to make sure block went
- through freeing correctly
+ /*
+ check to make sure block went
+ through freeing correctly
*/
if((bg_record->state != RM_PARTITION_DEALLOCATING
&& bg_record->state != RM_PARTITION_ERROR)
@@ -397,9 +397,9 @@ extern int update_block_list()
xfree(bg_record->target_name);
bg_record->target_name =
xstrdup(bg_record->user_name);
- } else if((bg_record->state
+ } else if((bg_record->state
== RM_PARTITION_DEALLOCATING)
- && (state == RM_PARTITION_CONFIGURING))
+ && (state == RM_PARTITION_CONFIGURING))
/* This is a funky state IBM says
isn't a bug, but all their
documentation says this doesn't
@@ -408,11 +408,11 @@ extern int update_block_list()
that. So we will just skip this
state and act like this didn't happen. */
goto nochange_state;
-
+
bg_record->state = state;
if(bg_record->state == RM_PARTITION_DEALLOCATING
- || skipped_dealloc)
+ || skipped_dealloc)
_block_is_deallocating(bg_record);
#ifndef HAVE_BGL
else if(bg_record->state == RM_PARTITION_REBOOTING) {
@@ -430,8 +430,8 @@ extern int update_block_list()
else if(bg_record->state == RM_PARTITION_CONFIGURING)
bg_record->boot_state = 1;
else if(bg_record->state == RM_PARTITION_FREE) {
- if(remove_from_bg_list(bg_lists->job_running,
- bg_record)
+ if(remove_from_bg_list(bg_lists->job_running,
+ bg_record)
== SLURM_SUCCESS) {
num_unused_cpus += bg_record->cpu_cnt;
}
@@ -442,7 +442,7 @@ extern int update_block_list()
error("Block %s in an error "
"state while booting.",
bg_record->bg_block_id);
- else
+ else
error("Block %s in an error state.",
bg_record->bg_block_id);
remove_from_bg_list(bg_lists->booted,
@@ -463,7 +463,7 @@ extern int update_block_list()
debug3("checking to make sure user %s "
"is the user.",
bg_record->target_name);
-
+
if(update_block_user(bg_record, 0) == 1)
last_bg_update = time(NULL);
if(bg_record->job_ptr) {
@@ -500,30 +500,30 @@ extern int update_block_list()
error("Couldn't boot Block %s "
"for user %s",
- bg_record->bg_block_id,
+ bg_record->bg_block_id,
bg_record->target_name);
slurm_mutex_unlock(&block_state_mutex);
-
+
now = time(NULL);
slurm_make_time_str(&now, time_str,
sizeof(time_str));
- snprintf(reason,
+ snprintf(reason,
sizeof(reason),
"update_block_list: "
"Boot fails "
- "[SLURM@%s]",
+ "[SLURM@%s]",
time_str);
drain_as_needed(bg_record, reason);
slurm_mutex_lock(&block_state_mutex);
bg_record->boot_state = 0;
bg_record->boot_count = 0;
if(remove_from_bg_list(
- bg_lists->job_running,
- bg_record)
+ bg_lists->job_running,
+ bg_record)
== SLURM_SUCCESS) {
- num_unused_cpus +=
+ num_unused_cpus +=
bg_record->cpu_cnt;
- }
+ }
remove_from_bg_list(
bg_lists->booted,
bg_record);
@@ -567,29 +567,29 @@ extern int update_block_list()
}
}
next_block:
- if ((rc = bridge_free_block(block_ptr))
+ if ((rc = bridge_free_block(block_ptr))
!= STATUS_OK) {
- error("bridge_free_block(): %s",
+ error("bridge_free_block(): %s",
bg_err_str(rc));
- }
+ }
}
list_iterator_destroy(itr);
slurm_mutex_unlock(&block_state_mutex);
-
+
/* kill all the jobs from unexpectedly freed blocks */
while((freeit = list_pop(kill_job_list))) {
debug2("Trying to requeue job %d", freeit->jobid);
lock_slurmctld(job_write_lock);
if((rc = job_requeue(0, freeit->jobid, -1))) {
error("couldn't requeue job %u, failing it: %s",
- freeit->jobid,
+ freeit->jobid,
slurm_strerror(rc));
(void) job_fail(freeit->jobid);
}
unlock_slurmctld(job_write_lock);
_destroy_kill_struct(freeit);
}
-
+
#endif
return updated;
}
@@ -604,10 +604,10 @@ extern int update_freeing_block_list()
char *name = NULL;
bg_record_t *bg_record = NULL;
ListIterator itr = NULL;
-
- if(!bg_lists->freeing)
+
+ if(!bg_lists->freeing)
return updated;
-
+
slurm_mutex_lock(&block_state_mutex);
itr = list_iterator_create(bg_lists->freeing);
while ((bg_record = (bg_record_t *) list_next(itr)) != NULL) {
@@ -615,7 +615,7 @@ extern int update_freeing_block_list()
continue;
name = bg_record->bg_block_id;
- if ((rc = bridge_get_block_info(name, &block_ptr))
+ if ((rc = bridge_get_block_info(name, &block_ptr))
!= STATUS_OK) {
if(bg_conf->layout_mode == LAYOUT_DYNAMIC) {
switch(rc) {
@@ -644,12 +644,12 @@ extern int update_freeing_block_list()
break;
}
- error("bridge_get_block_info(%s): %s",
- name,
+ error("bridge_get_block_info(%s): %s",
+ name,
bg_err_str(rc));
continue;
}
-
+
if ((rc = bridge_get_data(block_ptr, RM_PartitionState,
&state))
!= STATUS_OK) {
@@ -659,23 +659,23 @@ extern int update_freeing_block_list()
goto next_block;
} else if(bg_record->state != state) {
debug("freeing state of Block %s was %d and now is %d",
- bg_record->bg_block_id,
- bg_record->state,
+ bg_record->bg_block_id,
+ bg_record->state,
state);
bg_record->state = state;
updated = 1;
}
next_block:
- if ((rc = bridge_free_block(block_ptr))
+ if ((rc = bridge_free_block(block_ptr))
!= STATUS_OK) {
- error("bridge_free_block(): %s",
+ error("bridge_free_block(): %s",
bg_err_str(rc));
}
}
list_iterator_destroy(itr);
slurm_mutex_unlock(&block_state_mutex);
-
+
#endif
return updated;
}
diff --git a/src/plugins/select/bluegene/plugin/bg_block_info.h b/src/plugins/select/bluegene/plugin/bg_block_info.h
index 0f801a93a5a370a70a008fe072d045f36e14e54d..0b88411b07aadb4a4712425d7e8c6b00649d87f2 100644
--- a/src/plugins/select/bluegene/plugin/bg_block_info.h
+++ b/src/plugins/select/bluegene/plugin/bg_block_info.h
@@ -4,32 +4,32 @@
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/plugins/select/bluegene/plugin/bg_boot_time.h b/src/plugins/select/bluegene/plugin/bg_boot_time.h
index d1cd399b7dd50a65389374f58ac6740e7146cfb9..5a83177a8efc60f3712c722308eb1196efd9d44d 100644
--- a/src/plugins/select/bluegene/plugin/bg_boot_time.h
+++ b/src/plugins/select/bluegene/plugin/bg_boot_time.h
@@ -5,32 +5,32 @@
* Copyright (C) 2008 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -44,9 +44,9 @@
* BG_FREE_PREVIOUS_BLOCK + BG_MIN_BLOCK_BOOT +
* (BG_INCR_BLOCK_BOOT * base partition count).
* For example, if BG_MIN_BLOCK_BOOT=300, BG_MIN_BLOCK_BOOT=200,
- * BG_INCR_BLOCK_BOOT=20 and there are 4 blocks being booted,
+ * BG_INCR_BLOCK_BOOT=20 and there are 4 blocks being booted,
* wait up to 580 seconds (300 + 200 (20 * 4)).
- */
+ */
#define BG_FREE_PREVIOUS_BLOCK 300 /* time in seconds */
#define BG_MIN_BLOCK_BOOT 300 /* time in seconds */
diff --git a/src/plugins/select/bluegene/plugin/bg_job_place.c b/src/plugins/select/bluegene/plugin/bg_job_place.c
index a0cec8d9f4011a1e8359ff3b4321005a5c71b18a..b44622d64030c84da98f82ed08342758f85b9193 100644
--- a/src/plugins/select/bluegene/plugin/bg_job_place.c
+++ b/src/plugins/select/bluegene/plugin/bg_job_place.c
@@ -6,32 +6,32 @@
* Copyright (C) 2008 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Dan Phung <phung4@llnl.gov> and Morris Jette <jette1@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -67,10 +67,10 @@ pthread_mutex_t create_dynamic_mutex = PTHREAD_MUTEX_INITIALIZER;
List job_block_test_list = NULL;
static void _rotate_geo(uint16_t *req_geometry, int rot_cnt);
-static int _bg_record_sort_aval_inc(bg_record_t* rec_a, bg_record_t* rec_b);
-static int _get_user_groups(uint32_t user_id, uint32_t group_id,
+static int _bg_record_sort_aval_inc(bg_record_t* rec_a, bg_record_t* rec_b);
+static int _get_user_groups(uint32_t user_id, uint32_t group_id,
gid_t *groups, int max_groups, int *ngroups);
-static int _test_image_perms(char *image_name, List image_list,
+static int _test_image_perms(char *image_name, List image_list,
struct job_record* job_ptr);
#ifdef HAVE_BGL
static int _check_images(struct job_record* job_ptr,
@@ -81,8 +81,8 @@ static int _check_images(struct job_record* job_ptr,
char **linuximage,
char **mloaderimage, char **ramdiskimage);
#endif
-static bg_record_t *_find_matching_block(List block_list,
- struct job_record* job_ptr,
+static bg_record_t *_find_matching_block(List block_list,
+ struct job_record* job_ptr,
bitstr_t* slurm_block_bitmap,
ba_request_t *request,
uint32_t max_cpus,
@@ -101,7 +101,7 @@ static int _dynamically_request(List block_list, int *blocks_added,
static int _find_best_block_match(List block_list, int *blocks_added,
struct job_record* job_ptr,
bitstr_t* slurm_block_bitmap,
- uint32_t min_nodes,
+ uint32_t min_nodes,
uint32_t max_nodes, uint32_t req_nodes,
bg_record_t** found_bg_record,
uint16_t query_mode, int avail_cpus);
@@ -126,18 +126,18 @@ static void _rotate_geo(uint16_t *req_geometry, int rot_cnt)
}
}
-/*
+/*
* Comparator used for sorting blocks smallest to largest
- *
+ *
* returns: -1: rec_a < rec_b 0: rec_a == rec_b 1: rec_a > rec_b
- *
+ *
*/
static int _bg_record_sort_aval_inc(bg_record_t* rec_a, bg_record_t* rec_b)
{
- if((rec_a->job_running == BLOCK_ERROR_STATE)
+ if((rec_a->job_running == BLOCK_ERROR_STATE)
&& (rec_b->job_running != BLOCK_ERROR_STATE))
return 1;
- else if((rec_a->job_running != BLOCK_ERROR_STATE)
+ else if((rec_a->job_running != BLOCK_ERROR_STATE)
&& (rec_b->job_running == BLOCK_ERROR_STATE))
return -1;
else if(!rec_a->job_ptr && rec_b->job_ptr)
@@ -154,18 +154,18 @@ static int _bg_record_sort_aval_inc(bg_record_t* rec_a, bg_record_t* rec_b)
return bg_record_cmpf_inc(rec_a, rec_b);
}
-/*
+/*
* Comparator used for sorting blocks smallest to largest
- *
+ *
* returns: -1: rec_a > rec_b 0: rec_a == rec_b 1: rec_a < rec_b
- *
+ *
*/
static int _bg_record_sort_aval_dec(bg_record_t* rec_a, bg_record_t* rec_b)
{
- if((rec_a->job_running == BLOCK_ERROR_STATE)
+ if((rec_a->job_running == BLOCK_ERROR_STATE)
&& (rec_b->job_running != BLOCK_ERROR_STATE))
return -1;
- else if((rec_a->job_running != BLOCK_ERROR_STATE)
+ else if((rec_a->job_running != BLOCK_ERROR_STATE)
&& (rec_b->job_running == BLOCK_ERROR_STATE))
return 1;
else if(!rec_a->job_ptr && rec_b->job_ptr)
@@ -186,7 +186,7 @@ static int _bg_record_sort_aval_dec(bg_record_t* rec_a, bg_record_t* rec_b)
* Get a list of groups associated with a specific user_id
* Return 0 on success, -1 on failure
*/
-static int _get_user_groups(uint32_t user_id, uint32_t group_id,
+static int _get_user_groups(uint32_t user_id, uint32_t group_id,
gid_t *groups, int max_groups, int *ngroups)
{
int rc;
@@ -209,7 +209,7 @@ static int _get_user_groups(uint32_t user_id, uint32_t group_id,
/*
* Determine if the job has permission to use the identified image
*/
-static int _test_image_perms(char *image_name, List image_list,
+static int _test_image_perms(char *image_name, List image_list,
struct job_record* job_ptr)
{
int allow = 0, i, rc;
@@ -236,9 +236,9 @@ static int _test_image_perms(char *image_name, List image_list,
break;
}
if (job_ptr->user_id != cache_user) {
- rc = _get_user_groups(job_ptr->user_id,
+ rc = _get_user_groups(job_ptr->user_id,
job_ptr->group_id,
- groups,
+ groups,
MAX_GROUPS, &ngroups);
if (rc) /* Failed to get groups */
break;
@@ -256,7 +256,7 @@ static int _test_image_perms(char *image_name, List image_list,
}
list_iterator_destroy(itr2);
if (allow)
- break;
+ break;
}
}
list_iterator_destroy(itr);
@@ -279,23 +279,23 @@ static int _check_images(struct job_record* job_ptr,
#ifdef HAVE_BGL
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_BLRTS_IMAGE, blrtsimage);
-
+
if (*blrtsimage) {
- allow = _test_image_perms(*blrtsimage, bg_conf->blrts_list,
+ allow = _test_image_perms(*blrtsimage, bg_conf->blrts_list,
job_ptr);
if (!allow) {
error("User %u:%u is not allowed to use BlrtsImage %s",
job_ptr->user_id, job_ptr->group_id,
*blrtsimage);
return SLURM_ERROR;
-
+
}
}
#endif
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_LINUX_IMAGE, linuximage);
if (*linuximage) {
- allow = _test_image_perms(*linuximage, bg_conf->linux_list,
+ allow = _test_image_perms(*linuximage, bg_conf->linux_list,
job_ptr);
if (!allow) {
error("User %u:%u is not allowed to use LinuxImage %s",
@@ -308,12 +308,12 @@ static int _check_images(struct job_record* job_ptr,
SELECT_JOBDATA_MLOADER_IMAGE, mloaderimage);
if (*mloaderimage) {
allow = _test_image_perms(*mloaderimage,
- bg_conf->mloader_list,
+ bg_conf->mloader_list,
job_ptr);
if(!allow) {
error("User %u:%u is not allowed "
"to use MloaderImage %s",
- job_ptr->user_id, job_ptr->group_id,
+ job_ptr->user_id, job_ptr->group_id,
*mloaderimage);
return SLURM_ERROR;
}
@@ -323,12 +323,12 @@ static int _check_images(struct job_record* job_ptr,
SELECT_JOBDATA_RAMDISK_IMAGE, ramdiskimage);
if (*ramdiskimage) {
allow = _test_image_perms(*ramdiskimage,
- bg_conf->ramdisk_list,
+ bg_conf->ramdisk_list,
job_ptr);
if(!allow) {
error("User %u:%u is not allowed "
"to use RamDiskImage %s",
- job_ptr->user_id, job_ptr->group_id,
+ job_ptr->user_id, job_ptr->group_id,
*ramdiskimage);
return SLURM_ERROR;
}
@@ -337,8 +337,8 @@ static int _check_images(struct job_record* job_ptr,
return SLURM_SUCCESS;
}
-static bg_record_t *_find_matching_block(List block_list,
- struct job_record* job_ptr,
+static bg_record_t *_find_matching_block(List block_list,
+ struct job_record* job_ptr,
bitstr_t* slurm_block_bitmap,
ba_request_t *request,
uint32_t max_cpus,
@@ -350,31 +350,31 @@ static bg_record_t *_find_matching_block(List block_list,
bg_record_t *bg_record = NULL;
ListIterator itr = NULL;
char tmp_char[256];
-
- debug("number of blocks to check: %d state %d",
+
+ debug("number of blocks to check: %d state %d",
list_count(block_list),
query_mode);
-
+
itr = list_iterator_create(block_list);
- while ((bg_record = list_next(itr))) {
- /* If test_only we want to fall through to tell the
- scheduler that it is runnable just not right now.
+ while ((bg_record = list_next(itr))) {
+ /* If test_only we want to fall through to tell the
+ scheduler that it is runnable just not right now.
*/
- debug3("%s job_running = %d",
+ debug3("%s job_running = %d",
bg_record->bg_block_id, bg_record->job_running);
/*block is messed up some how (BLOCK_ERROR_STATE)
* ignore it or if state == RM_PARTITION_ERROR */
if((bg_record->job_running == BLOCK_ERROR_STATE)
|| (bg_record->state == RM_PARTITION_ERROR)) {
- debug("block %s is in an error state (can't use)",
- bg_record->bg_block_id);
+ debug("block %s is in an error state (can't use)",
+ bg_record->bg_block_id);
continue;
- } else if((bg_record->job_running != NO_JOB_RUNNING)
+ } else if((bg_record->job_running != NO_JOB_RUNNING)
&& (bg_record->job_running != job_ptr->job_id)
- && (bg_conf->layout_mode == LAYOUT_DYNAMIC
- || (!SELECT_IS_TEST(query_mode)
+ && (bg_conf->layout_mode == LAYOUT_DYNAMIC
+ || (!SELECT_IS_TEST(query_mode)
&& bg_conf->layout_mode != LAYOUT_DYNAMIC))) {
- debug("block %s in use by %s job %d",
+ debug("block %s in use by %s job %d",
bg_record->bg_block_id,
bg_record->user_name,
bg_record->job_running);
@@ -382,27 +382,27 @@ static bg_record_t *_find_matching_block(List block_list,
}
/* Check processor count */
- debug3("asking for %u-%u looking at %d",
+ debug3("asking for %u-%u looking at %d",
request->procs, max_cpus, bg_record->cpu_cnt);
if ((bg_record->cpu_cnt < request->procs)
|| ((max_cpus != NO_VAL)
&& (bg_record->cpu_cnt > max_cpus))) {
/* We use the proccessor count per block here
- mostly to see if we can run on a smaller block.
+ mostly to see if we can run on a smaller block.
*/
- convert_num_unit((float)bg_record->cpu_cnt, tmp_char,
+ convert_num_unit((float)bg_record->cpu_cnt, tmp_char,
sizeof(tmp_char), UNIT_NONE);
debug("block %s CPU count (%s) not suitable",
- bg_record->bg_block_id,
+ bg_record->bg_block_id,
tmp_char);
continue;
}
/*
- * Next we check that this block's bitmap is within
- * the set of nodes which the job can use.
+ * Next we check that this block's bitmap is within
+ * the set of nodes which the job can use.
* Nodes not available for the job could be down,
- * drained, allocated to some other job, or in some
+ * drained, allocated to some other job, or in some
* SLURM block not available to this job.
*/
if (!bit_super_set(bg_record->bitmap, slurm_block_bitmap)) {
@@ -421,13 +421,13 @@ static bg_record_t *_find_matching_block(List block_list,
bg_record->bg_block_id);
continue;
}
-
-
+
+
if(_check_for_booted_overlapping_blocks(
block_list, itr, bg_record,
overlap_check, overlapped_list, query_mode))
continue;
-
+
if(check_image) {
#ifdef HAVE_BGL
if(request->blrtsimage &&
@@ -435,7 +435,7 @@ static bg_record_t *_find_matching_block(List block_list,
bg_record->blrtsimage)) {
*allow = 1;
continue;
- }
+ }
#endif
if(request->linuximage &&
strcasecmp(request->linuximage,
@@ -445,7 +445,7 @@ static bg_record_t *_find_matching_block(List block_list,
}
if(request->mloaderimage &&
- strcasecmp(request->mloaderimage,
+ strcasecmp(request->mloaderimage,
bg_record->mloaderimage)) {
*allow = 1;
continue;
@@ -456,9 +456,9 @@ static bg_record_t *_find_matching_block(List block_list,
bg_record->ramdiskimage)) {
*allow = 1;
continue;
- }
+ }
}
-
+
/***********************************************/
/* check the connection type specified matches */
/***********************************************/
@@ -470,12 +470,12 @@ static bg_record_t *_find_matching_block(List block_list,
they have to be so skip booted
blocks if in small state
*/
- if(check_image
+ if(check_image
&& (bg_record->state
== RM_PARTITION_READY)) {
*allow = 1;
- continue;
- }
+ continue;
+ }
goto good_conn_type;
} else if(bg_record->conn_type >= SELECT_SMALL) {
/* since we already checked to see if
@@ -484,17 +484,17 @@ static bg_record_t *_find_matching_block(List block_list,
includes small and regular blocks.
So we can just continue on.
*/
- goto good_conn_type;
+ goto good_conn_type;
}
-
+
#endif
debug("bg block %s conn-type not usable asking for %s "
- "bg_record is %s",
+ "bg_record is %s",
bg_record->bg_block_id,
conn_type_string(request->conn_type),
conn_type_string(bg_record->conn_type));
continue;
- }
+ }
#ifndef HAVE_BGL
good_conn_type:
#endif
@@ -506,8 +506,8 @@ static bg_record_t *_find_matching_block(List block_list,
else { /* match requested geometry */
bool match = false;
int rot_cnt = 0; /* attempt six rotations */
-
- for (rot_cnt=0; rot_cnt<6; rot_cnt++) {
+
+ for (rot_cnt=0; rot_cnt<6; rot_cnt++) {
if ((bg_record->geo[X] >= request->geometry[X])
&& (bg_record->geo[Y]
>= request->geometry[Y])
@@ -516,21 +516,21 @@ static bg_record_t *_find_matching_block(List block_list,
match = true;
break;
}
- if (!request->rotate)
+ if (!request->rotate)
break;
-
+
_rotate_geo((uint16_t *)request->geometry,
rot_cnt);
}
-
- if (!match)
+
+ if (!match)
continue; /* Not usable */
}
debug2("we found one! %s", bg_record->bg_block_id);
break;
}
list_iterator_destroy(itr);
-
+
return bg_record;
}
@@ -549,7 +549,7 @@ static int _check_for_booted_overlapping_blocks(
if(is_test && bg_conf->layout_mode == LAYOUT_DYNAMIC)
return rc;
- /* Make sure no other blocks are under this block
+ /* Make sure no other blocks are under this block
are booted and running jobs
*/
itr = list_iterator_create(block_list);
@@ -561,7 +561,7 @@ static int _check_for_booted_overlapping_blocks(
found_record->bg_block_id);
continue;
}
-
+
slurm_mutex_lock(&block_state_mutex);
overlap = blocks_overlap(bg_record, found_record);
slurm_mutex_unlock(&block_state_mutex);
@@ -576,7 +576,7 @@ static int _check_for_booted_overlapping_blocks(
* block_list should always be destroyed afterwards.
*/
if(is_test && overlapped_list
- && found_record->job_ptr
+ && found_record->job_ptr
&& bg_record->job_running == NO_JOB_RUNNING) {
debug2("found over lapping block %s "
"overlapped %s with job %u",
@@ -591,7 +591,7 @@ static int _check_for_booted_overlapping_blocks(
break;
}
list_iterator_destroy(itr);
- if(tmp_rec && tmp_rec->job_ptr->end_time
+ if(tmp_rec && tmp_rec->job_ptr->end_time
< found_record->job_ptr->end_time)
tmp_rec->job_ptr =
found_record->job_ptr;
@@ -614,9 +614,9 @@ static int _check_for_booted_overlapping_blocks(
* we choose something else
*/
if(bg_conf->layout_mode == LAYOUT_OVERLAP
- && ((overlap_check == 0 && bg_record->state
+ && ((overlap_check == 0 && bg_record->state
!= RM_PARTITION_READY)
- || (overlap_check == 1 && found_record->state
+ || (overlap_check == 1 && found_record->state
!= RM_PARTITION_FREE))) {
if(!is_test) {
@@ -625,7 +625,7 @@ static int _check_for_booted_overlapping_blocks(
}
}
- if((found_record->job_running != NO_JOB_RUNNING)
+ if((found_record->job_running != NO_JOB_RUNNING)
|| (found_record->state == RM_PARTITION_ERROR)) {
if((found_record->job_running
== BLOCK_ERROR_STATE)
@@ -640,11 +640,11 @@ static int _check_for_booted_overlapping_blocks(
debug("can't use %s, there is "
"a job (%d) running on "
"an overlapping "
- "block %s",
+ "block %s",
bg_record->bg_block_id,
found_record->job_running,
found_record->bg_block_id);
-
+
if(bg_conf->layout_mode == LAYOUT_DYNAMIC) {
List temp_list = list_create(NULL);
/* this will remove and
@@ -672,7 +672,7 @@ static int _check_for_booted_overlapping_blocks(
debug("Removing unusable block %s "
"from the system.",
bg_record->bg_block_id);
-
+
if(!found_record) {
debug("This record %s wasn't "
"found in the "
@@ -683,19 +683,19 @@ static int _check_for_booted_overlapping_blocks(
found_record = bg_record;
} else
destroy_bg_record(bg_record);
-
+
list_push(temp_list, found_record);
free_block_list(temp_list);
list_destroy(temp_list);
-
+
slurm_mutex_unlock(&block_state_mutex);
- }
+ }
rc = 1;
-
- if(!is_test)
+
+ if(!is_test)
break;
- }
- }
+ }
+ }
}
list_iterator_destroy(itr);
@@ -704,7 +704,7 @@ static int _check_for_booted_overlapping_blocks(
/*
*
- * Return SLURM_SUCCESS on successful create, SLURM_ERROR for no create
+ * Return SLURM_SUCCESS on successful create, SLURM_ERROR for no create
*/
static int _dynamically_request(List block_list, int *blocks_added,
@@ -719,22 +719,22 @@ static int _dynamically_request(List block_list, int *blocks_added,
int rc = SLURM_ERROR;
int create_try = 0;
int start_geo[BA_SYSTEM_DIMENSIONS];
-
+
memcpy(start_geo, request->geometry, sizeof(int)*BA_SYSTEM_DIMENSIONS);
debug2("going to create %d", request->size);
list_of_lists = list_create(NULL);
-
- if(user_req_nodes)
+
+ if(user_req_nodes)
list_append(list_of_lists, job_block_test_list);
else {
list_append(list_of_lists, block_list);
if(job_block_test_list == bg_lists->job_running &&
list_count(block_list) != list_count(bg_lists->booted)) {
list_append(list_of_lists, bg_lists->booted);
- if(list_count(bg_lists->booted)
- != list_count(job_block_test_list))
+ if(list_count(bg_lists->booted)
+ != list_count(job_block_test_list))
list_append(list_of_lists, job_block_test_list);
- } else if(list_count(block_list)
+ } else if(list_count(block_list)
!= list_count(job_block_test_list)) {
list_append(list_of_lists, job_block_test_list);
}
@@ -742,11 +742,11 @@ static int _dynamically_request(List block_list, int *blocks_added,
itr = list_iterator_create(list_of_lists);
while ((temp_list = (List)list_next(itr))) {
create_try++;
-
+
/* 1- try empty space
- 2- we see if we can create one in the
+ 2- we see if we can create one in the
unused bps
- 3- see if we can create one in the non
+ 3- see if we can create one in the non
job running bps
*/
debug("trying with %d", create_try);
@@ -761,12 +761,12 @@ static int _dynamically_request(List block_list, int *blocks_added,
query_mode)) {
/* Here we don't really want
to create the block if we
- are testing.
+ are testing.
*/
list_append(block_list, bg_record);
(*blocks_added) = 1;
} else {
- if(job_block_test_list
+ if(job_block_test_list
== bg_lists->job_running) {
if(configure_block(bg_record)
== SLURM_ERROR) {
@@ -784,28 +784,28 @@ static int _dynamically_request(List block_list, int *blocks_added,
list_append(block_list, bg_record);
print_bg_record(bg_record);
(*blocks_added) = 1;
- }
+ }
}
list_destroy(new_blocks);
if(!*blocks_added) {
memcpy(request->geometry, start_geo,
- sizeof(int)*BA_SYSTEM_DIMENSIONS);
+ sizeof(int)*BA_SYSTEM_DIMENSIONS);
rc = SLURM_ERROR;
continue;
}
list_sort(block_list,
(ListCmpF)_bg_record_sort_aval_dec);
-
+
rc = SLURM_SUCCESS;
break;
} else if (errno == ESLURM_INTERCONNECT_FAILURE) {
rc = SLURM_ERROR;
break;
- }
+ }
memcpy(request->geometry, start_geo,
sizeof(int)*BA_SYSTEM_DIMENSIONS);
-
+
}
list_iterator_destroy(itr);
@@ -815,27 +815,27 @@ static int _dynamically_request(List block_list, int *blocks_added,
return rc;
}
/*
- * finds the best match for a given job request
- *
- *
+ * finds the best match for a given job request
+ *
+ *
* OUT - block_id of matched block, NULL otherwise
* returns 1 for error (no match)
- *
+ *
*/
-static int _find_best_block_match(List block_list,
+static int _find_best_block_match(List block_list,
int *blocks_added,
- struct job_record* job_ptr,
+ struct job_record* job_ptr,
bitstr_t* slurm_block_bitmap,
uint32_t min_nodes, uint32_t max_nodes,
uint32_t req_nodes,
- bg_record_t** found_bg_record,
+ bg_record_t** found_bg_record,
uint16_t query_mode, int avail_cpus)
{
bg_record_t *bg_record = NULL;
uint16_t req_geometry[BA_SYSTEM_DIMENSIONS];
uint16_t conn_type, rotate, target_size = 0;
uint32_t req_procs = job_ptr->num_procs;
- ba_request_t request;
+ ba_request_t request;
int i;
int overlap_check = 0;
int allow = 0;
@@ -855,7 +855,7 @@ static int _find_best_block_match(List block_list,
bool is_test = SELECT_IS_TEST(query_mode);
if(!total_cpus)
- total_cpus = DIM_SIZE[X] * DIM_SIZE[Y] * DIM_SIZE[Z]
+ total_cpus = DIM_SIZE[X] * DIM_SIZE[Y] * DIM_SIZE[Z]
* bg_conf->cpus_per_bp;
if(req_nodes > max_nodes) {
@@ -865,7 +865,7 @@ static int _find_best_block_match(List block_list,
}
if(!is_test && (req_procs > avail_cpus)) {
- debug2("asking for %u I only got %d",
+ debug2("asking for %u I only got %d",
req_procs, avail_cpus);
return SLURM_ERROR;
}
@@ -874,7 +874,7 @@ static int _find_best_block_match(List block_list,
error("_find_best_block_match: There is no block_list");
return SLURM_ERROR;
}
-
+
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_CONN_TYPE, &conn_type);
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
@@ -884,7 +884,7 @@ static int _find_best_block_match(List block_list,
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_MAX_CPUS, &max_cpus);
-
+
#ifdef HAVE_BGL
if((rc = _check_images(job_ptr, &blrtsimage, &linuximage,
&mloaderimage, &ramdiskimage)) == SLURM_ERROR)
@@ -894,7 +894,7 @@ static int _find_best_block_match(List block_list,
&mloaderimage, &ramdiskimage)) == SLURM_ERROR)
goto end_it;
#endif
-
+
if(req_geometry[X] != 0 && req_geometry[X] != (uint16_t)NO_VAL) {
target_size = 1;
for (i=0; i<BA_SYSTEM_DIMENSIONS; i++)
@@ -902,7 +902,7 @@ static int _find_best_block_match(List block_list,
if(target_size != min_nodes) {
debug2("min_nodes not set correctly %u should be %u "
"from %u%u%u",
- min_nodes, target_size,
+ min_nodes, target_size,
req_geometry[X],
req_geometry[Y],
req_geometry[Z]);
@@ -914,13 +914,13 @@ static int _find_best_block_match(List block_list,
req_geometry[X] = (uint16_t)NO_VAL;
target_size = min_nodes;
}
-
+
*found_bg_record = NULL;
allow = 0;
memset(&request, 0, sizeof(ba_request_t));
- for(i=0; i<BA_SYSTEM_DIMENSIONS; i++)
+ for(i=0; i<BA_SYSTEM_DIMENSIONS; i++)
request.geometry[i] = req_geometry[i];
request.deny_pass = (uint16_t)NO_VAL;
@@ -938,7 +938,7 @@ static int _find_best_block_match(List block_list,
request.linuximage = linuximage;
request.mloaderimage = mloaderimage;
request.ramdiskimage = ramdiskimage;
- if(job_ptr->details->req_node_bitmap)
+ if(job_ptr->details->req_node_bitmap)
request.avail_node_bitmap = job_ptr->details->req_node_bitmap;
else
request.avail_node_bitmap = slurm_block_bitmap;
@@ -948,26 +948,26 @@ static int _find_best_block_match(List block_list,
/* since we only look at procs after this and not nodes we
* need to set a max_cpus if given
*/
- if(max_cpus == (uint32_t)NO_VAL)
+ if(max_cpus == (uint32_t)NO_VAL)
max_cpus = max_nodes * bg_conf->cpus_per_bp;
-
+
while(1) {
/* Here we are creating a list of all the blocks that
* have overlapped jobs so if we don't find one that
* works we will have can look and see the earliest
* the job can start. This doesn't apply to Dynamic mode.
- */
+ */
if(is_test
- && bg_conf->layout_mode != LAYOUT_DYNAMIC)
+ && bg_conf->layout_mode != LAYOUT_DYNAMIC)
overlapped_list = list_create(NULL);
-
- bg_record = _find_matching_block(block_list,
+
+ bg_record = _find_matching_block(block_list,
job_ptr,
slurm_block_bitmap,
&request,
max_cpus,
&allow, check_image,
- overlap_check,
+ overlap_check,
overlapped_list,
query_mode);
if(!bg_record && is_test
@@ -977,14 +977,14 @@ static int _find_best_block_match(List block_list,
list_iterator_create(overlapped_list);
bg_record_t *tmp_rec = NULL;
while((tmp_rec = list_next(itr))) {
- if(!bg_record ||
+ if(!bg_record ||
(tmp_rec->job_ptr->end_time <
bg_record->job_ptr->end_time))
bg_record = tmp_rec;
}
list_iterator_destroy(itr);
}
-
+
if(is_test && bg_conf->layout_mode != LAYOUT_DYNAMIC)
list_destroy(overlapped_list);
@@ -992,7 +992,7 @@ static int _find_best_block_match(List block_list,
if (bg_record) {
if(!is_test) {
if(check_block_bp_states(
- bg_record->bg_block_id)
+ bg_record->bg_block_id)
== SLURM_ERROR) {
error("_find_best_block_match: Marking "
"block %s in an error state "
@@ -1005,9 +1005,9 @@ static int _find_best_block_match(List block_list,
}
}
format_node_name(bg_record, tmp_char, sizeof(tmp_char));
-
- debug("_find_best_block_match %s <%s>",
- bg_record->bg_block_id,
+
+ debug("_find_best_block_match %s <%s>",
+ bg_record->bg_block_id,
tmp_char);
bit_and(slurm_block_bitmap, bg_record->bitmap);
rc = SLURM_SUCCESS;
@@ -1016,17 +1016,17 @@ static int _find_best_block_match(List block_list,
} else {
/* this gets altered in _find_matching_block so we
reset it */
- for(i=0; i<BA_SYSTEM_DIMENSIONS; i++)
+ for(i=0; i<BA_SYSTEM_DIMENSIONS; i++)
request.geometry[i] = req_geometry[i];
}
-
+
/* see if we can just reset the image and reboot the block */
if(allow) {
check_image = 0;
allow = 0;
continue;
}
-
+
check_image = 1;
/* all these assume that the *bg_record is NULL */
@@ -1036,26 +1036,26 @@ static int _find_best_block_match(List block_list,
overlap_check++;
continue;
}
-
+
if(create_try || bg_conf->layout_mode != LAYOUT_DYNAMIC)
goto no_match;
-
+
if((rc = _dynamically_request(block_list, blocks_added,
- &request,
+ &request,
job_ptr->details->req_nodes,
query_mode))
== SLURM_SUCCESS) {
create_try = 1;
continue;
}
-
+
if(is_test) {
List new_blocks = NULL;
List job_list = NULL;
debug("trying with empty machine");
slurm_mutex_lock(&block_state_mutex);
- if(job_block_test_list == bg_lists->job_running)
+ if(job_block_test_list == bg_lists->job_running)
job_list = copy_bg_list(job_block_test_list);
else
job_list = job_block_test_list;
@@ -1065,7 +1065,7 @@ static int _find_best_block_match(List block_list,
bool track_down_nodes = true;
/* this gets altered in
* create_dynamic_block so we reset it */
- for(i=0; i<BA_SYSTEM_DIMENSIONS; i++)
+ for(i=0; i<BA_SYSTEM_DIMENSIONS; i++)
request.geometry[i] = req_geometry[i];
bg_record = list_pop(job_list);
@@ -1080,13 +1080,13 @@ static int _find_best_block_match(List block_list,
start_time,
bg_record->job_ptr->
end_time);
- else if(bg_record->job_running
+ else if(bg_record->job_running
== BLOCK_ERROR_STATE)
debug2("taking off (%s) "
"which is in an error "
"state",
bg_record->bg_block_id);
- } else
+ } else
/* This means we didn't have
any jobs to take off
anymore so we are making
@@ -1118,7 +1118,7 @@ static int _find_best_block_match(List block_list,
rc = SLURM_SUCCESS;
/* outside of the job_test_list this
* gets destroyed later, so don't worry
- * about it now
+ * about it now
*/
(*found_bg_record) = list_pop(new_blocks);
if(!(*found_bg_record)) {
@@ -1136,16 +1136,16 @@ static int _find_best_block_match(List block_list,
(*found_bg_record)->bitmap);
if(bg_record) {
- (*found_bg_record)->job_ptr
- = bg_record->job_ptr;
+ (*found_bg_record)->job_ptr
+ = bg_record->job_ptr;
destroy_bg_record(bg_record);
}
-
- if(job_block_test_list
+
+ if(job_block_test_list
!= bg_lists->job_running) {
list_append(block_list,
(*found_bg_record));
- while((bg_record =
+ while((bg_record =
list_pop(new_blocks))) {
if(block_exist_in_list(
block_list,
@@ -1158,13 +1158,13 @@ static int _find_best_block_match(List block_list,
// print_bg_record(bg_record);
}
}
- }
-
+ }
+
list_destroy(new_blocks);
break;
}
- if(job_block_test_list == bg_lists->job_running)
+ if(job_block_test_list == bg_lists->job_running)
list_destroy(job_list);
goto end_it;
@@ -1184,7 +1184,7 @@ end_it:
xfree(linuximage);
xfree(mloaderimage);
xfree(ramdiskimage);
-
+
return rc;
}
@@ -1210,14 +1210,14 @@ static int _sync_block_lists(List full_list, List incomp_list)
&& bit_equal(bg_record->ionode_bitmap,
new_record->ionode_bitmap))
break;
- }
+ }
if(!bg_record) {
list_remove(itr);
debug4("adding %s", new_record->bg_block_id);
list_append(incomp_list, new_record);
count++;
- }
+ }
list_iterator_reset(itr2);
}
list_iterator_destroy(itr);
@@ -1315,7 +1315,7 @@ static void _build_select_struct(struct job_record *job_ptr,
job_resrcs_ptr->node_bitmap = bit_copy(bitmap);
if (job_resrcs_ptr->node_bitmap == NULL)
fatal("bit_copy malloc failure");
-
+
job_resrcs_ptr->cpu_array_cnt = 1;
job_resrcs_ptr->cpu_array_value[0] = bg_conf->cpu_ratio;
job_resrcs_ptr->cpu_array_reps[0] = node_cnt;
@@ -1323,14 +1323,14 @@ static void _build_select_struct(struct job_record *job_ptr,
for (i=0; i<node_cnt; i++)
job_resrcs_ptr->cpus[i] = bg_conf->cpu_ratio;
-
+
if (job_resrcs_ptr->nprocs != total_cpus) {
error("select_p_job_test: nprocs mismatch %u != %u",
job_resrcs_ptr->nprocs, total_cpus);
}
}
-static List _get_preemptables(bg_record_t *bg_record, List preempt_jobs)
+static List _get_preemptables(bg_record_t *bg_record, List preempt_jobs)
{
List preempt = NULL;
ListIterator itr;
@@ -1351,7 +1351,7 @@ static List _get_preemptables(bg_record_t *bg_record, List preempt_jobs)
|| (bg_record == found_record)
|| !blocks_overlap(bg_record, found_record))
continue;
-
+
while((job_ptr = list_next(job_itr))) {
if(job_ptr == found_record->job_ptr)
break;
@@ -1364,19 +1364,19 @@ static List _get_preemptables(bg_record_t *bg_record, List preempt_jobs)
error("Job %u running on block %s "
"wasn't in the preempt list, but needs to be "
"preempted for queried job to run on block %s",
- found_record->job_ptr->job_id,
+ found_record->job_ptr->job_id,
found_record->bg_block_id,
bg_record->bg_block_id);
list_destroy(preempt);
preempt = NULL;
break;
}
- list_iterator_reset(job_itr);
+ list_iterator_reset(job_itr);
}
list_iterator_destroy(itr);
list_iterator_destroy(job_itr);
slurm_mutex_unlock(&block_state_mutex);
-
+
return preempt;
}
@@ -1384,7 +1384,7 @@ static List _get_preemptables(bg_record_t *bg_record, List preempt_jobs)
* equal to the main block list. And then return the number of cpus
* we freed up by removing the jobs.
*/
-static int _remove_preemptables(List block_list, List preempt_jobs)
+static int _remove_preemptables(List block_list, List preempt_jobs)
{
ListIterator itr;
ListIterator job_itr;
@@ -1410,16 +1410,16 @@ static int _remove_preemptables(List block_list, List preempt_jobs)
break;
}
}
- list_iterator_reset(itr);
-
- if(!found_record)
+ list_iterator_reset(itr);
+
+ if(!found_record)
error("Job %u wasn't found running anywhere, "
"can't preempt",
- job_ptr->job_id);
+ job_ptr->job_id);
}
list_iterator_destroy(itr);
list_iterator_destroy(job_itr);
-
+
return freed_cpus;
}
@@ -1434,8 +1434,8 @@ static int _remove_preemptables(List block_list, List preempt_jobs)
* SELECT_MODE_TEST_ONLY: test if job can ever run
* SELECT_MODE_WILL_RUN: determine when and where job can run
* IN preemptee_candidates - List of pointers to jobs which can be preempted.
- * IN/OUT preemptee_job_list - Pointer to list of job pointers. These are the
- * jobs to be preempted to initiate the pending job. Not set
+ * IN/OUT preemptee_job_list - Pointer to list of job pointers. These are the
+ * jobs to be preempted to initiate the pending job. Not set
* if mode=SELECT_MODE_TEST_ONLY or input pointer is NULL.
* RET - SLURM_SUCCESS if job runnable now, error code otherwise
*/
@@ -1455,7 +1455,7 @@ extern int submit_job(struct job_record *job_ptr, bitstr_t *slurm_block_bitmap,
uint16_t local_mode = mode, preempt_done=false;
int avail_cpus = num_unused_cpus;
- if (preemptee_candidates && preemptee_job_list
+ if (preemptee_candidates && preemptee_job_list
&& list_count(preemptee_candidates))
local_mode |= SELECT_MODE_PREEMPT_FLAG;
@@ -1463,17 +1463,17 @@ extern int submit_job(struct job_record *job_ptr, bitstr_t *slurm_block_bitmap,
slurm_mutex_lock(&create_dynamic_mutex);
job_block_test_list = bg_lists->job_running;
-
+
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_CONN_TYPE, &conn_type);
if(conn_type == SELECT_NAV) {
if(bg_conf->bp_node_cnt == bg_conf->nodecard_node_cnt)
conn_type = SELECT_SMALL;
- else if(min_nodes > 1)
+ else if(min_nodes > 1)
conn_type = SELECT_TORUS;
else if(job_ptr->num_procs < bg_conf->cpus_per_bp)
conn_type = SELECT_SMALL;
-
+
select_g_select_jobinfo_set(job_ptr->select_jobinfo,
SELECT_JOBDATA_CONN_TYPE,
&conn_type);
@@ -1481,25 +1481,25 @@ extern int submit_job(struct job_record *job_ptr, bitstr_t *slurm_block_bitmap,
if(slurm_block_bitmap && !bit_set_count(slurm_block_bitmap)) {
error("no nodes given to place job %u.", job_ptr->job_id);
-
+
if(bg_conf->layout_mode == LAYOUT_DYNAMIC)
slurm_mutex_unlock(&create_dynamic_mutex);
-
+
return SLURM_ERROR;
}
- select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
- buf, sizeof(buf),
+ select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
+ buf, sizeof(buf),
SELECT_PRINT_MIXED);
- debug("bluegene:submit_job: %d %s nodes=%u-%u-%u",
+ debug("bluegene:submit_job: %d %s nodes=%u-%u-%u",
local_mode, buf, min_nodes, req_nodes, max_nodes);
select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
- buf, sizeof(buf),
+ buf, sizeof(buf),
SELECT_PRINT_BLRTS_IMAGE);
#ifdef HAVE_BGL
debug2("BlrtsImage=%s", buf);
select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
- buf, sizeof(buf),
+ buf, sizeof(buf),
SELECT_PRINT_LINUX_IMAGE);
#endif
#ifdef HAVE_BGL
@@ -1509,31 +1509,31 @@ extern int submit_job(struct job_record *job_ptr, bitstr_t *slurm_block_bitmap,
#endif
select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
- buf, sizeof(buf),
+ buf, sizeof(buf),
SELECT_PRINT_MLOADER_IMAGE);
debug2("MloaderImage=%s", buf);
select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
- buf, sizeof(buf),
+ buf, sizeof(buf),
SELECT_PRINT_RAMDISK_IMAGE);
#ifdef HAVE_BGL
debug2("RamDiskImage=%s", buf);
#else
debug2("RamDiskIoLoadImage=%s", buf);
-#endif
+#endif
slurm_mutex_lock(&block_state_mutex);
block_list = copy_bg_list(bg_lists->main);
slurm_mutex_unlock(&block_state_mutex);
-
+
/* just remove the preemptable jobs now since we are treating
this as a run now deal */
-preempt:
+preempt:
list_sort(block_list, (ListCmpF)_bg_record_sort_aval_dec);
rc = _find_best_block_match(block_list, &blocks_added,
- job_ptr, slurm_block_bitmap, min_nodes,
- max_nodes, req_nodes,
+ job_ptr, slurm_block_bitmap, min_nodes,
+ max_nodes, req_nodes,
&bg_record, local_mode, avail_cpus);
-
+
if(rc == SLURM_SUCCESS) {
if(bg_record) {
/* Here we see if there is a job running since
@@ -1543,8 +1543,8 @@ preempt:
* past or current time) we add 5 seconds to
* it so we don't use the block immediately.
*/
- if(bg_record->job_ptr
- && bg_record->job_ptr->end_time) {
+ if(bg_record->job_ptr
+ && bg_record->job_ptr->end_time) {
if(bg_record->job_ptr->end_time <= starttime)
starttime += 5;
else
@@ -1552,14 +1552,14 @@ preempt:
bg_record->job_ptr->end_time;
} else if(bg_record->job_running == BLOCK_ERROR_STATE)
starttime = INFINITE;
-
+
job_ptr->start_time = starttime;
-
+
select_g_select_jobinfo_set(job_ptr->select_jobinfo,
- SELECT_JOBDATA_NODES,
+ SELECT_JOBDATA_NODES,
bg_record->nodes);
select_g_select_jobinfo_set(job_ptr->select_jobinfo,
- SELECT_JOBDATA_IONODES,
+ SELECT_JOBDATA_IONODES,
bg_record->ionodes);
if(!bg_record->bg_block_id) {
debug2("%d can start unassigned job %u at "
@@ -1592,12 +1592,12 @@ preempt:
&& (job_ptr->part_ptr->max_share <= 1))
error("Small block used in "
"non-shared partition");
-
+
debug2("%d can start job %u at %u on %s(%s)",
local_mode, job_ptr->job_id, starttime,
bg_record->bg_block_id,
bg_record->nodes);
-
+
if (SELECT_IS_MODE_RUN_NOW(local_mode)) {
select_g_select_jobinfo_set(
job_ptr->select_jobinfo,
@@ -1609,7 +1609,7 @@ preempt:
SELECT_JOBDATA_CONN_TYPE,
&conn_type);
if(job_ptr) {
- job_ptr->job_state
+ job_ptr->job_state
|= JOB_CONFIGURING;
last_job_update = time(NULL);
}
@@ -1618,23 +1618,23 @@ preempt:
job_ptr->select_jobinfo,
SELECT_JOBDATA_BLOCK_ID,
"unassigned");
-
+
select_g_select_jobinfo_set(
job_ptr->select_jobinfo,
- SELECT_JOBDATA_NODE_CNT,
+ SELECT_JOBDATA_NODE_CNT,
&bg_record->node_cnt);
}
- if (SELECT_IS_MODE_RUN_NOW(local_mode))
+ if (SELECT_IS_MODE_RUN_NOW(local_mode))
_build_select_struct(job_ptr,
slurm_block_bitmap,
bg_record->node_cnt);
/* set up the preempted job list */
if(SELECT_IS_PREEMPT_SET(local_mode)) {
- if(*preemptee_job_list)
+ if(*preemptee_job_list)
list_destroy(*preemptee_job_list);
*preemptee_job_list = _get_preemptables(
bg_record, preemptee_candidates);
- }
+ }
} else {
error("we got a success, but no block back");
}
@@ -1645,9 +1645,9 @@ preempt:
goto preempt;
}
- if(bg_conf->layout_mode == LAYOUT_DYNAMIC) {
+ if(bg_conf->layout_mode == LAYOUT_DYNAMIC) {
slurm_mutex_lock(&block_state_mutex);
- if(blocks_added)
+ if(blocks_added)
_sync_block_lists(block_list, bg_lists->main);
slurm_mutex_unlock(&block_state_mutex);
slurm_mutex_unlock(&create_dynamic_mutex);
diff --git a/src/plugins/select/bluegene/plugin/bg_job_place.h b/src/plugins/select/bluegene/plugin/bg_job_place.h
index 59631f4439ccb978125b7cd350aaa7652f73272f..7d0af4bf7fd185175119a63684b5b6b0fe456372 100644
--- a/src/plugins/select/bluegene/plugin/bg_job_place.h
+++ b/src/plugins/select/bluegene/plugin/bg_job_place.h
@@ -1,36 +1,36 @@
/*****************************************************************************\
- * bg_job_place.h - header for blue gene job placement (e.g. base partition
- * selection) functions.
+ * bg_job_place.h - header for blue gene job placement (e.g. base partition
+ * selection) functions.
*****************************************************************************
* Copyright (C) 2004-2006 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Dan Phung <phung4@llnl.gov> et. al.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -44,20 +44,20 @@
/*
* Try to find resources for a given job request
* IN job_ptr - pointer to job record in slurmctld
- * IN/OUT bitmap - nodes availble for assignment to job, clear those not to
+ * IN/OUT bitmap - nodes availble for assignment to job, clear those not to
* be used
- * IN min_nodes, max_nodes - minimum and maximum number of nodes to allocate
+ * IN min_nodes, max_nodes - minimum and maximum number of nodes to allocate
* to this job (considers slurm partition limits)
- * IN test_only - test to see if job is ever runnable,
+ * IN test_only - test to see if job is ever runnable,
* or (false) runable right now
* IN mode - SELECT_MODE_RUN_NOW: try to schedule job now
* SELECT_MODE_TEST_ONLY: test if job can ever run
* SELECT_MODE_WILL_RUN: determine when and where job can run
* IN preemptee_candidates - List of pointers to jobs which can be preempted.
- * IN/OUT preemptee_job_list - Pointer to list of job pointers. These are the
- * jobs to be preempted to initiate the pending job. Not set
+ * IN/OUT preemptee_job_list - Pointer to list of job pointers. These are the
+ * jobs to be preempted to initiate the pending job. Not set
* if mode=SELECT_MODE_TEST_ONLY or input pointer is NULL.
- * RET - SLURM_SUCCESS if job runnable now, error code otherwise
+ * RET - SLURM_SUCCESS if job runnable now, error code otherwise
*/
extern int submit_job(struct job_record *job_ptr, bitstr_t *bitmap,
uint32_t min_nodes, uint32_t max_nodes,
diff --git a/src/plugins/select/bluegene/plugin/bg_job_run.c b/src/plugins/select/bluegene/plugin/bg_job_run.c
index 5069c4ea33dcb046e873725c18a2e9db0b416134..2a10555f37729a90758eef262c5085208d37d0c8 100644
--- a/src/plugins/select/bluegene/plugin/bg_job_run.c
+++ b/src/plugins/select/bluegene/plugin/bg_job_run.c
@@ -1,38 +1,38 @@
/*****************************************************************************\
- * bg_job_run.c - blue gene job execution (e.g. initiation and termination)
+ * bg_job_run.c - blue gene job execution (e.g. initiation and termination)
* functions.
*
- * $Id$
+ * $Id$
*****************************************************************************
* Copyright (C) 2004-2006 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -100,8 +100,8 @@ static int _remove_job(db_job_id_t job_id);
#endif
static void _bg_list_del(void *x);
-static int _excise_block(List block_list,
- pm_partition_id_t bg_block_id,
+static int _excise_block(List block_list,
+ pm_partition_id_t bg_block_id,
char *nodes);
static List _get_all_allocated_blocks(void);
static void * _block_agent(void *args);
@@ -128,24 +128,24 @@ static int _remove_job(db_job_id_t job_id)
/* Find the job */
if ((rc = bridge_get_job(job_id, &job_rec)) != STATUS_OK) {
-
+
if (rc == JOB_NOT_FOUND) {
debug("job %d removed from MMCS", job_id);
return STATUS_OK;
- }
+ }
- error("bridge_get_job(%d): %s", job_id,
+ error("bridge_get_job(%d): %s", job_id,
bg_err_str(rc));
continue;
}
-
- if ((rc = bridge_get_data(job_rec, RM_JobState, &job_state))
+
+ if ((rc = bridge_get_data(job_rec, RM_JobState, &job_state))
!= STATUS_OK) {
(void) bridge_free_job(job_rec);
if (rc == JOB_NOT_FOUND) {
debug("job %d not found in MMCS", job_id);
return STATUS_OK;
- }
+ }
error("bridge_get_data(RM_JobState) for jobid=%d "
"%s", job_id, bg_err_str(rc));
@@ -156,19 +156,19 @@ static int _remove_job(db_job_id_t job_id)
error("bridge_free_job: %s", bg_err_str(rc));
debug2("job %d is in state %d", job_id, job_state);
-
+
/* check the state and process accordingly */
if(job_state == RM_JOB_TERMINATED)
return STATUS_OK;
else if(job_state == RM_JOB_DYING) {
- if(count > MAX_POLL_RETRIES)
+ if(count > MAX_POLL_RETRIES)
error("Job %d isn't dying, trying for "
- "%d seconds", job_id,
+ "%d seconds", job_id,
count*POLL_INTERVAL);
continue;
} else if(job_state == RM_JOB_ERROR) {
error("job %d is in a error state.", job_id);
-
+
//free_bg_block();
return STATUS_OK;
}
@@ -206,7 +206,7 @@ static int _remove_job(db_job_id_t job_id)
#endif
/* block_state_mutex should be locked before calling this function */
-static int _reset_block(bg_record_t *bg_record)
+static int _reset_block(bg_record_t *bg_record)
{
int rc = SLURM_SUCCESS;
if(bg_record) {
@@ -214,25 +214,25 @@ static int _reset_block(bg_record_t *bg_record)
bg_record->job_running = NO_JOB_RUNNING;
bg_record->job_ptr = NULL;
}
- /* remove user from list */
-
+ /* remove user from list */
+
if(bg_record->target_name) {
- if(strcmp(bg_record->target_name,
+ if(strcmp(bg_record->target_name,
bg_conf->slurm_user_name)) {
xfree(bg_record->target_name);
- bg_record->target_name =
+ bg_record->target_name =
xstrdup(bg_conf->slurm_user_name);
}
update_block_user(bg_record, 1);
} else {
- bg_record->target_name =
+ bg_record->target_name =
xstrdup(bg_conf->slurm_user_name);
- }
-
-
+ }
+
+
bg_record->boot_state = 0;
bg_record->boot_count = 0;
-
+
last_bg_update = time(NULL);
/* Only remove from the job_running list if
job_running == NO_JOB_RUNNING, since blocks in
@@ -241,7 +241,7 @@ static int _reset_block(bg_record_t *bg_record)
*/
if(bg_record->job_running == NO_JOB_RUNNING)
if(remove_from_bg_list(bg_lists->job_running,
- bg_record)
+ bg_record)
== SLURM_SUCCESS) {
num_unused_cpus += bg_record->cpu_cnt;
}
@@ -254,10 +254,10 @@ static int _reset_block(bg_record_t *bg_record)
}
/* job_start_mutex and block_state_mutex should be locked before
- * calling this function. This should only be called in _start_agent.
+ * calling this function. This should only be called in _start_agent.
* RET 1 if exists 0 if not, and job is requeued.
*/
-static int _make_sure_block_still_exists(bg_update_t *bg_update_ptr,
+static int _make_sure_block_still_exists(bg_update_t *bg_update_ptr,
bg_record_t *bg_record)
{
int rc = SLURM_SUCCESS;
@@ -276,7 +276,7 @@ static int _make_sure_block_still_exists(bg_update_t *bg_update_ptr,
lock_slurmctld(job_write_lock);
if((rc = job_requeue(0, bg_update_ptr->job_ptr->job_id, -1))) {
error("couldn't requeue job %u, failing it: %s",
- bg_update_ptr->job_ptr->job_id,
+ bg_update_ptr->job_ptr->job_id,
slurm_strerror(rc));
job_fail(bg_update_ptr->job_ptr->job_id);
}
@@ -325,12 +325,12 @@ static void _remove_jobs_on_block_and_reset(rm_job_list_t *job_list,
}
#ifdef HAVE_BG_FILES
- for (i=0; i<job_cnt; i++) {
+ for (i=0; i<job_cnt; i++) {
if (i) {
- if ((rc = bridge_get_data(job_list, RM_JobListNextJob,
+ if ((rc = bridge_get_data(job_list, RM_JobListNextJob,
&job_elem)) != STATUS_OK) {
error("bridge_get_data"
- "(RM_JobListNextJob): %s",
+ "(RM_JobListNextJob): %s",
bg_err_str(rc));
continue;
}
@@ -343,15 +343,15 @@ static void _remove_jobs_on_block_and_reset(rm_job_list_t *job_list,
continue;
}
}
-
+
if(!job_elem) {
error("No Job Elem breaking out job count = %d\n", i);
break;
}
- if ((rc = bridge_get_data(job_elem, RM_JobPartitionID,
+ if ((rc = bridge_get_data(job_elem, RM_JobPartitionID,
&job_block))
!= STATUS_OK) {
- error("bridge_get_data(RM_JobPartitionID) %s: %s",
+ error("bridge_get_data(RM_JobPartitionID) %s: %s",
job_block, bg_err_str(rc));
continue;
}
@@ -363,17 +363,17 @@ static void _remove_jobs_on_block_and_reset(rm_job_list_t *job_list,
debug2("looking at block %s looking for %s\n",
job_block, block_id);
-
+
if (!strcmp(job_block, block_id)) {
free(block_id);
continue;
}
-
+
free(block_id);
if ((rc = bridge_get_data(job_elem, RM_JobDBJobID, &job_id))
!= STATUS_OK) {
- error("bridge_get_data(RM_JobDBJobID): %s",
+ error("bridge_get_data(RM_JobDBJobID): %s",
bg_err_str(rc));
continue;
}
@@ -406,7 +406,7 @@ static void _remove_jobs_on_block_and_reset(rm_job_list_t *job_list,
block_id);
}
- _reset_block(bg_record);
+ _reset_block(bg_record);
} else if (bg_conf->layout_mode == LAYOUT_DYNAMIC) {
debug2("Hopefully we are destroying this block %s "
"since it isn't in the bg_lists->main",
@@ -439,18 +439,18 @@ static void _reset_block_list(List block_list)
#ifdef HAVE_BG_FILES
debug2("getting the job info");
- live_states = JOB_ALL_FLAG
- & (~JOB_TERMINATED_FLAG)
+ live_states = JOB_ALL_FLAG
+ & (~JOB_TERMINATED_FLAG)
& (~JOB_KILLED_FLAG)
& (~JOB_ERROR_FLAG);
-
+
if ((rc = bridge_get_jobs(live_states, &job_list)) != STATUS_OK) {
error("bridge_get_jobs(): %s", bg_err_str(rc));
-
+
return;
}
- if ((rc = bridge_get_data(job_list, RM_JobListSize, &jobs))
+ if ((rc = bridge_get_data(job_list, RM_JobListSize, &jobs))
!= STATUS_OK) {
error("bridge_get_data(RM_JobListSize): %s", bg_err_str(rc));
jobs = 0;
@@ -478,7 +478,7 @@ static void _sync_agent(bg_update_t *bg_update_ptr)
bg_record_t * bg_record = NULL;
slurmctld_lock_t job_write_lock = {
NO_LOCK, WRITE_LOCK, WRITE_LOCK, NO_LOCK };
-
+
slurm_mutex_lock(&block_state_mutex);
bg_record = find_bg_record_in_list(bg_lists->main,
bg_update_ptr->bg_block_id);
@@ -489,7 +489,7 @@ static void _sync_agent(bg_update_t *bg_update_ptr)
lock_slurmctld(job_write_lock);
if((rc = job_requeue(0, bg_update_ptr->job_ptr->job_id, -1))) {
error("couldn't requeue job %u, failing it: %s",
- bg_update_ptr->job_ptr->job_id,
+ bg_update_ptr->job_ptr->job_id,
slurm_strerror(rc));
job_fail(bg_update_ptr->job_ptr->job_id);
}
@@ -508,7 +508,7 @@ static void _sync_agent(bg_update_t *bg_update_ptr)
list_push(bg_lists->job_running, bg_record);
num_unused_cpus -= bg_record->cpu_cnt;
}
- if(!block_ptr_exist_in_list(bg_lists->booted, bg_record))
+ if(!block_ptr_exist_in_list(bg_lists->booted, bg_record))
list_push(bg_lists->booted, bg_record);
if(bg_record->state == RM_PARTITION_READY) {
@@ -516,16 +516,16 @@ static void _sync_agent(bg_update_t *bg_update_ptr)
int set_user_rc = SLURM_SUCCESS;
debug("User isn't correct for job %d on %s, "
- "fixing...",
+ "fixing...",
bg_update_ptr->job_ptr->job_id,
bg_update_ptr->bg_block_id);
xfree(bg_record->target_name);
- bg_record->target_name =
+ bg_record->target_name =
uid_to_string(bg_update_ptr->job_ptr->user_id);
set_user_rc = set_block_user(bg_record);
slurm_mutex_unlock(&block_state_mutex);
-
- if(set_user_rc == SLURM_ERROR)
+
+ if(set_user_rc == SLURM_ERROR)
(void) slurm_fail_job(bg_record->job_running);
} else
slurm_mutex_unlock(&block_state_mutex);
@@ -557,25 +557,25 @@ static void _start_agent(bg_update_t *bg_update_ptr)
NO_LOCK, WRITE_LOCK, WRITE_LOCK, NO_LOCK };
slurm_mutex_lock(&job_start_mutex);
-
+
slurm_mutex_lock(&block_state_mutex);
- bg_record = find_bg_record_in_list(bg_lists->main,
+ bg_record = find_bg_record_in_list(bg_lists->main,
bg_update_ptr->bg_block_id);
if(!bg_record) {
slurm_mutex_unlock(&block_state_mutex);
error("block %s not found in bg_lists->main",
bg_update_ptr->bg_block_id);
- /* wait for the slurmd to begin
- the batch script, slurm_fail_job()
- is a no-op if issued prior
+ /* wait for the slurmd to begin
+ the batch script, slurm_fail_job()
+ is a no-op if issued prior
to the script initiation do clean up just
incase the fail job isn't ran */
- sleep(2);
+ sleep(2);
lock_slurmctld(job_write_lock);
if((rc = job_requeue(0, bg_update_ptr->job_ptr->job_id, -1))) {
error("couldn't requeue job %u, failing it: %s",
- bg_update_ptr->job_ptr->job_id,
+ bg_update_ptr->job_ptr->job_id,
slurm_strerror(rc));
job_fail(bg_update_ptr->job_ptr->job_id);
}
@@ -604,17 +604,17 @@ static void _start_agent(bg_update_t *bg_update_ptr)
slurm_mutex_unlock(&job_start_mutex);
return;
}
- }
-
+ }
+
delete_list = list_create(NULL);
itr = list_iterator_create(bg_lists->main);
while ((found_record = list_next(itr))) {
if ((!found_record) || (bg_record == found_record))
continue;
-
+
if(!blocks_overlap(bg_record, found_record)) {
debug2("block %s isn't part of %s",
- found_record->bg_block_id,
+ found_record->bg_block_id,
bg_record->bg_block_id);
continue;
}
@@ -634,12 +634,12 @@ static void _start_agent(bg_update_t *bg_update_ptr)
}
debug2("need to make sure %s is free, it's part of %s",
- found_record->bg_block_id,
+ found_record->bg_block_id,
bg_record->bg_block_id);
list_push(delete_list, found_record);
- if(bg_conf->layout_mode == LAYOUT_DYNAMIC)
+ if(bg_conf->layout_mode == LAYOUT_DYNAMIC)
list_remove(itr);
- }
+ }
list_iterator_destroy(itr);
if(requeue_job) {
@@ -649,39 +649,39 @@ static void _start_agent(bg_update_t *bg_update_ptr)
_reset_block(bg_record);
slurm_mutex_unlock(&block_state_mutex);
- /* wait for the slurmd to begin
- the batch script, slurm_fail_job()
- is a no-op if issued prior
+ /* wait for the slurmd to begin
+ the batch script, slurm_fail_job()
+ is a no-op if issued prior
to the script initiation do clean up just
incase the fail job isn't ran */
- sleep(2);
+ sleep(2);
lock_slurmctld(job_write_lock);
if((rc = job_requeue(0, bg_update_ptr->job_ptr->job_id, -1))) {
error("couldn't requeue job %u, failing it: %s",
- bg_update_ptr->job_ptr->job_id,
+ bg_update_ptr->job_ptr->job_id,
slurm_strerror(rc));
job_fail(bg_update_ptr->job_ptr->job_id);
}
unlock_slurmctld(job_write_lock);
slurm_mutex_unlock(&job_start_mutex);
return;
- }
+ }
free_block_list(delete_list);
list_destroy(delete_list);
slurm_mutex_unlock(&block_state_mutex);
-
+
/* wait for all necessary blocks to be freed */
while(num_block_to_free > num_block_freed) {
sleep(1);
debug("got %d of %d freed",
- num_block_freed,
+ num_block_freed,
num_block_to_free);
}
/* Zero out the values here because we are done with them and
they will be ready for the next job */
num_block_to_free = num_block_freed = 0;
-
+
slurm_mutex_lock(&block_state_mutex);
if(!_make_sure_block_still_exists(bg_update_ptr, bg_record)) {
slurm_mutex_unlock(&block_state_mutex);
@@ -700,7 +700,7 @@ static void _start_agent(bg_update_t *bg_update_ptr)
rc = 0;
#ifdef HAVE_BGL
- if(bg_update_ptr->blrtsimage
+ if(bg_update_ptr->blrtsimage
&& strcasecmp(bg_update_ptr->blrtsimage, bg_record->blrtsimage)) {
debug3("changing BlrtsImage from %s to %s",
bg_record->blrtsimage, bg_update_ptr->blrtsimage);
@@ -708,8 +708,8 @@ static void _start_agent(bg_update_t *bg_update_ptr)
bg_record->blrtsimage = xstrdup(bg_update_ptr->blrtsimage);
rc = 1;
}
-#else
- if((bg_update_ptr->conn_type >= SELECT_SMALL)
+#else
+ if((bg_update_ptr->conn_type >= SELECT_SMALL)
&& (bg_update_ptr->conn_type != bg_record->conn_type)) {
debug3("changing small block mode from %u to %u",
bg_record->conn_type, bg_update_ptr->conn_type);
@@ -755,7 +755,7 @@ static void _start_agent(bg_update_t *bg_update_ptr)
if(rc) {
bg_record->modifying = 1;
-
+
bg_free_block(bg_record, 1, 1);
if(!_make_sure_block_still_exists(bg_update_ptr, bg_record)) {
@@ -766,39 +766,39 @@ static void _start_agent(bg_update_t *bg_update_ptr)
#ifdef HAVE_BG_FILES
#ifdef HAVE_BGL
if ((rc = bridge_modify_block(bg_record->bg_block_id,
- RM_MODIFY_BlrtsImg,
+ RM_MODIFY_BlrtsImg,
bg_record->blrtsimage))
!= STATUS_OK)
error("bridge_modify_block(RM_MODIFY_BlrtsImg)",
bg_err_str(rc));
-
+
if ((rc = bridge_modify_block(bg_record->bg_block_id,
- RM_MODIFY_LinuxImg,
+ RM_MODIFY_LinuxImg,
bg_record->linuximage))
- != STATUS_OK)
+ != STATUS_OK)
error("bridge_modify_block(RM_MODIFY_LinuxImg)",
bg_err_str(rc));
-
+
if ((rc = bridge_modify_block(bg_record->bg_block_id,
- RM_MODIFY_RamdiskImg,
+ RM_MODIFY_RamdiskImg,
bg_record->ramdiskimage))
!= STATUS_OK)
- error("bridge_modify_block(RM_MODIFY_RamdiskImg)",
+ error("bridge_modify_block(RM_MODIFY_RamdiskImg)",
bg_err_str(rc));
#else
if ((rc = bridge_modify_block(bg_record->bg_block_id,
- RM_MODIFY_CnloadImg,
+ RM_MODIFY_CnloadImg,
bg_record->linuximage))
- != STATUS_OK)
+ != STATUS_OK)
error("bridge_modify_block(RM_MODIFY_CnloadImg)",
bg_err_str(rc));
-
+
if ((rc = bridge_modify_block(bg_record->bg_block_id,
- RM_MODIFY_IoloadImg,
+ RM_MODIFY_IoloadImg,
bg_record->ramdiskimage))
!= STATUS_OK)
- error("bridge_modify_block(RM_MODIFY_IoloadImg)",
+ error("bridge_modify_block(RM_MODIFY_IoloadImg)",
bg_err_str(rc));
if(bg_update_ptr->conn_type > SELECT_SMALL) {
@@ -830,14 +830,14 @@ static void _start_agent(bg_update_t *bg_update_ptr)
}
#endif
if ((rc = bridge_modify_block(bg_record->bg_block_id,
- RM_MODIFY_MloaderImg,
+ RM_MODIFY_MloaderImg,
bg_record->mloaderimage))
!= STATUS_OK)
- error("bridge_modify_block(RM_MODIFY_MloaderImg)",
+ error("bridge_modify_block(RM_MODIFY_MloaderImg)",
bg_err_str(rc));
-
+
#endif
- bg_record->modifying = 0;
+ bg_record->modifying = 0;
} else if(bg_update_ptr->reboot) {
bg_record->modifying = 1;
@@ -848,26 +848,26 @@ static void _start_agent(bg_update_t *bg_update_ptr)
slurm_mutex_unlock(&job_start_mutex);
return;
}
- bg_record->modifying = 0;
+ bg_record->modifying = 0;
}
if(bg_record->state == RM_PARTITION_FREE) {
- slurm_mutex_unlock(&block_state_mutex);
+ slurm_mutex_unlock(&block_state_mutex);
if((rc = boot_block(bg_record)) != SLURM_SUCCESS) {
slurm_mutex_lock(&block_state_mutex);
_reset_block(bg_record);
slurm_mutex_unlock(&block_state_mutex);
- sleep(2);
- /* wait for the slurmd to begin
- the batch script, slurm_fail_job()
- is a no-op if issued prior
+ sleep(2);
+ /* wait for the slurmd to begin
+ the batch script, slurm_fail_job()
+ is a no-op if issued prior
to the script initiation do clean up just
incase the fail job isn't ran */
lock_slurmctld(job_write_lock);
if((rc = job_requeue(
0, bg_update_ptr->job_ptr->job_id, -1))) {
error("couldn't requeue job %u, failing it: %s",
- bg_update_ptr->job_ptr->job_id,
+ bg_update_ptr->job_ptr->job_id,
slurm_strerror(rc));
job_fail(bg_update_ptr->job_ptr->job_id);
}
@@ -876,15 +876,15 @@ static void _start_agent(bg_update_t *bg_update_ptr)
slurm_mutex_unlock(&job_start_mutex);
return;
}
- slurm_mutex_lock(&block_state_mutex);
+ slurm_mutex_lock(&block_state_mutex);
if(!_make_sure_block_still_exists(bg_update_ptr, bg_record)) {
slurm_mutex_unlock(&block_state_mutex);
slurm_mutex_unlock(&job_start_mutex);
return;
}
- } else if (bg_record->state == RM_PARTITION_CONFIGURING)
- bg_record->boot_state = 1;
-
+ } else if (bg_record->state == RM_PARTITION_CONFIGURING)
+ bg_record->boot_state = 1;
+
if(bg_record->job_running <= NO_JOB_RUNNING) {
slurm_mutex_unlock(&block_state_mutex);
@@ -894,37 +894,37 @@ static void _start_agent(bg_update_t *bg_update_ptr)
bg_update_ptr->job_ptr->job_id);
return;
}
-
+
bg_record->boot_count = 0;
xfree(bg_record->target_name);
- bg_record->target_name =
+ bg_record->target_name =
uid_to_string(bg_update_ptr->job_ptr->user_id);
debug("setting the target_name for Block %s to %s",
bg_record->bg_block_id, bg_record->target_name);
-
+
if(bg_record->state == RM_PARTITION_READY) {
debug("block %s is ready.", bg_record->bg_block_id);
- set_user_rc = set_block_user(bg_record);
+ set_user_rc = set_block_user(bg_record);
if(bg_update_ptr->job_ptr) {
bg_update_ptr->job_ptr->job_state &= (~JOB_CONFIGURING);
last_job_update = time(NULL);
}
}
- slurm_mutex_unlock(&block_state_mutex);
+ slurm_mutex_unlock(&block_state_mutex);
if(set_user_rc == SLURM_ERROR) {
- sleep(2);
- /* wait for the slurmd to begin
- the batch script, slurm_fail_job()
- is a no-op if issued prior
+ sleep(2);
+ /* wait for the slurmd to begin
+ the batch script, slurm_fail_job()
+ is a no-op if issued prior
to the script initiation do clean up just
incase the fail job isn't ran */
(void) slurm_fail_job(bg_record->job_running);
slurm_mutex_lock(&block_state_mutex);
if (remove_from_bg_list(bg_lists->job_running, bg_record)
- == SLURM_SUCCESS)
+ == SLURM_SUCCESS)
num_unused_cpus += bg_record->cpu_cnt;
-
+
slurm_mutex_unlock(&block_state_mutex);
}
slurm_mutex_unlock(&job_start_mutex);
@@ -935,23 +935,23 @@ static void _term_agent(bg_update_t *bg_update_ptr)
{
int jobs = 0;
rm_job_list_t *job_list = NULL;
-
+
#ifdef HAVE_BG_FILES
int live_states, rc;
-
+
debug2("getting the job info");
- live_states = JOB_ALL_FLAG
- & (~JOB_TERMINATED_FLAG)
+ live_states = JOB_ALL_FLAG
+ & (~JOB_TERMINATED_FLAG)
& (~JOB_KILLED_FLAG)
& (~JOB_ERROR_FLAG);
-
+
if ((rc = bridge_get_jobs(live_states, &job_list)) != STATUS_OK) {
error("bridge_get_jobs(): %s", bg_err_str(rc));
-
+
return;
- }
-
- if ((rc = bridge_get_data(job_list, RM_JobListSize, &jobs))
+ }
+
+ if ((rc = bridge_get_data(job_list, RM_JobListSize, &jobs))
!= STATUS_OK) {
error("bridge_get_data(RM_JobListSize): %s", bg_err_str(rc));
jobs = 0;
@@ -965,18 +965,18 @@ static void _term_agent(bg_update_t *bg_update_ptr)
if ((rc = bridge_free_job_list(job_list)) != STATUS_OK)
error("bridge_free_job_list(): %s", bg_err_str(rc));
#endif
-
+
}
/* Process requests off the bg_update_list queue and exit when done */
static void *_block_agent(void *args)
{
bg_update_t *bg_update_ptr = NULL;
-
+
/*
- * Don't just exit when there is no work left. Creating
+ * Don't just exit when there is no work left. Creating
* pthreads from within a dynamically linked object (plugin)
- * causes large memory leaks on some systems that seem
+ * causes large memory leaks on some systems that seem
* unavoidable even from detached pthreads.
*/
while (!agent_fini) {
@@ -1002,20 +1002,20 @@ static void *_block_agent(void *args)
if (agent_cnt == 0) {
list_destroy(bg_update_list);
bg_update_list = NULL;
- pthread_cond_signal(&agent_cond);
+ pthread_cond_signal(&agent_cond);
}
slurm_mutex_unlock(&agent_cnt_mutex);
return NULL;
}
-/* Perform an operation upon a BG block (block) for starting or
+/* Perform an operation upon a BG block (block) for starting or
* terminating a job */
static void _block_op(bg_update_t *bg_update_ptr)
{
pthread_attr_t attr_agent;
pthread_t thread_agent;
int retries;
-
+
slurm_mutex_lock(&agent_cnt_mutex);
if ((bg_update_list == NULL)
&& ((bg_update_list = list_create(_bg_list_del)) == NULL))
@@ -1030,8 +1030,8 @@ static void _block_op(bg_update_t *bg_update_ptr)
if (list_push(bg_update_list, bg_update_ptr) == NULL)
fatal("malloc failure in _block_op/list_push");
}
-
- /* already running MAX_AGENTS we don't really need more
+
+ /* already running MAX_AGENTS we don't really need more
since they never end */
if (agent_cnt > MAX_AGENT_COUNT) {
slurm_mutex_unlock(&agent_cnt_mutex);
@@ -1042,12 +1042,12 @@ static void _block_op(bg_update_t *bg_update_ptr)
agent_cnt++;
/* spawn an agent */
slurm_attr_init(&attr_agent);
- if (pthread_attr_setdetachstate(&attr_agent,
+ if (pthread_attr_setdetachstate(&attr_agent,
PTHREAD_CREATE_DETACHED))
error("pthread_attr_setdetachstate error %m");
-
+
retries = 0;
- while (pthread_create(&thread_agent, &attr_agent,
+ while (pthread_create(&thread_agent, &attr_agent,
_block_agent, NULL)) {
error("pthread_create error %m");
if (++retries > MAX_PTHREAD_RETRIES)
@@ -1065,7 +1065,7 @@ static List _get_all_allocated_blocks(void)
ListIterator itr;
bg_record_t *block_ptr = NULL;
bg_record_t *str_ptr = NULL;
-
+
if (!ret_list)
fatal("malloc error");
@@ -1080,7 +1080,7 @@ static List _get_all_allocated_blocks(void)
str_ptr = xmalloc(sizeof(bg_record_t));
str_ptr->bg_block_id = xstrdup(block_ptr->bg_block_id);
str_ptr->nodes = xstrdup(block_ptr->nodes);
-
+
list_append(ret_list, str_ptr);
}
list_iterator_destroy(itr);
@@ -1098,7 +1098,7 @@ static int _excise_block(List block_list, pm_partition_id_t bg_block_id,
int rc = SLURM_SUCCESS;
ListIterator iter;
bg_record_t *block = NULL;
-
+
if(block_list) {
iter = list_iterator_create(block_list);
xassert(iter);
@@ -1106,20 +1106,20 @@ static int _excise_block(List block_list, pm_partition_id_t bg_block_id,
rc = SLURM_ERROR;
if (strcmp(block->bg_block_id, bg_block_id))
continue;
- if (strcmp(block->nodes, nodes)) {
+ if (strcmp(block->nodes, nodes)) {
/* changed bgblock */
error("bg_block_id:%s old_nodes:%s "
"new_nodes:%s",
bg_block_id, nodes, block->nodes);
break;
}
-
+
/* exact match of name and node list */
debug("synced Block %s", bg_block_id);
list_delete_item(iter);
rc = SLURM_SUCCESS;
break;
- }
+ }
list_iterator_destroy(iter);
} else {
error("_excise_block: No block_list");
@@ -1133,8 +1133,8 @@ static int _excise_block(List block_list, pm_partition_id_t bg_block_id,
* bg_block_id IN - block name
* RET - SLURM_SUCCESS or an error code
*
- * NOTE: The job is killed before the function returns. This can take
- * many seconds. Do not call from slurmctld or any other entity that
+ * NOTE: The job is killed before the function returns. This can take
+ * many seconds. Do not call from slurmctld or any other entity that
* can not wait.
*/
int term_jobs_on_block(pm_partition_id_t bg_block_id)
@@ -1149,7 +1149,7 @@ int term_jobs_on_block(pm_partition_id_t bg_block_id)
bg_update_ptr->op = TERM_OP;
bg_update_ptr->bg_block_id = xstrdup(bg_block_id);
_block_op(bg_update_ptr);
-
+
return rc;
}
@@ -1174,66 +1174,66 @@ extern int start_job(struct job_record *job_ptr)
bg_update_ptr->job_ptr = job_ptr;
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_BLOCK_ID,
+ SELECT_JOBDATA_BLOCK_ID,
&(bg_update_ptr->bg_block_id));
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_REBOOT,
+ SELECT_JOBDATA_REBOOT,
&(bg_update_ptr->reboot));
#ifdef HAVE_BGL
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_BLRTS_IMAGE,
+ SELECT_JOBDATA_BLRTS_IMAGE,
&(bg_update_ptr->blrtsimage));
if(!bg_update_ptr->blrtsimage) {
bg_update_ptr->blrtsimage =
xstrdup(bg_conf->default_blrtsimage);
select_g_select_jobinfo_set(job_ptr->select_jobinfo,
- SELECT_JOBDATA_BLRTS_IMAGE,
+ SELECT_JOBDATA_BLRTS_IMAGE,
bg_update_ptr->blrtsimage);
}
#else
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_CONN_TYPE,
+ SELECT_JOBDATA_CONN_TYPE,
&(bg_update_ptr->conn_type));
#endif
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_LINUX_IMAGE,
+ SELECT_JOBDATA_LINUX_IMAGE,
&(bg_update_ptr->linuximage));
if(!bg_update_ptr->linuximage) {
bg_update_ptr->linuximage =
xstrdup(bg_conf->default_linuximage);
select_g_select_jobinfo_set(job_ptr->select_jobinfo,
- SELECT_JOBDATA_LINUX_IMAGE,
+ SELECT_JOBDATA_LINUX_IMAGE,
bg_update_ptr->linuximage);
}
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_MLOADER_IMAGE,
+ SELECT_JOBDATA_MLOADER_IMAGE,
&(bg_update_ptr->mloaderimage));
if(!bg_update_ptr->mloaderimage) {
- bg_update_ptr->mloaderimage =
+ bg_update_ptr->mloaderimage =
xstrdup(bg_conf->default_mloaderimage);
select_g_select_jobinfo_set(job_ptr->select_jobinfo,
- SELECT_JOBDATA_MLOADER_IMAGE,
+ SELECT_JOBDATA_MLOADER_IMAGE,
bg_update_ptr->mloaderimage);
}
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_RAMDISK_IMAGE,
+ SELECT_JOBDATA_RAMDISK_IMAGE,
&(bg_update_ptr->ramdiskimage));
if(!bg_update_ptr->ramdiskimage) {
bg_update_ptr->ramdiskimage =
xstrdup(bg_conf->default_ramdiskimage);
select_g_select_jobinfo_set(job_ptr->select_jobinfo,
- SELECT_JOBDATA_RAMDISK_IMAGE,
+ SELECT_JOBDATA_RAMDISK_IMAGE,
bg_update_ptr->ramdiskimage);
}
slurm_mutex_lock(&block_state_mutex);
- bg_record =
- find_bg_record_in_list(bg_lists->main,
+ bg_record =
+ find_bg_record_in_list(bg_lists->main,
bg_update_ptr->bg_block_id);
if (!bg_record) {
slurm_mutex_unlock(&block_state_mutex);
- error("bg_record %s doesn't exist, requested for job (%d)",
+ error("bg_record %s doesn't exist, requested for job (%d)",
bg_update_ptr->bg_block_id, job_ptr->job_id);
_bg_list_del(bg_update_ptr);
return SLURM_ERROR;
@@ -1253,7 +1253,7 @@ extern int start_job(struct job_record *job_ptr)
slurm_mutex_unlock(&block_state_mutex);
info("Queue start of job %u in BG block %s",
- job_ptr->job_id,
+ job_ptr->job_id,
bg_update_ptr->bg_block_id);
_block_op(bg_update_ptr);
return rc;
@@ -1273,12 +1273,12 @@ int term_job(struct job_record *job_ptr)
{
int rc = SLURM_SUCCESS;
bg_update_t *bg_update_ptr = NULL;
-
+
bg_update_ptr = xmalloc(sizeof(bg_update_t));
bg_update_ptr->op = TERM_OP;
bg_update_ptr->job_ptr = job_ptr;
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_BLOCK_ID,
+ SELECT_JOBDATA_BLOCK_ID,
&(bg_update_ptr->bg_block_id));
info("Queue termination of job %u in BG block %s",
job_ptr->job_id, bg_update_ptr->bg_block_id);
@@ -1300,7 +1300,7 @@ extern int sync_jobs(List job_list)
List block_list = NULL;
static bool run_already = false;
- /* Execute only on initial startup. We don't support bgblock
+ /* Execute only on initial startup. We don't support bgblock
* creation on demand today, so there is no need to re-sync data. */
if (run_already)
return SLURM_SUCCESS;
@@ -1310,64 +1310,64 @@ extern int sync_jobs(List job_list)
block_list = _get_all_allocated_blocks();
if(job_list) {
job_iterator = list_iterator_create(job_list);
- while ((job_ptr = (struct job_record *)
+ while ((job_ptr = (struct job_record *)
list_next(job_iterator))) {
bool good_block = true;
if (!IS_JOB_RUNNING(job_ptr))
continue;
-
+
bg_update_ptr = xmalloc(sizeof(bg_update_t));
bg_update_ptr->op = SYNC_OP;
bg_update_ptr->job_ptr = job_ptr;
select_g_select_jobinfo_get(
job_ptr->select_jobinfo,
- SELECT_JOBDATA_BLOCK_ID,
+ SELECT_JOBDATA_BLOCK_ID,
&(bg_update_ptr->bg_block_id));
#ifdef HAVE_BGL
select_g_select_jobinfo_get(
job_ptr->select_jobinfo,
- SELECT_JOBDATA_BLRTS_IMAGE,
+ SELECT_JOBDATA_BLRTS_IMAGE,
&(bg_update_ptr->blrtsimage));
#else
select_g_select_jobinfo_get(
job_ptr->select_jobinfo,
- SELECT_JOBDATA_CONN_TYPE,
+ SELECT_JOBDATA_CONN_TYPE,
&(bg_update_ptr->conn_type));
#endif
select_g_select_jobinfo_get(
job_ptr->select_jobinfo,
- SELECT_JOBDATA_LINUX_IMAGE,
+ SELECT_JOBDATA_LINUX_IMAGE,
&(bg_update_ptr->linuximage));
select_g_select_jobinfo_get(
job_ptr->select_jobinfo,
- SELECT_JOBDATA_MLOADER_IMAGE,
+ SELECT_JOBDATA_MLOADER_IMAGE,
&(bg_update_ptr->mloaderimage));
select_g_select_jobinfo_get(
job_ptr->select_jobinfo,
- SELECT_JOBDATA_RAMDISK_IMAGE,
+ SELECT_JOBDATA_RAMDISK_IMAGE,
&(bg_update_ptr->ramdiskimage));
-
+
if (bg_update_ptr->bg_block_id == NULL) {
- error("Running job %u has bgblock==NULL",
+ error("Running job %u has bgblock==NULL",
job_ptr->job_id);
good_block = false;
} else if (job_ptr->nodes == NULL) {
error("Running job %u has nodes==NULL",
job_ptr->job_id);
good_block = false;
- } else if (_excise_block(block_list,
- bg_update_ptr->bg_block_id,
- job_ptr->nodes)
+ } else if (_excise_block(block_list,
+ bg_update_ptr->bg_block_id,
+ job_ptr->nodes)
!= SLURM_SUCCESS) {
error("Kill job %u belongs to defunct "
"bgblock %s",
- job_ptr->job_id,
+ job_ptr->job_id,
bg_update_ptr->bg_block_id);
good_block = false;
}
if (!good_block) {
- job_ptr->job_state = JOB_FAILED
+ job_ptr->job_state = JOB_FAILED
| JOB_COMPLETING;
job_ptr->end_time = time(NULL);
last_job_update = time(NULL);
@@ -1377,7 +1377,7 @@ extern int sync_jobs(List job_list)
debug3("Queue sync of job %u in BG block %s "
"ending at %d",
- job_ptr->job_id,
+ job_ptr->job_id,
bg_update_ptr->bg_block_id,
job_ptr->end_time);
_block_op(bg_update_ptr);
@@ -1393,7 +1393,7 @@ extern int sync_jobs(List job_list)
_reset_block_list(block_list);
list_destroy(block_list);
} else {
- /* this should never happen,
+ /* this should never happen,
* vestigial logic */
error("sync_jobs: no block_list");
return SLURM_ERROR;
@@ -1402,27 +1402,27 @@ extern int sync_jobs(List job_list)
}
/*
- * Boot a block. Block state expected to be FREE upon entry.
+ * Boot a block. Block state expected to be FREE upon entry.
* NOTE: This function does not wait for the boot to complete.
* the slurm prolog script needs to perform the waiting.
*/
extern int boot_block(bg_record_t *bg_record)
{
#ifdef HAVE_BG_FILES
- int rc;
-
- if ((rc = bridge_set_block_owner(bg_record->bg_block_id,
- bg_conf->slurm_user_name))
+ int rc;
+
+ if ((rc = bridge_set_block_owner(bg_record->bg_block_id,
+ bg_conf->slurm_user_name))
!= STATUS_OK) {
- error("bridge_set_block_owner(%s,%s): %s",
- bg_record->bg_block_id,
+ error("bridge_set_block_owner(%s,%s): %s",
+ bg_record->bg_block_id,
bg_conf->slurm_user_name,
bg_err_str(rc));
return SLURM_ERROR;
- }
-
+ }
+
info("Booting block %s", bg_record->bg_block_id);
- if ((rc = bridge_create_block(bg_record->bg_block_id))
+ if ((rc = bridge_create_block(bg_record->bg_block_id))
!= STATUS_OK) {
error("bridge_create_block(%s): %s",
bg_record->bg_block_id, bg_err_str(rc));
@@ -1435,7 +1435,7 @@ extern int boot_block(bg_record_t *bg_record)
"Block %s is in an incompatible state. "
"This usually means hardware is allocated "
"by another block (maybe outside of SLURM). "
- "[SLURM@%s]",
+ "[SLURM@%s]",
bg_record->bg_block_id, time_str);
drain_as_needed(bg_record, reason);
bg_record->boot_state = 0;
@@ -1443,12 +1443,12 @@ extern int boot_block(bg_record_t *bg_record)
}
return SLURM_ERROR;
}
-
+
slurm_mutex_lock(&block_state_mutex);
if(!block_ptr_exist_in_list(bg_lists->booted, bg_record))
list_push(bg_lists->booted, bg_record);
slurm_mutex_unlock(&block_state_mutex);
-
+
rc = 0;
while(rc < 10) {
if(bg_record->state == RM_PARTITION_CONFIGURING) {
@@ -1458,8 +1458,8 @@ extern int boot_block(bg_record_t *bg_record)
rc++;
}
slurm_mutex_lock(&block_state_mutex);
- /* reset state right now, don't wait for
- * update_block_list() to run or epilog could
+ /* reset state right now, don't wait for
+ * update_block_list() to run or epilog could
* get old/bad data. */
if(bg_record->state != RM_PARTITION_CONFIGURING)
bg_record->state = RM_PARTITION_CONFIGURING;
@@ -1474,9 +1474,9 @@ extern int boot_block(bg_record_t *bg_record)
list_push(bg_lists->booted, bg_record);
bg_record->state = RM_PARTITION_READY;
last_bg_update = time(NULL);
- slurm_mutex_unlock(&block_state_mutex);
+ slurm_mutex_unlock(&block_state_mutex);
#endif
-
+
return SLURM_SUCCESS;
}
diff --git a/src/plugins/select/bluegene/plugin/bg_job_run.h b/src/plugins/select/bluegene/plugin/bg_job_run.h
index d4e57bae836724d62af8598a657485702846cd9f..5453c1880b5b13602162c3a1645284455c1e4635 100644
--- a/src/plugins/select/bluegene/plugin/bg_job_run.h
+++ b/src/plugins/select/bluegene/plugin/bg_job_run.h
@@ -1,36 +1,36 @@
/*****************************************************************************\
* bg_job_run.h - header for blue gene job execution (e.g. initiation and
- * termination) functions.
+ * termination) functions.
*****************************************************************************
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -42,7 +42,7 @@
#include "src/slurmctld/slurmctld.h"
/*
- * Boot a block. Partition state expected to be FREE upon entry.
+ * Boot a block. Partition state expected to be FREE upon entry.
* NOTE: This function does not wait for the boot to complete.
* the slurm prolog script needs to perform the waiting.
*/
@@ -51,28 +51,28 @@ extern int boot_block(bg_record_t *bg_record);
/*
* Perform any setup required to initiate a job
* job_ptr IN - pointer to the job being initiated
- * RET - SLURM_SUCCESS or an error code
+ * RET - SLURM_SUCCESS or an error code
*
- * NOTE: This happens in parallel with srun and slurmd spawning
- * the job. A prolog script is expected to defer initiation of
+ * NOTE: This happens in parallel with srun and slurmd spawning
+ * the job. A prolog script is expected to defer initiation of
* the job script until the BG block is available for use.
*/
extern int start_job(struct job_record *job_ptr);
/*
* Synchronize BG block state to that of currently active jobs.
- * This can recover from slurmctld crashes when block ownership
+ * This can recover from slurmctld crashes when block ownership
* changes were queued
*/
extern int sync_jobs(List job_list);
-/*
+/*
* Perform any work required to terminate a job
* job_ptr IN - pointer to the job being terminated
* RET - SLURM_SUCCESS or an error code
*
* NOTE: This happens in parallel with srun and slurmd terminating
- * the job. Insure that this function, mpirun and the epilog can
+ * the job. Insure that this function, mpirun and the epilog can
* all deal with termination race conditions.
*/
extern int term_job(struct job_record *job_ptr);
diff --git a/src/plugins/select/bluegene/plugin/bg_record_functions.c b/src/plugins/select/bluegene/plugin/bg_record_functions.c
index d785675aea1399a64bc9099a98fdd03cf235a993..5435e8e818a407f88986aed97c5866bb5390350e 100644
--- a/src/plugins/select/bluegene/plugin/bg_record_functions.c
+++ b/src/plugins/select/bluegene/plugin/bg_record_functions.c
@@ -6,32 +6,32 @@
* Copyright (C) 2008 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -61,11 +61,11 @@ extern void print_bg_record(bg_record_t* bg_record)
if (bg_record->bg_block_id)
info("\tbg_block_id: %s", bg_record->bg_block_id);
info("\tnodes: %s", bg_record->nodes);
- info("\tsize: %d BPs %u Nodes %d cpus",
+ info("\tsize: %d BPs %u Nodes %d cpus",
bg_record->bp_count,
bg_record->node_cnt,
bg_record->cpu_cnt);
- info("\tgeo: %ux%ux%u", bg_record->geo[X], bg_record->geo[Y],
+ info("\tgeo: %ux%ux%u", bg_record->geo[X], bg_record->geo[Y],
bg_record->geo[Z]);
info("\tconn_type: %s", conn_type_string(bg_record->conn_type));
#ifdef HAVE_BGL
@@ -138,7 +138,7 @@ extern int block_exist_in_list(List my_list, bg_record_t *bg_record)
"is already in the list %s",
bg_record->nodes,
found_record->bg_block_id);
-
+
rc = 1;
break;
}
@@ -179,8 +179,8 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
bool start_set=0;
ListIterator itr;
ba_node_t* ba_node = NULL;
-
- if(!bg_record->bg_block_list
+
+ if(!bg_record->bg_block_list
|| !list_count(bg_record->bg_block_list)) {
if(!bg_record->bg_block_list) {
bg_record->bg_block_list =
@@ -196,7 +196,7 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
while (bg_record->nodes[j] != '\0') {
if ((bg_record->nodes[j] == '['
|| bg_record->nodes[j] == ',')
- && (bg_record->nodes[j+8] == ']'
+ && (bg_record->nodes[j+8] == ']'
|| bg_record->nodes[j+8] == ',')
&& (bg_record->nodes[j+4] == 'x'
|| bg_record->nodes[j+4] == '-')) {
@@ -204,9 +204,9 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
number = xstrntol(bg_record->nodes + j,
NULL, BA_SYSTEM_DIMENSIONS,
HOSTLIST_BASE);
- start[X] = number /
+ start[X] = number /
(HOSTLIST_BASE * HOSTLIST_BASE);
- start[Y] = (number %
+ start[Y] = (number %
(HOSTLIST_BASE * HOSTLIST_BASE))
/ HOSTLIST_BASE;
start[Z] = (number % HOSTLIST_BASE);
@@ -215,7 +215,7 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
NULL, 3, HOSTLIST_BASE);
end[X] = number /
(HOSTLIST_BASE * HOSTLIST_BASE);
- end[Y] = (number
+ end[Y] = (number
% (HOSTLIST_BASE * HOSTLIST_BASE))
/ HOSTLIST_BASE;
end[Z] = (number % HOSTLIST_BASE);
@@ -233,8 +233,8 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
largest_diff = diff;
}
bg_record->bp_count += _addto_node_list(
- bg_record,
- start,
+ bg_record,
+ start,
end);
if(bg_record->nodes[j] != ',')
break;
@@ -243,13 +243,13 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
&& bg_record->nodes[j] <= '9')
|| (bg_record->nodes[j] >= 'A'
&& bg_record->nodes[j] <= 'Z')) {
-
+
number = xstrntol(bg_record->nodes + j,
NULL, BA_SYSTEM_DIMENSIONS,
HOSTLIST_BASE);
- start[X] = number /
+ start[X] = number /
(HOSTLIST_BASE * HOSTLIST_BASE);
- start[Y] = (number %
+ start[Y] = (number %
(HOSTLIST_BASE * HOSTLIST_BASE))
/ HOSTLIST_BASE;
start[Z] = (number % HOSTLIST_BASE);
@@ -267,8 +267,8 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
largest_diff = diff;
}
bg_record->bp_count += _addto_node_list(
- bg_record,
- start,
+ bg_record,
+ start,
start);
if(bg_record->nodes[j] != ',')
break;
@@ -276,7 +276,7 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
}
j++;
}
- if(largest_diff == -1)
+ if(largest_diff == -1)
fatal("No hostnames given here");
bg_record->start[X] = best_start[X];
@@ -289,7 +289,7 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
bg_record->start[Y],
bg_record->start[Z]);
}
-
+
bg_record->geo[X] = 0;
bg_record->geo[Y] = 0;
bg_record->geo[Z] = 0;
@@ -313,7 +313,7 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
alpha_num[ba_node->coord[X]],
alpha_num[ba_node->coord[Y]],
alpha_num[ba_node->coord[Z]]);
-
+
if(ba_node->coord[X]>end[X]) {
bg_record->geo[X]++;
end[X] = ba_node->coord[X];
@@ -356,39 +356,39 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
if ((bg_record->geo[X] == DIM_SIZE[X])
&& (bg_record->geo[Y] == DIM_SIZE[Y])
&& (bg_record->geo[Z] == DIM_SIZE[Z])) {
- bg_record->full_block = 1;
- }
+ bg_record->full_block = 1;
+ }
} else if(bg_record->node_cnt == bg_conf->bp_node_cnt)
bg_record->full_block = 1;
-
+
/* #ifndef HAVE_BG_FILES */
/* max_dim[X] = MAX(max_dim[X], end[X]); */
/* max_dim[Y] = MAX(max_dim[Y], end[Y]); */
/* max_dim[Z] = MAX(max_dim[Z], end[Z]); */
/* #endif */
-
- if (node_name2bitmap(bg_record->nodes,
- false,
+
+ if (node_name2bitmap(bg_record->nodes,
+ false,
&bg_record->bitmap)) {
fatal("process_nodes: "
- "1 Unable to convert nodes %s to bitmap",
+ "1 Unable to convert nodes %s to bitmap",
bg_record->nodes);
}
return;
}
-/*
+/*
* NOTE: This function does not do a mutex lock so if you are copying the
* main bg_list you need to lock 'block_state_mutex' before calling
*/
-extern List copy_bg_list(List in_list)
+extern List copy_bg_list(List in_list)
{
bg_record_t *bg_record = NULL;
bg_record_t *new_record = NULL;
List out_list = list_create(destroy_bg_record);
ListIterator itr = list_iterator_create(in_list);
- while ((bg_record = (bg_record_t *) list_next(itr))) {
+ while ((bg_record = (bg_record_t *) list_next(itr))) {
new_record = xmalloc(sizeof(bg_record_t));
new_record->original = bg_record;
copy_bg_record(bg_record, new_record);
@@ -396,8 +396,8 @@ extern List copy_bg_list(List in_list)
}
list_iterator_destroy(itr);
-
- return out_list;
+
+ return out_list;
}
extern void copy_bg_record(bg_record_t *fir_record, bg_record_t *sec_record)
@@ -405,7 +405,7 @@ extern void copy_bg_record(bg_record_t *fir_record, bg_record_t *sec_record)
int i;
ListIterator itr = NULL;
ba_node_t *ba_node = NULL, *new_ba_node = NULL;
-
+
if(!fir_record || !sec_record) {
error("copy_bg_record: "
"given a null for either first record or second record");
@@ -452,13 +452,13 @@ extern void copy_bg_record(bg_record_t *fir_record, bg_record_t *sec_record)
}
FREE_NULL_BITMAP(sec_record->bitmap);
- if(fir_record->bitmap
+ if(fir_record->bitmap
&& (sec_record->bitmap = bit_copy(fir_record->bitmap)) == NULL) {
error("Unable to copy bitmap for %s", fir_record->nodes);
sec_record->bitmap = NULL;
}
FREE_NULL_BITMAP(sec_record->ionode_bitmap);
- if(fir_record->ionode_bitmap
+ if(fir_record->ionode_bitmap
&& (sec_record->ionode_bitmap
= bit_copy(fir_record->ionode_bitmap)) == NULL) {
error("Unable to copy ionode_bitmap for %s",
@@ -482,11 +482,11 @@ extern void copy_bg_record(bg_record_t *fir_record, bg_record_t *sec_record)
sec_record->node_cnt = fir_record->node_cnt;
}
-/*
+/*
* Comparator used for sorting blocks smallest to largest
- *
+ *
* returns: -1: rec_a > rec_b 0: rec_a == rec_b 1: rec_a < rec_b
- *
+ *
*/
extern int bg_record_cmpf_inc(bg_record_t* rec_a, bg_record_t* rec_b)
{
@@ -524,12 +524,12 @@ extern bg_record_t *find_bg_record_in_list(List my_list, char *bg_block_id)
{
ListIterator itr;
bg_record_t *bg_record = NULL;
-
+
xassert(my_list);
if(!bg_block_id)
return NULL;
-
+
itr = list_iterator_create(my_list);
while((bg_record = list_next(itr))) {
if(bg_record->bg_block_id)
@@ -544,12 +544,12 @@ extern bg_record_t *find_bg_record_in_list(List my_list, char *bg_block_id)
return NULL;
}
-/* All changes to the bg_list target_name must
- be done before this function is called.
+/* All changes to the bg_list target_name must
+ be done before this function is called.
also slurm_conf_lock() must be called before calling this
- function along with slurm_conf_unlock() afterwards.
+ function along with slurm_conf_unlock() afterwards.
*/
-extern int update_block_user(bg_record_t *bg_record, int set)
+extern int update_block_user(bg_record_t *bg_record, int set)
{
if(!bg_record->target_name) {
error("Must set target_name to run update_block_user.");
@@ -560,38 +560,38 @@ extern int update_block_user(bg_record_t *bg_record, int set)
bg_record->user_name = xstrdup(bg_conf->slurm_user_name);
}
#ifdef HAVE_BG_FILES
- int rc=0;
+ int rc=0;
if(set) {
- if((rc = remove_all_users(bg_record->bg_block_id,
+ if((rc = remove_all_users(bg_record->bg_block_id,
bg_record->target_name))
== REMOVE_USER_ERR) {
error("1 Something happened removing "
- "users from block %s",
+ "users from block %s",
bg_record->bg_block_id);
return -1;
} else if (rc == REMOVE_USER_NONE) {
- if (strcmp(bg_record->target_name,
+ if (strcmp(bg_record->target_name,
bg_conf->slurm_user_name)) {
info("Adding user %s to Block %s",
- bg_record->target_name,
+ bg_record->target_name,
bg_record->bg_block_id);
-
+
if ((rc = bridge_add_block_user(
- bg_record->bg_block_id,
- bg_record->target_name))
+ bg_record->bg_block_id,
+ bg_record->target_name))
!= STATUS_OK) {
error("bridge_add_block_user"
- "(%s,%s): %s",
- bg_record->bg_block_id,
+ "(%s,%s): %s",
+ bg_record->bg_block_id,
bg_record->target_name,
bg_err_str(rc));
return -1;
- }
+ }
}
}
}
#endif
-
+
if(strcmp(bg_record->target_name, bg_record->user_name)) {
uid_t pw_uid;
xfree(bg_record->user_name);
@@ -600,18 +600,18 @@ extern int update_block_user(bg_record_t *bg_record, int set)
error("No such user: %s", bg_record->user_name);
return -1;
} else {
- bg_record->user_uid = pw_uid;
- }
+ bg_record->user_uid = pw_uid;
+ }
return 1;
}
-
+
return 0;
}
-/* If any nodes in node_list are drained, draining, or down,
+/* If any nodes in node_list are drained, draining, or down,
* then just return
* else drain all of the nodes
- * This function lets us drain an entire bgblock only if
+ * This function lets us drain an entire bgblock only if
* we have not already identified a specific node as bad. */
extern void drain_as_needed(bg_record_t *bg_record, char *reason)
{
@@ -627,13 +627,13 @@ extern void drain_as_needed(bg_record_t *bg_record, char *reason)
debug2("Trying to requeue job %d", bg_record->job_running);
if((rc = job_requeue(0, bg_record->job_running, -1))) {
error("couldn't requeue job %u, failing it: %s",
- bg_record->job_running,
+ bg_record->job_running,
slurm_strerror(rc));
job_fail(bg_record->job_running);
}
unlock_slurmctld(job_write_lock);
slurm_mutex_lock(&block_state_mutex);
- if(remove_from_bg_list(bg_lists->job_running, bg_record)
+ if(remove_from_bg_list(bg_lists->job_running, bg_record)
== SLURM_SUCCESS) {
num_unused_cpus += bg_record->cpu_cnt;
}
@@ -645,7 +645,7 @@ extern void drain_as_needed(bg_record_t *bg_record, char *reason)
debug2("small block");
goto end_it;
}
-
+
/* at least one base partition */
hl = hostlist_create(bg_record->nodes);
if (!hl) {
@@ -661,7 +661,7 @@ extern void drain_as_needed(bg_record_t *bg_record, char *reason)
free(host);
}
hostlist_destroy(hl);
-
+
if (needed) {
slurm_drain_nodes(bg_record->nodes, reason);
}
@@ -671,7 +671,7 @@ end_it:
bg_record->bg_block_id, bg_record->job_running);
sleep(1);
}
-
+
put_block_in_error_state(bg_record, BLOCK_ERROR_STATE, reason);
return;
}
@@ -682,7 +682,7 @@ extern int set_ionodes(bg_record_t *bg_record, int io_start, int io_nodes)
if(!bg_record)
return SLURM_ERROR;
-
+
bg_record->ionode_bitmap = bit_alloc(bg_conf->numpsets);
/* Set the correct ionodes being used in this block */
bit_nset(bg_record->ionode_bitmap, io_start, io_start+io_nodes);
@@ -706,11 +706,11 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
if(!records) {
fatal("add_bg_record: no records list given");
}
- bg_record = (bg_record_t*) xmalloc(sizeof(bg_record_t));
-
+ bg_record = (bg_record_t*) xmalloc(sizeof(bg_record_t));
+
bg_record->user_name = xstrdup(bg_conf->slurm_user_name);
bg_record->target_name = xstrdup(bg_conf->slurm_user_name);
-
+
if (uid_from_string (bg_record->user_name, &pw_uid) < 0)
error("add_bg_record: No such user: %s", bg_record->user_name);
else
@@ -727,14 +727,14 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
/* bg_record->boot_state = 0; Implicit */
/* bg_record->state = 0; Implicit */
#ifdef HAVE_BGL
- debug2("add_bg_record: asking for %s %d %d %s",
+ debug2("add_bg_record: asking for %s %d %d %s",
blockreq->block, blockreq->small32, blockreq->small128,
conn_type_string(blockreq->conn_type));
#else
- debug2("add_bg_record: asking for %s %d %d %d %d %d %s",
- blockreq->block, blockreq->small256,
+ debug2("add_bg_record: asking for %s %d %d %d %d %d %s",
+ blockreq->block, blockreq->small256,
blockreq->small128, blockreq->small64,
- blockreq->small32, blockreq->small16,
+ blockreq->small32, blockreq->small16,
conn_type_string(blockreq->conn_type));
#endif
/* Set the bitmap blank here if it is a full node we don't
@@ -744,25 +744,25 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
len = strlen(blockreq->block);
i=0;
- while(i<len
- && blockreq->block[i] != '['
+ while(i<len
+ && blockreq->block[i] != '['
&& (blockreq->block[i] < '0' || blockreq->block[i] > 'Z'
|| (blockreq->block[i] > '9' && blockreq->block[i] < 'A')))
i++;
-
+
if(i<len) {
len -= i;
-
+
len += strlen(bg_conf->slurm_node_prefix)+1;
bg_record->nodes = xmalloc(len);
- snprintf(bg_record->nodes, len, "%s%s",
+ snprintf(bg_record->nodes, len, "%s%s",
bg_conf->slurm_node_prefix, blockreq->block+i);
- } else
+ } else
fatal("add_bg_record: BPs=%s is in a weird format",
- blockreq->block);
-
+ blockreq->block);
+
process_nodes(bg_record, false);
-
+
#ifdef HAVE_BGL
bg_record->node_use = SELECT_COPROCESSOR_MODE;
#endif
@@ -793,7 +793,7 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
else
bg_record->ramdiskimage =
xstrdup(bg_conf->default_ramdiskimage);
-
+
if(bg_record->conn_type != SELECT_SMALL) {
/* this needs to be an append so we keep things in the
order we got them, they will be sorted later */
@@ -812,10 +812,10 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
if(no_check)
goto no_check;
/* if the ionode cnt for small32 is 0 then don't
- allow a sub quarter allocation
+ allow a sub quarter allocation
*/
if(bg_conf->nodecard_ionode_cnt < 2) {
- if(!bg_conf->nodecard_ionode_cnt && blockreq->small32)
+ if(!bg_conf->nodecard_ionode_cnt && blockreq->small32)
fatal("add_bg_record: "
"There is an error in your "
"bluegene.conf file.\n"
@@ -824,7 +824,7 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
"to at least 16)",
bg_conf->numpsets);
#ifndef HAVE_BGL
- if(blockreq->small16)
+ if(blockreq->small16)
fatal("add_bg_record: "
"There is an error in your "
"bluegene.conf file.\n"
@@ -832,7 +832,7 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
"Numpsets=%u. (Try setting it to "
"at least 32)",
bg_conf->numpsets);
- if((bg_conf->io_ratio < 0.5) && blockreq->small64)
+ if((bg_conf->io_ratio < 0.5) && blockreq->small64)
fatal("add_bg_record: "
"There is an error in your "
"bluegene.conf file.\n"
@@ -849,32 +849,32 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
"No specs given for this small block, "
"I am spliting this block into 4 128CnBlocks");
blockreq->small128=4;
- }
+ }
- i = (blockreq->small32*bg_conf->nodecard_node_cnt) +
+ i = (blockreq->small32*bg_conf->nodecard_node_cnt) +
(blockreq->small128*bg_conf->quarter_node_cnt);
if(i != bg_conf->bp_node_cnt)
fatal("add_bg_record: "
"There is an error in your bluegene.conf file.\n"
"I am unable to request %d nodes consisting of "
"%u 32CnBlocks and\n%u 128CnBlocks in one "
- "base partition with %u nodes.",
+ "base partition with %u nodes.",
i, blockreq->small32, blockreq->small128,
bg_conf->bp_node_cnt);
- small_count = blockreq->small32+blockreq->small128;
+ small_count = blockreq->small32+blockreq->small128;
#else
- if(!blockreq->small16 && !blockreq->small32
- && !blockreq->small64 && !blockreq->small128
+ if(!blockreq->small16 && !blockreq->small32
+ && !blockreq->small64 && !blockreq->small128
&& !blockreq->small256) {
info("add_bg_record: "
"No specs given for this small block, "
"I am spliting this block into 2 256CnBlocks");
blockreq->small256=2;
- }
+ }
- i = (blockreq->small16*16)
- + (blockreq->small32*32)
- + (blockreq->small64*64)
+ i = (blockreq->small16*16)
+ + (blockreq->small32*32)
+ + (blockreq->small64*64)
+ (blockreq->small128*128)
+ (blockreq->small256*256);
if(i != bg_conf->bp_node_cnt)
@@ -884,18 +884,18 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
"%u 16CNBlocks, %u 32CNBlocks,\n"
"%u 64CNBlocks, %u 128CNBlocks, "
"and %u 256CNBlocks\n"
- "in one base partition with %u nodes.",
- i, blockreq->small16, blockreq->small32,
- blockreq->small64, blockreq->small128,
+ "in one base partition with %u nodes.",
+ i, blockreq->small16, blockreq->small32,
+ blockreq->small64, blockreq->small128,
blockreq->small256, bg_conf->bp_node_cnt);
small_count = blockreq->small16
+ blockreq->small32
+ blockreq->small64
+ blockreq->small128
- + blockreq->small256;
+ + blockreq->small256;
#endif
no_check:
- /* Automatically create 2-way split if
+ /* Automatically create 2-way split if
* conn_type == SELECT_SMALL in bluegene.conf
* Here we go through each node listed and do the same thing
* for each node.
@@ -907,8 +907,8 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
}
list_iterator_destroy(itr);
destroy_bg_record(bg_record);
- }
-
+ }
+
return SLURM_SUCCESS;
}
@@ -950,7 +950,7 @@ extern int handle_small_record_request(List records, blockreq_t *blockreq,
bit_nclear(ionodes, start, start+ionode_cnt);
start+=ionode_cnt+1;
}
-
+
#ifndef HAVE_BGL
if((ionode_cnt = bg_conf->nodecard_ionode_cnt * 2))
ionode_cnt--;
@@ -1022,16 +1022,16 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start)
int bp_bit = 0;
static int io_cnt = NO_VAL;
static int create_size = NO_VAL;
- static blockreq_t blockreq;
+ static blockreq_t blockreq;
int rc = SLURM_SUCCESS;
time_t now = time(NULL);
char reason[128], time_str[32];
-
+
xassert(bp_name);
-
+
slurm_make_time_str(&now, time_str, sizeof(time_str));
- snprintf(reason, sizeof(reason),
- "select_bluegene: nodecard down [SLURM@%s]", time_str);
+ snprintf(reason, sizeof(reason),
+ "select_bluegene: nodecard down [SLURM@%s]", time_str);
if(io_cnt == NO_VAL) {
io_cnt = 1;
@@ -1056,7 +1056,7 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start)
/* this is here for sanity check to make sure we don't core on
these bits when we set them below. */
- if(io_start >= bg_conf->numpsets
+ if(io_start >= bg_conf->numpsets
|| (io_start+io_cnt) >= bg_conf->numpsets) {
debug("io %d-%d not configured on this "
"system, only %d ionodes per midplane",
@@ -1064,14 +1064,14 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start)
return EINVAL;
}
bp_bit = (node_ptr - node_record_table_ptr);
-
+
memset(&blockreq, 0, sizeof(blockreq_t));
-
+
blockreq.conn_type = SELECT_SMALL;
blockreq.block = bp_name;
debug3("here setting node %d of %d and ionodes %d-%d of %d",
- bp_bit, node_record_count, io_start,
+ bp_bit, node_record_count, io_start,
io_start+io_cnt, bg_conf->numpsets);
memset(&tmp_record, 0, sizeof(bg_record_t));
@@ -1088,11 +1088,11 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start)
while ((bg_record = list_next(itr))) {
if(!bit_test(bg_record->bitmap, bp_bit))
continue;
-
- if(!blocks_overlap(bg_record, &tmp_record))
+
+ if(!blocks_overlap(bg_record, &tmp_record))
continue;
- if(bg_record->job_running > NO_JOB_RUNNING)
+ if(bg_record->job_running > NO_JOB_RUNNING)
slurm_fail_job(bg_record->job_running);
/* If Running Dynamic mode and the the block is
@@ -1108,35 +1108,35 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start)
/* keep track of the smallest size that is at least
the size of create_size. */
- if(!smallest_bg_record ||
+ if(!smallest_bg_record ||
(smallest_bg_record->node_cnt > bg_record->node_cnt))
smallest_bg_record = bg_record;
}
list_iterator_destroy(itr);
slurm_mutex_unlock(&block_state_mutex);
-
+
if(bg_conf->layout_mode != LAYOUT_DYNAMIC) {
debug3("running non-dynamic mode");
/* This should never happen, but just in case... */
- if(delete_list)
+ if(delete_list)
list_destroy(delete_list);
/* If we found a block that is smaller or equal to a
midplane we will just mark it in an error state as
- opposed to draining the node.
+ opposed to draining the node.
*/
- if(smallest_bg_record
+ if(smallest_bg_record
&& (smallest_bg_record->node_cnt < bg_conf->bp_node_cnt)){
if(smallest_bg_record->state == RM_PARTITION_ERROR) {
rc = SLURM_NO_CHANGE_IN_DATA;
goto cleanup;
}
-
+
rc = put_block_in_error_state(
smallest_bg_record, BLOCK_ERROR_STATE, reason);
goto cleanup;
- }
-
+ }
+
debug("No block under 1 midplane available for this nodecard. "
"Draining the whole node.");
if(!node_already_down(bp_name)) {
@@ -1144,10 +1144,10 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start)
}
rc = SLURM_SUCCESS;
goto cleanup;
- }
+ }
/* below is only for Dynamic mode */
-
+
if(delete_list) {
int cnt_set = 0;
bitstr_t *iobitmap = bit_alloc(bg_conf->numpsets);
@@ -1177,17 +1177,17 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start)
block) set io_start = 0. */
if((io_start = bit_ffs(iobitmap)) == -1) {
io_start = 0;
- if(create_size > bg_conf->nodecard_node_cnt)
+ if(create_size > bg_conf->nodecard_node_cnt)
blockreq.small128 = 4;
else
blockreq.small32 = 16;
- } else if(create_size <= bg_conf->nodecard_node_cnt)
+ } else if(create_size <= bg_conf->nodecard_node_cnt)
blockreq.small32 = 1;
else
/* this should never happen */
blockreq.small128 = 1;
-
- FREE_NULL_BITMAP(iobitmap);
+
+ FREE_NULL_BITMAP(iobitmap);
} else if(smallest_bg_record) {
debug2("smallest dynamic block is %s",
smallest_bg_record->bg_block_id);
@@ -1195,7 +1195,7 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start)
rc = SLURM_NO_CHANGE_IN_DATA;
goto cleanup;
}
-
+
while(smallest_bg_record->job_running > NO_JOB_RUNNING)
sleep(1);
@@ -1203,7 +1203,7 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start)
rc = put_block_in_error_state(
smallest_bg_record, BLOCK_ERROR_STATE, reason);
goto cleanup;
- }
+ }
if(create_size > smallest_bg_record->node_cnt) {
/* we should never get here. This means we
@@ -1225,7 +1225,7 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start)
break;
#endif
case 128:
- blockreq.small32 = 4;
+ blockreq.small32 = 4;
break;
case 512:
default:
@@ -1264,10 +1264,10 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start)
char reason[128], time_str[32];
slurm_make_time_str(&now, time_str,
sizeof(time_str));
- snprintf(reason, sizeof(reason),
+ snprintf(reason, sizeof(reason),
"select_bluegene: "
- "nodecard down [SLURM@%s]",
- time_str);
+ "nodecard down [SLURM@%s]",
+ time_str);
slurm_drain_nodes(bp_name, reason);
}
rc = SLURM_SUCCESS;
@@ -1283,15 +1283,15 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start)
/* we also need a bg_block to pretend to be the
smallest block that takes up the entire midplane. */
}
-
-
+
+
/* Here we need to add blocks that take up nodecards on this
midplane. Since Slurm only keeps track of midplanes
natively this is the only want to handle this case.
*/
requests = list_create(destroy_bg_record);
add_bg_record(requests, NULL, &blockreq, 1, io_start);
-
+
delete_list = list_create(NULL);
while((bg_record = list_pop(requests))) {
slurm_mutex_lock(&block_state_mutex);
@@ -1320,7 +1320,7 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start)
slurm_mutex_lock(&block_state_mutex);
list_append(bg_lists->main, bg_record);
slurm_mutex_unlock(&block_state_mutex);
- if(bit_overlap(bg_record->ionode_bitmap,
+ if(bit_overlap(bg_record->ionode_bitmap,
tmp_record.ionode_bitmap)) {
/* here we know the error block doesn't exist
so just set the state here */
@@ -1329,20 +1329,20 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start)
}
}
list_destroy(requests);
-
+
slurm_mutex_lock(&block_state_mutex);
free_block_list(delete_list);
list_destroy(delete_list);
sort_bg_record_inc_size(bg_lists->main);
slurm_mutex_unlock(&block_state_mutex);
- last_bg_update = time(NULL);
+ last_bg_update = time(NULL);
cleanup:
FREE_NULL_BITMAP(tmp_record.bitmap);
FREE_NULL_BITMAP(tmp_record.ionode_bitmap);
return rc;
-
+
}
extern int up_nodecard(char *bp_name, bitstr_t *ionode_bitmap)
@@ -1363,7 +1363,7 @@ extern int up_nodecard(char *bp_name, bitstr_t *ionode_bitmap)
return EINVAL;
}
bp_bit = (node_ptr - node_record_table_ptr);
-
+
slurm_mutex_lock(&block_state_mutex);
itr = list_iterator_create(bg_lists->main);
while((bg_record = list_next(itr))) {
@@ -1371,15 +1371,15 @@ extern int up_nodecard(char *bp_name, bitstr_t *ionode_bitmap)
continue;
if(!bit_test(bg_record->bitmap, bp_bit))
continue;
-
+
if(!bit_overlap(bg_record->ionode_bitmap, ionode_bitmap)) {
continue;
}
- resume_block(bg_record);
+ resume_block(bg_record);
}
list_iterator_destroy(itr);
slurm_mutex_unlock(&block_state_mutex);
-
+
/* FIX ME: This needs to call the opposite of
slurm_drain_nodes which does not yet exist.
*/
@@ -1401,7 +1401,7 @@ extern int put_block_in_error_state(bg_record_t *bg_record,
uid_t pw_uid;
xassert(bg_record);
-
+
/* only check this if the blocks are created, meaning this
isn't at startup.
*/
@@ -1413,7 +1413,7 @@ extern int put_block_in_error_state(bg_record_t *bg_record,
while(bg_record->job_running > NO_JOB_RUNNING)
sleep(1);
}
-
+
slurm_mutex_lock(&block_state_mutex);
if(!block_ptr_exist_in_list(bg_lists->main, bg_record)) {
slurm_mutex_unlock(&block_state_mutex);
@@ -1421,7 +1421,7 @@ extern int put_block_in_error_state(bg_record_t *bg_record,
"error state it disappeared");
return SLURM_ERROR;
}
-
+
info("Setting Block %s to ERROR state. (reason: '%s')",
bg_record->bg_block_id, reason);
/* we add the block to these lists so we don't try to schedule
@@ -1430,9 +1430,9 @@ extern int put_block_in_error_state(bg_record_t *bg_record,
list_push(bg_lists->job_running, bg_record);
num_unused_cpus -= bg_record->cpu_cnt;
}
- if(!block_ptr_exist_in_list(bg_lists->booted, bg_record))
+ if(!block_ptr_exist_in_list(bg_lists->booted, bg_record))
list_push(bg_lists->booted, bg_record);
-
+
bg_record->job_running = state;
bg_record->state = RM_PARTITION_ERROR;
@@ -1440,7 +1440,7 @@ extern int put_block_in_error_state(bg_record_t *bg_record,
xfree(bg_record->target_name);
bg_record->user_name = xstrdup(bg_conf->slurm_user_name);
bg_record->target_name = xstrdup(bg_conf->slurm_user_name);
-
+
if (uid_from_string (bg_record->user_name, &pw_uid) < 0)
error("No such user: %s", bg_record->user_name);
else
@@ -1470,7 +1470,7 @@ extern int resume_block(bg_record_t *bg_record)
bg_record->bg_block_id);
if(remove_from_bg_list(bg_lists->job_running, bg_record)
- == SLURM_SUCCESS)
+ == SLURM_SUCCESS)
num_unused_cpus += bg_record->cpu_cnt;
remove_from_bg_list(bg_lists->booted, bg_record);
@@ -1496,7 +1496,7 @@ static int _check_all_blocks_error(int node_inx, time_t event_time,
int rc = SLURM_SUCCESS;
xassert(node_inx <= node_record_count);
-
+
memset(&send_node, 0, sizeof(struct node_record));
memset(&config_rec, 0, sizeof(struct config_record));
send_node.name = node_record_table_ptr[node_inx].name;
@@ -1529,12 +1529,12 @@ static int _check_all_blocks_error(int node_inx, time_t event_time,
rc = clusteracct_storage_g_node_down(acct_db_conn,
slurmctld_cluster_name,
&send_node, event_time,
- reason);
+ reason);
} else {
send_node.node_state = NODE_STATE_IDLE;
rc = clusteracct_storage_g_node_up(acct_db_conn,
slurmctld_cluster_name,
- &send_node, event_time);
+ &send_node, event_time);
}
return rc;
@@ -1553,7 +1553,7 @@ static int _set_block_nodes_accounting(bg_record_t *bg_record, char *reason)
continue;
rc = _check_all_blocks_error(i, now, reason);
}
-
+
return rc;
}
@@ -1570,12 +1570,12 @@ static int _addto_node_list(bg_record_t *bg_record, int *start, int *end)
}
if ((end[X] >= DIM_SIZE[X]) || (end[Y] >= DIM_SIZE[Y])
|| (end[Z] >= DIM_SIZE[Z])) {
- fatal("bluegene.conf matrix size exceeds space defined in "
+ fatal("bluegene.conf matrix size exceeds space defined in "
"slurm.conf %c%c%cx%d%d%d => %c%c%c",
alpha_num[start[X]], alpha_num[start[Y]],
- alpha_num[start[Z]],
- end[X], end[Y], end[Z],
- alpha_num[DIM_SIZE[X]], alpha_num[DIM_SIZE[Y]],
+ alpha_num[start[Z]],
+ end[X], end[Y], end[Z],
+ alpha_num[DIM_SIZE[X]], alpha_num[DIM_SIZE[Y]],
alpha_num[DIM_SIZE[Z]]);
}
debug3("adding bps: %c%c%cx%c%c%c",
@@ -1583,18 +1583,18 @@ static int _addto_node_list(bg_record_t *bg_record, int *start, int *end)
alpha_num[end[X]], alpha_num[end[Y]], alpha_num[end[Z]]);
debug3("slurm.conf: %c%c%c",
alpha_num[DIM_SIZE[X]], alpha_num[DIM_SIZE[Y]],
- alpha_num[DIM_SIZE[Z]]);
-
+ alpha_num[DIM_SIZE[Z]]);
+
for (x = start[X]; x <= end[X]; x++) {
for (y = start[Y]; y <= end[Y]; y++) {
for (z = start[Z]; z <= end[Z]; z++) {
-
+
snprintf(node_name_tmp, sizeof(node_name_tmp),
- "%s%c%c%c",
+ "%s%c%c%c",
bg_conf->slurm_node_prefix,
alpha_num[x], alpha_num[y],
- alpha_num[z]);
-
+ alpha_num[z]);
+
ba_node = ba_copy_node(
&ba_system_ptr->grid[x][y][z]);
ba_node->used = 1;
@@ -1612,7 +1612,7 @@ static int _ba_node_cmpf_inc(ba_node_t *node_a, ba_node_t *node_b)
return -1;
else if (node_a->coord[X] > node_b->coord[X])
return 1;
-
+
if (node_a->coord[Y] < node_b->coord[Y])
return -1;
else if (node_a->coord[Y] > node_b->coord[Y])
@@ -1626,7 +1626,7 @@ static int _ba_node_cmpf_inc(ba_node_t *node_a, ba_node_t *node_b)
error("You have the node %c%c%c in the list twice",
alpha_num[node_a->coord[X]],
alpha_num[node_a->coord[Y]],
- alpha_num[node_a->coord[Z]]);
+ alpha_num[node_a->coord[Z]]);
return 0;
}
diff --git a/src/plugins/select/bluegene/plugin/bg_record_functions.h b/src/plugins/select/bluegene/plugin/bg_record_functions.h
index 7c7bee988e947b6d037202afbf3c5ab196f2f7a1..f07ddf903340627cd605918102d3ed0c39f11c45 100644
--- a/src/plugins/select/bluegene/plugin/bg_record_functions.h
+++ b/src/plugins/select/bluegene/plugin/bg_record_functions.h
@@ -6,32 +6,32 @@
* Copyright (C) 2008 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -62,15 +62,15 @@ typedef struct bg_record {
rm_partition_t *bg_block; /* structure to hold info from db2 */
pm_partition_id_t bg_block_id; /* ID returned from MMCS */
List bg_block_list; /* node list of blocks in block */
- bitstr_t *bitmap; /* bitmap to check the name
+ bitstr_t *bitmap; /* bitmap to check the name
of block */
#ifdef HAVE_BGL
char *blrtsimage; /* BlrtsImage for this block */
#endif
int boot_count; /* number of attemts boot attempts */
- int boot_state; /* check to see if boot failed.
- -1 = fail,
- 0 = not booting,
+ int boot_state; /* check to see if boot failed.
+ -1 = fail,
+ 0 = not booting,
1 = booting */
int bp_count; /* size */
rm_connection_type_t conn_type; /* MESH or Torus or NAV */
@@ -106,8 +106,8 @@ typedef struct bg_record {
rm_partition_state_t state; /* Current state of the block */
int start[BA_SYSTEM_DIMENSIONS];/* start node */
int switch_count; /* number of switches used. */
- char *target_name; /* when a block is freed this
- is the name of the user we
+ char *target_name; /* when a block is freed this
+ is the name of the user we
want on the block */
char *user_name; /* user using the block */
uid_t user_uid; /* Owner of block uid */
@@ -126,10 +126,10 @@ extern int bg_record_cmpf_inc(bg_record_t *rec_a, bg_record_t *rec_b);
/* return bg_record from a bg_list */
extern bg_record_t *find_bg_record_in_list(List my_list, char *bg_block_id);
-/* change username of a block bg_record_t target_name needs to be
- updated before call of function.
+/* change username of a block bg_record_t target_name needs to be
+ updated before call of function.
*/
-extern int update_block_user(bg_record_t *bg_block_id, int set);
+extern int update_block_user(bg_record_t *bg_block_id, int set);
extern void drain_as_needed(bg_record_t *bg_record, char *reason);
extern int set_ionodes(bg_record_t *bg_record, int io_start, int io_nodes);
diff --git a/src/plugins/select/bluegene/plugin/bg_switch_connections.c b/src/plugins/select/bluegene/plugin/bg_switch_connections.c
index 2be5636db760d3fb4a79ca506abf50ee14f55c1d..363ae504b92189bd5d9b0a4f1a217274ad73526c 100644
--- a/src/plugins/select/bluegene/plugin/bg_switch_connections.c
+++ b/src/plugins/select/bluegene/plugin/bg_switch_connections.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * bg_switch_connections.c - Blue Gene switch management functions,
+ * bg_switch_connections.c - Blue Gene switch management functions,
* establish switch connections
*
* $Id$
@@ -7,32 +7,32 @@
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Dan Phung <phung4@llnl.gov> and Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -42,20 +42,20 @@
#ifdef HAVE_BG_FILES
-static int _get_bp_by_location(my_bluegene_t* my_bg,
- int* curr_coord,
+static int _get_bp_by_location(my_bluegene_t* my_bg,
+ int* curr_coord,
rm_BP_t** bp);
static int _get_switches_by_bpid(my_bluegene_t* my_bg, const char *bpid,
rm_switch_t **curr_switch);
//static int _set_switch(rm_switch_t* curr_switch, ba_connection_t *int_wire);
-static int _add_switch_conns(rm_switch_t* curr_switch,
+static int _add_switch_conns(rm_switch_t* curr_switch,
ba_switch_t *ba_switch);
#endif
static int _used_switches(ba_node_t *ba_node);
-/**
+/**
* this is just stupid. there are some implicit rules for where
* "NextBP" goes to, but we don't know, so we have to do this.
*/
@@ -77,20 +77,20 @@ static int _get_bp_by_location(my_bluegene_t* my_bg, int* curr_coord,
for (i=0; i<bp_num; i++){
if(i) {
- if ((rc = bridge_get_data(my_bg, RM_NextBP, bp))
+ if ((rc = bridge_get_data(my_bg, RM_NextBP, bp))
!= STATUS_OK) {
- fatal("bridge_get_data: RM_NextBP: %s",
+ fatal("bridge_get_data: RM_NextBP: %s",
bg_err_str(rc));
return SLURM_ERROR;
- }
+ }
} else {
- if ((rc = bridge_get_data(my_bg, RM_FirstBP, bp))
+ if ((rc = bridge_get_data(my_bg, RM_FirstBP, bp))
!= STATUS_OK) {
- fatal("bridge_get_data: RM_FirstBP: %s",
+ fatal("bridge_get_data: RM_FirstBP: %s",
bg_err_str(rc));
return SLURM_ERROR;
}
- }
+ }
if ((rc = bridge_get_data(*bp, RM_BPLoc, &loc)) != STATUS_OK) {
fatal("bridge_get_data: RM_BPLoc: %s", bg_err_str(rc));
return SLURM_ERROR;
@@ -118,7 +118,7 @@ static int _get_switches_by_bpid(
char *curr_bpid = NULL;
if(!switch_num) {
- if ((rc = bridge_get_data(my_bg, RM_SwitchNum, &switch_num))
+ if ((rc = bridge_get_data(my_bg, RM_SwitchNum, &switch_num))
!= STATUS_OK) {
fatal("bridge_get_data: RM_SwitchNum: %s",
bg_err_str(rc));
@@ -128,33 +128,33 @@ static int _get_switches_by_bpid(
for (i=0; i<switch_num; i++) {
if(i) {
- if ((rc = bridge_get_data(my_bg, RM_NextSwitch,
- &curr_switch))
+ if ((rc = bridge_get_data(my_bg, RM_NextSwitch,
+ &curr_switch))
!= STATUS_OK) {
fatal("bridge_get_data"
"(RM_NextSwitch): %s",
bg_err_str(rc));
}
} else {
- if ((rc = bridge_get_data(my_bg, RM_FirstSwitch,
- &curr_switch))
+ if ((rc = bridge_get_data(my_bg, RM_FirstSwitch,
+ &curr_switch))
!= STATUS_OK) {
fatal("bridge_get_data"
"(RM_FirstSwitch): %s",
bg_err_str(rc));
}
}
- if ((rc = bridge_get_data(curr_switch, RM_SwitchBPID,
+ if ((rc = bridge_get_data(curr_switch, RM_SwitchBPID,
&curr_bpid)) != STATUS_OK) {
- fatal("bridge_get_data: RM_SwitchBPID: %s",
+ fatal("bridge_get_data: RM_SwitchBPID: %s",
bg_err_str(rc));
}
-
+
if(!curr_bpid) {
error("No BP ID was returned from database");
continue;
}
-
+
if (!strcasecmp((char *)bpid, (char *)curr_bpid)) {
coord_switch[found_bpid] = curr_switch;
found_bpid++;
@@ -168,7 +168,7 @@ static int _get_switches_by_bpid(
return SLURM_ERROR;
}
-static int _add_switch_conns(rm_switch_t* curr_switch,
+static int _add_switch_conns(rm_switch_t* curr_switch,
ba_switch_t *ba_switch)
{
int firstconnect=1;
@@ -207,35 +207,35 @@ static int _add_switch_conns(rm_switch_t* curr_switch,
if(ba_conn->used && ba_conn->port_tar != source) {
switch(ba_conn->port_tar) {
case 0:
- conn[i].p2 = RM_PORT_S0;
+ conn[i].p2 = RM_PORT_S0;
break;
case 3:
- conn[i].p2 = RM_PORT_S3;
+ conn[i].p2 = RM_PORT_S3;
break;
case 5:
- conn[i].p2 = RM_PORT_S5;
- break;
+ conn[i].p2 = RM_PORT_S5;
+ break;
default:
error("we are trying to connection %d -> %d "
- "which can't happen",
+ "which can't happen",
source, ba_conn->port_tar);
- break;
+ break;
}
conn[i].part_state = RM_PARTITION_READY;
debug3("adding %d -> %d", source, ba_conn->port_tar);
list_push(conn_list, &conn[i]);
}
}
-
+
i = list_count(conn_list);
if(i) {
if ((rc = bridge_set_data(curr_switch, RM_SwitchConnNum, &i))
!= STATUS_OK) {
fatal("bridge_set_data: RM_SwitchConnNum: %s",
bg_err_str(rc));
-
+
return SLURM_ERROR;
- }
+ }
} else {
debug2("we got a switch with no connections");
list_destroy(conn_list);
@@ -246,13 +246,13 @@ static int _add_switch_conns(rm_switch_t* curr_switch,
while((conn_ptr = list_pop(conn_list))) {
if(firstconnect) {
if ((rc = bridge_set_data(
- curr_switch,
- RM_SwitchFirstConnection,
- conn_ptr))
+ curr_switch,
+ RM_SwitchFirstConnection,
+ conn_ptr))
!= STATUS_OK) {
fatal("bridge_set_data"
"(RM_SwitchFirstConnection): "
- "%s",
+ "%s",
bg_err_str(rc));
list_destroy(conn_list);
return SLURM_ERROR;
@@ -260,9 +260,9 @@ static int _add_switch_conns(rm_switch_t* curr_switch,
firstconnect=0;
} else {
if ((rc = bridge_set_data(
- curr_switch,
+ curr_switch,
RM_SwitchNextConnection,
- conn_ptr))
+ conn_ptr))
!= STATUS_OK) {
fatal("bridge_set_data"
"(RM_SwitchNextConnection): %s",
@@ -270,9 +270,9 @@ static int _add_switch_conns(rm_switch_t* curr_switch,
list_destroy(conn_list);
return SLURM_ERROR;
}
- }
+ }
}
-
+
list_destroy(conn_list);
return SLURM_SUCCESS;
@@ -287,10 +287,10 @@ static int _used_switches(ba_node_t* ba_node)
ba_switch_t *ba_switch = NULL;
int i = 0, j = 0, switch_count = 0;
int source = 0;
-
+
debug5("checking node %c%c%c",
- alpha_num[ba_node->coord[X]],
- alpha_num[ba_node->coord[Y]],
+ alpha_num[ba_node->coord[X]],
+ alpha_num[ba_node->coord[Y]],
alpha_num[ba_node->coord[Z]]);
for(i=0; i<BA_SYSTEM_DIMENSIONS; i++) {
debug5("dim %d", i);
@@ -326,7 +326,7 @@ static int _used_switches(ba_node_t* ba_node)
extern int configure_small_block(bg_record_t *bg_record)
{
int rc = SLURM_SUCCESS;
-#ifdef HAVE_BG_FILES
+#ifdef HAVE_BG_FILES
bool small = true;
ba_node_t* ba_node = NULL;
rm_BP_t *curr_bp = NULL;
@@ -350,12 +350,12 @@ extern int configure_small_block(bg_record_t *bg_record)
}
/* info("configuring small block on ionodes %s out of %d ncs", */
/* bg_record->ionodes, bg_conf->bp_nodecard_cnt); */
-#ifdef HAVE_BG_FILES
+#ifdef HAVE_BG_FILES
/* set that we are doing a small block */
- if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionSmall,
+ if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionSmall,
&small)) != STATUS_OK) {
-
- fatal("bridge_set_data(RM_PartitionPsetsPerBP)",
+
+ fatal("bridge_set_data(RM_PartitionPsetsPerBP)",
bg_err_str(rc));
}
@@ -367,7 +367,7 @@ extern int configure_small_block(bg_record_t *bg_record)
memset(use_nc, 0, sizeof(use_nc));
/* find out how many nodecards to get for each ionode */
-
+
for(i = 0; i<bg_conf->numpsets; i++) {
if(bit_test(bg_record->ionode_bitmap, i)) {
if(bg_conf->nc_ratio > 1) {
@@ -387,41 +387,41 @@ extern int configure_small_block(bg_record_t *bg_record)
RM_PartitionNodeCardNum,
&num_ncards))
!= STATUS_OK) {
-
- fatal("bridge_set_data: RM_PartitionBPNum: %s",
+
+ fatal("bridge_set_data: RM_PartitionBPNum: %s",
bg_err_str(rc));
}
-
+
ba_node = list_peek(bg_record->bg_block_list);
- if (_get_bp_by_location(bg, ba_node->coord, &curr_bp)
+ if (_get_bp_by_location(bg, ba_node->coord, &curr_bp)
== SLURM_ERROR) {
fatal("_get_bp_by_location()");
}
-
+
/* Set the one BP */
-
+
if ((rc = bridge_set_data(bg_record->bg_block,
RM_PartitionBPNum,
- &bg_record->bp_count))
+ &bg_record->bp_count))
!= STATUS_OK) {
-
- fatal("bridge_set_data: RM_PartitionBPNum: %s",
+
+ fatal("bridge_set_data: RM_PartitionBPNum: %s",
bg_err_str(rc));
return SLURM_ERROR;
- }
+ }
if ((rc = bridge_set_data(bg_record->bg_block,
- RM_PartitionFirstBP,
- curr_bp))
+ RM_PartitionFirstBP,
+ curr_bp))
!= STATUS_OK) {
-
+
fatal("bridge_set_data("
- "BRIDGE_PartitionFirstBP): %s",
+ "BRIDGE_PartitionFirstBP): %s",
bg_err_str(rc));
return SLURM_ERROR;
}
-
-
+
+
/* find the bp_id of the bp to get the small32 */
if ((rc = bridge_get_data(curr_bp, RM_BPID, &bp_id))
!= STATUS_OK) {
@@ -429,7 +429,7 @@ extern int configure_small_block(bg_record_t *bg_record)
return SLURM_ERROR;
}
-
+
if(!bp_id) {
error("No BP ID was returned from database");
return SLURM_ERROR;
@@ -443,8 +443,8 @@ extern int configure_small_block(bg_record_t *bg_record)
return SLURM_ERROR;
}
free(bp_id);
-
-
+
+
if((rc = bridge_get_data(ncard_list, RM_NodeCardListSize, &num))
!= STATUS_OK) {
error("bridge_get_data(RM_NodeCardListSize): %s",
@@ -459,8 +459,8 @@ extern int configure_small_block(bg_record_t *bg_record)
for(i=0; i<num; i++) {
if (i) {
- if ((rc = bridge_get_data(ncard_list,
- RM_NodeCardListNext,
+ if ((rc = bridge_get_data(ncard_list,
+ RM_NodeCardListNext,
&ncard)) != STATUS_OK) {
error("bridge_get_data"
"(RM_NodeCardListNext): %s",
@@ -469,8 +469,8 @@ extern int configure_small_block(bg_record_t *bg_record)
goto cleanup;
}
} else {
- if ((rc = bridge_get_data(ncard_list,
- RM_NodeCardListFirst,
+ if ((rc = bridge_get_data(ncard_list,
+ RM_NodeCardListFirst,
&ncard)) != STATUS_OK) {
error("bridge_get_data"
"(RM_NodeCardListFirst): %s",
@@ -479,18 +479,18 @@ extern int configure_small_block(bg_record_t *bg_record)
goto cleanup;
}
}
-
+
#ifdef HAVE_BGL
/* on BG/L we assume the order never changes when the
system is up. This could change when a reboot of
the system happens, but that should be rare.
*/
nc_id = i;
- if(!use_nc[i])
+ if(!use_nc[i])
continue;
#else
- if ((rc = bridge_get_data(ncard,
- RM_NodeCardID,
+ if ((rc = bridge_get_data(ncard,
+ RM_NodeCardID,
&nc_char)) != STATUS_OK) {
error("bridge_get_data(RM_NodeCardID): %d",rc);
rc = SLURM_ERROR;
@@ -504,7 +504,7 @@ extern int configure_small_block(bg_record_t *bg_record)
}
nc_id = atoi((char*)nc_char+1);
-
+
if(!use_nc[nc_id]) {
free(nc_char);
continue;
@@ -515,36 +515,36 @@ extern int configure_small_block(bg_record_t *bg_record)
char *ionode_id = "J00";
if((rc = bridge_new_nodecard(&ncard)) != STATUS_OK) {
- error("bridge_new_nodecard(): %s",
+ error("bridge_new_nodecard(): %s",
bg_err_str(rc));
rc = SLURM_ERROR;
goto cleanup;
}
if ((rc = bridge_set_data(ncard,
- RM_NodeCardID,
- nc_char))
- != STATUS_OK) {
+ RM_NodeCardID,
+ nc_char))
+ != STATUS_OK) {
error("bridge_set_data("
- "RM_NodeCardID): %s",
+ "RM_NodeCardID): %s",
bg_err_str(rc));
rc = SLURM_ERROR;
goto cleanup;
}
if ((rc = bridge_set_data(ncard,
- RM_NodeCardIONodeNum,
- &sub_nodecard))
- != STATUS_OK) {
+ RM_NodeCardIONodeNum,
+ &sub_nodecard))
+ != STATUS_OK) {
error("bridge_set_data("
- "RM_NodeCardIONodeNum): %s",
+ "RM_NodeCardIONodeNum): %s",
bg_err_str(rc));
rc = SLURM_ERROR;
goto cleanup;
}
-
+
if((rc = bridge_new_ionode(&ionode)) != STATUS_OK) {
- error("bridge_new_ionode(): %s",
+ error("bridge_new_ionode(): %s",
bg_err_str(rc));
rc = SLURM_ERROR;
goto cleanup;
@@ -552,70 +552,70 @@ extern int configure_small_block(bg_record_t *bg_record)
if(ionode_card)
ionode_id = "J01";
-
+
if ((rc = bridge_set_data(ionode,
- RM_IONodeID,
- ionode_id))
- != STATUS_OK) {
+ RM_IONodeID,
+ ionode_id))
+ != STATUS_OK) {
error("bridge_set_data("
- "RM_NodeCardIONodeNum): %s",
+ "RM_NodeCardIONodeNum): %s",
bg_err_str(rc));
rc = SLURM_ERROR;
goto cleanup;
- }
-
+ }
+
if ((rc = bridge_set_data(ncard,
- RM_NodeCardFirstIONode,
- ionode))
- != STATUS_OK) {
+ RM_NodeCardFirstIONode,
+ ionode))
+ != STATUS_OK) {
error("bridge_set_data("
- "RM_NodeCardFirstIONode): %s",
+ "RM_NodeCardFirstIONode): %s",
bg_err_str(rc));
rc = SLURM_ERROR;
goto cleanup;
}
-
+
if((rc = bridge_free_ionode(ionode)) != STATUS_OK) {
- error("bridge_free_ionode(): %s",
+ error("bridge_free_ionode(): %s",
bg_err_str(rc));
rc = SLURM_ERROR;
goto cleanup;
- }
+ }
}
free(nc_char);
#endif
if (nc_count) {
if ((rc = bridge_set_data(bg_record->bg_block,
- RM_PartitionNextNodeCard,
- ncard))
+ RM_PartitionNextNodeCard,
+ ncard))
!= STATUS_OK) {
-
+
error("bridge_set_data("
- "RM_PartitionNextNodeCard): %s",
+ "RM_PartitionNextNodeCard): %s",
bg_err_str(rc));
rc = SLURM_ERROR;
goto cleanup;
}
} else {
if ((rc = bridge_set_data(bg_record->bg_block,
- RM_PartitionFirstNodeCard,
- ncard))
+ RM_PartitionFirstNodeCard,
+ ncard))
!= STATUS_OK) {
-
+
error("bridge_set_data("
- "RM_PartitionFirstNodeCard): %s",
+ "RM_PartitionFirstNodeCard): %s",
bg_err_str(rc));
rc = SLURM_ERROR;
goto cleanup;
}
}
-
+
nc_count++;
#ifndef HAVE_BGL
if(sub_nodecard) {
if((rc = bridge_free_nodecard(ncard)) != STATUS_OK) {
- error("bridge_free_nodecard(): %s",
+ error("bridge_free_nodecard(): %s",
bg_err_str(rc));
rc = SLURM_ERROR;
goto cleanup;
@@ -650,15 +650,15 @@ extern int configure_block_switches(bg_record_t * bg_record)
int i = 0;
rm_BP_t *curr_bp = NULL;
rm_switch_t *coord_switch[BA_SYSTEM_DIMENSIONS];
-#endif
+#endif
if(!bg_record->bg_block_list) {
error("There was no block_list given, can't create block");
return SLURM_ERROR;
}
-
+
bg_record->switch_count = 0;
bg_record->bp_count = 0;
-
+
itr = list_iterator_create(bg_record->bg_block_list);
while ((ba_node = list_next(itr))) {
if(ba_node->used) {
@@ -669,32 +669,32 @@ extern int configure_block_switches(bg_record_t * bg_record)
#ifdef HAVE_BG_FILES
if ((rc = bridge_set_data(bg_record->bg_block,
RM_PartitionBPNum,
- &bg_record->bp_count))
+ &bg_record->bp_count))
!= STATUS_OK) {
- fatal("bridge_set_data: RM_PartitionBPNum: %s",
+ fatal("bridge_set_data: RM_PartitionBPNum: %s",
bg_err_str(rc));
rc = SLURM_ERROR;
-
+
goto cleanup;
}
if ((rc = bridge_set_data(bg_record->bg_block,
RM_PartitionSwitchNum,
- &bg_record->switch_count))
+ &bg_record->switch_count))
!= STATUS_OK) {
- fatal("bridge_set_data: RM_PartitionSwitchNum: %s",
+ fatal("bridge_set_data: RM_PartitionSwitchNum: %s",
bg_err_str(rc));
rc = SLURM_ERROR;
-
+
goto cleanup;
}
-#endif
+#endif
debug4("BP count %d", bg_record->bp_count);
debug4("switch count %d", bg_record->switch_count);
list_iterator_reset(itr);
while ((ba_node = list_next(itr))) {
#ifdef HAVE_BG_FILES
- if (_get_bp_by_location(bg, ba_node->coord, &curr_bp)
+ if (_get_bp_by_location(bg, ba_node->coord, &curr_bp)
== SLURM_ERROR) {
rc = SLURM_ERROR;
goto cleanup;
@@ -703,46 +703,46 @@ extern int configure_block_switches(bg_record_t * bg_record)
if(!ba_node->used) {
debug4("%c%c%c is a passthrough, "
"not including in request",
- alpha_num[ba_node->coord[X]],
- alpha_num[ba_node->coord[Y]],
+ alpha_num[ba_node->coord[X]],
+ alpha_num[ba_node->coord[Y]],
alpha_num[ba_node->coord[Z]]);
} else {
debug3("using node %c%c%c",
- alpha_num[ba_node->coord[X]],
- alpha_num[ba_node->coord[Y]],
+ alpha_num[ba_node->coord[X]],
+ alpha_num[ba_node->coord[Y]],
alpha_num[ba_node->coord[Z]]);
#ifdef HAVE_BG_FILES
if (first_bp){
if ((rc = bridge_set_data(bg_record->bg_block,
- RM_PartitionFirstBP,
- curr_bp))
+ RM_PartitionFirstBP,
+ curr_bp))
!= STATUS_OK) {
- list_iterator_destroy(itr);
+ list_iterator_destroy(itr);
fatal("bridge_set_data("
- "RM_PartitionFirstBP): %s",
+ "RM_PartitionFirstBP): %s",
bg_err_str(rc));
}
first_bp = 0;
} else {
if ((rc = bridge_set_data(bg_record->bg_block,
- RM_PartitionNextBP,
- curr_bp))
+ RM_PartitionNextBP,
+ curr_bp))
!= STATUS_OK) {
list_iterator_destroy(itr);
fatal("bridge_set_data"
- "(RM_PartitionNextBP): %s",
+ "(RM_PartitionNextBP): %s",
bg_err_str(rc));
}
}
#endif
- }
+ }
#ifdef HAVE_BG_FILES
- if ((rc = bridge_get_data(curr_bp, RM_BPID, &bpid))
+ if ((rc = bridge_get_data(curr_bp, RM_BPID, &bpid))
!= STATUS_OK) {
list_iterator_destroy(itr);
fatal("bridge_get_data: RM_BPID: %s", bg_err_str(rc));
- }
-
+ }
+
if(!bpid) {
error("No BP ID was returned from database");
continue;
@@ -750,10 +750,10 @@ extern int configure_block_switches(bg_record_t * bg_record)
if(_get_switches_by_bpid(bg, bpid, coord_switch)
!= SLURM_SUCCESS) {
error("Didn't get all the switches for bp %s", bpid);
- free(bpid);
+ free(bpid);
continue;
}
- free(bpid);
+ free(bpid);
for(i=0; i<BA_SYSTEM_DIMENSIONS; i++) {
if(_add_switch_conns(coord_switch[i],
&ba_node->axis_switch[i])
@@ -763,35 +763,35 @@ extern int configure_block_switches(bg_record_t * bg_record)
if ((rc = bridge_set_data(
bg_record->bg_block,
RM_PartitionFirstSwitch,
- coord_switch[i]))
+ coord_switch[i]))
!= STATUS_OK) {
fatal("bridge_set_data("
"RM_PartitionFirst"
- "Switch): %s",
+ "Switch): %s",
bg_err_str(rc));
}
-
+
first_switch = 0;
} else {
if ((rc = bridge_set_data(
bg_record->bg_block,
RM_PartitionNextSwitch,
- coord_switch[i]))
+ coord_switch[i]))
!= STATUS_OK) {
fatal("bridge_set_data("
"RM_PartitionNext"
- "Switch): %s",
+ "Switch): %s",
bg_err_str(rc));
}
}
}
}
-#endif
+#endif
}
rc = SLURM_SUCCESS;
#ifdef HAVE_BG_FILES
cleanup:
#endif
- return rc;
+ return rc;
}
diff --git a/src/plugins/select/bluegene/plugin/block_sys.c b/src/plugins/select/bluegene/plugin/block_sys.c
index 29007022337a3d98492dfcf153f389ce7396965d..271fb5ea4ebefdf6399cd425c1e7cdd35591bc52 100755
--- a/src/plugins/select/bluegene/plugin/block_sys.c
+++ b/src/plugins/select/bluegene/plugin/block_sys.c
@@ -6,32 +6,32 @@
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Dan Phung <phung4@llnl.gov> and Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -48,13 +48,13 @@ List bg_sys_free = NULL;
/* global system = list of allocated blocks */
List bg_sys_allocated = NULL;
-/**
+/**
* _get_bp: get the BP at location loc
*
* IN - bg: pointer to preinitialized bg pointer
- * IN - bp: pointer to preinitailized rm_element_t that will
+ * IN - bp: pointer to preinitailized rm_element_t that will
* hold the BP that we resolve to.
- * IN - loc: location of the desired BP
+ * IN - loc: location of the desired BP
* OUT - bp: will point to BP at location loc
* OUT - rc: error code (0 = success)
*/
@@ -84,7 +84,7 @@ static void _print_list(List list)
while ((stuff = (int*) list_next(itr))) {
debug("stuff %d", stuff);
if (stuff == NULL){
- break;
+ break;
}
debug("[ %d", stuff[0]);
@@ -97,8 +97,8 @@ static void _print_list(List list)
}
#endif
-/**
- * initialize the BG block in the resource manager
+/**
+ * initialize the BG block in the resource manager
*/
static void _pre_allocate(bg_record_t *bg_record)
{
@@ -107,17 +107,17 @@ static void _pre_allocate(bg_record_t *bg_record)
int send_psets=bg_conf->numpsets;
#ifdef HAVE_BGL
- if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionBlrtsImg,
+ if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionBlrtsImg,
bg_record->blrtsimage)) != STATUS_OK)
error("bridge_set_data(RM_PartitionBlrtsImg)", bg_err_str(rc));
- if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionLinuxImg,
- bg_record->linuximage)) != STATUS_OK)
+ if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionLinuxImg,
+ bg_record->linuximage)) != STATUS_OK)
error("bridge_set_data(RM_PartitionLinuxImg)", bg_err_str(rc));
- if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionRamdiskImg,
+ if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionRamdiskImg,
bg_record->ramdiskimage)) != STATUS_OK)
- error("bridge_set_data(RM_PartitionRamdiskImg)",
+ error("bridge_set_data(RM_PartitionRamdiskImg)",
bg_err_str(rc));
#else
struct tm my_tm;
@@ -125,59 +125,59 @@ static void _pre_allocate(bg_record_t *bg_record)
if ((rc = bridge_set_data(bg_record->bg_block,
RM_PartitionCnloadImg,
- bg_record->linuximage)) != STATUS_OK)
+ bg_record->linuximage)) != STATUS_OK)
error("bridge_set_data(RM_PartitionLinuxCnloadImg)",
bg_err_str(rc));
- if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionIoloadImg,
+ if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionIoloadImg,
bg_record->ramdiskimage)) != STATUS_OK)
- error("bridge_set_data(RM_PartitionIoloadImg)",
+ error("bridge_set_data(RM_PartitionIoloadImg)",
bg_err_str(rc));
gettimeofday(&my_tv, NULL);
localtime_r(&my_tv.tv_sec, &my_tm);
bg_record->bg_block_id = xstrdup_printf(
"RMP%2.2d%2.2s%2.2d%2.2d%2.2d%3.3d",
- my_tm.tm_mday, mon_abbr(my_tm.tm_mon),
+ my_tm.tm_mday, mon_abbr(my_tm.tm_mon),
my_tm.tm_hour, my_tm.tm_min, my_tm.tm_sec, my_tv.tv_usec/1000);
if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionID,
bg_record->bg_block_id)) != STATUS_OK)
error("bridge_set_data(RM_PartitionID)", bg_err_str(rc));
#endif
- if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionMloaderImg,
+ if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionMloaderImg,
bg_record->mloaderimage)) != STATUS_OK)
- error("bridge_set_data(RM_PartitionMloaderImg)",
+ error("bridge_set_data(RM_PartitionMloaderImg)",
bg_err_str(rc));
- if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionConnection,
+ if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionConnection,
&bg_record->conn_type)) != STATUS_OK)
- error("bridge_set_data(RM_PartitionConnection)",
+ error("bridge_set_data(RM_PartitionConnection)",
bg_err_str(rc));
-
+
/* rc = bg_conf->bp_node_cnt/bg_record->node_cnt; */
/* if(rc > 1) */
/* send_psets = bg_conf->numpsets/rc; */
-
- if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionPsetsPerBP,
+
+ if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionPsetsPerBP,
&send_psets)) != STATUS_OK)
- error("bridge_set_data(RM_PartitionPsetsPerBP)",
+ error("bridge_set_data(RM_PartitionPsetsPerBP)",
bg_err_str(rc));
-
- if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionUserName,
- bg_conf->slurm_user_name))
+
+ if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionUserName,
+ bg_conf->slurm_user_name))
!= STATUS_OK)
error("bridge_set_data(RM_PartitionUserName)", bg_err_str(rc));
-
+
#endif
}
-/**
+/**
* add the block record to the DB
*/
static int _post_allocate(bg_record_t *bg_record)
{
int rc = SLURM_SUCCESS;
-#ifdef HAVE_BG_FILES
+#ifdef HAVE_BG_FILES
int i;
pm_partition_id_t block_id;
uid_t my_uid;
@@ -186,7 +186,7 @@ static int _post_allocate(bg_record_t *bg_record)
debug2("adding block\n");
for(i=0;i<MAX_ADD_RETRY; i++) {
- if ((rc = bridge_add_block(bg_record->bg_block))
+ if ((rc = bridge_add_block(bg_record->bg_block))
!= STATUS_OK) {
error("bridge_add_block(): %s", bg_err_str(rc));
rc = SLURM_ERROR;
@@ -198,15 +198,15 @@ static int _post_allocate(bg_record_t *bg_record)
}
if(rc == SLURM_ERROR) {
info("going to free it");
- if ((rc = bridge_free_block(bg_record->bg_block))
+ if ((rc = bridge_free_block(bg_record->bg_block))
!= STATUS_OK)
error("bridge_free_block(): %s", bg_err_str(rc));
fatal("couldn't add last block.");
}
debug2("done adding\n");
-
+
/* Get back the new block id */
- if ((rc = bridge_get_data(bg_record->bg_block, RM_PartitionID,
+ if ((rc = bridge_get_data(bg_record->bg_block, RM_PartitionID,
&block_id))
!= STATUS_OK) {
error("bridge_get_data(RM_PartitionID): %s", bg_err_str(rc));
@@ -217,19 +217,19 @@ static int _post_allocate(bg_record_t *bg_record)
return SLURM_ERROR;
}
bg_record->bg_block_id = xstrdup(block_id);
-
+
free(block_id);
-
+
xfree(bg_record->target_name);
-
- bg_record->target_name =
+
+ bg_record->target_name =
xstrdup(bg_conf->slurm_user_name);
xfree(bg_record->user_name);
- bg_record->user_name =
+ bg_record->user_name =
xstrdup(bg_conf->slurm_user_name);
-
+
if (uid_from_string (bg_record->user_name, &my_uid) < 0)
error("uid_from_string(%s): %m", bg_record->user_name);
else
@@ -237,7 +237,7 @@ static int _post_allocate(bg_record_t *bg_record)
}
/* We are done with the block */
if ((rc = bridge_free_block(bg_record->bg_block)) != STATUS_OK)
- error("bridge_free_block(): %s", bg_err_str(rc));
+ error("bridge_free_block(): %s", bg_err_str(rc));
#else
/* We are just looking for a real number here no need for a
base conversion
@@ -246,8 +246,8 @@ static int _post_allocate(bg_record_t *bg_record)
int i=0, temp = 0;
if(bg_record->bg_block_id) {
while(bg_record->bg_block_id[i]
- && (bg_record->bg_block_id[i] > '9'
- || bg_record->bg_block_id[i] < '0'))
+ && (bg_record->bg_block_id[i] > '9'
+ || bg_record->bg_block_id[i] < '0'))
i++;
if(bg_record->bg_block_id[i]) {
temp = atoi(bg_record->bg_block_id+i)+1;
@@ -260,7 +260,7 @@ static int _post_allocate(bg_record_t *bg_record)
snprintf(bg_record->bg_block_id, 8,
"RMP%d", block_inx++);
}
-#endif
+#endif
return rc;
}
@@ -278,7 +278,7 @@ static int _find_nodecard(rm_partition_t *block_ptr, int *nc_id)
rm_nodecard_list_t *ncard_list = NULL;
rm_nodecard_t *ncard = NULL;
rm_BP_t *curr_bp = NULL;
-
+
xassert(block_ptr);
xassert(nc_id);
@@ -296,7 +296,7 @@ static int _find_nodecard(rm_partition_t *block_ptr, int *nc_id)
error("bridge_get_data(RM_NodeCardID): %s",
bg_err_str(rc));
}
-
+
if((rc = bridge_get_data(block_ptr,
RM_PartitionFirstBP,
&curr_bp))
@@ -309,7 +309,7 @@ static int _find_nodecard(rm_partition_t *block_ptr, int *nc_id)
error("bridge_get_data(RM_BPID): %d", rc);
return SLURM_ERROR;
}
-
+
if ((rc = bridge_get_nodecards(bp_id, &ncard_list))
!= STATUS_OK) {
error("bridge_get_nodecards(%s): %d",
@@ -320,16 +320,16 @@ static int _find_nodecard(rm_partition_t *block_ptr, int *nc_id)
free(bp_id);
if((rc = bridge_get_data(ncard_list, RM_NodeCardListSize, &num))
!= STATUS_OK) {
- error("bridge_get_data(RM_NodeCardListSize): %s",
+ error("bridge_get_data(RM_NodeCardListSize): %s",
bg_err_str(rc));
return SLURM_ERROR;
}
-
+
for(i=0; i<num; i++) {
if (i) {
- if ((rc =
- bridge_get_data(ncard_list,
- RM_NodeCardListNext,
+ if ((rc =
+ bridge_get_data(ncard_list,
+ RM_NodeCardListNext,
&ncard)) != STATUS_OK) {
error("bridge_get_data"
"(RM_NodeCardListNext): %s",
@@ -338,8 +338,8 @@ static int _find_nodecard(rm_partition_t *block_ptr, int *nc_id)
goto cleanup;
}
} else {
- if ((rc = bridge_get_data(ncard_list,
- RM_NodeCardListFirst,
+ if ((rc = bridge_get_data(ncard_list,
+ RM_NodeCardListFirst,
&ncard)) != STATUS_OK) {
error("bridge_get_data"
"(RM_NodeCardListFirst: %s",
@@ -348,8 +348,8 @@ static int _find_nodecard(rm_partition_t *block_ptr, int *nc_id)
goto cleanup;
}
}
- if ((rc = bridge_get_data(ncard,
- RM_NodeCardID,
+ if ((rc = bridge_get_data(ncard,
+ RM_NodeCardID,
&card_name)) != STATUS_OK) {
error("bridge_get_data(RM_NodeCardID: %s",
rc);
@@ -375,7 +375,7 @@ extern int configure_block(bg_record_t *bg_record)
{
/* new block to be added */
#ifdef HAVE_BG_FILES
- bridge_new_block(&bg_record->bg_block);
+ bridge_new_block(&bg_record->bg_block);
#endif
_pre_allocate(bg_record);
@@ -383,8 +383,8 @@ extern int configure_block(bg_record_t *bg_record)
configure_small_block(bg_record);
else
configure_block_switches(bg_record);
-
- _post_allocate(bg_record);
+
+ _post_allocate(bg_record);
return 1;
}
@@ -403,7 +403,7 @@ int read_bg_blocks(List curr_block_list)
char node_name_tmp[255], *user_name = NULL;
bg_record_t *bg_record = NULL;
uid_t my_uid;
-
+
int *coord = NULL;
int block_number, block_count;
char *tmp_char = NULL;
@@ -421,9 +421,9 @@ int read_bg_blocks(List curr_block_list)
!= STATUS_OK) {
error("2 rm_get_blocks_info(): %s", bg_err_str(rc));
return SLURM_ERROR;
-
+
}
-
+
if ((rc = bridge_get_data(block_list, RM_PartListSize, &block_count))
!= STATUS_OK) {
error("bridge_get_data(RM_PartListSize): %s", bg_err_str(rc));
@@ -431,9 +431,9 @@ int read_bg_blocks(List curr_block_list)
}
info("querying the system for existing blocks");
for(block_number=0; block_number<block_count; block_number++) {
-
+
if (block_number) {
- if ((rc = bridge_get_data(block_list,
+ if ((rc = bridge_get_data(block_list,
RM_PartListNextPart,
&block_ptr)) != STATUS_OK) {
error("bridge_get_data"
@@ -442,7 +442,7 @@ int read_bg_blocks(List curr_block_list)
break;
}
} else {
- if ((rc = bridge_get_data(block_list,
+ if ((rc = bridge_get_data(block_list,
RM_PartListFirstPart,
&block_ptr)) != STATUS_OK) {
error("bridge_get_data"
@@ -452,10 +452,10 @@ int read_bg_blocks(List curr_block_list)
}
}
- if ((rc = bridge_get_data(block_ptr, RM_PartitionID,
+ if ((rc = bridge_get_data(block_ptr, RM_PartitionID,
&tmp_char))
!= STATUS_OK) {
- error("bridge_get_data(RM_PartitionID): %s",
+ error("bridge_get_data(RM_PartitionID): %s",
bg_err_str(rc));
continue;
}
@@ -480,25 +480,25 @@ int read_bg_blocks(List curr_block_list)
break;
}
}
- /* New BG Block record */
-
+ /* New BG Block record */
+
bg_record = xmalloc(sizeof(bg_record_t));
list_push(curr_block_list, bg_record);
-
+
bg_record->bg_block_id = xstrdup(tmp_char);
free(tmp_char);
bg_record->state = NO_VAL;
#ifndef HAVE_BGL
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionSize,
- &bp_cnt))
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionSize,
+ &bp_cnt))
!= STATUS_OK) {
- error("bridge_get_data(RM_PartitionSize): %s",
+ error("bridge_get_data(RM_PartitionSize): %s",
bg_err_str(rc));
goto clean_up;
}
-
+
if(bp_cnt==0)
goto clean_up;
@@ -506,38 +506,38 @@ int read_bg_blocks(List curr_block_list)
bg_record->cpu_cnt = bg_conf->cpu_ratio * bg_record->node_cnt;
#endif
bg_record->job_running = NO_JOB_RUNNING;
-
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionBPNum,
- &bp_cnt))
+
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionBPNum,
+ &bp_cnt))
!= STATUS_OK) {
- error("bridge_get_data(RM_BPNum): %s",
+ error("bridge_get_data(RM_BPNum): %s",
bg_err_str(rc));
goto clean_up;
}
-
+
if(bp_cnt==0)
goto clean_up;
bg_record->bp_count = bp_cnt;
debug3("has %d BPs", bg_record->bp_count);
-
+
if ((rc = bridge_get_data(block_ptr, RM_PartitionSwitchNum,
- &bg_record->switch_count))
+ &bg_record->switch_count))
!= STATUS_OK) {
error("bridge_get_data(RM_PartitionSwitchNum): %s",
bg_err_str(rc));
goto clean_up;
- }
+ }
- if ((rc = bridge_get_data(block_ptr, RM_PartitionSmall,
- &small))
+ if ((rc = bridge_get_data(block_ptr, RM_PartitionSmall,
+ &small))
!= STATUS_OK) {
error("bridge_get_data(RM_PartitionSmall): %s",
bg_err_str(rc));
goto clean_up;
}
-
+
if(small) {
if ((rc = bridge_get_data(block_ptr,
RM_PartitionOptions,
@@ -564,7 +564,7 @@ int read_bg_blocks(List curr_block_list)
bg_record->conn_type = SELECT_SMALL;
break;
}
-
+
free(tmp_char);
} else
bg_record->conn_type = SELECT_SMALL;
@@ -578,7 +578,7 @@ int read_bg_blocks(List curr_block_list)
bg_err_str(rc));
goto clean_up;
}
-
+
if((rc = bridge_get_data(block_ptr,
RM_PartitionNodeCardNum,
&nc_cnt))
@@ -594,16 +594,16 @@ int read_bg_blocks(List curr_block_list)
io_cnt--;
nc_id = 0;
- if(nc_cnt == 1)
+ if(nc_cnt == 1)
_find_nodecard(block_ptr, &nc_id);
-
- bg_record->node_cnt =
+
+ bg_record->node_cnt =
nc_cnt * bg_conf->nodecard_node_cnt;
bg_record->cpu_cnt =
bg_conf->cpu_ratio * bg_record->node_cnt;
- if ((rc = bridge_get_data(ncard,
- RM_NodeCardQuarter,
+ if ((rc = bridge_get_data(ncard,
+ RM_NodeCardQuarter,
&io_start)) != STATUS_OK) {
error("bridge_get_data(CardQuarter): %d",rc);
goto clean_up;
@@ -615,16 +615,16 @@ int read_bg_blocks(List curr_block_list)
if((io_cnt = nc_cnt * bg_conf->io_ratio))
io_cnt--;
- if ((rc = bridge_get_data(ncard,
- RM_NodeCardID,
+ if ((rc = bridge_get_data(ncard,
+ RM_NodeCardID,
&tmp_char)) != STATUS_OK) {
error("bridge_get_data(RM_NodeCardID): %d",rc);
goto clean_up;
}
-
+
if(!tmp_char)
goto clean_up;
-
+
/* From the first nodecard id we can figure
out where to start from with the alloc of ionodes.
*/
@@ -636,8 +636,8 @@ int read_bg_blocks(List curr_block_list)
/* figure out the ionode we are using */
if ((rc = bridge_get_data(
- ncard,
- RM_NodeCardFirstIONode,
+ ncard,
+ RM_NodeCardFirstIONode,
&ionode)) != STATUS_OK) {
error("bridge_get_data("
"RM_NodeCardFirstIONode): %d",
@@ -645,16 +645,16 @@ int read_bg_blocks(List curr_block_list)
goto clean_up;
}
if ((rc = bridge_get_data(ionode,
- RM_IONodeID,
- &tmp_char))
- != STATUS_OK) {
+ RM_IONodeID,
+ &tmp_char))
+ != STATUS_OK) {
error("bridge_get_data("
- "RM_NodeCardIONodeNum): %s",
+ "RM_NodeCardIONodeNum): %s",
bg_err_str(rc));
rc = SLURM_ERROR;
goto clean_up;
- }
-
+ }
+
if(!tmp_char)
goto clean_up;
/* just add the ionode num to the
@@ -677,12 +677,12 @@ int read_bg_blocks(List curr_block_list)
bg_record->ionodes);
} else {
#ifdef HAVE_BGL
- bg_record->cpu_cnt = bg_conf->cpus_per_bp
+ bg_record->cpu_cnt = bg_conf->cpus_per_bp
* bg_record->bp_count;
bg_record->node_cnt = bg_conf->bp_node_cnt
* bg_record->bp_count;
#endif
- if ((rc = bridge_get_data(block_ptr,
+ if ((rc = bridge_get_data(block_ptr,
RM_PartitionConnection,
&bg_record->conn_type))
!= STATUS_OK) {
@@ -696,8 +696,8 @@ int read_bg_blocks(List curr_block_list)
don't want the bg_record->ionodes set.
*/
bg_record->ionode_bitmap = bit_alloc(bg_conf->numpsets);
- }
-
+ }
+
bg_record->bg_block_list =
get_and_set_block_wiring(bg_record->bg_block_id);
if(!bg_record->bg_block_list)
@@ -707,8 +707,8 @@ int read_bg_blocks(List curr_block_list)
for (i=0; i<bp_cnt; i++) {
if(i) {
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionNextBP,
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionNextBP,
&bp_ptr))
!= STATUS_OK) {
error("bridge_get_data(RM_NextBP): %s",
@@ -717,18 +717,18 @@ int read_bg_blocks(List curr_block_list)
break;
}
} else {
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionFirstBP,
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionFirstBP,
&bp_ptr))
!= STATUS_OK) {
error("bridge_get_data"
- "(RM_FirstBP): %s",
+ "(RM_FirstBP): %s",
bg_err_str(rc));
rc = SLURM_ERROR;
if (bg_recover)
bridge_free_block(block_ptr);
return rc;
- }
+ }
}
if ((rc = bridge_get_data(bp_ptr, RM_BPID, &bpid))
!= STATUS_OK) {
@@ -742,7 +742,7 @@ int read_bg_blocks(List curr_block_list)
error("No BP ID was returned from database");
continue;
}
-
+
coord = find_bp_loc(bpid);
if(!coord) {
@@ -751,17 +751,17 @@ int read_bg_blocks(List curr_block_list)
}
free(bpid);
-
- snprintf(node_name_tmp,
+
+ snprintf(node_name_tmp,
sizeof(node_name_tmp),
- "%s%c%c%c",
+ "%s%c%c%c",
bg_conf->slurm_node_prefix,
alpha_num[coord[X]], alpha_num[coord[Y]],
alpha_num[coord[Z]]);
-
-
+
+
hostlist_push(hostlist, node_name_tmp);
- }
+ }
i = 1024;
bg_record->nodes = xmalloc(i);
while (hostlist_ranged_string(hostlist, i,
@@ -773,7 +773,7 @@ int read_bg_blocks(List curr_block_list)
debug3("got nodes of %s", bg_record->nodes);
// need to get the 000x000 range for nodes
// also need to get coords
-
+
#ifdef HAVE_BGL
if ((rc = bridge_get_data(block_ptr, RM_PartitionMode,
&bg_record->node_use))
@@ -781,7 +781,7 @@ int read_bg_blocks(List curr_block_list)
error("bridge_get_data(RM_PartitionMode): %s",
bg_err_str(rc));
}
-#endif
+#endif
if ((rc = bridge_get_data(block_ptr, RM_PartitionState,
&bg_record->state)) != STATUS_OK) {
error("bridge_get_data(RM_PartitionState): %s",
@@ -791,11 +791,11 @@ int read_bg_blocks(List curr_block_list)
bg_record->boot_state = 1;
else
bg_record->boot_state = 0;
-
+
debug3("Block %s is in state %d",
- bg_record->bg_block_id,
+ bg_record->bg_block_id,
bg_record->state);
-
+
process_nodes(bg_record, false);
/* We can stop processing information now since we
@@ -814,18 +814,18 @@ int read_bg_blocks(List curr_block_list)
goto clean_up;
} else {
if(bp_cnt==0) {
-
- bg_record->user_name =
+
+ bg_record->user_name =
xstrdup(bg_conf->slurm_user_name);
- bg_record->target_name =
+ bg_record->target_name =
xstrdup(bg_conf->slurm_user_name);
-
+
} else {
user_name = NULL;
if ((rc = bridge_get_data(
- block_ptr,
- RM_PartitionFirstUser,
- &user_name))
+ block_ptr,
+ RM_PartitionFirstUser,
+ &user_name))
!= STATUS_OK) {
error("bridge_get_data"
"(RM_PartitionFirstUser): %s",
@@ -838,33 +838,33 @@ int read_bg_blocks(List curr_block_list)
goto clean_up;
}
bg_record->user_name = xstrdup(user_name);
-
+
if(!bg_record->boot_state) {
-
- bg_record->target_name =
+
+ bg_record->target_name =
xstrdup(bg_conf->
slurm_user_name);
-
+
} else
- bg_record->target_name =
+ bg_record->target_name =
xstrdup(user_name);
-
+
free(user_name);
-
+
}
if (uid_from_string (bg_record->user_name, &my_uid)<0){
- error("uid_from_string(%s): %m",
+ error("uid_from_string(%s): %m",
bg_record->user_name);
} else {
bg_record->user_uid = my_uid;
- }
+ }
}
-
+
#ifdef HAVE_BGL
/* get the images of the block */
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionBlrtsImg,
- &user_name))
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionBlrtsImg,
+ &user_name))
!= STATUS_OK) {
error("bridge_get_data(RM_PartitionBlrtsImg): %s",
bg_err_str(rc));
@@ -876,9 +876,9 @@ int read_bg_blocks(List curr_block_list)
}
bg_record->blrtsimage = xstrdup(user_name);
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionLinuxImg,
- &user_name))
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionLinuxImg,
+ &user_name))
!= STATUS_OK) {
error("bridge_get_data(RM_PartitionLinuxImg): %s",
bg_err_str(rc));
@@ -890,9 +890,9 @@ int read_bg_blocks(List curr_block_list)
}
bg_record->linuximage = xstrdup(user_name);
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionRamdiskImg,
- &user_name))
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionRamdiskImg,
+ &user_name))
!= STATUS_OK) {
error("bridge_get_data(RM_PartitionRamdiskImg): %s",
bg_err_str(rc));
@@ -905,9 +905,9 @@ int read_bg_blocks(List curr_block_list)
bg_record->ramdiskimage = xstrdup(user_name);
#else
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionCnloadImg,
- &user_name))
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionCnloadImg,
+ &user_name))
!= STATUS_OK) {
error("bridge_get_data(RM_PartitionCnloadImg): %s",
bg_err_str(rc));
@@ -919,9 +919,9 @@ int read_bg_blocks(List curr_block_list)
}
bg_record->linuximage = xstrdup(user_name);
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionIoloadImg,
- &user_name))
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionIoloadImg,
+ &user_name))
!= STATUS_OK) {
error("bridge_get_data(RM_PartitionIoloadImg): %s",
bg_err_str(rc));
@@ -934,9 +934,9 @@ int read_bg_blocks(List curr_block_list)
bg_record->ramdiskimage = xstrdup(user_name);
#endif
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionMloaderImg,
- &user_name))
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionMloaderImg,
+ &user_name))
!= STATUS_OK) {
error("bridge_get_data(RM_PartitionMloaderImg): %s",
bg_err_str(rc));
@@ -948,15 +948,15 @@ int read_bg_blocks(List curr_block_list)
}
bg_record->mloaderimage = xstrdup(user_name);
-
- clean_up:
- if (bg_recover
+
+ clean_up:
+ if (bg_recover
&& ((rc = bridge_free_block(block_ptr)) != STATUS_OK)) {
error("bridge_free_block(): %s", bg_err_str(rc));
}
}
bridge_free_block_list(block_list);
-
+
return rc;
}
@@ -1012,7 +1012,7 @@ extern int load_state_file(List curr_block_list, char *dir_name)
if (errno == EINTR)
continue;
else {
- error("Read error on %s: %m",
+ error("Read error on %s: %m",
state_file);
break;
}
@@ -1029,7 +1029,7 @@ extern int load_state_file(List curr_block_list, char *dir_name)
buffer = create_buf(data, data_size);
/*
- * Check the data version so that when the format changes, we
+ * Check the data version so that when the format changes, we
* we don't try to unpack data using the wrong format routines
*/
if(size_buf(buffer)
@@ -1058,7 +1058,7 @@ extern int load_state_file(List curr_block_list, char *dir_name)
#ifdef HAVE_BG_FILES
for (i=0; i<block_ptr->record_count; i++) {
block_info = &(block_ptr->block_array[i]);
-
+
/* we only care about the states we need here
* everthing else should have been set up already */
if(block_info->state == RM_PARTITION_ERROR) {
@@ -1100,14 +1100,14 @@ extern int load_state_file(List curr_block_list, char *dir_name)
FREE_NULL_BITMAP(bitmap);
removable_set_bps(non_usable_nodes);
- node_bitmap = bit_alloc(node_record_count);
- ionode_bitmap = bit_alloc(bg_conf->numpsets);
+ node_bitmap = bit_alloc(node_record_count);
+ ionode_bitmap = bit_alloc(bg_conf->numpsets);
for (i=0; i<block_ptr->record_count; i++) {
block_info = &(block_ptr->block_array[i]);
-
+
bit_nclear(node_bitmap, 0, bit_size(node_bitmap) - 1);
bit_nclear(ionode_bitmap, 0, bit_size(ionode_bitmap) - 1);
-
+
j = 0;
while(block_info->bp_inx[j] >= 0) {
if (block_info->bp_inx[j+1]
@@ -1121,7 +1121,7 @@ extern int load_state_file(List curr_block_list, char *dir_name)
block_info->bp_inx[j],
block_info->bp_inx[j+1]);
j += 2;
- }
+ }
j = 0;
while(block_info->ionode_inx[j] >= 0) {
@@ -1136,8 +1136,8 @@ extern int load_state_file(List curr_block_list, char *dir_name)
block_info->ionode_inx[j],
block_info->ionode_inx[j+1]);
j += 2;
- }
-
+ }
+
bg_record = xmalloc(sizeof(bg_record_t));
bg_record->bg_block_id =
xstrdup(block_info->bg_block_id);
@@ -1158,7 +1158,7 @@ extern int load_state_file(List curr_block_list, char *dir_name)
bg_record->bp_count = bit_set_count(node_bitmap);
bg_record->node_cnt = block_info->node_cnt;
if(bg_conf->bp_node_cnt > bg_record->node_cnt) {
- ionodes = bg_conf->bp_node_cnt
+ ionodes = bg_conf->bp_node_cnt
/ bg_record->node_cnt;
bg_record->cpu_cnt = bg_conf->cpus_per_bp / ionodes;
} else {
@@ -1175,28 +1175,28 @@ extern int load_state_file(List curr_block_list, char *dir_name)
bg_record->target_name = xstrdup(bg_conf->slurm_user_name);
bg_record->user_name = xstrdup(bg_conf->slurm_user_name);
-
+
if (uid_from_string (bg_record->user_name, &my_uid) < 0) {
- error("uid_from_strin(%s): %m",
+ error("uid_from_strin(%s): %m",
bg_record->user_name);
} else {
bg_record->user_uid = my_uid;
- }
-
+ }
+
#ifdef HAVE_BGL
bg_record->blrtsimage =
xstrdup(block_info->blrtsimage);
#endif
- bg_record->linuximage =
+ bg_record->linuximage =
xstrdup(block_info->linuximage);
bg_record->mloaderimage =
xstrdup(block_info->mloaderimage);
bg_record->ramdiskimage =
xstrdup(block_info->ramdiskimage);
- for(j=0; j<BA_SYSTEM_DIMENSIONS; j++)
+ for(j=0; j<BA_SYSTEM_DIMENSIONS; j++)
geo[j] = bg_record->geo[j];
-
+
if((bg_conf->layout_mode == LAYOUT_OVERLAP)
|| bg_record->full_block) {
reset_ba_system(false);
@@ -1205,8 +1205,8 @@ extern int load_state_file(List curr_block_list, char *dir_name)
results = list_create(NULL);
name = set_bg_block(results,
- bg_record->start,
- geo,
+ bg_record->start,
+ geo,
bg_record->conn_type);
if(!name) {
error("I was unable to "
@@ -1217,11 +1217,11 @@ extern int load_state_file(List curr_block_list, char *dir_name)
continue;
}
-
+
snprintf(temp, sizeof(temp), "%s%s",
bg_conf->slurm_node_prefix,
name);
-
+
xfree(name);
if(strcmp(temp, bg_record->nodes)) {
fatal("bad wiring in preserved state "
@@ -1234,11 +1234,11 @@ extern int load_state_file(List curr_block_list, char *dir_name)
bg_record->bg_block_list =
list_create(destroy_ba_node);
copy_node_path(results, &bg_record->bg_block_list);
- list_destroy(results);
-
+ list_destroy(results);
+
configure_block(bg_record);
blocks++;
- list_push(curr_block_list, bg_record);
+ list_push(curr_block_list, bg_record);
if(bg_conf->layout_mode == LAYOUT_DYNAMIC) {
bg_record_t *tmp_record = xmalloc(sizeof(bg_record_t));
copy_bg_record(bg_record, tmp_record);
@@ -1252,7 +1252,7 @@ extern int load_state_file(List curr_block_list, char *dir_name)
sort_bg_record_inc_size(curr_block_list);
slurm_mutex_unlock(&block_state_mutex);
-
+
info("Recovered %d blocks", blocks);
node_select_block_info_msg_free(&block_ptr);
free_buf(buffer);
diff --git a/src/plugins/select/bluegene/plugin/bluegene.c b/src/plugins/select/bluegene/plugin/bluegene.c
index 677d967d0b9d1001cea6510ead2d07494d2c44ba..a62e1df75ae3b6804be50445c07eb0af639e14fc 100644
--- a/src/plugins/select/bluegene/plugin/bluegene.c
+++ b/src/plugins/select/bluegene/plugin/bluegene.c
@@ -1,37 +1,37 @@
/*****************************************************************************\
- * bluegene.c - blue gene node configuration processing module.
+ * bluegene.c - blue gene node configuration processing module.
*
* $Id$
*****************************************************************************
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <auble1@llnl.gov> et. al.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -81,9 +81,9 @@ static void _destroy_bg_config(bg_config_t *bg_conf);
static void _destroy_bg_lists(bg_lists_t *bg_lists);
static void _set_bg_lists();
-static int _validate_config_nodes(List curr_block_list,
+static int _validate_config_nodes(List curr_block_list,
List found_block_list, char *dir);
-static int _delete_old_blocks(List curr_block_list,
+static int _delete_old_blocks(List curr_block_list,
List found_block_list);
static char *_get_bg_conf(void);
static int _reopen_bridge_log(void);
@@ -104,7 +104,7 @@ extern int init_bg(void)
xassert(slurmctld_conf.node_prefix);
bg_conf->slurm_user_name = xstrdup(slurmctld_conf.slurm_user_name);
bg_conf->slurm_node_prefix = xstrdup(slurmctld_conf.node_prefix);
- slurm_conf_unlock();
+ slurm_conf_unlock();
#ifdef HAVE_BGL
if(bg_conf->blrts_list)
@@ -119,7 +119,7 @@ extern int init_bg(void)
bg_conf->mloader_list = list_create(destroy_image);
if(bg_conf->ramdisk_list)
list_destroy(bg_conf->ramdisk_list);
- bg_conf->ramdisk_list = list_create(destroy_image);
+ bg_conf->ramdisk_list = list_create(destroy_image);
ba_init(NULL, 1);
@@ -146,11 +146,11 @@ extern void fini_bg(void)
_destroy_bg_config(bg_conf);
_destroy_bg_lists(bg_lists);
-
+
ba_fini();
}
-/*
+/*
* block_state_mutex should be locked before calling this function
*/
extern bool blocks_overlap(bg_record_t *rec_a, bg_record_t *rec_b)
@@ -160,25 +160,25 @@ extern bool blocks_overlap(bg_record_t *rec_a, bg_record_t *rec_b)
reset_ba_system(false);
check_and_set_node_list(rec_a->bg_block_list);
if(check_and_set_node_list(rec_b->bg_block_list)
- == SLURM_ERROR)
+ == SLURM_ERROR)
return true;
}
-
-
- if (!bit_overlap(rec_a->bitmap, rec_b->bitmap))
+
+
+ if (!bit_overlap(rec_a->bitmap, rec_b->bitmap))
return false;
if((rec_a->node_cnt >= bg_conf->bp_node_cnt)
|| (rec_b->node_cnt >= bg_conf->bp_node_cnt))
return true;
-
- if (!bit_overlap(rec_a->ionode_bitmap, rec_b->ionode_bitmap))
+
+ if (!bit_overlap(rec_a->ionode_bitmap, rec_b->ionode_bitmap))
return false;
return true;
}
-extern int remove_all_users(char *bg_block_id, char *user_name)
+extern int remove_all_users(char *bg_block_id, char *user_name)
{
int returnc = REMOVE_USER_NONE;
#ifdef HAVE_BG_FILES
@@ -190,17 +190,17 @@ extern int remove_all_users(char *bg_block_id, char *user_name)
if(rc == INCONSISTENT_DATA
&& bg_conf->layout_mode == LAYOUT_DYNAMIC)
return REMOVE_USER_FOUND;
-
- error("bridge_get_block(%s): %s",
- bg_block_id,
+
+ error("bridge_get_block(%s): %s",
+ bg_block_id,
bg_err_str(rc));
return REMOVE_USER_ERR;
- }
-
- if((rc = bridge_get_data(block_ptr, RM_PartitionUsersNum,
- &user_count))
+ }
+
+ if((rc = bridge_get_data(block_ptr, RM_PartitionUsersNum,
+ &user_count))
!= STATUS_OK) {
- error("bridge_get_data(RM_PartitionUsersNum): %s",
+ error("bridge_get_data(RM_PartitionUsersNum): %s",
bg_err_str(rc));
returnc = REMOVE_USER_ERR;
user_count = 0;
@@ -208,20 +208,20 @@ extern int remove_all_users(char *bg_block_id, char *user_name)
debug2("got %d users for %s",user_count, bg_block_id);
for(i=0; i<user_count; i++) {
if(i) {
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionNextUser,
- &user))
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionNextUser,
+ &user))
!= STATUS_OK) {
error("bridge_get_data"
- "(RM_PartitionNextUser): %s",
+ "(RM_PartitionNextUser): %s",
bg_err_str(rc));
returnc = REMOVE_USER_ERR;
break;
}
} else {
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionFirstUser,
- &user))
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionFirstUser,
+ &user))
!= STATUS_OK) {
error("bridge_get_data"
"(RM_PartitionFirstUser): %s",
@@ -246,12 +246,12 @@ extern int remove_all_users(char *bg_block_id, char *user_name)
continue;
}
}
-
+
info("Removing user %s from Block %s", user, bg_block_id);
- if ((rc = bridge_remove_block_user(bg_block_id, user))
+ if ((rc = bridge_remove_block_user(bg_block_id, user))
!= STATUS_OK) {
debug("user %s isn't on block %s",
- user,
+ user,
bg_block_id);
}
free(user);
@@ -267,7 +267,7 @@ extern int remove_all_users(char *bg_block_id, char *user_name)
slurm_fail_job(bg_record->job_running);
*/
-extern int set_block_user(bg_record_t *bg_record)
+extern int set_block_user(bg_record_t *bg_record)
{
int rc = 0;
debug("resetting the boot state flag and "
@@ -284,14 +284,14 @@ extern int set_block_user(bg_record_t *bg_record)
"Cancelling job.",
bg_record->bg_block_id);
rc = SLURM_ERROR;
- }
+ }
xfree(bg_record->target_name);
bg_record->target_name = xstrdup(bg_conf->slurm_user_name);
return rc;
}
-/**
+/**
* sort the partitions by increasing size
*/
extern void sort_bg_record_inc_size(List records){
@@ -303,8 +303,8 @@ extern void sort_bg_record_inc_size(List records){
/*
* block_agent - thread periodically updates status of
- * bluegene blocks.
- *
+ * bluegene blocks.
+ *
*/
extern void *block_agent(void *args)
{
@@ -333,7 +333,7 @@ extern void *block_agent(void *args)
}
}
}
-
+
sleep(1);
now = time(NULL);
}
@@ -342,8 +342,8 @@ extern void *block_agent(void *args)
/*
* state_agent - thread periodically updates status of
- * bluegene nodes.
- *
+ * bluegene nodes.
+ *
*/
extern void *state_agent(void *args)
{
@@ -363,8 +363,8 @@ extern void *state_agent(void *args)
test_mmcs_failures();
last_mmcs_test = time(NULL);
}
- }
-
+ }
+
sleep(1);
now = time(NULL);
}
@@ -382,7 +382,7 @@ extern int remove_from_bg_list(List my_bg_list, bg_record_t *bg_record)
if(!bg_record)
return rc;
- //slurm_mutex_lock(&block_state_mutex);
+ //slurm_mutex_lock(&block_state_mutex);
itr = list_iterator_create(my_bg_list);
while ((found_record = list_next(itr))) {
if(found_record)
@@ -401,7 +401,7 @@ extern int remove_from_bg_list(List my_bg_list, bg_record_t *bg_record)
/* This is here to remove from the orignal list when dealing with
* copies like above all locks need to be set. This function does not
* free anything you must free it when you are done */
-extern bg_record_t *find_and_remove_org_from_bg_list(List my_list,
+extern bg_record_t *find_and_remove_org_from_bg_list(List my_list,
bg_record_t *bg_record)
{
ListIterator itr = list_iterator_create(my_list);
@@ -436,7 +436,7 @@ extern bg_record_t *find_org_in_bg_list(List my_list, bg_record_t *bg_record)
if(bit_equal(bg_record->bitmap, found_record->bitmap)
&& bit_equal(bg_record->ionode_bitmap,
found_record->ionode_bitmap)) {
-
+
if(!strcmp(bg_record->bg_block_id,
found_record->bg_block_id)) {
debug2("got the block");
@@ -471,10 +471,10 @@ extern int bg_free_block(bg_record_t *bg_record, bool wait, bool locked)
if(!first)
slurm_mutex_lock(&block_state_mutex);
if (bg_record->state != NO_VAL
- && bg_record->state != RM_PARTITION_FREE
+ && bg_record->state != RM_PARTITION_FREE
&& bg_record->state != RM_PARTITION_DEALLOCATING) {
debug2("bridge_destroy %s", bg_record->bg_block_id);
-#ifdef HAVE_BG_FILES
+#ifdef HAVE_BG_FILES
rc = bridge_destroy_block(bg_record->bg_block_id);
if (rc != STATUS_OK) {
if(rc == PARTITION_NOT_FOUND) {
@@ -484,22 +484,22 @@ extern int bg_free_block(bg_record_t *bg_record, bool wait, bool locked)
} else if(rc == INCOMPATIBLE_STATE) {
debug2("bridge_destroy_partition"
"(%s): %s State = %d",
- bg_record->bg_block_id,
- bg_err_str(rc),
+ bg_record->bg_block_id,
+ bg_err_str(rc),
bg_record->state);
} else {
error("bridge_destroy_partition"
"(%s): %s State = %d",
- bg_record->bg_block_id,
- bg_err_str(rc),
+ bg_record->bg_block_id,
+ bg_err_str(rc),
bg_record->state);
}
}
#else
- bg_record->state = RM_PARTITION_FREE;
+ bg_record->state = RM_PARTITION_FREE;
#endif
}
-
+
if (!wait || (bg_record->state == RM_PARTITION_FREE)
#ifdef HAVE_BGL
|| (bg_record->state == RM_PARTITION_ERROR)
@@ -517,8 +517,8 @@ extern int bg_free_block(bg_record_t *bg_record, bool wait, bool locked)
}
remove_from_bg_list(bg_lists->booted, bg_record);
if(!locked)
- slurm_mutex_unlock(&block_state_mutex);
-
+ slurm_mutex_unlock(&block_state_mutex);
+
return SLURM_SUCCESS;
}
@@ -526,11 +526,11 @@ extern int bg_free_block(bg_record_t *bg_record, bool wait, bool locked)
extern void *mult_free_block(void *args)
{
bg_record_t *bg_record = NULL;
-
+
/*
- * Don't just exit when there is no work left. Creating
+ * Don't just exit when there is no work left. Creating
* pthreads from within a dynamically linked object (plugin)
- * causes large memory leaks on some systems that seem
+ * causes large memory leaks on some systems that seem
* unavoidable even from detached pthreads.
*/
while (!agent_fini) {
@@ -545,12 +545,12 @@ extern void *mult_free_block(void *args)
info("We are freeing a block (%s) that "
"has job %u(%u), This should never happen.\n",
bg_record->bg_block_id,
- bg_record->job_ptr->job_id,
+ bg_record->job_ptr->job_id,
bg_record->job_running);
term_jobs_on_block(bg_record->bg_block_id);
}
debug("freeing the block %s.", bg_record->bg_block_id);
- bg_free_block(bg_record, 1, 0);
+ bg_free_block(bg_record, 1, 0);
debug("done\n");
slurm_mutex_lock(&freed_cnt_mutex);
num_block_freed++;
@@ -576,15 +576,15 @@ extern void *mult_destroy_block(void *args)
int rc;
#endif
slurm_mutex_lock(&freed_cnt_mutex);
- if ((bg_lists->freeing == NULL)
+ if ((bg_lists->freeing == NULL)
&& ((bg_lists->freeing = list_create(destroy_bg_record)) == NULL))
fatal("malloc failure in bg_lists->freeing");
slurm_mutex_unlock(&freed_cnt_mutex);
-
+
/*
- * Don't just exit when there is no work left. Creating
+ * Don't just exit when there is no work left. Creating
* pthreads from within a dynamically linked object (plugin)
- * causes large memory leaks on some systems that seem
+ * causes large memory leaks on some systems that seem
* unavoidable even from detached pthreads.
*/
while (!agent_fini) {
@@ -598,13 +598,13 @@ extern void *mult_destroy_block(void *args)
slurm_mutex_lock(&block_state_mutex);
remove_from_bg_list(bg_lists->main, bg_record);
list_push(bg_lists->freeing, bg_record);
-
- /*
+
+ /*
* we only are sorting this so when we send it to a
* tool such as smap it will be in a nice order
*/
sort_bg_record_inc_size(bg_lists->freeing);
- if(remove_from_bg_list(bg_lists->job_running, bg_record)
+ if(remove_from_bg_list(bg_lists->job_running, bg_record)
== SLURM_SUCCESS) {
num_unused_cpus += bg_record->cpu_cnt;
}
@@ -612,7 +612,7 @@ extern void *mult_destroy_block(void *args)
debug3("removing the jobs on block %s\n",
bg_record->bg_block_id);
term_jobs_on_block(bg_record->bg_block_id);
-
+
debug2("destroying %s", (char *)bg_record->bg_block_id);
if(bg_free_block(bg_record, 1, 0) == SLURM_ERROR) {
debug("there was an error");
@@ -622,10 +622,10 @@ extern void *mult_destroy_block(void *args)
slurm_mutex_lock(&block_state_mutex);
remove_from_bg_list(bg_lists->freeing, bg_record);
slurm_mutex_unlock(&block_state_mutex);
-
+
#ifdef HAVE_BG_FILES
debug2("removing %s from database", bg_record->bg_block_id);
-
+
rc = bridge_remove_block(bg_record->bg_block_id);
if (rc != STATUS_OK) {
if(rc == PARTITION_NOT_FOUND) {
@@ -637,7 +637,7 @@ extern void *mult_destroy_block(void *args)
bg_err_str(rc));
}
} else
- debug2("done %s",
+ debug2("done %s",
(char *)bg_record->bg_block_id);
#endif
slurm_mutex_lock(&block_state_mutex);
@@ -645,12 +645,12 @@ extern void *mult_destroy_block(void *args)
slurm_mutex_unlock(&block_state_mutex);
last_bg_update = time(NULL);
debug2("destroyed");
-
+
already_here:
slurm_mutex_lock(&freed_cnt_mutex);
num_block_freed++;
slurm_mutex_unlock(&freed_cnt_mutex);
-
+
}
slurm_mutex_lock(&freed_cnt_mutex);
destroy_cnt--;
@@ -688,13 +688,13 @@ extern int free_block_list(List delete_list)
block_list = &bg_free_block_list;
count = &free_cnt;
}
-
+
slurm_mutex_lock(&freed_cnt_mutex);
-
- if ((*block_list == NULL)
+
+ if ((*block_list == NULL)
&& ((*block_list = list_create(NULL)) == NULL))
fatal("malloc failure in free_block_list");
-
+
while ((found_record = (bg_record_t*)list_pop(delete_list)) != NULL) {
/* push job onto queue in a FIFO */
debug3("adding %s to be freed", found_record->bg_block_id);
@@ -707,22 +707,22 @@ extern int free_block_list(List delete_list)
found_record->bg_block_id);
continue;
}
- /* already running MAX_AGENTS we don't really need more
+ /* already running MAX_AGENTS we don't really need more
since they don't end until we shut down the controller */
- if (*count > MAX_AGENT_COUNT)
+ if (*count > MAX_AGENT_COUNT)
continue;
-
+
(*count)++;
-
+
slurm_attr_init(&attr_agent);
if (pthread_attr_setdetachstate(
- &attr_agent,
+ &attr_agent,
PTHREAD_CREATE_DETACHED))
error("pthread_attr_setdetachstate error %m");
retries = 0;
if(bg_conf->layout_mode == LAYOUT_DYNAMIC) {
- while (pthread_create(&thread_agent,
- &attr_agent,
+ while (pthread_create(&thread_agent,
+ &attr_agent,
mult_destroy_block,
NULL)) {
error("pthread_create "
@@ -731,12 +731,12 @@ extern int free_block_list(List delete_list)
fatal("Can't create "
"pthread");
/* sleep and retry */
- usleep(1000);
+ usleep(1000);
}
} else {
- while (pthread_create(&thread_agent,
- &attr_agent,
- mult_free_block,
+ while (pthread_create(&thread_agent,
+ &attr_agent,
+ mult_free_block,
NULL)) {
error("pthread_create "
"error %m");
@@ -744,7 +744,7 @@ extern int free_block_list(List delete_list)
fatal("Can't create "
"pthread");
/* sleep and retry */
- usleep(1000);
+ usleep(1000);
}
}
slurm_attr_destroy(&attr_agent);
@@ -783,26 +783,26 @@ extern int read_bg_conf(void)
if(last_config_update == config_stat.st_mtime)
debug("%s unchanged", bg_conf_file);
else {
- info("Restart slurmctld for %s changes to take effect",
+ info("Restart slurmctld for %s changes to take effect",
bg_conf_file);
}
- last_config_update = config_stat.st_mtime;
+ last_config_update = config_stat.st_mtime;
xfree(bg_conf_file);
return SLURM_SUCCESS;
}
- last_config_update = config_stat.st_mtime;
+ last_config_update = config_stat.st_mtime;
/* initialization */
/* bg_conf defined in bg_node_alloc.h */
tbl = s_p_hashtbl_create(bg_conf_file_options);
-
+
if(s_p_parse_file(tbl, bg_conf_file) == SLURM_ERROR)
fatal("something wrong with opening/reading bluegene "
"conf file");
xfree(bg_conf_file);
-
+
#ifdef HAVE_BGL
- if (s_p_get_array((void ***)&image_array,
+ if (s_p_get_array((void ***)&image_array,
&count, "AltBlrtsImage", tbl)) {
for (i = 0; i < count; i++) {
list_append(bg_conf->blrts_list, image_array[i]);
@@ -820,7 +820,7 @@ extern int read_bg_conf(void)
bg_conf->default_blrtsimage = xstrdup(image->name);
info("Warning: using %s as the default BlrtsImage. "
"If this isn't correct please set BlrtsImage",
- bg_conf->default_blrtsimage);
+ bg_conf->default_blrtsimage);
} else {
debug3("default BlrtsImage %s", bg_conf->default_blrtsimage);
image = xmalloc(sizeof(image_t));
@@ -830,8 +830,8 @@ extern int read_bg_conf(void)
/* we want it to be first */
list_push(bg_conf->blrts_list, image);
}
-
- if (s_p_get_array((void ***)&image_array,
+
+ if (s_p_get_array((void ***)&image_array,
&count, "AltLinuxImage", tbl)) {
for (i = 0; i < count; i++) {
list_append(bg_conf->linux_list, image_array[i]);
@@ -849,7 +849,7 @@ extern int read_bg_conf(void)
bg_conf->default_linuximage = xstrdup(image->name);
info("Warning: using %s as the default LinuxImage. "
"If this isn't correct please set LinuxImage",
- bg_conf->default_linuximage);
+ bg_conf->default_linuximage);
} else {
debug3("default LinuxImage %s", bg_conf->default_linuximage);
image = xmalloc(sizeof(image_t));
@@ -857,10 +857,10 @@ extern int read_bg_conf(void)
image->def = true;
image->groups = NULL;
/* we want it to be first */
- list_push(bg_conf->linux_list, image);
+ list_push(bg_conf->linux_list, image);
}
- if (s_p_get_array((void ***)&image_array,
+ if (s_p_get_array((void ***)&image_array,
&count, "AltRamDiskImage", tbl)) {
for (i = 0; i < count; i++) {
list_append(bg_conf->ramdisk_list, image_array[i]);
@@ -879,7 +879,7 @@ extern int read_bg_conf(void)
bg_conf->default_ramdiskimage = xstrdup(image->name);
info("Warning: using %s as the default RamDiskImage. "
"If this isn't correct please set RamDiskImage",
- bg_conf->default_ramdiskimage);
+ bg_conf->default_ramdiskimage);
} else {
debug3("default RamDiskImage %s",
bg_conf->default_ramdiskimage);
@@ -888,11 +888,11 @@ extern int read_bg_conf(void)
image->def = true;
image->groups = NULL;
/* we want it to be first */
- list_push(bg_conf->ramdisk_list, image);
+ list_push(bg_conf->ramdisk_list, image);
}
#else
- if (s_p_get_array((void ***)&image_array,
+ if (s_p_get_array((void ***)&image_array,
&count, "AltCnloadImage", tbl)) {
for (i = 0; i < count; i++) {
list_append(bg_conf->linux_list, image_array[i]);
@@ -910,7 +910,7 @@ extern int read_bg_conf(void)
bg_conf->default_linuximage = xstrdup(image->name);
info("Warning: using %s as the default CnloadImage. "
"If this isn't correct please set CnloadImage",
- bg_conf->default_linuximage);
+ bg_conf->default_linuximage);
} else {
debug3("default CnloadImage %s", bg_conf->default_linuximage);
image = xmalloc(sizeof(image_t));
@@ -918,10 +918,10 @@ extern int read_bg_conf(void)
image->def = true;
image->groups = NULL;
/* we want it to be first */
- list_push(bg_conf->linux_list, image);
+ list_push(bg_conf->linux_list, image);
}
- if (s_p_get_array((void ***)&image_array,
+ if (s_p_get_array((void ***)&image_array,
&count, "AltIoloadImage", tbl)) {
for (i = 0; i < count; i++) {
list_append(bg_conf->ramdisk_list, image_array[i]);
@@ -940,7 +940,7 @@ extern int read_bg_conf(void)
bg_conf->default_ramdiskimage = xstrdup(image->name);
info("Warning: using %s as the default IoloadImage. "
"If this isn't correct please set IoloadImage",
- bg_conf->default_ramdiskimage);
+ bg_conf->default_ramdiskimage);
} else {
debug3("default IoloadImage %s", bg_conf->default_ramdiskimage);
image = xmalloc(sizeof(image_t));
@@ -948,11 +948,11 @@ extern int read_bg_conf(void)
image->def = true;
image->groups = NULL;
/* we want it to be first */
- list_push(bg_conf->ramdisk_list, image);
+ list_push(bg_conf->ramdisk_list, image);
}
#endif
- if (s_p_get_array((void ***)&image_array,
+ if (s_p_get_array((void ***)&image_array,
&count, "AltMloaderImage", tbl)) {
for (i = 0; i < count; i++) {
list_append(bg_conf->mloader_list, image_array[i]);
@@ -971,7 +971,7 @@ extern int read_bg_conf(void)
bg_conf->default_mloaderimage = xstrdup(image->name);
info("Warning: using %s as the default MloaderImage. "
"If this isn't correct please set MloaderImage",
- bg_conf->default_mloaderimage);
+ bg_conf->default_mloaderimage);
} else {
debug3("default MloaderImage %s",
bg_conf->default_mloaderimage);
@@ -980,7 +980,7 @@ extern int read_bg_conf(void)
image->def = true;
image->groups = NULL;
/* we want it to be first */
- list_push(bg_conf->mloader_list, image);
+ list_push(bg_conf->mloader_list, image);
}
if (!s_p_get_uint16(
@@ -1003,10 +1003,10 @@ extern int read_bg_conf(void)
"have %u cnodes per bp. You need at least the same "
"number of cpus as you have cnodes per bp. "
"Check the NodeName Procs= "
- "definition in the slurm.conf.",
- bg_conf->cpus_per_bp, bg_conf->bp_node_cnt);
+ "definition in the slurm.conf.",
+ bg_conf->cpus_per_bp, bg_conf->bp_node_cnt);
}
-
+
bg_conf->cpu_ratio = bg_conf->cpus_per_bp/bg_conf->bp_node_cnt;
if(!bg_conf->cpu_ratio)
fatal("We appear to have less than 1 cpu on a cnode. "
@@ -1014,8 +1014,8 @@ extern int read_bg_conf(void)
"in the blugene.conf and %u cpus "
"for each node in the slurm.conf",
bg_conf->bp_node_cnt, bg_conf->cpus_per_bp);
- num_unused_cpus =
- DIM_SIZE[X] * DIM_SIZE[Y] * DIM_SIZE[Z]
+ num_unused_cpus =
+ DIM_SIZE[X] * DIM_SIZE[Y] * DIM_SIZE[Z]
* bg_conf->cpus_per_bp;
if (!s_p_get_uint16(
@@ -1024,11 +1024,11 @@ extern int read_bg_conf(void)
"defaulting to 32 as NodeCardNodeCnt");
bg_conf->nodecard_node_cnt = 32;
}
-
+
if(bg_conf->nodecard_node_cnt<=0)
fatal("You should have more than 0 nodes per nodecard");
- bg_conf->bp_nodecard_cnt =
+ bg_conf->bp_nodecard_cnt =
bg_conf->bp_node_cnt / bg_conf->nodecard_node_cnt;
if (!s_p_get_uint16(&bg_conf->numpsets, "Numpsets", tbl))
@@ -1047,16 +1047,16 @@ extern int read_bg_conf(void)
bg_conf->nodecard_ionode_cnt =
bg_conf->quarter_ionode_cnt/4;
}
-
+
/* How many nodecards per ionode */
- bg_conf->nc_ratio =
- ((double)bg_conf->bp_node_cnt
- / (double)bg_conf->nodecard_node_cnt)
+ bg_conf->nc_ratio =
+ ((double)bg_conf->bp_node_cnt
+ / (double)bg_conf->nodecard_node_cnt)
/ (double)bg_conf->numpsets;
/* How many ionodes per nodecard */
- bg_conf->io_ratio =
+ bg_conf->io_ratio =
(double)bg_conf->numpsets /
- ((double)bg_conf->bp_node_cnt
+ ((double)bg_conf->bp_node_cnt
/ (double)bg_conf->nodecard_node_cnt);
//info("got %f %f", bg_conf->nc_ratio, bg_conf->io_ratio);
/* figure out the smallest block we can have on the
@@ -1106,7 +1106,7 @@ extern int read_bg_conf(void)
/* If we only have 1 nodecard just jump to the end
since this will never need to happen below.
Pretty much a hack to avoid seg fault;). */
- if(bg_conf->bp_node_cnt == bg_conf->nodecard_node_cnt)
+ if(bg_conf->bp_node_cnt == bg_conf->nodecard_node_cnt)
goto no_calc;
bg_lists->valid_small128 = list_create(_destroy_bitmap);
@@ -1142,7 +1142,7 @@ extern int read_bg_conf(void)
i += small_size+1;
list_append(bg_lists->valid_small256, tmp_bitmap);
}
-#endif
+#endif
} else {
fatal("your numpsets is 0");
}
@@ -1153,19 +1153,19 @@ no_calc:
info("Warning: BridgeAPIVerbose not configured "
"in bluegene.conf");
if (!s_p_get_string(&bg_conf->bridge_api_file,
- "BridgeAPILogFile", tbl))
+ "BridgeAPILogFile", tbl))
info("BridgeAPILogFile not configured in bluegene.conf");
else
_reopen_bridge_log();
if (s_p_get_string(&layout, "DenyPassthrough", tbl)) {
- if(strstr(layout, "X"))
+ if(strstr(layout, "X"))
ba_deny_pass |= PASS_DENY_X;
- if(strstr(layout, "Y"))
+ if(strstr(layout, "Y"))
ba_deny_pass |= PASS_DENY_Y;
- if(strstr(layout, "Z"))
+ if(strstr(layout, "Z"))
ba_deny_pass |= PASS_DENY_Z;
- if(!strcasecmp(layout, "ALL"))
+ if(!strcasecmp(layout, "ALL"))
ba_deny_pass |= PASS_DENY_ALL;
bg_conf->deny_pass = ba_deny_pass;
xfree(layout);
@@ -1176,14 +1176,14 @@ no_calc:
"defaulting to STATIC partitioning");
bg_conf->layout_mode = LAYOUT_STATIC;
} else {
- if(!strcasecmp(layout,"STATIC"))
+ if(!strcasecmp(layout,"STATIC"))
bg_conf->layout_mode = LAYOUT_STATIC;
- else if(!strcasecmp(layout,"OVERLAP"))
+ else if(!strcasecmp(layout,"OVERLAP"))
bg_conf->layout_mode = LAYOUT_OVERLAP;
- else if(!strcasecmp(layout,"DYNAMIC"))
+ else if(!strcasecmp(layout,"DYNAMIC"))
bg_conf->layout_mode = LAYOUT_DYNAMIC;
else {
- fatal("I don't understand this LayoutMode = %s",
+ fatal("I don't understand this LayoutMode = %s",
layout);
}
xfree(layout);
@@ -1191,13 +1191,13 @@ no_calc:
/* add blocks defined in file */
if(bg_conf->layout_mode != LAYOUT_DYNAMIC) {
- if (!s_p_get_array((void ***)&blockreq_array,
+ if (!s_p_get_array((void ***)&blockreq_array,
&count, "BPs", tbl)) {
info("WARNING: no blocks defined in bluegene.conf, "
"only making full system block");
create_full_system_block(NULL);
}
-
+
for (i = 0; i < count; i++) {
add_bg_record(bg_lists->main, NULL,
blockreq_array[i], 0, 0);
@@ -1224,10 +1224,10 @@ extern int validate_current_blocks(char *dir)
last_config_update = time(NULL);
curr_block_list = list_create(destroy_bg_record);
found_block_list = list_create(NULL);
-//#if 0
+//#if 0
/* Check to see if the configs we have are correct */
if (_validate_config_nodes(curr_block_list, found_block_list, dir)
- == SLURM_ERROR) {
+ == SLURM_ERROR) {
_delete_old_blocks(curr_block_list, found_block_list);
}
//#endif
@@ -1237,7 +1237,7 @@ extern int validate_current_blocks(char *dir)
info("No blocks created until jobs are submitted");
} else {
if (create_defined_blocks(bg_conf->layout_mode,
- found_block_list)
+ found_block_list)
== SLURM_ERROR) {
/* error in creating the static blocks, so
* blocks referenced by submitted jobs won't
@@ -1246,16 +1246,16 @@ extern int validate_current_blocks(char *dir)
fatal("Error, could not create the static blocks");
return SLURM_ERROR;
}
- }
-
+ }
+
/* ok now since bg_lists->main has been made we now can put blocks in
an error state this needs to be done outside of a lock
it doesn't matter much in the first place though since
no threads are started before this function. */
itr = list_iterator_create(bg_lists->main);
while((bg_record = list_next(itr))) {
- if(bg_record->state == RM_PARTITION_ERROR)
- put_block_in_error_state(bg_record,
+ if(bg_record->state == RM_PARTITION_ERROR)
+ put_block_in_error_state(bg_record,
BLOCK_ERROR_STATE, NULL);
}
list_iterator_destroy(itr);
@@ -1282,7 +1282,7 @@ static void _destroy_bg_config(bg_config_t *bg_conf)
bg_conf->blrts_list = NULL;
}
xfree(bg_conf->default_blrtsimage);
-#endif
+#endif
xfree(bg_conf->bridge_api_file);
xfree(bg_conf->default_linuximage);
xfree(bg_conf->default_mloaderimage);
@@ -1291,7 +1291,7 @@ static void _destroy_bg_config(bg_config_t *bg_conf)
list_destroy(bg_conf->linux_list);
bg_conf->linux_list = NULL;
}
-
+
if(bg_conf->mloader_list) {
list_destroy(bg_conf->mloader_list);
bg_conf->mloader_list = NULL;
@@ -1318,7 +1318,7 @@ static void _destroy_bg_lists(bg_lists_t *bg_lists)
if (bg_lists->freeing) {
list_destroy(bg_lists->freeing);
bg_lists->freeing = NULL;
- }
+ }
if (bg_lists->job_running) {
list_destroy(bg_lists->job_running);
@@ -1329,7 +1329,7 @@ static void _destroy_bg_lists(bg_lists_t *bg_lists)
if (bg_lists->main) {
list_destroy(bg_lists->main);
bg_lists->main = NULL;
- }
+ }
if(bg_lists->valid_small32) {
list_destroy(bg_lists->valid_small32);
@@ -1359,21 +1359,21 @@ static void _set_bg_lists()
slurm_mutex_lock(&block_state_mutex);
- if(bg_lists->booted)
+ if(bg_lists->booted)
list_destroy(bg_lists->booted);
bg_lists->booted = list_create(NULL);
- if(bg_lists->job_running)
+ if(bg_lists->job_running)
list_destroy(bg_lists->job_running);
- bg_lists->job_running = list_create(NULL);
+ bg_lists->job_running = list_create(NULL);
- if(bg_lists->main)
+ if(bg_lists->main)
list_destroy(bg_lists->main);
bg_lists->main = list_create(destroy_bg_record);
- slurm_mutex_unlock(&block_state_mutex);
-
+ slurm_mutex_unlock(&block_state_mutex);
+
}
/*
@@ -1386,15 +1386,15 @@ static void _set_bg_lists()
* since the bg_lists->main will contain the complete list of pointers
* and be destroyed with it.
*
- * RET - SLURM_SUCCESS if they match, else an error
+ * RET - SLURM_SUCCESS if they match, else an error
* code. Writes bg_block_id into bg_lists->main records.
*/
-static int _validate_config_nodes(List curr_block_list,
+static int _validate_config_nodes(List curr_block_list,
List found_block_list, char *dir)
{
int rc = SLURM_ERROR;
- bg_record_t* bg_record = NULL;
+ bg_record_t* bg_record = NULL;
bg_record_t* init_bg_record = NULL;
int full_created = 0;
ListIterator itr_conf;
@@ -1420,8 +1420,8 @@ static int _validate_config_nodes(List curr_block_list,
/* This needs to be reset to SLURM_ERROR or it will never we
that way again ;). */
rc = SLURM_ERROR;
-#endif
- if(!bg_recover)
+#endif
+ if(!bg_recover)
return SLURM_ERROR;
itr_curr = list_iterator_create(curr_block_list);
@@ -1429,7 +1429,7 @@ static int _validate_config_nodes(List curr_block_list,
while ((bg_record = list_next(itr_conf))) {
list_iterator_reset(itr_curr);
while ((init_bg_record = list_next(itr_curr))) {
- if (strcasecmp(bg_record->nodes,
+ if (strcasecmp(bg_record->nodes,
init_bg_record->nodes))
continue; /* wrong nodes */
if(!bit_equal(bg_record->ionode_bitmap,
@@ -1444,7 +1444,7 @@ static int _validate_config_nodes(List curr_block_list,
&& (init_bg_record->conn_type < SELECT_SMALL)))
continue; /* wrong conn_type */
#endif
-
+
copy_bg_record(init_bg_record, bg_record);
/* remove from the curr list since we just
matched it no reason to keep it around
@@ -1452,12 +1452,12 @@ static int _validate_config_nodes(List curr_block_list,
list_delete_item(itr_curr);
break;
}
-
+
if (!bg_record->bg_block_id) {
format_node_name(bg_record, tmp_char,
sizeof(tmp_char));
info("Block found in bluegene.conf to be "
- "created: Nodes:%s",
+ "created: Nodes:%s",
tmp_char);
rc = SLURM_ERROR;
} else {
@@ -1468,16 +1468,16 @@ static int _validate_config_nodes(List curr_block_list,
format_node_name(bg_record, tmp_char,
sizeof(tmp_char));
info("Existing: BlockID:%s Nodes:%s Conn:%s",
- bg_record->bg_block_id,
+ bg_record->bg_block_id,
tmp_char,
conn_type_string(bg_record->conn_type));
if(((bg_record->state == RM_PARTITION_READY)
|| (bg_record->state == RM_PARTITION_CONFIGURING))
- && !block_ptr_exist_in_list(bg_lists->booted,
+ && !block_ptr_exist_in_list(bg_lists->booted,
bg_record))
list_push(bg_lists->booted, bg_record);
}
- }
+ }
if(bg_conf->layout_mode == LAYOUT_DYNAMIC)
goto finished;
@@ -1492,11 +1492,11 @@ static int _validate_config_nodes(List curr_block_list,
format_node_name(bg_record, tmp_char,
sizeof(tmp_char));
info("Existing: BlockID:%s Nodes:%s Conn:%s",
- bg_record->bg_block_id,
+ bg_record->bg_block_id,
tmp_char,
conn_type_string(bg_record->conn_type));
if(((bg_record->state == RM_PARTITION_READY)
- || (bg_record->state
+ || (bg_record->state
== RM_PARTITION_CONFIGURING))
&& !block_ptr_exist_in_list(
bg_lists->booted, bg_record))
@@ -1506,7 +1506,7 @@ static int _validate_config_nodes(List curr_block_list,
}
}
}
-
+
finished:
list_iterator_destroy(itr_conf);
list_iterator_destroy(itr_curr);
@@ -1540,24 +1540,24 @@ static int _delete_old_blocks(List curr_block_list, List found_block_list)
while ((init_record = list_next(itr_curr))) {
itr_found = list_iterator_create(found_block_list);
while ((found_record = list_next(itr_found))) {
- if (!strcmp(init_record->bg_block_id,
+ if (!strcmp(init_record->bg_block_id,
found_record->bg_block_id)) {
/* don't delete this one */
- break;
+ break;
}
}
list_iterator_destroy(itr_found);
-
+
if(found_record == NULL) {
list_remove(itr_curr);
list_push(destroy_list, init_record);
}
- }
+ }
list_iterator_destroy(itr_curr);
}
slurm_mutex_lock(&freed_cnt_mutex);
- if ((bg_destroy_block_list == NULL)
+ if ((bg_destroy_block_list == NULL)
&& ((bg_destroy_block_list = list_create(NULL)) == NULL))
fatal("malloc failure in block_list");
@@ -1565,20 +1565,20 @@ static int _delete_old_blocks(List curr_block_list, List found_block_list)
while ((init_record = (bg_record_t*) list_next(itr_curr))) {
list_push(bg_destroy_block_list, init_record);
num_block_to_free++;
- if (destroy_cnt > MAX_AGENT_COUNT)
+ if (destroy_cnt > MAX_AGENT_COUNT)
continue;
-
+
destroy_cnt++;
slurm_attr_init(&attr_agent);
- if (pthread_attr_setdetachstate(&attr_agent,
+ if (pthread_attr_setdetachstate(&attr_agent,
PTHREAD_CREATE_DETACHED))
error("pthread_attr_setdetachstate error %m");
-
+
retries = 0;
- while (pthread_create(&thread_agent,
- &attr_agent,
- mult_destroy_block,
+ while (pthread_create(&thread_agent,
+ &attr_agent,
+ mult_destroy_block,
NULL)) {
error("pthread_create "
"error %m");
@@ -1586,14 +1586,14 @@ static int _delete_old_blocks(List curr_block_list, List found_block_list)
fatal("Can't create "
"pthread");
/* sleep and retry */
- usleep(1000);
+ usleep(1000);
}
slurm_attr_destroy(&attr_agent);
}
list_iterator_destroy(itr_curr);
slurm_mutex_unlock(&freed_cnt_mutex);
list_destroy(destroy_list);
-
+
retries=30;
while(num_block_to_free > num_block_freed) {
/* no need to check for return code here, things
@@ -1602,7 +1602,7 @@ static int _delete_old_blocks(List curr_block_list, List found_block_list)
if(retries==30) {
info("Waiting for old blocks to be "
"freed. Have %d of %d",
- num_block_freed,
+ num_block_freed,
num_block_to_free);
retries=0;
}
@@ -1645,14 +1645,14 @@ static int _reopen_bridge_log(void)
if (bg_conf->bridge_api_file == NULL)
return rc;
-
+
#ifdef HAVE_BG_FILES
rc = bridge_set_log_params(bg_conf->bridge_api_file,
bg_conf->bridge_api_verb);
#endif
- debug3("Bridge api file set to %s, verbose level %d\n",
+ debug3("Bridge api file set to %s, verbose level %d\n",
bg_conf->bridge_api_file, bg_conf->bridge_api_verb);
-
+
return rc;
}
diff --git a/src/plugins/select/bluegene/plugin/bluegene.h b/src/plugins/select/bluegene/plugin/bluegene.h
index 4d7a616d82959eefe2374dec7955c8e42c7482e0..de650b508e13c5b49db5aec021c3356b145ee668 100644
--- a/src/plugins/select/bluegene/plugin/bluegene.h
+++ b/src/plugins/select/bluegene/plugin/bluegene.h
@@ -1,37 +1,37 @@
/*****************************************************************************\
- * bluegene.h - header for blue gene configuration processing module.
+ * bluegene.h - header for blue gene configuration processing module.
*
* $Id$
*****************************************************************************
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Dan Phung <phung4@llnl.gov> and Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -45,7 +45,7 @@
typedef enum bg_layout_type {
LAYOUT_STATIC, /* no overlaps, except for full system block
blocks never change */
- LAYOUT_OVERLAP, /* overlaps permitted, must be defined in
+ LAYOUT_OVERLAP, /* overlaps permitted, must be defined in
bluegene.conf file */
LAYOUT_DYNAMIC /* slurm will make all blocks */
} bg_layout_t;
@@ -146,18 +146,18 @@ extern int set_block_user(bg_record_t *bg_record);
/* sort a list of bg_records by size (node count) */
extern void sort_bg_record_inc_size(List records);
-/* block_agent - detached thread periodically tests status of bluegene
+/* block_agent - detached thread periodically tests status of bluegene
* blocks */
extern void *block_agent(void *args);
-/* state_agent - thread periodically tests status of bluegene
+/* state_agent - thread periodically tests status of bluegene
* nodes, nodecards, and switches */
extern void *state_agent(void *args);
extern int bg_free_block(bg_record_t *bg_record, bool wait, bool locked);
extern int remove_from_bg_list(List my_bg_list, bg_record_t *bg_record);
-extern bg_record_t *find_and_remove_org_from_bg_list(List my_list,
+extern bg_record_t *find_and_remove_org_from_bg_list(List my_list,
bg_record_t *bg_record);
extern bg_record_t *find_org_in_bg_list(List my_list, bg_record_t *bg_record);
extern void *mult_free_block(void *args);
@@ -178,4 +178,4 @@ extern int configure_small_block(bg_record_t *bg_record);
extern int configure_block_switches(bg_record_t * bg_conf_record);
#endif /* _BLUEGENE_H_ */
-
+
diff --git a/src/plugins/select/bluegene/plugin/defined_block.c b/src/plugins/select/bluegene/plugin/defined_block.c
index 0e36ae89df159b14fea7c70df606c10131f20917..a7576dd9b8cbdd071bb502577c9d4ac9a3f7cb85 100644
--- a/src/plugins/select/bluegene/plugin/defined_block.c
+++ b/src/plugins/select/bluegene/plugin/defined_block.c
@@ -6,32 +6,32 @@
* Copyright (C) 2008 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -42,7 +42,7 @@
/*
* create_defined_blocks - create the static blocks that will be used
* for scheduling, all partitions must be able to be created and booted
- * at once.
+ * at once.
* IN - int overlapped, 1 if partitions are to be overlapped, 0 if they are
* static.
* RET - success of fitting all configurations
@@ -81,7 +81,7 @@ extern int create_defined_blocks(bg_layout_t overlapped,
non_usable_nodes = bitmap2node_name(bitmap);
removable_set_bps(non_usable_nodes);
FREE_NULL_BITMAP(bitmap);
-
+
slurm_mutex_lock(&block_state_mutex);
reset_ba_system(false);
if(bg_lists->main) {
@@ -90,23 +90,23 @@ extern int create_defined_blocks(bg_layout_t overlapped,
if(bg_found_block_list) {
itr_found = list_iterator_create(
bg_found_block_list);
- while ((found_record = (bg_record_t*)
+ while ((found_record = (bg_record_t*)
list_next(itr_found)) != NULL) {
/* info("%s[%s] ?= %s[%s]\n", */
/* bg_record->nodes, */
/* bg_record->ionodes, */
/* found_record->nodes, */
/* found_record->ionodes); */
-
- if ((bit_equal(bg_record->bitmap,
+
+ if ((bit_equal(bg_record->bitmap,
found_record->bitmap))
&& (bit_equal(bg_record->
- ionode_bitmap,
+ ionode_bitmap,
found_record->
ionode_bitmap))
) {
/* don't remake this one */
- break;
+ break;
}
}
list_iterator_destroy(itr_found);
@@ -114,7 +114,7 @@ extern int create_defined_blocks(bg_layout_t overlapped,
error("create_defined_blocks: "
"no bg_found_block_list 1");
}
- if(bg_record->bp_count > 0
+ if(bg_record->bp_count > 0
&& !bg_record->full_block
&& bg_record->cpu_cnt >= bg_conf->cpus_per_bp) {
char *name = NULL;
@@ -136,7 +136,7 @@ extern int create_defined_blocks(bg_layout_t overlapped,
"bluegene.conf file?",
bg_record->bg_block_id);
- for(i=0; i<BA_SYSTEM_DIMENSIONS; i++)
+ for(i=0; i<BA_SYSTEM_DIMENSIONS; i++)
geo[i] = bg_record->geo[i];
debug2("adding %s %c%c%c %c%c%c",
bg_record->nodes,
@@ -168,8 +168,8 @@ extern int create_defined_blocks(bg_layout_t overlapped,
results = list_create(NULL);
name = set_bg_block(
results,
- bg_record->start,
- geo,
+ bg_record->start,
+ geo,
bg_record->conn_type);
reset_all_removed_bps();
if(!name) {
@@ -183,11 +183,11 @@ extern int create_defined_blocks(bg_layout_t overlapped,
xfree(non_usable_nodes);
return SLURM_ERROR;
}
-
+
snprintf(temp, sizeof(temp), "%s%s",
bg_conf->slurm_node_prefix,
name);
-
+
xfree(name);
if(strcmp(temp, bg_record->nodes)) {
fatal("given list of %s "
@@ -203,7 +203,7 @@ extern int create_defined_blocks(bg_layout_t overlapped,
bg_record->bg_block_list =
list_create(destroy_ba_node);
copy_node_path(
- results,
+ results,
&bg_record->bg_block_list);
list_destroy(results);
}
@@ -221,11 +221,11 @@ extern int create_defined_blocks(bg_layout_t overlapped,
won't work since other
wires will be or are
already set
- */
+ */
list_remove(itr);
continue;
}
- if((rc = configure_block(bg_record))
+ if((rc = configure_block(bg_record))
== SLURM_ERROR) {
list_iterator_destroy(itr);
slurm_mutex_unlock(&block_state_mutex);
@@ -250,12 +250,12 @@ extern int create_defined_blocks(bg_layout_t overlapped,
slurm_mutex_lock(&block_state_mutex);
sort_bg_record_inc_size(bg_lists->main);
slurm_mutex_unlock(&block_state_mutex);
-
+
#ifdef _PRINT_BLOCKS_AND_EXIT
if(bg_lists->main) {
itr = list_iterator_create(bg_lists->main);
debug("\n\n");
- while ((found_record = (bg_record_t *) list_next(itr))
+ while ((found_record = (bg_record_t *) list_next(itr))
!= NULL) {
print_bg_record(found_record);
}
@@ -283,7 +283,7 @@ extern int create_full_system_block(List bg_found_block_list)
List results = NULL;
struct part_record *part_ptr = NULL;
bitstr_t *bitmap = bit_alloc(node_record_count);
-
+
/* Locks are already in place to protect part_list here */
itr = list_iterator_create(part_list);
while ((part_ptr = list_next(itr))) {
@@ -303,11 +303,11 @@ extern int create_full_system_block(List bg_found_block_list)
}
FREE_NULL_BITMAP(bitmap);
- /* Here we are adding a block that in for the entire machine
+ /* Here we are adding a block that in for the entire machine
just in case it isn't in the bluegene.conf file.
*/
slurm_mutex_lock(&block_state_mutex);
-
+
//#ifdef HAVE_BG_FILES
geo[X] = DIM_SIZE[X] - 1;
geo[Y] = DIM_SIZE[Y] - 1;
@@ -317,7 +317,7 @@ extern int create_full_system_block(List bg_found_block_list)
/* geo[Y] = max_dim[Y]; */
/* geo[Z] = max_dim[Z]; */
/* #endif */
-
+
i = (10+strlen(bg_conf->slurm_node_prefix));
name = xmalloc(i);
if((geo[X] == 0) && (geo[Y] == 0) && (geo[Z] == 0))
@@ -328,8 +328,8 @@ extern int create_full_system_block(List bg_found_block_list)
bg_conf->slurm_node_prefix,
alpha_num[geo[X]], alpha_num[geo[Y]],
alpha_num[geo[Z]]);
-
-
+
+
if(bg_found_block_list) {
itr = list_iterator_create(bg_found_block_list);
while ((bg_record = (bg_record_t *) list_next(itr)) != NULL) {
@@ -337,23 +337,23 @@ extern int create_full_system_block(List bg_found_block_list)
xfree(name);
list_iterator_destroy(itr);
/* don't create total already there */
- goto no_total;
+ goto no_total;
}
}
list_iterator_destroy(itr);
} else {
error("create_full_system_block: no bg_found_block_list 2");
}
-
+
if(bg_lists->main) {
itr = list_iterator_create(bg_lists->main);
- while ((bg_record = (bg_record_t *) list_next(itr))
+ while ((bg_record = (bg_record_t *) list_next(itr))
!= NULL) {
if (!strcmp(name, bg_record->nodes)) {
xfree(name);
list_iterator_destroy(itr);
/* don't create total already there */
- goto no_total;
+ goto no_total;
}
}
list_iterator_destroy(itr);
@@ -372,7 +372,7 @@ extern int create_full_system_block(List bg_found_block_list)
add_bg_record(records, NULL, &blockreq, 0 , 0);
xfree(name);
-
+
bg_record = (bg_record_t *) list_pop(records);
if(!bg_record) {
error("Nothing was returned from full system create");
@@ -380,7 +380,7 @@ extern int create_full_system_block(List bg_found_block_list)
goto no_total;
}
reset_ba_system(false);
- for(i=0; i<BA_SYSTEM_DIMENSIONS; i++)
+ for(i=0; i<BA_SYSTEM_DIMENSIONS; i++)
geo[i] = bg_record->geo[i];
debug2("adding %s %c%c%c %c%c%c",
bg_record->nodes,
@@ -392,8 +392,8 @@ extern int create_full_system_block(List bg_found_block_list)
alpha_num[geo[Z]]);
results = list_create(NULL);
name = set_bg_block(results,
- bg_record->start,
- geo,
+ bg_record->start,
+ geo,
bg_record->conn_type);
if(!name) {
error("I was unable to make the full system block.");
@@ -408,7 +408,7 @@ extern int create_full_system_block(List bg_found_block_list)
bg_record->bg_block_list = list_create(destroy_ba_node);
copy_node_path(results, &bg_record->bg_block_list);
list_destroy(results);
-
+
if((rc = configure_block(bg_record)) == SLURM_ERROR) {
error("create_full_system_block: "
"unable to configure block in api");
diff --git a/src/plugins/select/bluegene/plugin/defined_block.h b/src/plugins/select/bluegene/plugin/defined_block.h
index 048de8ef4dfedab8b9abf3c9122a24787a7678cf..315fa1a3fce1bb669bb6df6142bfb4e81a0fb92d 100644
--- a/src/plugins/select/bluegene/plugin/defined_block.h
+++ b/src/plugins/select/bluegene/plugin/defined_block.h
@@ -6,32 +6,32 @@
* Copyright (C) 2008 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/plugins/select/bluegene/plugin/dynamic_block.c b/src/plugins/select/bluegene/plugin/dynamic_block.c
index 542b30a06b2e52ce2a3fb556f810847cd44897e2..46e0094fb007fdb1ce7a0586970d58034eeec350 100644
--- a/src/plugins/select/bluegene/plugin/dynamic_block.c
+++ b/src/plugins/select/bluegene/plugin/dynamic_block.c
@@ -6,32 +6,32 @@
* Copyright (C) 2008 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -51,12 +51,12 @@ static int _breakup_blocks(List block_list, List new_blocks,
* job allocation.
* RET - a list of created block(s) or NULL on failure errno is set.
*/
-extern List create_dynamic_block(List block_list,
+extern List create_dynamic_block(List block_list,
ba_request_t *request, List my_block_list,
bool track_down_nodes)
{
int rc = SLURM_SUCCESS;
-
+
ListIterator itr;
bg_record_t *bg_record = NULL;
List results = NULL;
@@ -83,13 +83,13 @@ extern List create_dynamic_block(List block_list,
itr = list_iterator_create(my_block_list);
while ((bg_record = list_next(itr))) {
if(!my_bitmap) {
- my_bitmap =
+ my_bitmap =
bit_alloc(bit_size(bg_record->bitmap));
}
-
+
if(!bit_super_set(bg_record->bitmap, my_bitmap)) {
bit_or(my_bitmap, bg_record->bitmap);
- for(i=0; i<BA_SYSTEM_DIMENSIONS; i++)
+ for(i=0; i<BA_SYSTEM_DIMENSIONS; i++)
geo[i] = bg_record->geo[i];
debug2("adding %s %c%c%c %c%c%c",
bg_record->nodes,
@@ -122,14 +122,14 @@ extern List create_dynamic_block(List block_list,
if(request->avail_node_bitmap) {
bitstr_t *bitmap = bit_alloc(node_record_count);
-
+
/* we want the bps that aren't in this partition to
* mark them as used
*/
bit_or(bitmap, request->avail_node_bitmap);
bit_not(bitmap);
unusable_nodes = bitmap2node_name(bitmap);
-
+
//info("not using %s", nodes);
removable_set_bps(unusable_nodes);
@@ -178,21 +178,21 @@ extern List create_dynamic_block(List block_list,
goto finished;
break;
}
-
+
request->conn_type = SELECT_SMALL;
new_blocks = list_create(destroy_bg_record);
- if(_breakup_blocks(block_list, new_blocks,
+ if(_breakup_blocks(block_list, new_blocks,
request, my_block_list,
true, true)
- == SLURM_SUCCESS)
+ == SLURM_SUCCESS)
goto finished;
- if(_breakup_blocks(block_list, new_blocks,
+ if(_breakup_blocks(block_list, new_blocks,
request, my_block_list,
true, false)
- == SLURM_SUCCESS)
+ == SLURM_SUCCESS)
goto finished;
-
+
list_destroy(new_blocks);
new_blocks = NULL;
debug2("small block not able to be placed inside others");
@@ -200,49 +200,49 @@ extern List create_dynamic_block(List block_list,
if(request->conn_type == SELECT_NAV)
request->conn_type = SELECT_TORUS;
-
+
//debug("going to create %d", request->size);
if(!new_ba_request(request)) {
if(geo[X] == (uint16_t)NO_VAL) {
- error("Problems with request for size %d geo %dx%dx%d",
+ error("Problems with request for size %d geo %dx%dx%d",
request->size,
- request->geometry[X],
- request->geometry[Y],
+ request->geometry[X],
+ request->geometry[Y],
request->geometry[Z]);
} else {
error("Problems with request for size %d. "
- "No geo given.",
+ "No geo given.",
request->size);
}
rc = ESLURM_INTERCONNECT_FAILURE;
goto finished;
- }
-
+ }
+
/* try on free midplanes */
rc = SLURM_SUCCESS;
if(results)
list_flush(results);
else
results = list_create(NULL);
-
- if (allocate_block(request, results))
+
+ if (allocate_block(request, results))
goto setup_records;
-
+
debug2("allocate failure for size %d base "
- "partitions of free midplanes",
+ "partitions of free midplanes",
request->size);
rc = SLURM_ERROR;
-
- if(!list_count(block_list) || !my_block_list)
+
+ if(!list_count(block_list) || !my_block_list)
goto finished;
-
+
/*Try to put block starting in the smallest of the exisiting blocks*/
itr = list_iterator_create(block_list);
while ((bg_record = (bg_record_t *) list_next(itr)) != NULL) {
/* never check a block with a job running */
if(bg_record->job_running != NO_JOB_RUNNING)
continue;
-
+
/* Here we are only looking for the first
block on the midplane. So either the count
is greater or equal than
@@ -252,7 +252,7 @@ extern List create_dynamic_block(List block_list,
if((bg_record->node_cnt < bg_conf->bp_node_cnt)
&& (bit_ffs(bg_record->ionode_bitmap) != 0))
continue;
-
+
debug3("removing %s for request %d",
bg_record->nodes, request->size);
remove_block(bg_record->bg_block_list, (int)NO_VAL);
@@ -266,8 +266,8 @@ extern List create_dynamic_block(List block_list,
results = list_create(NULL);
if (allocate_block(request, results))
break;
-
- debug2("allocate failure for size %d base partitions",
+
+ debug2("allocate failure for size %d base partitions",
request->size);
rc = SLURM_ERROR;
}
@@ -277,7 +277,7 @@ setup_records:
if(rc == SLURM_SUCCESS) {
/*set up bg_record(s) here */
new_blocks = list_create(destroy_bg_record);
-
+
blockreq.block = request->save_name;
#ifdef HAVE_BGL
blockreq.blrtsimage = request->blrtsimage;
@@ -286,16 +286,16 @@ setup_records:
blockreq.mloaderimage = request->mloaderimage;
blockreq.ramdiskimage = request->ramdiskimage;
blockreq.conn_type = request->conn_type;
-
- add_bg_record(new_blocks, results, &blockreq, 0, 0);
+
+ add_bg_record(new_blocks, results, &blockreq, 0, 0);
}
finished:
reset_all_removed_bps();
-
+
xfree(unusable_nodes);
xfree(request->save_name);
-
+
if(request->elongate_geos) {
list_destroy(request->elongate_geos);
request->elongate_geos = NULL;
@@ -308,7 +308,7 @@ finished:
return new_blocks;
}
-extern bg_record_t *create_small_record(bg_record_t *bg_record,
+extern bg_record_t *create_small_record(bg_record_t *bg_record,
bitstr_t *ionodes, int size)
{
bg_record_t *found_record = NULL;
@@ -317,7 +317,7 @@ extern bg_record_t *create_small_record(bg_record_t *bg_record,
char bitstring[BITSIZE];
found_record = (bg_record_t*) xmalloc(sizeof(bg_record_t));
-
+
found_record->job_running = NO_JOB_RUNNING;
found_record->user_name = xstrdup(bg_record->user_name);
found_record->user_uid = bg_record->user_uid;
@@ -331,17 +331,17 @@ extern bg_record_t *create_small_record(bg_record_t *bg_record,
hostlist_destroy(hl);
found_record->nodes = xstrdup(host);
free(host);
- error("you gave me a list with no ba_nodes using %s",
+ error("you gave me a list with no ba_nodes using %s",
found_record->nodes);
} else {
found_record->nodes = xstrdup_printf(
"%s%c%c%c",
- bg_conf->slurm_node_prefix,
+ bg_conf->slurm_node_prefix,
alpha_num[found_record->start[X]],
alpha_num[found_record->start[Y]],
alpha_num[found_record->start[Z]]);
error("you gave me a record with no ba_nodes "
- "and no nodes either using %s",
+ "and no nodes either using %s",
found_record->nodes);
}
} else {
@@ -351,10 +351,10 @@ extern bg_record_t *create_small_record(bg_record_t *bg_record,
for(j=0;j<NUM_PORTS_PER_NODE;j++) {
ba_node->axis_switch[i].int_wire[j].used = 0;
if(i!=X) {
- if(j==3 || j==4)
+ if(j==3 || j==4)
ba_node->axis_switch[i].
int_wire[j].
- used = 1;
+ used = 1;
}
ba_node->axis_switch[i].int_wire[j].
port_tar = j;
@@ -363,8 +363,8 @@ extern bg_record_t *create_small_record(bg_record_t *bg_record,
list_append(found_record->bg_block_list, new_ba_node);
found_record->bp_count = 1;
found_record->nodes = xstrdup_printf(
- "%s%c%c%c",
- bg_conf->slurm_node_prefix,
+ "%s%c%c%c",
+ bg_conf->slurm_node_prefix,
alpha_num[ba_node->coord[X]],
alpha_num[ba_node->coord[Y]],
alpha_num[ba_node->coord[Z]]);
@@ -378,9 +378,9 @@ extern bg_record_t *create_small_record(bg_record_t *bg_record,
found_record->ramdiskimage = xstrdup(bg_record->ramdiskimage);
process_nodes(found_record, false);
-
+
found_record->conn_type = SELECT_SMALL;
-
+
xassert(bg_conf->cpu_ratio);
found_record->cpu_cnt = bg_conf->cpu_ratio * size;
found_record->node_cnt = size;
@@ -395,12 +395,12 @@ extern bg_record_t *create_small_record(bg_record_t *bg_record,
/*********************** Local Functions *************************/
static int _split_block(List block_list, List new_blocks,
- bg_record_t *bg_record, int cnodes)
+ bg_record_t *bg_record, int cnodes)
{
- bool full_bp = false;
+ bool full_bp = false;
bitoff_t start = 0;
blockreq_t blockreq;
-
+
memset(&blockreq, 0, sizeof(blockreq_t));
switch(bg_record->node_cnt) {
@@ -411,11 +411,11 @@ static int _split_block(List block_list, List new_blocks,
break;
case 128:
switch(cnodes) {
- case 32:
+ case 32:
blockreq.small32 = 4;
break;
default:
- error("We don't make a %d from size %d",
+ error("We don't make a %d from size %d",
cnodes, bg_record->node_cnt);
goto finished;
break;
@@ -423,15 +423,15 @@ static int _split_block(List block_list, List new_blocks,
break;
default:
switch(cnodes) {
- case 32:
+ case 32:
blockreq.small32 = 4;
blockreq.small128 = 3;
break;
- case 128:
+ case 128:
blockreq.small128 = 4;
break;
default:
- error("We don't make a %d from size %d",
+ error("We don't make a %d from size %d",
cnodes, bg_record->node_cnt);
goto finished;
break;
@@ -449,7 +449,7 @@ static int _split_block(List block_list, List new_blocks,
blockreq.small16 = 2;
break;
default:
- error("We don't make a %d from size %d",
+ error("We don't make a %d from size %d",
cnodes, bg_record->node_cnt);
goto finished;
break;
@@ -457,7 +457,7 @@ static int _split_block(List block_list, List new_blocks,
break;
case 64:
switch(cnodes) {
- case 16:
+ case 16:
blockreq.small16 = 2;
blockreq.small32 = 1;
break;
@@ -465,7 +465,7 @@ static int _split_block(List block_list, List new_blocks,
blockreq.small32 = 2;
break;
default:
- error("We don't make a %d from size %d",
+ error("We don't make a %d from size %d",
cnodes, bg_record->node_cnt);
goto finished;
break;
@@ -473,12 +473,12 @@ static int _split_block(List block_list, List new_blocks,
break;
case 128:
switch(cnodes) {
- case 16:
+ case 16:
blockreq.small16 = 2;
blockreq.small32 = 1;
blockreq.small64 = 1;
break;
- case 32:
+ case 32:
blockreq.small32 = 2;
blockreq.small64 = 1;
break;
@@ -486,7 +486,7 @@ static int _split_block(List block_list, List new_blocks,
blockreq.small64 = 2;
break;
default:
- error("We don't make a %d from size %d",
+ error("We don't make a %d from size %d",
cnodes, bg_record->node_cnt);
goto finished;
break;
@@ -494,13 +494,13 @@ static int _split_block(List block_list, List new_blocks,
break;
case 256:
switch(cnodes) {
- case 16:
+ case 16:
blockreq.small16 = 2;
blockreq.small32 = 1;
blockreq.small64 = 1;
blockreq.small128 = 1;
break;
- case 32:
+ case 32:
blockreq.small32 = 2;
blockreq.small64 = 1;
blockreq.small128 = 1;
@@ -513,7 +513,7 @@ static int _split_block(List block_list, List new_blocks,
blockreq.small128 = 2;
break;
default:
- error("We don't make a %d from size %d",
+ error("We don't make a %d from size %d",
cnodes, bg_record->node_cnt);
goto finished;
break;
@@ -521,14 +521,14 @@ static int _split_block(List block_list, List new_blocks,
break;
default:
switch(cnodes) {
- case 16:
+ case 16:
blockreq.small16 = 2;
blockreq.small32 = 1;
blockreq.small64 = 1;
blockreq.small128 = 1;
blockreq.small256 = 1;
break;
- case 32:
+ case 32:
blockreq.small32 = 2;
blockreq.small64 = 1;
blockreq.small128 = 1;
@@ -539,15 +539,15 @@ static int _split_block(List block_list, List new_blocks,
blockreq.small128 = 1;
blockreq.small256 = 1;
break;
- case 128:
+ case 128:
blockreq.small128 = 2;
blockreq.small256 = 1;
break;
- case 256:
+ case 256:
blockreq.small256 = 2;
break;
default:
- error("We don't make a %d from size %d",
+ error("We don't make a %d from size %d",
cnodes, bg_record->node_cnt);
goto finished;
break;
@@ -559,20 +559,20 @@ static int _split_block(List block_list, List new_blocks,
if(!full_bp && bg_record->ionode_bitmap) {
if((start = bit_ffs(bg_record->ionode_bitmap)) == -1)
- start = 0;
+ start = 0;
}
#ifdef HAVE_BGL
debug2("Asking for %u 32CNBlocks, and %u 128CNBlocks "
- "from a %u block, starting at ionode %d.",
- blockreq.small32, blockreq.small128,
+ "from a %u block, starting at ionode %d.",
+ blockreq.small32, blockreq.small128,
bg_record->node_cnt, start);
#else
debug2("Asking for %u 16CNBlocks, %u 32CNBlocks, "
"%u 64CNBlocks, %u 128CNBlocks, and %u 256CNBlocks"
- "from a %u block, starting at ionode %d.",
- blockreq.small16, blockreq.small32,
- blockreq.small64, blockreq.small128,
+ "from a %u block, starting at ionode %d.",
+ blockreq.small16, blockreq.small32,
+ blockreq.small64, blockreq.small128,
blockreq.small256, bg_record->node_cnt, start);
#endif
handle_small_record_request(new_blocks, &blockreq, bg_record, start);
@@ -592,10 +592,10 @@ static int _breakup_blocks(List block_list, List new_blocks,
char tmp_char[256];
bitstr_t *ionodes = bit_alloc(bg_conf->numpsets);
int cnodes = request->procs / bg_conf->cpu_ratio;
-
+
debug2("proc count = %d cnodes = %d size = %d",
request->procs, cnodes, request->size);
-
+
switch(cnodes) {
case 16:
/* a 16 can go anywhere */
@@ -615,27 +615,27 @@ static int _breakup_blocks(List block_list, List new_blocks,
default:
error("We shouldn't be here with this size %d", cnodes);
goto finished;
- break;
+ break;
}
/* First try with free blocks a midplane or less. Then try with the
* smallest blocks.
*/
- itr = list_iterator_create(block_list);
+ itr = list_iterator_create(block_list);
while ((bg_record = list_next(itr))) {
/* never look at a block if a job is running */
if(bg_record->job_running != NO_JOB_RUNNING)
continue;
/* on the third time through look for just a block
* that isn't used */
-
+
/* check for free blocks on the first and second time */
if(only_free && (bg_record->state != RM_PARTITION_FREE))
continue;
/* check small blocks first */
if(only_small && (bg_record->node_cnt > bg_conf->bp_node_cnt))
continue;
-
+
if (request->avail_node_bitmap &&
!bit_super_set(bg_record->bitmap,
request->avail_node_bitmap)) {
@@ -666,7 +666,7 @@ static int _breakup_blocks(List block_list, List new_blocks,
combo */
if(bit_itr) {
while((bitstr = list_next(bit_itr))) {
- if(bit_super_set(ionodes, bitstr))
+ if(bit_super_set(ionodes, bitstr))
break;
}
list_iterator_reset(bit_itr);
@@ -681,7 +681,7 @@ static int _breakup_blocks(List block_list, List new_blocks,
bit_fmt(bitstring, BITSIZE, ionodes);
debug2("1 adding %s %d got %d set "
"ionodes %s total is %s",
- bg_record->bg_block_id,
+ bg_record->bg_block_id,
bg_record->node_cnt, total_cnode_cnt,
bg_record->ionodes, bitstring);
if(total_cnode_cnt == cnodes) {
@@ -692,23 +692,23 @@ static int _breakup_blocks(List block_list, List new_blocks,
alpha_num[bg_record->start[Z]]);
if(!my_block_list) {
rc = SLURM_SUCCESS;
- goto finished;
+ goto finished;
}
-
+
bg_record = create_small_record(bg_record,
ionodes,
cnodes);
list_append(new_blocks, bg_record);
-
+
rc = SLURM_SUCCESS;
- goto finished;
+ goto finished;
}
continue;
}
/* we found a block that is bigger than requested */
break;
}
-
+
if(bg_record) {
bg_record_t *found_record = NULL;
@@ -725,9 +725,9 @@ static int _breakup_blocks(List block_list, List new_blocks,
rc = SLURM_ERROR;
goto finished;
}
-
+
format_node_name(found_record, tmp_char, sizeof(tmp_char));
-
+
debug2("going to split %s, %s",
found_record->bg_block_id,
tmp_char);
@@ -738,20 +738,20 @@ static int _breakup_blocks(List block_list, List new_blocks,
alpha_num[found_record->start[Z]]);
if(!my_block_list) {
rc = SLURM_SUCCESS;
- goto finished;
+ goto finished;
}
_split_block(block_list, new_blocks, found_record, cnodes);
rc = SLURM_SUCCESS;
goto finished;
}
-
+
finished:
if(bit_itr)
list_iterator_destroy(bit_itr);
- FREE_NULL_BITMAP(ionodes);
+ FREE_NULL_BITMAP(ionodes);
if(itr)
list_iterator_destroy(itr);
-
+
return rc;
}
diff --git a/src/plugins/select/bluegene/plugin/dynamic_block.h b/src/plugins/select/bluegene/plugin/dynamic_block.h
index 28027618ad5baa9fd82a39b76f9aafb1482c0bc3..e440e121b17fd6e55aa28f28622dd318ec14dac0 100644
--- a/src/plugins/select/bluegene/plugin/dynamic_block.h
+++ b/src/plugins/select/bluegene/plugin/dynamic_block.h
@@ -6,32 +6,32 @@
* Copyright (C) 2008 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -46,7 +46,7 @@ extern List create_dynamic_block(List block_list,
ba_request_t *request, List my_block_list,
bool track_down_nodes);
-extern bg_record_t *create_small_record(bg_record_t *bg_record,
+extern bg_record_t *create_small_record(bg_record_t *bg_record,
bitstr_t *ionodes, int size);
#endif /* _BLUEGENE_DYNAMIC_BLOCK_H_ */
diff --git a/src/plugins/select/bluegene/plugin/jobinfo.c b/src/plugins/select/bluegene/plugin/jobinfo.c
index 39188762e16fa4fc5423ef725257df8b23d652a9..5f8f37fd6a27f9b04c2740b087171ce6f9864e92 100644
--- a/src/plugins/select/bluegene/plugin/jobinfo.c
+++ b/src/plugins/select/bluegene/plugin/jobinfo.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -85,7 +85,7 @@ extern int free_select_jobinfo(select_jobinfo_t *jobinfo)
if (jobinfo->magic != JOBINFO_MAGIC) {
error("free_jobinfo: jobinfo magic bad");
return EINVAL;
- }
+ }
jobinfo->magic = 0;
xfree(jobinfo->bg_block_id);
xfree(jobinfo->nodes);
@@ -125,7 +125,7 @@ extern int set_select_jobinfo(select_jobinfo_t *jobinfo,
switch (data_type) {
case SELECT_JOBDATA_GEOMETRY:
- for (i=0; i<SYSTEM_DIMENSIONS; i++)
+ for (i=0; i<SYSTEM_DIMENSIONS; i++)
jobinfo->geometry[i] = uint16[i];
break;
case SELECT_JOBDATA_REBOOT:
@@ -180,9 +180,9 @@ extern int set_select_jobinfo(select_jobinfo_t *jobinfo,
/* we xfree() any preset value to avoid a memory leak */
xfree(jobinfo->ramdiskimage);
jobinfo->ramdiskimage = xstrdup(tmp_char);
- break;
+ break;
default:
- debug("set_jobinfo data_type %d invalid",
+ debug("set_jobinfo data_type %d invalid",
data_type);
}
@@ -192,8 +192,8 @@ extern int set_select_jobinfo(select_jobinfo_t *jobinfo,
/* get data from a select job credential
* IN jobinfo - updated select job credential
* IN data_type - type of data to enter into job credential
- * OUT data - the data to get from job credential, caller must xfree
- * data for data_tyep == SELECT_JOBDATA_BLOCK_ID
+ * OUT data - the data to get from job credential, caller must xfree
+ * data for data_tyep == SELECT_JOBDATA_BLOCK_ID
*/
extern int get_select_jobinfo(select_jobinfo_t *jobinfo,
enum select_jobdata_type data_type, void *data)
@@ -288,7 +288,7 @@ extern int get_select_jobinfo(select_jobinfo_t *jobinfo,
*tmp_char = xstrdup(jobinfo->ramdiskimage);
break;
default:
- debug2("get_jobinfo data_type %d invalid",
+ debug2("get_jobinfo data_type %d invalid",
data_type);
}
@@ -304,7 +304,7 @@ extern select_jobinfo_t *copy_select_jobinfo(select_jobinfo_t *jobinfo)
{
struct select_jobinfo *rc = NULL;
int i;
-
+
if (jobinfo == NULL)
;
else if (jobinfo->magic != JOBINFO_MAGIC)
@@ -345,7 +345,7 @@ extern int pack_select_jobinfo(select_jobinfo_t *jobinfo, Buf buffer)
int i;
if (jobinfo) {
- /* NOTE: If new elements are added here, make sure to
+ /* NOTE: If new elements are added here, make sure to
* add equivalant pack of zeros below for NULL pointer */
for (i=0; i<SYSTEM_DIMENSIONS; i++) {
pack16(jobinfo->geometry[i], buffer);
@@ -423,7 +423,7 @@ extern int unpack_select_jobinfo(select_jobinfo_t **jobinfo_pptr, Buf buffer)
safe_unpackstr_xmalloc(&(jobinfo->linuximage), &uint32_tmp, buffer);
safe_unpackstr_xmalloc(&(jobinfo->mloaderimage), &uint32_tmp, buffer);
safe_unpackstr_xmalloc(&(jobinfo->ramdiskimage), &uint32_tmp, buffer);
-
+
return SLURM_SUCCESS;
unpack_error:
@@ -446,7 +446,7 @@ extern char *sprint_select_jobinfo(select_jobinfo_t *jobinfo,
int i;
char max_cpus_char[8];
char *tmp_image = "default";
-
+
if (buf == NULL) {
error("sprint_jobinfo: buf is null");
return NULL;
@@ -480,10 +480,10 @@ extern char *sprint_select_jobinfo(select_jobinfo_t *jobinfo,
if (jobinfo->max_cpus == NO_VAL)
sprintf(max_cpus_char, "None");
else
- convert_num_unit((float)jobinfo->max_cpus,
+ convert_num_unit((float)jobinfo->max_cpus,
max_cpus_char, sizeof(max_cpus_char),
UNIT_NONE);
- snprintf(buf, size,
+ snprintf(buf, size,
"%7.7s %6.6s %6.6s %8s %cx%cx%c %-16s",
conn_type_string(jobinfo->conn_type),
_yes_no_string(jobinfo->reboot),
@@ -495,7 +495,7 @@ extern char *sprint_select_jobinfo(select_jobinfo_t *jobinfo,
jobinfo->bg_block_id);
break;
case SELECT_PRINT_MIXED_SHORT:
- snprintf(buf, size,
+ snprintf(buf, size,
"Connection=%s Reboot=%s Rotate=%s "
"Geometry=%cx%cx%c",
conn_type_string(jobinfo->conn_type),
@@ -506,7 +506,7 @@ extern char *sprint_select_jobinfo(select_jobinfo_t *jobinfo,
alpha_num[geometry[2]]);
break;
case SELECT_PRINT_MIXED:
- snprintf(buf, size,
+ snprintf(buf, size,
"Connection=%s Reboot=%s Rotate=%s "
"Geometry=%cx%cx%c Block_ID=%s",
conn_type_string(jobinfo->conn_type),
@@ -521,14 +521,14 @@ extern char *sprint_select_jobinfo(select_jobinfo_t *jobinfo,
snprintf(buf, size, "%s", jobinfo->bg_block_id);
break;
case SELECT_PRINT_NODES:
- if(jobinfo->ionodes && jobinfo->ionodes[0])
+ if(jobinfo->ionodes && jobinfo->ionodes[0])
snprintf(buf, size, "%s[%s]",
jobinfo->nodes, jobinfo->ionodes);
else
snprintf(buf, size, "%s", jobinfo->nodes);
break;
case SELECT_PRINT_CONNECTION:
- snprintf(buf, size, "%s",
+ snprintf(buf, size, "%s",
conn_type_string(jobinfo->conn_type));
break;
case SELECT_PRINT_REBOOT:
@@ -552,37 +552,37 @@ extern char *sprint_select_jobinfo(select_jobinfo_t *jobinfo,
convert_num_unit((float)jobinfo->max_cpus,
max_cpus_char, sizeof(max_cpus_char),
UNIT_NONE);
-
+
snprintf(buf, size, "%s", max_cpus_char);
break;
case SELECT_PRINT_BLRTS_IMAGE:
#ifdef HAVE_BGL
if(jobinfo->blrtsimage)
tmp_image = jobinfo->blrtsimage;
- snprintf(buf, size, "%s", tmp_image);
+ snprintf(buf, size, "%s", tmp_image);
#endif
break;
case SELECT_PRINT_LINUX_IMAGE:
if(jobinfo->linuximage)
tmp_image = jobinfo->linuximage;
- snprintf(buf, size, "%s", tmp_image);
+ snprintf(buf, size, "%s", tmp_image);
break;
case SELECT_PRINT_MLOADER_IMAGE:
if(jobinfo->mloaderimage)
tmp_image = jobinfo->mloaderimage;
- snprintf(buf, size, "%s", tmp_image);
+ snprintf(buf, size, "%s", tmp_image);
break;
case SELECT_PRINT_RAMDISK_IMAGE:
if(jobinfo->ramdiskimage)
tmp_image = jobinfo->ramdiskimage;
- snprintf(buf, size, "%s", tmp_image);
- break;
+ snprintf(buf, size, "%s", tmp_image);
+ break;
default:
error("sprint_jobinfo: bad mode %d", mode);
if (size > 0)
buf[0] = '\0';
}
-
+
return buf;
}
@@ -598,7 +598,7 @@ extern char *xstrdup_select_jobinfo(select_jobinfo_t *jobinfo, int mode)
char max_cpus_char[8];
char *tmp_image = "default";
char *buf = NULL;
-
+
if ((mode != SELECT_PRINT_DATA)
&& jobinfo && (jobinfo->magic != JOBINFO_MAGIC)) {
error("xstrdup_jobinfo: jobinfo magic bad");
@@ -620,17 +620,17 @@ extern char *xstrdup_select_jobinfo(select_jobinfo_t *jobinfo, int mode)
switch (mode) {
case SELECT_PRINT_HEAD:
- xstrcat(buf,
+ xstrcat(buf,
"CONNECT REBOOT ROTATE MAX_CPUS GEOMETRY BLOCK_ID");
break;
case SELECT_PRINT_DATA:
if (jobinfo->max_cpus == NO_VAL)
sprintf(max_cpus_char, "None");
else
- convert_num_unit((float)jobinfo->max_cpus,
+ convert_num_unit((float)jobinfo->max_cpus,
max_cpus_char, sizeof(max_cpus_char),
UNIT_NONE);
- xstrfmtcat(buf,
+ xstrfmtcat(buf,
"%7.7s %6.6s %6.6s %8s %cx%cx%c %-16s",
conn_type_string(jobinfo->conn_type),
_yes_no_string(jobinfo->reboot),
@@ -642,7 +642,7 @@ extern char *xstrdup_select_jobinfo(select_jobinfo_t *jobinfo, int mode)
jobinfo->bg_block_id);
break;
case SELECT_PRINT_MIXED:
- xstrfmtcat(buf,
+ xstrfmtcat(buf,
"Connection=%s Reboot=%s Rotate=%s "
"Geometry=%cx%cx%c Block_ID=%s",
conn_type_string(jobinfo->conn_type),
@@ -657,14 +657,14 @@ extern char *xstrdup_select_jobinfo(select_jobinfo_t *jobinfo, int mode)
xstrfmtcat(buf, "%s", jobinfo->bg_block_id);
break;
case SELECT_PRINT_NODES:
- if(jobinfo->ionodes && jobinfo->ionodes[0])
+ if(jobinfo->ionodes && jobinfo->ionodes[0])
xstrfmtcat(buf, "%s[%s]",
jobinfo->nodes, jobinfo->ionodes);
else
xstrfmtcat(buf, "%s", jobinfo->nodes);
break;
case SELECT_PRINT_CONNECTION:
- xstrfmtcat(buf, "%s",
+ xstrfmtcat(buf, "%s",
conn_type_string(jobinfo->conn_type));
break;
case SELECT_PRINT_REBOOT:
@@ -688,34 +688,34 @@ extern char *xstrdup_select_jobinfo(select_jobinfo_t *jobinfo, int mode)
convert_num_unit((float)jobinfo->max_cpus,
max_cpus_char, sizeof(max_cpus_char),
UNIT_NONE);
-
+
xstrfmtcat(buf, "%s", max_cpus_char);
break;
case SELECT_PRINT_BLRTS_IMAGE:
#ifdef HAVE_BGL
if(jobinfo->blrtsimage)
tmp_image = jobinfo->blrtsimage;
- xstrfmtcat(buf, "%s", tmp_image);
+ xstrfmtcat(buf, "%s", tmp_image);
#endif
break;
case SELECT_PRINT_LINUX_IMAGE:
if(jobinfo->linuximage)
tmp_image = jobinfo->linuximage;
- xstrfmtcat(buf, "%s", tmp_image);
+ xstrfmtcat(buf, "%s", tmp_image);
break;
case SELECT_PRINT_MLOADER_IMAGE:
if(jobinfo->mloaderimage)
tmp_image = jobinfo->mloaderimage;
- xstrfmtcat(buf, "%s", tmp_image);
+ xstrfmtcat(buf, "%s", tmp_image);
break;
case SELECT_PRINT_RAMDISK_IMAGE:
if(jobinfo->ramdiskimage)
tmp_image = jobinfo->ramdiskimage;
- xstrfmtcat(buf, "%s", tmp_image);
- break;
+ xstrfmtcat(buf, "%s", tmp_image);
+ break;
default:
error("xstrdup_jobinfo: bad mode %d", mode);
}
-
+
return buf;
}
diff --git a/src/plugins/select/bluegene/plugin/jobinfo.h b/src/plugins/select/bluegene/plugin/jobinfo.h
index 13a2a17021de3af963dc9b235644e8fa592f186f..ad7a41ab16218b0067220fdb30ebe35925073c95 100644
--- a/src/plugins/select/bluegene/plugin/jobinfo.h
+++ b/src/plugins/select/bluegene/plugin/jobinfo.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -52,11 +52,11 @@ struct select_jobinfo {
uint16_t rotate; /* permit geometry rotation if set */
char *bg_block_id; /* Blue Gene block ID */
uint16_t magic; /* magic number */
- char *nodes; /* node list given for estimated start */
+ char *nodes; /* node list given for estimated start */
char *ionodes; /* for bg to tell which ionodes of a small
- * block the job is running */
- uint32_t node_cnt; /* how many cnodes in block */
- uint16_t altered; /* see if we have altered this job
+ * block the job is running */
+ uint32_t node_cnt; /* how many cnodes in block */
+ uint16_t altered; /* see if we have altered this job
* or not yet */
uint32_t max_cpus; /* maximum processors to use */
#ifdef HAVE_BGL
@@ -90,8 +90,8 @@ extern int set_select_jobinfo(select_jobinfo_t *jobinfo,
/* get data from a select job credential
* IN jobinfo - updated select job credential
* IN data_type - type of data to enter into job credential
- * OUT data - the data to get from job credential, caller must xfree
- * data for data_tyep == SELECT_JOBDATA_BLOCK_ID
+ * OUT data - the data to get from job credential, caller must xfree
+ * data for data_tyep == SELECT_JOBDATA_BLOCK_ID
*/
extern int get_select_jobinfo(select_jobinfo_t *jobinfo,
enum select_jobdata_type data_type, void *data);
diff --git a/src/plugins/select/bluegene/plugin/libsched_if64.c b/src/plugins/select/bluegene/plugin/libsched_if64.c
index 3be8812e1ee701ffd71849eb945ebb051ff210f3..27689affa996c1851e637647e0200cbcd0a63274 100644
--- a/src/plugins/select/bluegene/plugin/libsched_if64.c
+++ b/src/plugins/select/bluegene/plugin/libsched_if64.c
@@ -1,38 +1,38 @@
/*****************************************************************************\
* libsched_if.c - here so mpirun can dynamically link to it to make
- * sure it doesn't go try creating a block all crazy like outside of slurm.
+ * sure it doesn't go try creating a block all crazy like outside of slurm.
*
* $Id: bluegene.c 9169 2006-09-05 17:26:51Z jette $
*****************************************************************************
* Copyright (C) 2004-2006 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <auble1@llnl.gov> et. al.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -41,7 +41,7 @@
#include <stdlib.h>
#include <string.h>
-int get_parameters(void *params)
+int get_parameters(void *params)
{
char *partition = getenv("MPIRUN_PARTITION"); /* get MPIRUN env
* var to see if we
diff --git a/src/plugins/select/bluegene/plugin/nodeinfo.c b/src/plugins/select/bluegene/plugin/nodeinfo.c
index c3e312f5a328b5f2b44ee6f4d2d2815d812484c3..00b8702d2e8de39a2d691b5704304b49cb6c1ef1 100644
--- a/src/plugins/select/bluegene/plugin/nodeinfo.c
+++ b/src/plugins/select/bluegene/plugin/nodeinfo.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -62,13 +62,13 @@ static node_subgrp_t *_find_subgrp(List subgrp_list, enum node_states state,
itr = list_iterator_create(subgrp_list);
while((subgrp = list_next(itr))) {
if(subgrp->state == state)
- break;
+ break;
}
list_iterator_destroy(itr);
if(!subgrp) {
subgrp = xmalloc(sizeof(node_subgrp_t));
subgrp->state = state;
- subgrp->bitmap = bit_alloc(size);
+ subgrp->bitmap = bit_alloc(size);
list_append(subgrp_list, subgrp);
}
@@ -95,7 +95,7 @@ static int _unpack_node_subgrp(node_subgrp_t **subgrp_pptr, Buf buffer,
*subgrp_pptr = subgrp;
safe_unpackstr_xmalloc(&subgrp->str, &uint32_tmp, buffer);
- if (!subgrp->str)
+ if (!subgrp->str)
subgrp->inx = bitfmt2int("");
else
subgrp->inx = bitfmt2int(subgrp->str);
@@ -128,7 +128,7 @@ extern int select_nodeinfo_pack(select_nodeinfo_t *nodeinfo, Buf buffer)
pack16(nodeinfo->bitmap_size, buffer);
- if(nodeinfo->subgrp_list)
+ if(nodeinfo->subgrp_list)
count = list_count(nodeinfo->subgrp_list);
pack16(count, buffer);
@@ -158,11 +158,11 @@ extern int select_nodeinfo_unpack(select_nodeinfo_t **nodeinfo, Buf buffer)
nodeinfo_ptr->subgrp_list = list_create(_free_node_subgrp);
for(j=0; j<size; j++) {
node_subgrp_t *subgrp = NULL;
- if(_unpack_node_subgrp(&subgrp, buffer,
+ if(_unpack_node_subgrp(&subgrp, buffer,
nodeinfo_ptr->bitmap_size)
!= SLURM_SUCCESS)
goto unpack_error;
- list_append(nodeinfo_ptr->subgrp_list, subgrp);
+ list_append(nodeinfo_ptr->subgrp_list, subgrp);
}
return SLURM_SUCCESS;
@@ -193,7 +193,7 @@ extern int select_nodeinfo_free(select_nodeinfo_t *nodeinfo)
if (nodeinfo->magic != NODEINFO_MAGIC) {
error("free_nodeinfo: nodeinfo magic bad");
return EINVAL;
- }
+ }
nodeinfo->magic = 0;
if(nodeinfo->subgrp_list)
list_destroy(nodeinfo->subgrp_list);
@@ -210,22 +210,22 @@ extern int select_nodeinfo_set_all(time_t last_query_time)
bg_record_t *bg_record = NULL;
static time_t last_set_all = 0;
- if(!blocks_are_created)
+ if(!blocks_are_created)
return SLURM_NO_CHANGE_IN_DATA;
-
+
/* only set this once when the last_bg_update is newer than
the last time we set things up. */
if(last_set_all && (last_bg_update-1 < last_set_all)) {
debug2("Node select info for set all hasn't "
- "changed since %d",
+ "changed since %d",
last_set_all);
- return SLURM_NO_CHANGE_IN_DATA;
+ return SLURM_NO_CHANGE_IN_DATA;
}
last_set_all = last_bg_update;
/* set this here so we know things have changed */
last_node_update = time(NULL);
-
+
slurm_mutex_lock(&block_state_mutex);
for (i=0; i<node_record_count; i++) {
node_ptr = &(node_record_table_ptr[i]);
@@ -245,7 +245,7 @@ extern int select_nodeinfo_set_all(time_t last_query_time)
if(bg_record->job_running == NO_JOB_RUNNING)
continue;
- if(bg_record->state == RM_PARTITION_ERROR)
+ if(bg_record->state == RM_PARTITION_ERROR)
state = NODE_STATE_ERROR;
else if(bg_record->job_running > NO_JOB_RUNNING) {
/* we don't need to set the allocated here
@@ -267,14 +267,14 @@ extern int select_nodeinfo_set_all(time_t last_query_time)
subgrp = _find_subgrp(
node_ptr->select_nodeinfo->subgrp_list,
state, bg_conf->numpsets);
-
+
if(subgrp->node_cnt < bg_conf->bp_node_cnt) {
if(bg_record->node_cnt < bg_conf->bp_node_cnt) {
bit_or(subgrp->bitmap,
bg_record->ionode_bitmap);
subgrp->node_cnt += bg_record->node_cnt;
} else {
- bit_nset(subgrp->bitmap,
+ bit_nset(subgrp->bitmap,
0, (bg_conf->numpsets-1));
subgrp->node_cnt = bg_conf->bp_node_cnt;
}
@@ -292,7 +292,7 @@ extern int select_nodeinfo_set(struct job_record *job_ptr)
return SLURM_SUCCESS;
}
-extern int select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
+extern int select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
enum select_nodedata_type dinfo,
enum node_states state,
void *data)
@@ -308,7 +308,7 @@ extern int select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
error("get_nodeinfo: nodeinfo not set");
return SLURM_ERROR;
}
-
+
if (nodeinfo->magic != NODEINFO_MAGIC) {
error("get_nodeinfo: jobinfo magic bad");
return SLURM_ERROR;
@@ -320,18 +320,18 @@ extern int select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
break;
case SELECT_NODEDATA_SUBGRP_SIZE:
*uint16 = 0;
- if(!nodeinfo->subgrp_list)
+ if(!nodeinfo->subgrp_list)
return SLURM_ERROR;
*uint16 = list_count(nodeinfo->subgrp_list);
break;
case SELECT_NODEDATA_SUBCNT:
*uint16 = 0;
- if(!nodeinfo->subgrp_list)
+ if(!nodeinfo->subgrp_list)
return SLURM_ERROR;
itr = list_iterator_create(nodeinfo->subgrp_list);
while((subgrp = list_next(itr))) {
if(subgrp->state == state) {
- *uint16 = subgrp->node_cnt;
+ *uint16 = subgrp->node_cnt;
break;
}
}
@@ -339,12 +339,12 @@ extern int select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
break;
case SELECT_NODEDATA_BITMAP:
*bitmap = NULL;
- if(!nodeinfo->subgrp_list)
+ if(!nodeinfo->subgrp_list)
return SLURM_ERROR;
itr = list_iterator_create(nodeinfo->subgrp_list);
while((subgrp = list_next(itr))) {
if(subgrp->state == state) {
- *bitmap = bit_copy(subgrp->bitmap);
+ *bitmap = bit_copy(subgrp->bitmap);
break;
}
}
@@ -352,12 +352,12 @@ extern int select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
break;
case SELECT_NODEDATA_STR:
*tmp_char = NULL;
- if(!nodeinfo->subgrp_list)
+ if(!nodeinfo->subgrp_list)
return SLURM_ERROR;
itr = list_iterator_create(nodeinfo->subgrp_list);
while((subgrp = list_next(itr))) {
if(subgrp->state == state) {
- *tmp_char = xstrdup(subgrp->str);
+ *tmp_char = xstrdup(subgrp->str);
break;
}
}
@@ -367,6 +367,6 @@ extern int select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
error("Unsupported option %d for get_nodeinfo.", dinfo);
rc = SLURM_ERROR;
break;
- }
+ }
return rc;
}
diff --git a/src/plugins/select/bluegene/plugin/nodeinfo.h b/src/plugins/select/bluegene/plugin/nodeinfo.h
index 00947812b7a4edfcc3bf27a51ee2c6aa266a4b2d..340ae1846170b6fabd91c71a7d81b2c1175500cf 100644
--- a/src/plugins/select/bluegene/plugin/nodeinfo.h
+++ b/src/plugins/select/bluegene/plugin/nodeinfo.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -69,7 +69,7 @@ extern int select_nodeinfo_set_all(time_t last_query_time);
extern int select_nodeinfo_set(struct job_record *job_ptr);
-extern int select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
+extern int select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
enum select_nodedata_type dinfo,
enum node_states state,
void *data);
diff --git a/src/plugins/select/bluegene/plugin/opts.c b/src/plugins/select/bluegene/plugin/opts.c
index 13ca8ba3de3e00bb198e890d2472270faec37531..f07079a5ba206492721a8b34fd11c20f41fef75d 100644
--- a/src/plugins/select/bluegene/plugin/opts.c
+++ b/src/plugins/select/bluegene/plugin/opts.c
@@ -16,15 +16,15 @@
* 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
+ * 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
+ * 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
+ * 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
@@ -51,7 +51,7 @@ void parse_command_line(int argc, char *argv[])
{
int opt_char;
int option_index;
-
+
static struct option long_options[] = {
{"all", no_argument, 0, 'a'},
{"bgblock", required_argument, 0, 'b'},
@@ -63,7 +63,7 @@ void parse_command_line(int argc, char *argv[])
{"usage", no_argument, 0, 'u'},
{NULL, 0, 0, 0}
};
-
+
while ((opt_char =
getopt_long(argc, argv, "ab:hp:ruVw",
long_options, &option_index)) != -1) {
@@ -116,7 +116,7 @@ static void _usage(void)
static void _help(void)
{
- /* We still honor -p and --partition,
+ /* We still honor -p and --partition,
* but don't tell users about them here */
printf("\
diff --git a/src/plugins/select/bluegene/plugin/select_bluegene.c b/src/plugins/select/bluegene/plugin/select_bluegene.c
index 97f1014293a7bf7f1ce955f375351878e590f921..99de111c6e5b7a3eacfef11b03968264ab76db2a 100644
--- a/src/plugins/select/bluegene/plugin/select_bluegene.c
+++ b/src/plugins/select/bluegene/plugin/select_bluegene.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Dan Phung <phung4@llnl.gov> Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -50,12 +50,12 @@
#define NOT_FROM_CONTROLLER -2
/* These are defined here so when we link with something other than
* the slurmctld we will have these symbols defined. They will get
- * overwritten when linking with the slurmctld.
+ * overwritten when linking with the slurmctld.
*/
slurm_ctl_conf_t slurmctld_conf;
struct node_record *node_record_table_ptr = NULL;
int bg_recover = NOT_FROM_CONTROLLER;
-List part_list = NULL;
+List part_list = NULL;
int node_record_count;
time_t last_node_update;
time_t last_job_update;
@@ -82,7 +82,7 @@ char *slurmctld_cluster_name = NULL;
* where <application> is a description of the intended application of
* the plugin (e.g., "select" for SLURM node selection) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load select plugins if the plugin_type string has a
+ * only load select plugins if the plugin_type string has a
* prefix of "select/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
@@ -253,16 +253,16 @@ extern int init ( void )
fatal("SYSTEM_DIMENSIONS value (%d) invalid for BlueGene",
SYSTEM_DIMENSIONS);
#endif
-
+
#ifdef HAVE_BG_FILES
#ifdef HAVE_BGL
if (!getenv("CLASSPATH") || !getenv("DB2INSTANCE")
|| !getenv("VWSPATH"))
fatal("db2profile has not been "
"run to setup DB2 environment");
-
+
if ((SELECT_COPROCESSOR_MODE != RM_PARTITION_COPROCESSOR_MODE)
- || (SELECT_VIRTUAL_NODE_MODE
+ || (SELECT_VIRTUAL_NODE_MODE
!= RM_PARTITION_VIRTUAL_NODE_MODE))
fatal("enum node_use_type out of sync with rm_api.h");
#endif
@@ -271,7 +271,7 @@ extern int init ( void )
|| (SELECT_NAV != RM_NAV))
fatal("enum conn_type out of sync with rm_api.h");
#endif
-
+
verbose("%s loading...", plugin_name);
/* if this is coming from something other than the controller
we don't want to read the config or anything like that. */
@@ -305,7 +305,7 @@ extern int fini ( void )
}
/*
- * The remainder of this file implements the standard SLURM
+ * The remainder of this file implements the standard SLURM
* node selection API.
*/
@@ -340,7 +340,7 @@ extern int select_p_state_save(char *dir_name)
continue;
#endif
xassert(bg_record->bg_block_id != NULL);
-
+
pack_block(bg_record, buffer);
blocks_packed++;
}
@@ -410,7 +410,7 @@ extern int select_p_state_save(char *dir_name)
extern int select_p_state_restore(char *dir_name)
{
debug("bluegene: select_p_state_restore");
-
+
return validate_current_blocks(dir_name);
}
@@ -418,7 +418,7 @@ extern int select_p_state_restore(char *dir_name)
extern int select_p_job_init(List job_list)
{
int rc = sync_jobs(job_list);
-
+
/* after we have synced the blocks then we say they are
created. */
blocks_are_created = 1;
@@ -430,9 +430,9 @@ extern int select_p_job_init(List job_list)
extern int select_p_node_init(struct node_record *node_ptr, int node_cnt)
{
if(node_cnt>0 && bg_conf)
- if(node_ptr->cpus >= bg_conf->bp_node_cnt)
+ if(node_ptr->cpus >= bg_conf->bp_node_cnt)
bg_conf->cpus_per_bp = node_ptr->cpus;
-
+
return SLURM_SUCCESS;
}
@@ -449,14 +449,14 @@ extern int select_p_node_init(struct node_record *node_ptr, int node_cnt)
fatal("Error, could not read the file");
return SLURM_ERROR;
}
-
+
if(part_list) {
struct part_record *part_ptr = NULL;
ListIterator itr = list_iterator_create(part_list);
while((part_ptr = list_next(itr))) {
part_ptr->max_nodes = part_ptr->max_nodes_orig;
part_ptr->min_nodes = part_ptr->min_nodes_orig;
- select_p_alter_node_cnt(SELECT_SET_BP_CNT,
+ select_p_alter_node_cnt(SELECT_SET_BP_CNT,
&part_ptr->max_nodes);
select_p_alter_node_cnt(SELECT_SET_BP_CNT,
&part_ptr->min_nodes);
@@ -464,18 +464,18 @@ extern int select_p_node_init(struct node_record *node_ptr, int node_cnt)
list_iterator_destroy(itr);
}
- return SLURM_SUCCESS;
+ return SLURM_SUCCESS;
}
/*
- * select_p_job_test - Given a specification of scheduling requirements,
- * identify the nodes which "best" satify the request. The specified
- * nodes may be DOWN or BUSY at the time of this test as may be used
+ * select_p_job_test - Given a specification of scheduling requirements,
+ * identify the nodes which "best" satify the request. The specified
+ * nodes may be DOWN or BUSY at the time of this test as may be used
* to deterime if a job could ever run.
* IN/OUT job_ptr - pointer to job being scheduled start_time is set
* when we can possibly start job.
- * IN/OUT bitmap - usable nodes are set on input, nodes not required to
+ * IN/OUT bitmap - usable nodes are set on input, nodes not required to
* satisfy the request are cleared, other left set
* IN min_nodes - minimum count of nodes
* IN max_nodes - maximum count of nodes (0==don't care)
@@ -484,15 +484,15 @@ extern int select_p_node_init(struct node_record *node_ptr, int node_cnt)
* SELECT_MODE_TEST_ONLY: test if job can ever run
* SELECT_MODE_WILL_RUN: determine when and where job can run
* IN preemptee_candidates - List of pointers to jobs which can be preempted.
- * IN/OUT preemptee_job_list - Pointer to list of job pointers. These are the
- * jobs to be preempted to initiate the pending job. Not set
+ * IN/OUT preemptee_job_list - Pointer to list of job pointers. These are the
+ * jobs to be preempted to initiate the pending job. Not set
* if mode=SELECT_MODE_TEST_ONLY or input pointer is NULL.
* RET zero on success, EINVAL otherwise
- * NOTE: bitmap must be a superset of req_nodes at the time that
+ * NOTE: bitmap must be a superset of req_nodes at the time that
* select_p_job_test is called
*/
extern int select_p_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
- uint32_t min_nodes, uint32_t max_nodes,
+ uint32_t min_nodes, uint32_t max_nodes,
uint32_t req_nodes, uint16_t mode,
List preemptee_candidates,
List *preemptee_job_list)
@@ -501,13 +501,13 @@ extern int select_p_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
* 1) geometry requested
* 2) min/max nodes (BPs) requested
* 3) type: TORUS or MESH or NAV (torus else mesh)
- *
+ *
* note: we don't have to worry about security at this level
* as the SLURM block logic will handle access rights.
*/
- return submit_job(job_ptr, bitmap, min_nodes, max_nodes,
- req_nodes, mode, preemptee_candidates,
+ return submit_job(job_ptr, bitmap, min_nodes, max_nodes,
+ req_nodes, mode, preemptee_candidates,
preemptee_job_list);
}
@@ -545,7 +545,7 @@ extern int select_p_pack_select_info(time_t last_query_time, Buf *buffer_ptr)
/* check to see if data has changed */
if (last_query_time >= last_bg_update) {
- debug2("Node select info hasn't changed since %d",
+ debug2("Node select info hasn't changed since %d",
last_bg_update);
return SLURM_NO_CHANGE_IN_DATA;
} else if(blocks_are_created) {
@@ -574,21 +574,21 @@ extern int select_p_pack_select_info(time_t last_query_time, Buf *buffer_ptr)
if(bg_lists->freeing) {
slurm_mutex_lock(&block_state_mutex);
itr = list_iterator_create(bg_lists->freeing);
- while ((bg_record = (bg_record_t *) list_next(itr))
+ while ((bg_record = (bg_record_t *) list_next(itr))
!= NULL) {
xassert(bg_record->bg_block_id != NULL);
-
+
pack_block(bg_record, buffer);
blocks_packed++;
}
list_iterator_destroy(itr);
slurm_mutex_unlock(&block_state_mutex);
- }
+ }
tmp_offset = get_buf_offset(buffer);
set_buf_offset(buffer, 0);
pack32(blocks_packed, buffer);
set_buf_offset(buffer, tmp_offset);
-
+
*buffer_ptr = buffer;
} else {
error("select_p_pack_node_info: bg_lists->main not ready yet");
@@ -598,13 +598,13 @@ extern int select_p_pack_select_info(time_t last_query_time, Buf *buffer_ptr)
return SLURM_SUCCESS;
}
-extern int select_p_select_nodeinfo_pack(select_nodeinfo_t *nodeinfo,
+extern int select_p_select_nodeinfo_pack(select_nodeinfo_t *nodeinfo,
Buf buffer)
{
return select_nodeinfo_pack(nodeinfo, buffer);
}
-extern int select_p_select_nodeinfo_unpack(select_nodeinfo_t **nodeinfo,
+extern int select_p_select_nodeinfo_unpack(select_nodeinfo_t **nodeinfo,
Buf buffer)
{
return select_nodeinfo_unpack(nodeinfo, buffer);
@@ -630,7 +630,7 @@ extern int select_p_select_nodeinfo_set(struct job_record *job_ptr)
return select_nodeinfo_set(job_ptr);
}
-extern int select_p_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
+extern int select_p_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
enum select_nodedata_type dinfo,
enum node_states state,
void *data)
@@ -717,55 +717,55 @@ extern int select_p_update_block (update_block_msg_t *block_desc_ptr)
snprintf(reason, sizeof(reason),
"update_block: "
"Admin removing block %s %s",
- bg_record->bg_block_id, tmp);
+ bg_record->bg_block_id, tmp);
else
snprintf(reason, sizeof(reason),
"update_block: "
"Removing all blocks on midplane %s %s",
- bg_record->nodes, tmp);
-
+ bg_record->nodes, tmp);
+
} else {
snprintf(reason, sizeof(reason),
"update_block: "
"Admin set block %s state to %s %s",
- bg_record->bg_block_id,
- bg_block_state_string(block_desc_ptr->state), tmp);
+ bg_record->bg_block_id,
+ bg_block_state_string(block_desc_ptr->state), tmp);
}
/* First fail any job running on this block */
if(bg_record->job_running > NO_JOB_RUNNING) {
- slurm_fail_job(bg_record->job_running);
+ slurm_fail_job(bg_record->job_running);
/* need to set the job_ptr to NULL
here or we will get error message
about us trying to free this block
with a job in it.
*/
bg_record->job_ptr = NULL;
- }
-
+ }
+
/* Free all overlapping blocks and kill any jobs only
- * if we are going into an error state */
+ * if we are going into an error state */
if (bg_conf->layout_mode != LAYOUT_DYNAMIC
&& (block_desc_ptr->state == RM_PARTITION_ERROR)) {
bg_record_t *found_record = NULL;
ListIterator itr;
List delete_list = list_create(NULL);
-
+
itr = list_iterator_create(bg_lists->main);
while ((found_record = list_next(itr))) {
if (bg_record == found_record)
continue;
-
+
if(!blocks_overlap(bg_record, found_record)) {
debug2("block %s isn't part of errored %s",
- found_record->bg_block_id,
+ found_record->bg_block_id,
bg_record->bg_block_id);
continue;
}
if(found_record->job_running > NO_JOB_RUNNING) {
info("Failing job %u block %s "
"failed because overlapping block %s "
- "is in an error state.",
- found_record->job_running,
+ "is in an error state.",
+ found_record->job_running,
found_record->bg_block_id,
bg_record->bg_block_id);
/* We need to fail this job first to
@@ -781,11 +781,11 @@ extern int select_p_update_block (update_block_msg_t *block_desc_ptr)
} else {
debug2("block %s is part of errored %s "
"but no running job",
- found_record->bg_block_id,
- bg_record->bg_block_id);
+ found_record->bg_block_id,
+ bg_record->bg_block_id);
}
list_push(delete_list, found_record);
- }
+ }
list_iterator_destroy(itr);
free_block_list(delete_list);
list_destroy(delete_list);
@@ -818,19 +818,19 @@ extern int select_p_update_block (update_block_msg_t *block_desc_ptr)
while ((found_record = list_next(itr))) {
if (bg_record == found_record)
continue;
-
+
if(!bit_equal(bg_record->bitmap,
found_record->bitmap)) {
debug2("block %s isn't part of to be freed %s",
- found_record->bg_block_id,
+ found_record->bg_block_id,
bg_record->bg_block_id);
continue;
}
if(found_record->job_running > NO_JOB_RUNNING) {
info("Failing job %u block %s "
"failed because overlapping block %s "
- "is in an error state.",
- found_record->job_running,
+ "is in an error state.",
+ found_record->job_running,
found_record->bg_block_id,
bg_record->bg_block_id);
/* We need to fail this job first to
@@ -846,16 +846,16 @@ extern int select_p_update_block (update_block_msg_t *block_desc_ptr)
} else {
debug2("block %s is part of to be freed %s "
"but no running job",
- found_record->bg_block_id,
- bg_record->bg_block_id);
+ found_record->bg_block_id,
+ bg_record->bg_block_id);
}
list_push(delete_list, found_record);
- }
+ }
list_iterator_destroy(itr);
large_block:
free_block_list(delete_list);
- list_destroy(delete_list);
+ list_destroy(delete_list);
slurm_mutex_unlock(&block_state_mutex);
} else {
slurm_mutex_unlock(&block_state_mutex);
@@ -863,7 +863,7 @@ extern int select_p_update_block (update_block_msg_t *block_desc_ptr)
bg_block_state_string(block_desc_ptr->state));
return ESLURM_INVALID_NODE_STATE;
}
-
+
info("%s", reason);
last_bg_update = time(NULL);
@@ -896,7 +896,7 @@ extern int select_p_update_sub_node (update_block_msg_t *block_desc_ptr)
goto end_it;
}
name = block_desc_ptr->nodes;
-
+
while (name[j] != '\0') {
if (name[j] == '[') {
if(set<1) {
@@ -906,14 +906,14 @@ extern int select_p_update_sub_node (update_block_msg_t *block_desc_ptr)
i = j++;
if((name[j] < '0'
|| name[j] > 'Z'
- || (name[j] > '9'
+ || (name[j] > '9'
&& name[j] < 'A'))) {
error("update_sub_node: sub block is empty");
rc = SLURM_ERROR;
goto end_it;
}
while(name[i] != '\0') {
- if(name[i] == ']')
+ if(name[i] == ']')
break;
i++;
}
@@ -923,8 +923,8 @@ extern int select_p_update_sub_node (update_block_msg_t *block_desc_ptr)
rc = SLURM_ERROR;
goto end_it;
}
-
- strncpy(ionodes, name+j, i-j);
+
+ strncpy(ionodes, name+j, i-j);
set++;
break;
} else if((name[j] >= '0'
@@ -940,24 +940,24 @@ extern int select_p_update_sub_node (update_block_msg_t *block_desc_ptr)
if((name[j+i] >= '0'
&& name[j+i] <= '9')
|| (name[j+i] >= 'A'
- && name[j+i] <= 'Z'))
+ && name[j+i] <= 'Z'))
continue;
-
+
error("update_sub_node: "
"misformatted name given %s",
name);
rc = SLURM_ERROR;
goto end_it;
}
-
+
strncpy(coord, name+j,
- BA_SYSTEM_DIMENSIONS);
+ BA_SYSTEM_DIMENSIONS);
j += BA_SYSTEM_DIMENSIONS-1;
set++;
}
j++;
}
-
+
if(set != 2) {
error("update_sub_node: "
"I didn't get the base partition and the sub part.");
@@ -970,7 +970,7 @@ extern int select_p_update_sub_node (update_block_msg_t *block_desc_ptr)
error("update_sub_node: Invalid ionode '%s' given.", ionodes);
rc = SLURM_ERROR;
FREE_NULL_BITMAP(ionode_bitmap);
- goto end_it;
+ goto end_it;
}
node_name = xstrdup_printf("%s%s", bg_conf->slurm_node_prefix, coord);
/* find out how many nodecards to get for each ionode */
@@ -981,7 +981,7 @@ extern int select_p_update_sub_node (update_block_msg_t *block_desc_ptr)
if(bit_test(ionode_bitmap, i)) {
if((int)nc_pos != (int)last_pos) {
/* find first bit in nc */
- int start_io =
+ int start_io =
(int)nc_pos * bg_conf->io_ratio;
down_nodecard(node_name, start_io);
last_pos = nc_pos;
@@ -994,20 +994,20 @@ extern int select_p_update_sub_node (update_block_msg_t *block_desc_ptr)
node_name, ionodes);
up_nodecard(node_name, ionode_bitmap);
} else {
- error("update_sub_node: Unknown state %s",
+ error("update_sub_node: Unknown state %s",
bg_block_state_string(block_desc_ptr->state));
rc = ESLURM_INVALID_BLOCK_STATE;
}
-
+
FREE_NULL_BITMAP(ionode_bitmap);
xfree(node_name);
-
+
last_bg_update = time(NULL);
end_it:
return rc;
}
-extern int select_p_get_info_from_plugin (enum select_plugindata_info dinfo,
+extern int select_p_get_info_from_plugin (enum select_plugindata_info dinfo,
struct job_record *job_ptr,
void *data)
{
@@ -1026,7 +1026,7 @@ extern int select_p_get_info_from_plugin (enum select_plugindata_info dinfo,
else
*tmp16 = 0;
break;
-
+
case SELECT_CONFIG_INFO:
*tmp_list = _get_config();
break;
@@ -1051,7 +1051,7 @@ extern int select_p_update_node_state (int index, uint16_t state)
for (y = DIM_SIZE[Y] - 1; y >= 0; y--) {
for (z = 0; z < DIM_SIZE[Z]; z++) {
for (x = 0; x < DIM_SIZE[X]; x++) {
- if (ba_system_ptr->grid[x][y][z].index
+ if (ba_system_ptr->grid[x][y][z].index
== index) {
ba_update_node_state(
&ba_system_ptr->grid[x][y][z],
@@ -1088,16 +1088,16 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
else if((*nodes) > bg_conf->bp_node_cnt) {
tmp = (*nodes);
tmp /= bg_conf->bp_node_cnt;
- if(tmp < 1)
+ if(tmp < 1)
tmp = 1;
- } else
+ } else
tmp = 1;
(*nodes) = tmp;
break;
case SELECT_APPLY_NODE_MIN_OFFSET:
if((*nodes) == 1) {
- /* Job will actually get more than one c-node,
- * but we can't be sure exactly how much so we
+ /* Job will actually get more than one c-node,
+ * but we can't be sure exactly how much so we
* don't scale up this value. */
break;
}
@@ -1118,30 +1118,30 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
SELECT_JOBDATA_ALTERED, &tmp);
tmp = NO_VAL;
set_select_jobinfo(job_desc->select_jobinfo,
- SELECT_JOBDATA_MAX_CPUS,
+ SELECT_JOBDATA_MAX_CPUS,
&tmp);
-
+
if(job_desc->min_nodes == (uint32_t) NO_VAL)
return SLURM_SUCCESS;
get_select_jobinfo(job_desc->select_jobinfo,
SELECT_JOBDATA_GEOMETRY, &req_geometry);
- if(req_geometry[0] != 0
+ if(req_geometry[0] != 0
&& req_geometry[0] != (uint16_t)NO_VAL) {
job_desc->min_nodes = 1;
for (i=0; i<BA_SYSTEM_DIMENSIONS; i++)
- job_desc->min_nodes *=
+ job_desc->min_nodes *=
(uint16_t)req_geometry[i];
job_desc->min_nodes *= bg_conf->bp_node_cnt;
job_desc->max_nodes = job_desc->min_nodes;
}
-
+
/* make sure if the user only specified num_procs to
set min_nodes correctly
*/
if(job_desc->num_procs > job_desc->min_nodes)
- job_desc->min_nodes =
+ job_desc->min_nodes =
job_desc->num_procs / bg_conf->cpu_ratio;
/* initialize num_procs to the min_nodes */
@@ -1154,17 +1154,17 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
/* See if min_nodes is greater than one base partition */
if(job_desc->min_nodes > bg_conf->bp_node_cnt) {
/*
- * if it is make sure it is a factor of
- * bg_conf->bp_node_cnt, if it isn't make it
- * that way
+ * if it is make sure it is a factor of
+ * bg_conf->bp_node_cnt, if it isn't make it
+ * that way
*/
tmp = job_desc->min_nodes % bg_conf->bp_node_cnt;
if(tmp > 0)
- job_desc->min_nodes +=
+ job_desc->min_nodes +=
(bg_conf->bp_node_cnt-tmp);
- }
+ }
tmp = job_desc->min_nodes / bg_conf->bp_node_cnt;
-
+
/* this means it is greater or equal to one bp */
if(tmp > 0) {
set_select_jobinfo(job_desc->select_jobinfo,
@@ -1172,26 +1172,26 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
&job_desc->min_nodes);
job_desc->min_nodes = tmp;
job_desc->num_procs = bg_conf->cpus_per_bp * tmp;
- } else {
+ } else {
#ifdef HAVE_BGL
if(job_desc->min_nodes <= bg_conf->nodecard_node_cnt
&& bg_conf->nodecard_ionode_cnt)
- job_desc->min_nodes =
+ job_desc->min_nodes =
bg_conf->nodecard_node_cnt;
- else if(job_desc->min_nodes
+ else if(job_desc->min_nodes
<= bg_conf->quarter_node_cnt)
- job_desc->min_nodes =
+ job_desc->min_nodes =
bg_conf->quarter_node_cnt;
- else
- job_desc->min_nodes =
+ else
+ job_desc->min_nodes =
bg_conf->bp_node_cnt;
-
+
set_select_jobinfo(job_desc->select_jobinfo,
SELECT_JOBDATA_NODE_CNT,
&job_desc->min_nodes);
tmp = bg_conf->bp_node_cnt/job_desc->min_nodes;
-
+
job_desc->num_procs = bg_conf->cpus_per_bp/tmp;
job_desc->min_nodes = 1;
#else
@@ -1203,12 +1203,12 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
}
i *= 2;
}
-
+
set_select_jobinfo(job_desc->select_jobinfo,
SELECT_JOBDATA_NODE_CNT,
&job_desc->min_nodes);
- job_desc->num_procs = job_desc->min_nodes
+ job_desc->num_procs = job_desc->min_nodes
* bg_conf->cpu_ratio;
job_desc->min_nodes = 1;
#endif
@@ -1218,7 +1218,7 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
if(job_desc->max_nodes > bg_conf->bp_node_cnt) {
tmp = job_desc->max_nodes % bg_conf->bp_node_cnt;
if(tmp > 0)
- job_desc->max_nodes +=
+ job_desc->max_nodes +=
(bg_conf->bp_node_cnt-tmp);
}
tmp = job_desc->max_nodes / bg_conf->bp_node_cnt;
@@ -1227,28 +1227,28 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
job_desc->max_nodes = tmp;
tmp *= bg_conf->cpus_per_bp;
set_select_jobinfo(job_desc->select_jobinfo,
- SELECT_JOBDATA_MAX_CPUS,
+ SELECT_JOBDATA_MAX_CPUS,
&tmp);
tmp = NO_VAL;
} else {
#ifdef HAVE_BGL
if(job_desc->max_nodes <= bg_conf->nodecard_node_cnt
&& bg_conf->nodecard_ionode_cnt)
- job_desc->max_nodes =
+ job_desc->max_nodes =
bg_conf->nodecard_node_cnt;
- else if(job_desc->max_nodes
+ else if(job_desc->max_nodes
<= bg_conf->quarter_node_cnt)
- job_desc->max_nodes =
+ job_desc->max_nodes =
bg_conf->quarter_node_cnt;
- else
- job_desc->max_nodes =
+ else
+ job_desc->max_nodes =
bg_conf->bp_node_cnt;
-
+
tmp = bg_conf->bp_node_cnt/job_desc->max_nodes;
tmp = bg_conf->cpus_per_bp/tmp;
-
+
set_select_jobinfo(job_desc->select_jobinfo,
- SELECT_JOBDATA_MAX_CPUS,
+ SELECT_JOBDATA_MAX_CPUS,
&tmp);
job_desc->max_nodes = 1;
#else
@@ -1269,19 +1269,19 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
#endif
}
tmp = NO_VAL;
-
+
break;
default:
error("unknown option %d for alter_node_cnt",type);
}
-
+
return SLURM_SUCCESS;
}
extern int select_p_reconfigure(void)
{
slurm_conf_lock();
- if(!slurmctld_conf.slurm_user_name
+ if(!slurmctld_conf.slurm_user_name
|| strcmp(bg_conf->slurm_user_name, slurmctld_conf.slurm_user_name))
error("The slurm user has changed from '%s' to '%s'. "
"If this is really what you "
@@ -1295,7 +1295,7 @@ extern int select_p_reconfigure(void)
"want you will need to restart slurm for this "
"change to be enforced in the bluegene plugin.",
bg_conf->slurm_node_prefix, slurmctld_conf.node_prefix);
- slurm_conf_unlock();
+ slurm_conf_unlock();
return SLURM_SUCCESS;
}
diff --git a/src/plugins/select/bluegene/plugin/sfree.c b/src/plugins/select/bluegene/plugin/sfree.c
index d21f5c68a805f8a478e86b6987bc406b506b392a..f70dfbeca4d34a95af0f9e977fcb024979fcf0cf 100644
--- a/src/plugins/select/bluegene/plugin/sfree.c
+++ b/src/plugins/select/bluegene/plugin/sfree.c
@@ -7,32 +7,32 @@
* Written by Danny Auble <da@llnl.gov>
*
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -58,7 +58,7 @@ static int _get_new_info_block(block_info_msg_t **block_ptr)
static block_info_msg_t *new_bg_ptr = NULL;
if (bg_info_ptr) {
- error_code = slurm_load_block_info(bg_info_ptr->last_update,
+ error_code = slurm_load_block_info(bg_info_ptr->last_update,
&new_bg_ptr);
if (error_code == SLURM_SUCCESS) {
slurm_free_block_info_msg(&bg_info_ptr);
@@ -72,9 +72,9 @@ static int _get_new_info_block(block_info_msg_t **block_ptr)
bg_info_ptr = new_bg_ptr;
- if(*block_ptr != bg_info_ptr)
+ if(*block_ptr != bg_info_ptr)
error_code = SLURM_SUCCESS;
-
+
*block_ptr = new_bg_ptr;
#endif
return error_code;
@@ -82,20 +82,20 @@ static int _get_new_info_block(block_info_msg_t **block_ptr)
static int _check_status()
{
- ListIterator itr = list_iterator_create(block_list);
+ ListIterator itr = list_iterator_create(block_list);
int i=0;
block_info_msg_t *block_ptr = NULL;
char *block_name = NULL;
-
+
while(list_count(block_list)) {
info("waiting for %d bgblocks to free...",
list_count(block_list));
- if(_get_new_info_block(&block_ptr)
+ if(_get_new_info_block(&block_ptr)
== SLURM_SUCCESS) {
while((block_name = list_next(itr))) {
for (i=0; i<block_ptr->record_count;
i++) {
- if(!strcmp(block_name,
+ if(!strcmp(block_name,
block_ptr->
block_array[i].
bg_block_id)) {
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
xstrdup(block_ptr->
block_array[i].bg_block_id));
}
- }
+ }
itr = list_iterator_create(block_list);
while((block_name = list_next(itr))) {
diff --git a/src/plugins/select/bluegene/plugin/sfree.h b/src/plugins/select/bluegene/plugin/sfree.h
index 00a5e964bb6822e98e6a9bf32f8276a56d1f9e67..a6e05ea0f0139dba3092206d390797eb55dd3361 100644
--- a/src/plugins/select/bluegene/plugin/sfree.h
+++ b/src/plugins/select/bluegene/plugin/sfree.h
@@ -15,15 +15,15 @@
* 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
+ * 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
+ * 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
diff --git a/src/plugins/select/bluegene/plugin/slurm_epilog.c b/src/plugins/select/bluegene/plugin/slurm_epilog.c
index 95c4128cd1093f540f3ea4cec013829b014866d0..0fa52617542162ec5bfd0fb8dde415ac92147b75 100644
--- a/src/plugins/select/bluegene/plugin/slurm_epilog.c
+++ b/src/plugins/select/bluegene/plugin/slurm_epilog.c
@@ -1,6 +1,6 @@
/*****************************************************************************\
- * slurm_ epilog.c - Wait until the specified partition is no longer ready and
- * owned by this user. This is executed via SLURM to synchronize the
+ * slurm_ epilog.c - Wait until the specified partition is no longer ready and
+ * owned by this user. This is executed via SLURM to synchronize the
* user's job execution with slurmctld configuration of partitions.
*
* $Id$
@@ -19,15 +19,15 @@
* 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
+ * 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
+ * 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
+ * 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
@@ -58,17 +58,17 @@
#define _DEBUG 0
/*
- * Check the bgblock's status every POLL_SLEEP seconds.
+ * Check the bgblock's status every POLL_SLEEP seconds.
* Retry for a period of MIN_DELAY + (INCR_DELAY * base partition count).
* For example if MIN_DELAY=300 and INCR_DELAY=20, wait up to 428 seconds
* for a 16 base partition bgblock to ready (300 + 20 * 16).
- */
+ */
#define POLL_SLEEP 3 /* retry interval in seconds */
#define MIN_DELAY 300 /* time in seconds */
#define INCR_DELAY 20 /* time in seconds per BP */
int max_delay = MIN_DELAY;
-int cur_delay = 0;
+int cur_delay = 0;
static int _get_job_size(uint32_t job_id);
static void _wait_part_not_ready(uint32_t job_id);
diff --git a/src/plugins/select/bluegene/plugin/slurm_prolog.c b/src/plugins/select/bluegene/plugin/slurm_prolog.c
index 1d368c701db3d55f2f3e08a1687704f1532aed82..381b37139db72e34b6aad77a716f4bdfda8f428a 100644
--- a/src/plugins/select/bluegene/plugin/slurm_prolog.c
+++ b/src/plugins/select/bluegene/plugin/slurm_prolog.c
@@ -1,6 +1,6 @@
/*****************************************************************************\
- * slurm_ prolog.c - Wait until the specified partition is ready and owned by
- * this user. This is executed via SLURM to synchronize the user's job
+ * slurm_ prolog.c - Wait until the specified partition is ready and owned by
+ * this user. This is executed via SLURM to synchronize the user's job
* execution with slurmctld configuration of partitions.
*****************************************************************************
* Copyright (C) 2004 The Regents of the University of California.
@@ -17,15 +17,15 @@
* 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
+ * 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
+ * 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
+ * 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
@@ -59,9 +59,9 @@
#define POLL_SLEEP 3 /* retry interval in seconds */
int max_delay = BG_FREE_PREVIOUS_BLOCK + BG_MIN_BLOCK_BOOT;
-int cur_delay = 0;
-
-enum rm_partition_state {RM_PARTITION_FREE,
+int cur_delay = 0;
+
+enum rm_partition_state {RM_PARTITION_FREE,
RM_PARTITION_CONFIGURING,
RM_PARTITION_READY,
RM_PARTITION_BUSY,
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
static int _wait_part_ready(uint32_t job_id)
{
int is_ready = 0, i, rc;
-
+
max_delay = BG_FREE_PREVIOUS_BLOCK + BG_MIN_BLOCK_BOOT +
(BG_INCR_BLOCK_BOOT * _get_job_size(job_id));
@@ -112,7 +112,7 @@ static int _wait_part_ready(uint32_t job_id)
if (i) {
sleep(POLL_SLEEP);
rc = _partitions_dealloc();
- if ((rc == 0) || (rc == -1))
+ if ((rc == 0) || (rc == -1))
cur_delay += POLL_SLEEP;
#if _DEBUG
printf(".");
@@ -188,9 +188,9 @@ static int _partitions_dealloc()
{
static block_info_msg_t *bg_info_ptr = NULL, *new_bg_ptr = NULL;
int rc = 0, error_code = 0, i;
-
+
if (bg_info_ptr) {
- error_code = slurm_load_block_info(bg_info_ptr->last_update,
+ error_code = slurm_load_block_info(bg_info_ptr->last_update,
&new_bg_ptr);
if (error_code == SLURM_SUCCESS)
slurm_free_block_info_msg(&bg_info_ptr);
@@ -208,7 +208,7 @@ static int _partitions_dealloc()
return -1;
}
for (i=0; i<new_bg_ptr->record_count; i++) {
- if(new_bg_ptr->block_array[i].state
+ if(new_bg_ptr->block_array[i].state
== RM_PARTITION_DEALLOCATING) {
rc = 1;
break;
diff --git a/src/plugins/select/bluegene/plugin/state_test.c b/src/plugins/select/bluegene/plugin/state_test.c
index 6076f48bef51733bd9da6feb1eb9c17f16134ec5..edd7da29b17def652932ae511108684002190013 100644
--- a/src/plugins/select/bluegene/plugin/state_test.c
+++ b/src/plugins/select/bluegene/plugin/state_test.c
@@ -1,6 +1,6 @@
/*****************************************************************************\
- * state_test.c - Test state of Bluegene base partitions and switches.
- * DRAIN nodes in SLURM that are not usable.
+ * state_test.c - Test state of Bluegene base partitions and switches.
+ * DRAIN nodes in SLURM that are not usable.
*
* $Id$
*****************************************************************************
@@ -8,32 +8,32 @@
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Dan Phung <phung4@llnl.gov> and Morris Jette <jette1@llnl.gov>
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -74,23 +74,23 @@ static void _configure_node_down(rm_bp_id_t bp_id, my_bluegene_t *my_bg)
for (i=0; i<bp_num; i++) {
if (i) {
- if ((rc = bridge_get_data(my_bg, RM_NextBP, &my_bp))
+ if ((rc = bridge_get_data(my_bg, RM_NextBP, &my_bp))
!= STATUS_OK) {
- error("bridge_get_data(RM_NextBP): %s",
+ error("bridge_get_data(RM_NextBP): %s",
bg_err_str(rc));
continue;
}
} else {
- if ((rc = bridge_get_data(my_bg, RM_FirstBP, &my_bp))
- !=
+ if ((rc = bridge_get_data(my_bg, RM_FirstBP, &my_bp))
+ !=
STATUS_OK) {
- error("bridge_get_data(RM_FirstBP): %s",
+ error("bridge_get_data(RM_FirstBP): %s",
bg_err_str(rc));
continue;
}
}
- if ((rc = bridge_get_data(my_bp, RM_BPID, &bpid))
+ if ((rc = bridge_get_data(my_bp, RM_BPID, &bpid))
!= STATUS_OK) {
error("bridge_get_data(RM_BPID): %s", bg_err_str(rc));
continue;
@@ -107,34 +107,34 @@ static void _configure_node_down(rm_bp_id_t bp_id, my_bluegene_t *my_bg)
}
free(bpid);
- if ((rc = bridge_get_data(my_bp, RM_BPState, &bp_state))
+ if ((rc = bridge_get_data(my_bp, RM_BPState, &bp_state))
!= STATUS_OK) {
- error("bridge_get_data(RM_BPState): %s",
+ error("bridge_get_data(RM_BPState): %s",
bg_err_str(rc));
continue;
}
if (bp_state != RM_BP_UP) /* already down */
continue;
- if ((rc = bridge_get_data(my_bp, RM_BPLoc, &bp_loc))
+ if ((rc = bridge_get_data(my_bp, RM_BPLoc, &bp_loc))
!= STATUS_OK) {
error("bridge_get_data(RM_BPLoc): %s", bg_err_str(rc));
continue;
}
-
- snprintf(bg_down_node, sizeof(bg_down_node), "%s%c%c%c",
+
+ snprintf(bg_down_node, sizeof(bg_down_node), "%s%c%c%c",
bg_conf->slurm_node_prefix,
alpha_num[bp_loc.X], alpha_num[bp_loc.Y],
alpha_num[bp_loc.Z]);
-
-
+
+
if (node_already_down(bg_down_node))
break;
error("switch for node %s is bad", bg_down_node);
slurm_make_time_str(&now, time_str, sizeof(time_str));
snprintf(reason, sizeof(reason),
- "select_bluegene: MMCS switch not UP [SLURM@%s]",
+ "select_bluegene: MMCS switch not UP [SLURM@%s]",
time_str);
slurm_drain_nodes(bg_down_node, reason);
break;
@@ -196,24 +196,24 @@ static int _test_down_nodecards(rm_BP_t *bp_ptr)
node_name = xstrdup_printf("%s%c%c%c",
bg_conf->slurm_node_prefix,
- alpha_num[coord[X]],
+ alpha_num[coord[X]],
alpha_num[coord[Y]],
alpha_num[coord[Z]]);
if((rc = bridge_get_data(ncard_list, RM_NodeCardListSize, &num))
!= STATUS_OK) {
- error("bridge_get_data(RM_NodeCardListSize): %s",
+ error("bridge_get_data(RM_NodeCardListSize): %s",
bg_err_str(rc));
rc = SLURM_ERROR;
goto clean_up;
}
-
+
for(i=0; i<num; i++) {
int io_start = 0;
if (i) {
- if ((rc = bridge_get_data(ncard_list,
- RM_NodeCardListNext,
+ if ((rc = bridge_get_data(ncard_list,
+ RM_NodeCardListNext,
&ncard)) != STATUS_OK) {
error("bridge_get_data"
"(RM_NodeCardListNext): %s",
@@ -222,8 +222,8 @@ static int _test_down_nodecards(rm_BP_t *bp_ptr)
goto clean_up;
}
} else {
- if ((rc = bridge_get_data(ncard_list,
- RM_NodeCardListFirst,
+ if ((rc = bridge_get_data(ncard_list,
+ RM_NodeCardListFirst,
&ncard)) != STATUS_OK) {
error("bridge_get_data"
"(RM_NodeCardListFirst: %s",
@@ -232,8 +232,8 @@ static int _test_down_nodecards(rm_BP_t *bp_ptr)
goto clean_up;
}
}
- if ((rc = bridge_get_data(ncard,
- RM_NodeCardState,
+ if ((rc = bridge_get_data(ncard,
+ RM_NodeCardState,
&state)) != STATUS_OK) {
error("bridge_get_data(RM_NodeCardState: %s",
rc);
@@ -241,25 +241,25 @@ static int _test_down_nodecards(rm_BP_t *bp_ptr)
goto clean_up;
}
- if(state == RM_NODECARD_UP)
+ if(state == RM_NODECARD_UP)
continue;
- if ((rc = bridge_get_data(ncard,
- RM_NodeCardID,
+ if ((rc = bridge_get_data(ncard,
+ RM_NodeCardID,
&nc_name)) != STATUS_OK) {
error("bridge_get_data(RM_NodeCardID): %d",rc);
rc = SLURM_ERROR;
goto clean_up;
}
-
+
if(!nc_name) {
rc = SLURM_ERROR;
goto clean_up;
}
#ifdef HAVE_BGL
- if ((rc = bridge_get_data(ncard,
- RM_NodeCardQuarter,
+ if ((rc = bridge_get_data(ncard,
+ RM_NodeCardQuarter,
&io_start)) != STATUS_OK) {
error("bridge_get_data(CardQuarter): %d",rc);
goto clean_up;
@@ -285,7 +285,7 @@ static int _test_down_nodecards(rm_BP_t *bp_ptr)
} else {
error("We don't have the system configured "
"for this nodecard %s, we only have "
- "%d ionodes and this starts at %d",
+ "%d ionodes and this starts at %d",
nc_name, io_start, bg_conf->numpsets);
}
free(nc_name);
@@ -314,7 +314,7 @@ static int _test_down_nodecards(rm_BP_t *bp_ptr)
*/
/* if(ionode_bitmap) { */
/* info("got ionode_bitmap"); */
-
+
/* bit_not(ionode_bitmap); */
/* up_nodecard(node_name, ionode_bitmap); */
/* } else { */
@@ -326,7 +326,7 @@ static int _test_down_nodecards(rm_BP_t *bp_ptr)
/* while ((bg_record = list_next(itr))) { */
/* if(bg_record->job_running != BLOCK_ERROR_STATE) */
/* continue; */
-
+
/* if(!bit_test(bg_record->bitmap, bp_bit)) */
/* continue; */
/* info("bringing %s back to service", */
@@ -337,7 +337,7 @@ static int _test_down_nodecards(rm_BP_t *bp_ptr)
/* } */
/* list_iterator_destroy(itr); */
/* slurm_mutex_unlock(&block_state_mutex); */
-
+
/* /\* FIX ME: This needs to call the opposite of */
/* slurm_drain_nodes which does not yet exist. */
/* *\/ */
@@ -350,7 +350,7 @@ static int _test_down_nodecards(rm_BP_t *bp_ptr)
/* } */
/* } */
/* } */
-
+
clean_up:
if(ncard_list)
bridge_free_nodecard_list(ncard_list);
@@ -358,16 +358,16 @@ clean_up:
/* if(ionode_bitmap) */
/* FREE_NULL_BITMAP(ionode_bitmap); */
free(bp_id);
-
+
return rc;
}
-/* Test for nodes that are not UP in MMCS and DRAIN them in SLURM */
+/* Test for nodes that are not UP in MMCS and DRAIN them in SLURM */
static void _test_down_nodes(my_bluegene_t *my_bg)
{
int bp_num, i, rc;
rm_BP_t *my_bp;
-
+
debug2("Running _test_down_nodes");
if ((rc = bridge_get_data(my_bg, RM_BPNum, &bp_num)) != STATUS_OK) {
error("bridge_get_data(RM_BPNum): %s", bg_err_str(rc));
@@ -375,16 +375,16 @@ static void _test_down_nodes(my_bluegene_t *my_bg)
}
for (i=0; i<bp_num; i++) {
if (i) {
- if ((rc = bridge_get_data(my_bg, RM_NextBP, &my_bp))
+ if ((rc = bridge_get_data(my_bg, RM_NextBP, &my_bp))
!= STATUS_OK) {
- error("bridge_get_data(RM_NextBP): %s",
+ error("bridge_get_data(RM_NextBP): %s",
bg_err_str(rc));
continue;
}
} else {
- if ((rc = bridge_get_data(my_bg, RM_FirstBP, &my_bp))
+ if ((rc = bridge_get_data(my_bg, RM_FirstBP, &my_bp))
!= STATUS_OK) {
- error("bridge_get_data(RM_FirstBP): %s",
+ error("bridge_get_data(RM_FirstBP): %s",
bg_err_str(rc));
continue;
}
@@ -394,7 +394,7 @@ static void _test_down_nodes(my_bluegene_t *my_bg)
}
}
-/* Test for switches that are not UP in MMCS,
+/* Test for switches that are not UP in MMCS,
* when found DRAIN them in SLURM and configure their base partition DOWN */
static void _test_down_switches(my_bluegene_t *my_bg)
{
@@ -404,22 +404,22 @@ static void _test_down_switches(my_bluegene_t *my_bg)
rm_switch_state_t switch_state;
debug2("Running _test_down_switches");
- if ((rc = bridge_get_data(my_bg, RM_SwitchNum, &switch_num))
+ if ((rc = bridge_get_data(my_bg, RM_SwitchNum, &switch_num))
!= STATUS_OK) {
error("bridge_get_data(RM_SwitchNum): %s", bg_err_str(rc));
switch_num = 0;
}
for (i=0; i<switch_num; i++) {
if (i) {
- if ((rc = bridge_get_data(my_bg, RM_NextSwitch,
+ if ((rc = bridge_get_data(my_bg, RM_NextSwitch,
&my_switch))
!= STATUS_OK) {
- error("bridge_get_data(RM_NextSwitch): %s",
+ error("bridge_get_data(RM_NextSwitch): %s",
bg_err_str(rc));
continue;
}
} else {
- if ((rc = bridge_get_data(my_bg, RM_FirstSwitch,
+ if ((rc = bridge_get_data(my_bg, RM_FirstSwitch,
&my_switch))
!= STATUS_OK) {
error("bridge_get_data(RM_FirstSwitch): %s",
@@ -428,7 +428,7 @@ static void _test_down_switches(my_bluegene_t *my_bg)
}
}
- if ((rc = bridge_get_data(my_switch, RM_SwitchState,
+ if ((rc = bridge_get_data(my_switch, RM_SwitchState,
&switch_state)) != STATUS_OK) {
error("bridge_get_data(RM_SwitchState): %s",
bg_err_str(rc));
@@ -436,7 +436,7 @@ static void _test_down_switches(my_bluegene_t *my_bg)
}
if (switch_state == RM_SWITCH_UP)
continue;
- if ((rc = bridge_get_data(my_switch, RM_SwitchBPID, &bp_id))
+ if ((rc = bridge_get_data(my_switch, RM_SwitchBPID, &bp_id))
!= STATUS_OK) {
error("bridge_get_data(RM_SwitchBPID): %s",
bg_err_str(rc));
@@ -458,7 +458,7 @@ static void _test_down_switches(my_bluegene_t *my_bg)
extern int node_already_down(char *node_name)
{
struct node_record *node_ptr = find_node_record(node_name);
-
+
if (node_ptr) {
if(IS_NODE_DRAIN(node_ptr))
return 2;
@@ -471,9 +471,9 @@ extern int node_already_down(char *node_name)
return 0;
}
-/*
- * Search MMCS for failed switches and nodes. Failed resources are DRAINED in
- * SLURM. This relies upon rm_get_BG(), which is slow (10+ seconds) so run
+/*
+ * Search MMCS for failed switches and nodes. Failed resources are DRAINED in
+ * SLURM. This relies upon rm_get_BG(), which is slow (10+ seconds) so run
* this test infrequently.
*/
extern void test_mmcs_failures(void)
@@ -483,12 +483,12 @@ extern void test_mmcs_failures(void)
int rc;
if ((rc = bridge_get_bg(&local_bg)) != STATUS_OK) {
-
+
error("bridge_get_BG(): %s", bg_err_str(rc));
return;
}
-
-
+
+
_test_down_switches(local_bg);
_test_down_nodes(local_bg);
if ((rc = bridge_free_bg(local_bg)) != STATUS_OK)
@@ -504,26 +504,26 @@ extern int check_block_bp_states(char *bg_block_id)
rm_BP_t *bp_ptr = NULL;
int bp_cnt = 0;
int i = 0;
-
+
if ((rc = bridge_get_block(bg_block_id, &block_ptr)) != STATUS_OK) {
error("Block %s doesn't exist.", bg_block_id);
rc = SLURM_ERROR;
-
+
goto done;
}
-
-
- if ((rc = bridge_get_data(block_ptr, RM_PartitionBPNum, &bp_cnt))
+
+
+ if ((rc = bridge_get_data(block_ptr, RM_PartitionBPNum, &bp_cnt))
!= STATUS_OK) {
error("bridge_get_data(RM_BPNum): %s", bg_err_str(rc));
rc = SLURM_ERROR;
goto cleanup;
}
-
+
for(i=0; i<bp_cnt; i++) {
if(i) {
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionNextBP,
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionNextBP,
&bp_ptr))
!= STATUS_OK) {
error("bridge_get_data(RM_NextBP): %s",
@@ -532,20 +532,20 @@ extern int check_block_bp_states(char *bg_block_id)
break;
}
} else {
- if ((rc = bridge_get_data(block_ptr,
- RM_PartitionFirstBP,
+ if ((rc = bridge_get_data(block_ptr,
+ RM_PartitionFirstBP,
&bp_ptr))
!= STATUS_OK) {
- error("bridge_get_data(RM_FirstBP): %s",
+ error("bridge_get_data(RM_FirstBP): %s",
bg_err_str(rc));
rc = SLURM_ERROR;
break;
- }
+ }
}
_test_down_nodecards(bp_ptr);
}
-
+
cleanup:
bridge_free_block(block_ptr);
done:
diff --git a/src/plugins/select/bluegene/plugin/state_test.h b/src/plugins/select/bluegene/plugin/state_test.h
index 0cd0ee5af49fa3d9de4c5a3380491f97eac2683d..16adcc8a25566a6e0203c8c308879f7084ceb42a 100644
--- a/src/plugins/select/bluegene/plugin/state_test.h
+++ b/src/plugins/select/bluegene/plugin/state_test.h
@@ -1,36 +1,36 @@
/*****************************************************************************\
- * state_test.h - header for Blue Gene node and switch state test.
+ * state_test.h - header for Blue Gene node and switch state test.
* $Id$
*****************************************************************************
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Dan Phung <phung4@llnl.gov> et. al.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -44,15 +44,15 @@
extern int node_already_down(char *node_name);
/*
- * Search MMCS for failed switches and nodes. Failed resources are DRAINED in
- * SLURM. This relies upon rm_get_BGL(), which is slow (10+ seconds) so run
+ * Search MMCS for failed switches and nodes. Failed resources are DRAINED in
+ * SLURM. This relies upon rm_get_BGL(), which is slow (10+ seconds) so run
* this test infrequently.
*/
extern void test_mmcs_failures(void);
/*
- * Search MMCS for failed switches and nodes inside of block.
- * Failed resources are DRAINED in SLURM. This relies upon rm_get_partition(),
+ * Search MMCS for failed switches and nodes inside of block.
+ * Failed resources are DRAINED in SLURM. This relies upon rm_get_partition(),
*/
extern int check_block_bp_states(char *bg_block_id);
diff --git a/src/plugins/select/bluegene/wrap_rm_api.h b/src/plugins/select/bluegene/wrap_rm_api.h
index 9c2bdaf883a1db550b4b5f298018e9ea8a754f10..02fe3de606cc0869a380017229a37881578092ce 100644
--- a/src/plugins/select/bluegene/wrap_rm_api.h
+++ b/src/plugins/select/bluegene/wrap_rm_api.h
@@ -1,7 +1,7 @@
/* We can not include IBM's attach_bgl.h or attach_bg.h file due to problems
* in compiling it with gcc and missing externals in that file, so we define
- * our own version of the header here and define critical variable. We also
- * "#define ATTACH_BGL_H" and "define ATTACH_BG_H" to avoid having IBM's
+ * our own version of the header here and define critical variable. We also
+ * "#define ATTACH_BGL_H" and "define ATTACH_BG_H" to avoid having IBM's
* header files loaded for BGL and BGP systems respectively.*/
#ifndef ATTACH_BGL_H /* Test for attach_bgl.h on BGL */
@@ -37,7 +37,7 @@
typedef int rm_BP_state_t;
typedef char * rm_job_list_t;
- /* these are the typedefs that we will need to have
+ /* these are the typedefs that we will need to have
* if we want the states on the Front End Node of a BG system
* make certain they match the rm_api.h values on the Service Node */
enum rm_partition_state {RM_PARTITION_FREE,
diff --git a/src/plugins/select/cons_res/Makefile.am b/src/plugins/select/cons_res/Makefile.am
index 631d2dc979474584b014217ac3c31ef089236322..9f708cae68d898053ef6ac24a45e2ea17e86cf55 100644
--- a/src/plugins/select/cons_res/Makefile.am
+++ b/src/plugins/select/cons_res/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/select/cons_res/Makefile.in b/src/plugins/select/cons_res/Makefile.in
index b80675925487f76b47a8dd00411fdcaea0363d33..97c1f52c8fed7471db20ce2ca0e4b48d7130fa78 100644
--- a/src/plugins/select/cons_res/Makefile.in
+++ b/src/plugins/select/cons_res/Makefile.in
@@ -312,7 +312,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = select_cons_res.la
diff --git a/src/plugins/select/cons_res/dist_tasks.c b/src/plugins/select/cons_res/dist_tasks.c
index 5c44654d7f8fb8c911733cf2ed9e5525bf2b2de2..b454bf8c4a8081434ee3ef9c72c7f34235ab1ea9 100644
--- a/src/plugins/select/cons_res/dist_tasks.c
+++ b/src/plugins/select/cons_res/dist_tasks.c
@@ -1,20 +1,20 @@
/*****************************************************************************\
* dist_tasks - Assign task count to {socket,core,thread} or CPU
* resources
- *****************************************************************************
+ *****************************************************************************
* Copyright (C) 2006-2008 Hewlett-Packard Development Company, L.P.
* Written by Susanne M. Balle, <susanne.balle@hp.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
@@ -30,7 +30,7 @@
* 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.
@@ -125,7 +125,7 @@ static int _compute_plane_dist(struct job_record *job_ptr)
maxtasks = job_res->nprocs;
avail_cpus = job_res->cpus;
-
+
if (job_ptr->details && job_ptr->details->mc_ptr)
plane_size = job_ptr->details->mc_ptr->plane_size;
@@ -194,7 +194,7 @@ static void _block_sync_core_bitmap(struct job_record *job_ptr,
size = bit_size(job_res->node_bitmap);
csize = bit_size(job_res->core_bitmap);
for (c = 0, i = 0, n = 0; n < size; n++) {
-
+
if (bit_test(job_res->node_bitmap, n) == 0)
continue;
core_cnt = 0;
@@ -202,7 +202,7 @@ static void _block_sync_core_bitmap(struct job_record *job_ptr,
select_node_record[n].cores;
if ((c + num_bits) > csize)
fatal ("cons_res: _block_sync_core_bitmap index error");
-
+
cpus = job_res->cpus[i];
vpus = select_node_record[n].vpus;
@@ -222,7 +222,7 @@ static void _block_sync_core_bitmap(struct job_record *job_ptr,
fatal("cons_res: cpus computation error");
if (alloc_sockets) { /* Advance to end of socket */
- while ((num_bits > 0) &&
+ while ((num_bits > 0) &&
(c % select_node_record[n].cores)) {
if (bit_test(job_res->core_bitmap, c++))
core_cnt++;
@@ -275,11 +275,11 @@ static void _cyclic_sync_core_bitmap(struct job_record *job_ptr,
sock_start = xmalloc(sock_size * sizeof(uint32_t));
sock_end = xmalloc(sock_size * sizeof(uint32_t));
sock_used = xmalloc(sock_size * sizeof(bool));
-
+
size = bit_size(job_res->node_bitmap);
csize = bit_size(core_map);
for (c = 0, i = 0, n = 0; n < size; n++) {
-
+
if (bit_test(job_res->node_bitmap, n) == 0)
continue;
sockets = select_node_record[n].sockets;
@@ -299,7 +299,7 @@ static void _cyclic_sync_core_bitmap(struct job_record *job_ptr,
xrealloc(sock_end, sock_size * sizeof(uint32_t));
xrealloc(sock_used, sock_size * sizeof(bool));
}
-
+
for (s = 0; s < sockets; s++) {
sock_start[s] = c + (s * cps);
sock_end[s] = sock_start[s] + cps;
@@ -339,7 +339,7 @@ static void _cyclic_sync_core_bitmap(struct job_record *job_ptr,
if (sock_start[s] == sock_end[s])
continue;
if (!alloc_sockets || !sock_used[s]) {
- bit_nclear(core_map, sock_start[s],
+ bit_nclear(core_map, sock_start[s],
sock_end[s]-1);
}
if ((select_node_record[n].vpus > 1) &&
@@ -396,8 +396,8 @@ static void _cyclic_sync_core_bitmap(struct job_record *job_ptr,
extern int cr_dist(struct job_record *job_ptr,
const select_type_plugin_info_t cr_type)
{
- int error_code, cr_cpu = 1;
-
+ int error_code, cr_cpu = 1;
+
if (job_ptr->job_resrcs->node_req == NODE_CR_RESERVED) {
/* the job has been allocated an EXCLUSIVE set of nodes,
* so it gets all of the bits in the core_bitmap and
@@ -406,7 +406,7 @@ extern int cr_dist(struct job_record *job_ptr,
bit_nset(job_ptr->job_resrcs->core_bitmap, 0, size-1);
return SLURM_SUCCESS;
}
-
+
if (job_ptr->details->task_dist == SLURM_DIST_PLANE) {
/* perform a plane distribution on the 'cpus' array */
error_code = _compute_plane_dist(job_ptr);
@@ -424,7 +424,7 @@ extern int cr_dist(struct job_record *job_ptr,
}
/* now sync up the core_bitmap with the allocated 'cpus' array
- * based on the given distribution AND resource setting */
+ * based on the given distribution AND resource setting */
if ((cr_type == CR_CORE) || (cr_type == CR_CORE_MEMORY) ||
(cr_type == CR_SOCKET) || (cr_type == CR_SOCKET_MEMORY))
cr_cpu = 0;
@@ -445,11 +445,11 @@ extern int cr_dist(struct job_record *job_ptr,
break;
case SLURM_DIST_ARBITRARY:
case SLURM_DIST_BLOCK:
- case SLURM_DIST_CYCLIC:
+ case SLURM_DIST_CYCLIC:
case SLURM_DIST_BLOCK_CYCLIC:
case SLURM_DIST_CYCLIC_CYCLIC:
case SLURM_DIST_UNKNOWN:
- _cyclic_sync_core_bitmap(job_ptr, cr_type);
+ _cyclic_sync_core_bitmap(job_ptr, cr_type);
break;
default:
error("select/cons_res: invalid task_dist entry");
diff --git a/src/plugins/select/cons_res/dist_tasks.h b/src/plugins/select/cons_res/dist_tasks.h
index 2b032609d76e9d3bcd23c054ce050ab03103f4e0..ae961c487d663bbfd02a49abd0468e9a0381c394 100644
--- a/src/plugins/select/cons_res/dist_tasks.h
+++ b/src/plugins/select/cons_res/dist_tasks.h
@@ -6,16 +6,16 @@
* Copyright (C) 2006 Hewlett-Packard Development Company, L.P.
* Written by Susanne M. Balle, <susanne.balle@hp.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
@@ -31,7 +31,7 @@
* 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.
diff --git a/src/plugins/select/cons_res/job_test.c b/src/plugins/select/cons_res/job_test.c
index 5564eff6a1928516faff67aa6c3526fa9e2957ac..31d152fd834777042fd41221df57c2390f870f41 100644
--- a/src/plugins/select/cons_res/job_test.c
+++ b/src/plugins/select/cons_res/job_test.c
@@ -1,33 +1,33 @@
/*****************************************************************************\
- * select_cons_res.c - node selection plugin supporting consumable
+ * select_cons_res.c - node selection plugin supporting consumable
* resources policies.
*****************************************************************************\
*
* The following example below illustrates how four jobs are allocated
* across a cluster using when a processor consumable resource approach.
- *
+ *
* The example cluster is composed of 4 nodes (10 cpus in total):
- * linux01 (with 2 processors),
- * linux02 (with 2 processors),
+ * linux01 (with 2 processors),
+ * linux02 (with 2 processors),
* linux03 (with 2 processors), and
- * linux04 (with 4 processors).
+ * linux04 (with 4 processors).
*
- * The four jobs are the following:
+ * The four jobs are the following:
* 1. srun -n 4 -N 4 sleep 120 &
* 2. srun -n 3 -N 3 sleep 120 &
* 3. srun -n 1 sleep 120 &
* 4. srun -n 3 sleep 120 &
* The user launches them in the same order as listed above.
- *
+ *
* Using a processor consumable resource approach we get the following
* job allocation and scheduling:
- *
+ *
* The output of squeue shows that we have 3 out of the 4 jobs allocated
* and running. This is a 2 running job increase over the default SLURM
* approach.
- *
+ *
* Job 2, Job 3, and Job 4 are now running concurrently on the cluster.
- *
+ *
* [<snip>]# squeue
* JOBID PARTITION NAME USER ST TIME NODES NODELIST(REASON)
* 5 lsf sleep root PD 0:00 1 (Resources)
@@ -35,19 +35,19 @@
* 3 lsf sleep root R 0:09 3 linux[01-03]
* 4 lsf sleep root R 0:05 1 linux04
* [<snip>]#
- *
+ *
* Once Job 2 finishes, Job 5, which was pending, is allocated
* available resources and is then running as illustrated below:
- *
+ *
* [<snip>]# squeue4
* JOBID PARTITION NAME USER ST TIME NODES NODELIST(REASON)
* 3 lsf sleep root R 1:58 3 linux[01-03]
* 4 lsf sleep root R 1:54 1 linux04
* 5 lsf sleep root R 0:02 3 linux[01-03]
* [<snip>]#
- *
+ *
* Job 3, Job 4, and Job 5 are now running concurrently on the cluster.
- *
+ *
* [<snip>]# squeue4
* JOBID PARTITION NAME USER ST TIME NODES NODELIST(REASON)
* 5 lsf sleep root R 1:52 3 xc14n[13-15]
@@ -59,33 +59,33 @@
*****************************************************************************
* Copyright (C) 2005-2008 Hewlett-Packard Development Company, L.P.
* Written by Susanne M. Balle <susanne.balle@hp.com>, who borrowed heavily
- * from select/linear
- *
+ * from select/linear
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -145,7 +145,7 @@ uint16_t _allocate_sockets(struct job_record *job_ptr, bitstr_t *core_map,
min_sockets = job_ptr->details->mc_ptr->min_sockets;
ntasks_per_socket = job_ptr->details->mc_ptr->ntasks_per_socket;
}
-
+
/* These are the job parameters that we must respect:
*
* job_ptr->details->mc_ptr->min_cores (cr_core|cr_socket)
@@ -203,7 +203,7 @@ uint16_t _allocate_sockets(struct job_record *job_ptr, bitstr_t *core_map,
* arrays and total core counts */
free_cores = xmalloc(sockets * sizeof(uint16_t));
used_cores = xmalloc(sockets * sizeof(uint16_t));
-
+
for (c = core_begin; c < core_end; c++) {
i = (c - core_begin) / cores_per_socket;
if (bit_test(core_map, c)) {
@@ -242,7 +242,7 @@ uint16_t _allocate_sockets(struct job_record *job_ptr, bitstr_t *core_map,
num_tasks = 0;
goto fini;
}
-
+
c = 0;
for (i = 0; i < sockets; i++) {
if (free_cores[i] > 0)
@@ -255,7 +255,7 @@ uint16_t _allocate_sockets(struct job_record *job_ptr, bitstr_t *core_map,
}
- /* Step 3: Compute task-related data:
+ /* Step 3: Compute task-related data:
* ntasks_per_socket, ntasks_per_node and cpus_per_task
* to determine the number of tasks to run on this node
*
@@ -274,7 +274,7 @@ uint16_t _allocate_sockets(struct job_record *job_ptr, bitstr_t *core_map,
}
if (job_ptr->details->ntasks_per_node)
num_tasks = MIN(num_tasks, job_ptr->details->ntasks_per_node);
-
+
if (cpus_per_task < 2) {
avail_cpus = num_tasks;
cps = num_tasks;
@@ -283,7 +283,7 @@ uint16_t _allocate_sockets(struct job_record *job_ptr, bitstr_t *core_map,
num_tasks = MIN(num_tasks, c);
avail_cpus = num_tasks * cpus_per_task;
}
-
+
/* Step 4 - make sure that ntasks_per_socket is enforced when
* allocating cores
*/
@@ -319,7 +319,7 @@ uint16_t _allocate_sockets(struct job_record *job_ptr, bitstr_t *core_map,
avail_cpus -= threads_per_core;
else
avail_cpus = 0;
-
+
} else
bit_clear(core_map, c);
}
@@ -364,7 +364,7 @@ uint16_t _allocate_cores(struct job_record *job_ptr, bitstr_t *core_map,
min_cores = job_ptr->details->mc_ptr->min_cores;
min_sockets = job_ptr->details->mc_ptr->min_sockets;
}
-
+
/* These are the job parameters that we must respect:
*
* job_ptr->details->mc_ptr->min_cores (cr_core|cr_socket)
@@ -398,8 +398,8 @@ uint16_t _allocate_cores(struct job_record *job_ptr, bitstr_t *core_map,
*
* Step 2: Apply min_sockets and min_cores to the "free" cores.
*
- * Step 3: Compute task-related data: use ntasks_per_core,
- * ntasks_per_node and cpus_per_task to determine
+ * Step 3: Compute task-related data: use ntasks_per_core,
+ * ntasks_per_node and cpus_per_task to determine
* the number of tasks that can run on this node
*
* Step 4: Mark the allocated resources in the job_cores bitmap
@@ -418,7 +418,7 @@ uint16_t _allocate_cores(struct job_record *job_ptr, bitstr_t *core_map,
/* Step 1: create and compute core-count-per-socket
* arrays and total core counts */
free_cores = xmalloc(sockets * sizeof(uint16_t));
-
+
for (c = core_begin; c < core_end; c++) {
i = (c - core_begin) / cores_per_socket;
if (bit_test(core_map, c)) {
@@ -426,7 +426,7 @@ uint16_t _allocate_cores(struct job_record *job_ptr, bitstr_t *core_map,
free_core_count++;
}
}
-
+
/* Step 2a: check min_cores per socket and min_sockets per node */
c = 0;
for (i = 0; i < sockets; i++) {
@@ -444,7 +444,7 @@ uint16_t _allocate_cores(struct job_record *job_ptr, bitstr_t *core_map,
num_tasks = 0;
goto fini;
}
-
+
c = 0;
for (i = 0; i < sockets; i++) {
if (free_cores[i] > 0)
@@ -457,8 +457,8 @@ uint16_t _allocate_cores(struct job_record *job_ptr, bitstr_t *core_map,
}
- /* Step 3: Compute task-related data: use ntasks_per_core,
- * ntasks_per_node and cpus_per_task to determine
+ /* Step 3: Compute task-related data: use ntasks_per_core,
+ * ntasks_per_node and cpus_per_task to determine
* the number of tasks to run on this node
*
* Note: cpus_per_task and ntasks_per_core need to play nice
@@ -468,14 +468,14 @@ uint16_t _allocate_cores(struct job_record *job_ptr, bitstr_t *core_map,
i = job_ptr->details->mc_ptr->ntasks_per_core;
if (!cpu_type && i > 0)
num_tasks = MIN(num_tasks, i);
-
+
/* convert from PER_CORE to TOTAL_FOR_NODE */
avail_cpus *= free_core_count;
num_tasks *= free_core_count;
if (job_ptr->details->ntasks_per_node)
num_tasks = MIN(num_tasks, job_ptr->details->ntasks_per_node);
-
+
if (cpus_per_task < 2) {
avail_cpus = num_tasks;
} else {
@@ -483,7 +483,7 @@ uint16_t _allocate_cores(struct job_record *job_ptr, bitstr_t *core_map,
num_tasks = MIN(num_tasks, c);
avail_cpus = num_tasks * cpus_per_task;
}
-
+
/* Step 4 */
for (c = core_begin; c < core_end && avail_cpus > 0; c++) {
if (bit_test(core_map, c) == 0)
@@ -528,7 +528,7 @@ fini:
* IN cr_type - Consumable Resource setting
* IN test_only - ignore allocated memory check
*
- * NOTE: The returned cpu_count may be less than the number of set bits in
+ * NOTE: The returned cpu_count may be less than the number of set bits in
* core_map for the given node. The cr_dist functions will determine
* which bits to deselect from the core_map to match the cpu_count.
*/
@@ -558,7 +558,7 @@ uint16_t _can_job_run_on_node(struct job_record *job_ptr, bitstr_t *core_map,
default:
cpus = _allocate_cores(job_ptr, core_map, node_i, 1);
}
-
+
if ((cr_type != CR_CPU_MEMORY) && (cr_type != CR_CORE_MEMORY) &&
(cr_type != CR_SOCKET_MEMORY) && (cr_type != CR_MEMORY))
return cpus;
@@ -574,25 +574,25 @@ uint16_t _can_job_run_on_node(struct job_record *job_ptr, bitstr_t *core_map,
if (job_ptr->details->job_min_memory & MEM_PER_CPU) {
/* memory is per-cpu */
while (cpus > 0 && (req_mem * cpus) > avail_mem)
- cpus--;
+ cpus--;
if (cpus < job_ptr->details->ntasks_per_node)
cpus = 0;
- /* FIXME: do we need to recheck min_cores, etc. here? */
+ /* FIXME: do we need to recheck min_cores, etc. here? */
} else {
/* memory is per node */
if (req_mem > avail_mem) {
- bit_nclear(core_map, cr_get_coremap_offset(node_i),
+ bit_nclear(core_map, cr_get_coremap_offset(node_i),
(cr_get_coremap_offset(node_i+1))-1);
cpus = 0;
}
}
-
+
debug3("cons_res: _can_job_run_on_node: %u cpus on %s(%d), mem %u/%u",
cpus, select_node_record[node_i].node_ptr->name,
node_usage[node_i].node_state,
node_usage[node_i].alloc_memory,
select_node_record[node_i].real_memory);
-
+
return cpus;
}
@@ -659,9 +659,9 @@ static int _verify_node_state(struct part_res_record *cr_part_ptr,
/* node-level memory check */
if ((job_ptr->details->job_min_memory) &&
- ((cr_type == CR_CORE_MEMORY) ||
+ ((cr_type == CR_CORE_MEMORY) ||
(cr_type == CR_CPU_MEMORY) ||
- (cr_type == CR_MEMORY) ||
+ (cr_type == CR_MEMORY) ||
(cr_type == CR_SOCKET_MEMORY))) {
free_mem = select_node_record[i].real_memory;
free_mem -= node_usage[i].alloc_memory;
@@ -678,7 +678,7 @@ static int _verify_node_state(struct part_res_record *cr_part_ptr,
debug3("cons_res: _vns: node %s in exclusive use",
select_node_record[i].node_ptr->name);
goto clear_bit;
-
+
/* non-resource-sharing node check */
} else if (node_usage[i].node_state >= NODE_CR_ONE_ROW) {
if ((job_node_req == NODE_CR_RESERVED) ||
@@ -694,7 +694,7 @@ static int _verify_node_state(struct part_res_record *cr_part_ptr,
select_node_record[i].node_ptr->name);
goto clear_bit;
}
-
+
/* node is NODE_CR_AVAILABLE - check job request */
} else {
if (job_node_req == NODE_CR_RESERVED) {
@@ -804,7 +804,7 @@ uint32_t _get_res_usage(struct job_record *job_ptr, bitstr_t *node_map,
cpu_cnt = xmalloc(array_size * sizeof(uint16_t));
freq = xmalloc(array_size * sizeof(uint32_t));
-
+
for (n = 0; n < cr_node_cnt; n++) {
if (bit_test(node_map, n)) {
cpu_count = _can_job_run_on_node(job_ptr, core_map,
@@ -822,7 +822,7 @@ uint32_t _get_res_usage(struct job_record *job_ptr, bitstr_t *node_map,
size++;
if (size >= array_size) {
array_size += CR_FREQ_ARRAY_INCREMENT;
- xrealloc(cpu_cnt,
+ xrealloc(cpu_cnt,
array_size * sizeof(uint16_t));
xrealloc(freq, array_size * sizeof(uint32_t));
}
@@ -836,7 +836,7 @@ uint32_t _get_res_usage(struct job_record *job_ptr, bitstr_t *node_map,
size++;
if (size >= array_size) {
array_size += CR_FREQ_ARRAY_INCREMENT;
- xrealloc(cpu_cnt,
+ xrealloc(cpu_cnt,
array_size *sizeof(uint16_t));
xrealloc(freq, array_size * sizeof(uint32_t));
}
@@ -846,10 +846,10 @@ uint32_t _get_res_usage(struct job_record *job_ptr, bitstr_t *node_map,
*cpu_cnt_ptr = cpu_cnt;
*freq_ptr = freq;
return size+1;
-}
+}
-static bool _enough_nodes(int avail_nodes, int rem_nodes,
+static bool _enough_nodes(int avail_nodes, int rem_nodes,
uint32_t min_nodes, uint32_t req_nodes)
{
int needed_nodes;
@@ -870,13 +870,13 @@ static int _eval_nodes(struct job_record *job_ptr, bitstr_t *node_map,
uint16_t *cpu_cnt, uint32_t *freq, uint32_t size)
{
int i, f, index, error_code = SLURM_ERROR;
- int *consec_nodes; /* how many nodes we can add from this
+ int *consec_nodes; /* how many nodes we can add from this
* consecutive set of nodes */
- int *consec_cpus; /* how many nodes we can add from this
+ int *consec_cpus; /* how many nodes we can add from this
* consecutive set of nodes */
int *consec_start; /* where this consecutive set starts (index) */
int *consec_end; /* where this consecutive set ends (index) */
- int *consec_req; /* are nodes from this set required
+ int *consec_req; /* are nodes from this set required
* (in req_bitmap) */
int consec_index, consec_size, sufficient;
int rem_cpus, rem_nodes; /* remaining resources desired */
@@ -902,12 +902,12 @@ static int _eval_nodes(struct job_record *job_ptr, bitstr_t *node_map,
if (switch_record_cnt && switch_record_table) {
/* Perform optimized resource selection based upon topology */
- return _eval_nodes_topo(job_ptr, node_map,
+ return _eval_nodes_topo(job_ptr, node_map,
min_nodes, max_nodes, req_nodes,
cr_node_cnt, cpu_cnt, freq, size);
}
- consec_size = 50; /* start allocation for 50 sets of
+ consec_size = 50; /* start allocation for 50 sets of
* consecutive nodes */
consec_cpus = xmalloc(sizeof(int) * consec_size);
consec_nodes = xmalloc(sizeof(int) * consec_size);
@@ -980,13 +980,13 @@ static int _eval_nodes(struct job_record *job_ptr, bitstr_t *node_map,
}
if (consec_nodes[consec_index] != 0)
consec_end[consec_index++] = index - 1;
-
+
for (i = 0; i < consec_index; i++) {
debug3("cons_res: eval_nodes:%d consec c=%d n=%d b=%d e=%d r=%d",
i, consec_cpus[i], consec_nodes[i], consec_start[i],
consec_end[i], consec_req[i]);
}
-
+
/* accumulate nodes from these sets of consecutive nodes until */
/* sufficient resources have been accumulated */
while (consec_index && (max_nodes > 0)) {
@@ -1004,7 +1004,7 @@ static int _eval_nodes(struct job_record *job_ptr, bitstr_t *node_map,
sufficient = (consec_cpus[i] >= rem_cpus) &&
_enough_nodes(consec_nodes[i], rem_nodes,
min_nodes, req_nodes);
-
+
/* if first possibility OR */
/* contains required nodes OR */
/* first set large enough for request OR */
@@ -1024,7 +1024,7 @@ static int _eval_nodes(struct job_record *job_ptr, bitstr_t *node_map,
if (job_ptr->details->contiguous &&
job_ptr->details->req_node_bitmap) {
- /* Must wait for all required nodes to be
+ /* Must wait for all required nodes to be
* in a single consecutive block */
int j, other_blocks = 0;
for (j = (i+1); j < consec_index; j++) {
@@ -1069,7 +1069,7 @@ static int _eval_nodes(struct job_record *job_ptr, bitstr_t *node_map,
if ((max_nodes <= 0) ||
((rem_nodes <= 0) && (rem_cpus <= 0)))
break;
- if (bit_test(node_map, i))
+ if (bit_test(node_map, i))
continue;
avail_cpus = _get_cpu_cnt(job_ptr, i, cpu_cnt,
freq, size);
@@ -1092,7 +1092,7 @@ static int _eval_nodes(struct job_record *job_ptr, bitstr_t *node_map,
freq, size);
if (avail_cpus <= 0)
continue;
- if ((max_nodes == 1) &&
+ if ((max_nodes == 1) &&
(avail_cpus < rem_cpus)) {
/* Job can only take one more node and
* this one has insufficient CPU */
@@ -1113,7 +1113,7 @@ static int _eval_nodes(struct job_record *job_ptr, bitstr_t *node_map,
consec_cpus[best_fit_index] = 0;
consec_nodes[best_fit_index] = 0;
}
-
+
if (error_code && (rem_cpus <= 0) &&
_enough_nodes(0, rem_nodes, min_nodes, req_nodes))
error_code = SLURM_SUCCESS;
@@ -1128,7 +1128,7 @@ static int _eval_nodes(struct job_record *job_ptr, bitstr_t *node_map,
/*
* A network topology aware version of _eval_nodes().
- * NOTE: The logic here is almost identical to that of _job_test_topo()
+ * NOTE: The logic here is almost identical to that of _job_test_topo()
* in select_linear.c. Any bug found here is probably also there.
*/
static int _eval_nodes_topo(struct job_record *job_ptr, bitstr_t *bitmap,
@@ -1169,7 +1169,7 @@ static int _eval_nodes_topo(struct job_record *job_ptr, bitstr_t *bitmap,
}
}
- /* Construct a set of switch array entries,
+ /* Construct a set of switch array entries,
* use the same indexes as switch_record_table in slurmctld */
switches_bitmap = xmalloc(sizeof(bitstr_t *) * switch_record_cnt);
switches_cpu_cnt = xmalloc(sizeof(int) * switch_record_cnt);
@@ -1290,9 +1290,9 @@ static int _eval_nodes_topo(struct job_record *job_ptr, bitstr_t *bitmap,
bit_clear(switches_bitmap[j], i);
switches_node_cnt[j]--;
} else {
- switches_cpu_cnt[j] +=
- _get_cpu_cnt(job_ptr, i,
- cpu_cnt, freq,
+ switches_cpu_cnt[j] +=
+ _get_cpu_cnt(job_ptr, i,
+ cpu_cnt, freq,
size);
}
}
@@ -1307,7 +1307,7 @@ static int _eval_nodes_topo(struct job_record *job_ptr, bitstr_t *bitmap,
for (i=first; i<=last; i++) {
if (!bit_test(switches_bitmap[j], i))
continue;
- switches_cpu_cnt[j] +=
+ switches_cpu_cnt[j] +=
_get_cpu_cnt(job_ptr, i, cpu_cnt,
freq, size);
}
@@ -1339,7 +1339,7 @@ static int _eval_nodes_topo(struct job_record *job_ptr, bitstr_t *bitmap,
/* Identify usable leafs (within higher switch having best fit) */
for (j=0; j<switch_record_cnt; j++) {
if ((switch_record_table[j].level != 0) ||
- (!bit_super_set(switches_bitmap[j],
+ (!bit_super_set(switches_bitmap[j],
switches_bitmap[best_fit_inx]))) {
switches_node_cnt[j] = 0;
}
@@ -1352,18 +1352,18 @@ static int _eval_nodes_topo(struct job_record *job_ptr, bitstr_t *bitmap,
if (switches_node_cnt[j] == 0)
continue;
sufficient = (switches_cpu_cnt[j] >= rem_cpus) &&
- _enough_nodes(switches_node_cnt[j],
- rem_nodes, min_nodes,
+ _enough_nodes(switches_node_cnt[j],
+ rem_nodes, min_nodes,
req_nodes);
/* If first possibility OR */
/* first set large enough for request OR */
/* tightest fit (less resource waste) OR */
/* nothing yet large enough, but this is biggest */
- if ((best_fit_nodes == 0) ||
+ if ((best_fit_nodes == 0) ||
(sufficient && (best_fit_sufficient == 0)) ||
- (sufficient &&
+ (sufficient &&
(switches_cpu_cnt[j] < best_fit_cpus)) ||
- ((sufficient == 0) &&
+ ((sufficient == 0) &&
(switches_cpu_cnt[j] > best_fit_cpus))) {
best_fit_cpus = switches_cpu_cnt[j];
best_fit_nodes = switches_node_cnt[j];
@@ -1397,13 +1397,13 @@ static int _eval_nodes_topo(struct job_record *job_ptr, bitstr_t *bitmap,
rem_nodes--;
max_nodes--;
rem_cpus -= avail_cpus;
- if ((max_nodes <= 0) ||
+ if ((max_nodes <= 0) ||
((rem_nodes <= 0) && (rem_cpus <= 0)))
break;
}
switches_node_cnt[best_fit_location] = 0;
}
- if ((rem_cpus <= 0) &&
+ if ((rem_cpus <= 0) &&
_enough_nodes(0, rem_nodes, min_nodes, req_nodes)) {
rc = SLURM_SUCCESS;
} else
@@ -1425,7 +1425,7 @@ static int _eval_nodes_topo(struct job_record *job_ptr, bitstr_t *bitmap,
* to tackle the knapsack problem. This code incrementally removes nodes
* with low cpu counts for the job and re-evaluates each result */
static int _choose_nodes(struct job_record *job_ptr, bitstr_t *node_map,
- uint32_t min_nodes, uint32_t max_nodes,
+ uint32_t min_nodes, uint32_t max_nodes,
uint32_t req_nodes, uint32_t cr_node_cnt,
uint16_t *cpu_cnt, uint32_t *freq, uint32_t size)
{
@@ -1443,12 +1443,12 @@ static int _choose_nodes(struct job_record *job_ptr, bitstr_t *node_map,
/* can't clear a required node! */
return SLURM_ERROR;
}
- bit_clear(node_map, b);
+ bit_clear(node_map, b);
}
}
}
- /* NOTE: num_procs is 1 by default,
+ /* NOTE: num_procs is 1 by default,
* Only reset max_nodes if user explicitly sets a proc count */
if ((job_ptr->num_procs > 1) && (max_nodes > job_ptr->num_procs))
max_nodes = job_ptr->num_procs;
@@ -1465,7 +1465,7 @@ static int _choose_nodes(struct job_record *job_ptr, bitstr_t *node_map,
return ec;
}
- /* This nodeset didn't work. To avoid a possible knapsack problem,
+ /* This nodeset didn't work. To avoid a possible knapsack problem,
* incrementally remove nodes with low cpu counts and retry */
/* find the higest number of cpus per node */
@@ -1531,7 +1531,7 @@ static uint16_t *_select_nodes(struct job_record *job_ptr, uint32_t min_nodes,
uint16_t *cpu_cnt, *cpus = NULL;
uint32_t start, n, a, i, f, size, *freq;
bitstr_t *req_map = job_ptr->details->req_node_bitmap;
-
+
if (bit_set_count(node_map) < min_nodes)
return NULL;
@@ -1569,7 +1569,7 @@ static uint16_t *_select_nodes(struct job_record *job_ptr, uint32_t min_nodes,
/* choose the best nodes for the job */
rc = _choose_nodes(job_ptr, node_map, min_nodes, max_nodes, req_nodes,
cr_node_cnt, cpu_cnt, freq, size);
-
+
/* if successful, sync up the core_map with the node_map, and
* create a cpus array */
if (rc == SLURM_SUCCESS) {
@@ -1580,7 +1580,7 @@ static uint16_t *_select_nodes(struct job_record *job_ptr, uint32_t min_nodes,
if (bit_test(node_map, n)) {
cpus[a++] = cpu_cnt[i];
if (cr_get_coremap_offset(n) != start) {
- bit_nclear(core_map, start,
+ bit_nclear(core_map, start,
(cr_get_coremap_offset(n))-1);
}
start = cr_get_coremap_offset(n+1);
@@ -1603,7 +1603,7 @@ static uint16_t *_select_nodes(struct job_record *job_ptr, uint32_t min_nodes,
}
-/* cr_job_test - does most of the real work for select_p_job_test(), which
+/* cr_job_test - does most of the real work for select_p_job_test(), which
* includes contiguous selection, load-leveling and max_share logic
*
* PROCEDURE:
@@ -1619,7 +1619,7 @@ static uint16_t *_select_nodes(struct job_record *job_ptr, uint32_t min_nodes,
* allocations
*/
extern int cr_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
- uint32_t min_nodes, uint32_t max_nodes,
+ uint32_t min_nodes, uint32_t max_nodes,
uint32_t req_nodes, int mode,
select_type_plugin_info_t cr_type,
enum node_cr_state job_node_req, uint32_t cr_node_cnt,
@@ -1639,17 +1639,17 @@ extern int cr_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
layout_ptr = job_ptr->details->req_node_layout;
reqmap = job_ptr->details->req_node_bitmap;
-
+
free_job_resources(&job_ptr->job_resrcs);
if (mode == SELECT_MODE_TEST_ONLY)
test_only = true;
- else /* SELECT_MODE_RUN_NOW || SELECT_MODE_WILL_RUN */
+ else /* SELECT_MODE_RUN_NOW || SELECT_MODE_WILL_RUN */
test_only = false;
/* check node_state and update the node bitmap as necessary */
if (!test_only) {
- error_code = _verify_node_state(cr_part_ptr, job_ptr,
+ error_code = _verify_node_state(cr_part_ptr, job_ptr,
bitmap, cr_type, node_usage,
job_node_req);
if (error_code != SLURM_SUCCESS) {
@@ -1657,7 +1657,7 @@ extern int cr_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
}
}
- /* This is the case if -O/--overcommit is true */
+ /* This is the case if -O/--overcommit is true */
if (job_ptr->num_procs == job_ptr->details->min_nodes) {
struct multi_core_data *mc_ptr = job_ptr->details->mc_ptr;
job_ptr->num_procs *= MAX(1, mc_ptr->min_threads);
@@ -1693,7 +1693,7 @@ extern int cr_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
FREE_NULL_BITMAP(free_cores);
FREE_NULL_BITMAP(avail_cores);
xfree(cpu_count);
- debug3("cons_res: cr_job_test: test 0 pass: test_only");
+ debug3("cons_res: cr_job_test: test 0 pass: test_only");
return SLURM_SUCCESS;
}
if (cr_type == CR_MEMORY) {
@@ -1715,8 +1715,8 @@ extern int cr_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
* 1. Jobs that don't share CPUs finish with step 1.
* 2. The remaining steps assume sharing or preemption.
*
- * Step 2: Remove resources that are in use by higher-priority
- * partitions, and test that job can still succeed. If not
+ * Step 2: Remove resources that are in use by higher-priority
+ * partitions, and test that job can still succeed. If not
* then exit.
*
* Step 3: Seek idle nodes among the partitions with the same
@@ -1769,7 +1769,7 @@ extern int cr_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
if (job_node_req == NODE_CR_ONE_ROW) {
/* This job CANNOT share CPUs regardless of priority,
- * so we fail here. Note that Shared=EXCLUSIVE was already
+ * so we fail here. Note that Shared=EXCLUSIVE was already
* addressed in _verify_node_state() and job preemption
* removes jobs from simulated resource allocation map
* before this point. */
@@ -1779,7 +1779,7 @@ extern int cr_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
/*** Step 2 ***/
bit_copybits(bitmap, orig_map);
bit_copybits(free_cores, avail_cores);
-
+
for (jp_ptr = cr_part_ptr; jp_ptr; jp_ptr = jp_ptr->next) {
if (jp_ptr->part_ptr == job_ptr->part_ptr)
break;
@@ -1789,7 +1789,7 @@ extern int cr_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
job_ptr->job_id);
}
- /* remove existing allocations (jobs) from higher-priority partitions
+ /* remove existing allocations (jobs) from higher-priority partitions
* from avail_cores */
for (p_ptr = cr_part_ptr; p_ptr; p_ptr = p_ptr->next) {
if (p_ptr->part_ptr->priority <= jp_ptr->part_ptr->priority)
@@ -1823,8 +1823,8 @@ extern int cr_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
/*** Step 3 ***/
bit_copybits(bitmap, orig_map);
bit_copybits(free_cores, avail_cores);
-
- /* remove existing allocations (jobs) from same-priority partitions
+
+ /* remove existing allocations (jobs) from same-priority partitions
* from avail_cores */
for (p_ptr = cr_part_ptr; p_ptr; p_ptr = p_ptr->next) {
if (p_ptr->part_ptr->priority != jp_ptr->part_ptr->priority)
@@ -1843,26 +1843,26 @@ extern int cr_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
bitmap, cr_node_cnt, free_cores,
node_usage, cr_type, test_only);
if (cpu_count) {
- /* jobs from low-priority partitions are the only thing left
+ /* jobs from low-priority partitions are the only thing left
* in our way. for now we'll ignore them, but FIXME: we need
* a good placement algorithm here that optimizes "job overlap"
- * between this job (in these idle nodes) and the low-priority
+ * between this job (in these idle nodes) and the low-priority
* jobs */
debug3("cons_res: cr_job_test: test 3 pass - found resources");
goto alloc_job;
}
debug3("cons_res: cr_job_test: test 3 fail - "
"not enough idle resources in same priority");
-
-
- /*** Step 4 ***/
+
+
+ /*** Step 4 ***/
/* try to fit the job into an existing row
*
* tmpcore = worker core_bitmap
* free_cores = core_bitmap to be built
* avail_cores = static core_bitmap of all available cores
*/
-
+
if (jp_ptr->row == NULL) {
/* there's no existing jobs in this partition, so place
* the job in avail_cores. FIXME: still need a good
@@ -1874,7 +1874,7 @@ extern int cr_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
bit_copybits(free_cores, avail_cores);
cpu_count = _select_nodes(job_ptr, min_nodes, max_nodes,
req_nodes, bitmap, cr_node_cnt,
- free_cores, node_usage, cr_type,
+ free_cores, node_usage, cr_type,
test_only);
debug3("cons_res: cr_job_test: test 4 pass - first row found");
goto alloc_job;
@@ -1918,7 +1918,7 @@ extern int cr_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
/* job can't fit into any row, so exit */
debug3("cons_res: cr_job_test: test 4 fail - busy partition");
goto alloc_job;
-
+
}
/*** CONSTRUCTION ZONE FOR STEPs 5 AND 6 ***
@@ -1982,18 +1982,18 @@ alloc_job:
job_res->nprocs = MAX(job_res->nprocs, job_ptr->num_procs);
job_res->node_req = job_node_req;
job_res->cpus = cpu_count;
- job_res->cpus_used = xmalloc(job_res->nhosts *
+ job_res->cpus_used = xmalloc(job_res->nhosts *
sizeof(uint16_t));
- job_res->memory_allocated = xmalloc(job_res->nhosts *
+ job_res->memory_allocated = xmalloc(job_res->nhosts *
sizeof(uint32_t));
- job_res->memory_used = xmalloc(job_res->nhosts *
+ job_res->memory_used = xmalloc(job_res->nhosts *
sizeof(uint32_t));
/* store the hardware data for the selected nodes */
error_code = build_job_resources(job_res, node_record_table_ptr,
select_fast_schedule);
if (error_code != SLURM_SUCCESS) {
- free_job_resources(&job_res);
+ free_job_resources(&job_res);
FREE_NULL_BITMAP(free_cores);
return error_code;
}
@@ -2020,7 +2020,7 @@ alloc_job:
bit_set(job_res->core_bitmap, c);
}
}
-
+
if (layout_ptr && reqmap && bit_test(reqmap, n)) {
job_res->cpus[i] = MIN(job_res->cpus[i],
layout_ptr[ll]);
diff --git a/src/plugins/select/cons_res/job_test.h b/src/plugins/select/cons_res/job_test.h
index ae39c71916146ec39ecfc5503a3e6a3293b68f56..66d3daa8d6f0e68b8a5332b16f56548be93ba328 100644
--- a/src/plugins/select/cons_res/job_test.h
+++ b/src/plugins/select/cons_res/job_test.h
@@ -1,21 +1,21 @@
/*****************************************************************************\
- * select_cons_res.h
+ * select_cons_res.h
*
* $Id: select_cons_res.h,v 1.3 2006/10/31 20:01:38 palermo Exp $
*****************************************************************************
* Copyright (C) 2006 Hewlett-Packard Development Company, L.P.
* Written by Susanne M. Balle, <susanne.balle@hp.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
@@ -31,7 +31,7 @@
* 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.
@@ -58,7 +58,7 @@
#include "src/slurmctld/slurmctld.h"
-/* _job_test - does most of the real work for select_p_job_test(), which
+/* _job_test - does most of the real work for select_p_job_test(), which
* pretty much just handles load-leveling and max_share logic */
int cr_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
uint32_t min_nodes, uint32_t max_nodes, uint32_t req_nodes,
diff --git a/src/plugins/select/cons_res/select_cons_res.c b/src/plugins/select/cons_res/select_cons_res.c
index b596dcb106e7d7f77997030eb5e4657925f63878..5a983fed5be3dfd841dbca2b6a7f1689b7e832e4 100644
--- a/src/plugins/select/cons_res/select_cons_res.c
+++ b/src/plugins/select/cons_res/select_cons_res.c
@@ -1,33 +1,33 @@
/*****************************************************************************\
- * select_cons_res.c - node selection plugin supporting consumable
+ * select_cons_res.c - node selection plugin supporting consumable
* resources policies.
*****************************************************************************\
*
* The following example below illustrates how four jobs are allocated
* across a cluster using when a processor consumable resource approach.
- *
+ *
* The example cluster is composed of 4 nodes (10 cpus in total):
- * linux01 (with 2 processors),
- * linux02 (with 2 processors),
+ * linux01 (with 2 processors),
+ * linux02 (with 2 processors),
* linux03 (with 2 processors), and
- * linux04 (with 4 processors).
+ * linux04 (with 4 processors).
*
- * The four jobs are the following:
+ * The four jobs are the following:
* 1. srun -n 4 -N 4 sleep 120 &
* 2. srun -n 3 -N 3 sleep 120 &
* 3. srun -n 1 sleep 120 &
* 4. srun -n 3 sleep 120 &
* The user launches them in the same order as listed above.
- *
+ *
* Using a processor consumable resource approach we get the following
* job allocation and scheduling:
- *
+ *
* The output of squeue shows that we have 3 out of the 4 jobs allocated
* and running. This is a 2 running job increase over the default SLURM
* approach.
- *
+ *
* Job 2, Job 3, and Job 4 are now running concurrently on the cluster.
- *
+ *
* [<snip>]# squeue
* JOBID PARTITION NAME USER ST TIME NODES NODELIST(REASON)
* 5 lsf sleep root PD 0:00 1 (Resources)
@@ -35,19 +35,19 @@
* 3 lsf sleep root R 0:09 3 linux[01-03]
* 4 lsf sleep root R 0:05 1 linux04
* [<snip>]#
- *
+ *
* Once Job 2 finishes, Job 5, which was pending, is allocated
* available resources and is then running as illustrated below:
- *
+ *
* [<snip>]# squeue4
* JOBID PARTITION NAME USER ST TIME NODES NODELIST(REASON)
* 3 lsf sleep root R 1:58 3 linux[01-03]
* 4 lsf sleep root R 1:54 1 linux04
* 5 lsf sleep root R 0:02 3 linux[01-03]
* [<snip>]#
- *
+ *
* Job 3, Job 4, and Job 5 are now running concurrently on the cluster.
- *
+ *
* [<snip>]# squeue4
* JOBID PARTITION NAME USER ST TIME NODES NODELIST(REASON)
* 5 lsf sleep root R 1:52 3 xc14n[13-15]
@@ -59,33 +59,33 @@
*****************************************************************************
* Copyright (C) 2005-2008 Hewlett-Packard Development Company, L.P.
* Written by Susanne M. Balle <susanne.balle@hp.com>, who borrowed heavily
- * from select/linear
- *
+ * from select/linear
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -114,15 +114,15 @@
/* These are defined here so when we link with something other than
* the slurmctld we will have these symbols defined. They will get
- * overwritten when linking with the slurmctld.
+ * overwritten when linking with the slurmctld.
*/
slurm_ctl_conf_t slurmctld_conf;
struct node_record *node_record_table_ptr;
-List part_list;
-List job_list;
+List part_list;
+List job_list;
int node_record_count;
time_t last_node_update;
-struct switch_record *switch_record_table;
+struct switch_record *switch_record_table;
int switch_record_cnt;
bitstr_t *avail_node_bitmap;
bitstr_t *idle_node_bitmap;
@@ -147,7 +147,7 @@ List slurm_find_preemptable_jobs(struct job_record *job_ptr);
* where <application> is a description of the intended application of
* the plugin (e.g., "select" for SLURM node selection) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load select plugins if the plugin_type string has a
+ * only load select plugins if the plugin_type string has a
* prefix of "select/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
@@ -194,7 +194,7 @@ static int _test_only(struct job_record *job_ptr, bitstr_t *bitmap,
uint32_t min_nodes, uint32_t max_nodes,
uint32_t req_nodes, uint16_t job_node_req);
static int _will_run_test(struct job_record *job_ptr, bitstr_t *bitmap,
- uint32_t min_nodes, uint32_t max_nodes,
+ uint32_t min_nodes, uint32_t max_nodes,
uint32_t req_nodes, uint16_t job_node_req,
List preemptee_candidates, List *preemptee_job_list);
@@ -209,11 +209,11 @@ static void _dump_job_res(job_resources_t job) {
sprintf(str, "[no core_bitmap]");
info("DEBUG: Dump job_resources: nhosts %u cb %s", job->nhosts, str);
}
-
+
static void _dump_nodes()
{
int i;
-
+
for (i=0; i<select_node_cnt; i++) {
info("node:%s cpus:%u c:%u s:%u t:%u mem:%u a_mem:%u state:%d",
select_node_record[i].node_ptr->name,
@@ -223,7 +223,7 @@ static void _dump_nodes()
select_node_record[i].vpus,
select_node_record[i].real_memory,
select_node_usage[i].alloc_memory,
- select_node_usage[i].node_state);
+ select_node_usage[i].node_state);
}
}
@@ -281,7 +281,7 @@ extern bool cr_preemption_killing(void)
{
(void) cr_preemption_enabled();
return job_preemption_killing;
-
+
}
#define CR_NUM_CORE_ARRAY_INCREMENT 8
@@ -344,7 +344,7 @@ extern uint32_t cr_get_coremap_offset(uint32_t node_index)
return cindex;
n -= cr_num_core_count[i];
- cindex += cr_node_num_cores[i] * (node_index-n);
+ cindex += cr_node_num_cores[i] * (node_index-n);
return cindex;
}
@@ -370,12 +370,12 @@ static struct part_row_data *_dup_row_data(struct part_row_data *orig_row,
if (num_rows == 0 || !orig_row)
return NULL;
-
+
new_row = xmalloc(num_rows * sizeof(struct part_row_data));
for (i = 0; i < num_rows; i++) {
new_row[i].num_jobs = orig_row[i].num_jobs;
new_row[i].job_list_size = orig_row[i].job_list_size;
- if (orig_row[i].row_bitmap)
+ if (orig_row[i].row_bitmap)
new_row[i].row_bitmap= bit_copy(orig_row[i].
row_bitmap);
if (new_row[i].job_list_size == 0)
@@ -405,7 +405,7 @@ static struct part_res_record *_dup_part_data(struct part_res_record *orig_ptr)
while (orig_ptr) {
new_ptr->part_ptr = orig_ptr->part_ptr;
new_ptr->num_rows = orig_ptr->num_rows;
- new_ptr->row = _dup_row_data(orig_ptr->row,
+ new_ptr->row = _dup_row_data(orig_ptr->row,
orig_ptr->num_rows);
if (orig_ptr->next) {
new_ptr->next = xmalloc(sizeof(struct part_res_record));
@@ -426,7 +426,7 @@ static struct node_use_record *_dup_node_usage(struct node_use_record *orig_ptr)
if (orig_ptr == NULL)
return NULL;
- new_use_ptr = xmalloc(select_node_cnt *
+ new_use_ptr = xmalloc(select_node_cnt *
sizeof(struct node_use_record));
new_ptr = new_use_ptr;
@@ -541,7 +541,7 @@ static void _add_job_to_row(struct job_resources *job,
}
add_job_to_cores(job, &(r_ptr->row_bitmap), cr_node_num_cores,
cr_num_core_count);
-
+
/* add the job to the job_list */
if (r_ptr->num_jobs >= r_ptr->job_list_size) {
r_ptr->job_list_size += 8;
@@ -572,17 +572,17 @@ static void _swap_rows(struct part_row_data *a, struct part_row_data *b)
tmprow.num_jobs = a->num_jobs;
tmprow.job_list = a->job_list;
tmprow.job_list_size = a->job_list_size;
-
+
a->row_bitmap = b->row_bitmap;
a->num_jobs = b->num_jobs;
a->job_list = b->job_list;
a->job_list_size = b->job_list_size;
-
+
b->row_bitmap = tmprow.row_bitmap;
b->num_jobs = tmprow.num_jobs;
b->job_list = tmprow.job_list;
b->job_list_size = tmprow.job_list_size;
-
+
return;
}
@@ -594,7 +594,7 @@ extern void cr_sort_part_rows(struct part_res_record *p_ptr)
if (!p_ptr->row)
return;
-
+
for (i = 0; i < p_ptr->num_rows; i++) {
if (p_ptr->row[i].row_bitmap)
a = bit_set_count(p_ptr->row[i].row_bitmap);
@@ -618,7 +618,7 @@ extern void cr_sort_part_rows(struct part_res_record *p_ptr)
* so the row_bitmap(s) need to be reconstructed.
* Optimize the jobs into the least number of rows,
* and make the lower rows as dense as possible.
- *
+ *
* IN/OUT: p_ptr - the partition that has jobs to be optimized
*/
static void _build_row_bitmaps(struct part_res_record *p_ptr)
@@ -627,7 +627,7 @@ static void _build_row_bitmaps(struct part_res_record *p_ptr)
int x, *jstart;
struct part_row_data *this_row, *orig_row;
struct job_resources **tmpjobs, *job;
-
+
if (!p_ptr->row)
return;
@@ -640,7 +640,7 @@ static void _build_row_bitmaps(struct part_res_record *p_ptr)
}
return;
}
-
+
/* rebuild the row bitmap */
num_jobs = this_row->num_jobs;
tmpjobs = xmalloc(num_jobs * sizeof(struct job_resources *));
@@ -667,7 +667,7 @@ static void _build_row_bitmaps(struct part_res_record *p_ptr)
size = bit_size(p_ptr->row[0].row_bitmap);
for (i = 0; i < p_ptr->num_rows; i++) {
if (p_ptr->row[i].row_bitmap) {
- bit_nclear(p_ptr->row[i].row_bitmap, 0,
+ bit_nclear(p_ptr->row[i].row_bitmap, 0,
size-1);
}
}
@@ -684,13 +684,13 @@ static void _build_row_bitmaps(struct part_res_record *p_ptr)
orig_row = _dup_row_data(p_ptr->row, p_ptr->num_rows);
if (orig_row == NULL)
return;
-
+
/* get row_bitmap size from first row (we can safely assume that the
* first row_bitmap exists because there exists at least one job. */
size = bit_size(p_ptr->row[0].row_bitmap);
-
+
/* create a master job list and clear out ALL row data */
- tmpjobs = xmalloc(num_jobs * sizeof(struct job_resources *));
+ tmpjobs = xmalloc(num_jobs * sizeof(struct job_resources *));
jstart = xmalloc(num_jobs * sizeof(int));
x = 0;
for (i = 0; i < p_ptr->num_rows; i++) {
@@ -707,7 +707,7 @@ static void _build_row_bitmaps(struct part_res_record *p_ptr)
bit_nclear(p_ptr->row[i].row_bitmap, 0, size-1);
}
}
-
+
/* VERY difficult: Optimal placement of jobs in the matrix
* - how to order jobs to be added to the matrix?
* - "by size" does not guarantee optimal placement
@@ -735,12 +735,12 @@ static void _build_row_bitmaps(struct part_res_record *p_ptr)
for (i = 0; i < num_jobs; i++) {
char cstr[64], nstr[64];
if (tmpjobs[i]->core_bitmap) {
- bit_fmt(cstr, (sizeof(cstr)-1) ,
+ bit_fmt(cstr, (sizeof(cstr)-1) ,
tmpjobs[i]->core_bitmap);
} else
sprintf(cstr, "[no core_bitmap]");
if (tmpjobs[i]->node_bitmap) {
- bit_fmt(nstr, (sizeof(nstr)-1),
+ bit_fmt(nstr, (sizeof(nstr)-1),
tmpjobs[i]->node_bitmap);
} else
sprintf(nstr, "[no node_bitmap]");
@@ -762,7 +762,7 @@ static void _build_row_bitmaps(struct part_res_record *p_ptr)
/* job should have been added, so shuffle the rows */
cr_sort_part_rows(p_ptr);
}
-
+
/* test for dangling jobs */
for (j = 0; j < num_jobs; j++) {
if (tmpjobs[j])
@@ -780,11 +780,11 @@ static void _build_row_bitmaps(struct part_res_record *p_ptr)
_destroy_row_data(p_ptr->row, p_ptr->num_rows);
p_ptr->row = orig_row;
orig_row = NULL;
-
+
/* still need to rebuild row_bitmaps */
for (i = 0; i < p_ptr->num_rows; i++) {
if (p_ptr->row[i].row_bitmap)
- bit_nclear(p_ptr->row[i].row_bitmap, 0,
+ bit_nclear(p_ptr->row[i].row_bitmap, 0,
size-1);
if (p_ptr->row[i].num_jobs == 0)
continue;
@@ -810,22 +810,22 @@ static void _build_row_bitmaps(struct part_res_record *p_ptr)
return;
/* LEFTOVER DESIGN THOUGHTS, PRESERVED HERE */
-
+
/* 1. sort jobs by size
* 2. only load core bitmaps with largest jobs that conflict
- * 3. sort rows by set count
+ * 3. sort rows by set count
* 4. add remaining jobs, starting with fullest rows
* 5. compute set count: if disparity between rows got closer, then
* switch non-conflicting jobs that were added
*/
- /*
+ /*
* Step 1: remove empty rows between non-empty rows
* Step 2: try to collapse rows
* Step 3: sort rows by size
* Step 4: try to swap jobs from different rows to pack rows
*/
-
+
/* WORK IN PROGRESS - more optimization should go here, such as:
*
* - try collapsing jobs from higher rows to lower rows
@@ -858,7 +858,7 @@ static int _add_job_to_res(struct job_record *job_ptr, int action)
error("job %u has no select data", job_ptr->job_id);
return SLURM_ERROR;
}
-
+
debug3("cons_res: _add_job_to_res: job %u act %d ", job_ptr->job_id,
action);
@@ -880,12 +880,12 @@ static int _add_job_to_res(struct job_record *job_ptr, int action)
select_node_record[i].node_ptr->name,
select_node_usage[i].alloc_memory,
job_ptr->job_id);
-
+
}
n++;
}
}
-
+
/* add cores */
if (action != 1) {
for (p_ptr = select_part_record; p_ptr; p_ptr = p_ptr->next) {
@@ -901,7 +901,7 @@ static int _add_job_to_res(struct job_record *job_ptr, int action)
p_ptr->row = xmalloc(p_ptr->num_rows *
sizeof(struct part_row_data));
}
-
+
/* find a row to add this job */
for (i = 0; i < p_ptr->num_rows; i++) {
if (!_can_job_fit_in_row(job, &(p_ptr->row[i])))
@@ -954,13 +954,13 @@ static int _rm_job_from_res(struct part_res_record *part_record_ptr,
error("job %u has no select data", job_ptr->job_id);
return SLURM_ERROR;
}
-
+
debug3("cons_res: _rm_job_from_res: job %u act %d", job_ptr->job_id,
action);
#if (CR_DEBUG)
_dump_job_res(job);
#endif
-
+
/* subtract memory */
if (action != 2) {
for (i = 0, n = 0; i < select_node_cnt; i++) {
@@ -972,7 +972,7 @@ static int _rm_job_from_res(struct part_res_record *part_record_ptr,
"(%u-%u) for job %u",
select_node_record[i].node_ptr->name,
node_usage[i].alloc_memory,
- job->memory_allocated[n],
+ job->memory_allocated[n],
job_ptr->job_id);
node_usage[i].alloc_memory = 0;
} else {
@@ -982,17 +982,17 @@ static int _rm_job_from_res(struct part_res_record *part_record_ptr,
n++;
}
}
-
+
/* subtract cores */
if (action != 1) {
/* reconstruct rows with remaining jobs */
struct part_res_record *p_ptr;
-
+
if(!job_ptr->part_ptr) {
error("error: 'rm' job %u does not have a "
"partition assigned",
job_ptr->job_id);
- return SLURM_ERROR;
+ return SLURM_ERROR;
}
for (p_ptr = part_record_ptr; p_ptr; p_ptr = p_ptr->next) {
@@ -1004,11 +1004,11 @@ static int _rm_job_from_res(struct part_res_record *part_record_ptr,
job_ptr->part_ptr->name);
return SLURM_ERROR;
}
-
+
if (!p_ptr->row) {
return SLURM_SUCCESS;
}
-
+
/* remove the job from the job_list */
n = 0;
for (i = 0; i < p_ptr->num_rows; i++) {
@@ -1032,7 +1032,7 @@ static int _rm_job_from_res(struct part_res_record *part_record_ptr,
break;
}
}
-
+
if (n) {
/* job was found and removed, so refresh the bitmaps */
_build_row_bitmaps(p_ptr);
@@ -1083,7 +1083,7 @@ static struct multi_core_data * _create_default_mc(void)
static uint16_t _get_job_node_req(struct job_record *job_ptr)
{
int max_share = job_ptr->part_ptr->max_share;
-
+
if (max_share == 0)
return NODE_CR_RESERVED;
@@ -1111,7 +1111,7 @@ static int _find_job (void *x, void *key)
return 0;
}
-static bool _is_preemptable(struct job_record *job_ptr,
+static bool _is_preemptable(struct job_record *job_ptr,
List preemptee_candidates)
{
if (!preemptee_candidates)
@@ -1128,9 +1128,9 @@ static int _test_only(struct job_record *job_ptr, bitstr_t *bitmap,
{
int rc;
- rc = cr_job_test(job_ptr, bitmap, min_nodes, max_nodes, req_nodes,
+ rc = cr_job_test(job_ptr, bitmap, min_nodes, max_nodes, req_nodes,
SELECT_MODE_TEST_ONLY, cr_type, job_node_req,
- select_node_cnt, select_part_record,
+ select_node_cnt, select_part_record,
select_node_usage);
return rc;
}
@@ -1152,12 +1152,12 @@ static int _run_now(struct job_record *job_ptr, bitstr_t *bitmap,
if (!orig_map)
fatal("bit_copy: malloc failure");
- rc = cr_job_test(job_ptr, bitmap, min_nodes, max_nodes, req_nodes,
+ rc = cr_job_test(job_ptr, bitmap, min_nodes, max_nodes, req_nodes,
SELECT_MODE_RUN_NOW, cr_type, job_node_req,
- select_node_cnt, select_part_record,
+ select_node_cnt, select_part_record,
select_node_usage);
- if ((rc != SLURM_SUCCESS) && cr_preemption_killing() &&
+ if ((rc != SLURM_SUCCESS) && cr_preemption_killing() &&
preemptee_candidates) {
/* Remove preemptable jobs from simulated environment */
future_part = _dup_part_data(select_part_record);
@@ -1173,21 +1173,21 @@ static int _run_now(struct job_record *job_ptr, bitstr_t *bitmap,
}
job_iterator = list_iterator_create(job_list);
- while ((tmp_job_ptr = (struct job_record *)
+ while ((tmp_job_ptr = (struct job_record *)
list_next(job_iterator))) {
- if (!IS_JOB_RUNNING(tmp_job_ptr) &&
+ if (!IS_JOB_RUNNING(tmp_job_ptr) &&
!IS_JOB_SUSPENDED(tmp_job_ptr))
continue;
- if (_is_preemptable(tmp_job_ptr,
+ if (_is_preemptable(tmp_job_ptr,
preemptee_candidates)) {
/* Remove preemptable job now */
_rm_job_from_res(future_part, future_usage,
tmp_job_ptr, 2);
bit_or(bitmap, orig_map);
- rc = cr_job_test(job_ptr, bitmap, min_nodes,
- max_nodes, req_nodes,
- SELECT_MODE_WILL_RUN,
- cr_type, job_node_req,
+ rc = cr_job_test(job_ptr, bitmap, min_nodes,
+ max_nodes, req_nodes,
+ SELECT_MODE_WILL_RUN,
+ cr_type, job_node_req,
select_node_cnt,
future_part, future_usage);
if (rc == SLURM_SUCCESS)
@@ -1198,7 +1198,7 @@ static int _run_now(struct job_record *job_ptr, bitstr_t *bitmap,
if ((rc == SLURM_SUCCESS) && preemptee_job_list &&
preemptee_candidates && cr_preemption_killing()) {
- /* Build list of preemptee jobs whose resources are
+ /* Build list of preemptee jobs whose resources are
* actually used */
if (*preemptee_job_list == NULL) {
*preemptee_job_list = list_create(
@@ -1210,11 +1210,11 @@ static int _run_now(struct job_record *job_ptr, bitstr_t *bitmap,
preemptee_candidates);
while ((tmp_job_ptr = (struct job_record *)
list_next(preemptee_iterator))) {
- if (bit_overlap(bitmap,
+ if (bit_overlap(bitmap,
tmp_job_ptr->node_bitmap) == 0)
continue;
- list_append(*preemptee_job_list,
+ list_append(*preemptee_job_list,
tmp_job_ptr);
}
list_iterator_destroy(preemptee_iterator);
@@ -1228,11 +1228,11 @@ static int _run_now(struct job_record *job_ptr, bitstr_t *bitmap,
return rc;
}
-/* _will_run_test - determine when and where a pending job can start, removes
- * jobs from node table at termination time and run _test_job() after
+/* _will_run_test - determine when and where a pending job can start, removes
+ * jobs from node table at termination time and run _test_job() after
* each one. Used by SLURM's sched/backfill plugin and Moab. */
static int _will_run_test(struct job_record *job_ptr, bitstr_t *bitmap,
- uint32_t min_nodes, uint32_t max_nodes,
+ uint32_t min_nodes, uint32_t max_nodes,
uint32_t req_nodes, uint16_t job_node_req,
List preemptee_candidates, List *preemptee_job_list)
{
@@ -1250,9 +1250,9 @@ static int _will_run_test(struct job_record *job_ptr, bitstr_t *bitmap,
fatal("bit_copy: malloc failure");
/* Try to run with currently available nodes */
- rc = cr_job_test(job_ptr, bitmap, min_nodes, max_nodes, req_nodes,
+ rc = cr_job_test(job_ptr, bitmap, min_nodes, max_nodes, req_nodes,
SELECT_MODE_WILL_RUN, cr_type, job_node_req,
- select_node_cnt, select_part_record,
+ select_node_cnt, select_part_record,
select_node_usage);
if (rc == SLURM_SUCCESS) {
bit_free(orig_map);
@@ -1260,7 +1260,7 @@ static int _will_run_test(struct job_record *job_ptr, bitstr_t *bitmap,
return SLURM_SUCCESS;
}
- /* Job is still pending. Simulate termination of jobs one at a time
+ /* Job is still pending. Simulate termination of jobs one at a time
* to determine when and where the job can start. */
future_part = _dup_part_data(select_part_record);
if (future_part == NULL) {
@@ -1295,7 +1295,7 @@ static int _will_run_test(struct job_record *job_ptr, bitstr_t *bitmap,
/* Remove preemptable job now */
_rm_job_from_res(future_part, future_usage,
tmp_job_ptr, action);
- } else
+ } else
list_append(cr_job_list, tmp_job_ptr);
}
list_iterator_destroy(job_iterator);
@@ -1303,7 +1303,7 @@ static int _will_run_test(struct job_record *job_ptr, bitstr_t *bitmap,
/* Test with all preemptable jobs gone */
if (preemptee_candidates) {
bit_or(bitmap, orig_map);
- rc = cr_job_test(job_ptr, bitmap, min_nodes, max_nodes,
+ rc = cr_job_test(job_ptr, bitmap, min_nodes, max_nodes,
req_nodes, SELECT_MODE_WILL_RUN, cr_type,
job_node_req, select_node_cnt, future_part,
future_usage);
@@ -1317,13 +1317,13 @@ static int _will_run_test(struct job_record *job_ptr, bitstr_t *bitmap,
list_sort(cr_job_list, _cr_job_list_sort);
job_iterator = list_iterator_create(cr_job_list);
while ((tmp_job_ptr = list_next(job_iterator))) {
- _rm_job_from_res(future_part, future_usage,
+ _rm_job_from_res(future_part, future_usage,
tmp_job_ptr, 0);
bit_or(bitmap, orig_map);
- rc = cr_job_test(job_ptr, bitmap, min_nodes,
- max_nodes, req_nodes,
- SELECT_MODE_WILL_RUN, cr_type,
- job_node_req, select_node_cnt,
+ rc = cr_job_test(job_ptr, bitmap, min_nodes,
+ max_nodes, req_nodes,
+ SELECT_MODE_WILL_RUN, cr_type,
+ job_node_req, select_node_cnt,
future_part, future_usage);
if (rc == SLURM_SUCCESS) {
if (tmp_job_ptr->end_time <= now)
@@ -1339,7 +1339,7 @@ static int _will_run_test(struct job_record *job_ptr, bitstr_t *bitmap,
if ((rc == SLURM_SUCCESS) && preemptee_job_list &&
preemptee_candidates) {
- /* Build list of preemptee jobs whose resources are
+ /* Build list of preemptee jobs whose resources are
* actually used. List returned even if not killed
* in selected plugin, but by Moab or something else. */
if (*preemptee_job_list == NULL) {
@@ -1350,7 +1350,7 @@ static int _will_run_test(struct job_record *job_ptr, bitstr_t *bitmap,
preemptee_iterator =list_iterator_create(preemptee_candidates);
while ((tmp_job_ptr = (struct job_record *)
list_next(preemptee_iterator))) {
- if (bit_overlap(bitmap,
+ if (bit_overlap(bitmap,
tmp_job_ptr->node_bitmap) == 0)
continue;
list_append(*preemptee_job_list, tmp_job_ptr);
@@ -1373,7 +1373,7 @@ static bool _is_node_avail(struct part_res_record *p_ptr, uint32_t node_i)
cpu_begin = cr_get_coremap_offset(node_i);
cpu_end = cr_get_coremap_offset(node_i+1);
-
+
if (select_node_usage[node_i].node_state >= NODE_CR_RESERVED)
return false;
@@ -1424,7 +1424,7 @@ static int _synchronize_bitmaps(struct job_record *job_ptr,
if (!job_ptr)
fatal("cons_res: error: don't know what job I'm sync'ing");
-
+
for (p_ptr = select_part_record; p_ptr; p_ptr = p_ptr->next) {
if (p_ptr->part_ptr == job_ptr->part_ptr)
break;
@@ -1438,7 +1438,7 @@ static int _synchronize_bitmaps(struct job_record *job_ptr,
bit_set(bitmap, i);
continue;
}
-
+
if(!p_ptr || _is_node_avail(p_ptr, i))
bit_set(bitmap, i);
}
@@ -1502,7 +1502,7 @@ extern int fini(void)
}
/*
- * The remainder of this file implements the standard SLURM
+ * The remainder of this file implements the standard SLURM
* node selection API.
*/
@@ -1561,12 +1561,12 @@ extern int select_p_node_init(struct node_record *node_ptr, int node_cnt)
/* initial global core data structures */
select_fast_schedule = slurm_get_fast_schedule();
_init_global_core_data(node_ptr, node_cnt);
-
+
_destroy_node_data(select_node_usage, select_node_record);
select_node_cnt = node_cnt;
- select_node_record = xmalloc(node_cnt *
+ select_node_record = xmalloc(node_cnt *
sizeof(struct node_res_record));
- select_node_usage = xmalloc(node_cnt *
+ select_node_usage = xmalloc(node_cnt *
sizeof(struct node_use_record));
for (i = 0; i < select_node_cnt; i++) {
@@ -1602,13 +1602,13 @@ extern int select_p_block_init(List part_list)
/*
- * select_p_job_test - Given a specification of scheduling requirements,
+ * select_p_job_test - Given a specification of scheduling requirements,
* identify the nodes which "best" satisfy the request.
* "best" is defined as either a minimal number of consecutive nodes
* or if sharing resources then sharing them with a job of similar size.
* IN/OUT job_ptr - pointer to job being considered for initiation,
* set's start_time when job expected to start
- * IN/OUT bitmap - usable nodes are set on input, nodes not required to
+ * IN/OUT bitmap - usable nodes are set on input, nodes not required to
* satisfy the request are cleared, other left set
* IN min_nodes - minimum count of nodes
* IN req_nodes - requested (or desired) count of nodes
@@ -1617,22 +1617,22 @@ extern int select_p_block_init(List part_list)
* SELECT_MODE_TEST_ONLY: test if job can ever run
* SELECT_MODE_WILL_RUN: determine when and where job can run
* IN preemptee_candidates - List of pointers to jobs which can be preempted.
- * IN/OUT preemptee_job_list - Pointer to list of job pointers. These are the
- * jobs to be preempted to initiate the pending job. Not set
+ * IN/OUT preemptee_job_list - Pointer to list of job pointers. These are the
+ * jobs to be preempted to initiate the pending job. Not set
* if mode=SELECT_MODE_TEST_ONLY or input pointer is NULL.
* RET zero on success, EINVAL otherwise
- * globals (passed via select_p_node_init):
+ * globals (passed via select_p_node_init):
* node_record_count - count of nodes configured
* node_record_table_ptr - pointer to global node table
* NOTE: the job information that is considered for scheduling includes:
* req_node_bitmap: bitmap of specific nodes required by the job
* contiguous: allocated nodes must be sequentially located
* num_procs: minimum number of processors required by the job
- * NOTE: bitmap must be a superset of req_nodes at the time that
+ * NOTE: bitmap must be a superset of req_nodes at the time that
* select_p_job_test is called
*/
extern int select_p_job_test(struct job_record *job_ptr, bitstr_t * bitmap,
- uint32_t min_nodes, uint32_t max_nodes,
+ uint32_t min_nodes, uint32_t max_nodes,
uint32_t req_nodes, uint16_t mode,
List preemptee_candidates,
List *preemptee_job_list)
@@ -1673,7 +1673,7 @@ extern int select_p_job_test(struct job_record *job_ptr, bitstr_t * bitmap,
req_nodes, job_node_req);
} else if (mode == SELECT_MODE_RUN_NOW) {
rc = _run_now(job_ptr, bitmap, min_nodes, max_nodes,
- req_nodes, job_node_req,
+ req_nodes, job_node_req,
preemptee_candidates, preemptee_job_list);
} else
fatal("select_p_job_test: Mode %d is invalid", mode);
@@ -1682,7 +1682,7 @@ extern int select_p_job_test(struct job_record *job_ptr, bitstr_t * bitmap,
if (job_ptr->job_resrcs)
log_job_resources(job_ptr->job_id, job_ptr->job_resrcs);
else
- info("no job_resources info for job %u",
+ info("no job_resources info for job %u",
job_ptr->job_id);
#else
if (debug_cpu_bind && job_ptr->job_resrcs)
@@ -1706,13 +1706,13 @@ extern int select_p_job_fini(struct job_record *job_ptr)
{
xassert(job_ptr);
xassert(job_ptr->magic == JOB_MAGIC);
-
+
_rm_job_from_res(select_part_record, select_node_usage, job_ptr, 0);
return SLURM_SUCCESS;
}
-/* NOTE: This function is not called with gang scheduling because it
+/* NOTE: This function is not called with gang scheduling because it
* needs to track how many jobs are running or suspended on each node.
* This sum is compared with the partition's Shared parameter */
extern int select_p_job_suspend(struct job_record *job_ptr)
@@ -1727,7 +1727,7 @@ extern int select_p_job_suspend(struct job_record *job_ptr)
extern int select_p_job_resume(struct job_record *job_ptr)
{
xassert(job_ptr);
-
+
return _add_job_to_res(job_ptr, 2);
}
@@ -1738,7 +1738,7 @@ extern int select_p_pack_select_info(time_t last_query_time, Buf *buffer_ptr)
return SLURM_ERROR;
}
-extern int select_p_select_nodeinfo_pack(select_nodeinfo_t *nodeinfo,
+extern int select_p_select_nodeinfo_pack(select_nodeinfo_t *nodeinfo,
Buf buffer)
{
pack16(nodeinfo->alloc_cpus, buffer);
@@ -1746,7 +1746,7 @@ extern int select_p_select_nodeinfo_pack(select_nodeinfo_t *nodeinfo,
return SLURM_SUCCESS;
}
-extern int select_p_select_nodeinfo_unpack(select_nodeinfo_t **nodeinfo,
+extern int select_p_select_nodeinfo_unpack(select_nodeinfo_t **nodeinfo,
Buf buffer)
{
select_nodeinfo_t *nodeinfo_ptr = NULL;
@@ -1782,7 +1782,7 @@ extern int select_p_select_nodeinfo_free(select_nodeinfo_t *nodeinfo)
error("select_p_select_nodeinfo_free: "
"nodeinfo magic bad");
return EINVAL;
- }
+ }
nodeinfo->magic = 0;
xfree(nodeinfo);
}
@@ -1802,9 +1802,9 @@ extern int select_p_select_nodeinfo_set_all(void)
the last time we set things up. */
if(last_set_all && (last_node_update < last_set_all)) {
debug2("Node select info for set all hasn't "
- "changed since %d",
+ "changed since %d",
last_set_all);
- return SLURM_NO_CHANGE_IN_DATA;
+ return SLURM_NO_CHANGE_IN_DATA;
}
last_set_all = last_node_update;
@@ -1858,7 +1858,7 @@ extern int select_p_select_nodeinfo_set(struct job_record *job_ptr)
if (!IS_JOB_RUNNING(job_ptr) && !IS_JOB_SUSPENDED(job_ptr))
return SLURM_SUCCESS;
-
+
return _add_job_to_res(job_ptr, 0);
}
@@ -1874,7 +1874,7 @@ extern int select_p_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
error("get_nodeinfo: nodeinfo not set");
return SLURM_ERROR;
}
-
+
if (nodeinfo->magic != NODEINFO_MAGIC) {
error("get_nodeinfo: jobinfo magic bad");
return SLURM_ERROR;
@@ -1892,7 +1892,7 @@ extern int select_p_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
error("Unsupported option %d for get_nodeinfo.", dinfo);
rc = SLURM_ERROR;
break;
- }
+ }
return rc;
}
@@ -1929,7 +1929,7 @@ extern int select_p_select_jobinfo_pack(select_jobinfo_t *jobinfo, Buf buffer)
return SLURM_SUCCESS;
}
-extern int select_p_select_jobinfo_unpack(select_jobinfo_t *jobinfo,
+extern int select_p_select_jobinfo_unpack(select_jobinfo_t *jobinfo,
Buf buffer)
{
return SLURM_SUCCESS;
@@ -1962,7 +1962,7 @@ extern int select_p_update_sub_node (update_part_msg_t *part_desc_ptr)
}
extern int select_p_get_info_from_plugin(enum select_plugindata_info info,
- struct job_record *job_ptr,
+ struct job_record *job_ptr,
void *data)
{
int rc = SLURM_SUCCESS;
@@ -1978,8 +1978,8 @@ extern int select_p_get_info_from_plugin(enum select_plugindata_info info,
FREE_NULL_BITMAP(tmp_bitmap);
return rc;
}
- *bitmap = tmp_bitmap; /* Ownership transfer,
- * Remember to free bitmap
+ *bitmap = tmp_bitmap; /* Ownership transfer,
+ * Remember to free bitmap
* using FREE_NULL_BITMAP(bitmap);*/
tmp_bitmap = 0;
break;
@@ -1988,7 +1988,7 @@ extern int select_p_get_info_from_plugin(enum select_plugindata_info info,
break;
case SELECT_CONFIG_INFO:
*tmp_list = NULL;
- break;
+ break;
default:
error("select_p_get_info_from_plugin info %d invalid",
info);
@@ -2041,7 +2041,7 @@ extern int select_p_reconfigure(void)
rc = select_p_node_init(node_record_table_ptr, node_record_count);
if (rc != SLURM_SUCCESS)
return rc;
-
+
/* reload job data */
job_iterator = list_iterator_create(job_list);
while ((job_ptr = (struct job_record *) list_next(job_iterator))) {
diff --git a/src/plugins/select/cons_res/select_cons_res.h b/src/plugins/select/cons_res/select_cons_res.h
index 9b65eea77ec761893ded456bb6a12a4bc39a7aa5..6e1f0f59f312b082b380ebab79c708acc90eb583 100644
--- a/src/plugins/select/cons_res/select_cons_res.h
+++ b/src/plugins/select/cons_res/select_cons_res.h
@@ -1,21 +1,21 @@
/*****************************************************************************\
- * select_cons_res.h
+ * select_cons_res.h
*
* $Id: select_cons_res.h,v 1.3 2006/10/31 20:01:38 palermo Exp $
*****************************************************************************
* Copyright (C) 2006 Hewlett-Packard Development Company, L.P.
* Written by Susanne M. Balle, <susanne.balle@hp.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
@@ -31,7 +31,7 @@
* 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.
diff --git a/src/plugins/select/linear/Makefile.am b/src/plugins/select/linear/Makefile.am
index b398747c96cf8b2d5873a6d5a610f8c9d56e66a5..e5178e38701069b0bed146b1c5eabfdd998c74f6 100644
--- a/src/plugins/select/linear/Makefile.am
+++ b/src/plugins/select/linear/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/select/linear/Makefile.in b/src/plugins/select/linear/Makefile.in
index 8ecc1604b0c4d99a81561e2611555e058f558a17..9e1c25851a73b157fbb9ee7f03e0de546206b7d8 100644
--- a/src/plugins/select/linear/Makefile.in
+++ b/src/plugins/select/linear/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = select_linear.la
diff --git a/src/plugins/select/linear/select_linear.c b/src/plugins/select/linear/select_linear.c
index 393dd7c1a46c7c8cbe279b640ff91b5617737ea2..53e0bebde735b53555bb47fde3e744e70cf41999 100644
--- a/src/plugins/select/linear/select_linear.c
+++ b/src/plugins/select/linear/select_linear.c
@@ -1,6 +1,6 @@
/*****************************************************************************\
- * select_linear.c - node selection plugin for simple one-dimensional
- * address space. Selects nodes for a job so as to minimize the number
+ * select_linear.c - node selection plugin for simple one-dimensional
+ * address space. Selects nodes for a job so as to minimize the number
* of sets of consecutive nodes using a best-fit algorithm.
*****************************************************************************
* Copyright (C) 2004-2007 The Regents of the University of California.
@@ -8,32 +8,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -79,18 +79,18 @@
/* These are defined here so when we link with something other than
* the slurmctld we will have these symbols defined. They will get
- * overwritten when linking with the slurmctld.
+ * overwritten when linking with the slurmctld.
*/
slurm_ctl_conf_t slurmctld_conf;
struct node_record *node_record_table_ptr;
-List part_list;
-List job_list;
+List part_list;
+List job_list;
int node_record_count;
time_t last_node_update;
-struct switch_record *switch_record_table;
+struct switch_record *switch_record_table;
int switch_record_cnt;
#ifdef HAVE_AIX
-/* On AIX dlopen's RTLD_LAZY flag does NOT work, so we must define
+/* On AIX dlopen's RTLD_LAZY flag does NOT work, so we must define
* actual functions here in order to load this plugin from anywhere
* other than slurmctld */
void job_preempt_remove(uint32_t job_id)
@@ -105,7 +105,7 @@ struct select_nodeinfo {
};
static int _add_job_to_nodes(struct node_cr_record *node_cr_ptr,
- struct job_record *job_ptr, char *pre_err,
+ struct job_record *job_ptr, char *pre_err,
int suspended);
static void _add_run_job(struct part_cr_record *part_cr_ptr, uint32_t job_id);
static void _build_select_struct(struct job_record *job_ptr, bitstr_t *bitmap);
@@ -120,30 +120,30 @@ static uint16_t _get_avail_cpus(struct job_record *job_ptr, int index);
static uint16_t _get_total_cpus(int index);
static void _init_node_cr(void);
static int _job_count_bitmap(struct node_cr_record *node_cr_ptr,
- struct job_record *job_ptr,
- bitstr_t * bitmap, bitstr_t * jobmap,
+ struct job_record *job_ptr,
+ bitstr_t * bitmap, bitstr_t * jobmap,
int run_job_cnt, int tot_job_cnt);
static int _job_test(struct job_record *job_ptr, bitstr_t *bitmap,
- uint32_t min_nodes, uint32_t max_nodes,
+ uint32_t min_nodes, uint32_t max_nodes,
uint32_t req_nodes);
static int _job_test_topo(struct job_record *job_ptr, bitstr_t *bitmap,
- uint32_t min_nodes, uint32_t max_nodes,
+ uint32_t min_nodes, uint32_t max_nodes,
uint32_t req_nodes);
static void _preempt_list_del(void *x);
static bool _rem_run_job(struct part_cr_record *part_cr_ptr, uint32_t job_id);
static int _rm_job_from_nodes(struct node_cr_record *node_cr_ptr,
- struct job_record *job_ptr, char *pre_err,
+ struct job_record *job_ptr, char *pre_err,
bool remove_all);
static int _run_now(struct job_record *job_ptr, bitstr_t *bitmap,
- uint32_t min_nodes, uint32_t max_nodes,
- int max_share, uint32_t req_nodes,
+ uint32_t min_nodes, uint32_t max_nodes,
+ int max_share, uint32_t req_nodes,
List preemptee_candidates,
List *preemptee_job_list);
static int _test_only(struct job_record *job_ptr, bitstr_t *bitmap,
- uint32_t min_nodes, uint32_t max_nodes,
+ uint32_t min_nodes, uint32_t max_nodes,
uint32_t req_nodes);
static int _will_run_test(struct job_record *job_ptr, bitstr_t *bitmap,
- uint32_t min_nodes, uint32_t max_nodes,
+ uint32_t min_nodes, uint32_t max_nodes,
int max_share, uint32_t req_nodes,
List preemptee_candidates,
List *preemptee_job_list);
@@ -170,7 +170,7 @@ extern int select_p_select_nodeinfo_free(select_nodeinfo_t *nodeinfo);
* where <application> is a description of the intended application of
* the plugin (e.g., "select" for SLURM node selection) and <method>
* is a description of how this plugin satisfies that application. SLURM will
- * only load select plugins if the plugin_type string has a
+ * only load select plugins if the plugin_type string has a
* prefix of "select/".
*
* plugin_version - an unsigned 32-bit integer giving the version number
@@ -218,8 +218,8 @@ static void *xcpu_agent(void *args)
down_node_list[0] = '\0';
for (i=0; i<select_node_cnt; i++) {
- snprintf(clone_path, sizeof(clone_path),
- "%s/%s/xcpu/clone", XCPU_DIR,
+ snprintf(clone_path, sizeof(clone_path),
+ "%s/%s/xcpu/clone", XCPU_DIR,
select_node_ptr[i].name);
if (stat(clone_path, &buf) == 0)
continue;
@@ -229,14 +229,14 @@ static void *xcpu_agent(void *args)
sizeof(down_node_list)) {
if (down_node_list[0] != '\0')
strcat(down_node_list,",");
- strcat(down_node_list,
+ strcat(down_node_list,
select_node_ptr[i].name);
} else
error("down_node_list overflow");
}
if (down_node_list[0]) {
char time_str[32];
- slurm_make_time_str(&now, time_str,
+ slurm_make_time_str(&now, time_str,
sizeof(time_str));
snprintf(reason, sizeof(reason),
"select_linear: Can not stat XCPU "
@@ -302,7 +302,7 @@ static void _add_run_job(struct part_cr_record *part_cr_ptr, uint32_t job_id)
if (part_cr_ptr->run_job_ids == NULL) { /* create new array */
part_cr_ptr->run_job_len = RUN_JOB_INCR;
- part_cr_ptr->run_job_ids = xmalloc(sizeof(uint32_t) *
+ part_cr_ptr->run_job_ids = xmalloc(sizeof(uint32_t) *
part_cr_ptr->run_job_len);
part_cr_ptr->run_job_ids[0] = job_id;
return;
@@ -318,12 +318,12 @@ static void _add_run_job(struct part_cr_record *part_cr_ptr, uint32_t job_id)
/* expand array and add to end */
part_cr_ptr->run_job_len += RUN_JOB_INCR;
- xrealloc(part_cr_ptr->run_job_ids,
+ xrealloc(part_cr_ptr->run_job_ids,
sizeof(uint32_t) * part_cr_ptr->run_job_len);
part_cr_ptr->run_job_ids[i] = job_id;
}
-/* Remove job id from record of jobs running on this node,
+/* Remove job id from record of jobs running on this node,
* RET true if successful, false if the job was not running */
static bool _rem_run_job(struct part_cr_record *part_cr_ptr, uint32_t job_id)
{
@@ -363,10 +363,10 @@ static inline bool _job_preemption_killing(void)
{
(void) _job_preemption_enabled();
return job_preemption_killing;
-
+
}
-static bool _enough_nodes(int avail_nodes, int rem_nodes,
+static bool _enough_nodes(int avail_nodes, int rem_nodes,
uint32_t min_nodes, uint32_t req_nodes)
{
int needed_nodes;
@@ -424,14 +424,14 @@ static uint16_t _get_avail_cpus(struct job_record *job_ptr, int index)
}
#if SELECT_DEBUG
- info("host %s HW_ cpus %u sockets %u cores %u threads %u ",
+ info("host %s HW_ cpus %u sockets %u cores %u threads %u ",
node_ptr->name, cpus, sockets, cores, threads);
#endif
avail_cpus = slurm_get_avail_procs(
min_sockets, min_cores, cpus_per_task,
ntasks_per_node, ntasks_per_socket, ntasks_per_core,
- &cpus, &sockets, &cores, &threads, NULL,
+ &cpus, &sockets, &cores, &threads, NULL,
SELECT_TYPE_INFO_NONE,
job_ptr->job_id, node_ptr->name);
@@ -445,7 +445,7 @@ static uint16_t _get_avail_cpus(struct job_record *job_ptr, int index)
/*
* _get_total_cpus - Get the total number of cpus on a node
- * Note that the value of cpus is the lowest-level logical
+ * Note that the value of cpus is the lowest-level logical
* processor (LLLP).
* IN index - index of node's configuration information in select_node_ptr
*/
@@ -512,7 +512,7 @@ static void _build_select_struct(struct job_record *job_ptr, bitstr_t *bitmap)
else
node_cpus = node_ptr->cpus;
job_resrcs_ptr->cpus[j] = node_cpus;
- if ((k == -1) ||
+ if ((k == -1) ||
(job_resrcs_ptr->cpu_array_value[k] != node_cpus)) {
job_resrcs_ptr->cpu_array_cnt++;
job_resrcs_ptr->cpu_array_reps[++k] = 1;
@@ -526,7 +526,7 @@ static void _build_select_struct(struct job_record *job_ptr, bitstr_t *bitmap)
else if (job_memory_node)
job_resrcs_ptr->memory_allocated[j] = job_memory_node;
else if (job_memory_cpu) {
- job_resrcs_ptr->memory_allocated[j] =
+ job_resrcs_ptr->memory_allocated[j] =
job_memory_cpu * node_cpus;
}
@@ -547,8 +547,8 @@ static void _build_select_struct(struct job_record *job_ptr, bitstr_t *bitmap)
* that are running 'run_job_cnt' jobs or less, and clear the rest.
*/
static int _job_count_bitmap(struct node_cr_record *node_cr_ptr,
- struct job_record *job_ptr,
- bitstr_t * bitmap, bitstr_t * jobmap,
+ struct job_record *job_ptr,
+ bitstr_t * bitmap, bitstr_t * jobmap,
int run_job_cnt, int tot_job_cnt)
{
int i, count = 0, total_jobs, total_run_jobs;
@@ -619,10 +619,10 @@ static int _job_count_bitmap(struct node_cr_record *node_cr_ptr,
return count;
}
-/* _find_job_mate - does most of the real work for select_p_job_test(),
- * in trying to find a suitable job to mate this one with. This is
- * a pretty simple algorithm now, but could try to match the job
- * with multiple jobs that add up to the proper size or a single
+/* _find_job_mate - does most of the real work for select_p_job_test(),
+ * in trying to find a suitable job to mate this one with. This is
+ * a pretty simple algorithm now, but could try to match the job
+ * with multiple jobs that add up to the proper size or a single
* job plus a few idle nodes. */
static int _find_job_mate(struct job_record *job_ptr, bitstr_t *bitmap,
uint32_t min_nodes, uint32_t max_nodes,
@@ -640,7 +640,7 @@ static int _find_job_mate(struct job_record *job_ptr, bitstr_t *bitmap,
(!bit_super_set(job_scan_ptr->node_bitmap, bitmap)))
continue;
if (job_scan_ptr->details && job_ptr->details &&
- (job_scan_ptr->details->contiguous !=
+ (job_scan_ptr->details->contiguous !=
job_ptr->details->contiguous))
continue;
@@ -663,20 +663,20 @@ static int _find_job_mate(struct job_record *job_ptr, bitstr_t *bitmap,
return rc;
}
-/* _job_test - does most of the real work for select_p_job_test(), which
+/* _job_test - does most of the real work for select_p_job_test(), which
* pretty much just handles load-leveling and max_share logic */
static int _job_test(struct job_record *job_ptr, bitstr_t *bitmap,
- uint32_t min_nodes, uint32_t max_nodes,
+ uint32_t min_nodes, uint32_t max_nodes,
uint32_t req_nodes)
{
int i, index, error_code = EINVAL, sufficient;
- int *consec_nodes; /* how many nodes we can add from this
+ int *consec_nodes; /* how many nodes we can add from this
* consecutive set of nodes */
- int *consec_cpus; /* how many nodes we can add from this
+ int *consec_cpus; /* how many nodes we can add from this
* consecutive set of nodes */
int *consec_start; /* where this consecutive set starts (index) */
int *consec_end; /* where this consecutive set ends (index) */
- int *consec_req; /* are nodes from this set required
+ int *consec_req; /* are nodes from this set required
* (in req_bitmap) */
int consec_index, consec_size;
int rem_cpus, rem_nodes; /* remaining resources desired */
@@ -693,12 +693,12 @@ static int _job_test(struct job_record *job_ptr, bitstr_t *bitmap,
if (switch_record_cnt && switch_record_table) {
/* Perform optimized resource selection based upon topology */
- return _job_test_topo(job_ptr, bitmap,
+ return _job_test_topo(job_ptr, bitmap,
min_nodes, max_nodes, req_nodes);
}
consec_index = 0;
- consec_size = 50; /* start allocation for 50 sets of
+ consec_size = 50; /* start allocation for 50 sets of
* consecutive nodes */
consec_cpus = xmalloc(sizeof(int) * consec_size);
consec_nodes = xmalloc(sizeof(int) * consec_size);
@@ -736,7 +736,7 @@ static int _job_test(struct job_record *job_ptr, bitstr_t *bitmap,
alloc_cpus += avail_cpus;
total_cpus += _get_total_cpus(index);
} else { /* node not required (yet) */
- bit_clear(bitmap, index);
+ bit_clear(bitmap, index);
consec_cpus[consec_index] += avail_cpus;
consec_nodes[consec_index]++;
}
@@ -809,11 +809,11 @@ static int _job_test(struct job_record *job_ptr, bitstr_t *bitmap,
/* first set large enough for request OR */
/* tightest fit (less resource waste) OR */
/* nothing yet large enough, but this is biggest */
- if ((best_fit_nodes == 0) ||
+ if ((best_fit_nodes == 0) ||
((best_fit_req == -1) && (consec_req[i] != -1)) ||
(sufficient && (best_fit_sufficient == 0)) ||
(sufficient && (consec_cpus[i] < best_fit_cpus)) ||
- ((sufficient == 0) &&
+ ((sufficient == 0) &&
(consec_cpus[i] > best_fit_cpus))) {
best_fit_cpus = consec_cpus[i];
best_fit_nodes = consec_nodes[i];
@@ -824,7 +824,7 @@ static int _job_test(struct job_record *job_ptr, bitstr_t *bitmap,
if (job_ptr->details->contiguous &&
job_ptr->details->req_node_bitmap) {
- /* Must wait for all required nodes to be
+ /* Must wait for all required nodes to be
* in a single consecutive block */
int j, other_blocks = 0;
for (j = (i+1); j < consec_index; j++) {
@@ -841,9 +841,9 @@ static int _job_test(struct job_record *job_ptr, bitstr_t *bitmap,
}
if (best_fit_nodes == 0)
break;
- if (job_ptr->details->contiguous &&
+ if (job_ptr->details->contiguous &&
((best_fit_cpus < rem_cpus) ||
- (!_enough_nodes(best_fit_nodes, rem_nodes,
+ (!_enough_nodes(best_fit_nodes, rem_nodes,
min_nodes, req_nodes))))
break; /* no hole large enough */
if (best_fit_req != -1) {
@@ -870,7 +870,7 @@ static int _job_test(struct job_record *job_ptr, bitstr_t *bitmap,
if ((max_nodes <= 0) ||
((rem_nodes <= 0) && (rem_cpus <= 0)))
break;
- if (bit_test(bitmap, i))
+ if (bit_test(bitmap, i))
continue;
bit_set(bitmap, i);
rem_nodes--;
@@ -897,7 +897,7 @@ static int _job_test(struct job_record *job_ptr, bitstr_t *bitmap,
total_cpus += _get_total_cpus(i);
}
}
- if (job_ptr->details->contiguous ||
+ if (job_ptr->details->contiguous ||
((rem_nodes <= 0) && (rem_cpus <= 0))) {
error_code = SLURM_SUCCESS;
break;
@@ -929,7 +929,7 @@ static int _job_test(struct job_record *job_ptr, bitstr_t *bitmap,
* select/cons_res/job_test.c. Any bug found here is probably also there.
*/
static int _job_test_topo(struct job_record *job_ptr, bitstr_t *bitmap,
- uint32_t min_nodes, uint32_t max_nodes,
+ uint32_t min_nodes, uint32_t max_nodes,
uint32_t req_nodes)
{
bitstr_t **switches_bitmap; /* nodes on this switch */
@@ -965,7 +965,7 @@ static int _job_test_topo(struct job_record *job_ptr, bitstr_t *bitmap,
}
}
- /* Construct a set of switch array entries,
+ /* Construct a set of switch array entries,
* use the same indexes as switch_record_table in slurmctld */
switches_bitmap = xmalloc(sizeof(bitstr_t *) * switch_record_cnt);
switches_cpu_cnt = xmalloc(sizeof(int) * switch_record_cnt);
@@ -1088,7 +1088,7 @@ static int _job_test_topo(struct job_record *job_ptr, bitstr_t *bitmap,
bit_clear(switches_bitmap[j], i);
switches_node_cnt[j]--;
} else {
- switches_cpu_cnt[j] +=
+ switches_cpu_cnt[j] +=
_get_avail_cpus(job_ptr, i);
}
}
@@ -1103,7 +1103,7 @@ static int _job_test_topo(struct job_record *job_ptr, bitstr_t *bitmap,
for (i=first; i<=last; i++) {
if (!bit_test(switches_bitmap[j], i))
continue;
- switches_cpu_cnt[j] +=
+ switches_cpu_cnt[j] +=
_get_avail_cpus(job_ptr, i);
}
}
@@ -1134,7 +1134,7 @@ static int _job_test_topo(struct job_record *job_ptr, bitstr_t *bitmap,
/* Identify usable leafs (within higher switch having best fit) */
for (j=0; j<switch_record_cnt; j++) {
if ((switch_record_table[j].level != 0) ||
- (!bit_super_set(switches_bitmap[j],
+ (!bit_super_set(switches_bitmap[j],
switches_bitmap[best_fit_inx]))) {
switches_node_cnt[j] = 0;
}
@@ -1147,18 +1147,18 @@ static int _job_test_topo(struct job_record *job_ptr, bitstr_t *bitmap,
if (switches_node_cnt[j] == 0)
continue;
sufficient = (switches_cpu_cnt[j] >= rem_cpus) &&
- _enough_nodes(switches_node_cnt[j],
- rem_nodes, min_nodes,
+ _enough_nodes(switches_node_cnt[j],
+ rem_nodes, min_nodes,
req_nodes);
/* If first possibility OR */
/* first set large enough for request OR */
/* tightest fit (less resource waste) OR */
/* nothing yet large enough, but this is biggest */
- if ((best_fit_nodes == 0) ||
+ if ((best_fit_nodes == 0) ||
(sufficient && (best_fit_sufficient == 0)) ||
- (sufficient &&
+ (sufficient &&
(switches_cpu_cnt[j] < best_fit_cpus)) ||
- ((sufficient == 0) &&
+ ((sufficient == 0) &&
(switches_cpu_cnt[j] > best_fit_cpus))) {
best_fit_cpus = switches_cpu_cnt[j];
best_fit_nodes = switches_node_cnt[j];
@@ -1192,13 +1192,13 @@ static int _job_test_topo(struct job_record *job_ptr, bitstr_t *bitmap,
rem_cpus -= avail_cpus;
alloc_cpus += avail_cpus;
total_cpus += _get_total_cpus(i);
- if ((max_nodes <= 0) ||
+ if ((max_nodes <= 0) ||
((rem_nodes <= 0) && (rem_cpus <= 0)))
break;
}
switches_node_cnt[best_fit_location] = 0;
}
- if ((rem_cpus <= 0) &&
+ if ((rem_cpus <= 0) &&
_enough_nodes(0, rem_nodes, min_nodes, req_nodes)) {
rc = SLURM_SUCCESS;
} else
@@ -1222,13 +1222,13 @@ static int _job_test_topo(struct job_record *job_ptr, bitstr_t *bitmap,
/*
- * deallocate resources that were assigned to this job
+ * deallocate resources that were assigned to this job
*
* if remove_all = false: the job has been suspended, so just deallocate CPUs
* if remove_all = true: deallocate all resources
*/
static int _rm_job_from_nodes(struct node_cr_record *node_cr_ptr,
- struct job_record *job_ptr, char *pre_err,
+ struct job_record *job_ptr, char *pre_err,
bool remove_all)
{
int i, i_first, i_last, rc = SLURM_SUCCESS;
@@ -1243,7 +1243,7 @@ static int _rm_job_from_nodes(struct node_cr_record *node_cr_ptr,
}
exclusive = (job_ptr->details->shared == 0);
- if (remove_all && job_ptr->details &&
+ if (remove_all && job_ptr->details &&
job_ptr->details->job_min_memory && (cr_type == CR_MEMORY)) {
if (job_ptr->details->job_min_memory & MEM_PER_CPU) {
job_memory_cpu = job_ptr->details->job_min_memory &
@@ -1337,7 +1337,7 @@ static int _rm_job_from_nodes(struct node_cr_record *node_cr_ptr,
"job %u and node %s",
pre_err, job_ptr->job_id,
node_record_table_ptr[i].name);
-
+
rc = SLURM_ERROR;
}
}
@@ -1352,7 +1352,7 @@ static int _rm_job_from_nodes(struct node_cr_record *node_cr_ptr,
* if alloc_all = 1: allocate all resources (CPUs and memory)
*/
static int _add_job_to_nodes(struct node_cr_record *node_cr_ptr,
- struct job_record *job_ptr, char *pre_err,
+ struct job_record *job_ptr, char *pre_err,
int alloc_all)
{
int i, i_first, i_last, rc = SLURM_SUCCESS;
@@ -1366,7 +1366,7 @@ static int _add_job_to_nodes(struct node_cr_record *node_cr_ptr,
return SLURM_ERROR;
}
- if (alloc_all && job_ptr->details &&
+ if (alloc_all && job_ptr->details &&
job_ptr->details->job_min_memory && (cr_type == CR_MEMORY)) {
if (job_ptr->details->job_min_memory & MEM_PER_CPU) {
job_memory_cpu = job_ptr->details->job_min_memory &
@@ -1389,12 +1389,12 @@ static int _add_job_to_nodes(struct node_cr_record *node_cr_ptr,
if (job_memory_cpu == 0)
node_cr_ptr[i].alloc_memory += job_memory_node;
else if (select_fast_schedule) {
- node_cr_ptr[i].alloc_memory +=
+ node_cr_ptr[i].alloc_memory +=
job_memory_cpu *
node_record_table_ptr[i].
config_ptr->cpus;
} else {
- node_cr_ptr[i].alloc_memory +=
+ node_cr_ptr[i].alloc_memory +=
job_memory_cpu *
node_record_table_ptr[i].cpus;
}
@@ -1454,14 +1454,14 @@ static inline void _dump_node_cr(struct node_cr_record *node_cr_ptr)
return;
for (i = 0; i < select_node_cnt; i++) {
- info("Node:%s exclusive_cnt:%u alloc_mem:%u",
+ info("Node:%s exclusive_cnt:%u alloc_mem:%u",
node_record_table_ptr[i].name,
node_cr_ptr[i].exclusive_cnt,
node_cr_ptr[i].alloc_memory);
part_cr_ptr = node_cr_ptr[i].parts;
while (part_cr_ptr) {
- info(" Part:%s run:%u tot:%u",
+ info(" Part:%s run:%u tot:%u",
part_cr_ptr->part_ptr->name,
part_cr_ptr->run_job_cnt,
part_cr_ptr->tot_job_cnt);
@@ -1480,7 +1480,7 @@ static struct node_cr_record *_dup_node_cr(struct node_cr_record *node_cr_ptr)
if (node_cr_ptr == NULL)
return NULL;
- new_node_cr_ptr = xmalloc(select_node_cnt *
+ new_node_cr_ptr = xmalloc(select_node_cnt *
sizeof(struct node_cr_record));
for (i = 0; i < select_node_cnt; i++) {
@@ -1489,7 +1489,7 @@ static struct node_cr_record *_dup_node_cr(struct node_cr_record *node_cr_ptr)
exclusive_cnt;
part_cr_ptr = node_cr_ptr[i].parts;
while (part_cr_ptr) {
- new_part_cr_ptr = xmalloc(sizeof(struct
+ new_part_cr_ptr = xmalloc(sizeof(struct
part_cr_record));
new_part_cr_ptr->part_ptr = part_cr_ptr->part_ptr;
if (part_cr_ptr->run_job_cnt) {
@@ -1497,7 +1497,7 @@ static struct node_cr_record *_dup_node_cr(struct node_cr_record *node_cr_ptr)
run_job_cnt;
new_part_cr_ptr->run_job_len = part_cr_ptr->
run_job_len;
- new_part_cr_ptr->run_job_ids =
+ new_part_cr_ptr->run_job_ids =
xmalloc(sizeof(uint32_t) *
part_cr_ptr->run_job_len);
memcpy(new_part_cr_ptr->run_job_ids,
@@ -1545,7 +1545,7 @@ static void _init_node_cr(void)
part_cr_ptr->part_ptr = part_ptr;
node_cr_ptr[i].parts = part_cr_ptr;
}
-
+
}
list_iterator_destroy(part_iterator);
@@ -1590,26 +1590,26 @@ static void _init_node_cr(void)
if (job_memory_cpu == 0)
node_cr_ptr[i].alloc_memory += job_memory_node;
else if (select_fast_schedule) {
- node_cr_ptr[i].alloc_memory +=
+ node_cr_ptr[i].alloc_memory +=
job_memory_cpu *
node_record_table_ptr[i].
config_ptr->cpus;
} else {
- node_cr_ptr[i].alloc_memory +=
+ node_cr_ptr[i].alloc_memory +=
job_memory_cpu *
node_record_table_ptr[i].cpus;
}
part_cr_ptr = node_cr_ptr[i].parts;
while (part_cr_ptr) {
- if (part_cr_ptr->part_ptr !=
+ if (part_cr_ptr->part_ptr !=
job_ptr->part_ptr) {
part_cr_ptr = part_cr_ptr->next;
continue;
}
part_cr_ptr->tot_job_cnt++;
- if (IS_JOB_RUNNING(job_ptr) ||
+ if (IS_JOB_RUNNING(job_ptr) ||
IS_JOB_COMPLETING(job_ptr)) {
- _add_run_job(part_cr_ptr,
+ _add_run_job(part_cr_ptr,
job_ptr->job_id);
part_cr_ptr->run_job_cnt++;
}
@@ -1635,7 +1635,7 @@ static int _find_job (void *x, void *key)
return 0;
}
-static bool _is_preemptable(struct job_record *job_ptr,
+static bool _is_preemptable(struct job_record *job_ptr,
List preemptee_candidates)
{
if (!preemptee_candidates)
@@ -1647,7 +1647,7 @@ static bool _is_preemptable(struct job_record *job_ptr,
/* Determine if a job can ever run */
static int _test_only(struct job_record *job_ptr, bitstr_t *bitmap,
- uint32_t min_nodes, uint32_t max_nodes,
+ uint32_t min_nodes, uint32_t max_nodes,
uint32_t req_nodes)
{
int rc;
@@ -1663,7 +1663,7 @@ static int _test_only(struct job_record *job_ptr, bitstr_t *bitmap,
/* Allocate resources for a job now, if possible */
static int _run_now(struct job_record *job_ptr, bitstr_t *bitmap,
- uint32_t min_nodes, uint32_t max_nodes,
+ uint32_t min_nodes, uint32_t max_nodes,
int max_share, uint32_t req_nodes,
List preemptee_candidates,
List *preemptee_job_list)
@@ -1681,17 +1681,17 @@ static int _run_now(struct job_record *job_ptr, bitstr_t *bitmap,
for (max_run_job=0; max_run_job<max_share; max_run_job++) {
bool last_iteration = (max_run_job == (max_share - 1));
- for (sus_jobs=0; ((sus_jobs<5) && (rc != SLURM_SUCCESS));
+ for (sus_jobs=0; ((sus_jobs<5) && (rc != SLURM_SUCCESS));
sus_jobs+=4) {
if (last_iteration)
sus_jobs = NO_SHARE_LIMIT;
- j = _job_count_bitmap(node_cr_ptr, job_ptr,
- orig_map, bitmap,
- max_run_job,
+ j = _job_count_bitmap(node_cr_ptr, job_ptr,
+ orig_map, bitmap,
+ max_run_job,
max_run_job + sus_jobs);
#if SELECT_DEBUG
{ char *node_list = bitmap2node_name(bitmap);
- info("_run_job %u iter:%d cnt:%d nodes:%s",
+ info("_run_job %u iter:%d cnt:%d nodes:%s",
job_ptr->job_id, max_run_job, j, node_list);
xfree(node_list);
}
@@ -1708,7 +1708,7 @@ static int _run_now(struct job_record *job_ptr, bitstr_t *bitmap,
if (rc == SLURM_SUCCESS)
break;
}
- rc = _job_test(job_ptr, bitmap, min_nodes, max_nodes,
+ rc = _job_test(job_ptr, bitmap, min_nodes, max_nodes,
req_nodes);
if (rc == SLURM_SUCCESS)
break;
@@ -1720,24 +1720,24 @@ static int _run_now(struct job_record *job_ptr, bitstr_t *bitmap,
(exp_node_cr = _dup_node_cr(node_cr_ptr))) {
/* Remove all preemptable jobs from simulated environment */
job_iterator = list_iterator_create(job_list);
- while ((tmp_job_ptr = (struct job_record *)
+ while ((tmp_job_ptr = (struct job_record *)
list_next(job_iterator))) {
- if (!IS_JOB_RUNNING(tmp_job_ptr) &&
+ if (!IS_JOB_RUNNING(tmp_job_ptr) &&
!IS_JOB_SUSPENDED(tmp_job_ptr))
continue;
- if (_is_preemptable(tmp_job_ptr,
+ if (_is_preemptable(tmp_job_ptr,
preemptee_candidates)) {
/* Remove preemptable job now */
_rm_job_from_nodes(exp_node_cr, tmp_job_ptr,
- "_will_run_test",
+ "_will_run_test",
_job_preemption_killing());
- j = _job_count_bitmap(exp_node_cr, job_ptr,
- orig_map, bitmap,
- (max_share - 1),
+ j = _job_count_bitmap(exp_node_cr, job_ptr,
+ orig_map, bitmap,
+ (max_share - 1),
NO_SHARE_LIMIT);
if (j < min_nodes)
continue;
- rc = _job_test(job_ptr, bitmap, min_nodes,
+ rc = _job_test(job_ptr, bitmap, min_nodes,
max_nodes, req_nodes);
if (rc == SLURM_SUCCESS)
break;
@@ -1747,7 +1747,7 @@ static int _run_now(struct job_record *job_ptr, bitstr_t *bitmap,
if ((rc == SLURM_SUCCESS) && preemptee_job_list &&
preemptee_candidates && _job_preemption_killing()) {
- /* Build list of preemptee jobs whose resources are
+ /* Build list of preemptee jobs whose resources are
* actually used */
if (*preemptee_job_list == NULL) {
*preemptee_job_list = list_create(
@@ -1759,11 +1759,11 @@ static int _run_now(struct job_record *job_ptr, bitstr_t *bitmap,
preemptee_candidates);
while ((tmp_job_ptr = (struct job_record *)
list_next(preemptee_iterator))) {
- if (bit_overlap(bitmap,
+ if (bit_overlap(bitmap,
tmp_job_ptr->node_bitmap) == 0)
continue;
- list_append(*preemptee_job_list,
+ list_append(*preemptee_job_list,
tmp_job_ptr);
}
list_iterator_destroy(preemptee_iterator);
@@ -1777,12 +1777,12 @@ static int _run_now(struct job_record *job_ptr, bitstr_t *bitmap,
return rc;
}
-/* Determine where and when the job at job_ptr can begin execution by updating
- * a scratch node_cr_record structure to reflect each job terminating at the
+/* Determine where and when the job at job_ptr can begin execution by updating
+ * a scratch node_cr_record structure to reflect each job terminating at the
* end of its time limit and use this to show where and when the job at job_ptr
* will begin execution. Used by SLURM's sched/backfill plugin and Moab. */
static int _will_run_test(struct job_record *job_ptr, bitstr_t *bitmap,
- uint32_t min_nodes, uint32_t max_nodes,
+ uint32_t min_nodes, uint32_t max_nodes,
int max_share, uint32_t req_nodes,
List preemptee_candidates,
List *preemptee_job_list)
@@ -1801,10 +1801,10 @@ static int _will_run_test(struct job_record *job_ptr, bitstr_t *bitmap,
fatal("bit_copy: malloc failure");
/* Try to run with currently available nodes */
- i = _job_count_bitmap(node_cr_ptr, job_ptr, orig_map, bitmap,
+ i = _job_count_bitmap(node_cr_ptr, job_ptr, orig_map, bitmap,
max_run_jobs, NO_SHARE_LIMIT);
if (i >= min_nodes) {
- rc = _job_test(job_ptr, bitmap, min_nodes, max_nodes,
+ rc = _job_test(job_ptr, bitmap, min_nodes, max_nodes,
req_nodes);
if (rc == SLURM_SUCCESS) {
bit_free(orig_map);
@@ -1813,7 +1813,7 @@ static int _will_run_test(struct job_record *job_ptr, bitstr_t *bitmap,
}
}
- /* Job is still pending. Simulate termination of jobs one at a time
+ /* Job is still pending. Simulate termination of jobs one at a time
* to determine when and where the job can start. */
exp_node_cr = _dup_node_cr(node_cr_ptr);
if (exp_node_cr == NULL) {
@@ -1827,7 +1827,7 @@ static int _will_run_test(struct job_record *job_ptr, bitstr_t *bitmap,
fatal("list_create: memory allocation failure");
job_iterator = list_iterator_create(job_list);
while ((tmp_job_ptr = (struct job_record *) list_next(job_iterator))) {
- if (!IS_JOB_RUNNING(tmp_job_ptr) &&
+ if (!IS_JOB_RUNNING(tmp_job_ptr) &&
!IS_JOB_SUSPENDED(tmp_job_ptr))
continue;
if (tmp_job_ptr->end_time == 0) {
@@ -1837,20 +1837,20 @@ static int _will_run_test(struct job_record *job_ptr, bitstr_t *bitmap,
if (_is_preemptable(tmp_job_ptr, preemptee_candidates)) {
/* Remove preemptable job now */
_rm_job_from_nodes(exp_node_cr, tmp_job_ptr,
- "_will_run_test",
+ "_will_run_test",
_job_preemption_killing());
- } else
+ } else
list_append(cr_job_list, tmp_job_ptr);
-
+
}
list_iterator_destroy(job_iterator);
/* Test with all preemptable jobs gone */
if (preemptee_candidates) {
- i = _job_count_bitmap(exp_node_cr, job_ptr, orig_map, bitmap,
+ i = _job_count_bitmap(exp_node_cr, job_ptr, orig_map, bitmap,
max_run_jobs, NO_SHARE_LIMIT);
if (i >= min_nodes) {
- rc = _job_test(job_ptr, bitmap, min_nodes, max_nodes,
+ rc = _job_test(job_ptr, bitmap, min_nodes, max_nodes,
req_nodes);
if (rc == SLURM_SUCCESS)
job_ptr->start_time = now + 1;
@@ -1862,16 +1862,16 @@ static int _will_run_test(struct job_record *job_ptr, bitstr_t *bitmap,
if (rc != SLURM_SUCCESS) {
list_sort(cr_job_list, _cr_job_list_sort);
job_iterator = list_iterator_create(cr_job_list);
- while ((tmp_job_ptr = (struct job_record *)
+ while ((tmp_job_ptr = (struct job_record *)
list_next(job_iterator))) {
_rm_job_from_nodes(exp_node_cr, tmp_job_ptr,
"_will_run_test", true);
- i = _job_count_bitmap(exp_node_cr, job_ptr, orig_map,
- bitmap, max_run_jobs,
+ i = _job_count_bitmap(exp_node_cr, job_ptr, orig_map,
+ bitmap, max_run_jobs,
NO_SHARE_LIMIT);
if (i < min_nodes)
continue;
- rc = _job_test(job_ptr, bitmap, min_nodes, max_nodes,
+ rc = _job_test(job_ptr, bitmap, min_nodes, max_nodes,
req_nodes);
if (rc != SLURM_SUCCESS)
continue;
@@ -1884,9 +1884,9 @@ static int _will_run_test(struct job_record *job_ptr, bitstr_t *bitmap,
list_iterator_destroy(job_iterator);
}
- if ((rc == SLURM_SUCCESS) && preemptee_job_list &&
+ if ((rc == SLURM_SUCCESS) && preemptee_job_list &&
preemptee_candidates) {
- /* Build list of preemptee jobs whose resources are
+ /* Build list of preemptee jobs whose resources are
* actually used. List returned even if not killed
* in selected plugin, but by Moab or something else. */
if (*preemptee_job_list == NULL) {
@@ -1897,7 +1897,7 @@ static int _will_run_test(struct job_record *job_ptr, bitstr_t *bitmap,
preemptee_iterator =list_iterator_create(preemptee_candidates);
while ((tmp_job_ptr = (struct job_record *)
list_next(preemptee_iterator))) {
- if (bit_overlap(bitmap,
+ if (bit_overlap(bitmap,
tmp_job_ptr->node_bitmap) == 0)
continue;
@@ -1957,7 +1957,7 @@ extern int fini ( void )
}
/*
- * The remainder of this file implements the standard SLURM
+ * The remainder of this file implements the standard SLURM
* node selection API.
*/
@@ -2009,14 +2009,14 @@ extern int select_p_block_init(List part_list)
}
/*
- * select_p_job_test - Given a specification of scheduling requirements,
+ * select_p_job_test - Given a specification of scheduling requirements,
* identify the nodes which "best" satisfy the request.
- * "best" is defined as either single set of consecutive nodes satisfying
- * the request and leaving the minimum number of unused nodes OR
+ * "best" is defined as either single set of consecutive nodes satisfying
+ * the request and leaving the minimum number of unused nodes OR
* the fewest number of consecutive node sets
* IN/OUT job_ptr - pointer to job being considered for initiation,
* set's start_time when job expected to start
- * IN/OUT bitmap - usable nodes are set on input, nodes not required to
+ * IN/OUT bitmap - usable nodes are set on input, nodes not required to
* satisfy the request are cleared, other left set
* IN min_nodes - minimum count of nodes
* IN req_nodes - requested (or desired) count of nodes
@@ -2025,22 +2025,22 @@ extern int select_p_block_init(List part_list)
* SELECT_MODE_TEST_ONLY: test if job can ever run
* SELECT_MODE_WILL_RUN: determine when and where job can run
* IN preemptee_candidates - List of pointers to jobs which can be preempted.
- * IN/OUT preemptee_job_list - Pointer to list of job pointers. These are the
- * jobs to be preempted to initiate the pending job. Not set
+ * IN/OUT preemptee_job_list - Pointer to list of job pointers. These are the
+ * jobs to be preempted to initiate the pending job. Not set
* if mode=SELECT_MODE_TEST_ONLY or input pointer is NULL.
* RET zero on success, EINVAL otherwise
- * globals (passed via select_p_node_init):
+ * globals (passed via select_p_node_init):
* node_recurd_count - count of nodes configured
* node_record_table_ptr - pointer to global node table
* NOTE: the job information that is considered for scheduling includes:
* req_node_bitmap: bitmap of specific nodes required by the job
* contiguous: allocated nodes must be sequentially located
* num_procs: minimum number of processors required by the job
- * NOTE: bitmap must be a superset of the job's required at the time that
+ * NOTE: bitmap must be a superset of the job's required at the time that
* select_p_job_test is called
*/
extern int select_p_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
- uint32_t min_nodes, uint32_t max_nodes,
+ uint32_t min_nodes, uint32_t max_nodes,
uint32_t req_nodes, uint16_t mode,
List preemptee_candidates,
List *preemptee_job_list)
@@ -2069,7 +2069,7 @@ extern int select_p_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
if (mode != SELECT_MODE_TEST_ONLY) {
if (job_ptr->details->shared) {
- max_share = job_ptr->part_ptr->max_share &
+ max_share = job_ptr->part_ptr->max_share &
~SHARED_FORCE;
} else /* ((shared == 0) || (shared == (uint16_t) NO_VAL)) */
max_share = 1;
@@ -2077,14 +2077,14 @@ extern int select_p_job_test(struct job_record *job_ptr, bitstr_t *bitmap,
if (mode == SELECT_MODE_WILL_RUN) {
rc = _will_run_test(job_ptr, bitmap, min_nodes, max_nodes,
- max_share, req_nodes,
+ max_share, req_nodes,
preemptee_candidates, preemptee_job_list);
} else if (mode == SELECT_MODE_TEST_ONLY) {
rc = _test_only(job_ptr, bitmap, min_nodes, max_nodes,
req_nodes);
} else if (mode == SELECT_MODE_RUN_NOW) {
rc = _run_now(job_ptr, bitmap, min_nodes, max_nodes,
- max_share, req_nodes,
+ max_share, req_nodes,
preemptee_candidates, preemptee_job_list);
} else
fatal("select_p_job_test: Mode %d is invalid", mode);
@@ -2107,15 +2107,15 @@ extern int select_p_job_begin(struct job_record *job_ptr)
for (i=0; i<select_node_cnt; i++) {
if (bit_test(job_ptr->node_bitmap, i) == 0)
continue;
- snprintf(clone_path, sizeof(clone_path),
- "%s/%s/xcpu/clone", XCPU_DIR,
+ snprintf(clone_path, sizeof(clone_path),
+ "%s/%s/xcpu/clone", XCPU_DIR,
select_node_ptr[i].name);
- if (chown(clone_path, (uid_t)job_ptr->user_id,
+ if (chown(clone_path, (uid_t)job_ptr->user_id,
(gid_t)job_ptr->group_id)) {
error("chown %s: %m", clone_path);
rc = SLURM_ERROR;
} else {
- debug("chown %s to %u", clone_path,
+ debug("chown %s to %u", clone_path,
job_ptr->user_id);
}
}
@@ -2146,8 +2146,8 @@ extern int select_p_job_fini(struct job_record *job_ptr)
for (i=0; i<select_node_cnt; i++) {
if (bit_test(job_ptr->node_bitmap, i) == 0)
continue;
- snprintf(clone_path, sizeof(clone_path),
- "%s/%s/xcpu/clone", XCPU_DIR,
+ snprintf(clone_path, sizeof(clone_path),
+ "%s/%s/xcpu/clone", XCPU_DIR,
select_node_ptr[i].name);
if (chown(clone_path, (uid_t)0, (gid_t)0)) {
error("chown %s: %m", clone_path);
@@ -2170,7 +2170,7 @@ extern int select_p_job_suspend(struct job_record *job_ptr)
slurm_mutex_lock(&cr_mutex);
if (node_cr_ptr == NULL)
_init_node_cr();
- _rm_job_from_nodes(node_cr_ptr, job_ptr, "select_p_job_suspend",
+ _rm_job_from_nodes(node_cr_ptr, job_ptr, "select_p_job_suspend",
false);
slurm_mutex_unlock(&cr_mutex);
return SLURM_SUCCESS;
@@ -2192,7 +2192,7 @@ extern int select_p_pack_select_info(time_t last_query_time, Buf *buffer_ptr)
return SLURM_ERROR;
}
-extern int select_p_select_nodeinfo_pack(select_nodeinfo_t *nodeinfo,
+extern int select_p_select_nodeinfo_pack(select_nodeinfo_t *nodeinfo,
Buf buffer)
{
pack16(nodeinfo->alloc_cpus, buffer);
@@ -2200,7 +2200,7 @@ extern int select_p_select_nodeinfo_pack(select_nodeinfo_t *nodeinfo,
return SLURM_SUCCESS;
}
-extern int select_p_select_nodeinfo_unpack(select_nodeinfo_t **nodeinfo,
+extern int select_p_select_nodeinfo_unpack(select_nodeinfo_t **nodeinfo,
Buf buffer)
{
select_nodeinfo_t *nodeinfo_ptr = NULL;
@@ -2236,7 +2236,7 @@ extern int select_p_select_nodeinfo_free(select_nodeinfo_t *nodeinfo)
error("select_p_select_nodeinfo_free: "
"nodeinfo magic bad");
return EINVAL;
- }
+ }
nodeinfo->magic = 0;
xfree(nodeinfo);
}
@@ -2253,9 +2253,9 @@ extern int select_p_select_nodeinfo_set_all(time_t last_query_time)
* the last time we set things up. */
if(last_set_all && (last_node_update < last_set_all)) {
debug2("Node select info for set all hasn't "
- "changed since %d",
+ "changed since %d",
last_set_all);
- return SLURM_NO_CHANGE_IN_DATA;
+ return SLURM_NO_CHANGE_IN_DATA;
}
last_set_all = last_node_update;
@@ -2265,10 +2265,10 @@ extern int select_p_select_nodeinfo_set_all(time_t last_query_time)
if ((node_ptr->node_state & NODE_STATE_COMPLETING) ||
(node_ptr->node_state == NODE_STATE_ALLOCATED)) {
if (slurmctld_conf.fast_schedule)
- node_ptr->select_nodeinfo->alloc_cpus =
+ node_ptr->select_nodeinfo->alloc_cpus =
node_ptr->config_ptr->cpus;
else
- node_ptr->select_nodeinfo->alloc_cpus =
+ node_ptr->select_nodeinfo->alloc_cpus =
node_ptr->cpus;
} else
node_ptr->select_nodeinfo->alloc_cpus = 0;
@@ -2280,16 +2280,16 @@ extern int select_p_select_nodeinfo_set_all(time_t last_query_time)
extern int select_p_select_nodeinfo_set(struct job_record *job_ptr)
{
xassert(job_ptr);
-
+
slurm_mutex_lock(&cr_mutex);
if (node_cr_ptr == NULL)
_init_node_cr();
slurm_mutex_unlock(&cr_mutex);
-
+
return SLURM_SUCCESS;
}
-extern int select_p_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
+extern int select_p_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
enum select_nodedata_type dinfo,
enum node_states state,
void *data)
@@ -2301,7 +2301,7 @@ extern int select_p_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
error("get_nodeinfo: nodeinfo not set");
return SLURM_ERROR;
}
-
+
if (nodeinfo->magic != NODEINFO_MAGIC) {
error("get_nodeinfo: jobinfo magic bad");
return SLURM_ERROR;
@@ -2319,7 +2319,7 @@ extern int select_p_select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
error("Unsupported option %d for get_nodeinfo.", dinfo);
rc = SLURM_ERROR;
break;
- }
+ }
return rc;
}
@@ -2336,7 +2336,7 @@ extern int select_p_select_jobinfo_set(select_jobinfo_t *jobinfo,
}
extern int select_p_select_jobinfo_get (select_jobinfo_t *jobinfo,
- enum select_jobdata_type data_type,
+ enum select_jobdata_type data_type,
void *data)
{
return SLURM_SUCCESS;
@@ -2374,7 +2374,7 @@ extern char *select_p_select_jobinfo_sprint(select_jobinfo_t *jobinfo,
return NULL;
}
-extern char *select_p_select_jobinfo_xstrdup(select_jobinfo_t *jobinfo,
+extern char *select_p_select_jobinfo_xstrdup(select_jobinfo_t *jobinfo,
int mode)
{
return NULL;
diff --git a/src/plugins/select/linear/select_linear.h b/src/plugins/select/linear/select_linear.h
index 0a38cb7da17ca97443b46e8366d9a46e4a588db1..be90cbd654938bce2eb714bbdc06a8e8fcf1af69 100644
--- a/src/plugins/select/linear/select_linear.h
+++ b/src/plugins/select/linear/select_linear.h
@@ -1,19 +1,19 @@
/*****************************************************************************\
- * select_linear.h
+ * select_linear.h
*****************************************************************************
* Copyright (C) 2006-2007 Hewlett-Packard Development Company, L.P.
* Written by Susanne M. Balle, <susanne.balle@hp.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
@@ -29,7 +29,7 @@
* 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.
@@ -42,7 +42,7 @@
#include "src/slurmctld/slurmctld.h"
/*
- * part_cr_record keeps track of the number of running jobs on
+ * part_cr_record keeps track of the number of running jobs on
* this node in this partition. SLURM allows a node to be
* assigned to more than one partition. One or more partitions
* may be configured to share the cores with more than one job.
@@ -54,14 +54,14 @@ struct part_cr_record {
* for this partition */
uint32_t *run_job_ids; /* job IDs for running jobs */
uint16_t run_job_len; /* length of run_job_ids array */
- uint16_t tot_job_cnt; /* number of jobs allocated to this
+ uint16_t tot_job_cnt; /* number of jobs allocated to this
* node for this partition */
struct part_cr_record *next; /* ptr to next part_cr_record */
};
/*
- * node_cr_record keeps track of the resources within a node which
- * have been reserved by already scheduled jobs.
+ * node_cr_record keeps track of the resources within a node which
+ * have been reserved by already scheduled jobs.
*/
struct node_cr_record {
struct part_cr_record *parts; /* ptr to singly-linked part_cr_record
@@ -69,7 +69,7 @@ struct node_cr_record {
uint32_t alloc_memory; /* real memory reserved by already
* scheduled jobs */
uint16_t exclusive_cnt; /* count of jobs exclusively allocated
- * this node (from different
+ * this node (from different
* partitions) */
};
diff --git a/src/plugins/switch/elan/Makefile.am b/src/plugins/switch/elan/Makefile.am
index 1da3e64d0bdf077f3671938f429ea13953bb4e23..5717122e358c68fa8d2a7fc0cb8e7cf3ca735f4b 100644
--- a/src/plugins/switch/elan/Makefile.am
+++ b/src/plugins/switch/elan/Makefile.am
@@ -8,7 +8,7 @@ else
elan_lib =
endif
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/switch/elan/Makefile.in b/src/plugins/switch/elan/Makefile.in
index 83352a4063b62a2c6250c1e7bcb79ae02a597e8e..596a58373bed1037b761c61b58fd53d262300e9e 100644
--- a/src/plugins/switch/elan/Makefile.in
+++ b/src/plugins/switch/elan/Makefile.in
@@ -319,7 +319,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
@HAVE_ELAN_FALSE@elan_lib =
@HAVE_ELAN_TRUE@elan_lib = switch_elan.la
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = $(elan_lib)
diff --git a/src/plugins/switch/elan/qsw.c b/src/plugins/switch/elan/qsw.c
index 2b261907693a95820c55179838367ead88f67ccf..c04e90458eda686533a54e3d257c08d90c0cca88 100644
--- a/src/plugins/switch/elan/qsw.c
+++ b/src/plugins/switch/elan/qsw.c
@@ -1,37 +1,37 @@
/*****************************************************************************\
- * qsw.c - Library routines for initiating jobs on QsNet.
+ * qsw.c - Library routines for initiating jobs on QsNet.
* $Id$
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jim Garlick <garlick@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -72,13 +72,13 @@
* (XXX: What is the equivalent in libelanctrl?)
*
* slurm/482: the elan USER context range is now split
- * into two segments, regular user context and RMS
+ * into two segments, regular user context and RMS
* context ranges. Do not allow a context range
* (lowcontext -- highcontext) to span these two segments,
* as this will generate and elan initialization error
* when MPI tries to attach to the capability. For now,
* restrict SLURM's range to the RMS one (starting at 0x400)
- *
+ *
*/
# define ELAN_USER_BASE_CONTEXT_NUM 0x400 /* act. RMS_BASE_CONTEXT_NUM */
# define ELAN_USER_TOP_CONTEXT_NUM 0x7ff
@@ -94,7 +94,7 @@
# define UserKey cap_userkey
# define RailMask cap_railmask
# define Values key_values
-#elif HAVE_LIBELAN3
+#elif HAVE_LIBELAN3
# include <elan3/elan3.h>
# include <elan3/elanvp.h>
#else
@@ -126,14 +126,14 @@
/* we allocate elan hardware context numbers in this range */
#define QSW_CTX_START ELAN_USER_BASE_CONTEXT_NUM
-/* XXX: Temporary workaround for slurm/222 (qws sw-kernel/5478)
+/* XXX: Temporary workaround for slurm/222 (qws sw-kernel/5478)
* (sys_validate_cap does not allow ELAN_USER_TOP_CONTEXT_NUM)
*/
-#define QSW_CTX_END ELAN_USER_TOP_CONTEXT_NUM - 1
+#define QSW_CTX_END ELAN_USER_TOP_CONTEXT_NUM - 1
#define QSW_CTX_INVAL (-1)
-/*
+/*
* We are going to some trouble to keep these defs private so slurm
* hackers not interested in the interconnect details can just pass around
* the opaque types. All use of the data structure internals is local to this
@@ -174,7 +174,7 @@ struct qsw_jobinfo {
/*
* Globals
*/
-static inline void _dump_step_ctx(const char *head,
+static inline void _dump_step_ctx(const char *head,
struct step_ctx *step_ctx_p);
static qsw_libstate_t qsw_internal_state = NULL;
static pthread_mutex_t qsw_lock = PTHREAD_MUTEX_INITIALIZER;
@@ -236,7 +236,7 @@ static inline void _dump_step_ctx(const char *head, struct step_ctx *step_ctx_p)
#endif
}
-static void
+static void
_pack_step_ctx(struct step_ctx *step_ctx_p, Buf buffer)
{
_dump_step_ctx("_pack_step_ctx", step_ctx_p);
@@ -326,12 +326,12 @@ qsw_unpack_libstate(qsw_libstate_t ls, Buf buffer)
goto unpack_error;
}
list_push(ls->step_ctx_list, step_ctx_p);
- }
+ }
if (ls->ls_magic != QSW_LIBSTATE_MAGIC)
goto unpack_error;
- return SLURM_SUCCESS;
+ return SLURM_SUCCESS;
unpack_error:
slurm_seterrno_ret(EBADMAGIC_QSWLIBSTATE); /* corrupted libstate */
@@ -372,7 +372,7 @@ _copy_libstate(qsw_libstate_t dest, qsw_libstate_t src)
dest_step_ctx_p->st_high_node = src_step_ctx_p->st_high_node;
list_push(dest->step_ctx_list, dest_step_ctx_p);
}
- list_iterator_destroy(iter);
+ list_iterator_destroy(iter);
}
/*
@@ -392,7 +392,7 @@ qsw_init(qsw_libstate_t oldstate)
if (oldstate)
_copy_libstate(new, oldstate);
else {
- new->ls_prognum = QSW_PRG_START +
+ new->ls_prognum = QSW_PRG_START +
(lrand48() % (QSW_PRG_END - QSW_PRG_START + 1));
}
qsw_internal_state = new;
@@ -451,14 +451,14 @@ done: _unlock_qsw();
int
qsw_alloc_jobinfo(qsw_jobinfo_t *jp)
{
- qsw_jobinfo_t new;
+ qsw_jobinfo_t new;
assert(jp != NULL);
new = (qsw_jobinfo_t)xmalloc(sizeof(struct qsw_jobinfo));
if (!new)
slurm_seterrno_ret(ENOMEM);
new->j_magic = QSW_JOBINFO_MAGIC;
-
+
*jp = new;
return 0;
}
@@ -471,7 +471,7 @@ qsw_alloc_jobinfo(qsw_jobinfo_t *jp)
qsw_jobinfo_t
qsw_copy_jobinfo(qsw_jobinfo_t j)
{
- qsw_jobinfo_t new;
+ qsw_jobinfo_t new;
if (qsw_alloc_jobinfo(&new))
return NULL;
memcpy(new, j, sizeof(struct qsw_jobinfo));
@@ -520,11 +520,11 @@ qsw_pack_jobinfo(qsw_jobinfo_t j, Buf buffer)
# else
j->j_cap.cap_spare = ELAN_CAP_UNINITIALISED;
pack16(j->j_cap.cap_spare, buffer);
-# endif
+# endif
#endif
#if HAVE_LIBELAN3
pack16(j->j_cap.padding, buffer);
-#endif
+#endif
pack32(j->j_cap.Version, buffer);
pack32(j->j_cap.LowContext, buffer);
pack32(j->j_cap.HighContext, buffer);
@@ -533,7 +533,7 @@ qsw_pack_jobinfo(qsw_jobinfo_t j, Buf buffer)
pack32(j->j_cap.HighNode, buffer);
#if HAVE_LIBELAN3
pack32(j->j_cap.Entries, buffer);
-#endif
+#endif
pack32(j->j_cap.RailMask, buffer);
for (i = 0; i < ELAN_BITMAPSIZE; i++)
pack32(j->j_cap.Bitmap[i], buffer);
@@ -554,7 +554,7 @@ qsw_unpack_jobinfo(qsw_jobinfo_t j, Buf buffer)
assert(j->j_magic == QSW_JOBINFO_MAGIC);
offset = get_buf_offset(buffer);
-
+
safe_unpack32(&j->j_magic, buffer);
safe_unpack32(&j->j_prognum, buffer);
for (i = 0; i < 4; i++)
@@ -567,8 +567,8 @@ qsw_unpack_jobinfo(qsw_jobinfo_t j, Buf buffer)
safe_unpack16(&j->j_cap.cap_spare, buffer);
# endif
#endif
-#if HAVE_LIBELAN3
- safe_unpack16(&j->j_cap.padding, buffer);
+#if HAVE_LIBELAN3
+ safe_unpack16(&j->j_cap.padding, buffer);
#endif
{
uint32_t tmp32;
@@ -579,7 +579,7 @@ qsw_unpack_jobinfo(qsw_jobinfo_t j, Buf buffer)
safe_unpack32(&tmp32, buffer);
j->j_cap.HighContext = (int) tmp32;
safe_unpack32(&tmp32, buffer);
- j->j_cap.MyContext = (int) tmp32;
+ j->j_cap.MyContext = (int) tmp32;
safe_unpack32(&tmp32, buffer);
j->j_cap.LowNode = (int) tmp32;
safe_unpack32(&tmp32, buffer);
@@ -591,7 +591,7 @@ qsw_unpack_jobinfo(qsw_jobinfo_t j, Buf buffer)
safe_unpack32(&j->j_cap.RailMask, buffer);
for (i = 0; i < ELAN_BITMAPSIZE; i++)
safe_unpack32(&j->j_cap.Bitmap[i], buffer);
-
+
if (j->j_magic != QSW_JOBINFO_MAGIC)
goto unpack_error;
@@ -608,9 +608,9 @@ qsw_unpack_jobinfo(qsw_jobinfo_t j, Buf buffer)
* more than once simultaneously on a single node. We allocate one to each
* parallel job which more than meets this requirement. A program description
* can be compared to a process group, except there is no way for a process to
- * disassociate itself or its children from the program description.
- * If the library is initialized, we allocate these consecutively, otherwise
- * we generate a random one, assuming we are being called by a transient
+ * disassociate itself or its children from the program description.
+ * If the library is initialized, we allocate these consecutively, otherwise
+ * we generate a random one, assuming we are being called by a transient
* program like pdsh. Ref: rms_prgcreate(3).
*/
static int
@@ -637,11 +637,11 @@ _generate_prognum(void)
/*
* Elan hardware context numbers are an adapter resource that must not be used
* more than once on a single node. One is allocated to each process on the
- * node that will be communicating over Elan. In order for processes on the
+ * node that will be communicating over Elan. In order for processes on the
* same node to communicate with one another and with other nodes across QsNet,
* they must use contexts in the hi-lo range of a common capability.
- * If the library state is initialized, we allocate/free these, otherwise
- * we generate a random one, assuming we are being called by a transient
+ * If the library state is initialized, we allocate/free these, otherwise
+ * we generate a random one, assuming we are being called by a transient
* program like pdsh. Ref: rms_setcap(3).
*
* Returns -1 on allocation error.
@@ -659,7 +659,7 @@ _alloc_hwcontext(bitstr_t *nodeset, uint32_t prognum, int num)
uint16_t low_node = bit_ffs(nodeset);
uint16_t high_node = bit_fls(nodeset);
struct step_ctx *step_ctx_p;
- bitstr_t *busy_context = bit_alloc(QSW_CTX_END -
+ bitstr_t *busy_context = bit_alloc(QSW_CTX_END -
QSW_CTX_START + 1);
assert(busy_context);
@@ -683,14 +683,14 @@ _alloc_hwcontext(bitstr_t *nodeset, uint32_t prognum, int num)
step_ctx_p->st_low_node = low_node;
step_ctx_p->st_high_node = high_node;
_dump_step_ctx("_alloc_hwcontext", step_ctx_p);
- list_push(qsw_internal_state->step_ctx_list, step_ctx_p);
+ list_push(qsw_internal_state->step_ctx_list, step_ctx_p);
new = bit + QSW_CTX_START;
}
_unlock_qsw();
bit_free(busy_context);
} else {
_srand_if_needed();
- new = lrand48() %
+ new = lrand48() %
(QSW_CTX_END - (QSW_CTX_START + num - 1) - 1);
new += QSW_CTX_START;
}
@@ -702,7 +702,7 @@ extern int qsw_restore_jobinfo(struct qsw_jobinfo *jobinfo)
{
struct step_ctx *step_ctx_p;
ListIterator iter;
- int duplicate = 0;
+ int duplicate = 0;
assert(qsw_internal_state);
if (!jobinfo)
@@ -765,7 +765,7 @@ _free_hwcontext(uint32_t prog_num)
* Returns -1 on failure to allocate hw context.
*/
static int
-_init_elan_capability(ELAN_CAPABILITY *cap, uint32_t prognum, int ntasks,
+_init_elan_capability(ELAN_CAPABILITY *cap, uint32_t prognum, int ntasks,
int nnodes, bitstr_t *nodeset, uint16_t *tasks_per_node,
int cyclic_alloc, int max_tasks_per_node)
{
@@ -794,7 +794,7 @@ _init_elan_capability(ELAN_CAPABILITY *cap, uint32_t prognum, int ntasks,
# else
cap->cap_spare = ELAN_CAP_UNINITIALISED;
# endif
-#endif
+#endif
/* UserKey is 128 bits of randomness which should be kept private */
for (i = 0; i < 4; i++)
@@ -827,14 +827,14 @@ _init_elan_capability(ELAN_CAPABILITY *cap, uint32_t prognum, int ntasks,
cap->Type |= ELAN_CAP_TYPE_BROADCASTABLE;
#endif
/*
- * Set up cap->Bitmap, which describes the mapping of processes to
+ * Set up cap->Bitmap, which describes the mapping of processes to
* the nodes in the range of cap->LowNode - cap->Highnode.
- * There are (ntasks * nnodes) significant bits in the mask, each
- * representing a process slot. Bits are off for process slots
- * corresponding to unallocated nodes. For example, if nodes 4 and 6
- * are running two processes per node, bits 0,1 (corresponding to the
- * two processes on node 4) and bits 4,5 (corresponding to the two
- * processes running on node 6) are set.
+ * There are (ntasks * nnodes) significant bits in the mask, each
+ * representing a process slot. Bits are off for process slots
+ * corresponding to unallocated nodes. For example, if nodes 4 and 6
+ * are running two processes per node, bits 0,1 (corresponding to the
+ * two processes on node 4) and bits 4,5 (corresponding to the two
+ * processes running on node 6) are set.
*/
node_index = 0;
for (i = cap->LowNode; i <= cap->HighNode; i++) {
@@ -844,7 +844,7 @@ _init_elan_capability(ELAN_CAPABILITY *cap, uint32_t prognum, int ntasks,
for (j = 0; j < task_cnt; j++) {
if (cyclic_alloc)
- bit = (i-cap->LowNode) + ( j *
+ bit = (i-cap->LowNode) + ( j *
(cap->HighNode - cap->LowNode + 1));
else
bit = ((i-cap->LowNode)
@@ -861,11 +861,11 @@ _init_elan_capability(ELAN_CAPABILITY *cap, uint32_t prognum, int ntasks,
/*
* Create all the QsNet related information needed to set up a QsNet parallel
- * program and store it in the qsw_jobinfo struct.
+ * program and store it in the qsw_jobinfo struct.
* Call this on the "client" process, e.g. pdsh, srun, slurmctld, etc..
*/
int
-qsw_setup_jobinfo(qsw_jobinfo_t j, int ntasks, bitstr_t *nodeset,
+qsw_setup_jobinfo(qsw_jobinfo_t j, int ntasks, bitstr_t *nodeset,
uint16_t *tasks_per_node, int cyclic_alloc)
{
int i, max_tasks_per_node = 0;
@@ -875,7 +875,7 @@ qsw_setup_jobinfo(qsw_jobinfo_t j, int ntasks, bitstr_t *nodeset,
assert(j->j_magic == QSW_JOBINFO_MAGIC);
assert(nodeset);
assert(tasks_per_node);
-
+
/* sanity check on args */
if ((ntasks <= 0) || (nnodes <= 0))
slurm_seterrno_ret(EINVAL);
@@ -886,11 +886,11 @@ qsw_setup_jobinfo(qsw_jobinfo_t j, int ntasks, bitstr_t *nodeset,
/* Note: ELAN_MAX_VPS is 512 on "old" Elan driver, 16384 on new. */
if ((max_tasks_per_node * nnodes) > ELAN_MAX_VPS)
slurm_seterrno_ret(EINVAL);
-
+
/* initialize jobinfo */
j->j_prognum = _generate_prognum();
- if (_init_elan_capability(&j->j_cap, j->j_prognum, ntasks, nnodes,
- nodeset, tasks_per_node, cyclic_alloc,
+ if (_init_elan_capability(&j->j_cap, j->j_prognum, ntasks, nnodes,
+ nodeset, tasks_per_node, cyclic_alloc,
max_tasks_per_node) == -1) {
slurm_seterrno_ret(EAGAIN); /* failed to allocate hw ctx */
}
@@ -915,18 +915,18 @@ qsw_teardown_jobinfo(qsw_jobinfo_t j)
* waitpid elan3_create |
* rms_prgaddcap |
* fork N procs ---+------ rms_setcap
- * wait all | setup RMS_ env
+ * wait all | setup RMS_ env
* | setuid, etc.
* | exec mpi process
- * |
+ * |
* exit |
* rms_prgdestroy |
* exit | (one pair of processes per mpi proc!)
*
- * - The first fork is required because rms_prgdestroy can't occur in the
+ * - The first fork is required because rms_prgdestroy can't occur in the
* process that calls rms_prgcreate (since it is a member, ECHILD).
- * - The second fork is required when running multiple processes per node
- * because each process must announce its use of one of the hw contexts
+ * - The second fork is required when running multiple processes per node
+ * because each process must announce its use of one of the hw contexts
* in the range allocated in the capability.
*/
@@ -939,7 +939,7 @@ qsw_prog_fini(qsw_jobinfo_t jobinfo)
debug2("qsw_prog_fini shmctl IPC_RMID complete");
}
/* Do nothing... apparently this will be handled by
- * callbacks in the kernel exit handlers ...
+ * callbacks in the kernel exit handlers ...
*/
#if 0
if (jobinfo->j_ctx) {
@@ -982,7 +982,7 @@ _qsw_shmem_create (qsw_jobinfo_t jobinfo, uid_t uid)
key_t key = elan_statkey (jobinfo->j_prognum);
int maxLocal = cap->HighContext - cap->LowContext + 1;
int pgsize = getpagesize ();
-
+
/* 8KB minimum stats page size */
if (pgsize < 8192)
pgsize = 8192;
@@ -998,7 +998,7 @@ _qsw_shmem_create (qsw_jobinfo_t jobinfo, uid_t uid)
if (shmctl (shmid, IPC_SET, &shm) < 0)
return (error ("Failed to set perms on Elan state shm: %m"));
-
+
return (0);
}
@@ -1045,7 +1045,7 @@ _prg_destructor_fork()
waitpid(pid, (int *)NULL, 0);
return fdpair[1];
}
-
+
/****************************************/
/*
* fork again so the destructor process
@@ -1117,7 +1117,7 @@ _prg_destructor_send(int fd, int prgid)
{
debug3("_prg_destructor_send %d", prgid);
if (write (fd, &prgid, sizeof(prgid)) != sizeof(prgid)) {
- error ("_prg_destructor_send failed: %m");
+ error ("_prg_destructor_send failed: %m");
}
/* Deliberately avoid closing fd. When this process exits, it
will close fd signalling to the child process that it is
@@ -1134,7 +1134,7 @@ qsw_prog_init(qsw_jobinfo_t jobinfo, uid_t uid)
{
int err;
int i, nrails;
- int fd;
+ int fd;
if ((fd = _prg_destructor_fork()) == -1)
goto fail;
@@ -1173,21 +1173,21 @@ qsw_prog_init(qsw_jobinfo_t jobinfo, uid_t uid)
ELAN3_CTX *ctx;
/* see qsw gnat sw-elan/4334: elan3_control_open can ret -1 */
- if ((ctx = elan3_control_open(i)) == NULL
+ if ((ctx = elan3_control_open(i)) == NULL
|| ctx == (void *)-1) {
slurm_seterrno(EELAN3CONTROL);
_prg_destructor_send(fd, -1);
goto fail;
}
-
-
- /* make cap known via rms_getcap/rms_ncaps to members
+
+
+ /* make cap known via rms_getcap/rms_ncaps to members
* of this prgnum */
if (elan3_create(ctx, &jobinfo->j_cap) < 0) {
- /* XXX masking errno value better than not knowing
+ /* XXX masking errno value better than not knowing
* which function failed? */
error("elan3_create(%d): %m", i);
- slurm_seterrno(EELAN3CREATE);
+ slurm_seterrno(EELAN3CREATE);
_prg_destructor_send(fd, -1);
goto fail;
}
@@ -1229,14 +1229,14 @@ qsw_prog_init(qsw_jobinfo_t jobinfo, uid_t uid)
* Failure to create shared memory is not a fatal error.
*/
_qsw_shmem_create (jobinfo, uid);
-
+
/* note: _elan3_fini() destroys context and makes capability unavail */
/* do it in qsw_prog_fini() after app terminates */
return 0;
fail:
err = errno; /* presrve errno in case _elan3_fini touches it */
- qsw_prog_fini(jobinfo);
+ qsw_prog_fini(jobinfo);
slurm_seterrno(err);
return -1;
}
@@ -1249,7 +1249,7 @@ qsw_setcap(qsw_jobinfo_t jobinfo, int procnum)
{
/*
* Assign elan hardware context to current process.
- * - arg1 (0 below) is an index into the kernel's list of caps for this
+ * - arg1 (0 below) is an index into the kernel's list of caps for this
* program desc (added by rms_prgaddcap). There will be
* one per rail.
* - arg2 indexes the hw ctxt range in the capability
@@ -1285,7 +1285,7 @@ qsw_getnodeid(void)
ELANCTRL_HANDLE handle;
ELAN_POSITION position;
- if (elanctrl_open(&handle) != 0)
+ if (elanctrl_open(&handle) != 0)
slurm_seterrno_ret(EGETNODEID);
if (elanctrl_get_position(handle, devidx, &position) != 0) {
@@ -1309,7 +1309,7 @@ qsw_getnodeid(void)
}
-static int
+static int
_read_elanhost_config (void)
{
int rc;
@@ -1318,7 +1318,7 @@ _read_elanhost_config (void)
return (-1);
if ((rc = elanhost_config_read (elanconf, NULL)) < 0) {
- error ("Unable to read Elan config: %s",
+ error ("Unable to read Elan config: %s",
elanhost_config_err (elanconf));
elanhost_config_destroy (elanconf);
elanconf = NULL;
@@ -1345,7 +1345,7 @@ qsw_maxnodeid(void)
}
/*
- * Given a hostname, return the elanid or -1 on error.
+ * Given a hostname, return the elanid or -1 on error.
* Initializes the elanconfig from the default /etc/elanhosts
* config file.
*/
@@ -1372,7 +1372,7 @@ qsw_getnodeid_byhost(char *host)
/*
* Given an elanid, determine the hostname. Returns -1 on error or the number
- * of characters copied on success.
+ * of characters copied on success.
* XXX - assumes RMS style hostnames (see above)
*/
int
@@ -1391,7 +1391,7 @@ qsw_gethost_bynodeid(char *buf, int len, int id)
slurm_seterrno (EGETHOST_BYNODEID);
goto done;
}
-
+
rc = slurm_strlcpy (buf, hostp, len);
done:
@@ -1453,15 +1453,15 @@ qsw_capability_string(struct qsw_jobinfo *j, char *buf, size_t size)
#if HAVE_LIBELANCTRL
snprintf(buf, size, "prg=%d ctx=%x.%x nodes=%d.%d",
- j->j_prognum, cap->LowContext, cap->HighContext,
+ j->j_prognum, cap->LowContext, cap->HighContext,
cap->LowNode, cap->HighNode);
-#else
+#else
snprintf(buf, size, "prg=%d ctx=%x.%x nodes=%d.%d entries=%d",
- j->j_prognum, cap->LowContext, cap->HighContext,
- cap->LowNode, cap->HighNode,
+ j->j_prognum, cap->LowContext, cap->HighContext,
+ cap->LowNode, cap->HighNode,
cap->Entries);
#endif
-
+
return buf;
}
@@ -1484,7 +1484,7 @@ qsw_print_jobinfo(FILE *fp, struct qsw_jobinfo *jobinfo)
# else
fprintf(fp, "%s\n", elan3_capability_string(cap, str));
# endif
-#else
+#else
fprintf(fp, "cap.UserKey=%8.8x.%8.8x.%8.8x.%8.8x\n",
cap->UserKey.Values[0], cap->UserKey.Values[1],
cap->UserKey.Values[2], cap->UserKey.Values[3]);
diff --git a/src/plugins/switch/elan/qsw.h b/src/plugins/switch/elan/qsw.h
index d82bd6391099a7ae4dee050fd8cf1f51c5ac89ab..c0eb3b558406a946f96d9f4490200b94fe8d11fc 100644
--- a/src/plugins/switch/elan/qsw.h
+++ b/src/plugins/switch/elan/qsw.h
@@ -1,36 +1,36 @@
/*****************************************************************************\
- * qsw.h - Library routines for initiating jobs on QsNet.
+ * qsw.h - Library routines for initiating jobs on QsNet.
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jim Garlick <garlick@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -68,7 +68,7 @@ typedef struct qsw_libstate *qsw_libstate_t;
#define QSW_MAX_TASKS ELAN_MAX_VPS
#define QSW_PACK_SIZE (4 * (2+4+1+8+ELAN_BITMAPSIZE))
-/* NOTE: error codes should be between ESLURM_SWITCH_MIN and
+/* NOTE: error codes should be between ESLURM_SWITCH_MIN and
* ESLURM_SWITCH MAX as defined in slurm/slurm_errno.h */
enum {
/* Quadrics Elan specific error codes */
@@ -110,7 +110,7 @@ int qsw_restore_jobinfo(struct qsw_jobinfo *jobinfo);
int qsw_pack_jobinfo(qsw_jobinfo_t j, Buf buffer);
int qsw_unpack_jobinfo(qsw_jobinfo_t j, Buf buffer);
-int qsw_setup_jobinfo(qsw_jobinfo_t j, int ntasks,
+int qsw_setup_jobinfo(qsw_jobinfo_t j, int ntasks,
bitstr_t *nodeset, uint16_t *tasks_per_node,
int cyclic_alloc);
void qsw_teardown_jobinfo(qsw_jobinfo_t j);
@@ -120,10 +120,10 @@ void qsw_prog_fini(qsw_jobinfo_t jobinfo);
int qsw_prgdestroy(qsw_jobinfo_t jobinfo); /* was qsw_prog_reap */
-int qsw_setcap(qsw_jobinfo_t jobinfo, int procnum);
+int qsw_setcap(qsw_jobinfo_t jobinfo, int procnum);
/* was qsw_attach */
-int qsw_prgsignal(qsw_jobinfo_t jobinfo, int signum);
+int qsw_prgsignal(qsw_jobinfo_t jobinfo, int signum);
/* was qsw_signal_job */
/* return max ElanID in configuration */
diff --git a/src/plugins/switch/elan/switch_elan.c b/src/plugins/switch/elan/switch_elan.c
index 690a4f5dad3ccfad25302fc8c53369386036d8ca..f80354de77a06e1222409d509a3f48aa6fa02ec5 100644
--- a/src/plugins/switch/elan/switch_elan.c
+++ b/src/plugins/switch/elan/switch_elan.c
@@ -1,37 +1,37 @@
/*****************************************************************************\
- * switch_elan.c - Library routines for initiating jobs on QsNet.
+ * switch_elan.c - Library routines for initiating jobs on QsNet.
*****************************************************************************
* Copyright (C) 2003-2007 The Regents of the University of California.
* Copyright (C) 2008 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Kevin Tew <tew1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -87,39 +87,39 @@ static slurm_errtab_t slurm_errtab[] = {
{ ENOSLURM, /* oh no! */
"Out of slurm" },
- { EBADMAGIC_QSWLIBSTATE,
+ { EBADMAGIC_QSWLIBSTATE,
"Bad magic in QSW libstate" },
- { EBADMAGIC_QSWJOBINFO,
+ { EBADMAGIC_QSWJOBINFO,
"Bad magic in QSW jobinfo" },
{ EINVAL_PRGCREATE,
"Program identifier in use or CPU count invalid, try again" },
{ ECHILD_PRGDESTROY,
"Processes belonging to this program are still running" },
- { EEXIST_PRGDESTROY,
+ { EEXIST_PRGDESTROY,
"Program identifier does not exist" },
- { EELAN3INIT,
+ { EELAN3INIT,
"Too many processes using Elan or mapping failure" },
- { EELAN3CONTROL,
+ { EELAN3CONTROL,
"Could not open elan3 control device" },
- { EELAN3CREATE,
+ { EELAN3CREATE,
"Could not create elan capability" },
- { ESRCH_PRGADDCAP,
+ { ESRCH_PRGADDCAP,
"Program does not exist (addcap)" },
- { EFAULT_PRGADDCAP,
+ { EFAULT_PRGADDCAP,
"Capability has invalid address (addcap)" },
- { EINVAL_SETCAP,
+ { EINVAL_SETCAP,
"Invalid context number (setcap)" },
- { EFAULT_SETCAP,
+ { EFAULT_SETCAP,
"Capability has invalid address (setcap)" },
- { EGETNODEID,
+ { EGETNODEID,
"Cannot determine local elan address" },
- { EGETNODEID_BYHOST,
+ { EGETNODEID_BYHOST,
"Cannot translate hostname to elan address" },
- { EGETHOST_BYNODEID,
+ { EGETHOST_BYNODEID,
"Cannot translate elan address to hostname" },
- { ESRCH_PRGSIGNAL,
+ { ESRCH_PRGSIGNAL,
"No such program identifier" },
- { EINVAL_PRGSIGNAL,
+ { EINVAL_PRGSIGNAL,
"Invalid signal number" }
};
@@ -140,7 +140,7 @@ static slurm_errtab_t slurm_errtab[] = {
* <application>/<method>
*
* where <application> is a description of the intended application of
- * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
+ * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
* of how this plugin satisfies that application. SLURM will only load
* a switch plugin if the plugin_type string has a prefix of "switch/".
*
@@ -238,7 +238,7 @@ int switch_p_libstate_restore (char *dir_name, bool recover)
if (!recover) /* clean start, no recovery */
return qsw_init(NULL);
-
+
file_name = xstrdup(dir_name);
xstrcat(file_name, "/qsw_state");
state_fd = open (file_name, O_RDONLY);
@@ -272,13 +272,13 @@ int switch_p_libstate_restore (char *dir_name, bool recover)
if (error_code == SLURM_SUCCESS) {
buffer = create_buf (data, data_size);
data = NULL; /* now in buffer, don't xfree() */
- if (buffer && (size_buf(buffer) >= sizeof(uint32_t) +
+ if (buffer && (size_buf(buffer) >= sizeof(uint32_t) +
strlen(QSW_STATE_VERSION))) {
char *ptr = get_buf_data(buffer);
- if (!memcmp(&ptr[sizeof(uint32_t)],
+ if (!memcmp(&ptr[sizeof(uint32_t)],
QSW_STATE_VERSION, 3)) {
- unpackstr_xmalloc(&ver_str, &ver_str_len,
+ unpackstr_xmalloc(&ver_str, &ver_str_len,
buffer);
debug3("qsw_state file version: %s", ver_str);
}
@@ -289,7 +289,7 @@ int switch_p_libstate_restore (char *dir_name, bool recover)
if ((qsw_alloc_libstate(&old_state))
|| (qsw_unpack_libstate(old_state, buffer) < 0))
error_code = SLURM_ERROR;
- } else
+ } else
error("qsw_state file is in an unsupported format, ignored");
if (buffer)
@@ -327,12 +327,12 @@ int switch_p_build_jobinfo ( switch_jobinfo_t *switch_job, char *nodelist,
bitstr_t *nodeset;
int node_id, error_code = SLURM_SUCCESS;
int i, nnodes, ntasks = 0;
-
+
if (!tasks_per_node) {
slurm_seterrno(ENOMEM);
return SLURM_ERROR;
}
-
+
if ((host_list = hostlist_create(nodelist)) == NULL)
fatal("hostlist_create(%s): %m", nodelist);
@@ -354,7 +354,7 @@ int switch_p_build_jobinfo ( switch_jobinfo_t *switch_job, char *nodelist,
if (node_id >= 0)
bit_set(nodeset, node_id);
else {
- error("qsw_getnodeid_byhost(%s) failure",
+ error("qsw_getnodeid_byhost(%s) failure",
this_node_name);
slurm_seterrno(ESLURM_INTERCONNECT_FAILURE);
error_code = SLURM_ERROR;
@@ -365,8 +365,8 @@ int switch_p_build_jobinfo ( switch_jobinfo_t *switch_job, char *nodelist,
if (error_code == SLURM_SUCCESS) {
qsw_jobinfo_t j = (qsw_jobinfo_t) switch_job;
- error_code = qsw_setup_jobinfo(j, ntasks, nodeset,
- tasks_per_node, cyclic_alloc);
+ error_code = qsw_setup_jobinfo(j, ntasks, nodeset,
+ tasks_per_node, cyclic_alloc);
/* allocs hw context */
}
@@ -423,9 +423,9 @@ static int _have_elan3 (void)
return (1);
#endif /* HAVE_LIBELAN3 */
return (0);
-}
+}
-/* Initialize node for use of the Elan interconnect by loading
+/* Initialize node for use of the Elan interconnect by loading
* elanid/hostname pairs then spawning the Elan network error
* resolver thread.
*
@@ -442,7 +442,7 @@ int switch_p_node_init ( void )
if (!_have_elan3 ()) return SLURM_SUCCESS;
/*
- * Load neterr elanid/hostname values into kernel
+ * Load neterr elanid/hostname values into kernel
*/
if (_set_elan_ids() < 0)
return SLURM_ERROR;
@@ -526,7 +526,7 @@ static int _elan3_load_neterr_svc (int i, char *host)
}
static void *_neterr_thr(void *arg)
-{
+{
debug3("Starting Elan network error resolver thread");
if (!(elan3h = dlopen ("libelan3.so", RTLD_LAZY))) {
@@ -539,8 +539,8 @@ static void *_neterr_thr(void *arg)
goto fail;
}
- /*
- * Attempt to register the neterr svc thread. If the address
+ /*
+ * Attempt to register the neterr svc thread. If the address
* cannot be bound, then there is already a thread running, and
* we should just exit with success.
*/
@@ -552,7 +552,7 @@ static void *_neterr_thr(void *arg)
info("Warning: Elan error resolver thread already running");
}
- /*
+ /*
* Signal main thread that we've successfully initialized
*/
slurm_mutex_lock(&neterr_mutex);
@@ -611,14 +611,14 @@ int switch_p_job_preinit ( switch_jobinfo_t *jobinfo )
return SLURM_SUCCESS;
}
-/*
+/*
* prepare node for interconnect use
*/
int switch_p_job_init ( switch_jobinfo_t *jobinfo, uid_t uid )
{
char buf[4096];
- debug2("calling qsw_prog_init from process %lu",
+ debug2("calling qsw_prog_init from process %lu",
(unsigned long) getpid());
verbose("ELAN: %s", qsw_capability_string(
(qsw_jobinfo_t)jobinfo, buf, 4096));
@@ -637,55 +637,55 @@ int switch_p_job_init ( switch_jobinfo_t *jobinfo, uid_t uid )
qsw_print_jobinfo(log_fp(), (qsw_jobinfo_t)jobinfo);
return SLURM_ERROR;
}
-
- return SLURM_SUCCESS;
+
+ return SLURM_SUCCESS;
}
int switch_p_job_fini ( switch_jobinfo_t *jobinfo )
{
- qsw_prog_fini((qsw_jobinfo_t)jobinfo);
+ qsw_prog_fini((qsw_jobinfo_t)jobinfo);
return SLURM_SUCCESS;
}
-int switch_p_job_postfini ( switch_jobinfo_t *jobinfo, uid_t pgid,
+int switch_p_job_postfini ( switch_jobinfo_t *jobinfo, uid_t pgid,
uint32_t job_id, uint32_t step_id )
{
return SLURM_SUCCESS;
}
-int switch_p_job_attach ( switch_jobinfo_t *jobinfo, char ***env,
- uint32_t nodeid, uint32_t procid, uint32_t nnodes,
+int switch_p_job_attach ( switch_jobinfo_t *jobinfo, char ***env,
+ uint32_t nodeid, uint32_t procid, uint32_t nnodes,
uint32_t nprocs, uint32_t rank )
{
int id = -1;
- debug3("nodeid=%lu nnodes=%lu procid=%lu nprocs=%lu rank=%lu",
- (unsigned long) nodeid, (unsigned long) nnodes,
- (unsigned long) procid, (unsigned long) nprocs,
+ debug3("nodeid=%lu nnodes=%lu procid=%lu nprocs=%lu rank=%lu",
+ (unsigned long) nodeid, (unsigned long) nnodes,
+ (unsigned long) procid, (unsigned long) nprocs,
(unsigned long) rank);
- debug3("setting capability in process %lu",
+ debug3("setting capability in process %lu",
(unsigned long) getpid());
if (qsw_setcap((qsw_jobinfo_t) jobinfo, (int) procid) < 0) {
error("qsw_setcap: %m");
return SLURM_ERROR;
}
- if (slurm_setenvpf(env, "RMS_RANK", "%lu", (unsigned long) rank )
+ if (slurm_setenvpf(env, "RMS_RANK", "%lu", (unsigned long) rank )
< 0)
return SLURM_ERROR;
- if (slurm_setenvpf(env, "RMS_NODEID", "%lu", (unsigned long) nodeid)
+ if (slurm_setenvpf(env, "RMS_NODEID", "%lu", (unsigned long) nodeid)
< 0)
return SLURM_ERROR;
- if (slurm_setenvpf(env, "RMS_PROCID", "%lu", (unsigned long) rank )
+ if (slurm_setenvpf(env, "RMS_PROCID", "%lu", (unsigned long) rank )
< 0)
return SLURM_ERROR;
- if (slurm_setenvpf(env, "RMS_NNODES", "%lu", (unsigned long) nnodes)
+ if (slurm_setenvpf(env, "RMS_NNODES", "%lu", (unsigned long) nnodes)
< 0)
return SLURM_ERROR;
- if (slurm_setenvpf(env, "RMS_NPROCS", "%lu", (unsigned long) nprocs)
+ if (slurm_setenvpf(env, "RMS_NPROCS", "%lu", (unsigned long) nprocs)
< 0)
return SLURM_ERROR;
- /*
+ /*
* Tell libelan the key to use for Elan state shmem segment
*/
if (qsw_statkey ((qsw_jobinfo_t) jobinfo, &id) >= 0)
@@ -701,16 +701,16 @@ extern int switch_p_get_jobinfo(switch_jobinfo_t *switch_job,
return SLURM_ERROR;
}
-static int
+static int
_set_elan_ids(void)
{
int i;
for (i = 0; i <= qsw_maxnodeid(); i++) {
- char host[256];
+ char host[256];
if (qsw_gethost_bynodeid(host, 256, i) < 0)
continue;
-
+
if (_elan3_load_neterr_svc(i, host) < 0)
error("elan3_load_neterr_svc(%d, %s): %m", i, host);
}
@@ -719,7 +719,7 @@ _set_elan_ids(void)
}
-/*
+/*
* Linear search through table of errno values and strings,
* returns NULL on error, string on success.
*/
diff --git a/src/plugins/switch/federation/Makefile.am b/src/plugins/switch/federation/Makefile.am
index f1517f6ffff8d691cea79ded71edbbc68bb2da9f..d90112c816d3904331b49141316820fc42c5148d 100644
--- a/src/plugins/switch/federation/Makefile.am
+++ b/src/plugins/switch/federation/Makefile.am
@@ -6,10 +6,10 @@ AUTOMAKE_OPTIONS = foreign
if HAVE_FEDERATION
federation_lib = switch_federation.la
else
-federation_lib =
+federation_lib =
endif
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
@@ -20,7 +20,7 @@ if HAVE_FEDERATION
switch_federation_la_SOURCES = \
federation.c federation.h \
federation_keys.h \
- switch_federation.c
+ switch_federation.c
switch_federation_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) \
$(FEDERATION_LDFLAGS)
diff --git a/src/plugins/switch/federation/Makefile.in b/src/plugins/switch/federation/Makefile.in
index 1378b3db91e32eab50dd6fb5c546ee665c721926..172b0fcb958818caaae11bdd2dd9a1f7188d3d28 100644
--- a/src/plugins/switch/federation/Makefile.in
+++ b/src/plugins/switch/federation/Makefile.in
@@ -322,7 +322,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
@HAVE_FEDERATION_FALSE@federation_lib =
@HAVE_FEDERATION_TRUE@federation_lib = switch_federation.la
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = $(federation_lib)
@@ -330,7 +330,7 @@ pkglib_LTLIBRARIES = $(federation_lib)
@HAVE_FEDERATION_TRUE@switch_federation_la_SOURCES = \
@HAVE_FEDERATION_TRUE@ federation.c federation.h \
@HAVE_FEDERATION_TRUE@ federation_keys.h \
-@HAVE_FEDERATION_TRUE@ switch_federation.c
+@HAVE_FEDERATION_TRUE@ switch_federation.c
@HAVE_FEDERATION_TRUE@switch_federation_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) \
@HAVE_FEDERATION_TRUE@ $(FEDERATION_LDFLAGS)
diff --git a/src/plugins/switch/federation/federation.c b/src/plugins/switch/federation/federation.c
index 0f6c62977461a9b613d3e8a9ce9f413d6b26f0f0..f44e9e697a281731b66873f4e0d56d20d8fad325 100644
--- a/src/plugins/switch/federation/federation.c
+++ b/src/plugins/switch/federation/federation.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jason King <jking@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -49,7 +49,7 @@
# include <ntbl.h>
#else
# error "Must have libntbl to compile this module!"
-#endif
+#endif
#include <sys/stat.h>
#include <slurm/slurm_errno.h>
@@ -58,7 +58,7 @@
#include "src/plugins/switch/federation/federation.h"
#include "src/plugins/switch/federation/federation_keys.h"
-/*
+/*
* Definitions local to this module
*/
#define FED_NODEINFO_MAGIC 0xc00cc00d
@@ -83,20 +83,20 @@ extern bool fed_need_state_save;
mode_t fed_umask;
/*
- * Data structures specific to Federation
+ * Data structures specific to Federation
*
* We are going to some trouble to keep these defs private so slurm
* hackers not interested in the interconnect details can just pass around
* the opaque types. All use of the data structure internals is local to this
* module.
*/
-
+
typedef struct fed_window {
uint16_t id;
uint32_t status;
uint16_t job_key;
} fed_window_t;
-
+
typedef struct fed_adapter {
char name[FED_ADAPTERNAME_LEN];
uint16_t lid;
@@ -155,7 +155,7 @@ typedef struct {
uint16_t network_id;
} fed_cache_entry_t;
-/*
+/*
* Globals
*/
fed_libstate_t *fed_state = NULL;
@@ -192,15 +192,15 @@ static int _parse_fed_file(hostlist_t *adapter_list);
static void _init_adapter_cache(void);
static int _fill_in_adapter_cache(void);
-/* The _lock() and _unlock() functions are used to lock/unlock a
- * global mutex. Used to serialize access to the global library
- * state variable fed_state.
+/* The _lock() and _unlock() functions are used to lock/unlock a
+ * global mutex. Used to serialize access to the global library
+ * state variable fed_state.
*/
static void
_lock(void)
{
int err = 1;
-
+
while(err) {
err = pthread_mutex_lock(&global_lock);
}
@@ -210,7 +210,7 @@ static void
_unlock(void)
{
int err = 1;
-
+
while(err) {
err = pthread_mutex_unlock(&global_lock);
}
@@ -266,17 +266,17 @@ _lookup_fed_status_tab(int status)
{
char *res = NULL;
int i;
-
+
for(i = 0; i < sizeof(fed_status_tab) / sizeof(fed_status_t); i++) {
if(fed_status_tab[i].status_number == status) {
res = fed_status_tab[i].status_msg;
break;
}
}
-
+
if(!res)
res = fed_status_tab[FED_STATUS_UNKNOWN].status_msg;
-
+
return res;
}
@@ -284,7 +284,7 @@ _lookup_fed_status_tab(int status)
void fed_print_jobinfo(FILE *fp, fed_jobinfo_t *jobinfo)
{
assert(jobinfo->magic == FED_JOBINFO_MAGIC);
-
+
/* stubbed out */
}
@@ -295,7 +295,7 @@ char *fed_sprint_jobinfo(fed_jobinfo_t *j, char *buf,
int count;
char *tmp = buf;
int remaining = size;
-
+
assert(buf);
assert(j);
assert(j->magic == FED_JOBINFO_MAGIC);
@@ -323,7 +323,7 @@ char *fed_sprint_jobinfo(fed_jobinfo_t *j, char *buf,
/* The lid caching functions were created to avoid unnecessary
* function calls each time we need to load network tables on a node.
- * _init_cache() simply initializes the cache to sane values and
+ * _init_cache() simply initializes the cache to sane values and
* needs to be called before any other cache functions are called.
*
* Used by: slurmd/slurmstepd
@@ -332,7 +332,7 @@ static void
_init_adapter_cache(void)
{
int i;
-
+
for(i = 0; i < FED_MAXADAPTERS; i++) {
lid_cache[i].name[0] = 0;
lid_cache[i].lid = -1;
@@ -353,7 +353,7 @@ _fill_in_adapter_cache(void)
int num;
int rc;
int i;
-
+
adapters = hostlist_iterator_create(adapter_list);
for (i = 0; (adapter_name = hostlist_next(adapters)); i++) {
rc = ntbl_adapter_resources(NTBL_VERSION, adapter_name, &res);
@@ -385,16 +385,16 @@ static void
_cache_lid(fed_adapter_t *ap)
{
assert(ap);
-
+
int adapter_num = ap->name[3] - (int) '0';
lid_cache[adapter_num].lid = ap->lid;
lid_cache[adapter_num].network_id = ap->network_id;
- strncpy(lid_cache[adapter_num].name, ap->name, FED_ADAPTERNAME_LEN);
+ strncpy(lid_cache[adapter_num].name, ap->name, FED_ADAPTERNAME_LEN);
}
-/* Check lid cache for an adapter name and return the network id.
+/* Check lid cache for an adapter name and return the network id.
*
* Used by: slurmd
*/
@@ -413,7 +413,7 @@ _get_network_id_from_adapter(char *adapter_name)
}
-/* Check lid cache for an adapter name and return the lid.
+/* Check lid cache for an adapter name and return the lid.
*
* Used by: slurmd
*/
@@ -442,14 +442,14 @@ static int _set_up_adapter(fed_adapter_t *fed_adapter, char *adapter_name)
int error_code;
info("adapter_name is %s", adapter_name);
-
- error_code = ntbl_adapter_resources(NTBL_VERSION,
- adapter_name,
+
+ error_code = ntbl_adapter_resources(NTBL_VERSION,
+ adapter_name,
&res);
- if(error_code != NTBL_SUCCESS)
+ if(error_code != NTBL_SUCCESS)
return SLURM_ERROR;
- strncpy(fed_adapter->name,
- adapter_name,
+ strncpy(fed_adapter->name,
+ adapter_name,
FED_ADAPTERNAME_LEN);
fed_adapter->lid = res.lid;
fed_adapter->network_id = res.network_id;
@@ -462,14 +462,14 @@ static int _set_up_adapter(fed_adapter_t *fed_adapter, char *adapter_name)
fed_adapter->window_count = res.window_count;
free(res.window_list);
_cache_lid(fed_adapter);
- error_code = ntbl_status_adapter(NTBL_VERSION,
- adapter_name,
- &win_count,
+ error_code = ntbl_status_adapter(NTBL_VERSION,
+ adapter_name,
+ &win_count,
&status);
umask(fed_umask);
if(error_code)
slurm_seterrno_ret(ESTATUS);
- tmp_winlist = (fed_window_t *)xmalloc(sizeof(fed_window_t) *
+ tmp_winlist = (fed_window_t *)xmalloc(sizeof(fed_window_t) *
res.window_count);
if(!tmp_winlist)
slurm_seterrno_ret(ENOMEM);
@@ -520,7 +520,7 @@ static int _parse_fed_file(hostlist_t *adapter_list)
if(s_p_parse_file(tbl, fed_conf) == SLURM_ERROR)
fatal("something wrong with opening/reading federation "
"conf file");
-
+
if (s_p_get_string(&adapter_name, "AdapterName", tbl)) {
int rc;
rc = hostlist_push(*adapter_list, adapter_name);
@@ -530,7 +530,7 @@ static int _parse_fed_file(hostlist_t *adapter_list)
}
s_p_hashtbl_destroy(tbl);
-
+
return SLURM_SUCCESS;
}
@@ -540,7 +540,7 @@ static int _parse_fed_file(hostlist_t *adapter_list)
*
* Used by: slurmd
*/
-static int
+static int
_get_adapters(fed_adapter_t *list, int *count)
{
hostlist_iterator_t adapter_iter;
@@ -549,7 +549,7 @@ _get_adapters(fed_adapter_t *list, int *count)
assert(list != NULL);
assert(adapter_list != NULL);
-
+
adapter_iter = hostlist_iterator_create(adapter_list);
for (i = 0; (adapter = hostlist_next(adapter_iter)); i++) {
if(_set_up_adapter(list + i, adapter) == SLURM_ERROR)
@@ -561,11 +561,11 @@ _get_adapters(fed_adapter_t *list, int *count)
assert(i > 0);
*count = i;
info("Number of adapters is = %d", *count);
-
+
if(!*count)
slurm_seterrno_ret(ENOADAPTER);
-
- return 0;
+
+ return 0;
}
/* Used by: slurmd, slurmctld */
@@ -584,7 +584,7 @@ fed_alloc_jobinfo(fed_jobinfo_t **j)
new->tables_per_task = 0;
new->tableinfo = NULL;
*j = new;
-
+
return 0;
}
@@ -599,7 +599,7 @@ fed_alloc_nodeinfo(fed_nodeinfo_t **n)
new = (fed_nodeinfo_t *)xmalloc(sizeof(fed_nodeinfo_t));
if(!new)
slurm_seterrno_ret(ENOMEM);
- new->adapter_list = (fed_adapter_t *)xmalloc(sizeof(fed_adapter_t)
+ new->adapter_list = (fed_adapter_t *)xmalloc(sizeof(fed_adapter_t)
* FED_MAXADAPTERS);
if(!new->adapter_list) {
xfree(new);
@@ -608,7 +608,7 @@ fed_alloc_nodeinfo(fed_nodeinfo_t **n)
new->magic = FED_NODEINFO_MAGIC;
new->adapter_count = 0;
new->next = NULL;
-
+
*n = new;
return 0;
@@ -626,7 +626,7 @@ fed_build_nodeinfo(fed_nodeinfo_t *n, char *name)
{
int count;
int err;
-
+
assert(n);
assert(n->magic == FED_NODEINFO_MAGIC);
assert(name);
@@ -645,11 +645,11 @@ static int
_print_adapter_resources(ADAPTER_RESOURCES *r, char *buf, size_t size)
{
int count;
-
+
assert(r);
assert(buf);
assert(size > 0);
-
+
count = snprintf(buf, size,
"--Begin Adapter Resources--\n"
" device_type = %x\n"
@@ -681,7 +681,7 @@ _print_adapter_resources(ADAPTER_RESOURCES *r, char *buf, size_t size)
#else
r->rcontext_block_count);
#endif
-
+
return count;
}
@@ -689,11 +689,11 @@ static int
_print_window_status(struct NTBL_STATUS *s, char *buf, size_t size)
{
int count;
-
+
assert(s);
assert(buf);
assert(size > 0);
-
+
switch(s->rc) {
case NTBL_UNLOADED_STATE:
count = snprintf(buf, size,
@@ -710,8 +710,8 @@ _print_window_status(struct NTBL_STATUS *s, char *buf, size_t size)
s->window_id, s->adapter);
#else
"window %u on %s: %s\n",
- s->window_id, s->adapter,
- _lookup_fed_status_tab(s->rc));
+ s->window_id, s->adapter,
+ _lookup_fed_status_tab(s->rc));
#endif
break;
case NTBL_LOADED_STATE:
@@ -747,24 +747,24 @@ _print_window_status(struct NTBL_STATUS *s, char *buf, size_t size)
#else
"window %u on %s: %s\n",
s->window_id, s->adapter,
- _lookup_fed_status_tab(s->rc));
-#endif
+ _lookup_fed_status_tab(s->rc));
+#endif
break;
default:
count = snprintf(buf, size,
"Uknown NTBL Return Code For Window %d: %s\n",
- s->window_id,
+ s->window_id,
_lookup_fed_status_tab(s->rc));
- }
-
- return count;
+ }
+
+ return count;
}
#endif
static int
_print_window_struct(fed_window_t *w, char *buf, size_t size)
{
int count;
-
+
assert(w);
assert(buf);
assert(size > 0);
@@ -779,8 +779,8 @@ _print_window_struct(fed_window_t *w, char *buf, size_t size)
}
/* Writes out nodeinfo structure to a buffer. Maintains the
- * snprintf semantics by only filling the buffer up to the value
- * of size. If FED_VERBOSE_PRINT is defined this function will
+ * snprintf semantics by only filling the buffer up to the value
+ * of size. If FED_VERBOSE_PRINT is defined this function will
* dump the entire structure, otherwise only the "useful" part.
*
* Used by: slurmd, slurmctld
@@ -794,13 +794,13 @@ fed_print_nodeinfo(fed_nodeinfo_t *n, char *buf, size_t size)
int remaining = size;
int count;
char *tmp = buf;
-
+
assert(n);
assert(buf);
assert(size > 0);
assert(n->magic == FED_NODEINFO_MAGIC);
- count = snprintf(tmp, remaining,
+ count = snprintf(tmp, remaining,
"Node: %s\n",
n->name);
if(count < 0)
@@ -840,15 +840,15 @@ fed_print_nodeinfo(fed_nodeinfo_t *n, char *buf, size_t size)
tmp += count;
if(remaining < 1)
return buf;
-
+
w = a->window_list;
for(j = 0; j < a->window_count; j++) {
#if FED_VERBOSE_PRINT
count = _print_window_struct(&w[j], tmp, remaining);
#else
-
+
if(w[j].status != NTBL_UNLOADED_STATE)
- count = _print_window_struct(&w[j], tmp,
+ count = _print_window_struct(&w[j], tmp,
remaining);
else
count = 0;
@@ -859,16 +859,16 @@ fed_print_nodeinfo(fed_nodeinfo_t *n, char *buf, size_t size)
tmp += count;
if(remaining < 1)
return buf;
- }
+ }
}
-
+
return buf;
}
/* Note that when collecting max_winmem, min_winmem and avail_mem
- * we convert these values from 64 to 32 bit unisgned integers. This
- * was to make the pack/unpack implementation easier. I am taking a
- * chance here that IBM will not release Federation adapters with more
+ * we convert these values from 64 to 32 bit unisgned integers. This
+ * was to make the pack/unpack implementation easier. I am taking a
+ * chance here that IBM will not release Federation adapters with more
* than 4GB of memory.
*
* Used by: all
@@ -879,11 +879,11 @@ fed_pack_nodeinfo(fed_nodeinfo_t *n, Buf buf)
int i,j;
fed_adapter_t *a;
int offset;
-
+
assert(n);
assert(n->magic == FED_NODEINFO_MAGIC);
assert(buf);
-
+
offset = get_buf_offset(buf);
pack32(n->magic, buf);
packmem(n->name, FED_HOSTLEN, buf);
@@ -914,7 +914,7 @@ _copy_node(fed_nodeinfo_t *dest, fed_nodeinfo_t *src)
int i,j;
fed_adapter_t *sa = NULL;
fed_adapter_t *da = NULL;
-
+
assert(dest);
assert(src);
assert(dest->magic == FED_NODEINFO_MAGIC);
@@ -940,18 +940,18 @@ _copy_node(fed_nodeinfo_t *dest, fed_nodeinfo_t *src)
for(j = 0; j < da->window_count; j++)
da->window_list[j] = sa->window_list[j];
}
-
+
return SLURM_SUCCESS;
}
/* The idea behind keeping the hash table was to avoid a linear
- * search of the node list each time we want to retrieve or
+ * search of the node list each time we want to retrieve or
* modify a node's data. The _hash_index function translates
* a node name to an index into the hash table.
*
* Used by: slurmctld
*/
-static int
+static int
_hash_index (char *name)
{
int index = 0;
@@ -966,7 +966,7 @@ _hash_index (char *name)
for (j = 1; *name; name++, j++)
index += (int)*name * j;
index %= fed_state->hash_max;
-
+
return index;
}
@@ -979,7 +979,7 @@ _find_node(fed_libstate_t *lp, char *name)
{
int i;
fed_nodeinfo_t *n;
-
+
assert(name);
assert(lp);
@@ -1025,9 +1025,9 @@ static void
_hash_rebuild(fed_libstate_t *state)
{
int i;
-
+
assert(state);
-
+
if(state->hash_table)
xfree(state->hash_table);
if (state->node_count > state->hash_max || state->hash_max == 0)
@@ -1041,9 +1041,9 @@ _hash_rebuild(fed_libstate_t *state)
}
/* If the node is already in the node list then simply return
- * a pointer to it, otherwise dynamically allocate memory to the
+ * a pointer to it, otherwise dynamically allocate memory to the
* node list if necessary.
- *
+ *
* Used by: slurmctld
*/
static fed_nodeinfo_t *
@@ -1077,7 +1077,7 @@ _alloc_node(fed_libstate_t *lp, char *name)
slurm_seterrno(ENOMEM);
return NULL;
}
-
+
n = lp->node_list + (lp->node_count++);
n->magic = FED_NODEINFO_MAGIC;
n->name[0] = '\0';
@@ -1101,9 +1101,9 @@ _print_libstate(const fed_libstate_t *l)
{
int i;
char buf[3000];
-
+
assert(l);
-
+
printf("--Begin libstate--\n");
printf(" magic = %u\n", l->magic);
printf(" node_count = %u\n", l->node_count);
@@ -1179,9 +1179,9 @@ _unpack_nodeinfo(fed_nodeinfo_t *n, Buf buf, bool believe_window_status)
/* NOTE! We don't care at this point whether n is valid.
* If it's NULL, we will just forego the copy at the end.
- */
+ */
assert(buf);
-
+
/* Extract node name from buffer
*/
safe_unpack32(&magic, buf);
@@ -1199,7 +1199,7 @@ _unpack_nodeinfo(fed_nodeinfo_t *n, Buf buf, bool believe_window_status)
* the slurmctld only unpacks RPCs to find out their identity.
* Most of the RPCs, including the one calling this function, are
* simply ignored.
- *
+ *
* So, here we just do a fake unpack to advance the buffer pointer.
*/
if (fed_state == NULL) {
@@ -1245,7 +1245,7 @@ _unpack_nodeinfo(fed_nodeinfo_t *n, Buf buf, bool believe_window_status)
safe_unpack32(&tmp_a->min_winmem, buf);
safe_unpack32(&tmp_a->avail_mem, buf);
safe_unpack32(&tmp_a->window_count, buf);
- tmp_w = (fed_window_t *)xmalloc(sizeof(fed_window_t) *
+ tmp_w = (fed_window_t *)xmalloc(sizeof(fed_window_t) *
tmp_a->window_count);
if(!tmp_w)
slurm_seterrno_ret(ENOMEM);
@@ -1261,7 +1261,7 @@ _unpack_nodeinfo(fed_nodeinfo_t *n, Buf buf, bool believe_window_status)
tmp_a->window_list = tmp_w;
tmp_w = NULL; /* don't free on unpack error of next adapter */
}
-
+
copy_node:
/* Only copy the node_info structure if the caller wants it */
if(n != NULL)
@@ -1273,7 +1273,7 @@ copy_node:
#endif
return SLURM_SUCCESS;
-
+
unpack_error:
xfree(tmp_w);
slurm_seterrno_ret(EUNPACK);
@@ -1301,12 +1301,12 @@ fed_free_nodeinfo(fed_nodeinfo_t *n, bool ptr_into_array)
{
fed_adapter_t *adapter;
int i;
-
+
if(!n)
return;
-
+
assert(n->magic == FED_NODEINFO_MAGIC);
-
+
if(n->adapter_list) {
adapter = n->adapter_list;
for (i = 0; i < n->adapter_count; i++) {
@@ -1318,7 +1318,7 @@ fed_free_nodeinfo(fed_nodeinfo_t *n, bool ptr_into_array)
xfree(n);
}
-/* Assign a unique key to each job. The key is used later to
+/* Assign a unique key to each job. The key is used later to
* gain access to the network table loaded on each node of a job.
*
* Federation documentation states that the job key must be greater
@@ -1330,16 +1330,16 @@ static uint16_t
_next_key(void)
{
uint16_t key;
-
+
assert(fed_state);
-
+
_lock();
key = fed_state->key_index % 0xFFF0;
if (key == 0)
key++;
fed_state->key_index = key + 1;
_unlock();
-
+
return key;
}
@@ -1392,16 +1392,16 @@ _allocate_windows_all(int adapter_cnt, fed_tableinfo_t *tableinfo,
fed_window_t *window;
NTBL *table;
int i;
-
+
assert(tableinfo);
assert(hostname);
-
+
node = _find_node(fed_state, hostname);
if(node == NULL) {
error("Failed to find node in node_list: %s", hostname);
return SLURM_ERROR;
}
-
+
/* Reserve a window on each adapter for this task */
for (i = 0; i < adapter_cnt; i++) {
adapter = &node->adapter_list[i];
@@ -1422,7 +1422,7 @@ _allocate_windows_all(int adapter_cnt, fed_tableinfo_t *tableinfo,
strncpy(tableinfo[i].adapter_name, adapter->name,
FED_ADAPTERNAME_LEN);
}
-
+
return SLURM_SUCCESS;
}
@@ -1443,17 +1443,17 @@ _allocate_window_single(char *adapter_name, fed_tableinfo_t *tableinfo,
fed_window_t *window;
NTBL *table;
int i;
-
+
assert(tableinfo);
assert(hostname);
-
+
debug("in _allocate_window_single");
node = _find_node(fed_state, hostname);
if(node == NULL) {
error("Failed to find node in node_list: %s", hostname);
return SLURM_ERROR;
}
-
+
/* find the adapter */
for (i = 0; i < node->adapter_count; i++) {
debug("adapter %s at index %d", node->adapter_list[i].name, i);
@@ -1487,12 +1487,12 @@ _allocate_window_single(char *adapter_name, fed_tableinfo_t *tableinfo,
strncpy(tableinfo[0].adapter_name, adapter_name,
FED_ADAPTERNAME_LEN);
-
+
return SLURM_SUCCESS;
}
-/* Find the correct NTBL structs and set the state
+/* Find the correct NTBL structs and set the state
* of the switch windows for the specified task_id.
*
* Used by: slurmctld
@@ -1508,11 +1508,11 @@ _window_state_set(int adapter_cnt, fed_tableinfo_t *tableinfo,
NTBL *table = NULL;
int i, j;
bool adapter_found;
-
+
assert(tableinfo);
assert(hostname);
assert(adapter_cnt <= FED_MAXADAPTERS);
-
+
node = _find_node(fed_state, hostname);
if (node == NULL) {
error("Failed to find node in node_list: %s", hostname);
@@ -1522,7 +1522,7 @@ _window_state_set(int adapter_cnt, fed_tableinfo_t *tableinfo,
error("Found node, but adapter_list is NULL");
return SLURM_ERROR;
}
-
+
for (i = 0; i < adapter_cnt; i++) {
if (tableinfo[i].table == NULL) {
error("tableinfo[%d].table is NULL", i);
@@ -1565,7 +1565,7 @@ _window_state_set(int adapter_cnt, fed_tableinfo_t *tableinfo,
(state == NTBL_UNLOADED_STATE) ? 0 : job_key;
}
}
-
+
return SLURM_SUCCESS;
}
@@ -1576,10 +1576,10 @@ static void
_print_table(NTBL **table, int size)
{
int i;
-
+
assert(table);
assert(size > 0);
-
+
printf("--Begin NTBL table--\n");
for(i = 0; i < size; i++) {
printf(" task_id: %u\n", table[i]->task_id);
@@ -1594,10 +1594,10 @@ static void
_print_index(char *index, int size)
{
int i;
-
+
assert(index);
assert(size > 0);
-
+
printf("--Begin lid index--\n");
for(i = 0; i < size; i++) {
printf(" task_id: %u\n", i);
@@ -1627,7 +1627,7 @@ _job_step_window_state(fed_jobinfo_t *jp, hostlist_t hl, enum NTBL_RC state)
int full_node_cnt;
int min_procs_per_node;
int max_procs_per_node;
-
+
xassert(!hostlist_is_empty(hl));
xassert(jp);
xassert(jp->magic == FED_JOBINFO_MAGIC);
@@ -1651,19 +1651,19 @@ _job_step_window_state(fed_jobinfo_t *jp, hostlist_t hl, enum NTBL_RC state)
full_node_cnt = nprocs % nnodes;
min_procs_per_node = nprocs / nnodes;
max_procs_per_node = (nprocs + nnodes - 1) / nnodes;
-
+
proc_cnt = 0;
_lock();
for (i = 0; i < nnodes; i++) {
host = hostlist_next(hi);
if(!host)
error("Failed to get next host");
-
+
if(i < full_node_cnt)
task_cnt = max_procs_per_node;
else
task_cnt = min_procs_per_node;
-
+
for (j = 0; j < task_cnt; j++) {
rc = _window_state_set(jp->tables_per_task,
jp->tableinfo,
@@ -1674,7 +1674,7 @@ _job_step_window_state(fed_jobinfo_t *jp, hostlist_t hl, enum NTBL_RC state)
free(host);
}
_unlock();
-
+
hostlist_iterator_destroy(hi);
return SLURM_SUCCESS;
}
@@ -1778,7 +1778,7 @@ fed_job_step_complete(fed_jobinfo_t *jp, hostlist_t hl)
debug("fed_job_step_complete called when fed_state == NULL");
}
_unlock();
-
+
hostlist_iterator_destroy(hi);
hostlist_destroy(uniq_hl);
return SLURM_SUCCESS;
@@ -1881,12 +1881,12 @@ fed_build_jobinfo(fed_jobinfo_t *jp, hostlist_t hl, int nprocs,
host = hostlist_next(hi);
if(!host)
error("Failed to get next host");
-
+
if(i < full_node_cnt)
task_cnt = max_procs_per_node;
else
task_cnt = min_procs_per_node;
-
+
for (j = 0; j < task_cnt; j++) {
if (adapter_name == NULL) {
rc = _allocate_windows_all(jp->tables_per_task,
@@ -1908,12 +1908,12 @@ fed_build_jobinfo(fed_jobinfo_t *jp, hostlist_t hl, int nprocs,
free(host);
}
_unlock();
-
+
#if FED_DEBUG
_print_table(jp->tableinfo[i].table, jp->tableinfo[i].table_length);
#endif
-
+
hostlist_iterator_destroy(hi);
return SLURM_SUCCESS;
@@ -1947,7 +1947,7 @@ fed_pack_jobinfo(fed_jobinfo_t *j, Buf buf)
assert(j);
assert(j->magic == FED_JOBINFO_MAGIC);
assert(buf);
-
+
pack32(j->magic, buf);
pack16(j->job_key, buf);
packmem(j->job_desc, DESCLEN, buf);
@@ -1991,16 +1991,16 @@ unpack_error: /* safe_unpackXX are macros which jump to unpack_error */
}
/* Used by: all */
-int
+int
fed_unpack_jobinfo(fed_jobinfo_t *j, Buf buf)
{
uint32_t size;
int i, k;
-
+
assert(j);
assert(j->magic == FED_JOBINFO_MAGIC);
assert(buf);
-
+
safe_unpack32(&j->magic, buf);
assert(j->magic == FED_JOBINFO_MAGIC);
safe_unpack16(&j->job_key, buf);
@@ -2021,7 +2021,7 @@ fed_unpack_jobinfo(fed_jobinfo_t *j, Buf buf)
}
return SLURM_SUCCESS;
-
+
unpack_error:
error("fed_unpack_jobinfo error");
if (j->tableinfo) {
@@ -2063,7 +2063,7 @@ fed_copy_jobinfo(fed_jobinfo_t *job)
goto cleanup2;
memcpy(new->tableinfo, job->tableinfo,
sizeof(fed_tableinfo_t) * job->tables_per_task);
-
+
for (i = 0; i < job->tables_per_task; i++) {
new->tableinfo[i].table =
(NTBL **) xmalloc(job->tableinfo[i].table_length
@@ -2137,11 +2137,11 @@ fed_free_jobinfo(fed_jobinfo_t *jp)
xfree(tableinfo->table);
}
xfree(jp->tableinfo);
- }
+ }
xfree(jp);
jp = NULL;
-
+
return;
}
@@ -2155,7 +2155,7 @@ fed_get_jobinfo(fed_jobinfo_t *jp, int key, void *data)
fed_tableinfo_t **tableinfo = (fed_tableinfo_t **)data;
int *tables_per = (int *)data;
int *job_key = (int *)data;
-
+
assert(jp);
assert(jp->magic == FED_JOBINFO_MAGIC);
@@ -2172,14 +2172,14 @@ fed_get_jobinfo(fed_jobinfo_t *jp, int key, void *data)
default:
slurm_seterrno_ret(EINVAL);
}
-
+
return SLURM_SUCCESS;
}
/*
* Check up to "retry" times for "window_id" on "adapter_name"
- * to switch to the NTBL_UNLOADED_STATE. Sleep one second between
+ * to switch to the NTBL_UNLOADED_STATE. Sleep one second between
* each retry.
*
* Used by: slurmd
@@ -2235,7 +2235,7 @@ _wait_for_all_windows(fed_tableinfo_t *tableinfo)
if (err != SLURM_SUCCESS) {
error("Window %hu adapter %s did not become"
" free within %d seconds",
- lid, tableinfo->table[i]->window_id,
+ lid, tableinfo->table[i]->window_id,
retry);
rc = err;
retry = 2;
@@ -2346,13 +2346,13 @@ fed_load_table(fed_jobinfo_t *jp, int uid, int pid)
jp->tableinfo[i].table);
}
if(err != NTBL_SUCCESS) {
- error("unable to load table: [%d] %s\n",
+ error("unable to load table: [%d] %s\n",
err, _lookup_fed_status_tab(err));
return SLURM_ERROR;
}
}
umask(fed_umask);
-
+
return SLURM_SUCCESS;
}
@@ -2384,7 +2384,7 @@ _unload_window(char *adapter, unsigned short job_key, unsigned short window_id,
sleep(1);
}
-
+
return SLURM_FAILURE;
}
@@ -2438,7 +2438,7 @@ static fed_libstate_t *
_alloc_libstate(void)
{
fed_libstate_t *tmp;
-
+
tmp = (fed_libstate_t *)xmalloc(sizeof(fed_libstate_t));
if(!tmp) {
slurm_seterrno(ENOMEM);
@@ -2451,7 +2451,7 @@ _alloc_libstate(void)
tmp->hash_max = 0;
tmp->hash_table = NULL;
tmp->key_index = 1;
-
+
return tmp;
}
@@ -2471,7 +2471,7 @@ fed_init(void)
assert(!fed_state);
fed_state = tmp;
_unlock();
-
+
return SLURM_SUCCESS;
}
@@ -2504,10 +2504,10 @@ _pack_libstate(fed_libstate_t *lp, Buf buffer)
{
int offset;
int i;
-
+
assert(lp);
assert(lp->magic == FED_LIBSTATE_MAGIC);
-
+
offset = get_buf_offset(buffer);
pack32(lp->magic, buffer);
pack32(lp->node_count, buffer);
@@ -2515,7 +2515,7 @@ _pack_libstate(fed_libstate_t *lp, Buf buffer)
(void)fed_pack_nodeinfo(&lp->node_list[i], buffer);
/* don't pack hash_table, we'll just rebuild on restore */
pack16(lp->key_index, buffer);
-
+
return(get_buf_offset(buffer) - offset);
}
@@ -2528,7 +2528,7 @@ fed_libstate_save(Buf buffer, bool free_flag)
if (fed_state != NULL)
_pack_libstate(fed_state, buffer);
- /* Clean up fed_state since backup slurmctld can repeatedly
+ /* Clean up fed_state since backup slurmctld can repeatedly
* save and restore state */
if (free_flag) {
_free_libstate(fed_state);
@@ -2544,11 +2544,11 @@ _unpack_libstate(fed_libstate_t *lp, Buf buffer)
int offset;
int node_count;
int i;
-
+
assert(lp->magic == FED_LIBSTATE_MAGIC);
-
+
offset = get_buf_offset(buffer);
-
+
safe_unpack32(&lp->magic, buffer);
safe_unpack32(&node_count, buffer);
for(i = 0; i < node_count; i++) {
@@ -2561,7 +2561,7 @@ _unpack_libstate(fed_libstate_t *lp, Buf buffer)
return SLURM_ERROR;
}
safe_unpack16(&lp->key_index, buffer);
-
+
return SLURM_SUCCESS;
unpack_error:
diff --git a/src/plugins/switch/federation/federation.h b/src/plugins/switch/federation/federation.h
index 6be809521c932daf437c7d9eb2d18bfbf47151e1..0ad4e8145aded485bc86264c8f1627ef240db34a 100644
--- a/src/plugins/switch/federation/federation.h
+++ b/src/plugins/switch/federation/federation.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jason King <jking@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -57,7 +57,7 @@ typedef struct fed_libstate fed_libstate_t;
typedef struct fed_jobinfo fed_jobinfo_t;
typedef struct fed_nodeinfo fed_nodeinfo_t;
-/* NOTE: error codes should be between ESLURM_SWITCH_MIN and
+/* NOTE: error codes should be between ESLURM_SWITCH_MIN and
* ESLURM_SWITCH MAX as defined in slurm/slurm_errno.h */
enum {
/* Federation specific error codes */
diff --git a/src/plugins/switch/federation/federation_keys.h b/src/plugins/switch/federation/federation_keys.h
index 7f9151923aa4234cb5ef135c273d00c68f53dfbc..b0400284acbab37c4bc0e4406fa667525b965992 100644
--- a/src/plugins/switch/federation/federation_keys.h
+++ b/src/plugins/switch/federation/federation_keys.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jason King <jking@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/plugins/switch/federation/switch_federation.c b/src/plugins/switch/federation/switch_federation.c
index 2f5b127ccdeb7d89ff91dc60db68aea1469130b0..b77e7ea51c36f11dfec937915db84d8df82dbca0 100644
--- a/src/plugins/switch/federation/switch_federation.c
+++ b/src/plugins/switch/federation/switch_federation.c
@@ -1,5 +1,5 @@
/***************************************************************************** \
- * switch_federation.c - Library routines for initiating jobs on IBM
+ * switch_federation.c - Library routines for initiating jobs on IBM
* Federation
*****************************************************************************
* Copyright (C) 2004-2007 The Regents of the University of California.
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jason King <jking@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -75,7 +75,7 @@ static slurm_errtab_t slurm_errtab[] = {
{ ESTATUS,
"Cannot get adapter status" },
- { EADAPTER,
+ { EADAPTER,
"Open of adapter failed" },
{ ENOADAPTER,
"No adapters found" },
@@ -116,7 +116,7 @@ static slurm_errtab_t slurm_errtab[] = {
* <application>/<method>
*
* where <application> is a description of the intended application of
- * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
+ * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
* of how this plugin satisfies that application. SLURM will only load
* a switch plugin if the plugin_type string has a prefix of "switch/".
*
@@ -163,7 +163,7 @@ int switch_p_slurmd_step_init( void )
/*
* Switch functions for global state save
- * NOTE: Clears current switch state as needed for backup
+ * NOTE: Clears current switch state as needed for backup
* controller to repeatedly assume control primary server
*/
int switch_p_libstate_save ( char * dir_name )
@@ -178,7 +178,7 @@ static int _switch_p_libstate_save ( char * dir_name, bool free_flag )
char *file_name;
int ret = SLURM_SUCCESS;
int state_fd;
-
+
buffer = init_buf(FED_LIBSTATE_LEN);
(void)fed_libstate_save(buffer, free_flag);
file_name = xstrdup(dir_name);
@@ -209,10 +209,10 @@ static int _switch_p_libstate_save ( char * dir_name, bool free_flag )
close(state_fd);
}
xfree(file_name);
-
+
if(buffer)
free_buf(buffer);
-
+
return ret;
}
@@ -289,7 +289,7 @@ int switch_p_libstate_clear(void)
/*
* switch state monitoring functions
*/
-/* NOTE: we assume that once the switch state is cleared,
+/* NOTE: we assume that once the switch state is cleared,
* notification of this will be forwarded to slurmctld. We do not
* enforce that in this function.
*/
@@ -303,18 +303,18 @@ int switch_p_clear_node_state(void)
ADAPTER_RESOURCES res;
char name[] = "sniN";
int err;
-
+
for(i = 0; i < FED_MAXADAPTERS; i++) {
name[3] = i + ZERO;
err = ntbl_adapter_resources(NTBL_VERSION, name, &res);
if(err != NTBL_SUCCESS)
continue;
for(j = 0; j < res.window_count; j++)
- ntbl_clean_window(NTBL_VERSION, name,
+ ntbl_clean_window(NTBL_VERSION, name,
ALWAYS_KILL, res.window_list[j]);
free(res.window_list);
}
-
+
return SLURM_SUCCESS;
}
@@ -353,7 +353,7 @@ void switch_p_free_node_info(switch_node_info_t **switch_node)
fed_free_nodeinfo((fed_nodeinfo_t *)*switch_node, false);
}
-char * switch_p_sprintf_node_info(switch_node_info_t *switch_node,
+char * switch_p_sprintf_node_info(switch_node_info_t *switch_node,
char *buf, size_t size)
{
return fed_print_nodeinfo((fed_nodeinfo_t *)switch_node, buf, size);
@@ -386,13 +386,13 @@ static char *adapter_name_check(char *network)
name = strndup(network + pmatch[1].rm_so,
(size_t)(pmatch[1].rm_eo - pmatch[1].rm_so));
regfree(&re);
-
+
return name;
}
-int switch_p_build_jobinfo(switch_jobinfo_t *switch_job, char *nodelist,
- uint16_t *tasks_per_node, int cyclic_alloc,
- char *network)
+int switch_p_build_jobinfo(switch_jobinfo_t *switch_job, char *nodelist,
+ uint16_t *tasks_per_node, int cyclic_alloc,
+ char *network)
{
hostlist_t list = NULL;
bool sn_all;
@@ -469,12 +469,12 @@ int switch_p_unpack_jobinfo(switch_jobinfo_t *switch_job, Buf buffer)
return fed_unpack_jobinfo((fed_jobinfo_t *)switch_job, buffer);
}
-extern int switch_p_get_jobinfo(switch_jobinfo_t *switch_job, int key,
+extern int switch_p_get_jobinfo(switch_jobinfo_t *switch_job, int key,
void *resulting_data)
{
return fed_get_jobinfo((fed_jobinfo_t *)switch_job, key,
resulting_data);
-}
+}
static inline int _make_step_comp(switch_jobinfo_t *jobinfo, char *nodelist)
{
@@ -493,7 +493,7 @@ extern int switch_p_job_step_complete(switch_jobinfo_t *jobinfo, char *nodelist)
return _make_step_comp(jobinfo, nodelist);
}
-extern int switch_p_job_step_part_comp(switch_jobinfo_t *jobinfo,
+extern int switch_p_job_step_part_comp(switch_jobinfo_t *jobinfo,
char *nodelist)
{
return _make_step_comp(jobinfo, nodelist);
@@ -543,7 +543,7 @@ int switch_p_node_init(void)
if(!_ntbl_version_ok()) {
slurm_seterrno_ret(EVERSION);
}
-
+
return SLURM_SUCCESS;
}
@@ -560,7 +560,7 @@ int switch_p_job_preinit(switch_jobinfo_t *jobinfo)
int switch_p_job_init (switch_jobinfo_t *jobinfo, uid_t uid)
{
pid_t pid;
-
+
pid = getpid();
return fed_load_table((fed_jobinfo_t *)jobinfo, uid, pid);
}
@@ -570,7 +570,7 @@ int switch_p_job_fini (switch_jobinfo_t *jobinfo)
return SLURM_SUCCESS;
}
-int switch_p_job_postfini(switch_jobinfo_t *jobinfo, uid_t pgid,
+int switch_p_job_postfini(switch_jobinfo_t *jobinfo, uid_t pgid,
uint32_t job_id, uint32_t step_id)
{
int err;
@@ -579,11 +579,11 @@ int switch_p_job_postfini(switch_jobinfo_t *jobinfo, uid_t pgid,
* Kill all processes in the job's session
*/
if(pgid) {
- debug2("Sending SIGKILL to pgid %lu",
- (unsigned long) pgid);
+ debug2("Sending SIGKILL to pgid %lu",
+ (unsigned long) pgid);
kill(-pgid, SIGKILL);
} else
- debug("Job %u.%u: Bad pid valud %lu", job_id,
+ debug("Job %u.%u: Bad pid valud %lu", job_id,
step_id, (unsigned long) pgid);
err = fed_unload_table((fed_jobinfo_t *)jobinfo);
@@ -593,8 +593,8 @@ int switch_p_job_postfini(switch_jobinfo_t *jobinfo, uid_t pgid,
return SLURM_SUCCESS;
}
-int switch_p_job_attach(switch_jobinfo_t *jobinfo, char ***env,
- uint32_t nodeid, uint32_t procid, uint32_t nnodes,
+int switch_p_job_attach(switch_jobinfo_t *jobinfo, char ***env,
+ uint32_t nodeid, uint32_t procid, uint32_t nnodes,
uint32_t nprocs, uint32_t rank)
{
#if 0
@@ -611,7 +611,7 @@ int switch_p_job_attach(switch_jobinfo_t *jobinfo, char ***env,
* switch functions for other purposes
*/
-/*
+/*
* Linear search through table of errno values and strings,
* returns NULL on error, string on success.
*/
diff --git a/src/plugins/switch/none/Makefile.am b/src/plugins/switch/none/Makefile.am
index 58a8ad437586b519e59951969aa94f126147aad6..b9423c7693f11bbb0df9ee3d37d23de3330045e7 100644
--- a/src/plugins/switch/none/Makefile.am
+++ b/src/plugins/switch/none/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/switch/none/Makefile.in b/src/plugins/switch/none/Makefile.in
index 30538fd5d7064221ff83d035f03fb17fb0b8cec6..201fdff3025367c1ff440b4321c75654ebd7b203 100644
--- a/src/plugins/switch/none/Makefile.in
+++ b/src/plugins/switch/none/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = switch_none.la
diff --git a/src/plugins/switch/none/switch_none.c b/src/plugins/switch/none/switch_none.c
index c4295b004080f5f77f2e3c0c2f0d58b9e5f5d7d6..dce887cf6058a6d772bf6efff29280a77be9f8ed 100644
--- a/src/plugins/switch/none/switch_none.c
+++ b/src/plugins/switch/none/switch_none.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -64,7 +64,7 @@
* <application>/<method>
*
* where <application> is a description of the intended application of
- * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
+ * the plugin (e.g., "switch" for SLURM switch) and <method> is a description
* of how this plugin satisfies that application. SLURM will only load
* a switch plugin if the plugin_type string has a prefix of "switch/".
*
@@ -119,7 +119,7 @@ int switch_p_alloc_jobinfo ( switch_jobinfo_t **switch_job )
return SLURM_SUCCESS;
}
-int switch_p_build_jobinfo ( switch_jobinfo_t *switch_job, char *nodelist,
+int switch_p_build_jobinfo ( switch_jobinfo_t *switch_job, char *nodelist,
uint16_t *tasks_per_node, int cyclic_alloc, char *network)
{
return SLURM_SUCCESS;
@@ -189,25 +189,25 @@ int switch_p_job_fini ( switch_jobinfo_t *jobinfo )
return SLURM_SUCCESS;
}
-int switch_p_job_postfini ( switch_jobinfo_t *jobinfo, uid_t pgid,
+int switch_p_job_postfini ( switch_jobinfo_t *jobinfo, uid_t pgid,
uint32_t job_id, uint32_t step_id )
{
/*
* Kill all processes in the job's session
*/
if (pgid) {
- debug2("Sending SIGKILL to pgid %lu",
- (unsigned long) pgid);
+ debug2("Sending SIGKILL to pgid %lu",
+ (unsigned long) pgid);
kill(-pgid, SIGKILL);
} else
- debug("Job %u.%u: Bad pid valud %lu", job_id,
+ debug("Job %u.%u: Bad pid valud %lu", job_id,
step_id, (unsigned long) pgid);
return SLURM_SUCCESS;
}
-int switch_p_job_attach ( switch_jobinfo_t *jobinfo, char ***env,
- uint32_t nodeid, uint32_t procid, uint32_t nnodes,
+int switch_p_job_attach ( switch_jobinfo_t *jobinfo, char ***env,
+ uint32_t nodeid, uint32_t procid, uint32_t nnodes,
uint32_t nprocs, uint32_t rank )
{
return SLURM_SUCCESS;
@@ -235,7 +235,7 @@ extern char *switch_p_strerror(int errnum)
/*
* node switch state monitoring functions
- * required for IBM Federation switch
+ * required for IBM Federation switch
*/
extern int switch_p_clear_node_state(void)
{
@@ -252,7 +252,7 @@ extern int switch_p_build_node_info(switch_node_info_t *switch_node)
return SLURM_SUCCESS;
}
-extern int switch_p_pack_node_info(switch_node_info_t *switch_node,
+extern int switch_p_pack_node_info(switch_node_info_t *switch_node,
Buf buffer)
{
return 0;
diff --git a/src/plugins/task/affinity/Makefile.am b/src/plugins/task/affinity/Makefile.am
index 8fa3663995b5e4761080cc174082c08afd62f036..bc2ab1b937b89bb99a045afd1f9b29cd4491a050 100644
--- a/src/plugins/task/affinity/Makefile.am
+++ b/src/plugins/task/affinity/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/task/affinity/Makefile.in b/src/plugins/task/affinity/Makefile.in
index 790ea629dfc31825857b35e1dd314db1d343ad1d..efc98ec8debd0002d60f7cdd35eeb5cf23693ab1 100644
--- a/src/plugins/task/affinity/Makefile.in
+++ b/src/plugins/task/affinity/Makefile.in
@@ -323,7 +323,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
@HAVE_SCHED_SETAFFINITY_FALSE@pkglib_LTLIBRARIES =
@HAVE_SCHED_SETAFFINITY_TRUE@pkglib_LTLIBRARIES = task_affinity.la
diff --git a/src/plugins/task/affinity/affinity.c b/src/plugins/task/affinity/affinity.c
index e330f5abc7b0bb15f1dd63d9b5d3c4c8f5539b7f..9d810fd35f9f175b7c103f386655decb73fde3a3 100644
--- a/src/plugins/task/affinity/affinity.c
+++ b/src/plugins/task/affinity/affinity.c
@@ -3,32 +3,32 @@
* $Id: affinity.c,v 1.2 2005/11/04 02:46:51 palermo Exp $
*****************************************************************************
* Copyright (C) 2005-2006 Hewlett-Packard Development Company, L.P.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -143,7 +143,7 @@ int get_cpuset(cpu_set_t *mask, slurmd_job_t *job)
char buftype[1024];
slurm_sprint_cpu_bind_type(buftype, job->cpu_bind_type);
- debug3("get_cpuset (%s[%d]) %s\n", buftype, job->cpu_bind_type,
+ debug3("get_cpuset (%s[%d]) %s\n", buftype, job->cpu_bind_type,
job->cpu_bind);
CPU_ZERO(mask);
@@ -156,7 +156,7 @@ int get_cpuset(cpu_set_t *mask, slurmd_job_t *job)
CPU_SET(job->envtp->localid % (job->cpus*threads), mask);
return true;
}
-
+
if (job->cpu_bind_type & CPU_BIND_LDRANK) {
/* if HAVE_NUMA then bind this task ID to it's corresponding
* locality domain ID. Otherwise, bind this task ID to it's
@@ -227,7 +227,7 @@ int get_cpuset(cpu_set_t *mask, slurmd_job_t *job)
CPU_SET(mycpu, mask);
return true;
}
-
+
if (job->cpu_bind_type & CPU_BIND_LDMASK) {
/* if HAVE_NUMA bind this task to the locality domains
* identified in mstr. Otherwise bind this task to the
@@ -258,7 +258,7 @@ int get_cpuset(cpu_set_t *mask, slurmd_job_t *job)
}
return true;
}
-
+
if (job->cpu_bind_type & CPU_BIND_LDMAP) {
/* if HAVE_NUMA bind this task to the given locality
* domain. Otherwise bind this task to the given
diff --git a/src/plugins/task/affinity/affinity.h b/src/plugins/task/affinity/affinity.h
index 29081489ed2aaefaaf1545ba77898e5570c29a1c..8e96683bcae2f2aa37e95d8eec29b889908885e1 100644
--- a/src/plugins/task/affinity/affinity.h
+++ b/src/plugins/task/affinity/affinity.h
@@ -3,32 +3,32 @@
* $Id: affinity.h,v 1.2 2005/11/04 02:46:51 palermo Exp $
*****************************************************************************
* Copyright (C) 2005 Hewlett-Packard Development Company, L.P.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -110,7 +110,7 @@ int slurm_memset_available(void);
#endif
int slurm_build_cpuset(char *base, char *path, uid_t uid, gid_t gid);
int slurm_get_cpuset(char *path, pid_t pid, size_t size, cpu_set_t *mask);
-int slurm_set_cpuset(char *base, char *path, pid_t pid, size_t size,
+int slurm_set_cpuset(char *base, char *path, pid_t pid, size_t size,
const cpu_set_t *mask);
/*** from numa.c ***/
diff --git a/src/plugins/task/affinity/cpuset.c b/src/plugins/task/affinity/cpuset.c
index 4c1e67466316bc35a44d595b5c7de0ffb573e488..5ff993d9dc1fb84f2a9de683ea5bf9597d96809d 100644
--- a/src/plugins/task/affinity/cpuset.c
+++ b/src/plugins/task/affinity/cpuset.c
@@ -3,35 +3,35 @@
*****************************************************************************
* Copyright (C) 2007 Bull
* Copyright (C) 2007 The Regents of the University of California.
- * Written by Don Albert <Don.Albert@Bull.com> and
+ * Written by Don Albert <Don.Albert@Bull.com> and
* Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -142,7 +142,7 @@ int slurm_build_cpuset(char *base, char *path, uid_t uid, gid_t gid)
return 0;
}
-int slurm_set_cpuset(char *base, char *path, pid_t pid, size_t size,
+int slurm_set_cpuset(char *base, char *path, pid_t pid, size_t size,
const cpu_set_t *mask)
{
int fd, rc;
@@ -169,7 +169,7 @@ int slurm_set_cpuset(char *base, char *path, pid_t pid, size_t size,
return -1;
}
- /* copy "mems" contents from parent directory, if it exists.
+ /* copy "mems" contents from parent directory, if it exists.
* "mems" must be set before any tasks can be added. */
snprintf(file_path, sizeof(file_path), "%s/mems", base);
fd = open(file_path, O_RDONLY);
diff --git a/src/plugins/task/affinity/dist_tasks.c b/src/plugins/task/affinity/dist_tasks.c
index 04ece518c5f837b4eb5c2007a75fd1935173ef66..9c1afb38d3d4fa03a7b735ce10c6186bf3c9d7aa 100644
--- a/src/plugins/task/affinity/dist_tasks.c
+++ b/src/plugins/task/affinity/dist_tasks.c
@@ -3,16 +3,16 @@
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Written by Susanne M. Balle, <susanne.balle@hp.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
@@ -28,7 +28,7 @@
* 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.
@@ -49,7 +49,7 @@
#endif
static char *_alloc_mask(launch_tasks_request_msg_t *req,
- int *whole_node_cnt, int *whole_socket_cnt,
+ int *whole_node_cnt, int *whole_socket_cnt,
int *whole_core_cnt, int *whole_thread_cnt,
int *part_socket_cnt, int *part_core_cnt);
static bitstr_t *_get_avail_map(launch_tasks_request_msg_t *req,
@@ -62,7 +62,7 @@ static int _task_layout_lllp_block(launch_tasks_request_msg_t *req,
uint32_t node_id, bitstr_t ***masks_p);
static int _task_layout_lllp_cyclic(launch_tasks_request_msg_t *req,
uint32_t node_id, bitstr_t ***masks_p);
-static int _task_layout_lllp_multi(launch_tasks_request_msg_t *req,
+static int _task_layout_lllp_multi(launch_tasks_request_msg_t *req,
uint32_t node_id, bitstr_t ***masks_p);
static void _lllp_map_abstract_masks(const uint32_t maxtasks,
@@ -100,7 +100,7 @@ static uint16_t _block_map(uint16_t index, uint16_t *map)
return(index);
}
-static void _task_layout_display_masks(launch_tasks_request_msg_t *req,
+static void _task_layout_display_masks(launch_tasks_request_msg_t *req,
const uint32_t *gtid,
const uint32_t maxtasks,
bitstr_t **masks)
@@ -119,7 +119,7 @@ static void _lllp_free_masks(const uint32_t maxtasks, bitstr_t **masks)
{
int i;
bitstr_t *bitmask;
- for (i = 0; i < maxtasks; i++) {
+ for (i = 0; i < maxtasks; i++) {
bitmask = masks[i];
if (bitmask) {
bit_free(bitmask);
@@ -161,8 +161,8 @@ static void _match_masks_to_ldom(const uint32_t maxtasks, bitstr_t **masks)
}
#endif
-/*
- * batch_bind - Set the batch request message so as to bind the shell to the
+/*
+ * batch_bind - Set the batch request message so as to bind the shell to the
* proper resources
*/
void batch_bind(batch_job_launch_msg_t *req)
@@ -200,7 +200,7 @@ void batch_bind(batch_job_launch_msg_t *req)
/* Transfer core_bitmap data to local req_map.
* The MOD function handles the case where fewer processes
- * physically exist than are configured (slurmd is out of
+ * physically exist than are configured (slurmd is out of
* sync with the slurmctld daemon). */
for (p = 0; p < (sockets * cores); p++) {
if (bit_test(arg.core_bitmap, p))
@@ -247,7 +247,7 @@ void batch_bind(batch_job_launch_msg_t *req)
info("task/affinity: job %u CPU final HW mask for node: %s",
req->job_id, req->cpu_bind);
} else {
- error("task/affinity: job %u allocated no CPUs",
+ error("task/affinity: job %u allocated no CPUs",
req->job_id);
}
bit_free(hw_map);
@@ -255,10 +255,10 @@ void batch_bind(batch_job_launch_msg_t *req)
slurm_cred_free_args(&arg);
}
-/*
+/*
* lllp_distribution
*
- * Note: lllp stands for Lowest Level of Logical Processors.
+ * Note: lllp stands for Lowest Level of Logical Processors.
*
* When automatic binding is enabled:
* - no binding flags set >= CPU_BIND_NONE, and
@@ -284,24 +284,24 @@ void lllp_distribution(launch_tasks_request_msg_t *req, uint32_t node_id)
CPU_BIND_TO_SOCKETS | CPU_BIND_TO_LDOMS;
static uint16_t bind_mode = CPU_BIND_NONE | CPU_BIND_MASK |
CPU_BIND_RANK | CPU_BIND_MAP |
- CPU_BIND_LDMASK | CPU_BIND_LDRANK |
+ CPU_BIND_LDMASK | CPU_BIND_LDRANK |
CPU_BIND_LDMAP;
if (req->cpu_bind_type & bind_mode) {
/* Explicit step binding specified by user */
char *avail_mask = _alloc_mask(req,
- &whole_nodes, &whole_sockets,
+ &whole_nodes, &whole_sockets,
&whole_cores, &whole_threads,
&part_sockets, &part_cores);
if ((whole_nodes == 0) && avail_mask) {
- /* Step does NOT have access to whole node,
+ /* Step does NOT have access to whole node,
* bind to full mask of available processors */
xfree(req->cpu_bind);
req->cpu_bind = avail_mask;
req->cpu_bind_type &= (~bind_mode);
req->cpu_bind_type |= CPU_BIND_MASK;
} else {
- /* Step does have access to whole node,
+ /* Step does have access to whole node,
* bind to whatever step wants */
xfree(avail_mask);
}
@@ -316,7 +316,7 @@ void lllp_distribution(launch_tasks_request_msg_t *req, uint32_t node_id)
* pick something reasonable */
int max_tasks = req->tasks_to_launch[(int)node_id];
char *avail_mask = _alloc_mask(req,
- &whole_nodes, &whole_sockets,
+ &whole_nodes, &whole_sockets,
&whole_cores, &whole_threads,
&part_sockets, &part_cores);
debug("binding tasks:%d to "
@@ -367,7 +367,7 @@ void lllp_distribution(launch_tasks_request_msg_t *req, uint32_t node_id)
case SLURM_DIST_BLOCK:
case SLURM_DIST_CYCLIC_CYCLIC:
case SLURM_DIST_BLOCK_CYCLIC:
- rc = _task_layout_lllp_cyclic(req, node_id, &masks);
+ rc = _task_layout_lllp_cyclic(req, node_id, &masks);
break;
default:
if (req->cpus_per_task > 1)
@@ -384,10 +384,10 @@ void lllp_distribution(launch_tasks_request_msg_t *req, uint32_t node_id)
*/
if (rc == SLURM_SUCCESS) {
- _task_layout_display_masks(req, gtid, maxtasks, masks);
+ _task_layout_display_masks(req, gtid, maxtasks, masks);
/* translate abstract masks to actual hardware layout */
_lllp_map_abstract_masks(maxtasks, masks);
- _task_layout_display_masks(req, gtid, maxtasks, masks);
+ _task_layout_display_masks(req, gtid, maxtasks, masks);
#ifdef HAVE_NUMA
if (req->cpu_bind_type & CPU_BIND_TO_LDOMS) {
_match_masks_to_ldom(maxtasks, masks);
@@ -439,7 +439,7 @@ static int _get_local_node_info(slurm_cred_arg_t *arg, int job_node_id,
arg->cores_per_socket[index];
cur_node_id++;
}
-
+
} while (cur_node_id < job_node_id);
*sockets = arg->sockets_per_node[index];
@@ -447,15 +447,15 @@ static int _get_local_node_info(slurm_cred_arg_t *arg, int job_node_id,
return bit_start;
}
-/* Determine which CPUs a job step can use.
- * OUT whole_<entity>_count - returns count of whole <entities> in this
+/* Determine which CPUs a job step can use.
+ * OUT whole_<entity>_count - returns count of whole <entities> in this
* allocation for this node
- * OUT part__<entity>_count - returns count of partial <entities> in this
+ * OUT part__<entity>_count - returns count of partial <entities> in this
* allocation for this node
* RET - a string representation of the available mask or NULL on error
* NOTE: Caller must xfree() the return value. */
static char *_alloc_mask(launch_tasks_request_msg_t *req,
- int *whole_node_cnt, int *whole_socket_cnt,
+ int *whole_node_cnt, int *whole_socket_cnt,
int *whole_core_cnt, int *whole_thread_cnt,
int *part_socket_cnt, int *part_core_cnt)
{
@@ -586,7 +586,7 @@ static bitstr_t *_get_avail_map(launch_tasks_request_msg_t *req,
}
/* Transfer core_bitmap data to local req_map.
* The MOD function handles the case where fewer processes
- * physically exist than are configured (slurmd is out of
+ * physically exist than are configured (slurmd is out of
* sync with the slurmctld daemon). */
for (p = 0; p < (sockets * cores); p++) {
if (bit_test(arg.core_bitmap, start+p))
@@ -609,7 +609,7 @@ static bitstr_t *_get_avail_map(launch_tasks_request_msg_t *req,
bit_set(hw_map, bit);
}
}
-
+
str = (char *)bit_fmt_hexmask(hw_map);
debug3("task/affinity: job %u.%u CPU final mask for local node: %s",
req->job_id, req->job_step_id, str);
@@ -669,15 +669,15 @@ static void _expand_masks(uint16_t cpu_bind_type, const uint32_t maxtasks,
}
}
-/*
+/*
* _task_layout_lllp_multi
*
- * A variant of _task_layout_lllp_cyclic for use with allocations having
- * more than one CPU per task, put the tasks as close as possible (fill
+ * A variant of _task_layout_lllp_cyclic for use with allocations having
+ * more than one CPU per task, put the tasks as close as possible (fill
* core rather than going next socket for the extra task)
*
*/
-static int _task_layout_lllp_multi(launch_tasks_request_msg_t *req,
+static int _task_layout_lllp_multi(launch_tasks_request_msg_t *req,
uint32_t node_id, bitstr_t ***masks_p)
{
int last_taskcount = -1, taskcount = 0;
@@ -686,16 +686,16 @@ static int _task_layout_lllp_multi(launch_tasks_request_msg_t *req,
int max_cpus = max_tasks * req->cpus_per_task;
bitstr_t *avail_map;
bitstr_t **masks = NULL;
-
+
info ("_task_layout_lllp_multi ");
avail_map = _get_avail_map(req, &hw_sockets, &hw_cores, &hw_threads);
if (!avail_map)
return SLURM_ERROR;
-
+
*masks_p = xmalloc(max_tasks * sizeof(bitstr_t*));
masks = *masks_p;
-
+
size = bit_set_count(avail_map);
if (size < max_tasks) {
error("task/affinity: only %d bits in avail_map for %d tasks!",
@@ -710,13 +710,13 @@ static int _task_layout_lllp_multi(launch_tasks_request_msg_t *req,
req->cpus_per_task, i);
req->cpus_per_task = i;
}
-
+
size = bit_size(avail_map);
i = 0;
while (taskcount < max_tasks) {
if (taskcount == last_taskcount)
fatal("_task_layout_lllp_multi failure");
- last_taskcount = taskcount;
+ last_taskcount = taskcount;
for (s = 0; s < hw_sockets; s++) {
for (c = 0; c < hw_cores; c++) {
for (t = 0; t < hw_threads; t++) {
@@ -742,7 +742,7 @@ static int _task_layout_lllp_multi(launch_tasks_request_msg_t *req,
}
}
bit_free(avail_map);
-
+
/* last step: expand the masks to bind each task
* to the requested resource */
_expand_masks(req->cpu_bind_type, max_tasks, masks,
@@ -751,7 +751,7 @@ static int _task_layout_lllp_multi(launch_tasks_request_msg_t *req,
return SLURM_SUCCESS;
}
-/*
+/*
* _task_layout_lllp_cyclic
*
* task_layout_lllp_cyclic creates a cyclic distribution at the
@@ -759,21 +759,21 @@ static int _task_layout_lllp_multi(launch_tasks_request_msg_t *req,
* thread depending on the system architecture. The Cyclic algorithm
* is the same as the the Cyclic distribution performed in srun.
*
- * Distribution at the lllp:
- * -m hostfile|plane|block|cyclic:block|cyclic
- *
+ * Distribution at the lllp:
+ * -m hostfile|plane|block|cyclic:block|cyclic
+ *
* The first distribution "hostfile|plane|block|cyclic" is computed
* in srun. The second distribution "plane|block|cyclic" is computed
* locally by each slurmd.
- *
+ *
* The input to the lllp distribution algorithms is the gids (tasks
* ids) generated for the local node.
- *
+ *
* The output is a mapping of the gids onto logical processors
* (thread/core/socket) with is expressed cpu_bind masks.
*
*/
-static int _task_layout_lllp_cyclic(launch_tasks_request_msg_t *req,
+static int _task_layout_lllp_cyclic(launch_tasks_request_msg_t *req,
uint32_t node_id, bitstr_t ***masks_p)
{
int last_taskcount = -1, taskcount = 0;
@@ -782,16 +782,16 @@ static int _task_layout_lllp_cyclic(launch_tasks_request_msg_t *req,
int max_cpus = max_tasks * req->cpus_per_task;
bitstr_t *avail_map;
bitstr_t **masks = NULL;
-
+
info ("_task_layout_lllp_cyclic ");
avail_map = _get_avail_map(req, &hw_sockets, &hw_cores, &hw_threads);
if (!avail_map)
return SLURM_ERROR;
-
+
*masks_p = xmalloc(max_tasks * sizeof(bitstr_t*));
masks = *masks_p;
-
+
size = bit_set_count(avail_map);
if (size < max_tasks) {
error("task/affinity: only %d bits in avail_map for %d tasks!",
@@ -812,7 +812,7 @@ static int _task_layout_lllp_cyclic(launch_tasks_request_msg_t *req,
while (taskcount < max_tasks) {
if (taskcount == last_taskcount)
fatal("_task_layout_lllp_cyclic failure");
- last_taskcount = taskcount;
+ last_taskcount = taskcount;
for (t = 0; t < hw_threads; t++) {
for (c = 0; c < hw_cores; c++) {
for (s = 0; s < hw_sockets; s++) {
@@ -838,7 +838,7 @@ static int _task_layout_lllp_cyclic(launch_tasks_request_msg_t *req,
}
}
bit_free(avail_map);
-
+
/* last step: expand the masks to bind each task
* to the requested resource */
_expand_masks(req->cpu_bind_type, max_tasks, masks,
@@ -847,7 +847,7 @@ static int _task_layout_lllp_cyclic(launch_tasks_request_msg_t *req,
return SLURM_SUCCESS;
}
-/*
+/*
* _task_layout_lllp_block
*
* task_layout_lllp_block will create a block distribution at the
@@ -855,21 +855,21 @@ static int _task_layout_lllp_cyclic(launch_tasks_request_msg_t *req,
* thread depending on the system architecture. The Block algorithm
* is the same as the the Block distribution performed in srun.
*
- * Distribution at the lllp:
- * -m hostfile|plane|block|cyclic:block|cyclic
- *
+ * Distribution at the lllp:
+ * -m hostfile|plane|block|cyclic:block|cyclic
+ *
* The first distribution "hostfile|plane|block|cyclic" is computed
* in srun. The second distribution "plane|block|cyclic" is computed
* locally by each slurmd.
- *
+ *
* The input to the lllp distribution algorithms is the gids (tasks
* ids) generated for the local node.
- *
+ *
* The output is a mapping of the gids onto logical processors
* (thread/core/socket) with is expressed cpu_bind masks.
*
*/
-static int _task_layout_lllp_block(launch_tasks_request_msg_t *req,
+static int _task_layout_lllp_block(launch_tasks_request_msg_t *req,
uint32_t node_id, bitstr_t ***masks_p)
{
int c, i, j, t, size, last_taskcount = -1, taskcount = 0;
@@ -912,7 +912,7 @@ static int _task_layout_lllp_block(launch_tasks_request_msg_t *req,
bit_free(avail_map);
return SLURM_ERROR;
}
-
+
/* block distribution with oversubsciption */
c = 0;
while(taskcount < max_tasks) {
@@ -1032,8 +1032,8 @@ static void _lllp_map_abstract_masks(const uint32_t maxtasks, bitstr_t **masks)
{
int i;
debug3("_lllp_map_abstract_masks");
-
- for (i = 0; i < maxtasks; i++) {
+
+ for (i = 0; i < maxtasks; i++) {
bitstr_t *bitmask = masks[i];
if (bitmask) {
bitstr_t *newmask = _lllp_map_abstract_mask(bitmask);
@@ -1043,7 +1043,7 @@ static void _lllp_map_abstract_masks(const uint32_t maxtasks, bitstr_t **masks)
}
}
-/*
+/*
* _lllp_generate_cpu_bind
*
* Generate the cpu_bind type and string given an array of bitstr_t masks
@@ -1061,7 +1061,7 @@ static void _lllp_generate_cpu_bind(launch_tasks_request_msg_t *req,
char *masks_str = NULL;
char buf_type[100];
- for (i = 0; i < maxtasks; i++) {
+ for (i = 0; i < maxtasks; i++) {
bitmask = masks[i];
if (bitmask) {
num_bits = bit_size(bitmask);
@@ -1100,7 +1100,7 @@ static void _lllp_generate_cpu_bind(launch_tasks_request_msg_t *req,
}
if (masks_str[0] != '\0') {
req->cpu_bind = masks_str;
- req->cpu_bind_type |= CPU_BIND_MASK;
+ req->cpu_bind_type |= CPU_BIND_MASK;
} else {
req->cpu_bind = NULL;
req->cpu_bind_type &= ~CPU_BIND_VERBOSE;
diff --git a/src/plugins/task/affinity/dist_tasks.h b/src/plugins/task/affinity/dist_tasks.h
index b009224c47aefbf6f11b27831dac6a28e3f0ab9f..dc08e8af06bdb428b9f3321068b0a33f549682ff 100644
--- a/src/plugins/task/affinity/dist_tasks.h
+++ b/src/plugins/task/affinity/dist_tasks.h
@@ -2,16 +2,16 @@
* Copyright (C) 2006 Hewlett-Packard Development Company, L.P.
* Written by Susanne M. Balle, <susanne.balle@hp.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
@@ -27,7 +27,7 @@
* 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.
diff --git a/src/plugins/task/affinity/numa.c b/src/plugins/task/affinity/numa.c
index 3ba7265c09ea79a059355932d4d0bef9b7cad83c..814c60117f4a95bc6e0886bc601187cae9afa41c 100644
--- a/src/plugins/task/affinity/numa.c
+++ b/src/plugins/task/affinity/numa.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -269,15 +269,15 @@ extern uint16_t slurm_get_numa_node(uint16_t cpuid)
uint16_t maxcpus = 0, nnid = 0;
int size, retry, max_node;
unsigned long *cpu_mask;
-
+
maxcpus = conf->sockets * conf->cores * conf->threads;
if (cpuid >= maxcpus)
return 0;
-
+
if (numa_array) {
return numa_array[cpuid];
}
-
+
/* need to load the numa_array */
max_node = numa_max_node();
diff --git a/src/plugins/task/affinity/schedutils.c b/src/plugins/task/affinity/schedutils.c
index 18bc2b32509560c2f861afb5cb3c2366320e1704..ebdf1c58f379d5f125279b826fb89621217f0f01 100644
--- a/src/plugins/task/affinity/schedutils.c
+++ b/src/plugins/task/affinity/schedutils.c
@@ -8,28 +8,28 @@
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -71,7 +71,7 @@ inline int val_to_char(int v)
return '0' + v;
else if (v >= 10 && v < 16)
return ('a' - 10) + v;
- else
+ else
return -1;
}
diff --git a/src/plugins/task/affinity/task_affinity.c b/src/plugins/task/affinity/task_affinity.c
index 70753f13ee9eea981c8efb2a314066fdfb26cf95..8a914d98a30ed21bf2318cc8b3a378be9f789ca7 100644
--- a/src/plugins/task/affinity/task_affinity.c
+++ b/src/plugins/task/affinity/task_affinity.c
@@ -8,32 +8,32 @@
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -70,7 +70,7 @@
* <application>/<method>
*
* where <application> is a description of the intended application of
- * the plugin (e.g., "task" for task control) and <method> is a description
+ * the plugin (e.g., "task" for task control) and <method> is a description
* of how this plugin satisfies that application. SLURM will only load
* a task plugin if the plugin_type string has a prefix of "task/".
*
@@ -95,7 +95,7 @@ extern int init (void)
}
/*
- * fini() is called when the plugin is removed. Clear any allocated
+ * fini() is called when the plugin is removed. Clear any allocated
* storage here.
*/
extern int fini (void)
@@ -155,7 +155,7 @@ static void _update_bind_type(launch_tasks_request_msg_t *req)
if (set_bind) {
char bind_str[128];
slurm_sprint_cpu_bind_type(bind_str, req->cpu_bind_type);
- info("task affinity : enforcing '%s' cpu bind method",
+ info("task affinity : enforcing '%s' cpu bind method",
bind_str);
}
}
@@ -163,7 +163,7 @@ static void _update_bind_type(launch_tasks_request_msg_t *req)
/*
* task_slurmd_batch_request()
*/
-extern int task_slurmd_batch_request (uint32_t job_id,
+extern int task_slurmd_batch_request (uint32_t job_id,
batch_job_launch_msg_t *req)
{
info("task_slurmd_batch_request: %u", job_id);
@@ -174,16 +174,16 @@ extern int task_slurmd_batch_request (uint32_t job_id,
/*
* task_slurmd_launch_request()
*/
-extern int task_slurmd_launch_request (uint32_t job_id,
- launch_tasks_request_msg_t *req,
+extern int task_slurmd_launch_request (uint32_t job_id,
+ launch_tasks_request_msg_t *req,
uint32_t node_id)
{
char buf_type[100];
debug("task_slurmd_launch_request: %u %u", job_id, node_id);
- if (((conf->sockets >= 1)
- && ((conf->cores > 1) || (conf->threads > 1)))
+ if (((conf->sockets >= 1)
+ && ((conf->cores > 1) || (conf->threads > 1)))
|| (!(req->cpu_bind_type & CPU_BIND_NONE))) {
_update_bind_type(req);
@@ -192,19 +192,19 @@ extern int task_slurmd_launch_request (uint32_t job_id,
"method is '%s' (%s)", buf_type, req->cpu_bind);
lllp_distribution(req, node_id);
-
+
slurm_sprint_cpu_bind_type(buf_type, req->cpu_bind_type);
debug("task affinity : after lllp distribution cpu bind "
"method is '%s' (%s)", buf_type, req->cpu_bind);
}
-
+
return SLURM_SUCCESS;
}
/*
* task_slurmd_reserve_resources()
*/
-extern int task_slurmd_reserve_resources (uint32_t job_id,
+extern int task_slurmd_reserve_resources (uint32_t job_id,
launch_tasks_request_msg_t *req,
uint32_t node_id)
{
@@ -282,7 +282,7 @@ extern int task_slurmd_release_resources (uint32_t job_id)
}
/*
- * task_pre_setuid() is called before setting the UID for the
+ * task_pre_setuid() is called before setting the UID for the
* user to launch his jobs. Use this to create the CPUSET directory
* and set the owner appropriately.
*/
@@ -311,7 +311,7 @@ extern int task_pre_launch (slurmd_job_t *job)
char base[PATH_MAX], path[PATH_MAX];
int rc = SLURM_SUCCESS;
- debug("affinity task_pre_launch:%u.%u, task:%u bind:%u",
+ debug("affinity task_pre_launch:%u.%u, task:%u bind:%u",
job->jobid, job->stepid, job->envtp->procid,
job->cpu_bind_type);
@@ -332,7 +332,7 @@ extern int task_pre_launch (slurmd_job_t *job)
info("Using sched_affinity for tasks");
/*** CPU binding support ***/
- if (job->cpu_bind_type) {
+ if (job->cpu_bind_type) {
cpu_set_t new_mask, cur_mask;
pid_t mypid = job->envtp->task_pid;
@@ -342,21 +342,21 @@ extern int task_pre_launch (slurmd_job_t *job)
(!(job->cpu_bind_type & CPU_BIND_NONE))) {
if (conf->task_plugin_param & CPU_BIND_CPUSETS) {
rc = slurm_set_cpuset(base, path, mypid,
- sizeof(new_mask),
+ sizeof(new_mask),
&new_mask);
slurm_get_cpuset(path, mypid,
- sizeof(cur_mask),
+ sizeof(cur_mask),
&cur_mask);
} else {
rc = slurm_setaffinity(mypid,
- sizeof(new_mask),
+ sizeof(new_mask),
&new_mask);
slurm_getaffinity(mypid,
- sizeof(cur_mask),
+ sizeof(cur_mask),
&cur_mask);
}
}
- slurm_chkaffinity(rc ? &cur_mask : &new_mask,
+ slurm_chkaffinity(rc ? &cur_mask : &new_mask,
job, rc);
} else if (job->mem_bind_type &&
(conf->task_plugin_param & CPU_BIND_CPUSETS)) {
@@ -365,13 +365,13 @@ extern int task_pre_launch (slurmd_job_t *job)
/* Establish cpuset just for the memory binding */
slurm_getaffinity(mypid, sizeof(cur_mask), &cur_mask);
- rc = slurm_set_cpuset(base, path,
- (pid_t) job->envtp->task_pid,
+ rc = slurm_set_cpuset(base, path,
+ (pid_t) job->envtp->task_pid,
sizeof(cur_mask), &cur_mask);
}
#ifdef HAVE_NUMA
- if ((conf->task_plugin_param & CPU_BIND_CPUSETS) &&
+ if ((conf->task_plugin_param & CPU_BIND_CPUSETS) &&
(slurm_memset_available() >= 0)) {
nodemask_t new_mask, cur_mask;
diff --git a/src/plugins/task/none/Makefile.am b/src/plugins/task/none/Makefile.am
index 186541c6fbfd877095679aece53a952421970a5a..1c43397fd85845b03acc4490b4817fe0648806c6 100644
--- a/src/plugins/task/none/Makefile.am
+++ b/src/plugins/task/none/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/task/none/Makefile.in b/src/plugins/task/none/Makefile.in
index 09594fd605e38a40c151c2fd2fd36e2d57102fa6..778cb2883377ceeb374531c16cedec91607813e6 100644
--- a/src/plugins/task/none/Makefile.in
+++ b/src/plugins/task/none/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = task_none.la
diff --git a/src/plugins/task/none/task_none.c b/src/plugins/task/none/task_none.c
index a06a7e8b3260d420abb2a1e4dcee13b0ab948928..5ab36e3a12c8e4f479f8a7d3e95bd7c51be28174 100644
--- a/src/plugins/task/none/task_none.c
+++ b/src/plugins/task/none/task_none.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * task_none.c - Library for task pre-launch and post_termination functions
+ * task_none.c - Library for task pre-launch and post_termination functions
* with no actions
*****************************************************************************
* Copyright (C) 2005-2007 The Regents of the University of California.
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -66,7 +66,7 @@
* <application>/<method>
*
* where <application> is a description of the intended application of
- * the plugin (e.g., "task" for task control) and <method> is a description
+ * the plugin (e.g., "task" for task control) and <method> is a description
* of how this plugin satisfies that application. SLURM will only load
* a task plugin if the plugin_type string has a prefix of "task/".
*
@@ -91,7 +91,7 @@ extern int init (void)
}
/*
- * fini() is called when the plugin is removed. Clear any allocated
+ * fini() is called when the plugin is removed. Clear any allocated
* storage here.
*/
extern int fini (void)
@@ -102,7 +102,7 @@ extern int fini (void)
/*
* task_slurmd_batch_request()
*/
-extern int task_slurmd_batch_request (uint32_t job_id,
+extern int task_slurmd_batch_request (uint32_t job_id,
batch_job_launch_msg_t *req)
{
debug("task_slurmd_batch_request: %u", job_id);
@@ -112,8 +112,8 @@ extern int task_slurmd_batch_request (uint32_t job_id,
/*
* task_slurmd_launch_request()
*/
-extern int task_slurmd_launch_request (uint32_t job_id,
- launch_tasks_request_msg_t *req,
+extern int task_slurmd_launch_request (uint32_t job_id,
+ launch_tasks_request_msg_t *req,
uint32_t node_id)
{
debug("task_slurmd_launch_request: %u %u", job_id, node_id);
@@ -123,7 +123,7 @@ extern int task_slurmd_launch_request (uint32_t job_id,
/*
* task_slurmd_reserve_resources()
*/
-extern int task_slurmd_reserve_resources (uint32_t job_id,
+extern int task_slurmd_reserve_resources (uint32_t job_id,
launch_tasks_request_msg_t *req,
uint32_t node_id)
{
@@ -175,7 +175,7 @@ extern int task_pre_setuid (slurmd_job_t *job)
*/
extern int task_pre_launch (slurmd_job_t *job)
{
- debug("task_pre_launch: %u.%u, task %d",
+ debug("task_pre_launch: %u.%u, task %d",
job->jobid, job->stepid, job->envtp->procid);
return SLURM_SUCCESS;
}
diff --git a/src/plugins/topology/3d_torus/Makefile.am b/src/plugins/topology/3d_torus/Makefile.am
index 4763af1d85d0b84d4ef19b4b3f73cac4264bdecd..7c200a27b3f3af790b9a32f26e803d13b7b2b200 100644
--- a/src/plugins/topology/3d_torus/Makefile.am
+++ b/src/plugins/topology/3d_torus/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/topology/3d_torus/Makefile.in b/src/plugins/topology/3d_torus/Makefile.in
index 62d47a502fc690b857ea0dc244be871f4339b4ad..628cb955a9e566c0bdc1bcf28e3cda2fd68ae6d5 100644
--- a/src/plugins/topology/3d_torus/Makefile.in
+++ b/src/plugins/topology/3d_torus/Makefile.in
@@ -312,7 +312,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = topology_3d_torus.la
diff --git a/src/plugins/topology/3d_torus/hilbert.c b/src/plugins/topology/3d_torus/hilbert.c
index 3b09f7982432f84b24fbc288cb55c5fc1712e929..6a26e722f3d4289f95198625f04dc59e6df8295b 100644
--- a/src/plugins/topology/3d_torus/hilbert.c
+++ b/src/plugins/topology/3d_torus/hilbert.c
@@ -1,8 +1,8 @@
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Filename: hilbert.c
-//
+//
// Purpose: Hilbert and Linked-list utility procedures for BayeSys3.
-//
+//
// History: TreeSys.c 17 Apr 1996 - 31 Dec 2002
// Peano.c 10 Apr 2001 - 11 Jan 2003
// merged 1 Feb 2003
@@ -57,7 +57,7 @@ int n) // I dimension
else{ t = (X[0] ^ X[i]) & P; X[0] ^= t; X[i] ^= t; } // exchange
if( X[0] & Q ) X[0] ^= P; // invert
}
-}
+}
extern void AxestoTranspose(
coord_t* X, // I O position [n]
int b, // I # bits
diff --git a/src/plugins/topology/3d_torus/hilbert.h b/src/plugins/topology/3d_torus/hilbert.h
index 4fec84fd8d118467e8cfe30800f847d16e6dc5b4..fe7eeda63685d3085ea73e64465e86985730af67 100644
--- a/src/plugins/topology/3d_torus/hilbert.h
+++ b/src/plugins/topology/3d_torus/hilbert.h
@@ -1,8 +1,8 @@
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Filename: hilbert.h
-//
+//
// Purpose: Hilbert and Linked-list utility procedures for BayeSys3.
-//
+//
// History: TreeSys.c 17 Apr 1996 - 31 Dec 2002
// Peano.c 10 Apr 2001 - 11 Jan 2003
// merged 1 Feb 2003
diff --git a/src/plugins/topology/3d_torus/hilbert_slurm.c b/src/plugins/topology/3d_torus/hilbert_slurm.c
index 8966caf8a3f4ebf1f70498e5c852ccaa1861286f..54f8a11cd505531d6f9702ca6a534950315472ca 100644
--- a/src/plugins/topology/3d_torus/hilbert_slurm.c
+++ b/src/plugins/topology/3d_torus/hilbert_slurm.c
@@ -1,38 +1,38 @@
/*****************************************************************************\
* hilbert_slurm.c - Reorder the node records to place them into order
- * on a Hilbert curve so that the resource allocation problem in
+ * on a Hilbert curve so that the resource allocation problem in
* N-dimensions can be reduced to a 1-dimension problem
*****************************************************************************
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -78,7 +78,7 @@ extern void nodes_to_hilbert_curve(void)
/* Get the coordinates for each node based upon its numeric suffix */
coords = xmalloc(sizeof(int) * node_record_count * dims);
- for (i=0, coord_inx=0, node_ptr=node_record_table_ptr;
+ for (i=0, coord_inx=0, node_ptr=node_record_table_ptr;
i<node_record_count; i++, node_ptr++) {
j = strlen(node_ptr->name);
if (j < (dims + offset)) {
@@ -102,7 +102,7 @@ extern void nodes_to_hilbert_curve(void)
}
/* Generate each node's Hilbert integer */
- for (i=0, coord_inx=0, node_ptr=node_record_table_ptr;
+ for (i=0, coord_inx=0, node_ptr=node_record_table_ptr;
i<node_record_count; i++, node_ptr++) {
for (j=0; j<dims; j++)
hilbert[j] = coords[coord_inx++];
@@ -110,20 +110,20 @@ extern void nodes_to_hilbert_curve(void)
/* A variation on the below calculation would be required here
* for other dimension counts */
- node_ptr->hilbert_integer =
- ((hilbert[0]>>4 & 1) << 14) +
+ node_ptr->hilbert_integer =
+ ((hilbert[0]>>4 & 1) << 14) +
((hilbert[1]>>4 & 1) << 13) +
- ((hilbert[2]>>4 & 1) << 12) +
+ ((hilbert[2]>>4 & 1) << 12) +
((hilbert[0]>>3 & 1) << 11) +
- ((hilbert[1]>>3 & 1) << 10) +
+ ((hilbert[1]>>3 & 1) << 10) +
((hilbert[2]>>3 & 1) << 9) +
- ((hilbert[0]>>2 & 1) << 8) +
+ ((hilbert[0]>>2 & 1) << 8) +
((hilbert[1]>>2 & 1) << 7) +
- ((hilbert[2]>>2 & 1) << 6) +
+ ((hilbert[2]>>2 & 1) << 6) +
((hilbert[0]>>1 & 1) << 5) +
- ((hilbert[1]>>1 & 1) << 4) +
+ ((hilbert[1]>>1 & 1) << 4) +
((hilbert[2]>>1 & 1) << 3) +
- ((hilbert[0]>>0 & 1) << 2) +
+ ((hilbert[0]>>0 & 1) << 2) +
((hilbert[1]>>0 & 1) << 1) +
((hilbert[2]>>0 & 1) << 0);
}
@@ -134,7 +134,7 @@ extern void nodes_to_hilbert_curve(void)
min_val = node_record_table_ptr[i].hilbert_integer;
min_inx = i;
for (j=(i+1); j<node_record_count; j++) {
- if (node_record_table_ptr[j].hilbert_integer <
+ if (node_record_table_ptr[j].hilbert_integer <
min_val) {
min_val = node_record_table_ptr[j].
hilbert_integer;
@@ -164,7 +164,7 @@ extern void nodes_to_hilbert_curve(void)
#if _DEBUG
/* Log the results */
- for (i=0, node_ptr=node_record_table_ptr; i<node_record_count;
+ for (i=0, node_ptr=node_record_table_ptr; i<node_record_count;
i++, node_ptr++) {
info("%s: %u", node_ptr->name, node_ptr->hilbert_integer);
}
diff --git a/src/plugins/topology/3d_torus/topology_3d_torus.c b/src/plugins/topology/3d_torus/topology_3d_torus.c
index 64a3f2f8ff7c6ccfd5c2e826e3ab728d9ba89181..764dd980c076e1b56a730f0f8808f08280c0014d 100644
--- a/src/plugins/topology/3d_torus/topology_3d_torus.c
+++ b/src/plugins/topology/3d_torus/topology_3d_torus.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -67,7 +67,7 @@
* <application>/<method>
*
* where <application> is a description of the intended application of
- * the plugin (e.g., "task" for task control) and <method> is a description
+ * the plugin (e.g., "task" for task control) and <method> is a description
* of how this plugin satisfies that application. SLURM will only load
* a task plugin if the plugin_type string has a prefix of "task/".
*
@@ -94,7 +94,7 @@ extern int init(void)
}
/*
- * fini() is called when the plugin is removed. Clear any allocated
+ * fini() is called when the plugin is removed. Clear any allocated
* storage here.
*/
extern int fini(void)
@@ -115,7 +115,7 @@ extern int topo_build_config(void)
}
/*
- * topo_get_node_addr - build node address and the associated pattern
+ * topo_get_node_addr - build node address and the associated pattern
* based on the topology information
*
* in 3d_torus plugin, only use node name as the topology address
diff --git a/src/plugins/topology/none/Makefile.am b/src/plugins/topology/none/Makefile.am
index 58d8f0ed4cc8655c4ff314c030181f690067090b..7934a690aadb5854d20b0ee2c3435ff4b63afefc 100644
--- a/src/plugins/topology/none/Makefile.am
+++ b/src/plugins/topology/none/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/topology/none/Makefile.in b/src/plugins/topology/none/Makefile.in
index 440093e07e9aa0253d5fef062bf31ac287055901..f13cc56b5eef0124af045adb9f13050bb7f0141d 100644
--- a/src/plugins/topology/none/Makefile.in
+++ b/src/plugins/topology/none/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = topology_none.la
diff --git a/src/plugins/topology/none/topology_none.c b/src/plugins/topology/none/topology_none.c
index fbe519f12c47d54fac42043d0ad1a8d7c218f3e9..f4990f872a14db51110aa8ca96f429680eab1e15 100644
--- a/src/plugins/topology/none/topology_none.c
+++ b/src/plugins/topology/none/topology_none.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -65,7 +65,7 @@
* <application>/<method>
*
* where <application> is a description of the intended application of
- * the plugin (e.g., "task" for task control) and <method> is a description
+ * the plugin (e.g., "task" for task control) and <method> is a description
* of how this plugin satisfies that application. SLURM will only load
* a task plugin if the plugin_type string has a prefix of "task/".
*
@@ -90,7 +90,7 @@ extern int init(void)
}
/*
- * fini() is called when the plugin is removed. Clear any allocated
+ * fini() is called when the plugin is removed. Clear any allocated
* storage here.
*/
extern int fini(void)
@@ -108,7 +108,7 @@ extern int topo_build_config(void)
}
/*
- * topo_get_node_addr - build node address and the associated pattern
+ * topo_get_node_addr - build node address and the associated pattern
* based on the topology information
*
* in none plugin, only use node name as the topology address
@@ -121,4 +121,4 @@ extern int topo_get_node_addr(char* node_name, char** paddr, char** ppattern)
*paddr = xstrdup(node_name);
*ppattern = xstrdup("node");
return SLURM_SUCCESS;
-}
+}
diff --git a/src/plugins/topology/tree/Makefile.am b/src/plugins/topology/tree/Makefile.am
index 5fd70e7478a4009ea95df1a8b74a2e699b45acc4..93ebf6549030c2d2ef3af5be38ab0f67c07d2a1a 100644
--- a/src/plugins/topology/tree/Makefile.am
+++ b/src/plugins/topology/tree/Makefile.am
@@ -3,7 +3,7 @@
CPPFLAGS = -DTOPOLOGY_CONFIG_FILE=\"$(sysconfdir)/topology.conf\"
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
diff --git a/src/plugins/topology/tree/Makefile.in b/src/plugins/topology/tree/Makefile.in
index 319aafa350f326946b17b79df57d5b0b753c1cdf..3668c56f2b35f5dec7ef1d166b17fa121fda6b9a 100644
--- a/src/plugins/topology/tree/Makefile.in
+++ b/src/plugins/topology/tree/Makefile.in
@@ -311,7 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = topology_tree.la
diff --git a/src/plugins/topology/tree/topology_tree.c b/src/plugins/topology/tree/topology_tree.c
index aafc4d7b8b8652596bd877e3885f8d86af1f617d..4a2ce9e26236dd60d810296376e7124723cf5b2e 100644
--- a/src/plugins/topology/tree/topology_tree.c
+++ b/src/plugins/topology/tree/topology_tree.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -69,7 +69,7 @@
* <application>/<method>
*
* where <application> is a description of the intended application of
- * the plugin (e.g., "task" for task control) and <method> is a description
+ * the plugin (e.g., "task" for task control) and <method> is a description
* of how this plugin satisfies that application. SLURM will only load
* a task plugin if the plugin_type string has a prefix of "task/".
*
@@ -117,7 +117,7 @@ extern int init(void)
}
/*
- * fini() is called when the plugin is removed. Clear any allocated
+ * fini() is called when the plugin is removed. Clear any allocated
* storage here.
*/
extern int fini(void)
@@ -139,7 +139,7 @@ extern int topo_build_config(void)
/*
- * topo_get_node_addr - build node address and the associated pattern
+ * topo_get_node_addr - build node address and the associated pattern
* based on the topology information
*
* example of output :
@@ -174,7 +174,7 @@ extern int topo_get_node_addr(char* node_name, char** paddr, char** ppattern)
if ( switch_record_table[i].level > s_max_level )
s_max_level = switch_record_table[i].level;
}
-
+
/* initialize output parameters */
*paddr = xstrdup("");
*ppattern = xstrdup("");
@@ -184,7 +184,7 @@ extern int topo_get_node_addr(char* node_name, char** paddr, char** ppattern)
for (i=0; i<switch_record_cnt; i++) {
if ( switch_record_table[i].level != j )
continue;
- if ( !bit_test(switch_record_table[i]. node_bitmap,
+ if ( !bit_test(switch_record_table[i]. node_bitmap,
node_inx) )
continue;
if ( sl == NULL ) {
@@ -233,7 +233,7 @@ static void _validate_switches(void)
return;
}
- switch_record_table = xmalloc(sizeof(struct switch_record) *
+ switch_record_table = xmalloc(sizeof(struct switch_record) *
switch_record_cnt);
multi_homed_bitmap = bit_alloc(node_record_count);
switch_ptr = switch_record_table;
@@ -244,10 +244,10 @@ static void _validate_switches(void)
if (ptr->nodes) {
switch_ptr->level = 0; /* leaf switch */
switch_ptr->nodes = xstrdup(ptr->nodes);
- if (node_name2bitmap(ptr->nodes, true,
+ if (node_name2bitmap(ptr->nodes, true,
&switch_ptr->node_bitmap)) {
fatal("Invalid node name (%s) in switch "
- "config (%s)",
+ "config (%s)",
ptr->nodes, ptr->switch_name);
}
if (switches_bitmap) {
@@ -255,7 +255,7 @@ static void _validate_switches(void)
bit_and(tmp_bitmap, switches_bitmap);
bit_or(multi_homed_bitmap, tmp_bitmap);
bit_free(tmp_bitmap);
- bit_or(switches_bitmap,
+ bit_or(switches_bitmap,
switch_ptr->node_bitmap);
} else {
switches_bitmap = bit_copy(switch_ptr->
@@ -298,11 +298,11 @@ static void _validate_switches(void)
if (switch_ptr->level == -1) {
switch_ptr->level = 1 +
switch_record_table[j].level;
- switch_ptr->node_bitmap =
+ switch_ptr->node_bitmap =
bit_copy(switch_record_table[j].
node_bitmap);
} else {
- switch_ptr->level =
+ switch_ptr->level =
MAX(switch_ptr->level,
(switch_record_table[j].
level + 1));
@@ -328,7 +328,7 @@ static void _validate_switches(void)
i = bit_set_count(switches_bitmap);
if (i > 0) {
child = bitmap2node_name(switches_bitmap);
- error("WARNING: switches lack access to %d nodes: %s",
+ error("WARNING: switches lack access to %d nodes: %s",
i, child);
xfree(child);
}
@@ -336,12 +336,12 @@ static void _validate_switches(void)
} else
fatal("switches contain no nodes");
- /* Report nodes on multiple leaf switches,
+ /* Report nodes on multiple leaf switches,
* possibly due to bad configuration file */
i = bit_set_count(multi_homed_bitmap);
if (i > 0) {
child = bitmap2node_name(multi_homed_bitmap);
- error("WARNING: Multiple leaf switches contain nodes: %s",
+ error("WARNING: Multiple leaf switches contain nodes: %s",
child);
xfree(child);
}
@@ -438,7 +438,7 @@ extern int _read_topo_file(slurm_conf_switches_t **ptr_array[])
conf_hashtbl = s_p_hashtbl_create(switch_options);
if (s_p_parse_file(conf_hashtbl, topo_conf) == SLURM_ERROR) {
- fatal("something wrong with opening/reading %s: %m",
+ fatal("something wrong with opening/reading %s: %m",
topo_conf);
}
diff --git a/src/sacct/Makefile.am b/src/sacct/Makefile.am
index 46a22ae5cc4d23d66f1fa470e4f3822f5621dd40..721375ab034d2b4a66f98d81739a40720ffaa2bf 100644
--- a/src/sacct/Makefile.am
+++ b/src/sacct/Makefile.am
@@ -11,7 +11,7 @@ sacct_LDADD = $(top_builddir)/src/api/libslurm.o -ldl
sacct_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
-noinst_HEADERS = sacct.c
+noinst_HEADERS = sacct.c
sacct_SOURCES = sacct.c process.c print.c options.c
force:
diff --git a/src/sacct/Makefile.in b/src/sacct/Makefile.in
index 73b6b518071b001fb56887919133105cc9f94668..aae16eccc8912630098df0b4f9ccdd68453ab6d9 100644
--- a/src/sacct/Makefile.in
+++ b/src/sacct/Makefile.in
@@ -299,7 +299,7 @@ CLEANFILES = core.*
INCLUDES = -I$(top_srcdir)
sacct_LDADD = $(top_builddir)/src/api/libslurm.o -ldl
sacct_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
-noinst_HEADERS = sacct.c
+noinst_HEADERS = sacct.c
sacct_SOURCES = sacct.c process.c print.c options.c
all: all-am
diff --git a/src/sacct/options.c b/src/sacct/options.c
index 9fbf671a6b5414311914f84c93d71259b5e4712c..73f89b88299a382096cc5371321350cde7ca1bfa 100644
--- a/src/sacct/options.c
+++ b/src/sacct/options.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -133,7 +133,7 @@ static int _addto_id_char_list(List char_list, char *names, bool gid)
name = _convert_to_id(
name, gid);
}
-
+
while((tmp_char = list_next(itr))) {
if(!strcasecmp(tmp_char, name))
break;
@@ -142,7 +142,7 @@ static int _addto_id_char_list(List char_list, char *names, bool gid)
if(!tmp_char) {
list_append(char_list, name);
count++;
- } else
+ } else
xfree(name);
list_iterator_reset(itr);
}
@@ -160,26 +160,26 @@ static int _addto_id_char_list(List char_list, char *names, bool gid)
if((i-start) > 0) {
name = xmalloc((i-start)+1);
memcpy(name, names+start, (i-start));
-
+
if (!isdigit((int) *name)) {
name = _convert_to_id(name, gid);
}
-
+
while((tmp_char = list_next(itr))) {
if(!strcasecmp(tmp_char, name))
break;
}
-
+
if(!tmp_char) {
list_append(char_list, name);
count++;
- } else
+ } else
xfree(name);
}
- }
+ }
list_iterator_destroy(itr);
return count;
-}
+}
/* returns number of objects added to list */
static int _addto_state_char_list(List char_list, char *names)
@@ -220,7 +220,7 @@ static int _addto_state_char_list(List char_list, char *names)
"state value");
xfree(name);
name = xstrdup_printf("%d", c);
-
+
while((tmp_char = list_next(itr))) {
if(!strcasecmp(tmp_char, name))
break;
@@ -229,7 +229,7 @@ static int _addto_state_char_list(List char_list, char *names)
if(!tmp_char) {
list_append(char_list, name);
count++;
- } else
+ } else
xfree(name);
list_iterator_reset(itr);
}
@@ -252,22 +252,22 @@ static int _addto_state_char_list(List char_list, char *names)
fatal("unrecognized job state value");
xfree(name);
name = xstrdup_printf("%d", c);
-
+
while((tmp_char = list_next(itr))) {
if(!strcasecmp(tmp_char, name))
break;
}
-
+
if(!tmp_char) {
list_append(char_list, name);
count++;
- } else
+ } else
xfree(name);
}
- }
+ }
list_iterator_destroy(itr);
return count;
-}
+}
/* returns number of objects added to list */
static int _addto_step_list(List step_list, char *names)
@@ -276,7 +276,7 @@ static int _addto_step_list(List step_list, char *names)
char *name = NULL, *dot = NULL;
jobacct_selected_step_t *selected_step = NULL;
jobacct_selected_step_t *curr_step = NULL;
-
+
ListIterator itr = NULL;
char quote_c = '\0';
int quote = 0;
@@ -322,9 +322,9 @@ static int _addto_step_list(List step_list, char *names)
xfree(name);
while((curr_step = list_next(itr))) {
- if((curr_step->jobid
+ if((curr_step->jobid
== selected_step->jobid)
- && (curr_step->stepid
+ && (curr_step->stepid
== selected_step->
stepid))
break;
@@ -334,7 +334,7 @@ static int _addto_step_list(List step_list, char *names)
list_append(step_list,
selected_step);
count++;
- } else
+ } else
destroy_jobacct_selected_step(
selected_step);
list_iterator_reset(itr);
@@ -363,7 +363,7 @@ static int _addto_step_list(List step_list, char *names)
while((curr_step = list_next(itr))) {
if((curr_step->jobid == selected_step->jobid)
- && (curr_step->stepid
+ && (curr_step->stepid
== selected_step->stepid))
break;
}
@@ -371,14 +371,14 @@ static int _addto_step_list(List step_list, char *names)
if(!curr_step) {
list_append(step_list, selected_step);
count++;
- } else
+ } else
destroy_jobacct_selected_step(
selected_step);
}
- }
+ }
list_iterator_destroy(itr);
return count;
-}
+}
void _help_msg(void)
{
@@ -530,7 +530,7 @@ int decode_state_char(char *state)
return JOB_NODE_FAIL;
else
return -1; // unknown
-}
+}
int get_data(void)
{
@@ -540,17 +540,17 @@ int get_data(void)
ListIterator itr = NULL;
ListIterator itr_step = NULL;
acct_job_cond_t *job_cond = params.job_cond;
-
+
if(params.opt_completion) {
jobs = g_slurm_jobcomp_get_jobs(job_cond);
return SLURM_SUCCESS;
} else {
-
+
jobs = jobacct_storage_g_get_jobs_cond(acct_db_conn, getuid(),
job_cond);
}
- if (params.opt_fdump)
+ if (params.opt_fdump)
return SLURM_SUCCESS;
if(!jobs)
@@ -559,14 +559,14 @@ int get_data(void)
itr = list_iterator_create(jobs);
while((job = list_next(itr))) {
if(job->user) {
- struct passwd *pw = NULL;
+ struct passwd *pw = NULL;
if ((pw=getpwnam(job->user)))
job->uid = pw->pw_uid;
}
-
- if(!job->steps || !list_count(job->steps))
+
+ if(!job->steps || !list_count(job->steps))
continue;
-
+
itr_step = list_iterator_create(job->steps);
while((step = list_next(itr_step)) != NULL) {
/* now aggregate the aggregatable */
@@ -592,7 +592,7 @@ int get_data(void)
list_iterator_destroy(itr);
return SLURM_SUCCESS;
-}
+}
void parse_command_line(int argc, char **argv)
{
@@ -670,7 +670,7 @@ void parse_command_line(int argc, char **argv)
all_users = 1;
break;
case 'A':
- if(!job_cond->acct_list)
+ if(!job_cond->acct_list)
job_cond->acct_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(job_cond->acct_list, optarg);
@@ -687,14 +687,14 @@ void parse_command_line(int argc, char **argv)
break;
}
all_clusters=0;
- if(!job_cond->cluster_list)
+ if(!job_cond->cluster_list)
job_cond->cluster_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(job_cond->cluster_list, optarg);
break;
case 'd':
params.opt_dump = 1;
- break;
+ break;
case 'D':
params.opt_dup = 1;
break;
@@ -710,7 +710,7 @@ void parse_command_line(int argc, char **argv)
break;
case 'g':
if(!job_cond->groupid_list)
- job_cond->groupid_list =
+ job_cond->groupid_list =
list_create(slurm_destroy_char);
_addto_id_char_list(job_cond->groupid_list, optarg, 1);
break;
@@ -719,41 +719,41 @@ void parse_command_line(int argc, char **argv)
break;
case 'i':
set = get_resource_arg_range(
- optarg,
+ optarg,
"requested node range",
(int *)&job_cond->nodes_min,
(int *)&job_cond->nodes_max,
true);
-
+
if (set == false) {
- error("invalid node range -i '%s'",
+ error("invalid node range -i '%s'",
optarg);
exit(1);
- }
+ }
break;
case 'I':
set = get_resource_arg_range(
- optarg,
+ optarg,
"requested cpu range",
(int *)&job_cond->cpus_min,
(int *)&job_cond->cpus_max,
true);
-
+
if (set == false) {
- error("invalid cpu range -i '%s'",
+ error("invalid cpu range -i '%s'",
optarg);
exit(1);
}
break;
case 'j':
if ((strspn(optarg, "0123456789, ") < strlen(optarg))
- && (strspn(optarg, ".0123456789, ")
+ && (strspn(optarg, ".0123456789, ")
< strlen(optarg))) {
fprintf(stderr, "Invalid jobs list: %s\n",
optarg);
exit(1);
}
-
+
if(!job_cond->step_list)
job_cond->step_list = list_create(
destroy_jobacct_selected_step);
@@ -783,11 +783,11 @@ void parse_command_line(int argc, char **argv)
job_cond->used_nodes = xstrdup(optarg);
break;
case 'p':
- print_fields_parsable_print =
+ print_fields_parsable_print =
PRINT_FIELDS_PARSABLE_ENDING;
break;
case 'P':
- print_fields_parsable_print =
+ print_fields_parsable_print =
PRINT_FIELDS_PARSABLE_NO_ENDING;
break;
case 'r':
@@ -821,7 +821,7 @@ void parse_command_line(int argc, char **argv)
}
all_users = 0;
if(!job_cond->userid_list)
- job_cond->userid_list =
+ job_cond->userid_list =
list_create(slurm_destroy_char);
_addto_id_char_list(job_cond->userid_list, optarg, 0);
break;
@@ -831,7 +831,7 @@ void parse_command_line(int argc, char **argv)
verbosity++;
break;
case 'W':
- if(!job_cond->wckey_list)
+ if(!job_cond->wckey_list)
job_cond->wckey_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(job_cond->wckey_list, optarg);
@@ -845,7 +845,7 @@ void parse_command_line(int argc, char **argv)
break;
case ':':
case '?': /* getopt() has explained it */
- exit(1);
+ exit(1);
}
}
@@ -859,8 +859,8 @@ void parse_command_line(int argc, char **argv)
/* Now set params.opt_dup, unless they've already done so */
if (params.opt_dup < 0) /* not already set explicitly */
params.opt_dup = 0;
-
- if (params.opt_fdump)
+
+ if (params.opt_fdump)
params.opt_dup |= FDUMP_FLAG;
job_cond->duplicates = params.opt_dup;
@@ -871,9 +871,9 @@ void parse_command_line(int argc, char **argv)
job_cond->usage_start = time(NULL);
else {
struct tm start_tm;
-
+
if(!localtime_r(&job_cond->usage_start, &start_tm)) {
- error("Couldn't get localtime from %d",
+ error("Couldn't get localtime from %d",
job_cond->usage_start);
return;
}
@@ -884,10 +884,10 @@ void parse_command_line(int argc, char **argv)
job_cond->usage_start = mktime(&start_tm);
}
}
-
+
if(verbosity > 0) {
char *start_char =NULL, *end_char = NULL;
-
+
start_char = xstrdup(ctime(&job_cond->usage_start));
/* remove the new line */
start_char[strlen(start_char)-1] = '\0';
@@ -930,7 +930,7 @@ void parse_command_line(int argc, char **argv)
xfree(acct_type);
} else {
slurm_acct_storage_init(params.opt_filein);
-
+
acct_type = slurm_get_accounting_storage_type();
if ((strcmp(acct_type, "accounting_storage/none") == 0)
&& (stat(params.opt_filein, &stat_buf) != 0)) {
@@ -948,20 +948,20 @@ void parse_command_line(int argc, char **argv)
/* specific clusters requested? */
if(all_clusters) {
- if(job_cond->cluster_list
+ if(job_cond->cluster_list
&& list_count(job_cond->cluster_list)) {
list_destroy(job_cond->cluster_list);
job_cond->cluster_list = NULL;
}
debug2("Clusters requested:\tall\n");
- } else if (job_cond->cluster_list
+ } else if (job_cond->cluster_list
&& list_count(job_cond->cluster_list)) {
debug2( "Clusters requested:\n");
itr = list_iterator_create(job_cond->cluster_list);
- while((start = list_next(itr)))
+ while((start = list_next(itr)))
debug2("\t: %s\n", start);
list_iterator_destroy(itr);
- } else if(!job_cond->cluster_list
+ } else if(!job_cond->cluster_list
|| !list_count(job_cond->cluster_list)) {
if(!job_cond->cluster_list)
job_cond->cluster_list =
@@ -974,10 +974,10 @@ void parse_command_line(int argc, char **argv)
/* if any jobs or nodes are specified set to look for all users if none
are set */
- if(!job_cond->userid_list || !list_count(job_cond->userid_list))
- if((job_cond->step_list && list_count(job_cond->step_list))
+ if(!job_cond->userid_list || !list_count(job_cond->userid_list))
+ if((job_cond->step_list && list_count(job_cond->step_list))
|| job_cond->used_nodes)
- all_users=1;
+ all_users=1;
if(all_users) {
if(job_cond->userid_list && list_count(job_cond->userid_list)) {
@@ -988,10 +988,10 @@ void parse_command_line(int argc, char **argv)
} else if (job_cond->userid_list && list_count(job_cond->userid_list)) {
debug2("Userids requested:");
itr = list_iterator_create(job_cond->userid_list);
- while((start = list_next(itr)))
+ while((start = list_next(itr)))
debug2("\t: %s", start);
list_iterator_destroy(itr);
- } else if(!job_cond->userid_list
+ } else if(!job_cond->userid_list
|| !list_count(job_cond->userid_list)) {
if(!job_cond->userid_list)
job_cond->userid_list = list_create(slurm_destroy_char);
@@ -1003,31 +1003,31 @@ void parse_command_line(int argc, char **argv)
if (job_cond->groupid_list && list_count(job_cond->groupid_list)) {
debug2("Groupids requested:\n");
itr = list_iterator_create(job_cond->groupid_list);
- while((start = list_next(itr)))
+ while((start = list_next(itr)))
debug2("\t: %s\n", start);
list_iterator_destroy(itr);
- }
+ }
/* specific partitions requested? */
if (job_cond->partition_list && list_count(job_cond->partition_list)) {
debug2("Partitions requested:");
itr = list_iterator_create(job_cond->partition_list);
- while((start = list_next(itr)))
+ while((start = list_next(itr)))
debug2("\t: %s\n", start);
list_iterator_destroy(itr);
}
/* specific jobs requested? */
- if (job_cond->step_list && list_count(job_cond->step_list)) {
+ if (job_cond->step_list && list_count(job_cond->step_list)) {
debug2("Jobs requested:");
itr = list_iterator_create(job_cond->step_list);
while((selected_step = list_next(itr))) {
- if(selected_step->stepid != NO_VAL)
+ if(selected_step->stepid != NO_VAL)
debug2("\t: %d.%d",
selected_step->jobid,
selected_step->stepid);
- else
- debug2("\t: %d",
+ else
+ debug2("\t: %d",
selected_step->jobid);
}
list_iterator_destroy(itr);
@@ -1038,7 +1038,7 @@ void parse_command_line(int argc, char **argv)
debug2("States requested:");
itr = list_iterator_create(job_cond->state_list);
while((start = list_next(itr))) {
- debug2("\t: %s",
+ debug2("\t: %s",
job_state_string(atoi(start)));
}
list_iterator_destroy(itr);
@@ -1047,10 +1047,10 @@ void parse_command_line(int argc, char **argv)
if (job_cond->wckey_list && list_count(job_cond->wckey_list)) {
debug2("Wckeys requested:");
itr = list_iterator_create(job_cond->wckey_list);
- while((start = list_next(itr)))
+ while((start = list_next(itr)))
debug2("\t: %s\n", start);
list_iterator_destroy(itr);
- }
+ }
/* select the output fields */
if(brief_output) {
@@ -1058,9 +1058,9 @@ void parse_command_line(int argc, char **argv)
dot = BRIEF_COMP_FIELDS;
else
dot = BRIEF_FIELDS;
-
+
xstrfmtcat(params.opt_field_list, "%s,", dot);
- }
+ }
if(long_output) {
if(params.opt_completion)
@@ -1069,8 +1069,8 @@ void parse_command_line(int argc, char **argv)
dot = LONG_FIELDS;
xstrfmtcat(params.opt_field_list, "%s,", dot);
- }
-
+ }
+
if (params.opt_field_list==NULL) {
if (params.opt_dump)
goto endopt;
@@ -1097,8 +1097,8 @@ void parse_command_line(int argc, char **argv)
if((tmp_char = strstr(start, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
- }
-
+ }
+
command_len = strlen(start);
for (i = 0; fields[i].name; i++) {
@@ -1138,7 +1138,7 @@ endopt:
* record version number (currently 1). For example, if your app needs
* to use field 28, a record with numfields<28 is too old a version
* for you, while numfields>=28 will provide what you are expecting.
- */
+ */
void do_dump(void)
{
ListIterator itr = NULL;
@@ -1146,12 +1146,12 @@ void do_dump(void)
jobacct_job_rec_t *job = NULL;
jobacct_step_rec_t *step = NULL;
struct tm ts;
-
+
itr = list_iterator_create(jobs);
while((job = list_next(itr))) {
if(job->sacct.min_cpu == (float)NO_VAL)
job->sacct.min_cpu = 0;
-
+
if(list_count(job->steps)) {
job->sacct.ave_cpu /= list_count(job->steps);
job->sacct.ave_rss /= list_count(job->steps);
@@ -1175,7 +1175,7 @@ void do_dump(void)
job->blockid, /* block id */
"-"); /* reserved 1 */
- printf("JOB_START 1 16 %d %d %s %d %d %d %s %s\n",
+ printf("JOB_START 1 16 %d %d %s %d %d %d %s %s\n",
job->uid,
job->gid,
job->jobname,
@@ -1203,7 +1203,7 @@ void do_dump(void)
"-"); /* reserved 1 */
if(step->end == 0)
step->end = job->end;
-
+
gmtime_r(&step->end, &ts);
printf("JOB_STEP 1 50 %u %04d%02d%02d%02d%02d%02d ",
step->stepid,
@@ -1222,7 +1222,7 @@ void do_dump(void)
(int)step->user_cpu_usec,
(int)step->sys_cpu_sec,
(int)step->sys_cpu_usec,
- step->sacct.max_vsize/1024,
+ step->sacct.max_vsize/1024,
step->sacct.max_rss/1024);
/* Data added in Slurm v1.1 */
printf("%u %u %.2f %u %u %.2f %d %u %u %.2f "
@@ -1266,7 +1266,7 @@ void do_dump(void)
job->elapsed);
printf("%04d%02d%02d%02d%02d%02d ",
1900+(ts.tm_year), 1+(ts.tm_mon), ts.tm_mday,
- ts.tm_hour, ts.tm_min, ts.tm_sec);
+ ts.tm_hour, ts.tm_min, ts.tm_sec);
printf("%s %d %d %d %d ",
job_state_string_compact(job->state),
job->exitcode,
@@ -1280,7 +1280,7 @@ void do_dump(void)
(int)job->user_cpu_usec,
(int)job->sys_cpu_sec,
(int)job->sys_cpu_usec,
- job->sacct.max_vsize/1024,
+ job->sacct.max_vsize/1024,
job->sacct.max_rss/1024);
/* Data added in Slurm v1.1 */
printf("%u %u %.2f %u %u %.2f %d %u %u %.2f "
@@ -1302,23 +1302,23 @@ void do_dump(void)
"-",
job->nodes,
job->account,
- job->requid);
+ job->requid);
}
}
- list_iterator_destroy(itr);
+ list_iterator_destroy(itr);
}
void do_dump_completion(void)
{
ListIterator itr = NULL;
jobcomp_job_rec_t *job = NULL;
-
+
itr = list_iterator_create(jobs);
while((job = list_next(itr))) {
printf("JOB %u %s %s %s %s(%u) %u(%s) %u %s %s %s %s",
job->jobid, job->partition, job->start_time,
job->end_time, job->uid_name, job->uid, job->gid,
- job->gid_name, job->node_cnt, job->nodelist,
+ job->gid_name, job->node_cnt, job->nodelist,
job->jobname, job->state,
job->timelimit);
if(job->blockid)
@@ -1344,7 +1344,7 @@ void do_help(void)
_usage();
break;
default:
- debug2("sacct bug: params.opt_help=%d\n",
+ debug2("sacct bug: params.opt_help=%d\n",
params.opt_help);
}
}
@@ -1363,7 +1363,7 @@ void do_list(void)
ListIterator itr_step = NULL;
jobacct_job_rec_t *job = NULL;
jobacct_step_rec_t *step = NULL;
-
+
if(!jobs)
return;
@@ -1379,9 +1379,9 @@ void do_list(void)
job->sacct.ave_pages /= list_count(job->steps);
}
- if (job->show_full)
+ if (job->show_full)
print_fields(JOB, job);
-
+
if (!params.opt_allocs
&& (job->track_steps || !job->show_full)) {
itr_step = list_iterator_create(job->steps);
@@ -1389,7 +1389,7 @@ void do_list(void)
if(step->end == 0)
step->end = job->end;
print_fields(JOBSTEP, step);
- }
+ }
list_iterator_destroy(itr_step);
}
}
diff --git a/src/sacct/print.c b/src/sacct/print.c
index ec612a21ba30e86de01cf1a856b0a8807992c4bd..db56ed9725034398e051d93cc04b45e9263a8ac2 100644
--- a/src/sacct/print.c
+++ b/src/sacct/print.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -52,8 +52,8 @@ char *_elapsed_time(long secs, long usecs)
if(secs < 0 || secs == NO_VAL)
return NULL;
-
-
+
+
while (usecs >= 1E6) {
secs++;
usecs -= 1E6;
@@ -67,7 +67,7 @@ char *_elapsed_time(long secs, long usecs)
hours = (secs / 3600) % 24;
days = secs / 86400;
- if (days)
+ if (days)
str = xstrdup_printf("%ld-%2.2ld:%2.2ld:%2.2ld",
days, hours, minutes, seconds);
else if (hours)
@@ -87,10 +87,10 @@ static char *_find_qos_name_from_list(
{
ListIterator itr = NULL;
acct_qos_rec_t *qos = NULL;
-
+
if(!qos_list || qosid == NO_VAL)
return NULL;
-
+
itr = list_iterator_create(qos_list);
while((qos = list_next(itr))) {
if(qosid == qos->id)
@@ -116,19 +116,19 @@ void print_fields(type_t type, void *object)
struct passwd *pw = NULL;
struct group *gr = NULL;
char outbuf[FORMAT_STRING_SIZE];
-
+
switch(type) {
case JOB:
step = NULL;
- if(!job->track_steps)
+ if(!job->track_steps)
step = (jobacct_step_rec_t *)job->first_step_ptr;
/* set this to avoid printing out info for things that
don't mean anything. Like an allocation that never
ran anything.
*/
- if(!step)
- job->track_steps = 1;
-
+ if(!step)
+ job->track_steps = 1;
+
break;
default:
break;
@@ -145,7 +145,7 @@ void print_fields(type_t type, void *object)
case JOB:
tmp_int = job->alloc_cpus;
// we want to use the step info
- if(!step)
+ if(!step)
break;
case JOBSTEP:
tmp_int = step->ncpus;
@@ -196,7 +196,7 @@ void print_fields(type_t type, void *object)
case PRINT_AVECPU:
switch(type) {
case JOB:
- if(!job->track_steps)
+ if(!job->track_steps)
tmp_int = job->sacct.ave_cpu;
break;
case JOBSTEP:
@@ -207,7 +207,7 @@ void print_fields(type_t type, void *object)
break;
}
tmp_char = _elapsed_time((int)tmp_int, 0);
-
+
field->print_routine(field,
tmp_char,
(curr_inx == field_count));
@@ -230,7 +230,7 @@ void print_fields(type_t type, void *object)
convert_num_unit((float)tmp_int,
outbuf, sizeof(outbuf),
UNIT_KILO);
-
+
field->print_routine(field,
outbuf,
(curr_inx == field_count));
@@ -252,7 +252,7 @@ void print_fields(type_t type, void *object)
convert_num_unit((float)tmp_int,
outbuf, sizeof(outbuf),
UNIT_KILO);
-
+
field->print_routine(field,
outbuf,
(curr_inx == field_count));
@@ -274,7 +274,7 @@ void print_fields(type_t type, void *object)
convert_num_unit((float)tmp_int,
outbuf, sizeof(outbuf),
UNIT_KILO);
-
+
field->print_routine(field,
outbuf,
(curr_inx == field_count));
@@ -355,7 +355,7 @@ void print_fields(type_t type, void *object)
tmp_int = step->elapsed;
break;
case JOBCOMP:
- tmp_int = job_comp->end_time
+ tmp_int = job_comp->end_time
- job_comp->start_time;
break;
default:
@@ -418,7 +418,7 @@ void print_fields(type_t type, void *object)
}
if (WIFSIGNALED(tmp_int))
tmp_int2 = WTERMSIG(tmp_int);
-
+
snprintf(outbuf, sizeof(outbuf), "%d:%d",
WEXITSTATUS(tmp_int), tmp_int2);
@@ -514,7 +514,7 @@ void print_fields(type_t type, void *object)
case JOB:
/* below really should be step. It is
not a typo */
- if(!job->track_steps)
+ if(!job->track_steps)
tmp_char = slurm_step_layout_type_name(
step->task_dist);
break;
@@ -549,7 +549,7 @@ void print_fields(type_t type, void *object)
convert_num_unit((float)tmp_int,
outbuf, sizeof(outbuf),
UNIT_KILO);
-
+
field->print_routine(field,
outbuf,
(curr_inx == field_count));
@@ -581,7 +581,7 @@ void print_fields(type_t type, void *object)
switch(type) {
case JOB:
if(!job->track_steps)
- tmp_int =
+ tmp_int =
job->sacct.max_pages_id.taskid;
break;
case JOBSTEP:
@@ -613,7 +613,7 @@ void print_fields(type_t type, void *object)
convert_num_unit((float)tmp_int,
outbuf, sizeof(outbuf),
UNIT_KILO);
-
+
field->print_routine(field,
outbuf,
(curr_inx == field_count));
@@ -672,12 +672,12 @@ void print_fields(type_t type, void *object)
default:
tmp_int = NO_VAL;
break;
- }
+ }
if(tmp_int != NO_VAL)
convert_num_unit((float)tmp_int,
outbuf, sizeof(outbuf),
UNIT_KILO);
-
+
field->print_routine(field,
outbuf,
(curr_inx == field_count));
@@ -819,13 +819,13 @@ void print_fields(type_t type, void *object)
default:
break;
}
-
+
if(!tmp_int) {
hostlist_t hl = hostlist_create(tmp_char);
tmp_int = hostlist_count(hl);
hostlist_destroy(hl);
}
- convert_num_unit((float)tmp_int,
+ convert_num_unit((float)tmp_int,
outbuf, sizeof(outbuf), UNIT_NONE);
field->print_routine(field,
outbuf,
@@ -837,7 +837,7 @@ void print_fields(type_t type, void *object)
if(!job->track_steps && !step)
tmp_int = job->alloc_cpus;
// we want to use the step info
- if(!step)
+ if(!step)
break;
case JOBSTEP:
tmp_int = step->ntasks;
@@ -904,10 +904,10 @@ void print_fields(type_t type, void *object)
break;
}
- if(!qos_list)
+ if(!qos_list)
qos_list = acct_storage_g_get_qos(
acct_db_conn, getuid(), NULL);
-
+
tmp_char = _find_qos_name_from_list(qos_list,
tmp_int);
field->print_routine(field,
@@ -1055,9 +1055,9 @@ void print_fields(type_t type, void *object)
break;
}
-
- if (((tmp_int & JOB_STATE_BASE) == JOB_CANCELLED) &&
- (tmp_int2 != NO_VAL))
+
+ if (((tmp_int & JOB_STATE_BASE) == JOB_CANCELLED) &&
+ (tmp_int2 != NO_VAL))
snprintf(outbuf, FORMAT_STRING_SIZE,
"%s by %d",
job_state_string(tmp_int),
@@ -1070,7 +1070,7 @@ void print_fields(type_t type, void *object)
snprintf(outbuf, FORMAT_STRING_SIZE,
"%s",
tmp_char);
-
+
field->print_routine(field,
outbuf,
(curr_inx == field_count));
@@ -1141,7 +1141,7 @@ void print_fields(type_t type, void *object)
case PRINT_TIMELIMIT:
switch(type) {
case JOB:
-
+
break;
case JOBSTEP:
@@ -1187,7 +1187,7 @@ void print_fields(type_t type, void *object)
if(job->user) {
if ((pw=getpwnam(job->user)))
tmp_int = pw->pw_uid;
- } else
+ } else
tmp_int = job->uid;
break;
case JOBSTEP:
@@ -1199,7 +1199,7 @@ void print_fields(type_t type, void *object)
break;
}
-
+
field->print_routine(field,
tmp_int,
(curr_inx == field_count));
@@ -1211,8 +1211,8 @@ void print_fields(type_t type, void *object)
tmp_char = job->user;
else if(job->uid != -1) {
if ((pw=getpwuid(job->uid)))
- tmp_char = pw->pw_name;
- }
+ tmp_char = pw->pw_name;
+ }
break;
case JOBSTEP:
diff --git a/src/sacct/process.c b/src/sacct/process.c
index 701a62d61b366bad5c5f470687c631f0e96df4ac..9f4614f2728b2f92f62666e217c30073c98b0a8a 100644
--- a/src/sacct/process.c
+++ b/src/sacct/process.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -48,13 +48,13 @@ char *find_hostname(uint32_t pos, char *hosts)
if(!hosts || (pos == (uint32_t)NO_VAL))
return NULL;
-
+
hostlist = hostlist_create(hosts);
temp = hostlist_nth(hostlist, pos);
if(temp) {
host = xstrdup(temp);
free(temp);
- }
+ }
hostlist_destroy(hostlist);
return host;
}
@@ -66,20 +66,20 @@ void aggregate_sacct(sacct_t *dest, sacct_t *from)
dest->max_vsize_id = from->max_vsize_id;
}
dest->ave_vsize += from->ave_vsize;
-
+
if(dest->max_rss < from->max_rss) {
dest->max_rss = from->max_rss;
dest->max_rss_id = from->max_rss_id;
}
dest->ave_rss += from->ave_rss;
-
+
if(dest->max_pages < from->max_pages) {
dest->max_pages = from->max_pages;
dest->max_pages_id = from->max_pages_id;
}
dest->ave_pages += from->ave_pages;
-
- if((dest->min_cpu > from->min_cpu)
+
+ if((dest->min_cpu > from->min_cpu)
|| (dest->min_cpu == (float)NO_VAL)) {
dest->min_cpu = from->min_cpu;
dest->min_cpu_id = from->min_cpu_id;
diff --git a/src/sacct/sacct.c b/src/sacct/sacct.c
index 8cd0afc34b3badd4f45c0ae0244c60dede3196b0..0d4609ddcc93fa3d8de040d0f5c768d55e78b154 100644
--- a/src/sacct/sacct.c
+++ b/src/sacct/sacct.c
@@ -8,28 +8,28 @@
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -47,11 +47,11 @@ print_field_t fields[] = {
{10, "AllocCPUS", print_fields_int, PRINT_ALLOC_CPUS},
{10, "Account", print_fields_str, PRINT_ACCOUNT},
{7, "AssocID", print_fields_int, PRINT_ASSOCID},
- {10, "AveCPU", print_fields_str, PRINT_AVECPU},
- {10, "AvePages", print_fields_str, PRINT_AVEPAGES},
- {10, "AveRSS", print_fields_str, PRINT_AVERSS},
- {10, "AveVMSize", print_fields_str, PRINT_AVEVSIZE},
- {16, "BlockID", print_fields_str, PRINT_BLOCKID},
+ {10, "AveCPU", print_fields_str, PRINT_AVECPU},
+ {10, "AvePages", print_fields_str, PRINT_AVEPAGES},
+ {10, "AveRSS", print_fields_str, PRINT_AVERSS},
+ {10, "AveVMSize", print_fields_str, PRINT_AVEVSIZE},
+ {16, "BlockID", print_fields_str, PRINT_BLOCKID},
{10, "Cluster", print_fields_str, PRINT_CLUSTER},
{10, "CPUTime", print_fields_time_from_secs, PRINT_CPU_TIME},
{10, "CPUTimeRAW", print_fields_int, PRINT_CPU_TIME_RAW},
@@ -59,47 +59,47 @@ print_field_t fields[] = {
{19, "Eligible", print_fields_date, PRINT_ELIGIBLE},
{19, "End", print_fields_date, PRINT_END},
{8, "ExitCode", print_fields_str, PRINT_EXITCODE},
- {6, "GID", print_fields_int, PRINT_GID},
- {9, "Group", print_fields_str, PRINT_GROUP},
- {10, "JobID", print_fields_str, PRINT_JOBID},
+ {6, "GID", print_fields_int, PRINT_GID},
+ {9, "Group", print_fields_str, PRINT_GROUP},
+ {10, "JobID", print_fields_str, PRINT_JOBID},
{10, "JobName", print_fields_str, PRINT_JOBNAME},
{9, "Layout", print_fields_str, PRINT_LAYOUT},
- {8, "MaxPages", print_fields_str, PRINT_MAXPAGES},
- {12, "MaxPagesNode", print_fields_str, PRINT_MAXPAGESNODE},
- {14, "MaxPagesTask", print_fields_int, PRINT_MAXPAGESTASK},
+ {8, "MaxPages", print_fields_str, PRINT_MAXPAGES},
+ {12, "MaxPagesNode", print_fields_str, PRINT_MAXPAGESNODE},
+ {14, "MaxPagesTask", print_fields_int, PRINT_MAXPAGESTASK},
{10, "MaxRSS", print_fields_str, PRINT_MAXRSS},
{10, "MaxRSSNode", print_fields_str, PRINT_MAXRSSNODE},
{10, "MaxRSSTask", print_fields_int, PRINT_MAXRSSTASK},
- {10, "MaxVMSize", print_fields_str, PRINT_MAXVSIZE},
- {14, "MaxVMSizeNode", print_fields_str, PRINT_MAXVSIZENODE},
- {14, "MaxVMSizeTask", print_fields_int, PRINT_MAXVSIZETASK},
- {10, "MinCPU", print_fields_str, PRINT_MINCPU},
- {10, "MinCPUNode", print_fields_str, PRINT_MINCPUNODE},
- {10, "MinCPUTask", print_fields_int, PRINT_MINCPUTASK},
+ {10, "MaxVMSize", print_fields_str, PRINT_MAXVSIZE},
+ {14, "MaxVMSizeNode", print_fields_str, PRINT_MAXVSIZENODE},
+ {14, "MaxVMSizeTask", print_fields_int, PRINT_MAXVSIZETASK},
+ {10, "MinCPU", print_fields_str, PRINT_MINCPU},
+ {10, "MinCPUNode", print_fields_str, PRINT_MINCPUNODE},
+ {10, "MinCPUTask", print_fields_int, PRINT_MINCPUTASK},
{10, "NCPUS", print_fields_int, PRINT_ALLOC_CPUS},
- {15, "NodeList", print_fields_str, PRINT_NODELIST},
- {8, "NNodes", print_fields_str, PRINT_NNODES},
+ {15, "NodeList", print_fields_str, PRINT_NODELIST},
+ {8, "NNodes", print_fields_str, PRINT_NNODES},
{8, "NTasks", print_fields_int, PRINT_NTASKS},
- {10, "Priority", print_fields_int, PRINT_PRIO},
- {10, "Partition", print_fields_str, PRINT_PARTITION},
+ {10, "Priority", print_fields_int, PRINT_PRIO},
+ {10, "Partition", print_fields_str, PRINT_PARTITION},
{10, "QOS", print_fields_str, PRINT_QOS},
{6, "QOSRAW", print_fields_int, PRINT_QOSRAW},
{8, "ReqCPUS", print_fields_int, PRINT_REQ_CPUS},
{10, "Reserved", print_fields_time_from_secs, PRINT_RESV},
{10, "ResvCPU", print_fields_time_from_secs, PRINT_RESV_CPU},
{10, "ResvCPURAW", print_fields_int, PRINT_RESV_CPU},
- {19, "Start", print_fields_date, PRINT_START},
- {10, "State", print_fields_str, PRINT_STATE},
- {19, "Submit", print_fields_date, PRINT_SUBMIT},
- {10, "Suspended", print_fields_time_from_secs, PRINT_SUSPENDED},
- {10, "SystemCPU", print_fields_str, PRINT_SYSTEMCPU},
+ {19, "Start", print_fields_date, PRINT_START},
+ {10, "State", print_fields_str, PRINT_STATE},
+ {19, "Submit", print_fields_date, PRINT_SUBMIT},
+ {10, "Suspended", print_fields_time_from_secs, PRINT_SUSPENDED},
+ {10, "SystemCPU", print_fields_str, PRINT_SYSTEMCPU},
{10, "Timelimit", print_fields_time_from_secs, PRINT_TIMELIMIT},
- {10, "TotalCPU", print_fields_str, PRINT_TOTALCPU},
- {6, "UID", print_fields_int, PRINT_UID},
- {9, "User", print_fields_str, PRINT_USER},
- {10, "UserCPU", print_fields_str, PRINT_USERCPU},
- {10, "WCKey", print_fields_str, PRINT_WCKEY},
- {10, "WCKeyID", print_fields_int, PRINT_WCKEYID},
+ {10, "TotalCPU", print_fields_str, PRINT_TOTALCPU},
+ {6, "UID", print_fields_int, PRINT_UID},
+ {9, "User", print_fields_str, PRINT_USER},
+ {10, "UserCPU", print_fields_str, PRINT_USERCPU},
+ {10, "WCKey", print_fields_str, PRINT_WCKEY},
+ {10, "WCKeyID", print_fields_int, PRINT_WCKEYID},
{0, NULL, NULL, 0}};
List jobs = NULL;
@@ -114,7 +114,7 @@ int main(int argc, char **argv)
SACCT_USAGE
} op;
int rc = 0;
-
+
sacct_init();
parse_command_line(argc, argv);
@@ -131,14 +131,14 @@ int main(int argc, char **argv)
} else
op = SACCT_LIST;
-
+
switch (op) {
case SACCT_DUMP:
if(get_data() == SLURM_ERROR)
exit(errno);
- if(params.opt_completion)
+ if(params.opt_completion)
do_dump_completion();
- else
+ else
do_dump();
break;
case SACCT_FDUMP:
@@ -149,9 +149,9 @@ int main(int argc, char **argv)
print_fields_header(print_fields_list);
if(get_data() == SLURM_ERROR)
exit(errno);
- if(params.opt_completion)
+ if(params.opt_completion)
do_list_completion();
- else
+ else
do_list();
break;
case SACCT_HELP:
diff --git a/src/sacct/sacct.h b/src/sacct/sacct.h
index f9a4014e59b1009f622e6935b116255986666b52..0bec9148d30aca8e77ac879f3575086bcd51d692 100644
--- a/src/sacct/sacct.h
+++ b/src/sacct/sacct.h
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/sacctmgr/account_functions.c b/src/sacctmgr/account_functions.c
index dae854c408ed16a71f5103822c42dff6ba19652b..7647b21d7a39d4d69f6383fa4fd3cc4a75e3c1f0 100644
--- a/src/sacctmgr/account_functions.c
+++ b/src/sacctmgr/account_functions.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -58,7 +58,7 @@ static int _set_cond(int *start, int argc, char *argv[],
}
if(!acct_cond->assoc_cond) {
- acct_cond->assoc_cond =
+ acct_cond->assoc_cond =
xmalloc(sizeof(acct_association_cond_t));
}
@@ -75,19 +75,19 @@ static int _set_cond(int *start, int argc, char *argv[],
end++;
}
}
-
+
if (!strncasecmp (argv[i], "Set", MAX(command_len, 3))) {
i--;
break;
- } else if (!end &&
+ } else if (!end &&
!strncasecmp (argv[i], "WithAssoc",
MAX(command_len, 5))) {
acct_cond->with_assocs = 1;
- } else if (!end &&
- !strncasecmp (argv[i], "WithCoordinators",
+ } else if (!end &&
+ !strncasecmp (argv[i], "WithCoordinators",
MAX(command_len, 5))) {
acct_cond->with_coords = 1;
- } else if (!end &&
+ } else if (!end &&
!strncasecmp (argv[i], "WithRawQOSLevel",
MAX(command_len, 5))) {
assoc_cond->with_raw_qos = 1;
@@ -98,44 +98,44 @@ static int _set_cond(int *start, int argc, char *argv[],
MAX(command_len, 5))) {
continue;
} else if(!end
- || !strncasecmp (argv[i], "Names",
+ || !strncasecmp (argv[i], "Names",
MAX(command_len, 1))
|| !strncasecmp (argv[i], "Accounts",
MAX(command_len, 1))
|| !strncasecmp (argv[i], "Acct",
MAX(command_len, 4))) {
if(!assoc_cond->acct_list) {
- assoc_cond->acct_list =
+ assoc_cond->acct_list =
list_create(slurm_destroy_char);
}
if(slurm_addto_char_list(
assoc_cond->acct_list,
- argv[i]+end))
+ argv[i]+end))
u_set = 1;
} else if (!strncasecmp (argv[i], "Clusters",
MAX(command_len, 1))) {
if(!assoc_cond->cluster_list) {
- assoc_cond->cluster_list =
+ assoc_cond->cluster_list =
list_create(slurm_destroy_char);
}
if(slurm_addto_char_list(
assoc_cond->cluster_list,
argv[i]+end))
a_set = 1;
- } else if (!strncasecmp (argv[i], "Descriptions",
+ } else if (!strncasecmp (argv[i], "Descriptions",
MAX(command_len, 1))) {
if(!acct_cond->description_list) {
- acct_cond->description_list =
+ acct_cond->description_list =
list_create(slurm_destroy_char);
}
if(slurm_addto_char_list(acct_cond->description_list,
argv[i]+end))
u_set = 1;
- } else if (!strncasecmp (argv[i], "Format",
+ } else if (!strncasecmp (argv[i], "Format",
MAX(command_len, 1))) {
if(format_list)
slurm_addto_char_list(format_list, argv[i]+end);
- } else if (!strncasecmp (argv[i], "FairShare",
+ } else if (!strncasecmp (argv[i], "FairShare",
MAX(command_len, 1))
|| !strncasecmp (argv[i], "Shares",
MAX(command_len, 1))) {
@@ -186,7 +186,7 @@ static int _set_cond(int *start, int argc, char *argv[],
assoc_cond->grp_submit_jobs_list,
argv[i]+end))
a_set = 1;
- } else if (!strncasecmp (argv[i], "GrpWall",
+ } else if (!strncasecmp (argv[i], "GrpWall",
MAX(command_len, 4))) {
if(!assoc_cond->grp_wall_list)
assoc_cond->grp_wall_list =
@@ -195,7 +195,7 @@ static int _set_cond(int *start, int argc, char *argv[],
assoc_cond->grp_wall_list,
argv[i]+end))
a_set = 1;
- } else if (!strncasecmp (argv[i], "MaxCPUMinsPerJob",
+ } else if (!strncasecmp (argv[i], "MaxCPUMinsPerJob",
MAX(command_len, 7))) {
if(!assoc_cond->max_cpu_mins_pj_list)
assoc_cond->max_cpu_mins_pj_list =
@@ -204,7 +204,7 @@ static int _set_cond(int *start, int argc, char *argv[],
assoc_cond->max_cpu_mins_pj_list,
argv[i]+end))
a_set = 1;
- } else if (!strncasecmp (argv[i], "MaxCpusPerJob",
+ } else if (!strncasecmp (argv[i], "MaxCpusPerJob",
MAX(command_len, 7))) {
if(!assoc_cond->max_cpus_pj_list)
assoc_cond->max_cpus_pj_list =
@@ -213,7 +213,7 @@ static int _set_cond(int *start, int argc, char *argv[],
assoc_cond->max_cpus_pj_list,
argv[i]+end))
a_set = 1;
- } else if (!strncasecmp (argv[i], "MaxJobs",
+ } else if (!strncasecmp (argv[i], "MaxJobs",
MAX(command_len, 4))) {
if(!assoc_cond->max_jobs_list)
assoc_cond->max_jobs_list =
@@ -222,7 +222,7 @@ static int _set_cond(int *start, int argc, char *argv[],
assoc_cond->max_jobs_list,
argv[i]+end))
a_set = 1;
- } else if (!strncasecmp (argv[i], "MaxNodesPerJob",
+ } else if (!strncasecmp (argv[i], "MaxNodesPerJob",
MAX(command_len, 4))) {
if(!assoc_cond->max_nodes_pj_list)
assoc_cond->max_nodes_pj_list =
@@ -231,7 +231,7 @@ static int _set_cond(int *start, int argc, char *argv[],
assoc_cond->max_nodes_pj_list,
argv[i]+end))
a_set = 1;
- } else if (!strncasecmp (argv[i], "MaxSubmitJobs",
+ } else if (!strncasecmp (argv[i], "MaxSubmitJobs",
MAX(command_len, 4))) {
if(!assoc_cond->max_submit_jobs_list)
assoc_cond->max_submit_jobs_list =
@@ -252,28 +252,28 @@ static int _set_cond(int *start, int argc, char *argv[],
} else if (!strncasecmp (argv[i], "Organizations",
MAX(command_len, 1))) {
if(!acct_cond->organization_list) {
- acct_cond->organization_list =
+ acct_cond->organization_list =
list_create(slurm_destroy_char);
}
if(slurm_addto_char_list(acct_cond->organization_list,
argv[i]+end))
u_set = 1;
- } else if (!strncasecmp (argv[i], "Parent",
+ } else if (!strncasecmp (argv[i], "Parent",
MAX(command_len, 1))) {
if(!assoc_cond->parent_acct_list) {
- assoc_cond->parent_acct_list =
+ assoc_cond->parent_acct_list =
list_create(slurm_destroy_char);
}
if(slurm_addto_char_list(assoc_cond->parent_acct_list,
argv[i]+end))
a_set = 1;
- } else if (!strncasecmp (argv[i], "QosLevel",
+ } else if (!strncasecmp (argv[i], "QosLevel",
MAX(command_len, 1))) {
if(!assoc_cond->qos_list) {
- assoc_cond->qos_list =
+ assoc_cond->qos_list =
list_create(slurm_destroy_char);
}
-
+
if(!g_qos_list) {
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
@@ -338,37 +338,37 @@ static int _set_rec(int *start, int argc, char *argv[],
} else if(!end
|| !strncasecmp (argv[i], "Account",
MAX(command_len, 1))
- || !strncasecmp (argv[i], "Names",
+ || !strncasecmp (argv[i], "Names",
MAX(command_len, 1))
|| !strncasecmp (argv[i], "Acct",
MAX(command_len, 4))) {
- if(acct_list)
+ if(acct_list)
slurm_addto_char_list(acct_list, argv[i]+end);
-
- } else if (!strncasecmp (argv[i], "Cluster",
+
+ } else if (!strncasecmp (argv[i], "Cluster",
MAX(command_len, 1))) {
if(cluster_list)
slurm_addto_char_list(cluster_list,
argv[i]+end);
- } else if (!strncasecmp (argv[i], "Description",
+ } else if (!strncasecmp (argv[i], "Description",
MAX(command_len, 1))) {
acct->description = strip_quotes(argv[i]+end, NULL, 1);
u_set = 1;
- } else if (!strncasecmp (argv[i], "FairShare",
+ } else if (!strncasecmp (argv[i], "FairShare",
MAX(command_len, 1))
|| !strncasecmp (argv[i], "Shares",
MAX(command_len, 1))) {
if(!assoc)
continue;
- if (get_uint(argv[i]+end, &assoc->shares_raw,
+ if (get_uint(argv[i]+end, &assoc->shares_raw,
"FairShare") == SLURM_SUCCESS)
a_set = 1;
- } else if (!strncasecmp (argv[i], "GrpCPUMins",
+ } else if (!strncasecmp (argv[i], "GrpCPUMins",
MAX(command_len, 7))) {
if(!assoc)
continue;
- if (get_uint64(argv[i]+end,
- &assoc->grp_cpu_mins,
+ if (get_uint64(argv[i]+end,
+ &assoc->grp_cpu_mins,
"GrpCPUMins") == SLURM_SUCCESS)
a_set = 1;
} else if (!strncasecmp (argv[i], "GrpCpus",
@@ -378,7 +378,7 @@ static int _set_rec(int *start, int argc, char *argv[],
if (get_uint(argv[i]+end, &assoc->grp_cpus,
"GrpCpus") == SLURM_SUCCESS)
a_set = 1;
- } else if (!strncasecmp (argv[i], "GrpJobs",
+ } else if (!strncasecmp (argv[i], "GrpJobs",
MAX(command_len, 4))) {
if(!assoc)
continue;
@@ -409,19 +409,19 @@ static int _set_rec(int *start, int argc, char *argv[],
a_set = 1;
} else {
exit_code=1;
- fprintf(stderr,
- " Bad GrpWall time format: %s\n",
+ fprintf(stderr,
+ " Bad GrpWall time format: %s\n",
argv[i]);
}
- } else if (!strncasecmp (argv[i], "MaxCPUMinsPerJob",
+ } else if (!strncasecmp (argv[i], "MaxCPUMinsPerJob",
MAX(command_len, 7))) {
if(!assoc)
continue;
- if (get_uint64(argv[i]+end,
- &assoc->max_cpu_mins_pj,
+ if (get_uint64(argv[i]+end,
+ &assoc->max_cpu_mins_pj,
"MaxCPUMins") == SLURM_SUCCESS)
a_set = 1;
- } else if (!strncasecmp (argv[i], "MaxCpusPerJob",
+ } else if (!strncasecmp (argv[i], "MaxCpusPerJob",
MAX(command_len, 7))) {
if(!assoc)
continue;
@@ -435,22 +435,22 @@ static int _set_rec(int *start, int argc, char *argv[],
if (get_uint(argv[i]+end, &assoc->max_jobs,
"MaxJobs") == SLURM_SUCCESS)
a_set = 1;
- } else if (!strncasecmp (argv[i], "MaxNodesPerJob",
+ } else if (!strncasecmp (argv[i], "MaxNodesPerJob",
MAX(command_len, 4))) {
if(!assoc)
continue;
- if (get_uint(argv[i]+end,
+ if (get_uint(argv[i]+end,
&assoc->max_nodes_pj,
"MaxNodes") == SLURM_SUCCESS)
a_set = 1;
- } else if (!strncasecmp (argv[i], "MaxSubmitJobs",
+ } else if (!strncasecmp (argv[i], "MaxSubmitJobs",
MAX(command_len, 4))) {
if(!assoc)
continue;
if (get_uint(argv[i]+end, &assoc->max_submit_jobs,
"MaxSubmitJobs") == SLURM_SUCCESS)
a_set = 1;
- } else if (!strncasecmp (argv[i], "MaxWallDurationPerJob",
+ } else if (!strncasecmp (argv[i], "MaxWallDurationPerJob",
MAX(command_len, 4))) {
if(!assoc)
continue;
@@ -460,11 +460,11 @@ static int _set_rec(int *start, int argc, char *argv[],
a_set = 1;
} else {
exit_code=1;
- fprintf(stderr,
- " Bad MaxWall time format: %s\n",
+ fprintf(stderr,
+ " Bad MaxWall time format: %s\n",
argv[i]);
}
- } else if (!strncasecmp (argv[i], "Organization",
+ } else if (!strncasecmp (argv[i], "Organization",
MAX(command_len, 1))) {
acct->organization = strip_quotes(argv[i]+end, NULL, 1);
u_set = 1;
@@ -474,15 +474,15 @@ static int _set_rec(int *start, int argc, char *argv[],
continue;
assoc->parent_acct = strip_quotes(argv[i]+end, NULL, 1);
a_set = 1;
- } else if (!strncasecmp (argv[i], "QosLevel",
+ } else if (!strncasecmp (argv[i], "QosLevel",
MAX(command_len, 1))) {
if(!assoc)
continue;
- if(!assoc->qos_list)
- assoc->qos_list =
+ if(!assoc->qos_list)
+ assoc->qos_list =
list_create(slurm_destroy_char);
-
- if(!g_qos_list)
+
+ if(!g_qos_list)
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
@@ -534,7 +534,7 @@ static int _isdefault(List acct_list)
user->name, user->default_acct);
}
list_iterator_destroy(itr);
- rc = 1;
+ rc = 1;
}
if(ret_list)
@@ -565,18 +565,18 @@ extern int sacctmgr_add_account(int argc, char *argv[])
acct_account_rec_t *start_acct = xmalloc(sizeof(acct_account_rec_t));
acct_association_rec_t *start_assoc =
xmalloc(sizeof(acct_association_rec_t));
-
+
init_acct_association_rec(start_assoc);
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
- i++;
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
+ i++;
limit_set += _set_rec(&i, argc, argv, name_list, cluster_list,
start_acct, start_assoc);
}
- if(exit_code)
+ if(exit_code)
return SLURM_ERROR;
if(!name_list || !list_count(name_list)) {
@@ -585,7 +585,7 @@ extern int sacctmgr_add_account(int argc, char *argv[])
destroy_acct_association_rec(start_assoc);
destroy_acct_account_rec(start_acct);
exit_code=1;
- fprintf(stderr, " Need name of account to add.\n");
+ fprintf(stderr, " Need name of account to add.\n");
return SLURM_SUCCESS;
} else {
acct_account_cond_t account_cond;
@@ -596,7 +596,7 @@ extern int sacctmgr_add_account(int argc, char *argv[])
account_cond.assoc_cond = &assoc_cond;
local_account_list = acct_storage_g_get_accounts(
- db_conn, my_uid, &account_cond);
+ db_conn, my_uid, &account_cond);
}
if(!local_account_list) {
@@ -619,7 +619,7 @@ extern int sacctmgr_add_account(int argc, char *argv[])
acct_storage_g_get_clusters(db_conn, my_uid, NULL);
if(!tmp_list) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Problem getting clusters from database. "
"Contact your admin.\n");
list_destroy(name_list);
@@ -629,10 +629,10 @@ extern int sacctmgr_add_account(int argc, char *argv[])
list_destroy(local_account_list);
return SLURM_ERROR;
}
-
+
if(!list_count(tmp_list)) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Can't add accounts, no cluster "
"defined yet.\n"
" Please contact your administrator.\n");
@@ -641,7 +641,7 @@ extern int sacctmgr_add_account(int argc, char *argv[])
destroy_acct_association_rec(start_assoc);
destroy_acct_account_rec(start_acct);
list_destroy(local_account_list);
- return SLURM_ERROR;
+ return SLURM_ERROR;
}
if(!cluster_list)
list_create(slurm_destroy_char);
@@ -663,7 +663,7 @@ extern int sacctmgr_add_account(int argc, char *argv[])
temp_list = acct_storage_g_get_clusters(db_conn, my_uid,
&cluster_cond);
-
+
itr_c = list_iterator_create(cluster_list);
itr = list_iterator_create(temp_list);
while((cluster = list_next(itr_c))) {
@@ -696,22 +696,22 @@ extern int sacctmgr_add_account(int argc, char *argv[])
}
}
-
+
acct_list = list_create(destroy_acct_account_rec);
assoc_list = list_create(destroy_acct_association_rec);
-
+
memset(&assoc_cond, 0, sizeof(acct_association_cond_t));
assoc_cond.acct_list = list_create(NULL);
itr = list_iterator_create(name_list);
- while((name = list_next(itr)))
+ while((name = list_next(itr)))
list_append(assoc_cond.acct_list, name);
list_iterator_destroy(itr);
list_append(assoc_cond.acct_list, start_assoc->parent_acct);
assoc_cond.cluster_list = cluster_list;
local_assoc_list = acct_storage_g_get_associations(
- db_conn, my_uid, &assoc_cond);
+ db_conn, my_uid, &assoc_cond);
list_destroy(assoc_cond.acct_list);
if(!local_assoc_list) {
exit_code=1;
@@ -730,17 +730,17 @@ extern int sacctmgr_add_account(int argc, char *argv[])
acct = NULL;
if(!sacctmgr_find_account_from_list(local_account_list, name)) {
acct = xmalloc(sizeof(acct_account_rec_t));
- acct->assoc_list =
- list_create(destroy_acct_association_rec);
+ acct->assoc_list =
+ list_create(destroy_acct_association_rec);
acct->name = xstrdup(name);
- if(start_acct->description)
+ if(start_acct->description)
acct->description =
xstrdup(start_acct->description);
else
acct->description = xstrdup(name);
if(start_acct->organization)
- acct->organization =
+ acct->organization =
xstrdup(start_acct->organization);
else if(strcmp(start_assoc->parent_acct, "root"))
acct->organization =
@@ -795,15 +795,15 @@ extern int sacctmgr_add_account(int argc, char *argv[])
assoc->qos_list = copy_char_list(start_assoc->qos_list);
- if(acct)
+ if(acct)
list_append(acct->assoc_list, assoc);
- else
+ else
list_append(assoc_list, assoc);
xstrfmtcat(assoc_str,
" A = %-10.10s"
" C = %-10.10s\n",
assoc->acct,
- assoc->cluster);
+ assoc->cluster);
}
list_iterator_destroy(itr_c);
@@ -826,11 +826,11 @@ extern int sacctmgr_add_account(int argc, char *argv[])
printf(" Adding Account(s)\n%s", acct_str);
printf(" Settings\n");
if(start_acct->description)
- printf(" Description = %s\n",
+ printf(" Description = %s\n",
start_acct->description);
else
printf(" Description = %s\n", "Account Name");
-
+
if(start_acct->organization)
printf(" Organization = %s\n",
start_acct->organization);
@@ -850,15 +850,15 @@ extern int sacctmgr_add_account(int argc, char *argv[])
printf(" Settings\n");
sacctmgr_print_assoc_limits(start_assoc);
}
-
+
notice_thread_init();
- if(list_count(acct_list))
+ if(list_count(acct_list))
rc = acct_storage_g_add_accounts(db_conn, my_uid, acct_list);
-
+
if(rc == SLURM_SUCCESS) {
- if(list_count(assoc_list))
- rc = acct_storage_g_add_associations(db_conn, my_uid,
+ if(list_count(assoc_list))
+ rc = acct_storage_g_add_associations(db_conn, my_uid,
assoc_list);
} else {
exit_code=1;
@@ -868,7 +868,7 @@ extern int sacctmgr_add_account(int argc, char *argv[])
goto end_it;
}
notice_thread_fini();
-
+
if(rc == SLURM_SUCCESS) {
if(commit_check("Would you like to commit changes?")) {
acct_storage_g_commit(db_conn, 1);
@@ -878,7 +878,7 @@ extern int sacctmgr_add_account(int argc, char *argv[])
}
} else {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" error: Problem adding account associations\n");
rc = SLURM_ERROR;
}
@@ -887,11 +887,11 @@ end_it:
list_destroy(name_list);
list_destroy(cluster_list);
list_destroy(acct_list);
- list_destroy(assoc_list);
-
+ list_destroy(assoc_list);
+
destroy_acct_association_rec(start_assoc);
destroy_acct_account_rec(start_acct);
-
+
return rc;
}
@@ -907,7 +907,7 @@ extern int sacctmgr_list_account(int argc, char *argv[])
acct_account_rec_t *acct = NULL;
acct_association_rec_t *assoc = NULL;
char *object;
-
+
int field_count = 0;
print_field_t *field = NULL;
@@ -948,8 +948,8 @@ extern int sacctmgr_list_account(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
- i++;
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
+ i++;
prev_set = _set_cond(&i, argc, argv, acct_cond, format_list);
cond_set = MAX(cond_set, prev_set);
}
@@ -964,12 +964,12 @@ extern int sacctmgr_list_account(int argc, char *argv[])
slurm_addto_char_list(format_list,
"Cl,ParentN,U,F,GrpJ,GrpN,GrpS,"
"MaxJ,MaxN,MaxS,MaxW,QOS");
-
+
if(acct_cond->with_coords)
slurm_addto_char_list(format_list, "Coord");
-
+
}
-
+
if(!acct_cond->with_assocs && cond_set > 1) {
if(!commit_check("You requested options that are only vaild "
"when querying with the withassoc option.\n"
@@ -978,7 +978,7 @@ extern int sacctmgr_list_account(int argc, char *argv[])
list_destroy(format_list);
destroy_acct_account_cond(acct_cond);
return SLURM_SUCCESS;
- }
+ }
}
print_fields_list = list_create(destroy_print_field);
@@ -988,11 +988,11 @@ extern int sacctmgr_list_account(int argc, char *argv[])
char *tmp_char = NULL;
int command_len = 0;
int newlen = 0;
-
+
if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
- }
+ }
command_len = strlen(object);
@@ -1004,19 +1004,19 @@ extern int sacctmgr_list_account(int argc, char *argv[])
field->name = xstrdup("Account");
field->len = 10;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("Cluster", object,
+ } else if(!strncasecmp("Cluster", object,
MAX(command_len, 2))) {
field->type = PRINT_CLUSTER;
field->name = xstrdup("Cluster");
field->len = 10;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("Coordinators", object,
+ } else if(!strncasecmp("Coordinators", object,
MAX(command_len, 2))) {
field->type = PRINT_COORDS;
field->name = xstrdup("Coordinators");
field->len = 20;
field->print_routine = sacctmgr_print_coord_list;
- } else if(!strncasecmp("Description", object,
+ } else if(!strncasecmp("Description", object,
MAX(command_len, 1))) {
field->type = PRINT_DESC;
field->name = xstrdup("Descr");
@@ -1028,31 +1028,31 @@ extern int sacctmgr_list_account(int argc, char *argv[])
field->name = xstrdup("FairShare");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("GrpCPUMins", object,
+ } else if(!strncasecmp("GrpCPUMins", object,
MAX(command_len, 8))) {
field->type = PRINT_GRPCM;
field->name = xstrdup("GrpCPUMins");
field->len = 11;
field->print_routine = print_fields_uint64;
- } else if(!strncasecmp("GrpCPUs", object,
+ } else if(!strncasecmp("GrpCPUs", object,
MAX(command_len, 8))) {
field->type = PRINT_GRPC;
field->name = xstrdup("GrpCPUs");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("GrpJobs", object,
+ } else if(!strncasecmp("GrpJobs", object,
MAX(command_len, 4))) {
field->type = PRINT_GRPJ;
field->name = xstrdup("GrpJobs");
field->len = 7;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("GrpNodes", object,
+ } else if(!strncasecmp("GrpNodes", object,
MAX(command_len, 4))) {
field->type = PRINT_GRPN;
field->name = xstrdup("GrpNodes");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("GrpSubmitJobs", object,
+ } else if(!strncasecmp("GrpSubmitJobs", object,
MAX(command_len, 4))) {
field->type = PRINT_GRPS;
field->name = xstrdup("GrpSubmit");
@@ -1069,31 +1069,31 @@ extern int sacctmgr_list_account(int argc, char *argv[])
field->name = xstrdup("ID");
field->len = 6;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("MaxCPUMinsPerJob", object,
+ } else if(!strncasecmp("MaxCPUMinsPerJob", object,
MAX(command_len, 7))) {
field->type = PRINT_MAXCM;
field->name = xstrdup("MaxCPUMins");
field->len = 11;
field->print_routine = print_fields_uint64;
- } else if(!strncasecmp("MaxCPUsPerJob", object,
+ } else if(!strncasecmp("MaxCPUsPerJob", object,
MAX(command_len, 7))) {
field->type = PRINT_MAXC;
field->name = xstrdup("MaxCPUs");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("MaxJobs", object,
+ } else if(!strncasecmp("MaxJobs", object,
MAX(command_len, 4))) {
field->type = PRINT_MAXJ;
field->name = xstrdup("MaxJobs");
field->len = 7;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("MaxNodesPerJob", object,
+ } else if(!strncasecmp("MaxNodesPerJob", object,
MAX(command_len, 4))) {
field->type = PRINT_MAXN;
field->name = xstrdup("MaxNodes");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("MaxSubmitJobs", object,
+ } else if(!strncasecmp("MaxSubmitJobs", object,
MAX(command_len, 4))) {
field->type = PRINT_MAXS;
field->name = xstrdup("MaxSubmit");
@@ -1111,25 +1111,25 @@ extern int sacctmgr_list_account(int argc, char *argv[])
field->name = xstrdup("Org");
field->len = 20;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("QOSRAWLevel", object,
+ } else if(!strncasecmp("QOSRAWLevel", object,
MAX(command_len, 4))) {
field->type = PRINT_QOS_RAW;
field->name = xstrdup("QOS_RAW");
field->len = 10;
field->print_routine = print_fields_char_list;
- } else if(!strncasecmp("QOSLevel", object,
+ } else if(!strncasecmp("QOSLevel", object,
MAX(command_len, 1))) {
field->type = PRINT_QOS;
field->name = xstrdup("QOS");
field->len = 20;
field->print_routine = sacctmgr_print_qos_list;
- } else if(!strncasecmp("ParentID", object,
+ } else if(!strncasecmp("ParentID", object,
MAX(command_len, 7))) {
field->type = PRINT_PID;
field->name = xstrdup("Par ID");
field->len = 6;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("ParentName", object,
+ } else if(!strncasecmp("ParentName", object,
MAX(command_len, 7))) {
field->type = PRINT_PNAME;
field->name = xstrdup("Par Name");
@@ -1152,11 +1152,11 @@ extern int sacctmgr_list_account(int argc, char *argv[])
xfree(field);
continue;
}
-
- if(newlen)
+
+ if(newlen)
field->len = newlen;
-
- list_append(print_fields_list, field);
+
+ list_append(print_fields_list, field);
}
list_iterator_destroy(itr);
list_destroy(format_list);
@@ -1167,7 +1167,7 @@ extern int sacctmgr_list_account(int argc, char *argv[])
return SLURM_ERROR;
}
- acct_list = acct_storage_g_get_accounts(db_conn, my_uid, acct_cond);
+ acct_list = acct_storage_g_get_accounts(db_conn, my_uid, acct_cond);
destroy_acct_account_cond(acct_cond);
if(!acct_list) {
@@ -1194,53 +1194,53 @@ extern int sacctmgr_list_account(int argc, char *argv[])
case PRINT_ACCOUNT:
field->print_routine(
field, acct->name,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_CLUSTER:
field->print_routine(
field, assoc->cluster,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_COORDS:
field->print_routine(
field,
acct->coordinators,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_DESC:
field->print_routine(
- field,
+ field,
acct->description,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_FAIRSHARE:
field->print_routine(
- field,
+ field,
assoc->shares_raw,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_GRPCM:
field->print_routine(
field,
assoc->grp_cpu_mins,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_GRPC:
field->print_routine(
field,
assoc->grp_cpus,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_GRPJ:
field->print_routine(
- field,
+ field,
assoc->grp_jobs,
(curr_inx
== field_count));
@@ -1254,7 +1254,7 @@ extern int sacctmgr_list_account(int argc, char *argv[])
break;
case PRINT_GRPS:
field->print_routine(
- field,
+ field,
assoc->grp_submit_jobs,
(curr_inx
== field_count));
@@ -1269,7 +1269,7 @@ extern int sacctmgr_list_account(int argc, char *argv[])
case PRINT_ID:
field->print_routine(
field, assoc->id,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_MAXCM:
@@ -1277,54 +1277,54 @@ extern int sacctmgr_list_account(int argc, char *argv[])
field,
assoc->
max_cpu_mins_pj,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_MAXC:
field->print_routine(
field,
assoc->max_cpus_pj,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_MAXJ:
field->print_routine(
field, assoc->max_jobs,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_MAXN:
field->print_routine(
field, assoc->
max_nodes_pj,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_MAXS:
field->print_routine(
- field,
+ field,
assoc->max_submit_jobs,
(curr_inx ==
field_count));
break;
case PRINT_MAXW:
field->print_routine(
- field,
+ field,
assoc->
max_wall_pj,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_ORG:
field->print_routine(
- field,
+ field,
acct->organization,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_QOS:
if(!g_qos_list) {
- g_qos_list =
+ g_qos_list =
acct_storage_g_get_qos(
db_conn,
my_uid,
@@ -1334,7 +1334,7 @@ extern int sacctmgr_list_account(int argc, char *argv[])
field,
g_qos_list,
assoc->qos_list,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_QOS_RAW:
@@ -1346,35 +1346,35 @@ extern int sacctmgr_list_account(int argc, char *argv[])
break;
case PRINT_PID:
field->print_routine(
- field,
+ field,
assoc->parent_id,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_PNAME:
field->print_routine(
- field,
+ field,
assoc->parent_acct,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_PART:
field->print_routine(
- field,
+ field,
assoc->partition,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_USER:
field->print_routine(
field, assoc->user,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
default:
field->print_routine(
field, NULL,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
}
@@ -1383,7 +1383,7 @@ extern int sacctmgr_list_account(int argc, char *argv[])
list_iterator_reset(itr2);
printf("\n");
}
- list_iterator_destroy(itr3);
+ list_iterator_destroy(itr3);
} else {
int curr_inx = 1;
while((field = list_next(itr2))) {
@@ -1411,7 +1411,7 @@ extern int sacctmgr_list_account(int argc, char *argv[])
case PRINT_USER:
field->print_routine(
field, NULL,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_QOS:
@@ -1423,26 +1423,26 @@ extern int sacctmgr_list_account(int argc, char *argv[])
case PRINT_ACCOUNT:
field->print_routine(
field, acct->name,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_COORDS:
field->print_routine(
field,
acct->coordinators,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_DESC:
field->print_routine(
field, acct->description,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_ORG:
field->print_routine(
field, acct->organization,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
default:
@@ -1469,11 +1469,11 @@ extern int sacctmgr_list_account(int argc, char *argv[])
extern int sacctmgr_modify_account(int argc, char *argv[])
{
int rc = SLURM_SUCCESS;
- acct_account_cond_t *acct_cond =
+ acct_account_cond_t *acct_cond =
xmalloc(sizeof(acct_account_cond_t));
acct_account_rec_t *acct = xmalloc(sizeof(acct_account_rec_t));
acct_association_rec_t *assoc = xmalloc(sizeof(acct_association_rec_t));
-
+
int i=0;
int cond_set = 0, prev_set = 0, rec_set = 0, set = 0;
List ret_list = NULL;
@@ -1485,10 +1485,10 @@ extern int sacctmgr_modify_account(int argc, char *argv[])
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))) {
i++;
prev_set = _set_cond(&i, argc, argv, acct_cond, NULL);
- cond_set = MAX(cond_set, prev_set);
+ cond_set = MAX(cond_set, prev_set);
} else if (!strncasecmp (argv[i], "Set", MAX(command_len, 3))) {
i++;
- prev_set = _set_rec(&i, argc, argv, NULL, NULL,
+ prev_set = _set_rec(&i, argc, argv, NULL, NULL,
acct, assoc);
rec_set = MAX(rec_set, prev_set);
} else {
@@ -1517,14 +1517,14 @@ extern int sacctmgr_modify_account(int argc, char *argv[])
destroy_acct_account_rec(acct);
destroy_acct_association_rec(assoc);
return SLURM_SUCCESS;
- }
+ }
}
notice_thread_init();
if(rec_set == 3 || rec_set == 1) { // process the account changes
if(cond_set == 2) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" There was a problem with your "
"'where' options.\n");
rc = SLURM_ERROR;
@@ -1559,28 +1559,28 @@ assoc_start:
if(cond_set == 1 && !acct_cond->assoc_cond->acct_list) {
rc = SLURM_ERROR;
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" There was a problem with your "
"'where' options.\n");
goto assoc_end;
}
-
+
if(assoc->parent_acct) {
- acct_account_rec_t *acct_rec =
+ acct_account_rec_t *acct_rec =
sacctmgr_find_account(assoc->parent_acct);
if(!acct_rec) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Parent Account %s doesn't exist.\n",
assoc->parent_acct);
- rc = SLURM_ERROR;
+ rc = SLURM_ERROR;
goto assoc_end;
}
}
ret_list = acct_storage_g_modify_associations(
db_conn, my_uid, acct_cond->assoc_cond, assoc);
-
+
if(ret_list && list_count(ret_list)) {
char *object = NULL;
ListIterator itr = list_iterator_create(ret_list);
@@ -1606,7 +1606,7 @@ assoc_end:
notice_thread_fini();
if(set) {
- if(commit_check("Would you like to commit changes?"))
+ if(commit_check("Would you like to commit changes?"))
acct_storage_g_commit(db_conn, 1);
else {
printf(" Changes Discarded\n");
@@ -1615,7 +1615,7 @@ assoc_end:
}
destroy_acct_account_cond(acct_cond);
destroy_acct_account_rec(acct);
- destroy_acct_association_rec(assoc);
+ destroy_acct_association_rec(assoc);
return rc;
}
@@ -1629,19 +1629,19 @@ extern int sacctmgr_delete_account(int argc, char *argv[])
List ret_list = NULL;
ListIterator itr = NULL;
int cond_set = 0, prev_set = 0;
-
+
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
- i++;
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
+ i++;
prev_set = _set_cond(&i, argc, argv, acct_cond, NULL);
cond_set = MAX(cond_set, prev_set);
}
if(!cond_set) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" No conditions given to remove, not executing.\n");
destroy_acct_account_cond(acct_cond);
return SLURM_ERROR;
@@ -1660,7 +1660,7 @@ extern int sacctmgr_delete_account(int argc, char *argv[])
char *tmp_char = NULL;
itr = list_iterator_create(acct_cond->assoc_cond->acct_list);
while((tmp_char = list_next(itr))) {
- if(!strcasecmp(tmp_char, "root"))
+ if(!strcasecmp(tmp_char, "root"))
break;
}
list_iterator_destroy(itr);
@@ -1677,14 +1677,14 @@ extern int sacctmgr_delete_account(int argc, char *argv[])
notice_thread_init();
if(cond_set == 1) {
ret_list = acct_storage_g_remove_accounts(
- db_conn, my_uid, acct_cond);
+ db_conn, my_uid, acct_cond);
} else if(cond_set == 2 || cond_set == 3) {
ret_list = acct_storage_g_remove_associations(
db_conn, my_uid, acct_cond->assoc_cond);
}
notice_thread_fini();
destroy_acct_account_cond(acct_cond);
-
+
if(ret_list && list_count(ret_list)) {
char *object = NULL;
ListIterator itr = NULL;
@@ -1701,7 +1701,7 @@ extern int sacctmgr_delete_account(int argc, char *argv[])
" Changes Discarded\n");
list_destroy(ret_list);
acct_storage_g_commit(db_conn, 0);
- return SLURM_ERROR;
+ return SLURM_ERROR;
}
itr = list_iterator_create(ret_list);
if(cond_set == 1) {
@@ -1725,7 +1725,7 @@ extern int sacctmgr_delete_account(int argc, char *argv[])
exit_code=1;
fprintf(stderr, " Error with request\n");
rc = SLURM_ERROR;
- }
+ }
if(ret_list)
list_destroy(ret_list);
diff --git a/src/sacctmgr/archive_functions.c b/src/sacctmgr/archive_functions.c
index 134cd96d1b8c441d8c4f6de4d9e1131a76c01427..ba57aaddd2d3e81cabc9bb47c815e1f9ab034acd 100644
--- a/src/sacctmgr/archive_functions.c
+++ b/src/sacctmgr/archive_functions.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -79,7 +79,7 @@ extern int _addto_uid_char_list(List char_list, char *names)
if (!isdigit((int) *name)) {
struct passwd *pwd;
if (!(pwd=getpwnam(name))) {
- fprintf(stderr,
+ fprintf(stderr,
"Invalid user "
"id: %s\n",
name);
@@ -89,7 +89,7 @@ extern int _addto_uid_char_list(List char_list, char *names)
name = xstrdup_printf(
"%d", pwd->pw_uid);
}
-
+
while((tmp_char = list_next(itr))) {
if(!strcasecmp(tmp_char, name))
break;
@@ -98,7 +98,7 @@ extern int _addto_uid_char_list(List char_list, char *names)
if(!tmp_char) {
list_append(char_list, name);
count++;
- } else
+ } else
xfree(name);
list_iterator_reset(itr);
}
@@ -116,11 +116,11 @@ extern int _addto_uid_char_list(List char_list, char *names)
if((i-start) > 0) {
name = xmalloc((i-start)+1);
memcpy(name, names+start, (i-start));
-
+
if (!isdigit((int) *name)) {
struct passwd *pwd;
if (!(pwd=getpwnam(name))) {
- fprintf(stderr,
+ fprintf(stderr,
"Invalid user id: %s\n",
name);
exit(1);
@@ -128,22 +128,22 @@ extern int _addto_uid_char_list(List char_list, char *names)
xfree(name);
name = xstrdup_printf("%d", pwd->pw_uid);
}
-
+
while((tmp_char = list_next(itr))) {
if(!strcasecmp(tmp_char, name))
break;
}
-
+
if(!tmp_char) {
list_append(char_list, name);
count++;
- } else
+ } else
xfree(name);
}
- }
+ }
list_iterator_destroy(itr);
return count;
-}
+}
static int _set_cond(int *start, int argc, char *argv[],
acct_archive_cond_t *arch_cond)
@@ -194,13 +194,13 @@ static int _set_cond(int *start, int argc, char *argv[],
MAX(command_len, 1))) {
arch_cond->archive_suspend = 1;
set = 1;
- } else if(!end
+ } else if(!end
|| !strncasecmp (argv[i], "Clusters",
MAX(command_len, 1))) {
slurm_addto_char_list(job_cond->cluster_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp (argv[i], "Accounts",
+ } else if (!strncasecmp (argv[i], "Accounts",
MAX(command_len, 2))) {
if(!job_cond->acct_list)
job_cond->acct_list =
@@ -240,7 +240,7 @@ static int _set_cond(int *start, int argc, char *argv[],
job_cond->step_list =
list_create(slurm_destroy_char);
- while ((end_char = strstr(start_char, ","))
+ while ((end_char = strstr(start_char, ","))
&& start_char) {
*end_char = 0;
while (isspace(*start_char))
@@ -250,7 +250,7 @@ static int _set_cond(int *start, int argc, char *argv[],
selected_step = xmalloc(
sizeof(jobacct_selected_step_t));
list_append(job_cond->step_list, selected_step);
-
+
dot = strstr(start_char, ".");
if (dot == NULL) {
debug2("No jobstep requested");
@@ -262,7 +262,7 @@ static int _set_cond(int *start, int argc, char *argv[],
selected_step->jobid = atoi(start_char);
start_char = end_char + 1;
}
-
+
set = 1;
} else if (!strncasecmp (argv[i], "Partitions",
MAX(command_len, 2))) {
@@ -310,7 +310,7 @@ static int _set_cond(int *start, int argc, char *argv[],
set = 1;
} else if (!strncasecmp (argv[i], "Script",
MAX(command_len, 2))) {
- arch_cond->archive_script =
+ arch_cond->archive_script =
strip_quotes(argv[i]+end, NULL, 0);
set = 1;
} else if (!strncasecmp (argv[i], "Users",
@@ -325,7 +325,7 @@ static int _set_cond(int *start, int argc, char *argv[],
exit_code=1;
fprintf(stderr, " Unknown condition: %s\n", argv[i]);
}
- }
+ }
(*start) = i;
@@ -351,16 +351,16 @@ extern int sacctmgr_archive_dump(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
- i++;
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
+ i++;
_set_cond(&i, argc, argv, arch_cond);
}
if(exit_code) {
destroy_acct_archive_cond(arch_cond);
return SLURM_ERROR;
- }
-
+ }
+
if (arch_cond->archive_dir) {
if(stat(arch_cond->archive_dir, &st) < 0) {
exit_code = errno;
@@ -379,7 +379,7 @@ extern int sacctmgr_archive_dump(int argc, char *argv[])
arch_cond->archive_dir);
return SLURM_ERROR;
}
-
+
if (access(arch_cond->archive_dir, W_OK) < 0) {
errno = EACCES;
fprintf(stderr, " dump: "
@@ -405,7 +405,7 @@ extern int sacctmgr_archive_dump(int argc, char *argv[])
arch_cond->archive_script);
return SLURM_ERROR;
}
-
+
if (access(arch_cond->archive_script, X_OK) < 0) {
errno = EACCES;
fprintf(stderr, " dump: "
@@ -429,7 +429,7 @@ extern int sacctmgr_archive_dump(int argc, char *argv[])
rc = SLURM_ERROR;
}
destroy_acct_archive_cond(arch_cond);
-
+
return rc;
}
@@ -451,39 +451,39 @@ extern int sacctmgr_archive_load(int argc, char *argv[])
end++;
}
}
-
+
if(!end
|| !strncasecmp (argv[i], "File", MAX(command_len, 1))) {
arch_rec->archive_file =
strip_quotes(argv[i]+end, NULL, 0);
- } else if (!strncasecmp (argv[i], "Insert",
+ } else if (!strncasecmp (argv[i], "Insert",
MAX(command_len, 2))) {
arch_rec->insert = strip_quotes(argv[i]+end, NULL, 1);
} else {
exit_code=1;
fprintf(stderr, " Unknown option: %s\n", argv[i]);
- }
+ }
}
-
+
if(exit_code) {
destroy_acct_archive_rec(arch_rec);
return SLURM_ERROR;
- }
-
+ }
+
if (arch_rec->archive_file) {
char *fullpath;
char cwd[MAXPATHLEN + 1];
int mode = R_OK;
- if ((getcwd(cwd, MAXPATHLEN)) == NULL)
- fatal("getcwd failed: %m");
-
+ if ((getcwd(cwd, MAXPATHLEN)) == NULL)
+ fatal("getcwd failed: %m");
+
if ((fullpath = search_path(cwd, arch_rec->archive_file,
true, mode))) {
xfree(arch_rec->archive_file);
arch_rec->archive_file = fullpath;
- }
-
+ }
+
if(stat(arch_rec->archive_file, &st) < 0) {
exit_code = errno;
fprintf(stderr, " load: Failed to stat %s: %m\n "
@@ -509,6 +509,6 @@ extern int sacctmgr_archive_load(int argc, char *argv[])
}
destroy_acct_archive_rec(arch_rec);
-
+
return rc;
}
diff --git a/src/sacctmgr/association_functions.c b/src/sacctmgr/association_functions.c
index 43b1367bacc0c1cdefdb7b59447c9d903049296f..dee7052a38542e81a5c36f04f359f7064b196a7f 100644
--- a/src/sacctmgr/association_functions.c
+++ b/src/sacctmgr/association_functions.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -61,21 +61,21 @@ static int _set_cond(int *start, int argc, char *argv[],
}
}
- if (!end && !strncasecmp (argv[i], "Tree",
+ if (!end && !strncasecmp (argv[i], "Tree",
MAX(command_len, 4))) {
tree_display = 1;
} else if (!end && !strncasecmp (argv[i], "WithDeleted",
MAX(command_len, 5))) {
assoc_cond->with_deleted = 1;
- } else if (!end &&
+ } else if (!end &&
!strncasecmp (argv[i], "WithRawQOSLevel",
MAX(command_len, 5))) {
assoc_cond->with_raw_qos = 1;
- } else if (!end &&
+ } else if (!end &&
!strncasecmp (argv[i], "WithSubAccounts",
MAX(command_len, 5))) {
assoc_cond->with_sub_accts = 1;
- } else if (!end && !strncasecmp (argv[i], "WOPInfo",
+ } else if (!end && !strncasecmp (argv[i], "WOPInfo",
MAX(command_len, 4))) {
assoc_cond->without_parent_info = 1;
} else if (!end && !strncasecmp (argv[i], "WOPLimits",
@@ -85,19 +85,19 @@ static int _set_cond(int *start, int argc, char *argv[],
MAX(command_len, 3))) {
without_limits = 1;
assoc_cond->without_parent_limits = 1;
- } else if(!end && !strncasecmp(argv[i], "where",
+ } else if(!end && !strncasecmp(argv[i], "where",
MAX(command_len, 5))) {
continue;
- } else if(!end || !strncasecmp (argv[i], "Ids",
+ } else if(!end || !strncasecmp (argv[i], "Ids",
MAX(command_len, 1))
- || !strncasecmp (argv[i], "Associations",
+ || !strncasecmp (argv[i], "Associations",
MAX(command_len, 2))) {
ListIterator itr = NULL;
char *temp = NULL;
uint32_t id = 0;
if(!assoc_cond->id_list)
- assoc_cond->id_list =
+ assoc_cond->id_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->id_list,
argv[i]+end);
@@ -117,7 +117,7 @@ static int _set_cond(int *start, int argc, char *argv[],
|| !strncasecmp (argv[i], "Acct",
MAX(command_len, 4))) {
if(!assoc_cond->acct_list)
- assoc_cond->acct_list =
+ assoc_cond->acct_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->acct_list,
argv[i]+end);
@@ -125,7 +125,7 @@ static int _set_cond(int *start, int argc, char *argv[],
} else if (!strncasecmp (argv[i], "Clusters",
MAX(command_len, 1))) {
if(!assoc_cond->cluster_list)
- assoc_cond->cluster_list =
+ assoc_cond->cluster_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->cluster_list,
argv[i]+end);
@@ -249,10 +249,10 @@ static int _set_cond(int *start, int argc, char *argv[],
assoc_cond->max_wall_pj_list,
argv[i]+end))
set = 1;
- } else if (!strncasecmp (argv[i], "Partitions",
+ } else if (!strncasecmp (argv[i], "Partitions",
MAX(command_len, 4))) {
if(!assoc_cond->partition_list)
- assoc_cond->partition_list =
+ assoc_cond->partition_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->partition_list,
argv[i]+end);
@@ -260,7 +260,7 @@ static int _set_cond(int *start, int argc, char *argv[],
} else if (!strncasecmp (argv[i], "Parent",
MAX(command_len, 4))) {
if(!assoc_cond->parent_acct_list) {
- assoc_cond->parent_acct_list =
+ assoc_cond->parent_acct_list =
list_create(slurm_destroy_char);
}
if(slurm_addto_char_list(assoc_cond->parent_acct_list,
@@ -269,15 +269,15 @@ static int _set_cond(int *start, int argc, char *argv[],
} else if (!strncasecmp (argv[i], "QosLevel",
MAX(command_len, 1))) {
if(!assoc_cond->qos_list) {
- assoc_cond->qos_list =
+ assoc_cond->qos_list =
list_create(slurm_destroy_char);
}
-
+
if(!g_qos_list) {
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
}
-
+
if(addto_qos_char_list(assoc_cond->qos_list, g_qos_list,
argv[i]+end, option))
set = 1;
@@ -286,7 +286,7 @@ static int _set_cond(int *start, int argc, char *argv[],
} else if (!strncasecmp (argv[i], "Users",
MAX(command_len, 1))) {
if(!assoc_cond->user_list)
- assoc_cond->user_list =
+ assoc_cond->user_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->user_list,
argv[i]+end);
@@ -354,8 +354,8 @@ extern int sacctmgr_list_association(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
- i++;
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
+ i++;
_set_cond(&i, argc, argv, assoc_cond, format_list);
}
@@ -365,7 +365,7 @@ extern int sacctmgr_list_association(int argc, char *argv[])
return SLURM_ERROR;
} else if(!list_count(format_list)) {
slurm_addto_char_list(format_list, "C,A,U,Part");
- if(!without_limits)
+ if(!without_limits)
slurm_addto_char_list(format_list,
"F,GrpCPUMins,GrpJ,GrpN,"
"GrpS,GrpWall,"
@@ -378,14 +378,14 @@ extern int sacctmgr_list_association(int argc, char *argv[])
char *tmp_char = NULL;
int command_len = 0;
int newlen = 0;
-
+
if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
- }
+ }
command_len = strlen(object);
-
+
field = xmalloc(sizeof(print_field_t));
if(!strncasecmp("Account", object, MAX(command_len, 1))
@@ -415,13 +415,13 @@ extern int sacctmgr_list_association(int argc, char *argv[])
field->name = xstrdup("GrpCPUMins");
field->len = 11;
field->print_routine = print_fields_uint64;
- } else if(!strncasecmp("GrpCPUs", object,
+ } else if(!strncasecmp("GrpCPUs", object,
MAX(command_len, 8))) {
field->type = PRINT_GRPC;
field->name = xstrdup("GrpCPUs");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("GrpJobs", object,
+ } else if(!strncasecmp("GrpJobs", object,
MAX(command_len, 4))) {
field->type = PRINT_GRPJ;
field->name = xstrdup("GrpJobs");
@@ -473,7 +473,7 @@ extern int sacctmgr_list_association(int argc, char *argv[])
field->name = xstrdup("MaxJobs");
field->len = 7;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("MaxNodesPerJob", object,
+ } else if(!strncasecmp("MaxNodesPerJob", object,
MAX(command_len, 4))) {
field->type = PRINT_MAXN;
field->name = xstrdup("MaxNodes");
@@ -545,10 +545,10 @@ extern int sacctmgr_list_association(int argc, char *argv[])
continue;
}
- if(newlen)
+ if(newlen)
field->len = newlen;
-
- list_append(print_fields_list, field);
+
+ list_append(print_fields_list, field);
}
list_iterator_destroy(itr);
list_destroy(format_list);
@@ -584,11 +584,11 @@ extern int sacctmgr_list_association(int argc, char *argv[])
if(tree_list) {
list_flush(tree_list);
} else {
- tree_list =
+ tree_list =
list_create(destroy_acct_print_tree);
}
last_cluster = assoc->cluster;
- }
+ }
while((field = list_next(itr2))) {
switch(field->type) {
case PRINT_ACCOUNT:
@@ -602,7 +602,7 @@ extern int sacctmgr_list_association(int argc, char *argv[])
} else {
local_acct =
xstrdup(assoc->acct);
- parent_acct =
+ parent_acct =
assoc->parent_acct;
}
print_acct = get_tree_acct_name(
@@ -613,7 +613,7 @@ extern int sacctmgr_list_association(int argc, char *argv[])
print_acct = assoc->acct;
}
field->print_routine(
- field,
+ field,
print_acct,
(curr_inx == field_count));
break;
@@ -641,7 +641,7 @@ extern int sacctmgr_list_association(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_GRPJ:
- field->print_routine(field,
+ field->print_routine(field,
assoc->grp_jobs,
(curr_inx == field_count));
break;
@@ -651,7 +651,7 @@ extern int sacctmgr_list_association(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_GRPS:
- field->print_routine(field,
+ field->print_routine(field,
assoc->grp_submit_jobs,
(curr_inx == field_count));
break;
@@ -662,12 +662,12 @@ extern int sacctmgr_list_association(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_ID:
- field->print_routine(field,
+ field->print_routine(field,
assoc->id,
(curr_inx == field_count));
break;
case PRINT_LFT:
- field->print_routine(field,
+ field->print_routine(field,
assoc->lft,
(curr_inx == field_count));
break;
@@ -683,7 +683,7 @@ extern int sacctmgr_list_association(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_MAXJ:
- field->print_routine(field,
+ field->print_routine(field,
assoc->max_jobs,
(curr_inx == field_count));
break;
@@ -693,7 +693,7 @@ extern int sacctmgr_list_association(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_MAXS:
- field->print_routine(field,
+ field->print_routine(field,
assoc->max_submit_jobs,
(curr_inx == field_count));
break;
@@ -719,10 +719,10 @@ extern int sacctmgr_list_association(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_QOS:
- if(!g_qos_list)
+ if(!g_qos_list)
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
-
+
field->print_routine(field,
g_qos_list,
assoc->qos_list,
@@ -734,12 +734,12 @@ extern int sacctmgr_list_association(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_RGT:
- field->print_routine(field,
+ field->print_routine(field,
assoc->rgt,
(curr_inx == field_count));
break;
case PRINT_USER:
- field->print_routine(field,
+ field->print_routine(field,
assoc->user,
(curr_inx == field_count));
break;
@@ -755,9 +755,9 @@ extern int sacctmgr_list_association(int argc, char *argv[])
printf("\n");
}
- if(tree_list)
+ if(tree_list)
list_destroy(tree_list);
-
+
list_iterator_destroy(itr2);
list_iterator_destroy(itr);
list_destroy(first_list);
diff --git a/src/sacctmgr/cluster_functions.c b/src/sacctmgr/cluster_functions.c
index dd33b048b8e178889cc5594f274ef41be4c26cee..29e3f980903e3638e99976aae7ecff12fb1e0bb7 100644
--- a/src/sacctmgr/cluster_functions.c
+++ b/src/sacctmgr/cluster_functions.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -83,10 +83,10 @@ static int _set_cond(int *start, int argc, char *argv[],
argv[i]+end))
set = 1;
}
- } else if (!strncasecmp (argv[i], "Classification",
+ } else if (!strncasecmp (argv[i], "Classification",
MAX(command_len, 3))) {
if(classification) {
- *classification =
+ *classification =
str_2_classification(argv[i]+end);
if(*classification)
set = 1;
@@ -129,34 +129,34 @@ static int _set_rec(int *start, int argc, char *argv[],
end++;
}
}
-
+
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))) {
i--;
break;
- } else if(!end && !strncasecmp(argv[i], "set",
+ } else if(!end && !strncasecmp(argv[i], "set",
MAX(command_len, 3))) {
continue;
} else if(!end
|| !strncasecmp (argv[i], "Names",
- MAX(command_len, 1))
- || !strncasecmp (argv[i], "Clusters",
+ MAX(command_len, 1))
+ || !strncasecmp (argv[i], "Clusters",
MAX(command_len, 3))) {
if(name_list)
slurm_addto_char_list(name_list,
argv[i]+end);
- } else if (!strncasecmp (argv[i], "Classification",
+ } else if (!strncasecmp (argv[i], "Classification",
MAX(command_len, 3))) {
if(classification) {
- *classification =
+ *classification =
str_2_classification(argv[i]+end);
if(*classification)
set = 1;
}
- } else if (!strncasecmp (argv[i], "FairShare",
+ } else if (!strncasecmp (argv[i], "FairShare",
MAX(command_len, 1))
|| !strncasecmp (argv[i], "Shares",
MAX(command_len, 1))) {
- if (get_uint(argv[i]+end, &assoc->shares_raw,
+ if (get_uint(argv[i]+end, &assoc->shares_raw,
"FairShare") == SLURM_SUCCESS)
set = 1;
} else if (!strncasecmp (argv[i], "GrpCPUMins",
@@ -164,13 +164,13 @@ static int _set_rec(int *start, int argc, char *argv[],
exit_code=1;
fprintf(stderr, "GrpCPUMins is not a valid option "
"for the root association of a cluster.\n");
- break;
+ break;
} else if (!strncasecmp (argv[i], "GrpCpus",
MAX(command_len, 7))) {
if (get_uint(argv[i]+end, &assoc->grp_cpus,
"GrpCpus") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp (argv[i], "GrpJobs",
+ } else if (!strncasecmp (argv[i], "GrpJobs",
MAX(command_len, 4))) {
if (get_uint(argv[i]+end, &assoc->grp_jobs,
"GrpJobs") == SLURM_SUCCESS)
@@ -192,11 +192,11 @@ static int _set_rec(int *start, int argc, char *argv[],
"for the root association of a cluster.\n");
} else if (!strncasecmp (argv[i], "MaxCPUMinsPerJob",
MAX(command_len, 7))) {
- if (get_uint64(argv[i]+end,
- &assoc->max_cpu_mins_pj,
+ if (get_uint64(argv[i]+end,
+ &assoc->max_cpu_mins_pj,
"MaxCPUMins") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp (argv[i], "MaxCpusPerJob",
+ } else if (!strncasecmp (argv[i], "MaxCpusPerJob",
MAX(command_len, 7))) {
if (get_uint(argv[i]+end, &assoc->max_cpus_pj,
"MaxCpus") == SLURM_SUCCESS)
@@ -208,7 +208,7 @@ static int _set_rec(int *start, int argc, char *argv[],
set = 1;
} else if (!strncasecmp (argv[i], "MaxNodesPerJob",
MAX(command_len, 4))) {
- if (get_uint(argv[i]+end,
+ if (get_uint(argv[i]+end,
&assoc->max_nodes_pj,
"MaxNodes") == SLURM_SUCCESS)
set = 1;
@@ -217,7 +217,7 @@ static int _set_rec(int *start, int argc, char *argv[],
if (get_uint(argv[i]+end, &assoc->max_submit_jobs,
"MaxSubmitJobs") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp (argv[i], "MaxWallDurationPerJob",
+ } else if (!strncasecmp (argv[i], "MaxWallDurationPerJob",
MAX(command_len, 4))) {
mins = time_str2mins(argv[i]+end);
if (mins != NO_VAL) {
@@ -225,20 +225,20 @@ static int _set_rec(int *start, int argc, char *argv[],
set = 1;
} else {
exit_code=1;
- fprintf(stderr,
- " Bad MaxWall time format: %s\n",
+ fprintf(stderr,
+ " Bad MaxWall time format: %s\n",
argv[i]);
}
- } else if (!strncasecmp (argv[i], "QOSLevel",
+ } else if (!strncasecmp (argv[i], "QOSLevel",
MAX(command_len, 1))) {
- if(!assoc->qos_list)
- assoc->qos_list =
+ if(!assoc->qos_list)
+ assoc->qos_list =
list_create(slurm_destroy_char);
-
- if(!g_qos_list)
+
+ if(!g_qos_list)
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
-
+
if(addto_qos_char_list(assoc->qos_list,
g_qos_list, argv[i]+end, option))
set = 1;
@@ -277,8 +277,8 @@ extern int sacctmgr_add_cluster(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
- i++;
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
+ i++;
limit_set += _set_rec(&i, argc, argv,
name_list, &start_assoc, &class);
}
@@ -288,7 +288,7 @@ extern int sacctmgr_add_cluster(int argc, char *argv[])
} else if(!list_count(name_list)) {
list_destroy(name_list);
exit_code=1;
- fprintf(stderr, " Need name of cluster to add.\n");
+ fprintf(stderr, " Need name of cluster to add.\n");
return SLURM_ERROR;
} else {
List temp_list = NULL;
@@ -339,7 +339,7 @@ extern int sacctmgr_add_cluster(int argc, char *argv[])
itr = list_iterator_create(name_list);
while((name = list_next(itr))) {
cluster = xmalloc(sizeof(acct_cluster_rec_t));
-
+
list_append(cluster_list, cluster);
cluster->name = xstrdup(name);
cluster->classification = class;
@@ -351,14 +351,14 @@ extern int sacctmgr_add_cluster(int argc, char *argv[])
get_classification_str(cluster->classification));
cluster->root_assoc->shares_raw = start_assoc.shares_raw;
-
+
cluster->root_assoc->grp_cpus = start_assoc.grp_cpus;
cluster->root_assoc->grp_jobs = start_assoc.grp_jobs;
cluster->root_assoc->grp_nodes = start_assoc.grp_nodes;
cluster->root_assoc->grp_submit_jobs =
start_assoc.grp_submit_jobs;
- cluster->root_assoc->max_cpu_mins_pj =
+ cluster->root_assoc->max_cpu_mins_pj =
start_assoc.max_cpu_mins_pj;
cluster->root_assoc->max_cpus_pj = start_assoc.max_cpus_pj;
cluster->root_assoc->max_jobs = start_assoc.max_jobs;
@@ -367,7 +367,7 @@ extern int sacctmgr_add_cluster(int argc, char *argv[])
start_assoc.max_submit_jobs;
cluster->root_assoc->max_wall_pj = start_assoc.max_wall_pj;
- cluster->root_assoc->qos_list =
+ cluster->root_assoc->qos_list =
copy_char_list(start_assoc.qos_list);
}
list_iterator_destroy(itr);
@@ -401,7 +401,7 @@ extern int sacctmgr_add_cluster(int argc, char *argv[])
}
end_it:
list_destroy(cluster_list);
-
+
return rc;
}
@@ -447,7 +447,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
PRINT_NODES,
PRINT_QOS,
PRINT_QOS_RAW,
- PRINT_RPC_VERSION
+ PRINT_RPC_VERSION
};
@@ -455,9 +455,9 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
i++;
- _set_cond(&i, argc, argv, cluster_cond->cluster_list,
+ _set_cond(&i, argc, argv, cluster_cond->cluster_list,
format_list,
&cluster_cond->classification);
}
@@ -471,10 +471,10 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
print_fields_list = list_create(destroy_print_field);
if(!list_count(format_list)) {
- slurm_addto_char_list(format_list,
+ slurm_addto_char_list(format_list,
"Cl,Controlh,Controlp,RPC");
- if(!without_limits)
- slurm_addto_char_list(format_list,
+ if(!without_limits)
+ slurm_addto_char_list(format_list,
"F,GrpJ,GrpN,GrpS,MaxJ,MaxN,"
"MaxS,MaxW,QOS");
}
@@ -484,11 +484,11 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
char *tmp_char = NULL;
int command_len = 0;
int newlen = 0;
-
+
if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
- }
+ }
command_len = strlen(object);
@@ -523,13 +523,13 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
field->name = xstrdup("CPUCount");
field->len = 9;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("FairShare", object,
+ } else if(!strncasecmp("FairShare", object,
MAX(command_len, 1))) {
field->type = PRINT_FAIRSHARE;
field->name = xstrdup("FairShare");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("GrpCPUs", object,
+ } else if(!strncasecmp("GrpCPUs", object,
MAX(command_len, 8))) {
field->type = PRINT_GRPC;
field->name = xstrdup("GrpCPUs");
@@ -571,7 +571,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
field->name = xstrdup("MaxJobs");
field->len = 7;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("MaxNodesPerJob", object,
+ } else if(!strncasecmp("MaxNodesPerJob", object,
MAX(command_len, 4))) {
field->type = PRINT_MAXN;
field->name = xstrdup("MaxNodes");
@@ -583,7 +583,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
field->name = xstrdup("MaxSubmit");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("MaxWallDurationPerJob", object,
+ } else if(!strncasecmp("MaxWallDurationPerJob", object,
MAX(command_len, 4))) {
field->type = PRINT_MAXW;
field->name = xstrdup("MaxWall");
@@ -601,7 +601,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
field->name = xstrdup("NodeNames");
field->len = 20;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("QOSRAWLevel", object,
+ } else if(!strncasecmp("QOSRAWLevel", object,
MAX(command_len, 4))) {
field->type = PRINT_QOS_RAW;
field->name = xstrdup("QOS_RAW");
@@ -618,7 +618,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
field->name = xstrdup("RPC");
field->len = 3;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("Shares", object,
+ } else if(!strncasecmp("Shares", object,
MAX(command_len, 1))) {
field->type = PRINT_FAIRSHARE;
field->name = xstrdup("Shares");
@@ -630,11 +630,11 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
xfree(field);
continue;
}
-
- if(newlen)
+
+ if(newlen)
field->len = newlen;
-
- list_append(print_fields_list, field);
+
+ list_append(print_fields_list, field);
}
list_iterator_destroy(itr);
list_destroy(format_list);
@@ -648,7 +648,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
cluster_list = acct_storage_g_get_clusters(db_conn, my_uid,
cluster_cond);
destroy_acct_cluster_cond(cluster_cond);
-
+
if(!cluster_list) {
exit_code=1;
fprintf(stderr, " Problem with query.\n");
@@ -712,7 +712,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_GRPJ:
- field->print_routine(field,
+ field->print_routine(field,
assoc->grp_jobs,
(curr_inx == field_count));
break;
@@ -722,7 +722,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_GRPS:
- field->print_routine(field,
+ field->print_routine(field,
assoc->grp_submit_jobs,
(curr_inx == field_count));
break;
@@ -738,7 +738,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_MAXJ:
- field->print_routine(field,
+ field->print_routine(field,
assoc->max_jobs,
(curr_inx == field_count));
break;
@@ -748,7 +748,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_MAXS:
- field->print_routine(field,
+ field->print_routine(field,
assoc->max_submit_jobs,
(curr_inx == field_count));
break;
@@ -758,7 +758,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
assoc->max_wall_pj,
(curr_inx == field_count));
break;
-
+
case PRINT_NODECNT:
{
hostlist_t hl = hostlist_create(cluster->nodes);
@@ -772,19 +772,19 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
cnt,
(curr_inx == field_count));
break;
- }
+ }
case PRINT_NODES:
field->print_routine(
field,
cluster->nodes,
(curr_inx == field_count));
break;
-
+
case PRINT_QOS:
- if(!g_qos_list)
+ if(!g_qos_list)
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
-
+
field->print_routine(field,
g_qos_list,
assoc->qos_list,
@@ -870,13 +870,13 @@ extern int sacctmgr_modify_cluster(int argc, char *argv[])
destroy_acct_association_rec(assoc);
destroy_acct_association_cond(assoc_cond);
return SLURM_SUCCESS;
- }
+ }
} else if(exit_code) {
destroy_acct_association_rec(assoc);
destroy_acct_association_cond(assoc_cond);
- return SLURM_ERROR;
+ return SLURM_ERROR;
}
-
+
if(class_cond) {
List temp_list = NULL;
acct_cluster_cond_t cluster_cond;
@@ -884,7 +884,7 @@ extern int sacctmgr_modify_cluster(int argc, char *argv[])
memset(&cluster_cond, 0, sizeof(acct_cluster_cond_t));
cluster_cond.cluster_list = assoc_cond->cluster_list;
cluster_cond.classification = class_cond;
-
+
temp_list = acct_storage_g_get_clusters(db_conn, my_uid,
&cluster_cond);
if(!temp_list) {
@@ -898,7 +898,7 @@ extern int sacctmgr_modify_cluster(int argc, char *argv[])
} else if(!list_count(temp_list)) {
fprintf(stderr,
" The class you gave %s didn't "
- "return any clusters.\n",
+ "return any clusters.\n",
get_classification_str(class_cond));
destroy_acct_association_rec(assoc);
destroy_acct_association_cond(assoc_cond);
@@ -912,13 +912,13 @@ extern int sacctmgr_modify_cluster(int argc, char *argv[])
list_destroy(assoc_cond->cluster_list);
assoc_cond->cluster_list = temp_list;
}
-
+
printf(" Setting\n");
if(rec_set) {
printf(" Default Limits =\n");
sacctmgr_print_assoc_limits(assoc);
- if(class_rec)
- printf(" Cluster Classification = %s\n",
+ if(class_rec)
+ printf(" Cluster Classification = %s\n",
get_classification_str(class_rec));
}
@@ -926,7 +926,7 @@ extern int sacctmgr_modify_cluster(int argc, char *argv[])
notice_thread_init();
ret_list = acct_storage_g_modify_associations(
db_conn, my_uid, assoc_cond, assoc);
-
+
if(ret_list && list_count(ret_list)) {
char *object = NULL;
ListIterator itr = list_iterator_create(ret_list);
@@ -950,7 +950,7 @@ extern int sacctmgr_modify_cluster(int argc, char *argv[])
if(class_rec) {
acct_cluster_cond_t cluster_cond;
acct_cluster_rec_t cluster_rec;
-
+
memset(&cluster_cond, 0, sizeof(acct_cluster_cond_t));
memset(&cluster_rec, 0, sizeof(acct_cluster_rec_t));
/* the class has already returned these clusters so
@@ -961,7 +961,7 @@ extern int sacctmgr_modify_cluster(int argc, char *argv[])
ret_list = acct_storage_g_modify_clusters(
db_conn, my_uid, &cluster_cond, &cluster_rec);
-
+
if(ret_list && list_count(ret_list)) {
char *object = NULL;
ListIterator itr = list_iterator_create(ret_list);
@@ -978,7 +978,7 @@ extern int sacctmgr_modify_cluster(int argc, char *argv[])
fprintf(stderr, " Error with request\n");
rc = SLURM_ERROR;
}
-
+
if(ret_list)
list_destroy(ret_list);
}
@@ -986,7 +986,7 @@ extern int sacctmgr_modify_cluster(int argc, char *argv[])
notice_thread_fini();
if(set) {
- if(commit_check("Would you like to commit changes?"))
+ if(commit_check("Would you like to commit changes?"))
acct_storage_g_commit(db_conn, 1);
else {
printf(" Changes Discarded\n");
@@ -1009,14 +1009,14 @@ extern int sacctmgr_delete_cluster(int argc, char *argv[])
int cond_set = 0;
cluster_cond->cluster_list = list_create(slurm_destroy_char);
-
+
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
i++;
cond_set += _set_cond(&i, argc, argv,
- cluster_cond->cluster_list,
+ cluster_cond->cluster_list,
NULL,
&cluster_cond->classification);
}
@@ -1026,16 +1026,16 @@ extern int sacctmgr_delete_cluster(int argc, char *argv[])
return SLURM_ERROR;
} else if(!cond_set) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" No conditions given to remove, not executing.\n");
destroy_acct_cluster_cond(cluster_cond);
return SLURM_ERROR;
}
- if(!list_count(cluster_cond->cluster_list)
+ if(!list_count(cluster_cond->cluster_list)
&& !cluster_cond->classification) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
"problem with delete request. "
"Nothing given to delete.\n");
destroy_acct_cluster_cond(cluster_cond);
@@ -1112,7 +1112,7 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[])
MAX(command_len, 1))) {
if(cluster_name) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Can only do one cluster at a time. "
"Already doing %s\n", cluster_name);
continue;
@@ -1122,16 +1122,16 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[])
MAX(command_len, 1))) {
if(file_name) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" File name already set to %s\n",
file_name);
continue;
- }
+ }
file_name = xstrdup(argv[i]+end);
} else {
exit_code=1;
fprintf(stderr, " Unknown option: %s\n", argv[i]);
- }
+ }
}
if(!cluster_name) {
@@ -1202,7 +1202,7 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[])
list_destroy(user_list);
list_destroy(assoc_cond.cluster_list);
return SLURM_ERROR;
-
+
} else {
if(my_uid != slurm_get_slurm_user_id() && my_uid != 0
&& user->admin_level < ACCT_ADMIN_SUPER_USER) {
@@ -1241,7 +1241,7 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[])
acct_hierarchical_rec_list = get_acct_hierarchical_rec_list(assoc_list);
acct_list = acct_storage_g_get_accounts(db_conn, my_uid, NULL);
-
+
fd = fopen(file_name, "w");
/* Add header */
if(fprintf(fd,
@@ -1277,17 +1277,17 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[])
line = xstrdup_printf("Cluster - %s", cluster_name);
- if(class_str)
+ if(class_str)
xstrfmtcat(line, ":Classification=%s", class_str);
acct_hierarchical_rec = list_peek(acct_hierarchical_rec_list);
assoc = acct_hierarchical_rec->assoc;
- if(strcmp(assoc->acct, "root"))
+ if(strcmp(assoc->acct, "root"))
fprintf(stderr, "Root association not on the top it was %s\n",
assoc->acct);
- else
+ else
print_file_add_limits_to_line(&line, assoc);
-
+
if(fprintf(fd, "%s\n", line) < 0) {
exit_code=1;
fprintf(stderr, " Can't write to file");
@@ -1297,7 +1297,7 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[])
print_file_acct_hierarchical_rec_list(
fd, acct_hierarchical_rec_list, user_list, acct_list);
-
+
xfree(cluster_name);
xfree(file_name);
list_destroy(acct_hierarchical_rec_list);
diff --git a/src/sacctmgr/common.c b/src/sacctmgr/common.c
index 494b366fb66bab2ea2337ff5ca58ea2be41f490d..6fda3ac161a70ba463256ea14d27206e7f670f68 100644
--- a/src/sacctmgr/common.c
+++ b/src/sacctmgr/common.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -89,7 +89,7 @@ static char *_get_qos_list_str(List qos_list)
itr = list_iterator_create(qos_list);
while((qos = list_next(itr))) {
- if(qos_char)
+ if(qos_char)
xstrfmtcat(qos_char, ",%s", qos->name);
else
xstrcat(qos_char, qos->name);
@@ -111,7 +111,7 @@ extern int parse_option_end(char *option)
|| (option[end] == '+' && option[end+1] == '=')
|| (option[end] == '-' && option[end+1] == '='))
break;
- end++;
+ end++;
}
if(!option[end])
@@ -152,7 +152,7 @@ extern char *strip_quotes(char *option, int *increased, bool make_lower)
if(lower != option[i])
option[i] = lower;
}
-
+
i++;
}
end += i;
@@ -169,7 +169,7 @@ extern char *strip_quotes(char *option, int *increased, bool make_lower)
extern int notice_thread_init()
{
pthread_attr_t attr;
-
+
slurm_attr_init(&attr);
if(pthread_create(&lock_warning_thread, &attr, &_print_lock_warn, NULL))
error ("pthread_create error %m");
@@ -182,7 +182,7 @@ extern int notice_thread_fini()
return pthread_cancel(lock_warning_thread);
}
-extern int commit_check(char *warning)
+extern int commit_check(char *warning)
{
int ans = 0;
char c = '\0';
@@ -210,16 +210,16 @@ extern int commit_check(char *warning)
tv.tv_usec = 0;
if((ans = select(fd+1, &rfds, NULL, NULL, &tv)) <= 0)
break;
-
+
c = getchar();
printf("\n");
}
_nonblock(0);
- if(ans <= 0)
+ if(ans <= 0)
printf("timeout\n");
- else if(c == 'Y' || c == 'y')
- return 1;
-
+ else if(c == 'Y' || c == 'y')
+ return 1;
+
return 0;
}
@@ -251,20 +251,20 @@ extern acct_association_rec_t *sacctmgr_find_association(char *user,
}
assoc_cond.user_list = list_create(NULL);
- if(user)
+ if(user)
list_append(assoc_cond.user_list, user);
else
list_append(assoc_cond.user_list, "");
-
+
assoc_cond.partition_list = list_create(NULL);
- if(partition)
+ if(partition)
list_append(assoc_cond.partition_list, partition);
else
list_append(assoc_cond.partition_list, "");
-
+
assoc_list = acct_storage_g_get_associations(db_conn, my_uid,
&assoc_cond);
-
+
list_destroy(assoc_cond.acct_list);
list_destroy(assoc_cond.cluster_list);
list_destroy(assoc_cond.user_list);
@@ -274,7 +274,7 @@ extern acct_association_rec_t *sacctmgr_find_association(char *user,
assoc = list_pop(assoc_list);
list_destroy(assoc_list);
-
+
return assoc;
}
@@ -326,10 +326,10 @@ extern acct_user_rec_t *sacctmgr_find_user(char *name)
acct_user_cond_t user_cond;
acct_association_cond_t assoc_cond;
List user_list = NULL;
-
+
if(!name)
return NULL;
-
+
memset(&user_cond, 0, sizeof(acct_user_cond_t));
memset(&assoc_cond, 0, sizeof(acct_association_cond_t));
assoc_cond.user_list = list_create(NULL);
@@ -355,7 +355,7 @@ extern acct_account_rec_t *sacctmgr_find_account(char *name)
acct_account_cond_t account_cond;
acct_association_cond_t assoc_cond;
List account_list = NULL;
-
+
if(!name)
return NULL;
@@ -367,7 +367,7 @@ extern acct_account_rec_t *sacctmgr_find_account(char *name)
account_list = acct_storage_g_get_accounts(db_conn, my_uid,
&account_cond);
-
+
list_destroy(assoc_cond.acct_list);
if(account_list)
@@ -396,44 +396,44 @@ extern acct_cluster_rec_t *sacctmgr_find_cluster(char *name)
list_destroy(cluster_cond.cluster_list);
- if(cluster_list)
+ if(cluster_list)
cluster = list_pop(cluster_list);
list_destroy(cluster_list);
-
+
return cluster;
}
extern acct_association_rec_t *sacctmgr_find_association_from_list(
- List assoc_list, char *user, char *account,
+ List assoc_list, char *user, char *account,
char *cluster, char *partition)
{
ListIterator itr = NULL;
acct_association_rec_t * assoc = NULL;
-
+
if(!assoc_list)
return NULL;
-
+
itr = list_iterator_create(assoc_list);
while((assoc = list_next(itr))) {
if(((!user && assoc->user)
|| (user && (!assoc->user
|| strcasecmp(user, assoc->user))))
|| ((!account && assoc->acct)
- || (account && (!assoc->acct
+ || (account && (!assoc->acct
|| strcasecmp(account, assoc->acct))))
|| ((!cluster && assoc->cluster)
- || (cluster && (!assoc->cluster
+ || (cluster && (!assoc->cluster
|| strcasecmp(cluster, assoc->cluster))))
|| ((!partition && assoc->partition)
- || (partition && (!assoc->partition
- || strcasecmp(partition,
+ || (partition && (!assoc->partition
+ || strcasecmp(partition,
assoc->partition)))))
continue;
break;
}
list_iterator_destroy(itr);
-
+
return assoc;
}
@@ -472,7 +472,7 @@ extern acct_qos_rec_t *sacctmgr_find_qos_from_list(
ListIterator itr = NULL;
acct_qos_rec_t *qos = NULL;
char *working_name = NULL;
-
+
if(!name || !qos_list)
return NULL;
@@ -480,14 +480,14 @@ extern acct_qos_rec_t *sacctmgr_find_qos_from_list(
working_name = name+1;
else
working_name = name;
-
+
itr = list_iterator_create(qos_list);
while((qos = list_next(itr))) {
if(!strcasecmp(working_name, qos->name))
break;
}
list_iterator_destroy(itr);
-
+
return qos;
}
@@ -497,17 +497,17 @@ extern acct_user_rec_t *sacctmgr_find_user_from_list(
{
ListIterator itr = NULL;
acct_user_rec_t *user = NULL;
-
+
if(!name || !user_list)
return NULL;
-
+
itr = list_iterator_create(user_list);
while((user = list_next(itr))) {
if(!strcasecmp(name, user->name))
break;
}
list_iterator_destroy(itr);
-
+
return user;
}
@@ -517,7 +517,7 @@ extern acct_account_rec_t *sacctmgr_find_account_from_list(
{
ListIterator itr = NULL;
acct_account_rec_t *account = NULL;
-
+
if(!name || !acct_list)
return NULL;
@@ -527,7 +527,7 @@ extern acct_account_rec_t *sacctmgr_find_account_from_list(
break;
}
list_iterator_destroy(itr);
-
+
return account;
}
@@ -547,7 +547,7 @@ extern acct_cluster_rec_t *sacctmgr_find_cluster_from_list(
break;
}
list_iterator_destroy(itr);
-
+
return cluster;
}
@@ -556,27 +556,27 @@ extern acct_wckey_rec_t *sacctmgr_find_wckey_from_list(
{
ListIterator itr = NULL;
acct_wckey_rec_t * wckey = NULL;
-
+
if(!wckey_list)
return NULL;
-
+
itr = list_iterator_create(wckey_list);
while((wckey = list_next(itr))) {
if(((!user && wckey->user)
|| (user && (!wckey->user
|| strcasecmp(user, wckey->user))))
|| ((!name && wckey->name)
- || (name && (!wckey->name
+ || (name && (!wckey->name
|| strcasecmp(name, wckey->name))))
|| ((!cluster && wckey->cluster)
- || (cluster && (!wckey->cluster
+ || (cluster && (!wckey->cluster
|| strcasecmp(cluster,
wckey->cluster)))))
continue;
break;
}
list_iterator_destroy(itr);
-
+
return wckey;
}
@@ -584,7 +584,7 @@ extern int get_uint(char *in_value, uint32_t *out_value, char *type)
{
char *ptr = NULL, *meat = NULL;
long num;
-
+
if(!(meat = strip_quotes(in_value, NULL, 1))) {
error("Problem with strip_quotes");
return SLURM_ERROR;
@@ -596,7 +596,7 @@ extern int get_uint(char *in_value, uint32_t *out_value, char *type)
return SLURM_ERROR;
}
xfree(meat);
-
+
if (num < 0)
*out_value = INFINITE; /* flag to clear */
else
@@ -608,7 +608,7 @@ extern int get_uint16(char *in_value, uint16_t *out_value, char *type)
{
char *ptr = NULL, *meat = NULL;
long num;
-
+
if(!(meat = strip_quotes(in_value, NULL, 1))) {
error("Problem with strip_quotes");
return SLURM_ERROR;
@@ -621,7 +621,7 @@ extern int get_uint16(char *in_value, uint16_t *out_value, char *type)
return SLURM_ERROR;
}
xfree(meat);
-
+
if (num < 0)
*out_value = (uint16_t) INFINITE; /* flag to clear */
else
@@ -633,7 +633,7 @@ extern int get_uint64(char *in_value, uint64_t *out_value, char *type)
{
char *ptr = NULL, *meat = NULL;
long long num;
-
+
if(!(meat = strip_quotes(in_value, NULL, 1))) {
error("Problem with strip_quotes");
return SLURM_ERROR;
@@ -646,7 +646,7 @@ extern int get_uint64(char *in_value, uint64_t *out_value, char *type)
return SLURM_ERROR;
}
xfree(meat);
-
+
if (num < 0)
*out_value = INFINITE; /* flag to clear */
else
@@ -658,7 +658,7 @@ extern int get_double(char *in_value, double *out_value, char *type)
{
char *ptr = NULL, *meat = NULL;
double num;
-
+
if(!(meat = strip_quotes(in_value, NULL, 1))) {
error("Problem with strip_quotes");
return SLURM_ERROR;
@@ -670,7 +670,7 @@ extern int get_double(char *in_value, double *out_value, char *type)
return SLURM_ERROR;
}
xfree(meat);
-
+
if (num < 0)
*out_value = (double) INFINITE; /* flag to clear */
else
@@ -678,7 +678,7 @@ extern int get_double(char *in_value, double *out_value, char *type)
return SLURM_SUCCESS;
}
-extern int addto_qos_char_list(List char_list, List qos_list, char *names,
+extern int addto_qos_char_list(List char_list, List qos_list, char *names,
int option)
{
int i=0, start=0;
@@ -718,14 +718,14 @@ extern int addto_qos_char_list(List char_list, List qos_list, char *names,
else if(names[i] == ',') {
if((i-start) > 0) {
int tmp_option = option;
- if(names[start] == '+'
+ if(names[start] == '+'
|| names[start] == '-') {
tmp_option = names[start];
start++;
}
name = xmalloc((i-start+1));
memcpy(name, names+start, (i-start));
-
+
id = str_2_acct_qos(qos_list, name);
if(id == NO_VAL) {
char *tmp = _get_qos_list_str(
@@ -740,7 +740,7 @@ extern int addto_qos_char_list(List char_list, List qos_list, char *names,
break;
}
xfree(name);
-
+
if(tmp_option) {
if(equal_set) {
error("You can't set "
@@ -780,7 +780,7 @@ extern int addto_qos_char_list(List char_list, List qos_list, char *names,
if(!tmp_char) {
list_append(char_list, name);
count++;
- } else
+ } else
xfree(name);
} else if (!(i-start)) {
list_append(char_list, xstrdup(""));
@@ -807,7 +807,7 @@ extern int addto_qos_char_list(List char_list, List qos_list, char *names,
}
name = xmalloc((i-start)+1);
memcpy(name, names+start, (i-start));
-
+
id = str_2_acct_qos(qos_list, name);
if(id == NO_VAL) {
char *tmp = _get_qos_list_str(qos_list);
@@ -853,17 +853,17 @@ extern int addto_qos_char_list(List char_list, List qos_list, char *names,
if(!strcasecmp(tmp_char, name))
break;
}
-
+
if(!tmp_char) {
list_append(char_list, name);
count++;
- } else
+ } else
xfree(name);
} else if (!(i-start)) {
list_append(char_list, xstrdup(""));
count++;
}
- }
+ }
if(!count) {
error("You gave me an empty qos list");
exit_code = 1;
@@ -873,7 +873,7 @@ end_it:
list_iterator_destroy(itr);
return count;
}
-
+
extern int addto_action_char_list(List char_list, char *names)
{
int i=0, start=0;
@@ -906,7 +906,7 @@ extern int addto_action_char_list(List char_list, char *names)
if((i-start) > 0) {
name = xmalloc((i-start+1));
memcpy(name, names+start, (i-start));
-
+
id = str_2_slurmdbd_msg_type(name);
if(id == NO_VAL) {
error("You gave a bad action "
@@ -926,7 +926,7 @@ extern int addto_action_char_list(List char_list, char *names)
if(!tmp_char) {
list_append(char_list, name);
count++;
- } else
+ } else
xfree(name);
}
@@ -944,7 +944,7 @@ extern int addto_action_char_list(List char_list, char *names)
if((i-start) > 0) {
name = xmalloc((i-start)+1);
memcpy(name, names+start, (i-start));
-
+
id = str_2_slurmdbd_msg_type(name);
if(id == NO_VAL) {
error("You gave a bad action '%s'.",
@@ -953,26 +953,26 @@ extern int addto_action_char_list(List char_list, char *names)
goto end_it;
}
xfree(name);
-
+
name = xstrdup_printf("%u", id);
while((tmp_char = list_next(itr))) {
if(!strcasecmp(tmp_char, name))
break;
}
-
+
if(!tmp_char) {
list_append(char_list, name);
count++;
- } else
+ } else
xfree(name);
}
- }
+ }
end_it:
list_iterator_destroy(itr);
return count;
}
-
-extern List copy_char_list(List char_list)
+
+extern List copy_char_list(List char_list)
{
List ret_list = NULL;
char *tmp_char = NULL;
@@ -983,12 +983,12 @@ extern List copy_char_list(List char_list)
itr = list_iterator_create(char_list);
ret_list = list_create(slurm_destroy_char);
-
- while((tmp_char = list_next(itr)))
+
+ while((tmp_char = list_next(itr)))
list_append(ret_list, xstrdup(tmp_char));
-
+
list_iterator_destroy(itr);
-
+
return ret_list;
}
@@ -999,7 +999,7 @@ extern void sacctmgr_print_coord_list(
ListIterator itr = NULL;
char *print_this = NULL;
acct_coord_rec_t *object = NULL;
-
+
if(!value || !list_count(value)) {
if(print_fields_parsable_print)
print_this = xstrdup("");
@@ -1009,15 +1009,15 @@ extern void sacctmgr_print_coord_list(
list_sort(value, (ListCmpF)sort_coord_list);
itr = list_iterator_create(value);
while((object = list_next(itr))) {
- if(print_this)
- xstrfmtcat(print_this, ",%s",
+ if(print_this)
+ xstrfmtcat(print_this, ",%s",
object->name);
- else
+ else
print_this = xstrdup(object->name);
}
list_iterator_destroy(itr);
}
-
+
if(print_fields_parsable_print == PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%s", print_this);
@@ -1026,7 +1026,7 @@ extern void sacctmgr_print_coord_list(
else {
if(strlen(print_this) > abs_len)
print_this[abs_len-1] = '+';
-
+
if(field->len == abs_len)
printf("%*.*s ", abs_len, abs_len, print_this);
else
@@ -1042,16 +1042,16 @@ extern void sacctmgr_print_qos_list(print_field_t *field, List qos_list,
char *print_this = NULL;
print_this = get_qos_complete_str(qos_list, value);
-
+
if(print_fields_parsable_print == PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%s", print_this);
else if(print_fields_parsable_print)
printf("%s|", print_this);
else {
- if(strlen(print_this) > abs_len)
+ if(strlen(print_this) > abs_len)
print_this[abs_len-1] = '+';
-
+
if(field->len == abs_len)
printf("%*.*s ", abs_len, abs_len, print_this);
else
@@ -1067,16 +1067,16 @@ extern void sacctmgr_print_qos_bitstr(print_field_t *field, List qos_list,
char *print_this = NULL;
print_this = get_qos_complete_str_bitstr(qos_list, value);
-
+
if(print_fields_parsable_print == PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%s", print_this);
else if(print_fields_parsable_print)
printf("%s|", print_this);
else {
- if(strlen(print_this) > abs_len)
+ if(strlen(print_this) > abs_len)
print_this[abs_len-1] = '+';
-
+
if(field->len == abs_len)
printf("%*.*s ", abs_len, abs_len, print_this);
else
@@ -1092,92 +1092,92 @@ extern void sacctmgr_print_assoc_limits(acct_association_rec_t *assoc)
if(assoc->shares_raw == INFINITE)
printf(" Fairshare = NONE\n");
- else if(assoc->shares_raw != NO_VAL)
+ else if(assoc->shares_raw != NO_VAL)
printf(" Fairshare = %u\n", assoc->shares_raw);
if(assoc->grp_cpu_mins == INFINITE)
printf(" GrpCPUMins = NONE\n");
- else if(assoc->grp_cpu_mins != NO_VAL)
- printf(" GrpCPUMins = %llu\n",
+ else if(assoc->grp_cpu_mins != NO_VAL)
+ printf(" GrpCPUMins = %llu\n",
(long long unsigned)assoc->grp_cpu_mins);
-
+
if(assoc->grp_cpus == INFINITE)
printf(" GrpCPUs = NONE\n");
- else if(assoc->grp_cpus != NO_VAL)
+ else if(assoc->grp_cpus != NO_VAL)
printf(" GrpCPUs = %u\n", assoc->grp_cpus);
-
- if(assoc->grp_jobs == INFINITE)
+
+ if(assoc->grp_jobs == INFINITE)
printf(" GrpJobs = NONE\n");
- else if(assoc->grp_jobs != NO_VAL)
+ else if(assoc->grp_jobs != NO_VAL)
printf(" GrpJobs = %u\n", assoc->grp_jobs);
-
+
if(assoc->grp_nodes == INFINITE)
printf(" GrpNodes = NONE\n");
else if(assoc->grp_nodes != NO_VAL)
printf(" GrpNodes = %u\n", assoc->grp_nodes);
-
- if(assoc->grp_submit_jobs == INFINITE)
+
+ if(assoc->grp_submit_jobs == INFINITE)
printf(" GrpSubmitJobs = NONE\n");
- else if(assoc->grp_submit_jobs != NO_VAL)
- printf(" GrpSubmitJobs = %u\n",
+ else if(assoc->grp_submit_jobs != NO_VAL)
+ printf(" GrpSubmitJobs = %u\n",
assoc->grp_submit_jobs);
-
- if(assoc->grp_wall == INFINITE)
- printf(" GrpWall = NONE\n");
+
+ if(assoc->grp_wall == INFINITE)
+ printf(" GrpWall = NONE\n");
else if(assoc->grp_wall != NO_VAL) {
char time_buf[32];
- mins2time_str((time_t) assoc->grp_wall,
+ mins2time_str((time_t) assoc->grp_wall,
time_buf, sizeof(time_buf));
printf(" GrpWall = %s\n", time_buf);
}
if(assoc->max_cpu_mins_pj == INFINITE)
printf(" MaxCPUMins = NONE\n");
- else if(assoc->max_cpu_mins_pj != NO_VAL)
- printf(" MaxCPUMins = %llu\n",
+ else if(assoc->max_cpu_mins_pj != NO_VAL)
+ printf(" MaxCPUMins = %llu\n",
(long long unsigned)assoc->max_cpu_mins_pj);
-
+
if(assoc->max_cpus_pj == INFINITE)
printf(" MaxCPUs = NONE\n");
- else if(assoc->max_cpus_pj != NO_VAL)
+ else if(assoc->max_cpus_pj != NO_VAL)
printf(" MaxCPUs = %u\n", assoc->max_cpus_pj);
-
- if(assoc->max_jobs == INFINITE)
+
+ if(assoc->max_jobs == INFINITE)
printf(" MaxJobs = NONE\n");
- else if(assoc->max_jobs != NO_VAL)
+ else if(assoc->max_jobs != NO_VAL)
printf(" MaxJobs = %u\n", assoc->max_jobs);
-
+
if(assoc->max_nodes_pj == INFINITE)
printf(" MaxNodes = NONE\n");
else if(assoc->max_nodes_pj != NO_VAL)
printf(" MaxNodes = %u\n", assoc->max_nodes_pj);
-
- if(assoc->max_submit_jobs == INFINITE)
+
+ if(assoc->max_submit_jobs == INFINITE)
printf(" MaxSubmitJobs = NONE\n");
- else if(assoc->max_submit_jobs != NO_VAL)
- printf(" MaxSubmitJobs = %u\n",
+ else if(assoc->max_submit_jobs != NO_VAL)
+ printf(" MaxSubmitJobs = %u\n",
assoc->max_submit_jobs);
-
- if(assoc->max_wall_pj == INFINITE)
- printf(" MaxWall = NONE\n");
+
+ if(assoc->max_wall_pj == INFINITE)
+ printf(" MaxWall = NONE\n");
else if(assoc->max_wall_pj != NO_VAL) {
char time_buf[32];
- mins2time_str((time_t) assoc->max_wall_pj,
+ mins2time_str((time_t) assoc->max_wall_pj,
time_buf, sizeof(time_buf));
printf(" MaxWall = %s\n", time_buf);
}
if(assoc->qos_list) {
if(!g_qos_list)
- g_qos_list =
+ g_qos_list =
acct_storage_g_get_qos(db_conn, my_uid, NULL);
char *temp_char = get_qos_complete_str(g_qos_list,
assoc->qos_list);
- if(temp_char) {
+ if(temp_char) {
printf(" QOS = %s\n", temp_char);
xfree(temp_char);
}
- }
+ }
}
extern void sacctmgr_print_qos_limits(acct_qos_rec_t *qos)
@@ -1190,72 +1190,72 @@ extern void sacctmgr_print_qos_limits(acct_qos_rec_t *qos)
if(qos->grp_cpu_mins == INFINITE)
printf(" GrpCPUMins = NONE\n");
- else if(qos->grp_cpu_mins != NO_VAL)
- printf(" GrpCPUMins = %llu\n",
+ else if(qos->grp_cpu_mins != NO_VAL)
+ printf(" GrpCPUMins = %llu\n",
(long long unsigned)qos->grp_cpu_mins);
-
+
if(qos->grp_cpus == INFINITE)
printf(" GrpCPUs = NONE\n");
- else if(qos->grp_cpus != NO_VAL)
+ else if(qos->grp_cpus != NO_VAL)
printf(" GrpCPUs = %u\n", qos->grp_cpus);
-
- if(qos->grp_jobs == INFINITE)
+
+ if(qos->grp_jobs == INFINITE)
printf(" GrpJobs = NONE\n");
- else if(qos->grp_jobs != NO_VAL)
+ else if(qos->grp_jobs != NO_VAL)
printf(" GrpJobs = %u\n", qos->grp_jobs);
-
+
if(qos->grp_nodes == INFINITE)
printf(" GrpNodes = NONE\n");
else if(qos->grp_nodes != NO_VAL)
printf(" GrpNodes = %u\n", qos->grp_nodes);
-
- if(qos->grp_submit_jobs == INFINITE)
+
+ if(qos->grp_submit_jobs == INFINITE)
printf(" GrpSubmitJobs = NONE\n");
- else if(qos->grp_submit_jobs != NO_VAL)
- printf(" GrpSubmitJobs = %u\n",
+ else if(qos->grp_submit_jobs != NO_VAL)
+ printf(" GrpSubmitJobs = %u\n",
qos->grp_submit_jobs);
-
- if(qos->grp_wall == INFINITE)
- printf(" GrpWall = NONE\n");
+
+ if(qos->grp_wall == INFINITE)
+ printf(" GrpWall = NONE\n");
else if(qos->grp_wall != NO_VAL) {
char time_buf[32];
- mins2time_str((time_t) qos->grp_wall,
+ mins2time_str((time_t) qos->grp_wall,
time_buf, sizeof(time_buf));
printf(" GrpWall = %s\n", time_buf);
}
if(qos->max_cpu_mins_pj == INFINITE)
printf(" MaxCPUMins = NONE\n");
- else if(qos->max_cpu_mins_pj != NO_VAL)
- printf(" MaxCPUMins = %llu\n",
+ else if(qos->max_cpu_mins_pj != NO_VAL)
+ printf(" MaxCPUMins = %llu\n",
(long long unsigned)qos->max_cpu_mins_pj);
-
+
if(qos->max_cpus_pj == INFINITE)
printf(" MaxCPUs = NONE\n");
- else if(qos->max_cpus_pj != NO_VAL)
+ else if(qos->max_cpus_pj != NO_VAL)
printf(" MaxCPUs = %u\n", qos->max_cpus_pj);
-
- if(qos->max_jobs_pu == INFINITE)
+
+ if(qos->max_jobs_pu == INFINITE)
printf(" MaxJobs = NONE\n");
- else if(qos->max_jobs_pu != NO_VAL)
+ else if(qos->max_jobs_pu != NO_VAL)
printf(" MaxJobs = %u\n", qos->max_jobs_pu);
-
+
if(qos->max_nodes_pj == INFINITE)
printf(" MaxNodes = NONE\n");
else if(qos->max_nodes_pj != NO_VAL)
printf(" MaxNodes = %u\n", qos->max_nodes_pj);
-
- if(qos->max_submit_jobs_pu == INFINITE)
+
+ if(qos->max_submit_jobs_pu == INFINITE)
printf(" MaxSubmitJobs = NONE\n");
- else if(qos->max_submit_jobs_pu != NO_VAL)
- printf(" MaxSubmitJobs = %u\n",
+ else if(qos->max_submit_jobs_pu != NO_VAL)
+ printf(" MaxSubmitJobs = %u\n",
qos->max_submit_jobs_pu);
-
- if(qos->max_wall_pj == INFINITE)
- printf(" MaxWall = NONE\n");
+
+ if(qos->max_wall_pj == INFINITE)
+ printf(" MaxWall = NONE\n");
else if(qos->max_wall_pj != NO_VAL) {
char time_buf[32];
- mins2time_str((time_t) qos->max_wall_pj,
+ mins2time_str((time_t) qos->max_wall_pj,
time_buf, sizeof(time_buf));
printf(" MaxWall = %s\n", time_buf);
}
@@ -1263,15 +1263,15 @@ extern void sacctmgr_print_qos_limits(acct_qos_rec_t *qos)
if(qos->preempt_list) {
char *temp_char = get_qos_complete_str(g_qos_list,
qos->preempt_list);
- if(temp_char) {
+ if(temp_char) {
printf(" Preempt = %s\n", temp_char);
xfree(temp_char);
}
- }
+ }
if(qos->priority == INFINITE)
printf(" Priority = NONE\n");
- else if(qos->priority != NO_VAL)
+ else if(qos->priority != NO_VAL)
printf(" Priority = %d\n", qos->priority);
}
@@ -1284,6 +1284,6 @@ extern int sort_coord_list(acct_coord_rec_t *coord_a, acct_coord_rec_t *coord_b)
return -1;
else if (diff > 0)
return 1;
-
+
return 0;
}
diff --git a/src/sacctmgr/config_functions.c b/src/sacctmgr/config_functions.c
index 642d993a0d0701e778281e04b4113fac992cd702..f301a1610fe7d78b1435b9edbdb42ae9e8507c5e 100644
--- a/src/sacctmgr/config_functions.c
+++ b/src/sacctmgr/config_functions.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/sacctmgr/file_functions.c b/src/sacctmgr/file_functions.c
index 8c3956d071c8481f4c6b4d7c6a80366a48c61b13..ff461f86f85c0c2530adf13875180c7d37309878 100644
--- a/src/sacctmgr/file_functions.c
+++ b/src/sacctmgr/file_functions.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -53,14 +53,14 @@ typedef struct {
uint64_t grp_cpu_mins;
uint32_t grp_cpus;
uint32_t grp_jobs;
- uint32_t grp_nodes;
+ uint32_t grp_nodes;
uint32_t grp_submit_jobs;
uint32_t grp_wall;
- uint64_t max_cpu_mins_pj;
- uint32_t max_cpus_pj;
+ uint64_t max_cpu_mins_pj;
+ uint32_t max_cpus_pj;
uint32_t max_jobs;
- uint32_t max_nodes_pj;
+ uint32_t max_nodes_pj;
uint32_t max_submit_jobs;
uint32_t max_wall_pj;
@@ -231,7 +231,7 @@ static int _get_next_line(char *buf, int buf_size, FILE *file)
}
/* _strip_cr_nl(buf); */ /* not necessary */
_strip_escapes(buf);
-
+
return lines;
}
@@ -250,7 +250,7 @@ static void _destroy_sacctmgr_file_opts(void *object)
xfree(file_opts->part);
if(file_opts->wckey_list)
list_destroy(file_opts->wckey_list);
- xfree(file_opts);
+ xfree(file_opts);
}
}
@@ -269,7 +269,7 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
while(options[i]) {
quote = 0;
start=i;
-
+
while(options[i] && options[i] != ':' && options[i] != '\n') {
if(options[i] == '"' || options[i] == '\'') {
if(quote) {
@@ -283,7 +283,7 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
i++;
}
if(quote) {
- while(options[i] && options[i] != quote_c)
+ while(options[i] && options[i] != quote_c)
i++;
if(!options[i])
fatal("There is a problem with option "
@@ -296,12 +296,12 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
sub = xstrndup(options+start, i-start);
end = parse_option_end(sub);
- command_len = end - 1;
+ command_len = end - 1;
if(sub[end] == '=') {
option2 = (int)sub[end-1];
end++;
}
-
+
option = strip_quotes(sub+end, NULL, 1);
if(!end) {
@@ -340,14 +340,14 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
} else if (!strncasecmp (sub, "Description",
MAX(command_len, 3))) {
file_opts->desc = xstrdup(option);
- } else if (!strncasecmp (sub, "FairShare",
+ } else if (!strncasecmp (sub, "FairShare",
MAX(command_len, 1))
|| !strncasecmp (sub, "Shares",
MAX(command_len, 1))) {
- if (get_uint(option, &file_opts->fairshare,
+ if (get_uint(option, &file_opts->fairshare,
"FairShare") != SLURM_SUCCESS) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Bad FairShare value: %s\n", option);
_destroy_sacctmgr_file_opts(file_opts);
break;
@@ -357,7 +357,7 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
if (get_uint64(option, &file_opts->grp_cpu_mins,
"GrpCPUMins") != SLURM_SUCCESS) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Bad GrpCPUMins value: %s\n", option);
_destroy_sacctmgr_file_opts(file_opts);
break;
@@ -366,7 +366,7 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
if (get_uint(option, &file_opts->grp_cpus,
"GrpCPUs") != SLURM_SUCCESS) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Bad GrpCPUs value: %s\n", option);
_destroy_sacctmgr_file_opts(file_opts);
break;
@@ -375,17 +375,17 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
if (get_uint(option, &file_opts->grp_jobs,
"GrpJobs") != SLURM_SUCCESS) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Bad GrpJobs value: %s\n", option);
_destroy_sacctmgr_file_opts(file_opts);
break;
}
- } else if (!strncasecmp (sub, "GrpNodes",
+ } else if (!strncasecmp (sub, "GrpNodes",
MAX(command_len, 4))) {
if (get_uint(option, &file_opts->grp_nodes,
"GrpNodes") != SLURM_SUCCESS) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Bad GrpNodes value: %s\n", option);
_destroy_sacctmgr_file_opts(file_opts);
break;
@@ -395,7 +395,7 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
if (get_uint(option, &file_opts->grp_submit_jobs,
"GrpSubmitJobs") != SLURM_SUCCESS) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Bad GrpJobs value: %s\n", option);
_destroy_sacctmgr_file_opts(file_opts);
break;
@@ -403,26 +403,26 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
} else if (!strncasecmp (sub, "GrpWall", MAX(command_len, 4))) {
mins = time_str2mins(option);
if (mins >= 0) {
- file_opts->grp_wall
+ file_opts->grp_wall
= (uint32_t) mins;
} else if (strcmp(option, "-1")) {
file_opts->grp_wall = INFINITE;
} else {
exit_code=1;
- fprintf(stderr,
- " Bad GrpWall time format: %s\n",
+ fprintf(stderr,
+ " Bad GrpWall time format: %s\n",
option);
_destroy_sacctmgr_file_opts(file_opts);
break;
}
} else if (!strncasecmp (sub, "MaxCPUMinsPerJob",
MAX(command_len, 7))
- || !strncasecmp (sub, "MaxProcSecPerJob",
+ || !strncasecmp (sub, "MaxProcSecPerJob",
MAX(command_len, 4))) {
if (get_uint64(option, &file_opts->max_cpu_mins_pj,
"MaxCPUMins") != SLURM_SUCCESS) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Bad MaxCPUMins value: %s\n", option);
_destroy_sacctmgr_file_opts(file_opts);
break;
@@ -432,7 +432,7 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
if (get_uint(option, &file_opts->max_cpus_pj,
"MaxCPUs") != SLURM_SUCCESS) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Bad MaxCPUs value: %s\n", option);
_destroy_sacctmgr_file_opts(file_opts);
break;
@@ -441,7 +441,7 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
if (get_uint(option, &file_opts->max_jobs,
"MaxJobs") != SLURM_SUCCESS) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Bad MaxJobs value: %s\n", option);
_destroy_sacctmgr_file_opts(file_opts);
break;
@@ -451,33 +451,33 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
if (get_uint(option, &file_opts->max_nodes_pj,
"MaxNodes") != SLURM_SUCCESS) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Bad MaxNodes value: %s\n", option);
_destroy_sacctmgr_file_opts(file_opts);
break;
}
- } else if (!strncasecmp (sub, "MaxSubmitJobs",
+ } else if (!strncasecmp (sub, "MaxSubmitJobs",
MAX(command_len, 4))) {
if (get_uint(option, &file_opts->max_submit_jobs,
"MaxSubmitJobs") != SLURM_SUCCESS) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Bad MaxJobs value: %s\n", option);
_destroy_sacctmgr_file_opts(file_opts);
break;
}
- } else if (!strncasecmp (sub, "MaxWallDurationPerJob",
+ } else if (!strncasecmp (sub, "MaxWallDurationPerJob",
MAX(command_len, 4))) {
mins = time_str2mins(option);
if (mins >= 0) {
- file_opts->max_wall_pj
+ file_opts->max_wall_pj
= (uint32_t) mins;
} else if (strcmp(option, "-1")) {
file_opts->max_wall_pj = INFINITE;
} else {
exit_code=1;
- fprintf(stderr,
- " Bad MaxWall time format: %s\n",
+ fprintf(stderr,
+ " Bad MaxWall time format: %s\n",
option);
_destroy_sacctmgr_file_opts(file_opts);
break;
@@ -489,10 +489,10 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
|| !strncasecmp (sub, "Expedite",
MAX(command_len, 1))) {
if(!file_opts->qos_list) {
- file_opts->qos_list =
+ file_opts->qos_list =
list_create(slurm_destroy_char);
}
-
+
if(!g_qos_list) {
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
@@ -520,7 +520,7 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
else
break;
}
-
+
xfree(sub);
xfree(option);
@@ -578,27 +578,27 @@ static List _set_up_print_fields(List format_list)
field->name = xstrdup("Coord Accounts");
field->len = 20;
field->print_routine = sacctmgr_print_coord_list;
- } else if(!strncasecmp("DefaultAccount", object,
+ } else if(!strncasecmp("DefaultAccount", object,
MAX(command_len, 8))) {
field->type = PRINT_DACCT;
field->name = xstrdup("Def Acct");
field->len = 10;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("DefaultWckey", object,
+ } else if(!strncasecmp("DefaultWckey", object,
MAX(command_len, 8))) {
field->type = PRINT_DWCKEY;
field->name = xstrdup("Def WCKey");
field->len = 10;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("Description", object,
+ } else if(!strncasecmp("Description", object,
MAX(command_len, 3))) {
field->type = PRINT_DESC;
field->name = xstrdup("Descr");
field->len = 20;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("FairShare", object,
+ } else if(!strncasecmp("FairShare", object,
MAX(command_len, 1))
- || !strncasecmp("Shares", object,
+ || !strncasecmp("Shares", object,
MAX(command_len, 1))) {
field->type = PRINT_FAIRSHARE;
field->name = xstrdup("FairShare");
@@ -651,19 +651,19 @@ static List _set_up_print_fields(List format_list)
field->name = xstrdup("MaxCPUMins");
field->len = 11;
field->print_routine = print_fields_uint64;
- } else if(!strncasecmp("MaxCPUsPerJob", object,
+ } else if(!strncasecmp("MaxCPUsPerJob", object,
MAX(command_len, 7))) {
field->type = PRINT_MAXC;
field->name = xstrdup("MaxCPUs");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("MaxJobs", object,
+ } else if(!strncasecmp("MaxJobs", object,
MAX(command_len, 4))) {
field->type = PRINT_MAXJ;
field->name = xstrdup("MaxJobs");
field->len = 7;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("MaxNodesPerJob", object,
+ } else if(!strncasecmp("MaxNodesPerJob", object,
MAX(command_len, 4))) {
field->type = PRINT_MAXN;
field->name = xstrdup("MaxNodes");
@@ -692,7 +692,7 @@ static List _set_up_print_fields(List format_list)
field->name = xstrdup("Org");
field->len = 20;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("QOSRAWLevel", object,
+ } else if(!strncasecmp("QOSRAWLevel", object,
MAX(command_len, 4))) {
field->type = PRINT_QOS_RAW;
field->name = xstrdup("QOS_RAW");
@@ -732,7 +732,7 @@ static List _set_up_print_fields(List format_list)
xfree(field);
continue;
}
- list_append(print_fields_list, field);
+ list_append(print_fields_list, field);
}
list_iterator_destroy(itr);
return print_fields_list;
@@ -749,24 +749,24 @@ static int _print_out_assoc(List assoc_list, bool user, bool add)
if(!assoc_list || !list_count(assoc_list))
return rc;
-
+
format_list = list_create(slurm_destroy_char);
if(user)
slurm_addto_char_list(format_list,
"User,Account,F,GrpCPUM,GrpCPUs,"
"GrpJ,GrpN,GrpS,GrpW,MaxCPUM,MaxCPUs,"
"MaxJ,MaxS,MaxN,MaxW,QOS");
- else
+ else
slurm_addto_char_list(format_list,
"Account,Parent,F,GrpCPUM,GrpCPUs,"
"GrpJ,GrpN,GrpS,GrpW,MaxCPUM,MaxCPUs,"
"MaxJ,MaxS,MaxN,MaxW,QOS");
-
+
print_fields_list = _set_up_print_fields(format_list);
list_destroy(format_list);
-
+
print_fields_header(print_fields_list);
-
+
itr = list_iterator_create(assoc_list);
itr2 = list_iterator_create(print_fields_list);
while((assoc = list_next(itr))) {
@@ -790,7 +790,7 @@ static int _print_out_assoc(List assoc_list, bool user, bool add)
assoc->grp_cpus);
break;
case PRINT_GRPJ:
- field->print_routine(field,
+ field->print_routine(field,
assoc->grp_jobs);
break;
case PRINT_GRPN:
@@ -798,7 +798,7 @@ static int _print_out_assoc(List assoc_list, bool user, bool add)
assoc->grp_nodes);
break;
case PRINT_GRPS:
- field->print_routine(field,
+ field->print_routine(field,
assoc->grp_submit_jobs);
break;
case PRINT_GRPW:
@@ -816,7 +816,7 @@ static int _print_out_assoc(List assoc_list, bool user, bool add)
assoc->max_cpus_pj);
break;
case PRINT_MAXJ:
- field->print_routine(field,
+ field->print_routine(field,
assoc->max_jobs);
break;
case PRINT_MAXN:
@@ -824,7 +824,7 @@ static int _print_out_assoc(List assoc_list, bool user, bool add)
assoc->max_nodes_pj);
break;
case PRINT_MAXS:
- field->print_routine(field,
+ field->print_routine(field,
assoc->max_submit_jobs);
break;
case PRINT_MAXW:
@@ -841,17 +841,17 @@ static int _print_out_assoc(List assoc_list, bool user, bool add)
assoc->partition);
break;
case PRINT_QOS:
- if(!g_qos_list)
+ if(!g_qos_list)
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
-
+
field->print_routine(
field,
g_qos_list,
assoc->qos_list);
break;
case PRINT_USER:
- field->print_routine(field,
+ field->print_routine(field,
assoc->user);
break;
default:
@@ -867,7 +867,7 @@ static int _print_out_assoc(List assoc_list, bool user, bool add)
list_iterator_destroy(itr2);
list_destroy(print_fields_list);
if(add)
- rc = acct_storage_g_add_associations(db_conn,
+ rc = acct_storage_g_add_associations(db_conn,
my_uid, assoc_list);
printf("--------------------------------------------------------------\n\n");
@@ -910,7 +910,7 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
&& (assoc->shares_raw != file_opts->fairshare)) {
mod_assoc.shares_raw = file_opts->fairshare;
changed = 1;
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8d -> %d\n",
" Changed fairshare",
type, name,
@@ -922,7 +922,7 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
&& (assoc->grp_cpu_mins != file_opts->grp_cpu_mins)) {
mod_assoc.grp_cpu_mins = file_opts->grp_cpu_mins;
changed = 1;
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8llu -> %llu\n",
" Changed GrpCPUMins",
type, name,
@@ -934,11 +934,11 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
&& (assoc->grp_cpus != file_opts->grp_cpus)) {
mod_assoc.grp_cpus = file_opts->grp_cpus;
changed = 1;
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8d -> %d\n",
" Changed GrpCpus",
type, name,
- assoc->grp_cpus,
+ assoc->grp_cpus,
file_opts->grp_cpus);
}
@@ -946,7 +946,7 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
&& (assoc->grp_jobs != file_opts->grp_jobs)) {
mod_assoc.grp_jobs = file_opts->grp_jobs;
changed = 1;
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8d -> %d\n",
" Changed GrpJobs",
type, name,
@@ -958,11 +958,11 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
&& (assoc->grp_nodes != file_opts->grp_nodes)) {
mod_assoc.grp_nodes = file_opts->grp_nodes;
changed = 1;
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8d -> %d\n",
" Changed GrpNodes",
type, name,
- assoc->grp_nodes,
+ assoc->grp_nodes,
file_opts->grp_nodes);
}
@@ -970,7 +970,7 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
&& (assoc->grp_submit_jobs != file_opts->grp_submit_jobs)) {
mod_assoc.grp_submit_jobs = file_opts->grp_submit_jobs;
changed = 1;
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8d -> %d\n",
" Changed GrpSubmitJobs",
type, name,
@@ -982,20 +982,20 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
&& (assoc->grp_wall != file_opts->grp_wall)) {
mod_assoc.grp_wall = file_opts->grp_wall;
changed = 1;
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8d -> %d\n",
" Changed GrpWallDuration",
type, name,
assoc->grp_wall,
file_opts->grp_wall);
}
-
+
if((file_opts->max_cpu_mins_pj != NO_VAL)
&& (assoc->max_cpu_mins_pj != file_opts->max_cpu_mins_pj)) {
mod_assoc.max_cpu_mins_pj =
file_opts->max_cpu_mins_pj;
changed = 1;
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8llu -> %llu\n",
" Changed MaxCPUMinsPerJob",
type, name,
@@ -1007,11 +1007,11 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
&& (assoc->max_cpus_pj != file_opts->max_cpus_pj)) {
mod_assoc.max_cpus_pj = file_opts->max_cpus_pj;
changed = 1;
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8d -> %d\n",
" Changed MaxCpusPerJob",
type, name,
- assoc->max_cpus_pj,
+ assoc->max_cpus_pj,
file_opts->max_cpus_pj);
}
@@ -1019,7 +1019,7 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
&& (assoc->max_jobs != file_opts->max_jobs)) {
mod_assoc.max_jobs = file_opts->max_jobs;
changed = 1;
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8d -> %d\n",
" Changed MaxJobs",
type, name,
@@ -1031,19 +1031,19 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
&& (assoc->max_nodes_pj != file_opts->max_nodes_pj)) {
mod_assoc.max_nodes_pj = file_opts->max_nodes_pj;
changed = 1;
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8d -> %d\n",
" Changed MaxNodesPerJob",
type, name,
- assoc->max_nodes_pj,
+ assoc->max_nodes_pj,
file_opts->max_nodes_pj);
}
-
+
if((file_opts->max_submit_jobs != NO_VAL)
&& (assoc->max_submit_jobs != file_opts->max_submit_jobs)) {
mod_assoc.max_submit_jobs = file_opts->max_submit_jobs;
changed = 1;
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8d -> %d\n",
" Changed MaxSubmitJobs",
type, name,
@@ -1055,7 +1055,7 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
&& (assoc->max_wall_pj != file_opts->max_wall_pj)) {
mod_assoc.max_wall_pj = file_opts->max_wall_pj;
changed = 1;
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8d -> %d\n",
" Changed MaxWallDurationPerJob",
type, name,
@@ -1065,7 +1065,7 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
if(assoc->parent_acct && parent && strcmp(assoc->parent_acct, parent)) {
mod_assoc.parent_acct = parent;
changed = 1;
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8s -> %s\n",
" Changed Parent",
type, name,
@@ -1088,7 +1088,7 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
break;
}
list_iterator_reset(now_qos_itr);
- if(!now_qos)
+ if(!now_qos)
list_append(mod_assoc.qos_list,
xstrdup(new_qos));
}
@@ -1098,7 +1098,7 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
new_qos = get_qos_complete_str(g_qos_list,
mod_assoc.qos_list);
if(new_qos) {
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8s\n",
" Added QOS",
type, name,
@@ -1112,9 +1112,9 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
} else if(file_opts->qos_list && list_count(file_opts->qos_list)) {
char *new_qos = get_qos_complete_str(g_qos_list,
file_opts->qos_list);
-
+
if(new_qos) {
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8s\n",
" Added QOS",
type, name,
@@ -1128,30 +1128,30 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
if(changed) {
List ret_list = NULL;
-
- assoc_cond.cluster_list = list_create(NULL);
+
+ assoc_cond.cluster_list = list_create(NULL);
list_push(assoc_cond.cluster_list, assoc->cluster);
- assoc_cond.acct_list = list_create(NULL);
+ assoc_cond.acct_list = list_create(NULL);
list_push(assoc_cond.acct_list, assoc->acct);
-
+
if(mod_type == MOD_USER) {
- assoc_cond.user_list = list_create(NULL);
+ assoc_cond.user_list = list_create(NULL);
list_push(assoc_cond.user_list, assoc->user);
if(assoc->partition) {
- assoc_cond.partition_list = list_create(NULL);
+ assoc_cond.partition_list = list_create(NULL);
list_push(assoc_cond.partition_list,
assoc->partition);
}
}
-
+
notice_thread_init();
ret_list = acct_storage_g_modify_associations(
db_conn, my_uid,
- &assoc_cond,
+ &assoc_cond,
&mod_assoc);
notice_thread_fini();
-
+
if(mod_assoc.qos_list)
list_destroy(mod_assoc.qos_list);
@@ -1171,7 +1171,7 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
/* printf(" %s\n", object); */
/* list_iterator_destroy(itr); */
/* } */
-
+
if(ret_list) {
printf("%s", my_info);
list_destroy(ret_list);
@@ -1190,13 +1190,13 @@ static int _mod_cluster(sacctmgr_file_opts_t *file_opts,
char *my_info = NULL;
acct_cluster_rec_t mod_cluster;
acct_cluster_cond_t cluster_cond;
-
+
memset(&mod_cluster, 0, sizeof(acct_cluster_rec_t));
memset(&cluster_cond, 0, sizeof(acct_cluster_cond_t));
- if(file_opts->classification
+ if(file_opts->classification
&& (file_opts->classification != cluster->classification)) {
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8s -> %s\n",
" Changed Classification", "Cluster",
cluster->name,
@@ -1208,16 +1208,16 @@ static int _mod_cluster(sacctmgr_file_opts_t *file_opts,
if(changed) {
List ret_list = NULL;
-
+
cluster_cond.cluster_list = list_create(NULL);
list_append(cluster_cond.cluster_list, cluster->name);
notice_thread_init();
ret_list = acct_storage_g_modify_clusters(db_conn, my_uid,
- &cluster_cond,
+ &cluster_cond,
&mod_cluster);
notice_thread_fini();
-
+
list_destroy(cluster_cond.cluster_list);
/* if(ret_list && list_count(ret_list)) { */
@@ -1229,7 +1229,7 @@ static int _mod_cluster(sacctmgr_file_opts_t *file_opts,
/* printf(" %s\n", object); */
/* list_iterator_destroy(itr); */
/* } */
-
+
if(ret_list) {
printf("%s", my_info);
list_destroy(ret_list);
@@ -1252,16 +1252,16 @@ static int _mod_acct(sacctmgr_file_opts_t *file_opts,
acct_account_rec_t mod_acct;
acct_account_cond_t acct_cond;
acct_association_cond_t assoc_cond;
-
+
memset(&mod_acct, 0, sizeof(acct_account_rec_t));
memset(&acct_cond, 0, sizeof(acct_account_cond_t));
memset(&assoc_cond, 0, sizeof(acct_association_cond_t));
- if(file_opts->desc)
+ if(file_opts->desc)
desc = xstrdup(file_opts->desc);
if(desc && strcmp(desc, acct->description)) {
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8s -> %s\n",
" Changed description", "Account",
acct->name,
@@ -1269,14 +1269,14 @@ static int _mod_acct(sacctmgr_file_opts_t *file_opts,
desc);
mod_acct.description = desc;
changed = 1;
- } else
+ } else
xfree(desc);
-
+
if(file_opts->org)
org = xstrdup(file_opts->org);
if(org && strcmp(org, acct->organization)) {
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8s -> %s\n",
" Changed organization", "Account",
acct->name,
@@ -1286,20 +1286,20 @@ static int _mod_acct(sacctmgr_file_opts_t *file_opts,
changed = 1;
} else
xfree(org);
-
+
if(changed) {
List ret_list = NULL;
-
+
assoc_cond.acct_list = list_create(NULL);
list_append(assoc_cond.acct_list, acct->name);
acct_cond.assoc_cond = &assoc_cond;
notice_thread_init();
ret_list = acct_storage_g_modify_accounts(db_conn, my_uid,
- &acct_cond,
+ &acct_cond,
&mod_acct);
notice_thread_fini();
-
+
list_destroy(assoc_cond.acct_list);
/* if(ret_list && list_count(ret_list)) { */
@@ -1311,7 +1311,7 @@ static int _mod_acct(sacctmgr_file_opts_t *file_opts,
/* printf(" %s\n", object); */
/* list_iterator_destroy(itr); */
/* } */
-
+
if(ret_list) {
printf("%s", my_info);
list_destroy(ret_list);
@@ -1343,7 +1343,7 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
memset(&mod_user, 0, sizeof(acct_user_rec_t));
memset(&user_cond, 0, sizeof(acct_user_cond_t));
memset(&assoc_cond, 0, sizeof(acct_association_cond_t));
-
+
assoc_cond.user_list = list_create(NULL);
list_append(assoc_cond.user_list, user->name);
user_cond.assoc_cond = &assoc_cond;
@@ -1351,9 +1351,9 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
if(file_opts->def_acct)
def_acct = xstrdup(file_opts->def_acct);
- if(def_acct &&
+ if(def_acct &&
(!user->default_acct || strcmp(def_acct, user->default_acct))) {
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8s -> %s\n",
" Changed Default Account", "User",
user->name,
@@ -1362,13 +1362,13 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
mod_user.default_acct = def_acct;
changed = 1;
}
-
+
if(file_opts->def_wckey)
def_wckey = xstrdup(file_opts->def_wckey);
- if(def_wckey &&
+ if(def_wckey &&
(!user->default_wckey || strcmp(def_wckey, user->default_wckey))) {
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8s -> %s\n",
" Changed Default WCKey", "User",
user->name,
@@ -1377,11 +1377,11 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
mod_user.default_wckey = def_wckey;
changed = 1;
}
-
+
if(user->admin_level != ACCT_ADMIN_NOTSET
&& file_opts->admin != ACCT_ADMIN_NOTSET
&& user->admin_level != file_opts->admin) {
- xstrfmtcat(my_info,
+ xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8s -> %s\n",
" Changed Admin Level", "User",
user->name,
@@ -1392,15 +1392,15 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
mod_user.admin_level = file_opts->admin;
changed = 1;
}
-
+
if(changed) {
notice_thread_init();
ret_list = acct_storage_g_modify_users(
db_conn, my_uid,
- &user_cond,
+ &user_cond,
&mod_user);
notice_thread_fini();
-
+
/* if(ret_list && list_count(ret_list)) { */
/* char *object = NULL; */
/* ListIterator itr = list_iterator_create(ret_list); */
@@ -1410,26 +1410,26 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
/* printf(" %s\n", object); */
/* list_iterator_destroy(itr); */
/* } */
-
+
if(ret_list) {
printf("%s", my_info);
list_destroy(ret_list);
set = 1;
- }
+ }
xfree(my_info);
}
xfree(def_acct);
xfree(def_wckey);
if((!user->coord_accts || !list_count(user->coord_accts))
- && (file_opts->coord_list
+ && (file_opts->coord_list
&& list_count(file_opts->coord_list))) {
ListIterator coord_itr = NULL;
char *temp_char = NULL;
acct_coord_rec_t *coord = NULL;
int first = 1;
notice_thread_init();
- rc = acct_storage_g_add_coord(db_conn, my_uid,
+ rc = acct_storage_g_add_coord(db_conn, my_uid,
file_opts->coord_list,
&user_cond);
notice_thread_fini();
@@ -1454,7 +1454,7 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
printf("\n");
set = 1;
} else if((user->coord_accts && list_count(user->coord_accts))
- && (file_opts->coord_list
+ && (file_opts->coord_list
&& list_count(file_opts->coord_list))) {
ListIterator coord_itr = NULL;
ListIterator char_itr = NULL;
@@ -1478,7 +1478,7 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
"account '%s'\n",
user->name,
temp_char);
-
+
list_append(add_list, temp_char);
}
list_iterator_reset(coord_itr);
@@ -1489,7 +1489,7 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
if(list_count(add_list)) {
notice_thread_init();
- rc = acct_storage_g_add_coord(db_conn, my_uid,
+ rc = acct_storage_g_add_coord(db_conn, my_uid,
add_list,
&user_cond);
notice_thread_fini();
@@ -1499,7 +1499,7 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
}
if((!user->wckey_list || !list_count(user->wckey_list))
- && (file_opts->wckey_list
+ && (file_opts->wckey_list
&& list_count(file_opts->wckey_list))) {
ListIterator wckey_itr = NULL;
char *temp_char = NULL;
@@ -1526,11 +1526,11 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
printf(" for user '%s'\n", user->name);
set = 1;
notice_thread_init();
- rc = acct_storage_g_add_wckeys(db_conn, my_uid,
+ rc = acct_storage_g_add_wckeys(db_conn, my_uid,
user->wckey_list);
notice_thread_fini();
} else if((user->wckey_list && list_count(user->wckey_list))
- && (file_opts->wckey_list
+ && (file_opts->wckey_list
&& list_count(file_opts->wckey_list))) {
ListIterator wckey_itr = NULL;
ListIterator char_itr = NULL;
@@ -1543,7 +1543,7 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
while((temp_char = list_next(char_itr))) {
while((wckey = list_next(wckey_itr))) {
- if(!strcmp(wckey->name, temp_char))
+ if(!strcmp(wckey->name, temp_char))
break;
}
if(!wckey) {
@@ -1553,7 +1553,7 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
wckey->name = xstrdup(temp_char);
wckey->cluster = xstrdup(cluster);
wckey->user = xstrdup(user->name);
-
+
list_append(add_list, wckey);
}
list_iterator_reset(wckey_itr);
@@ -1564,7 +1564,7 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
if(list_count(add_list)) {
notice_thread_init();
- rc = acct_storage_g_add_wckeys(db_conn, my_uid,
+ rc = acct_storage_g_add_wckeys(db_conn, my_uid,
add_list);
notice_thread_fini();
set = 1;
@@ -1585,34 +1585,34 @@ static acct_user_rec_t *_set_user_up(sacctmgr_file_opts_t *file_opts,
user->assoc_list = NULL;
user->name = xstrdup(file_opts->name);
-
+
if(file_opts->def_acct)
user->default_acct = xstrdup(file_opts->def_acct);
else
user->default_acct = xstrdup(parent);
-
+
if(file_opts->def_wckey)
user->default_wckey = xstrdup(file_opts->def_wckey);
else
user->default_wckey = xstrdup("");
-
+
user->admin_level = file_opts->admin;
-
+
if(file_opts->coord_list) {
acct_user_cond_t user_cond;
acct_association_cond_t assoc_cond;
ListIterator coord_itr = NULL;
char *temp_char = NULL;
acct_coord_rec_t *coord = NULL;
-
+
memset(&user_cond, 0, sizeof(acct_user_cond_t));
memset(&assoc_cond, 0, sizeof(acct_association_cond_t));
assoc_cond.user_list = list_create(NULL);
list_append(assoc_cond.user_list, user->name);
user_cond.assoc_cond = &assoc_cond;
-
+
notice_thread_init();
- acct_storage_g_add_coord(db_conn, my_uid,
+ acct_storage_g_add_coord(db_conn, my_uid,
file_opts->coord_list,
&user_cond);
notice_thread_fini();
@@ -1632,7 +1632,7 @@ static acct_user_rec_t *_set_user_up(sacctmgr_file_opts_t *file_opts,
ListIterator wckey_itr = NULL;
char *temp_char = NULL;
acct_wckey_rec_t *wckey = NULL;
-
+
user->wckey_list = list_create(destroy_acct_wckey_rec);
wckey_itr = list_iterator_create(file_opts->wckey_list);
while((temp_char = list_next(wckey_itr))) {
@@ -1655,9 +1655,9 @@ static acct_account_rec_t *_set_acct_up(sacctmgr_file_opts_t *file_opts,
char *parent)
{
acct_account_rec_t *acct = xmalloc(sizeof(acct_account_rec_t));
- acct->assoc_list = NULL;
+ acct->assoc_list = NULL;
acct->name = xstrdup(file_opts->name);
- if(file_opts->desc)
+ if(file_opts->desc)
acct->description = xstrdup(file_opts->desc);
else
acct->description = xstrdup(file_opts->name);
@@ -1716,16 +1716,16 @@ static acct_association_rec_t *_set_assoc_up(sacctmgr_file_opts_t *file_opts,
break;
}
-
+
assoc->shares_raw = file_opts->fairshare;
-
+
assoc->grp_cpu_mins = file_opts->grp_cpu_mins;
assoc->grp_cpus = file_opts->grp_cpus;
assoc->grp_jobs = file_opts->grp_jobs;
assoc->grp_nodes = file_opts->grp_nodes;
assoc->grp_submit_jobs = file_opts->grp_submit_jobs;
assoc->grp_wall = file_opts->grp_wall;
-
+
assoc->max_cpu_mins_pj = file_opts->max_cpu_mins_pj;
assoc->max_cpus_pj = file_opts->max_cpus_pj;
assoc->max_jobs = file_opts->max_jobs;
@@ -1733,14 +1733,14 @@ static acct_association_rec_t *_set_assoc_up(sacctmgr_file_opts_t *file_opts,
assoc->max_submit_jobs = file_opts->max_submit_jobs;
assoc->max_wall_pj = file_opts->max_wall_pj;
- if(file_opts->qos_list && list_count(file_opts->qos_list))
+ if(file_opts->qos_list && list_count(file_opts->qos_list))
assoc->qos_list = copy_char_list(file_opts->qos_list);
return assoc;
}
-static int _print_file_acct_hierarchical_rec_childern(FILE *fd,
+static int _print_file_acct_hierarchical_rec_childern(FILE *fd,
List acct_hierarchical_rec_list,
List user_list,
List acct_list)
@@ -1759,19 +1759,19 @@ static int _print_file_acct_hierarchical_rec_childern(FILE *fd,
user_list, acct_hierarchical_rec->assoc->user);
line = xstrdup_printf(
"User - %s", acct_hierarchical_rec->sort_name);
- if(acct_hierarchical_rec->assoc->partition)
- xstrfmtcat(line, ":Partition='%s'",
+ if(acct_hierarchical_rec->assoc->partition)
+ xstrfmtcat(line, ":Partition='%s'",
acct_hierarchical_rec->
assoc->partition);
if(user_rec) {
xstrfmtcat(line, ":DefaultAccount='%s'",
user_rec->default_acct);
- if(track_wckey
- && user_rec->default_wckey
+ if(track_wckey
+ && user_rec->default_wckey
&& user_rec->default_wckey[0])
xstrfmtcat(line, ":DefaultWCKey='%s'",
user_rec->default_wckey);
-
+
if(user_rec->admin_level > ACCT_ADMIN_NONE)
xstrfmtcat(line, ":AdminLevel='%s'",
acct_admin_level_str(
@@ -1790,7 +1790,7 @@ static int _print_file_acct_hierarchical_rec_childern(FILE *fd,
/* We only care about
* the direct accounts here
*/
- if(!coord->direct)
+ if(!coord->direct)
continue;
if(first_coord) {
xstrfmtcat(
@@ -1802,7 +1802,7 @@ static int _print_file_acct_hierarchical_rec_childern(FILE *fd,
} else {
xstrfmtcat(line, ",%s",
coord->name);
- }
+ }
}
if(!first_coord)
xstrcat(line, "'");
@@ -1826,7 +1826,7 @@ static int _print_file_acct_hierarchical_rec_childern(FILE *fd,
} else {
xstrfmtcat(line, ",%s",
wckey->name);
- }
+ }
}
if(!first_wckey)
xstrcat(line, "'");
@@ -1846,8 +1846,8 @@ static int _print_file_acct_hierarchical_rec_childern(FILE *fd,
acct_rec->organization);
}
}
-
- print_file_add_limits_to_line(&line,
+
+ print_file_add_limits_to_line(&line,
acct_hierarchical_rec->assoc);
if(fprintf(fd, "%s\n", line) < 0) {
@@ -1874,51 +1874,51 @@ extern int print_file_add_limits_to_line(char **line,
if(assoc->shares_raw != INFINITE)
xstrfmtcat(*line, ":Fairshare=%u", assoc->shares_raw);
-
+
if(assoc->grp_cpu_mins != INFINITE)
xstrfmtcat(*line, ":GrpCPUMins=%llu", assoc->grp_cpu_mins);
-
+
if(assoc->grp_cpus != INFINITE)
xstrfmtcat(*line, ":GrpCPUs=%u", assoc->grp_cpus);
-
- if(assoc->grp_jobs != INFINITE)
+
+ if(assoc->grp_jobs != INFINITE)
xstrfmtcat(*line, ":GrpJobs=%u", assoc->grp_jobs);
-
+
if(assoc->grp_nodes != INFINITE)
xstrfmtcat(*line, ":GrpNodes=%u", assoc->grp_nodes);
-
- if(assoc->grp_submit_jobs != INFINITE)
+
+ if(assoc->grp_submit_jobs != INFINITE)
xstrfmtcat(*line, ":GrpSubmitJobs=%u", assoc->grp_submit_jobs);
-
+
if(assoc->grp_wall != INFINITE)
xstrfmtcat(*line, ":GrpWall=%u", assoc->grp_wall);
if(assoc->max_cpu_mins_pj != INFINITE)
xstrfmtcat(*line, ":MaxCPUMinsPerJob=%llu",
assoc->max_cpu_mins_pj);
-
+
if(assoc->max_cpus_pj != INFINITE)
xstrfmtcat(*line, ":MaxCPUsPerJob=%u", assoc->max_cpus_pj);
-
- if(assoc->max_jobs != INFINITE)
+
+ if(assoc->max_jobs != INFINITE)
xstrfmtcat(*line, ":MaxJobs=%u", assoc->max_jobs);
-
+
if(assoc->max_nodes_pj != INFINITE)
xstrfmtcat(*line, ":MaxNodesPerJob=%u", assoc->max_nodes_pj);
-
- if(assoc->max_submit_jobs != INFINITE)
+
+ if(assoc->max_submit_jobs != INFINITE)
xstrfmtcat(*line, ":MaxSubmitJobs=%u", assoc->max_submit_jobs);
-
+
if(assoc->max_wall_pj != INFINITE)
xstrfmtcat(*line, ":MaxWallDurationPerJob=%u",
assoc->max_wall_pj);
if(assoc->qos_list && list_count(assoc->qos_list)) {
char *temp_char = NULL;
- if(!g_qos_list)
+ if(!g_qos_list)
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
-
+
temp_char = get_qos_complete_str(g_qos_list, assoc->qos_list);
xstrfmtcat(*line, ":QOS='%s'", temp_char);
xfree(temp_char);
@@ -1928,7 +1928,7 @@ extern int print_file_add_limits_to_line(char **line,
}
-extern int print_file_acct_hierarchical_rec_list(FILE *fd,
+extern int print_file_acct_hierarchical_rec_list(FILE *fd,
List acct_hierarchical_rec_list,
List user_list,
List acct_list)
@@ -1957,7 +1957,7 @@ extern int print_file_acct_hierarchical_rec_list(FILE *fd,
_print_file_acct_hierarchical_rec_childern(
fd, acct_hierarchical_rec->childern,
user_list, acct_list);
- }
+ }
list_iterator_destroy(itr);
return SLURM_SUCCESS;
@@ -2006,13 +2006,13 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
List print_fields_list;
List format_list = NULL;
print_field_t *field = NULL;
-
+
int set = 0, command_len = 0;
-
+
if(readonly_flag) {
exit_code = 1;
fprintf(stderr, "Can't run this command in readonly mode.\n");
- return;
+ return;
}
/* reset the connection to get the most recent stuff */
@@ -2037,17 +2037,17 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
MAX(command_len, 1))) {
if(file_name) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" File name already set to %s\n",
file_name);
continue;
- }
+ }
file_name = xstrdup(argv[i]+end);
} else if (!strncasecmp (argv[i], "Cluster",
MAX(command_len, 3))) {
if(cluster_name) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Can only do one cluster at a time. "
"Already doing %s\n", cluster_name);
continue;
@@ -2057,16 +2057,16 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
} else {
exit_code=1;
fprintf(stderr, " Unknown option: %s\n", argv[i]);
- }
+ }
}
if(!file_name) {
exit_code=1;
xfree(cluster_name);
- fprintf(stderr,
+ fprintf(stderr,
" No filename given, specify one with file=''\n");
return;
-
+
}
fd = fopen(file_name, "r");
@@ -2085,12 +2085,12 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
acct_assoc_list = list_create(destroy_acct_association_rec);
user_list = list_create(destroy_acct_user_rec);
user_assoc_list = list_create(destroy_acct_association_rec);
-
+
mod_acct_list = list_create(destroy_acct_account_rec);
mod_user_list = list_create(destroy_acct_user_rec);
mod_assoc_list = list_create(destroy_acct_association_rec);
- format_list = list_create(slurm_destroy_char);
+ format_list = list_create(slurm_destroy_char);
while((num_lines = _get_next_line(line, BUFFER_SIZE, fd)) > 0) {
lc += num_lines;
@@ -2107,16 +2107,16 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
for(i=0; i<len; i++) {
if(line[i] == '-') {
start = i;
- if(line[i-1] == ' ')
+ if(line[i-1] == ' ')
i--;
if(i<sizeof(object))
strncpy(object, line, i);
break;
- }
+ }
}
- if(!object[0])
+ if(!object[0])
continue;
-
+
while(line[start] != ' ' && start<len)
start++;
if(start>=len) {
@@ -2128,8 +2128,8 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
break;
}
start++;
-
- if(!strcasecmp("Machine", object)
+
+ if(!strcasecmp("Machine", object)
|| !strcasecmp("Cluster", object)) {
acct_association_cond_t assoc_cond;
@@ -2142,10 +2142,10 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
}
file_opts = _parse_options(line+start);
-
+
if(!file_opts) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" error: Problem with line(%d)\n", lc);
rc = SLURM_ERROR;
break;
@@ -2153,14 +2153,14 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
if(!cluster_name_set)
cluster_name = xstrdup(file_opts->name);
-
+
/* we have to do this here since this is the
first place we have the cluster_name
*/
memset(&user_cond, 0, sizeof(acct_user_cond_t));
user_cond.with_coords = 1;
user_cond.with_wckeys = 1;
-
+
memset(&assoc_cond, 0, sizeof(acct_association_cond_t));
assoc_cond.cluster_list = list_create(NULL);
assoc_cond.with_raw_qos = 1;
@@ -2184,14 +2184,14 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
list_destroy(curr_user_list);
xfree(user_name);
return;
-
+
} else {
- if(my_uid != slurm_get_slurm_user_id()
+ if(my_uid != slurm_get_slurm_user_id()
&& my_uid != 0
- && (user->admin_level
+ && (user->admin_level
< ACCT_ADMIN_SUPER_USER)) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Your user does not have "
"sufficient "
"privileges to load files.\n");
@@ -2202,7 +2202,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
}
}
xfree(user_name);
-
+
if(start_clean) {
acct_cluster_cond_t cluster_cond;
List ret_list = NULL;
@@ -2214,9 +2214,9 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
"to continue?")) {
printf("Aborted\n");
break;
- }
+ }
- memset(&cluster_cond, 0,
+ memset(&cluster_cond, 0,
sizeof(acct_cluster_cond_t));
cluster_cond.cluster_list = list_create(NULL);
list_append(cluster_cond.cluster_list,
@@ -2239,9 +2239,9 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
curr_cluster_list = acct_storage_g_get_clusters(
db_conn, my_uid, NULL);
- if(cluster_name)
+ if(cluster_name)
printf("For cluster %s\n", cluster_name);
-
+
if(!(cluster = sacctmgr_find_cluster_from_list(
curr_cluster_list, cluster_name))) {
List temp_assoc_list = list_create(NULL);
@@ -2254,7 +2254,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
if(file_opts->classification) {
cluster->classification =
file_opts->classification;
- printf("Classification: %s\n",
+ printf("Classification: %s\n",
get_classification_str(
cluster->
classification));
@@ -2265,11 +2265,11 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
cluster_name, "root");
list_append(temp_assoc_list,
cluster->root_assoc);
-
+
rc = _print_out_assoc(temp_assoc_list, 0, 0);
list_destroy(temp_assoc_list);
notice_thread_init();
-
+
rc = acct_storage_g_add_clusters(
db_conn, my_uid, cluster_list);
notice_thread_fini();
@@ -2277,7 +2277,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
if(rc != SLURM_SUCCESS) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Problem adding cluster\n");
rc = SLURM_ERROR;
_destroy_sacctmgr_file_opts(file_opts);
@@ -2288,9 +2288,9 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
set = _mod_cluster(file_opts,
cluster, parent);
}
-
+
_destroy_sacctmgr_file_opts(file_opts);
-
+
/* assoc_cond if set up above */
curr_assoc_list = acct_storage_g_get_associations(
db_conn, my_uid, &assoc_cond);
@@ -2311,14 +2311,14 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
"first with 'Cluster - $NAME' in your file\n");
break;
}
-
+
if(!strcasecmp("Parent", object)) {
xfree(parent);
-
+
i = start;
while(line[i] != '\n' && i<len)
i++;
-
+
if(i >= len) {
exit_code=1;
fprintf(stderr, " No parent name "
@@ -2346,19 +2346,19 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
printf(" No parent given creating off root, "
"If incorrect specify 'Parent - name' "
"before any childern in your file\n");
- }
-
+ }
+
if(!strcasecmp("Project", object)
|| !strcasecmp("Account", object)) {
file_opts = _parse_options(line+start);
-
+
if(!file_opts) {
exit_code=1;
fprintf(stderr, " Problem with line(%d)\n", lc);
rc = SLURM_ERROR;
break;
}
-
+
//info("got a project %s of %s", file_opts->name, parent);
if(!(acct = sacctmgr_find_account_from_list(
curr_acct_list, file_opts->name))
@@ -2430,9 +2430,9 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
list_append(mod_assoc_list, assoc2);
assoc2->cluster = xstrdup(cluster_name);
assoc2->acct = xstrdup(file_opts->name);
- assoc2->parent_acct =
+ assoc2->parent_acct =
xstrdup(assoc->parent_acct);
- if(_mod_assoc(file_opts,
+ if(_mod_assoc(file_opts,
assoc, MOD_ACCT, parent))
set = 1;
} else {
@@ -2443,7 +2443,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
continue;
} else if(!strcasecmp("User", object)) {
file_opts = _parse_options(line+start);
-
+
if(!file_opts) {
exit_code=1;
fprintf(stderr, " Problem with line(%d)\n", lc);
@@ -2471,7 +2471,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
} else if(!(assoc = sacctmgr_find_association_from_list(
curr_assoc_list,
file_opts->name, parent,
- cluster_name, file_opts->part))
+ cluster_name, file_opts->part))
&& !sacctmgr_find_association_from_list(
user_assoc_list,
file_opts->name, parent,
@@ -2482,7 +2482,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
* during this round but this is a new
* association we are adding
*/
- if(!user)
+ if(!user)
goto new_association;
/* This means there could be a change
@@ -2539,7 +2539,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
assoc2->user = xstrdup(file_opts->name);
assoc2->partition =
xstrdup(file_opts->part);
- if(_mod_assoc(file_opts,
+ if(_mod_assoc(file_opts,
assoc, MOD_USER, parent))
set = 1;
} else {
@@ -2551,7 +2551,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
continue;
} else {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Misformatted line(%d): %s\n", lc, line);
rc = SLURM_ERROR;
break;
@@ -2560,7 +2560,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
fclose(fd);
xfree(cluster_name);
xfree(parent);
-
+
START_TIMER;
if(rc == SLURM_SUCCESS && list_count(acct_list)) {
printf("Accounts\n");
@@ -2569,7 +2569,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
print_fields_list = _set_up_print_fields(format_list);
list_flush(format_list);
-
+
print_fields_header(print_fields_list);
itr = list_iterator_create(acct_list);
@@ -2606,7 +2606,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
"----------------------\n\n");
set = 1;
}
-
+
if(rc == SLURM_SUCCESS && list_count(acct_assoc_list)) {
printf("Account Associations\n");
rc = _print_out_assoc(acct_assoc_list, 0, 1);
@@ -2615,7 +2615,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
if(rc == SLURM_SUCCESS && list_count(user_list)) {
printf("Users\n");
- slurm_addto_char_list(format_list,
+ slurm_addto_char_list(format_list,
"Name,DefaultA,DefaultW,QOS,Admin,Coord");
print_fields_list = _set_up_print_fields(format_list);
@@ -2668,13 +2668,13 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
list_iterator_destroy(itr);
list_iterator_destroy(itr2);
list_destroy(print_fields_list);
-
+
rc = acct_storage_g_add_users(db_conn, my_uid, user_list);
printf("---------------------------"
"------------------------\n\n");
set = 1;
}
-
+
if(rc == SLURM_SUCCESS && list_count(user_assoc_list)) {
printf("User Associations\n");
rc = _print_out_assoc(user_assoc_list, 1, 1);
@@ -2684,7 +2684,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
if(set)
info("Done adding cluster in %s", TIME_STR);
-
+
if(rc == SLURM_SUCCESS) {
if(set) {
if(commit_check("Would you like to commit changes?")) {
diff --git a/src/sacctmgr/problem_functions.c b/src/sacctmgr/problem_functions.c
index fc954ab1573ecc4e2b23826971b5cd6397f208f4..30b72414771c3c81a2cbb800144df4fcc53999a9 100644
--- a/src/sacctmgr/problem_functions.c
+++ b/src/sacctmgr/problem_functions.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -60,18 +60,18 @@ static int _set_cond(int *start, int argc, char *argv[],
}
}
- if (!end && !strncasecmp (argv[i], "Tree",
+ if (!end && !strncasecmp (argv[i], "Tree",
MAX(command_len, 4))) {
tree_display = 1;
- } else if(!end && !strncasecmp(argv[i], "where",
+ } else if(!end && !strncasecmp(argv[i], "where",
MAX(command_len, 5))) {
continue;
- } else if(!end || !strncasecmp (argv[i], "Ids",
+ } else if(!end || !strncasecmp (argv[i], "Ids",
MAX(command_len, 1))
- || !strncasecmp (argv[i], "Problems",
+ || !strncasecmp (argv[i], "Problems",
MAX(command_len, 2))) {
if(!assoc_cond->id_list)
- assoc_cond->id_list =
+ assoc_cond->id_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->id_list,
argv[i]+end);
@@ -81,7 +81,7 @@ static int _set_cond(int *start, int argc, char *argv[],
|| !strncasecmp (argv[i], "Acct",
MAX(command_len, 4))) {
if(!assoc_cond->acct_list)
- assoc_cond->acct_list =
+ assoc_cond->acct_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->acct_list,
argv[i]+end);
@@ -89,7 +89,7 @@ static int _set_cond(int *start, int argc, char *argv[],
} else if (!strncasecmp (argv[i], "Clusters",
MAX(command_len, 1))) {
if(!assoc_cond->cluster_list)
- assoc_cond->cluster_list =
+ assoc_cond->cluster_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->cluster_list,
argv[i]+end);
@@ -99,10 +99,10 @@ static int _set_cond(int *start, int argc, char *argv[],
if(format_list)
slurm_addto_char_list(format_list,
argv[i]+end);
- } else if (!strncasecmp (argv[i], "Partitions",
+ } else if (!strncasecmp (argv[i], "Partitions",
MAX(command_len, 4))) {
if(!assoc_cond->partition_list)
- assoc_cond->partition_list =
+ assoc_cond->partition_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->partition_list,
argv[i]+end);
@@ -110,7 +110,7 @@ static int _set_cond(int *start, int argc, char *argv[],
} else if (!strncasecmp (argv[i], "Users",
MAX(command_len, 1))) {
if(!assoc_cond->user_list)
- assoc_cond->user_list =
+ assoc_cond->user_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->user_list,
argv[i]+end);
@@ -156,8 +156,8 @@ extern int sacctmgr_list_problem(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
- i++;
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
+ i++;
_set_cond(&i, argc, argv, assoc_cond, format_list);
}
@@ -165,7 +165,7 @@ extern int sacctmgr_list_problem(int argc, char *argv[])
destroy_acct_association_cond(assoc_cond);
list_destroy(format_list);
return SLURM_ERROR;
- } else if(!list_count(format_list))
+ } else if(!list_count(format_list))
slurm_addto_char_list(format_list, "C,A,U,Problem");
print_fields_list = list_create(destroy_print_field);
@@ -175,14 +175,14 @@ extern int sacctmgr_list_problem(int argc, char *argv[])
char *tmp_char = NULL;
int command_len = 0;
int newlen = 0;
-
+
if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
- }
+ }
command_len = strlen(object);
-
+
field = xmalloc(sizeof(print_field_t));
if(!strncasecmp("Account", object, MAX(command_len, 1))
@@ -219,10 +219,10 @@ extern int sacctmgr_list_problem(int argc, char *argv[])
continue;
}
- if(newlen)
+ if(newlen)
field->len = newlen;
-
- list_append(print_fields_list, field);
+
+ list_append(print_fields_list, field);
}
list_iterator_destroy(itr);
list_destroy(format_list);
@@ -255,7 +255,7 @@ extern int sacctmgr_list_problem(int argc, char *argv[])
switch(field->type) {
case PRINT_ACCOUNT:
field->print_routine(
- field,
+ field,
assoc->acct,
(curr_inx == field_count));
break;
@@ -277,7 +277,7 @@ extern int sacctmgr_list_problem(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_USER:
- field->print_routine(field,
+ field->print_routine(field,
assoc->user,
(curr_inx == field_count));
break;
@@ -293,9 +293,9 @@ extern int sacctmgr_list_problem(int argc, char *argv[])
printf("\n");
}
- if(tree_list)
+ if(tree_list)
list_destroy(tree_list);
-
+
list_iterator_destroy(itr2);
list_iterator_destroy(itr);
list_destroy(assoc_list);
diff --git a/src/sacctmgr/qos_functions.c b/src/sacctmgr/qos_functions.c
index 4a450976eeb66a394d1ad912b911d6620c61fbd8..696e211ac3ef82a8ead7b29907e25a61d90a5f9c 100644
--- a/src/sacctmgr/qos_functions.c
+++ b/src/sacctmgr/qos_functions.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -69,7 +69,7 @@ static int _set_cond(int *start, int argc, char *argv[],
if (!strncasecmp (argv[i], "Set", MAX(command_len, 3))) {
i--;
break;
- } else if (!strncasecmp (argv[i], "WithDeleted",
+ } else if (!strncasecmp (argv[i], "WithDeleted",
MAX(command_len, 5))) {
qos_cond->with_deleted = 1;
} else if(!end && !strncasecmp(argv[i], "where",
@@ -81,22 +81,22 @@ static int _set_cond(int *start, int argc, char *argv[],
|| !strncasecmp (argv[i], "QOSLevel",
MAX(command_len, 1))) {
if(!qos_cond->name_list) {
- qos_cond->name_list =
+ qos_cond->name_list =
list_create(slurm_destroy_char);
}
if(slurm_addto_char_list(qos_cond->name_list,
argv[i]+end))
set = 1;
- } else if(!strncasecmp (argv[i], "Descriptions",
+ } else if(!strncasecmp (argv[i], "Descriptions",
MAX(command_len, 1))) {
if(!qos_cond->description_list) {
- qos_cond->description_list =
+ qos_cond->description_list =
list_create(slurm_destroy_char);
}
if(slurm_addto_char_list(qos_cond->description_list,
argv[i]+end))
set = 1;
- } else if (!strncasecmp (argv[i], "Format",
+ } else if (!strncasecmp (argv[i], "Format",
MAX(command_len, 1))) {
if(format_list)
slurm_addto_char_list(format_list, argv[i]+end);
@@ -106,10 +106,10 @@ static int _set_cond(int *start, int argc, char *argv[],
uint32_t id = 0;
if(!qos_cond->id_list) {
- qos_cond->id_list =
+ qos_cond->id_list =
list_create(slurm_destroy_char);
}
- if(slurm_addto_char_list(qos_cond->id_list,
+ if(slurm_addto_char_list(qos_cond->id_list,
argv[i]+end))
set = 1;
@@ -166,7 +166,7 @@ static int _set_rec(int *start, int argc, char *argv[],
} else if(!end
|| !strncasecmp (argv[i], "Name",
MAX(command_len, 1))) {
- if(name_list)
+ if(name_list)
slurm_addto_char_list(name_list, argv[i]+end);
} else if (!strncasecmp (argv[i], "Description",
MAX(command_len, 1))) {
@@ -178,8 +178,8 @@ static int _set_rec(int *start, int argc, char *argv[],
MAX(command_len, 7))) {
if(!qos)
continue;
- if (get_uint64(argv[i]+end,
- &qos->grp_cpu_mins,
+ if (get_uint64(argv[i]+end,
+ &qos->grp_cpu_mins,
"GrpCPUMins") == SLURM_SUCCESS)
set = 1;
} else if (!strncasecmp (argv[i], "GrpCpus",
@@ -220,19 +220,19 @@ static int _set_rec(int *start, int argc, char *argv[],
set = 1;
} else {
exit_code=1;
- fprintf(stderr,
- " Bad GrpWall time format: %s\n",
+ fprintf(stderr,
+ " Bad GrpWall time format: %s\n",
argv[i]);
}
- } else if (!strncasecmp (argv[i], "MaxCPUMinsPerJob",
+ } else if (!strncasecmp (argv[i], "MaxCPUMinsPerJob",
MAX(command_len, 7))) {
if(!qos)
continue;
- if (get_uint64(argv[i]+end,
- &qos->max_cpu_mins_pj,
+ if (get_uint64(argv[i]+end,
+ &qos->max_cpu_mins_pj,
"MaxCPUMins") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp (argv[i], "MaxCpusPerJob",
+ } else if (!strncasecmp (argv[i], "MaxCpusPerJob",
MAX(command_len, 7))) {
if(!qos)
continue;
@@ -250,7 +250,7 @@ static int _set_rec(int *start, int argc, char *argv[],
MAX(command_len, 4))) {
if(!qos)
continue;
- if (get_uint(argv[i]+end,
+ if (get_uint(argv[i]+end,
&qos->max_nodes_pj,
"MaxNodes") == SLURM_SUCCESS)
set = 1;
@@ -261,7 +261,7 @@ static int _set_rec(int *start, int argc, char *argv[],
if (get_uint(argv[i]+end, &qos->max_submit_jobs_pu,
"MaxSubmitJobs") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp (argv[i], "MaxWallDurationPerJob",
+ } else if (!strncasecmp (argv[i], "MaxWallDurationPerJob",
MAX(command_len, 4))) {
if(!qos)
continue;
@@ -271,41 +271,41 @@ static int _set_rec(int *start, int argc, char *argv[],
set = 1;
} else {
exit_code=1;
- fprintf(stderr,
- " Bad MaxWall time format: %s\n",
+ fprintf(stderr,
+ " Bad MaxWall time format: %s\n",
argv[i]);
}
- } else if (!strncasecmp (argv[i], "Preempt",
+ } else if (!strncasecmp (argv[i], "Preempt",
MAX(command_len, 3))) {
if(!qos)
continue;
- if(!qos->preempt_list)
- qos->preempt_list =
+ if(!qos->preempt_list)
+ qos->preempt_list =
list_create(slurm_destroy_char);
- if(!g_qos_list)
+ if(!g_qos_list)
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
-
+
if(addto_qos_char_list(qos->preempt_list,
g_qos_list, argv[i]+end, option))
set = 1;
else
exit_code = 1;
- } else if (!strncasecmp (argv[i], "Priority",
+ } else if (!strncasecmp (argv[i], "Priority",
MAX(command_len, 3))) {
if(!qos)
continue;
-
+
if (get_uint(argv[i]+end, &qos->priority,
"Priority") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp (argv[i], "UsageFactor",
+ } else if (!strncasecmp (argv[i], "UsageFactor",
MAX(command_len, 3))) {
if(!qos)
continue;
-
+
if (get_double(argv[i]+end, &qos->usage_factor,
"UsageFactor") == SLURM_SUCCESS)
set = 1;
@@ -339,8 +339,8 @@ extern int sacctmgr_add_qos(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
- i++;
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
+ i++;
limit_set += _set_rec(&i, argc, argv, name_list, start_qos);
}
@@ -353,13 +353,13 @@ extern int sacctmgr_add_qos(int argc, char *argv[])
list_destroy(name_list);
destroy_acct_qos_rec(start_qos);
exit_code=1;
- fprintf(stderr, " Need name of qos to add.\n");
+ fprintf(stderr, " Need name of qos to add.\n");
return SLURM_SUCCESS;
- }
+ }
if(!g_qos_list) {
g_qos_list = acct_storage_g_get_qos(db_conn, my_uid, NULL);
-
+
if(!g_qos_list) {
exit_code=1;
fprintf(stderr, " Problem getting qos's "
@@ -379,7 +379,7 @@ extern int sacctmgr_add_qos(int argc, char *argv[])
if(!sacctmgr_find_qos_from_list(g_qos_list, name)) {
qos = xmalloc(sizeof(acct_qos_rec_t));
qos->name = xstrdup(name);
- if(start_qos->description)
+ if(start_qos->description)
qos->description =
xstrdup(start_qos->description);
else
@@ -412,11 +412,11 @@ extern int sacctmgr_add_qos(int argc, char *argv[])
}
list_iterator_destroy(itr);
list_destroy(name_list);
-
+
if(!list_count(qos_list)) {
printf(" Nothing new added.\n");
goto end_it;
- }
+ }
if(qos_str) {
printf(" Adding QOS(s)\n%s", qos_str);
@@ -430,15 +430,15 @@ extern int sacctmgr_add_qos(int argc, char *argv[])
xfree(qos_str);
}
-
+
notice_thread_init();
- if(list_count(qos_list))
+ if(list_count(qos_list))
rc = acct_storage_g_add_qos(db_conn, my_uid, qos_list);
- else
+ else
goto end_it;
notice_thread_fini();
-
+
if(rc == SLURM_SUCCESS) {
if(commit_check("Would you like to commit changes?")) {
acct_storage_g_commit(db_conn, 1);
@@ -500,14 +500,14 @@ extern int sacctmgr_list_qos(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
- i++;
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
+ i++;
_set_cond(&i, argc, argv, qos_cond, format_list);
}
if(exit_code) {
destroy_acct_qos_cond(qos_cond);
- list_destroy(format_list);
+ list_destroy(format_list);
return SLURM_ERROR;
} else if(!list_count(format_list)) {
slurm_addto_char_list(format_list, "N,Prio,Pree,"
@@ -521,11 +521,11 @@ extern int sacctmgr_list_qos(int argc, char *argv[])
char *tmp_char = NULL;
int command_len = 0;
int newlen = 0;
-
+
if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
- }
+ }
command_len = strlen(object);
@@ -553,7 +553,7 @@ extern int sacctmgr_list_qos(int argc, char *argv[])
field->name = xstrdup("GrpJobs");
field->len = 7;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("GrpNodes", object,
+ } else if(!strncasecmp("GrpNodes", object,
MAX(command_len, 4))) {
field->type = PRINT_GRPN;
field->name = xstrdup("GrpNodes");
@@ -594,7 +594,7 @@ extern int sacctmgr_list_qos(int argc, char *argv[])
field->name = xstrdup("MaxCPUs");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("MaxJobsPerUser", object,
+ } else if(!strncasecmp("MaxJobsPerUser", object,
MAX(command_len, 4))) {
field->type = PRINT_MAXJ;
field->name = xstrdup("MaxJobs");
@@ -654,10 +654,10 @@ extern int sacctmgr_list_qos(int argc, char *argv[])
continue;
}
- if(newlen)
+ if(newlen)
field->len = newlen;
-
- list_append(print_fields_list, field);
+
+ list_append(print_fields_list, field);
}
list_iterator_destroy(itr);
list_destroy(format_list);
@@ -666,7 +666,7 @@ extern int sacctmgr_list_qos(int argc, char *argv[])
list_destroy(print_fields_list);
return SLURM_ERROR;
}
- qos_list = acct_storage_g_get_qos(db_conn, my_uid, qos_cond);
+ qos_list = acct_storage_g_get_qos(db_conn, my_uid, qos_cond);
destroy_acct_qos_cond(qos_cond);
if(!qos_list) {
@@ -702,7 +702,7 @@ extern int sacctmgr_list_qos(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_GRPJ:
- field->print_routine(field,
+ field->print_routine(field,
qos->grp_jobs,
(curr_inx == field_count));
break;
@@ -712,7 +712,7 @@ extern int sacctmgr_list_qos(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_GRPS:
- field->print_routine(field,
+ field->print_routine(field,
qos->grp_submit_jobs,
(curr_inx == field_count));
break;
@@ -739,7 +739,7 @@ extern int sacctmgr_list_qos(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_MAXJ:
- field->print_routine(field,
+ field->print_routine(field,
qos->max_jobs_pu,
(curr_inx == field_count));
break;
@@ -749,7 +749,7 @@ extern int sacctmgr_list_qos(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_MAXS:
- field->print_routine(field,
+ field->print_routine(field,
qos->max_submit_jobs_pu,
(curr_inx == field_count));
break;
@@ -765,7 +765,7 @@ extern int sacctmgr_list_qos(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_PREE:
- if(!g_qos_list)
+ if(!g_qos_list)
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
@@ -818,7 +818,7 @@ extern int sacctmgr_modify_qos(int argc, char *argv[])
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))) {
i++;
cond_set += _set_cond(&i, argc, argv, qos_cond, NULL);
-
+
} else if (!strncasecmp (argv[i], "Set", MAX(command_len, 3))) {
i++;
rec_set += _set_rec(&i, argc, argv, NULL, qos);
@@ -844,11 +844,11 @@ extern int sacctmgr_modify_qos(int argc, char *argv[])
destroy_acct_qos_cond(qos_cond);
destroy_acct_qos_rec(qos);
return SLURM_SUCCESS;
- }
+ }
}
- notice_thread_init();
-
+ notice_thread_init();
+
ret_list = acct_storage_g_modify_qos(db_conn, my_uid, qos_cond, qos);
if(ret_list && list_count(ret_list)) {
char *object = NULL;
@@ -866,14 +866,14 @@ extern int sacctmgr_modify_qos(int argc, char *argv[])
fprintf(stderr, " Error with request\n");
rc = SLURM_ERROR;
}
-
+
if(ret_list)
list_destroy(ret_list);
notice_thread_fini();
if(set) {
- if(commit_check("Would you like to commit changes?"))
+ if(commit_check("Would you like to commit changes?"))
acct_storage_g_commit(db_conn, 1);
else {
printf(" Changes Discarded\n");
@@ -882,7 +882,7 @@ extern int sacctmgr_modify_qos(int argc, char *argv[])
}
destroy_acct_qos_cond(qos_cond);
- destroy_acct_qos_rec(qos);
+ destroy_acct_qos_rec(qos);
return rc;
}
@@ -895,18 +895,18 @@ extern int sacctmgr_delete_qos(int argc, char *argv[])
int i=0;
List ret_list = NULL;
int set = 0;
-
+
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
- i++;
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
+ i++;
set += _set_cond(&i, argc, argv, qos_cond, NULL);
}
if(!set) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" No conditions given to remove, not executing.\n");
destroy_acct_qos_cond(qos_cond);
return SLURM_ERROR;
@@ -919,12 +919,12 @@ extern int sacctmgr_delete_qos(int argc, char *argv[])
ret_list = acct_storage_g_remove_qos(db_conn, my_uid, qos_cond);
notice_thread_fini();
destroy_acct_qos_cond(qos_cond);
-
+
if(ret_list && list_count(ret_list)) {
char *object = NULL;
ListIterator itr = list_iterator_create(ret_list);
printf(" Deleting QOS(s)...\n");
-
+
while((object = list_next(itr))) {
printf(" %s\n", object);
}
@@ -941,7 +941,7 @@ extern int sacctmgr_delete_qos(int argc, char *argv[])
exit_code=1;
fprintf(stderr, " Error with request\n");
rc = SLURM_ERROR;
- }
+ }
if(ret_list)
list_destroy(ret_list);
diff --git a/src/sacctmgr/sacctmgr.c b/src/sacctmgr/sacctmgr.c
index 80e42f06d3d7277fd43d18f61d5397d38bb7c29c..0a5c2b66307f41b531b409a58606f70267c90b1e 100644
--- a/src/sacctmgr/sacctmgr.c
+++ b/src/sacctmgr/sacctmgr.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * sacctmgr.c - administration tool for slurm's accounting.
+ * sacctmgr.c - administration tool for slurm's accounting.
* provides interface to read, write, update, and configure
* accounting.
*****************************************************************************
@@ -8,32 +8,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -68,8 +68,8 @@ static void _print_version( void );
static int _process_command (int argc, char *argv[]);
static void _usage ();
-int
-main (int argc, char *argv[])
+int
+main (int argc, char *argv[])
{
int error_code = SLURM_SUCCESS, i, opt_char, input_field_count;
char **input_fields;
@@ -125,7 +125,7 @@ main (int argc, char *argv[])
print_fields_have_header = 0;
break;
case (int)'p':
- print_fields_parsable_print =
+ print_fields_parsable_print =
PRINT_FIELDS_PARSABLE_ENDING;
break;
case (int)'P':
@@ -151,7 +151,7 @@ main (int argc, char *argv[])
break;
default:
exit_code = 1;
- fprintf(stderr, "getopt error, returned %c\n",
+ fprintf(stderr, "getopt error, returned %c\n",
opt_char);
exit(exit_code);
}
@@ -165,7 +165,7 @@ main (int argc, char *argv[])
if (optind < argc) {
for (i = optind; i < argc; i++) {
input_fields[input_field_count++] = argv[i];
- }
+ }
}
if (verbosity) {
@@ -197,7 +197,7 @@ main (int argc, char *argv[])
int tmp_errno = errno;
if((input_field_count == 2) &&
(!strncasecmp(argv[2], "Configuration", strlen(argv[1]))) &&
- ((!strncasecmp(argv[1], "list", strlen(argv[0]))) ||
+ ((!strncasecmp(argv[1], "list", strlen(argv[0]))) ||
(!strncasecmp(argv[1], "show", strlen(argv[0]))))) {
if(tmp_errno == ESLURM_DB_CONNECTION) {
tmp_errno = 0;
@@ -206,7 +206,7 @@ main (int argc, char *argv[])
sacctmgr_list_config(false);
}
errno = tmp_errno;
- if(errno)
+ if(errno)
error("Problem talking to the database: %m");
exit(1);
}
@@ -217,7 +217,7 @@ main (int argc, char *argv[])
else
error_code = _get_command (&input_field_count, input_fields);
while (error_code == SLURM_SUCCESS) {
- error_code = _process_command (input_field_count,
+ error_code = _process_command (input_field_count,
input_fields);
if (error_code || exit_flag)
break;
@@ -231,7 +231,7 @@ main (int argc, char *argv[])
exit_code = 0;
}
}
- if(local_exit_code)
+ if(local_exit_code)
exit_code = local_exit_code;
acct_storage_g_close_connection(&db_conn);
slurm_acct_storage_fini();
@@ -269,8 +269,8 @@ static char *_getline(const char *prompt)
* OUT argc - location to store count of arguments
* OUT argv - location to store the argument list
*/
-static int
-_get_command (int *argc, char **argv)
+static int
+_get_command (int *argc, char **argv)
{
char *in_line;
static char *last_in_line = NULL;
@@ -313,11 +313,11 @@ _get_command (int *argc, char **argv)
continue;
if (((*argc) + 1) > MAX_INPUT_FIELDS) { /* bogus input line */
exit_code = 1;
- fprintf (stderr,
+ fprintf (stderr,
"%s: can not process over %d words\n",
command_name, input_words);
return E2BIG;
- }
+ }
argv[(*argc)++] = &in_line[i];
for (i++; i < in_line_size; i++) {
if (in_line[i] == '\042') {
@@ -336,9 +336,9 @@ _get_command (int *argc, char **argv)
in_line[i] = '\0';
break;
}
- }
+ }
}
- return 0;
+ return 0;
}
@@ -348,7 +348,7 @@ static void _print_version(void)
if (quiet_flag == -1) {
long version = slurm_api_version();
printf("slurm_api_version: %ld, %ld.%ld.%ld\n", version,
- SLURM_VERSION_MAJOR(version),
+ SLURM_VERSION_MAJOR(version),
SLURM_VERSION_MINOR(version),
SLURM_VERSION_MICRO(version));
}
@@ -361,7 +361,7 @@ static void _print_version(void)
* RET 0 or errno (only for errors fatal to sacctmgr)
*/
static int
-_process_command (int argc, char *argv[])
+_process_command (int argc, char *argv[])
{
int command_len = 0;
if (argc < 1) {
@@ -369,11 +369,11 @@ _process_command (int argc, char *argv[])
if (quiet_flag == -1)
fprintf(stderr, "no input");
return 0;
- }
+ }
command_len = strlen(argv[0]);
-
- if (strncasecmp (argv[0], "associations",
+
+ if (strncasecmp (argv[0], "associations",
MAX(command_len, 3)) == 0) {
with_assoc_flag = 1;
} else if (strncasecmp (argv[0], "dump", MAX(command_len, 3)) == 0) {
@@ -381,18 +381,18 @@ _process_command (int argc, char *argv[])
} else if (strncasecmp (argv[0], "help", MAX(command_len, 2)) == 0) {
if (argc > 1) {
exit_code = 1;
- fprintf (stderr,
+ fprintf (stderr,
"too many arguments for keyword:%s\n",
argv[0]);
}
_usage ();
} else if (strncasecmp (argv[0], "load", MAX(command_len, 2)) == 0) {
load_sacctmgr_cfg_file((argc - 1), &argv[1]);
- } else if (strncasecmp (argv[0], "oneliner",
+ } else if (strncasecmp (argv[0], "oneliner",
MAX(command_len, 1)) == 0) {
if (argc > 1) {
exit_code = 1;
- fprintf (stderr,
+ fprintf (stderr,
"too many arguments for keyword:%s\n",
argv[0]);
}
@@ -409,8 +409,8 @@ _process_command (int argc, char *argv[])
(strncasecmp (argv[0], "quit", MAX(command_len, 4)) == 0)) {
if (argc > 1) {
exit_code = 1;
- fprintf (stderr,
- "too many arguments for keyword:%s\n",
+ fprintf (stderr,
+ "too many arguments for keyword:%s\n",
argv[0]);
}
exit_flag = 1;
@@ -438,7 +438,7 @@ _process_command (int argc, char *argv[])
fprintf (stderr,
"too many arguments for %s keyword\n",
argv[0]);
- }
+ }
quiet_flag = -1;
} else if (strncasecmp (argv[0], "readonly",
MAX(command_len, 4)) == 0) {
@@ -447,7 +447,7 @@ _process_command (int argc, char *argv[])
fprintf (stderr,
"too many arguments for %s keyword\n",
argv[0]);
- }
+ }
readonly_flag = 1;
} else if (strncasecmp (argv[0], "rollup", MAX(command_len, 2)) == 0) {
time_t my_start = 0;
@@ -466,7 +466,7 @@ _process_command (int argc, char *argv[])
my_end = parse_time(argv[2], 1);
if(argc > 3)
archive_data = atoi(argv[3]);
- if(acct_storage_g_roll_usage(db_conn, my_start,
+ if(acct_storage_g_roll_usage(db_conn, my_start,
my_end, archive_data)
== SLURM_SUCCESS) {
if(commit_check("Would you like to commit rollup?")) {
@@ -482,22 +482,22 @@ _process_command (int argc, char *argv[])
fprintf (stderr,
"too many arguments for %s keyword\n",
argv[0]);
- }
+ }
_print_version();
} else {
exit_code = 1;
fprintf (stderr, "invalid keyword: %s\n", argv[0]);
}
-
+
return 0;
}
-/*
- * _add_it - add the entity per the supplied arguments
+/*
+ * _add_it - add the entity per the supplied arguments
* IN argc - count of arguments
* IN argv - list of arguments
*/
-static void _add_it (int argc, char *argv[])
+static void _add_it (int argc, char *argv[])
{
int error_code = SLURM_SUCCESS;
int command_len = 0;
@@ -505,7 +505,7 @@ static void _add_it (int argc, char *argv[])
if(readonly_flag) {
exit_code = 1;
fprintf(stderr, "Can't run this command in readonly mode.\n");
- return;
+ return;
}
if(!argv[0])
@@ -514,7 +514,7 @@ static void _add_it (int argc, char *argv[])
command_len = strlen(argv[0]);
/* reset the connection to get the most recent stuff */
acct_storage_g_commit(db_conn, 0);
-
+
/* First identify the entity to add */
if (strncasecmp (argv[0], "Account", MAX(command_len, 1)) == 0
|| !strncasecmp (argv[0], "Acct", MAX(command_len, 4))) {
@@ -536,18 +536,18 @@ static void _add_it (int argc, char *argv[])
fprintf(stderr, "\"Account\", \"Cluster\", \"Coordinator\", ");
fprintf(stderr, "\"QOS\", or \"User\"\n");
}
-
+
if (error_code == SLURM_ERROR) {
exit_code = 1;
}
}
-/*
- * _archive_it - archive the entity per the supplied arguments
+/*
+ * _archive_it - archive the entity per the supplied arguments
* IN argc - count of arguments
* IN argv - list of arguments
*/
-static void _archive_it (int argc, char *argv[])
+static void _archive_it (int argc, char *argv[])
{
int error_code = SLURM_SUCCESS;
int command_len = 0;
@@ -555,7 +555,7 @@ static void _archive_it (int argc, char *argv[])
if(readonly_flag) {
exit_code = 1;
fprintf(stderr, "Can't run this command in readonly mode.\n");
- return;
+ return;
}
if(!argv[0])
@@ -564,7 +564,7 @@ static void _archive_it (int argc, char *argv[])
command_len = strlen(argv[0]);
/* reset the connection to get the most recent stuff */
acct_storage_g_commit(db_conn, 0);
-
+
/* First identify the entity to add */
if (strncasecmp (argv[0], "dump", MAX(command_len, 1)) == 0) {
error_code = sacctmgr_archive_dump((argc - 1), &argv[1]);
@@ -577,20 +577,20 @@ static void _archive_it (int argc, char *argv[])
fprintf(stderr, "Input line must include, ");
fprintf(stderr, "\"Dump\", or \"load\"\n");
}
-
+
if (error_code == SLURM_ERROR) {
exit_code = 1;
}
}
-/*
- * _show_it - list the slurm configuration per the supplied arguments
+/*
+ * _show_it - list the slurm configuration per the supplied arguments
* IN argc - count of arguments
* IN argv - list of arguments
* undocumented association options wopi and wopl
* without parent info and without parent limits
*/
-static void _show_it (int argc, char *argv[])
+static void _show_it (int argc, char *argv[])
{
int error_code = SLURM_SUCCESS;
int command_len = 0;
@@ -610,10 +610,10 @@ static void _show_it (int argc, char *argv[])
} else if (strncasecmp (argv[0], "Associations",
MAX(command_len, 2)) == 0) {
error_code = sacctmgr_list_association((argc - 1), &argv[1]);
- } else if (strncasecmp (argv[0], "Clusters",
+ } else if (strncasecmp (argv[0], "Clusters",
MAX(command_len, 1)) == 0) {
error_code = sacctmgr_list_cluster((argc - 1), &argv[1]);
- } else if (strncasecmp (argv[0], "Configuration",
+ } else if (strncasecmp (argv[0], "Configuration",
MAX(command_len, 1)) == 0) {
error_code = sacctmgr_list_config(true);
} else if (strncasecmp (argv[0], "Problems",
@@ -621,7 +621,7 @@ static void _show_it (int argc, char *argv[])
error_code = sacctmgr_list_problem((argc - 1), &argv[1]);
} else if (strncasecmp (argv[0], "QOS", MAX(command_len, 1)) == 0) {
error_code = sacctmgr_list_qos((argc - 1), &argv[1]);
- } else if (strncasecmp (argv[0], "Transactions",
+ } else if (strncasecmp (argv[0], "Transactions",
MAX(command_len, 1)) == 0) {
error_code = sacctmgr_list_txn((argc - 1), &argv[1]);
} else if (strncasecmp (argv[0], "Users", MAX(command_len, 1)) == 0) {
@@ -637,20 +637,20 @@ static void _show_it (int argc, char *argv[])
"\"Configuration\"\n\"Cluster\", \"Problem\", "
"\"QOS\", \"Transaction\", \"User\", "
"or \"WCKey\"\n");
- }
-
+ }
+
if (error_code == SLURM_ERROR) {
exit_code = 1;
}
}
-/*
- * _modify_it - modify the slurm configuration per the supplied arguments
+/*
+ * _modify_it - modify the slurm configuration per the supplied arguments
* IN argc - count of arguments
* IN argv - list of arguments
*/
-static void _modify_it (int argc, char *argv[])
+static void _modify_it (int argc, char *argv[])
{
int error_code = SLURM_SUCCESS;
int command_len = 0;
@@ -658,7 +658,7 @@ static void _modify_it (int argc, char *argv[])
if(readonly_flag) {
exit_code = 1;
fprintf(stderr, "Can't run this command in readonly mode.\n");
- return;
+ return;
}
if(!argv[0])
@@ -672,7 +672,7 @@ static void _modify_it (int argc, char *argv[])
if (strncasecmp (argv[0], "Accounts", MAX(command_len, 1)) == 0
|| !strncasecmp (argv[0], "Acct", MAX(command_len, 4))) {
error_code = sacctmgr_modify_account((argc - 1), &argv[1]);
- } else if (strncasecmp (argv[0], "Clusters",
+ } else if (strncasecmp (argv[0], "Clusters",
MAX(command_len, 1)) == 0) {
error_code = sacctmgr_modify_cluster((argc - 1), &argv[1]);
} else if (strncasecmp (argv[0], "QOSs", MAX(command_len, 1)) == 0) {
@@ -693,12 +693,12 @@ static void _modify_it (int argc, char *argv[])
}
}
-/*
- * _delete_it - delete the slurm configuration per the supplied arguments
+/*
+ * _delete_it - delete the slurm configuration per the supplied arguments
* IN argc - count of arguments
* IN argv - list of arguments
*/
-static void _delete_it (int argc, char *argv[])
+static void _delete_it (int argc, char *argv[])
{
int error_code = SLURM_SUCCESS;
int command_len = 0;
@@ -706,7 +706,7 @@ static void _delete_it (int argc, char *argv[])
if(readonly_flag) {
exit_code = 1;
fprintf(stderr, "Can't run this command in readonly mode.\n");
- return;
+ return;
}
if(!argv[0])
@@ -723,7 +723,7 @@ static void _delete_it (int argc, char *argv[])
} else if (strncasecmp (argv[0], "Clusters",
MAX(command_len, 2)) == 0) {
error_code = sacctmgr_delete_cluster((argc - 1), &argv[1]);
- } else if (strncasecmp (argv[0], "Coordinators",
+ } else if (strncasecmp (argv[0], "Coordinators",
MAX(command_len, 2)) == 0) {
error_code = sacctmgr_delete_coord((argc - 1), &argv[1]);
} else if (strncasecmp (argv[0], "QOS", MAX(command_len, 2)) == 0) {
@@ -738,7 +738,7 @@ static void _delete_it (int argc, char *argv[])
fprintf(stderr, "\"Account\", \"Cluster\", \"Coordinator\", ");
fprintf(stderr, "\"QOS\", or \"User\"\n");
}
-
+
if (error_code == SLURM_ERROR) {
exit_code = 1;
}
@@ -924,6 +924,6 @@ sacctmgr [<OPTION>] [<COMMAND>] \n\
\n\
\n\
All commands entitys, and options are case-insensitive. \n\n");
-
+
}
diff --git a/src/sacctmgr/sacctmgr.h b/src/sacctmgr/sacctmgr.h
index 55a72c7ff514f2e61f9662568042c76e5e9942cd..691227262be63f50aeb62d0bef4d22fa8fad2ff3 100644
--- a/src/sacctmgr/sacctmgr.h
+++ b/src/sacctmgr/sacctmgr.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -144,7 +144,7 @@ extern int get_uint(char *in_value, uint32_t *out_value, char *type);
extern int get_uint16(char *in_value, uint16_t *out_value, char *type);
extern int get_uint64(char *in_value, uint64_t *out_value, char *type);
extern int get_double(char *in_value, double *out_value, char *type);
-extern int addto_qos_char_list(List char_list, List qos_list, char *names,
+extern int addto_qos_char_list(List char_list, List qos_list, char *names,
int option);
extern int addto_action_char_list(List char_list, char *names);
extern List copy_char_list(List qos_list);
@@ -173,11 +173,11 @@ extern acct_account_rec_t *sacctmgr_find_account(char *name);
extern acct_cluster_rec_t *sacctmgr_find_cluster(char *name);
/* do not free any of the object returned from these functions since
- * they are pointing to an object in the list given
+ * they are pointing to an object in the list given
*/
extern acct_association_rec_t *sacctmgr_find_association_from_list(
- List assoc_list, char *user, char *account,
+ List assoc_list, char *user, char *account,
char *cluster, char *partition);
extern acct_association_rec_t *sacctmgr_find_account_base_assoc_from_list(
List assoc_list, char *account, char *cluster);
@@ -197,7 +197,7 @@ extern acct_wckey_rec_t *sacctmgr_find_wckey_from_list(
extern int print_file_add_limits_to_line(char **line,
acct_association_rec_t *assoc);
-extern int print_file_acct_hierarchical_rec_list(FILE *fd,
+extern int print_file_acct_hierarchical_rec_list(FILE *fd,
List acct_hierarchical_rec_list,
List user_list,
List acct_list);
diff --git a/src/sacctmgr/txn_functions.c b/src/sacctmgr/txn_functions.c
index b92c8526d10ad15f902567bf46f68c8a4939ed15..c5942dee42eaf6ffff8a46b9bf7607f7a9090ef3 100644
--- a/src/sacctmgr/txn_functions.c
+++ b/src/sacctmgr/txn_functions.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -79,10 +79,10 @@ static int _set_cond(int *start, int argc, char *argv[],
uint32_t id = 0;
if(!txn_cond->id_list)
- txn_cond->id_list =
+ txn_cond->id_list =
list_create(slurm_destroy_char);
-
- if(slurm_addto_char_list(txn_cond->id_list,
+
+ if(slurm_addto_char_list(txn_cond->id_list,
argv[i]+end))
set = 1;
@@ -138,7 +138,7 @@ static int _set_cond(int *start, int argc, char *argv[],
MAX(command_len, 1))) {
if(format_list)
slurm_addto_char_list(format_list, argv[i]+end);
- } else if (!strncasecmp (argv[i], "Start",
+ } else if (!strncasecmp (argv[i], "Start",
MAX(command_len, 1))) {
txn_cond->time_start = parse_time(argv[i]+end, 1);
set = 1;
@@ -194,8 +194,8 @@ extern int sacctmgr_list_txn(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
- i++;
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
+ i++;
_set_cond(&i, argc, argv, txn_cond, format_list);
}
@@ -209,8 +209,8 @@ extern int sacctmgr_list_txn(int argc, char *argv[])
if(!list_count(format_list)) {
slurm_addto_char_list(format_list, "T,Action,Actor,Where,Info");
- if(txn_cond->with_assoc_info)
- slurm_addto_char_list(format_list,
+ if(txn_cond->with_assoc_info)
+ slurm_addto_char_list(format_list,
"User,Account,Cluster");
}
@@ -219,11 +219,11 @@ extern int sacctmgr_list_txn(int argc, char *argv[])
char *tmp_char = NULL;
int command_len = 0;
int newlen = 0;
-
+
if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
- }
+ }
command_len = strlen(object);
@@ -233,13 +233,13 @@ extern int sacctmgr_list_txn(int argc, char *argv[])
field->name = xstrdup("Accounts");
field->len = 20;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("ActionRaw", object,
+ } else if(!strncasecmp("ActionRaw", object,
MAX(command_len, 7))) {
field->type = PRINT_ACTIONRAW;
field->name = xstrdup("ActionRaw");
field->len = 10;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("ActionRaw", object,
+ } else if(!strncasecmp("ActionRaw", object,
MAX(command_len, 4))) {
field->type = PRINT_ACTION;
field->name = xstrdup("Action");
@@ -251,7 +251,7 @@ extern int sacctmgr_list_txn(int argc, char *argv[])
field->name = xstrdup("Actor");
field->len = 10;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("Clusters", object,
+ } else if(!strncasecmp("Clusters", object,
MAX(command_len, 4))) {
field->type = PRINT_CLUSTER;
field->name = xstrdup("Clusters");
@@ -267,7 +267,7 @@ extern int sacctmgr_list_txn(int argc, char *argv[])
field->name = xstrdup("Info");
field->len = 20;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("TimeStamp", object,
+ } else if(!strncasecmp("TimeStamp", object,
MAX(command_len, 1))) {
field->type = PRINT_TS;
field->name = xstrdup("Time");
@@ -290,10 +290,10 @@ extern int sacctmgr_list_txn(int argc, char *argv[])
continue;
}
- if(newlen)
+ if(newlen)
field->len = newlen;
-
- list_append(print_fields_list, field);
+
+ list_append(print_fields_list, field);
}
list_iterator_destroy(itr);
list_destroy(format_list);
@@ -328,13 +328,13 @@ extern int sacctmgr_list_txn(int argc, char *argv[])
break;
case PRINT_ACTIONRAW:
field->print_routine(
- field,
+ field,
txn->action,
(curr_inx == field_count));
break;
case PRINT_ACTION:
field->print_routine(
- field,
+ field,
slurmdbd_msg_type_2_str(txn->action,
0),
(curr_inx == field_count));
@@ -354,7 +354,7 @@ extern int sacctmgr_list_txn(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_INFO:
- field->print_routine(field,
+ field->print_routine(field,
txn->set_info,
(curr_inx == field_count));
break;
@@ -368,7 +368,7 @@ extern int sacctmgr_list_txn(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_WHERE:
- field->print_routine(field,
+ field->print_routine(field,
txn->where_query,
(curr_inx == field_count));
break;
@@ -382,7 +382,7 @@ extern int sacctmgr_list_txn(int argc, char *argv[])
list_iterator_reset(itr2);
printf("\n");
}
-
+
list_iterator_destroy(itr2);
list_iterator_destroy(itr);
list_destroy(txn_list);
diff --git a/src/sacctmgr/user_functions.c b/src/sacctmgr/user_functions.c
index c60b9575b58a793c3fc90e66e00265da8a09e42d..996ebaca0841cb8e8de1f23e32cd2134a9e02ed2 100644
--- a/src/sacctmgr/user_functions.c
+++ b/src/sacctmgr/user_functions.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -57,12 +57,12 @@ static int _set_cond(int *start, int argc, char *argv[],
return -1;
}
- if(!user_cond->assoc_cond)
- user_cond->assoc_cond =
+ if(!user_cond->assoc_cond)
+ user_cond->assoc_cond =
xmalloc(sizeof(acct_association_cond_t));
-
+
assoc_cond = user_cond->assoc_cond;
-
+
/* we need this to make sure we only change users, not
* accounts if this list didn't exist it would change
* accounts. Having it blank is fine, it just needs to
@@ -86,14 +86,14 @@ static int _set_cond(int *start, int argc, char *argv[],
if (!strncasecmp (argv[i], "Set", MAX(command_len, 3))) {
i--;
break;
- } else if (!end && !strncasecmp (argv[i], "WithAssoc",
+ } else if (!end && !strncasecmp (argv[i], "WithAssoc",
MAX(command_len, 5))) {
user_cond->with_assocs = 1;
- } else if (!end &&
+ } else if (!end &&
!strncasecmp (argv[i], "WithCoordinators",
MAX(command_len, 5))) {
user_cond->with_coords = 1;
- } else if (!end &&
+ } else if (!end &&
!strncasecmp (argv[i], "WithRawQOSLevel",
MAX(command_len, 5))) {
assoc_cond->with_raw_qos = 1;
@@ -104,19 +104,19 @@ static int _set_cond(int *start, int argc, char *argv[],
MAX(command_len, 5))) {
continue;
} else if(!end
- || !strncasecmp (argv[i], "Names",
+ || !strncasecmp (argv[i], "Names",
MAX(command_len, 1))
|| !strncasecmp (argv[i], "Users",
MAX(command_len, 1))) {
if(slurm_addto_char_list(assoc_cond->user_list,
- argv[i]+end))
+ argv[i]+end))
u_set = 1;
} else if (!strncasecmp (argv[i], "Account",
MAX(command_len, 2))
|| !strncasecmp (argv[i], "Acct",
MAX(command_len, 4))) {
if(!assoc_cond->acct_list) {
- assoc_cond->acct_list =
+ assoc_cond->acct_list =
list_create(slurm_destroy_char);
}
if(slurm_addto_char_list(assoc_cond->acct_list,
@@ -124,13 +124,13 @@ static int _set_cond(int *start, int argc, char *argv[],
a_set = 1;
} else if (!strncasecmp (argv[i], "AdminLevel",
MAX(command_len, 2))) {
- user_cond->admin_level =
+ user_cond->admin_level =
str_2_acct_admin_level(argv[i]+end);
- u_set = 1;
+ u_set = 1;
} else if (!strncasecmp (argv[i], "Clusters",
MAX(command_len, 1))) {
if(!assoc_cond->cluster_list) {
- assoc_cond->cluster_list =
+ assoc_cond->cluster_list =
list_create(slurm_destroy_char);
}
if(slurm_addto_char_list(assoc_cond->cluster_list,
@@ -139,7 +139,7 @@ static int _set_cond(int *start, int argc, char *argv[],
} else if (!strncasecmp (argv[i], "DefaultAccount",
MAX(command_len, 8))) {
if(!user_cond->def_acct_list) {
- user_cond->def_acct_list =
+ user_cond->def_acct_list =
list_create(slurm_destroy_char);
}
if(slurm_addto_char_list(user_cond->def_acct_list,
@@ -148,17 +148,17 @@ static int _set_cond(int *start, int argc, char *argv[],
} else if (!strncasecmp (argv[i], "DefaultWCKey",
MAX(command_len, 8))) {
if(!user_cond->def_wckey_list) {
- user_cond->def_wckey_list =
+ user_cond->def_wckey_list =
list_create(slurm_destroy_char);
}
if(slurm_addto_char_list(user_cond->def_wckey_list,
argv[i]+end))
u_set = 1;
- } else if (!strncasecmp (argv[i], "Format",
+ } else if (!strncasecmp (argv[i], "Format",
MAX(command_len, 1))) {
if(format_list)
slurm_addto_char_list(format_list, argv[i]+end);
- } else if (!strncasecmp (argv[i], "FairShare",
+ } else if (!strncasecmp (argv[i], "FairShare",
MAX(command_len, 1))
|| !strncasecmp (argv[i], "Shares",
MAX(command_len, 1))) {
@@ -236,7 +236,7 @@ static int _set_cond(int *start, int argc, char *argv[],
assoc_cond->max_cpus_pj_list,
argv[i]+end))
a_set = 1;
- } else if (!strncasecmp (argv[i], "MaxJobs",
+ } else if (!strncasecmp (argv[i], "MaxJobs",
MAX(command_len, 4))) {
if(!assoc_cond->max_jobs_list)
assoc_cond->max_jobs_list =
@@ -245,7 +245,7 @@ static int _set_cond(int *start, int argc, char *argv[],
assoc_cond->max_jobs_list,
argv[i]+end))
a_set = 1;
- } else if (!strncasecmp (argv[i], "MaxNodesPerJob",
+ } else if (!strncasecmp (argv[i], "MaxNodesPerJob",
MAX(command_len, 4))) {
if(!assoc_cond->max_nodes_pj_list)
assoc_cond->max_nodes_pj_list =
@@ -275,20 +275,20 @@ static int _set_cond(int *start, int argc, char *argv[],
} else if (!strncasecmp (argv[i], "Partition",
MAX(command_len, 3))) {
if(!assoc_cond->partition_list) {
- assoc_cond->partition_list =
+ assoc_cond->partition_list =
list_create(slurm_destroy_char);
}
if(slurm_addto_char_list(
- assoc_cond->partition_list,
+ assoc_cond->partition_list,
argv[i]+end))
a_set = 1;
} else if (!strncasecmp (argv[i], "QosLevel",
MAX(command_len, 1))) {
if(!assoc_cond->qos_list) {
- assoc_cond->qos_list =
+ assoc_cond->qos_list =
list_create(slurm_destroy_char);
}
-
+
if(!g_qos_list) {
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
@@ -302,8 +302,8 @@ static int _set_cond(int *start, int argc, char *argv[],
fprintf(stderr, " Unknown condition: %s\n"
" Use keyword 'set' to modify value\n",
argv[i]);
- }
- }
+ }
+ }
(*start) = i;
@@ -348,12 +348,12 @@ static int _set_rec(int *start, int argc, char *argv[],
continue;
} else if(!end) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Bad format on %s: End your option with "
"an '=' sign\n", argv[i]);
} else if (!strncasecmp (argv[i], "AdminLevel",
MAX(command_len, 2))) {
- user->admin_level =
+ user->admin_level =
str_2_acct_admin_level(argv[i]+end);
u_set = 1;
} else if (!strncasecmp (argv[i], "DefaultAccount",
@@ -366,7 +366,7 @@ static int _set_rec(int *start, int argc, char *argv[],
MAX(command_len, 8))) {
if(user->default_wckey)
xfree(user->default_wckey);
- user->default_wckey =
+ user->default_wckey =
strip_quotes(argv[i]+end, NULL, 1);
u_set = 1;
} else if (!strncasecmp (argv[i], "FairShare",
@@ -375,15 +375,15 @@ static int _set_rec(int *start, int argc, char *argv[],
MAX(command_len, 1))) {
if(!assoc)
continue;
- if (get_uint(argv[i]+end, &assoc->shares_raw,
+ if (get_uint(argv[i]+end, &assoc->shares_raw,
"FairShare") == SLURM_SUCCESS)
a_set = 1;
} else if (!strncasecmp (argv[i], "GrpCPUMins",
MAX(command_len, 7))) {
if(!assoc)
continue;
- if (get_uint64(argv[i]+end,
- &assoc->grp_cpu_mins,
+ if (get_uint64(argv[i]+end,
+ &assoc->grp_cpu_mins,
"GrpCPUMins") == SLURM_SUCCESS)
a_set = 1;
} else if (!strncasecmp (argv[i], "GrpCpus",
@@ -393,7 +393,7 @@ static int _set_rec(int *start, int argc, char *argv[],
if (get_uint(argv[i]+end, &assoc->grp_cpus,
"GrpCpus") == SLURM_SUCCESS)
a_set = 1;
- } else if (!strncasecmp (argv[i], "GrpJobs",
+ } else if (!strncasecmp (argv[i], "GrpJobs",
MAX(command_len, 4))) {
if(!assoc)
continue;
@@ -424,16 +424,16 @@ static int _set_rec(int *start, int argc, char *argv[],
a_set = 1;
} else {
exit_code=1;
- fprintf(stderr,
- " Bad GrpWall time format: %s\n",
+ fprintf(stderr,
+ " Bad GrpWall time format: %s\n",
argv[i]);
}
- } else if (!strncasecmp (argv[i], "MaxCPUMinsPerJob",
+ } else if (!strncasecmp (argv[i], "MaxCPUMinsPerJob",
MAX(command_len, 7))) {
if(!assoc)
continue;
- if (get_uint64(argv[i]+end,
- &assoc->max_cpu_mins_pj,
+ if (get_uint64(argv[i]+end,
+ &assoc->max_cpu_mins_pj,
"MaxCPUMins") == SLURM_SUCCESS)
a_set = 1;
} else if (!strncasecmp (argv[i], "MaxCpusPerJob",
@@ -454,18 +454,18 @@ static int _set_rec(int *start, int argc, char *argv[],
MAX(command_len, 4))) {
if(!assoc)
continue;
- if (get_uint(argv[i]+end,
+ if (get_uint(argv[i]+end,
&assoc->max_nodes_pj,
"MaxNodes") == SLURM_SUCCESS)
a_set = 1;
- } else if (!strncasecmp (argv[i], "MaxSubmitJobs",
+ } else if (!strncasecmp (argv[i], "MaxSubmitJobs",
MAX(command_len, 4))) {
if(!assoc)
continue;
if (get_uint(argv[i]+end, &assoc->max_submit_jobs,
"MaxSubmitJobs") == SLURM_SUCCESS)
a_set = 1;
- } else if (!strncasecmp (argv[i], "MaxWallDurationPerJob",
+ } else if (!strncasecmp (argv[i], "MaxWallDurationPerJob",
MAX(command_len, 4))) {
if(!assoc)
continue;
@@ -475,22 +475,22 @@ static int _set_rec(int *start, int argc, char *argv[],
a_set = 1;
} else {
exit_code=1;
- fprintf(stderr,
- " Bad MaxWall time format: %s\n",
+ fprintf(stderr,
+ " Bad MaxWall time format: %s\n",
argv[i]);
}
} else if (!strncasecmp (argv[i], "QosLevel",
MAX(command_len, 1))) {
if(!assoc)
continue;
- if(!assoc->qos_list)
- assoc->qos_list =
+ if(!assoc->qos_list)
+ assoc->qos_list =
list_create(slurm_destroy_char);
-
- if(!g_qos_list)
+
+ if(!g_qos_list)
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
-
+
if(addto_qos_char_list(assoc->qos_list,
g_qos_list, argv[i]+end, option))
a_set = 1;
@@ -501,8 +501,8 @@ static int _set_rec(int *start, int argc, char *argv[],
fprintf(stderr, " Unknown option: %s\n"
" Use keyword 'where' to modify condition\n",
argv[i]);
- }
- }
+ }
+ }
(*start) = i;
@@ -517,7 +517,7 @@ static int _set_rec(int *start, int argc, char *argv[],
/*
* IN: user_cond - used for the assoc_cond pointing to the user and
- * account list
+ * account list
* IN: check - whether or not to check if the existance of the above lists
*/
static int _check_coord_request(acct_user_cond_t *user_cond, bool check)
@@ -533,22 +533,22 @@ static int _check_coord_request(acct_user_cond_t *user_cond, bool check)
if(!user_cond) {
exit_code=1;
- fprintf(stderr, " You need to specify the user_cond here.\n");
+ fprintf(stderr, " You need to specify the user_cond here.\n");
return SLURM_ERROR;
}
if(check && (!user_cond->assoc_cond->user_list
|| !list_count(user_cond->assoc_cond->user_list))) {
exit_code=1;
- fprintf(stderr, " You need to specify a user list here.\n");
- return SLURM_ERROR;
+ fprintf(stderr, " You need to specify a user list here.\n");
+ return SLURM_ERROR;
}
-
+
if(check && (!user_cond->assoc_cond->acct_list
|| !list_count(user_cond->assoc_cond->acct_list))) {
exit_code=1;
- fprintf(stderr, " You need to specify a account list here.\n");
- return SLURM_ERROR;
+ fprintf(stderr, " You need to specify a account list here.\n");
+ return SLURM_ERROR;
}
memset(&account_cond, 0, sizeof(acct_account_cond_t));
@@ -565,20 +565,20 @@ static int _check_coord_request(acct_user_cond_t *user_cond, bool check)
if(user_cond->assoc_cond->acct_list &&
(list_count(local_acct_list) !=
list_count(user_cond->assoc_cond->acct_list))) {
-
+
itr = list_iterator_create(user_cond->assoc_cond->acct_list);
itr2 = list_iterator_create(local_acct_list);
-
+
while((name = list_next(itr))) {
while((acct_rec = list_next(itr2))) {
- if(!strcmp(name, acct_rec->name))
+ if(!strcmp(name, acct_rec->name))
break;
}
list_iterator_reset(itr2);
if(!acct_rec) {
- fprintf(stderr,
+ fprintf(stderr,
" You specified a non-existant "
- "account '%s'.\n", name);
+ "account '%s'.\n", name);
exit_code=1;
rc = SLURM_ERROR;
}
@@ -600,20 +600,20 @@ static int _check_coord_request(acct_user_cond_t *user_cond, bool check)
if(user_cond->assoc_cond->user_list &&
(list_count(local_user_list) !=
list_count(user_cond->assoc_cond->user_list))) {
-
+
itr = list_iterator_create(user_cond->assoc_cond->user_list);
itr2 = list_iterator_create(local_user_list);
-
+
while((name = list_next(itr))) {
while((user_rec = list_next(itr2))) {
- if(!strcmp(name, user_rec->name))
+ if(!strcmp(name, user_rec->name))
break;
}
list_iterator_reset(itr2);
if(!user_rec) {
- fprintf(stderr,
+ fprintf(stderr,
" You specified a non-existant "
- "user '%s'.\n", name);
+ "user '%s'.\n", name);
exit_code=1;
rc = SLURM_ERROR;
}
@@ -634,7 +634,7 @@ static int _check_user_has_acct(char *user, char *acct)
{
acct_association_cond_t assoc_cond;
List ret_list = NULL;
-
+
memset(&assoc_cond, 0, sizeof(acct_association_cond_t));
assoc_cond.acct_list = list_create(NULL);
list_push(assoc_cond.acct_list, acct);
@@ -642,7 +642,7 @@ static int _check_user_has_acct(char *user, char *acct)
list_push(assoc_cond.user_list, user);
ret_list = acct_storage_g_get_associations(db_conn, my_uid,
&assoc_cond);
-
+
if(ret_list && (list_count(ret_list)))
return 1;
@@ -721,24 +721,24 @@ extern int sacctmgr_add_user(int argc, char *argv[])
|| !strncasecmp (argv[i], "Users", MAX(command_len, 1))) {
slurm_addto_char_list(assoc_cond->user_list,
argv[i]+end);
- } else if (!strncasecmp (argv[i], "Accounts",
+ } else if (!strncasecmp (argv[i], "Accounts",
MAX(command_len, 2))
|| !strncasecmp (argv[i], "Acct",
MAX(command_len, 4))) {
slurm_addto_char_list(assoc_cond->acct_list,
argv[i]+end);
- } else if (!strncasecmp (argv[i], "AdminLevel",
+ } else if (!strncasecmp (argv[i], "AdminLevel",
MAX(command_len, 2))) {
admin_level = str_2_acct_admin_level(argv[i]+end);
- } else if (!strncasecmp (argv[i], "Clusters",
+ } else if (!strncasecmp (argv[i], "Clusters",
MAX(command_len, 1))) {
slurm_addto_char_list(assoc_cond->cluster_list,
argv[i]+end);
} else if (!strncasecmp (argv[i], "DefaultAccount",
MAX(command_len, 8))) {
if(default_acct) {
- fprintf(stderr,
- " Already listed DefaultAccount %s\n",
+ fprintf(stderr,
+ " Already listed DefaultAccount %s\n",
default_acct);
exit_code = 1;
continue;
@@ -749,8 +749,8 @@ extern int sacctmgr_add_user(int argc, char *argv[])
} else if (!strncasecmp (argv[i], "DefaultWCKey",
MAX(command_len, 8))) {
if(default_wckey) {
- fprintf(stderr,
- " Already listed DefaultWCKey %s\n",
+ fprintf(stderr,
+ " Already listed DefaultWCKey %s\n",
default_wckey);
exit_code = 1;
continue;
@@ -762,16 +762,16 @@ extern int sacctmgr_add_user(int argc, char *argv[])
MAX(command_len, 1))
|| !strncasecmp (argv[i], "Shares",
MAX(command_len, 1))) {
- if (get_uint(argv[i]+end, &start_assoc.shares_raw,
+ if (get_uint(argv[i]+end, &start_assoc.shares_raw,
"FairShare") == SLURM_SUCCESS)
limit_set = 1;
} else if (!strncasecmp (argv[i], "GrpCPUMins",
MAX(command_len, 7))) {
- if (get_uint64(argv[i]+end,
- &start_assoc.grp_cpu_mins,
+ if (get_uint64(argv[i]+end,
+ &start_assoc.grp_cpu_mins,
"GrpCPUMins") == SLURM_SUCCESS)
limit_set = 1;
- } else if (!strncasecmp (argv[i], "GrpCpus",
+ } else if (!strncasecmp (argv[i], "GrpCpus",
MAX(command_len, 7))) {
if (get_uint(argv[i]+end, &start_assoc.grp_cpus,
"GrpCpus") == SLURM_SUCCESS)
@@ -799,17 +799,17 @@ extern int sacctmgr_add_user(int argc, char *argv[])
limit_set = 1;
} else {
exit_code=1;
- fprintf(stderr,
- " Bad GrpWall time format: %s\n",
+ fprintf(stderr,
+ " Bad GrpWall time format: %s\n",
argv[i]);
}
} else if (!strncasecmp (argv[i], "MaxCPUMinsPerJob",
MAX(command_len, 7))) {
- if (get_uint64(argv[i]+end,
- &start_assoc.max_cpu_mins_pj,
+ if (get_uint64(argv[i]+end,
+ &start_assoc.max_cpu_mins_pj,
"MaxCPUMins") == SLURM_SUCCESS)
limit_set = 1;
- } else if (!strncasecmp (argv[i], "MaxCpusPerJob",
+ } else if (!strncasecmp (argv[i], "MaxCpusPerJob",
MAX(command_len, 7))) {
if (get_uint(argv[i]+end, &start_assoc.max_cpus_pj,
"MaxCpus") == SLURM_SUCCESS)
@@ -821,7 +821,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
limit_set = 1;
} else if (!strncasecmp (argv[i], "MaxNodesPerJob",
MAX(command_len, 4))) {
- if (get_uint(argv[i]+end,
+ if (get_uint(argv[i]+end,
&start_assoc.max_nodes_pj,
"MaxNodes") == SLURM_SUCCESS)
limit_set = 1;
@@ -838,37 +838,37 @@ extern int sacctmgr_add_user(int argc, char *argv[])
limit_set = 1;
} else {
exit_code=1;
- fprintf(stderr,
- " Bad MaxWall time format: %s\n",
+ fprintf(stderr,
+ " Bad MaxWall time format: %s\n",
argv[i]);
}
- } else if (!strncasecmp (argv[i], "Partitions",
+ } else if (!strncasecmp (argv[i], "Partitions",
MAX(command_len, 1))) {
slurm_addto_char_list(assoc_cond->partition_list,
argv[i]+end);
} else if (!strncasecmp (argv[i], "QosLevel",
MAX(command_len, 1))) {
- if(!start_assoc.qos_list)
- start_assoc.qos_list =
+ if(!start_assoc.qos_list)
+ start_assoc.qos_list =
list_create(slurm_destroy_char);
-
- if(!g_qos_list)
+
+ if(!g_qos_list)
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
-
+
if(addto_qos_char_list(start_assoc.qos_list, g_qos_list,
argv[i]+end, option))
limit_set = 1;
else
exit_code = 1;
- } else if (!strncasecmp (argv[i], "WCKeys",
+ } else if (!strncasecmp (argv[i], "WCKeys",
MAX(command_len, 1))) {
slurm_addto_char_list(wckey_cond->name_list,
argv[i]+end);
} else {
exit_code=1;
fprintf(stderr, " Unknown option: %s\n", argv[i]);
- }
+ }
}
if(exit_code) {
@@ -879,18 +879,18 @@ extern int sacctmgr_add_user(int argc, char *argv[])
destroy_acct_wckey_cond(wckey_cond);
destroy_acct_association_cond(assoc_cond);
exit_code=1;
- fprintf(stderr, " Need name of user to add.\n");
+ fprintf(stderr, " Need name of user to add.\n");
return SLURM_ERROR;
} else {
acct_user_cond_t user_cond;
memset(&user_cond, 0, sizeof(acct_user_cond_t));
user_cond.assoc_cond = assoc_cond;
-
+
local_user_list = acct_storage_g_get_users(
db_conn, my_uid, &user_cond);
-
- }
+
+ }
if(!local_user_list) {
exit_code=1;
@@ -910,7 +910,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
my_uid, NULL);
if(!cluster_list) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Problem getting clusters from database. "
"Contact your admin.\n");
destroy_acct_wckey_cond(wckey_cond);
@@ -923,14 +923,14 @@ extern int sacctmgr_add_user(int argc, char *argv[])
itr_c = list_iterator_create(cluster_list);
while((cluster_rec = list_next(itr_c))) {
- list_append(assoc_cond->cluster_list,
+ list_append(assoc_cond->cluster_list,
xstrdup(cluster_rec->name));
}
list_iterator_destroy(itr_c);
if(!list_count(assoc_cond->cluster_list)) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" Can't add users, no cluster defined yet.\n"
" Please contact your administrator.\n");
destroy_acct_wckey_cond(wckey_cond);
@@ -938,7 +938,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
list_destroy(local_user_list);
if(local_acct_list)
list_destroy(local_acct_list);
- return SLURM_ERROR;
+ return SLURM_ERROR;
}
} else {
List temp_list = NULL;
@@ -949,7 +949,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
temp_list = acct_storage_g_get_clusters(db_conn, my_uid,
&cluster_cond);
-
+
itr_c = list_iterator_create(assoc_cond->cluster_list);
itr = list_iterator_create(temp_list);
while((cluster = list_next(itr_c))) {
@@ -980,7 +980,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
list_destroy(local_user_list);
if(local_acct_list)
list_destroy(local_acct_list);
- return SLURM_ERROR;
+ return SLURM_ERROR;
}
}
@@ -990,7 +990,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
destroy_acct_association_cond(assoc_cond);
exit_code=1;
fprintf(stderr, " Need name of account to "
- "add user to.\n");
+ "add user to.\n");
return SLURM_ERROR;
}
} else {
@@ -1001,8 +1001,8 @@ extern int sacctmgr_add_user(int argc, char *argv[])
account_cond.assoc_cond = assoc_cond;
local_acct_list = acct_storage_g_get_accounts(
- db_conn, my_uid, &account_cond);
-
+ db_conn, my_uid, &account_cond);
+
if(!local_acct_list) {
exit_code=1;
fprintf(stderr, " Problem getting accounts "
@@ -1012,9 +1012,9 @@ extern int sacctmgr_add_user(int argc, char *argv[])
destroy_acct_association_cond(assoc_cond);
return SLURM_ERROR;
}
-
- if(!default_acct)
- default_acct =
+
+ if(!default_acct)
+ default_acct =
xstrdup(list_peek(assoc_cond->acct_list));
memset(&query_assoc_cond, 0, sizeof(acct_association_cond_t));
@@ -1022,7 +1022,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
query_assoc_cond.cluster_list = assoc_cond->cluster_list;
local_assoc_list = acct_storage_g_get_associations(
db_conn, my_uid, &query_assoc_cond);
-
+
if(!local_assoc_list) {
exit_code=1;
fprintf(stderr, " Problem getting associations "
@@ -1033,16 +1033,16 @@ extern int sacctmgr_add_user(int argc, char *argv[])
destroy_acct_association_cond(assoc_cond);
return SLURM_ERROR;
}
- }
-
+ }
+
if(track_wckey) {
- if(!default_wckey)
- default_wckey =
+ if(!default_wckey)
+ default_wckey =
xstrdup(list_peek(wckey_cond->name_list));
wckey_cond->cluster_list = assoc_cond->cluster_list;
wckey_cond->user_list = assoc_cond->user_list;
local_wckey_list = acct_storage_g_get_wckeys(
- db_conn, my_uid, wckey_cond);
+ db_conn, my_uid, wckey_cond);
wckey_cond->cluster_list = NULL;
wckey_cond->user_list = NULL;
@@ -1062,7 +1062,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
if(!default_acct) {
exit_code=1;
fprintf(stderr, " Need a default account for "
- "these users to add.\n");
+ "these users to add.\n");
rc = SLURM_ERROR;
goto no_default;
}
@@ -1077,7 +1077,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
default_acct);
continue;
}
- first = 0;
+ first = 0;
}
if (uid_from_string (name, &pw_uid) < 0) {
char *warning = xstrdup_printf(
@@ -1095,16 +1095,16 @@ extern int sacctmgr_add_user(int argc, char *argv[])
}
user = xmalloc(sizeof(acct_user_rec_t));
- user->assoc_list =
+ user->assoc_list =
list_create(destroy_acct_association_rec);
- user->wckey_list =
+ user->wckey_list =
list_create(destroy_acct_wckey_rec);
user->name = xstrdup(name);
user->default_acct = xstrdup(default_acct);
user->default_wckey = xstrdup(default_wckey);
user->admin_level = admin_level;
-
+
xstrfmtcat(user_str, " %s\n", name);
list_append(user_list, user);
@@ -1139,10 +1139,10 @@ extern int sacctmgr_add_user(int argc, char *argv[])
"admin to add "
"this account.\n",
account, cluster);
- }
+ }
continue;
}
-
+
itr_p = list_iterator_create(
assoc_cond->partition_list);
while((partition = list_next(itr_p))) {
@@ -1159,39 +1159,39 @@ extern int sacctmgr_add_user(int argc, char *argv[])
assoc->acct = xstrdup(account);
assoc->cluster = xstrdup(cluster);
assoc->partition = xstrdup(partition);
-
- assoc->shares_raw =
+
+ assoc->shares_raw =
start_assoc.shares_raw;
- assoc->grp_cpu_mins =
+ assoc->grp_cpu_mins =
start_assoc.grp_cpu_mins;
assoc->grp_cpus = start_assoc.grp_cpus;
assoc->grp_jobs = start_assoc.grp_jobs;
- assoc->grp_nodes =
+ assoc->grp_nodes =
start_assoc.grp_nodes;
- assoc->grp_submit_jobs =
+ assoc->grp_submit_jobs =
start_assoc.grp_submit_jobs;
assoc->grp_wall = start_assoc.grp_wall;
-
- assoc->max_cpu_mins_pj =
+
+ assoc->max_cpu_mins_pj =
start_assoc.max_cpu_mins_pj;
- assoc->max_cpus_pj =
+ assoc->max_cpus_pj =
start_assoc.max_cpus_pj;
assoc->max_jobs = start_assoc.max_jobs;
- assoc->max_nodes_pj =
+ assoc->max_nodes_pj =
start_assoc.max_nodes_pj;
- assoc->max_submit_jobs =
+ assoc->max_submit_jobs =
start_assoc.max_submit_jobs;
assoc->max_wall_pj =
start_assoc.max_wall_pj;
-
+
assoc->qos_list = copy_char_list(
start_assoc.qos_list);
-
- if(user)
+
+ if(user)
list_append(user->assoc_list,
assoc);
- else
+ else
list_append(assoc_list, assoc);
xstrfmtcat(assoc_str,
" U = %-9.9s"
@@ -1203,15 +1203,15 @@ extern int sacctmgr_add_user(int argc, char *argv[])
assoc->partition);
}
list_iterator_destroy(itr_p);
- if(partition_set)
+ if(partition_set)
continue;
if(sacctmgr_find_association_from_list(
local_assoc_list,
name, account, cluster, NULL)) {
continue;
- }
-
+ }
+
assoc = xmalloc(sizeof(acct_association_rec_t));
init_acct_association_rec(assoc);
assoc->user = xstrdup(name);
@@ -1220,37 +1220,37 @@ extern int sacctmgr_add_user(int argc, char *argv[])
assoc->shares_raw = start_assoc.shares_raw;
- assoc->grp_cpu_mins =
+ assoc->grp_cpu_mins =
start_assoc.grp_cpu_mins;
assoc->grp_cpus = start_assoc.grp_cpus;
assoc->grp_jobs = start_assoc.grp_jobs;
assoc->grp_nodes = start_assoc.grp_nodes;
- assoc->grp_submit_jobs =
+ assoc->grp_submit_jobs =
start_assoc.grp_submit_jobs;
assoc->grp_wall = start_assoc.grp_wall;
-
- assoc->max_cpu_mins_pj =
+
+ assoc->max_cpu_mins_pj =
start_assoc.max_cpu_mins_pj;
assoc->max_cpus_pj = start_assoc.max_cpus_pj;
assoc->max_jobs = start_assoc.max_jobs;
assoc->max_nodes_pj = start_assoc.max_nodes_pj;
- assoc->max_submit_jobs =
+ assoc->max_submit_jobs =
start_assoc.max_submit_jobs;
assoc->max_wall_pj = start_assoc.max_wall_pj;
-
- assoc->qos_list =
+
+ assoc->qos_list =
copy_char_list(start_assoc.qos_list);
- if(user)
+ if(user)
list_append(user->assoc_list, assoc);
- else
+ else
list_append(assoc_list, assoc);
xstrfmtcat(assoc_str,
" U = %-9.9s"
" A = %-10.10s"
" C = %-10.10s\n",
assoc->user, assoc->acct,
- assoc->cluster);
+ assoc->cluster);
}
list_iterator_destroy(itr_c);
}
@@ -1258,7 +1258,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
acct_first = 0;
/* continue here if not doing wckeys */
- if(!track_wckey)
+ if(!track_wckey)
continue;
itr_w = list_iterator_create(wckey_cond->name_list);
@@ -1274,16 +1274,16 @@ extern int sacctmgr_add_user(int argc, char *argv[])
wckey->user = xstrdup(name);
wckey->name = xstrdup(account);
wckey->cluster = xstrdup(cluster);
- if(user)
+ if(user)
list_append(user->wckey_list, wckey);
- else
+ else
list_append(wckey_list, wckey);
xstrfmtcat(wckey_str,
" U = %-9.9s"
" W = %-10.10s"
" C = %-10.10s\n",
wckey->user, wckey->name,
- wckey->cluster);
+ wckey->cluster);
}
list_iterator_destroy(itr_c);
@@ -1302,7 +1302,7 @@ no_default:
destroy_acct_wckey_cond(wckey_cond);
destroy_acct_association_cond(assoc_cond);
- if(!list_count(user_list) && !list_count(assoc_list)
+ if(!list_count(user_list) && !list_count(assoc_list)
&& !list_count(wckey_list)) {
printf(" Nothing new added.\n");
goto end_it;
@@ -1318,9 +1318,9 @@ no_default:
printf(" Default Account = %s\n", default_acct);
if(track_wckey)
printf(" Default WCKey = %s\n", default_wckey);
-
+
if(admin_level != ACCT_ADMIN_NOTSET)
- printf(" Admin Level = %s\n",
+ printf(" Admin Level = %s\n",
acct_admin_level_str(admin_level));
xfree(user_str);
}
@@ -1349,13 +1349,13 @@ no_default:
if(rc == SLURM_SUCCESS) {
if(list_count(assoc_list))
- rc = acct_storage_g_add_associations(db_conn, my_uid,
+ rc = acct_storage_g_add_associations(db_conn, my_uid,
assoc_list);
- }
-
+ }
+
if(rc == SLURM_SUCCESS) {
if(list_count(wckey_list))
- rc = acct_storage_g_add_wckeys(db_conn, my_uid,
+ rc = acct_storage_g_add_wckeys(db_conn, my_uid,
wckey_list);
} else {
exit_code=1;
@@ -1404,8 +1404,8 @@ extern int sacctmgr_add_coord(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
- i++;
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
+ i++;
prev_set = _set_cond(&i, argc, argv, user_cond, NULL);
cond_set = MAX(cond_set, prev_set);
}
@@ -1416,7 +1416,7 @@ extern int sacctmgr_add_coord(int argc, char *argv[])
} else if(!cond_set) {
exit_code=1;
fprintf(stderr, " You need to specify conditions to "
- "to add the coordinator.\n");
+ "to add the coordinator.\n");
destroy_acct_user_cond(user_cond);
return SLURM_ERROR;
}
@@ -1441,14 +1441,14 @@ extern int sacctmgr_add_coord(int argc, char *argv[])
printf(" Adding Coordinator User(s)\n%s", user_str);
printf(" To Account(s) and all sub-accounts\n%s", acct_str);
-
+
notice_thread_init();
- rc = acct_storage_g_add_coord(db_conn, my_uid,
+ rc = acct_storage_g_add_coord(db_conn, my_uid,
user_cond->assoc_cond->acct_list,
user_cond);
notice_thread_fini();
destroy_acct_user_cond(user_cond);
-
+
if(rc == SLURM_SUCCESS) {
if(commit_check("Would you like to commit changes?")) {
acct_storage_g_commit(db_conn, 1);
@@ -1517,8 +1517,8 @@ extern int sacctmgr_list_user(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
- i++;
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
+ i++;
prev_set = _set_cond(&i, argc, argv, user_cond, format_list);
cond_set = MAX(cond_set, prev_set);
}
@@ -1530,8 +1530,8 @@ extern int sacctmgr_list_user(int argc, char *argv[])
}
if(!list_count(format_list)) {
- if(slurm_get_track_wckey())
- slurm_addto_char_list(format_list,
+ if(slurm_get_track_wckey())
+ slurm_addto_char_list(format_list,
"U,DefaultA,DefaultW,Ad");
else
slurm_addto_char_list(format_list, "U,DefaultA,Ad");
@@ -1551,7 +1551,7 @@ extern int sacctmgr_list_user(int argc, char *argv[])
list_destroy(format_list);
destroy_acct_user_cond(user_cond);
return SLURM_SUCCESS;
- }
+ }
}
print_fields_list = list_create(destroy_print_field);
@@ -1561,11 +1561,11 @@ extern int sacctmgr_list_user(int argc, char *argv[])
char *tmp_char = NULL;
int command_len = 0;
int newlen = 0;
-
+
if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
- }
+ }
command_len = strlen(object);
@@ -1576,7 +1576,7 @@ extern int sacctmgr_list_user(int argc, char *argv[])
field->name = xstrdup("Account");
field->len = 10;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("AdminLevel", object,
+ } else if(!strncasecmp("AdminLevel", object,
MAX(command_len, 2))) {
field->type = PRINT_ADMIN;
field->name = xstrdup("Admin");
@@ -1612,7 +1612,7 @@ extern int sacctmgr_list_user(int argc, char *argv[])
field->name = xstrdup("FairShare");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("GrpCPUMins", object,
+ } else if(!strncasecmp("GrpCPUMins", object,
MAX(command_len, 8))) {
field->type = PRINT_GRPCM;
field->name = xstrdup("GrpCPUMins");
@@ -1624,19 +1624,19 @@ extern int sacctmgr_list_user(int argc, char *argv[])
field->name = xstrdup("GrpCPUs");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("GrpJobs", object,
+ } else if(!strncasecmp("GrpJobs", object,
MAX(command_len, 4))) {
field->type = PRINT_GRPJ;
field->name = xstrdup("GrpJobs");
field->len = 7;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("GrpNodes", object,
+ } else if(!strncasecmp("GrpNodes", object,
MAX(command_len, 4))) {
field->type = PRINT_GRPN;
field->name = xstrdup("GrpNodes");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("GrpSubmitJobs", object,
+ } else if(!strncasecmp("GrpSubmitJobs", object,
MAX(command_len, 4))) {
field->type = PRINT_GRPS;
field->name = xstrdup("GrpSubmit");
@@ -1671,19 +1671,19 @@ extern int sacctmgr_list_user(int argc, char *argv[])
field->name = xstrdup("MaxJobs");
field->len = 7;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("MaxNodesPerJob", object,
+ } else if(!strncasecmp("MaxNodesPerJob", object,
MAX(command_len, 4))) {
field->type = PRINT_MAXN;
field->name = xstrdup("MaxNodes");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("MaxSubmitJobs", object,
+ } else if(!strncasecmp("MaxSubmitJobs", object,
MAX(command_len, 4))) {
field->type = PRINT_MAXS;
field->name = xstrdup("MaxSubmit");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if(!strncasecmp("MaxWallDurationPerJob", object,
+ } else if(!strncasecmp("MaxWallDurationPerJob", object,
MAX(command_len, 4))) {
field->type = PRINT_MAXW;
field->name = xstrdup("MaxWall");
@@ -1720,7 +1720,7 @@ extern int sacctmgr_list_user(int argc, char *argv[])
field->len = 9;
field->print_routine = print_fields_uint;
} else if(!strncasecmp("User", object, MAX(command_len, 1))
- || !strncasecmp("Name", object,
+ || !strncasecmp("Name", object,
MAX(command_len, 2))) {
field->type = PRINT_USER;
field->name = xstrdup("User");
@@ -1733,10 +1733,10 @@ extern int sacctmgr_list_user(int argc, char *argv[])
continue;
}
- if(newlen)
+ if(newlen)
field->len = newlen;
-
- list_append(print_fields_list, field);
+
+ list_append(print_fields_list, field);
}
list_iterator_destroy(itr);
list_destroy(format_list);
@@ -1767,16 +1767,16 @@ extern int sacctmgr_list_user(int argc, char *argv[])
if(user->assoc_list) {
ListIterator itr3 =
list_iterator_create(user->assoc_list);
-
+
while((assoc = list_next(itr3))) {
int curr_inx = 1;
while((field = list_next(itr2))) {
switch(field->type) {
case PRINT_ACCOUNT:
field->print_routine(
- field,
+ field,
assoc->acct,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_ADMIN:
@@ -1785,65 +1785,65 @@ extern int sacctmgr_list_user(int argc, char *argv[])
acct_admin_level_str(
user->
admin_level),
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_CLUSTER:
field->print_routine(
field,
assoc->cluster,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_COORDS:
field->print_routine(
field,
user->coord_accts,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_DACCT:
field->print_routine(
field,
user->default_acct,
- (curr_inx ==
+ (curr_inx ==
field_count),
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_DWCKEY:
field->print_routine(
field,
user->default_wckey,
- (curr_inx ==
+ (curr_inx ==
field_count),
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_FAIRSHARE:
field->print_routine(
field,
assoc->shares_raw,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_GRPCM:
field->print_routine(
field,
assoc->grp_cpu_mins,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_GRPC:
field->print_routine(
field,
assoc->grp_cpus,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_GRPJ:
field->print_routine(
- field,
+ field,
assoc->grp_jobs,
(curr_inx
== field_count));
@@ -1857,7 +1857,7 @@ extern int sacctmgr_list_user(int argc, char *argv[])
break;
case PRINT_GRPS:
field->print_routine(
- field,
+ field,
assoc->grp_submit_jobs,
(curr_inx
== field_count));
@@ -1873,7 +1873,7 @@ extern int sacctmgr_list_user(int argc, char *argv[])
field->print_routine(
field,
assoc->id,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_MAXCM:
@@ -1881,21 +1881,21 @@ extern int sacctmgr_list_user(int argc, char *argv[])
field,
assoc->
max_cpu_mins_pj,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_MAXC:
field->print_routine(
field,
assoc->max_cpus_pj,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_MAXJ:
field->print_routine(
- field,
+ field,
assoc->max_jobs,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_MAXN:
@@ -1903,12 +1903,12 @@ extern int sacctmgr_list_user(int argc, char *argv[])
field,
assoc->
max_nodes_pj,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_MAXS:
field->print_routine(
- field,
+ field,
assoc->max_submit_jobs,
(curr_inx ==
field_count));
@@ -1918,12 +1918,12 @@ extern int sacctmgr_list_user(int argc, char *argv[])
field,
assoc->
max_wall_pj,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_QOS:
if(!g_qos_list) {
- g_qos_list =
+ g_qos_list =
acct_storage_g_get_qos(
db_conn,
my_uid,
@@ -1933,42 +1933,42 @@ extern int sacctmgr_list_user(int argc, char *argv[])
field,
g_qos_list,
assoc->qos_list,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_QOS_RAW:
field->print_routine(
field,
NULL,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_PID:
field->print_routine(
field,
assoc->parent_id,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_PNAME:
field->print_routine(
field,
assoc->parent_acct,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_PART:
field->print_routine(
field,
assoc->partition,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_USER:
field->print_routine(
field,
user->name,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
default:
@@ -1983,7 +1983,7 @@ extern int sacctmgr_list_user(int argc, char *argv[])
list_iterator_reset(itr2);
printf("\n");
}
- list_iterator_destroy(itr3);
+ list_iterator_destroy(itr3);
} else {
int curr_inx = 1;
while((field = list_next(itr2))) {
@@ -2010,7 +2010,7 @@ extern int sacctmgr_list_user(int argc, char *argv[])
case PRINT_PNAME:
case PRINT_PART:
field->print_routine(
- field,
+ field,
NULL,
(curr_inx == field_count));
break;
@@ -2047,7 +2047,7 @@ extern int sacctmgr_list_user(int argc, char *argv[])
break;
case PRINT_USER:
field->print_routine(
- field,
+ field,
user->name,
(curr_inx == field_count));
break;
@@ -2120,22 +2120,22 @@ extern int sacctmgr_modify_user(int argc, char *argv[])
destroy_acct_user_rec(user);
destroy_acct_association_rec(assoc);
return SLURM_SUCCESS;
- }
+ }
}
-
+
notice_thread_init();
if(rec_set == 3 || rec_set == 1) { // process the account changes
if(cond_set == 2) {
rc = SLURM_ERROR;
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" There was a problem with your "
"'where' options.\n");
goto assoc_start;
}
- if(user_cond->assoc_cond
- && user_cond->assoc_cond->acct_list
+ if(user_cond->assoc_cond
+ && user_cond->assoc_cond->acct_list
&& list_count(user_cond->assoc_cond->acct_list)) {
notice_thread_fini();
if(commit_check(
@@ -2143,14 +2143,14 @@ extern int sacctmgr_modify_user(int argc, char *argv[])
"request. Did you mean "
"DefaultAccounts?\n")) {
if(!user_cond->def_acct_list)
- user_cond->def_acct_list =
+ user_cond->def_acct_list =
list_create(slurm_destroy_char);
list_transfer(user_cond->def_acct_list,
user_cond->assoc_cond->acct_list);
}
notice_thread_init();
}
-
+
ret_list = acct_storage_g_modify_users(
db_conn, my_uid, user_cond, user);
if(ret_list && list_count(ret_list)) {
@@ -2167,7 +2167,7 @@ extern int sacctmgr_modify_user(int argc, char *argv[])
* you can specfy a user by something else
* like default_account or something. If the
* user doesn't have the account make
- * note of it.
+ * note of it.
*/
if(user->default_acct &&
!_check_user_has_acct(
@@ -2176,7 +2176,7 @@ extern int sacctmgr_modify_user(int argc, char *argv[])
regret_list = list_create(NULL);
list_append(regret_list, object);
continue;
- }
+ }
}
if(regret_list) {
list_iterator_destroy(itr);
@@ -2215,11 +2215,11 @@ extern int sacctmgr_modify_user(int argc, char *argv[])
assoc_start:
if(rec_set == 3 || rec_set == 2) { // process the association changes
- if(cond_set == 1
+ if(cond_set == 1
&& !list_count(user_cond->assoc_cond->user_list)) {
rc = SLURM_ERROR;
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" There was a problem with your "
"'where' options.\n");
goto assoc_end;
@@ -2252,7 +2252,7 @@ assoc_end:
notice_thread_fini();
if(set) {
- if(commit_check("Would you like to commit changes?"))
+ if(commit_check("Would you like to commit changes?"))
acct_storage_g_commit(db_conn, 1);
else {
printf(" Changes Discarded\n");
@@ -2261,7 +2261,7 @@ assoc_end:
}
destroy_acct_user_cond(user_cond);
- destroy_acct_user_rec(user);
+ destroy_acct_user_rec(user);
destroy_acct_association_rec(assoc);
return rc;
@@ -2278,15 +2278,15 @@ extern int sacctmgr_delete_user(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
- i++;
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
+ i++;
prev_set = _set_cond(&i, argc, argv, user_cond, NULL);
cond_set = MAX(cond_set, prev_set);
}
if(!cond_set) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" No conditions given to remove, not executing.\n");
destroy_acct_user_cond(user_cond);
return SLURM_ERROR;
@@ -2295,12 +2295,12 @@ extern int sacctmgr_delete_user(int argc, char *argv[])
if(exit_code) {
destroy_acct_user_cond(user_cond);
return SLURM_ERROR;
- }
+ }
notice_thread_init();
if(cond_set == 1) {
ret_list = acct_storage_g_remove_users(
- db_conn, my_uid, user_cond);
+ db_conn, my_uid, user_cond);
} else if(cond_set == 2 || cond_set == 3) {
ret_list = acct_storage_g_remove_associations(
db_conn, my_uid, user_cond->assoc_cond);
@@ -2333,8 +2333,8 @@ extern int sacctmgr_delete_user(int argc, char *argv[])
exit_code=1;
fprintf(stderr, " Error with request\n");
rc = SLURM_ERROR;
- }
-
+ }
+
if(ret_list)
list_destroy(ret_list);
@@ -2358,8 +2358,8 @@ extern int sacctmgr_delete_coord(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
- i++;
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
+ i++;
prev_set = _set_cond(&i, argc, argv, user_cond, NULL);
cond_set = MAX(cond_set, prev_set);
}
@@ -2370,7 +2370,7 @@ extern int sacctmgr_delete_coord(int argc, char *argv[])
} else if(!cond_set) {
exit_code=1;
fprintf(stderr, " You need to specify a user list "
- "or account list here.\n");
+ "or account list here.\n");
destroy_acct_user_cond(user_cond);
return SLURM_ERROR;
}
@@ -2380,11 +2380,11 @@ extern int sacctmgr_delete_coord(int argc, char *argv[])
return SLURM_ERROR;
}
- if(user_cond->assoc_cond->user_list) {
+ if(user_cond->assoc_cond->user_list) {
itr = list_iterator_create(user_cond->assoc_cond->user_list);
while((name = list_next(itr))) {
xstrfmtcat(user_str, " %s\n", name);
-
+
}
list_iterator_destroy(itr);
}
@@ -2393,7 +2393,7 @@ extern int sacctmgr_delete_coord(int argc, char *argv[])
itr = list_iterator_create(user_cond->assoc_cond->acct_list);
while((name = list_next(itr))) {
xstrfmtcat(acct_str, " %s\n", name);
-
+
}
list_iterator_destroy(itr);
}
@@ -2401,9 +2401,9 @@ extern int sacctmgr_delete_coord(int argc, char *argv[])
if(!user_str && !acct_str) {
exit_code=1;
fprintf(stderr, " You need to specify a user list "
- "or an account list here.\n");
+ "or an account list here.\n");
destroy_acct_user_cond(user_cond);
- return SLURM_ERROR;
+ return SLURM_ERROR;
}
/* FIX ME: This list should be recieved from the slurmdbd not
* just assumed. Right now it doesn't do it correctly though.
@@ -2415,11 +2415,11 @@ extern int sacctmgr_delete_coord(int argc, char *argv[])
printf(" From Account(s)\n%s", acct_str);
else
printf(" From all accounts\n");
- } else
+ } else
printf(" Removing all users from Accounts\n%s", acct_str);
-
+
notice_thread_init();
- ret_list = acct_storage_g_remove_coord(db_conn, my_uid,
+ ret_list = acct_storage_g_remove_coord(db_conn, my_uid,
user_cond->assoc_cond->acct_list,
user_cond);
destroy_acct_user_cond(user_cond);
@@ -2446,7 +2446,7 @@ extern int sacctmgr_delete_coord(int argc, char *argv[])
list_destroy(ret_list);
notice_thread_fini();
if(set) {
- if(commit_check("Would you like to commit changes?"))
+ if(commit_check("Would you like to commit changes?"))
acct_storage_g_commit(db_conn, 1);
else {
printf(" Changes Discarded\n");
diff --git a/src/sacctmgr/wckey_functions.c b/src/sacctmgr/wckey_functions.c
index b3403ef8c694ab4767901c89b5d62b7b9be0f9c2..09be80620cdfb94816eb7029fc30b2ea1a077077 100644
--- a/src/sacctmgr/wckey_functions.c
+++ b/src/sacctmgr/wckey_functions.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -92,10 +92,10 @@ static int _set_cond(int *start, int argc, char *argv[],
uint32_t id = 0;
if(!wckey_cond->id_list)
- wckey_cond->id_list =
+ wckey_cond->id_list =
list_create(slurm_destroy_char);
-
- if(slurm_addto_char_list(wckey_cond->id_list,
+
+ if(slurm_addto_char_list(wckey_cond->id_list,
argv[i]+end))
set = 1;
@@ -124,7 +124,7 @@ static int _set_cond(int *start, int argc, char *argv[],
MAX(command_len, 1))) {
if(format_list)
slurm_addto_char_list(format_list, argv[i]+end);
- } else if (!strncasecmp (argv[i], "Start",
+ } else if (!strncasecmp (argv[i], "Start",
MAX(command_len, 1))) {
wckey_cond->usage_start = parse_time(argv[i]+end, 1);
set = 1;
@@ -140,7 +140,7 @@ static int _set_cond(int *start, int argc, char *argv[],
exit_code=1;
fprintf(stderr, " Unknown condition: %s\n", argv[i]);
}
- }
+ }
(*start) = i;
@@ -174,8 +174,8 @@ extern int sacctmgr_list_wckey(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
- i++;
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
+ i++;
_set_cond(&i, argc, argv, wckey_cond, format_list);
}
@@ -186,7 +186,7 @@ extern int sacctmgr_list_wckey(int argc, char *argv[])
}
if(!list_count(format_list)) {
- slurm_addto_char_list(format_list,
+ slurm_addto_char_list(format_list,
"Name,Cluster,User");
}
@@ -197,11 +197,11 @@ extern int sacctmgr_list_wckey(int argc, char *argv[])
char *tmp_char = NULL;
int command_len = 0;
int newlen = 0;
-
+
if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
- }
+ }
command_len = strlen(object);
@@ -235,10 +235,10 @@ extern int sacctmgr_list_wckey(int argc, char *argv[])
continue;
}
- if(newlen)
+ if(newlen)
field->len = newlen;
-
- list_append(print_fields_list, field);
+
+ list_append(print_fields_list, field);
}
list_iterator_destroy(itr);
list_destroy(format_list);
@@ -264,7 +264,7 @@ extern int sacctmgr_list_wckey(int argc, char *argv[])
print_fields_header(print_fields_list);
field_count = list_count(print_fields_list);
-
+
while((wckey = list_next(itr))) {
int curr_inx = 1;
while((field = list_next(itr2))) {
@@ -272,25 +272,25 @@ extern int sacctmgr_list_wckey(int argc, char *argv[])
/* All the association stuff */
case PRINT_CLUSTER:
field->print_routine(
- field,
+ field,
wckey->cluster,
(curr_inx == field_count));
break;
case PRINT_ID:
field->print_routine(
- field,
+ field,
wckey->id,
(curr_inx == field_count));
break;
case PRINT_NAME:
field->print_routine(
- field,
+ field,
wckey->name,
(curr_inx == field_count));
break;
case PRINT_USER:
field->print_routine(
- field,
+ field,
wckey->user,
(curr_inx == field_count));
break;
diff --git a/src/salloc/Makefile.am b/src/salloc/Makefile.am
index 05fb0f3eb54d0601e865845a92c8e19b17cc2910..2461f542cc19701e39fe8ddb5b282018495587ae 100644
--- a/src/salloc/Makefile.am
+++ b/src/salloc/Makefile.am
@@ -12,7 +12,7 @@ salloc_SOURCES = salloc.c salloc.h opt.c opt.h
convenience_libs = $(top_builddir)/src/api/libslurm.o -ldl
salloc_LDADD = \
- $(convenience_libs)
+ $(convenience_libs)
salloc_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
diff --git a/src/salloc/Makefile.in b/src/salloc/Makefile.in
index dd3cbd5ffb4a46da43cdffa228788d1e57ec1bb0..a0516e8a3090949d438c5a0a252f6afbe820ba5b 100644
--- a/src/salloc/Makefile.in
+++ b/src/salloc/Makefile.in
@@ -297,7 +297,7 @@ INCLUDES = -I$(top_srcdir) $(BG_INCLUDES)
salloc_SOURCES = salloc.c salloc.h opt.c opt.h
convenience_libs = $(top_builddir)/src/api/libslurm.o -ldl
salloc_LDADD = \
- $(convenience_libs)
+ $(convenience_libs)
salloc_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
all: all-am
diff --git a/src/salloc/opt.c b/src/salloc/opt.c
index 7ff825923ee95e579d89c26cc0cfce27fbc038ed..679e004d45a31bc6c605c552e70ee366e193baf3 100644
--- a/src/salloc/opt.c
+++ b/src/salloc/opt.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <grondona1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -212,7 +212,7 @@ int initialize_and_process_args(int argc, char *argv[])
}
/*
- * If the node list supplied is a file name, translate that into
+ * If the node list supplied is a file name, translate that into
* a list of nodes, we orphan the data pointed to
* RET true if the node list is a valid one
*/
@@ -222,9 +222,9 @@ static bool _valid_node_list(char **node_list_pptr)
/* If we are using Arbitrary and we specified the number of
procs to use then we need exactly this many since we are
- saying, lay it out this way! Same for max and min nodes.
+ saying, lay it out this way! Same for max and min nodes.
Other than that just read in as many in the hostfile */
- if(opt.nprocs_set)
+ if(opt.nprocs_set)
count = opt.nprocs;
else if(opt.nodes_set) {
if(opt.max_nodes)
@@ -278,7 +278,7 @@ static void _opt_default()
opt.nprocs = 1;
opt.nprocs_set = false;
- opt.cpus_per_task = 1;
+ opt.cpus_per_task = 1;
opt.cpus_set = false;
opt.min_nodes = 1;
opt.max_nodes = 0;
@@ -340,7 +340,7 @@ static void _opt_default()
opt.euid = (uid_t) -1;
opt.egid = (gid_t) -1;
-
+
opt.bell = BELL_AFTER_DELAY;
opt.acctg_freq = -1;
opt.no_shell = false;
@@ -353,8 +353,8 @@ static void _opt_default()
/*---[ env var processing ]-----------------------------------------------*/
/*
- * try to use a similar scheme as popt.
- *
+ * try to use a similar scheme as popt.
+ *
* in order to add a new env var (to be processed like an option):
*
* define a new entry into env_vars[], if the option is a simple int
@@ -405,7 +405,7 @@ static void _opt_env()
env_vars_t *e = env_vars;
while (e->var) {
- if ((val = getenv(e->var)) != NULL)
+ if ((val = getenv(e->var)) != NULL)
_process_env_var(e, val);
e++;
}
@@ -431,7 +431,7 @@ _process_env_var(env_vars_t *e, const char *val)
if (val != NULL) {
*((int *) e->arg) = (int) strtol(val, &end, 10);
if (!(end && *end == '\0')) {
- error("%s=%s invalid. ignoring...",
+ error("%s=%s invalid. ignoring...",
e->var, val);
}
}
@@ -458,14 +458,14 @@ _process_env_var(env_vars_t *e, const char *val)
case OPT_DEBUG:
if (val != NULL) {
opt.verbose = (int) strtol(val, &end, 10);
- if (!(end && *end == '\0'))
+ if (!(end && *end == '\0'))
error("%s=%s invalid", e->var, val);
}
break;
case OPT_NODES:
- opt.nodes_set = verify_node_count( val,
- &opt.min_nodes,
+ opt.nodes_set = verify_node_count( val,
+ &opt.min_nodes,
&opt.max_nodes );
if (opt.nodes_set == false) {
error("invalid node count in env variable, ignoring");
@@ -526,7 +526,7 @@ _process_env_var(env_vars_t *e, const char *val)
opt.wckey = xstrdup(optarg);
break;
case OPT_SIGNAL:
- if (get_signal_opts(optarg, &opt.warn_signal,
+ if (get_signal_opts(optarg, &opt.warn_signal,
&opt.warn_time)) {
error("Invalid signal specification: %s", optarg);
exit(error_exit);
@@ -542,7 +542,7 @@ _process_env_var(env_vars_t *e, const char *val)
* Get a decimal integer from arg.
*
* Returns the integer on success, exits program on failure.
- *
+ *
*/
static int
_get_int(const char *arg, const char *what)
@@ -656,11 +656,11 @@ void set_options(const int argc, char **argv)
}
opt.progname = xbasename(argv[0]);
- optind = 0;
+ optind = 0;
while((opt_char = getopt_long(argc, argv, opt_string,
optz, &option_index)) != -1) {
switch (opt_char) {
-
+
case '?':
fprintf(stderr, "Try \"salloc --help\" for more "
"information\n");
@@ -687,7 +687,7 @@ void set_options(const int argc, char **argv)
break;
case 'c':
opt.cpus_set = true;
- opt.cpus_per_task =
+ opt.cpus_per_task =
_get_int(optarg, "cpus-per-task");
break;
case 'C':
@@ -749,22 +749,22 @@ void set_options(const int argc, char **argv)
opt.licenses = xstrdup(optarg);
break;
case 'm':
- opt.distribution = verify_dist_type(optarg,
+ opt.distribution = verify_dist_type(optarg,
&opt.plane_size);
if (opt.distribution == SLURM_DIST_UNKNOWN) {
- error("distribution type `%s' "
+ error("distribution type `%s' "
"is not recognized", optarg);
exit(error_exit);
}
break;
case 'n':
opt.nprocs_set = true;
- opt.nprocs =
+ opt.nprocs =
_get_int(optarg, "number of tasks");
break;
case 'N':
- opt.nodes_set =
- verify_node_count(optarg,
+ opt.nodes_set =
+ verify_node_count(optarg,
&opt.min_nodes,
&opt.max_nodes);
if (opt.nodes_set == false) {
@@ -839,7 +839,7 @@ void set_options(const int argc, char **argv)
case LONG_OPT_MINCPU:
opt.mincpus = _get_int(optarg, "mincpus");
if (opt.mincpus < 0) {
- error("invalid mincpus constraint %s",
+ error("invalid mincpus constraint %s",
optarg);
exit(error_exit);
}
@@ -847,10 +847,10 @@ void set_options(const int argc, char **argv)
case LONG_OPT_MINCORES:
verbose("mincores option has been deprecated, use "
"cores-per-socket");
- opt.min_cores_per_socket = _get_int(optarg,
+ opt.min_cores_per_socket = _get_int(optarg,
"mincores");
if (opt.min_cores_per_socket < 0) {
- error("invalid mincores constraint %s",
+ error("invalid mincores constraint %s",
optarg);
exit(error_exit);
}
@@ -858,10 +858,10 @@ void set_options(const int argc, char **argv)
case LONG_OPT_MINSOCKETS:
verbose("minsockets option has been deprecated, use "
"sockets-per-node");
- opt.min_sockets_per_node = _get_int(optarg,
+ opt.min_sockets_per_node = _get_int(optarg,
"minsockets");
if (opt.min_sockets_per_node < 0) {
- error("invalid minsockets constraint %s",
+ error("invalid minsockets constraint %s",
optarg);
exit(error_exit);
}
@@ -869,10 +869,10 @@ void set_options(const int argc, char **argv)
case LONG_OPT_MINTHREADS:
verbose("minthreads option has been deprecated, use "
"threads-per-core");
- opt.min_threads_per_core = _get_int(optarg,
+ opt.min_threads_per_core = _get_int(optarg,
"minthreads");
if (opt.min_threads_per_core < 0) {
- error("invalid minthreads constraint %s",
+ error("invalid minthreads constraint %s",
optarg);
exit(error_exit);
}
@@ -880,7 +880,7 @@ void set_options(const int argc, char **argv)
case LONG_OPT_MEM:
opt.realmem = (int) str_to_bytes(optarg);
if (opt.realmem < 0) {
- error("invalid memory constraint %s",
+ error("invalid memory constraint %s",
optarg);
exit(error_exit);
}
@@ -888,7 +888,7 @@ void set_options(const int argc, char **argv)
case LONG_OPT_MEM_PER_CPU:
opt.mem_per_cpu = (int) str_to_bytes(optarg);
if (opt.mem_per_cpu < 0) {
- error("invalid memory constraint %s",
+ error("invalid memory constraint %s",
optarg);
exit(error_exit);
}
@@ -1008,7 +1008,7 @@ void set_options(const int argc, char **argv)
"ntasks-per-node");
break;
case LONG_OPT_NTASKSPERSOCKET:
- opt.ntasks_per_socket = _get_int(optarg,
+ opt.ntasks_per_socket = _get_int(optarg,
"ntasks-per-socket");
break;
case LONG_OPT_NTASKSPERCORE:
@@ -1069,7 +1069,7 @@ void set_options(const int argc, char **argv)
opt.reservation = xstrdup(optarg);
break;
case LONG_OPT_SIGNAL:
- if (get_signal_opts(optarg, &opt.warn_signal,
+ if (get_signal_opts(optarg, &opt.warn_signal,
&opt.warn_time)) {
error("Invalid signal specification: %s",
optarg);
@@ -1098,7 +1098,7 @@ static void _proc_get_user_env(char *optarg)
opt.get_user_env_time = 0;
end_ptr = optarg;
}
-
+
if ((end_ptr == NULL) || (end_ptr[0] == '\0'))
return;
if ((end_ptr[0] == 's') || (end_ptr[0] == 'S'))
@@ -1172,7 +1172,7 @@ static int _salloc_default_command (int *argcp, char **argvp[])
return (0);
}
-/*
+/*
* _opt_verify : perform some post option processing verification
*
*/
@@ -1188,10 +1188,10 @@ static bool _opt_verify(void)
if (opt.mincpus < opt.cpus_per_task)
opt.mincpus = opt.cpus_per_task;
- if ((opt.euid != (uid_t) -1) && (opt.euid != opt.uid))
+ if ((opt.euid != (uid_t) -1) && (opt.euid != opt.uid))
opt.uid = opt.euid;
- if ((opt.egid != (gid_t) -1) && (opt.egid != opt.gid))
+ if ((opt.egid != (gid_t) -1) && (opt.egid != opt.gid))
opt.gid = opt.egid;
if ((opt.no_shell == false) && (command_argc == 0))
@@ -1213,7 +1213,7 @@ static bool _opt_verify(void)
verified = false;
}
- if ((opt.min_nodes < 0) || (opt.max_nodes < 0) ||
+ if ((opt.min_nodes < 0) || (opt.max_nodes < 0) ||
(opt.max_nodes && (opt.min_nodes > opt.max_nodes))) {
error("invalid number of nodes (-N %d-%d)\n",
opt.min_nodes, opt.max_nodes);
@@ -1257,10 +1257,10 @@ static bool _opt_verify(void)
opt.realmem = opt.mem_per_cpu;
}
}
-
+
/* Check to see if user has specified enough resources to
* satisfy the plane distribution with the specified
- * plane_size.
+ * plane_size.
* if (n/plane_size < N) and ((N-1) * plane_size >= n) -->
* problem Simple check will not catch all the problem/invalid
* cases.
@@ -1273,8 +1273,8 @@ static bool _opt_verify(void)
#if(0)
info("Too few processes ((n/plane_size) %d < N %d) "
"and ((N-1)*(plane_size) %d >= n %d)) ",
- opt.nprocs/opt.plane_size, opt.min_nodes,
- (opt.min_nodes-1)*opt.plane_size,
+ opt.nprocs/opt.plane_size, opt.min_nodes,
+ (opt.min_nodes-1)*opt.plane_size,
opt.nprocs);
#endif
error("Too few processes for the requested "
@@ -1284,7 +1284,7 @@ static bool _opt_verify(void)
}
}
- /* bound threads/cores from ntasks_cores/sockets */
+ /* bound threads/cores from ntasks_cores/sockets */
if (opt.ntasks_per_core > 0) {
/* if cpu_bind_type doesn't already have a auto pref,
* choose the level based on the level of ntasks
@@ -1307,8 +1307,8 @@ static bool _opt_verify(void)
}
/* massage the numbers */
- if ((opt.nodes_set || opt.extra_set) &&
- ((opt.min_nodes == opt.max_nodes) || (opt.max_nodes == 0)) &&
+ if ((opt.nodes_set || opt.extra_set) &&
+ ((opt.min_nodes == opt.max_nodes) || (opt.max_nodes == 0)) &&
!opt.nprocs_set) {
/* 1 proc / node default */
opt.nprocs = opt.min_nodes;
@@ -1329,17 +1329,17 @@ static bool _opt_verify(void)
} else if (opt.nodes_set && opt.nprocs_set) {
- /*
- * make sure # of procs >= min_nodes
+ /*
+ * make sure # of procs >= min_nodes
*/
if (opt.nprocs < opt.min_nodes) {
- info ("Warning: can't run %d processes on %d "
- "nodes, setting nnodes to %d",
+ info ("Warning: can't run %d processes on %d "
+ "nodes, setting nnodes to %d",
opt.nprocs, opt.min_nodes, opt.nprocs);
opt.min_nodes = opt.nprocs;
- if ( opt.max_nodes
+ if ( opt.max_nodes
&& (opt.min_nodes > opt.max_nodes) )
opt.max_nodes = opt.min_nodes;
}
@@ -1375,20 +1375,20 @@ static bool _opt_verify(void)
/* set up the proc and node counts based on the arbitrary list
of nodes */
if((opt.distribution == SLURM_DIST_ARBITRARY)
- && (!opt.nodes_set || !opt.nprocs_set)) {
+ && (!opt.nodes_set || !opt.nprocs_set)) {
hostlist_t hl = hostlist_create(opt.nodelist);
if(!opt.nprocs_set) {
opt.nprocs_set = 1;
opt.nprocs = hostlist_count(hl);
- }
+ }
if(!opt.nodes_set) {
opt.nodes_set = 1;
hostlist_uniq(hl);
opt.min_nodes = opt.max_nodes = hostlist_count(hl);
}
hostlist_destroy(hl);
- }
-
+ }
+
if (opt.time_limit_str) {
opt.time_limit = time_str2mins(opt.time_limit_str);
if ((opt.time_limit < 0) && (opt.time_limit != INFINITE)) {
@@ -1411,7 +1411,7 @@ static bool _opt_verify(void)
char tmp[64];
slurm_sprint_cpu_bind_type(tmp, opt.cpu_bind_type);
if (opt.cpu_bind) {
- setenvf(NULL, "SLURM_CPU_BIND", "%s:%s",
+ setenvf(NULL, "SLURM_CPU_BIND", "%s:%s",
tmp, opt.cpu_bind);
} else {
setenvf(NULL, "SLURM_CPU_BIND", "%s", tmp);
@@ -1421,15 +1421,15 @@ static bool _opt_verify(void)
char tmp[64];
slurm_sprint_mem_bind_type(tmp, opt.mem_bind_type);
if (opt.mem_bind) {
- setenvf(NULL, "SLURM_MEM_BIND", "%s:%s",
+ setenvf(NULL, "SLURM_MEM_BIND", "%s:%s",
tmp, opt.mem_bind);
} else {
setenvf(NULL, "SLURM_MEM_BIND", "%s", tmp);
}
}
- if ((opt.ntasks_per_node != NO_VAL) &&
+ if ((opt.ntasks_per_node != NO_VAL) &&
(getenv("SLURM_NTASKS_PER_NODE") == NULL)) {
- setenvf(NULL, "SLURM_NTASKS_PER_NODE", "%d",
+ setenvf(NULL, "SLURM_NTASKS_PER_NODE", "%d",
opt.ntasks_per_node);
}
@@ -1463,7 +1463,7 @@ extern char *spank_get_job_env(const char *name)
return NULL;
}
-extern int spank_set_job_env(const char *name, const char *value,
+extern int spank_set_job_env(const char *name, const char *value,
int overwrite)
{
int i, len;
@@ -1529,7 +1529,7 @@ extern int spank_unset_job_env(const char *name)
}
/* helper function for printing options
- *
+ *
* warning: returns pointer to memory allocated on the stack.
*/
static char *print_constraints()
@@ -1550,7 +1550,7 @@ static char *print_constraints()
if (opt.contiguous == true)
xstrcat(buf, "contiguous ");
-
+
if (opt.nodelist != NULL)
xstrfmtcat(buf, "nodelist=%s ", opt.nodelist);
@@ -1710,7 +1710,7 @@ static void _opt_list()
info("ntasks-per-socket : %d", opt.ntasks_per_socket);
info("ntasks-per-core : %d", opt.ntasks_per_core);
info("plane_size : %u", opt.plane_size);
- info("cpu_bind : %s",
+ info("cpu_bind : %s",
opt.cpu_bind == NULL ? "default" : opt.cpu_bind);
info("mem_bind : %s",
opt.mem_bind == NULL ? "default" : opt.mem_bind);
@@ -1802,14 +1802,14 @@ static void _help(void)
" -w, --nodelist=hosts... request a specific list of hosts\n"
" -x, --exclude=hosts... exclude a specific list of hosts\n"
"\n"
-"Consumable resources related options:\n"
-" --exclusive allocate nodes in exclusive mode when\n"
+"Consumable resources related options:\n"
+" --exclusive allocate nodes in exclusive mode when\n"
" cpu consumable resource is enabled\n"
" --mem-per-cpu=MB maximum amount of real memory per allocated\n"
-" cpu required by the job.\n"
-" --mem >= --mem-per-cpu if --mem is specified.\n"
+" cpu required by the job.\n"
+" --mem >= --mem-per-cpu if --mem is specified.\n"
"\n"
-"Affinity/Multi-core options: (when the task/affinity plugin is enabled)\n"
+"Affinity/Multi-core options: (when the task/affinity plugin is enabled)\n"
" -B --extra-node-info=S[:C[:T]] Expands to:\n"
" --sockets-per-node=S number of sockets per node to allocate\n"
" --cores-per-socket=C number of cores per socket to allocate\n"
@@ -1851,7 +1851,7 @@ static void _help(void)
" If wanting to run in HTC mode (only for 1\n"
" midplane and below). You can use HTC_S for\n"
" SMP, HTC_D for Dual, HTC_V for\n"
-" virtual node mode, and HTC_L for Linux mode.\n"
+" virtual node mode, and HTC_L for Linux mode.\n"
" --cnload-image=path path to compute node image for bluegene block. Default if not set\n"
" --mloader-image=path path to mloader image for bluegene block. Default if not set\n"
" --ioload-image=path path to ioload image for bluegene block. Default if not set\n"
diff --git a/src/salloc/opt.h b/src/salloc/opt.h
index aa1bebae0c4d1a8d41ed9366bdda097e2c8f3e09..3f5eee11153c6fa2c1af66125bd5687434307cc0 100644
--- a/src/salloc/opt.h
+++ b/src/salloc/opt.h
@@ -7,32 +7,32 @@
* Written by Mark Grondona <grondona1@llnl.gov>,
* Christopher J. Morrone <morrone2@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -64,7 +64,7 @@ typedef enum {BELL_NEVER, BELL_AFTER_DELAY, BELL_ALWAYS} bell_flag_t;
typedef struct salloc_options {
- char *progname; /* argv[0] of this program or
+ char *progname; /* argv[0] of this program or
* configuration file if multi_prog */
char user[MAX_USERNAME];/* local username */
uid_t uid; /* local uid */
@@ -76,8 +76,8 @@ typedef struct salloc_options {
bool nprocs_set; /* true if nprocs explicitly set */
int cpus_per_task; /* --cpus-per-task=n, -c n */
bool cpus_set; /* true if cpus_per_task explicitly set */
- int min_nodes; /* --nodes=n, -N n */
- int max_nodes; /* --nodes=x-n, -N x-n */
+ int min_nodes; /* --nodes=n, -N n */
+ int max_nodes; /* --nodes=x-n, -N x-n */
bool nodes_set; /* true if nodes explicitly set */
int min_sockets_per_node; /* --sockets-per-node=n */
int min_cores_per_socket; /* --cores-per-socket=n */
@@ -97,7 +97,7 @@ typedef struct salloc_options {
distribution; /* --distribution=, -m dist */
uint32_t plane_size; /* lllp distribution -> plane_size for
* when -m plane=<# of lllp per
- * plane> */
+ * plane> */
char *job_name; /* --job-name=, -J name */
unsigned int jobid; /* --jobid=jobid */
char *dependency; /* --dependency, -P type:jobid */
@@ -175,7 +175,7 @@ void set_options(const int argc, char **argv);
/* external functions available for SPANK plugins to modify the environment
* exported to the SLURM Prolog and Epilog programs */
extern char *spank_get_job_env(const char *name);
-extern int spank_set_job_env(const char *name, const char *value,
+extern int spank_set_job_env(const char *name, const char *value,
int overwrite);
extern int spank_unset_job_env(const char *name);
diff --git a/src/salloc/salloc.c b/src/salloc/salloc.c
index 074e1cb82d5e857542622d92f8bda5fda9754eae..f3600d5549635a9b907c1bf912ac4c7ad4116893 100644
--- a/src/salloc/salloc.c
+++ b/src/salloc/salloc.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Christopher J. Morrone <morrone2@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -61,7 +61,7 @@
/* external functions available for SPANK plugins to modify the environment
* exported to the SLURM Prolog and Epilog programs */
extern char *spank_get_job_env(const char *name);
-extern int spank_set_job_env(const char *name, const char *value,
+extern int spank_set_job_env(const char *name, const char *value,
int overwrite);
extern int spank_unset_job_env(const char *name);
#include "src/common/xsignal.h"
@@ -214,7 +214,7 @@ int main(int argc, char *argv[])
callbacks.user_msg = _user_msg_handler;
callbacks.node_fail = _node_fail_handler;
/* create message thread to handle pings and such from slurmctld */
- msg_thr = slurm_allocation_msg_thr_create(&desc.other_port,
+ msg_thr = slurm_allocation_msg_thr_create(&desc.other_port,
&callbacks);
xsignal(SIGHUP, _signal_while_allocating);
@@ -224,7 +224,7 @@ int main(int argc, char *argv[])
xsignal(SIGTERM, _signal_while_allocating);
xsignal(SIGUSR1, _signal_while_allocating);
xsignal(SIGUSR2, _signal_while_allocating);
-
+
before = time(NULL);
while ((alloc = slurm_allocate_resources_blocking(&desc, opt.immediate,
_pending_callback)) == NULL) {
@@ -244,8 +244,8 @@ int main(int argc, char *argv[])
} else if (errno == EINTR) {
error("Interrupted by signal."
" Allocation request rescinded.");
- } else if (opt.immediate &&
- ((errno == ETIMEDOUT) ||
+ } else if (opt.immediate &&
+ ((errno == ETIMEDOUT) ||
(errno == ESLURM_NODES_BUSY))) {
error("Unable to allocate resources: %s",
slurm_strerror(ESLURM_NODES_BUSY));
@@ -318,7 +318,7 @@ int main(int argc, char *argv[])
opt.cpus_per_task);
}
if (opt.overcommit) {
- env_array_append_fmt(&env, "SLURM_OVERCOMMIT", "%d",
+ env_array_append_fmt(&env, "SLURM_OVERCOMMIT", "%d",
opt.overcommit);
}
if (opt.acctg_freq >= 0) {
@@ -327,7 +327,7 @@ int main(int argc, char *argv[])
}
if (opt.network)
env_array_append_fmt(&env, "SLURM_NETWORK", "%s", opt.network);
-
+
env_array_set_environment(env);
env_array_free(env);
pthread_mutex_lock(&allocation_state_lock);
@@ -382,7 +382,7 @@ relinquish:
*/
rc = 1;
if (rc_pid != -1) {
-
+
if (WIFEXITED(status)) {
rc = WEXITSTATUS(status);
} else if (WIFSIGNALED(status)) {
@@ -433,7 +433,7 @@ static int _fill_job_desc_from_opts(job_desc_msg_t *desc)
{
desc->contiguous = opt.contiguous ? 1 : 0;
desc->features = opt.constraints;
- if (opt.immediate == 1)
+ if (opt.immediate == 1)
desc->immediate = 1;
desc->name = xstrdup(opt.job_name);
desc->reservation = xstrdup(opt.reservation);
@@ -646,18 +646,18 @@ static void _job_complete_handler(srun_job_complete_msg_t *comp)
}
/*
- * Job has been notified of it's approaching time limit.
+ * Job has been notified of it's approaching time limit.
* Job will be killed shortly after timeout.
* This RPC can arrive multiple times with the same or updated timeouts.
* FIXME: We may want to signal the job or perform other action for this.
- * FIXME: How much lead time do we want for this message? Some jobs may
+ * FIXME: How much lead time do we want for this message? Some jobs may
* require tens of minutes to gracefully terminate.
*/
static void _timeout_handler(srun_timeout_msg_t *msg)
{
if (msg->timeout != last_timeout) {
last_timeout = msg->timeout;
- verbose("Job allocation time limit to be reached at %s",
+ verbose("Job allocation time limit to be reached at %s",
ctime(&msg->timeout));
}
}
@@ -667,7 +667,7 @@ static void _user_msg_handler(srun_user_msg_t *msg)
info("%s", msg->msg);
}
-static void _ping_handler(srun_ping_msg_t *msg)
+static void _ping_handler(srun_ping_msg_t *msg)
{
/* the api will respond so there really isn't anything to do
here */
@@ -701,7 +701,7 @@ static void _set_rlimits(char **env)
}
env_num = strtol(env_value, &p, 10);
if (p && (p[0] != '\0')) {
- error("Invalid environment %s value %s",
+ error("Invalid environment %s value %s",
env_name, env_value);
continue;
}
@@ -729,7 +729,7 @@ static int _wait_bluegene_block_ready(resource_allocation_response_msg_t *alloc)
select_g_select_jobinfo_get(alloc->select_jobinfo,
SELECT_JOBDATA_BLOCK_ID,
&block_id);
-
+
for (i=0; (cur_delay < max_delay); i++) {
if (i == 1)
info("Waiting for block %s to become ready for job",
@@ -737,7 +737,7 @@ static int _wait_bluegene_block_ready(resource_allocation_response_msg_t *alloc)
if (i) {
sleep(POLL_SLEEP);
rc = _blocks_dealloc();
- if ((rc == 0) || (rc == -1))
+ if ((rc == 0) || (rc == -1))
cur_delay += POLL_SLEEP;
debug("still waiting");
}
@@ -781,9 +781,9 @@ static int _blocks_dealloc(void)
{
static block_info_msg_t *bg_info_ptr = NULL, *new_bg_ptr = NULL;
int rc = 0, error_code = 0, i;
-
+
if (bg_info_ptr) {
- error_code = slurm_load_block_info(bg_info_ptr->last_update,
+ error_code = slurm_load_block_info(bg_info_ptr->last_update,
&new_bg_ptr);
if (error_code == SLURM_SUCCESS)
slurm_free_block_info_msg(&bg_info_ptr);
@@ -801,7 +801,7 @@ static int _blocks_dealloc(void)
return -1;
}
for (i=0; i<new_bg_ptr->record_count; i++) {
- if(new_bg_ptr->block_array[i].state
+ if(new_bg_ptr->block_array[i].state
== RM_PARTITION_DEALLOCATING) {
rc = 1;
break;
diff --git a/src/salloc/salloc.h b/src/salloc/salloc.h
index fdd262aaf7b49575670d744e14e722759af9adcf..3267b9ba1664bec5a9a3d44ce378e306873f4eb7 100644
--- a/src/salloc/salloc.h
+++ b/src/salloc/salloc.h
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Christopher J. Morrone <morrone2@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/sattach/Makefile.am b/src/sattach/Makefile.am
index 749a846d1f84a22d96f8c6d7f7e6f70bb3a73c6c..036b34f93ff543f3619b495b7a31ea29b3e56d4a 100644
--- a/src/sattach/Makefile.am
+++ b/src/sattach/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir)
bin_PROGRAMS = sattach
@@ -10,12 +10,12 @@ sattach_SOURCES = \
attach.c attach.h \
opt.c opt.h \
sattach.c \
- sattach.wrapper.c
+ sattach.wrapper.c
convenience_libs = $(top_builddir)/src/api/libslurm.o -ldl
sattach_LDADD = \
- $(convenience_libs)
+ $(convenience_libs)
sattach_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
diff --git a/src/sattach/Makefile.in b/src/sattach/Makefile.in
index 71fd991d5250570dbe667c532baad3058bb1f3d7..23165fe104f8866b6d3f093cc36e84409cf90df3 100644
--- a/src/sattach/Makefile.in
+++ b/src/sattach/Makefile.in
@@ -293,16 +293,16 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir)
sattach_SOURCES = \
attach.c attach.h \
opt.c opt.h \
sattach.c \
- sattach.wrapper.c
+ sattach.wrapper.c
convenience_libs = $(top_builddir)/src/api/libslurm.o -ldl
sattach_LDADD = \
- $(convenience_libs)
+ $(convenience_libs)
sattach_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
all: all-am
diff --git a/src/sattach/attach.c b/src/sattach/attach.c
index 89c9caf92f8d5a1ff5c28532ab36fd4c3dcd354e..31f9f28d6c61f431b8dc018cc49aa1e75f30d1a5 100644
--- a/src/sattach/attach.c
+++ b/src/sattach/attach.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <grondona1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -59,10 +59,10 @@ char *totalview_jobid;
void MPIR_Breakpoint(void)
{
- /*
- * This just notifies parallel debugger that some event of
+ /*
+ * This just notifies parallel debugger that some event of
* interest occurred.
- */
+ */
debug("In MPIR_Breakpoint");
}
diff --git a/src/sattach/attach.h b/src/sattach/attach.h
index 7d3c396a90f7b91b69f7ec726c5db525b270b174..56c96f26492626cfd03b0c2febc76237dd384c18 100644
--- a/src/sattach/attach.h
+++ b/src/sattach/attach.h
@@ -1,8 +1,8 @@
/****************************************************************************\
* attach.h - definitions needed for TotalView interactions
*****************************************************************************
- * This file was supplied by James Cownie <jcownie@etnus.com> and provides
- * information required to interface Slurm to the TotalView debugger from
+ * This file was supplied by James Cownie <jcownie@etnus.com> and provides
+ * information required to interface Slurm to the TotalView debugger from
* the Etnus Corporation. For more information about TotalView, see
* http://www.etnus.com/
\*****************************************************************************/
@@ -51,7 +51,7 @@ typedef struct {
extern MPIR_PROCDESC *MPIR_proctable;
extern int MPIR_proctable_size;
-/* Various global variables which a debugger can use for
+/* Various global variables which a debugger can use for
* 1) finding out what the state of the program is at
* the time the magic breakpoint is hit.
* 2) inform the process that it has been attached to and is
@@ -62,9 +62,9 @@ extern VOLATILE int MPIR_debug_gate;
extern int MPIR_being_debugged; /* Cause extra info on internal state
* to be maintained
*/
-
+
/* Values for the debug_state, this seems to be all we need at the moment
- * but that may change...
+ * but that may change...
*/
#define MPIR_DEBUG_SPAWNED 1
#define MPIR_DEBUG_ABORTING 2
@@ -77,6 +77,6 @@ extern void MPIR_Breakpoint(void);
/* Value for totalview %J expansion in bulk launch string
*/
-extern char *totalview_jobid;
+extern char *totalview_jobid;
#endif
diff --git a/src/sattach/opt.c b/src/sattach/opt.c
index 671577f6588523e993e44e28e91064613c1aac09..ab5aa66c1c85d45c1913c5d2e353dc1d1e55cef5 100644
--- a/src/sattach/opt.c
+++ b/src/sattach/opt.c
@@ -6,21 +6,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <grondona1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -167,7 +167,7 @@ static void argerror(const char *msg, ...)
* Get a POSITIVE decimal integer from arg.
*
* Returns the integer on success, exits program on failure.
- *
+ *
*/
static int
_get_pos_int(const char *arg, const char *what)
@@ -214,7 +214,7 @@ static void _opt_default()
opt.euid = (uid_t) -1;
opt.egid = (gid_t) -1;
-
+
opt.labelio = false;
opt.ctrl_comm_ifhn = xshort_hostname();
memcpy(&opt.fds, &fds, sizeof(fds));
@@ -231,8 +231,8 @@ static void _opt_default()
/*---[ env var processing ]-----------------------------------------------*/
/*
- * try to use a similar scheme as popt.
- *
+ * try to use a similar scheme as popt.
+ *
* in order to add a new env var (to be processed like an option):
*
* define a new entry into env_vars[], if the option is a simple int
@@ -262,7 +262,7 @@ static void _opt_env(void)
env_vars_t *e = env_vars;
while (e->var) {
- if ((val = getenv(e->var)) != NULL)
+ if ((val = getenv(e->var)) != NULL)
_process_env_var(e, val);
e++;
}
@@ -305,11 +305,11 @@ void set_options(const int argc, char **argv)
char *opt_string = "+hlQuvV";
opt.progname = xbasename(argv[0]);
- optind = 0;
+ optind = 0;
while((opt_char = getopt_long(argc, argv, opt_string,
long_options, &option_index)) != -1) {
switch (opt_char) {
-
+
case '?':
fprintf(stderr, "Try \"sattach --help\" for more "
"information\n");
@@ -437,7 +437,7 @@ static void _opt_args(int argc, char **argv)
exit(error_exit);
}
-/*
+/*
* _opt_verify : perform some post option processing verification
*
*/
diff --git a/src/sattach/opt.h b/src/sattach/opt.h
index d5af888b8649722a8665f470d407f8f56696da55..db9dca01ebb469e4414b85a6480c76e4efd4832c 100644
--- a/src/sattach/opt.h
+++ b/src/sattach/opt.h
@@ -7,21 +7,21 @@
* Written by Mark Grondona <grondona1@llnl.gov>,
* Christopher J. Morrone <morrone2@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -50,7 +50,7 @@
extern int _verbose;
typedef struct sbatch_options {
- char *progname; /* argv[0] of this program or
+ char *progname; /* argv[0] of this program or
* configuration file if multi_prog */
char user[MAX_USERNAME];/* local username */
uid_t uid; /* local uid */
diff --git a/src/sattach/sattach.c b/src/sattach/sattach.c
index 6d18b1484bbe4245c07aee153c69464ebc03f803..d98042cc0fd6d5098f96e5ea378cbd8ac587f37e 100644
--- a/src/sattach/sattach.c
+++ b/src/sattach/sattach.c
@@ -6,21 +6,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Christopher J. Morrone <morrone2@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -67,7 +67,7 @@ static void _mpir_cleanup(void);
static void _mpir_dump_proctable(void);
static void print_layout_info(slurm_step_layout_t *layout);
static slurm_cred_t *_generate_fake_cred(uint32_t jobid, uint32_t stepid,
- uid_t uid, char *nodelist,
+ uid_t uid, char *nodelist,
uint32_t node_cnt);
static uint32_t _nodeid_from_layout(slurm_step_layout_t *layout,
uint32_t taskid);
@@ -154,7 +154,7 @@ int sattach(int argc, char *argv[])
fake_cred = _generate_fake_cred(opt.jobid, opt.stepid,
opt.uid, layout->node_list,
layout->node_cnt);
-
+
mts = _msg_thr_create(layout->node_cnt, layout->task_cnt);
io = client_io_handler_create(opt.fds, layout->task_cnt,
@@ -166,7 +166,7 @@ int sattach(int argc, char *argv[])
mts->num_resp_port, mts->resp_port,
io->num_listen, io->listenport,
mts->tasks_started);
-
+
MPIR_debug_state = MPIR_DEBUG_SPAWNED;
MPIR_Breakpoint();
if (opt.debugger_test)
@@ -318,7 +318,7 @@ void _handle_response_msg_list(List other_nodes_resp, bitstr_t *tasks_started)
ret_data_info->data);
debug("Attach returned msg_rc=%d err=%d type=%d",
msg_rc, ret_data_info->err, ret_data_info->type);
- if (msg_rc != SLURM_SUCCESS)
+ if (msg_rc != SLURM_SUCCESS)
errno = ret_data_info->err;
_handle_response_msg(ret_data_info->type,
ret_data_info->data,
@@ -348,7 +348,7 @@ static int _attach_to_tasks(uint32_t jobid,
reattach_tasks_request_msg_t reattach_msg;
slurm_msg_t_init(&msg);
-
+
timeout = slurm_get_msg_timeout() * 1000; /* sec to msec */
reattach_msg.job_id = jobid;
@@ -361,8 +361,8 @@ static int _attach_to_tasks(uint32_t jobid,
msg.msg_type = REQUEST_REATTACH_TASKS;
msg.data = &reattach_msg;
-
- nodes_resp = slurm_send_recv_msgs(layout->node_list, &msg,
+
+ nodes_resp = slurm_send_recv_msgs(layout->node_list, &msg,
timeout, false);
if (nodes_resp == NULL) {
error("slurm_send_recv_msgs failed: %m");
@@ -371,7 +371,7 @@ static int _attach_to_tasks(uint32_t jobid,
_handle_response_msg_list(nodes_resp, tasks_started);
list_destroy(nodes_resp);
-
+
return SLURM_SUCCESS;
}
@@ -480,7 +480,7 @@ _launch_handler(message_thread_state_t *mts, slurm_msg_t *resp)
}
-static void
+static void
_exit_handler(message_thread_state_t *mts, slurm_msg_t *exit_msg)
{
task_exit_msg_t *msg = (task_exit_msg_t *) exit_msg->data;
@@ -532,14 +532,14 @@ _handle_msg(void *arg, slurm_msg_t *msg)
static uid_t slurm_uid;
static bool slurm_uid_set = false;
uid_t uid = getuid();
-
+
if (!slurm_uid_set) {
slurm_uid = slurm_get_slurm_user_id();
slurm_uid_set = true;
}
if ((req_uid != slurm_uid) && (req_uid != 0) && (req_uid != uid)) {
- error ("Security violation, slurm message from uid %u",
+ error ("Security violation, slurm message from uid %u",
(unsigned int) req_uid);
return;
}
@@ -609,4 +609,4 @@ _mpir_dump_proctable()
i, tv->host_name, tv->pid, tv->executable_name);
}
}
-
+
diff --git a/src/sattach/sattach.wrapper.c b/src/sattach/sattach.wrapper.c
index 9505043845a45ca480e48a6e17a55241f89ac56c..c49cf6ef396e97c021cc72dc7d6f43dd26a6399a 100644
--- a/src/sattach/sattach.wrapper.c
+++ b/src/sattach/sattach.wrapper.c
@@ -1,9 +1,9 @@
-/*
+/*
* sattach.wrapper.c - sattach command wrapper for use with debuggers
- * sattach is a SLURM command that can be used to attach to an
+ * sattach is a SLURM command that can be used to attach to an
* active parallel job
*
- * For TotalView, a parallel job debugger from
+ * For TotalView, a parallel job debugger from
* TotalView Technologies, LLC <http://www.TotalViewTech.com>
* Type "<ctrl-a>" to specify arguments for sattach
* Type "g" to start the program
diff --git a/src/sbatch/Makefile.am b/src/sbatch/Makefile.am
index d9b382f1bad2e1217f14f3301ad01b358847f176..bd1159dc0a619da9fbd4cf6828f8a8e27880e739 100644
--- a/src/sbatch/Makefile.am
+++ b/src/sbatch/Makefile.am
@@ -3,7 +3,7 @@
AUTOMAKE_OPTIONS = foreign
CLEANFILES = core.*
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir)
bin_PROGRAMS = sbatch
@@ -11,7 +11,7 @@ sbatch_SOURCES = sbatch.c opt.c opt.h
convenience_libs = $(top_builddir)/src/api/libslurm.o -ldl
-sbatch_LDADD = $(convenience_libs)
+sbatch_LDADD = $(convenience_libs)
sbatch_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
diff --git a/src/sbatch/Makefile.in b/src/sbatch/Makefile.in
index 53dfd6402ea25763723946192adc41b6731a0edb..dcb24478b8da5657c7e5e6103326ebd041d98080 100644
--- a/src/sbatch/Makefile.in
+++ b/src/sbatch/Makefile.in
@@ -293,10 +293,10 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
CLEANFILES = core.*
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir)
sbatch_SOURCES = sbatch.c opt.c opt.h
convenience_libs = $(top_builddir)/src/api/libslurm.o -ldl
-sbatch_LDADD = $(convenience_libs)
+sbatch_LDADD = $(convenience_libs)
sbatch_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
all: all-am
diff --git a/src/sbatch/opt.c b/src/sbatch/opt.c
index 70d9377e8d7776bcb4bf58a07fdfab2e4dcc1e70..d76233b26b6e6135ba61ad72c327672af1675d30 100644
--- a/src/sbatch/opt.c
+++ b/src/sbatch/opt.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <grondona1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -229,7 +229,7 @@ static void argerror(const char *msg, ...)
#endif /* USE_ARGERROR */
/*
- * If the node list supplied is a file name, translate that into
+ * If the node list supplied is a file name, translate that into
* a list of nodes, we orphan the data pointed to
* RET true if the node list is a valid one
*/
@@ -239,9 +239,9 @@ static bool _valid_node_list(char **node_list_pptr)
/* If we are using Arbitrary and we specified the number of
procs to use then we need exactly this many since we are
- saying, lay it out this way! Same for max and min nodes.
+ saying, lay it out this way! Same for max and min nodes.
Other than that just read in as many in the hostfile */
- if(opt.nprocs_set)
+ if(opt.nprocs_set)
count = opt.nprocs;
else if(opt.nodes_set) {
if(opt.max_nodes)
@@ -283,7 +283,7 @@ static void _opt_default()
opt.nprocs = 1;
opt.nprocs_set = false;
- opt.cpus_per_task = 1;
+ opt.cpus_per_task = 1;
opt.cpus_set = false;
opt.min_nodes = 0;
opt.max_nodes = 0;
@@ -344,7 +344,7 @@ static void _opt_default()
opt.euid = (uid_t) -1;
opt.egid = (gid_t) -1;
-
+
opt.propagate = NULL; /* propagate specific rlimits */
opt.ifname = xstrdup("/dev/null");
@@ -407,8 +407,8 @@ static void _set_distribution(task_dist_states_t distribution,
/*---[ env var processing ]-----------------------------------------------*/
/*
- * try to use a similar scheme as popt.
- *
+ * try to use a similar scheme as popt.
+ *
* in order to add a new env var (to be processed like an option):
*
* define a new entry into env_vars[], if the option is a simple int
@@ -471,7 +471,7 @@ static void _opt_env()
env_vars_t *e = env_vars;
while (e->var) {
- if ((val = getenv(e->var)) != NULL)
+ if ((val = getenv(e->var)) != NULL)
_process_env_var(e, val);
e++;
}
@@ -496,7 +496,7 @@ _process_env_var(env_vars_t *e, const char *val)
if (val != NULL) {
*((int *) e->arg) = (int) strtol(val, &end, 10);
if (!(end && *end == '\0')) {
- error("%s=%s invalid. ignoring...",
+ error("%s=%s invalid. ignoring...",
e->var, val);
}
}
@@ -523,7 +523,7 @@ _process_env_var(env_vars_t *e, const char *val)
case OPT_DEBUG:
if (val != NULL) {
opt.verbose = (int) strtol(val, &end, 10);
- if (!(end && *end == '\0'))
+ if (!(end && *end == '\0'))
error("%s=%s invalid", e->var, val);
}
break;
@@ -541,15 +541,15 @@ _process_env_var(env_vars_t *e, const char *val)
break;
case OPT_DISTRIB:
- opt.distribution = verify_dist_type(optarg,
+ opt.distribution = verify_dist_type(optarg,
&opt.plane_size);
if (opt.distribution == SLURM_DIST_UNKNOWN)
error("distribution type `%s' is invalid", optarg);
break;
case OPT_NODES:
- opt.nodes_set = verify_node_count( val,
- &opt.min_nodes,
+ opt.nodes_set = verify_node_count( val,
+ &opt.min_nodes,
&opt.max_nodes );
if (opt.nodes_set == false) {
error("\"%s=%s\" -- invalid node count. ignoring...",
@@ -560,7 +560,7 @@ _process_env_var(env_vars_t *e, const char *val)
case OPT_CONN_TYPE:
opt.conn_type = verify_conn_type(val);
break;
-
+
case OPT_NO_ROTATE:
opt.no_rotate = true;
break;
@@ -601,7 +601,7 @@ _process_env_var(env_vars_t *e, const char *val)
opt.wckey = xstrdup(optarg);
break;
case OPT_SIGNAL:
- if (get_signal_opts(optarg, &opt.warn_signal,
+ if (get_signal_opts(optarg, &opt.warn_signal,
&opt.warn_time)) {
error("Invalid signal specification: %s", optarg);
exit(error_exit);
@@ -803,7 +803,7 @@ char *process_options_first_pass(int argc, char **argv)
if ((fullpath = search_path(opt.cwd, cmd, true, mode))) {
xfree(opt.script_argv[0]);
opt.script_argv[0] = fullpath;
- }
+ }
return opt.script_argv[0];
} else {
@@ -870,7 +870,7 @@ static char *_next_line(const void *buf, int size, void **state)
ptr = current = (char *)*state;
while ((*ptr != '\n') && (ptr < ((char *)buf+size)))
ptr++;
-
+
line = xstrndup(current, (ptr-current));
/*
@@ -912,7 +912,7 @@ _get_argument(const char *file, int lineno, const char *line, int *skipped)
if (*ptr == '\0')
return NULL;
-
+
/* copy argument into "argument" buffer, */
i = 0;
while ((quoted || !isspace(*ptr)) && *ptr != '\n' && *ptr != '\0') {
@@ -1113,7 +1113,7 @@ static void _set_options(int argc, char **argv)
break;
case 'c':
opt.cpus_set = true;
- opt.cpus_per_task =
+ opt.cpus_per_task =
_get_int(optarg, "cpus-per-task");
break;
case 'C':
@@ -1178,26 +1178,26 @@ static void _set_options(int argc, char **argv)
opt.licenses = xstrdup(optarg);
break;
case 'm':
- opt.distribution = verify_dist_type(optarg,
+ opt.distribution = verify_dist_type(optarg,
&opt.plane_size);
if (opt.distribution == SLURM_DIST_UNKNOWN) {
- error("distribution type `%s' "
+ error("distribution type `%s' "
"is not recognized", optarg);
exit(error_exit);
- }
+ }
break;
case 'n':
opt.nprocs_set = true;
- opt.nprocs =
+ opt.nprocs =
_get_int(optarg, "number of tasks");
break;
case 'N':
- opt.nodes_set =
- verify_node_count(optarg,
+ opt.nodes_set =
+ verify_node_count(optarg,
&opt.min_nodes,
&opt.max_nodes);
if (opt.nodes_set == false) {
- error("invalid node count `%s'",
+ error("invalid node count `%s'",
optarg);
exit(error_exit);
}
@@ -1282,7 +1282,7 @@ static void _set_options(int argc, char **argv)
case LONG_OPT_MINCPU:
opt.mincpus = _get_int(optarg, "mincpus");
if (opt.mincpus < 0) {
- error("invalid mincpus constraint %s",
+ error("invalid mincpus constraint %s",
optarg);
exit(error_exit);
}
@@ -1290,10 +1290,10 @@ static void _set_options(int argc, char **argv)
case LONG_OPT_MINCORES:
verbose("mincores option has been deprecated, use "
"cores-per-socket");
- opt.min_cores_per_socket = _get_int(optarg,
+ opt.min_cores_per_socket = _get_int(optarg,
"mincores");
if (opt.min_cores_per_socket < 0) {
- error("invalid mincores constraint %s",
+ error("invalid mincores constraint %s",
optarg);
exit(error_exit);
}
@@ -1301,10 +1301,10 @@ static void _set_options(int argc, char **argv)
case LONG_OPT_MINSOCKETS:
verbose("minsockets option has been deprecated, use "
"sockets-per-node");
- opt.min_sockets_per_node = _get_int(optarg,
+ opt.min_sockets_per_node = _get_int(optarg,
"minsockets");
if (opt.min_sockets_per_node < 0) {
- error("invalid minsockets constraint %s",
+ error("invalid minsockets constraint %s",
optarg);
exit(error_exit);
}
@@ -1312,10 +1312,10 @@ static void _set_options(int argc, char **argv)
case LONG_OPT_MINTHREADS:
verbose("minthreads option has been deprecated, use "
"threads-per-core");
- opt.min_threads_per_core = _get_int(optarg,
+ opt.min_threads_per_core = _get_int(optarg,
"minthreads");
if (opt.min_threads_per_core < 0) {
- error("invalid minthreads constraint %s",
+ error("invalid minthreads constraint %s",
optarg);
exit(error_exit);
}
@@ -1323,7 +1323,7 @@ static void _set_options(int argc, char **argv)
case LONG_OPT_MEM:
opt.realmem = (int) str_to_bytes(optarg);
if (opt.realmem < 0) {
- error("invalid memory constraint %s",
+ error("invalid memory constraint %s",
optarg);
exit(error_exit);
}
@@ -1331,7 +1331,7 @@ static void _set_options(int argc, char **argv)
case LONG_OPT_MEM_PER_CPU:
opt.mem_per_cpu = (int) str_to_bytes(optarg);
if (opt.mem_per_cpu < 0) {
- error("invalid memory constraint %s",
+ error("invalid memory constraint %s",
optarg);
exit(error_exit);
}
@@ -1453,7 +1453,7 @@ static void _set_options(int argc, char **argv)
opt.ntasks_per_node);
break;
case LONG_OPT_NTASKSPERSOCKET:
- opt.ntasks_per_socket = _get_int(optarg,
+ opt.ntasks_per_socket = _get_int(optarg,
"ntasks-per-socket");
setenvf(NULL, "SLURM_NTASKS_PER_SOCKET", "%d",
opt.ntasks_per_socket);
@@ -1533,7 +1533,7 @@ static void _set_options(int argc, char **argv)
opt.ckpt_dir = xstrdup(optarg);
break;
case LONG_OPT_SIGNAL:
- if (get_signal_opts(optarg, &opt.warn_signal,
+ if (get_signal_opts(optarg, &opt.warn_signal,
&opt.warn_time)) {
error("Invalid signal specification: %s",
optarg);
@@ -1579,7 +1579,7 @@ static void _proc_get_user_env(char *optarg)
static void _set_pbs_options(int argc, char **argv)
{
int opt_char, option_index = 0;
-
+
char *pbs_opt_string = "+a:A:c:C:e:hIj:k:l:m:M:N:o:p:q:r:S:u:v:VWz";
struct option pbs_long_options[] = {
@@ -1616,7 +1616,7 @@ static void _set_pbs_options(int argc, char **argv)
!= -1) {
switch (opt_char) {
case 'a':
- opt.begin = parse_time(optarg, 0);
+ opt.begin = parse_time(optarg, 0);
break;
case 'A':
xfree(opt.account);
@@ -1718,12 +1718,12 @@ static char *_get_pbs_node_name(char *node_options, int *i)
int start = (*i);
char *value = NULL;
- while(node_options[*i]
+ while(node_options[*i]
&& node_options[*i] != '+'
- && node_options[*i] != ':')
+ && node_options[*i] != ':')
(*i)++;
- value = xmalloc((*i)-start+1);
+ value = xmalloc((*i)-start+1);
memcpy(value, node_options+start, (*i)-start);
if(node_options[*i])
@@ -1734,9 +1734,9 @@ static char *_get_pbs_node_name(char *node_options, int *i)
static void _get_next_pbs_node_part(char *node_options, int *i)
{
- while(node_options[*i]
+ while(node_options[*i]
&& node_options[*i] != '+'
- && node_options[*i] != ':')
+ && node_options[*i] != ':')
(*i)++;
if(node_options[*i])
(*i)++;
@@ -1763,18 +1763,18 @@ static void _parse_pbs_nodes_opts(char *node_opts)
temp = _get_pbs_node_name(node_opts, &i);
hostlist_push(hl, temp);
xfree(temp);
- } else
+ } else
i++;
-
+
}
- if(!node_cnt)
+ if(!node_cnt)
node_cnt = 1;
else {
opt.nodes_set = true;
opt.min_nodes = opt.max_nodes = node_cnt;
}
-
+
if(ppn) {
ppn *= node_cnt;
opt.nprocs_set = true;
@@ -1798,7 +1798,7 @@ static void _parse_pbs_nodes_opts(char *node_opts)
static void _get_next_pbs_option(char *pbs_options, int *i)
{
- while(pbs_options[*i] && pbs_options[*i] != ',')
+ while(pbs_options[*i] && pbs_options[*i] != ',')
(*i)++;
if(pbs_options[*i])
(*i)++;
@@ -1809,9 +1809,9 @@ static char *_get_pbs_option_value(char *pbs_options, int *i)
int start = (*i);
char *value = NULL;
- while(pbs_options[*i] && pbs_options[*i] != ',')
+ while(pbs_options[*i] && pbs_options[*i] != ',')
(*i)++;
- value = xmalloc((*i)-start+1);
+ value = xmalloc((*i)-start+1);
memcpy(value, pbs_options+start, (*i)-start);
if(pbs_options[*i])
@@ -1949,12 +1949,12 @@ static void _parse_pbs_resource_list(char *rl)
xfree(opt.time_limit_str);
opt.time_limit_str = xstrdup(temp);
xfree(temp);
- } else
+ } else
i++;
}
}
-/*
+/*
* _opt_verify : perform some post option processing verification
*
*/
@@ -1992,7 +1992,7 @@ static bool _opt_verify(void)
verified = false;
}
- if ((opt.min_nodes < 0) || (opt.max_nodes < 0) ||
+ if ((opt.min_nodes < 0) || (opt.max_nodes < 0) ||
(opt.max_nodes && (opt.min_nodes > opt.max_nodes))) {
error("invalid number of nodes (-N %d-%d)\n",
opt.min_nodes, opt.max_nodes);
@@ -2036,10 +2036,10 @@ static bool _opt_verify(void)
opt.realmem = opt.mem_per_cpu;
}
}
-
+
/* Check to see if user has specified enough resources to
* satisfy the plane distribution with the specified
- * plane_size.
+ * plane_size.
* if (n/plane_size < N) and ((N-1) * plane_size >= n) -->
* problem Simple check will not catch all the problem/invalid
* cases.
@@ -2047,13 +2047,13 @@ static bool _opt_verify(void)
* environment are more extensive and are documented in the
* SLURM reference guide. */
if (opt.distribution == SLURM_DIST_PLANE && opt.plane_size) {
- if ((opt.min_nodes <= 0) ||
+ if ((opt.min_nodes <= 0) ||
((opt.nprocs/opt.plane_size) < opt.min_nodes)) {
if (((opt.min_nodes-1)*opt.plane_size) >= opt.nprocs) {
#if(0)
info("Too few processes ((n/plane_size) %d < N %d) "
"and ((N-1)*(plane_size) %d >= n %d)) ",
- opt.nprocs/opt.plane_size, opt.min_nodes,
+ opt.nprocs/opt.plane_size, opt.min_nodes,
(opt.min_nodes-1)*opt.plane_size, opt.nprocs);
#endif
error("Too few processes for the requested "
@@ -2064,13 +2064,13 @@ static bool _opt_verify(void)
}
_set_distribution(opt.distribution, &dist, &lllp_dist);
- if(dist)
+ if(dist)
if (setenvf(NULL, "SLURM_DISTRIBUTION", "%s", dist)) {
error("Can't set SLURM_DISTRIBUTION env variable");
}
-
+
if(opt.distribution == SLURM_DIST_PLANE)
- if (setenvf(NULL, "SLURM_DIST_PLANESIZE", "%d",
+ if (setenvf(NULL, "SLURM_DIST_PLANESIZE", "%d",
opt.plane_size)) {
error("Can't set SLURM_DIST_PLANESIZE env variable");
}
@@ -2080,7 +2080,7 @@ static bool _opt_verify(void)
error("Can't set SLURM_DIST_LLLP env variable");
}
- /* bound threads/cores from ntasks_cores/sockets */
+ /* bound threads/cores from ntasks_cores/sockets */
if (opt.ntasks_per_core > 0) {
/* if cpu_bind_type doesn't already have a auto pref,
* choose the level based on the level of ntasks
@@ -2103,8 +2103,8 @@ static bool _opt_verify(void)
}
/* massage the numbers */
- if ((opt.nodes_set || opt.extra_set) &&
- ((opt.min_nodes == opt.max_nodes) || (opt.max_nodes == 0)) &&
+ if ((opt.nodes_set || opt.extra_set) &&
+ ((opt.min_nodes == opt.max_nodes) || (opt.max_nodes == 0)) &&
!opt.nprocs_set) {
/* 1 proc / node default */
opt.nprocs = MAX(opt.min_nodes, 1);
@@ -2125,17 +2125,17 @@ static bool _opt_verify(void)
} else if (opt.nodes_set && opt.nprocs_set) {
- /*
- * make sure # of procs >= min_nodes
+ /*
+ * make sure # of procs >= min_nodes
*/
if (opt.nprocs < opt.min_nodes) {
- info ("Warning: can't run %d processes on %d "
- "nodes, setting nnodes to %d",
+ info ("Warning: can't run %d processes on %d "
+ "nodes, setting nnodes to %d",
opt.nprocs, opt.min_nodes, opt.nprocs);
opt.min_nodes = opt.nprocs;
- if ( opt.max_nodes
+ if ( opt.max_nodes
&& (opt.min_nodes > opt.max_nodes) )
opt.max_nodes = opt.min_nodes;
}
@@ -2171,21 +2171,21 @@ static bool _opt_verify(void)
/* set up the proc and node counts based on the arbitrary list
of nodes */
if((opt.distribution == SLURM_DIST_ARBITRARY)
- && (!opt.nodes_set || !opt.nprocs_set)) {
+ && (!opt.nodes_set || !opt.nprocs_set)) {
hostlist_t hl = hostlist_create(opt.nodelist);
if(!opt.nprocs_set) {
opt.nprocs_set = 1;
opt.nprocs = hostlist_count(hl);
- }
+ }
if(!opt.nodes_set) {
opt.nodes_set = 1;
hostlist_uniq(hl);
- opt.min_nodes = opt.max_nodes
+ opt.min_nodes = opt.max_nodes
= hostlist_count(hl);
}
hostlist_destroy(hl);
- }
-
+ }
+
if (opt.time_limit_str) {
opt.time_limit = time_str2mins(opt.time_limit_str);
if ((opt.time_limit < 0) && (opt.time_limit != INFINITE)) {
@@ -2198,17 +2198,17 @@ static bool _opt_verify(void)
if (opt.ckpt_interval_str) {
opt.ckpt_interval = time_str2mins(opt.ckpt_interval_str);
- if ((opt.ckpt_interval < 0) &&
+ if ((opt.ckpt_interval < 0) &&
(opt.ckpt_interval != INFINITE)) {
error("Invalid checkpoint interval specification");
exit(error_exit);
}
}
- if ((opt.euid != (uid_t) -1) && (opt.euid != opt.uid))
+ if ((opt.euid != (uid_t) -1) && (opt.euid != opt.uid))
opt.uid = opt.euid;
- if ((opt.egid != (gid_t) -1) && (opt.egid != opt.gid))
+ if ((opt.egid != (gid_t) -1) && (opt.egid != opt.gid))
opt.gid = opt.egid;
if (opt.immediate) {
@@ -2232,7 +2232,7 @@ static bool _opt_verify(void)
setenvfs("SLURM_JOB_DEPENDENCY=%s", opt.dependency);
if (opt.acctg_freq >= 0)
- setenvf(NULL, "SLURM_ACCTG_FREQ", "%d", opt.acctg_freq);
+ setenvf(NULL, "SLURM_ACCTG_FREQ", "%d", opt.acctg_freq);
#ifdef HAVE_AIX
if (opt.network == NULL)
@@ -2247,7 +2247,7 @@ static bool _opt_verify(void)
char tmp[64];
slurm_sprint_cpu_bind_type(tmp, opt.cpu_bind_type);
if (opt.cpu_bind) {
- setenvf(NULL, "SBATCH_CPU_BIND", "%s:%s",
+ setenvf(NULL, "SBATCH_CPU_BIND", "%s:%s",
tmp, opt.cpu_bind);
} else {
setenvf(NULL, "SBATCH_CPU_BIND", "%s", tmp);
@@ -2257,7 +2257,7 @@ static bool _opt_verify(void)
char tmp[64];
slurm_sprint_mem_bind_type(tmp, opt.mem_bind_type);
if (opt.mem_bind) {
- setenvf(NULL, "SBATCH_MEM_BIND", "%s:%s",
+ setenvf(NULL, "SBATCH_MEM_BIND", "%s:%s",
tmp, opt.mem_bind);
} else {
setenvf(NULL, "SBATCH_MEM_BIND", "%s", tmp);
@@ -2324,7 +2324,7 @@ extern char *spank_get_job_env(const char *name)
return NULL;
}
-extern int spank_set_job_env(const char *name, const char *value,
+extern int spank_set_job_env(const char *name, const char *value,
int overwrite)
{
int i, len;
@@ -2390,7 +2390,7 @@ extern int spank_unset_job_env(const char *name)
}
/* helper function for printing options
- *
+ *
* warning: returns pointer to memory allocated on the stack.
*/
static char *print_constraints()
@@ -2420,7 +2420,7 @@ static char *print_constraints()
if (opt.contiguous == true)
xstrcat(buf, "contiguous ");
-
+
if (opt.nodelist != NULL)
xstrfmtcat(buf, "nodelist=%s ", opt.nodelist);
@@ -2437,7 +2437,7 @@ static char *print_constraints()
* Get a decimal integer from arg.
*
* Returns the integer on success, exits program on failure.
- *
+ *
*/
static int
_get_int(const char *arg, const char *what)
@@ -2499,7 +2499,7 @@ static void _opt_list()
info("nodes : %d %s", opt.min_nodes,
opt.nodes_set ? "(set)" : "(default)");
}
- info("jobid : %u %s", opt.jobid,
+ info("jobid : %u %s", opt.jobid,
opt.jobid_set ? "(set)" : "(default)");
info("partition : %s",
opt.partition == NULL ? "default" : opt.partition);
@@ -2568,7 +2568,7 @@ static void _opt_list()
info("ntasks-per-node : %d", opt.ntasks_per_node);
info("ntasks-per-socket : %d", opt.ntasks_per_socket);
info("ntasks-per-core : %d", opt.ntasks_per_core);
- info("cpu_bind : %s",
+ info("cpu_bind : %s",
opt.cpu_bind == NULL ? "default" : opt.cpu_bind);
info("mem_bind : %s",
opt.mem_bind == NULL ? "default" : opt.mem_bind);
@@ -2667,14 +2667,14 @@ static void _help(void)
" -w, --nodelist=hosts... request a specific list of hosts\n"
" -x, --exclude=hosts... exclude a specific list of hosts\n"
"\n"
-"Consumable resources related options:\n"
-" --exclusive allocate nodes in exclusive mode when\n"
+"Consumable resources related options:\n"
+" --exclusive allocate nodes in exclusive mode when\n"
" cpu consumable resource is enabled\n"
" --mem-per-cpu=MB maximum amount of real memory per allocated\n"
-" cpu required by the job.\n"
-" --mem >= --mem-per-cpu if --mem is specified.\n"
+" cpu required by the job.\n"
+" --mem >= --mem-per-cpu if --mem is specified.\n"
"\n"
-"Affinity/Multi-core options: (when the task/affinity plugin is enabled)\n"
+"Affinity/Multi-core options: (when the task/affinity plugin is enabled)\n"
" -B --extra-node-info=S[:C[:T]] Expands to:\n"
" --sockets-per-node=S number of sockets per node to allocate\n"
" --cores-per-socket=C number of cores per socket to allocate\n"
@@ -2716,7 +2716,7 @@ static void _help(void)
" If wanting to run in HTC mode (only for 1\n"
" midplane and below). You can use HTC_S for\n"
" SMP, HTC_D for Dual, HTC_V for\n"
-" virtual node mode, and HTC_L for Linux mode.\n"
+" virtual node mode, and HTC_L for Linux mode.\n"
" --cnload-image=path path to compute node image for bluegene block. Default if not set\n"
" --mloader-image=path path to mloader image for bluegene block. Default if not set\n"
" --ioload-image=path path to ioload image for bluegene block. Default if not set\n"
diff --git a/src/sbatch/opt.h b/src/sbatch/opt.h
index 12a818318c856525648fe0df6582279785b33dac..e843ec601fa43bd2bdb322a13edb9b43b28535c6 100644
--- a/src/sbatch/opt.h
+++ b/src/sbatch/opt.h
@@ -7,32 +7,32 @@
* Written by Mark Grondona <grondona1@llnl.gov>,
* Christopher J. Morrone <morrone2@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -77,8 +77,8 @@ typedef struct sbatch_options {
bool nprocs_set; /* true if nprocs explicitly set */
int cpus_per_task; /* --cpus-per-task=n, -c n */
bool cpus_set; /* true if cpus_per_task explicitly set */
- int min_nodes; /* --nodes=n, -N n */
- int max_nodes; /* --nodes=x-n, -N x-n */
+ int min_nodes; /* --nodes=n, -N n */
+ int max_nodes; /* --nodes=x-n, -N x-n */
bool nodes_set; /* true if nodes explicitly set */
int min_sockets_per_node; /* --sockets-per-node=n */
int min_cores_per_socket; /* --cores-per-socket=n */
@@ -98,7 +98,7 @@ typedef struct sbatch_options {
distribution; /* --distribution=, -m dist */
uint32_t plane_size; /* lllp distribution -> plane_size for
* when -m plane=<# of lllp per
- * plane> */
+ * plane> */
char *job_name; /* --job-name=, -J name */
unsigned int jobid; /* --jobid=jobid */
bool jobid_set; /* true of jobid explicitly set */
@@ -200,7 +200,7 @@ int process_options_second_pass(int argc, char *argv[], const char *file,
/* external functions available for SPANK plugins to modify the environment
* exported to the SLURM Prolog and Epilog programs */
extern char *spank_get_job_env(const char *name);
-extern int spank_set_job_env(const char *name, const char *value,
+extern int spank_set_job_env(const char *name, const char *value,
int overwrite);
extern int spank_unset_job_env(const char *name);
diff --git a/src/sbatch/sbatch.c b/src/sbatch/sbatch.c
index 4622c192b61d7db3d5c9d15ae1f98aef5302d40e..6560415096e8ca7d413674b39b2d1c259c0149bd 100644
--- a/src/sbatch/sbatch.c
+++ b/src/sbatch/sbatch.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Christopher J. Morrone <morrone2@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -127,8 +127,8 @@ int main(int argc, char *argv[])
}
if (opt.get_user_env_time < 0) {
- /* Moab does not propage the user's resource limits, so
- * slurmd determines the values at the same time that it
+ /* Moab does not propage the user's resource limits, so
+ * slurmd determines the values at the same time that it
* gets the user's default environment variables. */
(void) _set_rlimit_env();
}
@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
while (slurm_submit_batch_job(&desc, &resp) < 0) {
static char *msg;
-
+
if (errno == ESLURM_ERROR_ON_DESC_TO_RECORD_COPY)
msg = "Slurm job queue full, sleeping and retrying.";
else if (errno == ESLURM_NODES_BUSY) {
@@ -385,13 +385,13 @@ static int _set_umask_env(void)
mask = (int)umask(0);
umask(mask);
- sprintf(mask_char, "0%d%d%d",
+ sprintf(mask_char, "0%d%d%d",
((mask>>6)&07), ((mask>>3)&07), mask&07);
if (setenvf(NULL, "SLURM_UMASK", "%s", mask_char) < 0) {
error ("unable to set SLURM_UMASK in environment");
return SLURM_FAILURE;
}
- debug ("propagating UMASK=%s", mask_char);
+ debug ("propagating UMASK=%s", mask_char);
return SLURM_SUCCESS;
}
@@ -564,7 +564,7 @@ static char *script_wrap(char *command_string)
return script;
}
-/* Set SLURM_RLIMIT_* environment variables with current resource
+/* Set SLURM_RLIMIT_* environment variables with current resource
* limit values, reset RLIMIT_NOFILE to maximum possible value */
static int _set_rlimit_env(void)
{
@@ -594,7 +594,7 @@ static int _set_rlimit_env(void)
rc = SLURM_FAILURE;
continue;
}
-
+
cur = (unsigned long) rlim->rlim_cur;
snprintf(name, sizeof(name), "SLURM_RLIMIT_%s", rli->name);
if (opt.propagate && rli->propagate_flag == PROPAGATE_RLIMITS)
@@ -604,17 +604,17 @@ static int _set_rlimit_env(void)
format = "U%lu";
else
format = "%lu";
-
+
if (setenvf (NULL, name, format, cur) < 0) {
error ("unable to set %s in environment", name);
rc = SLURM_FAILURE;
continue;
}
-
+
debug ("propagating RLIMIT_%s=%lu", rli->name, cur);
}
- /*
+ /*
* Now increase NOFILE to the max available for this srun
*/
if (getrlimit (RLIMIT_NOFILE, rlim) < 0)
@@ -622,7 +622,7 @@ static int _set_rlimit_env(void)
if (rlim->rlim_cur < rlim->rlim_max) {
rlim->rlim_cur = rlim->rlim_max;
- if (setrlimit (RLIMIT_NOFILE, rlim) < 0)
+ if (setrlimit (RLIMIT_NOFILE, rlim) < 0)
return (error("Unable to increase max no. files: %m"));
}
diff --git a/src/sbcast/agent.c b/src/sbcast/agent.c
index 7f5ec4bc3a0762b59b1deb9ef34f61561efa66c5..2ea8eb6f7358eee516ea37078a6a386596acd149 100644
--- a/src/sbcast/agent.c
+++ b/src/sbcast/agent.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -92,14 +92,14 @@ static void *_agent_thread(void *args)
error("slurm_send_recv_msgs: %m");
exit(1);
}
-
+
itr = list_iterator_create(ret_list);
while ((ret_data_info = list_next(itr))) {
- msg_rc = slurm_get_return_code(ret_data_info->type,
+ msg_rc = slurm_get_return_code(ret_data_info->type,
ret_data_info->data);
if (msg_rc == SLURM_SUCCESS)
continue;
-
+
error("REQUEST_FILE_BCAST(%s): %s",
ret_data_info->node_name,
slurm_strerror(msg_rc));
@@ -142,9 +142,9 @@ extern void send_rpc(file_bcast_msg_t *bcast_msg,
fanout = MAX_THREADS;
span = set_span(sbcast_cred->node_cnt, fanout);
-
+
hl = hostlist_create(sbcast_cred->node_list);
-
+
i = 0;
while (i < sbcast_cred->node_cnt) {
int j = 0;
diff --git a/src/sbcast/opts.c b/src/sbcast/opts.c
index 083bd00d6b1f74a4f3b49b888d983e5fc69cfeee..dfab79d04378cb586feec913cf2b5c72068f175d 100644
--- a/src/sbcast/opts.c
+++ b/src/sbcast/opts.c
@@ -16,15 +16,15 @@
* 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
+ * 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
+ * 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
@@ -110,7 +110,7 @@ extern void parse_command_line(int argc, char *argv[])
long_options, &option_index)) != -1) {
switch (opt_char) {
case (int)'?':
- fprintf(stderr,
+ fprintf(stderr,
"Try \"sbcast --help\" for more information\n");
exit(1);
break;
@@ -148,12 +148,12 @@ extern void parse_command_line(int argc, char *argv[])
}
if ((argc - optind) != 2) {
- fprintf(stderr, "Need two file names, have %d names\n",
+ fprintf(stderr, "Need two file names, have %d names\n",
(argc - optind));
fprintf(stderr, "Try \"sbcast --help\" for more information\n");
exit(1);
}
-
+
params.src_fname = xstrdup(argv[optind]);
params.dst_fname = xstrdup(argv[optind+1]);
diff --git a/src/sbcast/sbcast.c b/src/sbcast/sbcast.c
index 470c167500e9497b393e92cbb3138cf86f02c313..fa70eeb0ce8f3faca9a80e875949a7d696cff8be 100644
--- a/src/sbcast/sbcast.c
+++ b/src/sbcast/sbcast.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
/* validate the source file */
if ((fd = open(params.src_fname, O_RDONLY)) < 0) {
- error("Can't open `%s`: %s", params.src_fname,
+ error("Can't open `%s`: %s", params.src_fname,
strerror(errno));
exit(1);
}
@@ -143,7 +143,7 @@ static void _get_job_info(void)
* we need to preserve and use most of the information later */
}
-/* load a buffer with data from the file to broadcast,
+/* load a buffer with data from the file to broadcast,
* return number of bytes read, zero on end of file */
static ssize_t _get_block(char *buffer, size_t buf_size)
{
@@ -153,7 +153,7 @@ static ssize_t _get_block(char *buffer, size_t buf_size)
if (!fd) {
fd = open(params.src_fname, O_RDONLY);
if (!fd) {
- error("Can't open `%s`: %s",
+ error("Can't open `%s`: %s",
params.src_fname, strerror(errno));
exit(1);
}
@@ -219,7 +219,7 @@ static void _bcast_file(void)
size_read += bcast_msg.block_len;
if (size_read >= f_stat.st_size)
bcast_msg.last_block = 1;
-
+
send_rpc(&bcast_msg, sbcast_cred);
if (bcast_msg.last_block)
break; /* end of file */
diff --git a/src/sbcast/sbcast.h b/src/sbcast/sbcast.h
index 2b7df77d2da4ebfc42ea1a2b94547fea09054472..e327b903a49256797d32d5b75171c3b1d9b3356a 100644
--- a/src/sbcast/sbcast.h
+++ b/src/sbcast/sbcast.h
@@ -16,15 +16,15 @@
* 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
+ * 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
+ * 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
diff --git a/src/scancel/opt.c b/src/scancel/opt.c
index d33f60180ce9fd294026cad89c830d455f1dad65..c2cfee6833c3e4f9fcc03d61f31830a416e03110 100644
--- a/src/scancel/opt.c
+++ b/src/scancel/opt.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <grondona1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * In addition, as a special exception, the copyright holders give permission
* to link the code of portions of this program with the OpenSSL library unde
- * 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
+ * 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
+ * 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.
@@ -97,7 +97,7 @@ struct signv {
{ "TTOU", SIGTTOU }
};
-/* forward declarations of static functions
+/* forward declarations of static functions
*
*/
@@ -150,7 +150,7 @@ int initialize_and_process_args(int argc, char *argv[])
}
-static uint16_t
+static uint16_t
_xlate_state_name(const char *state_name, bool env_var)
{
enum job_states i;
@@ -161,15 +161,15 @@ _xlate_state_name(const char *state_name, bool env_var)
return i;
}
}
- if ((strcasecmp(state_name,
+ if ((strcasecmp(state_name,
job_state_string(JOB_COMPLETING)) == 0) ||
- (strcasecmp(state_name,
+ (strcasecmp(state_name,
job_state_string_compact(JOB_COMPLETING)) == 0)) {
return JOB_COMPLETING;
}
- if ((strcasecmp(state_name,
+ if ((strcasecmp(state_name,
job_state_string(JOB_CONFIGURING)) == 0) ||
- (strcasecmp(state_name,
+ (strcasecmp(state_name,
job_state_string_compact(JOB_CONFIGURING)) == 0)) {
return JOB_CONFIGURING;
}
@@ -195,7 +195,7 @@ static uint16_t _xlate_signal_name(const char *signal_name)
sig_num = (uint16_t) strtol(signal_name, &end_ptr, 10);
if ((*end_ptr == '\0') || (sig_num != 0))
return sig_num;
-
+
for (i=0; i<SIZE(sig_name_num); i++) {
if (strcasecmp(sig_name_num[i].name, signal_name) == 0) {
xfree(sig_names);
@@ -206,7 +206,7 @@ static uint16_t _xlate_signal_name(const char *signal_name)
else {
xstrcat(sig_names, ",");
xstrcat(sig_names, sig_name_num[i].name);
- }
+ }
}
fprintf (stderr, "Invalid job signal: %s\n", signal_name);
fprintf (stderr, "Valid signals include: %s\n", sig_names);
@@ -331,7 +331,7 @@ static void _opt_args(int argc, char **argv)
{
int opt_char;
int option_index;
- static struct option long_options[] = {
+ static struct option long_options[] = {
{"account", required_argument, 0, 'A'},
{"batch", no_argument, 0, 'b'},
{"ctld", no_argument, 0, OPT_LONG_CTLD},
@@ -356,7 +356,7 @@ static void _opt_args(int argc, char **argv)
long_options, &option_index)) != -1) {
switch (opt_char) {
case (int)'?':
- fprintf(stderr,
+ fprintf(stderr,
"Try \"scancel --help\" for more "
"information\n");
exit(1);
@@ -456,7 +456,7 @@ _xlate_job_step_ids(char **rest)
exit (1);
}
opt.step_id[i] = tmp_l;
- } else
+ } else
opt.step_id[i] = SLURM_BATCH_SCRIPT;
if (next_str[0] != '\0') {
@@ -467,7 +467,7 @@ _xlate_job_step_ids(char **rest)
}
-/*
+/*
* opt_verify : perform some post option processing verification
*
*/
diff --git a/src/scancel/scancel.c b/src/scancel/scancel.c
index 08b0f8d22e650e828f2e0504fb2e6d89942cb3af..62ad2db748bc2e361810d99e411b870dbb01ae7e 100644
--- a/src/scancel/scancel.c
+++ b/src/scancel/scancel.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -95,7 +95,7 @@ static pthread_mutex_t num_active_threads_lock;
static pthread_cond_t num_active_threads_cond;
int
-main (int argc, char *argv[])
+main (int argc, char *argv[])
{
log_options_t log_opts = LOG_OPTS_STDERR_ONLY ;
@@ -104,8 +104,8 @@ main (int argc, char *argv[])
if (opt.verbose) {
log_opts.stderr_level += opt.verbose;
log_alter (log_opts, SYSLOG_FACILITY_DAEMON, NULL);
- }
-
+ }
+
_load_job_records();
_verify_job_ids();
@@ -127,13 +127,13 @@ main (int argc, char *argv[])
/* _load_job_records - load all job information for filtering and verification */
-static void
+static void
_load_job_records (void)
{
int error_code;
error_code = slurm_load_jobs ((time_t) NULL, &job_buffer_ptr, 1);
-
+
if (error_code) {
slurm_perror ("slurm_load_jobs error");
exit (1);
@@ -158,8 +158,8 @@ _verify_job_ids (void)
(i >= job_buffer_ptr->record_count)) &&
(opt.verbose >= 0)) {
if (opt.step_id[j] == SLURM_BATCH_SCRIPT)
- error("Kill job error on job id %u: %s",
- opt.job_id[j],
+ error("Kill job error on job id %u: %s",
+ opt.job_id[j],
slurm_strerror(ESLURM_INVALID_JOB_ID));
else
error("Kill job error on job step id %u.%u: %s",
@@ -171,7 +171,7 @@ _verify_job_ids (void)
/* _filter_job_records - filtering job information per user specification */
-static void
+static void
_filter_job_records (void)
{
int i, j;
@@ -180,7 +180,7 @@ _filter_job_records (void)
job_ptr = job_buffer_ptr->job_array ;
for (i = 0; i < job_buffer_ptr->record_count; i++) {
- if (job_ptr[i].job_id == 0)
+ if (job_ptr[i].job_id == 0)
continue;
job_base_state = job_ptr[i].job_state & JOB_STATE_BASE;
@@ -453,16 +453,16 @@ _cancel_job_id (void *ci)
}
if (error_code) {
error_code = slurm_get_errno();
- if ((opt.verbose > 0) ||
+ if ((opt.verbose > 0) ||
((error_code != ESLURM_ALREADY_DONE) &&
(error_code != ESLURM_INVALID_JOB_ID)))
- error("Kill job error on job id %u: %s",
+ error("Kill job error on job id %u: %s",
job_id, slurm_strerror(slurm_get_errno()));
}
/* Purposely free the struct passed in here, so the caller doesn't have
- * to keep track of it, but don't destroy the mutex and condition
- * variables contained. */
+ * to keep track of it, but don't destroy the mutex and condition
+ * variables contained. */
pthread_mutex_lock( cancel_info->num_active_threads_lock );
(*(cancel_info->num_active_threads))--;
pthread_cond_signal( cancel_info->num_active_threads_cond );
@@ -491,7 +491,7 @@ _cancel_step_id (void *ci)
if (sig == SIGKILL)
verbose("Terminating step %u.%u", job_id, step_id);
else {
- verbose("Signal %u to step %u.%u",
+ verbose("Signal %u to step %u.%u",
sig, job_id, step_id);
}
@@ -512,14 +512,14 @@ _cancel_step_id (void *ci)
if (error_code) {
error_code = slurm_get_errno();
if ((opt.verbose > 0) || (error_code != ESLURM_ALREADY_DONE ))
- error("Kill job error on job step id %u.%u: %s",
- job_id, step_id,
+ error("Kill job error on job step id %u.%u: %s",
+ job_id, step_id,
slurm_strerror(slurm_get_errno()));
}
/* Purposely free the struct passed in here, so the caller doesn't have
- * to keep track of it, but don't destroy the mutex and condition
- * variables contained. */
+ * to keep track of it, but don't destroy the mutex and condition
+ * variables contained. */
pthread_mutex_lock( cancel_info->num_active_threads_lock );
(*(cancel_info->num_active_threads))--;
pthread_cond_signal( cancel_info->num_active_threads_cond );
@@ -530,7 +530,7 @@ _cancel_step_id (void *ci)
}
/* _confirmation - Confirm job cancel request interactively */
-static int
+static int
_confirmation (int i, uint32_t step_id)
{
char in_line[128];
@@ -540,12 +540,12 @@ _confirmation (int i, uint32_t step_id)
job_ptr = job_buffer_ptr->job_array ;
while (1) {
if (step_id == SLURM_BATCH_SCRIPT) {
- printf ("Cancel job_id=%u name=%s partition=%s [y/n]? ",
- job_ptr[i].job_id, job_ptr[i].name,
+ printf ("Cancel job_id=%u name=%s partition=%s [y/n]? ",
+ job_ptr[i].job_id, job_ptr[i].name,
job_ptr[i].partition);
} else {
- printf ("Cancel step_id=%u.%u name=%s partition=%s [y/n]? ",
- job_ptr[i].job_id, step_id, job_ptr[i].name,
+ printf ("Cancel step_id=%u.%u name=%s partition=%s [y/n]? ",
+ job_ptr[i].job_id, step_id, job_ptr[i].name,
job_ptr[i].partition);
}
diff --git a/src/scancel/scancel.h b/src/scancel/scancel.h
index fa5f2c4e0e7327fae5c13831fef51d8087eee2d0..e7bda6f1aad8d0b0c3403b0a596864e8bc4ecbea 100644
--- a/src/scancel/scancel.h
+++ b/src/scancel/scancel.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette<jette1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/scontrol/create_res.c b/src/scontrol/create_res.c
index 781498f2525690f4e33a2e050443ccc0555067a3..9cf80631f2d3324553dd751a4ed4ec41ae495723 100644
--- a/src/scontrol/create_res.c
+++ b/src/scontrol/create_res.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by David Bremer <dbremer@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -76,7 +76,7 @@ static char * _process_plus_minus(char plus_or_minus, char *src)
/*
* _parse_flags is used to parse the Flags= option. It handles
- * daily, weekly, and maint, optionally preceded by + or -,
+ * daily, weekly, and maint, optionally preceded by + or -,
* separated by a comma but no spaces.
*/
static uint32_t _parse_flags(const char *flagstr, const char *msg)
@@ -102,33 +102,33 @@ static uint32_t _parse_flags(const char *flagstr, const char *msg)
curr += taglen;
if (flip)
outflags |= RESERVE_FLAG_NO_MAINT;
- else
+ else
outflags |= RESERVE_FLAG_MAINT;
- } else if ((strncasecmp(curr, "Overlap", MAX(taglen,1))
+ } else if ((strncasecmp(curr, "Overlap", MAX(taglen,1))
== 0) && (!flip)) {
curr += taglen;
outflags |= RESERVE_FLAG_OVERLAP;
- /* "-OVERLAP" is not supported since that's the
- * default behavior and the option only applies
+ /* "-OVERLAP" is not supported since that's the
+ * default behavior and the option only applies
* for reservation creation, not updates */
- } else if (strncasecmp(curr, "Ignore_Jobs", MAX(taglen,1))
+ } else if (strncasecmp(curr, "Ignore_Jobs", MAX(taglen,1))
== 0) {
curr += taglen;
if (flip)
outflags |= RESERVE_FLAG_NO_IGN_JOB;
- else
+ else
outflags |= RESERVE_FLAG_IGN_JOBS;
} else if (strncasecmp(curr, "Daily", MAX(taglen,1)) == 0) {
curr += taglen;
if (flip)
outflags |= RESERVE_FLAG_NO_DAILY;
- else
+ else
outflags |= RESERVE_FLAG_DAILY;
} else if (strncasecmp(curr, "Weekly", MAX(taglen,1)) == 0) {
curr += taglen;
if (flip)
outflags |= RESERVE_FLAG_NO_WEEKLY;
- else
+ else
outflags |= RESERVE_FLAG_WEEKLY;
} else {
error("Error parsing flags %s. %s", flagstr, msg);
@@ -144,21 +144,21 @@ static uint32_t _parse_flags(const char *flagstr, const char *msg)
-/*
- * scontrol_parse_res_options parse options for creating or updating a
+/*
+ * scontrol_parse_res_options parse options for creating or updating a
reservation
* IN argc - count of arguments
* IN argv - list of arguments
* IN msg - a string to append to any error message
* OUT resv_msg_ptr - struct holding reservation parameters
* OUT free_user_str - bool indicating that resv_msg_ptr->users should be freed
- * OUT free_acct_str - bool indicating that resv_msg_ptr->accounts should be
- * freed
+ * OUT free_acct_str - bool indicating that resv_msg_ptr->accounts should be
+ * freed
* RET 0 on success, -1 on err and prints message
*/
extern int
-scontrol_parse_res_options(int argc, char *argv[], const char *msg,
- resv_desc_msg_t *resv_msg_ptr,
+scontrol_parse_res_options(int argc, char *argv[], const char *msg,
+ resv_desc_msg_t *resv_msg_ptr,
int *free_user_str, int *free_acct_str)
{
int i;
@@ -195,7 +195,7 @@ scontrol_parse_res_options(int argc, char *argv[], const char *msg,
time_t t = parse_time(val, 0);
if (t == 0) {
exit_code = 1;
- error("Invalid start time %s. %s",
+ error("Invalid start time %s. %s",
argv[i], msg);
return -1;
}
@@ -235,15 +235,15 @@ scontrol_parse_res_options(int argc, char *argv[], const char *msg,
} else {
resv_msg_ptr->flags = f;
}
- } else if (strncasecmp(tag, "NodeCnt", MAX(taglen,5)) == 0 ||
+ } else if (strncasecmp(tag, "NodeCnt", MAX(taglen,5)) == 0 ||
strncasecmp(tag, "NodeCount", MAX(taglen,5)) == 0) {
char *endptr = NULL;
resv_msg_ptr->node_cnt = strtol(val, &endptr, 10);
- if (endptr == NULL || *endptr != '\0' ||
+ if (endptr == NULL || *endptr != '\0' ||
*val == '\0') {
exit_code = 1;
- error("Invalid node count %s. %s",
+ error("Invalid node count %s. %s",
argv[i], msg);
return -1;
}
@@ -256,13 +256,13 @@ scontrol_parse_res_options(int argc, char *argv[], const char *msg,
} else if (strncasecmp(tag, "Licenses", MAX(taglen, 2)) == 0) {
resv_msg_ptr->licenses = val;
- } else if (strncasecmp(tag, "PartitionName", MAX(taglen, 1))
+ } else if (strncasecmp(tag, "PartitionName", MAX(taglen, 1))
== 0) {
resv_msg_ptr->partition = val;
} else if (strncasecmp(tag, "Users", MAX(taglen, 1)) == 0) {
if (plus_minus) {
- resv_msg_ptr->users =
+ resv_msg_ptr->users =
_process_plus_minus(plus_minus, val);
*free_user_str = 1;
} else {
@@ -270,7 +270,7 @@ scontrol_parse_res_options(int argc, char *argv[], const char *msg,
}
} else if (strncasecmp(tag, "Accounts", MAX(taglen, 1)) == 0) {
if (plus_minus) {
- resv_msg_ptr->accounts =
+ resv_msg_ptr->accounts =
_process_plus_minus(plus_minus, val);
*free_acct_str = 1;
} else {
@@ -289,12 +289,12 @@ scontrol_parse_res_options(int argc, char *argv[], const char *msg,
-/*
- * scontrol_update_res - update the slurm reservation configuration per the
- * supplied arguments
+/*
+ * scontrol_update_res - update the slurm reservation configuration per the
+ * supplied arguments
* IN argc - count of arguments
* IN argv - list of arguments
- * RET 0 if no slurm error, errno otherwise. parsing error prints
+ * RET 0 if no slurm error, errno otherwise. parsing error prints
* error message and returns 0.
*/
extern int
@@ -306,7 +306,7 @@ scontrol_update_res(int argc, char *argv[])
slurm_init_resv_desc_msg (&resv_msg);
err = scontrol_parse_res_options(argc, argv, "No reservation update.",
- &resv_msg, &free_user_str,
+ &resv_msg, &free_user_str,
&free_acct_str);
if (err)
goto SCONTROL_UPDATE_RES_CLEANUP;
@@ -336,12 +336,12 @@ SCONTROL_UPDATE_RES_CLEANUP:
-/*
- * scontrol_create_res - create the slurm reservation configuration per the
- * supplied arguments
+/*
+ * scontrol_create_res - create the slurm reservation configuration per the
+ * supplied arguments
* IN argc - count of arguments
* IN argv - list of arguments
- * RET 0 if no slurm error, errno otherwise. parsing error prints
+ * RET 0 if no slurm error, errno otherwise. parsing error prints
* error message and returns 0.
*/
extern int
@@ -354,7 +354,7 @@ scontrol_create_res(int argc, char *argv[])
slurm_init_resv_desc_msg (&resv_msg);
err = scontrol_parse_res_options(argc, argv, "No reservation created.",
- &resv_msg, &free_user_str,
+ &resv_msg, &free_user_str,
&free_acct_str);
if (err)
goto SCONTROL_CREATE_RES_CLEANUP;
@@ -364,29 +364,29 @@ scontrol_create_res(int argc, char *argv[])
error("A start time must be given. No reservation created.");
goto SCONTROL_CREATE_RES_CLEANUP;
}
- if (resv_msg.end_time == (time_t)NO_VAL &&
+ if (resv_msg.end_time == (time_t)NO_VAL &&
resv_msg.duration == (uint32_t)NO_VAL) {
exit_code = 1;
error("An end time or duration must be given. "
"No reservation created.");
goto SCONTROL_CREATE_RES_CLEANUP;
}
- if (resv_msg.end_time != (time_t)NO_VAL &&
- resv_msg.duration != (uint32_t)NO_VAL &&
+ if (resv_msg.end_time != (time_t)NO_VAL &&
+ resv_msg.duration != (uint32_t)NO_VAL &&
resv_msg.start_time + resv_msg.duration*60 != resv_msg.end_time) {
exit_code = 1;
error("StartTime + Duration does not equal EndTime. "
"No reservation created.");
goto SCONTROL_CREATE_RES_CLEANUP;
}
- if (resv_msg.start_time > resv_msg.end_time &&
+ if (resv_msg.start_time > resv_msg.end_time &&
resv_msg.end_time != (time_t)NO_VAL) {
exit_code = 1;
error("Start time cannot be after end time. "
"No reservation created.");
goto SCONTROL_CREATE_RES_CLEANUP;
}
- if (resv_msg.node_cnt == NO_VAL &&
+ if (resv_msg.node_cnt == NO_VAL &&
(resv_msg.node_list == NULL || resv_msg.node_list[0] == '\0') &&
(resv_msg.licenses == NULL || resv_msg.licenses[0] == '\0')) {
exit_code = 1;
@@ -394,7 +394,7 @@ scontrol_create_res(int argc, char *argv[])
"No reservation created.");
goto SCONTROL_CREATE_RES_CLEANUP;
}
- if ((resv_msg.users == NULL || resv_msg.users[0] == '\0') &&
+ if ((resv_msg.users == NULL || resv_msg.users[0] == '\0') &&
(resv_msg.accounts == NULL || resv_msg.accounts[0] == '\0')) {
exit_code = 1;
error("Either Users or Accounts must be specified. "
@@ -413,9 +413,9 @@ scontrol_create_res(int argc, char *argv[])
}
SCONTROL_CREATE_RES_CLEANUP:
- if (free_user_str)
+ if (free_user_str)
xfree(resv_msg.users);
- if (free_acct_str)
+ if (free_acct_str)
xfree(resv_msg.accounts);
return ret;
}
diff --git a/src/scontrol/info_block.c b/src/scontrol/info_block.c
index 5f8e79b2fde41f2272873520d0a064c788253c02..799c003de36b372959a6bc7bef01871ddfd98112 100644
--- a/src/scontrol/info_block.c
+++ b/src/scontrol/info_block.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -39,7 +39,7 @@
#include "scontrol.h"
/* Load current partiton table information into *part_buffer_pptr */
-extern int
+extern int
scontrol_load_block (block_info_msg_t **block_info_pptr)
{
int error_code;
@@ -71,10 +71,10 @@ scontrol_load_block (block_info_msg_t **block_info_pptr)
/*
* scontrol_print_block - print the specified block's information
- * IN block_name - NULL to print information about all block
+ * IN block_name - NULL to print information about all block
*/
-extern void
-scontrol_print_block (char *block_name)
+extern void
+scontrol_print_block (char *block_name)
{
int error_code, i, print_cnt = 0;
block_info_msg_t *block_info_ptr = NULL;
@@ -91,9 +91,9 @@ scontrol_print_block (char *block_name)
if (quiet_flag == -1) {
char time_str[32];
slurm_make_time_str(
- (time_t *)&block_info_ptr->last_update,
+ (time_t *)&block_info_ptr->last_update,
time_str, sizeof(time_str));
- printf ("last_update_time=%s, records=%d\n",
+ printf ("last_update_time=%s, records=%d\n",
time_str, block_info_ptr->record_count);
}
@@ -113,7 +113,7 @@ scontrol_print_block (char *block_name)
if (block_name) {
exit_code = 1;
if (quiet_flag != 1)
- printf ("Block %s not found\n",
+ printf ("Block %s not found\n",
block_name);
} else if (quiet_flag != 1)
printf ("No blocks in the system\n");
diff --git a/src/scontrol/info_job.c b/src/scontrol/info_job.c
index c5bfd6067029a89ac6e97dd5afaa31fd1fe15fdc..7c44241e8ac30262b299d9b6d0c47508afa149d2 100644
--- a/src/scontrol/info_job.c
+++ b/src/scontrol/info_job.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -44,10 +44,10 @@
#include "src/common/stepd_api.h"
static bool _in_node_bit_list(int inx, int *node_list_array);
-static int _scontrol_load_jobs(job_info_msg_t ** job_buffer_pptr,
+static int _scontrol_load_jobs(job_info_msg_t ** job_buffer_pptr,
uint32_t job_id);
/*
- * Determine if a node index is in a node list pair array.
+ * Determine if a node index is in a node list pair array.
* RET - true if specified index is in the array
*/
static bool
@@ -70,8 +70,8 @@ _in_node_bit_list(int inx, int *node_list_array)
}
/* Load current job table information into *job_buffer_pptr */
-static int
-_scontrol_load_jobs(job_info_msg_t ** job_buffer_pptr, uint32_t job_id)
+static int
+_scontrol_load_jobs(job_info_msg_t ** job_buffer_pptr, uint32_t job_id)
{
int error_code;
static job_info_msg_t *old_job_info_ptr = NULL;
@@ -122,8 +122,8 @@ _scontrol_load_jobs(job_info_msg_t ** job_buffer_pptr, uint32_t job_id)
return error_code;
}
-/*
- * scontrol_pid_info - given a local process id, print the corresponding
+/*
+ * scontrol_pid_info - given a local process id, print the corresponding
* slurm job id and its expected end time
* IN job_pid - the local process id of interest
*/
@@ -158,10 +158,10 @@ scontrol_pid_info(pid_t job_pid)
}
/*
- * scontrol_print_completing - print jobs in completing state and
+ * scontrol_print_completing - print jobs in completing state and
* associated nodes in COMPLETING or DOWN state
*/
-extern void
+extern void
scontrol_print_completing (void)
{
int error_code, i;
@@ -177,7 +177,7 @@ scontrol_print_completing (void)
slurm_perror ("slurm_load_jobs error");
return;
}
- /* Must load all nodes including hidden for cross-index
+ /* Must load all nodes including hidden for cross-index
* from job's node_inx to node table to work */
/*if (all_flag) Always set this flag */
show_flags |= SHOW_ALL;
@@ -193,13 +193,13 @@ scontrol_print_completing (void)
job_info = job_info_msg->job_array;
for (i=0; i<job_info_msg->record_count; i++) {
if (job_info[i].job_state & JOB_COMPLETING)
- scontrol_print_completing_job(&job_info[i],
+ scontrol_print_completing_job(&job_info[i],
node_info_msg);
}
}
extern void
-scontrol_print_completing_job(job_info_t *job_ptr,
+scontrol_print_completing_job(job_info_t *job_ptr,
node_info_msg_t *node_info_msg)
{
int i;
@@ -213,7 +213,7 @@ scontrol_print_completing_job(job_info_t *job_ptr,
for (i=0; i<node_info_msg->record_count; i++) {
node_info = &(node_info_msg->node_array[i]);
- if (IS_NODE_COMPLETING(node_info) &&
+ if (IS_NODE_COMPLETING(node_info) &&
(_in_node_bit_list(i, job_ptr->node_inx)))
hostlist_push_host(comp_nodes, node_info->name);
else if (IS_NODE_DOWN(node_info) &&
@@ -239,8 +239,8 @@ scontrol_print_completing_job(job_info_t *job_ptr,
* scontrol_print_job - print the specified job's information
* IN job_id - job's id or NULL to print information about all jobs
*/
-extern void
-scontrol_print_job (char * job_id_str)
+extern void
+scontrol_print_job (char * job_id_str)
{
int error_code = SLURM_SUCCESS, i, print_cnt = 0;
uint32_t job_id = 0;
@@ -257,12 +257,12 @@ scontrol_print_job (char * job_id_str)
slurm_perror ("slurm_load_jobs error");
return;
}
-
+
if (quiet_flag == -1) {
char time_str[32];
- slurm_make_time_str ((time_t *)&job_buffer_ptr->last_update,
+ slurm_make_time_str ((time_t *)&job_buffer_ptr->last_update,
time_str, sizeof(time_str));
- printf ("last_update_time=%s, records=%d\n",
+ printf ("last_update_time=%s, records=%d\n",
time_str, job_buffer_ptr->record_count);
}
@@ -289,7 +289,7 @@ scontrol_print_job (char * job_id_str)
* IN job_step_id_str - job step's id or NULL to print information
* about all job steps
*/
-extern void
+extern void
scontrol_print_step (char *job_step_id_str)
{
int error_code, i;
@@ -304,7 +304,7 @@ scontrol_print_step (char *job_step_id_str)
if (job_step_id_str) {
job_id = (uint32_t) strtol (job_step_id_str, &next_str, 10);
- if (next_str[0] == '.')
+ if (next_str[0] == '.')
step_id = (uint32_t) strtol (&next_str[1], NULL, 10);
}
@@ -315,7 +315,7 @@ scontrol_print_step (char *job_step_id_str)
(last_job_id == job_id) && (last_step_id == step_id)) {
if (last_show_flags != show_flags)
old_job_step_info_ptr->last_update = (time_t) 0;
- error_code = slurm_get_job_steps (
+ error_code = slurm_get_job_steps (
old_job_step_info_ptr->last_update,
job_id, step_id, &job_step_info_ptr,
show_flags);
@@ -335,7 +335,7 @@ scontrol_print_step (char *job_step_id_str)
old_job_step_info_ptr);
old_job_step_info_ptr = NULL;
}
- error_code = slurm_get_job_steps ( (time_t) 0, job_id, step_id,
+ error_code = slurm_get_job_steps ( (time_t) 0, job_id, step_id,
&job_step_info_ptr, show_flags);
}
@@ -353,15 +353,15 @@ scontrol_print_step (char *job_step_id_str)
if (quiet_flag == -1) {
char time_str[32];
- slurm_make_time_str ((time_t *)&job_step_info_ptr->last_update,
+ slurm_make_time_str ((time_t *)&job_step_info_ptr->last_update,
time_str, sizeof(time_str));
- printf ("last_update_time=%s, records=%d\n",
+ printf ("last_update_time=%s, records=%d\n",
time_str, job_step_info_ptr->job_step_count);
}
job_step_ptr = job_step_info_ptr->job_steps ;
for (i = 0; i < job_step_info_ptr->job_step_count; i++) {
- slurm_print_job_step_info (stdout, & job_step_ptr[i],
+ slurm_print_job_step_info (stdout, & job_step_ptr[i],
one_liner ) ;
}
@@ -369,7 +369,7 @@ scontrol_print_step (char *job_step_id_str)
if (job_step_id_str) {
exit_code = 1;
if (quiet_flag != 1)
- printf ("Job step %u.%u not found\n",
+ printf ("Job step %u.%u not found\n",
job_id, step_id);
} else if (quiet_flag != 1)
printf ("No job steps in the system\n");
@@ -507,7 +507,7 @@ _list_pids_all_steps(const char *node_name, uint32_t jobid)
steps = stepd_available(NULL, node_name);
if (!steps || list_count(steps) == 0) {
fprintf(stderr, "Job %u does not exist on this node.\n", jobid);
- if (steps)
+ if (steps)
list_destroy(steps);
exit_code = 1;
return;
@@ -556,7 +556,7 @@ _list_pids_all_jobs(const char *node_name)
list_destroy(steps);
}
-/*
+/*
* scontrol_list_pids - given a slurmd job ID or job ID + step ID,
* print the process IDs of the processes each job step (or
* just the specified step ID).
@@ -625,7 +625,7 @@ _reformat_hostlist(char *hostlist)
int i, o;
for (i=0; (hostlist[i] != '\0'); i++) {
if (hostlist[i] == '\n')
- hostlist[i] = ',';
+ hostlist[i] = ',';
}
o = 0;
@@ -638,7 +638,7 @@ _reformat_hostlist(char *hostlist)
}
/*
- * scontrol_encode_hostlist - given a list of hostnames or the pathname
+ * scontrol_encode_hostlist - given a list of hostnames or the pathname
* of a file containing hostnames, translate them into a hostlist
* expression
*/
diff --git a/src/scontrol/info_node.c b/src/scontrol/info_node.c
index 56b639f56665d56f1424e2bbd43e2e0711ada8db..015509b222a28b7d440362965242d6071e372a4e 100644
--- a/src/scontrol/info_node.c
+++ b/src/scontrol/info_node.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -40,8 +40,8 @@
#include "scontrol.h"
/* Load current node table information into *node_buffer_pptr */
-extern int
-scontrol_load_nodes (node_info_msg_t ** node_buffer_pptr, uint16_t show_flags)
+extern int
+scontrol_load_nodes (node_info_msg_t ** node_buffer_pptr, uint16_t show_flags)
{
int error_code;
static node_info_msg_t *old_node_info_ptr = NULL;
@@ -51,7 +51,7 @@ scontrol_load_nodes (node_info_msg_t ** node_buffer_pptr, uint16_t show_flags)
if (old_node_info_ptr) {
if (last_show_flags != show_flags)
old_node_info_ptr->last_update = (time_t) 0;
- error_code = slurm_load_node (old_node_info_ptr->last_update,
+ error_code = slurm_load_node (old_node_info_ptr->last_update,
&node_info_ptr, show_flags);
if (error_code == SLURM_SUCCESS)
slurm_free_node_info_msg (old_node_info_ptr);
@@ -79,13 +79,13 @@ scontrol_load_nodes (node_info_msg_t ** node_buffer_pptr, uint16_t show_flags)
* scontrol_print_node - print the specified node's information
* IN node_name - NULL to print all node information
* IN node_ptr - pointer to node table of information
- * NOTE: call this only after executing load_node, called from
+ * NOTE: call this only after executing load_node, called from
* scontrol_print_node_list
- * NOTE: To avoid linear searches, we remember the location of the
+ * NOTE: To avoid linear searches, we remember the location of the
* last name match
*/
extern void
-scontrol_print_node (char *node_name, node_info_msg_t * node_buffer_ptr)
+scontrol_print_node (char *node_name, node_info_msg_t * node_buffer_ptr)
{
int i, j, print_cnt = 0;
static int last_inx = 0;
@@ -93,7 +93,7 @@ scontrol_print_node (char *node_name, node_info_msg_t * node_buffer_ptr)
for (j = 0; j < node_buffer_ptr->record_count; j++) {
if (node_name) {
i = (j + last_inx) % node_buffer_ptr->record_count;
- if (strcmp (node_name,
+ if (strcmp (node_name,
node_buffer_ptr->node_array[i].name))
continue;
} else if (node_buffer_ptr->node_array[j].name == NULL)
@@ -101,7 +101,7 @@ scontrol_print_node (char *node_name, node_info_msg_t * node_buffer_ptr)
else
i = j;
print_cnt++;
- slurm_print_node_table (stdout,
+ slurm_print_node_table (stdout,
& node_buffer_ptr->node_array[i],
node_buffer_ptr->node_scaling,
one_liner);
@@ -124,13 +124,13 @@ scontrol_print_node (char *node_name, node_info_msg_t * node_buffer_ptr)
/*
- * scontrol_print_node_list - print information about the supplied node list
+ * scontrol_print_node_list - print information about the supplied node list
* (or regular expression)
- * IN node_list - print information about the supplied node list
+ * IN node_list - print information about the supplied node list
* (or regular expression)
*/
extern void
-scontrol_print_node_list (char *node_list)
+scontrol_print_node_list (char *node_list)
{
node_info_msg_t *node_info_ptr = NULL;
hostlist_t host_list;
@@ -151,9 +151,9 @@ scontrol_print_node_list (char *node_list)
if (quiet_flag == -1) {
char time_str[32];
- slurm_make_time_str ((time_t *)&node_info_ptr->last_update,
+ slurm_make_time_str ((time_t *)&node_info_ptr->last_update,
time_str, sizeof(time_str));
- printf ("last_update_time=%s, records=%d\n",
+ printf ("last_update_time=%s, records=%d\n",
time_str, node_info_ptr->record_count);
}
@@ -173,18 +173,18 @@ scontrol_print_node_list (char *node_list)
exit_code = 1;
if (quiet_flag != 1) {
if (errno == EINVAL)
- fprintf (stderr,
- "unable to parse node list %s\n",
+ fprintf (stderr,
+ "unable to parse node list %s\n",
node_list);
else if (errno == ERANGE)
- fprintf (stderr,
- "too many nodes in supplied range %s\n",
+ fprintf (stderr,
+ "too many nodes in supplied range %s\n",
node_list);
else
perror ("error parsing node list");
}
}
- }
+ }
return;
}
@@ -213,7 +213,7 @@ extern void scontrol_print_topo (char *node_list)
for (i=0; i<topo_info_msg->record_count; i++) {
if (strcmp(topo_info_msg->topo_array[i].name, node_list))
continue;
- slurm_print_topo_record(stdout, &topo_info_msg->topo_array[i],
+ slurm_print_topo_record(stdout, &topo_info_msg->topo_array[i],
one_liner);
return;
}
@@ -221,7 +221,7 @@ extern void scontrol_print_topo (char *node_list)
/* Search for matching node name */
for (i=0; i<topo_info_msg->record_count; i++) {
if ((topo_info_msg->topo_array[i].nodes == NULL) ||
- (topo_info_msg->topo_array[i].nodes[0] == '\0'))
+ (topo_info_msg->topo_array[i].nodes[0] == '\0'))
continue;
hs = hostset_create(topo_info_msg->topo_array[i].nodes);
if (hs == NULL)
@@ -231,7 +231,7 @@ extern void scontrol_print_topo (char *node_list)
if (!match)
continue;
match_cnt++;
- slurm_print_topo_record(stdout, &topo_info_msg->topo_array[i],
+ slurm_print_topo_record(stdout, &topo_info_msg->topo_array[i],
one_liner);
}
diff --git a/src/scontrol/info_part.c b/src/scontrol/info_part.c
index e3bbe2591d0fe5e320160fc4e83c0ceced53ac78..ec9bf165c1747c37f8bf58768360f468a82595af 100644
--- a/src/scontrol/info_part.c
+++ b/src/scontrol/info_part.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -39,7 +39,7 @@
#include "scontrol.h"
/* Load current partiton table information into *part_buffer_pptr */
-extern int
+extern int
scontrol_load_partitions (partition_info_msg_t **part_buffer_pptr)
{
int error_code;
@@ -67,7 +67,7 @@ scontrol_load_partitions (partition_info_msg_t **part_buffer_pptr)
}
}
else
- error_code = slurm_load_partitions((time_t) NULL,
+ error_code = slurm_load_partitions((time_t) NULL,
&part_info_ptr, show_flags);
if (error_code == SLURM_SUCCESS) {
@@ -81,10 +81,10 @@ scontrol_load_partitions (partition_info_msg_t **part_buffer_pptr)
/*
* scontrol_print_part - print the specified partition's information
- * IN partition_name - NULL to print information about all partition
+ * IN partition_name - NULL to print information about all partition
*/
-extern void
-scontrol_print_part (char *partition_name)
+extern void
+scontrol_print_part (char *partition_name)
{
int error_code, i, print_cnt = 0;
partition_info_msg_t *part_info_ptr = NULL;
@@ -100,19 +100,19 @@ scontrol_print_part (char *partition_name)
if (quiet_flag == -1) {
char time_str[32];
- slurm_make_time_str ((time_t *)&part_info_ptr->last_update,
+ slurm_make_time_str ((time_t *)&part_info_ptr->last_update,
time_str, sizeof(time_str));
- printf ("last_update_time=%s, records=%d\n",
+ printf ("last_update_time=%s, records=%d\n",
time_str, part_info_ptr->record_count);
}
part_ptr = part_info_ptr->partition_array;
for (i = 0; i < part_info_ptr->record_count; i++) {
- if (partition_name &&
+ if (partition_name &&
strcmp (partition_name, part_ptr[i].name) != 0)
continue;
print_cnt++;
- slurm_print_partition_info (stdout, & part_ptr[i],
+ slurm_print_partition_info (stdout, & part_ptr[i],
one_liner ) ;
if (partition_name)
break;
@@ -122,7 +122,7 @@ scontrol_print_part (char *partition_name)
if (partition_name) {
exit_code = 1;
if (quiet_flag != 1)
- printf ("Partition %s not found\n",
+ printf ("Partition %s not found\n",
partition_name);
} else if (quiet_flag != 1)
printf ("No partitions in the system\n");
diff --git a/src/scontrol/info_res.c b/src/scontrol/info_res.c
index 3d76e9d8c991771255e890e13dec9de0a8a3e1ab..62584ba6de74fa75b095486fa8d9d5eb4ca0e6eb 100644
--- a/src/scontrol/info_res.c
+++ b/src/scontrol/info_res.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by David Bremer <dbremer@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -39,7 +39,7 @@
#include "scontrol.h"
/* Load current reservation table information into *res_buffer_pptr */
-extern int
+extern int
scontrol_load_reservations(reserve_info_msg_t **res_buffer_pptr)
{
int error_code;
@@ -79,8 +79,8 @@ scontrol_load_reservations(reserve_info_msg_t **res_buffer_pptr)
* scontrol_print_res - print the specified reservation's information
* IN reservation_name - NULL to print information about all reservations
*/
-extern void
-scontrol_print_res (char *reservation_name)
+extern void
+scontrol_print_res (char *reservation_name)
{
int error_code, i, print_cnt = 0;
reserve_info_msg_t *res_info_ptr = NULL;
@@ -96,19 +96,19 @@ scontrol_print_res (char *reservation_name)
if (quiet_flag == -1) {
char time_str[32];
- slurm_make_time_str ((time_t *)&res_info_ptr->last_update,
+ slurm_make_time_str ((time_t *)&res_info_ptr->last_update,
time_str, sizeof(time_str));
- printf ("last_update_time=%s, records=%d\n",
+ printf ("last_update_time=%s, records=%d\n",
time_str, res_info_ptr->record_count);
}
res_ptr = res_info_ptr->reservation_array;
for (i = 0; i < res_info_ptr->record_count; i++) {
- if (reservation_name &&
+ if (reservation_name &&
strcmp (reservation_name, res_ptr[i].name) != 0)
continue;
print_cnt++;
- slurm_print_reservation_info (stdout, & res_ptr[i],
+ slurm_print_reservation_info (stdout, & res_ptr[i],
one_liner ) ;
if (reservation_name)
break;
@@ -118,7 +118,7 @@ scontrol_print_res (char *reservation_name)
if (reservation_name) {
exit_code = 1;
if (quiet_flag != 1)
- printf ("Reservation %s not found\n",
+ printf ("Reservation %s not found\n",
reservation_name);
} else if (quiet_flag != 1)
printf ("No reservations in the system\n");
diff --git a/src/scontrol/scontrol.c b/src/scontrol/scontrol.c
index 315c95fa8f89ea8715394c1d2d8fe112af89497e..af865a2b5ac7dea8febdadba1bb1153e9b06a9d6 100644
--- a/src/scontrol/scontrol.c
+++ b/src/scontrol/scontrol.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * scontrol.c - administration tool for slurm.
+ * scontrol.c - administration tool for slurm.
* provides interface to read, write, update, and configurations.
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
@@ -8,32 +8,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -58,7 +58,7 @@ static void _create_it (int argc, char *argv[]);
static void _delete_it (int argc, char *argv[]);
static void _show_it (int argc, char *argv[]);
static int _get_command (int *argc, char *argv[]);
-static void _ping_slurmctld(char *control_machine,
+static void _ping_slurmctld(char *control_machine,
char *backup_controller);
static void _print_config (char *config_param);
static void _print_daemons (void);
@@ -71,8 +71,8 @@ static int _update_bluegene_block (int argc, char *argv[]);
static int _update_bluegene_subbp (int argc, char *argv[]);
static void _usage ();
-int
-main (int argc, char *argv[])
+int
+main (int argc, char *argv[])
{
int error_code = SLURM_SUCCESS, i, opt_char, input_field_count;
char **input_fields;
@@ -143,7 +143,7 @@ main (int argc, char *argv[])
break;
default:
exit_code = 1;
- fprintf(stderr, "getopt error, returned %c\n",
+ fprintf(stderr, "getopt error, returned %c\n",
opt_char);
exit(exit_code);
}
@@ -162,7 +162,7 @@ main (int argc, char *argv[])
if (optind < argc) {
for (i = optind; i < argc; i++) {
input_fields[input_field_count++] = argv[i];
- }
+ }
}
if (input_field_count)
@@ -171,12 +171,12 @@ main (int argc, char *argv[])
error_code = _get_command (&input_field_count, input_fields);
while (error_code == SLURM_SUCCESS) {
- error_code = _process_command (input_field_count,
+ error_code = _process_command (input_field_count,
input_fields);
if (error_code || exit_flag)
break;
error_code = _get_command (&input_field_count, input_fields);
- }
+ }
exit(exit_code);
}
@@ -187,7 +187,7 @@ static void _print_version(void)
if (quiet_flag == -1) {
long version = slurm_api_version();
printf("slurm_api_version: %ld, %ld.%ld.%ld\n", version,
- SLURM_VERSION_MAJOR(version),
+ SLURM_VERSION_MAJOR(version),
SLURM_VERSION_MINOR(version),
SLURM_VERSION_MICRO(version));
}
@@ -225,8 +225,8 @@ static char *_getline(const char *prompt)
* OUT argc - location to store count of arguments
* OUT argv - location to store the argument list
*/
-static int
-_get_command (int *argc, char **argv)
+static int
+_get_command (int *argc, char **argv)
{
char *in_line;
static char *last_in_line = NULL;
@@ -266,11 +266,11 @@ _get_command (int *argc, char **argv)
continue;
if (((*argc) + 1) > MAX_INPUT_FIELDS) { /* bogus input line */
exit_code = 1;
- fprintf (stderr,
+ fprintf (stderr,
"%s: can not process over %d words\n",
command_name, input_words);
return E2BIG;
- }
+ }
argv[(*argc)++] = &in_line[i];
for (i++; i < in_line_size; i++) {
if (in_line[i] == '\042') {
@@ -289,16 +289,16 @@ _get_command (int *argc, char **argv)
in_line[i] = '\0';
break;
}
- }
+ }
}
- return 0;
+ return 0;
}
-/*
- * _print_config - print the specified configuration parameter and value
+/*
+ * _print_config - print the specified configuration parameter and value
* IN config_param - NULL to print all parameters and values
*/
-static void
+static void
_print_config (char *config_param)
{
int error_code;
@@ -321,7 +321,7 @@ _print_config (char *config_param)
}
}
else
- error_code = slurm_load_ctl_conf ((time_t) NULL,
+ error_code = slurm_load_ctl_conf ((time_t) NULL,
&slurm_ctl_conf_ptr);
if (error_code) {
@@ -335,14 +335,14 @@ _print_config (char *config_param)
if (error_code == SLURM_SUCCESS) {
slurm_print_ctl_conf (stdout, slurm_ctl_conf_ptr) ;
- fprintf(stdout, "\n");
+ fprintf(stdout, "\n");
}
if (slurm_ctl_conf_ptr)
_ping_slurmctld (slurm_ctl_conf_ptr->control_machine,
slurm_ctl_conf_ptr->backup_controller);
}
-/* Print slurmd status on localhost.
+/* Print slurmd status on localhost.
* Parse hostlist in the future */
static void _print_slurmd(char *hostlist)
{
@@ -379,7 +379,7 @@ _print_ping (void)
}
/* Report if slurmctld daemons are responding */
-static void
+static void
_ping_slurmctld(char *control_machine, char *backup_controller)
{
static char *state[2] = { "UP", "DOWN" };
@@ -406,7 +406,7 @@ _ping_slurmctld(char *control_machine, char *backup_controller)
} else
fprintf(stdout, "(NULL) ");
}
- fprintf(stdout, "are %s/%s\n",
+ fprintf(stdout, "are %s/%s\n",
state[primary], state[secondary]);
if (down_msg && (getuid() == 0)) {
@@ -470,7 +470,7 @@ _print_daemons (void)
* RET 0 or errno (only for errors fatal to scontrol)
*/
static int
-_process_command (int argc, char *argv[])
+_process_command (int argc, char *argv[])
{
int error_code = 0;
char *tag = argv[0];
@@ -494,7 +494,7 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
if (argc > 2) {
exit_code = 1;
fprintf (stderr,
- "too many arguments for keyword:%s\n",
+ "too many arguments for keyword:%s\n",
tag);
}
error_code = slurm_shutdown (1);
@@ -509,8 +509,8 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
else if (strncasecmp (tag, "completing", MAX(taglen, 2)) == 0) {
if (argc > 1) {
exit_code = 1;
- fprintf (stderr,
- "too many arguments for keyword:%s\n",
+ fprintf (stderr,
+ "too many arguments for keyword:%s\n",
tag);
}
scontrol_print_completing();
@@ -521,14 +521,14 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
fprintf (stderr, "too few arguments for %s keyword\n",
tag);
return 0;
- }
+ }
_create_it ((argc - 1), &argv[1]);
}
else if (strncasecmp (tag, "details", MAX(taglen, 1)) == 0) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr,
- "too many arguments for keyword:%s\n",
+ "too many arguments for keyword:%s\n",
tag);
return 0;
}
@@ -537,8 +537,8 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
else if (strncasecmp (tag, "exit", MAX(taglen, 1)) == 0) {
if (argc > 1) {
exit_code = 1;
- fprintf (stderr,
- "too many arguments for keyword:%s\n",
+ fprintf (stderr,
+ "too many arguments for keyword:%s\n",
tag);
}
exit_flag = 1;
@@ -546,7 +546,7 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
else if (strncasecmp (tag, "help", MAX(taglen, 2)) == 0) {
if (argc > 1) {
exit_code = 1;
- fprintf (stderr,
+ fprintf (stderr,
"too many arguments for keyword:%s\n",
tag);
}
@@ -559,7 +559,7 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
else if (strncasecmp (tag, "oneliner", MAX(taglen, 1)) == 0) {
if (argc > 1) {
exit_code = 1;
- fprintf (stderr,
+ fprintf (stderr,
"too many arguments for keyword:%s\n",
tag);
}
@@ -568,13 +568,13 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
else if (strncasecmp (tag, "pidinfo", MAX(taglen, 3)) == 0) {
if (argc > 2) {
exit_code = 1;
- fprintf (stderr,
- "too many arguments for keyword:%s\n",
+ fprintf (stderr,
+ "too many arguments for keyword:%s\n",
tag);
} else if (argc < 2) {
exit_code = 1;
- fprintf (stderr,
- "missing argument for keyword:%s\n",
+ fprintf (stderr,
+ "missing argument for keyword:%s\n",
tag);
} else
scontrol_pid_info ((pid_t) atol (argv[1]) );
@@ -582,7 +582,7 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
else if (strncasecmp (tag, "ping", MAX(taglen, 3)) == 0) {
if (argc > 1) {
exit_code = 1;
- fprintf (stderr,
+ fprintf (stderr,
"too many arguments for keyword:%s\n",
tag);
}
@@ -600,8 +600,8 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
else if (strncasecmp (tag, "quit", MAX(taglen, 4)) == 0) {
if (argc > 1) {
exit_code = 1;
- fprintf (stderr,
- "too many arguments for keyword:%s\n",
+ fprintf (stderr,
+ "too many arguments for keyword:%s\n",
tag);
}
exit_flag = 1;
@@ -623,19 +623,19 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
if (argc > 5) {
exit_code = 1;
if (quiet_flag != 1)
- fprintf(stderr,
- "too many arguments for keyword:%s\n",
+ fprintf(stderr,
+ "too many arguments for keyword:%s\n",
tag);
}
else if (argc < 3) {
exit_code = 1;
if (quiet_flag != 1)
- fprintf(stderr,
- "too few arguments for keyword:%s\n",
+ fprintf(stderr,
+ "too few arguments for keyword:%s\n",
tag);
}
else {
- error_code = scontrol_checkpoint(argv[1], argv[2],
+ error_code = scontrol_checkpoint(argv[1], argv[2],
argc - 3, &argv[3]);
if (error_code) {
exit_code = 1;
@@ -665,7 +665,7 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
slurm_perror ("slurm_requeue error");
}
}
-
+
}
else if ((strncasecmp (tag, "suspend", MAX(taglen, 2)) == 0)
|| (strncasecmp (tag, "resume", MAX(taglen, 3)) == 0)) {
@@ -695,13 +695,13 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
if (argc > 2) {
exit_code = 1;
if (quiet_flag != 1)
- fprintf(stderr,
+ fprintf(stderr,
"too many arguments for keyword:%s\n",
tag);
} else if (argc < 2) {
exit_code = 1;
if (quiet_flag != 1)
- fprintf(stderr,
+ fprintf(stderr,
"too few arguments for keyword:%s\n",
tag);
} else {
@@ -709,7 +709,7 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
char *endptr;
char *levels[] = {
"quiet", "fatal", "error", "info", "verbose",
- "debug", "debug2", "debug3", "debug4",
+ "debug", "debug2", "debug3", "debug4",
"debug5", NULL};
int index = 0;
while (levels[index]) {
@@ -773,7 +773,7 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
error_code = 1;
exit_code = 1;
fprintf (stderr,
- "invalid shutdown argument:%s\n",
+ "invalid shutdown argument:%s\n",
argv[1]);
} else
options= 2;
@@ -781,7 +781,7 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
error_code = 1;
exit_code = 1;
fprintf (stderr,
- "too many arguments for keyword:%s\n",
+ "too many arguments for keyword:%s\n",
tag);
}
if (error_code == 0) {
@@ -799,7 +799,7 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
fprintf (stderr, "too few arguments for %s keyword\n",
tag);
return 0;
- }
+ }
_update_it ((argc - 1), &argv[1]);
}
else if (strncasecmp (tag, "delete", MAX(taglen, 1)) == 0) {
@@ -817,7 +817,7 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
fprintf (stderr,
"too many arguments for %s keyword\n",
tag);
- }
+ }
quiet_flag = -1;
}
else if (strncasecmp (tag, "version", MAX(taglen, 4)) == 0) {
@@ -826,14 +826,14 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
fprintf (stderr,
"too many arguments for %s keyword\n",
tag);
- }
+ }
_print_version();
}
else if (strncasecmp (tag, "listpids", MAX(taglen, 1)) == 0) {
if (argc > 3) {
exit_code = 1;
- fprintf (stderr,
- "too many arguments for keyword:%s\n",
+ fprintf (stderr,
+ "too many arguments for keyword:%s\n",
tag);
} else {
scontrol_list_pids (argc == 1 ? NULL : argv[1],
@@ -843,8 +843,8 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
else if (strncasecmp (tag, "notify", MAX(taglen, 1)) == 0) {
if (argc < 3) {
exit_code = 1;
- fprintf (stderr,
- "too few arguments for keyword:%s\n",
+ fprintf (stderr,
+ "too few arguments for keyword:%s\n",
tag);
} else if (scontrol_job_notify(argc-1, &argv[1])) {
exit_code = 1;
@@ -860,13 +860,13 @@ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
}
-/*
- * _create_it - create a slurm configuration per the supplied arguments
+/*
+ * _create_it - create a slurm configuration per the supplied arguments
* IN argc - count of arguments
* IN argv - list of arguments
*/
static void
-_create_it (int argc, char *argv[])
+_create_it (int argc, char *argv[])
{
/* Scan for "res" first, anywhere in the args. When creating
a reservation there is a partition= option, which we don't
@@ -895,20 +895,20 @@ _create_it (int argc, char *argv[])
if (i >= argc) {
exit_code = 1;
error("Invalid creation entity: %s\n", argv[0]);
- } else if (error_code)
+ } else if (error_code)
exit_code = 1;
}
-/*
- * _delete_it - delete the specified slurm entity
+/*
+ * _delete_it - delete the specified slurm entity
* IN argc - count of arguments
* IN argv - list of arguments
*/
static void
-_delete_it (int argc, char *argv[])
+_delete_it (int argc, char *argv[])
{
char *tag = NULL, *val = NULL;
int taglen = 0;
@@ -971,8 +971,8 @@ _delete_it (int argc, char *argv[])
}
-/*
- * _show_it - print a description of the specified slurm entity
+/*
+ * _show_it - print a description of the specified slurm entity
* IN argc - count of arguments
* IN argv - list of arguments
*/
@@ -985,15 +985,15 @@ _show_it (int argc, char *argv[])
if (argc > 3) {
exit_code = 1;
if (quiet_flag != 1)
- fprintf(stderr,
- "too many arguments for keyword:%s\n",
+ fprintf(stderr,
+ "too many arguments for keyword:%s\n",
argv[0]);
return;
}
else if (argc < 2) {
exit_code = 1;
if (quiet_flag != 1)
- fprintf(stderr,
+ fprintf(stderr,
"too few arguments for keyword:%s\n", argv[0]);
return;
}
@@ -1019,7 +1019,7 @@ _show_it (int argc, char *argv[])
exit_code = 1;
if (quiet_flag != 1)
fprintf(stderr,
- "too many arguments for keyword:%s\n",
+ "too many arguments for keyword:%s\n",
argv[0]);
}
_print_daemons ();
@@ -1040,10 +1040,10 @@ _show_it (int argc, char *argv[])
exit_code = 1;
} else if (strncasecmp (tag, "nodes", MAX(taglen, 1)) == 0) {
scontrol_print_node_list (val);
- } else if (strncasecmp (tag, "partitions", MAX(taglen, 1)) == 0 ||
+ } else if (strncasecmp (tag, "partitions", MAX(taglen, 1)) == 0 ||
strncasecmp (tag, "partitionname", MAX(taglen, 1)) == 0) {
scontrol_print_part (val);
- } else if (strncasecmp (tag, "reservations", MAX(taglen, 1)) == 0 ||
+ } else if (strncasecmp (tag, "reservations", MAX(taglen, 1)) == 0 ||
strncasecmp (tag, "reservationname", MAX(taglen, 1)) == 0) {
scontrol_print_res (val);
} else if (strncasecmp (tag, "slurmd", MAX(taglen, 2)) == 0) {
@@ -1058,19 +1058,19 @@ _show_it (int argc, char *argv[])
fprintf (stderr,
"invalid entity:%s for keyword:%s \n",
tag, argv[0]);
- }
+ }
}
-/*
- * _update_it - update the slurm configuration per the supplied arguments
+/*
+ * _update_it - update the slurm configuration per the supplied arguments
* IN argc - count of arguments
* IN argv - list of arguments
*/
static void
-_update_it (int argc, char *argv[])
+_update_it (int argc, char *argv[])
{
int i, error_code = SLURM_SUCCESS;
int nodetag=0, partag=0, jobtag=0;
@@ -1104,7 +1104,7 @@ _update_it (int argc, char *argv[])
/* The order of tests matters here. An update job request can include
partition and reservation tags, possibly before the jobid tag, but
none of the other updates have a jobid tag, so check jobtag first.
- Likewise, check restag next, because reservations can have a
+ Likewise, check restag next, because reservations can have a
partition tag. The order of the rest doesn't matter because there
aren't any other duplicate tags. */
@@ -1138,16 +1138,16 @@ _update_it (int argc, char *argv[])
}
}
-/*
- * _update_bluegene_block - update the bluegene block per the
- * supplied arguments
+/*
+ * _update_bluegene_block - update the bluegene block per the
+ * supplied arguments
* IN argc - count of arguments
* IN argv - list of arguments
- * RET 0 if no slurm error, errno otherwise. parsing error prints
+ * RET 0 if no slurm error, errno otherwise. parsing error prints
* error message and returns 0
*/
static int
-_update_bluegene_block (int argc, char *argv[])
+_update_bluegene_block (int argc, char *argv[])
{
#ifdef HAVE_BG
int i, update_cnt = 0;
@@ -1183,7 +1183,7 @@ _update_bluegene_block (int argc, char *argv[])
block_msg.state = RM_PARTITION_NAV;
else {
exit_code = 1;
- fprintf (stderr, "Invalid input: %s\n",
+ fprintf (stderr, "Invalid input: %s\n",
argv[i]);
fprintf (stderr, "Acceptable State values "
"are FREE, ERROR, REMOVE\n");
@@ -1204,7 +1204,7 @@ _update_bluegene_block (int argc, char *argv[])
} else if (block_msg.state == (uint16_t)NO_VAL) {
error("You didn't give me a state to set %s to "
"(i.e. FREE, ERROR).", block_msg.nodes);
- return 0;
+ return 0;
}
if (slurm_update_block(&block_msg)) {
@@ -1219,16 +1219,16 @@ _update_bluegene_block (int argc, char *argv[])
#endif
}
-/*
- * _update_bluegene_subbp - update the bluegene nodecards per the
- * supplied arguments
+/*
+ * _update_bluegene_subbp - update the bluegene nodecards per the
+ * supplied arguments
* IN argc - count of arguments
* IN argv - list of arguments
- * RET 0 if no slurm error, errno otherwise. parsing error prints
+ * RET 0 if no slurm error, errno otherwise. parsing error prints
* error message and returns 0
*/
static int
-_update_bluegene_subbp (int argc, char *argv[])
+_update_bluegene_subbp (int argc, char *argv[])
{
#ifdef HAVE_BG
int i, update_cnt = 0;
@@ -1261,7 +1261,7 @@ _update_bluegene_subbp (int argc, char *argv[])
block_msg.state = RM_PARTITION_FREE;
else {
exit_code = 1;
- fprintf (stderr, "Invalid input: %s\n",
+ fprintf (stderr, "Invalid input: %s\n",
argv[i]);
fprintf (stderr, "Acceptable State values "
"are FREE and ERROR\n");
@@ -1282,7 +1282,7 @@ _update_bluegene_subbp (int argc, char *argv[])
} else if (block_msg.state == (uint16_t)NO_VAL) {
error("You didn't give me a state to set %s to "
"(i.e. FREE, ERROR).", block_msg.nodes);
- return 0;
+ return 0;
}
if (slurm_update_block(&block_msg)) {
diff --git a/src/scontrol/scontrol.h b/src/scontrol/scontrol.h
index 83b068b5961bd9c95b3076f7f82fac5762b19d79..4e2baeb610b2c675acca5035424f4faa672f5d65 100644
--- a/src/scontrol/scontrol.h
+++ b/src/scontrol/scontrol.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -100,12 +100,12 @@ extern int input_words; /* number of words of input permitted */
extern int one_liner; /* one record per line if =1 */
extern int quiet_flag; /* quiet=1, verbose=-1, normal=0 */
-extern int scontrol_checkpoint(char *op, char *job_step_id_str, int argc,
+extern int scontrol_checkpoint(char *op, char *job_step_id_str, int argc,
char **argv);
extern int scontrol_encode_hostlist(char *hostlist);
extern int scontrol_job_notify(int argc, char *argv[]);
extern int scontrol_load_jobs (job_info_msg_t ** job_buffer_pptr);
-extern int scontrol_load_nodes (node_info_msg_t ** node_buffer_pptr,
+extern int scontrol_load_nodes (node_info_msg_t ** node_buffer_pptr,
uint16_t show_flags);
extern int scontrol_load_partitions (
partition_info_msg_t **part_info_pptr);
@@ -113,11 +113,11 @@ extern int scontrol_load_block(
block_info_msg_t **block_info_pptr);
extern void scontrol_pid_info(pid_t job_pid);
extern void scontrol_print_completing (void);
-extern void scontrol_print_completing_job(job_info_t *job_ptr,
+extern void scontrol_print_completing_job(job_info_t *job_ptr,
node_info_msg_t *node_info_msg);
extern void scontrol_print_job (char * job_id_str);
extern void scontrol_print_hosts (char * node_list);
-extern void scontrol_print_node (char *node_name,
+extern void scontrol_print_node (char *node_name,
node_info_msg_t *node_info_ptr);
extern void scontrol_print_node_list (char *node_list);
extern void scontrol_print_part (char *partition_name);
diff --git a/src/scontrol/update_job.c b/src/scontrol/update_job.c
index 45b7f213e3192f87e853f581b26bd2c03e309b53..5c9830d754a7cfb0c7cac4c2b85d9408957b28ed 100644
--- a/src/scontrol/update_job.c
+++ b/src/scontrol/update_job.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -45,17 +45,17 @@ static int _parse_checkpoint_args(int argc, char **argv,
static int _parse_restart_args(int argc, char **argv,
uint16_t *stick, char **image_dir);
-/*
+/*
* scontrol_checkpoint - perform some checkpoint/resume operation
* IN op - checkpoint operation
- * IN job_step_id_str - either a job name (for all steps of the given job) or
+ * IN job_step_id_str - either a job name (for all steps of the given job) or
* a step name: "<jid>.<step_id>"
* IN argc - argument count
* IN argv - arguments of the operation
- * RET 0 if no slurm error, errno otherwise. parsing error prints
+ * RET 0 if no slurm error, errno otherwise. parsing error prints
* error message and returns 0
*/
-extern int
+extern int
scontrol_checkpoint(char *op, char *job_step_id_str, int argc, char *argv[])
{
int rc = SLURM_SUCCESS;
@@ -70,7 +70,7 @@ scontrol_checkpoint(char *op, char *job_step_id_str, int argc, char *argv[])
if (job_step_id_str) {
job_id = (uint32_t) strtol (job_step_id_str, &next_str, 10);
if (next_str[0] == '.') {
- step_id = (uint32_t) strtol (&next_str[1], &next_str,
+ step_id = (uint32_t) strtol (&next_str[1], &next_str,
10);
step_id_set = 1;
} else
@@ -116,25 +116,25 @@ scontrol_checkpoint(char *op, char *job_step_id_str, int argc, char *argv[])
if (_parse_checkpoint_args(argc, argv, &max_wait, &image_dir)){
return 0;
}
- rc = slurm_checkpoint_create (job_id, step_id, max_wait,
+ rc = slurm_checkpoint_create (job_id, step_id, max_wait,
image_dir);
} else if (strncasecmp(op, "vacate", MAX(oplen, 2)) == 0) {
if (_parse_checkpoint_args(argc, argv, &max_wait, &image_dir)){
return 0;
}
- rc = slurm_checkpoint_vacate (job_id, step_id, max_wait,
+ rc = slurm_checkpoint_vacate (job_id, step_id, max_wait,
image_dir);
} else if (strncasecmp(op, "restart", MAX(oplen, 2)) == 0) {
if (_parse_restart_args(argc, argv, &stick, &image_dir)) {
return 0;
}
- rc = slurm_checkpoint_restart (job_id, step_id, stick,
+ rc = slurm_checkpoint_restart (job_id, step_id, stick,
image_dir);
} else if (strncasecmp(op, "error", MAX(oplen, 2)) == 0) {
- rc = slurm_checkpoint_error (job_id, step_id,
+ rc = slurm_checkpoint_error (job_id, step_id,
&ckpt_errno, &ckpt_strerror);
if (rc == SLURM_SUCCESS) {
printf("error(%u): %s\n", ckpt_errno, ckpt_strerror);
@@ -151,14 +151,14 @@ scontrol_checkpoint(char *op, char *job_step_id_str, int argc, char *argv[])
}
static int
-_parse_checkpoint_args(int argc, char **argv, uint16_t *max_wait,
+_parse_checkpoint_args(int argc, char **argv, uint16_t *max_wait,
char **image_dir)
{
int i;
-
+
for (i=0; i< argc; i++) {
if (strncasecmp(argv[i], "MaxWait=", 8) == 0) {
- *max_wait = (uint16_t) strtol(&argv[i][8],
+ *max_wait = (uint16_t) strtol(&argv[i][8],
(char **) NULL, 10);
} else if (strncasecmp(argv[i], "ImageDir=", 9) == 0) {
*image_dir = &argv[i][9];
@@ -176,7 +176,7 @@ static int
_parse_restart_args(int argc, char **argv, uint16_t *stick, char **image_dir)
{
int i;
-
+
for (i=0; i< argc; i++) {
if (strncasecmp(argv[i], "StickToNodes", 5) == 0) {
*stick = 1;
@@ -199,7 +199,7 @@ _parse_restart_args(int argc, char **argv, uint16_t *stick, char **image_dir)
* RET 0 if no slurm error, errno otherwise. parsing error prints
* error message and returns 0
*/
-extern int
+extern int
scontrol_suspend(char *op, char *job_id_str)
{
int rc = SLURM_SUCCESS;
@@ -233,7 +233,7 @@ scontrol_suspend(char *op, char *job_id_str)
* RET 0 if no slurm error, errno otherwise. parsing error prints
* error message and returns 0
*/
-extern int
+extern int
scontrol_requeue(char *job_id_str)
{
int rc = SLURM_SUCCESS;
@@ -258,23 +258,23 @@ scontrol_requeue(char *job_id_str)
}
-/*
- * scontrol_update_job - update the slurm job configuration per the supplied
- * arguments
+/*
+ * scontrol_update_job - update the slurm job configuration per the supplied
+ * arguments
* IN argc - count of arguments
* IN argv - list of arguments
- * RET 0 if no slurm error, errno otherwise. parsing error prints
+ * RET 0 if no slurm error, errno otherwise. parsing error prints
* error message and returns 0
*/
extern int
-scontrol_update_job (int argc, char *argv[])
+scontrol_update_job (int argc, char *argv[])
{
int i, update_cnt = 0;
char *tag, *val;
int taglen, vallen;
job_desc_msg_t job_msg;
- slurm_init_job_desc_msg (&job_msg);
+ slurm_init_job_desc_msg (&job_msg);
for (i=0; i<argc; i++) {
tag = argv[i];
@@ -284,7 +284,7 @@ scontrol_update_job (int argc, char *argv[])
val++;
vallen = strlen(val);
} else if (strncasecmp(tag, "Nice", MAX(strlen(tag), 2)) == 0){
- /* "Nice" is the only tag that might not have an
+ /* "Nice" is the only tag that might not have an
equal sign, so it is handled specially. */
job_msg.nice = NICE_OFFSET + 100;
update_cnt++;
@@ -297,13 +297,13 @@ scontrol_update_job (int argc, char *argv[])
}
if (strncasecmp(tag, "JobId", MAX(taglen, 1)) == 0) {
- job_msg.job_id =
+ job_msg.job_id =
(uint32_t) strtol(val, (char **) NULL, 10);
}
else if (strncasecmp(tag, "Comment", MAX(taglen, 3)) == 0) {
job_msg.comment = val;
update_cnt++;
- }
+ }
else if (strncasecmp(tag, "TimeLimit", MAX(taglen, 2)) == 0) {
int time_limit = time_str2mins(val);
if ((time_limit < 0) && (time_limit != INFINITE)) {
@@ -315,7 +315,7 @@ scontrol_update_job (int argc, char *argv[])
update_cnt++;
}
else if (strncasecmp(tag, "Priority", MAX(taglen, 2)) == 0) {
- job_msg.priority =
+ job_msg.priority =
(uint32_t) strtoll(val, (char **) NULL, 10);
update_cnt++;
}
@@ -324,7 +324,7 @@ scontrol_update_job (int argc, char *argv[])
nice = strtoll(val, (char **) NULL, 10);
if (abs(nice) > NICE_OFFSET) {
error("Invalid nice value, must be between "
- "-%d and %d", NICE_OFFSET,
+ "-%d and %d", NICE_OFFSET,
NICE_OFFSET);
exit_code = 1;
return 0;
@@ -335,12 +335,12 @@ scontrol_update_job (int argc, char *argv[])
/* ReqProcs was replaced by NumProcs in SLURM version 2.1 */
else if ((strncasecmp(tag, "ReqProcs", MAX(taglen, 4)) == 0) ||
(strncasecmp(tag, "NumProcs", MAX(taglen, 8)) == 0)) {
- job_msg.num_procs =
+ job_msg.num_procs =
(uint32_t) strtol(val, (char **) NULL, 10);
update_cnt++;
}
else if (strncasecmp(tag, "Requeue", MAX(taglen, 4)) == 0) {
- job_msg.requeue =
+ job_msg.requeue =
(uint16_t) strtol(val, (char **) NULL, 10);
update_cnt++;
}
@@ -348,7 +348,7 @@ scontrol_update_job (int argc, char *argv[])
else if ((strncasecmp(tag, "ReqNodes", MAX(taglen, 8)) == 0) ||
(strncasecmp(tag, "NumNodes", MAX(taglen, 8)) == 0)) {
int rc = get_resource_arg_range(
- val,
+ val,
"requested node count",
(int *)&job_msg.min_nodes,
(int *)&job_msg.max_nodes,
@@ -358,12 +358,12 @@ scontrol_update_job (int argc, char *argv[])
update_cnt++;
}
else if (strncasecmp(tag, "ReqSockets", MAX(taglen, 4)) == 0) {
- job_msg.min_sockets =
+ job_msg.min_sockets =
(uint16_t) strtol(val, (char **) NULL, 10);
update_cnt++;
}
else if (strncasecmp(tag, "ReqCores", MAX(taglen, 4)) == 0) {
- job_msg.min_cores =
+ job_msg.min_cores =
(uint16_t) strtol(val, (char **) NULL, 10);
update_cnt++;
}
@@ -373,22 +373,22 @@ scontrol_update_job (int argc, char *argv[])
update_cnt++;
}
else if (strncasecmp(tag, "ReqThreads", MAX(taglen, 4)) == 0) {
- job_msg.min_threads =
+ job_msg.min_threads =
(uint16_t) strtol(val, (char **) NULL, 10);
update_cnt++;
}
else if (strncasecmp(tag, "MinCPUs", MAX(taglen, 4)) == 0) {
- job_msg.job_min_cpus =
+ job_msg.job_min_cpus =
(uint32_t) strtol(val, (char **) NULL, 10);
update_cnt++;
}
- else if (strncasecmp(tag, "MinMemoryNode",
+ else if (strncasecmp(tag, "MinMemoryNode",
MAX(taglen, 10)) == 0) {
- job_msg.job_min_memory =
+ job_msg.job_min_memory =
(uint32_t) strtol(val, (char **) NULL, 10);
update_cnt++;
}
- else if (strncasecmp(tag, "MinMemoryCPU",
+ else if (strncasecmp(tag, "MinMemoryCPU",
MAX(taglen, 10)) == 0) {
job_msg.job_min_memory =
(uint32_t) strtol(val, (char **) NULL, 10);
@@ -396,16 +396,16 @@ scontrol_update_job (int argc, char *argv[])
update_cnt++;
}
else if (strncasecmp(tag, "MinTmpDisk", MAX(taglen, 5)) == 0) {
- job_msg.job_min_tmp_disk =
+ job_msg.job_min_tmp_disk =
(uint32_t) strtol(val, (char **) NULL, 10);
update_cnt++;
}
- else if (strncasecmp(tag, "PartitionName",
+ else if (strncasecmp(tag, "PartitionName",
MAX(taglen, 2)) == 0) {
job_msg.partition = val;
update_cnt++;
}
- else if (strncasecmp(tag, "ReservationName",
+ else if (strncasecmp(tag, "ReservationName",
MAX(taglen, 3)) == 0) {
job_msg.reservation = val;
update_cnt++;
@@ -424,8 +424,8 @@ scontrol_update_job (int argc, char *argv[])
else if (strncasecmp(val, "NO", MAX(vallen, 1)) == 0)
job_msg.shared = 0;
else
- job_msg.shared =
- (uint16_t) strtol(val,
+ job_msg.shared =
+ (uint16_t) strtol(val,
(char **) NULL, 10);
update_cnt++;
}
@@ -435,8 +435,8 @@ scontrol_update_job (int argc, char *argv[])
else if (strncasecmp(val, "NO", MAX(vallen, 1)) == 0)
job_msg.contiguous = 0;
else
- job_msg.contiguous =
- (uint16_t) strtol(val,
+ job_msg.contiguous =
+ (uint16_t) strtol(val,
(char **) NULL, 10);
update_cnt++;
}
@@ -482,7 +482,7 @@ scontrol_update_job (int argc, char *argv[])
break;
}
geometry_tmp = next_ptr;
- token = strtok_r(geometry_tmp, delimiter,
+ token = strtok_r(geometry_tmp, delimiter,
&next_ptr);
}
if (token != NULL) {
@@ -508,7 +508,7 @@ scontrol_update_job (int argc, char *argv[])
else if (strncasecmp(val, "NO", MAX(vallen, 1)) == 0)
rotate = 0;
else
- rotate = (uint16_t) strtol(val,
+ rotate = (uint16_t) strtol(val,
(char **) NULL, 10);
job_msg.rotate = rotate;
update_cnt++;
diff --git a/src/scontrol/update_node.c b/src/scontrol/update_node.c
index beeb579deb3308a7c57a6a5d4601a355878a0000..d39e9f3394937a43d47c0c09a62c785ca8f1b9d7 100644
--- a/src/scontrol/update_node.c
+++ b/src/scontrol/update_node.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -38,16 +38,16 @@
#include "scontrol.h"
-/*
+/*
* scontrol_update_node - update the slurm node configuration per the supplied
- * arguments
+ * arguments
* IN argc - count of arguments
* IN argv - list of arguments
- * RET 0 if no slurm error, errno otherwise. parsing error prints
+ * RET 0 if no slurm error, errno otherwise. parsing error prints
* error message and returns 0
*/
extern int
-scontrol_update_node (int argc, char *argv[])
+scontrol_update_node (int argc, char *argv[])
{
int i, j, k, rc = 0, update_cnt = 0;
@@ -97,11 +97,11 @@ scontrol_update_node (int argc, char *argv[])
break;
}
} else if (errno == ERANGE) {
- error("Weight value (%s) is out of range",
+ error("Weight value (%s) is out of range",
val);
break;
} else if (val[0] == '-') {
- error("Weight value (%s) is less than zero",
+ error("Weight value (%s) is less than zero",
val);
break;
} else if (num > 0xfffffff0) {
@@ -138,40 +138,40 @@ scontrol_update_node (int argc, char *argv[])
slurm_make_time_str(&now, time_str, sizeof(time_str));
snprintf(time_buf, sizeof(time_buf), "@%s]", time_str);
xstrcat(reason_str, time_buf);
-
+
node_msg.reason = reason_str;
update_cnt++;
}
else if (strncasecmp(tag, "State", MAX(taglen, 1)) == 0) {
- if (strncasecmp(val, "NoResp",
+ if (strncasecmp(val, "NoResp",
MAX(vallen, 3)) == 0) {
node_msg.node_state = NODE_STATE_NO_RESPOND;
update_cnt++;
- } else if (strncasecmp(val, "DRAIN",
+ } else if (strncasecmp(val, "DRAIN",
MAX(vallen, 3)) == 0) {
node_msg.node_state = NODE_STATE_DRAIN;
update_cnt++;
- } else if (strncasecmp(val, "FAIL",
+ } else if (strncasecmp(val, "FAIL",
MAX(vallen, 3)) == 0) {
node_msg.node_state = NODE_STATE_FAIL;
update_cnt++;
- } else if (strncasecmp(val, "RESUME",
+ } else if (strncasecmp(val, "RESUME",
MAX(vallen, 3)) == 0) {
node_msg.node_state = NODE_RESUME;
update_cnt++;
- } else if (strncasecmp(val, "POWER_DOWN",
+ } else if (strncasecmp(val, "POWER_DOWN",
MAX(vallen, 7)) == 0) {
node_msg.node_state = NODE_STATE_POWER_SAVE;
update_cnt++;
- } else if (strncasecmp(val, "POWER_UP",
+ } else if (strncasecmp(val, "POWER_UP",
MAX(vallen, 7)) == 0) {
node_msg.node_state = NODE_STATE_POWER_UP;
update_cnt++;
} else {
state_val = (uint16_t) NO_VAL;
for (j = 0; j < NODE_STATE_END; j++) {
- if (strncasecmp (node_state_string(j),
- val,
+ if (strncasecmp (node_state_string(j),
+ val,
MAX(vallen, 3)) == 0){
state_val = (uint16_t) j;
break;
@@ -179,7 +179,7 @@ scontrol_update_node (int argc, char *argv[])
}
if (j == NODE_STATE_END) {
exit_code = 1;
- fprintf(stderr, "Invalid input: %s\n",
+ fprintf(stderr, "Invalid input: %s\n",
argv[i]);
fprintf (stderr, "Request aborted\n");
fprintf (stderr, "Valid states are: ");
@@ -187,11 +187,11 @@ scontrol_update_node (int argc, char *argv[])
"NoResp DRAIN FAIL RESUME "
"POWER_DOWN POWER_UP ");
for (k = 0; k < NODE_STATE_END; k++) {
- fprintf (stderr, "%s ",
+ fprintf (stderr, "%s ",
node_state_string(k));
}
fprintf (stderr, "\n");
- fprintf (stderr,
+ fprintf (stderr,
"Not all states are valid "
"given a node's prior "
"state\n");
diff --git a/src/scontrol/update_part.c b/src/scontrol/update_part.c
index 4d6e71c65ee2835e812c9b39ae23299f208985fb..decf42346d6c8d80a25ec5bea23ecb1c91a1a96e 100644
--- a/src/scontrol/update_part.c
+++ b/src/scontrol/update_part.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -40,8 +40,8 @@
#include "src/scontrol/scontrol.h"
extern int
-scontrol_parse_part_options (int argc, char *argv[], int *update_cnt_ptr,
- update_part_msg_t *part_msg_ptr)
+scontrol_parse_part_options (int argc, char *argv[], int *update_cnt_ptr,
+ update_part_msg_t *part_msg_ptr)
{
int i, min, max;
char *tag, *val;
@@ -51,13 +51,13 @@ scontrol_parse_part_options (int argc, char *argv[], int *update_cnt_ptr,
error("scontrol_parse_part_options internal error, "
"update_cnt_ptr == NULL");
exit_code = 1;
- return -1;
+ return -1;
}
if (!part_msg_ptr) {
error("scontrol_parse_part_options internal error, "
"part_msg_ptr == NULL");
exit_code = 1;
- return -1;
+ return -1;
}
for (i=0; i<argc; i++) {
@@ -166,28 +166,28 @@ scontrol_parse_part_options (int argc, char *argv[], int *update_cnt_ptr,
if (strncasecmp(val, "NO", MAX(vallen, 1)) == 0) {
part_msg_ptr->max_share = 1;
- } else if (strncasecmp(val, "EXCLUSIVE",
+ } else if (strncasecmp(val, "EXCLUSIVE",
MAX(vallen, 1)) == 0) {
part_msg_ptr->max_share = 0;
- } else if (strncasecmp(val, "YES", MAX(vallen, 1))
+ } else if (strncasecmp(val, "YES", MAX(vallen, 1))
== 0) {
if (colon_pos) {
- part_msg_ptr->max_share =
- (uint16_t) strtol(colon_pos+1,
+ part_msg_ptr->max_share =
+ (uint16_t) strtol(colon_pos+1,
(char **) NULL, 10);
} else {
part_msg_ptr->max_share = (uint16_t) 4;
}
- } else if (strncasecmp(val, "FORCE", MAX(vallen, 1))
+ } else if (strncasecmp(val, "FORCE", MAX(vallen, 1))
== 0) {
if (colon_pos) {
- part_msg_ptr->max_share =
+ part_msg_ptr->max_share =
(uint16_t) strtol(colon_pos+1,
- (char **) NULL, 10) |
+ (char **) NULL, 10) |
SHARED_FORCE;
} else {
- part_msg_ptr->max_share =
+ part_msg_ptr->max_share =
(uint16_t) 4 |SHARED_FORCE;
}
} else {
@@ -200,7 +200,7 @@ scontrol_parse_part_options (int argc, char *argv[], int *update_cnt_ptr,
(*update_cnt_ptr)++;
}
else if (strncasecmp(tag, "Priority", MAX(taglen, 2)) == 0) {
- part_msg_ptr->priority = (uint16_t) strtol(val,
+ part_msg_ptr->priority = (uint16_t) strtol(val,
(char **) NULL, 10);
(*update_cnt_ptr)++;
}
@@ -243,16 +243,16 @@ scontrol_parse_part_options (int argc, char *argv[], int *update_cnt_ptr,
-/*
- * scontrol_update_part - update the slurm partition configuration per the
- * supplied arguments
+/*
+ * scontrol_update_part - update the slurm partition configuration per the
+ * supplied arguments
* IN argc - count of arguments
* IN argv - list of arguments
- * RET 0 if no slurm error, errno otherwise. parsing error prints
+ * RET 0 if no slurm error, errno otherwise. parsing error prints
* error message and returns 0
*/
extern int
-scontrol_update_part (int argc, char *argv[])
+scontrol_update_part (int argc, char *argv[])
{
int update_cnt = 0;
update_part_msg_t part_msg;
@@ -280,16 +280,16 @@ scontrol_update_part (int argc, char *argv[])
-/*
- * scontrol_create_part - create a slurm partition configuration per the
- * supplied arguments
+/*
+ * scontrol_create_part - create a slurm partition configuration per the
+ * supplied arguments
* IN argc - count of arguments
* IN argv - list of arguments
- * RET 0 if no slurm error, errno otherwise. parsing error prints
+ * RET 0 if no slurm error, errno otherwise. parsing error prints
* error message and returns 0
*/
extern int
-scontrol_create_part (int argc, char *argv[])
+scontrol_create_part (int argc, char *argv[])
{
int update_cnt = 0;
update_part_msg_t part_msg;
diff --git a/src/sinfo/opts.c b/src/sinfo/opts.c
index 3129c54d61d3c1cac75364d9fbe687dbec9b480b..de2bb69474fe44603ffa8e9d94f9bc0efc0bb7f0 100644
--- a/src/sinfo/opts.c
+++ b/src/sinfo/opts.c
@@ -16,15 +16,15 @@
* 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
+ * 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
+ * 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
+ * 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
@@ -72,7 +72,7 @@ static int _parse_format( char* );
static bool _node_state_equal (int state_id, const char *state_str);
static int _node_state_id (char *str);
static const char * _node_state_list (void);
-static void _parse_token( char *token, char *field, int *field_size,
+static void _parse_token( char *token, char *field, int *field_size,
bool *right_justify, char **suffix);
static void _print_options( void );
static void _print_version( void );
@@ -126,7 +126,7 @@ extern void parse_command_line(int argc, char *argv[])
long_options, &option_index)) != -1) {
switch (opt_char) {
case (int)'?':
- fprintf(stderr,
+ fprintf(stderr,
"Try \"sinfo --help\" for more information\n");
exit(1);
break;
@@ -240,15 +240,15 @@ extern void parse_command_line(int argc, char *argv[])
"%N %.6D %.9P %6t";
} else if (params.list_reasons) {
- params.format = params.long_output ?
- "%50R %6t %N" :
+ params.format = params.long_output ?
+ "%50R %6t %N" :
"%50R %N";
} else if ((env_val = getenv ("SINFO_FORMAT"))) {
params.format = xstrdup(env_val);
} else {
- params.format = params.long_output ?
+ params.format = params.long_output ?
"%9P %.5a %.10l %.10s %.4r %.5h %.10g %.6D %.11T %N" :
"%9P %.5a %.10l %.6D %.6t %N";
}
@@ -261,7 +261,7 @@ extern void parse_command_line(int argc, char *argv[])
fatal ("Unable to build state list for -R!");
}
- if (params.dead_nodes || params.nodes || params.partition ||
+ if (params.dead_nodes || params.nodes || params.partition ||
params.responding_nodes ||params.state_list)
params.filtering = true;
@@ -300,7 +300,7 @@ _next_tok (char *sep, char **str)
* IN str - comma separated list of job states
* RET List of enum job_states values
*/
-static List
+static List
_build_state_list (char *state_str)
{
List state_ids;
@@ -331,7 +331,7 @@ _build_state_list (char *state_str)
* _build_all_states_list - build a list containing all possible node states
* RET List of enum job_states values
*/
-static List
+static List
_build_all_states_list( void )
{
List my_list;
@@ -360,7 +360,7 @@ static const char *
_node_state_list (void)
{
int i;
- static char *all_states = NULL;
+ static char *all_states = NULL;
if (all_states)
return (all_states);
@@ -394,7 +394,7 @@ _node_state_equal (int i, const char *str)
int len = strlen (str);
if ((strncasecmp(node_state_string_compact(i), str, len) == 0) ||
- (strncasecmp(node_state_string(i), str, len) == 0))
+ (strncasecmp(node_state_string(i), str, len) == 0))
return (true);
return (false);
}
@@ -405,9 +405,9 @@ _node_state_equal (int i, const char *str)
* OUT states - node_state value corresponding to str
* RET 0 or error code
*/
-static int
+static int
_node_state_id (char *str)
-{
+{
int i;
int len = strlen (str);
@@ -439,9 +439,9 @@ _node_state_id (char *str)
return (-1);
}
-/* Take the user's format specification and use it to build build the
+/* Take the user's format specification and use it to build build the
* format specifications (internalize it to print.c data structures) */
-static int
+static int
_parse_format( char* format )
{
int field_size;
@@ -457,31 +457,31 @@ _parse_format( char* format )
params.format_list = list_create( NULL );
if ((prefix = _get_prefix(format)))
- format_add_prefix( params.format_list, 0, 0, prefix);
+ format_add_prefix( params.format_list, 0, 0, prefix);
tmp_format = xstrdup( format );
token = strtok_r( tmp_format, "%", &tmp_char);
if (token && (format[0] != '%')) /* toss header */
token = strtok_r( NULL, "%", &tmp_char );
while (token) {
- _parse_token( token, field, &field_size, &right_justify,
+ _parse_token( token, field, &field_size, &right_justify,
&suffix);
if (field[0] == 'a') {
params.match_flags.avail_flag = true;
format_add_avail( params.format_list,
- field_size,
- right_justify,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'A') {
- format_add_nodes_ai( params.format_list,
- field_size,
- right_justify,
+ format_add_nodes_ai( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'c') {
params.match_flags.cpus_flag = true;
- format_add_cpus( params.format_list,
- field_size,
- right_justify,
+ format_add_cpus( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'C') {
params.match_flags.cpus_flag = true;
@@ -491,142 +491,142 @@ _parse_format( char* format )
suffix );
} else if (field[0] == 'd') {
params.match_flags.disk_flag = true;
- format_add_disk( params.format_list,
- field_size,
- right_justify,
+ format_add_disk( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'D') {
- format_add_nodes( params.format_list,
- field_size,
- right_justify,
+ format_add_nodes( params.format_list,
+ field_size,
+ right_justify,
suffix );
}
/* else if (field[0] == 'E') see 'R' below */
else if (field[0] == 'f') {
params.match_flags.features_flag = true;
- format_add_features( params.format_list,
- field_size,
- right_justify,
+ format_add_features( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'F') {
- format_add_nodes_aiot( params.format_list,
- field_size,
- right_justify,
+ format_add_nodes_aiot( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'g') {
params.match_flags.groups_flag = true;
- format_add_groups( params.format_list,
- field_size,
- right_justify,
+ format_add_groups( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'h') {
params.match_flags.share_flag = true;
- format_add_share( params.format_list,
- field_size,
- right_justify,
+ format_add_share( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'l') {
params.match_flags.max_time_flag = true;
- format_add_time( params.format_list,
- field_size,
- right_justify,
+ format_add_time( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'L') {
params.match_flags.default_time_flag = true;
- format_add_default_time( params.format_list,
- field_size,
- right_justify,
+ format_add_default_time( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'm') {
params.match_flags.memory_flag = true;
- format_add_memory( params.format_list,
- field_size,
- right_justify,
+ format_add_memory( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'N') {
- format_add_node_list( params.format_list,
- field_size,
- right_justify,
+ format_add_node_list( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'p') {
params.match_flags.priority_flag = true;
- format_add_priority( params.format_list,
- field_size,
- right_justify,
+ format_add_priority( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'P') {
params.match_flags.partition_flag = true;
- format_add_partition( params.format_list,
- field_size,
- right_justify,
+ format_add_partition( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'r') {
params.match_flags.root_flag = true;
- format_add_root( params.format_list,
- field_size,
- right_justify,
+ format_add_root( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if ((field[0] == 'E') || (field[0] == 'R')) {
params.match_flags.reason_flag = true;
- format_add_reason( params.format_list,
- field_size,
- right_justify,
+ format_add_reason( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 's') {
params.match_flags.job_size_flag = true;
- format_add_size( params.format_list,
- field_size,
- right_justify,
+ format_add_size( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'S') {
- format_add_alloc_nodes( params.format_list,
- field_size,
- right_justify,
+ format_add_alloc_nodes( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 't') {
params.match_flags.state_flag = true;
- format_add_state_compact( params.format_list,
- field_size,
- right_justify,
+ format_add_state_compact( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'T') {
params.match_flags.state_flag = true;
- format_add_state_long( params.format_list,
- field_size,
- right_justify,
+ format_add_state_long( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'w') {
params.match_flags.weight_flag = true;
- format_add_weight( params.format_list,
- field_size,
- right_justify,
+ format_add_weight( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'X') {
params.match_flags.sockets_flag = true;
- format_add_sockets( params.format_list,
- field_size,
- right_justify,
+ format_add_sockets( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'Y') {
params.match_flags.cores_flag = true;
- format_add_cores( params.format_list,
- field_size,
- right_justify,
+ format_add_cores( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'Z') {
params.match_flags.threads_flag = true;
- format_add_threads( params.format_list,
- field_size,
- right_justify,
+ format_add_threads( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else if (field[0] == 'z') {
params.match_flags.sct_flag = true;
- format_add_sct( params.format_list,
- field_size,
- right_justify,
+ format_add_sct( params.format_list,
+ field_size,
+ right_justify,
suffix );
} else
- fprintf(stderr, "Invalid node format specification: %c\n",
+ fprintf(stderr, "Invalid node format specification: %c\n",
field[0] );
token = strtok_r( NULL, "%", &tmp_char);
}
@@ -644,7 +644,7 @@ _get_prefix( char *token )
{
char *pos, *prefix;
- if (token == NULL)
+ if (token == NULL)
return NULL;
pos = strchr(token, (int) '%');
@@ -668,7 +668,7 @@ _get_prefix( char *token )
* OUT suffix - tring containing everthing after the field specification
*/
static void
-_parse_token( char *token, char *field, int *field_size, bool *right_justify,
+_parse_token( char *token, char *field, int *field_size, bool *right_justify,
char **suffix)
{
int i = 0;
@@ -701,11 +701,11 @@ void _print_options( void )
printf("iterate = %d\n", params.iterate );
printf("long = %s\n", params.long_output ? "true" : "false");
printf("no_header = %s\n", params.no_header ? "true" : "false");
- printf("node_field = %s\n", params.node_field_flag ?
+ printf("node_field = %s\n", params.node_field_flag ?
"true" : "false");
printf("node_format = %s\n", params.node_flag ? "true" : "false");
printf("nodes = %s\n", params.nodes ? params.nodes : "n/a");
- printf("partition = %s\n", params.partition ?
+ printf("partition = %s\n", params.partition ?
params.partition: "n/a");
printf("responding = %s\n", params.responding_nodes ?
"true" : "false");
diff --git a/src/sinfo/print.c b/src/sinfo/print.c
index 1dfac41961119ea69decbfa825a4769b9bda9538..833357ff3c82756e060f608782f0c10226b68eff 100644
--- a/src/sinfo/print.c
+++ b/src/sinfo/print.c
@@ -4,35 +4,35 @@
* Copyright (C) 2002-2007 The Regents of the University of California.
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Joey Ekstrom <ekstrom1@llnl.gov> and
+ * Written by Joey Ekstrom <ekstrom1@llnl.gov> and
* Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -54,9 +54,9 @@
#define MIN_NODE_FIELD_SIZE 9
-static int _build_min_max_16_string(char *buffer, int buf_size,
+static int _build_min_max_16_string(char *buffer, int buf_size,
uint16_t min, uint16_t max, bool range);
-static int _build_min_max_32_string(char *buffer, int buf_size,
+static int _build_min_max_32_string(char *buffer, int buf_size,
uint32_t min, uint32_t max,
bool range, bool use_suffix);
static int _print_secs(long time, int width, bool right, bool cut_output);
@@ -99,7 +99,7 @@ int print_sinfo_entry(sinfo_data_t *sinfo_data)
sinfo_format_t *current;
while ((current = (sinfo_format_t *) list_next(i)) != NULL) {
- if (current->function(sinfo_data, current->width,
+ if (current->function(sinfo_data, current->width,
current->right_justify, current->suffix)
!= SLURM_SUCCESS)
return SLURM_ERROR;
@@ -155,7 +155,7 @@ static int _print_secs(long time, int width, bool right, bool cut_output)
hours = (time / 3600) % 24;
days = time / 86400;
- if (days)
+ if (days)
snprintf(str, FORMAT_STRING_SIZE,
"%ld-%2.2ld:%2.2ld:%2.2ld",
days, hours, minutes, seconds);
@@ -172,31 +172,31 @@ static int _print_secs(long time, int width, bool right, bool cut_output)
return SLURM_SUCCESS;
}
-static int
-_build_min_max_16_string(char *buffer, int buf_size, uint16_t min, uint16_t max,
+static int
+_build_min_max_16_string(char *buffer, int buf_size, uint16_t min, uint16_t max,
bool range)
{
char tmp_min[8];
char tmp_max[8];
convert_num_unit((float)min, tmp_min, sizeof(tmp_min), UNIT_NONE);
convert_num_unit((float)max, tmp_max, sizeof(tmp_max), UNIT_NONE);
-
+
if (max == min)
return snprintf(buffer, buf_size, "%s", tmp_max);
else if (range) {
if (max == (uint16_t) INFINITE)
- return snprintf(buffer, buf_size, "%s-infinite",
+ return snprintf(buffer, buf_size, "%s-infinite",
tmp_min);
else
- return snprintf(buffer, buf_size, "%s-%s",
+ return snprintf(buffer, buf_size, "%s-%s",
tmp_min, tmp_max);
} else
return snprintf(buffer, buf_size, "%s+", tmp_min);
}
-static int
+static int
_build_min_max_32_string(char *buffer, int buf_size,
- uint32_t min, uint32_t max,
+ uint32_t min, uint32_t max,
bool range, bool use_suffix)
{
char tmp_min[8];
@@ -216,20 +216,20 @@ _build_min_max_32_string(char *buffer, int buf_size,
return snprintf(buffer, buf_size, "%s", tmp_max);
else if (range) {
if (max == INFINITE)
- return snprintf(buffer, buf_size, "%s-infinite",
+ return snprintf(buffer, buf_size, "%s-infinite",
tmp_min);
else
- return snprintf(buffer, buf_size, "%s-%s",
+ return snprintf(buffer, buf_size, "%s-%s",
tmp_min, tmp_max);
} else
return snprintf(buffer, buf_size, "%s+", tmp_min);
}
int
-format_add_function(List list, int width, bool right, char *suffix,
+format_add_function(List list, int width, bool right, char *suffix,
int (*function) (sinfo_data_t *, int, bool, char*))
{
- sinfo_format_t *tmp =
+ sinfo_format_t *tmp =
(sinfo_format_t *) xmalloc(sizeof(sinfo_format_t));
tmp->function = function;
tmp->width = width;
@@ -251,7 +251,7 @@ static void _set_node_field_size(List sinfo_list)
int max_width = MIN_NODE_FIELD_SIZE, this_width = 0;
while ((current = (sinfo_data_t *) list_next(i)) != NULL) {
- this_width = hostlist_ranged_string(current->nodes,
+ this_width = hostlist_ranged_string(current->nodes,
sizeof(tmp), tmp);
max_width = MAX(max_width, this_width);
}
@@ -263,7 +263,7 @@ static void _set_node_field_size(List sinfo_list)
* _str_tolower - convert string to all lower case
* upper_str IN - upper case input string
* RET - lower case version of upper_str, caller must be xfree
- */
+ */
static char *_str_tolower(char *upper_str)
{
int i = strlen(upper_str) + 1;
@@ -302,9 +302,9 @@ int _print_cpus(sinfo_data_t * sinfo_data, int width,
{
char id[FORMAT_STRING_SIZE];
if (sinfo_data) {
- _build_min_max_32_string(id, FORMAT_STRING_SIZE,
- sinfo_data->min_cpus,
- sinfo_data->max_cpus,
+ _build_min_max_32_string(id, FORMAT_STRING_SIZE,
+ sinfo_data->min_cpus,
+ sinfo_data->max_cpus,
false, true);
_print_str(id, width, right_justify, true);
} else
@@ -326,13 +326,13 @@ int _print_cpus_aiot(sinfo_data_t * sinfo_data, int width,
char tmpt[8];
if (sinfo_data) {
#ifdef HAVE_BG
- convert_num_unit((float)sinfo_data->cpus_alloc,
+ convert_num_unit((float)sinfo_data->cpus_alloc,
tmpa, sizeof(tmpa), UNIT_NONE);
- convert_num_unit((float)sinfo_data->cpus_idle,
+ convert_num_unit((float)sinfo_data->cpus_idle,
tmpi, sizeof(tmpi), UNIT_NONE);
- convert_num_unit((float)sinfo_data->cpus_other,
+ convert_num_unit((float)sinfo_data->cpus_other,
tmpo, sizeof(tmpo), UNIT_NONE);
- convert_num_unit((float)sinfo_data->cpus_total,
+ convert_num_unit((float)sinfo_data->cpus_total,
tmpt, sizeof(tmpt), UNIT_NONE);
#else
sprintf(tmpa, "%u", sinfo_data->cpus_alloc);
@@ -358,14 +358,14 @@ int _print_sct(sinfo_data_t * sinfo_data, int width,
char threads[FORMAT_STRING_SIZE];
char sct[(FORMAT_STRING_SIZE+1)*3];
if (sinfo_data) {
- _build_min_max_16_string(sockets, FORMAT_STRING_SIZE,
- sinfo_data->min_sockets,
+ _build_min_max_16_string(sockets, FORMAT_STRING_SIZE,
+ sinfo_data->min_sockets,
sinfo_data->max_sockets, false);
- _build_min_max_16_string(cores, FORMAT_STRING_SIZE,
- sinfo_data->min_cores,
+ _build_min_max_16_string(cores, FORMAT_STRING_SIZE,
+ sinfo_data->min_cores,
sinfo_data->max_cores, false);
- _build_min_max_16_string(threads, FORMAT_STRING_SIZE,
- sinfo_data->min_threads,
+ _build_min_max_16_string(threads, FORMAT_STRING_SIZE,
+ sinfo_data->min_threads,
sinfo_data->max_threads, false);
sct[0] = '\0';
strcat(sct, sockets);
@@ -388,8 +388,8 @@ int _print_sockets(sinfo_data_t * sinfo_data, int width,
{
char id[FORMAT_STRING_SIZE];
if (sinfo_data) {
- _build_min_max_16_string(id, FORMAT_STRING_SIZE,
- sinfo_data->min_sockets,
+ _build_min_max_16_string(id, FORMAT_STRING_SIZE,
+ sinfo_data->min_sockets,
sinfo_data->max_sockets, false);
_print_str(id, width, right_justify, true);
} else {
@@ -406,8 +406,8 @@ int _print_cores(sinfo_data_t * sinfo_data, int width,
{
char id[FORMAT_STRING_SIZE];
if (sinfo_data) {
- _build_min_max_16_string(id, FORMAT_STRING_SIZE,
- sinfo_data->min_cores,
+ _build_min_max_16_string(id, FORMAT_STRING_SIZE,
+ sinfo_data->min_cores,
sinfo_data->max_cores, false);
_print_str(id, width, right_justify, true);
} else {
@@ -424,8 +424,8 @@ int _print_threads(sinfo_data_t * sinfo_data, int width,
{
char id[FORMAT_STRING_SIZE];
if (sinfo_data) {
- _build_min_max_16_string(id, FORMAT_STRING_SIZE,
- sinfo_data->min_threads,
+ _build_min_max_16_string(id, FORMAT_STRING_SIZE,
+ sinfo_data->min_threads,
sinfo_data->max_threads, false);
_print_str(id, width, right_justify, true);
} else {
@@ -442,8 +442,8 @@ int _print_disk(sinfo_data_t * sinfo_data, int width,
{
char id[FORMAT_STRING_SIZE];
if (sinfo_data) {
- _build_min_max_32_string(id, FORMAT_STRING_SIZE,
- sinfo_data->min_disk,
+ _build_min_max_32_string(id, FORMAT_STRING_SIZE,
+ sinfo_data->min_disk,
sinfo_data->max_disk,
false, false);
_print_str(id, width, right_justify, true);
@@ -475,7 +475,7 @@ int _print_groups(sinfo_data_t * sinfo_data, int width,
if (sinfo_data->part_info == NULL)
_print_str("n/a", width, right_justify, true);
else if (sinfo_data->part_info->allow_groups)
- _print_str(sinfo_data->part_info->allow_groups,
+ _print_str(sinfo_data->part_info->allow_groups,
width, right_justify, true);
else
_print_str("all", width, right_justify, true);
@@ -494,13 +494,13 @@ int _print_alloc_nodes(sinfo_data_t * sinfo_data, int width,
if (sinfo_data->part_info == NULL)
_print_str("n/a", width, right_justify, true);
else if (sinfo_data->part_info->allow_alloc_nodes)
- _print_str(sinfo_data->part_info->allow_alloc_nodes,
+ _print_str(sinfo_data->part_info->allow_alloc_nodes,
width, right_justify, true);
else
_print_str("all", width, right_justify, true);
} else
_print_str("ALLOCNODES", width, right_justify, true);
-
+
if (suffix)
printf("%s", suffix);
return SLURM_SUCCESS;
@@ -511,8 +511,8 @@ int _print_memory(sinfo_data_t * sinfo_data, int width,
{
char id[FORMAT_STRING_SIZE];
if (sinfo_data) {
- _build_min_max_32_string(id, FORMAT_STRING_SIZE,
- sinfo_data->min_mem,
+ _build_min_max_32_string(id, FORMAT_STRING_SIZE,
+ sinfo_data->min_mem,
sinfo_data->max_mem,
false, false);
_print_str(id, width, right_justify, true);
@@ -532,7 +532,7 @@ int _print_node_list(sinfo_data_t * sinfo_data, int width,
if (sinfo_data) {
char tmp[MAXHOSTRANGELEN];
- hostlist_ranged_string(sinfo_data->nodes,
+ hostlist_ranged_string(sinfo_data->nodes,
sizeof(tmp), tmp);
_print_str(tmp, width, right_justify, true);
} else {
@@ -554,8 +554,8 @@ int _print_nodes_t(sinfo_data_t * sinfo_data, int width,
char id[FORMAT_STRING_SIZE];
char tmp[8];
if (sinfo_data) {
-#ifdef HAVE_BG
- convert_num_unit((float)sinfo_data->nodes_total, tmp,
+#ifdef HAVE_BG
+ convert_num_unit((float)sinfo_data->nodes_total, tmp,
sizeof(tmp), UNIT_NONE);
#else
snprintf(tmp, sizeof(tmp), "%d", sinfo_data->nodes_total);
@@ -577,16 +577,16 @@ int _print_nodes_ai(sinfo_data_t * sinfo_data, int width,
char tmpa[8];
char tmpi[8];
if (sinfo_data) {
-#ifdef HAVE_BG
- convert_num_unit((float)sinfo_data->nodes_alloc,
+#ifdef HAVE_BG
+ convert_num_unit((float)sinfo_data->nodes_alloc,
tmpa, sizeof(tmpa), UNIT_NONE);
- convert_num_unit((float)sinfo_data->nodes_idle,
+ convert_num_unit((float)sinfo_data->nodes_idle,
tmpi, sizeof(tmpi), UNIT_NONE);
#else
snprintf(tmpa, sizeof(tmpa), "%d", sinfo_data->nodes_alloc);
snprintf(tmpi, sizeof(tmpi), "%d", sinfo_data->nodes_idle);
#endif
- snprintf(id, FORMAT_STRING_SIZE, "%s/%s",
+ snprintf(id, FORMAT_STRING_SIZE, "%s/%s",
tmpa, tmpi);
_print_str(id, width, right_justify, true);
} else
@@ -606,12 +606,12 @@ int _print_nodes_aiot(sinfo_data_t * sinfo_data, int width,
char tmpo[8];
char tmpt[8];
if (sinfo_data) {
-#ifdef HAVE_BG
- convert_num_unit((float)sinfo_data->nodes_alloc,
+#ifdef HAVE_BG
+ convert_num_unit((float)sinfo_data->nodes_alloc,
tmpa, sizeof(tmpa), UNIT_NONE);
- convert_num_unit((float)sinfo_data->nodes_idle,
+ convert_num_unit((float)sinfo_data->nodes_idle,
tmpi, sizeof(tmpi), UNIT_NONE);
- convert_num_unit((float)sinfo_data->nodes_other,
+ convert_num_unit((float)sinfo_data->nodes_other,
tmpo, sizeof(tmpo), UNIT_NONE);
convert_num_unit((float)sinfo_data->nodes_total,
tmpt, sizeof(tmpt), UNIT_NONE);
@@ -622,7 +622,7 @@ int _print_nodes_aiot(sinfo_data_t * sinfo_data, int width,
snprintf(tmpt, sizeof(tmpt), "%u", sinfo_data->nodes_total);
#endif
- snprintf(id, FORMAT_STRING_SIZE, "%s/%s/%s/%s",
+ snprintf(id, FORMAT_STRING_SIZE, "%s/%s/%s/%s",
tmpa, tmpi, tmpo, tmpt);
_print_str(id, width, right_justify, true);
} else
@@ -659,7 +659,7 @@ int _print_partition(sinfo_data_t * sinfo_data, int width,
return SLURM_SUCCESS;
}
-int _print_prefix(sinfo_data_t * job, int width, bool right_justify,
+int _print_prefix(sinfo_data_t * job, int width, bool right_justify,
char* suffix)
{
if (suffix)
@@ -673,8 +673,8 @@ int _print_priority(sinfo_data_t * sinfo_data, int width,
char id[FORMAT_STRING_SIZE];
if (sinfo_data) {
- _build_min_max_16_string(id, FORMAT_STRING_SIZE,
- sinfo_data->part_info->priority,
+ _build_min_max_16_string(id, FORMAT_STRING_SIZE,
+ sinfo_data->part_info->priority,
sinfo_data->part_info->priority, true);
_print_str(id, width, right_justify, true);
} else
@@ -690,7 +690,7 @@ int _print_reason(sinfo_data_t * sinfo_data, int width,
{
if (sinfo_data) {
char * reason = sinfo_data->reason ? sinfo_data->reason:"none";
- if (strncmp(reason, "(null)", 6) == 0)
+ if (strncmp(reason, "(null)", 6) == 0)
reason = "none";
_print_str(reason, width, right_justify, true);
} else
@@ -755,7 +755,7 @@ int _print_size(sinfo_data_t * sinfo_data, int width,
if ((sinfo_data->part_info->min_nodes < 1) &&
(sinfo_data->part_info->max_nodes > 0))
sinfo_data->part_info->min_nodes = 1;
- _build_min_max_32_string(id, FORMAT_STRING_SIZE,
+ _build_min_max_32_string(id, FORMAT_STRING_SIZE,
sinfo_data->part_info->min_nodes,
sinfo_data->part_info->max_nodes,
true, true);
@@ -831,7 +831,7 @@ int _print_default_time(sinfo_data_t * sinfo_data, int width,
{
if (sinfo_data) {
if ((sinfo_data->part_info == NULL) ||
- (sinfo_data->part_info->default_time == NO_VAL))
+ (sinfo_data->part_info->default_time == NO_VAL))
_print_str("n/a", width, right_justify, true);
else if (sinfo_data->part_info->default_time == INFINITE)
_print_str("infinite", width, right_justify, true);
@@ -851,8 +851,8 @@ int _print_weight(sinfo_data_t * sinfo_data, int width,
{
char id[FORMAT_STRING_SIZE];
if (sinfo_data) {
- _build_min_max_32_string(id, FORMAT_STRING_SIZE,
- sinfo_data->min_weight,
+ _build_min_max_32_string(id, FORMAT_STRING_SIZE,
+ sinfo_data->min_weight,
sinfo_data->max_weight,
false, false);
_print_str(id, width, right_justify, true);
diff --git a/src/sinfo/print.h b/src/sinfo/print.h
index 542dd27c6766e27e43bfbd1adfabaa7cc8656f06..a6e41fe0667682fa0df08a0ec911ac216f9fdc42 100644
--- a/src/sinfo/print.h
+++ b/src/sinfo/print.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Joey Ekstrom <ekstrom1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -60,7 +60,7 @@ typedef struct sinfo_format {
* Print Format Functions
*****************************************************************************/
int format_add_function(List list, int width, bool right_justify,
- char * suffix,
+ char * suffix,
int (*function) (sinfo_data_t *, int, bool, char *));
void print_date(void);
@@ -166,19 +166,19 @@ int _print_priority(sinfo_data_t * sinfo_data, int width,
bool right_justify, char *suffix);
int _print_reason(sinfo_data_t * sinfo_data, int width,
bool right_justify, char *suffix);
-int _print_root(sinfo_data_t * sinfo_data, int width,
+int _print_root(sinfo_data_t * sinfo_data, int width,
bool right_justify, char *suffix);
-int _print_share(sinfo_data_t * sinfo_data, int width,
+int _print_share(sinfo_data_t * sinfo_data, int width,
bool right_justify, char *suffix);
-int _print_size(sinfo_data_t * sinfo_data, int width,
+int _print_size(sinfo_data_t * sinfo_data, int width,
bool right_justify, char *suffix);
int _print_state_compact(sinfo_data_t * sinfo_data, int width,
bool right_justify, char *suffix);
int _print_state_long(sinfo_data_t * sinfo_data, int width,
bool right_justify, char *suffix);
-int _print_time(sinfo_data_t * sinfo_data, int width,
+int _print_time(sinfo_data_t * sinfo_data, int width,
bool right_justify, char *suffix);
-int _print_default_time(sinfo_data_t * sinfo_data, int width,
+int _print_default_time(sinfo_data_t * sinfo_data, int width,
bool right_justify, char *suffix);
int _print_weight(sinfo_data_t * sinfo_data, int width,
bool right_justify, char *suffix);
diff --git a/src/sinfo/sinfo.c b/src/sinfo/sinfo.c
index 7771a5081405b091455946f2ebd35fe642f835b6..2118afaf010194b270c4f3fc6b3527b7d97697c9 100644
--- a/src/sinfo/sinfo.c
+++ b/src/sinfo/sinfo.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Joey Ekstrom <ekstrom1@llnl.gov>, Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -47,7 +47,7 @@
#include "src/sinfo/sinfo.h"
#include "src/sinfo/print.h"
-#ifdef HAVE_BG
+#ifdef HAVE_BG
# include "src/plugins/select/bluegene/wrap_rm_api.h"
# include "src/plugins/select/bluegene/plugin/bluegene.h"
#endif
@@ -67,17 +67,17 @@ static int cpus_per_node = 1;
* Funtions *
************/
static int _bg_report(block_info_msg_t *block_ptr);
-static int _build_sinfo_data(List sinfo_list,
+static int _build_sinfo_data(List sinfo_list,
partition_info_msg_t *partition_msg,
node_info_msg_t *node_msg);
-static sinfo_data_t *_create_sinfo(partition_info_t* part_ptr,
+static sinfo_data_t *_create_sinfo(partition_info_t* part_ptr,
uint16_t part_inx, node_info_t *node_ptr,
uint32_t node_scaling);
static bool _filter_out(node_info_t *node_ptr);
static void _sinfo_list_delete(void *data);
-static bool _match_node_data(sinfo_data_t *sinfo_ptr,
+static bool _match_node_data(sinfo_data_t *sinfo_ptr,
node_info_t *node_ptr);
-static bool _match_part_data(sinfo_data_t *sinfo_ptr,
+static bool _match_part_data(sinfo_data_t *sinfo_ptr,
partition_info_t* part_ptr);
static int _query_server(partition_info_msg_t ** part_pptr,
node_info_msg_t ** node_pptr,
@@ -171,10 +171,10 @@ static char *_part_state_str(int state)
#ifdef HAVE_BG
switch (state) {
#ifdef HAVE_BGL
- case RM_PARTITION_BUSY:
+ case RM_PARTITION_BUSY:
return "BUSY";
#else
- case RM_PARTITION_REBOOTING:
+ case RM_PARTITION_REBOOTING:
return "REBOOTING";
#endif
case RM_PARTITION_CONFIGURING:
@@ -230,7 +230,7 @@ static int _bg_report(block_info_msg_t *block_ptr)
/*
* _query_server - download the current server state
* part_pptr IN/OUT - partition information message
- * node_pptr IN/OUT - node information message
+ * node_pptr IN/OUT - node information message
* RET zero or error code
*/
static int
@@ -248,7 +248,7 @@ _query_server(partition_info_msg_t ** part_pptr,
if (params.all_flag)
show_flags |= SHOW_ALL;
-
+
if (old_part_ptr) {
error_code =
slurm_load_partitions(old_part_ptr->last_update,
@@ -270,21 +270,21 @@ _query_server(partition_info_msg_t ** part_pptr,
old_part_ptr = new_part_ptr;
*part_pptr = new_part_ptr;
-
+
if (old_node_ptr) {
error_code =
slurm_load_node(old_node_ptr->last_update,
&new_node_ptr, show_flags);
- if (error_code == SLURM_SUCCESS)
+ if (error_code == SLURM_SUCCESS)
slurm_free_node_info_msg(old_node_ptr);
else if (slurm_get_errno() == SLURM_NO_CHANGE_IN_DATA) {
error_code = SLURM_SUCCESS;
new_node_ptr = old_node_ptr;
}
- } else
+ } else
error_code = slurm_load_node((time_t) NULL, &new_node_ptr,
show_flags);
-
+
if (error_code) {
slurm_perror("slurm_load_node");
return error_code;
@@ -294,7 +294,7 @@ _query_server(partition_info_msg_t ** part_pptr,
#ifdef HAVE_BG
if (old_bg_ptr) {
- error_code = slurm_load_block_info(old_bg_ptr->last_update,
+ error_code = slurm_load_block_info(old_bg_ptr->last_update,
&new_bg_ptr);
if (error_code == SLURM_SUCCESS)
slurm_free_block_info_msg(&old_bg_ptr);
@@ -303,7 +303,7 @@ _query_server(partition_info_msg_t ** part_pptr,
new_bg_ptr = old_bg_ptr;
}
} else {
- error_code = slurm_load_block_info((time_t) NULL,
+ error_code = slurm_load_block_info((time_t) NULL,
&new_bg_ptr);
}
if (error_code) {
@@ -317,36 +317,36 @@ _query_server(partition_info_msg_t ** part_pptr,
}
/*
- * _build_sinfo_data - make a sinfo_data entry for each unique node
+ * _build_sinfo_data - make a sinfo_data entry for each unique node
* configuration and add it to the sinfo_list for later printing.
* sinfo_list IN/OUT - list of unique sinfo_data records to report
* partition_msg IN - partition info message
* node_msg IN - node info message
- * RET zero or error code
+ * RET zero or error code
*/
-static int _build_sinfo_data(List sinfo_list,
- partition_info_msg_t *partition_msg,
+static int _build_sinfo_data(List sinfo_list,
+ partition_info_msg_t *partition_msg,
node_info_msg_t *node_msg)
{
node_info_t *node_ptr = NULL;
partition_info_t *part_ptr = NULL;
int j, j2;
-
+
g_node_scaling = node_msg->node_scaling;
#ifdef HAVE_BG
cpus_per_node = node_msg->node_array[0].cpus / g_node_scaling;
#endif
-
+
/* by default every partition is shown, even if no nodes */
if ((!params.node_flag) && params.match_flags.partition_flag) {
part_ptr = partition_msg->partition_array;
for (j=0; j<partition_msg->record_count; j++, part_ptr++) {
- if ((!params.partition) ||
+ if ((!params.partition) ||
(_strcmp(params.partition, part_ptr->name) == 0)) {
list_append(sinfo_list, _create_sinfo(
part_ptr, (uint16_t) j,
- NULL,
+ NULL,
node_msg->node_scaling));
}
}
@@ -355,11 +355,11 @@ static int _build_sinfo_data(List sinfo_list,
/* make sinfo_list entries for every node in every partition */
for (j=0; j<partition_msg->record_count; j++, part_ptr++) {
part_ptr = &(partition_msg->partition_array[j]);
-
+
if (params.filtering && params.partition &&
_strcmp(part_ptr->name, params.partition))
continue;
-
+
j2 = 0;
while(part_ptr->node_inx[j2] >= 0) {
int i2 = 0;
@@ -368,19 +368,19 @@ static int _build_sinfo_data(List sinfo_list,
i2 <= part_ptr->node_inx[j2+1];
i2++) {
node_ptr = &(node_msg->node_array[i2]);
-
+
if (node_ptr->name == NULL ||
(params.filtering &&
_filter_out(node_ptr)))
continue;
if(select_g_select_nodeinfo_get(
- node_ptr->select_nodeinfo,
+ node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBGRP_SIZE,
0,
&subgrp_size) == SLURM_SUCCESS
&& subgrp_size)
- _handle_subgrps(sinfo_list,
+ _handle_subgrps(sinfo_list,
(uint16_t) j,
part_ptr,
node_ptr,
@@ -402,7 +402,7 @@ static int _build_sinfo_data(List sinfo_list,
}
/*
- * _filter_out - Determine if the specified node should be filtered out or
+ * _filter_out - Determine if the specified node should be filtered out or
* reported.
* node_ptr IN - node to consider filtering out
* RET - true if node should not be reported, false otherwise
@@ -433,7 +433,7 @@ static bool _filter_out(node_info_t *node_ptr)
iterator = list_iterator_create(params.state_list);
while ((node_state = list_next(iterator))) {
- if (*node_state ==
+ if (*node_state ==
(NODE_STATE_DRAIN | NODE_STATE_ALLOCATED)) {
/* We search for anything that gets mapped to
* DRAINING in node_state_string */
@@ -444,7 +444,7 @@ static bool _filter_out(node_info_t *node_ptr)
match = true;
break;
}
- } else if (*node_state ==
+ } else if (*node_state ==
(NODE_STATE_DRAIN | NODE_STATE_IDLE)) {
/* We search for anything that gets mapped to
* DRAINED in node_state_string */
@@ -462,7 +462,7 @@ static bool _filter_out(node_info_t *node_ptr)
}
} else if (*node_state == NODE_STATE_ERROR) {
slurm_get_select_nodeinfo(
- node_ptr->select_nodeinfo,
+ node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ERROR,
&cpus);
@@ -472,7 +472,7 @@ static bool _filter_out(node_info_t *node_ptr)
}
} else if (*node_state == NODE_STATE_ALLOCATED) {
slurm_get_select_nodeinfo(
- node_ptr->select_nodeinfo,
+ node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ALLOCATED,
&cpus);
@@ -488,9 +488,9 @@ static bool _filter_out(node_info_t *node_ptr)
break;
}
} else {
- base_state =
+ base_state =
node_ptr->node_state & NODE_STATE_BASE;
- if (base_state == *node_state) {
+ if (base_state == *node_state) {
match = true;
break;
}
@@ -515,7 +515,7 @@ static void _sort_hostlist(List sinfo_list)
list_iterator_destroy(i);
}
-static bool _match_node_data(sinfo_data_t *sinfo_ptr,
+static bool _match_node_data(sinfo_data_t *sinfo_ptr,
node_info_t *node_ptr)
{
if (sinfo_ptr->nodes &&
@@ -536,7 +536,7 @@ static bool _match_node_data(sinfo_data_t *sinfo_ptr,
return false;
}
- /* If no need to exactly match sizes, just return here
+ /* If no need to exactly match sizes, just return here
* otherwise check cpus, disk, memory and weigth individually */
if (!params.exact_match)
return true;
@@ -571,7 +571,7 @@ static bool _match_node_data(sinfo_data_t *sinfo_ptr,
return true;
}
-static bool _match_part_data(sinfo_data_t *sinfo_ptr,
+static bool _match_part_data(sinfo_data_t *sinfo_ptr,
partition_info_t* part_ptr)
{
if (part_ptr == sinfo_ptr->part_info) /* identical partition */
@@ -582,9 +582,9 @@ static bool _match_part_data(sinfo_data_t *sinfo_ptr,
if (params.match_flags.avail_flag &&
(part_ptr->state_up != sinfo_ptr->part_info->state_up))
return false;
-
+
if (params.match_flags.groups_flag &&
- (_strcmp(part_ptr->allow_groups,
+ (_strcmp(part_ptr->allow_groups,
sinfo_ptr->part_info->allow_groups)))
return false;
@@ -696,11 +696,11 @@ static void _update_sinfo(sinfo_data_t *sinfo_ptr, node_info_t *node_ptr,
total_cpus = node_ptr->cpus;
total_nodes = node_scaling;
- select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
+ select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ALLOCATED,
&used_cpus);
- select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
+ select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ERROR,
&error_cpus);
@@ -718,7 +718,7 @@ static void _update_sinfo(sinfo_data_t *sinfo_ptr, node_info_t *node_ptr,
sinfo_ptr->nodes_alloc += used_cpus;
sinfo_ptr->nodes_other += error_cpus;
- sinfo_ptr->nodes_idle +=
+ sinfo_ptr->nodes_idle +=
(total_nodes - (used_cpus + error_cpus));
used_cpus *= cpus_per_node;
error_cpus *= cpus_per_node;
@@ -749,7 +749,7 @@ static void _update_sinfo(sinfo_data_t *sinfo_ptr, node_info_t *node_ptr,
sinfo_ptr->nodes_alloc += total_nodes;
else if (base_state == NODE_STATE_IDLE)
sinfo_ptr->nodes_idle += total_nodes;
- else
+ else
sinfo_ptr->nodes_other += total_nodes;
#endif
sinfo_ptr->nodes_total += total_nodes;
@@ -765,22 +765,22 @@ static void _update_sinfo(sinfo_data_t *sinfo_ptr, node_info_t *node_ptr,
} else if (IS_NODE_DRAIN(node_ptr) ||
(base_state == NODE_STATE_DOWN)) {
sinfo_ptr->cpus_other += total_cpus;
- } else
+ } else
sinfo_ptr->cpus_idle += total_cpus;
-
+
/* info("count is now %d %d %d %d", */
/* sinfo_ptr->cpus_alloc, sinfo_ptr->cpus_idle, */
/* sinfo_ptr->cpus_other, sinfo_ptr->cpus_total); */
}
-static int _insert_node_ptr(List sinfo_list, uint16_t part_num,
+static int _insert_node_ptr(List sinfo_list, uint16_t part_num,
partition_info_t *part_ptr,
node_info_t *node_ptr, uint32_t node_scaling)
{
int rc = SLURM_SUCCESS;
sinfo_data_t *sinfo_ptr = NULL;
- ListIterator itr = NULL;
-
+ ListIterator itr = NULL;
+
itr = list_iterator_create(sinfo_list);
while ((sinfo_ptr = list_next(itr))) {
if (!_match_part_data(sinfo_ptr, part_ptr))
@@ -792,16 +792,16 @@ static int _insert_node_ptr(List sinfo_list, uint16_t part_num,
break;
}
list_iterator_destroy(itr);
-
+
/* if no match, create new sinfo_data entry */
- if (!sinfo_ptr)
+ if (!sinfo_ptr)
list_append(sinfo_list,
_create_sinfo(part_ptr, part_num,
- node_ptr, node_scaling));
+ node_ptr, node_scaling));
return rc;
}
-static int _handle_subgrps(List sinfo_list, uint16_t part_num,
+static int _handle_subgrps(List sinfo_list, uint16_t part_num,
partition_info_t *part_ptr,
node_info_t *node_ptr, uint32_t node_scaling)
{
@@ -820,9 +820,9 @@ static int _handle_subgrps(List sinfo_list, uint16_t part_num,
/* 0, */
/* &size) != SLURM_SUCCESS) */
/* return SLURM_ERROR; */
-
+
/* bitmap = bit_alloc(size); */
-
+
/* If we ever update the hostlist stuff to support this stuff
* then we can use this to tack on the end of the node name
* the subgrp stuff. On bluegene systems this would be nice
@@ -830,20 +830,20 @@ static int _handle_subgrps(List sinfo_list, uint16_t part_num,
*/
/* orig_name = node_ptr->name; */
/* node_ptr->name = NULL; */
- if (params.state_list)
+ if (params.state_list)
iterator = list_iterator_create(params.state_list);
for(i=0; i<state_cnt; i++) {
if(iterator) {
while ((node_state = list_next(iterator))) {
- if(*node_state == state[i])
+ if(*node_state == state[i])
break;
}
list_iterator_reset(iterator);
- if(!node_state)
+ if(!node_state)
continue;
}
- if(select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
+ if(select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
state[i],
&size) == SLURM_SUCCESS
@@ -854,7 +854,7 @@ static int _handle_subgrps(List sinfo_list, uint16_t part_num,
/* state[i], */
/* &tmp_bitmap) != SLURM_SUCCESS) */
/* continue; */
-
+
/* if(select_g_select_nodeinfo_get( */
/* node_ptr->select_nodeinfo, */
/* SELECT_NODEDATA_STR, */
@@ -903,7 +903,7 @@ static int _handle_subgrps(List sinfo_list, uint16_t part_num,
return SLURM_SUCCESS;
}
node_ptr->node_state &= NODE_STATE_FLAGS;
- node_ptr->node_state |= NODE_STATE_IDLE;
+ node_ptr->node_state |= NODE_STATE_IDLE;
/* info("%s got %s of %u", node_ptr->name, */
/* node_state_string(node_ptr->node_state), size); */
if((int)node_scaling > 0)
@@ -918,14 +918,14 @@ static int _handle_subgrps(List sinfo_list, uint16_t part_num,
return SLURM_SUCCESS;
}
-/*
+/*
* _create_sinfo - create an sinfo record for the given node and partition
* sinfo_list IN/OUT - table of accumulated sinfo records
* part_ptr IN - pointer to partition record to add
* part_inx IN - index of partition record (0-origin)
* node_ptr IN - pointer to node record to add
*/
-static sinfo_data_t *_create_sinfo(partition_info_t* part_ptr,
+static sinfo_data_t *_create_sinfo(partition_info_t* part_ptr,
uint16_t part_inx, node_info_t *node_ptr,
uint32_t node_scaling)
{
@@ -937,9 +937,9 @@ static sinfo_data_t *_create_sinfo(partition_info_t* part_ptr,
sinfo_ptr->part_inx = part_inx;
sinfo_ptr->nodes = hostlist_create("");
- if (node_ptr)
+ if (node_ptr)
_update_sinfo(sinfo_ptr, node_ptr, node_scaling);
-
+
return sinfo_ptr;
}
@@ -952,7 +952,7 @@ static void _sinfo_list_delete(void *data)
}
/* like strcmp, but works with NULL pointers */
-static int _strcmp(char *data1, char *data2)
+static int _strcmp(char *data1, char *data2)
{
static char null_str[] = "(null)";
diff --git a/src/sinfo/sinfo.h b/src/sinfo/sinfo.h
index 4eeb583ba6822eff1c031735906b02324714ae05..9c11c52dfd5204fbc3fe3855556a48372421488e 100644
--- a/src/sinfo/sinfo.h
+++ b/src/sinfo/sinfo.h
@@ -17,15 +17,15 @@
* 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
+ * 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
+ * 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
+ * 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
@@ -105,13 +105,13 @@ typedef struct {
#ifdef HAVE_BG
hostlist_t ionodes;
#endif
- /* part_info contains partition, avail, max_time, job_size,
+ /* part_info contains partition, avail, max_time, job_size,
* root, share, groups, priority */
partition_info_t* part_info;
uint16_t part_inx;
} sinfo_data_t;
-/* Identify what fields must match for a node's information to be
+/* Identify what fields must match for a node's information to be
* combined into a single sinfo_data entry based upon output format */
struct sinfo_match_flags {
bool avail_flag;
diff --git a/src/sinfo/sort.c b/src/sinfo/sort.c
index 4eb53621cbf3ccae877d4fae1df0b3dbddc35456..3feaa3a0418d04f8da9adb657ba27fd026d8a460 100644
--- a/src/sinfo/sort.c
+++ b/src/sinfo/sort.c
@@ -3,35 +3,35 @@
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Joey Ekstrom <ekstrom1@llnl.gov>,
+ * Written by Joey Ekstrom <ekstrom1@llnl.gov>,
* Morris Jette <jette1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -90,7 +90,7 @@ void sort_sinfo_list(List sinfo_list)
reverse_order = false;
part_order = false;
- if ((params.sort[i] == ',') || (params.sort[i] == '#') ||
+ if ((params.sort[i] == ',') || (params.sort[i] == '#') ||
(params.sort[i] == '+') || (params.sort[i] == '-'))
continue;
if ((i > 0) && (params.sort[i-1] == '-'))
@@ -474,7 +474,7 @@ static int _sort_by_reason(void *void1, void *void2)
/* Sort by the time associated with the reason (if any).
* If no time, sort by the "reason" string.
- * "reason" is of the format "<reason[<user>@MM/DD-HH:MM_SS]"
+ * "reason" is of the format "<reason[<user>@MM/DD-HH:MM_SS]"
* or (ISO8601) "<reason[<user>@YYYY-MM-DDTHH:MM:SS]"
* In either case a simple string compare sort order the records. */
static int _sort_by_reason_time(void *void1, void *void2)
diff --git a/src/slurmctld/acct_policy.c b/src/slurmctld/acct_policy.c
index bf6efeabdb5c0e73b530ce30565bc42abfdc6071..0fcaba9601a8578acad8df836ffa40c0bea07b43 100644
--- a/src/slurmctld/acct_policy.c
+++ b/src/slurmctld/acct_policy.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -82,7 +82,7 @@ static bool _valid_job_assoc(struct job_record *job_ptr)
assoc_rec.acct = job_ptr->account;
}
if (assoc_mgr_fill_in_assoc(acct_db_conn, &assoc_rec,
- accounting_enforce,
+ accounting_enforce,
(acct_association_rec_t **)
&job_ptr->assoc_ptr)) {
info("_validate_job_assoc: invalid account or "
@@ -114,8 +114,8 @@ extern void acct_policy_add_job_submit(struct job_record *job_ptr)
slurm_mutex_lock(&assoc_mgr_qos_lock);
qos_ptr = (acct_qos_rec_t *)job_ptr->qos_ptr;
- if(!qos_ptr->user_limit_list)
- qos_ptr->user_limit_list =
+ if(!qos_ptr->user_limit_list)
+ qos_ptr->user_limit_list =
list_create(destroy_acct_used_limits);
itr = list_iterator_create(qos_ptr->user_limit_list);
while((used_limits = list_next(itr))) {
@@ -128,15 +128,15 @@ extern void acct_policy_add_job_submit(struct job_record *job_ptr)
used_limits->uid = job_ptr->user_id;
list_append(qos_ptr->user_limit_list, used_limits);
}
- qos_ptr->grp_used_submit_jobs++;
- used_limits->submit_jobs++;
+ qos_ptr->grp_used_submit_jobs++;
+ used_limits->submit_jobs++;
slurm_mutex_unlock(&assoc_mgr_qos_lock);
}
slurm_mutex_lock(&assoc_mgr_association_lock);
assoc_ptr = (acct_association_rec_t *)job_ptr->assoc_ptr;
while(assoc_ptr) {
- assoc_ptr->used_submit_jobs++;
+ assoc_ptr->used_submit_jobs++;
/* now handle all the group limits of the parents */
assoc_ptr = assoc_ptr->parent_assoc_ptr;
}
@@ -152,7 +152,7 @@ extern void acct_policy_remove_job_submit(struct job_record *job_ptr)
{
acct_association_rec_t *assoc_ptr = NULL;
- if (!job_ptr->assoc_ptr ||
+ if (!job_ptr->assoc_ptr ||
!(accounting_enforce & ACCOUNTING_ENFORCE_LIMITS))
return;
@@ -163,8 +163,8 @@ extern void acct_policy_remove_job_submit(struct job_record *job_ptr)
slurm_mutex_lock(&assoc_mgr_qos_lock);
qos_ptr = (acct_qos_rec_t *)job_ptr->qos_ptr;
- if(!qos_ptr->user_limit_list)
- qos_ptr->user_limit_list =
+ if(!qos_ptr->user_limit_list)
+ qos_ptr->user_limit_list =
list_create(destroy_acct_used_limits);
itr = list_iterator_create(qos_ptr->user_limit_list);
while((used_limits = list_next(itr))) {
@@ -179,26 +179,26 @@ extern void acct_policy_remove_job_submit(struct job_record *job_ptr)
}
if(qos_ptr->grp_used_submit_jobs)
- qos_ptr->grp_used_submit_jobs--;
+ qos_ptr->grp_used_submit_jobs--;
else
debug2("_acct_remove_job_submit: "
"grp_submit_jobs underflow for qos %s",
qos_ptr->name);
if(used_limits->submit_jobs)
- used_limits->submit_jobs--;
+ used_limits->submit_jobs--;
else
debug2("_acct_remove_job_submit: "
"used_submit_jobs underflow for qos %s user %d",
qos_ptr->name, used_limits->uid);
-
+
slurm_mutex_unlock(&assoc_mgr_qos_lock);
}
slurm_mutex_lock(&assoc_mgr_association_lock);
assoc_ptr = (acct_association_rec_t *)job_ptr->assoc_ptr;
while(assoc_ptr) {
- if (assoc_ptr->used_submit_jobs)
+ if (assoc_ptr->used_submit_jobs)
assoc_ptr->used_submit_jobs--;
else
debug2("_acct_remove_job_submit: "
@@ -228,8 +228,8 @@ extern void acct_policy_job_begin(struct job_record *job_ptr)
slurm_mutex_lock(&assoc_mgr_qos_lock);
qos_ptr = (acct_qos_rec_t *)job_ptr->qos_ptr;
- if(!qos_ptr->user_limit_list)
- qos_ptr->user_limit_list =
+ if(!qos_ptr->user_limit_list)
+ qos_ptr->user_limit_list =
list_create(destroy_acct_used_limits);
itr = list_iterator_create(qos_ptr->user_limit_list);
while((used_limits = list_next(itr))) {
@@ -242,17 +242,17 @@ extern void acct_policy_job_begin(struct job_record *job_ptr)
used_limits->uid = job_ptr->user_id;
list_append(qos_ptr->user_limit_list, used_limits);
}
- qos_ptr->grp_used_jobs++;
+ qos_ptr->grp_used_jobs++;
qos_ptr->grp_used_cpus += job_ptr->total_procs;
qos_ptr->grp_used_nodes += job_ptr->node_cnt;
- used_limits->jobs++;
+ used_limits->jobs++;
slurm_mutex_unlock(&assoc_mgr_qos_lock);
}
slurm_mutex_lock(&assoc_mgr_association_lock);
assoc_ptr = (acct_association_rec_t *)job_ptr->assoc_ptr;
while(assoc_ptr) {
- assoc_ptr->used_jobs++;
+ assoc_ptr->used_jobs++;
assoc_ptr->grp_used_cpus += job_ptr->total_procs;
assoc_ptr->grp_used_nodes += job_ptr->node_cnt;
/* now handle all the group limits of the parents */
@@ -280,8 +280,8 @@ extern void acct_policy_job_fini(struct job_record *job_ptr)
slurm_mutex_lock(&assoc_mgr_qos_lock);
qos_ptr = (acct_qos_rec_t *)job_ptr->qos_ptr;
- if(!qos_ptr->user_limit_list)
- qos_ptr->user_limit_list =
+ if(!qos_ptr->user_limit_list)
+ qos_ptr->user_limit_list =
list_create(destroy_acct_used_limits);
itr = list_iterator_create(qos_ptr->user_limit_list);
while((used_limits = list_next(itr))) {
@@ -295,33 +295,33 @@ extern void acct_policy_job_fini(struct job_record *job_ptr)
list_append(qos_ptr->user_limit_list, used_limits);
}
- if(qos_ptr->grp_used_jobs)
+ if(qos_ptr->grp_used_jobs)
qos_ptr->grp_used_jobs--;
else
debug2("acct_policy_job_fini: used_jobs underflow "
"for qos %s", qos_ptr->name);
-
+
qos_ptr->grp_used_cpus -= job_ptr->total_procs;
if((int)qos_ptr->grp_used_cpus < 0) {
qos_ptr->grp_used_cpus = 0;
debug2("acct_policy_job_fini: grp_used_cpus underflow "
- "for qos %s", qos_ptr->name);
+ "for qos %s", qos_ptr->name);
}
qos_ptr->grp_used_nodes -= job_ptr->node_cnt;
if((int)qos_ptr->grp_used_nodes < 0) {
qos_ptr->grp_used_nodes = 0;
debug2("acct_policy_job_fini: grp_used_nodes underflow "
- "for qos %s", qos_ptr->name);
+ "for qos %s", qos_ptr->name);
}
if(used_limits->jobs)
- used_limits->jobs--;
+ used_limits->jobs--;
else
debug2("acct_policy_job_fini: used_jobs underflow "
"for qos %s user %d", qos_ptr->name,
used_limits->uid);
-
+
slurm_mutex_unlock(&assoc_mgr_qos_lock);
}
@@ -356,7 +356,7 @@ extern void acct_policy_job_fini(struct job_record *job_ptr)
* acct_policy_job_runnable - Determine of the specified job can execute
* right now or not depending upon accounting policy (e.g. running
* job limit for this association). If the association limits prevent
- * the job from ever running (lowered limits since job submissin),
+ * the job from ever running (lowered limits since job submissin),
* then cancel the job.
*/
extern bool acct_policy_job_runnable(struct job_record *job_ptr)
@@ -368,7 +368,7 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
uint64_t usage_mins;
uint32_t wall_mins;
int parent = 0; /*flag to tell us if we are looking at the
- * parent or not
+ * parent or not
*/
/* check to see if we are enforcing associations */
@@ -403,7 +403,7 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
debug2("Job %u being held, "
"the job is at or exceeds QOS %s's "
"group max cpu minutes of %llu with %llu",
- job_ptr->job_id,
+ job_ptr->job_id,
qos_ptr->name, qos_ptr->grp_cpu_mins,
usage_mins);
rc = false;
@@ -421,28 +421,28 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
debug2("job %u being held, "
"the job is at or exceeds QOS %s's "
"group max jobs limit %u with %u for qos %s",
- job_ptr->job_id,
- qos_ptr->grp_jobs,
+ job_ptr->job_id,
+ qos_ptr->grp_jobs,
qos_ptr->grp_used_jobs, qos_ptr->name);
-
+
rc = false;
goto end_qos;
}
-
+
if (qos_ptr->grp_nodes != INFINITE) {
if (job_ptr->details->min_nodes > qos_ptr->grp_nodes) {
info("job %u is being cancelled, "
"min node request %u exceeds "
"group max node limit %u for qos '%s'",
- job_ptr->job_id,
- job_ptr->details->min_nodes,
+ job_ptr->job_id,
+ job_ptr->details->min_nodes,
qos_ptr->grp_nodes,
qos_ptr->name);
_cancel_job(job_ptr);
- } else if ((qos_ptr->grp_used_nodes +
- job_ptr->details->min_nodes) >
+ } else if ((qos_ptr->grp_used_nodes +
+ job_ptr->details->min_nodes) >
qos_ptr->grp_nodes) {
- job_ptr->state_reason =
+ job_ptr->state_reason =
WAIT_ASSOC_RESOURCE_LIMIT;
xfree(job_ptr->state_desc);
debug2("job %u being held, "
@@ -451,9 +451,9 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
"with already used %u + requested %u "
"for qos %s",
job_ptr->job_id,
- qos_ptr->grp_nodes,
+ qos_ptr->grp_nodes,
qos_ptr->grp_used_nodes,
- job_ptr->details->min_nodes,
+ job_ptr->details->min_nodes,
qos_ptr->name);
rc = false;
goto end_qos;
@@ -461,7 +461,7 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
}
/* we don't need to check submit_jobs here */
-
+
if ((qos_ptr->grp_wall != INFINITE)
&& (wall_mins >= qos_ptr->grp_wall)) {
job_ptr->state_reason = WAIT_ASSOC_JOB_LIMIT;
@@ -471,21 +471,21 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
"group wall limit %u "
"with %u for qos %s",
job_ptr->job_id,
- qos_ptr->grp_wall,
+ qos_ptr->grp_wall,
wall_mins, qos_ptr->name);
-
+
rc = false;
goto end_qos;
}
-
+
/* NOTE: We can't enforce qos_ptr->max_cpu_mins_pj at this
* time because we don't have access to a CPU count for the job
* due to how all of the job's specifications interact */
-
+
/* NOTE: We can't enforce qos_ptr->max_cpus at this
* time because we don't have access to a CPU count for the job
* due to how all of the job's specifications interact */
-
+
if (qos_ptr->max_jobs_pu != INFINITE) {
acct_used_limits_t *used_limits = NULL;
if(qos_ptr->user_limit_list) {
@@ -497,34 +497,34 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
}
list_iterator_destroy(itr);
}
- if(used_limits && (used_limits->jobs
+ if(used_limits && (used_limits->jobs
>= qos_ptr->max_jobs_pu)) {
debug2("job %u being held, "
"the job is at or exceeds "
"max jobs limit %u with %u for QOS %s",
job_ptr->job_id,
- qos_ptr->max_jobs_pu,
+ qos_ptr->max_jobs_pu,
used_limits->jobs, qos_ptr->name);
rc = false;
goto end_qos;
}
}
-
+
if (qos_ptr->max_nodes_pj != INFINITE) {
- if (job_ptr->details->min_nodes >
+ if (job_ptr->details->min_nodes >
qos_ptr->max_nodes_pj) {
info("job %u being cancelled, "
"min node limit %u exceeds "
"qos max %u",
job_ptr->job_id,
- job_ptr->details->min_nodes,
+ job_ptr->details->min_nodes,
qos_ptr->max_nodes_pj);
_cancel_job(job_ptr);
rc = false;
goto end_qos;
}
}
-
+
/* we don't need to check submit_jobs_pu here */
/* if the qos limits have changed since job
@@ -535,13 +535,13 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
(job_ptr->time_limit > time_limit)) {
info("job %u being cancelled, "
"time limit %u exceeds account max %u",
- job_ptr->job_id, job_ptr->time_limit,
+ job_ptr->job_id, job_ptr->time_limit,
time_limit);
_cancel_job(job_ptr);
rc = false;
goto end_qos;
}
- }
+ }
}
slurm_mutex_lock(&assoc_mgr_association_lock);
@@ -550,10 +550,10 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
usage_mins = (uint64_t)(assoc_ptr->usage_raw / 60.0);
wall_mins = assoc_ptr->grp_used_wall / 60;
#if _DEBUG
- info("acct_job_limits: %u of %u",
+ info("acct_job_limits: %u of %u",
assoc_ptr->used_jobs, assoc_ptr->max_jobs);
-#endif
- if ((!qos_ptr ||
+#endif
+ if ((!qos_ptr ||
(qos_ptr && qos_ptr->grp_cpu_mins == (uint64_t)INFINITE))
&& (assoc_ptr->grp_cpu_mins != (uint64_t)INFINITE)
&& (usage_mins >= assoc_ptr->grp_cpu_mins)) {
@@ -564,14 +564,14 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
"group max cpu minutes limit %llu "
"with %Lf for account %s",
job_ptr->job_id, assoc_ptr->id,
- assoc_ptr->grp_cpu_mins,
- assoc_ptr->usage_raw, assoc_ptr->acct);
-
+ assoc_ptr->grp_cpu_mins,
+ assoc_ptr->usage_raw, assoc_ptr->acct);
+
rc = false;
goto end_it;
}
- if ((!qos_ptr ||
+ if ((!qos_ptr ||
(qos_ptr && qos_ptr->grp_jobs == INFINITE)) &&
(assoc_ptr->grp_jobs != INFINITE) &&
(assoc_ptr->used_jobs >= assoc_ptr->grp_jobs)) {
@@ -581,29 +581,29 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
"assoc %u is at or exceeds "
"group max jobs limit %u with %u for account %s",
job_ptr->job_id, assoc_ptr->id,
- assoc_ptr->grp_jobs,
+ assoc_ptr->grp_jobs,
assoc_ptr->used_jobs, assoc_ptr->acct);
-
+
rc = false;
goto end_it;
}
-
- if ((!qos_ptr ||
+
+ if ((!qos_ptr ||
(qos_ptr && qos_ptr->grp_nodes == INFINITE))
&& (assoc_ptr->grp_nodes != INFINITE)) {
- if (job_ptr->details->min_nodes >
+ if (job_ptr->details->min_nodes >
assoc_ptr->grp_nodes) {
info("job %u being cancelled, "
"min node request %u exceeds "
"group max node limit %u for account %s",
- job_ptr->job_id,
- job_ptr->details->min_nodes,
+ job_ptr->job_id,
+ job_ptr->details->min_nodes,
assoc_ptr->grp_nodes, assoc_ptr->acct);
_cancel_job(job_ptr);
- } else if ((assoc_ptr->grp_used_nodes +
- job_ptr->details->min_nodes) >
+ } else if ((assoc_ptr->grp_used_nodes +
+ job_ptr->details->min_nodes) >
assoc_ptr->grp_nodes) {
- job_ptr->state_reason =
+ job_ptr->state_reason =
WAIT_ASSOC_RESOURCE_LIMIT;
xfree(job_ptr->state_desc);
debug2("job %u being held, "
@@ -612,9 +612,9 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
"with already used %u + requested %u "
"for account %s",
job_ptr->job_id, assoc_ptr->id,
- assoc_ptr->grp_nodes,
+ assoc_ptr->grp_nodes,
assoc_ptr->grp_used_nodes,
- job_ptr->details->min_nodes,
+ job_ptr->details->min_nodes,
assoc_ptr->acct);
rc = false;
goto end_it;
@@ -623,7 +623,7 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
/* we don't need to check submit_jobs here */
- if ((!qos_ptr ||
+ if ((!qos_ptr ||
(qos_ptr && qos_ptr->grp_wall == INFINITE))
&& (assoc_ptr->grp_wall != INFINITE)
&& (wall_mins >= assoc_ptr->grp_wall)) {
@@ -634,14 +634,14 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
"group wall limit %u "
"with %u for account %s",
job_ptr->job_id, assoc_ptr->id,
- assoc_ptr->grp_wall,
+ assoc_ptr->grp_wall,
wall_mins, assoc_ptr->acct);
-
+
rc = false;
goto end_it;
}
-
+
/* We don't need to look at the regular limits for
* parents since we have pre-propogated them, so just
* continue with the next parent
@@ -649,17 +649,17 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
if(parent) {
assoc_ptr = assoc_ptr->parent_assoc_ptr;
continue;
- }
-
+ }
+
/* NOTE: We can't enforce assoc_ptr->max_cpu_mins_pj at this
* time because we don't have access to a CPU count for the job
* due to how all of the job's specifications interact */
-
+
/* NOTE: We can't enforce assoc_ptr->max_cpus at this
* time because we don't have access to a CPU count for the job
* due to how all of the job's specifications interact */
- if ((!qos_ptr ||
+ if ((!qos_ptr ||
(qos_ptr && qos_ptr->max_jobs_pu == INFINITE)) &&
(assoc_ptr->max_jobs != INFINITE) &&
(assoc_ptr->used_jobs >= assoc_ptr->max_jobs)) {
@@ -669,22 +669,22 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
"assoc %u is at or exceeds "
"max jobs limit %u with %u for account %s",
job_ptr->job_id, assoc_ptr->id,
- assoc_ptr->max_jobs,
- assoc_ptr->used_jobs, assoc_ptr->acct);
+ assoc_ptr->max_jobs,
+ assoc_ptr->used_jobs, assoc_ptr->acct);
rc = false;
goto end_it;
}
-
- if ((!qos_ptr ||
+
+ if ((!qos_ptr ||
(qos_ptr && qos_ptr->max_nodes_pj == INFINITE))
&& (assoc_ptr->max_nodes_pj != INFINITE)) {
- if (job_ptr->details->min_nodes >
+ if (job_ptr->details->min_nodes >
assoc_ptr->max_nodes_pj) {
info("job %u being cancelled, "
"min node limit %u exceeds "
"account max %u",
job_ptr->job_id,
- job_ptr->details->min_nodes,
+ job_ptr->details->min_nodes,
assoc_ptr->max_nodes_pj);
_cancel_job(job_ptr);
rc = false;
@@ -696,7 +696,7 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
/* if the association limits have changed since job
* submission and job can not run, then kill it */
- if ((!qos_ptr ||
+ if ((!qos_ptr ||
(qos_ptr && qos_ptr->max_wall_pj == INFINITE))
&& (assoc_ptr->max_wall_pj != INFINITE)) {
time_limit = assoc_ptr->max_wall_pj;
@@ -704,14 +704,14 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
(job_ptr->time_limit > time_limit)) {
info("job %u being cancelled, "
"time limit %u exceeds account max %u",
- job_ptr->job_id, job_ptr->time_limit,
+ job_ptr->job_id, job_ptr->time_limit,
time_limit);
_cancel_job(job_ptr);
rc = false;
goto end_it;
}
- }
-
+ }
+
assoc_ptr = assoc_ptr->parent_assoc_ptr;
parent = 1;
}
diff --git a/src/slurmctld/acct_policy.h b/src/slurmctld/acct_policy.h
index 4bd31614c967f836ea78ea8c88451ee05d3c6faf..578cfbdbd5682de3558b0ae55aa00b81e31e6214 100644
--- a/src/slurmctld/acct_policy.h
+++ b/src/slurmctld/acct_policy.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -68,7 +68,7 @@ extern void acct_policy_job_fini(struct job_record *job_ptr);
* acct_policy_job_runnable - Determine of the specified job can execute
* right now or not depending upon accounting policy (e.g. running
* job limit for this association). If the association limits prevent
- * the job from ever running (lowered limits since job submissin),
+ * the job from ever running (lowered limits since job submissin),
* then cancel the job.
*/
extern bool acct_policy_job_runnable(struct job_record *job_ptr);
diff --git a/src/slurmctld/agent.c b/src/slurmctld/agent.c
index 4b0bbc691c8cfa46c318b3227ceefbf28583409d..f5f9f442f61c5743493a77674d7d328b5885c69e 100644
--- a/src/slurmctld/agent.c
+++ b/src/slurmctld/agent.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * agent.c - parallel background communication functions. This is where
+ * agent.c - parallel background communication functions. This is where
* logic could be placed for broadcast communications.
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
@@ -8,56 +8,56 @@
* Written by Morris Jette <jette1@llnl.gov>, et. al.
* Derived from pdsh written by Jim Garlick <garlick1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
*****************************************************************************
* Theory of operation:
*
- * The functions below permit slurm to initiate parallel tasks as a
- * detached thread and let the functions below make sure the work happens.
- * For example, when a job's time limit is to be changed slurmctld needs
- * to notify the slurmd on every node to which the job was allocated.
- * We don't want to hang slurmctld's primary function (the job update RPC)
- * to perform this work, so it just initiates an agent to perform the work.
- * The agent is passed all details required to perform the work, so it will
- * be possible to execute the agent as an pthread, process, or even a daemon
+ * The functions below permit slurm to initiate parallel tasks as a
+ * detached thread and let the functions below make sure the work happens.
+ * For example, when a job's time limit is to be changed slurmctld needs
+ * to notify the slurmd on every node to which the job was allocated.
+ * We don't want to hang slurmctld's primary function (the job update RPC)
+ * to perform this work, so it just initiates an agent to perform the work.
+ * The agent is passed all details required to perform the work, so it will
+ * be possible to execute the agent as an pthread, process, or even a daemon
* on some other computer.
*
* The main agent thread creates a separate thread for each node to be
- * communicated with up to AGENT_THREAD_COUNT. A special watchdog thread
- * sends SIGLARM to any threads that have been active (in DSH_ACTIVE state)
- * for more than COMMAND_TIMEOUT seconds.
+ * communicated with up to AGENT_THREAD_COUNT. A special watchdog thread
+ * sends SIGLARM to any threads that have been active (in DSH_ACTIVE state)
+ * for more than COMMAND_TIMEOUT seconds.
* The agent responds to slurmctld via a function call or an RPC as required.
* For example, informing slurmctld that some node is not responding.
*
- * All the state for each thread is maintained in thd_t struct, which is
+ * All the state for each thread is maintained in thd_t struct, which is
* used by the watchdog thread as well as the communication threads.
\*****************************************************************************/
@@ -120,7 +120,7 @@ typedef struct thd {
pthread_attr_t attr; /* thread attributes */
state_t state; /* thread state */
time_t start_time; /* start time */
- time_t end_time; /* end time or delta time
+ time_t end_time; /* end time or delta time
* upon termination */
slurm_addr *addr; /* specific addr to send to
* will not do nodelist if set */
@@ -141,7 +141,7 @@ typedef struct agent_info {
} agent_info_t;
typedef struct task_info {
- pthread_mutex_t *thread_mutex_ptr; /* pointer to agent specific
+ pthread_mutex_t *thread_mutex_ptr; /* pointer to agent specific
* mutex */
pthread_cond_t *thread_cond_ptr;/* pointer to agent specific
* condition */
@@ -154,7 +154,7 @@ typedef struct task_info {
typedef struct queued_request {
agent_arg_t* agent_arg_ptr; /* The queued request */
- time_t first_attempt; /* Time of first check for batch
+ time_t first_attempt; /* Time of first check for batch
* launch RPC *only* */
time_t last_attempt; /* Time of last xmit attempt */
} queued_request_t;
@@ -171,11 +171,11 @@ static void _list_delete_retry(void *retry_entry);
static agent_info_t *_make_agent_info(agent_arg_t *agent_arg_ptr);
static task_info_t *_make_task_data(agent_info_t *agent_info_ptr, int inx);
static void _notify_slurmctld_jobs(agent_info_t *agent_ptr);
-static void _notify_slurmctld_nodes(agent_info_t *agent_ptr,
+static void _notify_slurmctld_nodes(agent_info_t *agent_ptr,
int no_resp_cnt, int retry_cnt);
static void _purge_agent_args(agent_arg_t *agent_arg_ptr);
static void _queue_agent_retry(agent_info_t * agent_info_ptr, int count);
-static int _setup_requeue(agent_arg_t *agent_arg_ptr, thd_t *thread_ptr,
+static int _setup_requeue(agent_arg_t *agent_arg_ptr, thd_t *thread_ptr,
int count, int *spot);
static void _slurmctld_free_batch_job_launch_msg(batch_job_launch_msg_t * msg);
static void _spawn_retry_agent(agent_arg_t * agent_arg_ptr);
@@ -200,10 +200,10 @@ static int agent_cnt = 0;
static bool run_scheduler = false;
/*
- * agent - party responsible for transmitting an common RPC in parallel
- * across a set of nodes. Use agent_queue_request() if immediate
+ * agent - party responsible for transmitting an common RPC in parallel
+ * across a set of nodes. Use agent_queue_request() if immediate
* execution is not essential.
- * IN pointer to agent_arg_t, which is xfree'd (including hostlist,
+ * IN pointer to agent_arg_t, which is xfree'd (including hostlist,
* and msg_args) upon completion if AGENT_IS_THREAD is set
* RET always NULL (function format just for use as pthread)
*/
@@ -235,7 +235,7 @@ void *agent(void *args)
slurm_mutex_unlock(&agent_cnt_mutex);
if (slurmctld_config.shutdown_time)
goto cleanup;
-
+
/* basic argument value tests */
begin_time = time(NULL);
if (_valid_agent_arg(agent_arg_ptr))
@@ -273,7 +273,7 @@ void *agent(void *args)
&agent_info_ptr->thread_mutex);
}
- /* create thread specific data, NOTE: freed from
+ /* create thread specific data, NOTE: freed from
* _thread_per_group_rpc() */
task_specific_ptr = _make_task_data(agent_info_ptr, i);
@@ -303,7 +303,7 @@ void *agent(void *args)
agent_info_ptr->threads_active++;
slurm_mutex_unlock(&agent_info_ptr->thread_mutex);
}
-
+
/* wait for termination of remaining threads */
pthread_join(thread_wdog, NULL);
delay = (int) difftime(time(NULL), begin_time);
@@ -328,7 +328,7 @@ void *agent(void *args)
xfree(agent_info_ptr);
}
slurm_mutex_lock(&agent_cnt_mutex);
-
+
if (agent_cnt > 0)
agent_cnt--;
else {
@@ -336,7 +336,7 @@ void *agent(void *args)
agent_cnt = 0;
}
- if (agent_cnt && agent_cnt < MAX_AGENT_CNT)
+ if (agent_cnt && agent_cnt < MAX_AGENT_CNT)
agent_retry(RPC_RETRY_INTERVAL, true);
pthread_cond_broadcast(&agent_cnt_cond);
@@ -353,7 +353,7 @@ static int _valid_agent_arg(agent_arg_t *agent_arg_ptr)
if (agent_arg_ptr->node_count == 0)
return SLURM_FAILURE; /* no messages to be sent */
- if (agent_arg_ptr->node_count
+ if (agent_arg_ptr->node_count
!= hostlist_count(agent_arg_ptr->hostlist)) {
error("you said you were going to send to %d "
"hosts but I only have %d",
@@ -374,7 +374,7 @@ static agent_info_t *_make_agent_info(agent_arg_t *agent_arg_ptr)
hostlist_t hl = NULL;
char buf[8192];
char *name = NULL;
-
+
agent_info_ptr = xmalloc(sizeof(agent_info_t));
slurm_mutex_init(&agent_info_ptr->thread_mutex);
if (pthread_cond_init(&agent_info_ptr->thread_cond, NULL))
@@ -387,7 +387,7 @@ static agent_info_t *_make_agent_info(agent_arg_t *agent_arg_ptr)
agent_info_ptr->thread_struct = thread_ptr;
agent_info_ptr->msg_type = agent_arg_ptr->msg_type;
agent_info_ptr->msg_args_pptr = &agent_arg_ptr->msg_args;
-
+
if ((agent_arg_ptr->msg_type != REQUEST_SHUTDOWN) &&
(agent_arg_ptr->msg_type != REQUEST_RECONFIGURE) &&
(agent_arg_ptr->msg_type != SRUN_EXEC) &&
@@ -397,15 +397,15 @@ static agent_info_t *_make_agent_info(agent_arg_t *agent_arg_ptr)
(agent_arg_ptr->msg_type != SRUN_STEP_MISSING) &&
(agent_arg_ptr->msg_type != SRUN_JOB_COMPLETE)) {
/* Sending message to a possibly large number of slurmd.
- * Push all message forwarding to slurmd in order to
+ * Push all message forwarding to slurmd in order to
* offload as much work from slurmctld as possible. */
agent_info_ptr->get_reply = true;
- span = set_span(agent_arg_ptr->node_count, 1);
+ span = set_span(agent_arg_ptr->node_count, 1);
} else {
- /* Message is going to one node (for srun) or we want
+ /* Message is going to one node (for srun) or we want
* it to get processed ASAP (SHUTDOWN or RECONFIGURE).
* Send the message directly to each node. */
- span = set_span(agent_arg_ptr->node_count,
+ span = set_span(agent_arg_ptr->node_count,
agent_arg_ptr->node_count);
}
i = 0;
@@ -440,7 +440,7 @@ static agent_info_t *_make_agent_info(agent_arg_t *agent_arg_ptr)
#if 0
info("sending to nodes %s", thread_ptr[thr_count].nodelist);
#endif
- thr_count++;
+ thr_count++;
}
xfree(span);
agent_info_ptr->thread_count = thr_count;
@@ -463,16 +463,16 @@ static task_info_t *_make_task_data(agent_info_t *agent_info_ptr, int inx)
return task_info_ptr;
}
-static void _update_wdog_state(thd_t *thread_ptr,
- state_t *state,
+static void _update_wdog_state(thd_t *thread_ptr,
+ state_t *state,
thd_complete_t *thd_comp)
{
switch(*state) {
case DSH_ACTIVE:
thd_comp->work_done = false;
if (thread_ptr->end_time <= thd_comp->now) {
- debug3("agent thread %lu timed out\n",
- (unsigned long)
+ debug3("agent thread %lu timed out\n",
+ (unsigned long)
thread_ptr->thread);
if (pthread_kill(thread_ptr->thread, SIGUSR1) == ESRCH)
*state = DSH_NO_RESP;
@@ -497,11 +497,11 @@ static void _update_wdog_state(thd_t *thread_ptr,
}
}
-/*
- * _wdog - Watchdog thread. Send SIGUSR1 to threads which have been active
- * for too long.
+/*
+ * _wdog - Watchdog thread. Send SIGUSR1 to threads which have been active
+ * for too long.
* IN args - pointer to agent_info_t with info on threads to watch
- * Sleep between polls with exponential times (from 0.125 to 1.0 second)
+ * Sleep between polls with exponential times (from 0.125 to 1.0 second)
*/
static void *_wdog(void *args)
{
@@ -525,16 +525,16 @@ static void *_wdog(void *args)
srun_agent = true;
thd_comp.max_delay = 0;
-
+
while (1) {
thd_comp.work_done = true;/* assume all threads complete */
thd_comp.fail_cnt = 0; /* assume no threads failures */
thd_comp.no_resp_cnt = 0; /* assume all threads respond */
thd_comp.retry_cnt = 0; /* assume no required retries */
thd_comp.now = time(NULL);
-
+
usleep(usec);
- usec = MIN((usec * 2), 1000000);
+ usec = MIN((usec * 2), 1000000);
slurm_mutex_lock(&agent_ptr->thread_mutex);
for (i = 0; i < agent_ptr->thread_count; i++) {
@@ -556,15 +556,15 @@ static void *_wdog(void *args)
}
if (thd_comp.work_done)
break;
-
+
slurm_mutex_unlock(&agent_ptr->thread_mutex);
}
if (srun_agent) {
_notify_slurmctld_jobs(agent_ptr);
} else {
- _notify_slurmctld_nodes(agent_ptr,
- thd_comp.no_resp_cnt,
+ _notify_slurmctld_nodes(agent_ptr,
+ thd_comp.no_resp_cnt,
thd_comp.retry_cnt);
}
@@ -573,10 +573,10 @@ static void *_wdog(void *args)
list_destroy(thread_ptr[i].ret_list);
xfree(thread_ptr[i].nodelist);
}
-
+
if (thd_comp.max_delay)
debug2("agent maximum delay %d seconds", thd_comp.max_delay);
-
+
slurm_mutex_unlock(&agent_ptr->thread_mutex);
return (void *) NULL;
}
@@ -626,7 +626,7 @@ static void _notify_slurmctld_jobs(agent_info_t *agent_ptr)
#endif
}
-static void _notify_slurmctld_nodes(agent_info_t *agent_ptr,
+static void _notify_slurmctld_nodes(agent_info_t *agent_ptr,
int no_resp_cnt, int retry_cnt)
{
ListIterator itr = NULL;
@@ -649,7 +649,7 @@ static void _notify_slurmctld_nodes(agent_info_t *agent_ptr,
lock_slurmctld(node_write_lock);
if (agent_ptr->msg_type == REQUEST_BATCH_JOB_LAUNCH) {
/* Requeue the request */
- batch_job_launch_msg_t *launch_msg_ptr =
+ batch_job_launch_msg_t *launch_msg_ptr =
*agent_ptr->msg_args_pptr;
uint32_t job_id = launch_msg_ptr->job_id;
job_complete(job_id, 0, true, 0);
@@ -670,9 +670,9 @@ static void _notify_slurmctld_nodes(agent_info_t *agent_ptr,
state = thread_ptr[i].state;
is_ret_list = 0;
goto switch_on_state;
- }
+ }
is_ret_list = 1;
-
+
itr = list_iterator_create(thread_ptr[i].ret_list);
while((ret_data_info = list_next(itr))) {
state = ret_data_info->err;
@@ -694,7 +694,7 @@ static void _notify_slurmctld_nodes(agent_info_t *agent_ptr,
error("Prolog/epilog failure");
#else
if(!is_ret_list) {
- set_node_down(thread_ptr[i].nodelist,
+ set_node_down(thread_ptr[i].nodelist,
"Prolog/epilog failure");
break;
}
@@ -786,9 +786,9 @@ static void *_thread_per_group_rpc(void *args)
int rc = SLURM_SUCCESS;
slurm_msg_t msg;
task_info_t *task_ptr = (task_info_t *) args;
- /* we cache some pointers from task_info_t because we need
- * to xfree args before being finished with their use. xfree
- * is required for timely termination of this pthread because
+ /* we cache some pointers from task_info_t because we need
+ * to xfree args before being finished with their use. xfree
+ * is required for timely termination of this pthread because
* xfree could lock it at the end, preventing a timely
* thread_exit */
pthread_mutex_t *thread_mutex_ptr = task_ptr->thread_mutex_ptr;
@@ -806,7 +806,7 @@ static void *_thread_per_group_rpc(void *args)
#if AGENT_IS_THREAD
/* Locks: Write job, write node */
- slurmctld_lock_t job_write_lock = {
+ slurmctld_lock_t job_write_lock = {
NO_LOCK, WRITE_LOCK, WRITE_LOCK, NO_LOCK };
#endif
xassert(args != NULL);
@@ -840,15 +840,15 @@ static void *_thread_per_group_rpc(void *args)
if (task_ptr->get_reply) {
if(thread_ptr->addr) {
msg.address = *thread_ptr->addr;
-
+
if(!(ret_list = slurm_send_addr_recv_msgs(
&msg, thread_ptr->nodelist, 0))) {
error("_thread_per_group_rpc: "
"no ret_list given");
goto cleanup;
}
-
-
+
+
} else {
if(!(ret_list = slurm_send_recv_msgs(
thread_ptr->nodelist,
@@ -868,7 +868,7 @@ static void *_thread_per_group_rpc(void *args)
&msg.address) == SLURM_ERROR) {
error("_thread_per_group_rpc: "
"can't find address for host %s, "
- "check slurm.conf",
+ "check slurm.conf",
thread_ptr->nodelist);
goto cleanup;
}
@@ -882,39 +882,39 @@ static void *_thread_per_group_rpc(void *args)
}
goto cleanup;
}
-
+
//info("got %d messages back", list_count(ret_list));
found = 0;
- itr = list_iterator_create(ret_list);
+ itr = list_iterator_create(ret_list);
while((ret_data_info = list_next(itr)) != NULL) {
- rc = slurm_get_return_code(ret_data_info->type,
+ rc = slurm_get_return_code(ret_data_info->type,
ret_data_info->data);
#if AGENT_IS_THREAD
- /* SPECIAL CASE: Mark node as IDLE if job already
+ /* SPECIAL CASE: Mark node as IDLE if job already
complete */
- if (is_kill_msg &&
+ if (is_kill_msg &&
(rc == ESLURMD_KILL_JOB_ALREADY_COMPLETE)) {
kill_job_msg_t *kill_job;
- kill_job = (kill_job_msg_t *)
+ kill_job = (kill_job_msg_t *)
task_ptr->msg_args_ptr;
rc = SLURM_SUCCESS;
lock_slurmctld(job_write_lock);
- if (job_epilog_complete(kill_job->job_id,
+ if (job_epilog_complete(kill_job->job_id,
ret_data_info->
- node_name,
+ node_name,
rc))
run_scheduler = true;
unlock_slurmctld(job_write_lock);
}
- /* SPECIAL CASE: Kill non-startable batch job,
+ /* SPECIAL CASE: Kill non-startable batch job,
* Requeue the job on ESLURMD_PROLOG_FAILED */
- if ((msg_type == REQUEST_BATCH_JOB_LAUNCH) &&
+ if ((msg_type == REQUEST_BATCH_JOB_LAUNCH) &&
(rc != SLURM_SUCCESS) && (rc != ESLURMD_PROLOG_FAILED) &&
(ret_data_info->type != RESPONSE_FORWARD_FAILED)) {
- batch_job_launch_msg_t *launch_msg_ptr =
+ batch_job_launch_msg_t *launch_msg_ptr =
task_ptr->msg_args_ptr;
uint32_t job_id = launch_msg_ptr->job_id;
- info("Killing non-startable batch job %u: %s",
+ info("Killing non-startable batch job %u: %s",
job_id, slurm_strerror(rc));
thread_state = DSH_DONE;
ret_data_info->err = thread_state;
@@ -924,18 +924,18 @@ static void *_thread_per_group_rpc(void *args)
continue;
}
#endif
-
-
- if (((msg_type == REQUEST_SIGNAL_TASKS) ||
- (msg_type == REQUEST_TERMINATE_TASKS)) &&
+
+
+ if (((msg_type == REQUEST_SIGNAL_TASKS) ||
+ (msg_type == REQUEST_TERMINATE_TASKS)) &&
(rc == ESRCH)) {
/* process is already dead, not a real error */
rc = SLURM_SUCCESS;
}
-
+
switch (rc) {
case SLURM_SUCCESS:
- /*debug3("agent processed RPC to node %s",
+ /*debug3("agent processed RPC to node %s",
ret_data_info->node_name); */
thread_state = DSH_DONE;
break;
@@ -948,25 +948,25 @@ static void *_thread_per_group_rpc(void *args)
break;
case ESLURMD_EPILOG_FAILED:
error("Epilog failure on host %s, "
- "setting DOWN",
+ "setting DOWN",
ret_data_info->node_name);
-
+
thread_state = DSH_FAILED;
break;
case ESLURMD_PROLOG_FAILED:
error("Prolog failure on host %s, "
- "setting DOWN",
+ "setting DOWN",
ret_data_info->node_name);
thread_state = DSH_FAILED;
break;
- case ESLURM_INVALID_JOB_ID:
+ case ESLURM_INVALID_JOB_ID:
/* Not indicative of a real error */
- case ESLURMD_JOB_NOTRUNNING:
+ case ESLURMD_JOB_NOTRUNNING:
/* Not indicative of a real error */
debug2("agent processed RPC to node %s: %s",
ret_data_info->node_name,
slurm_strerror(rc));
-
+
thread_state = DSH_DONE;
break;
default:
@@ -985,20 +985,20 @@ static void *_thread_per_group_rpc(void *args)
* cases */
thread_state = DSH_DONE;
}
- }
+ }
ret_data_info->err = thread_state;
}
list_iterator_destroy(itr);
cleanup:
xfree(args);
-
+
/* handled at end of thread just in case resend is needed */
destroy_forward(&msg.forward);
slurm_mutex_lock(thread_mutex_ptr);
thread_ptr->ret_list = ret_list;
thread_ptr->state = thread_state;
- thread_ptr->end_time = (time_t) difftime(time(NULL),
+ thread_ptr->end_time = (time_t) difftime(time(NULL),
thread_ptr->start_time);
/* Signal completion so another thread can replace us */
(*threads_active_ptr)--;
@@ -1015,7 +1015,7 @@ static void _sig_handler(int dummy)
{
}
-static int _setup_requeue(agent_arg_t *agent_arg_ptr, thd_t *thread_ptr,
+static int _setup_requeue(agent_arg_t *agent_arg_ptr, thd_t *thread_ptr,
int count, int *spot)
{
ret_data_info_t *ret_data_info = NULL;
@@ -1025,13 +1025,13 @@ static int _setup_requeue(agent_arg_t *agent_arg_ptr, thd_t *thread_ptr,
if (ret_data_info->err != DSH_NO_RESP)
continue;
- debug("got the name %s to resend out of %d",
+ debug("got the name %s to resend out of %d",
ret_data_info->node_name, count);
-
+
if(agent_arg_ptr) {
- hostlist_push(agent_arg_ptr->hostlist,
+ hostlist_push(agent_arg_ptr->hostlist,
ret_data_info->node_name);
-
+
if ((++(*spot)) == count) {
list_iterator_destroy(itr);
return 1;
@@ -1053,7 +1053,7 @@ static void _queue_agent_retry(agent_info_t * agent_info_ptr, int count)
queued_request_t *queued_req_ptr = NULL;
thd_t *thread_ptr = agent_info_ptr->thread_struct;
int i, j;
-
+
if (count == 0)
return;
@@ -1072,25 +1072,25 @@ static void _queue_agent_retry(agent_info_t * agent_info_ptr, int count)
if (thread_ptr[i].state != DSH_NO_RESP)
continue;
- debug("got the name %s to resend",
+ debug("got the name %s to resend",
thread_ptr[i].nodelist);
- hostlist_push(agent_arg_ptr->hostlist,
+ hostlist_push(agent_arg_ptr->hostlist,
thread_ptr[i].nodelist);
if ((++j) == count)
break;
} else {
- if(_setup_requeue(agent_arg_ptr, &thread_ptr[i],
+ if(_setup_requeue(agent_arg_ptr, &thread_ptr[i],
count, &j))
break;
}
}
if (count != j) {
- error("agent: Retry count (%d) != actual count (%d)",
+ error("agent: Retry count (%d) != actual count (%d)",
count, j);
agent_arg_ptr->node_count = j;
}
- debug2("Queue RPC msg_type=%u, nodes=%d for retry",
+ debug2("Queue RPC msg_type=%u, nodes=%d for retry",
agent_arg_ptr->msg_type, j);
/* add the requeust to a list */
@@ -1109,7 +1109,7 @@ static void _queue_agent_retry(agent_info_t * agent_info_ptr, int count)
}
/*
- * _list_delete_retry - delete an entry from the retry list,
+ * _list_delete_retry - delete an entry from the retry list,
* see common/list.h for documentation
*/
static void _list_delete_retry(void *retry_entry)
@@ -1126,11 +1126,11 @@ static void _list_delete_retry(void *retry_entry)
/*
- * agent_retry - Agent for retrying pending RPCs. One pending request is
+ * agent_retry - Agent for retrying pending RPCs. One pending request is
* issued if it has been pending for at least min_wait seconds
* IN min_wait - Minimum wait time between re-issue of a pending RPC
- * IN mai_too - Send pending email too, note this performed using a
- * fork/waitpid, so it can take longer than just creating a pthread
+ * IN mai_too - Send pending email too, note this performed using a
+ * fork/waitpid, so it can take longer than just creating a pthread
* to send RPCs
* RET count of queued requests remaining
*/
@@ -1147,13 +1147,13 @@ extern int agent_retry (int min_wait, bool mail_too)
static time_t last_msg_time = (time_t) 0;
uint32_t msg_type[5], i = 0;
list_size = list_count(retry_list);
- if ((list_size > MAX_AGENT_CNT)
+ if ((list_size > MAX_AGENT_CNT)
&& (difftime(now, last_msg_time) > 300)) {
/* Note sizable backlog of work */
- info("WARNING: agent retry_list size is %d",
+ info("WARNING: agent retry_list size is %d",
list_size);
retry_iter = list_iterator_create(retry_list);
- while ((queued_req_ptr = (queued_request_t *)
+ while ((queued_req_ptr = (queued_request_t *)
list_next(retry_iter))) {
agent_arg_ptr = queued_req_ptr->agent_arg_ptr;
msg_type[i++] = agent_arg_ptr->msg_type;
@@ -1161,7 +1161,7 @@ extern int agent_retry (int min_wait, bool mail_too)
break;
}
list_iterator_destroy(retry_iter);
- info(" retry_list msg_type=%u,%u,%u,%u,%u",
+ info(" retry_list msg_type=%u,%u,%u,%u,%u",
msg_type[0], msg_type[1], msg_type[2],
msg_type[3], msg_type[4]);
last_msg_time = now;
@@ -1199,13 +1199,13 @@ extern int agent_retry (int min_wait, bool mail_too)
}
if (retry_list && (queued_req_ptr == NULL)) {
- /* now try to find a requeue request that is
+ /* now try to find a requeue request that is
* relatively old */
double age = 0;
retry_iter = list_iterator_create(retry_list);
/* next try to find an older record to retry */
- while ((queued_req_ptr = (queued_request_t *)
+ while ((queued_req_ptr = (queued_request_t *)
list_next(retry_iter))) {
rc = _batch_launch_defer(queued_req_ptr);
if (rc == -1) { /* abort request */
@@ -1245,7 +1245,7 @@ extern int agent_retry (int min_wait, bool mail_too)
if (mi)
_mail_proc(mi);
}
-
+
return list_size;
}
@@ -1292,7 +1292,7 @@ void agent_queue_request(agent_arg_t *agent_arg_ptr)
list_append(retry_list, (void *)queued_req_ptr);
slurm_mutex_unlock(&retry_mutex);
- /* now process the request in a separate pthread
+ /* now process the request in a separate pthread
* (if we can create another pthread to do so) */
agent_retry(999, false);
}
@@ -1307,7 +1307,7 @@ static void _spawn_retry_agent(agent_arg_t * agent_arg_ptr)
if (agent_arg_ptr == NULL)
return;
- debug2("Spawning RPC agent for msg_type %u",
+ debug2("Spawning RPC agent for msg_type %u",
agent_arg_ptr->msg_type);
slurm_attr_init(&attr_agent);
if (pthread_attr_setdetachstate(&attr_agent,
@@ -1323,7 +1323,7 @@ static void _spawn_retry_agent(agent_arg_t * agent_arg_ptr)
slurm_attr_destroy(&attr_agent);
}
-/* _slurmctld_free_batch_job_launch_msg is a variant of
+/* _slurmctld_free_batch_job_launch_msg is a variant of
* slurm_free_job_launch_msg because all environment variables currently
* loaded in one xmalloc buffer (see get_job_env()), which is different
* from how slurmd assembles the data from a message
@@ -1371,7 +1371,7 @@ static void _purge_agent_args(agent_arg_t *agent_arg_ptr)
if (agent_arg_ptr->msg_type == REQUEST_BATCH_JOB_LAUNCH)
_slurmctld_free_batch_job_launch_msg(
agent_arg_ptr->msg_args);
- else if (agent_arg_ptr->msg_type ==
+ else if (agent_arg_ptr->msg_type ==
RESPONSE_RESOURCE_ALLOCATION)
slurm_free_resource_allocation_response_msg(
agent_arg_ptr->msg_args);
@@ -1425,10 +1425,10 @@ static void _mail_proc(mail_info_t *mi)
error("Couldn't do a dup for 1: %m");
if(dup(fd) == -1) // 2
error("Couldn't do a dup for 2 %m");
- execle(slurmctld_conf.mail_prog, "mail",
+ execle(slurmctld_conf.mail_prog, "mail",
"-s", mi->message, mi->user_name,
NULL, NULL);
- error("Failed to exec %s: %m",
+ error("Failed to exec %s: %m",
slurmctld_conf.mail_prog);
exit(1);
} else { /* parent */
@@ -1465,7 +1465,7 @@ extern void mail_job_info (struct job_record *job_ptr, uint16_t mail_type)
mi->message = xmalloc(sizeof(char)*128);
sprintf(mi->message, "SLURM Job_id=%u Name=%.24s %s",
- job_ptr->job_id, job_ptr->name,
+ job_ptr->job_id, job_ptr->name,
_mail_type_str(mail_type));
info ("msg to %s: %s", mi->user_name, mi->message);
@@ -1507,7 +1507,7 @@ static int _batch_launch_defer(queued_request_t *queued_req_ptr)
launch_msg_ptr = (batch_job_launch_msg_t *)agent_arg_ptr->msg_args;
job_ptr = find_job_record(launch_msg_ptr->job_id);
- if ((job_ptr == NULL) ||
+ if ((job_ptr == NULL) ||
(!IS_JOB_RUNNING(job_ptr) && !IS_JOB_SUSPENDED(job_ptr))) {
info("agent(batch_launch): removed pending request for "
"cancelled job %u",
@@ -1515,7 +1515,7 @@ static int _batch_launch_defer(queued_request_t *queued_req_ptr)
return -1; /* job cancelled while waiting */
}
- hostlist_deranged_string(agent_arg_ptr->hostlist,
+ hostlist_deranged_string(agent_arg_ptr->hostlist,
sizeof(hostname), hostname);
node_ptr = find_node_record(hostname);
if (node_ptr == NULL) {
@@ -1536,10 +1536,10 @@ static int _batch_launch_defer(queued_request_t *queued_req_ptr)
if (queued_req_ptr->last_attempt == 0) {
queued_req_ptr->first_attempt = now;
queued_req_ptr->last_attempt = now;
- } else if (difftime(now, queued_req_ptr->first_attempt) >=
+ } else if (difftime(now, queued_req_ptr->first_attempt) >=
slurm_get_resume_timeout()) {
error("agent waited too long for node %s to respond, "
- "sending batch request anyway...",
+ "sending batch request anyway...",
node_ptr->name);
if (job_ptr->time_limit != INFINITE)
job_ptr->end_time = now + (job_ptr->time_limit * 60);
diff --git a/src/slurmctld/agent.h b/src/slurmctld/agent.h
index f4243d2f9b487b97898ff5d7b95b2f1deeacf815..9483a8eec9b1413b5a77b4fe4e2b09c6b45711ac 100644
--- a/src/slurmctld/agent.h
+++ b/src/slurmctld/agent.h
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * agent.h - data structures and function definitions for parallel
+ * agent.h - data structures and function definitions for parallel
* background communications
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
@@ -8,32 +8,32 @@
* Written by Morris Jette <jette@llnl.gov>, et. al.
* Derived from dsh written by Jim Garlick <garlick1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -44,18 +44,18 @@
#include "src/slurmctld/slurmctld.h"
-#define AGENT_IS_THREAD 1 /* set if agent itself a thread of
+#define AGENT_IS_THREAD 1 /* set if agent itself a thread of
* slurmctld, 0 for function call */
#define AGENT_THREAD_COUNT 10 /* maximum active threads per agent */
#define COMMAND_TIMEOUT 30 /* command requeue or error, seconds */
#define MAX_AGENT_CNT (MAX_SERVER_THREADS / (AGENT_THREAD_COUNT + 2))
- /* maximum simultaneous agents, note
+ /* maximum simultaneous agents, note
* total thread count is product of
* MAX_AGENT_CNT and
- * (AGENT_THREAD_COUNT + 2) */
+ * (AGENT_THREAD_COUNT + 2) */
typedef struct agent_arg {
- uint32_t node_count; /* number of nodes to communicate
+ uint32_t node_count; /* number of nodes to communicate
* with */
uint16_t retry; /* if set, keep trying */
slurm_addr *addr; /* if set will send to this
@@ -67,8 +67,8 @@ typedef struct agent_arg {
} agent_arg_t;
/*
- * agent - party responsible for transmitting an common RPC in parallel
- * across a set of nodes. agent_queue_request() if immediate
+ * agent - party responsible for transmitting an common RPC in parallel
+ * across a set of nodes. agent_queue_request() if immediate
* execution is not essential.
* IN pointer to agent_arg_t, which is xfree'd (including addr,
* hostlist and msg_args) upon completion if AGENT_IS_THREAD is set
@@ -84,11 +84,11 @@ extern void *agent (void *args);
extern void agent_queue_request(agent_arg_t *agent_arg_ptr);
/*
- * agent_retry - Agent for retrying pending RPCs. One pending request is
+ * agent_retry - Agent for retrying pending RPCs. One pending request is
* issued if it has been pending for at least min_wait seconds
* IN min_wait - Minimum wait time between re-issue of a pending RPC
- * IN mai_too - Send pending email too, note this performed using a
- * fork/waitpid, so it can take longer than just creating
+ * IN mai_too - Send pending email too, note this performed using a
+ * fork/waitpid, so it can take longer than just creating
* a pthread to send RPCs
* RET count of queued requests remaining
*/
@@ -104,7 +104,7 @@ extern int get_agent_count(void);
* mail_job_info - Send e-mail notice of job state change
* IN job_ptr - job identification
* IN state_type - job transition type, see MAIL_JOB in slurm.h
- */
+ */
extern void mail_job_info (struct job_record *job_ptr, uint16_t mail_type);
#endif /* !_AGENT_H */
diff --git a/src/slurmctld/backup.c b/src/slurmctld/backup.c
index b7751e361c5cd1c3c69b3d28380c8ef9818e27d2..6bbbb38e15bfbd07537cca1e37ab39c21f8b5198 100644
--- a/src/slurmctld/backup.c
+++ b/src/slurmctld/backup.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -100,13 +100,13 @@ static int backup_sigarray[] = {
SIGPIPE, SIGALRM, SIGABRT, SIGHUP, 0
};
-/* run_backup - this is the backup controller, it should run in standby
+/* run_backup - this is the backup controller, it should run in standby
* mode, assuming control when the primary controller stops responding */
void run_backup(void)
{
time_t last_ping = 0;
pthread_attr_t thread_attr_sig, thread_attr_rpc;
- slurmctld_lock_t config_read_lock = {
+ slurmctld_lock_t config_read_lock = {
READ_LOCK, NO_LOCK, NO_LOCK, NO_LOCK };
slurmctld_lock_t config_write_lock = {
WRITE_LOCK, WRITE_LOCK, WRITE_LOCK, WRITE_LOCK };
@@ -124,7 +124,7 @@ void run_backup(void)
* create attached thread to process RPCs
*/
slurm_attr_init(&thread_attr_rpc);
- while (pthread_create(&slurmctld_config.thread_id_rpc,
+ while (pthread_create(&slurmctld_config.thread_id_rpc,
&thread_attr_rpc, _background_rpc_mgr, NULL)) {
error("pthread_create error %m");
sleep(1);
@@ -135,8 +135,8 @@ void run_backup(void)
* create attached thread for signal handling
*/
slurm_attr_init(&thread_attr_sig);
- while (pthread_create(&slurmctld_config.thread_id_sig,
- &thread_attr_sig, _background_signal_hand,
+ while (pthread_create(&slurmctld_config.thread_id_sig,
+ &thread_attr_sig, _background_signal_hand,
NULL)) {
error("pthread_create %m");
sleep(1);
@@ -175,8 +175,8 @@ void run_backup(void)
}
/* Since pidfile is created as user root (its owner is
- * changed to SlurmUser) SlurmUser may not be able to
- * remove it, so this is not necessarily an error.
+ * changed to SlurmUser) SlurmUser may not be able to
+ * remove it, so this is not necessarily an error.
* No longer need slurmctld_conf lock after above join. */
if (unlink(slurmctld_conf.slurmctld_pidfile) < 0)
verbose("Unable to remove pidfile '%s': %m",
@@ -220,21 +220,21 @@ void run_backup(void)
return;
}
-/* _background_signal_hand - Process daemon-wide signals for the
+/* _background_signal_hand - Process daemon-wide signals for the
* backup controller */
static void *_background_signal_hand(void *no_data)
{
int sig, rc;
sigset_t set;
/* Locks: Write configuration, job, node, and partition */
- slurmctld_lock_t config_write_lock = {
+ slurmctld_lock_t config_write_lock = {
WRITE_LOCK, WRITE_LOCK, WRITE_LOCK, WRITE_LOCK };
(void) pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
(void) pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
/* No need for slurmctld_conf lock yet */
- while ( (create_pidfile(slurmctld_conf.slurmctld_pidfile) < 0) &&
+ while ( (create_pidfile(slurmctld_conf.slurmctld_pidfile) < 0) &&
(errno == EAGAIN) ) {
verbose("Retrying create_pidfile: %m");
sleep(1);
@@ -288,8 +288,8 @@ static void *_background_signal_hand(void *no_data)
/* Reset the job credential key based upon configuration parameters.
* slurmctld_conf is locked on entry. */
static void _update_cred_key(void)
-{
- slurm_cred_ctx_key_update(slurmctld_config.cred_ctx,
+{
+ slurm_cred_ctx_key_update(slurmctld_config.cred_ctx,
slurmctld_conf.job_credential_private_key);
}
@@ -297,7 +297,7 @@ static void _sig_handler(int signal)
{
}
-/* _background_rpc_mgr - Read and process incoming RPCs to the background
+/* _background_rpc_mgr - Read and process incoming RPCs to the background
* controller (that's us) */
static void *_background_rpc_mgr(void *no_data)
{
@@ -309,7 +309,7 @@ static void *_background_rpc_mgr(void *no_data)
char* node_addr = NULL;
/* Read configuration only */
- slurmctld_lock_t config_read_lock = {
+ slurmctld_lock_t config_read_lock = {
READ_LOCK, NO_LOCK, NO_LOCK, NO_LOCK };
int sigarray[] = {SIGUSR1, 0};
@@ -336,9 +336,9 @@ static void *_background_rpc_mgr(void *no_data)
/* Prepare to catch SIGUSR1 to interrupt accept().
* This signal is generated by the slurmctld signal
- * handler thread upon receipt of SIGABRT, SIGINT,
- * or SIGTERM. That thread does all processing of
- * all signals. */
+ * handler thread upon receipt of SIGABRT, SIGINT,
+ * or SIGTERM. That thread does all processing of
+ * all signals. */
xsignal(SIGUSR1, _sig_handler);
xsignal_unblock(sigarray);
@@ -346,8 +346,8 @@ static void *_background_rpc_mgr(void *no_data)
* Process incoming RPCs indefinitely
*/
while (slurmctld_config.shutdown_time == 0) {
- /* accept needed for stream implementation
- * is a no-op in message implementation that just passes
+ /* accept needed for stream implementation
+ * is a no-op in message implementation that just passes
* sockfd to newsockfd */
if ((newsockfd = slurm_accept_msg_conn(sockfd, &cli_addr))
== SLURM_SOCKET_ERROR) {
@@ -360,17 +360,17 @@ static void *_background_rpc_mgr(void *no_data)
slurm_msg_t_init(msg);
if (slurm_receive_msg(newsockfd, msg, 0) != 0)
error("slurm_receive_msg: %m");
-
+
error_code = _background_process_msg(msg);
if ((error_code == SLURM_SUCCESS) &&
(msg->msg_type == REQUEST_SHUTDOWN_IMMEDIATE) &&
(slurmctld_config.shutdown_time == 0))
slurmctld_config.shutdown_time = time(NULL);
-
+
slurm_free_msg(msg);
- /* close should only be called when the socket
- * implementation is being used the following call will
+ /* close should only be called when the socket
+ * implementation is being used the following call will
* be a no-op in a message/mongo implementation */
slurm_close_accepted_conn(newsockfd); /* close new socket */
}
@@ -392,26 +392,26 @@ static int _background_process_msg(slurm_msg_t * msg)
if ((uid == 0) || (uid == getuid()))
super_user = true;
- if (super_user &&
+ if (super_user &&
(msg->msg_type == REQUEST_SHUTDOWN_IMMEDIATE)) {
info("Performing RPC: REQUEST_SHUTDOWN_IMMEDIATE");
- } else if (super_user &&
+ } else if (super_user &&
(msg->msg_type == REQUEST_SHUTDOWN)) {
info("Performing RPC: REQUEST_SHUTDOWN");
pthread_kill(slurmctld_config.thread_id_sig, SIGTERM);
- } else if (super_user &&
+ } else if (super_user &&
(msg->msg_type == REQUEST_TAKEOVER)) {
info("Performing RPC: REQUEST_TAKEOVER");
_shutdown_primary_controller(SHUTDOWN_WAIT);
takeover = true;
error_code = SLURM_SUCCESS;
- } else if (super_user &&
+ } else if (super_user &&
(msg->msg_type == REQUEST_CONTROL)) {
debug3("Ignoring RPC: REQUEST_CONTROL");
error_code = ESLURM_DISABLED;
last_controller_response = time(NULL);
} else {
- error("Invalid RPC received %d while in standby mode",
+ error("Invalid RPC received %d while in standby mode",
msg->msg_type);
error_code = ESLURM_IN_STANDBY_MODE;
}
@@ -428,16 +428,16 @@ static int _ping_controller(void)
int rc;
slurm_msg_t req;
/* Locks: Read configuration */
- slurmctld_lock_t config_read_lock = {
+ slurmctld_lock_t config_read_lock = {
READ_LOCK, NO_LOCK, NO_LOCK, NO_LOCK };
- /*
+ /*
* Set address of controller to ping
*/
slurm_msg_t_init(&req);
lock_slurmctld(config_read_lock);
debug3("pinging slurmctld at %s", slurmctld_conf.control_addr);
- slurm_set_addr(&req.address, slurmctld_conf.slurmctld_port,
+ slurm_set_addr(&req.address, slurmctld_conf.slurmctld_port,
slurmctld_conf.control_addr);
unlock_slurmctld(config_read_lock);
@@ -459,7 +459,7 @@ static int _ping_controller(void)
/*
* Reload the slurm.conf parameters without any processing
* of the node, partition, or state information.
- * Specifically, we don't want to purge batch scripts based
+ * Specifically, we don't want to purge batch scripts based
* upon old job state information.
* This is a stripped down version of read_slurm_conf(0).
*/
@@ -472,7 +472,7 @@ static int _backup_reconfig(void)
}
/*
- * Tell the primary_controller to relinquish control, primary control_machine
+ * Tell the primary_controller to relinquish control, primary control_machine
* has to suspend operation
* Based on _shutdown_backup_controller from controller.c
* wait_time - How long to wait for primary controller to write state, seconds.
@@ -497,8 +497,8 @@ static int _shutdown_primary_controller(int wait_time)
/* send request message */
req.msg_type = REQUEST_CONTROL;
-
- if (slurm_send_recv_rc_msg_only_one(&req, &rc,
+
+ if (slurm_send_recv_rc_msg_only_one(&req, &rc,
(CONTROL_TIMEOUT * 1000)) < 0) {
error("_shutdown_primary_controller:send/recv: %m");
return SLURM_ERROR;
@@ -512,10 +512,10 @@ static int _shutdown_primary_controller(int wait_time)
return SLURM_ERROR;
}
- /* FIXME: Ideally the REQUEST_CONTROL RPC does not return until all
- * other activity has ceased and the state has been saved. That is
- * not presently the case (it returns when no other work is pending,
- * so the state save should occur right away). We sleep for a while
+ /* FIXME: Ideally the REQUEST_CONTROL RPC does not return until all
+ * other activity has ceased and the state has been saved. That is
+ * not presently the case (it returns when no other work is pending,
+ * so the state save should occur right away). We sleep for a while
* here and give the primary controller time to shutdown */
if (wait_time)
sleep(wait_time);
diff --git a/src/slurmctld/basil_interface.c b/src/slurmctld/basil_interface.c
index ea0ec5079781e2e9f7407c8daa441b0799e12624..9afd5b4113176be108cd4cb9720e83982ab89223 100644
--- a/src/slurmctld/basil_interface.c
+++ b/src/slurmctld/basil_interface.c
@@ -1,39 +1,39 @@
/*****************************************************************************\
* basil_interface.c - slurmctld interface to BASIL, Cray's Batch Application
- * Scheduler Interface Layer (BASIL). In order to support development,
- * these functions will provide basic BASIL-like functionality even
+ * Scheduler Interface Layer (BASIL). In order to support development,
+ * these functions will provide basic BASIL-like functionality even
* without a BASIL command being present.
*****************************************************************************
* Copyright (C) 2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -111,7 +111,7 @@ extern int basil_query(void)
debug("basil query initiated");
if (first_run) {
- /* Set basil_node_id to NO_VAL since the default value
+ /* Set basil_node_id to NO_VAL since the default value
* of zero is a valid BASIL node ID */
node_ptr = node_record_table_ptr;
for (i=0; i<node_record_cnt; i++, node_ptr++)
@@ -160,7 +160,7 @@ extern int basil_query(void)
reason = "basil role not BATCH";
}
- /* Calculate the total count of processors and
+ /* Calculate the total count of processors and
* MB of memory on the node */
config_ptr = node_ptr->config_ptr;
if ((slurmctld_conf.fast_schedule != 2) &&
@@ -185,14 +185,14 @@ extern int basil_query(void)
}
_validate_basil_node_id();
- /* Confirm that each BASIL reservation is still valid,
+ /* Confirm that each BASIL reservation is still valid,
* purge vestigial reservations */
for (each_basil_reservation) {
bool found = false;
job_iterator = list_iterator_create(job_list);
- while ((job_ptr = (struct job_record *)
+ while ((job_ptr = (struct job_record *)
list_next(job_iterator))) {
- select_g_get_jobinfo(job_ptr->select_jobinfo,
+ select_g_get_jobinfo(job_ptr->select_jobinfo,
SELECT_DATA_RESV_ID, &res_id);
found = !strcmp(res_id, basil_reservation_id);
xfree(res_id);
@@ -216,7 +216,7 @@ extern int basil_query(void)
job_iterator = list_iterator_create(job_list);
while ((job_ptr = (struct job_record *) list_next(job_iterator))) {
res_id = NULL;
- select_g_get_jobinfo(job_ptr->select_jobinfo,
+ select_g_get_jobinfo(job_ptr->select_jobinfo,
SELECT_DATA_RESV_ID, &res_id);
if (res_id) {
tmp = strchr(res_id, '_');
@@ -250,17 +250,17 @@ extern int basil_reserve(struct job_record *job_ptr)
error("basil reserve error: %s", "TBD");
return SLURM_ERROR;
}
- select_g_set_jobinfo(job_ptr->select_jobinfo,
+ select_g_set_jobinfo(job_ptr->select_jobinfo,
SELECT_DATA_RESV_ID, reservation_id);
- debug("basil reservation made job_id=%u resv_id=%s",
+ debug("basil reservation made job_id=%u resv_id=%s",
job_ptr->job_id, reservation_id);
#else
char reservation_id[32];
- snprintf(reservation_id, sizeof(reservation_id),
+ snprintf(reservation_id, sizeof(reservation_id),
"resv_%d", ++last_res_id);
- select_g_set_jobinfo(job_ptr->select_jobinfo,
+ select_g_set_jobinfo(job_ptr->select_jobinfo,
SELECT_DATA_RESV_ID, reservation_id);
- debug("basil reservation made job_id=%u resv_id=%s",
+ debug("basil reservation made job_id=%u resv_id=%s",
job_ptr->job_id, reservation_id);
#endif /* APBASIL_LOC */
#endif /* HAVE_CRAY_XT */
@@ -277,7 +277,7 @@ extern int basil_release(struct job_record *job_ptr)
int error_code = SLURM_SUCCESS;
#ifdef HAVE_CRAY_XT
char *reservation_id = NULL;
- select_g_get_jobinfo(job_ptr->select_jobinfo,
+ select_g_get_jobinfo(job_ptr->select_jobinfo,
SELECT_DATA_RESV_ID, &reservation_id);
if (reservation_id) {
error_code = basil_release_id(reservation_id);
diff --git a/src/slurmctld/basil_interface.h b/src/slurmctld/basil_interface.h
index 9c6c3109cee0331f314cd3b9e5b33e543aca1759..d2ff12b875d3c73f43567793e0644d11aee8d5af 100644
--- a/src/slurmctld/basil_interface.h
+++ b/src/slurmctld/basil_interface.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index d63be01389a4476d54c1e941dc55daadcfc76f31..e53723d46c3fa8e4e9a6abf015d4cc376f7c1712 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>, Kevin Tew <tew1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -104,40 +104,40 @@
#define DEFAULT_DAEMONIZE 1 /* Run as daemon by default if set */
#define DEFAULT_RECOVER 1 /* Default state recovery on restart
* 0 = use no saved state information
- * 1 = recover saved job state,
+ * 1 = recover saved job state,
* node DOWN/DRAIN state and reason information
* 2 = recover all state saved from last shutdown */
-#define MIN_CHECKIN_TIME 3 /* Nodes have this number of seconds to
+#define MIN_CHECKIN_TIME 3 /* Nodes have this number of seconds to
* check-in before we ping them */
#define SHUTDOWN_WAIT 2 /* Time to wait for backup server shutdown */
#if (0)
-/* If defined and FastSchedule=0 in slurm.conf, then report the CPU count that a
+/* If defined and FastSchedule=0 in slurm.conf, then report the CPU count that a
* node registers with rather than the CPU count defined for the node in slurm.conf */
#define SLURM_NODE_ACCT_REGISTER 1
#endif
/**************************************************************************\
- * To test for memory leaks, set MEMORY_LEAK_DEBUG to 1 using
+ * To test for memory leaks, set MEMORY_LEAK_DEBUG to 1 using
* "configure --enable-memory-leak-debug" then execute
- * > valgrind --tool=memcheck --leak-check=yes --num-callers=6 \
+ * > valgrind --tool=memcheck --leak-check=yes --num-callers=6 \
* --leak-resolution=med slurmctld -D
*
* Then exercise the slurmctld functionality before executing
* > scontrol shutdown
*
- * The OpenSSL code produces a bunch of errors related to use of
- * non-initialized memory use.
- * The switch/elan functions will report one block "possibly lost"
+ * The OpenSSL code produces a bunch of errors related to use of
+ * non-initialized memory use.
+ * The switch/elan functions will report one block "possibly lost"
* (640 bytes), it is really not lost.
* The _keyvalue_regex_init() function will generate two blocks "definitely
* lost", both of size zero. We haven't bothered to address this.
* On some systems dlopen() will generate a small number of "definitely
* lost" blocks that are not cleared by dlclose().
- * On some systems, pthread_create() will generated a small number of
+ * On some systems, pthread_create() will generated a small number of
* "possibly lost" blocks.
- * Otherwise the report should be free of errors. Remember to reset
- * MEMORY_LEAK_DEBUG to 0 for production use (non-seamless backup
+ * Otherwise the report should be free of errors. Remember to reset
+ * MEMORY_LEAK_DEBUG to 0 for production use (non-seamless backup
* controller use).
\**************************************************************************/
@@ -226,7 +226,7 @@ int main(int argc, char *argv[])
update_logging();
_kill_old_slurmctld();
- /*
+ /*
* Need to create pidfile here in case we setuid() below
* (init_pidfile() exits if it can't initialize pid file).
* On Linux we also need to make this setuid job explicitly
@@ -238,14 +238,14 @@ int main(int argc, char *argv[])
if (stat(slurmctld_conf.mail_prog, &stat_buf) != 0)
error("Configured MailProg is invalid");
- if (!strcmp(slurmctld_conf.accounting_storage_type,
+ if (!strcmp(slurmctld_conf.accounting_storage_type,
"accounting_storage/none")) {
- if (strcmp(slurmctld_conf.job_acct_gather_type,
+ if (strcmp(slurmctld_conf.job_acct_gather_type,
"jobacct_gather/none"))
error("Job accounting information gathered, "
- "but not stored");
+ "but not stored");
} else {
- if (!strcmp(slurmctld_conf.job_acct_gather_type,
+ if (!strcmp(slurmctld_conf.job_acct_gather_type,
"jobacct_gather/none"))
info("Job accounting information stored, "
"but details not gathered");
@@ -259,7 +259,7 @@ int main(int argc, char *argv[])
debug ("Unable to set dumpable to 1");
#endif /* PR_SET_DUMPABLE */
- /*
+ /*
* Create StateSaveLocation directory if necessary.
*/
set_slurmctld_state_loc();
@@ -268,7 +268,7 @@ int main(int argc, char *argv[])
slurmctld_config.daemonize = 1;
if (daemon(1, 1))
error("daemon(): %m");
- log_alter(log_opts, LOG_DAEMON,
+ log_alter(log_opts, LOG_DAEMON,
slurmctld_conf.slurmctld_logfile);
if (slurmctld_conf.slurmctld_logfile
&& (slurmctld_conf.slurmctld_logfile[0] == '/')) {
@@ -316,7 +316,7 @@ int main(int argc, char *argv[])
slurm_conf_unlock();
error("You can not have AccountingStorageEnforce "
- "set for AccountingStorageType='%s'",
+ "set for AccountingStorageType='%s'",
slurmctld_conf.accounting_storage_type);
}
@@ -329,27 +329,27 @@ int main(int argc, char *argv[])
ASSOC_MGR_CACHE_USER | ASSOC_MGR_CACHE_QOS;
if (assoc_mgr_init(acct_db_conn, &assoc_init_arg)) {
- if(accounting_enforce & ACCOUNTING_ENFORCE_ASSOCS)
+ if(accounting_enforce & ACCOUNTING_ENFORCE_ASSOCS)
error("Association database appears down, "
"reading from state file.");
else
debug("Association database appears down, "
"reading from state file.");
-
+
if ((load_assoc_mgr_state(slurmctld_conf.state_save_location)
- != SLURM_SUCCESS)
+ != SLURM_SUCCESS)
&& (accounting_enforce & ACCOUNTING_ENFORCE_ASSOCS)) {
error("Unable to get any information from "
"the state file");
fatal("slurmdbd and/or database must be up at "
"slurmctld start time");
}
- }
+ }
/* Now load the usage from a flat file since it isn't kept in
the database No need to check for an error since if this
fails we will get an error message and we will go on our
- way. If we get an error we can't do anything about it.
+ way. If we get an error we can't do anything about it.
*/
load_assoc_usage(slurmctld_conf.state_save_location);
@@ -358,14 +358,14 @@ int main(int argc, char *argv[])
*/
if (running_cache) {
slurm_attr_init(&thread_attr);
- while (pthread_create(&assoc_cache_thread, &thread_attr,
+ while (pthread_create(&assoc_cache_thread, &thread_attr,
_assoc_cache_mgr, NULL)) {
error("pthread_create error %m");
sleep(1);
}
slurm_attr_destroy(&thread_attr);
}
-
+
info("slurmctld version %s started on cluster %s",
SLURM_VERSION, slurmctld_cluster_name);
@@ -383,7 +383,7 @@ int main(int argc, char *argv[])
/* Not used in creator
*
- * slurm_cred_ctx_set(slurmctld_config.cred_ctx,
+ * slurm_cred_ctx_set(slurmctld_config.cred_ctx,
* SLURM_CRED_OPT_EXPIRY_WINDOW, CRED_LIFE);
*/
@@ -428,11 +428,11 @@ int main(int argc, char *argv[])
unlock_slurmctld(config_write_lock);
select_g_select_nodeinfo_set_all(time(NULL));
- if (recover == 0)
+ if (recover == 0)
_accounting_mark_all_nodes_down("cold-start");
primary = 1;
-
+
} else {
error("this host (%s) not valid controller (%s or %s)",
node_name, slurmctld_conf.control_machine,
@@ -441,7 +441,7 @@ int main(int argc, char *argv[])
}
if (!acct_db_conn) {
- acct_db_conn =
+ acct_db_conn =
acct_storage_g_get_connection(true, 0, false);
/* We only send in a variable the first time
we call this since we are setting up static
@@ -460,9 +460,9 @@ int main(int argc, char *argv[])
info("Running as primary controller");
clusteracct_storage_g_register_ctld(
acct_db_conn,
- slurmctld_cluster_name,
+ slurmctld_cluster_name,
slurmctld_conf.slurmctld_port);
-
+
_accounting_cluster_ready();
if (slurm_priority_init() != SLURM_SUCCESS)
@@ -479,8 +479,8 @@ int main(int argc, char *argv[])
slurmctld_config.server_thread_count++;
slurm_mutex_unlock(&slurmctld_config.thread_count_lock);
slurm_attr_init(&thread_attr);
- while (pthread_create(&slurmctld_config.thread_id_rpc,
- &thread_attr, _slurmctld_rpc_mgr,
+ while (pthread_create(&slurmctld_config.thread_id_rpc,
+ &thread_attr, _slurmctld_rpc_mgr,
NULL)) {
error("pthread_create error %m");
sleep(1);
@@ -563,14 +563,14 @@ int main(int argc, char *argv[])
}
/* Since pidfile is created as user root (its owner is
- * changed to SlurmUser) SlurmUser may not be able to
+ * changed to SlurmUser) SlurmUser may not be able to
* remove it, so this is not necessarily an error. */
if (unlink(slurmctld_conf.slurmctld_pidfile) < 0) {
verbose("Unable to remove pidfile '%s': %m",
slurmctld_conf.slurmctld_pidfile);
}
-
-
+
+
#ifdef MEMORY_LEAK_DEBUG
/* This should purge all allocated memory, *\
\* Anything left over represents a leak. */
@@ -617,7 +617,7 @@ int main(int argc, char *argv[])
slurm_api_clear_config();
sleep(2);
#else
- /* Give REQUEST_SHUTDOWN a chance to get propagated,
+ /* Give REQUEST_SHUTDOWN a chance to get propagated,
* up to 3 seconds. */
for (i=0; i<3; i++) {
agent_purge();
@@ -634,7 +634,7 @@ int main(int argc, char *argv[])
"thread", cnt);
}
log_fini();
-
+
if (dump_core)
abort();
else
@@ -655,9 +655,9 @@ static void _init_config(void)
(void) setrlimit(RLIMIT_CORE, &rlim);
}
if (getrlimit(RLIMIT_STACK, &rlim) == 0) {
- /* slurmctld can spawn lots of pthreads.
- * Set the (per thread) stack size to a
- * more "reasonable" value to avoid running
+ /* slurmctld can spawn lots of pthreads.
+ * Set the (per thread) stack size to a
+ * more "reasonable" value to avoid running
* out of virtual memory and dying */
rlim.rlim_cur = rlim.rlim_max;
(void) setrlimit(RLIMIT_STACK, &rlim);
@@ -690,12 +690,12 @@ static void _init_config(void)
* Same name as API function for use in accounting_storage plugin.
* Anything you add to this function must be added to the
* _slurm_rpc_reconfigure_controller function inside proc_req.c try
- * to keep these in sync.
+ * to keep these in sync.
*/
static int _reconfigure_slurm(void)
{
/* Locks: Write configuration, job, node, and partition */
- slurmctld_lock_t config_write_lock = {
+ slurmctld_lock_t config_write_lock = {
WRITE_LOCK, WRITE_LOCK, WRITE_LOCK, WRITE_LOCK };
int rc;
@@ -736,7 +736,7 @@ static void *_slurmctld_signal_hand(void *no_data)
int sig_array[] = {SIGINT, SIGTERM, SIGHUP, SIGABRT, 0};
sigset_t set;
/* Locks: Read configuration */
- slurmctld_lock_t config_read_lock = {
+ slurmctld_lock_t config_read_lock = {
READ_LOCK, NO_LOCK, NO_LOCK, NO_LOCK };
(void) pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
@@ -818,7 +818,7 @@ static void *_slurmctld_rpc_mgr(void *no_data)
int no_thread;
connection_arg_t *conn_arg = NULL;
/* Locks: Read config */
- slurmctld_lock_t config_read_lock = {
+ slurmctld_lock_t config_read_lock = {
READ_LOCK, NO_LOCK, NO_LOCK, NO_LOCK };
int sigarray[] = {SIGUSR1, 0};
char* node_addr = NULL;
@@ -860,8 +860,8 @@ static void *_slurmctld_rpc_mgr(void *no_data)
/* Prepare to catch SIGUSR1 to interrupt accept().
* This signal is generated by the slurmctld signal
- * handler thread upon receipt of SIGABRT, SIGINT,
- * or SIGTERM. That thread does all processing of
+ * handler thread upon receipt of SIGABRT, SIGINT,
+ * or SIGTERM. That thread does all processing of
* all signals. */
xsignal(SIGUSR1, _sig_handler);
xsignal_unblock(sigarray);
@@ -871,7 +871,7 @@ static void *_slurmctld_rpc_mgr(void *no_data)
*/
while (_wait_for_server_thread()) {
/*
- * accept needed for stream implementation is a no-op in
+ * accept needed for stream implementation is a no-op in
* message implementation that just passes sockfd to newsockfd
*/
if ((newsockfd = slurm_accept_msg_conn(sockfd,
@@ -925,14 +925,14 @@ static void *_service_connection(void *arg)
if(slurm_receive_msg(conn->newsockfd, msg, 0) != 0) {
error("slurm_receive_msg: %m");
/* close should only be called when the socket implementation
- * is being used the following call will be a no-op in a
+ * is being used the following call will be a no-op in a
* message/mongo implementation */
/* close the new socket */
slurm_close_accepted_conn(conn->newsockfd);
goto cleanup;
}
- /* set msg connection fd to accepted fd. This allows
+ /* set msg connection fd to accepted fd. This allows
* possibility for slurmd_req () to close accepted connection
*/
if(errno != SLURM_SUCCESS) {
@@ -944,7 +944,7 @@ static void *_service_connection(void *arg)
/* process the request */
slurmctld_req(msg);
}
- if ((conn->newsockfd >= 0)
+ if ((conn->newsockfd >= 0)
&& slurm_close_accepted_conn(conn->newsockfd) < 0)
error ("close(%d): %m", conn->newsockfd);
@@ -955,7 +955,7 @@ cleanup:
return return_code;
}
-/* Increment slurmctld_config.server_thread_count and don't return
+/* Increment slurmctld_config.server_thread_count and don't return
* until its value is no larger than MAX_SERVER_THREADS,
* RET true unless shutdown in progress */
static bool _wait_for_server_thread(void)
@@ -973,7 +973,7 @@ static bool _wait_for_server_thread(void)
slurmctld_config.server_thread_count++;
break;
} else {
- /* wait for state change and retry,
+ /* wait for state change and retry,
* just a delay and not an error.
* This can happen when the epilog completes
* on a bunch of nodes at the same time, which
@@ -983,14 +983,14 @@ static bool _wait_for_server_thread(void)
time_t now = time(NULL);
if (difftime(now, last_print_time) > 2) {
verbose("server_thread_count over "
- "limit (%d), waiting",
+ "limit (%d), waiting",
slurmctld_config.
server_thread_count);
last_print_time = now;
}
print_it = false;
}
- pthread_cond_wait(&server_thread_cond,
+ pthread_cond_wait(&server_thread_cond,
&slurmctld_config.thread_count_lock);
}
}
@@ -1065,7 +1065,7 @@ static int _accounting_cluster_ready()
the priority plugin */
priority_g_set_max_cluster_usage(cluster_procs,
slurmctld_conf.priority_decay_hl);
-
+
return rc;
}
@@ -1103,7 +1103,7 @@ static int _accounting_mark_all_nodes_down(char *reason)
slurmctld_cluster_name,
node_ptr, event_time,
reason))
- == SLURM_ERROR)
+ == SLURM_ERROR)
break;
}
return rc;
@@ -1124,7 +1124,7 @@ static void _remove_assoc(acct_association_rec_t *rec)
/*
* _slurmctld_background - process slurmctld background activities
- * purge defunct job records, save state, schedule jobs, and
+ * purge defunct job records, save state, schedule jobs, and
* ping other nodes
*/
static void *_slurmctld_background(void *no_data)
@@ -1147,26 +1147,26 @@ static void *_slurmctld_background(void *no_data)
DEF_TIMERS;
/* Locks: Read config */
- slurmctld_lock_t config_read_lock = {
+ slurmctld_lock_t config_read_lock = {
READ_LOCK, NO_LOCK, NO_LOCK, NO_LOCK };
/* Locks: Read config, read job */
- slurmctld_lock_t job_read_lock = {
+ slurmctld_lock_t job_read_lock = {
READ_LOCK, READ_LOCK, NO_LOCK, NO_LOCK };
/* Locks: Read config, write job, write node, read partition */
- slurmctld_lock_t job_write_lock = {
+ slurmctld_lock_t job_write_lock = {
READ_LOCK, WRITE_LOCK, WRITE_LOCK, READ_LOCK };
/* Locks: Read config, write job, write node
* (Might kill jobs on nodes set DOWN) */
- slurmctld_lock_t node_write_lock = {
+ slurmctld_lock_t node_write_lock = {
READ_LOCK, WRITE_LOCK, WRITE_LOCK, NO_LOCK };
/* Locks: Read node */
- slurmctld_lock_t node_read_lock = {
+ slurmctld_lock_t node_read_lock = {
NO_LOCK, NO_LOCK, READ_LOCK, NO_LOCK };
/* Locks: Write node */
- slurmctld_lock_t node_write_lock2 = {
+ slurmctld_lock_t node_write_lock2 = {
NO_LOCK, NO_LOCK, WRITE_LOCK, NO_LOCK };
/* Locks: Write partition */
- slurmctld_lock_t part_write_lock = {
+ slurmctld_lock_t part_write_lock = {
NO_LOCK, NO_LOCK, NO_LOCK, WRITE_LOCK };
/* Let the dust settle before doing work */
@@ -1215,7 +1215,7 @@ static void *_slurmctld_background(void *no_data)
sleep(1);
}
if (slurmctld_config.server_thread_count)
- info("shutdown server_thread_count=%d",
+ info("shutdown server_thread_count=%d",
slurmctld_config.server_thread_count);
if (_report_locks_set() == 0) {
info("Saving all slurm state");
@@ -1232,7 +1232,7 @@ static void *_slurmctld_background(void *no_data)
unlock_slurmctld(node_write_lock);
}
- if (difftime(now, last_no_resp_msg_time) >=
+ if (difftime(now, last_no_resp_msg_time) >=
no_resp_msg_interval) {
last_no_resp_msg_time = now;
lock_slurmctld(node_write_lock2);
@@ -1331,7 +1331,7 @@ static void *_slurmctld_background(void *no_data)
}
if (difftime(now, last_node_acct) >= PERIODIC_NODE_ACCT) {
- /* Report current node state to account for added
+ /* Report current node state to account for added
* or reconfigured nodes */
last_node_acct = now;
lock_slurmctld(node_read_lock);
@@ -1340,8 +1340,8 @@ static void *_slurmctld_background(void *no_data)
}
/* Reassert this machine as the primary controller.
- * A network or security problem could result in
- * the backup controller assuming control even
+ * A network or security problem could result in
+ * the backup controller assuming control even
* while the real primary controller is running */
lock_slurmctld(config_read_lock);
if (slurmctld_conf.slurmctld_timeout &&
@@ -1390,8 +1390,8 @@ extern void send_all_to_accounting(time_t event_time)
send_resvs_to_accounting();
}
-/*
- * _report_locks_set - report any slurmctld locks left set
+/*
+ * _report_locks_set - report any slurmctld locks left set
* RET count of locks currently set
*/
static int _report_locks_set(void)
@@ -1512,7 +1512,7 @@ static void _parse_commandline(int argc, char *argv[])
}
}
-/* _usage - print a message describing the command line arguments of
+/* _usage - print a message describing the command line arguments of
* slurmctld */
static void _usage(char *prog_name)
{
@@ -1549,7 +1549,7 @@ static void _usage(char *prog_name)
}
/*
- * Tell the backup_controller to relinquish control, primary control_machine
+ * Tell the backup_controller to relinquish control, primary control_machine
* has resumed operation
* wait_time - How long to wait for backup controller to write state, seconds.
* Must be zero when called from _slurmctld_background() loop.
@@ -1573,8 +1573,8 @@ static int _shutdown_backup_controller(int wait_time)
/* send request message */
req.msg_type = REQUEST_CONTROL;
-
- if (slurm_send_recv_rc_msg_only_one(&req, &rc,
+
+ if (slurm_send_recv_rc_msg_only_one(&req, &rc,
(CONTROL_TIMEOUT * 1000)) < 0) {
error("_shutdown_backup_controller:send/recv: %m");
return SLURM_ERROR;
@@ -1588,7 +1588,7 @@ static int _shutdown_backup_controller(int wait_time)
* but just temporarily became non-responsive */
clusteracct_storage_g_register_ctld(
acct_db_conn,
- slurmctld_cluster_name,
+ slurmctld_cluster_name,
slurmctld_conf.slurmctld_port);
}
} else {
@@ -1596,10 +1596,10 @@ static int _shutdown_backup_controller(int wait_time)
return SLURM_ERROR;
}
- /* FIXME: Ideally the REQUEST_CONTROL RPC does not return until all
- * other activity has ceased and the state has been saved. That is
- * not presently the case (it returns when no other work is pending,
- * so the state save should occur right away). We sleep for a while
+ /* FIXME: Ideally the REQUEST_CONTROL RPC does not return until all
+ * other activity has ceased and the state has been saved. That is
+ * not presently the case (it returns when no other work is pending,
+ * so the state save should occur right away). We sleep for a while
* here and give the backup controller time to shutdown */
if (wait_time)
sleep(wait_time);
@@ -1609,23 +1609,23 @@ static int _shutdown_backup_controller(int wait_time)
/* Reset the job credential key based upon configuration parameters
* NOTE: READ lock_slurmctld config before entry */
-static void _update_cred_key(void)
+static void _update_cred_key(void)
{
- slurm_cred_ctx_key_update(slurmctld_config.cred_ctx,
+ slurm_cred_ctx_key_update(slurmctld_config.cred_ctx,
slurmctld_conf.job_credential_private_key);
}
/* Reset slurmctld logging based upon configuration parameters
* uses common slurmctld_conf data structure
* NOTE: READ lock_slurmctld config before entry */
-void update_logging(void)
+void update_logging(void)
{
/* Preserve execute line arguments (if any) */
if (debug_level) {
slurmctld_conf.slurmctld_debug = MIN(
- (LOG_LEVEL_INFO + debug_level),
+ (LOG_LEVEL_INFO + debug_level),
(LOG_LEVEL_END - 1));
- }
+ }
if (slurmctld_conf.slurmctld_debug != (uint16_t) NO_VAL) {
log_opts.stderr_level = slurmctld_conf.slurmctld_debug;
log_opts.logfile_level = slurmctld_conf.slurmctld_debug;
@@ -1658,12 +1658,12 @@ _kill_old_slurmctld(void)
info ("killing old slurmctld[%ld]", (long) oldpid);
kill(oldpid, SIGTERM);
- /*
+ /*
* Wait for previous daemon to terminate
*/
- if (fd_get_readw_lock(fd) < 0)
+ if (fd_get_readw_lock(fd) < 0)
fatal ("unable to wait for readw lock: %m");
- (void) close(fd); /* Ignore errors */
+ (void) close(fd); /* Ignore errors */
}
}
@@ -1700,7 +1700,7 @@ set_slurmctld_state_loc(void)
struct stat st;
const char *path = slurmctld_conf.state_save_location;
- /*
+ /*
* If state save location does not exist, try to create it.
* Otherwise, ensure path is a directory as expected, and that
* we have permission to write to it.
@@ -1740,12 +1740,12 @@ static void *_assoc_cache_mgr(void *no_data)
return NULL;
}
lock_slurmctld(job_write_lock);
- assoc_mgr_refresh_lists(acct_db_conn, NULL);
+ assoc_mgr_refresh_lists(acct_db_conn, NULL);
if(running_cache)
unlock_slurmctld(job_write_lock);
slurm_mutex_unlock(&assoc_cache_mutex);
}
-
+
debug2("got real data from the database "
"refreshing the association ptr's for %d jobs",
list_count(job_list));
@@ -1755,13 +1755,13 @@ static void *_assoc_cache_mgr(void *no_data)
memset(&assoc_rec, 0, sizeof(acct_association_rec_t));
assoc_rec.id = job_ptr->assoc_id;
- debug("assoc is %x (%d) for job %u",
- job_ptr->assoc_ptr, job_ptr->assoc_id,
+ debug("assoc is %x (%d) for job %u",
+ job_ptr->assoc_ptr, job_ptr->assoc_id,
job_ptr->job_id);
-
+
if (assoc_mgr_fill_in_assoc(
acct_db_conn, &assoc_rec,
- accounting_enforce,
+ accounting_enforce,
(acct_association_rec_t **)
&job_ptr->assoc_ptr)) {
verbose("Invalid association id %u "
@@ -1771,8 +1771,8 @@ static void *_assoc_cache_mgr(void *no_data)
* been removed */
}
- debug("now assoc is %x (%d) for job %u",
- job_ptr->assoc_ptr, job_ptr->assoc_id,
+ debug("now assoc is %x (%d) for job %u",
+ job_ptr->assoc_ptr, job_ptr->assoc_id,
job_ptr->job_id);
}
if(job_ptr->qos) {
@@ -1787,7 +1787,7 @@ static void *_assoc_cache_mgr(void *no_data)
job_ptr->qos, job_ptr->job_id);
/* not a fatal error, qos could have
* been removed */
- }
+ }
}
}
list_iterator_destroy(itr);
@@ -1805,7 +1805,7 @@ static void _become_slurm_user(void)
/* Determine SlurmUser gid */
slurm_user_gid = gid_from_uid(slurmctld_conf.slurm_user_id);
if (slurm_user_gid == (gid_t) -1) {
- fatal("Failed to determine gid of SlurmUser(%u)",
+ fatal("Failed to determine gid of SlurmUser(%u)",
slurmctld_conf.slurm_user_id);
}
@@ -1817,7 +1817,7 @@ static void _become_slurm_user(void)
fatal("Failed to drop supplementary groups, "
"setgroups: %m");
} else if ((slurmctld_conf.slurm_user_id != getuid()) &&
- initgroups(slurmctld_conf.slurm_user_name,
+ initgroups(slurmctld_conf.slurm_user_name,
slurm_user_gid)) {
fatal("Failed to set supplementary groups, "
"initgroups: %m");
diff --git a/src/slurmctld/gang.c b/src/slurmctld/gang.c
index 6251c0b36ab26fc7b1dc5ca2343bc7fbc8a6ff01..56816f00d0f745a51e7166ab1ee5eea4a0c5e095 100644
--- a/src/slurmctld/gang.c
+++ b/src/slurmctld/gang.c
@@ -4,16 +4,16 @@
* Copyright (C) 2008 Hewlett-Packard Development Company, L.P.
* Written by Chris Holmes
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
@@ -29,7 +29,7 @@
* 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.
@@ -118,7 +118,7 @@ struct gs_part {
*
* The core_bitmap and cpus array are a collection of allocated values
* ONLY. For every bit set in node_bitmap, there is a corresponding
- * element in cpus and a set of elements in the core_bitmap.
+ * element in cpus and a set of elements in the core_bitmap.
*
******************************************
*
@@ -203,7 +203,7 @@ static void _print_jobs(struct gs_part *p_ptr)
if (p_ptr->active_resmap) {
int s = bit_size(p_ptr->active_resmap);
i = bit_set_count(p_ptr->active_resmap);
- debug3("gang: active resmap has %d of %d bits set",
+ debug3("gang: active resmap has %d of %d bits set",
i, s);
}
}
@@ -290,7 +290,7 @@ static void _load_phys_res_cnt(void)
xfree(gs_sockets_per_node);
xfree(gs_socket_rep_count);
- if ((gr_type != GS_CPU) && (gr_type != GS_CORE) &&
+ if ((gr_type != GS_CPU) && (gr_type != GS_CORE) &&
(gr_type != GS_SOCKET))
return;
@@ -472,7 +472,7 @@ static int _can_cpus_fit(struct job_record *job_ptr, struct gs_part *p_ptr)
if (gr_type != GS_CPU)
return 0;
-
+
size = bit_size(job_res->node_bitmap);
p_cpus = p_ptr->active_cpus;
j_cpus = job_res->cpus;
@@ -492,7 +492,7 @@ static int _can_cpus_fit(struct job_record *job_ptr, struct gs_part *p_ptr)
/* Return 1 if job fits in this row, else return 0 */
-static int _job_fits_in_active_row(struct job_record *job_ptr,
+static int _job_fits_in_active_row(struct job_record *job_ptr,
struct gs_part *p_ptr)
{
job_resources_t *job_res = job_ptr->job_resrcs;
@@ -507,7 +507,7 @@ static int _job_fits_in_active_row(struct job_record *job_ptr,
gs_bits_per_node,
gs_bit_rep_count);
}
-
+
/* gr_type == GS_NODE || gr_type == GS_CPU */
job_map = bit_copy(job_res->node_bitmap);
if (!job_map)
@@ -572,7 +572,7 @@ static void _fill_sockets(bitstr_t *job_nodemap, struct gs_part *p_ptr)
/* Add the given job to the "active" structures of
* the given partition and increment the run count */
-static void _add_job_to_active(struct job_record *job_ptr,
+static void _add_job_to_active(struct job_record *job_ptr,
struct gs_part *p_ptr)
{
job_resources_t *job_res = job_ptr->job_resrcs;
@@ -604,7 +604,7 @@ static void _add_job_to_active(struct job_record *job_ptr,
bit_or(p_ptr->active_resmap, job_res->node_bitmap);
}
}
-
+
/* add job to the active_cpus array */
if (gr_type == GS_CPU) {
uint32_t i, a, sz = bit_size(p_ptr->active_resmap);
@@ -651,7 +651,7 @@ static int _suspend_job(uint32_t job_id)
rc = job_suspend(&msg, 0, -1, false);
/* job_suspend() returns ESLURM_DISABLED if job is already suspended */
if ((rc != SLURM_SUCCESS) && (rc != ESLURM_DISABLED)) {
- info("gang: suspending job %u: %s",
+ info("gang: suspending job %u: %s",
job_id, slurm_strerror(rc));
}
return rc;
@@ -667,7 +667,7 @@ static void _resume_job(uint32_t job_id)
msg.op = RESUME_JOB;
rc = job_suspend(&msg, 0, -1, false);
if ((rc != SLURM_SUCCESS) && (rc != ESLURM_ALREADY_DONE)) {
- error("gang: resuming job %u: %s",
+ error("gang: resuming job %u: %s",
job_id, slurm_strerror(rc));
}
}
@@ -750,11 +750,11 @@ static void _cast_shadow(struct gs_job *j_ptr, uint16_t priority)
{
struct gs_part *p_ptr;
int i;
-
+
for (p_ptr = gs_part_list; p_ptr; p_ptr = p_ptr->next) {
if (p_ptr->priority >= priority)
continue;
-
+
/* This partition has a lower priority, so add
* the job as a "Shadow" */
if (!p_ptr->shadow) {
@@ -771,7 +771,7 @@ static void _cast_shadow(struct gs_job *j_ptr, uint16_t priority)
if (i < p_ptr->num_shadows)
continue;
}
-
+
if (p_ptr->num_shadows+1 >= p_ptr->shadow_size) {
p_ptr->shadow_size *= 2;
xrealloc(p_ptr->shadow, p_ptr->shadow_size *
@@ -787,7 +787,7 @@ static void _clear_shadow(struct gs_job *j_ptr)
{
struct gs_part *p_ptr;
int i;
-
+
for (p_ptr = gs_part_list; p_ptr; p_ptr = p_ptr->next) {
if (!p_ptr->shadow)
@@ -828,7 +828,7 @@ static void _update_active_row(struct gs_part *p_ptr, int add_new_jobs)
for (i = 0; p_ptr->shadow && p_ptr->shadow[i]; i++) {
_add_job_to_active(p_ptr->shadow[i]->job_ptr, p_ptr);
}
-
+
/* attempt to add the existing 'active' jobs */
for (i = 0; i < p_ptr->num_jobs; i++) {
j_ptr = p_ptr->job_list[i];
@@ -837,7 +837,7 @@ static void _update_active_row(struct gs_part *p_ptr, int add_new_jobs)
if (_job_fits_in_active_row(j_ptr->job_ptr, p_ptr)) {
_add_job_to_active(j_ptr->job_ptr, p_ptr);
_cast_shadow(j_ptr, p_ptr->priority);
-
+
} else {
/* this job has been preempted by a shadow job.
* suspend it and preserve it's job_list order */
@@ -906,12 +906,12 @@ static void _update_active_row(struct gs_part *p_ptr, int add_new_jobs)
static void _update_all_active_rows(void)
{
int i;
-
+
/* Sort the partitions. This way the shadows of any high-priority
* jobs are appropriately adjusted before the lower priority
* partitions are updated */
_sort_partitions();
-
+
for (i = 0; i < num_sorted_part; i++) {
_update_active_row(gs_part_sorted[i], 1);
}
@@ -940,17 +940,17 @@ static void _remove_job_from_part(uint32_t job_id, struct gs_part *p_ptr,
debug3("gang: _remove_job_from_part: removing job %u from %s",
job_id, p_ptr->part_name);
j_ptr = p_ptr->job_list[i];
-
+
/* remove any shadow first */
_clear_shadow(j_ptr);
-
+
/* remove the job from the job_list by shifting everyone else down */
p_ptr->num_jobs--;
for (; i < p_ptr->num_jobs; i++) {
p_ptr->job_list[i] = p_ptr->job_list[i+1];
}
p_ptr->job_list[i] = NULL;
-
+
/* make sure the job is not suspended, and then delete it */
if (!fini && (j_ptr->sig_state == GS_SUSPEND)) {
debug3("gang: _remove_job_from_part: resuming suspended "
@@ -959,7 +959,7 @@ static void _remove_job_from_part(uint32_t job_id, struct gs_part *p_ptr,
}
j_ptr->job_ptr = NULL;
xfree(j_ptr);
-
+
return;
}
@@ -967,7 +967,7 @@ static void _remove_job_from_part(uint32_t job_id, struct gs_part *p_ptr,
* then "cast it's shadow" over the active row of any partition with a
* lower priority than the given partition. Return the sig state of the
* job (GS_SUSPEND or GS_RESUME) */
-static uint16_t _add_job_to_part(struct gs_part *p_ptr,
+static uint16_t _add_job_to_part(struct gs_part *p_ptr,
struct job_record *job_ptr)
{
int i;
@@ -981,7 +981,7 @@ static uint16_t _add_job_to_part(struct gs_part *p_ptr,
debug3("gang: _add_job_to_part: adding job %u to %s",
job_ptr->job_id, p_ptr->part_name);
-
+
/* take care of any memory needs */
if (!p_ptr->job_list) {
p_ptr->job_list_size = default_job_list_size;
@@ -989,7 +989,7 @@ static uint16_t _add_job_to_part(struct gs_part *p_ptr,
sizeof(struct gs_job *));
/* job_list is initialized to be NULL filled */
}
-
+
/* protect against duplicates */
i = _find_job_index(p_ptr, job_ptr->job_id);
if (i >= 0) {
@@ -1002,7 +1002,7 @@ static uint16_t _add_job_to_part(struct gs_part *p_ptr,
_remove_job_from_part(job_ptr->job_id, p_ptr, false);
_update_active_row(p_ptr, 0);
}
-
+
/* more memory management */
if ((p_ptr->num_jobs + 1) == p_ptr->job_list_size) {
p_ptr->job_list_size *= 2;
@@ -1011,7 +1011,7 @@ static uint16_t _add_job_to_part(struct gs_part *p_ptr,
/* enlarged job_list is initialized to be NULL filled */
}
j_ptr = xmalloc(sizeof(struct gs_job));
-
+
/* gather job info */
j_ptr->job_id = job_ptr->job_id;
j_ptr->job_ptr = job_ptr;
@@ -1020,10 +1020,10 @@ static uint16_t _add_job_to_part(struct gs_part *p_ptr,
/* append this job to the job_list */
p_ptr->job_list[p_ptr->num_jobs++] = j_ptr;
-
+
/* determine the immediate fate of this job (run or suspend) */
if (_job_fits_in_active_row(job_ptr, p_ptr)) {
- debug3("gang: _add_job_to_part: job %u remains running",
+ debug3("gang: _add_job_to_part: job %u remains running",
job_ptr->job_id);
_add_job_to_active(job_ptr, p_ptr);
/* note that this job is a "filler" for this row */
@@ -1044,15 +1044,15 @@ static uint16_t _add_job_to_part(struct gs_part *p_ptr,
_suspend_job(job_ptr->job_id);
j_ptr->sig_state = GS_SUSPEND;
}
-
+
_print_jobs(p_ptr);
-
+
return j_ptr->sig_state;
}
/* ensure that all jobs running in SLURM are accounted for.
* this procedure assumes that the gs data has already been
- * locked by the caller!
+ * locked by the caller!
*/
static void _scan_slurm_job_list(void)
{
@@ -1068,7 +1068,7 @@ static void _scan_slurm_job_list(void)
job_iterator = list_iterator_create(job_list);
while ((job_ptr = (struct job_record *) list_next(job_iterator))) {
debug3("gang: _scan_slurm_job_list: checking job %u",
- job_ptr->job_id);
+ job_ptr->job_id);
if (IS_JOB_PENDING(job_ptr))
continue;
if (IS_JOB_SUSPENDED(job_ptr) && (job_ptr->priority == 0))
@@ -1083,17 +1083,17 @@ static void _scan_slurm_job_list(void)
if (i >= 0)
/* we're tracking it, so continue */
continue;
-
+
/* We're not tracking this job. Resume it if it's
* suspended, and then add it to the job list. */
-
+
if (IS_JOB_SUSPENDED(job_ptr)) {
- /* The likely scenario here is that the
- * failed over, and this is a job that gang
- * had previously suspended. It's not possible
- * to determine the previous order of jobs
- * without preserving gang state, which is not
- * worth the extra infrastructure. Just resume
+ /* The likely scenario here is that the
+ * failed over, and this is a job that gang
+ * had previously suspended. It's not possible
+ * to determine the previous order of jobs
+ * without preserving gang state, which is not
+ * worth the extra infrastructure. Just resume
* the job and then add it to the job list.
*/
_resume_job(job_ptr->job_id);
@@ -1102,10 +1102,10 @@ static void _scan_slurm_job_list(void)
_add_job_to_part(p_ptr, job_ptr);
continue;
}
-
+
/* if the job is not pending, suspended, or running, then
* it's completing or completed. Make sure we've released
- * this job */
+ * this job */
p_ptr = _find_gs_part(job_ptr->partition);
if (!p_ptr) /* no partition */
continue;
@@ -1152,7 +1152,7 @@ static void _spawn_timeslicer_thread(void)
}
slurm_attr_init(&thread_attr_msg);
- if (pthread_create(×licer_thread_id, &thread_attr_msg,
+ if (pthread_create(×licer_thread_id, &thread_attr_msg,
_timeslicer_thread, NULL))
fatal("pthread_create %m");
@@ -1251,7 +1251,7 @@ extern int gs_job_start(struct job_record *job_ptr)
return SLURM_SUCCESS;
}
-/* Scan the master SLURM job list for any new jobs to add, or for any old jobs
+/* Scan the master SLURM job list for any new jobs to add, or for any old jobs
* to remove */
extern int gs_job_scan(void)
{
@@ -1266,7 +1266,7 @@ extern int gs_job_scan(void)
return SLURM_SUCCESS;
}
-/* Gang scheduling has been disabled by change in configuration,
+/* Gang scheduling has been disabled by change in configuration,
* resume any suspended jobs */
extern void gs_wake_jobs(void)
{
@@ -1279,7 +1279,7 @@ extern void gs_wake_jobs(void)
job_iterator = list_iterator_create(job_list);
while ((job_ptr = (struct job_record *) list_next(job_iterator))) {
if (IS_JOB_SUSPENDED(job_ptr) && (job_ptr->priority != 0)) {
- info("gang waking preempted job %u", job_ptr->job_id);
+ info("gang waking preempted job %u", job_ptr->job_id);
_resume_job(job_ptr->job_id);
}
}
@@ -1290,7 +1290,7 @@ extern void gs_wake_jobs(void)
extern int gs_job_fini(struct job_record *job_ptr)
{
struct gs_part *p_ptr;
-
+
debug3("gang: entering gs_job_fini for job %u", job_ptr->job_id);
pthread_mutex_lock(&data_mutex);
p_ptr = _find_gs_part(job_ptr->partition);
@@ -1307,7 +1307,7 @@ extern int gs_job_fini(struct job_record *job_ptr)
_update_all_active_rows();
pthread_mutex_unlock(&data_mutex);
debug3("gang: leaving gs_job_fini");
-
+
return SLURM_SUCCESS;
}
@@ -1327,7 +1327,7 @@ extern int gs_job_fini(struct job_record *job_ptr)
* Here's the plan:
* 1. save a copy of the global structures, and then construct
* new ones.
- * 2. load the new partition structures with existing jobs,
+ * 2. load the new partition structures with existing jobs,
* confirming the job exists and resizing their resmaps
* (if necessary).
* 3. make sure all partitions are accounted for. If a partition
@@ -1354,7 +1354,7 @@ extern int gs_reconfig(void)
gr_type = _get_gr_type();
_load_phys_res_cnt();
_build_parts();
-
+
/* scan the old part list and add existing jobs to the new list */
for (p_ptr = old_part_list; p_ptr; p_ptr = p_ptr->next) {
newp_ptr = _find_gs_part(p_ptr->part_name);
@@ -1362,15 +1362,15 @@ extern int gs_reconfig(void)
/* this partition was removed, so resume
* any suspended jobs and continue */
for (i = 0; i < p_ptr->num_jobs; i++) {
- if (p_ptr->job_list[i]->sig_state ==
+ if (p_ptr->job_list[i]->sig_state ==
GS_SUSPEND) {
info("resuming job in missing part %s",
p_ptr->part_name);
_resume_job(p_ptr->job_list[i]->
job_id);
- p_ptr->job_list[i]->sig_state =
+ p_ptr->job_list[i]->sig_state =
GS_RESUME;
- }
+ }
}
continue;
}
@@ -1394,7 +1394,7 @@ extern int gs_reconfig(void)
continue;
}
/* resume any job that is suspended by us */
- if (IS_JOB_SUSPENDED(job_ptr) &&
+ if (IS_JOB_SUSPENDED(job_ptr) &&
(job_ptr->priority != 0)) {
debug3("resuming job %u apparently suspended "
" by gang", job_ptr->job_id);
@@ -1436,20 +1436,20 @@ extern int gs_reconfig(void)
static void _build_active_row(struct gs_part *p_ptr)
{
int i;
-
+
debug3("gang: entering _build_active_row");
p_ptr->jobs_active = 0;
if (p_ptr->num_jobs == 0)
return;
-
+
/* apply all shadow jobs first */
for (i = 0; i < p_ptr->num_shadows; i++) {
_add_job_to_active(p_ptr->shadow[i]->job_ptr, p_ptr);
}
-
+
/* attempt to add jobs from the job_list in the current order */
for (i = 0; i < p_ptr->num_jobs; i++) {
- if (_job_fits_in_active_row(p_ptr->job_list[i]->job_ptr,
+ if (_job_fits_in_active_row(p_ptr->job_list[i]->job_ptr,
p_ptr)) {
_add_job_to_active(p_ptr->job_list[i]->job_ptr, p_ptr);
p_ptr->job_list[i]->row_state = GS_ACTIVE;
@@ -1476,7 +1476,7 @@ static void _cycle_job_list(struct gs_part *p_ptr)
{
int i, j;
struct gs_job *j_ptr;
-
+
debug3("gang: entering _cycle_job_list");
/* re-prioritize the job_list and set all row_states to GS_NO_ACTIVE */
for (i = 0; i < p_ptr->num_jobs; i++) {
@@ -1491,7 +1491,7 @@ static void _cycle_job_list(struct gs_part *p_ptr)
}
if (p_ptr->job_list[i]->row_state == GS_FILLER)
p_ptr->job_list[i]->row_state = GS_NO_ACTIVE;
-
+
}
debug3("gang: _cycle_job_list reordered job list:");
/* Rebuild the active row. */
@@ -1504,7 +1504,7 @@ static void _cycle_job_list(struct gs_part *p_ptr)
j_ptr = p_ptr->job_list[i];
if ((j_ptr->row_state == GS_NO_ACTIVE) &&
(j_ptr->sig_state == GS_RESUME)) {
- debug3("gang: _cycle_job_list: suspending job %u",
+ debug3("gang: _cycle_job_list: suspending job %u",
j_ptr->job_id);
if (p_ptr->num_shadows)
_preempt_job_queue(j_ptr->job_id);
@@ -1514,7 +1514,7 @@ static void _cycle_job_list(struct gs_part *p_ptr)
_clear_shadow(j_ptr);
}
}
-
+
/* Resume suspended jobs that are GS_ACTIVE */
for (i = 0; i < p_ptr->num_jobs; i++) {
j_ptr = p_ptr->job_list[i];
@@ -1546,19 +1546,19 @@ static void *_timeslicer_thread(void *arg)
NO_LOCK, WRITE_LOCK, READ_LOCK, NO_LOCK };
struct gs_part *p_ptr;
int i;
-
+
debug3("gang: starting timeslicer loop");
while (!thread_shutdown) {
lock_slurmctld(job_write_lock);
pthread_mutex_lock(&data_mutex);
_sort_partitions();
-
+
/* scan each partition... */
debug3("gang: _timeslicer_thread: scanning partitions");
for (i = 0; i < num_sorted_part; i++) {
p_ptr = gs_part_sorted[i];
debug3("gang: _timeslicer_thread: part %s: "
- "run %u total %u", p_ptr->part_name,
+ "run %u total %u", p_ptr->part_name,
p_ptr->jobs_active, p_ptr->num_jobs);
if (p_ptr->jobs_active <
p_ptr->num_jobs + p_ptr->num_shadows)
diff --git a/src/slurmctld/gang.h b/src/slurmctld/gang.h
index 72c04640ca4a19eaad7a0878c7fbf910cb768472..dcea1eb7006fda8a61c82a77052d077019f836dd 100644
--- a/src/slurmctld/gang.h
+++ b/src/slurmctld/gang.h
@@ -4,16 +4,16 @@
* Copyright (C) 2008 Hewlett-Packard Development Company, L.P.
* Written by Chris Holmes
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
@@ -29,7 +29,7 @@
* 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.
@@ -55,19 +55,19 @@ extern int gs_fini(void);
/* Notify the gang scheduler that a job has been started */
extern int gs_job_start(struct job_record *job_ptr);
-/* scan the master SLURM job list for any new jobs to add, or for any old jobs
+/* scan the master SLURM job list for any new jobs to add, or for any old jobs
* to remove */
extern int gs_job_scan(void);
/* Notify the gang scheduler that a job has completed */
extern int gs_job_fini(struct job_record *job_ptr);
-/* Gang scheduling has been disabled by change in configuration,
+/* Gang scheduling has been disabled by change in configuration,
* resume any suspended jobs */
extern void gs_wake_jobs(void);
/* Tell gang scheduler that system reconfiguration has been performed
- * configuration parameters may have changed. Rebuild data structures
+ * configuration parameters may have changed. Rebuild data structures
* from scratch */
extern int gs_reconfig(void);
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 9fee3de6ff2ae79c70074e902bb30dcfa9dd2286..88d64adc887a723e48b42743f95f85ccc8b12da6 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -1,6 +1,6 @@
/*****************************************************************************\
* job_mgr.c - manage the job information of slurm
- * Note: there is a global job list (job_list), time stamp
+ * Note: there is a global job list (job_list), time stamp
* (last_job_update), and hash table (job_hash)
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
@@ -8,32 +8,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -127,7 +127,7 @@ static char *_copy_nodelist_no_dup(char *node_list);
static void _del_batch_list_rec(void *x);
static void _delete_job_desc_files(uint32_t job_id);
static acct_qos_rec_t *_determine_and_validate_qos(
- acct_association_rec_t *assoc_ptr,
+ acct_association_rec_t *assoc_ptr,
acct_qos_rec_t *qos_rec,
int *error_code);
static void _dump_job_details(struct job_details *detail_ptr,
@@ -184,7 +184,7 @@ static int _write_data_array_to_file(char *file_name, char **data,
static void _xmit_new_end_time(struct job_record *job_ptr);
-/*
+/*
* create_job_record - create an empty job_record including job_details.
* load its values with defaults (zeros, nulls, and magic cookie)
* IN/OUT error_code - set to zero if no error, errno otherwise
@@ -230,9 +230,9 @@ struct job_record *create_job_record(int *error_code)
}
-/*
+/*
* delete_job_details - delete a job's detail record and clear it's pointer
- * this information can be deleted as soon as the job is allocated
+ * this information can be deleted as soon as the job is allocated
* resources and running (could need to restart batch job)
* IN job_entry - pointer to job_record to clear the record of
*/
@@ -302,10 +302,10 @@ static void _delete_job_desc_files(uint32_t job_id)
}
static acct_qos_rec_t *_determine_and_validate_qos(
- acct_association_rec_t *assoc_ptr,
+ acct_association_rec_t *assoc_ptr,
acct_qos_rec_t *qos_rec,
int *error_code)
-{
+{
acct_qos_rec_t *qos_ptr = NULL;
/* If enforcing associations make sure this is a valid qos
@@ -317,10 +317,10 @@ static acct_qos_rec_t *_determine_and_validate_qos(
xassert(qos_rec);
if(!qos_rec->name && !qos_rec->id) {
- if(assoc_ptr && assoc_ptr->valid_qos
+ if(assoc_ptr && assoc_ptr->valid_qos
&& bit_set_count(assoc_ptr->valid_qos) == 1)
qos_rec->id = bit_ffs(assoc_ptr->valid_qos);
- else
+ else
qos_rec->name = "normal";
}
@@ -330,20 +330,20 @@ static acct_qos_rec_t *_determine_and_validate_qos(
error("Invalid qos (%s)", qos_rec->name);
*error_code = ESLURM_INVALID_QOS;
return NULL;
- }
-
+ }
+
if((accounting_enforce & ACCOUNTING_ENFORCE_QOS)
- && assoc_ptr
+ && assoc_ptr
&& (!assoc_ptr->valid_qos || !bit_test(assoc_ptr->valid_qos,
qos_rec->id))) {
error("This association %d(account='%s', "
"user='%s', partition='%s') does not have "
- "access to qos %s",
+ "access to qos %s",
assoc_ptr->id, assoc_ptr->acct, assoc_ptr->user,
assoc_ptr->partition, qos_rec->name);
*error_code = ESLURM_INVALID_QOS;
return NULL;
- }
+ }
*error_code = SLURM_SUCCESS;
return qos_ptr;
@@ -352,7 +352,7 @@ static acct_qos_rec_t *_determine_and_validate_qos(
/*
* dump_all_job_state - save the state of all jobs to file for checkpoint
- * Changes here should be reflected in load_last_job_id() and
+ * Changes here should be reflected in load_last_job_id() and
* load_all_job_state().
* RET 0 or error code */
int dump_all_job_state(void)
@@ -496,7 +496,7 @@ static int _open_job_state_file(char **state_file)
}
/*
- * load_all_job_state - load the job state from file, recover from last
+ * load_all_job_state - load the job state from file, recover from last
* checkpoint. Execute this after loading the configuration file data.
* Changes here should be reflected in load_last_job_id().
* RET 0 or error code
@@ -529,7 +529,7 @@ extern int load_all_job_state(void)
if (errno == EINTR)
continue;
else {
- error("Read error on %s: %m",
+ error("Read error on %s: %m",
state_file);
break;
}
@@ -620,7 +620,7 @@ extern int load_last_job_id( void )
if (errno == EINTR)
continue;
else {
- error("Read error on %s: %m",
+ error("Read error on %s: %m",
state_file);
break;
}
@@ -668,7 +668,7 @@ unpack_error:
}
/*
- * _dump_job_state - dump the state of a specific job, its details, and
+ * _dump_job_state - dump the state of a specific job, its details, and
* steps to a buffer
* IN dump_job_ptr - pointer to job for which information is requested
* IN/OUT buffer - location to store data, pointers automatically advanced
@@ -745,7 +745,7 @@ static void _dump_job_state(struct job_record *dump_job_ptr, Buf buffer)
pack16(dump_job_ptr->ckpt_interval, buffer);
checkpoint_pack_jobinfo(dump_job_ptr->check_job, buffer);
- packstr_array(dump_job_ptr->spank_job_env,
+ packstr_array(dump_job_ptr->spank_job_env,
dump_job_ptr->spank_job_env_size, buffer);
/* Dump job details, if available */
@@ -759,7 +759,7 @@ static void _dump_job_state(struct job_record *dump_job_ptr, Buf buffer)
/* Dump job steps */
step_iterator = list_iterator_create(dump_job_ptr->step_list);
- while ((step_ptr = (struct step_record *)
+ while ((step_ptr = (struct step_record *)
list_next(step_iterator))) {
pack16((uint16_t) STEP_FLAG, buffer);
dump_job_step_state(step_ptr, buffer);
@@ -837,7 +837,7 @@ static int _load_job_state(Buf buffer)
safe_unpack16(&other_port, buffer);
if (job_state & JOB_COMPLETING) {
- safe_unpackstr_xmalloc(&nodes_completing,
+ safe_unpackstr_xmalloc(&nodes_completing,
&name_len, buffer);
}
safe_unpackstr_xmalloc(&nodes, &name_len, buffer);
@@ -870,7 +870,7 @@ static int _load_job_state(Buf buffer)
goto unpack_error;
}
- if (((job_state & JOB_STATE_BASE) >= JOB_END) ||
+ if (((job_state & JOB_STATE_BASE) >= JOB_END) ||
(batch_flag > 2)) {
error("Invalid data for job %u: job_state=%u batch_flag=%u",
job_id, job_state, batch_flag);
@@ -892,9 +892,9 @@ static int _load_job_state(Buf buffer)
}
part_ptr = find_part_record (partition);
if (part_ptr == NULL) {
- verbose("Invalid partition (%s) for job_id %u",
+ verbose("Invalid partition (%s) for job_id %u",
partition, job_id);
- /* not a fatal error, partition could have been removed,
+ /* not a fatal error, partition could have been removed,
* reset_job_bitmaps() will clean-up this job */
}
@@ -916,7 +916,7 @@ static int _load_job_state(Buf buffer)
job_id_sequence = job_id + 1;
safe_unpack16(&details, buffer);
- if ((details == DETAILS_FLAG) &&
+ if ((details == DETAILS_FLAG) &&
(_load_job_details(job_ptr, buffer))) {
job_ptr->job_state = JOB_FAILED;
job_ptr->exit_code = 1;
@@ -1010,7 +1010,7 @@ static int _load_job_state(Buf buffer)
memset(&assoc_rec, 0, sizeof(acct_association_rec_t));
- /*
+ /*
* For speed and accurracy we will first see if we once had an
* association record. If not look for it by
* account,partition, user_id.
@@ -1044,10 +1044,10 @@ static int _load_job_state(Buf buffer)
/* make sure we have started this job in accounting */
if(job_ptr->assoc_id && !job_ptr->db_index && job_ptr->nodes) {
- debug("starting job %u in accounting",
+ debug("starting job %u in accounting",
job_ptr->job_id);
- jobacct_storage_g_job_start(acct_db_conn,
- slurmctld_cluster_name,
+ jobacct_storage_g_job_start(acct_db_conn,
+ slurmctld_cluster_name,
job_ptr);
if (IS_JOB_SUSPENDED(job_ptr)) {
jobacct_storage_g_job_suspend(acct_db_conn,
@@ -1074,7 +1074,7 @@ static int _load_job_state(Buf buffer)
job_ptr->start_time = now;
job_ptr->end_time = now;
job_completion_logger(job_ptr);
- }
+ }
job_ptr->qos = qos_rec.id;
}
safe_unpack16(&step_flag, buffer);
@@ -1116,7 +1116,7 @@ unpack_error:
}
/*
- * _dump_job_details - dump the state of a specific job details to
+ * _dump_job_details - dump the state of a specific job details to
* a buffer
* IN detail_ptr - pointer to job details for which information is requested
* IN/OUT buffer - location to store data, pointers automatically advanced
@@ -1312,17 +1312,17 @@ static int _load_job_details(struct job_record *job_ptr, Buf buffer)
job_ptr->details->work_dir = work_dir;
job_ptr->details->ckpt_dir = ckpt_dir;
job_ptr->details->restart_dir = restart_dir;
-
+
return SLURM_SUCCESS;
unpack_error:
-/* for (i=0; i<argc; i++)
+/* for (i=0; i<argc; i++)
xfree(argv[i]); Don't trust this on unpack error */
xfree(argv);
xfree(cpu_bind);
xfree(dependency);
-/* for (i=0; i<env_cnt; i++)
+/* for (i=0; i<env_cnt; i++)
xfree(env_sup[i]); Don't trust this on unpack error */
xfree(env_sup);
xfree(err);
@@ -1338,7 +1338,7 @@ unpack_error:
return SLURM_FAILURE;
}
-/* _add_job_hash - add a job hash entry for given job record, job_id must
+/* _add_job_hash - add a job hash entry for given job record, job_id must
* already be set
* IN job_ptr - pointer to job record
* Globals: hash table updated
@@ -1352,7 +1352,7 @@ void _add_job_hash(struct job_record *job_ptr)
job_hash[inx] = job_ptr;
}
-/*
+/*
* find_job_record - return a pointer to the job record with the given job_id
* IN job_id - requested job's id
* RET pointer to the job's record, NULL on error
@@ -1374,8 +1374,8 @@ struct job_record *find_job_record(uint32_t job_id)
}
/*
- * kill_job_by_part_name - Given a partition name, deallocate resource for
- * its jobs and kill them. All jobs associated with this partition
+ * kill_job_by_part_name - Given a partition name, deallocate resource for
+ * its jobs and kill them. All jobs associated with this partition
* will have their partition pointer cleared.
* IN part_name - name of a partition
* RET number of jobs associated with this partition
@@ -1420,7 +1420,7 @@ extern int kill_job_by_part_name(char *part_name)
xfree(job_ptr->state_desc);
if (suspended) {
job_ptr->end_time = job_ptr->suspend_time;
- job_ptr->tot_sus_time +=
+ job_ptr->tot_sus_time +=
difftime(now, job_ptr->suspend_time);
} else
job_ptr->end_time = now;
@@ -1446,8 +1446,8 @@ extern int kill_job_by_part_name(char *part_name)
}
/*
- * kill_running_job_by_node_name - Given a node name, deallocate RUNNING
- * or COMPLETING jobs from the node or kill them
+ * kill_running_job_by_node_name - Given a node name, deallocate RUNNING
+ * or COMPLETING jobs from the node or kill them
* IN node_name - name of a node
* RET number of killed jobs
*/
@@ -1488,7 +1488,7 @@ extern int kill_running_job_by_node_name(char *node_name)
if (job_ptr->node_cnt)
(job_ptr->node_cnt)--;
else
- error("node_cnt underflow on JobId=%u",
+ error("node_cnt underflow on JobId=%u",
job_ptr->job_id);
if (job_ptr->node_cnt == 0) {
job_ptr->job_state &= (~JOB_COMPLETING);
@@ -1499,7 +1499,7 @@ extern int kill_running_job_by_node_name(char *node_name)
(node_ptr->comp_job_cnt)--;
else
error("Node %s comp_job_cnt underflow, "
- "JobId=%u",
+ "JobId=%u",
node_ptr->name, job_ptr->job_id);
} else if (IS_JOB_RUNNING(job_ptr) || suspended) {
job_count++;
@@ -1527,15 +1527,15 @@ extern int kill_running_job_by_node_name(char *node_name)
slurm_sched_requeue(job_ptr, requeue_msg);
job_ptr->time_last_active = now;
if (suspended) {
- job_ptr->end_time =
+ job_ptr->end_time =
job_ptr->suspend_time;
- job_ptr->tot_sus_time +=
+ job_ptr->tot_sus_time +=
difftime(now,
job_ptr->
suspend_time);
} else
job_ptr->end_time = now;
-
+
/* We want this job to look like it
* was terminated in the accounting logs.
* Set a new submit time so the restarted
@@ -1548,7 +1548,7 @@ extern int kill_running_job_by_node_name(char *node_name)
if (job_ptr->node_cnt)
job_ptr->job_state |= JOB_COMPLETING;
job_ptr->details->submit_time = now;
-
+
/* restart from periodic checkpoint */
if (job_ptr->ckpt_interval &&
job_ptr->ckpt_time &&
@@ -1571,17 +1571,17 @@ extern int kill_running_job_by_node_name(char *node_name)
info("Killing job_id %u on failed node %s",
job_ptr->job_id, node_name);
srun_node_fail(job_ptr->job_id, node_name);
- job_ptr->job_state = JOB_NODE_FAIL |
+ job_ptr->job_state = JOB_NODE_FAIL |
JOB_COMPLETING;
- job_ptr->exit_code =
+ job_ptr->exit_code =
MAX(job_ptr->exit_code, 1);
job_ptr->state_reason = FAIL_DOWN_NODE;
xfree(job_ptr->state_desc);
if (suspended) {
job_ptr->end_time =
job_ptr->suspend_time;
- job_ptr->tot_sus_time +=
- difftime(now,
+ job_ptr->tot_sus_time +=
+ difftime(now,
job_ptr->
suspend_time);
} else
@@ -1600,7 +1600,7 @@ extern int kill_running_job_by_node_name(char *node_name)
}
/* Remove one node from a job's allocation */
-extern void excise_node_from_job(struct job_record *job_ptr,
+extern void excise_node_from_job(struct job_record *job_ptr,
struct node_record *node_ptr)
{
int i, orig_pos = -1, new_pos = -1;
@@ -1649,15 +1649,15 @@ void dump_job_desc(job_desc_msg_t * job_specs)
if (job_specs == NULL)
return;
- job_id = (job_specs->job_id != NO_VAL) ?
+ job_id = (job_specs->job_id != NO_VAL) ?
(long) job_specs->job_id : -1L;
debug3("JobDesc: user_id=%u job_id=%ld partition=%s name=%s",
job_specs->user_id, job_id,
job_specs->partition, job_specs->name);
- num_procs = (job_specs->num_procs != NO_VAL) ?
+ num_procs = (job_specs->num_procs != NO_VAL) ?
(long) job_specs->num_procs : -1L;
- job_min_cpus = (job_specs->job_min_cpus != (uint16_t) NO_VAL) ?
+ job_min_cpus = (job_specs->job_min_cpus != (uint16_t) NO_VAL) ?
(long) job_specs->job_min_cpus : -1L;
debug3(" num_procs=%ld job_min_procs=%ld", num_procs, job_min_cpus);
@@ -1677,7 +1677,7 @@ void dump_job_desc(job_desc_msg_t * job_specs)
job_min_memory = (long) job_specs->job_min_memory;
mem_type = "job";
}
- job_min_tmp_disk = (job_specs->job_min_tmp_disk != NO_VAL) ?
+ job_min_tmp_disk = (job_specs->job_min_tmp_disk != NO_VAL) ?
(long) job_specs->job_min_tmp_disk : -1L;
debug3(" min_memory_%s=%ld job_min_tmp_disk=%ld",
mem_type, job_min_memory, job_min_tmp_disk);
@@ -1685,22 +1685,22 @@ void dump_job_desc(job_desc_msg_t * job_specs)
debug3(" immediate=%ld features=%s reservation=%s",
immediate, job_specs->features, job_specs->reservation);
- debug3(" req_nodes=%s exc_nodes=%s",
+ debug3(" req_nodes=%s exc_nodes=%s",
job_specs->req_nodes, job_specs->exc_nodes);
- time_limit = (job_specs->time_limit != NO_VAL) ?
+ time_limit = (job_specs->time_limit != NO_VAL) ?
(long) job_specs->time_limit : -1L;
- priority = (job_specs->priority != NO_VAL) ?
+ priority = (job_specs->priority != NO_VAL) ?
(long) job_specs->priority : -1L;
- contiguous = (job_specs->contiguous != (uint16_t) NO_VAL) ?
+ contiguous = (job_specs->contiguous != (uint16_t) NO_VAL) ?
(long) job_specs->contiguous : -1L;
- shared = (job_specs->shared != (uint16_t) NO_VAL) ?
+ shared = (job_specs->shared != (uint16_t) NO_VAL) ?
(long) job_specs->shared : -1L;
debug3(" time_limit=%ld priority=%ld contiguous=%ld shared=%ld",
time_limit, priority, contiguous, shared);
- kill_on_node_fail = (job_specs->kill_on_node_fail !=
- (uint16_t) NO_VAL) ?
+ kill_on_node_fail = (job_specs->kill_on_node_fail !=
+ (uint16_t) NO_VAL) ?
(long) job_specs->kill_on_node_fail : -1L;
if (job_specs->script) /* log has problem with string len & null */
debug3(" kill_on_node_fail=%ld script=%.40s...",
@@ -1710,7 +1710,7 @@ void dump_job_desc(job_desc_msg_t * job_specs)
kill_on_node_fail, job_specs->script);
if (job_specs->argc == 1)
- debug3(" argv=\"%s\"",
+ debug3(" argv=\"%s\"",
job_specs->argv[0]);
else if (job_specs->argc == 2)
debug3(" argv=%s,%s",
@@ -1723,7 +1723,7 @@ void dump_job_desc(job_desc_msg_t * job_specs)
job_specs->argv[2]);
if (job_specs->env_size == 1)
- debug3(" environment=\"%s\"",
+ debug3(" environment=\"%s\"",
job_specs->environment[0]);
else if (job_specs->env_size == 2)
debug3(" environment=%s,%s",
@@ -1736,7 +1736,7 @@ void dump_job_desc(job_desc_msg_t * job_specs)
job_specs->environment[2]);
if (job_specs->spank_job_env_size == 1)
- debug3(" spank_job_env=\"%s\"",
+ debug3(" spank_job_env=\"%s\"",
job_specs->spank_job_env[0]);
else if (job_specs->spank_job_env_size == 2)
debug3(" spank_job_env=%s,%s",
@@ -1756,10 +1756,10 @@ void dump_job_desc(job_desc_msg_t * job_specs)
job_specs->alloc_node, job_specs->alloc_sid);
debug3(" resp_host=%s alloc_resp_port=%u other_port=%u",
- job_specs->resp_host,
+ job_specs->resp_host,
job_specs->alloc_resp_port, job_specs->other_port);
debug3(" dependency=%s account=%s comment=%s",
- job_specs->dependency, job_specs->account,
+ job_specs->dependency, job_specs->account,
job_specs->comment);
num_tasks = (job_specs->num_tasks != (uint16_t) NO_VAL) ?
@@ -1780,23 +1780,23 @@ void dump_job_desc(job_desc_msg_t * job_specs)
requeue = (job_specs->requeue != (uint16_t) NO_VAL) ?
(long) job_specs->requeue : -1L;
debug3(" network=%s begin=%s cpus_per_task=%ld requeue=%ld "
- "licenses=%s",
+ "licenses=%s",
job_specs->network, buf, cpus_per_task, requeue,
job_specs->licenses);
slurm_make_time_str(&job_specs->end_time, buf, sizeof(buf));
- debug3(" end_time=%s signal=%u@%u",
+ debug3(" end_time=%s signal=%u@%u",
buf, job_specs->warn_signal, job_specs->warn_time);
ntasks_per_node = (job_specs->ntasks_per_node != (uint16_t) NO_VAL) ?
(long) job_specs->ntasks_per_node : -1L;
- ntasks_per_socket = (job_specs->ntasks_per_socket !=
+ ntasks_per_socket = (job_specs->ntasks_per_socket !=
(uint16_t) NO_VAL) ?
(long) job_specs->ntasks_per_socket : -1L;
ntasks_per_core = (job_specs->ntasks_per_core != (uint16_t) NO_VAL) ?
(long) job_specs->ntasks_per_core : -1L;
debug3(" ntasks_per_node=%ld ntasks_per_socket=%ld "
- "ntasks_per_core=%ld",
+ "ntasks_per_core=%ld",
ntasks_per_node, ntasks_per_socket, ntasks_per_core);
debug3(" cpus_bind=%u:%s mem_bind=%u:%s plane_size:%u",
@@ -1804,18 +1804,18 @@ void dump_job_desc(job_desc_msg_t * job_specs)
job_specs->mem_bind_type, job_specs->mem_bind,
job_specs->plane_size);
- select_g_select_jobinfo_sprint(job_specs->select_jobinfo,
+ select_g_select_jobinfo_sprint(job_specs->select_jobinfo,
buf, sizeof(buf), SELECT_PRINT_MIXED);
if (buf[0] != '\0')
debug3(" %s", buf);
}
-/*
- * init_job_conf - initialize the job configuration tables and values.
- * this should be called after creating node information, but
- * before creating any job entries. Pre-existing job entries are
- * left unchanged.
+/*
+ * init_job_conf - initialize the job configuration tables and values.
+ * this should be called after creating node information, but
+ * before creating any job entries. Pre-existing job entries are
+ * left unchanged.
* NOTE: The job hash table size does not change after initial creation.
* RET 0 if no error, otherwise an error code
* global: last_job_update - time of last job table update
@@ -1842,38 +1842,38 @@ extern void rehash_jobs(void)
{
if (job_hash == NULL) {
hash_table_size = slurmctld_conf.max_job_cnt;
- job_hash = (struct job_record **)
+ job_hash = (struct job_record **)
xmalloc(hash_table_size * sizeof(struct job_record *));
} else if (hash_table_size < (slurmctld_conf.max_job_cnt / 2)) {
- /* If the MaxJobCount grows by too much, the hash table will
+ /* If the MaxJobCount grows by too much, the hash table will
* be ineffective without rebuilding. We don't presently bother
- * to rebuild the hash table, but cut MaxJobCount back as
- * needed. */
+ * to rebuild the hash table, but cut MaxJobCount back as
+ * needed. */
error ("MaxJobCount reset too high, restart slurmctld");
slurmctld_conf.max_job_cnt = hash_table_size;
}
}
/*
- * job_allocate - create job_records for the suppied job specification and
+ * job_allocate - create job_records for the suppied job specification and
* allocate nodes for it.
* IN job_specs - job specifications
* IN immediate - if set then either initiate the job immediately or fail
- * IN will_run - don't initiate the job if set, just test if it could run
+ * IN will_run - don't initiate the job if set, just test if it could run
* now or later
* OUT resp - will run response (includes start location, time, etc.)
* IN allocate - resource allocation request if set, not a full job
* IN submit_uid -uid of user issuing the request
* OUT job_pptr - set to pointer to job record
- * RET 0 or an error code. If the job would only be able to execute with
- * some change in partition configuration then
+ * RET 0 or an error code. If the job would only be able to execute with
+ * some change in partition configuration then
* ESLURM_REQUESTED_PART_CONFIG_UNAVAILABLE is returned
- * globals: job_list - pointer to global job list
+ * globals: job_list - pointer to global job list
* list_part - global list of partition info
* default_part_loc - pointer to default partition
* NOTE: lock_slurmctld on entry: Read config Write job, Write node, Read part
*/
-extern int job_allocate(job_desc_msg_t * job_specs, int immediate,
+extern int job_allocate(job_desc_msg_t * job_specs, int immediate,
int will_run, will_run_response_msg_t **resp,
int allocate, uid_t submit_uid,
struct job_record **job_pptr)
@@ -1885,7 +1885,7 @@ extern int job_allocate(job_desc_msg_t * job_specs, int immediate,
&job_ptr, submit_uid);
*job_pptr = job_ptr;
time_t now = time(NULL);
-
+
if (error_code) {
if (job_ptr && (immediate || will_run)) {
job_ptr->job_state = JOB_FAILED;
@@ -1910,14 +1910,14 @@ extern int job_allocate(job_desc_msg_t * job_specs, int immediate,
independent = false;
/* Avoid resource fragmentation if important */
- if ((submit_uid || (job_specs->req_nodes == NULL)) &&
+ if ((submit_uid || (job_specs->req_nodes == NULL)) &&
independent && job_is_completing())
too_fragmented = true; /* Don't pick nodes for job now */
- /* FIXME: Ideally we only want to refuse the request if the
+ /* FIXME: Ideally we only want to refuse the request if the
* required node list is insufficient to satisfy the job's
* processor or node count requirements, but the overhead is
* rather high to do that right here. We let requests from
- * user root proceed if a node list is specified, for
+ * user root proceed if a node list is specified, for
* meta-schedulers (e.g. LCRM). */
else
too_fragmented = false;
@@ -1925,7 +1925,7 @@ extern int job_allocate(job_desc_msg_t * job_specs, int immediate,
if (independent && (!too_fragmented))
top_prio = _top_priority(job_ptr);
else
- top_prio = true; /* don't bother testing,
+ top_prio = true; /* don't bother testing,
* it is not runable anyway */
if (immediate && (too_fragmented || (!top_prio) || (!independent))) {
job_ptr->job_state = JOB_FAILED;
@@ -1956,7 +1956,7 @@ extern int job_allocate(job_desc_msg_t * job_specs, int immediate,
test_only = will_run || (allocate == 0);
- no_alloc = test_only || too_fragmented ||
+ no_alloc = test_only || too_fragmented ||
(!top_prio) || (!independent);
error_code = select_nodes(job_ptr, no_alloc, NULL);
@@ -2000,12 +2000,12 @@ extern int job_allocate(job_desc_msg_t * job_specs, int immediate,
job_completion_logger(job_ptr);
return error_code;
}
-
+
if (will_run) { /* job would run, flag job destruction */
job_ptr->job_state = JOB_FAILED;
job_ptr->exit_code = 1;
job_ptr->start_time = job_ptr->end_time = now;
- }
+ }
return SLURM_SUCCESS;
}
@@ -2044,7 +2044,7 @@ extern int job_fail(uint32_t job_id)
job_ptr->time_last_active = now;
if (suspended) {
job_ptr->end_time = job_ptr->suspend_time;
- job_ptr->tot_sus_time +=
+ job_ptr->tot_sus_time +=
difftime(now, job_ptr->suspend_time);
} else
job_ptr->end_time = now;
@@ -2064,17 +2064,17 @@ extern int job_fail(uint32_t job_id)
}
-/*
+/*
* job_signal - signal the specified job
* IN job_id - id of the job to be signaled
* IN signal - signal to send, SIGKILL == cancel the job
* IN batch_flag - signal batch shell only if set
* IN uid - uid of requesting user
- * RET 0 on success, otherwise ESLURM error code
+ * RET 0 on success, otherwise ESLURM error code
* global: job_list - pointer global job list
* last_job_update - time of last job table update
*/
-extern int job_signal(uint32_t job_id, uint16_t signal, uint16_t batch_flag,
+extern int job_signal(uint32_t job_id, uint16_t signal, uint16_t batch_flag,
uid_t uid)
{
struct job_record *job_ptr;
@@ -2148,7 +2148,7 @@ extern int job_signal(uint32_t job_id, uint16_t signal, uint16_t batch_flag,
signal, job_id);
return SLURM_SUCCESS;
}
-
+
if (IS_JOB_RUNNING(job_ptr)) {
if (signal == SIGKILL) {
/* No need to signal steps, deallocate kills them */
@@ -2166,7 +2166,7 @@ extern int job_signal(uint32_t job_id, uint16_t signal, uint16_t batch_flag,
} else {
_signal_job(job_ptr, signal);
}
- verbose("job_signal %u of running job %u successful",
+ verbose("job_signal %u of running job %u successful",
signal, job_id);
return SLURM_SUCCESS;
}
@@ -2194,8 +2194,8 @@ _signal_batch_job(struct job_record *job_ptr, uint16_t signal)
agent_args->msg_type = REQUEST_SIGNAL_TASKS;
agent_args->retry = 1;
agent_args->node_count = 1;
- agent_args->hostlist =
- hostlist_create(node_record_table_ptr[i].name);
+ agent_args->hostlist =
+ hostlist_create(node_record_table_ptr[i].name);
kill_tasks_msg = xmalloc(sizeof(kill_tasks_msg_t));
kill_tasks_msg->job_id = job_ptr->job_id;
kill_tasks_msg->job_step_id = NO_VAL;
@@ -2207,13 +2207,13 @@ _signal_batch_job(struct job_record *job_ptr, uint16_t signal)
return;
}
-/*
+/*
* job_complete - note the normal termination the specified job
* IN job_id - id of the job which completed
* IN uid - user id of user issuing the RPC
* IN requeue - job should be run again if possible
* IN job_return_code - job's return code, if set then set state to FAILED
- * RET - 0 on success, otherwise ESLURM error code
+ * RET - 0 on success, otherwise ESLURM error code
* global: job_list - pointer global job list
* last_job_update - time of last job table update
*/
@@ -2280,7 +2280,7 @@ extern int job_complete(uint32_t job_id, uid_t uid, bool requeue,
put now + 1 so we get different records in the
database */
job_ptr->details->submit_time = now+1;
-
+
job_ptr->batch_flag++; /* only one retry */
job_ptr->restart_cnt++;
job_ptr->job_state = JOB_PENDING | job_comp_flag;
@@ -2291,7 +2291,7 @@ extern int job_complete(uint32_t job_id, uid_t uid, bool requeue,
acct_policy_add_job_submit(job_ptr);
info("Non-responding node, requeue JobId=%u", job_ptr->job_id);
- } else if (IS_JOB_PENDING(job_ptr) && job_ptr->details &&
+ } else if (IS_JOB_PENDING(job_ptr) && job_ptr->details &&
job_ptr->batch_flag) {
/* Possible failure mode with DOWN node and job requeue.
* The DOWN node might actually respond to the cancel and
@@ -2322,7 +2322,7 @@ extern int job_complete(uint32_t job_id, uid_t uid, bool requeue,
if (suspended) {
job_ptr->end_time = job_ptr->suspend_time;
- job_ptr->tot_sus_time +=
+ job_ptr->tot_sus_time +=
difftime(now, job_ptr->suspend_time);
} else
job_ptr->end_time = now;
@@ -2339,8 +2339,8 @@ extern int job_complete(uint32_t job_id, uid_t uid, bool requeue,
/*
* _job_create - create a job table record for the supplied specifications.
- * this performs only basic tests for request validity (access to
- * partition, nodes count in partition, and sufficient processors in
+ * this performs only basic tests for request validity (access to
+ * partition, nodes count in partition, and sufficient processors in
* partition).
* input: job_specs - job specifications
* IN allocate - resource allocation request if set rather than job submit
@@ -2349,9 +2349,9 @@ extern int job_complete(uint32_t job_id, uid_t uid, bool requeue,
* RET 0 on success, otherwise ESLURM error code. If the job would only be
* able to execute with some change in partition configuration then
* ESLURM_REQUESTED_PART_CONFIG_UNAVAILABLE is returned
- * globals: job_list - pointer to global job list
+ * globals: job_list - pointer to global job list
* list_part - global list of partition info
- * default_part_loc - pointer to default partition
+ * default_part_loc - pointer to default partition
* job_hash - hash table into job records
*/
@@ -2385,7 +2385,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
part_ptr = list_find_first(part_list, &list_find_part,
job_desc->partition);
if (part_ptr == NULL) {
- info("_job_create: invalid partition specified: %s",
+ info("_job_create: invalid partition specified: %s",
job_desc->partition);
error_code = ESLURM_INVALID_PARTITION_NAME;
return error_code;
@@ -2404,7 +2404,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
else if ((job_desc->min_nodes > part_ptr->max_nodes_orig) &&
slurmctld_conf.enforce_part_limits) {
info("_job_create: job's min nodes greater than partition's "
- "max nodes (%u > %u)",
+ "max nodes (%u > %u)",
job_desc->min_nodes, part_ptr->max_nodes_orig);
error_code = ESLURM_INVALID_NODE_COUNT;
return error_code;
@@ -2422,7 +2422,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
} else if ((job_desc->max_nodes < part_ptr->min_nodes_orig) &&
slurmctld_conf.enforce_part_limits) {
info("_job_create: job's max nodes less than partition's "
- "min nodes (%u < %u)",
+ "min nodes (%u < %u)",
job_desc->max_nodes, part_ptr->min_nodes_orig);
error_code = ESLURM_INVALID_NODE_COUNT;
return error_code;
@@ -2436,7 +2436,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
(job_desc->time_limit > part_ptr->max_time) &&
slurmctld_conf.enforce_part_limits) {
info("_job_create: job's time greater than partition's "
- "(%u > %u)",
+ "(%u > %u)",
job_desc->time_limit, part_ptr->max_time);
error_code = ESLURM_INVALID_TIME_LIMIT;
return error_code;
@@ -2459,7 +2459,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
}
if (validate_group(part_ptr, job_desc->user_id) == 0) {
info("_job_create: uid %u access to partition %s denied, %s",
- (unsigned int) job_desc->user_id, part_ptr->name,
+ (unsigned int) job_desc->user_id, part_ptr->name,
"bad group");
error_code = ESLURM_JOB_MISSING_REQUIRED_PARTITION_GROUP;
return error_code;
@@ -2487,7 +2487,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
error_code = ESLURM_INVALID_ACCOUNT;
return error_code;
} else if(association_based_accounting
- && !assoc_ptr
+ && !assoc_ptr
&& !(accounting_enforce & ACCOUNTING_ENFORCE_ASSOCS)) {
/* if not enforcing associations we want to look for
the default account and use it to avoid getting
@@ -2501,7 +2501,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
"for user %u using default account '%s'",
job_desc->account, job_desc->user_id,
assoc_rec.acct);
- xfree(job_desc->account);
+ xfree(job_desc->account);
}
}
if (job_desc->account == NULL)
@@ -2510,7 +2510,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
/* This must be done after we have the assoc_ptr set */
memset(&qos_rec, 0, sizeof(acct_qos_rec_t));
qos_rec.name = job_desc->qos;
- if (wiki_sched && job_desc->comment &&
+ if (wiki_sched && job_desc->comment &&
strstr(job_desc->comment, "QOS:")) {
if (strstr(job_desc->comment, "FLAGS:PREEMPTOR"))
qos_rec.name = "expedite";
@@ -2524,7 +2524,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
if ((accounting_enforce & ACCOUNTING_ENFORCE_LIMITS) &&
(!_validate_acct_policy(job_desc, part_ptr,
- assoc_ptr, qos_ptr,
+ assoc_ptr, qos_ptr,
&limit_set_max_nodes))) {
info("_job_create: exceeded association's node or time limit "
"for user %u", job_desc->user_id);
@@ -2536,22 +2536,22 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
/* This needs to be done after the association acct policy check since
* it looks at unaltered nodes for bluegene systems
*/
- debug3("before alteration asking for nodes %u-%u cpus %u",
+ debug3("before alteration asking for nodes %u-%u cpus %u",
job_desc->min_nodes, job_desc->max_nodes,
job_desc->num_procs);
select_g_alter_node_cnt(SELECT_SET_NODE_CNT, job_desc);
select_g_select_jobinfo_get(job_desc->select_jobinfo,
SELECT_JOBDATA_MAX_CPUS, &max_cpus);
- debug3("after alteration asking for nodes %u-%u cpus %u-%u",
+ debug3("after alteration asking for nodes %u-%u cpus %u-%u",
job_desc->min_nodes, job_desc->max_nodes,
job_desc->num_procs, max_cpus);
-#endif
+#endif
/* check if select partition has sufficient resources to satisfy
* the request */
/* insure that selected nodes are in this partition */
if (job_desc->req_nodes) {
- error_code = node_name2bitmap(job_desc->req_nodes, false,
+ error_code = node_name2bitmap(job_desc->req_nodes, false,
&req_bitmap);
if (error_code) {
error_code = ESLURM_INVALID_NODE_NAME;
@@ -2561,19 +2561,19 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
bit_fill_gaps(req_bitmap);
if (bit_super_set(req_bitmap, part_ptr->node_bitmap) != 1) {
info("_job_create: requested nodes %s not in "
- "partition %s",
+ "partition %s",
job_desc->req_nodes, part_ptr->name);
error_code = ESLURM_REQUESTED_NODES_NOT_IN_PARTITION;
goto cleanup_fail;
}
-
+
i = bit_set_count(req_bitmap);
if (i > job_desc->min_nodes)
job_desc->min_nodes = i;
if (i > job_desc->num_procs)
job_desc->num_procs = i;
if(job_desc->max_nodes
- && job_desc->min_nodes > job_desc->max_nodes)
+ && job_desc->min_nodes > job_desc->max_nodes)
job_desc->max_nodes = job_desc->min_nodes;
}
if (job_desc->exc_nodes) {
@@ -2617,7 +2617,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
for (i=0; i<SYSTEM_DIMENSIONS; i++)
tot *= geo[i];
if (job_desc->min_nodes > tot) {
- info("MinNodes(%d) > GeometryNodes(%d)",
+ info("MinNodes(%d) > GeometryNodes(%d)",
job_desc->min_nodes, tot);
error_code = ESLURM_TOO_MANY_REQUESTED_CPUS;
goto cleanup_fail;
@@ -2647,13 +2647,13 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
&conn_type);
}
#endif
-
+
if (job_desc->max_nodes == NO_VAL)
job_desc->max_nodes = 0;
if ((part_ptr->state_up)
&& (job_desc->num_procs > part_ptr->total_cpus)) {
- info("Job requested too many cpus (%u) of partition %s(%u)",
- job_desc->num_procs, part_ptr->name,
+ info("Job requested too many cpus (%u) of partition %s(%u)",
+ job_desc->num_procs, part_ptr->name,
part_ptr->total_cpus);
error_code = ESLURM_TOO_MANY_REQUESTED_CPUS;
goto cleanup_fail;
@@ -2662,13 +2662,13 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
select_g_alter_node_cnt(SELECT_APPLY_NODE_MIN_OFFSET,
&total_nodes);
if ((part_ptr->state_up) && (job_desc->min_nodes > total_nodes)) {
- info("Job requested too many nodes (%u) of partition %s(%u)",
- job_desc->min_nodes, part_ptr->name,
+ info("Job requested too many nodes (%u) of partition %s(%u)",
+ job_desc->min_nodes, part_ptr->name,
total_nodes);
error_code = ESLURM_INVALID_NODE_COUNT;
goto cleanup_fail;
}
- if (job_desc->max_nodes &&
+ if (job_desc->max_nodes &&
(job_desc->max_nodes < job_desc->min_nodes)) {
info("Job's max_nodes(%u) < min_nodes(%u)",
job_desc->max_nodes, job_desc->min_nodes);
@@ -2678,7 +2678,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
license_list = license_validate(job_desc->licenses, &valid);
if (!valid) {
- info("Job's requested licenses are invalid: %s",
+ info("Job's requested licenses are invalid: %s",
job_desc->licenses);
error_code = ESLURM_INVALID_LICENSES;
goto cleanup_fail;
@@ -2742,25 +2742,25 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
job_ptr->license_list = license_list;
license_list = NULL;
- /* Insure that requested partition is valid right now,
+ /* Insure that requested partition is valid right now,
* otherwise leave job queued and provide warning code */
detail_ptr = job_ptr->details;
fail_reason= WAIT_NO_REASON;
if (job_desc->min_nodes > part_ptr->max_nodes) {
info("Job %u requested too many nodes (%u) of "
- "partition %s(MaxNodes %u)",
- job_ptr->job_id, job_desc->min_nodes,
+ "partition %s(MaxNodes %u)",
+ job_ptr->job_id, job_desc->min_nodes,
part_ptr->name, part_ptr->max_nodes);
fail_reason = WAIT_PART_NODE_LIMIT;
} else if ((job_desc->max_nodes != 0) && /* no max_nodes for job */
(job_desc->max_nodes < part_ptr->min_nodes)) {
info("Job %u requested too few nodes (%u) of "
"partition %s(MinNodes %u)",
- job_ptr->job_id, job_desc->max_nodes,
+ job_ptr->job_id, job_desc->max_nodes,
part_ptr->name, part_ptr->min_nodes);
fail_reason = WAIT_PART_NODE_LIMIT;
} else if (part_ptr->state_up == 0) {
- info("Job %u requested down partition %s",
+ info("Job %u requested down partition %s",
job_ptr->job_id, part_ptr->name);
fail_reason = WAIT_PART_STATE;
} else if ((job_ptr->time_limit != NO_VAL) &&
@@ -2807,13 +2807,13 @@ static int _validate_job_create_req(job_desc_msg_t * job_desc)
strlen(job_desc->account));
return ESLURM_PATHNAME_TOO_LONG;
}
- if (job_desc->alloc_node &&
+ if (job_desc->alloc_node &&
(strlen(job_desc->alloc_node) > MAX_STR_LEN)) {
info("_validate_job_create_req: strlen(alloc_node) too big (%d)",
strlen(job_desc->alloc_node));
return ESLURM_PATHNAME_TOO_LONG;
}
- if (job_desc->blrtsimage &&
+ if (job_desc->blrtsimage &&
(strlen(job_desc->blrtsimage) > MAX_STR_LEN)) {
info("_validate_job_create_req: strlen(blrtsimage) too big (%d)",
strlen(job_desc->blrtsimage));
@@ -2824,7 +2824,7 @@ static int _validate_job_create_req(job_desc_msg_t * job_desc)
strlen(job_desc->comment));
return ESLURM_PATHNAME_TOO_LONG;
}
- if (job_desc->dependency &&
+ if (job_desc->dependency &&
(strlen(job_desc->dependency) > MAX_STR_LEN)) {
info("_validate_job_create_req: strlen(dependency) too big (%d)",
strlen(job_desc->dependency));
@@ -2845,7 +2845,7 @@ static int _validate_job_create_req(job_desc_msg_t * job_desc)
strlen(job_desc->std_in));
return ESLURM_PATHNAME_TOO_LONG;
}
- if (job_desc->linuximage &&
+ if (job_desc->linuximage &&
(strlen(job_desc->linuximage) > MAX_STR_LEN)) {
info("_validate_job_create_req: strlen(linuximage) too big (%d)",
strlen(job_desc->linuximage));
@@ -2861,7 +2861,7 @@ static int _validate_job_create_req(job_desc_msg_t * job_desc)
strlen(job_desc->mail_user));
return ESLURM_PATHNAME_TOO_LONG;
}
- if (job_desc->mloaderimage &&
+ if (job_desc->mloaderimage &&
(strlen(job_desc->mloaderimage) > MAX_STR_LEN)) {
info("_validate_job_create_req: strlen(mloaderimage) too big (%d)",
strlen(job_desc->features));
@@ -2887,7 +2887,7 @@ static int _validate_job_create_req(job_desc_msg_t * job_desc)
strlen(job_desc->partition));
return ESLURM_PATHNAME_TOO_LONG;
}
- if (job_desc->ramdiskimage &&
+ if (job_desc->ramdiskimage &&
(strlen(job_desc->ramdiskimage) > MAX_STR_LEN)) {
info("_validate_job_create_req: strlen(ramdiskimage) too big (%d)",
strlen(job_desc->ramdiskimage));
@@ -2899,14 +2899,14 @@ static int _validate_job_create_req(job_desc_msg_t * job_desc)
return ESLURM_PATHNAME_TOO_LONG;
}
if (!valid_spank_job_env(job_desc->spank_job_env,
- job_desc->spank_job_env_size,
+ job_desc->spank_job_env_size,
job_desc->user_id)) {
return EINVAL;
}
return SLURM_SUCCESS;
}
-/* _copy_job_desc_to_file - copy the job script and environment from the RPC
+/* _copy_job_desc_to_file - copy the job script and environment from the RPC
* structure into a file */
static int
_copy_job_desc_to_file(job_desc_msg_t * job_desc, uint32_t job_id)
@@ -3034,7 +3034,7 @@ static int _write_data_to_file(char *file_name, char *data)
}
/*
- * get_job_env - return the environment variables and their count for a
+ * get_job_env - return the environment variables and their count for a
* given job
* IN job_ptr - pointer to job for which data is required
* OUT env_size - number of elements to read
@@ -3055,7 +3055,7 @@ char **get_job_env(struct job_record *job_ptr, uint32_t * env_size)
return environment;
}
-/*
+/*
* get_job_script - return the script for a given job
* IN job_ptr - pointer to job for which data is required
* RET point to string containing job script
@@ -3081,7 +3081,7 @@ char *get_job_script(struct job_record *job_ptr)
* OUT data - pointer to array of pointers to strings (e.g. env),
* must be xfreed when no longer needed
* OUT size - number of elements in data
- * IN job_ptr - job
+ * IN job_ptr - job
* NOTE: The output format of this must be identical with _xduparray2()
*/
static void
@@ -3108,8 +3108,8 @@ _read_data_array_from_file(char *file_name, char ***data, uint32_t * size,
if (amount < sizeof(uint32_t)) {
if (amount != 0) /* incomplete write */
error("Error reading file %s, %m", file_name);
- else
- verbose("File %s has zero size", file_name);
+ else
+ verbose("File %s has zero size", file_name);
close(fd);
return;
}
@@ -3168,7 +3168,7 @@ _read_data_array_from_file(char *file_name, char ***data, uint32_t * size,
tmp_chr = strchr(job_ptr->details->env_sup[j], '=');
if (tmp_chr == NULL) {
error("Invalid supplemental environment "
- "variable: %s",
+ "variable: %s",
job_ptr->details->env_sup[j]);
continue;
}
@@ -3176,20 +3176,20 @@ _read_data_array_from_file(char *file_name, char ***data, uint32_t * size,
name_len = tmp_chr - job_ptr->details->env_sup[j] + 1;
/* search for duplicate */
for (i = 0; i < rec_cnt; i++) {
- if (strncmp(array_ptr[i],
+ if (strncmp(array_ptr[i],
job_ptr->details->env_sup[j],
name_len)) {
continue;
}
/* over-write duplicate */
- memcpy(&buffer[pos],
+ memcpy(&buffer[pos],
job_ptr->details->env_sup[j], env_len);
array_ptr[i] = &buffer[pos];
pos += env_len;
break;
}
if (i >= rec_cnt) { /* add env to array end */
- memcpy(&buffer[pos],
+ memcpy(&buffer[pos],
job_ptr->details->env_sup[j], env_len);
array_ptr[rec_cnt++] = &buffer[pos];
pos += env_len;
@@ -3205,7 +3205,7 @@ _read_data_array_from_file(char *file_name, char ***data, uint32_t * size,
/*
* Read a string from a file
* IN file_name - file to read from
- * OUT data - pointer to string
+ * OUT data - pointer to string
* must be xfreed when no longer needed
*/
void _read_data_from_file(char *file_name, char **data)
@@ -3293,7 +3293,7 @@ _set_multi_core_data(job_desc_msg_t * job_desc)
return mc_ptr;
}
-/* _copy_job_desc_to_job_record - copy the job descriptor from the RPC
+/* _copy_job_desc_to_job_record - copy the job descriptor from the RPC
* structure into the actual slurmctld job record */
static int
_copy_job_desc_to_job_record(job_desc_msg_t * job_desc,
@@ -3318,17 +3318,17 @@ _copy_job_desc_to_job_record(job_desc_msg_t * job_desc,
if(user_rec.default_wckey)
job_desc->wckey = xstrdup_printf(
"*%s", user_rec.default_wckey);
- else if(!(accounting_enforce
+ else if(!(accounting_enforce
& ACCOUNTING_ENFORCE_WCKEYS))
- job_desc->wckey = xstrdup("*");
+ job_desc->wckey = xstrdup("*");
else {
error("Job didn't specify wckey and user "
"%d has no default.", job_desc->user_id);
return ESLURM_INVALID_WCKEY;
- }
+ }
} else if(job_desc->wckey) {
acct_wckey_rec_t wckey_rec, *wckey_ptr = NULL;
-
+
memset(&wckey_rec, 0, sizeof(acct_wckey_rec_t));
wckey_rec.uid = job_desc->user_id;
wckey_rec.name = job_desc->wckey;
@@ -3336,11 +3336,11 @@ _copy_job_desc_to_job_record(job_desc_msg_t * job_desc,
if (assoc_mgr_fill_in_wckey(acct_db_conn, &wckey_rec,
accounting_enforce,
&wckey_ptr)) {
- if(accounting_enforce
+ if(accounting_enforce
& ACCOUNTING_ENFORCE_WCKEYS) {
error("_job_create: invalid wckey '%s' "
"for user %u.",
- wckey_rec.name,
+ wckey_rec.name,
job_desc->user_id);
return ESLURM_INVALID_WCKEY;
}
@@ -3360,7 +3360,7 @@ _copy_job_desc_to_job_record(job_desc_msg_t * job_desc,
job_ptr->partition = xstrdup(part_ptr->name);
job_ptr->part_ptr = part_ptr;
-
+
if (job_desc->job_id != NO_VAL) /* already confirmed unique */
job_ptr->job_id = job_desc->job_id;
else
@@ -3426,15 +3426,15 @@ _copy_job_desc_to_job_record(job_desc_msg_t * job_desc,
detail_ptr->min_nodes = job_desc->min_nodes;
detail_ptr->max_nodes = job_desc->max_nodes;
if (job_desc->req_nodes) {
- detail_ptr->req_nodes =
+ detail_ptr->req_nodes =
_copy_nodelist_no_dup(job_desc->req_nodes);
detail_ptr->req_node_bitmap = *req_bitmap;
- detail_ptr->req_node_layout = NULL; /* Layout specified at
+ detail_ptr->req_node_layout = NULL; /* Layout specified at
* start time */
*req_bitmap = NULL; /* Reused nothing left to free */
}
if (job_desc->exc_nodes) {
- detail_ptr->exc_nodes =
+ detail_ptr->exc_nodes =
_copy_nodelist_no_dup(job_desc->exc_nodes);
detail_ptr->exc_node_bitmap = *exc_bitmap;
*exc_bitmap = NULL; /* Reused nothing left to free */
@@ -3457,7 +3457,7 @@ _copy_job_desc_to_job_record(job_desc_msg_t * job_desc,
if (job_desc->ntasks_per_node != (uint16_t) NO_VAL) {
detail_ptr->ntasks_per_node = job_desc->ntasks_per_node;
if (detail_ptr->overcommit == 0) {
- detail_ptr->job_min_cpus =
+ detail_ptr->job_min_cpus =
MAX(detail_ptr->job_min_cpus,
(detail_ptr->cpus_per_task *
detail_ptr->ntasks_per_node));
@@ -3486,26 +3486,26 @@ _copy_job_desc_to_job_record(job_desc_msg_t * job_desc,
detail_ptr->work_dir = xstrdup(job_desc->work_dir);
if (job_desc->begin_time > time(NULL))
detail_ptr->begin_time = job_desc->begin_time;
- job_ptr->select_jobinfo =
+ job_ptr->select_jobinfo =
select_g_select_jobinfo_copy(job_desc->select_jobinfo);
if (job_desc->ckpt_dir)
detail_ptr->ckpt_dir = xstrdup(job_desc->ckpt_dir);
else
detail_ptr->ckpt_dir = xstrdup(detail_ptr->work_dir);
-
+
/* The priority needs to be set after this since we don't have
an association rec yet
*/
- detail_ptr->mc_ptr = _set_multi_core_data(job_desc);
+ detail_ptr->mc_ptr = _set_multi_core_data(job_desc);
*job_rec_ptr = job_ptr;
return SLURM_SUCCESS;
}
/*
- * _copy_nodelist_no_dup - Take a node_list string and convert it to an
- * expression without duplicate names. For example, we want to convert
+ * _copy_nodelist_no_dup - Take a node_list string and convert it to an
+ * expression without duplicate names. For example, we want to convert
* a users request for nodes "lx1,lx2,lx1,lx3" to "lx[1-3]"
* node_list IN - string describing a list of nodes
* RET a compact node expression, must be xfreed by the user
@@ -3550,8 +3550,8 @@ static bool _valid_job_min_mem(job_desc_msg_t * job_desc_msg)
/* Our size is per CPU and limit per node or vise-versa.
* CPU count my vary by node, but we don't have a good
- * way to identify specific nodes for the job at this
- * point, so just pick the first node as a basis for
+ * way to identify specific nodes for the job at this
+ * point, so just pick the first node as a basis for
* enforcing MaxMemPerCPU. */
if (slurmctld_conf.fast_schedule)
cpus_per_node = node_record_table_ptr[0].config_ptr->cpus;
@@ -3571,7 +3571,7 @@ static bool _valid_job_min_mem(job_desc_msg_t * job_desc_msg)
return false;
}
-/*
+/*
* job_time_limit - terminate jobs which have exceeded their time limit
* global: job_list - pointer global job list
* last_job_update - time of last job table update
@@ -3604,25 +3604,25 @@ void job_time_limit(void)
if (IS_JOB_CONFIGURING(job_ptr)) {
if (!IS_JOB_RUNNING(job_ptr) ||
- ((bit_overlap(job_ptr->node_bitmap,
+ ((bit_overlap(job_ptr->node_bitmap,
power_node_bitmap) == 0) &&
- (bit_overlap(job_ptr->node_bitmap,
+ (bit_overlap(job_ptr->node_bitmap,
avail_node_bitmap) == 0))) {
- debug("Configuration for job %u is complete",
+ debug("Configuration for job %u is complete",
job_ptr->job_id);
job_ptr->job_state &= (~JOB_CONFIGURING);
}
}
- /* This needs to be near the top of the loop, checks every
+ /* This needs to be near the top of the loop, checks every
* running, suspended and pending job */
resv_status = job_resv_check(job_ptr);
if ((job_ptr->priority == 1) && (!IS_JOB_FINISHED(job_ptr))) {
- /* Rather than resetting job priorities whenever a
- * DOWN, DRAINED or non-responsive node is returned to
+ /* Rather than resetting job priorities whenever a
+ * DOWN, DRAINED or non-responsive node is returned to
* service, we pick them up here. There will be a small
- * delay in restting a job's priority, but the code is
+ * delay in restting a job's priority, but the code is
* a lot cleaner this way. */
_set_job_prio(job_ptr);
}
@@ -3636,7 +3636,7 @@ void job_time_limit(void)
* running for. */
job_cpu_usage_mins = (uint64_t)
((((now - job_ptr->start_time)
- - job_ptr->tot_sus_time) / 60)
+ - job_ptr->tot_sus_time) / 60)
* job_ptr->total_procs);
/* Consider a job active if it has any active steps */
@@ -3668,9 +3668,9 @@ void job_time_limit(void)
} else if ((job_ptr->warn_time) &&
(job_ptr->warn_time + PERIODIC_TIMEOUT +
now >= job_ptr->end_time)) {
- debug("Warning signal %u to job %u ",
+ debug("Warning signal %u to job %u ",
job_ptr->warn_signal, job_ptr->job_id);
- (void) job_signal(job_ptr->job_id,
+ (void) job_signal(job_ptr->job_id,
job_ptr->warn_signal, 0, 0);
job_ptr->warn_signal = 0;
job_ptr->warn_time = 0;
@@ -3686,7 +3686,7 @@ void job_time_limit(void)
xfree(job_ptr->state_desc);
continue;
}
-
+
/* check if any individual job steps have exceeded
* their time limit */
if (job_ptr->step_list &&
@@ -3710,7 +3710,7 @@ void job_time_limit(void)
info("Job %u timed out, "
"the job is at or exceeds QOS %s's "
"group max cpu minutes of %llu with %llu",
- job_ptr->job_id,
+ job_ptr->job_id,
qos->name, qos->grp_cpu_mins,
usage_mins);
job_ptr->state_reason = FAIL_TIMEOUT;
@@ -3724,21 +3724,21 @@ void job_time_limit(void)
info("Job %u timed out, "
"the job is at or exceeds QOS %s's "
"group wall limit of %u with %u",
- job_ptr->job_id,
+ job_ptr->job_id,
qos->name, qos->grp_wall,
wall_mins);
job_ptr->state_reason = FAIL_TIMEOUT;
slurm_mutex_unlock(&assoc_mgr_qos_lock);
goto job_failed;
}
-
+
if ((qos->max_cpu_mins_pj != (uint64_t)INFINITE)
&& (job_cpu_usage_mins >= qos->max_cpu_mins_pj)) {
last_job_update = now;
info("Job %u timed out, "
"the job is at or exceeds QOS %s's "
"max cpu minutes of %llu with %llu",
- job_ptr->job_id,
+ job_ptr->job_id,
qos->name, qos->max_cpu_mins_pj,
job_cpu_usage_mins);
job_ptr->state_reason = FAIL_TIMEOUT;
@@ -3753,7 +3753,7 @@ void job_time_limit(void)
while(assoc) {
usage_mins = (uint64_t)(assoc->usage_raw / 60.0);
wall_mins = assoc->grp_used_wall / 60;
-
+
if ((qos && (qos->grp_cpu_mins == INFINITE))
&& (assoc->grp_cpu_mins != (uint64_t)INFINITE)
&& (usage_mins >= assoc->grp_cpu_mins)) {
@@ -3762,7 +3762,7 @@ void job_time_limit(void)
"group max cpu minutes limit %llu "
"with %llu for account %s",
job_ptr->job_id, assoc->id,
- assoc->grp_cpu_mins,
+ assoc->grp_cpu_mins,
usage_mins, assoc->acct);
job_ptr->state_reason = FAIL_TIMEOUT;
break;
@@ -3776,21 +3776,21 @@ void job_time_limit(void)
"group wall limit %u "
"with %u for account %s",
job_ptr->job_id, assoc->id,
- assoc->grp_wall,
+ assoc->grp_wall,
wall_mins, assoc->acct);
job_ptr->state_reason = FAIL_TIMEOUT;
break;
}
if ((qos && (qos->max_cpu_mins_pj == INFINITE))
- && (assoc->max_cpu_mins_pj != (uint64_t)INFINITE)
+ && (assoc->max_cpu_mins_pj != (uint64_t)INFINITE)
&& (job_cpu_usage_mins >= assoc->max_cpu_mins_pj)) {
info("Job %u timed out, "
"assoc %u is at or exceeds "
"max cpu minutes limit %llu "
"with %llu for account %s",
job_ptr->job_id, assoc->id,
- assoc->max_cpu_mins_pj,
+ assoc->max_cpu_mins_pj,
job_cpu_usage_mins, assoc->acct);
job_ptr->state_reason = FAIL_TIMEOUT;
break;
@@ -3837,13 +3837,13 @@ static void _job_timed_out(struct job_record *job_ptr)
return;
}
-/* _validate_job_desc - validate that a job descriptor for job submit or
- * allocate has valid data, set values to defaults as required
+/* _validate_job_desc - validate that a job descriptor for job submit or
+ * allocate has valid data, set values to defaults as required
* IN/OUT job_desc_msg - pointer to job descriptor, modified as needed
- * IN allocate - if clear job to be queued, if set allocate for user now
+ * IN allocate - if clear job to be queued, if set allocate for user now
* IN submit_uid - who request originated
*/
-static int _validate_job_desc(job_desc_msg_t * job_desc_msg, int allocate,
+static int _validate_job_desc(job_desc_msg_t * job_desc_msg, int allocate,
uid_t submit_uid)
{
if ((job_desc_msg->num_procs == NO_VAL)
@@ -3880,7 +3880,7 @@ static int _validate_job_desc(job_desc_msg_t * job_desc_msg, int allocate,
if (job_desc_msg->job_id != NO_VAL) {
struct job_record *dup_job_ptr;
- if ((submit_uid != 0) &&
+ if ((submit_uid != 0) &&
(submit_uid != slurmctld_conf.slurm_user_id)) {
info("attempt by uid %u to set job_id", submit_uid);
return ESLURM_INVALID_JOB_ID;
@@ -3891,9 +3891,9 @@ static int _validate_job_desc(job_desc_msg_t * job_desc_msg, int allocate,
return ESLURM_INVALID_JOB_ID;
}
dup_job_ptr = find_job_record((uint32_t) job_desc_msg->job_id);
- if (dup_job_ptr &&
+ if (dup_job_ptr &&
(!(IS_JOB_COMPLETED(dup_job_ptr)))) {
- info("attempt re-use active job_id %u",
+ info("attempt re-use active job_id %u",
job_desc_msg->job_id);
return ESLURM_DUPLICATE_JOB_ID;
}
@@ -3943,7 +3943,7 @@ static int _validate_job_desc(job_desc_msg_t * job_desc_msg, int allocate,
return SLURM_SUCCESS;
}
-/*
+/*
* _list_delete_job - delete a job record and its corresponding job_details,
* see common/list.h for documentation
* IN job_entry - pointer to job_record to delete
@@ -3962,12 +3962,12 @@ static void _list_delete_job(void *job_entry)
/* Remove the record from the hash table */
job_pptr = &job_hash[JOB_HASH_INX(job_ptr->job_id)];
- while ((job_pptr != NULL) &&
+ while ((job_pptr != NULL) &&
((job_ptr = *job_pptr) != (struct job_record *) job_entry)) {
- job_pptr = &job_ptr->job_next;
+ job_pptr = &job_ptr->job_next;
}
if (job_pptr == NULL)
- fatal("job hash error");
+ fatal("job hash error");
*job_pptr = job_ptr->job_next;
delete_job_details(job_ptr);
@@ -4004,8 +4004,8 @@ static void _list_delete_job(void *job_entry)
/*
- * _list_find_job_id - find specific job_id entry in the job list,
- * see common/list.h for documentation, key is job_id_ptr
+ * _list_find_job_id - find specific job_id entry in the job list,
+ * see common/list.h for documentation, key is job_id_ptr
* global- job_list - the global partition list
*/
static int _list_find_job_id(void *job_entry, void *key)
@@ -4020,8 +4020,8 @@ static int _list_find_job_id(void *job_entry, void *key)
/*
- * _list_find_job_old - find old entries in the job list,
- * see common/list.h for documentation, key is ignored
+ * _list_find_job_old - find old entries in the job list,
+ * see common/list.h for documentation, key is ignored
* global- job_list - the global partition list
*/
static int _list_find_job_old(void *job_entry, void *key)
@@ -4046,15 +4046,15 @@ static int _list_find_job_old(void *job_entry, void *key)
if (job_ptr->end_time > min_age)
return 0; /* Too new to purge */
- if (!(IS_JOB_FINISHED(job_ptr)))
+ if (!(IS_JOB_FINISHED(job_ptr)))
return 0; /* Job still active */
return 1; /* Purge the job */
}
-/*
- * pack_all_jobs - dump all job information for all jobs in
+/*
+ * pack_all_jobs - dump all job information for all jobs in
* machine independent form (for network transmission)
* OUT buffer_ptr - the pointer is set to the allocated buffer.
* OUT buffer_size - set to size of the buffer in bytes
@@ -4062,7 +4062,7 @@ static int _list_find_job_old(void *job_entry, void *key)
* IN uid - uid of user making request (for partition filtering)
* global: job_list - global list of job records
* NOTE: the buffer at *buffer_ptr must be xfreed by the caller
- * NOTE: change _unpack_job_desc_msg() in common/slurm_protocol_pack.c
+ * NOTE: change _unpack_job_desc_msg() in common/slurm_protocol_pack.c
* whenever the data format changes
*/
extern void pack_all_jobs(char **buffer_ptr, int *buffer_size,
@@ -4091,7 +4091,7 @@ extern void pack_all_jobs(char **buffer_ptr, int *buffer_size,
xassert (job_ptr->magic == JOB_MAGIC);
if (((show_flags & SHOW_ALL) == 0) && (uid != 0) &&
- (job_ptr->part_ptr) &&
+ (job_ptr->part_ptr) &&
(job_ptr->part_ptr->hidden))
continue;
@@ -4115,8 +4115,8 @@ extern void pack_all_jobs(char **buffer_ptr, int *buffer_size,
buffer_ptr[0] = xfer_buf_data(buffer);
}
-/*
- * pack_one_job - dump information for one jobs in
+/*
+ * pack_one_job - dump information for one jobs in
* machine independent form (for network transmission)
* OUT buffer_ptr - the pointer is set to the allocated buffer.
* OUT buffer_size - set to size of the buffer in bytes
@@ -4124,7 +4124,7 @@ extern void pack_all_jobs(char **buffer_ptr, int *buffer_size,
* IN show_flags - job filtering options
* IN uid - uid of user making request (for partition filtering)
* NOTE: the buffer at *buffer_ptr must be xfreed by the caller
- * NOTE: change _unpack_job_desc_msg() in common/slurm_protocol_pack.c
+ * NOTE: change _unpack_job_desc_msg() in common/slurm_protocol_pack.c
* whenever the data format changes
*/
extern int pack_one_job(char **buffer_ptr, int *buffer_size,
@@ -4164,12 +4164,12 @@ extern int pack_one_job(char **buffer_ptr, int *buffer_size,
return SLURM_SUCCESS;
}
-/*
- * pack_job - dump all configuration information about a specific job in
+/*
+ * pack_job - dump all configuration information about a specific job in
* machine independent form (for network transmission)
* IN dump_job_ptr - pointer to job for which information is requested
* IN show_flags - job filtering options
- * IN/OUT buffer - buffer in which data is placed, pointers automatically
+ * IN/OUT buffer - buffer in which data is placed, pointers automatically
* updated
* NOTE: change _unpack_job_info_members() in common/slurm_protocol_pack.c
* whenever the data format changes
@@ -4223,7 +4223,7 @@ void pack_job(struct job_record *dump_job_ptr, uint16_t show_flags, Buf buffer)
packstr(dump_job_ptr->account, buffer);
packstr(dump_job_ptr->network, buffer);
packstr(dump_job_ptr->comment, buffer);
-
+
slurm_mutex_lock(&assoc_mgr_qos_lock);
if (assoc_mgr_qos_list)
packstr(acct_qos_str(assoc_mgr_qos_list, dump_job_ptr->qos),
@@ -4253,14 +4253,14 @@ void pack_job(struct job_record *dump_job_ptr, uint16_t show_flags, Buf buffer)
pack32(dump_job_ptr->total_procs, buffer);
else
pack32(dump_job_ptr->num_procs, buffer);
-
+
select_g_select_jobinfo_pack(dump_job_ptr->select_jobinfo, buffer);
detail_ptr = dump_job_ptr->details;
/* A few details are always dumped here */
_pack_default_job_details(dump_job_ptr, buffer);
- /* other job details are only dumped until the job starts
+ /* other job details are only dumped until the job starts
* running (at which time they become meaningless) */
if (detail_ptr)
_pack_pending_job_details(detail_ptr, buffer);
@@ -4315,7 +4315,7 @@ static void _pack_default_job_details(struct job_record *job_ptr,
static void _pack_pending_job_details(struct job_details *detail_ptr,
Buf buffer)
{
- if (detail_ptr) {
+ if (detail_ptr) {
pack16(detail_ptr->shared, buffer);
pack16(detail_ptr->contiguous, buffer);
pack16(detail_ptr->cpus_per_task, buffer);
@@ -4350,7 +4350,7 @@ static void _pack_pending_job_details(struct job_details *detail_ptr,
}
/*
- * purge_old_job - purge old job records.
+ * purge_old_job - purge old job records.
* the jobs must have completed at least MIN_JOB_AGE minutes ago
* global: job_list - global job table
* last_job_update - time of last job table update
@@ -4380,9 +4380,9 @@ static int _purge_job_record(uint32_t job_id)
}
-/*
- * reset_job_bitmaps - reestablish bitmaps for existing jobs.
- * this should be called after rebuilding node information,
+/*
+ * reset_job_bitmaps - reestablish bitmaps for existing jobs.
+ * this should be called after rebuilding node information,
* but before using any job entries.
* global: last_job_update - time of last job table update
* job_list - pointer to global job list
@@ -4405,7 +4405,7 @@ void reset_job_bitmaps(void)
NULL, &cr_flag)) {
cr_flag = NO_VAL; /* error */
}
-
+
}
if (slurm_get_preempt_mode() == PREEMPT_MODE_GANG)
gang_flag = true;
@@ -4423,7 +4423,7 @@ void reset_job_bitmaps(void)
part_ptr = list_find_first(part_list, &list_find_part,
job_ptr->partition);
if (part_ptr == NULL) {
- error("Invalid partition (%s) for job_id %u",
+ error("Invalid partition (%s) for job_id %u",
job_ptr->partition, job_ptr->job_id);
job_fail = true;
}
@@ -4441,15 +4441,15 @@ void reset_job_bitmaps(void)
} else if ((job_ptr->node_bitmap == NULL) && job_ptr->nodes &&
(node_name2bitmap(job_ptr->nodes, false,
&job_ptr->node_bitmap))) {
- error("Invalid nodes (%s) for job_id %u",
+ error("Invalid nodes (%s) for job_id %u",
job_ptr->nodes, job_ptr->job_id);
job_fail = true;
}
reset_node_bitmap(job_ptr->job_resrcs, job_ptr->node_bitmap);
- if (!job_fail && !IS_JOB_FINISHED(job_ptr) &&
- job_ptr->job_resrcs && (cr_flag || gang_flag) &&
+ if (!job_fail && !IS_JOB_FINISHED(job_ptr) &&
+ job_ptr->job_resrcs && (cr_flag || gang_flag) &&
valid_job_resources(job_ptr->job_resrcs,
- node_record_table_ptr,
+ node_record_table_ptr,
slurmctld_conf.fast_schedule)) {
error("Aborting JobID %u due to change in socket/core "
"configuration of allocated nodes",
@@ -4470,20 +4470,20 @@ void reset_job_bitmaps(void)
if (job_fail) {
if (IS_JOB_PENDING(job_ptr)) {
- job_ptr->start_time =
+ job_ptr->start_time =
job_ptr->end_time = time(NULL);
job_ptr->job_state = JOB_NODE_FAIL;
} else if (IS_JOB_RUNNING(job_ptr)) {
job_ptr->end_time = time(NULL);
- job_ptr->job_state = JOB_NODE_FAIL |
+ job_ptr->job_state = JOB_NODE_FAIL |
JOB_COMPLETING;
} else if (IS_JOB_SUSPENDED(job_ptr)) {
job_ptr->end_time = job_ptr->suspend_time;
job_ptr->job_state = JOB_NODE_FAIL |
JOB_COMPLETING;
- job_ptr->tot_sus_time +=
+ job_ptr->tot_sus_time +=
difftime(now, job_ptr->suspend_time);
- jobacct_storage_g_job_suspend(acct_db_conn,
+ jobacct_storage_g_job_suspend(acct_db_conn,
job_ptr);
}
job_ptr->exit_code = MAX(job_ptr->exit_code, 1);
@@ -4499,7 +4499,7 @@ void reset_job_bitmaps(void)
* (i.e. it needs to be in this second loop) */
while ((job_ptr = (struct job_record *) list_next(job_iterator))) {
if (select_g_select_nodeinfo_set(job_ptr) != SLURM_SUCCESS) {
- error("select_g_update_nodeinfo(%u): %m",
+ error("select_g_update_nodeinfo(%u): %m",
job_ptr->job_id);
}
}
@@ -4510,26 +4510,26 @@ void reset_job_bitmaps(void)
static int _reset_detail_bitmaps(struct job_record *job_ptr)
{
- if (job_ptr->details == NULL)
+ if (job_ptr->details == NULL)
return SLURM_SUCCESS;
FREE_NULL_BITMAP(job_ptr->details->req_node_bitmap);
xfree(job_ptr->details->req_node_layout); /* layout info is lost
* but should be re-generated
* at job start time */
- if ((job_ptr->details->req_nodes) &&
- (node_name2bitmap(job_ptr->details->req_nodes, false,
+ if ((job_ptr->details->req_nodes) &&
+ (node_name2bitmap(job_ptr->details->req_nodes, false,
&job_ptr->details->req_node_bitmap))) {
- error("Invalid req_nodes (%s) for job_id %u",
+ error("Invalid req_nodes (%s) for job_id %u",
job_ptr->details->req_nodes, job_ptr->job_id);
return SLURM_ERROR;
}
FREE_NULL_BITMAP(job_ptr->details->exc_node_bitmap);
- if ((job_ptr->details->exc_nodes) &&
+ if ((job_ptr->details->exc_nodes) &&
(node_name2bitmap(job_ptr->details->exc_nodes, true,
&job_ptr->details->exc_node_bitmap))) {
- error("Invalid exc_nodes (%s) for job_id %u",
+ error("Invalid exc_nodes (%s) for job_id %u",
job_ptr->details->exc_nodes, job_ptr->job_id);
return SLURM_ERROR;
}
@@ -4546,17 +4546,17 @@ static void _reset_step_bitmaps(struct job_record *job_ptr)
while ((step_ptr = (struct step_record *) list_next (step_iterator))) {
FREE_NULL_BITMAP(step_ptr->step_node_bitmap);
if (step_ptr->step_layout &&
- step_ptr->step_layout->node_list &&
- (node_name2bitmap(step_ptr->step_layout->node_list, false,
+ step_ptr->step_layout->node_list &&
+ (node_name2bitmap(step_ptr->step_layout->node_list, false,
&step_ptr->step_node_bitmap))) {
- error("Invalid step_node_list (%s) for step_id %u.%u",
- step_ptr->step_layout->node_list,
+ error("Invalid step_node_list (%s) for step_id %u.%u",
+ step_ptr->step_layout->node_list,
job_ptr->job_id, step_ptr->step_id);
delete_step_record (job_ptr, step_ptr->step_id);
}
if ((step_ptr->step_node_bitmap == NULL) &&
(step_ptr->batch_step == 0)) {
- error("Missing node_list for step_id %u.%u",
+ error("Missing node_list for step_id %u.%u",
job_ptr->job_id, step_ptr->step_id);
delete_step_record (job_ptr, step_ptr->step_id);
}
@@ -4574,7 +4574,7 @@ void reset_first_job_id(void)
}
/*
- * get_next_job_id - return the job_id to be used by default for
+ * get_next_job_id - return the job_id to be used by default for
* the next job
*/
extern uint32_t get_next_job_id(void)
@@ -4630,7 +4630,7 @@ static void _set_job_prio(struct job_record *job_ptr)
return;
job_ptr->priority = slurm_sched_initial_priority(maximum_prio,
job_ptr);
- if ((job_ptr->priority <= 1) ||
+ if ((job_ptr->priority <= 1) ||
(job_ptr->direct_set_prio) ||
(job_ptr->details && (job_ptr->details->nice != NICE_OFFSET)))
return;
@@ -4639,7 +4639,7 @@ static void _set_job_prio(struct job_record *job_ptr)
}
-/* After a node is returned to service, reset the priority of jobs
+/* After a node is returned to service, reset the priority of jobs
* which may have been held due to that node being unavailable */
void reset_job_priority(void)
{
@@ -4659,7 +4659,7 @@ void reset_job_priority(void)
last_job_update = time(NULL);
}
-/*
+/*
* _top_priority - determine if any other job has a higher priority than the
* specified job
* IN job_ptr - pointer to selected job
@@ -4675,7 +4675,7 @@ static bool _top_priority(struct job_record *job_ptr)
int rc = SLURM_SUCCESS;
/* On BlueGene with static partitioning, we don't want to delay
- * jobs based upon priority since jobs of different sizes can
+ * jobs based upon priority since jobs of different sizes can
* execute on different sets of nodes. While sched/backfill would
* eventually start the job if delayed here based upon priority,
* that could delay the initiation of a job by a few seconds. */
@@ -4697,7 +4697,7 @@ static bool _top_priority(struct job_record *job_ptr)
top = true; /* assume top priority until found otherwise */
job_iterator = list_iterator_create(job_list);
- while ((job_ptr2 = (struct job_record *)
+ while ((job_ptr2 = (struct job_record *)
list_next(job_iterator))) {
if (job_ptr2 == job_ptr)
continue;
@@ -4709,7 +4709,7 @@ static bool _top_priority(struct job_record *job_ptr)
((!job_ptr2->resv_name) && job_ptr->resv_name))
continue; /* different reservation */
if (job_ptr2->resv_name && job_ptr->resv_name &&
- (!strcmp(job_ptr2->resv_name,
+ (!strcmp(job_ptr2->resv_name,
job_ptr->resv_name))) {
/* same reservation */
if (job_ptr2->priority <= job_ptr->priority)
@@ -4727,7 +4727,7 @@ static bool _top_priority(struct job_record *job_ptr)
if (bit_overlap(job_ptr->part_ptr->node_bitmap,
job_ptr2->part_ptr->node_bitmap) == 0)
continue; /* no node overlap in partitions */
- if ((job_ptr2->part_ptr->priority >
+ if ((job_ptr2->part_ptr->priority >
job_ptr ->part_ptr->priority) ||
((job_ptr2->part_ptr->priority ==
job_ptr ->part_ptr->priority) &&
@@ -4810,7 +4810,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
if (!IS_JOB_PENDING(job_ptr))
error_code = ESLURM_DISABLED;
else {
- int rc = update_job_account("update_job", job_ptr,
+ int rc = update_job_account("update_job", job_ptr,
job_specs->account);
if (rc != SLURM_SUCCESS)
error_code = rc;
@@ -4841,14 +4841,14 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
error_code = ESLURM_INVALID_ACCOUNT;
/* Let update proceed. Note there is an invalid
* association ID for accounting purposes */
- } else
+ } else
job_ptr->assoc_id = assoc_rec.id;
xfree(job_ptr->partition);
job_ptr->partition = xstrdup(job_specs->partition);
job_ptr->part_ptr = tmp_part_ptr;
info("update_job: setting partition to %s for "
- "job_id %u", job_specs->partition,
+ "job_id %u", job_specs->partition,
job_specs->job_id);
update_accounting = true;
} else {
@@ -4857,7 +4857,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
error_code = ESLURM_ACCESS_DENIED;
}
}
-
+
/* Always do this last just incase the assoc_ptr changed */
if (job_specs->comment && wiki_sched && (!super_user)) {
/* User must use Moab command to change job comment */
@@ -4870,17 +4870,17 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
job_specs->comment = NULL; /* Nothing left to free */
info("update_job: setting comment to %s for job_id %u",
job_ptr->comment, job_specs->job_id);
-
+
if (wiki_sched && strstr(job_ptr->comment, "QOS:")) {
acct_qos_rec_t qos_rec;
-
+
memset(&qos_rec, 0, sizeof(acct_qos_rec_t));
-
+
if (strstr(job_ptr->comment, "FLAGS:PREEMPTOR"))
qos_rec.name = "expedite";
else if (strstr(job_ptr->comment, "FLAGS:PREEMPTEE"))
qos_rec.name = "standby";
-
+
job_ptr->qos_ptr = _determine_and_validate_qos(
job_ptr->assoc_ptr, &qos_rec, &error_code);
job_ptr->qos = qos_rec.id;
@@ -4888,13 +4888,13 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
}
} else if(job_specs->qos) {
acct_qos_rec_t qos_rec;
-
+
info("update_job: setting qos to %s for job_id %u",
- job_specs->qos, job_specs->job_id);
-
+ job_specs->qos, job_specs->job_id);
+
memset(&qos_rec, 0, sizeof(acct_qos_rec_t));
qos_rec.name = job_specs->qos;
-
+
job_ptr->qos_ptr = _determine_and_validate_qos(
job_ptr->assoc_ptr, &qos_rec, &error_code);
job_ptr->qos = qos_rec.id;
@@ -4903,7 +4903,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
if (!super_user && (accounting_enforce & ACCOUNTING_ENFORCE_LIMITS) &&
(!_validate_acct_policy(job_specs, job_ptr->part_ptr,
- job_ptr->assoc_ptr, job_ptr->qos_ptr,
+ job_ptr->assoc_ptr, job_ptr->qos_ptr,
&job_ptr->limit_set_max_nodes))) {
info("_job_create: exceeded association's node or time limit "
"for user %u", job_specs->user_id);
@@ -4911,17 +4911,17 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
return error_code;
}
-
+
/* This needs to be done after the association acct policy check since
* it looks at unaltered nodes for bluegene systems
*/
- debug3("update before alteration asking for nodes %u-%u cpus %u",
+ debug3("update before alteration asking for nodes %u-%u cpus %u",
job_specs->min_nodes, job_specs->max_nodes,
job_specs->num_procs);
select_g_alter_node_cnt(SELECT_SET_NODE_CNT, job_specs);
select_g_select_jobinfo_get(job_specs->select_jobinfo,
SELECT_JOBDATA_MAX_CPUS, &max_cpus);
- debug3("update after alteration asking for nodes %u-%u cpus %u-%u",
+ debug3("update after alteration asking for nodes %u-%u cpus %u-%u",
job_specs->min_nodes, job_specs->max_nodes,
job_specs->num_procs, max_cpus);
@@ -4933,7 +4933,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
else {
job_ptr->num_procs = job_specs->num_procs;
info("update_job: setting num_procs to %u for "
- "job_id %u", job_specs->num_procs,
+ "job_id %u", job_specs->num_procs,
job_specs->job_id);
update_accounting = true;
}
@@ -4947,7 +4947,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
> job_specs->job_min_cpus)) {
detail_ptr->job_min_cpus = job_specs->job_min_cpus;
info("update_job: setting job_min_cpus to %u for "
- "job_id %u", job_specs->job_min_cpus,
+ "job_id %u", job_specs->job_min_cpus,
job_specs->job_id);
} else {
error("Attempt to increase job_min_cpus for job %u",
@@ -4988,7 +4988,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
}
}
if (save_min_nodes != NO_VAL) {
- info("update_job: setting min_nodes to %u for job_id %u",
+ info("update_job: setting min_nodes to %u for job_id %u",
job_specs->min_nodes, job_specs->job_id);
update_accounting = true;
}
@@ -4998,7 +4998,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
}
if (job_specs->time_limit != NO_VAL) {
- if (IS_JOB_FINISHED(job_ptr))
+ if (IS_JOB_FINISHED(job_ptr))
error_code = ESLURM_DISABLED;
else if (job_ptr->time_limit == job_specs->time_limit) {
verbose("update_job: new time limit identical to old "
@@ -5009,7 +5009,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
if (old_time == INFINITE) /* one year in mins */
old_time = (365 * 24 * 60);
job_ptr->time_limit = job_specs->time_limit;
- if (IS_JOB_RUNNING(job_ptr) ||
+ if (IS_JOB_RUNNING(job_ptr) ||
IS_JOB_SUSPENDED(job_ptr)) {
if (job_ptr->time_limit == INFINITE) {
/* Set end time in one year */
@@ -5030,15 +5030,15 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
}
}
info("update_job: setting time_limit to %u for "
- "job_id %u", job_specs->time_limit,
+ "job_id %u", job_specs->time_limit,
job_specs->job_id);
update_accounting = true;
} else if (IS_JOB_PENDING(job_ptr) && job_ptr->part_ptr &&
- (job_ptr->part_ptr->max_time >=
+ (job_ptr->part_ptr->max_time >=
job_specs->time_limit)) {
job_ptr->time_limit = job_specs->time_limit;
info("update_job: setting time_limit to %u for "
- "job_id %u", job_specs->time_limit,
+ "job_id %u", job_specs->time_limit,
job_specs->job_id);
update_accounting = true;
} else {
@@ -5061,7 +5061,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
job_ptr->end_time = job_specs->end_time;
job_ptr->time_limit += (delta_t+30)/60; /* Sec->min */
info("update_job: setting time_limit to %u for "
- "job_id %u", job_ptr->time_limit,
+ "job_id %u", job_ptr->time_limit,
job_specs->job_id);
update_accounting = true;
}
@@ -5077,7 +5077,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
rc = validate_job_resv(job_ptr);
if (rc == SLURM_SUCCESS) {
info("update_job: setting reservation to %s "
- "for job_id %u", job_ptr->resv_name,
+ "for job_id %u", job_ptr->resv_name,
job_ptr->job_id);
xfree(save_resv_name);
job_specs->reservation = NULL; /* Noth free */
@@ -5101,7 +5101,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
priority of the job while running to give better
position (larger time slices) than competing jobs
*/
- if (IS_JOB_FINISHED(job_ptr) || (detail_ptr == NULL))
+ if (IS_JOB_FINISHED(job_ptr) || (detail_ptr == NULL))
error_code = ESLURM_DISABLED;
else if (super_user
|| (job_ptr->priority > job_specs->priority)) {
@@ -5114,7 +5114,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
job_ptr->priority = job_specs->priority;
}
info("update_job: setting priority to %u for "
- "job_id %u", job_ptr->priority,
+ "job_id %u", job_ptr->priority,
job_specs->job_id);
update_accounting = true;
} else {
@@ -5125,7 +5125,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
}
if (job_specs->nice != (uint16_t) NO_VAL) {
- if (IS_JOB_FINISHED(job_ptr))
+ if (IS_JOB_FINISHED(job_ptr))
error_code = ESLURM_DISABLED;
else if (super_user || (job_specs->nice < NICE_OFFSET)) {
int64_t new_prio = job_ptr->priority;
@@ -5133,7 +5133,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
new_prio -= job_specs->nice;
job_ptr->priority = MAX(new_prio, 2);
job_ptr->details->nice = job_specs->nice;
-
+
info("update_job: setting priority to %u for "
"job_id %u", job_ptr->priority,
job_specs->job_id);
@@ -5144,7 +5144,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
error_code = ESLURM_ACCESS_DENIED;
}
}
-
+
if (job_specs->job_min_memory != NO_VAL) {
if ((!IS_JOB_PENDING(job_ptr)) || (detail_ptr == NULL))
error_code = ESLURM_DISABLED;
@@ -5156,8 +5156,8 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
entity = "job";
detail_ptr->job_min_memory = job_specs->job_min_memory;
info("update_job: setting min_memory_%s to %u for "
- "job_id %u", entity,
- (job_specs->job_min_memory & (~MEM_PER_CPU)),
+ "job_id %u", entity,
+ (job_specs->job_min_memory & (~MEM_PER_CPU)),
job_specs->job_id);
} else {
error("Attempt to increase job_min_memory for job %u",
@@ -5170,12 +5170,12 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
if ((!IS_JOB_PENDING(job_ptr)) || (detail_ptr == NULL))
error_code = ESLURM_DISABLED;
else if (super_user
- || (detail_ptr->job_min_tmp_disk
+ || (detail_ptr->job_min_tmp_disk
> job_specs->job_min_tmp_disk)) {
detail_ptr->job_min_tmp_disk =
job_specs->job_min_tmp_disk;
info("update_job: setting job_min_tmp_disk to %u for "
- "job_id %u", job_specs->job_min_tmp_disk,
+ "job_id %u", job_specs->job_min_tmp_disk,
job_specs->job_id);
} else {
error("Attempt to increase job_min_tmp_disk "
@@ -5191,7 +5191,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
else {
mc_ptr->min_sockets = job_specs->min_sockets;
info("update_job: setting min_sockets to %u for "
- "job_id %u", job_specs->min_sockets,
+ "job_id %u", job_specs->min_sockets,
job_specs->job_id);
}
}
@@ -5202,7 +5202,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
else {
mc_ptr->min_cores = job_specs->min_cores;
info("update_job: setting min_cores to %u for "
- "job_id %u", job_specs->min_cores,
+ "job_id %u", job_specs->min_cores,
job_specs->job_id);
}
}
@@ -5213,7 +5213,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
else {
mc_ptr->min_threads = job_specs->min_threads;
info("update_job: setting min_threads to %u for "
- "job_id %u", job_specs->min_threads,
+ "job_id %u", job_specs->min_threads,
job_specs->job_id);
}
}
@@ -5224,7 +5224,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
else if (super_user
|| (detail_ptr->shared > job_specs->shared)) {
detail_ptr->shared = job_specs->shared;
- info("update_job: setting shared to %u for job_id %u",
+ info("update_job: setting shared to %u for job_id %u",
job_specs->shared, job_specs->job_id);
} else {
error("Attempt to remove sharing for job %u",
@@ -5240,7 +5240,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
|| (detail_ptr->contiguous > job_specs->contiguous)) {
detail_ptr->contiguous = job_specs->contiguous;
info("update_job: setting contiguous to %u for "
- "job_id %u", job_specs->contiguous,
+ "job_id %u", job_specs->contiguous,
job_specs->job_id);
} else {
error("Attempt to add contiguous for job %u",
@@ -5259,7 +5259,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
detail_ptr->feature_list = NULL;
if (build_feature_list(job_ptr)) {
info("update_job: invalid features"
- "(%s) for job_id %u",
+ "(%s) for job_id %u",
job_specs->features, job_specs->job_id);
if (detail_ptr->feature_list)
list_destroy(detail_ptr->feature_list);
@@ -5268,7 +5268,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
error_code = ESLURM_INVALID_FEATURE;
} else {
info("update_job: setting features to "
- "%s for job_id %u",
+ "%s for job_id %u",
job_specs->features, job_specs->job_id);
xfree(old_features);
if (old_list)
@@ -5304,11 +5304,11 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
error_code = ESLURM_DISABLED;
else {
int rc = update_job_wckey("update_job",
- job_ptr,
+ job_ptr,
job_specs->wckey);
if (rc != SLURM_SUCCESS)
error_code = rc;
- else
+ else
update_accounting = true;
}
}
@@ -5320,7 +5320,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
xfree(detail_ptr->exc_nodes);
FREE_NULL_BITMAP(detail_ptr->exc_node_bitmap);
} else {
- if (node_name2bitmap(job_specs->exc_nodes, false,
+ if (node_name2bitmap(job_specs->exc_nodes, false,
&exc_bitmap)) {
error("Invalid node list for job_update: %s",
job_specs->exc_nodes);
@@ -5334,7 +5334,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
FREE_NULL_BITMAP(detail_ptr->exc_node_bitmap);
detail_ptr->exc_node_bitmap = exc_bitmap;
info("update_job: setting exc_nodes to %s "
- "for job_id %u", job_specs->exc_nodes,
+ "for job_id %u", job_specs->exc_nodes,
job_specs->job_id);
job_specs->exc_nodes = NULL;
}
@@ -5349,7 +5349,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
FREE_NULL_BITMAP(detail_ptr->req_node_bitmap);
xfree(detail_ptr->req_node_layout);
} else {
- if (node_name2bitmap(job_specs->req_nodes, false,
+ if (node_name2bitmap(job_specs->req_nodes, false,
&req_bitmap)) {
error("Invalid node list for job_update: %s",
job_specs->req_nodes);
@@ -5364,7 +5364,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
xfree(detail_ptr->req_node_layout);
detail_ptr->req_node_bitmap = req_bitmap;
info("update_job: setting req_nodes to %s "
- "for job_id %u", job_specs->req_nodes,
+ "for job_id %u", job_specs->req_nodes,
job_specs->job_id);
job_specs->req_nodes = NULL;
}
@@ -5394,8 +5394,8 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
!= SLURM_SUCCESS) {
error_code = ESLURM_DEPENDENCY;
} else {
- info("update_job: setting dependency to %s for "
- "job_id %u", job_ptr->details->dependency,
+ info("update_job: setting dependency to %s for "
+ "job_id %u", job_ptr->details->dependency,
job_ptr->job_id);
}
}
@@ -5405,7 +5405,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
/* Make sure this time is current, it does no
good for accounting to say this job could had
started in the past since the job isn't
- going to start until now as the earliest.
+ going to start until now as the earliest.
*/
if(job_specs->begin_time < now)
job_specs->begin_time = now;
@@ -5438,7 +5438,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
info("update_job: setting licenses to %s for job %u",
job_ptr->licenses, job_ptr->job_id);
} else if (IS_JOB_RUNNING(job_ptr) && super_user) {
- /* NOTE: This can result in oversubscription of
+ /* NOTE: This can result in oversubscription of
* licenses */
license_job_return(job_ptr);
if (job_ptr->license_list)
@@ -5446,7 +5446,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
job_ptr->license_list = license_list;
info("update_job: changing licenses from %s to %s for "
" running job %u",
- job_ptr->licenses, job_specs->licenses,
+ job_ptr->licenses, job_specs->licenses,
job_ptr->job_id);
xfree(job_ptr->licenses);
job_ptr->licenses = job_specs->licenses;
@@ -5490,7 +5490,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
SELECT_JOBDATA_REBOOT, &reboot);
}
}
-
+
select_g_select_jobinfo_get(job_specs->select_jobinfo,
SELECT_JOBDATA_GEOMETRY, geometry);
if (geometry[0] != (uint16_t) NO_VAL) {
@@ -5501,11 +5501,11 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
for (i=0; i<SYSTEM_DIMENSIONS; i++)
tot *= geometry[i];
info("update_job: setting geometry to %ux%ux%u "
- "min_nodes=%u for jobid %u",
- geometry[0], geometry[1],
+ "min_nodes=%u for jobid %u",
+ geometry[0], geometry[1],
geometry[2], tot, job_ptr->job_id);
select_g_select_jobinfo_set(job_ptr->select_jobinfo,
- SELECT_JOBDATA_GEOMETRY,
+ SELECT_JOBDATA_GEOMETRY,
geometry);
detail_ptr->min_nodes = tot;
} else {
@@ -5525,7 +5525,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
"jobid %u", image, job_ptr->job_id);
select_g_select_jobinfo_set(
job_ptr->select_jobinfo,
- SELECT_JOBDATA_BLRTS_IMAGE,
+ SELECT_JOBDATA_BLRTS_IMAGE,
image);
}
}
@@ -5570,14 +5570,14 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
image);
}
}
-
+
#endif
if(update_accounting) {
if (job_ptr->details && job_ptr->details->begin_time) {
/* Update job record in accounting to reflect
* changes */
- jobacct_storage_g_job_start(acct_db_conn,
- slurmctld_cluster_name,
+ jobacct_storage_g_job_start(acct_db_conn,
+ slurmctld_cluster_name,
job_ptr);
}
}
@@ -5586,13 +5586,13 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
/*
- * validate_jobs_on_node - validate that any jobs that should be on the node
- * are actually running, if not clean up the job records and/or node
- * records, call this function after validate_node_specs() sets the node
- * state properly
+ * validate_jobs_on_node - validate that any jobs that should be on the node
+ * are actually running, if not clean up the job records and/or node
+ * records, call this function after validate_node_specs() sets the node
+ * state properly
* IN reg_msg - node registration message
*/
-extern void
+extern void
validate_jobs_on_node(slurm_node_registration_status_msg_t *reg_msg)
{
int i, node_inx, jobs_on_node;
@@ -5603,13 +5603,13 @@ validate_jobs_on_node(slurm_node_registration_status_msg_t *reg_msg)
node_ptr = find_node_record(reg_msg->node_name);
if (node_ptr == NULL) {
- error("slurmd registered on unknown node %s",
+ error("slurmd registered on unknown node %s",
reg_msg->node_name);
return;
}
if (node_ptr->up_time > reg_msg->up_time) {
- verbose("Node %s rebooted %u secs ago",
+ verbose("Node %s rebooted %u secs ago",
reg_msg->node_name, reg_msg->up_time);
}
node_ptr->up_time = reg_msg->up_time;
@@ -5618,10 +5618,10 @@ validate_jobs_on_node(slurm_node_registration_status_msg_t *reg_msg)
/* Check that jobs running are really supposed to be there */
for (i = 0; i < reg_msg->job_count; i++) {
- if ( (reg_msg->job_id[i] >= MIN_NOALLOC_JOBID) &&
+ if ( (reg_msg->job_id[i] >= MIN_NOALLOC_JOBID) &&
(reg_msg->job_id[i] <= MAX_NOALLOC_JOBID) ) {
info("NoAllocate job %u.%u reported on node %s",
- reg_msg->job_id[i], reg_msg->step_id[i],
+ reg_msg->job_id[i], reg_msg->step_id[i],
reg_msg->node_name);
continue;
}
@@ -5629,18 +5629,18 @@ validate_jobs_on_node(slurm_node_registration_status_msg_t *reg_msg)
job_ptr = find_job_record(reg_msg->job_id[i]);
if (job_ptr == NULL) {
error("Orphan job %u.%u reported on node %s",
- reg_msg->job_id[i], reg_msg->step_id[i],
+ reg_msg->job_id[i], reg_msg->step_id[i],
reg_msg->node_name);
- abort_job_on_node(reg_msg->job_id[i],
+ abort_job_on_node(reg_msg->job_id[i],
job_ptr, node_ptr);
}
- else if (IS_JOB_RUNNING(job_ptr) ||
+ else if (IS_JOB_RUNNING(job_ptr) ||
IS_JOB_SUSPENDED(job_ptr)) {
if (bit_test(job_ptr->node_bitmap, node_inx)) {
debug3("Registered job %u.%u on node %s ",
- reg_msg->job_id[i],
- reg_msg->step_id[i],
+ reg_msg->job_id[i],
+ reg_msg->step_id[i],
reg_msg->node_name);
if ((job_ptr->batch_flag) &&
(node_inx == bit_ffs(
@@ -5649,7 +5649,7 @@ validate_jobs_on_node(slurm_node_registration_status_msg_t *reg_msg)
* batch jobs */
job_ptr->time_last_active = now;
}
- step_ptr = find_step_record(job_ptr,
+ step_ptr = find_step_record(job_ptr,
reg_msg->
step_id[i]);
if (step_ptr)
@@ -5659,18 +5659,18 @@ validate_jobs_on_node(slurm_node_registration_status_msg_t *reg_msg)
* restart on another nodes. A node from the
* original allocation just responded here. */
error("Registered job %u.%u on wrong node %s ",
- reg_msg->job_id[i],
+ reg_msg->job_id[i],
reg_msg->step_id[i],
reg_msg->node_name);
- abort_job_on_node(reg_msg->job_id[i], job_ptr,
+ abort_job_on_node(reg_msg->job_id[i], job_ptr,
node_ptr);
}
}
else if (IS_JOB_COMPLETING(job_ptr)) {
- /* Re-send kill request as needed,
+ /* Re-send kill request as needed,
* not necessarily an error */
- kill_job_on_node(reg_msg->job_id[i], job_ptr,
+ kill_job_on_node(reg_msg->job_id[i], job_ptr,
node_ptr);
}
@@ -5679,18 +5679,18 @@ validate_jobs_on_node(slurm_node_registration_status_msg_t *reg_msg)
/* Typically indicates a job requeue and the hung
* slurmd that went DOWN is now responding */
error("Registered PENDING job %u.%u on node %s ",
- reg_msg->job_id[i], reg_msg->step_id[i],
+ reg_msg->job_id[i], reg_msg->step_id[i],
reg_msg->node_name);
- abort_job_on_node(reg_msg->job_id[i],
+ abort_job_on_node(reg_msg->job_id[i],
job_ptr, node_ptr);
}
else { /* else job is supposed to be done */
error("Registered job %u.%u in state %s on node %s ",
- reg_msg->job_id[i], reg_msg->step_id[i],
+ reg_msg->job_id[i], reg_msg->step_id[i],
job_state_string(job_ptr->job_state),
reg_msg->node_name);
- kill_job_on_node(reg_msg->job_id[i], job_ptr,
+ kill_job_on_node(reg_msg->job_id[i], job_ptr,
node_ptr);
}
}
@@ -5701,10 +5701,10 @@ validate_jobs_on_node(slurm_node_registration_status_msg_t *reg_msg)
if (jobs_on_node != reg_msg->job_count) {
/* slurmd will not know of a job unless the job has
- * steps active at registration time, so this is not
- * an error condition, slurmd is also reporting steps
+ * steps active at registration time, so this is not
+ * an error condition, slurmd is also reporting steps
* rather than jobs */
- debug3("resetting job_count on node %s from %d to %d",
+ debug3("resetting job_count on node %s from %d to %d",
reg_msg->node_name, reg_msg->job_count, jobs_on_node);
reg_msg->job_count = jobs_on_node;
}
@@ -5712,9 +5712,9 @@ validate_jobs_on_node(slurm_node_registration_status_msg_t *reg_msg)
return;
}
-/* Purge any batch job that should have its script running on node
- * node_inx, but is not. Allow BatchStartTimeout + ResumeTimeout seconds
- * for startup.
+/* Purge any batch job that should have its script running on node
+ * node_inx, but is not. Allow BatchStartTimeout + ResumeTimeout seconds
+ * for startup.
*
* Purge all job steps that were started before the node was last booted.
*
@@ -5758,18 +5758,18 @@ static void _purge_missing_jobs(int node_inx, time_t now)
(job_ptr->time_last_active < startup_time) &&
(job_ptr->start_time < startup_time) &&
(node_inx == bit_ffs(job_ptr->node_bitmap))) {
- info("Batch JobId=%u missing from node 0, killing it",
+ info("Batch JobId=%u missing from node 0, killing it",
job_ptr->job_id);
job_complete(job_ptr->job_id, 0, false, NO_VAL);
} else {
- _notify_srun_missing_step(job_ptr, node_inx,
+ _notify_srun_missing_step(job_ptr, node_inx,
now, node_boot_time);
}
}
list_iterator_destroy(job_iterator);
}
-static void _notify_srun_missing_step(struct job_record *job_ptr, int node_inx,
+static void _notify_srun_missing_step(struct job_record *job_ptr, int node_inx,
time_t now, time_t node_boot_time)
{
ListIterator step_iterator;
@@ -5782,10 +5782,10 @@ static void _notify_srun_missing_step(struct job_record *job_ptr, int node_inx,
if (!bit_test(step_ptr->step_node_bitmap, node_inx))
continue;
if (step_ptr->time_last_active >= now) {
- /* Back up timer in case more than one node
+ /* Back up timer in case more than one node
* registration happens at this same time.
* We don't want this node's registration
- * to count toward a different node's
+ * to count toward a different node's
* registration message. */
step_ptr->time_last_active = now - 1;
} else if (step_ptr->host && step_ptr->port) {
@@ -5796,31 +5796,31 @@ static void _notify_srun_missing_step(struct job_record *job_ptr, int node_inx,
} else if ((step_ptr->start_time < node_boot_time) &&
(step_ptr->no_kill == 0)) {
/* There is a risk that the job step's tasks completed
- * on this node before its reboot, but that should be
+ * on this node before its reboot, but that should be
* very rare and there is no srun to work with (POE) */
- info("Node %s rebooted, killing missing step %u.%u",
+ info("Node %s rebooted, killing missing step %u.%u",
node_name, job_ptr->job_id, step_ptr->step_id);
- signal_step_tasks(step_ptr, SIGKILL,
+ signal_step_tasks(step_ptr, SIGKILL,
REQUEST_TERMINATE_TASKS);
}
- }
+ }
list_iterator_destroy (step_iterator);
}
/*
* abort_job_on_node - Kill the specific job_id on a specific node,
- * the request is not processed immediately, but queued.
- * This is to prevent a flood of pthreads if slurmctld restarts
- * without saved state and slurmd daemons register with a
- * multitude of running jobs. Slurmctld will not recognize
- * these jobs and use this function to kill them - one
+ * the request is not processed immediately, but queued.
+ * This is to prevent a flood of pthreads if slurmctld restarts
+ * without saved state and slurmd daemons register with a
+ * multitude of running jobs. Slurmctld will not recognize
+ * these jobs and use this function to kill them - one
* agent request per node as they register.
* IN job_id - id of the job to be killed
* IN job_ptr - pointer to terminating job (NULL if unknown, e.g. orphaned)
* IN node_ptr - pointer to the node on which the job resides
*/
extern void
-abort_job_on_node(uint32_t job_id, struct job_record *job_ptr,
+abort_job_on_node(uint32_t job_id, struct job_record *job_ptr,
struct node_record *node_ptr)
{
agent_arg_t *agent_info;
@@ -5834,7 +5834,7 @@ abort_job_on_node(uint32_t job_id, struct job_record *job_ptr,
kill_req->time = time(NULL);
kill_req->nodes = xstrdup(node_ptr->name);
if (job_ptr) { /* NULL if unknown */
- kill_req->select_jobinfo =
+ kill_req->select_jobinfo =
select_g_select_jobinfo_copy(job_ptr->select_jobinfo);
kill_req->spank_job_env = xduparray(job_ptr->spank_job_env_size,
job_ptr->spank_job_env);
@@ -5858,7 +5858,7 @@ abort_job_on_node(uint32_t job_id, struct job_record *job_ptr,
* IN node_ptr - pointer to the node on which the job resides
*/
extern void
-kill_job_on_node(uint32_t job_id, struct job_record *job_ptr,
+kill_job_on_node(uint32_t job_id, struct job_record *job_ptr,
struct node_record *node_ptr)
{
agent_arg_t *agent_info;
@@ -5872,7 +5872,7 @@ kill_job_on_node(uint32_t job_id, struct job_record *job_ptr,
kill_req->time = time(NULL);
kill_req->nodes = xstrdup(node_ptr->name);
if (job_ptr) { /* NULL if unknown */
- kill_req->select_jobinfo =
+ kill_req->select_jobinfo =
select_g_select_jobinfo_copy(job_ptr->select_jobinfo);
kill_req->job_state = job_ptr->job_state;
}
@@ -5905,7 +5905,7 @@ job_alloc_info(uint32_t uid, uint32_t job_id, struct job_record **job_pptr)
job_ptr = find_job_record(job_id);
if (job_ptr == NULL)
return ESLURM_INVALID_JOB_ID;
- if ((job_ptr->user_id != uid) &&
+ if ((job_ptr->user_id != uid) &&
(uid != 0) && (uid != slurmctld_conf.slurm_user_id))
return ESLURM_ACCESS_DENIED;
if ((slurmctld_conf.private_data & PRIVATE_DATA_JOBS)
@@ -5938,7 +5938,7 @@ int sync_job_files(void)
return SLURM_SUCCESS;
}
-/* Append to the batch_dirs list the job_id's associated with
+/* Append to the batch_dirs list the job_id's associated with
* every batch job directory in existence
* NOTE: READ lock_slurmctld config before entry
*/
@@ -5953,7 +5953,7 @@ static void _get_batch_job_dir_ids(List batch_dirs)
xassert(slurmctld_conf.state_save_location);
f_dir = opendir(slurmctld_conf.state_save_location);
if (!f_dir) {
- error("opendir(%s): %m",
+ error("opendir(%s): %m",
slurmctld_conf.state_save_location);
return;
}
@@ -5973,9 +5973,9 @@ static void _get_batch_job_dir_ids(List batch_dirs)
closedir(f_dir);
}
-/* All pending batch jobs must have a batch_dir entry,
+/* All pending batch jobs must have a batch_dir entry,
* otherwise we flag it as FAILED and don't schedule
- * If the batch_dir entry exists for a PENDING or RUNNING batch job,
+ * If the batch_dir entry exists for a PENDING or RUNNING batch job,
* remove it the list (of directories to be deleted) */
static void _validate_job_files(List batch_dirs)
{
@@ -5990,7 +5990,7 @@ static void _validate_job_files(List batch_dirs)
if (IS_JOB_FINISHED(job_ptr))
continue;
/* Want to keep this job's files */
- del_cnt = list_delete_all(batch_dirs, _find_batch_dir,
+ del_cnt = list_delete_all(batch_dirs, _find_batch_dir,
&(job_ptr->job_id));
if ((del_cnt == 0) && IS_JOB_PENDING(job_ptr)) {
error("Script for job %u lost, state set to FAILED",
@@ -6042,7 +6042,7 @@ static void _remove_defunct_batch_dirs(List batch_dirs)
* globals: node_record_count - number of nodes in the system
* node_record_table_ptr - pointer to global node table
*/
-static void
+static void
_xmit_new_end_time(struct job_record *job_ptr)
{
job_time_msg_t *job_time_msg_ptr;
@@ -6075,14 +6075,14 @@ _xmit_new_end_time(struct job_record *job_ptr)
/*
- * job_epilog_complete - Note the completion of the epilog script for a
+ * job_epilog_complete - Note the completion of the epilog script for a
* given job
* IN job_id - id of the job for which the epilog was executed
* IN node_name - name of the node on which the epilog was executed
* IN return_code - return code from epilog script
* RET true if job is COMPLETED, otherwise false
*/
-extern bool job_epilog_complete(uint32_t job_id, char *node_name,
+extern bool job_epilog_complete(uint32_t job_id, char *node_name,
uint32_t return_code)
{
struct job_record *job_ptr = find_job_record(job_id);
@@ -6092,13 +6092,13 @@ extern bool job_epilog_complete(uint32_t job_id, char *node_name,
return true;
/* There is a potential race condition this handles.
- * If slurmctld cold-starts while slurmd keeps running,
- * slurmd could notify slurmctld of a job epilog completion
- * before getting synced up with slurmctld state. If
- * a new job arrives and the job_id is reused, we
- * could try to note the termination of a job that
+ * If slurmctld cold-starts while slurmd keeps running,
+ * slurmd could notify slurmctld of a job epilog completion
+ * before getting synced up with slurmctld state. If
+ * a new job arrives and the job_id is reused, we
+ * could try to note the termination of a job that
* hasn't really started. Very rare obviously. */
- if ((IS_JOB_PENDING(job_ptr) && (!IS_JOB_COMPLETING(job_ptr))) ||
+ if ((IS_JOB_PENDING(job_ptr) && (!IS_JOB_COMPLETING(job_ptr))) ||
(job_ptr->node_bitmap == NULL)) {
uint16_t base_state = NODE_STATE_UNKNOWN;
node_ptr = find_node_record(node_name);
@@ -6119,7 +6119,7 @@ extern bool job_epilog_complete(uint32_t job_id, char *node_name,
int i;
if (return_code)
- error("Epilog error on %s, setting DOWN",
+ error("Epilog error on %s, setting DOWN",
job_ptr->nodes);
for (i=0; i<node_record_count; i++) {
if (!bit_test(job_ptr->node_bitmap, i))
@@ -6149,11 +6149,11 @@ extern bool job_epilog_complete(uint32_t job_id, char *node_name,
if (IS_JOB_PENDING(job_ptr) && (job_ptr->batch_flag)) {
info("requeue batch job %u", job_ptr->job_id);
if (job_ptr->details) {
- /* the time stamp on the new batch launch
- * credential must be larger than the time
- * stamp on the revoke request. Also the
- * I/O must be all cleared out and the
- * named socket purged, so delay for at
+ /* the time stamp on the new batch launch
+ * credential must be larger than the time
+ * stamp on the revoke request. Also the
+ * I/O must be all cleared out and the
+ * named socket purged, so delay for at
* least ten seconds. */
job_ptr->details->begin_time = time(NULL) + 10;
job_ptr->start_time = job_ptr->end_time = 0;
@@ -6168,7 +6168,7 @@ extern bool job_epilog_complete(uint32_t job_id, char *node_name,
}
/* job_fini - free all memory associated with job records */
-void job_fini (void)
+void job_fini (void)
{
if (job_list) {
list_destroy(job_list);
@@ -6193,7 +6193,7 @@ extern void job_completion_logger(struct job_record *job_ptr)
/* make sure all parts of the job are notified */
srun_job_complete(job_ptr);
-
+
/* mail out notifications of completion */
base_state = job_ptr->job_state & JOB_STATE_BASE;
if ((base_state == JOB_COMPLETE) || (base_state == JOB_CANCELLED)) {
@@ -6219,7 +6219,7 @@ extern void job_completion_logger(struct job_record *job_ptr)
assoc_rec.uid = job_ptr->user_id;
if(!(assoc_mgr_fill_in_assoc(acct_db_conn, &assoc_rec,
- accounting_enforce,
+ accounting_enforce,
(acct_association_rec_t **)
&job_ptr->assoc_ptr))) {
job_ptr->assoc_id = assoc_rec.id;
@@ -6231,11 +6231,11 @@ extern void job_completion_logger(struct job_record *job_ptr)
}
}
- /*
+ /*
* This means the job wasn't ever eligible, but we want to
* keep track of all jobs, so we will set the db_inx to
* INFINITE and the database will understand what happened.
- */
+ */
if(!job_ptr->nodes && !job_ptr->db_index) {
jobacct_storage_g_job_start(
acct_db_conn, slurmctld_cluster_name, job_ptr);
@@ -6435,7 +6435,7 @@ static int _suspend_job_nodes(struct job_record *job_ptr, bool clear_prio)
if (node_ptr->run_job_cnt)
(node_ptr->run_job_cnt)--;
else {
- error("Node %s run_job_cnt underflow",
+ error("Node %s run_job_cnt underflow",
node_ptr->name);
}
if (job_ptr->details
@@ -6458,10 +6458,10 @@ static int _suspend_job_nodes(struct job_record *job_ptr, bool clear_prio)
debug3("_suspend_job_nodes: Node %s left DOWN",
node_ptr->name);
} else if (node_ptr->run_job_cnt) {
- node_ptr->node_state = NODE_STATE_ALLOCATED |
+ node_ptr->node_state = NODE_STATE_ALLOCATED |
node_flags;
} else {
- node_ptr->node_state = NODE_STATE_IDLE |
+ node_ptr->node_state = NODE_STATE_IDLE |
node_flags;
}
}
@@ -6513,7 +6513,7 @@ static int _resume_job_nodes(struct job_record *job_ptr, bool clear_prio)
* job_suspend - perform some suspend/resume operation
* IN sus_ptr - suspend/resume request message
* IN uid - user id of the user issuing the RPC
- * IN conn_fd - file descriptor on which to send reply,
+ * IN conn_fd - file descriptor on which to send reply,
* -1 if none
* IN clear_prio - if set, then clear the job's priority after
* suspending it, this is used to distinguish
@@ -6522,7 +6522,7 @@ static int _resume_job_nodes(struct job_record *job_ptr, bool clear_prio)
* (the gang scheduler)
* RET 0 on success, otherwise ESLURM error code
*/
-extern int job_suspend(suspend_msg_t *sus_ptr, uid_t uid,
+extern int job_suspend(suspend_msg_t *sus_ptr, uid_t uid,
slurm_fd conn_fd, bool clear_prio)
{
int rc = SLURM_SUCCESS;
@@ -6582,7 +6582,7 @@ extern int job_suspend(suspend_msg_t *sus_ptr, uid_t uid,
job_ptr->priority = 0;
if (job_ptr->suspend_time) {
job_ptr->pre_sus_time +=
- difftime(now,
+ difftime(now,
job_ptr->suspend_time);
} else {
job_ptr->pre_sus_time +=
@@ -6719,7 +6719,7 @@ extern int job_requeue (uid_t uid, uint32_t job_id, slurm_fd conn_fd)
job_ptr->job_state = JOB_PENDING;
if (job_ptr->node_cnt)
job_ptr->job_state |= JOB_COMPLETING;
-
+
job_ptr->details->submit_time = now;
job_ptr->pre_sus_time = (time_t) 0;
job_ptr->suspend_time = (time_t) 0;
@@ -6778,7 +6778,7 @@ extern void update_job_nodes_completing(void)
(job_ptr->node_bitmap == NULL))
continue;
xfree(job_ptr->nodes_completing);
- job_ptr->nodes_completing =
+ job_ptr->nodes_completing =
bitmap2node_name(job_ptr->node_bitmap);
}
list_iterator_destroy(job_iterator);
@@ -6799,10 +6799,10 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
xassert(limit_set_max_nodes);
//(*limit_set_max_nodes) = 0;
-
+
slurm_mutex_lock(&assoc_mgr_qos_lock);
if(qos_ptr) {
- /* for validation we don't need to look at
+ /* for validation we don't need to look at
* qos_ptr->grp_cpu_mins.
*/
@@ -6810,7 +6810,7 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
* time because we don't have access to a CPU count for the job
* due to how all of the job's specifications interact */
- /* for validation we don't need to look at
+ /* for validation we don't need to look at
* qos_ptr->grp_jobs.
*/
@@ -6820,115 +6820,115 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
"min node request %u exceeds "
"group max node limit %u for qos '%s'",
user_name,
- job_desc->user_id,
- job_desc->min_nodes,
+ job_desc->user_id,
+ job_desc->min_nodes,
qos_ptr->grp_nodes,
qos_ptr->name);
rc = false;
goto end_qos;
} else if (job_desc->max_nodes == 0
- || (*limit_set_max_nodes
- && (job_desc->max_nodes
+ || (*limit_set_max_nodes
+ && (job_desc->max_nodes
> qos_ptr->grp_nodes))) {
job_desc->max_nodes = qos_ptr->grp_nodes;
(*limit_set_max_nodes) = 1;
- } else if (job_desc->max_nodes >
+ } else if (job_desc->max_nodes >
qos_ptr->grp_nodes) {
info("job submit for user %s(%u): "
"max node changed %u -> %u because "
"of qos limit",
user_name,
- job_desc->user_id,
- job_desc->max_nodes,
+ job_desc->user_id,
+ job_desc->max_nodes,
qos_ptr->grp_nodes);
if(job_desc->max_nodes == NO_VAL)
(*limit_set_max_nodes) = 1;
- job_desc->max_nodes = qos_ptr->grp_nodes;
+ job_desc->max_nodes = qos_ptr->grp_nodes;
}
}
if ((qos_ptr->grp_submit_jobs != INFINITE) &&
- (qos_ptr->grp_used_submit_jobs
+ (qos_ptr->grp_used_submit_jobs
>= qos_ptr->grp_submit_jobs)) {
info("job submit for user %s(%u): "
"group max submit job limit exceded %u "
"for qos '%s'",
user_name,
- job_desc->user_id,
+ job_desc->user_id,
qos_ptr->grp_submit_jobs,
qos_ptr->name);
rc = false;
goto end_qos;
}
-
-
- /* for validation we don't need to look at
+
+
+ /* for validation we don't need to look at
* qos_ptr->grp_wall. It is checked while the job is running.
*/
-
-
- /* for validation we don't need to look at
+
+
+ /* for validation we don't need to look at
* qos_ptr->max_cpu_mins_pj.
*/
-
+
/* NOTE: We can't enforce qos_ptr->max_cpus at this
* time because we don't have access to a CPU count for the job
* due to how all of the job's specifications interact */
-
- /* for validation we don't need to look at
+
+ /* for validation we don't need to look at
* qos_ptr->max_jobs.
*/
-
+
if (qos_ptr->max_nodes_pj != INFINITE) {
if (job_desc->min_nodes > qos_ptr->max_nodes_pj) {
info("job submit for user %s(%u): "
"min node limit %u exceeds "
"qos max %u",
user_name,
- job_desc->user_id,
- job_desc->min_nodes,
+ job_desc->user_id,
+ job_desc->min_nodes,
qos_ptr->max_nodes_pj);
rc = false;
goto end_qos;
} else if (job_desc->max_nodes == 0
- || (*limit_set_max_nodes
- && (job_desc->max_nodes
+ || (*limit_set_max_nodes
+ && (job_desc->max_nodes
> qos_ptr->max_nodes_pj))) {
job_desc->max_nodes = qos_ptr->max_nodes_pj;
(*limit_set_max_nodes) = 1;
- } else if (job_desc->max_nodes >
+ } else if (job_desc->max_nodes >
qos_ptr->max_nodes_pj) {
info("job submit for user %s(%u): "
"max node changed %u -> %u because "
"of qos limit",
user_name,
- job_desc->user_id,
- job_desc->max_nodes,
+ job_desc->user_id,
+ job_desc->max_nodes,
qos_ptr->max_nodes_pj);
if(job_desc->max_nodes == NO_VAL)
(*limit_set_max_nodes) = 1;
job_desc->max_nodes = qos_ptr->max_nodes_pj;
}
}
-
+
if (qos_ptr->max_submit_jobs_pu != INFINITE) {
acct_used_limits_t *used_limits = NULL;
if(qos_ptr->user_limit_list) {
ListIterator itr = list_iterator_create(
qos_ptr->user_limit_list);
while((used_limits = list_next(itr))) {
- if(used_limits->uid
+ if(used_limits->uid
== job_desc->user_id)
break;
}
list_iterator_destroy(itr);
}
- if(used_limits && (used_limits->submit_jobs
+ if(used_limits && (used_limits->submit_jobs
>= qos_ptr->max_submit_jobs_pu)) {
info("job submit for user %s(%u): "
"account max submit job limit exceded %u",
user_name,
- job_desc->user_id,
+ job_desc->user_id,
qos_ptr->max_submit_jobs_pu);
rc = false;
goto end_qos;
@@ -6940,19 +6940,19 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
if (job_desc->time_limit == NO_VAL) {
if (part_ptr->max_time == INFINITE)
job_desc->time_limit = time_limit;
- else
+ else
job_desc->time_limit =
- MIN(time_limit,
+ MIN(time_limit,
part_ptr->max_time);
timelimit_set = 1;
- } else if (timelimit_set &&
+ } else if (timelimit_set &&
job_desc->time_limit > time_limit) {
job_desc->time_limit = time_limit;
} else if (job_desc->time_limit > time_limit) {
info("job submit for user %s(%u): "
"time limit %u exceeds account max %u",
user_name,
- job_desc->user_id,
+ job_desc->user_id,
job_desc->time_limit, time_limit);
rc = false;
goto end_qos;
@@ -6963,7 +6963,7 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
slurm_mutex_lock(&assoc_mgr_association_lock);
while(assoc_ptr) {
- /* for validation we don't need to look at
+ /* for validation we don't need to look at
* assoc_ptr->grp_cpu_mins.
*/
@@ -6971,11 +6971,11 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
* time because we don't have access to a CPU count for the job
* due to how all of the job's specifications interact */
- /* for validation we don't need to look at
+ /* for validation we don't need to look at
* assoc_ptr->grp_jobs.
*/
- if ((!qos_ptr ||
+ if ((!qos_ptr ||
(qos_ptr && qos_ptr->grp_nodes == INFINITE)) &&
(assoc_ptr->grp_nodes != INFINITE)) {
if (job_desc->min_nodes > assoc_ptr->grp_nodes) {
@@ -6983,26 +6983,26 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
"min node request %u exceeds "
"group max node limit %u for account %s",
user_name,
- job_desc->user_id,
- job_desc->min_nodes,
+ job_desc->user_id,
+ job_desc->min_nodes,
assoc_ptr->grp_nodes,
assoc_ptr->acct);
rc = false;
break;
} else if (job_desc->max_nodes == 0
- || (*limit_set_max_nodes
- && (job_desc->max_nodes
+ || (*limit_set_max_nodes
+ && (job_desc->max_nodes
> assoc_ptr->grp_nodes))) {
job_desc->max_nodes = assoc_ptr->grp_nodes;
(*limit_set_max_nodes) = 1;
- } else if (job_desc->max_nodes >
+ } else if (job_desc->max_nodes >
assoc_ptr->grp_nodes) {
info("job submit for user %s(%u): "
"max node changed %u -> %u because "
"of account limit",
user_name,
- job_desc->user_id,
- job_desc->max_nodes,
+ job_desc->user_id,
+ job_desc->max_nodes,
assoc_ptr->grp_nodes);
if(job_desc->max_nodes == NO_VAL)
(*limit_set_max_nodes) = 1;
@@ -7010,27 +7010,27 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
}
}
- if ((!qos_ptr ||
+ if ((!qos_ptr ||
(qos_ptr && qos_ptr->grp_submit_jobs == INFINITE)) &&
(assoc_ptr->grp_submit_jobs != INFINITE) &&
- (assoc_ptr->used_submit_jobs
+ (assoc_ptr->used_submit_jobs
>= assoc_ptr->grp_submit_jobs)) {
info("job submit for user %s(%u): "
"group max submit job limit exceeded %u "
"for account '%s'",
user_name,
- job_desc->user_id,
+ job_desc->user_id,
assoc_ptr->grp_submit_jobs,
assoc_ptr->acct);
rc = false;
break;
}
-
- /* for validation we don't need to look at
+
+ /* for validation we don't need to look at
* assoc_ptr->grp_wall. It is checked while the job is running.
*/
-
+
/* We don't need to look at the regular limits for
* parents since we have pre-propogated them, so just
* continue with the next parent
@@ -7038,21 +7038,21 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
if(parent) {
assoc_ptr = assoc_ptr->parent_assoc_ptr;
continue;
- }
-
- /* for validation we don't need to look at
+ }
+
+ /* for validation we don't need to look at
* assoc_ptr->max_cpu_mins_pj.
*/
-
+
/* NOTE: We can't enforce assoc_ptr->max_cpus at this
* time because we don't have access to a CPU count for the job
* due to how all of the job's specifications interact */
- /* for validation we don't need to look at
+ /* for validation we don't need to look at
* assoc_ptr->max_jobs.
*/
-
- if ((!qos_ptr ||
+
+ if ((!qos_ptr ||
(qos_ptr && qos_ptr->max_nodes_pj == INFINITE)) &&
(assoc_ptr->max_nodes_pj != INFINITE)) {
if (job_desc->min_nodes > assoc_ptr->max_nodes_pj) {
@@ -7060,25 +7060,25 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
"min node limit %u exceeds "
"account max %u",
user_name,
- job_desc->user_id,
- job_desc->min_nodes,
+ job_desc->user_id,
+ job_desc->min_nodes,
assoc_ptr->max_nodes_pj);
rc = false;
break;
} else if (job_desc->max_nodes == 0
- || (*limit_set_max_nodes
- && (job_desc->max_nodes
+ || (*limit_set_max_nodes
+ && (job_desc->max_nodes
> assoc_ptr->max_nodes_pj))) {
job_desc->max_nodes = assoc_ptr->max_nodes_pj;
(*limit_set_max_nodes) = 1;
- } else if (job_desc->max_nodes >
+ } else if (job_desc->max_nodes >
assoc_ptr->max_nodes_pj) {
info("job submit for user %s(%u): "
"max node changed %u -> %u because "
"of account limit",
user_name,
- job_desc->user_id,
- job_desc->max_nodes,
+ job_desc->user_id,
+ job_desc->max_nodes,
assoc_ptr->max_nodes_pj);
if(job_desc->max_nodes == NO_VAL)
(*limit_set_max_nodes) = 1;
@@ -7086,46 +7086,46 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
}
}
- if ((!qos_ptr ||
+ if ((!qos_ptr ||
(qos_ptr && qos_ptr->max_submit_jobs_pu == INFINITE)) &&
(assoc_ptr->max_submit_jobs != INFINITE) &&
- (assoc_ptr->used_submit_jobs
+ (assoc_ptr->used_submit_jobs
>= assoc_ptr->max_submit_jobs)) {
info("job submit for user %s(%u): "
"account max submit job limit exceeded %u",
user_name,
- job_desc->user_id,
+ job_desc->user_id,
assoc_ptr->max_submit_jobs);
rc = false;
break;
}
-
- if ((!qos_ptr ||
+
+ if ((!qos_ptr ||
(qos_ptr && qos_ptr->max_wall_pj == INFINITE)) &&
(assoc_ptr->max_wall_pj != INFINITE)) {
time_limit = assoc_ptr->max_wall_pj;
if (job_desc->time_limit == NO_VAL) {
if (part_ptr->max_time == INFINITE)
job_desc->time_limit = time_limit;
- else
+ else
job_desc->time_limit =
- MIN(time_limit,
+ MIN(time_limit,
part_ptr->max_time);
timelimit_set = 1;
- } else if (timelimit_set &&
+ } else if (timelimit_set &&
job_desc->time_limit > time_limit) {
job_desc->time_limit = time_limit;
} else if (job_desc->time_limit > time_limit) {
info("job submit for user %s(%u): "
"time limit %u exceeds account max %u",
user_name,
- job_desc->user_id,
+ job_desc->user_id,
job_desc->time_limit, time_limit);
rc = false;
break;
}
}
-
+
assoc_ptr = assoc_ptr->parent_assoc_ptr;
parent = 1;
}
@@ -7164,12 +7164,12 @@ extern int job_cancel_by_assoc_id(uint32_t assoc_id)
if(job_ptr->assoc_ptr)
job_ptr->assoc_id = ((acct_association_rec_t *)
job_ptr->assoc_ptr)->id;
- }
+ }
if(IS_JOB_FINISHED(job_ptr))
continue;
- info("Association deleted, cancelling job %u",
+ info("Association deleted, cancelling job %u",
job_ptr->job_id);
/* make sure the assoc_mgr_association_lock isn't
locked before this. */
@@ -7189,7 +7189,7 @@ extern int job_cancel_by_assoc_id(uint32_t assoc_id)
* IN new_account - desired account name
* RET SLURM_SUCCESS or error code
*/
-extern int update_job_account(char *module, struct job_record *job_ptr,
+extern int update_job_account(char *module, struct job_record *job_ptr,
char *new_account)
{
acct_association_rec_t assoc_rec;
@@ -7221,7 +7221,7 @@ extern int update_job_account(char *module, struct job_record *job_ptr,
*/
assoc_rec.acct = NULL;
assoc_mgr_fill_in_assoc(acct_db_conn, &assoc_rec,
- accounting_enforce,
+ accounting_enforce,
(acct_association_rec_t **)
&job_ptr->assoc_ptr);
if(!job_ptr->assoc_ptr) {
@@ -7261,7 +7261,7 @@ extern int update_job_account(char *module, struct job_record *job_ptr,
* IN new_wckey - desired wckey name
* RET SLURM_SUCCESS or error code
*/
-extern int update_job_wckey(char *module, struct job_record *job_ptr,
+extern int update_job_wckey(char *module, struct job_record *job_ptr,
char *new_wckey)
{
acct_wckey_rec_t wckey_rec, *wckey_ptr;
@@ -7280,8 +7280,8 @@ extern int update_job_wckey(char *module, struct job_record *job_ptr,
info("%s: invalid wckey %s for job_id %u",
module, new_wckey, job_ptr->job_id);
return ESLURM_INVALID_WCKEY;
- } else if(association_based_accounting
- && !wckey_ptr
+ } else if(association_based_accounting
+ && !wckey_ptr
&& !(accounting_enforce & ACCOUNTING_ENFORCE_WCKEYS)) {
/* if not enforcing associations we want to look for
the default account and use it to avoid getting
@@ -7302,7 +7302,7 @@ extern int update_job_wckey(char *module, struct job_record *job_ptr,
wckey_rec.name = new_wckey;
}
}
-
+
if (wckey_rec.name && wckey_rec.name[0] != '\0') {
xstrfmtcat(job_ptr->name, "\"%s", wckey_rec.name);
job_ptr->account = xstrdup(wckey_rec.name);
@@ -7322,7 +7322,7 @@ extern int send_jobs_to_accounting()
{
ListIterator itr = NULL;
struct job_record *job_ptr;
- slurmctld_lock_t job_write_lock = {
+ slurmctld_lock_t job_write_lock = {
NO_LOCK, WRITE_LOCK, READ_LOCK, READ_LOCK };
time_t now = time(NULL);
@@ -7353,20 +7353,20 @@ extern int send_jobs_to_accounting()
job_ptr->end_time = now;
job_completion_logger(job_ptr);
continue;
- } else
+ } else
job_ptr->assoc_id = assoc_rec.id;
}
/* we only want active, un accounted for jobs */
- if(job_ptr->db_index || IS_JOB_FINISHED(job_ptr))
+ if(job_ptr->db_index || IS_JOB_FINISHED(job_ptr))
continue;
-
+
debug("first reg: starting job %u in accounting",
job_ptr->job_id);
jobacct_storage_g_job_start(
acct_db_conn, slurmctld_cluster_name, job_ptr);
- if (IS_JOB_SUSPENDED(job_ptr))
+ if (IS_JOB_SUSPENDED(job_ptr))
jobacct_storage_g_job_suspend(acct_db_conn, job_ptr);
}
list_iterator_destroy(itr);
@@ -7376,7 +7376,7 @@ extern int send_jobs_to_accounting()
}
/* Perform checkpoint operation on a job */
-extern int job_checkpoint(checkpoint_msg_t *ckpt_ptr, uid_t uid,
+extern int job_checkpoint(checkpoint_msg_t *ckpt_ptr, uid_t uid,
slurm_fd conn_fd)
{
int rc = SLURM_SUCCESS;
@@ -7386,7 +7386,7 @@ extern int job_checkpoint(checkpoint_msg_t *ckpt_ptr, uid_t uid,
slurm_msg_t resp_msg;
slurm_msg_t_init(&resp_msg);
-
+
/* find the job */
job_ptr = find_job_record (ckpt_ptr->job_id);
if (job_ptr == NULL) {
@@ -7401,7 +7401,7 @@ extern int job_checkpoint(checkpoint_msg_t *ckpt_ptr, uid_t uid,
rc = ESLURM_JOB_PENDING;
goto reply;
} else if (IS_JOB_SUSPENDED(job_ptr)) {
- /* job can't get cycles for checkpoint
+ /* job can't get cycles for checkpoint
* if it is already suspended */
rc = ESLURM_DISABLED;
goto reply;
@@ -7428,7 +7428,7 @@ extern int job_checkpoint(checkpoint_msg_t *ckpt_ptr, uid_t uid,
->ckpt_dir);
}
- rc = _checkpoint_job_record(job_ptr,
+ rc = _checkpoint_job_record(job_ptr,
ckpt_ptr->image_dir);
if (rc != SLURM_SUCCESS)
goto reply;
@@ -7437,8 +7437,8 @@ extern int job_checkpoint(checkpoint_msg_t *ckpt_ptr, uid_t uid,
xstrfmtcat(ckpt_ptr->image_dir, "/%u", job_ptr->job_id);
rc = checkpoint_op(ckpt_ptr->job_id, ckpt_ptr->step_id, NULL,
ckpt_ptr->op, ckpt_ptr->data,
- ckpt_ptr->image_dir, &resp_data.event_time,
- &resp_data.error_code,
+ ckpt_ptr->image_dir, &resp_data.event_time,
+ &resp_data.error_code,
&resp_data.error_msg);
info("checkpoint_op %u of %u.%u complete, rc=%d",
ckpt_ptr->op, ckpt_ptr->job_id, ckpt_ptr->step_id, rc);
@@ -7446,9 +7446,9 @@ extern int job_checkpoint(checkpoint_msg_t *ckpt_ptr, uid_t uid,
} else { /* operate on all of a job's steps */
int update_rc = -2;
ListIterator step_iterator;
-
+
step_iterator = list_iterator_create (job_ptr->step_list);
- while ((step_ptr = (struct step_record *)
+ while ((step_ptr = (struct step_record *)
list_next (step_iterator))) {
char *image_dir = NULL;
if (ckpt_ptr->image_dir) {
@@ -7456,19 +7456,19 @@ extern int job_checkpoint(checkpoint_msg_t *ckpt_ptr, uid_t uid,
} else {
image_dir = xstrdup(step_ptr->ckpt_dir);
}
- xstrfmtcat(image_dir, "/%u.%hu", job_ptr->job_id,
+ xstrfmtcat(image_dir, "/%u.%hu", job_ptr->job_id,
step_ptr->step_id);
update_rc = checkpoint_op(ckpt_ptr->job_id,
step_ptr->step_id,
step_ptr,
- ckpt_ptr->op,
+ ckpt_ptr->op,
ckpt_ptr->data,
image_dir,
&resp_data.event_time,
&resp_data.error_code,
&resp_data.error_msg);
info("checkpoint_op %u of %u.%u complete, rc=%d",
- ckpt_ptr->op, ckpt_ptr->job_id,
+ ckpt_ptr->op, ckpt_ptr->job_id,
step_ptr->step_id, rc);
rc = MAX(rc, update_rc);
xfree(image_dir);
@@ -7481,7 +7481,7 @@ extern int job_checkpoint(checkpoint_msg_t *ckpt_ptr, uid_t uid,
reply:
if (conn_fd < 0) /* periodic checkpoint */
return rc;
-
+
if ((rc == SLURM_SUCCESS) &&
((ckpt_ptr->op == CHECK_ABLE) || (ckpt_ptr->op == CHECK_ERROR))) {
resp_msg.msg_type = RESPONSE_CHECKPOINT;
@@ -7513,7 +7513,7 @@ static int _checkpoint_job_record (struct job_record *job_ptr, char *image_dir)
debug("_checkpoint_job_record: checkpoint job record of %u to file %s",
job_ptr->job_id, ckpt_file);
-
+
old_file = xstrdup(ckpt_file);
xstrcat(old_file, ".old");
@@ -7596,7 +7596,7 @@ static void _pack_job_for_ckpt (struct job_record *job_ptr, Buf buffer)
msg.data = job_desc;
pack_msg(&msg, buffer);
- /* free the environment since all strings are stored in one
+ /* free the environment since all strings are stored in one
* xmalloced buffer */
if (job_desc->environment) {
xfree(job_desc->environment[0]);
@@ -7643,7 +7643,7 @@ _copy_job_record_to_job_desc(struct job_record *job_ptr)
job_desc->cpu_bind = xstrdup(details->cpu_bind);
job_desc->cpu_bind_type = details->cpu_bind_type;
job_desc->dependency = xstrdup(details->dependency);
- job_desc->environment = get_job_env(job_ptr,
+ job_desc->environment = get_job_env(job_ptr,
&job_desc->env_size);
job_desc->std_err = xstrdup(details->std_err);
job_desc->exc_nodes = xstrdup(details->exc_nodes);
@@ -7663,7 +7663,7 @@ _copy_job_record_to_job_desc(struct job_record *job_ptr)
job_desc->nice = details->nice;
job_desc->num_tasks = details->num_tasks;
job_desc->open_mode = details->open_mode;
- job_desc->other_port = job_ptr->other_port;
+ job_desc->other_port = job_ptr->other_port;
job_desc->std_out = xstrdup(details->std_out);
job_desc->overcommit = details->overcommit;
job_desc->partition = xstrdup(job_ptr->partition);
@@ -7694,7 +7694,7 @@ _copy_job_record_to_job_desc(struct job_record *job_ptr)
job_desc->ntasks_per_core = mc_ptr->ntasks_per_core;
job_desc->wckey = xstrdup(job_ptr->wckey);
#if 0
- /* select_jobinfo is unused at job submit time, only it's
+ /* select_jobinfo is unused at job submit time, only it's
* components are set. We recover those from the structure below.
* job_desc->select_jobinfo = select_g_select_jobinfo_copy(job_ptr->
select_jobinfo); */
@@ -7702,23 +7702,23 @@ _copy_job_record_to_job_desc(struct job_record *job_ptr)
/* The following fields are used only on BlueGene systems.
* Since BlueGene does not use the checkpoint/restart logic today,
* we do not them. */
- select_g_select_jobinfo_get(job_ptr->select_jobinfo, SELECT_JOBDATA_GEOMETRY,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo, SELECT_JOBDATA_GEOMETRY,
&job_desc->geometry);
- select_g_select_jobinfo_get(job_ptr->select_jobinfo, SELECT_JOBDATA_CONN_TYPE,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo, SELECT_JOBDATA_CONN_TYPE,
&job_desc->conn_type);
- select_g_select_jobinfo_get(job_ptr->select_jobinfo, SELECT_JOBDATA_REBOOT,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo, SELECT_JOBDATA_REBOOT,
&job_desc->reboot);
- select_g_select_jobinfo_get(job_ptr->select_jobinfo, SELECT_JOBDATA_ROTATE,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo, SELECT_JOBDATA_ROTATE,
&job_desc->rotate);
- select_g_select_jobinfo_get(job_ptr->select_jobinfo, SELECT_JOBDATA_BLRTS_IMAGE,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo, SELECT_JOBDATA_BLRTS_IMAGE,
&job_desc->blrtsimage);
- select_g_select_jobinfo_get(job_ptr->select_jobinfo, SELECT_JOBDATA_LINUX_IMAGE,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo, SELECT_JOBDATA_LINUX_IMAGE,
&job_desc->linuximage);
- select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_MLOADER_IMAGE,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo,
+ SELECT_JOBDATA_MLOADER_IMAGE,
&job_desc->mloaderimage);
- select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_RAMDISK_IMAGE,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo,
+ SELECT_JOBDATA_RAMDISK_IMAGE,
&job_desc->ramdiskimage);
#endif
@@ -7733,7 +7733,7 @@ _copy_job_record_to_job_desc(struct job_record *job_ptr)
* the job requirements is load from the checkpoint file and
* the job id is restored.
*
- * IN ckpt_ptr - checkpoint request message
+ * IN ckpt_ptr - checkpoint request message
* IN uid - user id of the user issuing the RPC
* IN conn_fd - file descriptor on which to send reply
* RET 0 on success, otherwise ESLURM error code
@@ -7755,7 +7755,7 @@ extern int job_restart(checkpoint_msg_t *ckpt_ptr, uid_t uid, slurm_fd conn_fd)
rc = ESLURM_NOT_SUPPORTED;
goto reply;
}
-
+
if ((job_ptr = find_job_record(ckpt_ptr->job_id)) &&
! IS_JOB_FINISHED(job_ptr)) {
rc = ESLURM_DISABLED;
@@ -7767,7 +7767,7 @@ extern int job_restart(checkpoint_msg_t *ckpt_ptr, uid_t uid, slurm_fd conn_fd)
data = _read_job_ckpt_file(ckpt_file, &data_size);
xfree(ckpt_file);
-
+
if (data == NULL) {
rc = errno;
xfree (ckpt_file);
@@ -7826,7 +7826,7 @@ extern int job_restart(checkpoint_msg_t *ckpt_ptr, uid_t uid, slurm_fd conn_fd)
/* Set new job priority */
job_desc->priority = NO_VAL;
-
+
/*
* XXX: we set submit_uid to 0 in the following job_allocate() call
* This is for setting the job_id to the original one.
@@ -7848,13 +7848,13 @@ extern int job_restart(checkpoint_msg_t *ckpt_ptr, uid_t uid, slurm_fd conn_fd)
image_dir = xstrdup(ckpt_ptr->image_dir);
}
xstrfmtcat(image_dir, "/%u", ckpt_ptr->job_id);
-
+
job_ptr->details->restart_dir = image_dir;
image_dir = NULL; /* Nothing left to xfree */
last_job_update = time(NULL);
}
-
+
unpack_error:
free_buf(buffer);
xfree(image_dir);
@@ -7877,7 +7877,7 @@ _read_job_ckpt_file(char *ckpt_file, int *size_ptr)
int ckpt_fd, error_code = 0;
int data_allocated, data_read, data_size = 0;
char *data = NULL;
-
+
ckpt_fd = open(ckpt_file, O_RDONLY);
if (ckpt_fd < 0) {
info("No job ckpt file (%s) to read", ckpt_file);
@@ -7892,7 +7892,7 @@ _read_job_ckpt_file(char *ckpt_file, int *size_ptr)
if (errno == EINTR)
continue;
else {
- error("Read error on %s: %m",
+ error("Read error on %s: %m",
ckpt_file);
error_code = errno;
break;
@@ -7950,7 +7950,7 @@ extern void job_preempt_remove(uint32_t job_id)
if (rc == SLURM_SUCCESS)
info("preempted job %u had to be killed", job_id);
else {
- info("preempted job %u kill failure %s",
+ info("preempted job %u kill failure %s",
job_id, slurm_strerror(rc));
}
}
diff --git a/src/slurmctld/job_scheduler.c b/src/slurmctld/job_scheduler.c
index 3e840681c97f507160f0a6c4535257af0d81d30c..82e54ef6088f459088927fc26d8546b60c8c8c6b 100644
--- a/src/slurmctld/job_scheduler.c
+++ b/src/slurmctld/job_scheduler.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -102,7 +102,7 @@ static int _build_user_job_list(uint32_t user_id, char* job_name,
/* build list pending jobs */
job_buffer_size = job_queue_size = 0;
job_queue[0] = my_job_queue = NULL;
-
+
job_iterator = list_iterator_create(job_list);
while ((job_ptr = (struct job_record *) list_next(job_iterator))) {
xassert (job_ptr->magic == JOB_MAGIC);
@@ -118,18 +118,18 @@ static int _build_user_job_list(uint32_t user_id, char* job_name,
}
my_job_queue[job_queue_size].job_ptr = job_ptr;
my_job_queue[job_queue_size].job_priority = job_ptr->priority;
- my_job_queue[job_queue_size].part_priority =
+ my_job_queue[job_queue_size].part_priority =
job_ptr->part_ptr->priority;
job_queue_size++;
}
list_iterator_destroy(job_iterator);
-
+
job_queue[0] = my_job_queue;
return job_queue_size;
}
-/*
+/*
* build_job_queue - build (non-priority ordered) list of pending jobs
* OUT job_queue - pointer to job queue
* RET number of entries in job_queue
@@ -165,7 +165,7 @@ extern int build_job_queue(struct job_queue **job_queue)
}
my_job_queue[job_queue_size].job_ptr = job_ptr;
my_job_queue[job_queue_size].job_priority = job_ptr->priority;
- my_job_queue[job_queue_size].part_priority =
+ my_job_queue[job_queue_size].part_priority =
job_ptr->part_ptr->priority;
job_queue_size++;
}
@@ -177,9 +177,9 @@ extern int build_job_queue(struct job_queue **job_queue)
/*
* job_is_completing - Determine if jobs are in the process of completing.
- * RET - True of any job is in the process of completing AND
+ * RET - True of any job is in the process of completing AND
* CompleteWait is configured non-zero
- * NOTE: This function can reduce resource fragmentation, which is a
+ * NOTE: This function can reduce resource fragmentation, which is a
* critical issue on Elan interconnect based systems.
*/
extern bool job_is_completing(void)
@@ -250,7 +250,7 @@ extern void set_job_elig_time(void)
* already been reserved by higher priority jobs (those in
* the failed_parts array) */
static bool _failed_partition(struct part_record *part_ptr,
- struct part_record **failed_parts,
+ struct part_record **failed_parts,
int failed_part_cnt)
{
int i;
@@ -262,14 +262,14 @@ static bool _failed_partition(struct part_record *part_ptr,
return false;
}
-/*
+/*
* schedule - attempt to schedule all pending jobs
- * pending jobs for each partition will be scheduled in priority
+ * pending jobs for each partition will be scheduled in priority
* order until a request fails
* RET count of jobs scheduled
- * Note: We re-build the queue every time. Jobs can not only be added
- * or removed from the queue, but have their priority or partition
- * changed with the update_job RPC. In general nodes will be in priority
+ * Note: We re-build the queue every time. Jobs can not only be added
+ * or removed from the queue, but have their priority or partition
+ * changed with the update_job RPC. In general nodes will be in priority
* order (by submit time), so the sorting should be pretty fast.
*/
extern int schedule(void)
@@ -293,7 +293,7 @@ extern int schedule(void)
time_t now = time(NULL);
DEF_TIMERS;
-
+
if(!sched_timeout)
sched_timeout = MIN(slurm_get_msg_timeout(), 10);
@@ -326,7 +326,7 @@ extern int schedule(void)
}
sort_job_queue(job_queue, job_queue_size);
- failed_parts = xmalloc(sizeof(struct part_record *) *
+ failed_parts = xmalloc(sizeof(struct part_record *) *
list_count(part_list));
save_avail_node_bitmap = bit_copy(avail_node_bitmap);
@@ -336,15 +336,15 @@ extern int schedule(void)
continue;
if ((job_ptr->resv_name == NULL) &&
- _failed_partition(job_ptr->part_ptr, failed_parts,
+ _failed_partition(job_ptr->part_ptr, failed_parts,
failed_part_cnt)) {
job_ptr->state_reason = WAIT_PRIORITY;
xfree(job_ptr->state_desc);
continue;
}
- if (bit_overlap(avail_node_bitmap,
+ if (bit_overlap(avail_node_bitmap,
job_ptr->part_ptr->node_bitmap) == 0) {
- /* All nodes DRAIN, DOWN, or
+ /* All nodes DRAIN, DOWN, or
* reserved for jobs in higher priority partition */
job_ptr->state_reason = WAIT_RESOURCES;
continue;
@@ -355,16 +355,16 @@ extern int schedule(void)
continue;
}
- if (assoc_mgr_validate_assoc_id(acct_db_conn,
+ if (assoc_mgr_validate_assoc_id(acct_db_conn,
job_ptr->assoc_id,
accounting_enforce)) {
- /* NOTE: This only happens if a user's account is
- * disabled between when the job was submitted and
- * the time we consider running it. It should be
+ /* NOTE: This only happens if a user's account is
+ * disabled between when the job was submitted and
+ * the time we consider running it. It should be
* very rare. */
info("schedule: JobId=%u has invalid account",
job_ptr->job_id);
- last_job_update = time(NULL);
+ last_job_update = time(NULL);
job_ptr->job_state = JOB_FAILED;
job_ptr->exit_code = 1;
job_ptr->state_reason = FAIL_BANK_ACCOUNT;
@@ -391,18 +391,18 @@ extern int schedule(void)
if (fail_by_part) {
/* do not schedule more jobs in this partition
* or on nodes in this partition */
- failed_parts[failed_part_cnt++] =
+ failed_parts[failed_part_cnt++] =
job_ptr->part_ptr;
bit_not(job_ptr->part_ptr->node_bitmap);
- bit_and(avail_node_bitmap,
+ bit_and(avail_node_bitmap,
job_ptr->part_ptr->node_bitmap);
bit_not(job_ptr->part_ptr->node_bitmap);
}
} else if (error_code == ESLURM_RESERVATION_NOT_USABLE) {
- if (job_ptr->resv_ptr
+ if (job_ptr->resv_ptr
&& job_ptr->resv_ptr->node_bitmap) {
bit_not(job_ptr->resv_ptr->node_bitmap);
- bit_and(avail_node_bitmap,
+ bit_and(avail_node_bitmap,
job_ptr->resv_ptr->node_bitmap);
bit_not(job_ptr->resv_ptr->node_bitmap);
} else {
@@ -411,12 +411,12 @@ extern int schedule(void)
* so just skip over this job and try running
* the next lower priority job */
}
- } else if (error_code == SLURM_SUCCESS) {
+ } else if (error_code == SLURM_SUCCESS) {
/* job initiated */
last_job_update = now;
#ifdef HAVE_BG
- select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_IONODES,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo,
+ SELECT_JOBDATA_IONODES,
&ionodes);
if(ionodes) {
sprintf(tmp_char,"%s[%s]",
@@ -440,7 +440,7 @@ extern int schedule(void)
(error_code != ESLURM_NODE_NOT_AVAIL) &&
(error_code != ESLURM_ACCOUNTING_POLICY)) {
info("schedule: JobId=%u non-runnable: %s",
- job_ptr->job_id,
+ job_ptr->job_id,
slurm_strerror(error_code));
if (!wiki_sched) {
last_job_update = now;
@@ -453,7 +453,7 @@ extern int schedule(void)
delete_job_details(job_ptr);
}
}
-
+
if ((time(NULL) - now) >= sched_timeout) {
debug("schedule: loop taking to long breaking out");
break;
@@ -470,7 +470,7 @@ extern int schedule(void)
}
-/*
+/*
* sort_job_queue - sort job_queue in decending priority order
* IN job_queue_size - count of elements in the job queue
* IN/OUT job_queue - pointer to sorted job queue
@@ -519,7 +519,7 @@ extern void sort_job_queue(struct job_queue *job_queue, int job_queue_size)
}
/*
- * launch_job - send an RPC to a slurmd to initiate a batch job
+ * launch_job - send an RPC to a slurmd to initiate a batch job
* IN job_ptr - pointer to job that will be initiated
*/
extern void launch_job(struct job_record *job_ptr)
@@ -572,18 +572,18 @@ extern void launch_job(struct job_record *job_ptr)
launch_msg_ptr->spank_job_env = xduparray(job_ptr->spank_job_env_size,
job_ptr->spank_job_env);
launch_msg_ptr->script = get_job_script(job_ptr);
- launch_msg_ptr->environment = get_job_env(job_ptr,
+ launch_msg_ptr->environment = get_job_env(job_ptr,
&launch_msg_ptr->envc);
- launch_msg_ptr->job_mem = job_ptr->details->job_min_memory;
+ launch_msg_ptr->job_mem = job_ptr->details->job_min_memory;
launch_msg_ptr->num_cpu_groups = job_ptr->job_resrcs->cpu_array_cnt;
launch_msg_ptr->cpus_per_node = xmalloc(sizeof(uint16_t) *
job_ptr->job_resrcs->cpu_array_cnt);
- memcpy(launch_msg_ptr->cpus_per_node,
+ memcpy(launch_msg_ptr->cpus_per_node,
job_ptr->job_resrcs->cpu_array_value,
(sizeof(uint16_t) * job_ptr->job_resrcs->cpu_array_cnt));
launch_msg_ptr->cpu_count_reps = xmalloc(sizeof(uint32_t) *
job_ptr->job_resrcs->cpu_array_cnt);
- memcpy(launch_msg_ptr->cpu_count_reps,
+ memcpy(launch_msg_ptr->cpu_count_reps,
job_ptr->job_resrcs->cpu_array_reps,
(sizeof(uint32_t) * job_ptr->job_resrcs->cpu_array_cnt));
@@ -603,12 +603,12 @@ extern void launch_job(struct job_record *job_ptr)
/*
* make_batch_job_cred - add a job credential to the batch_job_launch_msg
- * IN/OUT launch_msg_ptr - batch_job_launch_msg in which job_id, step_id,
- * uid and nodes have already been set
+ * IN/OUT launch_msg_ptr - batch_job_launch_msg in which job_id, step_id,
+ * uid and nodes have already been set
* IN job_ptr - pointer to job record
* RET 0 or error code
*/
-extern int make_batch_job_cred(batch_job_launch_msg_t *launch_msg_ptr,
+extern int make_batch_job_cred(batch_job_launch_msg_t *launch_msg_ptr,
struct job_record *job_ptr)
{
slurm_cred_arg_t cred_arg;
@@ -785,7 +785,7 @@ extern int test_job_dependency(struct job_record *job_ptr)
}
/*
- * Parse a job dependency string and use it to establish a "depend_spec"
+ * Parse a job dependency string and use it to establish a "depend_spec"
* list of dependencies. We accept both old format (a single job ID) and
* new format (e.g. "afterok:123:124,after:128").
* IN job_ptr - job record to have dependency and depend_list updated
@@ -852,7 +852,7 @@ extern int update_job_dependency(struct job_record *job_ptr, char *new_depend)
dep_job_ptr = find_job_record(job_id);
if (!dep_job_ptr) /* assume already done */
break;
- snprintf(dep_buf, sizeof(dep_buf),
+ snprintf(dep_buf, sizeof(dep_buf),
"afterany:%u", job_id);
new_depend = dep_buf;
dep_ptr = xmalloc(sizeof(struct depend_spec));
@@ -879,9 +879,9 @@ extern int update_job_dependency(struct job_record *job_ptr, char *new_depend)
sep_ptr++; /* skip over ":" */
while (rc == SLURM_SUCCESS) {
job_id = strtol(sep_ptr, &sep_ptr2, 10);
- if ((sep_ptr2 == NULL) ||
+ if ((sep_ptr2 == NULL) ||
(job_id < 0) || (job_id == job_ptr->job_id) ||
- ((sep_ptr2[0] != '\0') && (sep_ptr2[0] != ',') &&
+ ((sep_ptr2[0] != '\0') && (sep_ptr2[0] != ',') &&
(sep_ptr2[0] != ':'))) {
rc = EINVAL;
break;
@@ -928,10 +928,10 @@ static void _pre_list_del(void *x)
}
/* Determine if a pending job will run using only the specified nodes
- * (in job_desc_msg->req_nodes), build response message and return
- * SLURM_SUCCESS on success. Otherwise return an error code. Caller
+ * (in job_desc_msg->req_nodes), build response message and return
+ * SLURM_SUCCESS on success. Otherwise return an error code. Caller
* must free response message */
-extern int job_start_data(job_desc_msg_t *job_desc_msg,
+extern int job_start_data(job_desc_msg_t *job_desc_msg,
will_run_response_msg_t **resp)
{
struct job_record *job_ptr;
@@ -953,12 +953,12 @@ extern int job_start_data(job_desc_msg_t *job_desc_msg,
if ((job_ptr->details == NULL) || (!IS_JOB_PENDING(job_ptr)))
return ESLURM_DISABLED;
- if ((job_desc_msg->req_nodes == NULL) ||
+ if ((job_desc_msg->req_nodes == NULL) ||
(job_desc_msg->req_nodes == '\0')) {
/* assume all nodes available to job for testing */
avail_bitmap = bit_alloc(node_record_count);
bit_nset(avail_bitmap, 0, (node_record_count - 1));
- } else if (node_name2bitmap(job_desc_msg->req_nodes, false,
+ } else if (node_name2bitmap(job_desc_msg->req_nodes, false,
&avail_bitmap) != 0) {
return ESLURM_INVALID_NODE_NAME;
}
@@ -980,7 +980,7 @@ extern int job_start_data(job_desc_msg_t *job_desc_msg,
FREE_NULL_BITMAP(exc_node_mask);
}
if (job_ptr->details->req_node_bitmap) {
- if (!bit_super_set(job_ptr->details->req_node_bitmap,
+ if (!bit_super_set(job_ptr->details->req_node_bitmap,
avail_bitmap)) {
rc = ESLURM_REQUESTED_PART_CONFIG_UNAVAILABLE;
}
@@ -1001,12 +1001,12 @@ extern int job_start_data(job_desc_msg_t *job_desc_msg,
bit_and(avail_bitmap, avail_node_bitmap);
if (rc == SLURM_SUCCESS) {
- min_nodes = MAX(job_ptr->details->min_nodes,
+ min_nodes = MAX(job_ptr->details->min_nodes,
part_ptr->min_nodes);
if (job_ptr->details->max_nodes == 0)
max_nodes = part_ptr->max_nodes;
else
- max_nodes = MIN(job_ptr->details->max_nodes,
+ max_nodes = MIN(job_ptr->details->max_nodes,
part_ptr->max_nodes);
max_nodes = MIN(max_nodes, 500000); /* prevent overflows */
if (!job_ptr->limit_set_max_nodes &&
@@ -1016,7 +1016,7 @@ extern int job_start_data(job_desc_msg_t *job_desc_msg,
req_nodes = min_nodes;
preemptee_candidates = slurm_find_preemptable_jobs(job_ptr);
rc = select_g_job_test(job_ptr, avail_bitmap,
- min_nodes, max_nodes, req_nodes,
+ min_nodes, max_nodes, req_nodes,
SELECT_MODE_WILL_RUN, preemptee_candidates,
&preemptee_job_list);
}
@@ -1027,7 +1027,7 @@ extern int job_start_data(job_desc_msg_t *job_desc_msg,
resp_data->job_id = job_ptr->job_id;
#ifdef HAVE_BG
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_NODE_CNT,
+ SELECT_JOBDATA_NODE_CNT,
&resp_data->proc_cnt);
#else
@@ -1050,7 +1050,7 @@ extern int job_start_data(job_desc_msg_t *job_desc_msg,
list_next(preemptee_iterator))) {
preemptee_jid = xmalloc(sizeof(uint32_t));
(*preemptee_jid) = tmp_job_ptr->job_id;
- list_append(resp_data->preemptee_job_id,
+ list_append(resp_data->preemptee_job_id,
preemptee_jid);
}
list_iterator_destroy(preemptee_iterator);
@@ -1090,7 +1090,7 @@ extern int epilog_slurmctld(struct job_record *job_ptr)
}
slurm_attr_init(&thread_attr_epilog);
- pthread_attr_setdetachstate(&thread_attr_epilog,
+ pthread_attr_setdetachstate(&thread_attr_epilog,
PTHREAD_CREATE_DETACHED);
while(1) {
rc = pthread_create(&thread_id_epilog,
@@ -1115,24 +1115,24 @@ static char **_build_env(struct job_record *job_ptr)
/* Set SPANK env vars first so that we can overrite as needed
* below. Prevent user hacking from setting SLURM_JOB_ID etc. */
if (job_ptr->spank_job_env_size) {
- env_array_merge(&my_env,
+ env_array_merge(&my_env,
(const char **) job_ptr->spank_job_env);
}
#ifdef HAVE_CRAY_XT
- select_g_select_jobinfo_get(job_ptr->select_jobinfo,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_RESV_ID, &name);
setenvf(&env, "BASIL_RESERVATION_ID", "%s", name);
xfree(name);
#endif
#ifdef HAVE_BG
- select_g_select_jobinfo_get(job_ptr->select_jobinfo,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_BLOCK_ID, &name);
setenvf(&my_env, "MPIRUN_PARTITION", "%s", name);
#endif
setenvf(&my_env, "SLURM_JOB_ACCOUNT", "%s", job_ptr->account);
if (job_ptr->details) {
- setenvf(&my_env, "SLURM_JOB_CONSTRAINTS",
+ setenvf(&my_env, "SLURM_JOB_CONSTRAINTS",
"%s", job_ptr->details->features);
}
setenvf(&my_env, "SLURM_JOB_GID", "%u", job_ptr->group_id);
@@ -1159,7 +1159,7 @@ static void *_run_epilog(void *arg)
int i, status, wait_rc;
char *argv[2], **my_env;
/* Locks: Read config, job */
- slurmctld_lock_t config_read_lock = {
+ slurmctld_lock_t config_read_lock = {
READ_LOCK, READ_LOCK, NO_LOCK, NO_LOCK };
lock_slurmctld(config_read_lock);
@@ -1233,7 +1233,7 @@ extern int prolog_slurmctld(struct job_record *job_ptr)
job_ptr->details->prolog_running = 1;
slurm_attr_init(&thread_attr_prolog);
- pthread_attr_setdetachstate(&thread_attr_prolog,
+ pthread_attr_setdetachstate(&thread_attr_prolog,
PTHREAD_CREATE_DETACHED);
while(1) {
rc = pthread_create(&thread_id_prolog,
@@ -1256,7 +1256,7 @@ static void *_run_prolog(void *arg)
int i, rc, status, wait_rc;
char *argv[2], **my_env;
/* Locks: Read config, job; Write nodes */
- slurmctld_lock_t config_read_lock = {
+ slurmctld_lock_t config_read_lock = {
READ_LOCK, READ_LOCK, WRITE_LOCK, NO_LOCK };
bitstr_t *node_bitmap = NULL;
static int last_job_requeue = 0;
@@ -1271,7 +1271,7 @@ static void *_run_prolog(void *arg)
for (i=0; i<node_record_count; i++) {
if (bit_test(node_bitmap, i) == 0)
continue;
- node_record_table_ptr[i].node_state |=
+ node_record_table_ptr[i].node_state |=
NODE_STATE_POWER_UP;
}
}
@@ -1345,14 +1345,14 @@ static void *_run_prolog(void *arg)
for (i=0; i<node_record_count; i++) {
if (bit_test(job_ptr->node_bitmap, i) == 0)
continue;
- node_record_table_ptr[i].node_state &=
+ node_record_table_ptr[i].node_state &=
(~NODE_STATE_POWER_UP);
}
} else if (node_bitmap) {
for (i=0; i<node_record_count; i++) {
if (bit_test(node_bitmap, i) == 0)
continue;
- node_record_table_ptr[i].node_state &=
+ node_record_table_ptr[i].node_state &=
(~NODE_STATE_POWER_UP);
}
}
@@ -1390,7 +1390,7 @@ extern int build_feature_list(struct job_record *job_ptr)
have_count = true;
count = strtol(&tmp_requested[i+1], &str_ptr2, 10);
if ((feature == NULL) || (count <= 0)) {
- info("Job %u invalid constraint %s",
+ info("Job %u invalid constraint %s",
job_ptr->job_id, detail_ptr->features);
xfree(tmp_requested);
return ESLURM_INVALID_FEATURE;
@@ -1399,7 +1399,7 @@ extern int build_feature_list(struct job_record *job_ptr)
} else if (tmp_requested[i] == '&') {
tmp_requested[i] = '\0';
if ((feature == NULL) || (bracket != 0)) {
- info("Job %u invalid constraint %s",
+ info("Job %u invalid constraint %s",
job_ptr->job_id, detail_ptr->features);
xfree(tmp_requested);
return ESLURM_INVALID_FEATURE;
@@ -1415,7 +1415,7 @@ extern int build_feature_list(struct job_record *job_ptr)
tmp_requested[i] = '\0';
have_or = true;
if (feature == NULL) {
- info("Job %u invalid constraint %s",
+ info("Job %u invalid constraint %s",
job_ptr->job_id, detail_ptr->features);
xfree(tmp_requested);
return ESLURM_INVALID_FEATURE;
@@ -1433,7 +1433,7 @@ extern int build_feature_list(struct job_record *job_ptr)
} else if (tmp_requested[i] == '[') {
tmp_requested[i] = '\0';
if ((feature != NULL) || bracket) {
- info("Job %u invalid constraint %s",
+ info("Job %u invalid constraint %s",
job_ptr->job_id, detail_ptr->features);
xfree(tmp_requested);
return ESLURM_INVALID_FEATURE;
@@ -1442,7 +1442,7 @@ extern int build_feature_list(struct job_record *job_ptr)
} else if (tmp_requested[i] == ']') {
tmp_requested[i] = '\0';
if ((feature == NULL) || (bracket == 0)) {
- info("Job %u invalid constraint %s",
+ info("Job %u invalid constraint %s",
job_ptr->job_id, detail_ptr->features);
xfree(tmp_requested);
return ESLURM_INVALID_FEATURE;
@@ -1458,7 +1458,7 @@ extern int build_feature_list(struct job_record *job_ptr)
}
break;
} else if (tmp_requested[i] == ',') {
- info("Job %u invalid constraint %s",
+ info("Job %u invalid constraint %s",
job_ptr->job_id, detail_ptr->features);
xfree(tmp_requested);
return ESLURM_INVALID_FEATURE;
@@ -1468,7 +1468,7 @@ extern int build_feature_list(struct job_record *job_ptr)
}
xfree(tmp_requested);
if (have_count && have_or) {
- info("Job %u invalid constraint (OR with feature count): %s",
+ info("Job %u invalid constraint (OR with feature count): %s",
job_ptr->job_id, detail_ptr->features);
return ESLURM_INVALID_FEATURE;
}
@@ -1540,7 +1540,7 @@ static int _valid_node_feature(char *feature)
feature_iter = list_iterator_create(feature_list);
if (feature_iter == NULL)
fatal("list_inerator_create malloc failure");
- while ((feature_ptr = (struct features_record *)
+ while ((feature_ptr = (struct features_record *)
list_next(feature_iter))) {
if (strcmp(feature_ptr->name, feature))
continue;
diff --git a/src/slurmctld/job_scheduler.h b/src/slurmctld/job_scheduler.h
index 5c37b9b29439015a2f3334bbb1598328268148f9..a1f39fd575be3e2c770d83a6603bed58c31271c7 100644
--- a/src/slurmctld/job_scheduler.h
+++ b/src/slurmctld/job_scheduler.h
@@ -8,32 +8,32 @@
* Written by Morris Jette <jette@llnl.gov>, et. al.
* Derived from dsh written by Jim Garlick <garlick1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -58,7 +58,7 @@ struct job_queue {
*/
extern int build_feature_list(struct job_record *job_ptr);
-/*
+/*
* build_job_queue - build (non-priority ordered) list of pending jobs
* OUT job_queue - pointer to job queue
* RET number of entries in job_queue
@@ -76,30 +76,30 @@ extern int epilog_slurmctld(struct job_record *job_ptr);
/*
* job_is_completing - Determine if jobs are in the process of completing.
- * RET - True of any job is in the process of completing AND
+ * RET - True of any job is in the process of completing AND
* CompleteWait is configured non-zero
- * NOTE: This function can reduce resource fragmentation, which is a
+ * NOTE: This function can reduce resource fragmentation, which is a
* critical issue on Elan interconnect based systems.
*/
extern bool job_is_completing(void);
/* Determine if a pending job will run using only the specified nodes
- * (in job_desc_msg->req_nodes), build response message and return
- * SLURM_SUCCESS on success. Otherwise return an error code. Caller
+ * (in job_desc_msg->req_nodes), build response message and return
+ * SLURM_SUCCESS on success. Otherwise return an error code. Caller
* must free response message */
-extern int job_start_data(job_desc_msg_t *job_desc_msg,
+extern int job_start_data(job_desc_msg_t *job_desc_msg,
will_run_response_msg_t **resp);
/*
- * launch_job - send an RPC to a slurmd to initiate a batch job
+ * launch_job - send an RPC to a slurmd to initiate a batch job
* IN job_ptr - pointer to job that will be initiated
*/
extern void launch_job(struct job_record *job_ptr);
/*
* make_batch_job_cred - add a job credential to the batch_job_launch_msg
- * IN/OUT launch_msg_ptr - batch_job_launch_msg in which job_id, step_id,
- * uid and nodes have already been set
+ * IN/OUT launch_msg_ptr - batch_job_launch_msg in which job_id, step_id,
+ * uid and nodes have already been set
* IN job_ptr - pointer to job record
* RET 0 or error code
*/
@@ -117,25 +117,25 @@ extern void print_job_dependency(struct job_record *job_ptr);
*/
extern int prolog_slurmctld(struct job_record *job_ptr);
-/*
+/*
* schedule - attempt to schedule all pending jobs
- * pending jobs for each partition will be scheduled in priority
+ * pending jobs for each partition will be scheduled in priority
* order until a request fails
* RET count of jobs scheduled
- * Note: We re-build the queue every time. Jobs can not only be added
- * or removed from the queue, but have their priority or partition
- * changed with the update_job RPC. In general nodes will be in priority
+ * Note: We re-build the queue every time. Jobs can not only be added
+ * or removed from the queue, but have their priority or partition
+ * changed with the update_job RPC. In general nodes will be in priority
* order (by submit time), so the sorting should be pretty fast.
*/
extern int schedule(void);
/*
- * set_job_elig_time - set the eligible time for pending jobs once their
+ * set_job_elig_time - set the eligible time for pending jobs once their
* dependencies are lifted (in job->details->begin_time)
*/
extern void set_job_elig_time(void);
-/*
+/*
* sort_job_queue - sort job_queue in decending priority order
* IN job_queue_size - count of elements in the job queue
* IN/OUT job_queue - pointer to sorted job queue
@@ -151,7 +151,7 @@ extern void sort_job_queue(struct job_queue *job_queue, int job_queue_size);
extern int test_job_dependency(struct job_record *job_ptr);
/*
- * Parse a job dependency string and use it to establish a "depend_spec"
+ * Parse a job dependency string and use it to establish a "depend_spec"
* list of dependencies. We accept both old format (a single job ID) and
* new format (e.g. "afterok:123:124,after:128").
* IN job_ptr - job record to have dependency and depend_list updated
diff --git a/src/slurmctld/licenses.c b/src/slurmctld/licenses.c
index 19ac43fa80a6c04816fb671681d7af496b24a72e..3cd442a8cb47fdbcfd574ac6e3af45a1517b3893 100644
--- a/src/slurmctld/licenses.c
+++ b/src/slurmctld/licenses.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -72,7 +72,7 @@ static inline void _licenses_print(char *header, List licenses)
if (iter == NULL)
fatal("malloc failure from list_iterator_create");
while ((license_entry = (licenses_t *) list_next(iter))) {
- info("name:%s total:%u used:%u", license_entry->name,
+ info("name:%s total:%u used:%u", license_entry->name,
license_entry->total, license_entry->used);
}
list_iterator_destroy(iter);
@@ -192,7 +192,7 @@ extern int license_update(char *licenses)
if (iter == NULL)
fatal("malloc failure from list_iterator_create");
while ((license_entry = (licenses_t *) list_next(iter))) {
- match = list_find_first(new_list, _license_find_rec,
+ match = list_find_first(new_list, _license_find_rec,
license_entry->name);
if (!match) {
info("license %s removed with %u in use",
@@ -200,7 +200,7 @@ extern int license_update(char *licenses)
} else {
match->used = license_entry->used;
if (match->used > match->total) {
- info("license %s count decreased",
+ info("license %s count decreased",
match->name);
}
}
@@ -231,7 +231,7 @@ extern void license_free(void)
* OUT valid - true if required licenses are valid and a sufficient number
* are configured (though not necessarily available now)
* RET license_list, must be destroyed by caller
- */
+ */
extern List license_validate(char *licenses, bool *valid)
{
ListIterator iter;
@@ -280,7 +280,7 @@ extern List license_validate(char *licenses, bool *valid)
* IN job_ptr - job identification
* IN when - time to check
* RET: SLURM_SUCCESS, EAGAIN (not available now), SLURM_ERROR (never runnable)
- */
+ */
extern int license_job_test(struct job_record *job_ptr, time_t when)
{
ListIterator iter;
@@ -295,7 +295,7 @@ extern int license_job_test(struct job_record *job_ptr, time_t when)
if (iter == NULL)
fatal("malloc failure from list_iterator_create");
while ((license_entry = (licenses_t *) list_next(iter))) {
- match = list_find_first(license_list, _license_find_rec,
+ match = list_find_first(license_list, _license_find_rec,
license_entry->name);
if (!match) {
error("could not find license %s for job %u",
@@ -307,7 +307,7 @@ extern int license_job_test(struct job_record *job_ptr, time_t when)
job_ptr->job_id, match->name);
rc = SLURM_ERROR;
break;
- } else if ((license_entry->total + match->used) >
+ } else if ((license_entry->total + match->used) >
match->total) {
rc = EAGAIN;
break;
@@ -315,7 +315,7 @@ extern int license_job_test(struct job_record *job_ptr, time_t when)
resv_licenses = job_test_lic_resv(job_ptr,
license_entry->name,
when);
- if ((license_entry->total + match->used +
+ if ((license_entry->total + match->used +
resv_licenses) > match->total) {
rc = EAGAIN;
break;
@@ -331,7 +331,7 @@ extern int license_job_test(struct job_record *job_ptr, time_t when)
* license_job_get - Get the licenses required for a job
* IN job_ptr - job identification
* RET SLURM_SUCCESS or failure code
- */
+ */
extern int license_job_get(struct job_record *job_ptr)
{
ListIterator iter;
@@ -346,7 +346,7 @@ extern int license_job_get(struct job_record *job_ptr)
if (iter == NULL)
fatal("malloc failure from list_iterator_create");
while ((license_entry = (licenses_t *) list_next(iter))) {
- match = list_find_first(license_list, _license_find_rec,
+ match = list_find_first(license_list, _license_find_rec,
license_entry->name);
if (match) {
match->used += license_entry->total;
@@ -367,7 +367,7 @@ extern int license_job_get(struct job_record *job_ptr)
* license_job_return - Return the licenses allocated to a job
* IN job_ptr - job identification
* RET SLURM_SUCCESS or failure code
- */
+ */
extern int license_job_return(struct job_record *job_ptr)
{
ListIterator iter;
@@ -382,7 +382,7 @@ extern int license_job_return(struct job_record *job_ptr)
if (iter == NULL)
fatal("malloc failure from list_iterator_create");
while ((license_entry = (licenses_t *) list_next(iter))) {
- match = list_find_first(license_list, _license_find_rec,
+ match = list_find_first(license_list, _license_find_rec,
license_entry->name);
if (match) {
if (match->used >= license_entry->total)
@@ -396,7 +396,7 @@ extern int license_job_return(struct job_record *job_ptr)
license_entry->used = 0;
} else {
/* This can happen after a reconfiguration */
- error("job returning unknown license %s",
+ error("job returning unknown license %s",
license_entry->name);
}
}
@@ -423,7 +423,7 @@ extern bool license_list_overlap(List list_1, List list_2)
if (iter == NULL)
fatal("malloc failure from list_iterator_create");
while ((license_entry = (licenses_t *) list_next(iter))) {
- if (list_find_first(list_2, _license_find_rec,
+ if (list_find_first(list_2, _license_find_rec,
license_entry->name)) {
match = true;
break;
diff --git a/src/slurmctld/licenses.h b/src/slurmctld/licenses.h
index 4ec106e294a916211ec47f75edc56fce9d62e6a9..511be695da2c640dacfca6117c3b4512e1d34e60 100644
--- a/src/slurmctld/licenses.h
+++ b/src/slurmctld/licenses.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -68,14 +68,14 @@ extern void license_free_rec(void *x);
* license_job_get - Get the licenses required for a job
* IN job_ptr - job identification
* RET SLURM_SUCCESS or failure code
- */
+ */
extern int license_job_get(struct job_record *job_ptr);
/*
* license_job_return - Return the licenses allocated to a job
* IN job_ptr - job identification
* RET SLURM_SUCCESS or failure code
- */
+ */
extern int license_job_return(struct job_record *job_ptr);
/*
@@ -83,7 +83,7 @@ extern int license_job_return(struct job_record *job_ptr);
* IN job_ptr - job identification
* IN when - time to check
* RET: SLURM_SUCCESS, EAGAIN (not available now), SLURM_ERROR (never runnable)
- */
+ */
extern int license_job_test(struct job_record *job_ptr, time_t when);
/*
@@ -92,7 +92,7 @@ extern int license_job_test(struct job_record *job_ptr, time_t when);
* OUT valid - true if required licenses are valid and a sufficient number
* are configured (though not necessarily available now)
* RET license_list, must be destroyed by caller
- */
+ */
extern List license_validate(char *licenses, bool *valid);
/*
diff --git a/src/slurmctld/locks.c b/src/slurmctld/locks.c
index 4834595fd78c0784b7aa9727120ae8848f25b9f5..c557f331b6306e1855d154aaa3a82298560bb1a1 100644
--- a/src/slurmctld/locks.c
+++ b/src/slurmctld/locks.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette@llnl.gov>, Randy Sanchez <rsancez@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -64,7 +64,7 @@ static void _wr_rdunlock(lock_datatype_t datatype);
static void _wr_wrlock(lock_datatype_t datatype);
static void _wr_wrunlock(lock_datatype_t datatype);
-/* init_locks - create locks used for slurmctld data structure access
+/* init_locks - create locks used for slurmctld data structure access
* control */
void init_locks(void)
{
@@ -97,7 +97,7 @@ void lock_slurmctld(slurmctld_lock_t lock_levels)
_wr_wrlock(PART_LOCK);
}
-/* unlock_slurmctld - Issue the required unlock requests in a well
+/* unlock_slurmctld - Issue the required unlock requests in a well
* defined order */
void unlock_slurmctld(slurmctld_lock_t lock_levels)
{
diff --git a/src/slurmctld/locks.h b/src/slurmctld/locks.h
index 4094a68eb9c41e55da80e0343fe5b6325712e2de..ff99e3014d6bc21ae514bdc71365b91066182fb7 100644
--- a/src/slurmctld/locks.h
+++ b/src/slurmctld/locks.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette@llnl.gov>, Randy Sanchez <rsancez@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -39,35 +39,35 @@
/*****************************************************************************\
* Read/write locks are implemented by the routines in this directory by using
* a set of three (3) UNIX semaphores to lock a resource.
- *
+ *
* The set of three (3) semaphores represent a reader semaphore,
* a writer semaphore and a writers waiting semaphore.
- *
+ *
* The reader semaphore indicates the number of readers that currently have a
* read lock on the resource.
* The writers semaphore indicates that a writer has the resource locked.
* The writers waiting semaphore indicates the number of writers waiting to
* lock the resource.
- *
+ *
* Readers cannot lock the resource until there are no writers waiting for the
* resource and the resource is not locked by a writer.
- *
+ *
* Writers cannot lock the resource if the resource is locked by other writers
* or if any readers have the resource locked.
- *
+ *
* Writers will have priority in locking the resource over readers because
* of the writers waiting semaphore. The writers waiting semaphore is incremented
* by a writer that is waiting to lock the resource. A reader cannot lock
* the resource until there are no writers waiting to lock the resource and
* the resource is not locked by a writer.
- *
+ *
* So, if the resource is locked by an unspecified number of readers,
* and a writer trys to lock the resource, then the writer will be blocked
* until all of the previous readers have unlocked the resource. But,
* just before the writer checked to see if there were any readers locking
- * the resource, the writer incremented the writers waiting semaphore,
+ * the resource, the writer incremented the writers waiting semaphore,
* indicating that there is now a writer waiting to lock the resource.
- * In the mean time, if an unspecified number of readers try to lock the
+ * In the mean time, if an unspecified number of readers try to lock the
* resource after a writer (or writers) has tried to lock the resource,
* those readers will be blocked until all writers have obtained the lock on
* the resource, used the resource and unlocked the resource. The subsequent
@@ -76,11 +76,11 @@
* writers waiting to lock the resource.
*
* use init_locks() to initialize the locks then
- * lock_slurmctld() and unlock_slurmctld() to get the ordering so as to
- * prevent deadlock. The arguments indicate the lock type required for
+ * lock_slurmctld() and unlock_slurmctld() to get the ordering so as to
+ * prevent deadlock. The arguments indicate the lock type required for
* each entity (job, node, etc.) in a well defined order.
- * For example: no lock on the config data structure, read lock on the job
- * and node data structures, and write lock on the partition data structure
+ * For example: no lock on the config data structure, read lock on the job
+ * and node data structures, and write lock on the partition data structure
* would look like this: "{ NO_LOCK, READ_LOCK, READ_LOCK, WRITE_LOCK }"
\*****************************************************************************/
@@ -110,14 +110,14 @@ typedef struct {
*/
typedef enum {
CONFIG_LOCK,
- JOB_LOCK,
- NODE_LOCK,
+ JOB_LOCK,
+ NODE_LOCK,
PART_LOCK,
ENTITY_COUNT
} lock_datatype_t;
-#define read_lock(data_type) (data_type * 3 + 0)
-#define write_lock(data_type) (data_type * 3 + 1)
+#define read_lock(data_type) (data_type * 3 + 0)
+#define write_lock(data_type) (data_type * 3 + 1)
#define write_wait_lock(data_type) (data_type * 3 + 2)
typedef struct {
@@ -129,7 +129,7 @@ typedef struct {
* OUT lock_flags - a copy of the current lock values */
extern void get_lock_values (slurmctld_lock_flags_t *lock_flags);
-/* init_locks - create locks used for slurmctld data structure access
+/* init_locks - create locks used for slurmctld data structure access
* control */
extern void init_locks ( void );
@@ -140,7 +140,7 @@ extern void kill_locked_threads ( void );
* RET 0 on success, -1 on failure */
extern void lock_slurmctld (slurmctld_lock_t lock_levels);
-/* unlock_slurmctld - Issue the required unlock requests in a well
+/* unlock_slurmctld - Issue the required unlock requests in a well
* defined order */
extern void unlock_slurmctld (slurmctld_lock_t lock_levels);
diff --git a/src/slurmctld/node_mgr.c b/src/slurmctld/node_mgr.c
index 7d8e85c6fb1069e87ca05e113123b1aa872fe45c..56207517955281139ac7a25c79f7e4a36b903dfe 100644
--- a/src/slurmctld/node_mgr.c
+++ b/src/slurmctld/node_mgr.c
@@ -1,7 +1,7 @@
/*****************************************************************************\
* node_mgr.c - manage the node records of slurm
- * Note: there is a global node table (node_record_table_ptr), its
- * hash table (node_hash_table), time stamp (last_node_update) and
+ * Note: there is a global node table (node_record_table_ptr), its
+ * hash table (node_hash_table), time stamp (last_node_update) and
* configuration list (config_list)
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
@@ -9,32 +9,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -87,7 +87,7 @@ bitstr_t *power_node_bitmap = NULL; /* bitmap of powered down nodes */
bitstr_t *share_node_bitmap = NULL; /* bitmap of sharable nodes */
bitstr_t *up_node_bitmap = NULL; /* bitmap of non-down nodes */
-static void _dump_node_state (struct node_record *dump_node_ptr,
+static void _dump_node_state (struct node_record *dump_node_ptr,
Buf buffer);
static void _make_node_down(struct node_record *node_ptr,
time_t event_time);
@@ -100,7 +100,7 @@ static void _update_config_ptr(bitstr_t *bitmap,
struct config_record *config_ptr);
static int _update_node_features(char *node_names, char *features);
static int _update_node_weight(char *node_names, uint32_t weight);
-static bool _valid_node_state_change(uint16_t old, uint16_t new);
+static bool _valid_node_state_change(uint16_t old, uint16_t new);
#ifndef HAVE_FRONT_END
static void _node_not_resp (struct node_record *node_ptr, time_t msg_time);
#endif
@@ -114,7 +114,7 @@ int dump_all_node_state ( void )
int error_code = 0, inx, log_fd;
char *old_file, *new_file, *reg_file;
/* Locks: Read config and node */
- slurmctld_lock_t node_read_lock = { READ_LOCK, NO_LOCK, READ_LOCK,
+ slurmctld_lock_t node_read_lock = { READ_LOCK, NO_LOCK, READ_LOCK,
NO_LOCK };
Buf buffer = init_buf(high_buffer_size);
DEF_TIMERS;
@@ -128,7 +128,7 @@ int dump_all_node_state ( void )
lock_slurmctld (node_read_lock);
for (inx = 0; inx < node_record_count; inx++) {
xassert (node_record_table_ptr[inx].magic == NODE_MAGIC);
- xassert (node_record_table_ptr[inx].config_ptr->magic ==
+ xassert (node_record_table_ptr[inx].config_ptr->magic ==
CONFIG_MAGIC);
_dump_node_state (&node_record_table_ptr[inx], buffer);
@@ -145,7 +145,7 @@ int dump_all_node_state ( void )
lock_state_files ();
log_fd = creat (new_file, 0600);
if (log_fd < 0) {
- error ("Can't save state, error creating file %s %m",
+ error ("Can't save state, error creating file %s %m",
new_file);
error_code = errno;
} else {
@@ -167,7 +167,7 @@ int dump_all_node_state ( void )
if (rc && !error_code)
error_code = rc;
}
- if (error_code)
+ if (error_code)
(void) unlink (new_file);
else { /* file shuffle */
(void) unlink (old_file);
@@ -195,8 +195,8 @@ int dump_all_node_state ( void )
* IN dump_node_ptr - pointer to node for which information is requested
* IN/OUT buffer - location to store data, pointers automatically advanced
*/
-static void
-_dump_node_state (struct node_record *dump_node_ptr, Buf buffer)
+static void
+_dump_node_state (struct node_record *dump_node_ptr, Buf buffer)
{
packstr (dump_node_ptr->name, buffer);
packstr (dump_node_ptr->reason, buffer);
@@ -241,7 +241,7 @@ static int _open_node_state_file(char **state_file)
}
/*
- * load_all_node_state - Load the node state from file, recover on slurmctld
+ * load_all_node_state - Load the node state from file, recover on slurmctld
* restart. Execute this after loading the configuration file data.
* Data goes into common storage.
* IN state_only - if true, overwrite only node state, features and reason
@@ -287,7 +287,7 @@ extern int load_all_node_state ( bool state_only )
if (errno == EINTR)
continue;
else {
- error ("Read error on %s: %m",
+ error ("Read error on %s: %m",
state_file);
break;
}
@@ -333,27 +333,27 @@ extern int load_all_node_state ( bool state_only )
base_state = node_state & NODE_STATE_BASE;
/* validity test as possible */
- if ((cpus == 0) ||
- (sockets == 0) ||
- (cores == 0) ||
- (threads == 0) ||
+ if ((cpus == 0) ||
+ (sockets == 0) ||
+ (cores == 0) ||
+ (threads == 0) ||
(base_state >= NODE_STATE_END)) {
error ("Invalid data for node %s: procs=%u, "
"sockets=%u, cores=%u, threads=%u, state=%u",
- node_name, cpus,
+ node_name, cpus,
sockets, cores, threads, node_state);
error ("No more node data will be processed from the "
"checkpoint file");
xfree (node_name);
error_code = EINVAL;
break;
-
+
}
/* find record and perform update */
node_ptr = find_node_record (node_name);
if (node_ptr == NULL) {
- error ("Node %s has vanished from configuration",
+ error ("Node %s has vanished from configuration",
node_name);
xfree(features);
xfree(reason);
@@ -427,9 +427,9 @@ extern int load_all_node_state ( bool state_only )
}
xfree (node_name);
- if(node_ptr)
+ if(node_ptr)
select_g_update_node_state(
- (node_ptr - node_record_table_ptr),
+ (node_ptr - node_record_table_ptr),
node_ptr->node_state);
}
@@ -450,9 +450,9 @@ unpack_error:
}
-/* list_compare_config - compare two entry from the config list based upon
+/* list_compare_config - compare two entry from the config list based upon
* weight, see common/list.h for documentation */
-int list_compare_config (void *config_entry1, void *config_entry2)
+int list_compare_config (void *config_entry1, void *config_entry2)
{
int weight1, weight2;
weight1 = ((struct config_record *) config_entry1)->weight;
@@ -478,8 +478,8 @@ static bool _node_is_hidden(struct node_record *node_ptr)
return true;
}
-/*
- * pack_all_node - dump all configuration and node information for all nodes
+/*
+ * pack_all_node - dump all configuration and node information for all nodes
* in machine independent form (for network transmission)
* OUT buffer_ptr - pointer to the stored data
* OUT buffer_size - set to size of the buffer in bytes
@@ -508,7 +508,7 @@ extern void pack_all_node (char **buffer_ptr, int *buffer_size,
/* write header: version and time */
nodes_packed = 0 ;
pack32 (nodes_packed, buffer);
- select_g_alter_node_cnt(SELECT_GET_NODE_SCALING,
+ select_g_alter_node_cnt(SELECT_GET_NODE_SCALING,
&node_scaling);
pack32 (node_scaling, buffer);
@@ -518,7 +518,7 @@ extern void pack_all_node (char **buffer_ptr, int *buffer_size,
part_filter_set(uid);
for (inx = 0; inx < node_record_count; inx++, node_ptr++) {
xassert (node_ptr->magic == NODE_MAGIC);
- xassert (node_ptr->config_ptr->magic ==
+ xassert (node_ptr->config_ptr->magic ==
CONFIG_MAGIC);
/* We can't avoid packing node records without breaking
@@ -555,20 +555,20 @@ extern void pack_all_node (char **buffer_ptr, int *buffer_size,
}
-/*
- * _pack_node - dump all configuration information about a specific node in
+/*
+ * _pack_node - dump all configuration information about a specific node in
* machine independent form (for network transmission)
* IN dump_node_ptr - pointer to node for which information is requested
* IN/OUT buffer - buffer where data is placed, pointers automatically updated
- * NOTE: if you make any changes here be sure to make the corresponding
+ * NOTE: if you make any changes here be sure to make the corresponding
* changes to load_node_config in api/node_info.c
* NOTE: READ lock_slurmctld config before entry
*/
-static void _pack_node (struct node_record *dump_node_ptr, Buf buffer)
+static void _pack_node (struct node_record *dump_node_ptr, Buf buffer)
{
packstr (dump_node_ptr->name, buffer);
pack16 (dump_node_ptr->node_state, buffer);
- if (slurmctld_conf.fast_schedule) {
+ if (slurmctld_conf.fast_schedule) {
/* Only data from config_record used for scheduling */
pack16 (dump_node_ptr->config_ptr->cpus, buffer);
pack16 (dump_node_ptr->config_ptr->sockets, buffer);
@@ -576,7 +576,7 @@ static void _pack_node (struct node_record *dump_node_ptr, Buf buffer)
pack16 (dump_node_ptr->config_ptr->threads, buffer);
pack32 (dump_node_ptr->config_ptr->real_memory, buffer);
pack32 (dump_node_ptr->config_ptr->tmp_disk, buffer);
- } else {
+ } else {
/* Individual node data used for scheduling */
pack16 (dump_node_ptr->cpus, buffer);
pack16 (dump_node_ptr->sockets, buffer);
@@ -601,7 +601,7 @@ static void _pack_node (struct node_record *dump_node_ptr, Buf buffer)
* Uses common data structures.
* NOTE: READ lock_slurmctld config before entry
*/
-void set_slurmd_addr (void)
+void set_slurmd_addr (void)
{
int i;
struct node_record *node_ptr = node_record_table_ptr;
@@ -621,7 +621,7 @@ void set_slurmd_addr (void)
node_ptr->comm_name);
if (node_ptr->slurm_addr.sin_port)
continue;
- fatal ("slurm_set_addr failure on %s",
+ fatal ("slurm_set_addr failure on %s",
node_ptr->comm_name);
}
@@ -629,13 +629,13 @@ void set_slurmd_addr (void)
return;
}
-/*
+/*
* update_node - update the configuration data for one or more nodes
* IN update_node_msg - update node request
* RET SLURM_SUCCESS or error code
* global: node_record_table_ptr - pointer to global node table
*/
-int update_node ( update_node_msg_t * update_node_msg )
+int update_node ( update_node_msg_t * update_node_msg )
{
int error_code = 0, node_inx;
struct node_record *node_ptr = NULL;
@@ -645,14 +645,14 @@ int update_node ( update_node_msg_t * update_node_msg )
time_t now = time(NULL);
if (update_node_msg -> node_names == NULL ) {
- error ("update_node: invalid node name %s",
+ error ("update_node: invalid node name %s",
update_node_msg -> node_names );
return ESLURM_INVALID_NODE_NAME;
}
if ( (host_list = hostlist_create (update_node_msg -> node_names))
== NULL) {
- error ("hostlist_create error on %s: %m",
+ error ("hostlist_create error on %s: %m",
update_node_msg -> node_names);
return ESLURM_INVALID_NODE_NAME;
}
@@ -664,14 +664,14 @@ int update_node ( update_node_msg_t * update_node_msg )
node_ptr = find_node_record (this_node_name);
node_inx = node_ptr - node_record_table_ptr;
if (node_ptr == NULL) {
- error ("update_node: node %s does not exist",
+ error ("update_node: node %s does not exist",
this_node_name);
error_code = ESLURM_INVALID_NODE_NAME;
free (this_node_name);
break;
}
-
- if ((update_node_msg -> reason) &&
+
+ if ((update_node_msg -> reason) &&
(update_node_msg -> reason[0])) {
xfree(node_ptr->reason);
node_ptr->reason = xstrdup(update_node_msg->reason);
@@ -680,11 +680,11 @@ int update_node ( update_node_msg_t * update_node_msg )
}
if (state_val != (uint16_t) NO_VAL) {
- base_state = node_ptr->node_state;
+ base_state = node_ptr->node_state;
if (!_valid_node_state_change(base_state, state_val)) {
info("Invalid node state transition requested "
"for node %s from=%s to=%s",
- this_node_name,
+ this_node_name,
node_state_string(base_state),
node_state_string(state_val));
state_val = (uint16_t) NO_VAL;
@@ -698,7 +698,7 @@ int update_node ( update_node_msg_t * update_node_msg )
(IS_NODE_DRAIN(node_ptr) ||
IS_NODE_FAIL(node_ptr))) {
clusteracct_storage_g_node_up(
- acct_db_conn,
+ acct_db_conn,
slurmctld_cluster_name,
node_ptr,
now);
@@ -707,7 +707,7 @@ int update_node ( update_node_msg_t * update_node_msg )
node_ptr->node_state &= (~NODE_STATE_FAIL);
if (IS_NODE_DOWN(node_ptr)) {
state_val = NODE_STATE_IDLE;
- node_ptr->node_state |=
+ node_ptr->node_state |=
NODE_STATE_NO_RESPOND;
node_ptr->last_response = now;
ping_nodes_now = true;
@@ -727,7 +727,7 @@ int update_node ( update_node_msg_t * update_node_msg )
ping_nodes_now = true;
} else {
error("slurm_set_addr failure "
- "on %s",
+ "on %s",
node_ptr->comm_name);
state_val = base_state;
}
@@ -735,7 +735,7 @@ int update_node ( update_node_msg_t * update_node_msg )
state_val = base_state;
}
if (state_val == NODE_STATE_DOWN) {
- /* We must set node DOWN before killing
+ /* We must set node DOWN before killing
* its jobs */
_make_node_down(node_ptr, now);
kill_running_job_by_node_name (this_node_name);
@@ -745,7 +745,7 @@ int update_node ( update_node_msg_t * update_node_msg )
if (IS_NODE_DOWN(node_ptr)) {
trigger_node_up(node_ptr);
clusteracct_storage_g_node_up(
- acct_db_conn,
+ acct_db_conn,
slurmctld_cluster_name,
node_ptr,
now);
@@ -753,7 +753,7 @@ int update_node ( update_node_msg_t * update_node_msg )
(IS_NODE_DRAIN(node_ptr) ||
IS_NODE_FAIL(node_ptr))) {
clusteracct_storage_g_node_up(
- acct_db_conn,
+ acct_db_conn,
slurmctld_cluster_name,
node_ptr,
now);
@@ -780,7 +780,7 @@ int update_node ( update_node_msg_t * update_node_msg )
(node_ptr->comp_job_cnt == 0)) {
trigger_node_drained(node_ptr);
clusteracct_storage_g_node_down(
- acct_db_conn,
+ acct_db_conn,
slurmctld_cluster_name,
node_ptr, now, NULL);
}
@@ -809,21 +809,21 @@ int update_node ( update_node_msg_t * update_node_msg )
state_val = base_state;
bit_clear(avail_node_bitmap, node_inx);
} else {
- info ("Invalid node state specified %u",
+ info ("Invalid node state specified %u",
state_val);
err_code = 1;
error_code = ESLURM_INVALID_NODE_STATE;
}
if (err_code == 0) {
- node_ptr->node_state = state_val |
- (node_ptr->node_state &
+ node_ptr->node_state = state_val |
+ (node_ptr->node_state &
NODE_STATE_FLAGS);
- select_g_update_node_state(node_inx,
+ select_g_update_node_state(node_inx,
state_val);
info ("update_node: node %s state set to %s",
- this_node_name,
+ this_node_name,
node_state_string(state_val));
}
}
@@ -838,17 +838,17 @@ int update_node ( update_node_msg_t * update_node_msg )
if ((error_code == 0) && (update_node_msg->features)) {
error_code = _update_node_features(
- update_node_msg->node_names,
+ update_node_msg->node_names,
update_node_msg->features);
}
-
- /* Update weight. Weight is part of config_ptr,
+
+ /* Update weight. Weight is part of config_ptr,
* hence do the splitting if required */
if ((error_code == 0) && (update_node_msg->weight != NO_VAL)) {
error_code = _update_node_weight(update_node_msg->node_names,
update_node_msg->weight);
- if (!error_code)
+ if (!error_code)
/* sort config_list by weight for scheduling */
list_sort(config_list, &list_compare_config);
@@ -858,7 +858,7 @@ int update_node ( update_node_msg_t * update_node_msg )
}
/*
- * restore_node_features - Restore node features based upon state
+ * restore_node_features - Restore node features based upon state
* saved (preserves interactive updates)
*/
extern void restore_node_features(void)
@@ -867,7 +867,7 @@ extern void restore_node_features(void)
char *node_list;
/* Identify all nodes that have features field
- * preserved and not explicitly set in slurm.conf
+ * preserved and not explicitly set in slurm.conf
* to a different value */
for (i=0; i<node_record_count; i++) {
if (!node_record_table_ptr[i].features)
@@ -895,7 +895,7 @@ extern void restore_node_features(void)
xstrcat(node_list, node_record_table_ptr[j].name);
xfree(node_record_table_ptr[j].features);
}
- _update_node_features(node_list,
+ _update_node_features(node_list,
node_record_table_ptr[i].features);
xfree(node_record_table_ptr[i].features);
xfree(node_list);
@@ -923,8 +923,8 @@ static int _update_node_weight(char *node_names, uint32_t weight)
return rc;
}
- /* For each config_record with one of these nodes,
- * update it (if all nodes updated) or split it into
+ /* For each config_record with one of these nodes,
+ * update it (if all nodes updated) or split it into
* a new entry */
config_iterator = list_iterator_create(config_list);
if (config_iterator == NULL)
@@ -962,12 +962,12 @@ static int _update_node_weight(char *node_names, uint32_t weight)
feature);
}
new_config_ptr->node_bitmap = bit_copy(tmp_bitmap);
- new_config_ptr->nodes =
+ new_config_ptr->nodes =
bitmap2node_name(tmp_bitmap);
build_config_feature_list(new_config_ptr);
_update_config_ptr(tmp_bitmap, new_config_ptr);
- /* Update remaining records */
+ /* Update remaining records */
bit_not(tmp_bitmap);
bit_and(config_ptr->node_bitmap, tmp_bitmap);
xfree(config_ptr->nodes);
@@ -978,7 +978,7 @@ static int _update_node_weight(char *node_names, uint32_t weight)
}
list_iterator_destroy(config_iterator);
bit_free(node_bitmap);
-
+
info("_update_node_weight: nodes %s weight set to: %u",
node_names, weight);
return SLURM_SUCCESS;
@@ -1005,8 +1005,8 @@ static int _update_node_features(char *node_names, char *features)
return rc;
}
- /* For each config_record with one of these nodes,
- * update it (if all nodes updated) or split it into
+ /* For each config_record with one of these nodes,
+ * update it (if all nodes updated) or split it into
* a new entry */
config_iterator = list_iterator_create(config_list);
if (config_iterator == NULL)
@@ -1046,12 +1046,12 @@ static int _update_node_features(char *node_names, char *features)
if (features[0])
new_config_ptr->feature = xstrdup(features);
new_config_ptr->node_bitmap = bit_copy(tmp_bitmap);
- new_config_ptr->nodes =
+ new_config_ptr->nodes =
bitmap2node_name(tmp_bitmap);
build_config_feature_list(new_config_ptr);
_update_config_ptr(tmp_bitmap, new_config_ptr);
- /* Update remaining records */
+ /* Update remaining records */
bit_not(tmp_bitmap);
bit_and(config_ptr->node_bitmap, tmp_bitmap);
xfree(config_ptr->nodes);
@@ -1062,14 +1062,14 @@ static int _update_node_features(char *node_names, char *features)
}
list_iterator_destroy(config_iterator);
bit_free(node_bitmap);
-
+
info("_update_node_features: nodes %s reason set to: %s",
node_names, features);
return SLURM_SUCCESS;
}
/* Reset the config pointer for updated jobs */
-static void _update_config_ptr(bitstr_t *bitmap,
+static void _update_config_ptr(bitstr_t *bitmap,
struct config_record *config_ptr)
{
int i;
@@ -1081,8 +1081,8 @@ static void _update_config_ptr(bitstr_t *bitmap,
}
}
-/*
- * drain_nodes - drain one or more nodes,
+/*
+ * drain_nodes - drain one or more nodes,
* no-op for nodes already drained or draining
* IN nodes - nodes to drain
* IN reason - reason to drain the nodes
@@ -1101,7 +1101,7 @@ extern int drain_nodes ( char *nodes, char *reason )
error ("drain_nodes: invalid node name %s", nodes);
return ESLURM_INVALID_NODE_NAME;
}
-
+
if ( (host_list = hostlist_create (nodes)) == NULL) {
error ("hostlist_create error on %s: %m", nodes);
return ESLURM_INVALID_NODE_NAME;
@@ -1112,7 +1112,7 @@ extern int drain_nodes ( char *nodes, char *reason )
node_ptr = find_node_record (this_node_name);
node_inx = node_ptr - node_record_table_ptr;
if (node_ptr == NULL) {
- error ("drain_nodes: node %s does not exist",
+ error ("drain_nodes: node %s does not exist",
this_node_name);
error_code = ESLURM_INVALID_NODE_NAME;
free (this_node_name);
@@ -1136,7 +1136,7 @@ extern int drain_nodes ( char *nodes, char *reason )
(node_ptr->comp_job_cnt == 0)) {
/* no jobs, node is drained */
trigger_node_drained(node_ptr);
- clusteracct_storage_g_node_down(acct_db_conn,
+ clusteracct_storage_g_node_down(acct_db_conn,
slurmctld_cluster_name,
node_ptr, now, NULL);
}
@@ -1197,7 +1197,7 @@ static bool _valid_node_state_change(uint16_t old, uint16_t new)
}
/*
- * validate_node_specs - validate the node's specifications as valid,
+ * validate_node_specs - validate the node's specifications as valid,
* if not set state to down, in any case update last_response
* IN reg_msg - node registration message
* RET 0 if no error, ENOENT if no such node, EINVAL if values too low
@@ -1250,11 +1250,11 @@ extern int validate_node_specs(slurm_node_registration_status_msg_t *reg_msg)
error_code = EINVAL;
reason_down = "Low socket*core*thread count";
} else if ((slurmctld_conf.fast_schedule == 0) &&
- ((cr_flag == 1) || gang_flag) &&
- ((sockets1 > sockets2) || (cores1 > cores2) ||
+ ((cr_flag == 1) || gang_flag) &&
+ ((sockets1 > sockets2) || (cores1 > cores2) ||
(threads1 > threads2))) {
error("Node %s has high socket*core*thread count %u, "
- "extra resources ignored",
+ "extra resources ignored",
reg_msg->node_name, threads1);
/* Preserve configured values */
reg_msg->sockets = config_ptr->sockets;
@@ -1263,7 +1263,7 @@ extern int validate_node_specs(slurm_node_registration_status_msg_t *reg_msg)
}
if (reg_msg->cpus < config_ptr->cpus) {
- error ("Node %s has low cpu count %u",
+ error ("Node %s has low cpu count %u",
reg_msg->node_name, reg_msg->cpus);
error_code = EINVAL;
reason_down = "Low CPUs";
@@ -1281,7 +1281,7 @@ extern int validate_node_specs(slurm_node_registration_status_msg_t *reg_msg)
if ((node_ptr->cpus != reg_msg->cpus) &&
(slurmctld_conf.fast_schedule == 0)) {
for (i=0; i<node_ptr->part_cnt; i++) {
- node_ptr->part_pptr[i]->total_cpus +=
+ node_ptr->part_pptr[i]->total_cpus +=
(reg_msg->cpus - node_ptr->cpus);
}
}
@@ -1294,7 +1294,7 @@ extern int validate_node_specs(slurm_node_registration_status_msg_t *reg_msg)
if ((slurmctld_conf.fast_schedule != 2) &&
(reg_msg->real_memory < config_ptr->real_memory)) {
- error ("Node %s has low real_memory size %u",
+ error ("Node %s has low real_memory size %u",
reg_msg->node_name, reg_msg->real_memory);
error_code = EINVAL;
reason_down = "Low RealMemory";
@@ -1327,7 +1327,7 @@ extern int validate_node_specs(slurm_node_registration_status_msg_t *reg_msg)
node_flags = node_ptr->node_state & NODE_STATE_FLAGS;
if (error_code) {
if (!IS_NODE_DOWN(node_ptr)) {
- error ("Setting node %s state to DOWN",
+ error ("Setting node %s state to DOWN",
reg_msg->node_name);
}
last_node_update = time (NULL);
@@ -1345,14 +1345,14 @@ extern int validate_node_specs(slurm_node_registration_status_msg_t *reg_msg)
}
} else {
uint16_t err_cpus = 0;
- select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
+ select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ERROR,
- &err_cpus);
+ &err_cpus);
if (IS_NODE_UNKNOWN(node_ptr)) {
last_node_update = now;
reset_job_priority();
- debug("validate_node_specs: node %s has registered",
+ debug("validate_node_specs: node %s has registered",
reg_msg->node_name);
if (reg_msg->job_count) {
node_ptr->node_state = NODE_STATE_ALLOCATED |
@@ -1362,7 +1362,7 @@ extern int validate_node_specs(slurm_node_registration_status_msg_t *reg_msg)
node_flags;
node_ptr->last_idle = now;
}
- if (!err_cpus
+ if (!err_cpus
&& !IS_NODE_DRAIN(node_ptr)
&& !IS_NODE_FAIL(node_ptr)) {
xfree(node_ptr->reason);
@@ -1373,8 +1373,8 @@ extern int validate_node_specs(slurm_node_registration_status_msg_t *reg_msg)
} else if (IS_NODE_DOWN(node_ptr) &&
((slurmctld_conf.ret2service == 2) ||
((slurmctld_conf.ret2service == 1) &&
- (node_ptr->reason != NULL) &&
- (strncmp(node_ptr->reason, "Not responding", 14)
+ (node_ptr->reason != NULL) &&
+ (strncmp(node_ptr->reason, "Not responding", 14)
== 0)))) {
last_node_update = now;
if (reg_msg->job_count) {
@@ -1385,11 +1385,11 @@ extern int validate_node_specs(slurm_node_registration_status_msg_t *reg_msg)
node_flags;
node_ptr->last_idle = now;
}
- info("node %s returned to service",
+ info("node %s returned to service",
reg_msg->node_name);
reset_job_priority();
trigger_node_up(node_ptr);
- if (!err_cpus
+ if (!err_cpus
&& !IS_NODE_DRAIN(node_ptr)
&& !IS_NODE_FAIL(node_ptr)) {
xfree(node_ptr->reason);
@@ -1397,7 +1397,7 @@ extern int validate_node_specs(slurm_node_registration_status_msg_t *reg_msg)
acct_db_conn, slurmctld_cluster_name,
node_ptr, now);
}
- } else if (node_ptr->last_response
+ } else if (node_ptr->last_response
&& (last_restart > node_ptr->last_response)
&& (slurmctld_conf.ret2service != 2)) {
char time_str[32];
@@ -1464,7 +1464,7 @@ extern int validate_nodes_via_front_end(
node_ptr = &node_record_table_ptr[0]; /* All msg send to node zero,
* the front-end for the wholel cluster */
for (i = 0; i < reg_msg->job_count; i++) {
- if ( (reg_msg->job_id[i] >= MIN_NOALLOC_JOBID) &&
+ if ( (reg_msg->job_id[i] >= MIN_NOALLOC_JOBID) &&
(reg_msg->job_id[i] <= MAX_NOALLOC_JOBID) ) {
info("NoAllocate job %u.%u reported",
reg_msg->job_id[i], reg_msg->step_id[i]);
@@ -1475,11 +1475,11 @@ extern int validate_nodes_via_front_end(
if (job_ptr == NULL) {
error("Orphan job %u.%u reported",
reg_msg->job_id[i], reg_msg->step_id[i]);
- abort_job_on_node(reg_msg->job_id[i],
+ abort_job_on_node(reg_msg->job_id[i],
job_ptr, node_ptr);
}
- else if (IS_JOB_RUNNING(job_ptr) ||
+ else if (IS_JOB_RUNNING(job_ptr) ||
IS_JOB_SUSPENDED(job_ptr)) {
debug3("Registered job %u.%u",
reg_msg->job_id[i], reg_msg->step_id[i]);
@@ -1490,9 +1490,9 @@ extern int validate_nodes_via_front_end(
}
else if (IS_JOB_COMPLETING(job_ptr)) {
- /* Re-send kill request as needed,
+ /* Re-send kill request as needed,
* not necessarily an error */
- kill_job_on_node(reg_msg->job_id[i], job_ptr,
+ kill_job_on_node(reg_msg->job_id[i], job_ptr,
node_ptr);
}
@@ -1502,15 +1502,15 @@ extern int validate_nodes_via_front_end(
* slurmd that went DOWN is now responding */
error("Registered PENDING job %u.%u",
reg_msg->job_id[i], reg_msg->step_id[i]);
- abort_job_on_node(reg_msg->job_id[i], job_ptr,
+ abort_job_on_node(reg_msg->job_id[i], job_ptr,
node_ptr);
}
else { /* else job is supposed to be done */
error("Registered job %u.%u in state %s",
- reg_msg->job_id[i], reg_msg->step_id[i],
+ reg_msg->job_id[i], reg_msg->step_id[i],
job_state_string(job_ptr->job_state));
- kill_job_on_node(reg_msg->job_id[i], job_ptr,
+ kill_job_on_node(reg_msg->job_id[i], job_ptr,
node_ptr);
}
}
@@ -1523,10 +1523,10 @@ extern int validate_nodes_via_front_end(
(job_ptr->batch_flag == 0))
continue;
#ifdef HAVE_BG
- /* slurmd does not report job presence until after prolog
- * completes which waits for bgblock boot to complete.
+ /* slurmd does not report job presence until after prolog
+ * completes which waits for bgblock boot to complete.
* This can take several minutes on BlueGene. */
- if (difftime(now, job_ptr->time_last_active) <=
+ if (difftime(now, job_ptr->time_last_active) <=
(BG_FREE_PREVIOUS_BLOCK + BG_MIN_BLOCK_BOOT +
BG_INCR_BLOCK_BOOT * job_ptr->node_cnt))
@@ -1566,7 +1566,7 @@ extern int validate_nodes_via_front_end(
updated_job = true;
if (prolog_hostlist)
(void) hostlist_push_host(
- prolog_hostlist,
+ prolog_hostlist,
node_ptr->name);
else
prolog_hostlist = hostlist_create(
@@ -1576,30 +1576,30 @@ extern int validate_nodes_via_front_end(
}
} else {
uint16_t err_cpus = 0;
- select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
+ select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ERROR,
- &err_cpus);
+ &err_cpus);
if (reg_hostlist)
(void) hostlist_push_host(
reg_hostlist, node_ptr->name);
else
reg_hostlist = hostlist_create(node_ptr->name);
-
+
node_flags = node_ptr->node_state & NODE_STATE_FLAGS;
if (IS_NODE_UNKNOWN(node_ptr)) {
updated_job = true;
if (jobs_on_node) {
- node_ptr->node_state =
- NODE_STATE_ALLOCATED |
+ node_ptr->node_state =
+ NODE_STATE_ALLOCATED |
node_flags;
} else {
- node_ptr->node_state =
+ node_ptr->node_state =
NODE_STATE_IDLE |
node_flags;
node_ptr->last_idle = now;
}
- if (!err_cpus
+ if (!err_cpus
&& !IS_NODE_DRAIN(node_ptr)
&& !IS_NODE_FAIL(node_ptr)) {
xfree(node_ptr->reason);
@@ -1607,22 +1607,22 @@ extern int validate_nodes_via_front_end(
acct_db_conn,
slurmctld_cluster_name,
node_ptr, now);
- }
+ }
} else if (IS_NODE_DOWN(node_ptr) &&
(slurmctld_conf.ret2service == 1)) {
updated_job = true;
if (jobs_on_node) {
- node_ptr->node_state =
+ node_ptr->node_state =
NODE_STATE_ALLOCATED |
node_flags;
} else {
- node_ptr->node_state =
+ node_ptr->node_state =
NODE_STATE_IDLE |
node_flags;
node_ptr->last_idle = now;
}
trigger_node_up(node_ptr);
- if (!err_cpus
+ if (!err_cpus
&& !IS_NODE_DRAIN(node_ptr)
&& !IS_NODE_FAIL(node_ptr)) {
xfree(node_ptr->reason);
@@ -1630,7 +1630,7 @@ extern int validate_nodes_via_front_end(
acct_db_conn,
slurmctld_cluster_name,
node_ptr, now);
- }
+ }
} else if (IS_NODE_ALLOCATED(node_ptr) &&
(jobs_on_node == 0)) {
/* job vanished */
@@ -1639,10 +1639,10 @@ extern int validate_nodes_via_front_end(
node_flags;
node_ptr->last_idle = now;
} else if (IS_NODE_COMPLETING(node_ptr) &&
- (jobs_on_node == 0)) {
+ (jobs_on_node == 0)) {
/* job already done */
updated_job = true;
- node_ptr->node_state &=
+ node_ptr->node_state &=
(~NODE_STATE_COMPLETING);
}
@@ -1708,7 +1708,7 @@ static void _sync_bitmaps(struct node_record *node_ptr, int job_count)
* node_did_resp - record that the specified node is responding
* IN name - name of the node
* NOTE: READ lock_slurmctld config before entry
- */
+ */
void node_did_resp (char *name)
{
struct node_record *node_ptr;
@@ -1753,29 +1753,29 @@ static void _node_did_resp(struct node_record *node_ptr)
node_ptr->last_idle = now;
node_ptr->node_state = NODE_STATE_IDLE | node_flags;
if (!IS_NODE_DRAIN(node_ptr) && !IS_NODE_FAIL(node_ptr)) {
- clusteracct_storage_g_node_up(acct_db_conn,
+ clusteracct_storage_g_node_up(acct_db_conn,
slurmctld_cluster_name,
node_ptr, now);
}
}
if (IS_NODE_DOWN(node_ptr) &&
(slurmctld_conf.ret2service == 1) &&
- (node_ptr->reason != NULL) &&
+ (node_ptr->reason != NULL) &&
(strncmp(node_ptr->reason, "Not responding", 14) == 0)) {
last_node_update = now;
node_ptr->last_idle = now;
node_ptr->node_state = NODE_STATE_IDLE | node_flags;
- info("node_did_resp: node %s returned to service",
+ info("node_did_resp: node %s returned to service",
node_ptr->name);
trigger_node_up(node_ptr);
if (!IS_NODE_DRAIN(node_ptr) && !IS_NODE_FAIL(node_ptr)) {
xfree(node_ptr->reason);
- clusteracct_storage_g_node_up(acct_db_conn,
+ clusteracct_storage_g_node_up(acct_db_conn,
slurmctld_cluster_name,
node_ptr, now);
}
}
- if (IS_NODE_IDLE(node_ptr) && !IS_NODE_COMPLETING(node_ptr)) {
+ if (IS_NODE_IDLE(node_ptr) && !IS_NODE_COMPLETING(node_ptr)) {
bit_set (idle_node_bitmap, node_inx);
bit_set (share_node_bitmap, node_inx);
}
@@ -1792,9 +1792,9 @@ static void _node_did_resp(struct node_record *node_ptr)
}
/*
- * node_not_resp - record that the specified node is not responding
+ * node_not_resp - record that the specified node is not responding
* IN name - name of the node
- * IN msg_time - time message was sent
+ * IN msg_time - time message was sent
*/
void node_not_resp (char *name, time_t msg_time)
{
@@ -1811,7 +1811,7 @@ void node_not_resp (char *name, time_t msg_time)
last_node_update = time(NULL);
}
}
-
+
#else
node_ptr = find_node_record (name);
if (node_ptr == NULL) {
@@ -1840,7 +1840,7 @@ extern void node_no_resp_msg(void)
if (!node_ptr->not_responding)
continue;
if (no_resp_hostlist) {
- (void) hostlist_push_host(no_resp_hostlist,
+ (void) hostlist_push_host(no_resp_hostlist,
node_ptr->name);
} else
no_resp_hostlist = hostlist_create(node_ptr->name);
@@ -1848,7 +1848,7 @@ extern void node_no_resp_msg(void)
}
if (no_resp_hostlist) {
hostlist_uniq(no_resp_hostlist);
- hostlist_ranged_string(no_resp_hostlist,
+ hostlist_ranged_string(no_resp_hostlist,
sizeof(host_str), host_str);
error("Nodes %s not responding", host_str);
hostlist_destroy(no_resp_hostlist);
@@ -1865,7 +1865,7 @@ static void _node_not_resp (struct node_record *node_ptr, time_t msg_time)
return; /* Already known to be not responding */
if (node_ptr->last_response >= msg_time) {
- debug("node_not_resp: node %s responded since msg sent",
+ debug("node_not_resp: node %s responded since msg sent",
node_ptr->name);
return;
}
@@ -1878,8 +1878,8 @@ static void _node_not_resp (struct node_record *node_ptr, time_t msg_time)
/*
* set_node_down - make the specified node's state DOWN and
- * kill jobs as needed
- * IN name - name of the node
+ * kill jobs as needed
+ * IN name - name of the node
* IN reason - why the node is DOWN
*/
void set_node_down (char *name, char *reason)
@@ -1916,7 +1916,7 @@ void set_node_down (char *name, char *reason)
/*
* is_node_down - determine if the specified node's state is DOWN
* IN name - name of the node
- * RET true if node exists and is down, otherwise false
+ * RET true if node exists and is down, otherwise false
*/
bool is_node_down (char *name)
{
@@ -1936,7 +1936,7 @@ bool is_node_down (char *name)
/*
* is_node_resp - determine if the specified node's state is responding
* IN name - name of the node
- * RET true if node exists and is responding, otherwise false
+ * RET true if node exists and is responding, otherwise false
*/
bool is_node_resp (char *name)
{
@@ -2074,7 +2074,7 @@ extern void make_node_comp(struct node_record *node_ptr,
/* Don't verify RPC if DOWN */
(node_ptr->comp_job_cnt)++;
node_ptr->node_state |= NODE_STATE_COMPLETING;
- }
+ }
node_flags = node_ptr->node_state & NODE_STATE_FLAGS;
if ((node_ptr->run_job_cnt == 0) &&
@@ -2082,14 +2082,14 @@ extern void make_node_comp(struct node_record *node_ptr,
bit_set(idle_node_bitmap, inx);
if (IS_NODE_DRAIN(node_ptr) || IS_NODE_FAIL(node_ptr)) {
trigger_node_drained(node_ptr);
- clusteracct_storage_g_node_down(acct_db_conn,
+ clusteracct_storage_g_node_down(acct_db_conn,
slurmctld_cluster_name,
node_ptr, now, NULL);
}
}
if (IS_NODE_DOWN(node_ptr)) {
- debug3("make_node_comp: Node %s being left DOWN",
+ debug3("make_node_comp: Node %s being left DOWN",
node_ptr->name);
} else if (node_ptr->run_job_cnt)
node_ptr->node_state = NODE_STATE_ALLOCATED | node_flags;
@@ -2104,7 +2104,7 @@ static void _make_node_down(struct node_record *node_ptr, time_t event_time)
{
int inx = node_ptr - node_record_table_ptr;
uint16_t node_flags;
-
+
xassert(node_ptr);
last_node_update = time (NULL);
node_flags = node_ptr->node_state & NODE_STATE_FLAGS;
@@ -2114,9 +2114,9 @@ static void _make_node_down(struct node_record *node_ptr, time_t event_time)
bit_set (idle_node_bitmap, inx);
bit_set (share_node_bitmap, inx);
bit_clear (up_node_bitmap, inx);
- select_g_update_node_state(inx, node_ptr->node_state);
+ select_g_update_node_state(inx, node_ptr->node_state);
trigger_node_down(node_ptr);
- clusteracct_storage_g_node_down(acct_db_conn,
+ clusteracct_storage_g_node_down(acct_db_conn,
slurmctld_cluster_name,
node_ptr, event_time, NULL);
}
@@ -2126,13 +2126,13 @@ static void _make_node_down(struct node_record *node_ptr, time_t event_time)
* IN node_ptr - pointer to node reporting job completion
* IN job_ptr - pointer to job that just completed
*/
-void make_node_idle(struct node_record *node_ptr,
+void make_node_idle(struct node_record *node_ptr,
struct job_record *job_ptr)
{
int inx = node_ptr - node_record_table_ptr;
uint16_t node_flags;
time_t now = time(NULL);
-
+
xassert(node_ptr);
if (job_ptr && /* Specific job completed */
(bit_test(job_ptr->node_bitmap, inx))) { /* Not a replay */
@@ -2151,7 +2151,7 @@ void make_node_idle(struct node_record *node_ptr,
slurm_sched_schedule();
}
} else {
- error("node_cnt underflow on job_id %u",
+ error("node_cnt underflow on job_id %u",
job_ptr->job_id);
}
@@ -2167,9 +2167,9 @@ void make_node_idle(struct node_record *node_ptr,
(node_ptr->comp_job_cnt)--;
else
error("Node %s comp_job_cnt underflow in "
- "make_node_idle, job_id %u",
+ "make_node_idle, job_id %u",
node_ptr->name, job_ptr->job_id);
- if (node_ptr->comp_job_cnt > 0)
+ if (node_ptr->comp_job_cnt > 0)
return; /* More jobs completing */
}
}
@@ -2187,11 +2187,11 @@ void make_node_idle(struct node_record *node_ptr,
node_ptr->node_state = NODE_STATE_IDLE | node_flags;
bit_set(idle_node_bitmap, inx);
bit_clear(avail_node_bitmap, inx);
- debug3("make_node_idle: Node %s is DRAINED",
+ debug3("make_node_idle: Node %s is DRAINED",
node_ptr->name);
node_ptr->last_idle = now;
trigger_node_drained(node_ptr);
- clusteracct_storage_g_node_down(acct_db_conn,
+ clusteracct_storage_g_node_down(acct_db_conn,
slurmctld_cluster_name,
node_ptr, now, NULL);
} else if (node_ptr->run_job_cnt) {
@@ -2210,7 +2210,7 @@ extern int send_nodes_to_accounting(time_t event_time)
int rc = SLURM_SUCCESS, i = 0;
struct node_record *node_ptr = NULL;
uint32_t node_scaling = 0;
- slurmctld_lock_t node_read_lock = {
+ slurmctld_lock_t node_read_lock = {
READ_LOCK, NO_LOCK, READ_LOCK, WRITE_LOCK };
select_g_alter_node_cnt(SELECT_GET_NODE_SCALING, &node_scaling);
@@ -2227,7 +2227,7 @@ extern int send_nodes_to_accounting(time_t event_time)
if(node_ptr->select_nodeinfo) {
uint16_t err_cpus = 0;
select_g_select_nodeinfo_get(
- node_ptr->select_nodeinfo,
+ node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ERROR,
&err_cpus);
@@ -2243,11 +2243,11 @@ extern int send_nodes_to_accounting(time_t event_time)
send_node.name = node_ptr->name;
send_node.config_ptr = &config_rec;
select_g_alter_node_cnt(
- SELECT_GET_NODE_SCALING,
+ SELECT_GET_NODE_SCALING,
&node_scaling);
-
+
if(node_scaling)
- cpus_per_node = node_ptr->cpus
+ cpus_per_node = node_ptr->cpus
/ node_scaling;
err_cpus *= cpus_per_node;
@@ -2270,7 +2270,7 @@ extern int send_nodes_to_accounting(time_t event_time)
slurmctld_cluster_name,
node_ptr, event_time,
NULL);
- if (rc == SLURM_ERROR)
+ if (rc == SLURM_ERROR)
break;
}
unlock_slurmctld(node_read_lock);
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index dbde1f803a3bb834c931bf3e6774ff9da120d7fd..49cff3f2abc17f78d95aca90de054819a80ae1b7 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -1,38 +1,38 @@
/*****************************************************************************\
- * node_scheduler.c - select and allocated nodes to jobs
- * Note: there is a global node table (node_record_table_ptr)
+ * node_scheduler.c - select and allocated nodes to jobs
+ * Note: there is a global node table (node_record_table_ptr)
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -81,9 +81,9 @@
struct node_set { /* set of nodes with same configuration */
uint16_t cpus_per_node; /* NOTE: This is the minimum count,
- * if FastSchedule==0 then individual
- * nodes within the same configuration
- * line (in slurm.conf) can actually
+ * if FastSchedule==0 then individual
+ * nodes within the same configuration
+ * line (in slurm.conf) can actually
* have different CPU counts */
uint32_t real_memory;
uint32_t nodes;
@@ -93,15 +93,15 @@ struct node_set { /* set of nodes with same configuration */
bitstr_t *my_bitmap; /* node bitmap */
};
-static int _build_node_list(struct job_record *job_ptr,
+static int _build_node_list(struct job_record *job_ptr,
struct node_set **node_set_pptr,
int *node_set_size);
static void _filter_nodes_in_set(struct node_set *node_set_ptr,
struct job_details *detail_ptr);
static int _list_find_feature(void *feature_entry, void *key);
static int _match_feature(char *seek, struct node_set *node_set_ptr);
-static int _nodes_in_sets(bitstr_t *req_bitmap,
- struct node_set * node_set_ptr,
+static int _nodes_in_sets(bitstr_t *req_bitmap,
+ struct node_set * node_set_ptr,
int node_set_size);
static int _pick_best_nodes(struct node_set *node_set_ptr,
int node_set_size, bitstr_t ** select_bitmap,
@@ -111,9 +111,9 @@ static int _pick_best_nodes(struct node_set *node_set_ptr,
uint32_t req_nodes, bool test_only,
List preemptee_candidates,
List *preemptee_job_list);
-static bool _valid_feature_counts(struct job_details *detail_ptr,
+static bool _valid_feature_counts(struct job_details *detail_ptr,
bitstr_t *node_bitmap, bool *has_xor);
-static bitstr_t *_valid_features(struct job_details *detail_ptr,
+static bitstr_t *_valid_features(struct job_details *detail_ptr,
struct config_record *config_ptr);
@@ -140,16 +140,16 @@ extern void allocate_nodes(struct job_record *job_ptr)
/*
- * deallocate_nodes - for a given job, deallocate its nodes and make
- * their state NODE_STATE_COMPLETING also release the job's licenses
+ * deallocate_nodes - for a given job, deallocate its nodes and make
+ * their state NODE_STATE_COMPLETING also release the job's licenses
* and resources reserved by accounting policy association
* IN job_ptr - pointer to terminating job (already in some COMPLETING state)
* IN timeout - true if job exhausted time limit, send REQUEST_KILL_TIMELIMIT
* RPC instead of REQUEST_TERMINATE_JOB
- * IN suspended - true if job was already suspended (node's job_run_cnt
+ * IN suspended - true if job was already suspended (node's job_run_cnt
* already decremented);
*/
-extern void deallocate_nodes(struct job_record *job_ptr, bool timeout,
+extern void deallocate_nodes(struct job_record *job_ptr, bool timeout,
bool suspended)
{
int i;
@@ -194,7 +194,7 @@ extern void deallocate_nodes(struct job_record *job_ptr, bool timeout,
job_ptr->spank_job_env);
kill_job->spank_job_env_size = job_ptr->spank_job_env_size;
- for (i=0, node_ptr=node_record_table_ptr;
+ for (i=0, node_ptr=node_record_table_ptr;
i < node_record_count; i++, node_ptr++) {
if (bit_test(job_ptr->node_bitmap, i) == 0)
continue;
@@ -218,7 +218,7 @@ extern void deallocate_nodes(struct job_record *job_ptr, bool timeout,
delete_step_records(job_ptr, 0);
slurm_sched_schedule();
}
-
+
if (agent_args->node_count == 0) {
error("Job %u allocated no nodes to be killed on",
job_ptr->job_id);
@@ -229,7 +229,7 @@ extern void deallocate_nodes(struct job_record *job_ptr, bool timeout,
xfree(agent_args);
return;
}
-
+
agent_args->msg_args = kill_job;
agent_queue_request(agent_args);
return;
@@ -248,7 +248,7 @@ static int _match_feature(char *seek, struct node_set *node_set_ptr)
if (seek == NULL)
return 1; /* nothing to look for */
- feat_ptr = list_find_first(feature_list, _list_find_feature,
+ feat_ptr = list_find_first(feature_list, _list_find_feature,
(void *) seek);
if (feat_ptr == NULL)
return 0; /* no such feature */
@@ -335,7 +335,7 @@ _resolve_shared_status(uint16_t user_flag, uint16_t part_max_share,
}
/*
- * If the job has required feature counts, then accumulate those
+ * If the job has required feature counts, then accumulate those
* required resources using multiple calls to _pick_best_nodes()
* and adding those selected nodes to the job's required node list.
* Upon completion, return job's requirements to match the values
@@ -407,10 +407,10 @@ _get_req_features(struct node_set *node_set_ptr, int node_set_size,
continue;
tmp_node_set_size = 0;
/* _pick_best_nodes() is destructive of the node_set
- * data structure, so we need to make a copy then
+ * data structure, so we need to make a copy then
* purge it */
for (i=0; i<node_set_size; i++) {
- if (!_match_feature(feat_ptr->name,
+ if (!_match_feature(feat_ptr->name,
node_set_ptr+i))
continue;
tmp_node_set_ptr[tmp_node_set_size].
@@ -423,10 +423,10 @@ _get_req_features(struct node_set *node_set_ptr, int node_set_size,
node_set_ptr[i].nodes;
tmp_node_set_ptr[tmp_node_set_size].weight =
node_set_ptr[i].weight;
- tmp_node_set_ptr[tmp_node_set_size].features =
+ tmp_node_set_ptr[tmp_node_set_size].features =
xstrdup(node_set_ptr[i].features);
tmp_node_set_ptr[tmp_node_set_size].
- feature_bits =
+ feature_bits =
bit_copy(node_set_ptr[i].feature_bits);
tmp_node_set_ptr[tmp_node_set_size].my_bitmap =
bit_copy(node_set_ptr[i].my_bitmap);
@@ -440,10 +440,10 @@ _get_req_features(struct node_set *node_set_ptr, int node_set_size,
if (*preemptee_job_list) {
list_destroy(*preemptee_job_list);
*preemptee_job_list = NULL;
- }
- error_code = _pick_best_nodes(tmp_node_set_ptr,
- tmp_node_set_size, &feature_bitmap,
- job_ptr, part_ptr, min_nodes,
+ }
+ error_code = _pick_best_nodes(tmp_node_set_ptr,
+ tmp_node_set_size, &feature_bitmap,
+ job_ptr, part_ptr, min_nodes,
max_nodes, req_nodes, test_only,
preemptee_candidates,
preemptee_job_list);
@@ -451,8 +451,8 @@ _get_req_features(struct node_set *node_set_ptr, int node_set_size,
{
char *tmp_str = bitmap2node_name(feature_bitmap);
info("job %u needs %u nodes with feature %s, "
- "using %s, error_code=%d",
- job_ptr->job_id, feat_ptr->count,
+ "using %s, error_code=%d",
+ job_ptr->job_id, feat_ptr->count,
feat_ptr->name, tmp_str, error_code);
xfree(tmp_str);
}
@@ -476,7 +476,7 @@ _get_req_features(struct node_set *node_set_ptr, int node_set_size,
bit_copy(feature_bitmap);
}
if (accumulate_bitmap) {
- bit_or(accumulate_bitmap,
+ bit_or(accumulate_bitmap,
feature_bitmap);
bit_free(feature_bitmap);
} else
@@ -489,13 +489,13 @@ _get_req_features(struct node_set *node_set_ptr, int node_set_size,
/* restore most of job state and accumulate remaining resources */
if (saved_req_node_bitmap) {
FREE_NULL_BITMAP(job_ptr->details->req_node_bitmap);
- job_ptr->details->req_node_bitmap =
+ job_ptr->details->req_node_bitmap =
bit_copy(saved_req_node_bitmap);
}
if (accumulate_bitmap) {
uint32_t node_cnt;
if (job_ptr->details->req_node_bitmap) {
- bit_or(job_ptr->details->req_node_bitmap,
+ bit_or(job_ptr->details->req_node_bitmap,
accumulate_bitmap);
FREE_NULL_BITMAP(accumulate_bitmap);
} else
@@ -516,7 +516,7 @@ _get_req_features(struct node_set *node_set_ptr, int node_set_size,
#if 0
{
char *tmp_str = bitmap2node_name(job_ptr->details->req_node_bitmap);
- info("job %u requires %d:%d:%d nodes %s err:%u",
+ info("job %u requires %d:%d:%d nodes %s err:%u",
job_ptr->job_id, min_nodes, req_nodes, max_nodes,
tmp_str, error_code);
xfree(tmp_str);
@@ -529,14 +529,14 @@ _get_req_features(struct node_set *node_set_ptr, int node_set_size,
*preemptee_job_list = NULL;
}
error_code = _pick_best_nodes(node_set_ptr, node_set_size,
- select_bitmap, job_ptr, part_ptr, min_nodes,
- max_nodes, req_nodes, test_only,
+ select_bitmap, job_ptr, part_ptr, min_nodes,
+ max_nodes, req_nodes, test_only,
preemptee_candidates, preemptee_job_list);
}
#if 0
{
char *tmp_str = bitmap2node_name(*select_bitmap);
- info("job %u allocated nodes %s err:%u",
+ info("job %u allocated nodes %s err:%u",
job_ptr->job_id, tmp_str, error_code);
xfree(tmp_str);
}
@@ -560,7 +560,7 @@ _get_req_features(struct node_set *node_set_ptr, int node_set_size,
}
/*
- * _pick_best_nodes - from a weight order list of all nodes satisfying a
+ * _pick_best_nodes - from a weight order list of all nodes satisfying a
* job's specifications, select the "best" for use
* IN node_set_ptr - pointer to node specification information
* IN node_set_size - number of entries in records pointed to by node_set_ptr
@@ -573,26 +573,26 @@ _get_req_features(struct node_set *node_set_ptr, int node_set_size,
* IN test_only - do not actually allocate resources
* IN/OUT preemptee_job_list - list of pointers to jobs to be preempted
* NULL on first entry
- * RET SLURM_SUCCESS on success,
- * ESLURM_NODES_BUSY if request can not be satisfied now,
- * ESLURM_REQUESTED_NODE_CONFIG_UNAVAILABLE if request can never
- * be satisfied ,
- * ESLURM_REQUESTED_PART_CONFIG_UNAVAILABLE if the job can not be
+ * RET SLURM_SUCCESS on success,
+ * ESLURM_NODES_BUSY if request can not be satisfied now,
+ * ESLURM_REQUESTED_NODE_CONFIG_UNAVAILABLE if request can never
+ * be satisfied ,
+ * ESLURM_REQUESTED_PART_CONFIG_UNAVAILABLE if the job can not be
* initiated until the parition's configuration changes or
* ESLURM_NODE_NOT_AVAIL if required nodes are DOWN or DRAINED
* NOTE: the caller must FREE_NULL_BITMAP memory pointed to by select_bitmap
* Notes: The algorithm is
* 1) If required node list is specified, determine implicitly required
- * processor and node count
- * 2) Determine how many disjoint required "features" are represented
+ * processor and node count
+ * 2) Determine how many disjoint required "features" are represented
* (e.g. "FS1|FS2|FS3")
- * 3) For each feature: find matching node table entries, identify nodes
- * that are up and available (idle or shared) and add them to a bit
+ * 3) For each feature: find matching node table entries, identify nodes
+ * that are up and available (idle or shared) and add them to a bit
* map
- * 4) Select_g_job_test() to select the "best" of those based upon
+ * 4) Select_g_job_test() to select the "best" of those based upon
* topology and/or workload
- * 5) If request can't be satisfied now, execute select_g_job_test()
- * against the list of nodes that exist in any state (perhaps DOWN
+ * 5) If request can't be satisfied now, execute select_g_job_test()
+ * against the list of nodes that exist in any state (perhaps DOWN
* DRAINED or ALLOCATED) to determine if the request can
* ever be satified.
*/
@@ -605,7 +605,7 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
List *preemptee_job_list)
{
int error_code = SLURM_SUCCESS, i, j, pick_code;
- int total_nodes = 0, avail_nodes = 0;
+ int total_nodes = 0, avail_nodes = 0;
bitstr_t *avail_bitmap = NULL, *total_bitmap = NULL;
bitstr_t *backup_bitmap = NULL;
bitstr_t *possible_bitmap = NULL;
@@ -616,7 +616,7 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
bool tried_sched = false; /* Tried to schedule with avail nodes */
static uint32_t cr_enabled = NO_VAL;
bool preempt_flag = false;
- select_type_plugin_info_t cr_type = SELECT_TYPE_INFO_NONE;
+ select_type_plugin_info_t cr_type = SELECT_TYPE_INFO_NONE;
int shared = 0, select_mode;
if (test_only)
@@ -632,7 +632,7 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
/* Are Consumable Resources enabled? Check once. */
if (cr_enabled == NO_VAL) {
cr_enabled = 0; /* select/linear and bluegene are no-ops */
- error_code = select_g_get_info_from_plugin (SELECT_CR_PLUGIN,
+ error_code = select_g_get_info_from_plugin (SELECT_CR_PLUGIN,
NULL, &cr_enabled);
if (error_code != SLURM_SUCCESS) {
cr_enabled = NO_VAL;
@@ -647,7 +647,7 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
/* If job preemption is enabled, then do NOT limit the set of available
* nodes by their current 'sharable' or 'idle' setting */
if (slurm_get_preempt_mode() != PREEMPT_MODE_OFF)
- preempt_flag = true;
+ preempt_flag = true;
if (cr_enabled) {
/* Determine which nodes might be used by this job based upon
@@ -665,8 +665,8 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
FREE_NULL_BITMAP(partially_idle_node_bitmap);
return error_code;
}
- debug3("Job %u shared %d CR type %d num_procs %d nbits %d",
- job_ptr->job_id, shared, cr_enabled, cr_type,
+ debug3("Job %u shared %d CR type %d num_procs %d nbits %d",
+ job_ptr->job_id, shared, cr_enabled, cr_type,
job_ptr->num_procs,
bit_set_count(partially_idle_node_bitmap));
}
@@ -686,14 +686,14 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
/* check the availability of these nodes */
/* Should we check memory availability on these nodes? */
- if (!bit_super_set(job_ptr->details->req_node_bitmap,
+ if (!bit_super_set(job_ptr->details->req_node_bitmap,
avail_node_bitmap)) {
FREE_NULL_BITMAP(partially_idle_node_bitmap);
return ESLURM_NODE_NOT_AVAIL;
}
if (partially_idle_node_bitmap) {
- if (!bit_super_set(job_ptr->details->req_node_bitmap,
+ if (!bit_super_set(job_ptr->details->req_node_bitmap,
partially_idle_node_bitmap)) {
FREE_NULL_BITMAP(partially_idle_node_bitmap);
return ESLURM_NODES_BUSY;
@@ -703,7 +703,7 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
if (!preempt_flag) {
if (shared) {
if (!bit_super_set(job_ptr->details->
- req_node_bitmap,
+ req_node_bitmap,
share_node_bitmap)) {
FREE_NULL_BITMAP(
partially_idle_node_bitmap);
@@ -711,7 +711,7 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
}
} else {
if (!bit_super_set(job_ptr->details->
- req_node_bitmap,
+ req_node_bitmap,
idle_node_bitmap)) {
FREE_NULL_BITMAP(
partially_idle_node_bitmap);
@@ -720,12 +720,12 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
}
}
- /* still must go through select_g_job_test() to
+ /* still must go through select_g_job_test() to
* determine validity of request and/or perform
* set-up before job launch */
total_nodes = 0; /* reinitialize */
}
-
+
/* identify the min and max feature values for exclusive OR */
max_feature = -1;
min_feature = MAX_FEATURES;
@@ -741,7 +741,7 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
debug3("_pick_best_nodes: job %u idle_nodes %u share_nodes %u",
job_ptr->job_id, bit_set_count(idle_node_bitmap),
bit_set_count(share_node_bitmap));
- /* Accumulate resources for this job based upon its required
+ /* Accumulate resources for this job based upon its required
* features (possibly with node counts). */
for (j = min_feature; j <= max_feature; j++) {
for (i = 0; i < node_set_size; i++) {
@@ -749,7 +749,7 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
continue;
if (total_bitmap) {
- bit_or(total_bitmap,
+ bit_or(total_bitmap,
node_set_ptr[i].my_bitmap);
} else {
total_bitmap = bit_copy(
@@ -774,7 +774,7 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
}
}
if (avail_bitmap) {
- bit_or(avail_bitmap,
+ bit_or(avail_bitmap,
node_set_ptr[i].my_bitmap);
} else {
avail_bitmap = bit_copy(node_set_ptr[i].
@@ -785,9 +785,9 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
avail_nodes = bit_set_count(avail_bitmap);
tried_sched = false; /* need to test these nodes */
- if ((shared || preempt_flag) &&
- ((i+1) < node_set_size) &&
- (node_set_ptr[i].weight ==
+ if ((shared || preempt_flag) &&
+ ((i+1) < node_set_size) &&
+ (node_set_ptr[i].weight ==
node_set_ptr[i+1].weight)) {
/* Keep accumulating so we can pick the
* most lightly loaded nodes */
@@ -801,7 +801,7 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
continue; /* Keep accumulating nodes */
if ((job_ptr->details->req_node_bitmap) &&
- (!bit_super_set(job_ptr->details->req_node_bitmap,
+ (!bit_super_set(job_ptr->details->req_node_bitmap,
avail_bitmap)))
continue;
@@ -812,22 +812,22 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
list_destroy(*preemptee_job_list);
*preemptee_job_list = NULL;
}
- pick_code = select_g_job_test(job_ptr,
- avail_bitmap,
- min_nodes,
+ pick_code = select_g_job_test(job_ptr,
+ avail_bitmap,
+ min_nodes,
max_nodes,
req_nodes,
select_mode,
- preemptee_candidates,
+ preemptee_candidates,
preemptee_job_list);
#if 0
{
char *tmp_str1 = bitmap2node_name(backup_bitmap);
char *tmp_str2 = bitmap2node_name(avail_bitmap);
info("pick job:%u err:%d nodes:%u:%u:%u mode:%u "
- "select %s of %s",
- job_ptr->job_id, pick_code,
- min_nodes, req_nodes, max_nodes, select_mode,
+ "select %s of %s",
+ job_ptr->job_id, pick_code,
+ min_nodes, req_nodes, max_nodes, select_mode,
tmp_str2, tmp_str1);
xfree(tmp_str1);
xfree(tmp_str2);
@@ -837,7 +837,7 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
FREE_NULL_BITMAP(backup_bitmap);
if (bit_set_count(avail_bitmap) > max_nodes) {
/* end of tests for this feature */
- avail_nodes = 0;
+ avail_nodes = 0;
break;
}
FREE_NULL_BITMAP(partially_idle_node_bitmap);
@@ -856,15 +856,15 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
if (avail_bitmap && (!tried_sched) &&
(avail_nodes >= min_nodes) &&
((job_ptr->details->req_node_bitmap == NULL) ||
- bit_super_set(job_ptr->details->req_node_bitmap,
+ bit_super_set(job_ptr->details->req_node_bitmap,
avail_bitmap))) {
if (*preemptee_job_list) {
list_destroy(*preemptee_job_list);
*preemptee_job_list = NULL;
}
- pick_code = select_g_job_test(job_ptr, avail_bitmap,
+ pick_code = select_g_job_test(job_ptr, avail_bitmap,
min_nodes, max_nodes,
- req_nodes,
+ req_nodes,
select_mode,
preemptee_candidates,
preemptee_job_list);
@@ -878,7 +878,7 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
}
}
- /* determine if job could possibly run (if all configured
+ /* determine if job could possibly run (if all configured
* nodes available) */
if (total_bitmap)
total_nodes = bit_set_count(total_bitmap);
@@ -886,7 +886,7 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
(!runable_ever || !runable_avail) &&
(total_nodes >= min_nodes) &&
((job_ptr->details->req_node_bitmap == NULL) ||
- (bit_super_set(job_ptr->details->req_node_bitmap,
+ (bit_super_set(job_ptr->details->req_node_bitmap,
total_bitmap)))) {
if (!runable_avail) {
FREE_NULL_BITMAP(avail_bitmap);
@@ -894,12 +894,12 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
if (avail_bitmap == NULL)
fatal("bit_copy malloc failure");
bit_and(avail_bitmap, avail_node_bitmap);
- pick_code = select_g_job_test(job_ptr,
- avail_bitmap,
- min_nodes,
+ pick_code = select_g_job_test(job_ptr,
+ avail_bitmap,
+ min_nodes,
max_nodes,
req_nodes,
- SELECT_MODE_TEST_ONLY,
+ SELECT_MODE_TEST_ONLY,
preemptee_candidates, NULL);
if (pick_code == SLURM_SUCCESS) {
runable_ever = true;
@@ -912,12 +912,12 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
}
}
if (!runable_ever) {
- pick_code = select_g_job_test(job_ptr,
- total_bitmap,
- min_nodes,
+ pick_code = select_g_job_test(job_ptr,
+ total_bitmap,
+ min_nodes,
max_nodes,
- req_nodes,
- SELECT_MODE_TEST_ONLY,
+ req_nodes,
+ SELECT_MODE_TEST_ONLY,
preemptee_candidates, NULL);
if (pick_code == SLURM_SUCCESS) {
FREE_NULL_BITMAP(possible_bitmap);
@@ -933,19 +933,19 @@ _pick_best_nodes(struct node_set *node_set_ptr, int node_set_size,
break;
}
- /* The job is not able to start right now, return a
+ /* The job is not able to start right now, return a
* value indicating when the job can start */
if (!runable_avail)
error_code = ESLURM_REQUESTED_PART_CONFIG_UNAVAILABLE;
if (!runable_ever) {
error_code = ESLURM_REQUESTED_NODE_CONFIG_UNAVAILABLE;
- info("_pick_best_nodes: job %u never runnable",
+ info("_pick_best_nodes: job %u never runnable",
job_ptr->job_id);
}
if (error_code == SLURM_SUCCESS) {
error_code = ESLURM_NODES_BUSY;
- *select_bitmap = possible_bitmap;
+ *select_bitmap = possible_bitmap;
} else {
FREE_NULL_BITMAP(possible_bitmap);
}
@@ -973,7 +973,7 @@ static void _preempt_jobs(List preemptee_job_list, int *error_code)
if (mode == PREEMPT_MODE_CANCEL) {
rc = job_signal(job_ptr->job_id, SIGKILL, 0, 0);
if (rc == SLURM_SUCCESS) {
- info("preempted job %u has been killed",
+ info("preempted job %u has been killed",
job_ptr->job_id);
}
} else if (mode == PREEMPT_MODE_CHECKPOINT) {
@@ -1000,7 +1000,7 @@ static void _preempt_jobs(List preemptee_job_list, int *error_code)
info("preempted job %u had to be killed",
job_ptr->job_id);
else {
- info("preempted job %u kill failure %s",
+ info("preempted job %u kill failure %s",
job_ptr->job_id, slurm_strerror(rc));
}
}
@@ -1014,20 +1014,20 @@ static void _preempt_jobs(List preemptee_job_list, int *error_code)
/*
* select_nodes - select and allocate nodes to a specific job
* IN job_ptr - pointer to the job record
- * IN test_only - if set do not allocate nodes, just confirm they
+ * IN test_only - if set do not allocate nodes, just confirm they
* could be allocated now
* IN select_node_bitmap - bitmap of nodes to be used for the
* job's resource allocation (not returned if NULL), caller
* must free
* RET 0 on success, ESLURM code from slurm_errno.h otherwise
* globals: list_part - global list of partition info
- * default_part_loc - pointer to default partition
+ * default_part_loc - pointer to default partition
* config_list - global list of node configuration info
* Notes: The algorithm is
- * 1) Build a table (node_set_ptr) of nodes with the requisite
- * configuration. Each table entry includes their weight,
+ * 1) Build a table (node_set_ptr) of nodes with the requisite
+ * configuration. Each table entry includes their weight,
* node_list, features, etc.
- * 2) Call _pick_best_nodes() to select those nodes best satisfying
+ * 2) Call _pick_best_nodes() to select those nodes best satisfying
* the request, (e.g. best-fit or other criterion)
* 3) Call allocate_nodes() to perform the actual allocation
*/
@@ -1089,7 +1089,7 @@ extern int select_nodes(struct job_record *job_ptr, bool test_only,
/* insure that selected nodes in these node sets */
if (job_ptr->details->req_node_bitmap) {
- error_code = _nodes_in_sets(job_ptr->details->req_node_bitmap,
+ error_code = _nodes_in_sets(job_ptr->details->req_node_bitmap,
node_set_ptr, node_set_size);
if (error_code) {
info("No nodes satisfy requirements for JobId=%u",
@@ -1106,7 +1106,7 @@ extern int select_nodes(struct job_record *job_ptr, bool test_only,
if (job_ptr->details->max_nodes == 0)
max_nodes = part_ptr->max_nodes;
else
- max_nodes = MIN(job_ptr->details->max_nodes,
+ max_nodes = MIN(job_ptr->details->max_nodes,
part_ptr->max_nodes);
max_nodes = MIN(max_nodes, 500000); /* prevent overflows */
if (!job_ptr->limit_set_max_nodes &&
@@ -1174,8 +1174,8 @@ extern int select_nodes(struct job_record *job_ptr, bool test_only,
}
#endif /* HAVE_CRAY_XT */
- /* This job may be getting requeued, clear vestigial
- * state information before over-writting and leaking
+ /* This job may be getting requeued, clear vestigial
+ * state information before over-writting and leaking
* memory. */
FREE_NULL_BITMAP(job_ptr->node_bitmap);
xfree(job_ptr->nodes);
@@ -1189,12 +1189,12 @@ extern int select_nodes(struct job_record *job_ptr, bool test_only,
if (job_ptr->time_limit == NO_VAL)
job_ptr->time_limit = part_ptr->max_time;
if (job_ptr->time_limit == INFINITE)
- job_ptr->end_time = job_ptr->start_time +
+ job_ptr->end_time = job_ptr->start_time +
(365 * 24 * 60 * 60); /* secs in year */
else
- job_ptr->end_time = job_ptr->start_time +
+ job_ptr->end_time = job_ptr->start_time +
(job_ptr->time_limit * 60); /* secs */
-
+
if (select_g_job_begin(job_ptr) != SLURM_SUCCESS) {
/* Leave job queued, something is hosed */
error("select_g_job_begin(%u): %m", job_ptr->job_id);
@@ -1220,7 +1220,7 @@ extern int select_nodes(struct job_record *job_ptr, bool test_only,
configuring = IS_JOB_CONFIGURING(job_ptr);
job_ptr->job_state = JOB_RUNNING;
- if (configuring
+ if (configuring
|| bit_overlap(job_ptr->node_bitmap, power_node_bitmap))
job_ptr->job_state |= JOB_CONFIGURING;
if (select_g_select_nodeinfo_set(job_ptr) != SLURM_SUCCESS) {
@@ -1232,7 +1232,7 @@ extern int select_nodes(struct job_record *job_ptr, bool test_only,
acct_policy_job_begin(job_ptr);
- jobacct_storage_g_job_start(acct_db_conn, slurmctld_cluster_name,
+ jobacct_storage_g_job_start(acct_db_conn, slurmctld_cluster_name,
job_ptr);
prolog_slurmctld(job_ptr);
slurm_sched_newalloc(job_ptr);
@@ -1255,13 +1255,13 @@ extern int select_nodes(struct job_record *job_ptr, bool test_only,
return error_code;
}
-/*
- * _list_find_feature - find an entry in the feature list, see list.h for
- * documentation
+/*
+ * _list_find_feature - find an entry in the feature list, see list.h for
+ * documentation
* IN key - is feature name or NULL for all features
* RET 1 if found, 0 otherwise
*/
-static int _list_find_feature(void *feature_entry, void *key)
+static int _list_find_feature(void *feature_entry, void *key)
{
struct features_record *feature_ptr;
@@ -1281,7 +1281,7 @@ static int _list_find_feature(void *feature_entry, void *key)
* IN/OUT node_bitmap - nodes available for use, clear if unusable
* RET true if valid, false otherwise
*/
-static bool _valid_feature_counts(struct job_details *detail_ptr,
+static bool _valid_feature_counts(struct job_details *detail_ptr,
bitstr_t *node_bitmap, bool *has_xor)
{
ListIterator job_feat_iter;
@@ -1305,9 +1305,9 @@ static bool _valid_feature_counts(struct job_details *detail_ptr,
job_feat_iter = list_iterator_create(detail_ptr->feature_list);
if (job_feat_iter == NULL)
fatal("list_iterator_create malloc error");
- while ((job_feat_ptr = (struct feature_record *)
+ while ((job_feat_ptr = (struct feature_record *)
list_next(job_feat_iter))) {
- feat_ptr = list_find_first(feature_list, _list_find_feature,
+ feat_ptr = list_find_first(feature_list, _list_find_feature,
(void *) job_feat_ptr->name);
if (feat_ptr) {
if (last_op == FEATURE_OP_AND)
@@ -1319,7 +1319,7 @@ static bool _valid_feature_counts(struct job_details *detail_ptr,
bit_or(feature_bitmap, feat_ptr->node_bitmap);
} else { /* feature not found */
if (last_op == FEATURE_OP_AND) {
- bit_nclear(feature_bitmap, 0,
+ bit_nclear(feature_bitmap, 0,
(node_record_count - 1));
}
}
@@ -1334,12 +1334,12 @@ static bool _valid_feature_counts(struct job_details *detail_ptr,
feature_list);
if (job_feat_iter == NULL)
fatal("list_iterator_create malloc error");
- while ((job_feat_ptr = (struct feature_record *)
+ while ((job_feat_ptr = (struct feature_record *)
list_next(job_feat_iter))) {
if (job_feat_ptr->count == 0)
continue;
- feat_ptr = list_find_first(feature_list,
- _list_find_feature,
+ feat_ptr = list_find_first(feature_list,
+ _list_find_feature,
(void *)job_feat_ptr->name);
if (!feat_ptr) {
rc = false;
@@ -1375,7 +1375,7 @@ static bool _valid_feature_counts(struct job_details *detail_ptr,
* IN/OUT bitmap - set of nodes being considered for use
* RET SLURM_SUCCESS or EINVAL if can't filter (exclusive OR of features)
*/
-extern int job_req_node_filter(struct job_record *job_ptr,
+extern int job_req_node_filter(struct job_record *job_ptr,
bitstr_t *avail_bitmap)
{
int i;
@@ -1386,7 +1386,7 @@ extern int job_req_node_filter(struct job_record *job_ptr,
bool has_xor = false;
if (detail_ptr == NULL) {
- error("job_req_node_filter: job %u has no details",
+ error("job_req_node_filter: job %u has no details",
job_ptr->job_id);
return EINVAL;
}
@@ -1399,9 +1399,9 @@ extern int job_req_node_filter(struct job_record *job_ptr,
config_ptr = node_ptr->config_ptr;
if (slurmctld_conf.fast_schedule) {
if ((detail_ptr->job_min_cpus > config_ptr->cpus) ||
- ((detail_ptr->job_min_memory & (~MEM_PER_CPU)) >
+ ((detail_ptr->job_min_memory & (~MEM_PER_CPU)) >
config_ptr->real_memory) ||
- (detail_ptr->job_min_tmp_disk >
+ (detail_ptr->job_min_tmp_disk >
config_ptr->tmp_disk)) {
bit_clear(avail_bitmap, i);
continue;
@@ -1417,7 +1417,7 @@ extern int job_req_node_filter(struct job_record *job_ptr,
if ((detail_ptr->job_min_cpus > node_ptr->cpus) ||
((detail_ptr->job_min_memory & (~MEM_PER_CPU)) >
node_ptr->real_memory) ||
- (detail_ptr->job_min_tmp_disk >
+ (detail_ptr->job_min_tmp_disk >
node_ptr->tmp_disk)) {
bit_clear(avail_bitmap, i);
continue;
@@ -1446,9 +1446,9 @@ extern int job_req_node_filter(struct job_record *job_ptr,
* IN job_ptr - pointer to node to be scheduled
* OUT node_set_pptr - list of node sets which could be used for the job
* OUT node_set_size - number of node_set entries
- * RET error code
+ * RET error code
*/
-static int _build_node_list(struct job_record *job_ptr,
+static int _build_node_list(struct job_record *job_ptr,
struct node_set **node_set_pptr,
int *node_set_size)
{
@@ -1468,7 +1468,7 @@ static int _build_node_list(struct job_record *job_ptr,
if (job_ptr->resv_name) {
/* Limit node selection to those in selected reservation */
time_t start_res = time(NULL);
- rc = job_test_resv(job_ptr, &start_res, false,
+ rc = job_test_resv(job_ptr, &start_res, false,
&usable_node_mask);
if (rc != SLURM_SUCCESS) {
job_ptr->state_reason = WAIT_RESERVATION;
@@ -1479,7 +1479,7 @@ static int _build_node_list(struct job_record *job_ptr,
return ESLURM_REQUESTED_NODE_CONFIG_UNAVAILABLE;
}
if ((detail_ptr->req_node_bitmap) &&
- (!bit_super_set(detail_ptr->req_node_bitmap,
+ (!bit_super_set(detail_ptr->req_node_bitmap,
usable_node_mask))) {
job_ptr->state_reason = WAIT_RESERVATION;
xfree(job_ptr->state_desc);
@@ -1490,7 +1490,7 @@ static int _build_node_list(struct job_record *job_ptr,
}
node_set_inx = 0;
- node_set_ptr = (struct node_set *)
+ node_set_ptr = (struct node_set *)
xmalloc(sizeof(struct node_set) * 2);
node_set_ptr[node_set_inx+1].my_bitmap = NULL;
if (detail_ptr->exc_node_bitmap) {
@@ -1499,7 +1499,7 @@ static int _build_node_list(struct job_record *job_ptr,
bit_and(usable_node_mask, detail_ptr->exc_node_bitmap);
bit_not(detail_ptr->exc_node_bitmap);
} else {
- usable_node_mask =
+ usable_node_mask =
bit_copy(detail_ptr->exc_node_bitmap);
if (usable_node_mask == NULL)
fatal("bit_copy malloc failure");
@@ -1513,7 +1513,7 @@ static int _build_node_list(struct job_record *job_ptr,
}
if (!_valid_feature_counts(detail_ptr, usable_node_mask, &has_xor)) {
- info("No job %u feature requirements can not be met",
+ info("No job %u feature requirements can not be met",
job_ptr->job_id);
bit_free(usable_node_mask);
return ESLURM_REQUESTED_NODE_CONFIG_UNAVAILABLE;
@@ -1523,12 +1523,12 @@ static int _build_node_list(struct job_record *job_ptr,
if (config_iterator == NULL)
fatal("list_iterator_create malloc failure");
- while ((config_ptr = (struct config_record *)
+ while ((config_ptr = (struct config_record *)
list_next(config_iterator))) {
config_filter = 0;
if ((detail_ptr->job_min_cpus > config_ptr->cpus ) ||
- ((detail_ptr->job_min_memory & (~MEM_PER_CPU)) >
+ ((detail_ptr->job_min_memory & (~MEM_PER_CPU)) >
config_ptr->real_memory) ||
(detail_ptr->job_min_tmp_disk > config_ptr->tmp_disk))
config_filter = 1;
@@ -1537,7 +1537,7 @@ static int _build_node_list(struct job_record *job_ptr,
(mc_ptr->min_cores > config_ptr->cores ) ||
(mc_ptr->min_threads > config_ptr->threads )))
config_filter = 1;
-
+
/* since nodes can register with more resources than defined */
/* in the configuration, we want to use those higher values */
/* for scheduling, but only as needed (slower) */
@@ -1564,7 +1564,7 @@ static int _build_node_list(struct job_record *job_ptr,
bit_set_count(node_set_ptr[node_set_inx].my_bitmap);
if (check_node_config &&
(node_set_ptr[node_set_inx].nodes != 0)) {
- _filter_nodes_in_set(&node_set_ptr[node_set_inx],
+ _filter_nodes_in_set(&node_set_ptr[node_set_inx],
detail_ptr);
}
if (node_set_ptr[node_set_inx].nodes == 0) {
@@ -1573,7 +1573,7 @@ static int _build_node_list(struct job_record *job_ptr,
}
if (has_xor) {
- tmp_feature = _valid_features(job_ptr->details,
+ tmp_feature = _valid_features(job_ptr->details,
config_ptr);
if (tmp_feature == NULL) {
FREE_NULL_BITMAP(node_set_ptr[node_set_inx].
@@ -1594,7 +1594,7 @@ static int _build_node_list(struct job_record *job_ptr,
node_set_ptr[node_set_inx].weight =
config_ptr->weight;
max_weight = MAX(max_weight, config_ptr->weight);
- node_set_ptr[node_set_inx].features =
+ node_set_ptr[node_set_inx].features =
xstrdup(config_ptr->feature);
node_set_ptr[node_set_inx].feature_bits = tmp_feature;
debug2("found %d usable nodes from config containing %s",
@@ -1613,7 +1613,7 @@ static int _build_node_list(struct job_record *job_ptr,
FREE_NULL_BITMAP(usable_node_mask);
if (node_set_inx == 0) {
- info("No nodes satisfy job %u requirements",
+ info("No nodes satisfy job %u requirements",
job_ptr->job_id);
xfree(node_set_ptr);
return ESLURM_REQUESTED_NODE_CONFIG_UNAVAILABLE;
@@ -1645,7 +1645,7 @@ static int _build_node_list(struct job_record *job_ptr,
xstrdup(node_set_ptr[i].features);
node_set_ptr[node_set_inx].feature_bits =
bit_copy(node_set_ptr[i].feature_bits);
- node_set_ptr[node_set_inx].my_bitmap =
+ node_set_ptr[node_set_inx].my_bitmap =
bit_copy(node_set_ptr[i].my_bitmap);
bit_and(node_set_ptr[node_set_inx].my_bitmap,
power_node_bitmap);
@@ -1667,7 +1667,7 @@ static int _build_node_list(struct job_record *job_ptr,
return SLURM_SUCCESS;
}
-/* Remove from the node set any nodes which lack sufficient resources
+/* Remove from the node set any nodes which lack sufficient resources
* to satisfy the job's request */
static void _filter_nodes_in_set(struct node_set *node_set_ptr,
struct job_details *job_con)
@@ -1684,7 +1684,7 @@ static void _filter_nodes_in_set(struct node_set *node_set_ptr,
node_con = node_record_table_ptr[i].config_ptr;
if ((job_con->job_min_cpus <= node_con->cpus) &&
- ((job_con->job_min_memory & (~MEM_PER_CPU)) <=
+ ((job_con->job_min_memory & (~MEM_PER_CPU)) <=
node_con->real_memory) &&
(job_con->job_min_tmp_disk <= node_con->tmp_disk))
job_ok = 1;
@@ -1710,7 +1710,7 @@ static void _filter_nodes_in_set(struct node_set *node_set_ptr,
node_ptr = &node_record_table_ptr[i];
if ((job_con->job_min_cpus <= node_ptr->cpus) &&
- ((job_con->job_min_memory & (~MEM_PER_CPU)) <=
+ ((job_con->job_min_memory & (~MEM_PER_CPU)) <=
node_ptr->real_memory) &&
(job_con->job_min_tmp_disk <= node_ptr->tmp_disk))
job_ok = 1;
@@ -1731,13 +1731,13 @@ static void _filter_nodes_in_set(struct node_set *node_set_ptr,
/*
* _nodes_in_sets - Determine if required nodes are included in node_set(s)
- * IN req_bitmap - nodes specifically required by the job
+ * IN req_bitmap - nodes specifically required by the job
* IN node_set_ptr - sets of valid nodes
* IN node_set_size - count of node_set entries
* RET 0 if in set, otherwise an error code
*/
-static int _nodes_in_sets(bitstr_t *req_bitmap,
- struct node_set * node_set_ptr,
+static int _nodes_in_sets(bitstr_t *req_bitmap,
+ struct node_set * node_set_ptr,
int node_set_size)
{
bitstr_t *scratch_bitmap = NULL;
@@ -1780,13 +1780,13 @@ extern void build_node_details(struct job_record *job_ptr)
job_ptr->node_addr = NULL;
return;
}
-
+
/* Use hostlist here to insure ordering of info matches that of srun */
if ((host_list = hostlist_create(job_ptr->nodes)) == NULL)
fatal("hostlist_create error for %s: %m", job_ptr->nodes);
- job_ptr->node_cnt = hostlist_count(host_list);
- xrealloc(job_ptr->node_addr,
- (sizeof(slurm_addr) * job_ptr->node_cnt));
+ job_ptr->node_cnt = hostlist_count(host_list);
+ xrealloc(job_ptr->node_addr,
+ (sizeof(slurm_addr) * job_ptr->node_cnt));
while ((this_node_name = hostlist_shift(host_list))) {
if ((node_ptr = find_node_record(this_node_name))) {
@@ -1810,16 +1810,16 @@ extern void build_node_details(struct job_record *job_ptr)
* the available nodes. This is only used for XOR operators.
* IN details_ptr - job requirement details, includes requested features
* IN config_ptr - node's configuration record
- * RET NULL if request is not satisfied, otherwise a bitmap indicating
+ * RET NULL if request is not satisfied, otherwise a bitmap indicating
* which mutually exclusive features are satisfied. For example
* _valid_features("[fs1|fs2|fs3|fs4]", "fs3") returns a bitmap with
* the third bit set. For another example
- * _valid_features("[fs1|fs2|fs3|fs4]", "fs1,fs3") returns a bitmap
+ * _valid_features("[fs1|fs2|fs3|fs4]", "fs1,fs3") returns a bitmap
* with the first and third bits set. The function returns a bitmap
- * with the first bit set if requirements are satisfied without a
+ * with the first bit set if requirements are satisfied without a
* mutually exclusive feature list.
*/
-static bitstr_t *_valid_features(struct job_details *details_ptr,
+static bitstr_t *_valid_features(struct job_details *details_ptr,
struct config_record *config_ptr)
{
bitstr_t *result_bits = (bitstr_t *) NULL;
@@ -1839,15 +1839,15 @@ static bitstr_t *_valid_features(struct job_details *details_ptr,
feat_iter = list_iterator_create(details_ptr->feature_list);
if (feat_iter == NULL)
fatal("list_iterator_create malloc failure");
- while ((job_feat_ptr = (struct feature_record *)
+ while ((job_feat_ptr = (struct feature_record *)
list_next(feat_iter))) {
if ((job_feat_ptr->op_code == FEATURE_OP_XOR) ||
(last_op == FEATURE_OP_XOR)) {
- feat_ptr = list_find_first(feature_list,
+ feat_ptr = list_find_first(feature_list,
_list_find_feature,
(void *)job_feat_ptr->name);
- if (feat_ptr &&
- bit_super_set(config_ptr->node_bitmap,
+ if (feat_ptr &&
+ bit_super_set(config_ptr->node_bitmap,
feat_ptr->node_bitmap)) {
bit_set(result_bits, position);
}
@@ -1861,7 +1861,7 @@ static bitstr_t *_valid_features(struct job_details *details_ptr,
}
/*
- * re_kill_job - for a given job, deallocate its nodes for a second time,
+ * re_kill_job - for a given job, deallocate its nodes for a second time,
* basically a cleanup for failed deallocate() calls
* IN job_ptr - pointer to terminating job (already in some COMPLETING state)
* globals: node_record_count - number of nodes in the system
@@ -1900,7 +1900,7 @@ extern void re_kill_job(struct job_record *job_ptr)
if ((job_ptr->node_bitmap == NULL) ||
(bit_test(job_ptr->node_bitmap, i) == 0))
continue;
- if (IS_NODE_DOWN(node_ptr)) {
+ if (IS_NODE_DOWN(node_ptr)) {
/* Consider job already completed */
bit_clear(job_ptr->node_bitmap, i);
if (node_ptr->comp_job_cnt)
@@ -1933,7 +1933,7 @@ extern void re_kill_job(struct job_record *job_ptr)
return;
}
hostlist_uniq(kill_hostlist);
- hostlist_ranged_string(kill_hostlist,
+ hostlist_ranged_string(kill_hostlist,
sizeof(host_str), host_str);
#ifdef HAVE_BG
if (job_ptr->job_id != last_job_id) {
diff --git a/src/slurmctld/node_scheduler.h b/src/slurmctld/node_scheduler.h
index d8ae5d80a1a32af3b4cb515826b00ced2477d098..a3d8cd10273b1fd4a8164e6a225a2386a9894efe 100644
--- a/src/slurmctld/node_scheduler.h
+++ b/src/slurmctld/node_scheduler.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -67,7 +67,7 @@ extern void deallocate_nodes(struct job_record *job_ptr, bool timeout,
bool suspended);
/*
- * re_kill_job - for a given job, deallocate its nodes for a second time,
+ * re_kill_job - for a given job, deallocate its nodes for a second time,
* basically a cleanup for failed deallocate() calls
* IN job_ptr - pointer to terminating job (already in some COMPLETING state)
* globals: node_record_count - number of nodes in the system
@@ -78,20 +78,20 @@ extern void re_kill_job(struct job_record *job_ptr);
/*
* select_nodes - select and allocate nodes to a specific job
* IN job_ptr - pointer to the job record
- * IN test_only - if set do not allocate nodes, just confirm they
+ * IN test_only - if set do not allocate nodes, just confirm they
* could be allocated now
* IN select_node_bitmap - bitmap of nodes to be used for the
* job's resource allocation (not returned if NULL), caller
* must free
* RET 0 on success, ESLURM code from slurm_errno.h otherwise
* globals: list_part - global list of partition info
- * default_part_loc - pointer to default partition
+ * default_part_loc - pointer to default partition
* config_list - global list of node configuration info
* Notes: The algorithm is
- * 1) Build a table (node_set_ptr) of nodes with the requisite
- * configuration. Each table entry includes their weight,
+ * 1) Build a table (node_set_ptr) of nodes with the requisite
+ * configuration. Each table entry includes their weight,
* node_list, features, etc.
- * 2) Call _pick_best_nodes() to select those nodes best satisfying
+ * 2) Call _pick_best_nodes() to select those nodes best satisfying
* the request, (e.g. best-fit or other criterion)
* 3) Call allocate_nodes() to perform the actual allocation
*/
diff --git a/src/slurmctld/partition_mgr.c b/src/slurmctld/partition_mgr.c
index fb0184f12d2adf9bb133b357ec3743c7bafc39ff..8b2aacc9d6f7b8b3fa1aa24b203645cc03505723 100644
--- a/src/slurmctld/partition_mgr.c
+++ b/src/slurmctld/partition_mgr.c
@@ -9,32 +9,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -100,17 +100,17 @@ static time_t _get_group_tlm(void);
static void _list_delete_part(void *part_entry);
static int _open_part_state_file(char **state_file);
static int _uid_list_size(uid_t * uid_list_ptr);
-static void _unlink_free_nodes(bitstr_t *old_bitmap,
+static void _unlink_free_nodes(bitstr_t *old_bitmap,
struct part_record *part_ptr);
/*
- * _build_part_bitmap - update the total_cpus, total_nodes, and node_bitmap
- * for the specified partition, also reset the partition pointers in
+ * _build_part_bitmap - update the total_cpus, total_nodes, and node_bitmap
+ * for the specified partition, also reset the partition pointers in
* the node back to this partition.
* IN part_ptr - pointer to the partition
* RET 0 if no error, errno otherwise
* global: node_record_table_ptr - pointer to global node table
- * NOTE: this does not report nodes defined in more than one partition. this
+ * NOTE: this does not report nodes defined in more than one partition. this
* is checked only upon reading the configuration file, not on an update
*/
static int _build_part_bitmap(struct part_record *part_ptr)
@@ -185,7 +185,7 @@ static int _build_part_bitmap(struct part_record *part_ptr)
}
/* unlink nodes removed from a partition */
-static void _unlink_free_nodes(bitstr_t *old_bitmap,
+static void _unlink_free_nodes(bitstr_t *old_bitmap,
struct part_record *part_ptr)
{
int i, j, k, update_nodes = 0;
@@ -203,7 +203,7 @@ static void _unlink_free_nodes(bitstr_t *old_bitmap,
continue;
node_ptr->part_cnt--;
for (k=j; k<node_ptr->part_cnt; k++) {
- node_ptr->part_pptr[k] =
+ node_ptr->part_pptr[k] =
node_ptr->part_pptr[k+1];
}
break;
@@ -216,7 +216,7 @@ static void _unlink_free_nodes(bitstr_t *old_bitmap,
}
-/*
+/*
* create_part_record - create a partition record
* RET a pointer to the record or NULL if error
* global: part_list - global partition list
@@ -246,7 +246,7 @@ struct part_record *create_part_record(void)
part_ptr->max_share = default_part.max_share;
part_ptr->priority = default_part.priority;
if(part_max_priority)
- part_ptr->norm_priority = (double)default_part.priority
+ part_ptr->norm_priority = (double)default_part.priority
/ (double)part_max_priority;
part_ptr->node_bitmap = NULL;
@@ -273,9 +273,9 @@ struct part_record *create_part_record(void)
}
-/*
+/*
* _delete_part_record - delete record for partition with specified name
- * IN name - name of the desired node, delete all partitions if NULL
+ * IN name - name of the desired node, delete all partitions if NULL
* RET 0 on success, errno otherwise
* global: part_list - global partition list
*/
@@ -390,7 +390,7 @@ int dump_all_part_state(void)
/*
* _dump_part_state - dump the state of a specific partition to a buffer
- * IN part_ptr - pointer to partition for which information
+ * IN part_ptr - pointer to partition for which information
* is requested
* IN/OUT buffer - location to store data, pointers automatically advanced
*/
@@ -435,10 +435,10 @@ static int _open_part_state_file(char **state_file)
xstrcat(*state_file, "/part_state");
state_fd = open(*state_file, O_RDONLY);
if (state_fd < 0) {
- error("Could not open partition state file %s: %m",
+ error("Could not open partition state file %s: %m",
*state_file);
} else if (fstat(state_fd, &stat_buf) < 0) {
- error("Could not stat partition state file %s: %m",
+ error("Could not stat partition state file %s: %m",
*state_file);
(void) close(state_fd);
} else if (stat_buf.st_size < 10) {
@@ -454,8 +454,8 @@ static int _open_part_state_file(char **state_file)
}
/*
- * load_all_part_state - load the partition state from file, recover on
- * slurmctld restart. execute this after loading the configuration
+ * load_all_part_state - load the partition state from file, recover on
+ * slurmctld restart. execute this after loading the configuration
* file data.
* NOTE: READ lock_slurmctld config before entry
*/
@@ -485,13 +485,13 @@ int load_all_part_state(void)
data_allocated = BUF_SIZE;
data = xmalloc(data_allocated);
while (1) {
- data_read = read(state_fd, &data[data_size],
+ data_read = read(state_fd, &data[data_size],
BUF_SIZE);
if (data_read < 0) {
if (errno == EINTR)
continue;
else {
- error("Read error on %s: %m",
+ error("Read error on %s: %m",
state_file);
break;
}
@@ -534,7 +534,7 @@ int load_all_part_state(void)
safe_unpack16(&max_share, buffer);
safe_unpack16(&priority, buffer);
- if(priority > part_max_priority)
+ if(priority > part_max_priority)
part_max_priority = priority;
safe_unpack16(&state_up, buffer);
@@ -558,7 +558,7 @@ int load_all_part_state(void)
}
/* find record and perform update */
- part_ptr = list_find_first(part_list, &list_find_part,
+ part_ptr = list_find_first(part_list, &list_find_part,
part_name);
if (part_ptr) {
@@ -579,9 +579,9 @@ int load_all_part_state(void)
part_ptr->max_share = max_share;
part_ptr->priority = priority;
- if(part_max_priority)
- part_ptr->norm_priority =
- (double)part_ptr->priority
+ if(part_max_priority)
+ part_ptr->norm_priority =
+ (double)part_ptr->priority
/ (double)part_max_priority;
part_ptr->state_up = state_up;
@@ -610,9 +610,9 @@ int load_all_part_state(void)
return EFAULT;
}
-/*
+/*
* find_part_record - find a record for partition with specified name
- * IN name - name of the desired partition
+ * IN name - name of the desired partition
* RET pointer to node partition or NULL if not found
* global: part_list - global partition list
*/
@@ -622,9 +622,9 @@ struct part_record *find_part_record(char *name)
}
-/*
- * init_part_conf - initialize the default partition configuration values
- * and create a (global) partition list.
+/*
+ * init_part_conf - initialize the default partition configuration values
+ * and create a (global) partition list.
* this should be called before creating any partition entries.
* RET 0 if no error, otherwise an error code
* global: default_part - default partition values
@@ -672,7 +672,7 @@ int init_part_conf(void)
}
/*
- * _list_delete_part - delete an entry from the global partition list,
+ * _list_delete_part - delete an entry from the global partition list,
* see common/list.h for documentation
* global: node_record_count - count of nodes in the system
* node_record_table_ptr - pointer to global node table
@@ -691,7 +691,7 @@ static void _list_delete_part(void *part_entry)
continue;
node_ptr->part_cnt--;
for (k=j; k<node_ptr->part_cnt; k++) {
- node_ptr->part_pptr[k] =
+ node_ptr->part_pptr[k] =
node_ptr->part_pptr[k+1];
}
break;
@@ -708,10 +708,10 @@ static void _list_delete_part(void *part_entry)
/*
- * list_find_part - find an entry in the partition list, see common/list.h
+ * list_find_part - find an entry in the partition list, see common/list.h
* for documentation
- * IN key - partition name or "universal_key" for all partitions
- * RET 1 if matches key, 0 otherwise
+ * IN key - partition name or "universal_key" for all partitions
+ * RET 1 if matches key, 0 otherwise
* global- part_list - the global partition list
*/
int list_find_part(void *part_entry, void *key)
@@ -728,7 +728,7 @@ int list_find_part(void *part_entry, void *key)
return 0;
}
-/* part_filter_set - Set the partition's hidden flag based upon a user's
+/* part_filter_set - Set the partition's hidden flag based upon a user's
* group access. This must be followed by a call to part_filter_clear() */
extern void part_filter_set(uid_t uid)
{
@@ -759,8 +759,8 @@ extern void part_filter_clear(void)
list_iterator_destroy(part_iterator);
}
-/*
- * pack_all_part - dump all partition information for all partitions in
+/*
+ * pack_all_part - dump all partition information for all partitions in
* machine independent form (for network transmission)
* OUT buffer_ptr - the pointer is set to the allocated buffer.
* OUT buffer_size - set to size of the buffer in bytes
@@ -770,7 +770,7 @@ extern void part_filter_clear(void)
* NOTE: the buffer at *buffer_ptr must be xfreed by the caller
* NOTE: change slurm_load_part() in api/part_info.c if data format changes
*/
-extern void pack_all_part(char **buffer_ptr, int *buffer_size,
+extern void pack_all_part(char **buffer_ptr, int *buffer_size,
uint16_t show_flags, uid_t uid)
{
ListIterator part_iterator;
@@ -795,7 +795,7 @@ extern void pack_all_part(char **buffer_ptr, int *buffer_size,
while ((part_ptr = (struct part_record *) list_next(part_iterator))) {
xassert (part_ptr->magic == PART_MAGIC);
if (((show_flags & SHOW_ALL) == 0) && (uid != 0) &&
- ((part_ptr->hidden)
+ ((part_ptr->hidden)
|| (validate_group (part_ptr, uid) == 0)))
continue;
pack_part(part_ptr, buffer);
@@ -814,11 +814,11 @@ extern void pack_all_part(char **buffer_ptr, int *buffer_size,
}
-/*
- * pack_part - dump all configuration information about a specific partition
+/*
+ * pack_part - dump all configuration information about a specific partition
* in machine independent form (for network transmission)
* IN part_ptr - pointer to partition for which information is requested
- * IN/OUT buffer - buffer in which data is placed, pointers automatically
+ * IN/OUT buffer - buffer in which data is placed, pointers automatically
* updated
* global: default_part_loc - pointer to the default partition
* NOTE: if you make any changes here be sure to make the corresponding changes
@@ -840,7 +840,7 @@ void pack_part(struct part_record *part_ptr, Buf buffer)
pack32(part_ptr->max_nodes_orig, buffer);
pack32(part_ptr->min_nodes_orig, buffer);
altered = part_ptr->total_nodes;
- select_g_alter_node_cnt(SELECT_APPLY_NODE_MAX_OFFSET,
+ select_g_alter_node_cnt(SELECT_APPLY_NODE_MAX_OFFSET,
&altered);
pack32(altered, buffer);
pack32(part_ptr->total_cpus, buffer);
@@ -859,7 +859,7 @@ void pack_part(struct part_record *part_ptr, Buf buffer)
}
-/*
+/*
* update_part - create or update a partition's configuration data
* IN part_desc - description of partition changes
* IN create_flag - create a new partition
@@ -878,7 +878,7 @@ extern int update_part (update_part_msg_t * part_desc, bool create_flag)
}
error_code = SLURM_SUCCESS;
- part_ptr = list_find_first(part_list, &list_find_part,
+ part_ptr = list_find_first(part_list, &list_find_part,
part_desc->name);
if (create_flag) {
@@ -909,24 +909,24 @@ extern int update_part (update_part_msg_t * part_desc, bool create_flag)
}
if (part_desc->max_time != NO_VAL) {
- info("update_part: setting max_time to %u for partition %s",
+ info("update_part: setting max_time to %u for partition %s",
part_desc->max_time, part_desc->name);
part_ptr->max_time = part_desc->max_time;
}
- if ((part_desc->default_time != NO_VAL) &&
+ if ((part_desc->default_time != NO_VAL) &&
(part_desc->default_time > part_ptr->max_time)) {
info("update_part: DefaultTime would exceed MaxTime for "
"partition %s", part_desc->name);
} else if (part_desc->default_time != NO_VAL) {
info("update_part: setting default_time to %u "
- "for partition %s",
+ "for partition %s",
part_desc->default_time, part_desc->name);
part_ptr->default_time = part_desc->default_time;
}
if (part_desc->max_nodes != NO_VAL) {
- info("update_part: setting max_nodes to %u for partition %s",
+ info("update_part: setting max_nodes to %u for partition %s",
part_desc->max_nodes, part_desc->name);
part_ptr->max_nodes = part_desc->max_nodes;
part_ptr->max_nodes_orig = part_desc->max_nodes;
@@ -935,7 +935,7 @@ extern int update_part (update_part_msg_t * part_desc, bool create_flag)
}
if (part_desc->min_nodes != NO_VAL) {
- info("update_part: setting min_nodes to %u for partition %s",
+ info("update_part: setting min_nodes to %u for partition %s",
part_desc->min_nodes, part_desc->name);
part_ptr->min_nodes = part_desc->min_nodes;
part_ptr->min_nodes_orig = part_desc->min_nodes;
@@ -944,13 +944,13 @@ extern int update_part (update_part_msg_t * part_desc, bool create_flag)
}
if (part_desc->root_only != (uint16_t) NO_VAL) {
- info("update_part: setting root_only to %u for partition %s",
+ info("update_part: setting root_only to %u for partition %s",
part_desc->root_only, part_desc->name);
part_ptr->root_only = part_desc->root_only;
}
if (part_desc->state_up != (uint16_t) NO_VAL) {
- info("update_part: setting state_up to %u for partition %s",
+ info("update_part: setting state_up to %u for partition %s",
part_desc->state_up, part_desc->name);
part_ptr->state_up = part_desc->state_up;
}
@@ -976,7 +976,7 @@ extern int update_part (update_part_msg_t * part_desc, bool create_flag)
info("update_part: setting priority to %u for partition %s",
part_desc->priority, part_desc->name);
part_ptr->priority = part_desc->priority;
-
+
/* If the max_priority changes we need to change all
the normalized priorities of all the other
partitions. If not then just set this partitions.
@@ -988,23 +988,23 @@ extern int update_part (update_part_msg_t * part_desc, bool create_flag)
part_max_priority = part_ptr->priority;
while((part2 = list_next(itr))) {
- part2->norm_priority = (double)part2->priority
+ part2->norm_priority = (double)part2->priority
/ (double)part_max_priority;
}
list_iterator_destroy(itr);
} else {
- part_ptr->norm_priority = (double)part_ptr->priority
+ part_ptr->norm_priority = (double)part_ptr->priority
/ (double)part_max_priority;
}
}
if (part_desc->default_part == 1) {
if (default_part_name == NULL) {
- info("update_part: setting default partition to %s",
+ info("update_part: setting default partition to %s",
part_desc->name);
} else if (strcmp(default_part_name, part_desc->name) != 0) {
info("update_part: changing default "
- "partition from %s to %s",
+ "partition from %s to %s",
default_part_name, part_desc->name);
}
xfree(default_part_name);
@@ -1018,13 +1018,13 @@ extern int update_part (update_part_msg_t * part_desc, bool create_flag)
if ((strcasecmp(part_desc->allow_groups, "ALL") == 0) ||
(part_desc->allow_groups[0] == '\0')) {
info("update_part: setting allow_groups to ALL for "
- "partition %s",
+ "partition %s",
part_desc->name);
} else {
part_ptr->allow_groups = part_desc->allow_groups;
part_desc->allow_groups = NULL;
info("update_part: setting allow_groups to %s for "
- "partition %s",
+ "partition %s",
part_ptr->allow_groups, part_desc->name);
part_ptr->allow_uids =
_get_groups_members(part_ptr->allow_groups);
@@ -1044,7 +1044,7 @@ extern int update_part (update_part_msg_t * part_desc, bool create_flag)
allow_alloc_nodes;
part_desc->allow_alloc_nodes = NULL;
info("update_part: setting allow_alloc_nodes to %s for "
- "partition %s",
+ "partition %s",
part_ptr->allow_alloc_nodes, part_desc->name);
}
}
@@ -1069,7 +1069,7 @@ extern int update_part (update_part_msg_t * part_desc, bool create_flag)
part_ptr->nodes = backup_node_list;
} else {
info("update_part: setting nodes to %s "
- "for partition %s",
+ "for partition %s",
part_ptr->nodes, part_desc->name);
xfree(backup_node_list);
}
@@ -1082,7 +1082,7 @@ extern int update_part (update_part_msg_t * part_desc, bool create_flag)
slurm_sched_partition_change(); /* notify sched plugin */
select_g_reconfigure(); /* notify select plugin too */
reset_job_priority(); /* free jobs */
-
+
/* I am not sure why this was ever there (da) */
/* if (select_g_block_init(part_list) != SLURM_SUCCESS ) */
/* error("failed to update node selection plugin state"); */
@@ -1093,7 +1093,7 @@ extern int update_part (update_part_msg_t * part_desc, bool create_flag)
/*
- * validate_group - validate that the submit uid is authorized to run in
+ * validate_group - validate that the submit uid is authorized to run in
* this partition
* IN part_ptr - pointer to a partition
* IN run_uid - user to run the job as
@@ -1109,7 +1109,7 @@ extern int validate_group(struct part_record *part_ptr, uid_t run_uid)
return 1; /* super-user can run anywhere */
if (part_ptr->allow_uids == NULL)
return 0; /* no non-super-users in the list */
-
+
for (i = 0; part_ptr->allow_uids[i]; i++) {
if (part_ptr->allow_uids[i] == run_uid)
return 1;
@@ -1128,22 +1128,22 @@ extern int validate_group(struct part_record *part_ptr, uid_t run_uid)
extern int validate_alloc_node(struct part_record *part_ptr, char* alloc_node)
{
int status;
-
+
if (part_ptr->allow_alloc_nodes == NULL)
return 1; /* all allocating nodes allowed */
if (alloc_node == NULL)
return 1; /* if no allocating node defined
* let it go */
-
+
hostlist_t hl = hostlist_create(part_ptr->allow_alloc_nodes);
status=hostlist_find(hl,alloc_node);
hostlist_destroy(hl);
-
+
if(status==-1)
status=0;
else
status=1;
-
+
return status;
}
@@ -1176,10 +1176,10 @@ void load_part_uid_allow_list(int force)
}
-/*
+/*
* _get_groups_members - indentify the users in a list of group names
* IN group_names - a comma delimited list of group names
- * RET a zero terminated list of its UIDs or NULL on error
+ * RET a zero terminated list of its UIDs or NULL on error
* NOTE: User root has implicitly access to every group
* NOTE: The caller must xfree non-NULL return values
*/
@@ -1217,10 +1217,10 @@ uid_t *_get_groups_members(char *group_names)
return group_uids;
}
-/*
+/*
* _get_group_members - indentify the users in a given group name
* IN group_name - a single group name
- * RET a zero terminated list of its UIDs or NULL on error
+ * RET a zero terminated list of its UIDs or NULL on error
* NOTE: User root has implicitly access to every group
* NOTE: The caller must xfree non-NULL return values
*/
@@ -1237,10 +1237,10 @@ uid_t *_get_group_members(char *group_name)
FILE *fp = NULL;
#endif
- /* We need to check for !grp_result, since it appears some
+ /* We need to check for !grp_result, since it appears some
* versions of this function do not return an error on failure.
*/
- if (getgrnam_r(group_name, &grp, grp_buffer, PW_BUF_SIZE,
+ if (getgrnam_r(group_name, &grp, grp_buffer, PW_BUF_SIZE,
&grp_result) || (grp_result == NULL)) {
error("Could not find configured group %s", group_name);
return NULL;
@@ -1288,14 +1288,14 @@ uid_t *_get_group_members(char *group_name)
for (i=0; j < uid_cnt; i++) {
if (grp_result->gr_mem[i] == NULL)
break;
- if (uid_from_string(grp_result->gr_mem[i],
+ if (uid_from_string(grp_result->gr_mem[i],
&my_uid) < 0)
error("Could not find user %s in "
"configured group %s",
grp_result->gr_mem[i],
group_name);
else if (my_uid)
- group_uids[j++] = my_uid;
+ group_uids[j++] = my_uid;
}
}
}
@@ -1373,7 +1373,7 @@ static int _uid_list_size(uid_t * uid_list_ptr)
}
/* part_fini - free all memory associated with partition records */
-void part_fini (void)
+void part_fini (void)
{
if (part_list) {
list_destroy(part_list);
@@ -1385,7 +1385,7 @@ void part_fini (void)
}
/*
- * delete_partition - delete the specified partition (actually leave
+ * delete_partition - delete the specified partition (actually leave
* the entry, just flag it as defunct)
* IN job_specs - job specification from RPC
*/
diff --git a/src/slurmctld/ping_nodes.c b/src/slurmctld/ping_nodes.c
index 12bea1dbd9befadc11be9af7603e6a085a5ee1c1..079122a2922f4650932d08dd238ef4e052da386b 100644
--- a/src/slurmctld/ping_nodes.c
+++ b/src/slurmctld/ping_nodes.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -66,7 +66,7 @@ static int ping_count = 0;
/*
* is_ping_done - test if the last node ping cycle has completed.
- * Use this to avoid starting a new set of ping requests before the
+ * Use this to avoid starting a new set of ping requests before the
* previous one completes
* RET true if ping process is done, false otherwise
*/
@@ -83,9 +83,9 @@ bool is_ping_done (void)
}
/*
- * ping_begin - record that a ping cycle has begin. This can be called more
- * than once (for REQUEST_PING and simultaneous REQUEST_NODE_REGISTRATION
- * for selected nodes). Matching ping_end calls must be made for each
+ * ping_begin - record that a ping cycle has begin. This can be called more
+ * than once (for REQUEST_PING and simultaneous REQUEST_NODE_REGISTRATION
+ * for selected nodes). Matching ping_end calls must be made for each
* before is_ping_done returns true.
*/
void ping_begin (void)
@@ -96,9 +96,9 @@ void ping_begin (void)
}
/*
- * ping_end - record that a ping cycle has ended. This can be called more
- * than once (for REQUEST_PING and simultaneous REQUEST_NODE_REGISTRATION
- * for selected nodes). Matching ping_end calls must be made for each
+ * ping_end - record that a ping cycle has ended. This can be called more
+ * than once (for REQUEST_PING and simultaneous REQUEST_NODE_REGISTRATION
+ * for selected nodes). Matching ping_end calls must be made for each
* before is_ping_done returns true.
*/
void ping_end (void)
@@ -112,14 +112,14 @@ void ping_end (void)
}
/*
- * ping_nodes - check that all nodes and daemons are alive,
+ * ping_nodes - check that all nodes and daemons are alive,
* get nodes in UNKNOWN state to register
*/
void ping_nodes (void)
{
static int offset = 0; /* mutex via node table write lock on entry */
static int max_reg_threads = 0; /* max node registration threads
- * this can include DOWN nodes, so
+ * this can include DOWN nodes, so
* limit the number to avoid huge
* communication delays */
int i;
@@ -133,27 +133,27 @@ void ping_nodes (void)
struct node_record *node_ptr;
now = time (NULL);
-
+
ping_agent_args = xmalloc (sizeof (agent_arg_t));
ping_agent_args->msg_type = REQUEST_PING;
ping_agent_args->retry = 0;
ping_agent_args->hostlist = hostlist_create("");
-
+
reg_agent_args = xmalloc (sizeof (agent_arg_t));
reg_agent_args->msg_type = REQUEST_NODE_REGISTRATION_STATUS;
reg_agent_args->retry = 0;
reg_agent_args->hostlist = hostlist_create("");
-
+
/*
* If there are a large number of down nodes, the node ping
- * can take a long time to complete:
+ * can take a long time to complete:
* ping_time = down_nodes * agent_timeout / agent_parallelism
* ping_time = down_nodes * 10_seconds / 10
* ping_time = down_nodes (seconds)
- * Because of this, we extend the SlurmdTimeout by the
+ * Because of this, we extend the SlurmdTimeout by the
* time needed to complete a ping of all nodes.
*/
- if ((slurmctld_conf.slurmd_timeout == 0)
+ if ((slurmctld_conf.slurmd_timeout == 0)
|| (last_ping_time == (time_t) 0)) {
node_dead_time = (time_t) 0;
} else {
@@ -167,11 +167,11 @@ void ping_nodes (void)
max_reg_threads = MAX(slurm_get_tree_width(), 1);
}
offset += max_reg_threads;
- if ((offset > node_record_count) &&
+ if ((offset > node_record_count) &&
(offset >= (max_reg_threads * MAX_REG_FREQUENCY)))
offset = 0;
- for (i=0, node_ptr=node_record_table_ptr;
+ for (i=0, node_ptr=node_record_table_ptr;
i<node_record_count; i++, node_ptr++) {
if (IS_NODE_FUTURE(node_ptr) || IS_NODE_POWER_SAVE(node_ptr))
continue;
@@ -187,7 +187,7 @@ void ping_nodes (void)
(void) hostlist_push_host(down_hostlist,
node_ptr->name);
else
- down_hostlist =
+ down_hostlist =
hostlist_create(node_ptr->name);
set_node_down(node_ptr->name, "Not responding");
node_ptr->not_responding = false; /* logged below */
@@ -205,21 +205,21 @@ void ping_nodes (void)
continue;
#endif
- /* Request a node registration if its state is UNKNOWN or
- * on a periodic basis (about every MAX_REG_FREQUENCY ping,
- * this mechanism avoids an additional (per node) timer or
- * counter and gets updated configuration information
- * once in a while). We limit these requests since they
+ /* Request a node registration if its state is UNKNOWN or
+ * on a periodic basis (about every MAX_REG_FREQUENCY ping,
+ * this mechanism avoids an additional (per node) timer or
+ * counter and gets updated configuration information
+ * once in a while). We limit these requests since they
* can generate a flood of incomming RPCs. */
if (IS_NODE_UNKNOWN(node_ptr) || restart_flag ||
((i >= offset) && (i < (offset + max_reg_threads)))) {
- hostlist_push(reg_agent_args->hostlist,
+ hostlist_push(reg_agent_args->hostlist,
node_ptr->name);
reg_agent_args->node_count++;
continue;
}
- if ((!IS_NODE_NO_RESPOND(node_ptr)) &&
+ if ((!IS_NODE_NO_RESPOND(node_ptr)) &&
(node_ptr->last_response >= still_live_time))
continue;
@@ -237,7 +237,7 @@ void ping_nodes (void)
xfree (ping_agent_args);
} else {
hostlist_uniq(ping_agent_args->hostlist);
- hostlist_ranged_string(ping_agent_args->hostlist,
+ hostlist_ranged_string(ping_agent_args->hostlist,
sizeof(host_str), host_str);
debug("Spawning ping agent for %s", host_str);
ping_begin();
@@ -249,9 +249,9 @@ void ping_nodes (void)
xfree (reg_agent_args);
} else {
hostlist_uniq(reg_agent_args->hostlist);
- hostlist_ranged_string(reg_agent_args->hostlist,
+ hostlist_ranged_string(reg_agent_args->hostlist,
sizeof(host_str), host_str);
- debug("Spawning registration agent for %s %d hosts",
+ debug("Spawning registration agent for %s %d hosts",
host_str, reg_agent_args->node_count);
ping_begin();
agent_queue_request(reg_agent_args);
@@ -279,7 +279,7 @@ extern void run_health_check(void)
check_agent_args->retry = 0;
check_agent_args->hostlist = hostlist_create("");
- for (i=0, node_ptr=node_record_table_ptr;
+ for (i=0, node_ptr=node_record_table_ptr;
i<node_record_count; i++, node_ptr++) {
if (IS_NODE_DOWN(node_ptr) || IS_NODE_FUTURE(node_ptr))
continue;
@@ -298,7 +298,7 @@ extern void run_health_check(void)
xfree (check_agent_args);
} else {
hostlist_uniq(check_agent_args->hostlist);
- hostlist_ranged_string(check_agent_args->hostlist,
+ hostlist_ranged_string(check_agent_args->hostlist,
sizeof(host_str), host_str);
debug("Spawning health check agent for %s", host_str);
ping_begin();
diff --git a/src/slurmctld/ping_nodes.h b/src/slurmctld/ping_nodes.h
index 1fc7af887d2d6d2571e7766870935b2a7a9827ee..53d321ca930fea5210edbabd8895e6267b0f142c 100644
--- a/src/slurmctld/ping_nodes.h
+++ b/src/slurmctld/ping_nodes.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -43,30 +43,30 @@
/*
* is_ping_done - test if the last node ping cycle has completed.
- * Use this to avoid starting a new set of ping requests before the
+ * Use this to avoid starting a new set of ping requests before the
* previous one completes
* RET true if ping process is done, false otherwise
*/
extern bool is_ping_done (void);
/*
- * ping_begin - record that a ping cycle has begin. This can be called more
- * than once (for REQUEST_PING and simultaneous REQUEST_NODE_REGISTRATION
- * for selected nodes). Matching ping_end calls must be made for each
+ * ping_begin - record that a ping cycle has begin. This can be called more
+ * than once (for REQUEST_PING and simultaneous REQUEST_NODE_REGISTRATION
+ * for selected nodes). Matching ping_end calls must be made for each
* before is_ping_done returns true.
*/
extern void ping_begin (void);
/*
- * ping_end - record that a ping cycle has ended. This can be called more
- * than once (for REQUEST_PING and simultaneous REQUEST_NODE_REGISTRATION
- * for selected nodes). Matching ping_end calls must be made for each
+ * ping_end - record that a ping cycle has ended. This can be called more
+ * than once (for REQUEST_PING and simultaneous REQUEST_NODE_REGISTRATION
+ * for selected nodes). Matching ping_end calls must be made for each
* before is_ping_done returns true.
*/
extern void ping_end (void);
/*
- * ping_nodes - check that all nodes and daemons are alive,
+ * ping_nodes - check that all nodes and daemons are alive,
* get nodes in UNKNOWN state to register
*/
extern void ping_nodes (void);
diff --git a/src/slurmctld/port_mgr.c b/src/slurmctld/port_mgr.c
index d11e71f260d1479e24215a3e3796eefd490d41f9..798292b1512e708ccc7dab55432f2a3ba7f83e2f 100644
--- a/src/slurmctld/port_mgr.c
+++ b/src/slurmctld/port_mgr.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -95,7 +95,7 @@ static void _rebuild_port_array(struct step_record *step_ptr)
if (hl == NULL)
fatal("malloc failure: hostlist_create");
- step_ptr->resv_port_array = xmalloc(sizeof(int) *
+ step_ptr->resv_port_array = xmalloc(sizeof(int) *
step_ptr->resv_port_cnt);
step_ptr->resv_port_cnt = 0;
while ((tmp_char = hostlist_shift(hl))) {
@@ -107,7 +107,7 @@ static void _rebuild_port_array(struct step_record *step_ptr)
hostlist_destroy(hl);
if (step_ptr->resv_port_cnt == 0) {
error("Problem recovering resv_port_array for step %u.%u: %s",
- step_ptr->job_ptr->job_id, step_ptr->step_id,
+ step_ptr->job_ptr->job_id, step_ptr->step_id,
step_ptr->resv_ports);
xfree(step_ptr->resv_ports);
}
@@ -129,14 +129,14 @@ static void _make_step_resv(struct step_record *step_ptr)
for (i=0; i<step_ptr->resv_port_cnt; i++) {
if ((step_ptr->resv_port_array[i] < port_resv_min) ||
- (step_ptr->resv_port_array[i] > port_resv_max))
+ (step_ptr->resv_port_array[i] > port_resv_max))
continue;
j = step_ptr->resv_port_array[i] - port_resv_min;
bit_or(port_resv_table[j], step_ptr->step_node_bitmap);
}
}
-/* Identify every job step with a port reservation and put the
+/* Identify every job step with a port reservation and put the
* reservation into the local reservation table. */
static void _make_all_resv(void)
{
@@ -147,7 +147,7 @@ static void _make_all_resv(void)
job_iterator = list_iterator_create(job_list);
while ((job_ptr = (struct job_record *) list_next(job_iterator))) {
step_iterator = list_iterator_create(job_ptr->step_list);
- while ((step_ptr = (struct step_record *)
+ while ((step_ptr = (struct step_record *)
list_next(step_iterator))) {
_make_step_resv(step_ptr);
}
@@ -198,7 +198,7 @@ extern int reserve_port_config(char *mpi_params)
port_resv_min = p_min;
port_resv_max = p_max;
port_resv_cnt = p_max - p_min + 1;
- debug("Ports available for reservation %u-%u",
+ debug("Ports available for reservation %u-%u",
port_resv_min, port_resv_max);
xfree(port_resv_table);
@@ -257,9 +257,9 @@ extern int resv_port_alloc(struct step_record *step_ptr)
if (hl == NULL)
fatal("malloc: hostlist_create");
for (i=0; i<port_inx; i++) {
- /* NOTE: We give the port a name like "[1234]" rather than
+ /* NOTE: We give the port a name like "[1234]" rather than
* just "1234" to avoid hostlists of the form "1[234-236]" */
- bit_or(port_resv_table[port_array[i]],
+ bit_or(port_resv_table[port_array[i]],
step_ptr->step_node_bitmap);
port_array[i] += port_resv_min;
snprintf(port_str, sizeof(port_str), "[%d]", port_array[i]);
@@ -304,11 +304,11 @@ extern void resv_port_free(struct step_record *step_ptr)
bit_not(step_ptr->step_node_bitmap);
for (i=0; i<step_ptr->resv_port_cnt; i++) {
if ((step_ptr->resv_port_array[i] < port_resv_min) ||
- (step_ptr->resv_port_array[i] > port_resv_max))
+ (step_ptr->resv_port_array[i] > port_resv_max))
continue;
j = step_ptr->resv_port_array[i] - port_resv_min;
bit_and(port_resv_table[j], step_ptr->step_node_bitmap);
-
+
}
bit_not(step_ptr->step_node_bitmap);
xfree(step_ptr->resv_port_array);
diff --git a/src/slurmctld/port_mgr.h b/src/slurmctld/port_mgr.h
index af4a87a418531da210dae065c4e3f9049677ddc5..7f3f1bd56c04034699c9153c49672050b3ea113a 100644
--- a/src/slurmctld/port_mgr.h
+++ b/src/slurmctld/port_mgr.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/slurmctld/power_save.c b/src/slurmctld/power_save.c
index 34729fa126c23b2c695d21d5ebb20d6e31ac585f..ff4a91aa21c2290e74a1e048e82970fd6e52004a 100644
--- a/src/slurmctld/power_save.c
+++ b/src/slurmctld/power_save.c
@@ -1,9 +1,9 @@
/*****************************************************************************\
- * power_save.c - support node power saving mode. Nodes which have been
- * idle for an extended period of time will be placed into a power saving
+ * power_save.c - support node power saving mode. Nodes which have been
+ * idle for an extended period of time will be placed into a power saving
* mode by running an arbitrary script. This script can lower the voltage
* or frequency of the nodes or can completely power the nodes off.
- * When the node is restored to normal operation, another script will be
+ * When the node is restored to normal operation, another script will be
* executed. Many parameters are available to control this mode of operation.
*****************************************************************************
* Copyright (C) 2007 The Regents of the University of California.
@@ -11,32 +11,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -70,7 +70,7 @@
#define _DEBUG 0
#define PID_CNT 10
#define MAX_SHUTDOWN_DELAY 120 /* seconds to wait for child procs
- * to exit after daemon shutdown
+ * to exit after daemon shutdown
* request, then orphan or kill proc */
/* Records for tracking processes forked to suspend/resume nodes */
@@ -131,7 +131,7 @@ static void _do_power_work(void)
/* ready to start another round of node suspends */
run_suspend = true;
if (last_suspend) {
- bit_nclear(suspend_node_bitmap, 0,
+ bit_nclear(suspend_node_bitmap, 0,
(node_record_count - 1));
last_suspend = (time_t) 0;
}
@@ -140,7 +140,7 @@ static void _do_power_work(void)
last_work_scan = now;
/* Build bitmaps identifying each node which should change state */
- for (i=0, node_ptr=node_record_table_ptr;
+ for (i=0, node_ptr=node_record_table_ptr;
i<node_record_count; i++, node_ptr++) {
susp_state = IS_NODE_POWER_SAVE(node_ptr);
@@ -154,7 +154,7 @@ static void _do_power_work(void)
(IS_NODE_ALLOCATED(node_ptr) ||
(node_ptr->last_idle > (now - idle_time)))) {
if (wake_node_bitmap == NULL) {
- wake_node_bitmap =
+ wake_node_bitmap =
bit_alloc(node_record_count);
}
wake_cnt++;
@@ -170,17 +170,17 @@ static void _do_power_work(void)
}
/* Suspend nodes as appropriate */
- if (run_suspend &&
+ if (run_suspend &&
(susp_state == 0) &&
((suspend_rate == 0) || (suspend_cnt < suspend_rate)) &&
IS_NODE_IDLE(node_ptr) &&
(!IS_NODE_COMPLETING(node_ptr)) &&
(!IS_NODE_POWER_UP(node_ptr)) &&
(node_ptr->last_idle < (now - idle_time)) &&
- ((exc_node_bitmap == NULL) ||
+ ((exc_node_bitmap == NULL) ||
(bit_test(exc_node_bitmap, i) == 0))) {
if (sleep_node_bitmap == NULL) {
- sleep_node_bitmap =
+ sleep_node_bitmap =
bit_alloc(node_record_count);
}
sleep_cnt++;
@@ -225,7 +225,7 @@ static void _do_power_work(void)
/* If slurmctld crashes, the node state that it recovers could differ
* from the actual hardware state (e.g. ResumeProgram failed to complete).
- * To address that, when a node that should be powered up for a running
+ * To address that, when a node that should be powered up for a running
* job is not responding, they try running ResumeProgram again. */
static void _re_wake(void)
{
@@ -240,7 +240,7 @@ static void _re_wake(void)
!IS_NODE_POWER_SAVE(node_ptr) &&
(bit_test(suspend_node_bitmap, i) == 0)) {
if (wake_node_bitmap == NULL) {
- wake_node_bitmap =
+ wake_node_bitmap =
bit_alloc(node_record_count);
}
bit_set(wake_node_bitmap, i);
@@ -252,12 +252,12 @@ static void _re_wake(void)
nodes = bitmap2node_name(wake_node_bitmap);
if (nodes) {
info("power_save: rewaking nodes %s", nodes);
- _run_prog(resume_prog, nodes);
+ _run_prog(resume_prog, nodes);
} else
error("power_save: bitmap2nodename");
xfree(nodes);
bit_free(wake_node_bitmap);
- }
+ }
}
static void _do_resume(char *host)
@@ -267,7 +267,7 @@ static void _do_resume(char *host)
#else
verbose("power_save: waking nodes %s", host);
#endif
- _run_prog(resume_prog, host);
+ _run_prog(resume_prog, host);
}
static void _do_suspend(char *host)
@@ -277,7 +277,7 @@ static void _do_suspend(char *host)
#else
verbose("power_save: suspending nodes %s", host);
#endif
- _run_prog(suspend_prog, host);
+ _run_prog(suspend_prog, host);
}
/* run a suspend or resume program
@@ -344,14 +344,14 @@ static int _reap_procs(void)
delay = difftime(time(NULL), child_time[i]);
if (delay > max_timeout) {
- info("power_save: program %d ran for %d sec",
+ info("power_save: program %d ran for %d sec",
(int) child_pid[i], delay);
}
if (WIFEXITED(status)) {
rc = WEXITSTATUS(status);
if (rc != 0) {
- error("power_save: program exit status of %d",
+ error("power_save: program exit status of %d",
rc);
}
} else if (WIFSIGNALED(status)) {
@@ -408,7 +408,7 @@ static void _shutdown_power(void)
break;
if (i >= max_timeout) {
error("power_save: orphaning %d processes which are "
- "not terminating so slurmctld can exit",
+ "not terminating so slurmctld can exit",
proc_cnt);
_kill_procs();
break;
@@ -536,7 +536,7 @@ static bool _valid_prog(char *file_name)
struct stat buf;
if (file_name[0] != '/') {
- debug("power_save program %s not absolute pathname",
+ debug("power_save program %s not absolute pathname",
file_name);
return false;
}
@@ -560,9 +560,9 @@ static bool _valid_prog(char *file_name)
return true;
}
-/* start_power_mgr - Start power management thread as needed. The thread
+/* start_power_mgr - Start power management thread as needed. The thread
* terminates automatically at slurmctld shutdown time.
- * IN thread_id - pointer to thread ID of the started pthread.
+ * IN thread_id - pointer to thread ID of the started pthread.
*/
extern void start_power_mgr(pthread_t *thread_id)
{
@@ -577,7 +577,7 @@ extern void start_power_mgr(pthread_t *thread_id)
slurm_mutex_unlock(&power_mutex);
slurm_attr_init(&thread_attr);
- while (pthread_create(thread_id, &thread_attr, _init_power_save,
+ while (pthread_create(thread_id, &thread_attr, _init_power_save,
NULL)) {
error("pthread_create %m");
sleep(1);
diff --git a/src/slurmctld/preempt.c b/src/slurmctld/preempt.c
index c6bed53e1f00b250e574ebca6a4ba476aa926abf..c1005d8fd484dc9bae4372feb51ff350c8f8c065 100644
--- a/src/slurmctld/preempt.c
+++ b/src/slurmctld/preempt.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -86,13 +86,13 @@ static slurm_preempt_ops_t *
/* Find the correct plugin. */
c->cur_plugin = plugin_load_and_link(c->preempt_type, n_syms, syms,
(void **) &c->ops);
- if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
+ if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
error("Couldn't find the specified plugin name for %s "
"looking at all files",
c->preempt_type);
-
+
/* Get plugin list. */
if ( c->plugin_list == NULL ) {
char *plugin_dir;
@@ -182,7 +182,7 @@ extern int slurm_preempt_init(void)
{
int retval = SLURM_SUCCESS;
char *preempt_type = NULL;
-
+
slurm_mutex_lock( &g_preempt_context_lock );
if ( g_preempt_context )
diff --git a/src/slurmctld/preempt.h b/src/slurmctld/preempt.h
index 5ea8aa8bc18e0c5d901f3e3fdebe8809022887e2..cdb86b243346a82ceb98e366968abd5eff53c92f 100644
--- a/src/slurmctld/preempt.h
+++ b/src/slurmctld/preempt.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -51,7 +51,7 @@ int slurm_preempt_init(void);
/*
* Terminate the preemption plugin.
- *
+ *
* Returns a SLURM errno.
*/
extern int slurm_preempt_fini(void);
@@ -64,7 +64,7 @@ extern int slurm_preempt_fini(void);
/*
* slurm_find_preemptable_jobs - Given a pointer to a pending job, return list
- * of pointers to preemptable jobs. The jobs should be sorted in order
+ * of pointers to preemptable jobs. The jobs should be sorted in order
* from most desirable to to least desirable to preempt.
* NOTE: Returns NULL if no preemptable jobs are found.
* NOTE: Caller must list_destroy() any list returned.
diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index acd4029f787d178287bab10528100be25ccb73f7..f735635ca9ae0fc10fed6bfec9ce697935250118 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -4,34 +4,34 @@
* Copyright (C) 2002-2007 The Regents of the University of California.
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Morris Jette <jette@llnl.gov>, et. al.
+ * Written by Morris Jette <jette@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -88,7 +88,7 @@ static void _fill_ctld_conf(slurm_ctl_conf_t * build_ptr);
static void _kill_job_on_msg_fail(uint32_t job_id);
static int _launch_batch_step(job_desc_msg_t *job_desc_msg,
uid_t uid, uint32_t *step_id);
-static int _make_step_cred(struct step_record *step_rec,
+static int _make_step_cred(struct step_record *step_rec,
slurm_cred_t **slurm_cred);
inline static void _slurm_rpc_allocate_resources(slurm_msg_t * msg);
inline static void _slurm_rpc_checkpoint(slurm_msg_t * msg);
@@ -398,7 +398,7 @@ void _fill_ctld_conf(slurm_ctl_conf_t * conf_ptr)
memset(conf_ptr, 0, sizeof(slurm_ctl_conf_t));
conf_ptr->last_update = time(NULL);
- conf_ptr->accounting_storage_enforce =
+ conf_ptr->accounting_storage_enforce =
conf->accounting_storage_enforce;
conf_ptr->accounting_storage_host =
xstrdup(conf->accounting_storage_host);
@@ -503,7 +503,7 @@ void _fill_ctld_conf(slurm_ctl_conf_t * conf_ptr)
conf_ptr->proctrack_type = xstrdup(conf->proctrack_type);
conf_ptr->prolog = xstrdup(conf->prolog);
conf_ptr->prolog_slurmctld = xstrdup(conf->prolog_slurmctld);
- conf_ptr->propagate_prio_process =
+ conf_ptr->propagate_prio_process =
slurmctld_conf.propagate_prio_process;
conf_ptr->propagate_rlimits = xstrdup(conf->propagate_rlimits);
conf_ptr->propagate_rlimits_except = xstrdup(conf->
@@ -578,7 +578,7 @@ void _fill_ctld_conf(slurm_ctl_conf_t * conf_ptr)
}
/*
- * validate_super_user - validate that the uid is authorized to see
+ * validate_super_user - validate that the uid is authorized to see
* privileged data (either user root or SlurmUser)
* IN uid - user to validate
* RET true if permitted to run, false otherwise
@@ -591,13 +591,13 @@ extern bool validate_super_user(uid_t uid)
return false;
}
-/* _kill_job_on_msg_fail - The request to create a job record successed,
- * but the reply message to srun failed. We kill the job to avoid
+/* _kill_job_on_msg_fail - The request to create a job record successed,
+ * but the reply message to srun failed. We kill the job to avoid
* leaving it orphaned */
static void _kill_job_on_msg_fail(uint32_t job_id)
{
/* Locks: Write job, write node */
- slurmctld_lock_t job_write_lock = {
+ slurmctld_lock_t job_write_lock = {
NO_LOCK, WRITE_LOCK, WRITE_LOCK, NO_LOCK };
error("Job allocate response msg send failure, killing JobId=%u",
@@ -608,7 +608,7 @@ static void _kill_job_on_msg_fail(uint32_t job_id)
}
/* create a credential for a given job step, return error code */
-static int _make_step_cred(struct step_record *step_ptr,
+static int _make_step_cred(struct step_record *step_ptr,
slurm_cred_t **slurm_cred)
{
slurm_cred_arg_t cred_arg;
@@ -633,7 +633,7 @@ static int _make_step_cred(struct step_record *step_ptr,
/* Identify the cores allocated to this job step
* The core_bitmap is based upon the nodes allocated to the _job_.
- * The slurmd must identify the appropriate cores to be used
+ * The slurmd must identify the appropriate cores to be used
* by each step. */
cred_arg.core_bitmap = step_ptr->core_bitmap_job;
cred_arg.cores_per_socket = job_resrcs_ptr->cores_per_socket;
@@ -651,7 +651,7 @@ static int _make_step_cred(struct step_record *step_ptr,
return SLURM_SUCCESS;
}
-/* _slurm_rpc_allocate_resources: process RPC to allocate resources for
+/* _slurm_rpc_allocate_resources: process RPC to allocate resources for
* a job */
static void _slurm_rpc_allocate_resources(slurm_msg_t * msg)
{
@@ -662,7 +662,7 @@ static void _slurm_rpc_allocate_resources(slurm_msg_t * msg)
job_desc_msg_t *job_desc_msg = (job_desc_msg_t *) msg->data;
resource_allocation_response_msg_t alloc_msg;
/* Locks: Read config, write job, write node, read partition */
- slurmctld_lock_t job_write_lock = {
+ slurmctld_lock_t job_write_lock = {
READ_LOCK, WRITE_LOCK, WRITE_LOCK, READ_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
int immediate = job_desc_msg->immediate;
@@ -696,7 +696,7 @@ static void _slurm_rpc_allocate_resources(slurm_msg_t * msg)
do_unlock = true;
lock_slurmctld(job_write_lock);
- error_code = job_allocate(job_desc_msg, immediate,
+ error_code = job_allocate(job_desc_msg, immediate,
false, NULL,
true, uid, &job_ptr);
/* unlock after finished using the job structure data */
@@ -711,7 +711,7 @@ static void _slurm_rpc_allocate_resources(slurm_msg_t * msg)
job_waiting = true;
if ((error_code == SLURM_SUCCESS)
- || ((immediate == 0) && job_waiting)) {
+ || ((immediate == 0) && job_waiting)) {
xassert(job_ptr);
info("_slurm_rpc_allocate_resources JobId=%u NodeList=%s %s",
job_ptr->job_id, job_ptr->nodes, TIME_STR);
@@ -720,17 +720,17 @@ static void _slurm_rpc_allocate_resources(slurm_msg_t * msg)
if (job_ptr->job_resrcs && job_ptr->job_resrcs->cpu_array_cnt) {
alloc_msg.num_cpu_groups = job_ptr->job_resrcs->
cpu_array_cnt;
- alloc_msg.cpu_count_reps = xmalloc(sizeof(uint32_t) *
+ alloc_msg.cpu_count_reps = xmalloc(sizeof(uint32_t) *
job_ptr->job_resrcs->
cpu_array_cnt);
- memcpy(alloc_msg.cpu_count_reps,
+ memcpy(alloc_msg.cpu_count_reps,
job_ptr->job_resrcs->cpu_array_reps,
(sizeof(uint32_t) * job_ptr->job_resrcs->
cpu_array_cnt));
- alloc_msg.cpus_per_node = xmalloc(sizeof(uint16_t) *
+ alloc_msg.cpus_per_node = xmalloc(sizeof(uint16_t) *
job_ptr->job_resrcs->
cpu_array_cnt);
- memcpy(alloc_msg.cpus_per_node,
+ memcpy(alloc_msg.cpus_per_node,
job_ptr->job_resrcs->cpu_array_value,
(sizeof(uint16_t) * job_ptr->job_resrcs->
cpu_array_cnt));
@@ -743,14 +743,14 @@ static void _slurm_rpc_allocate_resources(slurm_msg_t * msg)
alloc_msg.job_id = job_ptr->job_id;
alloc_msg.node_cnt = job_ptr->node_cnt;
alloc_msg.node_list = xstrdup(job_ptr->nodes);
- alloc_msg.select_jobinfo =
+ alloc_msg.select_jobinfo =
select_g_select_jobinfo_copy(job_ptr->select_jobinfo);
unlock_slurmctld(job_write_lock);
slurm_msg_t_init(&response_msg);
response_msg.msg_type = RESPONSE_RESOURCE_ALLOCATION;
response_msg.data = &alloc_msg;
-
+
if (slurm_send_node_msg(msg->conn_fd, &response_msg) < 0)
_kill_job_on_msg_fail(job_ptr->job_id);
xfree(alloc_msg.cpu_count_reps);
@@ -762,7 +762,7 @@ static void _slurm_rpc_allocate_resources(slurm_msg_t * msg)
} else { /* allocate error */
if (do_unlock)
unlock_slurmctld(job_write_lock);
- info("_slurm_rpc_allocate_resources: %s ",
+ info("_slurm_rpc_allocate_resources: %s ",
slurm_strerror(error_code));
slurm_send_rc_msg(msg, error_code);
}
@@ -776,7 +776,7 @@ static void _slurm_rpc_dump_conf(slurm_msg_t * msg)
last_update_msg_t *last_time_msg = (last_update_msg_t *) msg->data;
slurm_ctl_conf_info_msg_t config_tbl;
/* Locks: Read config, partition*/
- slurmctld_lock_t config_read_lock = {
+ slurmctld_lock_t config_read_lock = {
READ_LOCK, NO_LOCK, NO_LOCK, READ_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -800,7 +800,7 @@ static void _slurm_rpc_dump_conf(slurm_msg_t * msg)
response_msg.address = msg->address;
response_msg.msg_type = RESPONSE_BUILD_INFO;
response_msg.data = &config_tbl;
-
+
/* send message */
slurm_send_node_msg(msg->conn_fd, &response_msg);
free_slurm_conf(&config_tbl, false);
@@ -817,7 +817,7 @@ static void _slurm_rpc_dump_jobs(slurm_msg_t * msg)
job_info_request_msg_t *job_info_request_msg =
(job_info_request_msg_t *) msg->data;
/* Locks: Read config job, write node (for hiding) */
- slurmctld_lock_t job_read_lock = {
+ slurmctld_lock_t job_read_lock = {
READ_LOCK, READ_LOCK, NO_LOCK, WRITE_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -831,8 +831,8 @@ static void _slurm_rpc_dump_jobs(slurm_msg_t * msg)
debug2("_slurm_rpc_dump_jobs, no change");
slurm_send_rc_msg(msg, SLURM_NO_CHANGE_IN_DATA);
} else {
- pack_all_jobs(&dump, &dump_size,
- job_info_request_msg->show_flags,
+ pack_all_jobs(&dump, &dump_size,
+ job_info_request_msg->show_flags,
g_slurm_auth_get_uid(msg->auth_cred, NULL));
unlock_slurmctld(job_read_lock);
END_TIMER2("_slurm_rpc_dump_jobs");
@@ -845,7 +845,7 @@ static void _slurm_rpc_dump_jobs(slurm_msg_t * msg)
response_msg.msg_type = RESPONSE_JOB_INFO;
response_msg.data = dump;
response_msg.data_size = dump_size;
-
+
/* send message */
slurm_send_node_msg(msg->conn_fd, &response_msg);
xfree(dump);
@@ -861,7 +861,7 @@ static void _slurm_rpc_dump_job_single(slurm_msg_t * msg)
slurm_msg_t response_msg;
job_id_msg_t *job_id_msg = (job_id_msg_t *) msg->data;
/* Locks: Read config job, write node (for hiding) */
- slurmctld_lock_t job_read_lock = {
+ slurmctld_lock_t job_read_lock = {
READ_LOCK, READ_LOCK, NO_LOCK, WRITE_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -897,7 +897,7 @@ static void _slurm_rpc_get_shares(slurm_msg_t *msg)
shares_request_msg_t *req_msg = (shares_request_msg_t *) msg->data;
shares_response_msg_t resp_msg;
slurm_msg_t response_msg;
-
+
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
START_TIMER;
@@ -905,7 +905,7 @@ static void _slurm_rpc_get_shares(slurm_msg_t *msg)
(unsigned int)uid);
resp_msg.assoc_shares_list = assoc_mgr_get_shares(acct_db_conn,
uid,
- req_msg->acct_list,
+ req_msg->acct_list,
req_msg->user_list);
slurm_msg_t_init(&response_msg);
response_msg.address = msg->address;
@@ -975,7 +975,7 @@ static void _slurm_rpc_end_time(slurm_msg_t * msg)
response_msg.data = &timeout_msg;
slurm_send_node_msg(msg->conn_fd, &response_msg);
}
- debug2("_slurm_rpc_end_time jobid=%u %s",
+ debug2("_slurm_rpc_end_time jobid=%u %s",
time_req_msg->job_id, TIME_STR);
}
@@ -986,10 +986,10 @@ static void _slurm_rpc_dump_nodes(slurm_msg_t * msg)
char *dump;
int dump_size;
slurm_msg_t response_msg;
- node_info_request_msg_t *node_req_msg =
+ node_info_request_msg_t *node_req_msg =
(node_info_request_msg_t *) msg->data;
/* Locks: Read config, read node, write node (for hiding) */
- slurmctld_lock_t node_read_lock = {
+ slurmctld_lock_t node_read_lock = {
READ_LOCK, NO_LOCK, READ_LOCK, WRITE_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -1005,7 +1005,7 @@ static void _slurm_rpc_dump_nodes(slurm_msg_t * msg)
uid);
slurm_send_rc_msg(msg, ESLURM_ACCESS_DENIED);
return;
- }
+ }
select_g_select_nodeinfo_set_all(node_req_msg->last_update - 1);
@@ -1015,7 +1015,7 @@ static void _slurm_rpc_dump_nodes(slurm_msg_t * msg)
slurm_send_rc_msg(msg, SLURM_NO_CHANGE_IN_DATA);
} else {
- pack_all_node(&dump, &dump_size, node_req_msg->show_flags,
+ pack_all_node(&dump, &dump_size, node_req_msg->show_flags,
uid);
unlock_slurmctld(node_read_lock);
END_TIMER2("_slurm_rpc_dump_nodes");
@@ -1028,7 +1028,7 @@ static void _slurm_rpc_dump_nodes(slurm_msg_t * msg)
response_msg.msg_type = RESPONSE_NODE_INFO;
response_msg.data = dump;
response_msg.data_size = dump_size;
-
+
/* send message */
slurm_send_node_msg(msg->conn_fd, &response_msg);
xfree(dump);
@@ -1045,7 +1045,7 @@ static void _slurm_rpc_dump_partitions(slurm_msg_t * msg)
part_info_request_msg_t *part_req_msg;
/* Locks: Read configuration and partition */
- slurmctld_lock_t part_read_lock = {
+ slurmctld_lock_t part_read_lock = {
READ_LOCK, NO_LOCK, NO_LOCK, READ_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -1065,7 +1065,7 @@ static void _slurm_rpc_dump_partitions(slurm_msg_t * msg)
debug2("_slurm_rpc_dump_partitions, no change");
slurm_send_rc_msg(msg, SLURM_NO_CHANGE_IN_DATA);
} else {
- pack_all_part(&dump, &dump_size, part_req_msg->show_flags,
+ pack_all_part(&dump, &dump_size, part_req_msg->show_flags,
uid);
unlock_slurmctld(part_read_lock);
END_TIMER2("_slurm_rpc_dump_partitions");
@@ -1078,23 +1078,23 @@ static void _slurm_rpc_dump_partitions(slurm_msg_t * msg)
response_msg.msg_type = RESPONSE_PARTITION_INFO;
response_msg.data = dump;
response_msg.data_size = dump_size;
-
+
/* send message */
slurm_send_node_msg(msg->conn_fd, &response_msg);
xfree(dump);
}
}
-/* _slurm_rpc_epilog_complete - process RPC noting the completion of
+/* _slurm_rpc_epilog_complete - process RPC noting the completion of
* the epilog denoting the completion of a job it its entirety */
static void _slurm_rpc_epilog_complete(slurm_msg_t * msg)
{
DEF_TIMERS;
/* Locks: Read configuration, write job, write node */
- slurmctld_lock_t job_write_lock = {
+ slurmctld_lock_t job_write_lock = {
READ_LOCK, WRITE_LOCK, WRITE_LOCK, NO_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
- epilog_complete_msg_t *epilog_msg =
+ epilog_complete_msg_t *epilog_msg =
(epilog_complete_msg_t *) msg->data;
bool run_scheduler = false;
@@ -1109,7 +1109,7 @@ static void _slurm_rpc_epilog_complete(slurm_msg_t * msg)
return;
}
- if (job_epilog_complete(epilog_msg->job_id, epilog_msg->node_name,
+ if (job_epilog_complete(epilog_msg->job_id, epilog_msg->node_name,
epilog_msg->return_code))
run_scheduler = true;
unlock_slurmctld(job_write_lock);
@@ -1134,7 +1134,7 @@ static void _slurm_rpc_epilog_complete(slurm_msg_t * msg)
/* NOTE: RPC has no response */
}
-/* _slurm_rpc_job_step_kill - process RPC to cancel an entire job or
+/* _slurm_rpc_job_step_kill - process RPC to cancel an entire job or
* an individual job step */
static void _slurm_rpc_job_step_kill(slurm_msg_t * msg)
{
@@ -1144,10 +1144,10 @@ static void _slurm_rpc_job_step_kill(slurm_msg_t * msg)
job_step_kill_msg_t *job_step_kill_msg =
(job_step_kill_msg_t *) msg->data;
/* Locks: Read config, write job, write node */
- slurmctld_lock_t job_write_lock = {
+ slurmctld_lock_t job_write_lock = {
READ_LOCK, WRITE_LOCK, WRITE_LOCK, NO_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
-
+
START_TIMER;
debug2("Processing RPC: REQUEST_CANCEL_JOB_STEP uid=%u",
(unsigned int) uid);
@@ -1156,15 +1156,15 @@ static void _slurm_rpc_job_step_kill(slurm_msg_t * msg)
/* do RPC call */
if (job_step_kill_msg->job_step_id == SLURM_BATCH_SCRIPT) {
/* NOTE: SLURM_BATCH_SCRIPT == NO_VAL */
- error_code = job_signal(job_step_kill_msg->job_id,
- job_step_kill_msg->signal,
+ error_code = job_signal(job_step_kill_msg->job_id,
+ job_step_kill_msg->signal,
job_step_kill_msg->batch_flag, uid);
unlock_slurmctld(job_write_lock);
END_TIMER2("_slurm_rpc_job_step_kill");
/* return result */
if (error_code) {
- info("Signal %u JobId=%u by UID=%u: %s",
+ info("Signal %u JobId=%u by UID=%u: %s",
job_step_kill_msg->signal,
job_step_kill_msg->job_id, uid,
slurm_strerror(error_code));
@@ -1195,20 +1195,20 @@ static void _slurm_rpc_job_step_kill(slurm_msg_t * msg)
if (error_code) {
info("Signal %u of StepId=%u.%u by UID=%u: %s",
job_step_kill_msg->signal,
- job_step_kill_msg->job_id,
+ job_step_kill_msg->job_id,
job_step_kill_msg->job_step_id, uid,
slurm_strerror(error_code));
slurm_send_rc_msg(msg, error_code);
} else {
if (job_step_kill_msg->signal == SIGKILL) {
info("Cancel of StepId=%u.%u by UID=%u %s",
- job_step_kill_msg->job_id,
- job_step_kill_msg->job_step_id, uid,
+ job_step_kill_msg->job_id,
+ job_step_kill_msg->job_step_id, uid,
TIME_STR);
} else {
info("Signal %u of StepId=%u.%u by UID=%u %s",
job_step_kill_msg->signal,
- job_step_kill_msg->job_id,
+ job_step_kill_msg->job_id,
job_step_kill_msg->job_step_id, uid,
TIME_STR);
}
@@ -1218,7 +1218,7 @@ static void _slurm_rpc_job_step_kill(slurm_msg_t * msg)
schedule_job_save();
}
}
-
+
}
/* _slurm_rpc_complete_job_allocation - process RPC to note the
@@ -1230,7 +1230,7 @@ static void _slurm_rpc_complete_job_allocation(slurm_msg_t * msg)
complete_job_allocation_msg_t *comp_msg =
(complete_job_allocation_msg_t *) msg->data;
/* Locks: Write job, write node */
- slurmctld_lock_t job_write_lock = {
+ slurmctld_lock_t job_write_lock = {
NO_LOCK, WRITE_LOCK, WRITE_LOCK, NO_LOCK
};
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -1274,7 +1274,7 @@ static void _slurm_rpc_complete_batch_script(slurm_msg_t * msg)
complete_batch_script_msg_t *comp_msg =
(complete_batch_script_msg_t *) msg->data;
/* Locks: Write job, write node */
- slurmctld_lock_t job_write_lock = {
+ slurmctld_lock_t job_write_lock = {
NO_LOCK, WRITE_LOCK, WRITE_LOCK, NO_LOCK
};
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -1337,11 +1337,11 @@ static void _slurm_rpc_complete_batch_script(slurm_msg_t * msg)
/* return result */
if (error_code) {
info("_slurm_rpc_complete_batch_script JobId=%u: %s ",
- comp_msg->job_id,
+ comp_msg->job_id,
slurm_strerror(error_code));
slurm_send_rc_msg(msg, error_code);
} else {
- debug2("_slurm_rpc_complete_batch_script JobId=%u %s",
+ debug2("_slurm_rpc_complete_batch_script JobId=%u %s",
comp_msg->job_id, TIME_STR);
slurm_send_rc_msg(msg, SLURM_SUCCESS);
dump_job = true;
@@ -1352,7 +1352,7 @@ static void _slurm_rpc_complete_batch_script(slurm_msg_t * msg)
(void) schedule_node_save(); /* Has own locking */
}
-/* _slurm_rpc_job_step_create - process RPC to creates/registers a job step
+/* _slurm_rpc_job_step_create - process RPC to creates/registers a job step
* with the step_mgr */
static void _slurm_rpc_job_step_create(slurm_msg_t * msg)
{
@@ -1366,7 +1366,7 @@ static void _slurm_rpc_job_step_create(slurm_msg_t * msg)
(job_step_create_request_msg_t *) msg->data;
slurm_cred_t *slurm_cred = (slurm_cred_t *) NULL;
/* Locks: Write jobs, read nodes */
- slurmctld_lock_t job_write_lock = {
+ slurmctld_lock_t job_write_lock = {
NO_LOCK, WRITE_LOCK, READ_LOCK, NO_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -1396,7 +1396,7 @@ static void _slurm_rpc_job_step_create(slurm_msg_t * msg)
if (error_code == SLURM_SUCCESS) {
/* issue the RPC */
lock_slurmctld(job_write_lock);
- error_code = step_create(req_step_msg, &step_rec,
+ error_code = step_create(req_step_msg, &step_rec,
false, false);
}
if (error_code == SLURM_SUCCESS)
@@ -1406,30 +1406,30 @@ static void _slurm_rpc_job_step_create(slurm_msg_t * msg)
/* return result */
if (error_code) {
unlock_slurmctld(job_write_lock);
- info("_slurm_rpc_job_step_create: %s",
+ info("_slurm_rpc_job_step_create: %s",
slurm_strerror(error_code));
slurm_send_rc_msg(msg, error_code);
} else {
slurm_step_layout_t *layout = step_rec->step_layout;
-
+
info("_slurm_rpc_job_step_create: StepId=%u.%u %s %s",
- step_rec->job_ptr->job_id, step_rec->step_id,
+ step_rec->job_ptr->job_id, step_rec->step_id,
req_step_msg->node_list, TIME_STR);
job_step_resp.job_step_id = step_rec->step_id;
job_step_resp.resv_ports = xstrdup(step_rec->resv_ports);
job_step_resp.step_layout = slurm_step_layout_copy(layout);
-
+
job_step_resp.cred = slurm_cred;
job_step_resp.switch_job = switch_copy_jobinfo(
step_rec->switch_job);
-
+
unlock_slurmctld(job_write_lock);
slurm_msg_t_init(&resp);
resp.address = msg->address;
resp.msg_type = RESPONSE_JOB_STEP_CREATE;
resp.data = &job_step_resp;
-
+
slurm_send_node_msg(msg->conn_fd, &resp);
xfree(job_step_resp.resv_ports);
slurm_step_layout_destroy(job_step_resp.step_layout);
@@ -1449,7 +1449,7 @@ static void _slurm_rpc_job_step_get_info(slurm_msg_t * msg)
job_step_info_request_msg_t *request =
(job_step_info_request_msg_t *) msg->data;
/* Locks: Read config, job, write partition (for filtering) */
- slurmctld_lock_t job_read_lock = {
+ slurmctld_lock_t job_read_lock = {
READ_LOCK, READ_LOCK, NO_LOCK, WRITE_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -1466,7 +1466,7 @@ static void _slurm_rpc_job_step_get_info(slurm_msg_t * msg)
} else {
Buf buffer = init_buf(BUF_SIZE);
error_code = pack_ctld_job_step_info_response_msg(
- request->job_id, request->step_id,
+ request->job_id, request->step_id,
uid, request->show_flags, buffer);
unlock_slurmctld(job_read_lock);
END_TIMER2("_slurm_rpc_job_step_get_info");
@@ -1499,7 +1499,7 @@ static void _slurm_rpc_job_step_get_info(slurm_msg_t * msg)
}
}
-/* _slurm_rpc_job_will_run - process RPC to determine if job with given
+/* _slurm_rpc_job_will_run - process RPC to determine if job with given
* configuration can be initiated */
static void _slurm_rpc_job_will_run(slurm_msg_t * msg)
{
@@ -1509,7 +1509,7 @@ static void _slurm_rpc_job_will_run(slurm_msg_t * msg)
struct job_record *job_ptr;
job_desc_msg_t *job_desc_msg = (job_desc_msg_t *) msg->data;
/* Locks: Write job, read node, read partition */
- slurmctld_lock_t job_write_lock = {
+ slurmctld_lock_t job_write_lock = {
NO_LOCK, WRITE_LOCK, READ_LOCK, READ_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
uint16_t port; /* dummy value */
@@ -1539,7 +1539,7 @@ static void _slurm_rpc_job_will_run(slurm_msg_t * msg)
if (error_code == SLURM_SUCCESS) {
lock_slurmctld(job_write_lock);
if (job_desc_msg->job_id == NO_VAL) {
- error_code = job_allocate(job_desc_msg, false,
+ error_code = job_allocate(job_desc_msg, false,
true, &resp,
true, uid, &job_ptr);
} else { /* existing job test */
@@ -1551,7 +1551,7 @@ static void _slurm_rpc_job_will_run(slurm_msg_t * msg)
/* return result */
if (error_code) {
- debug2("_slurm_rpc_job_will_run: %s",
+ debug2("_slurm_rpc_job_will_run: %s",
slurm_strerror(error_code));
slurm_send_rc_msg(msg, error_code);
} else if (resp) {
@@ -1571,7 +1571,7 @@ static void _slurm_rpc_job_will_run(slurm_msg_t * msg)
}
}
-/* _slurm_rpc_node_registration - process RPC to determine if a node's
+/* _slurm_rpc_node_registration - process RPC to determine if a node's
* actual configuration satisfies the configured specification */
static void _slurm_rpc_node_registration(slurm_msg_t * msg)
{
@@ -1581,7 +1581,7 @@ static void _slurm_rpc_node_registration(slurm_msg_t * msg)
slurm_node_registration_status_msg_t *node_reg_stat_msg =
(slurm_node_registration_status_msg_t *) msg->data;
/* Locks: Read config, write job, write node */
- slurmctld_lock_t job_write_lock = {
+ slurmctld_lock_t job_write_lock = {
READ_LOCK, WRITE_LOCK, WRITE_LOCK, NO_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -1609,7 +1609,7 @@ static void _slurm_rpc_node_registration(slurm_msg_t * msg)
/* return result */
if (error_code) {
error("_slurm_rpc_node_registration node=%s: %s",
- node_reg_stat_msg->node_name,
+ node_reg_stat_msg->node_name,
slurm_strerror(error_code));
slurm_send_rc_msg(msg, error_code);
} else {
@@ -1630,7 +1630,7 @@ static void _slurm_rpc_job_alloc_info(slurm_msg_t * msg)
(job_alloc_info_msg_t *) msg->data;
job_alloc_info_response_msg_t job_info_resp_msg;
/* Locks: Read config, job, read node */
- slurmctld_lock_t job_read_lock = {
+ slurmctld_lock_t job_read_lock = {
READ_LOCK, READ_LOCK, READ_LOCK, NO_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
bool do_unlock = false;
@@ -1650,7 +1650,7 @@ static void _slurm_rpc_job_alloc_info(slurm_msg_t * msg)
if (do_unlock)
unlock_slurmctld(job_read_lock);
debug2("_slurm_rpc_job_alloc_info: JobId=%u, uid=%u: %s",
- job_info_msg->job_id, uid,
+ job_info_msg->job_id, uid,
slurm_strerror(error_code));
slurm_send_rc_msg(msg, error_code);
} else {
@@ -1660,16 +1660,16 @@ static void _slurm_rpc_job_alloc_info(slurm_msg_t * msg)
/* send job_ID and node_name_ptr */
job_info_resp_msg.num_cpu_groups = job_ptr->job_resrcs->
cpu_array_cnt;
- job_info_resp_msg.cpu_count_reps =
- xmalloc(sizeof(uint32_t) *
+ job_info_resp_msg.cpu_count_reps =
+ xmalloc(sizeof(uint32_t) *
job_ptr->job_resrcs->cpu_array_cnt);
- memcpy(job_info_resp_msg.cpu_count_reps,
+ memcpy(job_info_resp_msg.cpu_count_reps,
job_ptr->job_resrcs->cpu_array_reps,
(sizeof(uint32_t) * job_ptr->job_resrcs->cpu_array_cnt));
- job_info_resp_msg.cpus_per_node =
- xmalloc(sizeof(uint16_t) *
+ job_info_resp_msg.cpus_per_node =
+ xmalloc(sizeof(uint16_t) *
job_ptr->job_resrcs->cpu_array_cnt);
- memcpy(job_info_resp_msg.cpus_per_node,
+ memcpy(job_info_resp_msg.cpus_per_node,
job_ptr->job_resrcs->cpu_array_value,
(sizeof(uint16_t) * job_ptr->job_resrcs->cpu_array_cnt));
job_info_resp_msg.error_code = error_code;
@@ -1680,14 +1680,14 @@ static void _slurm_rpc_job_alloc_info(slurm_msg_t * msg)
(sizeof(slurm_addr) * job_ptr->node_cnt));
job_info_resp_msg.node_cnt = job_ptr->node_cnt;
job_info_resp_msg.node_list = xstrdup(job_ptr->nodes);
- job_info_resp_msg.select_jobinfo =
+ job_info_resp_msg.select_jobinfo =
select_g_select_jobinfo_copy(job_ptr->select_jobinfo);
unlock_slurmctld(job_read_lock);
slurm_msg_t_init(&response_msg);
response_msg.msg_type = RESPONSE_JOB_ALLOCATION_INFO;
response_msg.data = &job_info_resp_msg;
-
+
slurm_send_node_msg(msg->conn_fd, &response_msg);
select_g_select_jobinfo_free(job_info_resp_msg.select_jobinfo);
xfree(job_info_resp_msg.cpu_count_reps);
@@ -1697,7 +1697,7 @@ static void _slurm_rpc_job_alloc_info(slurm_msg_t * msg)
}
}
-/* _slurm_rpc_job_alloc_info_lite - process RPC to get minor details
+/* _slurm_rpc_job_alloc_info_lite - process RPC to get minor details
on existing job */
static void _slurm_rpc_job_alloc_info_lite(slurm_msg_t * msg)
{
@@ -1709,7 +1709,7 @@ static void _slurm_rpc_job_alloc_info_lite(slurm_msg_t * msg)
(job_alloc_info_msg_t *) msg->data;
resource_allocation_response_msg_t job_info_resp_msg;
/* Locks: Read config, job, read node */
- slurmctld_lock_t job_read_lock = {
+ slurmctld_lock_t job_read_lock = {
READ_LOCK, READ_LOCK, READ_LOCK, NO_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
bool do_unlock = false;
@@ -1738,30 +1738,30 @@ static void _slurm_rpc_job_alloc_info_lite(slurm_msg_t * msg)
/* send job_ID and node_name_ptr */
job_info_resp_msg.num_cpu_groups = job_ptr->job_resrcs->
cpu_array_cnt;
- job_info_resp_msg.cpu_count_reps =
- xmalloc(sizeof(uint32_t) *
+ job_info_resp_msg.cpu_count_reps =
+ xmalloc(sizeof(uint32_t) *
job_ptr->job_resrcs->cpu_array_cnt);
- memcpy(job_info_resp_msg.cpu_count_reps,
+ memcpy(job_info_resp_msg.cpu_count_reps,
job_ptr->job_resrcs->cpu_array_reps,
(sizeof(uint32_t) * job_ptr->job_resrcs->cpu_array_cnt));
- job_info_resp_msg.cpus_per_node =
- xmalloc(sizeof(uint16_t) *
+ job_info_resp_msg.cpus_per_node =
+ xmalloc(sizeof(uint16_t) *
job_ptr->job_resrcs->cpu_array_cnt);
- memcpy(job_info_resp_msg.cpus_per_node,
+ memcpy(job_info_resp_msg.cpus_per_node,
job_ptr->job_resrcs->cpu_array_value,
(sizeof(uint16_t) * job_ptr->job_resrcs->cpu_array_cnt));
job_info_resp_msg.error_code = error_code;
job_info_resp_msg.job_id = job_info_msg->job_id;
job_info_resp_msg.node_cnt = job_ptr->node_cnt;
job_info_resp_msg.node_list = xstrdup(job_ptr->nodes);
- job_info_resp_msg.select_jobinfo =
+ job_info_resp_msg.select_jobinfo =
select_g_select_jobinfo_copy(job_ptr->select_jobinfo);
unlock_slurmctld(job_read_lock);
slurm_msg_t_init(&response_msg);
response_msg.msg_type = RESPONSE_JOB_ALLOCATION_INFO_LITE;
response_msg.data = &job_info_resp_msg;
-
+
slurm_send_node_msg(msg->conn_fd, &response_msg);
select_g_select_jobinfo_free(job_info_resp_msg.select_jobinfo);
xfree(job_info_resp_msg.cpu_count_reps);
@@ -1770,7 +1770,7 @@ static void _slurm_rpc_job_alloc_info_lite(slurm_msg_t * msg)
}
}
-/* _slurm_rpc_job_sbcast_cred - process RPC to get details on existing job
+/* _slurm_rpc_job_sbcast_cred - process RPC to get details on existing job
* plus sbcast credential */
static void _slurm_rpc_job_sbcast_cred(slurm_msg_t * msg)
{
@@ -1783,7 +1783,7 @@ static void _slurm_rpc_job_sbcast_cred(slurm_msg_t * msg)
job_sbcast_cred_msg_t job_info_resp_msg;
sbcast_cred_t *sbcast_cred;
/* Locks: Read config, job, read node */
- slurmctld_lock_t job_read_lock = {
+ slurmctld_lock_t job_read_lock = {
READ_LOCK, READ_LOCK, READ_LOCK, NO_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -1800,7 +1800,7 @@ static void _slurm_rpc_job_sbcast_cred(slurm_msg_t * msg)
if (error_code || (job_ptr == NULL)) {
unlock_slurmctld(job_read_lock);
debug2("_slurm_rpc_job_sbcast_cred: JobId=%u, uid=%u: %s",
- job_info_msg->job_id, uid,
+ job_info_msg->job_id, uid,
slurm_strerror(error_code));
slurm_send_rc_msg(msg, error_code);
} else if ((sbcast_cred = create_sbcast_cred(slurmctld_config.cred_ctx,
@@ -1826,7 +1826,7 @@ static void _slurm_rpc_job_sbcast_cred(slurm_msg_t * msg)
slurm_msg_t_init(&response_msg);
response_msg.msg_type = RESPONSE_JOB_SBCAST_CRED;
response_msg.data = &job_info_resp_msg;
-
+
slurm_send_node_msg(msg->conn_fd, &response_msg);
xfree(job_info_resp_msg.node_addr);
xfree(job_info_resp_msg.node_list);
@@ -1844,11 +1844,11 @@ static void _slurm_rpc_ping(slurm_msg_t * msg)
}
-/* _slurm_rpc_reconfigure_controller - process RPC to re-initialize
- * slurmctld from configuration file
+/* _slurm_rpc_reconfigure_controller - process RPC to re-initialize
+ * slurmctld from configuration file
* Anything you add to this function must be added to the
* slurm_reconfigure function inside controller.c try
- * to keep these in sync.
+ * to keep these in sync.
*/
static void _slurm_rpc_reconfigure_controller(slurm_msg_t * msg)
{
@@ -1856,7 +1856,7 @@ static void _slurm_rpc_reconfigure_controller(slurm_msg_t * msg)
static bool in_progress = false;
DEF_TIMERS;
/* Locks: Write configuration, job, node and partition */
- slurmctld_lock_t config_write_lock = {
+ slurmctld_lock_t config_write_lock = {
WRITE_LOCK, WRITE_LOCK, WRITE_LOCK, WRITE_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -1899,7 +1899,7 @@ static void _slurm_rpc_reconfigure_controller(slurm_msg_t * msg)
slurm_strerror(error_code));
slurm_send_rc_msg(msg, error_code);
} else {
- info("_slurm_rpc_reconfigure_controller: completed %s",
+ info("_slurm_rpc_reconfigure_controller: completed %s",
TIME_STR);
slurm_send_rc_msg(msg, SLURM_SUCCESS);
slurm_sched_partition_change(); /* notify sched plugin */
@@ -1939,7 +1939,7 @@ static void _slurm_rpc_shutdown_controller(slurm_msg_t * msg)
shutdown_msg_t *shutdown_msg = (shutdown_msg_t *) msg->data;
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
/* Locks: Read node */
- slurmctld_lock_t node_read_lock = {
+ slurmctld_lock_t node_read_lock = {
NO_LOCK, NO_LOCK, READ_LOCK, NO_LOCK };
if (!validate_super_user(uid)) {
@@ -1951,7 +1951,7 @@ static void _slurm_rpc_shutdown_controller(slurm_msg_t * msg)
else if (msg->msg_type == REQUEST_CONTROL) {
info("Performing RPC: REQUEST_CONTROL");
/* resume backup mode */
- slurmctld_config.resume_backup = true;
+ slurmctld_config.resume_backup = true;
} else {
info("Performing RPC: REQUEST_SHUTDOWN");
options = shutdown_msg->options;
@@ -1981,7 +1981,7 @@ static void _slurm_rpc_shutdown_controller(slurm_msg_t * msg)
slurmctld_shutdown();
}
}
-
+
if (msg->msg_type == REQUEST_CONTROL) {
/* Wait for workload to dry up before sending reply.
* One thread should remain, this one. */
@@ -1995,15 +1995,15 @@ static void _slurm_rpc_shutdown_controller(slurm_msg_t * msg)
slurmctld_config.server_thread_count);
/* save_all_state(); performed by _slurmctld_background */
}
-
-
+
+
slurm_send_rc_msg(msg, error_code);
if ((error_code == SLURM_SUCCESS) && (options == 1) &&
(slurmctld_config.thread_id_sig))
pthread_kill(slurmctld_config.thread_id_sig, SIGABRT);
}
-/* _slurm_rpc_shutdown_controller_immediate - process RPC to shutdown
+/* _slurm_rpc_shutdown_controller_immediate - process RPC to shutdown
* slurmctld */
static void _slurm_rpc_shutdown_controller_immediate(slurm_msg_t * msg)
{
@@ -2023,9 +2023,9 @@ static void _slurm_rpc_shutdown_controller_immediate(slurm_msg_t * msg)
debug("Performing RPC: REQUEST_SHUTDOWN_IMMEDIATE");
}
-/* _slurm_rpc_step_complete - process step completion RPC to note the
+/* _slurm_rpc_step_complete - process step completion RPC to note the
* completion of a job step on at least some nodes.
- * If the job step is complete, it may
+ * If the job step is complete, it may
* represent the termination of an entire job */
static void _slurm_rpc_step_complete(slurm_msg_t *msg)
{
@@ -2045,7 +2045,7 @@ static void _slurm_rpc_step_complete(slurm_msg_t *msg)
debug("Processing RPC: REQUEST_STEP_COMPLETE for %u.%u "
"nodes %u-%u rc=%u uid=%u",
req->job_id, req->job_step_id,
- req->range_first, req->range_last,
+ req->range_first, req->range_last,
req->step_rc, (unsigned int) uid);
lock_slurmctld(job_write_lock);
@@ -2062,7 +2062,7 @@ static void _slurm_rpc_step_complete(slurm_msg_t *msg)
if (req->job_step_id == SLURM_BATCH_SCRIPT) {
/* FIXME: test for error, possibly cause batch job requeue */
- error_code = job_complete(req->job_id, uid, job_requeue,
+ error_code = job_complete(req->job_id, uid, job_requeue,
step_rc);
unlock_slurmctld(job_write_lock);
END_TIMER2("_slurm_rpc_step_complete");
@@ -2115,12 +2115,12 @@ static void _slurm_rpc_step_layout(slurm_msg_t *msg)
job_step_id_msg_t *req = (job_step_id_msg_t *)msg->data;
slurm_step_layout_t *step_layout = NULL;
/* Locks: Read config job, write node */
- slurmctld_lock_t job_read_lock = {
+ slurmctld_lock_t job_read_lock = {
READ_LOCK, READ_LOCK, READ_LOCK, NO_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
struct job_record *job_ptr = NULL;
struct step_record *step_ptr = NULL;
-
+
START_TIMER;
debug2("Processing RPC: REQUEST_STEP_LAYOUT, from uid=%u",
(unsigned int) uid);
@@ -2136,7 +2136,7 @@ static void _slurm_rpc_step_layout(slurm_msg_t *msg)
"JobId=%u from uid=%u", req->job_id, uid);
} else {
debug2("_slurm_rpc_step_layout: JobId=%u, uid=%u: %s",
- req->job_id, uid,
+ req->job_id, uid,
slurm_strerror(error_code));
}
slurm_send_rc_msg(msg, error_code);
@@ -2148,7 +2148,7 @@ static void _slurm_rpc_step_layout(slurm_msg_t *msg)
unlock_slurmctld(job_read_lock);
debug2("_slurm_rpc_step_layout: "
"JobId=%u.%u Not Found",
- req->job_id, req->step_id);
+ req->job_id, req->step_id);
slurm_send_rc_msg(msg, ESLURM_INVALID_JOB_ID);
return;
}
@@ -2158,7 +2158,7 @@ static void _slurm_rpc_step_layout(slurm_msg_t *msg)
slurm_msg_t_init(&response_msg);
response_msg.msg_type = RESPONSE_STEP_LAYOUT;
response_msg.data = step_layout;
-
+
slurm_send_node_msg(msg->conn_fd, &response_msg);
slurm_step_layout_destroy(step_layout);
}
@@ -2174,7 +2174,7 @@ static void _slurm_rpc_submit_batch_job(slurm_msg_t * msg)
submit_response_msg_t submit_msg;
job_desc_msg_t *job_desc_msg = (job_desc_msg_t *) msg->data;
/* Locks: Write job, read node, read partition */
- slurmctld_lock_t job_write_lock = {
+ slurmctld_lock_t job_write_lock = {
NO_LOCK, WRITE_LOCK, READ_LOCK, READ_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -2205,7 +2205,7 @@ static void _slurm_rpc_submit_batch_job(slurm_msg_t * msg)
if (IS_JOB_COMPLETING(job_ptr)) {
info("Attempt to re-use active "
"job id %u", job_ptr->job_id);
- slurm_send_rc_msg(msg,
+ slurm_send_rc_msg(msg,
ESLURM_DUPLICATE_JOB_ID);
unlock_slurmctld(job_write_lock);
return;
@@ -2217,8 +2217,8 @@ static void _slurm_rpc_submit_batch_job(slurm_msg_t * msg)
if (job_ptr) { /* Active job allocation */
#ifdef HAVE_FRONT_END /* Limited job step support */
- /* Non-super users not permitted to run job steps on
- * front-end. A single slurmd can not handle a heavy
+ /* Non-super users not permitted to run job steps on
+ * front-end. A single slurmd can not handle a heavy
* load. */
if (!validate_super_user(uid)) {
info("Attempt to execute batch job step by uid=%u",
@@ -2239,7 +2239,7 @@ static void _slurm_rpc_submit_batch_job(slurm_msg_t * msg)
unlock_slurmctld(job_write_lock);
return;
}
- if (job_ptr->details &&
+ if (job_ptr->details &&
job_ptr->details->prolog_running) {
slurm_send_rc_msg(msg, EAGAIN);
unlock_slurmctld(job_write_lock);
@@ -2262,9 +2262,9 @@ static void _slurm_rpc_submit_batch_job(slurm_msg_t * msg)
submit_msg.job_id = job_desc_msg->job_id;
submit_msg.step_id = step_id;
submit_msg.error_code = error_code;
- response_msg.msg_type =
+ response_msg.msg_type =
RESPONSE_SUBMIT_BATCH_JOB;
-
+
response_msg.data = &submit_msg;
slurm_send_node_msg(msg->conn_fd,
&response_msg);
@@ -2274,8 +2274,8 @@ static void _slurm_rpc_submit_batch_job(slurm_msg_t * msg)
}
/* Create new job allocation */
- error_code = job_allocate(job_desc_msg,
- job_desc_msg->immediate,
+ error_code = job_allocate(job_desc_msg,
+ job_desc_msg->immediate,
false, NULL,
false, uid, &job_ptr);
unlock_slurmctld(job_write_lock);
@@ -2292,7 +2292,7 @@ static void _slurm_rpc_submit_batch_job(slurm_msg_t * msg)
slurm_strerror(error_code));
slurm_send_rc_msg(msg, error_code);
} else {
- info("_slurm_rpc_submit_batch_job JobId=%u %s",
+ info("_slurm_rpc_submit_batch_job JobId=%u %s",
job_ptr->job_id, TIME_STR);
/* send job_ID */
submit_msg.job_id = job_ptr->job_id;
@@ -2307,7 +2307,7 @@ static void _slurm_rpc_submit_batch_job(slurm_msg_t * msg)
}
}
-/* _slurm_rpc_update_job - process RPC to update the configuration of a
+/* _slurm_rpc_update_job - process RPC to update the configuration of a
* job (e.g. priority) */
static void _slurm_rpc_update_job(slurm_msg_t * msg)
{
@@ -2315,7 +2315,7 @@ static void _slurm_rpc_update_job(slurm_msg_t * msg)
DEF_TIMERS;
job_desc_msg_t *job_desc_msg = (job_desc_msg_t *) msg->data;
/* Locks: Write job, read node, read partition */
- slurmctld_lock_t job_write_lock = {
+ slurmctld_lock_t job_write_lock = {
NO_LOCK, WRITE_LOCK, READ_LOCK, READ_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -2336,7 +2336,7 @@ static void _slurm_rpc_update_job(slurm_msg_t * msg)
job_desc_msg->job_id, slurm_strerror(error_code));
slurm_send_rc_msg(msg, error_code);
} else {
- debug2("_slurm_rpc_update_job complete JobId=%u %s",
+ debug2("_slurm_rpc_update_job complete JobId=%u %s",
job_desc_msg->job_id, TIME_STR);
slurm_send_rc_msg(msg, SLURM_SUCCESS);
/* Below functions provide their own locking */
@@ -2352,7 +2352,7 @@ static void _slurm_rpc_update_job(slurm_msg_t * msg)
* node_list IN - list of nodes to drain
* reason IN - reason to drain the nodes
* RET SLURM_SUCCESS or error code
- * NOTE: This is utilzed by plugins and not via RPC and it sets its
+ * NOTE: This is utilzed by plugins and not via RPC and it sets its
* own locks.
*/
extern int slurm_drain_nodes(char *node_list, char *reason)
@@ -2360,7 +2360,7 @@ extern int slurm_drain_nodes(char *node_list, char *reason)
int error_code;
DEF_TIMERS;
/* Locks: Write node */
- slurmctld_lock_t node_write_lock = {
+ slurmctld_lock_t node_write_lock = {
NO_LOCK, NO_LOCK, WRITE_LOCK, NO_LOCK };
START_TIMER;
@@ -2397,7 +2397,7 @@ extern int slurm_fail_job(uint32_t job_id)
return error_code;
}
-/* _slurm_rpc_update_node - process RPC to update the configuration of a
+/* _slurm_rpc_update_node - process RPC to update the configuration of a
* node (e.g. UP/DOWN) */
static void _slurm_rpc_update_node(slurm_msg_t * msg)
{
@@ -2406,7 +2406,7 @@ static void _slurm_rpc_update_node(slurm_msg_t * msg)
update_node_msg_t *update_node_msg_ptr =
(update_node_msg_t *) msg->data;
/* Locks: Write job and write node */
- slurmctld_lock_t node_write_lock = {
+ slurmctld_lock_t node_write_lock = {
NO_LOCK, WRITE_LOCK, WRITE_LOCK, NO_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -2434,7 +2434,7 @@ static void _slurm_rpc_update_node(slurm_msg_t * msg)
slurm_strerror(error_code));
slurm_send_rc_msg(msg, error_code);
} else {
- debug2("_slurm_rpc_update_node complete for %s %s",
+ debug2("_slurm_rpc_update_node complete for %s %s",
update_node_msg_ptr->node_names, TIME_STR);
slurm_send_rc_msg(msg, SLURM_SUCCESS);
}
@@ -2446,7 +2446,7 @@ static void _slurm_rpc_update_node(slurm_msg_t * msg)
trigger_reconfig();
}
-/* _slurm_rpc_update_partition - process RPC to update the configuration
+/* _slurm_rpc_update_partition - process RPC to update the configuration
* of a partition (e.g. UP/DOWN) */
static void _slurm_rpc_update_partition(slurm_msg_t * msg)
{
@@ -2454,7 +2454,7 @@ static void _slurm_rpc_update_partition(slurm_msg_t * msg)
DEF_TIMERS;
update_part_msg_t *part_desc_ptr = (update_part_msg_t *) msg->data;
/* Locks: Read config, read node, write partition */
- slurmctld_lock_t part_write_lock = {
+ slurmctld_lock_t part_write_lock = {
READ_LOCK, NO_LOCK, READ_LOCK, WRITE_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -2508,7 +2508,7 @@ static void _slurm_rpc_delete_partition(slurm_msg_t * msg)
DEF_TIMERS;
delete_part_msg_t *part_desc_ptr = (delete_part_msg_t *) msg->data;
/* Locks: write job, read node, write partition */
- slurmctld_lock_t part_write_lock = {
+ slurmctld_lock_t part_write_lock = {
NO_LOCK, WRITE_LOCK, READ_LOCK, WRITE_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -2552,10 +2552,10 @@ static void _slurm_rpc_resv_create(slurm_msg_t * msg)
{
int error_code = SLURM_SUCCESS;
DEF_TIMERS;
- resv_desc_msg_t *resv_desc_ptr = (resv_desc_msg_t *)
+ resv_desc_msg_t *resv_desc_ptr = (resv_desc_msg_t *)
msg->data;
/* Locks: write node, read partition */
- slurmctld_lock_t node_write_lock = {
+ slurmctld_lock_t node_write_lock = {
NO_LOCK, NO_LOCK, WRITE_LOCK, READ_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -2608,10 +2608,10 @@ static void _slurm_rpc_resv_update(slurm_msg_t * msg)
{
int error_code = SLURM_SUCCESS;
DEF_TIMERS;
- resv_desc_msg_t *resv_desc_ptr = (resv_desc_msg_t *)
+ resv_desc_msg_t *resv_desc_ptr = (resv_desc_msg_t *)
msg->data;
/* Locks: write node, read partition */
- slurmctld_lock_t node_write_lock = {
+ slurmctld_lock_t node_write_lock = {
NO_LOCK, NO_LOCK, WRITE_LOCK, READ_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -2660,7 +2660,7 @@ static void _slurm_rpc_resv_delete(slurm_msg_t * msg)
reservation_name_msg_t *resv_desc_ptr = (reservation_name_msg_t *)
msg->data;
/* Locks: read job, write node */
- slurmctld_lock_t node_write_lock = {
+ slurmctld_lock_t node_write_lock = {
NO_LOCK, READ_LOCK, WRITE_LOCK, NO_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -2704,11 +2704,11 @@ static void _slurm_rpc_resv_delete(slurm_msg_t * msg)
/* _slurm_rpc_resv_show - process RPC to dump reservation info */
static void _slurm_rpc_resv_show(slurm_msg_t * msg)
{
- resv_info_request_msg_t *resv_req_msg = (resv_info_request_msg_t *)
+ resv_info_request_msg_t *resv_req_msg = (resv_info_request_msg_t *)
msg->data;
DEF_TIMERS;
/* Locks: read node */
- slurmctld_lock_t node_read_lock = {
+ slurmctld_lock_t node_read_lock = {
NO_LOCK, NO_LOCK, READ_LOCK, NO_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
slurm_msg_t response_msg;
@@ -2745,7 +2745,7 @@ static void _slurm_rpc_resv_show(slurm_msg_t * msg)
}
}
-/* _slurm_rpc_update_block - process RPC to update the configuration
+/* _slurm_rpc_update_block - process RPC to update the configuration
* of a block (e.g. FREE/ERROR/DELETE) */
static void _slurm_rpc_update_block(slurm_msg_t * msg)
{
@@ -2801,7 +2801,7 @@ static void _slurm_rpc_job_ready(slurm_msg_t * msg)
job_id_msg_t *id_msg = (job_id_msg_t *) msg->data;
DEF_TIMERS;
/* Locks: read job */
- slurmctld_lock_t job_read_lock = {
+ slurmctld_lock_t job_read_lock = {
NO_LOCK, READ_LOCK, NO_LOCK, NO_LOCK };
slurm_msg_t response_msg;
return_code_msg_t rc_msg;
@@ -2817,7 +2817,7 @@ static void _slurm_rpc_job_ready(slurm_msg_t * msg)
slurm_strerror(error_code));
slurm_send_rc_msg(msg, error_code);
} else {
- debug2("_slurm_rpc_job_ready(%u)=%d %s", id_msg->job_id,
+ debug2("_slurm_rpc_job_ready(%u)=%d %s", id_msg->job_id,
result, TIME_STR);
slurm_msg_t_init(&response_msg);
response_msg.address = msg->address;
@@ -2837,7 +2837,7 @@ static void _slurm_rpc_block_info(slurm_msg_t * msg)
(block_info_request_msg_t *) msg->data;
slurm_msg_t response_msg;
/* Locks: read config */
- slurmctld_lock_t config_read_lock = {
+ slurmctld_lock_t config_read_lock = {
READ_LOCK, NO_LOCK, NO_LOCK, NO_LOCK };
DEF_TIMERS;
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
@@ -2851,7 +2851,7 @@ static void _slurm_rpc_block_info(slurm_msg_t * msg)
error_code = ESLURM_ACCESS_DENIED;
error("Security violation, REQUEST_BLOCK_INFO RPC from uid=u",
(unsigned int) uid);
- }
+ }
unlock_slurmctld(config_read_lock);
if (error_code == SLURM_SUCCESS) {
error_code = select_g_pack_select_info(
@@ -2861,7 +2861,7 @@ static void _slurm_rpc_block_info(slurm_msg_t * msg)
END_TIMER2("_slurm_rpc_block_info");
if (error_code) {
- debug3("_slurm_rpc_block_info: %s",
+ debug3("_slurm_rpc_block_info: %s",
slurm_strerror(error_code));
slurm_send_rc_msg(msg, error_code);
} else {
@@ -2873,7 +2873,7 @@ static void _slurm_rpc_block_info(slurm_msg_t * msg)
response_msg.data_size = get_buf_offset(buffer);
/* send message */
slurm_send_node_msg(msg->conn_fd, &response_msg);
-
+
if (buffer)
free_buf(buffer);
}
@@ -2881,9 +2881,9 @@ static void _slurm_rpc_block_info(slurm_msg_t * msg)
/* Reset the job credential key based upon configuration parameters.
* NOTE: READ lock_slurmctld config before entry */
-static void _update_cred_key(void)
+static void _update_cred_key(void)
{
- slurm_cred_ctx_key_update(slurmctld_config.cred_ctx,
+ slurm_cred_ctx_key_update(slurmctld_config.cred_ctx,
slurmctld_conf.job_credential_private_key);
}
@@ -2909,14 +2909,14 @@ inline static void _slurm_rpc_suspend(slurm_msg_t * msg)
default:
op = "unknown";
}
- info("Processing RPC: REQUEST_SUSPEND(%s) from uid=%u",
+ info("Processing RPC: REQUEST_SUSPEND(%s) from uid=%u",
op, (unsigned int) uid);
lock_slurmctld(job_write_lock);
error_code = job_suspend(sus_ptr, uid, msg->conn_fd, true);
unlock_slurmctld(job_write_lock);
END_TIMER2("_slurm_rpc_suspend");
-
+
if (error_code) {
info("_slurm_rpc_suspend(%s) %u: %s", op,
sus_ptr->job_id, slurm_strerror(error_code));
@@ -2945,7 +2945,7 @@ inline static void _slurm_rpc_requeue(slurm_msg_t * msg)
(unsigned int) uid);
lock_slurmctld(job_write_lock);
- error_code = job_requeue(uid, requeue_ptr->job_id,
+ error_code = job_requeue(uid, requeue_ptr->job_id,
msg->conn_fd);
unlock_slurmctld(job_write_lock);
END_TIMER2("_slurm_rpc_requeue");
@@ -2968,7 +2968,7 @@ inline static void _slurm_rpc_checkpoint(slurm_msg_t * msg)
DEF_TIMERS;
checkpoint_msg_t *ckpt_ptr = (checkpoint_msg_t *) msg->data;
/* Locks: write job lock, read node lock */
- slurmctld_lock_t job_write_lock = {
+ slurmctld_lock_t job_write_lock = {
NO_LOCK, WRITE_LOCK, READ_LOCK, NO_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
char *op;
@@ -2999,7 +2999,7 @@ inline static void _slurm_rpc_checkpoint(slurm_msg_t * msg)
default:
op = "unknown";
}
- debug2("Processing RPC: REQUEST_CHECKPOINT(%s) from uid=%u",
+ debug2("Processing RPC: REQUEST_CHECKPOINT(%s) from uid=%u",
op, (unsigned int) uid);
/* do RPC call and send reply */
@@ -3016,11 +3016,11 @@ inline static void _slurm_rpc_checkpoint(slurm_msg_t * msg)
if (error_code) {
if (ckpt_ptr->step_id == SLURM_BATCH_SCRIPT) {
- info("_slurm_rpc_checkpoint %s %u: %s", op,
+ info("_slurm_rpc_checkpoint %s %u: %s", op,
ckpt_ptr->job_id, slurm_strerror(error_code));
} else {
- info("_slurm_rpc_checkpoint %s %u.%u: %s", op,
- ckpt_ptr->job_id, ckpt_ptr->step_id,
+ info("_slurm_rpc_checkpoint %s %u.%u: %s", op,
+ ckpt_ptr->job_id, ckpt_ptr->step_id,
slurm_strerror(error_code));
}
} else {
@@ -3101,7 +3101,7 @@ inline static void _slurm_rpc_checkpoint_task_comp(slurm_msg_t * msg)
}
}
-/* Copy an array of type char **, xmalloc() the array and xstrdup() the
+/* Copy an array of type char **, xmalloc() the array and xstrdup() the
* strings in the array */
extern char **
xduparray(uint16_t size, char ** array)
@@ -3119,10 +3119,10 @@ xduparray(uint16_t size, char ** array)
return result;
}
-/* Like xduparray(), but performs one xmalloc(). The output format of this
+/* Like xduparray(), but performs one xmalloc(). The output format of this
* must be identical to _read_data_array_from_file() */
static char **
-_xduparray2(uint16_t size, char ** array)
+_xduparray2(uint16_t size, char ** array)
{
int i, len = 0;
char *ptr, ** result;
@@ -3161,7 +3161,7 @@ int _launch_batch_step(job_desc_msg_t *job_desc_msg, uid_t uid,
batch_job_launch_msg_t *launch_msg_ptr;
agent_arg_t *agent_arg_ptr;
struct node_record *node_ptr;
-
+
/*
* Create a job step. Note that a credential is not necessary,
* since the slurmctld will be submitting this job directly to
@@ -3169,7 +3169,7 @@ int _launch_batch_step(job_desc_msg_t *job_desc_msg, uid_t uid,
*/
job_step_create_request_msg_t req_step_msg;
struct step_record *step_rec;
-
+
/*
* As far as the step record in slurmctld goes, we are just
* launching a batch script which will be run on a single
@@ -3191,7 +3191,7 @@ int _launch_batch_step(job_desc_msg_t *job_desc_msg, uid_t uid,
if (error_code != SLURM_SUCCESS)
return error_code;
-
+
/*
* TODO: check all instances of step_record to ensure there's no
* problem with a null switch_job_info pointer.
@@ -3208,7 +3208,7 @@ int _launch_batch_step(job_desc_msg_t *job_desc_msg, uid_t uid,
* current allocation.
* TODO: validate the specific batch job request vs. the
* existing allocation. Note that subsequent srun steps within
- * the batch script will work within the full allocation, but
+ * the batch script will work within the full allocation, but
* the batch step options can still provide default settings via
* environment variables
*
@@ -3219,8 +3219,8 @@ int _launch_batch_step(job_desc_msg_t *job_desc_msg, uid_t uid,
* about how this job actually ran.
*/
job_ptr->time_last_active = now;
-
-
+
+
/* Launch the batch job */
node_ptr = find_first_node_record(job_ptr->node_bitmap);
if (node_ptr == NULL) {
@@ -3281,12 +3281,12 @@ int _launch_batch_step(job_desc_msg_t *job_desc_msg, uid_t uid,
launch_msg_ptr->num_cpu_groups = job_ptr->job_resrcs->cpu_array_cnt;
launch_msg_ptr->cpus_per_node = xmalloc(sizeof(uint16_t) *
job_ptr->job_resrcs->cpu_array_cnt);
- memcpy(launch_msg_ptr->cpus_per_node,
+ memcpy(launch_msg_ptr->cpus_per_node,
job_ptr->job_resrcs->cpu_array_value,
(sizeof(uint16_t) * job_ptr->job_resrcs->cpu_array_cnt));
launch_msg_ptr->cpu_count_reps = xmalloc(sizeof(uint32_t) *
job_ptr->job_resrcs->cpu_array_cnt);
- memcpy(launch_msg_ptr->cpu_count_reps,
+ memcpy(launch_msg_ptr->cpu_count_reps,
job_ptr->job_resrcs->cpu_array_reps,
(sizeof(uint32_t) * job_ptr->job_resrcs->cpu_array_cnt));
launch_msg_ptr->select_jobinfo = select_g_select_jobinfo_copy(
@@ -3298,7 +3298,7 @@ int _launch_batch_step(job_desc_msg_t *job_desc_msg, uid_t uid,
* This means that SLURM_TASKS_PER_NODE will not match with
* SLURM_NPROCS in the batch script environment.
*/
-
+
agent_arg_ptr = (agent_arg_t *) xmalloc(sizeof(agent_arg_t));
agent_arg_ptr->node_count = 1;
agent_arg_ptr->retry = 0;
@@ -3308,7 +3308,7 @@ int _launch_batch_step(job_desc_msg_t *job_desc_msg, uid_t uid,
/* Launch the RPC via agent */
agent_queue_request(agent_arg_ptr);
-
+
*step_id = step_rec->step_id;
return SLURM_SUCCESS;
}
@@ -3377,7 +3377,7 @@ inline static void _slurm_rpc_get_topo(slurm_msg_t * msg)
slurm_msg_t response_msg;
int i;
/* Locks: read node lock */
- slurmctld_lock_t node_read_lock = {
+ slurmctld_lock_t node_read_lock = {
NO_LOCK, NO_LOCK, READ_LOCK, NO_LOCK };
DEF_TIMERS;
@@ -3385,7 +3385,7 @@ inline static void _slurm_rpc_get_topo(slurm_msg_t * msg)
lock_slurmctld(node_read_lock);
topo_resp_msg = xmalloc(sizeof(topo_info_response_msg_t));
topo_resp_msg->record_count = switch_record_cnt;
- topo_resp_msg->topo_array = xmalloc(sizeof(topo_info_t) *
+ topo_resp_msg->topo_array = xmalloc(sizeof(topo_info_t) *
topo_resp_msg->record_count);
for (i=0; i<topo_resp_msg->record_count; i++) {
topo_resp_msg->topo_array[i].level =
@@ -3414,7 +3414,7 @@ inline static void _slurm_rpc_job_notify(slurm_msg_t * msg)
{
int error_code = SLURM_SUCCESS;
/* Locks: read job */
- slurmctld_lock_t job_read_lock = {
+ slurmctld_lock_t job_read_lock = {
NO_LOCK, READ_LOCK, NO_LOCK, NO_LOCK };
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
job_notify_msg_t * notify_msg = (job_notify_msg_t *) msg->data;
@@ -3452,7 +3452,7 @@ inline static void _slurm_rpc_set_debug_level(slurm_msg_t *msg)
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
slurmctld_lock_t config_read_lock =
{ READ_LOCK, NO_LOCK, NO_LOCK, NO_LOCK };
- set_debug_level_msg_t *request_msg =
+ set_debug_level_msg_t *request_msg =
(set_debug_level_msg_t *) msg->data;
log_options_t log_opts = LOG_OPTS_INITIALIZER;
slurm_ctl_conf_t *conf;
@@ -3460,7 +3460,7 @@ inline static void _slurm_rpc_set_debug_level(slurm_msg_t *msg)
debug2("Processing RPC: REQUEST_SET_DEBUG_LEVEL from uid=%u",
(unsigned int) uid);
if (!validate_super_user(uid)) {
- error("set debug level request from non-super user uid=%d",
+ error("set debug level request from non-super user uid=%d",
uid);
slurm_send_rc_msg(msg, EACCES);
return;
@@ -3513,17 +3513,17 @@ inline static void _slurm_rpc_accounting_update_msg(slurm_msg_t *msg)
accounting_update_msg_t *update_ptr =
(accounting_update_msg_t *) msg->data;
acct_update_object_t *object = NULL;
-
+
DEF_TIMERS;
START_TIMER;
debug2("Processing RPC: ACCOUNTING_UPDATE_MSG from uid=%u",
(unsigned int) uid);
- if (!validate_super_user(uid)
+ if (!validate_super_user(uid)
&& (assoc_mgr_get_admin_level(acct_db_conn, uid)
< ACCT_ADMIN_SUPER_USER)) {
- error("Update Association request from non-super user uid=%d",
+ error("Update Association request from non-super user uid=%d",
uid);
slurm_send_rc_msg(msg, EACCES);
return;
@@ -3565,7 +3565,7 @@ inline static void _slurm_rpc_accounting_update_msg(slurm_msg_t *msg)
}
list_iterator_destroy(itr);
}
-
+
END_TIMER2("_slurm_rpc_accounting_update_msg");
slurm_send_rc_msg(msg, rc);
@@ -3575,21 +3575,21 @@ inline static void _slurm_rpc_accounting_first_reg(slurm_msg_t *msg)
{
uid_t uid = g_slurm_auth_get_uid(msg->auth_cred, NULL);
time_t event_time = time(NULL);
-
+
DEF_TIMERS;
START_TIMER;
debug2("Processing RPC: ACCOUNTING_FIRST_REG from uid=%u",
(unsigned int) uid);
- if (!validate_super_user(uid)
+ if (!validate_super_user(uid)
&& (assoc_mgr_get_admin_level(acct_db_conn, uid)
< ACCT_ADMIN_SUPER_USER)) {
- error("First Registration request from non-super user uid=%d",
+ error("First Registration request from non-super user uid=%d",
uid);
return;
}
-
+
send_all_to_accounting(event_time);
-
+
END_TIMER2("_slurm_rpc_accounting_first_reg");
}
diff --git a/src/slurmctld/proc_req.h b/src/slurmctld/proc_req.h
index 33b960365bf90bdc7985c0088e7a3f0d227e12f8..6810e42d3fbd4b790b12522e21e249fbd959e037 100644
--- a/src/slurmctld/proc_req.h
+++ b/src/slurmctld/proc_req.h
@@ -3,34 +3,34 @@
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Morris Jette <jette1@llnl.gov> and Kevin Tew <tew1@llnl.gov>
+ * Written by Morris Jette <jette1@llnl.gov> and Kevin Tew <tew1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -70,7 +70,7 @@ extern int slurm_drain_nodes(char *node_list, char *reason);
*/
extern int slurm_fail_job(uint32_t job_id);
-/* Copy an array of type char **, xmalloc() the array and xstrdup() the
+/* Copy an array of type char **, xmalloc() the array and xstrdup() the
* strings in the array */
extern char **xduparray(uint16_t size, char ** array);
diff --git a/src/slurmctld/read_config.c b/src/slurmctld/read_config.c
index c685359a23598b77e580a674640ec5a530952bd8..1f2a29e4ca43e6e3961eca2831a5f7596e3c7194 100644
--- a/src/slurmctld/read_config.c
+++ b/src/slurmctld/read_config.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -91,17 +91,17 @@ static void _acct_restore_active_jobs(void);
static int _build_bitmaps(void);
static void _build_bitmaps_pre_select(void);
static int _init_all_slurm_conf(void);
-static int _preserve_select_type_param(slurm_ctl_conf_t * ctl_conf_ptr,
- select_type_plugin_info_t
+static int _preserve_select_type_param(slurm_ctl_conf_t * ctl_conf_ptr,
+ select_type_plugin_info_t
old_select_type_p);
-static int _preserve_plugins(slurm_ctl_conf_t * ctl_conf_ptr,
+static int _preserve_plugins(slurm_ctl_conf_t * ctl_conf_ptr,
char *old_auth_type, char *old_checkpoint_type,
- char *old_crypto_type, char *old_sched_type,
+ char *old_crypto_type, char *old_sched_type,
char *old_select_type, char *old_switch_type);
-static void _purge_old_node_state(struct node_record *old_node_table_ptr,
+static void _purge_old_node_state(struct node_record *old_node_table_ptr,
int old_node_record_count);
static int _restore_job_dependencies(void);
-static int _restore_node_state(struct node_record *old_node_table_ptr,
+static int _restore_node_state(struct node_record *old_node_table_ptr,
int old_node_record_count);
static int _sync_nodes_to_comp_job(void);
static int _sync_nodes_to_jobs(void);
@@ -112,7 +112,7 @@ static void _validate_node_proc_count(void);
#endif
/*
- * _build_bitmaps_pre_select - recover some state for jobs and nodes prior to
+ * _build_bitmaps_pre_select - recover some state for jobs and nodes prior to
* calling the select_* functions
*/
static void _build_bitmaps_pre_select(void)
@@ -133,7 +133,7 @@ static void _build_bitmaps_pre_select(void)
if ((part_ptr->nodes == NULL) || (part_ptr->nodes[0] == '\0'))
continue;
- if (node_name2bitmap(part_ptr->nodes, false,
+ if (node_name2bitmap(part_ptr->nodes, false,
&part_ptr->node_bitmap)) {
fatal("Invalid node names in partition %s",
part_ptr->name);
@@ -145,7 +145,7 @@ static void _build_bitmaps_pre_select(void)
node_ptr = &node_record_table_ptr[i];
part_ptr->total_nodes++;
if (slurmctld_conf.fast_schedule)
- part_ptr->total_cpus +=
+ part_ptr->total_cpus +=
node_ptr->config_ptr->cpus;
else
part_ptr->total_cpus += node_ptr->cpus;
@@ -156,11 +156,11 @@ static void _build_bitmaps_pre_select(void)
}
}
list_iterator_destroy(part_iterator);
- return;
+ return;
}
/*
- * _build_bitmaps - build node bitmaps to define which nodes are in which
+ * _build_bitmaps - build node bitmaps to define which nodes are in which
* 1) partition 2) configuration record 3) up state 4) idle state
* also sets values of total_nodes and total_cpus for every partition.
* RET 0 if no error, errno otherwise
@@ -196,7 +196,7 @@ static int _build_bitmaps(void)
(avail_node_bitmap == NULL) ||
(power_node_bitmap == NULL) ||
(share_node_bitmap == NULL) ||
- (up_node_bitmap == NULL))
+ (up_node_bitmap == NULL))
fatal ("bit_alloc malloc failure");
/* initialize the configuration bitmaps */
@@ -234,7 +234,7 @@ static int _build_bitmaps(void)
}
list_iterator_destroy(job_iterator);
- /* scan all nodes and identify which are up, idle and
+ /* scan all nodes and identify which are up, idle and
* their configuration, resync DRAINED vs. DRAINING state */
for (i=0, node_ptr=node_record_table_ptr;
i<node_record_count; i++, node_ptr++) {
@@ -242,7 +242,7 @@ static int _build_bitmaps(void)
if (node_ptr->name[0] == '\0')
continue; /* defunct */
- drain_flag = IS_NODE_DRAIN(node_ptr) |
+ drain_flag = IS_NODE_DRAIN(node_ptr) |
IS_NODE_FAIL(node_ptr);
job_cnt = node_ptr->run_job_cnt + node_ptr->comp_job_cnt;
@@ -250,7 +250,7 @@ static int _build_bitmaps(void)
IS_NODE_DOWN(node_ptr))
bit_set(idle_node_bitmap, i);
if (IS_NODE_IDLE(node_ptr) || IS_NODE_ALLOCATED(node_ptr)) {
- if ((drain_flag == 0) &&
+ if ((drain_flag == 0) &&
(!IS_NODE_NO_RESPOND(node_ptr)))
bit_set(avail_node_bitmap, i);
bit_set(up_node_bitmap, i);
@@ -274,9 +274,9 @@ static int _build_bitmaps(void)
}
-/*
- * _init_all_slurm_conf - initialize or re-initialize the slurm
- * configuration values.
+/*
+ * _init_all_slurm_conf - initialize or re-initialize the slurm
+ * configuration values.
* RET 0 if no error, otherwise an error code.
* NOTE: We leave the job table intact
* NOTE: Operates on common variables, no arguments
@@ -358,7 +358,7 @@ static void _handle_all_downnodes(void)
if (count == 0) {
debug("No DownNodes");
return;
- }
+ }
for (i = 0; i < count; i++) {
ptr = ptr_array[i];
@@ -367,7 +367,7 @@ static void _handle_all_downnodes(void)
}
}
-/*
+/*
* _build_all_nodeline_info - get a array of slurm_conf_node_t structures
* from the slurm.conf reader, build table, and set values
* RET 0 if no error, error code otherwise
@@ -431,7 +431,7 @@ static int _build_single_partitionline_info(slurm_conf_partition_t *part)
if (default_part_name
&& strcmp(default_part_name, part->name))
info("_parse_part_spec: changing default partition "
- "from %s to %s",
+ "from %s to %s",
default_part_name, part->name);
xfree(default_part_name);
default_part_name = xstrdup(part->name);
@@ -441,8 +441,8 @@ static int _build_single_partitionline_info(slurm_conf_partition_t *part)
part_ptr->disable_root_jobs = slurmctld_conf.disable_root_jobs;
else
part_ptr->disable_root_jobs = part->disable_root_jobs;
-
- if(part_ptr->disable_root_jobs)
+
+ if(part_ptr->disable_root_jobs)
debug2("partition %s does not allow root jobs", part_ptr->name);
if ((part->default_time != NO_VAL) &&
@@ -472,7 +472,7 @@ static int _build_single_partitionline_info(slurm_conf_partition_t *part)
int cnt_tot, cnt_uniq, buf_size;
hostlist_t hl = hostlist_create(part_ptr->
allow_alloc_nodes);
-
+
hostlist_push(hl, part->allow_alloc_nodes);
cnt_tot = hostlist_count(hl);
hostlist_uniq(hl);
@@ -485,11 +485,11 @@ static int _build_single_partitionline_info(slurm_conf_partition_t *part)
strlen(part->allow_alloc_nodes) + 1;
xfree(part_ptr->allow_alloc_nodes);
part_ptr->allow_alloc_nodes = xmalloc(buf_size);
- hostlist_ranged_string(hl, buf_size,
+ hostlist_ranged_string(hl, buf_size,
part_ptr->allow_alloc_nodes);
hostlist_destroy(hl);
} else {
- part_ptr->allow_alloc_nodes =
+ part_ptr->allow_alloc_nodes =
xstrdup(part->allow_alloc_nodes);
}
}
@@ -497,7 +497,7 @@ static int _build_single_partitionline_info(slurm_conf_partition_t *part)
if (part_ptr->nodes) {
int cnt_tot, cnt_uniq, buf_size;
hostlist_t hl = hostlist_create(part_ptr->nodes);
-
+
hostlist_push(hl, part->nodes);
cnt_tot = hostlist_count(hl);
hostlist_uniq(hl);
@@ -534,7 +534,7 @@ static int _build_all_partitionline_info()
int count;
int i;
ListIterator itr = NULL;
-
+
count = slurm_conf_partition_array(&ptr_array);
if (count == 0)
fatal("No PartitionName information available!");
@@ -543,7 +543,7 @@ static int _build_all_partitionline_info()
part = ptr_array[i];
_build_single_partitionline_info(part);
- if(part->priority > part_max_priority)
+ if(part->priority > part_max_priority)
part_max_priority = part->priority;
}
@@ -553,7 +553,7 @@ static int _build_all_partitionline_info()
itr = list_iterator_create(part_list);
while((part_ptr = list_next(itr))) {
- part_ptr->norm_priority = (double)part_ptr->priority
+ part_ptr->norm_priority = (double)part_ptr->priority
/ (double)part_max_priority;
}
list_iterator_destroy(itr);
@@ -563,12 +563,12 @@ static int _build_all_partitionline_info()
}
/*
- * read_slurm_conf - load the slurm configuration from the configured file.
+ * read_slurm_conf - load the slurm configuration from the configured file.
* read_slurm_conf can be called more than once if so desired.
- * IN recover - replace job, node and/or partition data with last saved
+ * IN recover - replace job, node and/or partition data with last saved
* state information depending upon value
* 0 = use no saved state information
- * 1 = recover saved job and trigger state,
+ * 1 = recover saved job and trigger state,
* node DOWN/DRAIN/FAIL state and reason information
* 2 = recover all state saved from last slurmctld shutdown
* RET SLURM_SUCCESS if no error, otherwise an error code
@@ -590,7 +590,7 @@ int read_slurm_conf(int recover)
char *old_switch_type = xstrdup(slurmctld_conf.switch_type);
char *state_save_dir = xstrdup(slurmctld_conf.state_save_location);
char *mpi_params;
- select_type_plugin_info_t old_select_type_p =
+ select_type_plugin_info_t old_select_type_p =
(select_type_plugin_info_t) slurmctld_conf.select_type_param;
/* initialization */
@@ -644,7 +644,7 @@ int read_slurm_conf(int recover)
if (node_record_count < 1) {
error("read_slurm_conf: no nodes configured.");
- _purge_old_node_state(old_node_table_ptr,
+ _purge_old_node_state(old_node_table_ptr,
old_node_record_count);
return EINVAL;
}
@@ -663,7 +663,7 @@ int read_slurm_conf(int recover)
} else { /* Load no info, preserve all state */
if (old_node_table_ptr) {
info("restoring original state of nodes");
- rc = _restore_node_state(old_node_table_ptr,
+ rc = _restore_node_state(old_node_table_ptr,
old_node_record_count);
error_code = MAX(error_code, rc); /* not fatal */
}
@@ -717,7 +717,7 @@ int read_slurm_conf(int recover)
/* Update plugins as possible */
rc = _preserve_plugins(&slurmctld_conf,
old_auth_type, old_checkpoint_type,
- old_crypto_type, old_sched_type,
+ old_crypto_type, old_sched_type,
old_select_type, old_switch_type);
error_code = MAX(error_code, rc); /* not fatal */
@@ -757,7 +757,7 @@ int read_slurm_conf(int recover)
/* Restore node state and size information from saved records.
* If a node was re-configured to be down or drained, we set those states */
-static int _restore_node_state(struct node_record *old_node_table_ptr,
+static int _restore_node_state(struct node_record *old_node_table_ptr,
int old_node_record_count)
{
struct node_record *node_ptr;
@@ -786,7 +786,7 @@ static int _restore_node_state(struct node_record *old_node_table_ptr,
node_ptr->node_state |= NODE_STATE_DOWN;
}
if (drain_flag)
- node_ptr->node_state |= NODE_STATE_DRAIN;
+ node_ptr->node_state |= NODE_STATE_DRAIN;
if ((!power_save_mode) &&
(IS_NODE_POWER_SAVE(node_ptr) ||
IS_NODE_POWER_UP(node_ptr))) {
@@ -801,8 +801,8 @@ static int _restore_node_state(struct node_record *old_node_table_ptr,
node_ptr->last_response = old_node_table_ptr[i].last_response;
if (old_node_table_ptr[i].port != node_ptr->config_ptr->cpus) {
rc = ESLURM_NEED_RESTART;
- error("Configured cpu count change on %s (%u to %u)",
- node_ptr->name, old_node_table_ptr[i].port,
+ error("Configured cpu count change on %s (%u to %u)",
+ node_ptr->name, old_node_table_ptr[i].port,
node_ptr->config_ptr->cpus);
}
node_ptr->cpus = old_node_table_ptr[i].cpus;
@@ -843,7 +843,7 @@ static int _restore_node_state(struct node_record *old_node_table_ptr,
}
/* Purge old node state information */
-static void _purge_old_node_state(struct node_record *old_node_table_ptr,
+static void _purge_old_node_state(struct node_record *old_node_table_ptr,
int old_node_record_count)
{
int i;
@@ -859,19 +859,19 @@ static void _purge_old_node_state(struct node_record *old_node_table_ptr,
/*
* _preserve_select_type_param - preserve original plugin parameters.
- * Daemons and/or commands must be restarted for some
+ * Daemons and/or commands must be restarted for some
* select plugin value changes to take effect.
* RET zero or error code
*/
-static int _preserve_select_type_param(slurm_ctl_conf_t *ctl_conf_ptr,
+static int _preserve_select_type_param(slurm_ctl_conf_t *ctl_conf_ptr,
select_type_plugin_info_t old_select_type_p)
{
int rc = SLURM_SUCCESS;
-
- /* SelectTypeParameters cannot change */
+
+ /* SelectTypeParameters cannot change */
if (old_select_type_p) {
if (old_select_type_p != ctl_conf_ptr->select_type_param) {
- ctl_conf_ptr->select_type_param = (uint16_t)
+ ctl_conf_ptr->select_type_param = (uint16_t)
old_select_type_p;
rc = ESLURM_INVALID_SELECTTYPE_CHANGE;
}
@@ -879,13 +879,13 @@ static int _preserve_select_type_param(slurm_ctl_conf_t *ctl_conf_ptr,
return rc;
}
-/* Start or stop the gang scheduler module as needed based upon changes in
+/* Start or stop the gang scheduler module as needed based upon changes in
* configuration */
static int _update_preempt(uint16_t old_preempt_mode)
{
uint16_t new_preempt_mode = slurm_get_preempt_mode();
- if ((old_preempt_mode & PREEMPT_MODE_GANG) ==
+ if ((old_preempt_mode & PREEMPT_MODE_GANG) ==
(new_preempt_mode & PREEMPT_MODE_GANG))
return SLURM_SUCCESS;
@@ -904,14 +904,14 @@ static int _update_preempt(uint16_t old_preempt_mode)
}
/*
- * _preserve_plugins - preserve original plugin values over reconfiguration
- * as required. daemons and/or commands must be restarted for some
+ * _preserve_plugins - preserve original plugin values over reconfiguration
+ * as required. daemons and/or commands must be restarted for some
* plugin value changes to take effect.
* RET zero or error code
*/
-static int _preserve_plugins(slurm_ctl_conf_t * ctl_conf_ptr,
+static int _preserve_plugins(slurm_ctl_conf_t * ctl_conf_ptr,
char *old_auth_type, char *old_checkpoint_type,
- char *old_crypto_type, char *old_sched_type,
+ char *old_crypto_type, char *old_sched_type,
char *old_select_type, char *old_switch_type)
{
int rc = SLURM_SUCCESS;
@@ -926,7 +926,7 @@ static int _preserve_plugins(slurm_ctl_conf_t * ctl_conf_ptr,
}
if (old_checkpoint_type) {
- if (strcmp(old_checkpoint_type,
+ if (strcmp(old_checkpoint_type,
ctl_conf_ptr->checkpoint_type)) {
xfree(ctl_conf_ptr->checkpoint_type);
ctl_conf_ptr->checkpoint_type = old_checkpoint_type;
@@ -982,8 +982,8 @@ static int _preserve_plugins(slurm_ctl_conf_t * ctl_conf_ptr,
/*
* _sync_nodes_to_jobs - sync node state to job states on slurmctld restart.
- * This routine marks nodes allocated to a job as busy no matter what
- * the node's last saved state
+ * This routine marks nodes allocated to a job as busy no matter what
+ * the node's last saved state
* RET count of nodes having state changed
* Note: Operates on common variables, no arguments
*/
@@ -1009,7 +1009,7 @@ static int _sync_nodes_to_jobs(void)
return update_cnt;
}
-/* For jobs which are in state COMPLETING, deallocate the nodes and
+/* For jobs which are in state COMPLETING, deallocate the nodes and
* issue the RPC to kill the job */
static int _sync_nodes_to_comp_job(void)
{
@@ -1047,9 +1047,9 @@ static int _sync_nodes_to_active_job(struct job_record *job_ptr)
continue;
node_flags = node_ptr->node_state & NODE_STATE_FLAGS;
-
+
node_ptr->run_job_cnt++; /* NOTE:
- * This counter moved to comp_job_cnt
+ * This counter moved to comp_job_cnt
* by _sync_nodes_to_comp_job() */
if ((IS_JOB_RUNNING(job_ptr) || IS_JOB_COMPLETING(job_ptr)) &&
(job_ptr->details) && (job_ptr->details->shared == 0))
@@ -1059,7 +1059,7 @@ static int _sync_nodes_to_active_job(struct job_record *job_ptr)
IS_JOB_RUNNING(job_ptr) &&
(job_ptr->kill_on_node_fail == 0) &&
(job_ptr->node_cnt > 1)) {
- /* This should only happen if a job was running
+ /* This should only happen if a job was running
* on a node that was newly configured DOWN */
info("Removing failed node %s from job_id %u",
node_ptr->name, job_ptr->job_id);
@@ -1081,13 +1081,13 @@ static int _sync_nodes_to_active_job(struct job_record *job_ptr)
cnt++;
node_ptr->node_state =
NODE_STATE_ALLOCATED | node_flags;
- }
+ }
}
return cnt;
}
#ifdef HAVE_ELAN
-/* Every node in a given partition must have the same processor count
+/* Every node in a given partition must have the same processor count
* at present, this function insure it */
static void _validate_node_proc_count(void)
{
@@ -1143,7 +1143,7 @@ static int _restore_job_dependencies(void)
job_iterator = list_iterator_create(job_list);
while ((job_ptr = (struct job_record *) list_next(job_iterator))) {
if (accounting_enforce & ACCOUNTING_ENFORCE_LIMITS) {
- if (IS_JOB_RUNNING(job_ptr) ||
+ if (IS_JOB_RUNNING(job_ptr) ||
IS_JOB_SUSPENDED(job_ptr))
acct_policy_job_begin(job_ptr);
if (!IS_JOB_FINISHED(job_ptr))
@@ -1155,7 +1155,7 @@ static int _restore_job_dependencies(void)
list_destroy(job_ptr->license_list);
if (valid)
job_ptr->license_list = license_list;
- if (IS_JOB_RUNNING(job_ptr))
+ if (IS_JOB_RUNNING(job_ptr))
license_job_get(job_ptr);
if ((job_ptr->details == NULL) ||
@@ -1175,7 +1175,7 @@ static int _restore_job_dependencies(void)
return error_code;
}
-/* Flush accounting information on this cluster, then for each running or
+/* Flush accounting information on this cluster, then for each running or
* suspended job, restore its state in the accounting system */
static void _acct_restore_active_jobs(void)
{
@@ -1197,9 +1197,9 @@ static void _acct_restore_active_jobs(void)
acct_db_conn, slurmctld_cluster_name, job_ptr);
step_iterator = list_iterator_create(
job_ptr->step_list);
- while ((step_ptr = (struct step_record *)
+ while ((step_ptr = (struct step_record *)
list_next(step_iterator))) {
- jobacct_storage_g_step_start(acct_db_conn,
+ jobacct_storage_g_step_start(acct_db_conn,
step_ptr);
}
list_iterator_destroy (step_iterator);
diff --git a/src/slurmctld/read_config.h b/src/slurmctld/read_config.h
index 8e96a6d5050c1ffa3d5c69f4ab0ec49632302ae7..95f251a8080b1a1a663612875c4480217cc3afc7 100644
--- a/src/slurmctld/read_config.h
+++ b/src/slurmctld/read_config.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -40,12 +40,12 @@
#define _HAVE_READ_CONFIG_H
/*
- * read_slurm_conf - load the slurm configuration from the configured file.
+ * read_slurm_conf - load the slurm configuration from the configured file.
* read_slurm_conf can be called more than once if so desired.
- * IN recover - replace job, node and/or partition data with last saved
+ * IN recover - replace job, node and/or partition data with last saved
* state information depending upon value
* 0 = use no saved state information
- * 1 = recover saved job state,
+ * 1 = recover saved job state,
* node DOWN/DRAIN state and reason information
* 1 = recover only saved job state information
* 2 = recover all state saved from last slurmctld shutdown
diff --git a/src/slurmctld/reservation.c b/src/slurmctld/reservation.c
index 38e2886010399e15b08deeb5ecb567a701adff5c..6f6816254f9b23a9599ea7b1432e3d048838b028 100644
--- a/src/slurmctld/reservation.c
+++ b/src/slurmctld/reservation.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -87,7 +87,7 @@ List resv_list = (List) NULL;
uint32_t resv_over_run;
uint32_t top_suffix = 0;
-static int _build_account_list(char *accounts, int *account_cnt,
+static int _build_account_list(char *accounts, int *account_cnt,
char ***account_list);
static int _build_uid_list(char *users, int *user_cnt, uid_t **user_list);
static void _clear_job_resv(slurmctld_resv_t *resv_ptr);
@@ -101,7 +101,7 @@ static void _generate_resv_name(resv_desc_msg_t *resv_ptr);
static uint32_t _get_job_duration(struct job_record *job_ptr);
static bool _is_account_valid(char *account);
static bool _is_resv_used(slurmctld_resv_t *resv_ptr);
-static bool _job_overlap(time_t start_time, uint16_t flags,
+static bool _job_overlap(time_t start_time, uint16_t flags,
bitstr_t *node_bitmap);
static List _list_dup(List license_list);
static int _open_resv_state_file(char **state_file);
@@ -111,23 +111,23 @@ static int _post_resv_create(slurmctld_resv_t *resv_ptr);
static int _post_resv_delete(slurmctld_resv_t *resv_ptr);
static int _post_resv_update(slurmctld_resv_t *resv_ptr,
slurmctld_resv_t *old_resv_ptr);
-static bitstr_t *_pick_idle_nodes(bitstr_t *avail_nodes,
+static bitstr_t *_pick_idle_nodes(bitstr_t *avail_nodes,
resv_desc_msg_t *resv_desc_ptr);
-static bitstr_t *_pick_idle_nodes2(bitstr_t *avail_nodes,
+static bitstr_t *_pick_idle_nodes2(bitstr_t *avail_nodes,
resv_desc_msg_t *resv_desc_ptr);
static int _resize_resv(slurmctld_resv_t *resv_ptr, uint32_t node_cnt);
-static bool _resv_overlap(time_t start_time, time_t end_time,
+static bool _resv_overlap(time_t start_time, time_t end_time,
uint16_t flags, bitstr_t *node_bitmap,
slurmctld_resv_t *this_resv_ptr);
-static int _select_nodes(resv_desc_msg_t *resv_desc_ptr,
+static int _select_nodes(resv_desc_msg_t *resv_desc_ptr,
struct part_record **part_ptr,
bitstr_t **resv_bitmap);
static int _set_assoc_list(slurmctld_resv_t *resv_ptr);
static void _set_cpu_cnt(slurmctld_resv_t *resv_ptr);
static void _set_nodes_maint(slurmctld_resv_t *resv_ptr, time_t now);
-static void _swap_resv(slurmctld_resv_t *resv_backup,
+static void _swap_resv(slurmctld_resv_t *resv_backup,
slurmctld_resv_t *resv_ptr);
-static int _update_account_list(slurmctld_resv_t *resv_ptr,
+static int _update_account_list(slurmctld_resv_t *resv_ptr,
char *accounts);
static int _update_uid_list(slurmctld_resv_t *resv_ptr, char *users);
static void _validate_all_reservations(void);
@@ -170,10 +170,10 @@ static slurmctld_resv_t *_copy_resv(slurmctld_resv_t *resv_orig_ptr)
resv_copy_ptr = xmalloc(sizeof(slurmctld_resv_t));
resv_copy_ptr->accounts = xstrdup(resv_orig_ptr->accounts);
resv_copy_ptr->account_cnt = resv_orig_ptr->account_cnt;
- resv_copy_ptr->account_list = xmalloc(sizeof(char *) *
+ resv_copy_ptr->account_list = xmalloc(sizeof(char *) *
resv_orig_ptr->account_cnt);
for (i=0; i<resv_copy_ptr->account_cnt; i++) {
- resv_copy_ptr->account_list[i] =
+ resv_copy_ptr->account_list[i] =
xstrdup(resv_orig_ptr->account_list[i]);
}
resv_copy_ptr->assoc_list = xstrdup(resv_orig_ptr->assoc_list);
@@ -199,7 +199,7 @@ static slurmctld_resv_t *_copy_resv(slurmctld_resv_t *resv_orig_ptr)
resv_copy_ptr->start_time_prev = resv_orig_ptr->start_time_prev;
resv_copy_ptr->users = xstrdup(resv_orig_ptr->users);
resv_copy_ptr->user_cnt = resv_orig_ptr->user_cnt;
- resv_copy_ptr->user_list = xmalloc(sizeof(uid_t) *
+ resv_copy_ptr->user_list = xmalloc(sizeof(uid_t) *
resv_orig_ptr->user_cnt);
for (i=0; i<resv_copy_ptr->user_cnt; i++)
resv_copy_ptr->user_list[i] = resv_orig_ptr->user_list[i];
@@ -208,7 +208,7 @@ static slurmctld_resv_t *_copy_resv(slurmctld_resv_t *resv_orig_ptr)
}
/* Swaping the contents of two reservation records */
-static void _swap_resv(slurmctld_resv_t *resv_backup,
+static void _swap_resv(slurmctld_resv_t *resv_backup,
slurmctld_resv_t *resv_ptr)
{
resv_desc_msg_t *resv_copy_ptr;
@@ -277,7 +277,7 @@ static int _find_resv_name(void *x, void *key)
static void _dump_resv_req(resv_desc_msg_t *resv_ptr, char *mode)
{
-
+
#if _RESV_DEBUG
char start_str[32] = "-1", end_str[32] = "-1", *flag_str = NULL;
int duration;
@@ -287,7 +287,7 @@ static void _dump_resv_req(resv_desc_msg_t *resv_ptr, char *mode)
start_str, sizeof(start_str));
}
if (resv_ptr->end_time != (time_t) NO_VAL) {
- slurm_make_time_str(&resv_ptr->end_time,
+ slurm_make_time_str(&resv_ptr->end_time,
end_str, sizeof(end_str));
}
if (resv_ptr->flags != (uint16_t) NO_VAL)
@@ -302,8 +302,8 @@ static void _dump_resv_req(resv_desc_msg_t *resv_ptr, char *mode)
"Flags=%s NodeCnt=%d NodeList=%s Features=%s "
"PartitionName=%s Users=%s Accounts=%s Licenses=%s",
mode, resv_ptr->name, start_str, end_str, duration,
- flag_str, resv_ptr->node_cnt, resv_ptr->node_list,
- resv_ptr->features, resv_ptr->partition,
+ flag_str, resv_ptr->node_cnt, resv_ptr->node_list,
+ resv_ptr->features, resv_ptr->partition,
resv_ptr->users, resv_ptr->accounts, resv_ptr->licenses);
xfree(flag_str);
@@ -372,7 +372,7 @@ static int _append_assoc_list(List assoc_list, acct_association_rec_t *assoc)
acct_association_rec_t *assoc_ptr = NULL;
if (assoc_mgr_fill_in_assoc(
acct_db_conn, assoc,
- accounting_enforce,
+ accounting_enforce,
&assoc_ptr)) {
if(accounting_enforce & ACCOUNTING_ENFORCE_ASSOCS) {
error("No association for user %u and account %s",
@@ -382,8 +382,8 @@ static int _append_assoc_list(List assoc_list, acct_association_rec_t *assoc)
assoc->uid, assoc->acct);
rc = SLURM_SUCCESS;
}
-
- }
+
+ }
if (assoc_ptr) {
list_append(assoc_list, assoc_ptr);
rc = SLURM_SUCCESS;
@@ -410,7 +410,7 @@ static int _set_assoc_list(slurmctld_resv_t *resv_ptr)
for(i=0; i < resv_ptr->user_cnt; i++) {
if(resv_ptr->account_cnt) {
for(j=0; j < resv_ptr->account_cnt; j++) {
- memset(&assoc, 0,
+ memset(&assoc, 0,
sizeof(acct_association_rec_t));
assoc.uid = resv_ptr->user_list[i];
assoc.acct = resv_ptr->account_list[j];
@@ -419,9 +419,9 @@ static int _set_assoc_list(slurmctld_resv_t *resv_ptr)
!= SLURM_SUCCESS) {
goto end_it;
}
- }
+ }
} else {
- memset(&assoc, 0,
+ memset(&assoc, 0,
sizeof(acct_association_rec_t));
assoc.uid = resv_ptr->user_list[i];
if((rc = assoc_mgr_get_user_assocs(
@@ -435,7 +435,7 @@ static int _set_assoc_list(slurmctld_resv_t *resv_ptr)
}
} else if(resv_ptr->account_cnt) {
for(i=0; i < resv_ptr->account_cnt; i++) {
- memset(&assoc, 0,
+ memset(&assoc, 0,
sizeof(acct_association_rec_t));
assoc.uid = (uint32_t)NO_VAL;
assoc.acct = resv_ptr->account_list[j];
@@ -443,26 +443,26 @@ static int _set_assoc_list(slurmctld_resv_t *resv_ptr)
!= SLURM_SUCCESS) {
goto end_it;
}
- }
+ }
} else if(accounting_enforce & ACCOUNTING_ENFORCE_ASSOCS) {
error("We need at least 1 user or 1 account to "
"create a reservtion.");
rc = SLURM_ERROR;
}
-
+
if(list_count(assoc_list)) {
ListIterator itr = list_iterator_create(assoc_list);
xfree(resv_ptr->assoc_list); /* clear for modify */
while((assoc_ptr = list_next(itr))) {
if(resv_ptr->assoc_list)
- xstrfmtcat(resv_ptr->assoc_list, "%u,",
+ xstrfmtcat(resv_ptr->assoc_list, "%u,",
assoc_ptr->id);
else
xstrfmtcat(resv_ptr->assoc_list, ",%u,",
assoc_ptr->id);
}
list_iterator_destroy(itr);
- }
+ }
end_it:
list_destroy(assoc_list);
@@ -477,7 +477,7 @@ static int _post_resv_create(slurmctld_resv_t *resv_ptr)
char temp_bit[BUF_SIZE];
memset(&resv, 0, sizeof(acct_reservation_rec_t));
-
+
resv.assocs = resv_ptr->assoc_list;
resv.cluster = slurmctld_cluster_name;
resv.cpus = resv_ptr->cpu_cnt;
@@ -485,8 +485,8 @@ static int _post_resv_create(slurmctld_resv_t *resv_ptr)
resv.id = resv_ptr->resv_id;
resv.name = resv_ptr->name;
resv.nodes = resv_ptr->node_list;
- if (resv_ptr->node_bitmap) {
- resv.node_inx = bit_fmt(temp_bit, sizeof(temp_bit),
+ if (resv_ptr->node_bitmap) {
+ resv.node_inx = bit_fmt(temp_bit, sizeof(temp_bit),
resv_ptr->node_bitmap);
}
@@ -514,7 +514,7 @@ static int _post_resv_delete(slurmctld_resv_t *resv_ptr)
* database if said database isn't up right now */
resv.time_start_prev = time(NULL);
rc = acct_storage_g_remove_reservation(acct_db_conn, &resv);
-
+
return rc;
}
@@ -527,11 +527,11 @@ static int _post_resv_update(slurmctld_resv_t *resv_ptr,
char temp_bit[BUF_SIZE];
memset(&resv, 0, sizeof(acct_reservation_rec_t));
-
+
resv.cluster = slurmctld_cluster_name;
resv.id = resv_ptr->resv_id;
resv.time_end = resv_ptr->end_time;
-
+
if(!old_resv_ptr) {
resv.assocs = resv_ptr->assoc_list;
resv.cpus = resv_ptr->cpu_cnt;
@@ -539,31 +539,31 @@ static int _post_resv_update(slurmctld_resv_t *resv_ptr,
resv.nodes = resv_ptr->node_list;
} else {
time_t now = time(NULL);
-
+
if(old_resv_ptr->assoc_list && resv_ptr->assoc_list) {
if(strcmp(old_resv_ptr->assoc_list,
- resv_ptr->assoc_list))
+ resv_ptr->assoc_list))
resv.assocs = resv_ptr->assoc_list;
- } else if(resv_ptr->assoc_list)
+ } else if(resv_ptr->assoc_list)
resv.assocs = resv_ptr->assoc_list;
- if(old_resv_ptr->cpu_cnt != resv_ptr->cpu_cnt)
+ if(old_resv_ptr->cpu_cnt != resv_ptr->cpu_cnt)
resv.cpus = resv_ptr->cpu_cnt;
- else
+ else
resv.cpus = (uint32_t)NO_VAL;
- if(old_resv_ptr->flags != resv_ptr->flags)
+ if(old_resv_ptr->flags != resv_ptr->flags)
resv.flags = resv_ptr->flags;
- else
+ else
resv.flags = (uint16_t)NO_VAL;
if(old_resv_ptr->node_list && resv_ptr->node_list) {
if(strcmp(old_resv_ptr->node_list,
- resv_ptr->node_list))
+ resv_ptr->node_list))
resv.nodes = resv_ptr->node_list;
- } else if(resv_ptr->node_list)
+ } else if(resv_ptr->node_list)
resv.nodes = resv_ptr->node_list;
-
+
/* Here if the reservation has started already we need
* to mark a new start time for it if certain
* variables are needed in accounting. Right now if
@@ -571,7 +571,7 @@ static int _post_resv_update(slurmctld_resv_t *resv_ptr,
* new start time of now. */
if((resv_ptr->start_time < now)
&& (resv.assocs
- || resv.nodes
+ || resv.nodes
|| (resv.flags != (uint16_t)NO_VAL)
|| (resv.cpus != (uint32_t)NO_VAL))) {
resv_ptr->start_time_prev = resv_ptr->start_time;
@@ -582,7 +582,7 @@ static int _post_resv_update(slurmctld_resv_t *resv_ptr,
resv.time_start = resv_ptr->start_time;
resv.time_start_prev = resv_ptr->start_time_prev;
- if (resv.nodes && resv_ptr->node_bitmap) {
+ if (resv.nodes && resv_ptr->node_bitmap) {
resv.node_inx = bit_fmt(temp_bit, sizeof(temp_bit),
resv_ptr->node_bitmap);
}
@@ -597,11 +597,11 @@ static int _post_resv_update(slurmctld_resv_t *resv_ptr,
* them
* IN account - a list of account names
* OUT account_cnt - number of accounts in the list
- * OUT account_list - list of the account names,
+ * OUT account_list - list of the account names,
* CALLER MUST XFREE this plus each individual record
* RETURN 0 on success
*/
-static int _build_account_list(char *accounts, int *account_cnt,
+static int _build_account_list(char *accounts, int *account_cnt,
char ***account_list)
{
char *last = NULL, *tmp, *tok;
@@ -620,7 +620,7 @@ static int _build_account_list(char *accounts, int *account_cnt,
tok = strtok_r(tmp, ",", &last);
while (tok) {
if (!_is_account_valid(tok)) {
- info("Reservation request has invalid account %s",
+ info("Reservation request has invalid account %s",
tok);
goto inval;
}
@@ -640,14 +640,14 @@ static int _build_account_list(char *accounts, int *account_cnt,
}
/*
- * Update a account list for an existing reservation based upon an
- * update comma delimited specification of accounts to add (+name),
+ * Update a account list for an existing reservation based upon an
+ * update comma delimited specification of accounts to add (+name),
* remove (-name), or set value of
* IN/OUT resv_ptr - pointer to reservation structure being updated
* IN accounts - a list of account names, to set, add, or remove
* RETURN 0 on success
*/
-static int _update_account_list(slurmctld_resv_t *resv_ptr,
+static int _update_account_list(slurmctld_resv_t *resv_ptr,
char *accounts)
{
char *last = NULL, *ac_cpy, *tok;
@@ -676,13 +676,13 @@ static int _update_account_list(slurmctld_resv_t *resv_ptr,
} else if (tok[0] == '\0') {
continue;
} else if (plus_account || minus_account) {
- info("Reservation account expression invalid %s",
+ info("Reservation account expression invalid %s",
accounts);
goto inval;
} else
ac_type[ac_cnt] = 3; /* set */
if (!_is_account_valid(tok)) {
- info("Reservation request has invalid account %s",
+ info("Reservation request has invalid account %s",
tok);
goto inval;
}
@@ -712,7 +712,7 @@ static int _update_account_list(slurmctld_resv_t *resv_ptr,
continue;
found_it = false;
for (j=0; j<resv_ptr->account_cnt; j++) {
- if (strcmp(resv_ptr->account_list[j],
+ if (strcmp(resv_ptr->account_list[j],
ac_list[i])) {
continue;
}
@@ -747,7 +747,7 @@ static int _update_account_list(slurmctld_resv_t *resv_ptr,
continue;
found_it = false;
for (j=0; j<resv_ptr->account_cnt; j++) {
- if (strcmp(resv_ptr->account_list[j],
+ if (strcmp(resv_ptr->account_list[j],
ac_list[i])) {
continue;
}
@@ -756,7 +756,7 @@ static int _update_account_list(slurmctld_resv_t *resv_ptr,
}
if (found_it)
continue; /* duplicate entry */
- xrealloc(resv_ptr->account_list,
+ xrealloc(resv_ptr->account_list,
sizeof(char *) * (resv_ptr->account_cnt + 1));
resv_ptr->account_list[resv_ptr->account_cnt++] =
xstrdup(ac_list[i]);
@@ -831,8 +831,8 @@ static int _build_uid_list(char *users, int *user_cnt, uid_t **user_list)
}
/*
- * Update a user/uid list for an existing reservation based upon an
- * update comma delimited specification of users to add (+name),
+ * Update a user/uid list for an existing reservation based upon an
+ * update comma delimited specification of users to add (+name),
* remove (-name), or set value of
* IN/OUT resv_ptr - pointer to reservation structure being updated
* IN users - a list of user names, to set, add, or remove
@@ -897,7 +897,7 @@ static int _update_uid_list(slurmctld_resv_t *resv_ptr, char *users)
xfree(u_type);
return SLURM_SUCCESS;
}
-
+
/* Modification of existing user list */
if (minus_user) {
for (i=0; i<u_cnt; i++) {
@@ -957,7 +957,7 @@ static int _update_uid_list(slurmctld_resv_t *resv_ptr, char *users)
if (resv_ptr->users && resv_ptr->users[0])
xstrcat(resv_ptr->users, ",");
xstrcat(resv_ptr->users, u_name[i]);
- xrealloc(resv_ptr->user_list,
+ xrealloc(resv_ptr->user_list,
sizeof(uid_t) * (resv_ptr->user_cnt + 1));
resv_ptr->user_list[resv_ptr->user_cnt++] =
u_list[i];
@@ -976,18 +976,18 @@ static int _update_uid_list(slurmctld_resv_t *resv_ptr, char *users)
return ESLURM_USER_ID_MISSING;
}
-/*
+/*
* _pack_resv - dump configuration information about a specific reservation
* in machine independent form (for network transmission or state save)
* IN resv_ptr - pointer to reservation for which information is requested
- * IN/OUT buffer - buffer in which data is placed, pointers automatically
+ * IN/OUT buffer - buffer in which data is placed, pointers automatically
* updated
* IN internal - true if for internal save state, false for xmit to users
- * NOTE: if you make any changes here be sure to make the corresponding
+ * NOTE: if you make any changes here be sure to make the corresponding
* to _unpack_reserve_info_members() in common/slurm_protocol_pack.c
* plus load_all_resv_state() below.
*/
-static void _pack_resv(slurmctld_resv_t *resv_ptr, Buf buffer,
+static void _pack_resv(slurmctld_resv_t *resv_ptr, Buf buffer,
bool internal)
{
packstr(resv_ptr->accounts, buffer);
@@ -1018,7 +1018,7 @@ static void _pack_resv(slurmctld_resv_t *resv_ptr, Buf buffer,
* Test if a new/updated reservation request will overlap running jobs
* RET true if overlap
*/
-static bool _job_overlap(time_t start_time, uint16_t flags,
+static bool _job_overlap(time_t start_time, uint16_t flags,
bitstr_t *node_bitmap)
{
ListIterator job_iterator;
@@ -1047,7 +1047,7 @@ static bool _job_overlap(time_t start_time, uint16_t flags,
* reservation
* RET true if overlap
*/
-static bool _resv_overlap(time_t start_time, time_t end_time,
+static bool _resv_overlap(time_t start_time, time_t end_time,
uint16_t flags, bitstr_t *node_bitmap,
slurmctld_resv_t *this_resv_ptr)
{
@@ -1057,7 +1057,7 @@ static bool _resv_overlap(time_t start_time, time_t end_time,
uint32_t delta_t, i, j;
time_t s_time1, s_time2, e_time1, e_time2;
- if ((flags & RESERVE_FLAG_MAINT) ||
+ if ((flags & RESERVE_FLAG_MAINT) ||
(flags & RESERVE_FLAG_OVERLAP) ||
(!node_bitmap))
return rc;
@@ -1148,7 +1148,7 @@ extern int create_resv(resv_desc_msg_t *resv_desc_ptr)
rc = ESLURM_INVALID_TIME_VALUE;
goto bad_parse;
}
- } else
+ } else
resv_desc_ptr->start_time = now;
if (resv_desc_ptr->end_time != (time_t) NO_VAL) {
@@ -1165,10 +1165,10 @@ extern int create_resv(resv_desc_msg_t *resv_desc_ptr)
if (resv_desc_ptr->flags == (uint16_t) NO_VAL)
resv_desc_ptr->flags = 0;
else {
- resv_desc_ptr->flags &= RESERVE_FLAG_MAINT |
+ resv_desc_ptr->flags &= RESERVE_FLAG_MAINT |
RESERVE_FLAG_OVERLAP |
- RESERVE_FLAG_IGN_JOBS |
- RESERVE_FLAG_DAILY |
+ RESERVE_FLAG_IGN_JOBS |
+ RESERVE_FLAG_DAILY |
RESERVE_FLAG_WEEKLY;
}
if (resv_desc_ptr->partition) {
@@ -1187,20 +1187,20 @@ extern int create_resv(resv_desc_msg_t *resv_desc_ptr)
goto bad_parse;
}
if (resv_desc_ptr->accounts) {
- rc = _build_account_list(resv_desc_ptr->accounts,
+ rc = _build_account_list(resv_desc_ptr->accounts,
&account_cnt, &account_list);
if (rc)
goto bad_parse;
}
if (resv_desc_ptr->users) {
- rc = _build_uid_list(resv_desc_ptr->users,
+ rc = _build_uid_list(resv_desc_ptr->users,
&user_cnt, &user_list);
if (rc)
goto bad_parse;
}
if (resv_desc_ptr->licenses) {
bool valid;
- license_list = license_validate(resv_desc_ptr->licenses,
+ license_list = license_validate(resv_desc_ptr->licenses,
&valid);
if (!valid) {
info("Reservation request has invalid licenses %s",
@@ -1208,7 +1208,7 @@ extern int create_resv(resv_desc_msg_t *resv_desc_ptr)
rc = ESLURM_INVALID_LICENSES;
goto bad_parse;
}
- if ((resv_desc_ptr->node_cnt == NO_VAL) &&
+ if ((resv_desc_ptr->node_cnt == NO_VAL) &&
(resv_desc_ptr->node_list == NULL))
resv_desc_ptr->node_cnt = 0;
}
@@ -1217,15 +1217,15 @@ extern int create_resv(resv_desc_msg_t *resv_desc_ptr)
if (strcasecmp(resv_desc_ptr->node_list, "ALL") == 0) {
node_bitmap = bit_alloc(node_record_count);
bit_nset(node_bitmap, 0, (node_record_count - 1));
- } else if (node_name2bitmap(resv_desc_ptr->node_list,
+ } else if (node_name2bitmap(resv_desc_ptr->node_list,
false, &node_bitmap)) {
rc = ESLURM_INVALID_NODE_NAME;
goto bad_parse;
}
if (resv_desc_ptr->node_cnt == NO_VAL)
resv_desc_ptr->node_cnt = 0;
- if (_resv_overlap(resv_desc_ptr->start_time,
- resv_desc_ptr->end_time,
+ if (_resv_overlap(resv_desc_ptr->start_time,
+ resv_desc_ptr->end_time,
resv_desc_ptr->flags, node_bitmap,
NULL)) {
info("Reservation request overlaps another");
@@ -1233,7 +1233,7 @@ extern int create_resv(resv_desc_msg_t *resv_desc_ptr)
goto bad_parse;
}
resv_desc_ptr->node_cnt = bit_set_count(node_bitmap);
- if (_job_overlap(resv_desc_ptr->start_time,
+ if (_job_overlap(resv_desc_ptr->start_time,
resv_desc_ptr->flags, node_bitmap)) {
info("Reservation request overlaps jobs");
rc = ESLURM_NODES_BUSY;
@@ -1250,7 +1250,7 @@ extern int create_resv(resv_desc_msg_t *resv_desc_ptr)
_generate_resv_id();
if (resv_desc_ptr->name) {
- resv_ptr = (slurmctld_resv_t *) list_find_first (resv_list,
+ resv_ptr = (slurmctld_resv_t *) list_find_first (resv_list,
_find_resv_name, resv_desc_ptr->name);
if (resv_ptr) {
info("Reservation request name duplication (%s)",
@@ -1261,8 +1261,8 @@ extern int create_resv(resv_desc_msg_t *resv_desc_ptr)
} else {
while (1) {
_generate_resv_name(resv_desc_ptr);
- resv_ptr = (slurmctld_resv_t *)
- list_find_first (resv_list,
+ resv_ptr = (slurmctld_resv_t *)
+ list_find_first (resv_list,
_find_resv_name, resv_desc_ptr->name);
if (!resv_ptr)
break;
@@ -1309,12 +1309,12 @@ extern int create_resv(resv_desc_msg_t *resv_desc_ptr)
/* This needs to be done after all other setup is done. */
_post_resv_create(resv_ptr);
- slurm_make_time_str(&resv_ptr->start_time, start_time,
+ slurm_make_time_str(&resv_ptr->start_time, start_time,
sizeof(start_time));
slurm_make_time_str(&resv_ptr->end_time, end_time, sizeof(end_time));
info("Created reservation %s accounts=%s users=%s "
"nodes=%s start=%s end=%s",
- resv_ptr->name, resv_ptr->accounts, resv_ptr->users,
+ resv_ptr->name, resv_ptr->accounts, resv_ptr->users,
resv_ptr->node_list, start_time, end_time);
list_append(resv_list, resv_ptr);
last_resv_update = now;
@@ -1358,7 +1358,7 @@ extern int update_resv(resv_desc_msg_t *resv_desc_ptr)
/* Find the specified reservation */
if ((resv_desc_ptr->name == NULL))
return ESLURM_RESERVATION_INVALID;
- resv_ptr = (slurmctld_resv_t *) list_find_first (resv_list,
+ resv_ptr = (slurmctld_resv_t *) list_find_first (resv_list,
_find_resv_name, resv_desc_ptr->name);
if (!resv_ptr)
return ESLURM_RESERVATION_INVALID;
@@ -1416,13 +1416,13 @@ extern int update_resv(resv_desc_msg_t *resv_desc_ptr)
}
if (resv_desc_ptr->licenses && (resv_desc_ptr->licenses[0] == '\0')) {
if ((resv_desc_ptr->node_cnt == 0) ||
- ((resv_desc_ptr->node_cnt == NO_VAL) &&
+ ((resv_desc_ptr->node_cnt == NO_VAL) &&
(resv_ptr->node_cnt == 0))) {
info("Reservation attempt to clear licenses with "
"NodeCount=0");
rc = ESLURM_INVALID_LICENSES;
goto update_failure;
- }
+ }
xfree(resv_desc_ptr->licenses); /* clear licenses */
xfree(resv_ptr->licenses);
if (resv_ptr->license_list)
@@ -1432,7 +1432,7 @@ extern int update_resv(resv_desc_msg_t *resv_desc_ptr)
if (resv_desc_ptr->licenses) {
bool valid = true;
List license_list;
- license_list = license_validate(resv_desc_ptr->licenses,
+ license_list = license_validate(resv_desc_ptr->licenses,
&valid);
if (!valid) {
info("Reservation invalid license update (%s)",
@@ -1452,8 +1452,8 @@ extern int update_resv(resv_desc_msg_t *resv_desc_ptr)
xfree(resv_ptr->features);
}
if (resv_desc_ptr->features) {
- /* To support in the future, the reservation resources would
- * need to be selected again. For now, administrator can
+ /* To support in the future, the reservation resources would
+ * need to be selected again. For now, administrator can
* delete this reservation and create a new one. */
info("Attempt to change features of reservation %s",
resv_desc_ptr->name);
@@ -1483,7 +1483,7 @@ extern int update_resv(resv_desc_msg_t *resv_desc_ptr)
resv_ptr->start_time = resv_desc_ptr->start_time;
resv_ptr->start_time_first = resv_desc_ptr->start_time;
if(resv_ptr->duration) {
- resv_ptr->end_time = resv_ptr->start_time_first +
+ resv_ptr->end_time = resv_ptr->start_time_first +
(resv_ptr->duration * 60);
}
}
@@ -1498,7 +1498,7 @@ extern int update_resv(resv_desc_msg_t *resv_desc_ptr)
}
if (resv_desc_ptr->duration != NO_VAL) {
resv_ptr->duration = resv_desc_ptr->duration;
- resv_ptr->end_time = resv_ptr->start_time_first +
+ resv_ptr->end_time = resv_ptr->start_time_first +
(resv_desc_ptr->duration * 60);
}
@@ -1506,7 +1506,7 @@ extern int update_resv(resv_desc_msg_t *resv_desc_ptr)
error_code = ESLURM_INVALID_TIME_VALUE;
goto update_failure;
}
- if (resv_desc_ptr->node_list &&
+ if (resv_desc_ptr->node_list &&
(resv_desc_ptr->node_list[0] == '\0')) { /* Clear bitmap */
resv_ptr->flags &= (~RESERVE_FLAG_SPEC_NODES);
xfree(resv_desc_ptr->node_list);
@@ -1523,7 +1523,7 @@ extern int update_resv(resv_desc_msg_t *resv_desc_ptr)
if (strcasecmp(resv_desc_ptr->node_list, "ALL") == 0) {
node_bitmap = bit_alloc(node_record_count);
bit_nset(node_bitmap, 0, (node_record_count - 1));
- } else if (node_name2bitmap(resv_desc_ptr->node_list,
+ } else if (node_name2bitmap(resv_desc_ptr->node_list,
false, &node_bitmap)) {
error_code = ESLURM_INVALID_NODE_NAME;
goto update_failure;
@@ -1543,13 +1543,13 @@ extern int update_resv(resv_desc_msg_t *resv_desc_ptr)
}
resv_ptr->node_cnt = bit_set_count(resv_ptr->node_bitmap);
}
- if (_resv_overlap(resv_ptr->start_time, resv_ptr->end_time,
+ if (_resv_overlap(resv_ptr->start_time, resv_ptr->end_time,
resv_ptr->flags, resv_ptr->node_bitmap, resv_ptr)) {
info("Reservation request overlaps another");
error_code = ESLURM_RESERVATION_OVERLAP;
goto update_failure;
}
- if (_job_overlap(resv_ptr->start_time, resv_ptr->flags,
+ if (_job_overlap(resv_ptr->start_time, resv_ptr->flags,
resv_ptr->node_bitmap)) {
info("Reservation request overlaps jobs");
error_code = ESLURM_NODES_BUSY;
@@ -1559,12 +1559,12 @@ extern int update_resv(resv_desc_msg_t *resv_desc_ptr)
if ((error_code = _set_assoc_list(resv_ptr)) != SLURM_SUCCESS)
goto update_failure;
- slurm_make_time_str(&resv_ptr->start_time, start_time,
+ slurm_make_time_str(&resv_ptr->start_time, start_time,
sizeof(start_time));
slurm_make_time_str(&resv_ptr->end_time, end_time, sizeof(end_time));
info("Update reservation %s accounts=%s users=%s "
"nodes=%s start=%s end=%s",
- resv_ptr->name, resv_ptr->accounts, resv_ptr->users,
+ resv_ptr->name, resv_ptr->accounts, resv_ptr->users,
resv_ptr->node_list, start_time, end_time);
_post_resv_update(resv_ptr, resv_backup);
@@ -1834,7 +1834,7 @@ static bool _validate_one_reservation(slurmctld_resv_t *resv_ptr)
if (resv_ptr->accounts) {
int account_cnt = 0, i, rc;
char **account_list;
- rc = _build_account_list(resv_ptr->accounts,
+ rc = _build_account_list(resv_ptr->accounts,
&account_cnt, &account_list);
if (rc) {
error("Reservation %s has invalid accounts (%s)",
@@ -1851,7 +1851,7 @@ static bool _validate_one_reservation(slurmctld_resv_t *resv_ptr)
bool valid;
if (resv_ptr->license_list)
list_destroy(resv_ptr->license_list);
- resv_ptr->license_list = license_validate(resv_ptr->licenses,
+ resv_ptr->license_list = license_validate(resv_ptr->licenses,
&valid);
if (!valid) {
error("Reservation %s has invalid licenses (%s)",
@@ -1862,7 +1862,7 @@ static bool _validate_one_reservation(slurmctld_resv_t *resv_ptr)
if (resv_ptr->users) {
int rc, user_cnt = 0;
uid_t *user_list = NULL;
- rc = _build_uid_list(resv_ptr->users,
+ rc = _build_uid_list(resv_ptr->users,
&user_cnt, &user_list);
if (rc) {
error("Reservation %s has invalid users (%s)",
@@ -1931,7 +1931,7 @@ static void _validate_all_reservations(void)
if ((job_ptr->resv_ptr == NULL) ||
(job_ptr->resv_ptr->magic != RESV_MAGIC)) {
- job_ptr->resv_ptr = (slurmctld_resv_t *)
+ job_ptr->resv_ptr = (slurmctld_resv_t *)
list_find_first(resv_list,
_find_resv_name,
job_ptr->resv_name);
@@ -1948,7 +1948,7 @@ static void _validate_all_reservations(void)
}
/*
- * Validate the the reserved nodes are not DOWN or DRAINED and
+ * Validate the the reserved nodes are not DOWN or DRAINED and
* select different nodes as needed.
*/
static void _validate_node_choice(slurmctld_resv_t *resv_ptr)
@@ -1964,7 +1964,7 @@ static void _validate_node_choice(slurmctld_resv_t *resv_ptr)
if (i == resv_ptr->node_cnt)
return;
- /* Reservation includes DOWN, DRAINED/DRAINING, FAILING or
+ /* Reservation includes DOWN, DRAINED/DRAINING, FAILING or
* NO_RESPOND nodes. Generate new request using _select_nodes()
* in attempt to replace this nodes */
memset(&resv_desc, 0, sizeof(resv_desc_msg_t));
@@ -2005,10 +2005,10 @@ static int _open_resv_state_file(char **state_file)
xstrcat(*state_file, "/resv_state");
state_fd = open(*state_file, O_RDONLY);
if (state_fd < 0) {
- error("Could not open reservation state file %s: %m",
+ error("Could not open reservation state file %s: %m",
*state_file);
} else if (fstat(state_fd, &stat_buf) < 0) {
- error("Could not stat reservation state file %s: %m",
+ error("Could not stat reservation state file %s: %m",
*state_file);
(void) close(state_fd);
} else if (stat_buf.st_size < 10) {
@@ -2024,10 +2024,10 @@ static int _open_resv_state_file(char **state_file)
}
/*
- * Load the reservation state from file, recover on slurmctld restart.
+ * Load the reservation state from file, recover on slurmctld restart.
* Reset reservation pointers for all jobs.
* Execute this after loading the configuration file data.
- * IN recover - 0 = validate current reservations ONLY if already recovered,
+ * IN recover - 0 = validate current reservations ONLY if already recovered,
* otherwise recover from disk
* 1+ = recover all reservation state from disk
* RET SLURM_SUCCESS or error code
@@ -2065,13 +2065,13 @@ extern int load_all_resv_state(int recover)
data_allocated = BUF_SIZE;
data = xmalloc(data_allocated);
while (1) {
- data_read = read(state_fd, &data[data_size],
+ data_read = read(state_fd, &data[data_size],
BUF_SIZE);
if (data_read < 0) {
if (errno == EINTR)
continue;
else {
- error("Read error on %s: %m",
+ error("Read error on %s: %m",
state_file);
break;
}
@@ -2106,7 +2106,7 @@ extern int load_all_resv_state(int recover)
while (remaining_buf(buffer) > 0) {
resv_ptr = xmalloc(sizeof(slurmctld_resv_t));
xassert(resv_ptr->magic = RESV_MAGIC); /* Sets value */
- safe_unpackstr_xmalloc(&resv_ptr->accounts,
+ safe_unpackstr_xmalloc(&resv_ptr->accounts,
&uint32_tmp, buffer);
safe_unpack_time(&resv_ptr->end_time, buffer);
safe_unpackstr_xmalloc(&resv_ptr->features,
@@ -2124,7 +2124,7 @@ extern int load_all_resv_state(int recover)
safe_unpackstr_xmalloc(&resv_ptr->users,&uint32_tmp, buffer);
/* Fields saved for internal use only (save state) */
- safe_unpackstr_xmalloc(&resv_ptr->assoc_list,
+ safe_unpackstr_xmalloc(&resv_ptr->assoc_list,
&uint32_tmp, buffer);
safe_unpack32(&resv_ptr->cpu_cnt, buffer);
safe_unpack32(&resv_ptr->resv_id, buffer);
@@ -2176,7 +2176,7 @@ extern int validate_job_resv(struct job_record *job_ptr)
return ESLURM_RESERVATION_INVALID;
/* Find the named reservation */
- resv_ptr = (slurmctld_resv_t *) list_find_first (resv_list,
+ resv_ptr = (slurmctld_resv_t *) list_find_first (resv_list,
_find_resv_name, job_ptr->resv_name);
if (!resv_ptr) {
info("Reservation name not found (%s)", job_ptr->resv_name);
@@ -2208,7 +2208,7 @@ static int _resize_resv(slurmctld_resv_t *resv_ptr, uint32_t node_cnt)
bit_and(tmp1_bitmap, idle_node_bitmap);
i = bit_set_count(tmp1_bitmap);
if (i > delta_node_cnt) {
- tmp2_bitmap = bit_pick_cnt(tmp1_bitmap,
+ tmp2_bitmap = bit_pick_cnt(tmp1_bitmap,
delta_node_cnt);
bit_not(tmp2_bitmap);
bit_and(resv_ptr->node_bitmap, tmp2_bitmap);
@@ -2217,12 +2217,12 @@ static int _resize_resv(slurmctld_resv_t *resv_ptr, uint32_t node_cnt)
delta_node_cnt = 0; /* ALL DONE */
} else if (i) {
bit_not(idle_node_bitmap);
- bit_and(resv_ptr->node_bitmap,
+ bit_and(resv_ptr->node_bitmap,
idle_node_bitmap);
bit_not(idle_node_bitmap);
resv_ptr->node_cnt = bit_set_count(
resv_ptr->node_bitmap);
- delta_node_cnt = resv_ptr->node_cnt -
+ delta_node_cnt = resv_ptr->node_cnt -
node_cnt;
}
FREE_NULL_BITMAP(tmp1_bitmap);
@@ -2240,7 +2240,7 @@ static int _resize_resv(slurmctld_resv_t *resv_ptr, uint32_t node_cnt)
return SLURM_SUCCESS;
}
- /* Must increase node count. Make this look like new request so
+ /* Must increase node count. Make this look like new request so
* we can use _select_nodes() for selecting the nodes */
memset(&resv_desc, 0, sizeof(resv_desc_msg_t));
resv_desc.start_time = resv_ptr->start_time;
@@ -2262,7 +2262,7 @@ static int _resize_resv(slurmctld_resv_t *resv_ptr, uint32_t node_cnt)
}
/* Given a reservation create request, select appropriate nodes for use */
-static int _select_nodes(resv_desc_msg_t *resv_desc_ptr,
+static int _select_nodes(resv_desc_msg_t *resv_desc_ptr,
struct part_record **part_ptr,
bitstr_t **resv_bitmap)
{
@@ -2333,15 +2333,15 @@ static int _select_nodes(resv_desc_msg_t *resv_desc_ptr,
feature_iter = list_iterator_create(feature_list);
if (feature_iter == NULL)
fatal("list_iterator_create malloc failure");
- while ((feature_ptr = (struct features_record *)
+ while ((feature_ptr = (struct features_record *)
list_next(feature_iter))) {
if (strcmp(token, feature_ptr->name))
continue;
if (last_op_code == FEATURE_OP_OR) {
- bit_or(feature_bitmap,
+ bit_or(feature_bitmap,
feature_ptr->node_bitmap);
} else {
- bit_and(feature_bitmap,
+ bit_and(feature_bitmap,
feature_ptr->node_bitmap);
}
match = true;
@@ -2351,7 +2351,7 @@ static int _select_nodes(resv_desc_msg_t *resv_desc_ptr,
if (!match) {
info("reservation feature invalid: %s", token);
rc = ESLURM_INVALID_FEATURE;
- bit_nclear(feature_bitmap, 0,
+ bit_nclear(feature_bitmap, 0,
(node_record_count - 1));
break;
}
@@ -2377,15 +2377,15 @@ static int _select_nodes(resv_desc_msg_t *resv_desc_ptr,
else if ((i = bit_overlap(node_bitmap, idle_node_bitmap)) >=
resv_desc_ptr->node_cnt) { /* Reserve idle nodes */
bit_and(node_bitmap, idle_node_bitmap);
- *resv_bitmap = bit_pick_cnt(node_bitmap,
+ *resv_bitmap = bit_pick_cnt(node_bitmap,
resv_desc_ptr->node_cnt);
} else if (resv_desc_ptr->flags & RESERVE_FLAG_IGN_JOBS) {
/* Reserve nodes that are idle first, then busy nodes */
- *resv_bitmap = _pick_idle_nodes2(node_bitmap,
+ *resv_bitmap = _pick_idle_nodes2(node_bitmap,
resv_desc_ptr);
} else {
/* Reserve nodes that are or will be idle.
- * This algorithm is slower than above logic that just
+ * This algorithm is slower than above logic that just
* selects from the idle nodes. */
*resv_bitmap = _pick_idle_nodes(node_bitmap, resv_desc_ptr);
}
@@ -2408,7 +2408,7 @@ static int _select_nodes(resv_desc_msg_t *resv_desc_ptr,
* IN resv_desc_ptr - reservation request
* RET bitmap of selected nodes or NULL if request can not be satisfied
*/
-static bitstr_t *_pick_idle_nodes(bitstr_t *avail_nodes,
+static bitstr_t *_pick_idle_nodes(bitstr_t *avail_nodes,
resv_desc_msg_t *resv_desc_ptr)
{
ListIterator job_iterator;
@@ -2435,7 +2435,7 @@ static bitstr_t *_pick_idle_nodes(bitstr_t *avail_nodes,
* IN resv_desc_ptr - reservation request
* RET bitmap of selected nodes or NULL if request can not be satisfied
*/
-static bitstr_t *_pick_idle_nodes2(bitstr_t *avail_nodes,
+static bitstr_t *_pick_idle_nodes2(bitstr_t *avail_nodes,
resv_desc_msg_t *resv_desc_ptr)
{
ListIterator job_iterator;
@@ -2480,9 +2480,9 @@ static int _valid_job_access_resv(struct job_record *job_ptr,
"Checking user/account lists",
resv_ptr->name);
goto no_assocs;
- }
+ }
snprintf(tmp_char, sizeof(tmp_char), ",%u,", job_ptr->assoc_id);
- if(strstr(resv_ptr->assoc_list, tmp_char))
+ if(strstr(resv_ptr->assoc_list, tmp_char))
return SLURM_SUCCESS;
} else {
no_assocs:
@@ -2492,7 +2492,7 @@ static int _valid_job_access_resv(struct job_record *job_ptr,
}
for (i=0; (i<resv_ptr->account_cnt) && job_ptr->account; i++) {
if (resv_ptr->account_list[i] &&
- (strcmp(job_ptr->account,
+ (strcmp(job_ptr->account,
resv_ptr->account_list[i]) == 0)) {
return SLURM_SUCCESS;
}
@@ -2517,7 +2517,7 @@ extern int job_test_resv_now(struct job_record *job_ptr)
if (job_ptr->resv_name == NULL)
return SLURM_SUCCESS;
- resv_ptr = (slurmctld_resv_t *) list_find_first (resv_list,
+ resv_ptr = (slurmctld_resv_t *) list_find_first (resv_list,
_find_resv_name, job_ptr->resv_name);
job_ptr->resv_ptr = resv_ptr;
if (!resv_ptr)
@@ -2538,7 +2538,7 @@ extern int job_test_resv_now(struct job_record *job_ptr)
return SLURM_SUCCESS;
}
-/* For a given license_list, return the total count of licenses of the
+/* For a given license_list, return the total count of licenses of the
* specified name */
static int _license_cnt(List license_list, char *lic_name)
{
@@ -2589,7 +2589,7 @@ static uint32_t _get_job_duration(struct job_record *job_ptr)
}
/*
- * Determine how many licenses of the give type the specified job is
+ * Determine how many licenses of the give type the specified job is
* prevented from using due to reservations
*
* IN job_ptr - job to test
@@ -2623,7 +2623,7 @@ extern int job_test_lic_resv(struct job_record *job_ptr, char *lic_name,
}
list_iterator_destroy(iter);
- /* info("job %u blocked from %d licenses of type %s",
+ /* info("job %u blocked from %d licenses of type %s",
job_ptr->job_id, resv_cnt, lic_name); */
return resv_cnt;
}
@@ -2657,7 +2657,7 @@ extern int job_test_resv(struct job_record *job_ptr, time_t *when,
if (job_ptr->resv_name) {
bool overlap_resv = false;
- resv_ptr = (slurmctld_resv_t *) list_find_first (resv_list,
+ resv_ptr = (slurmctld_resv_t *) list_find_first (resv_list,
_find_resv_name, job_ptr->resv_name);
job_ptr->resv_ptr = resv_ptr;
if (!resv_ptr)
@@ -2702,9 +2702,9 @@ extern int job_test_resv(struct job_record *job_ptr, time_t *when,
}
list_iterator_destroy(iter);
#if _RESV_DEBUG
-{
- char *nodes=bitmap2node_name(*node_bitmap);
- info("nodes:%s", nodes);
+{
+ char *nodes=bitmap2node_name(*node_bitmap);
+ info("nodes:%s", nodes);
xfree(nodes);
}
#endif
@@ -2750,7 +2750,7 @@ extern int job_test_resv(struct job_record *job_ptr, time_t *when,
list_iterator_destroy(iter);
if ((rc == SLURM_SUCCESS) && move_time) {
- if (license_job_test(job_ptr, job_start_time)
+ if (license_job_test(job_ptr, job_start_time)
== EAGAIN) {
/* Need to postpone for licenses */
rc = ESLURM_NODES_BUSY;
@@ -2833,7 +2833,7 @@ extern int job_resv_check(struct job_record *job_ptr)
/* Finish scan of all jobs for valid reservations
*
* Purge vestigial reservation records.
- * Advance daily or weekly reservations that are no longer
+ * Advance daily or weekly reservations that are no longer
* being actively used.
*/
extern void fini_job_resv_check(void)
@@ -2907,7 +2907,7 @@ extern int send_resvs_to_accounting(void)
if(!resv_list)
return SLURM_SUCCESS;
-
+
itr = list_iterator_create(resv_list);
while ((resv_ptr = list_next(itr))) {
_post_resv_create(resv_ptr);
@@ -2974,9 +2974,9 @@ static void _set_nodes_maint(slurmctld_resv_t *resv_ptr, time_t now)
/* mark that this node is now down and in maint mode
* or was removed from maint mode */
if (IS_NODE_DOWN(node_ptr) || IS_NODE_DRAIN(node_ptr) ||
- IS_NODE_FAIL(node_ptr)) {
+ IS_NODE_FAIL(node_ptr)) {
clusteracct_storage_g_node_down(
- acct_db_conn,
+ acct_db_conn,
slurmctld_cluster_name,
node_ptr, now, NULL);
}
diff --git a/src/slurmctld/reservation.h b/src/slurmctld/reservation.h
index 745779b3cf2483335e2ccfeb7de18e5f85ecf5e6..e92885cfe661be7c260b85108c2ed7c29a6a90d9 100644
--- a/src/slurmctld/reservation.h
+++ b/src/slurmctld/reservation.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -74,10 +74,10 @@ extern int send_resvs_to_accounting(void);
extern void set_node_maint_mode(void);
/*
- * Load the reservation state from file, recover on slurmctld restart.
+ * Load the reservation state from file, recover on slurmctld restart.
* Reset reservation pointers for all jobs.
* Execute this after loading the configuration file data.
- * IN recover - 0 = validate current reservations ONLY if already recovered,
+ * IN recover - 0 = validate current reservations ONLY if already recovered,
* otherwise recover from disk
* 1+ = recover all reservation state from disk
* RET SLURM_SUCCESS or error code
@@ -94,7 +94,7 @@ extern int load_all_resv_state(int recover);
extern int validate_job_resv(struct job_record *job_ptr);
/*
- * Determine how many licenses of the give type the specified job is
+ * Determine how many licenses of the give type the specified job is
* prevented from using due to reservations
*
* IN job_ptr - job to test
@@ -146,7 +146,7 @@ extern int job_resv_check(struct job_record *job_ptr);
/* Finish scan of all jobs for valid reservations
*
* Purge vestigial reservation records.
- * Advance daily or weekly reservations that are no longer
+ * Advance daily or weekly reservations that are no longer
* being actively used.
*/
extern void fini_job_resv_check(void);
diff --git a/src/slurmctld/sched_plugin.c b/src/slurmctld/sched_plugin.c
index a9e148ae5819bbb1d58c71278e2db1764e8bf367..df3af57167e7e0563771a9b2f62727e23c87d44c 100644
--- a/src/slurmctld/sched_plugin.c
+++ b/src/slurmctld/sched_plugin.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jay Windley <jwindley@lnxi.com>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -57,7 +57,7 @@ typedef struct slurm_sched_ops {
int (*schedule) ( void );
int (*newalloc) ( struct job_record * );
int (*freealloc) ( struct job_record * );
- uint32_t (*initial_priority) ( uint32_t,
+ uint32_t (*initial_priority) ( uint32_t,
struct job_record * );
void (*job_is_pending) ( void );
int (*reconfig) ( void );
@@ -112,13 +112,13 @@ slurm_sched_get_ops( slurm_sched_context_t *c )
/* Find the correct plugin. */
c->cur_plugin = plugin_load_and_link(c->sched_type, n_syms, syms,
(void **) &c->ops);
- if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
+ if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
error("Couldn't find the specified plugin name for %s "
"looking at all files",
c->sched_type);
-
+
/* Get plugin list. */
if ( c->plugin_list == NULL ) {
char *plugin_dir;
@@ -217,7 +217,7 @@ slurm_sched_init( void )
{
int retval = SLURM_SUCCESS;
char *sched_type = NULL;
-
+
slurm_mutex_lock( &g_sched_context_lock );
if ( g_sched_context )
@@ -240,7 +240,7 @@ slurm_sched_init( void )
goto done;
}
- if ( (slurm_get_preempt_mode() & PREEMPT_MODE_GANG) &&
+ if ( (slurm_get_preempt_mode() & PREEMPT_MODE_GANG) &&
(gs_init() != SLURM_SUCCESS))
error( "cannot start gang scheduler ");
@@ -264,7 +264,7 @@ slurm_sched_fini( void )
rc = slurm_sched_context_destroy(g_sched_context);
g_sched_context = NULL;
- if ( (slurm_get_preempt_mode() & PREEMPT_MODE_GANG) &&
+ if ( (slurm_get_preempt_mode() & PREEMPT_MODE_GANG) &&
(gs_fini() != SLURM_SUCCESS))
error( "cannot stop gang scheduler" );
@@ -281,7 +281,7 @@ slurm_sched_reconfig( void )
if ( slurm_sched_init() < 0 )
return SLURM_ERROR;
- if ( (slurm_get_preempt_mode() & PREEMPT_MODE_GANG) &&
+ if ( (slurm_get_preempt_mode() & PREEMPT_MODE_GANG) &&
(gs_reconfig() != SLURM_SUCCESS))
error( "cannot reconfigure gang scheduler" );
@@ -299,7 +299,7 @@ slurm_sched_schedule( void )
#if 0
/* Must have job write lock and node read lock set here */
- if ( (slurm_get_preempt_mode() & PREEMPT_MODE_GANG) &&
+ if ( (slurm_get_preempt_mode() & PREEMPT_MODE_GANG) &&
(gs_job_scan() != SLURM_SUCCESS))
error( "gang scheduler could not rescan jobs" );
#endif
@@ -316,9 +316,9 @@ slurm_sched_newalloc( struct job_record *job_ptr )
if ( slurm_sched_init() < 0 )
return SLURM_ERROR;
- if ( (slurm_get_preempt_mode() & PREEMPT_MODE_GANG) &&
+ if ( (slurm_get_preempt_mode() & PREEMPT_MODE_GANG) &&
(gs_job_start( job_ptr ) != SLURM_SUCCESS)) {
- error( "gang scheduler problem starting job %u",
+ error( "gang scheduler problem starting job %u",
job_ptr->job_id);
}
@@ -334,9 +334,9 @@ slurm_sched_freealloc( struct job_record *job_ptr )
if ( slurm_sched_init() < 0 )
return SLURM_ERROR;
- if ( (slurm_get_preempt_mode() & PREEMPT_MODE_GANG) &&
+ if ( (slurm_get_preempt_mode() & PREEMPT_MODE_GANG) &&
(gs_job_fini( job_ptr ) != SLURM_SUCCESS)) {
- error( "gang scheduler problem finishing job %u",
+ error( "gang scheduler problem finishing job %u",
job_ptr->job_id);
}
@@ -348,13 +348,13 @@ slurm_sched_freealloc( struct job_record *job_ptr )
/* TAG( slurm_sched_initital_priority ) */
/* *********************************************************************** */
uint32_t
-slurm_sched_initial_priority( uint32_t last_prio,
+slurm_sched_initial_priority( uint32_t last_prio,
struct job_record *job_ptr )
{
if ( slurm_sched_init() < 0 )
return SLURM_ERROR;
- return (*(g_sched_context->ops.initial_priority))( last_prio,
+ return (*(g_sched_context->ops.initial_priority))( last_prio,
job_ptr );
}
@@ -367,7 +367,7 @@ slurm_sched_job_is_pending( void )
if ( slurm_sched_init() < 0 )
return;
- if ( (slurm_get_preempt_mode() & PREEMPT_MODE_GANG) &&
+ if ( (slurm_get_preempt_mode() & PREEMPT_MODE_GANG) &&
(gs_reconfig() != SLURM_SUCCESS))
error( "cannot reconfigure gang scheduler" );
@@ -385,7 +385,7 @@ slurm_sched_partition_change( void )
#if 0
/* Must have job write lock and node read lock set here */
- if ( (slurm_get_preempt_mode() & PREEMPT_MODE_GANG) &&
+ if ( (slurm_get_preempt_mode() & PREEMPT_MODE_GANG) &&
(gs_job_scan() != SLURM_SUCCESS))
error( "gang scheduler could not rescan jobs" );
#endif
@@ -396,7 +396,7 @@ slurm_sched_partition_change( void )
/* *********************************************************************** */
/* TAG( slurm_sched_p_get_errno ) */
/* *********************************************************************** */
-int
+int
slurm_sched_p_get_errno( void )
{
if ( slurm_sched_init() < 0 )
diff --git a/src/slurmctld/sched_plugin.h b/src/slurmctld/sched_plugin.h
index 69f368e485f2a0c28700d579636a683c0fcc70a5..03365cb39461d0a242f7392bf86241c9139f72fe 100644
--- a/src/slurmctld/sched_plugin.h
+++ b/src/slurmctld/sched_plugin.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Jay Windley <jwindley@lnxi.com>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -51,7 +51,7 @@ int slurm_sched_init( void );
/*
* Terminate external scheduler, free memory.
- *
+ *
* Returns a SLURM errno.
*/
extern int slurm_sched_fini(void);
@@ -85,7 +85,7 @@ int slurm_sched_freealloc( struct job_record *job_ptr );
/*
* Supply the initial SLURM priority for a newly-submitted job.
*/
-uint32_t slurm_sched_initial_priority( uint32_t max_prio,
+uint32_t slurm_sched_initial_priority( uint32_t max_prio,
struct job_record *job_ptr );
/*
@@ -103,7 +103,7 @@ void slurm_sched_job_is_pending( void );
*/
void slurm_sched_partition_change( void );
-/*
+/*
* Return any plugin-specific error number
*/
int slurm_sched_p_get_errno( void );
diff --git a/src/slurmctld/slurmctld.h b/src/slurmctld/slurmctld.h
index 053c87e9e954560d62d0e756318a93360d34d1f3..0e72c5d7cf75142991ed333e114e47512c56a1b0 100644
--- a/src/slurmctld/slurmctld.h
+++ b/src/slurmctld/slurmctld.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -97,8 +97,8 @@
/* Retry an incomplete RPC agent request every RPC_RETRY_INTERVAL seconds */
#define RPC_RETRY_INTERVAL 60
-/* Attempt to schedule jobs every PERIODIC_SCHEDULE seconds despite
- * any RPC activity. This will catch any state transisions that may
+/* Attempt to schedule jobs every PERIODIC_SCHEDULE seconds despite
+ * any RPC activity. This will catch any state transisions that may
* have otherwise been missed */
#define PERIODIC_SCHEDULE 60
@@ -118,7 +118,7 @@
/* Pathname of group file record for checking update times */
#define GROUP_FILE "/etc/group"
-/* Check for updates to GROUP_FILE every PERIODIC_GROUP_CHECK seconds,
+/* Check for updates to GROUP_FILE every PERIODIC_GROUP_CHECK seconds,
* Update the group uid_t access list as needed */
#define PERIODIC_GROUP_CHECK 600
@@ -170,18 +170,18 @@ extern bool ping_nodes_now; /* if set, ping nodes immediately */
/*****************************************************************************\
* NODE states and bitmaps
- *
- * avail_node_bitmap Set if node's state is not DOWN, DRAINING/DRAINED,
+ *
+ * avail_node_bitmap Set if node's state is not DOWN, DRAINING/DRAINED,
* FAILING or NO_RESPOND (i.e. available to run a job)
* idle_node_bitmap Set if node has no jobs allocated to it
* power_node_bitmap Set for nodes which are powered down
* share_node_bitmap Set if any job allocated resources on that node
- * is configured to not share the node with other
+ * is configured to not share the node with other
* jobs (--exclusive option specified by job or
* Shared=NO configured for the job's partition)
* up_node_bitmap Set if the node's state is not DOWN
\*****************************************************************************/
-extern bitstr_t *avail_node_bitmap; /* bitmap of available nodes,
+extern bitstr_t *avail_node_bitmap; /* bitmap of available nodes,
* state not DOWN, DRAIN or FAILING */
extern bitstr_t *idle_node_bitmap; /* bitmap of idle nodes */
extern bitstr_t *power_node_bitmap; /* Powered down nodes */
@@ -208,7 +208,7 @@ struct part_record {
uint32_t total_cpus; /* total number of cpus in the partition */
uint32_t min_offset; /* select plugin min offset */
uint32_t max_offset; /* select plugin max offset */
- uint16_t root_only; /* 1 if allocate/submit RPC can only be
+ uint16_t root_only; /* 1 if allocate/submit RPC can only be
issued by user root */
uint16_t max_share; /* number of jobs to gang schedule */
double norm_priority; /* normalized scheduling priority for
@@ -216,9 +216,9 @@ struct part_record {
uint16_t priority; /* scheduling priority for jobs */
uint16_t state_up; /* 1 if state is up, 0 if down */
char *nodes; /* comma delimited list names of nodes */
- char *allow_groups; /* comma delimited list of groups,
+ char *allow_groups; /* comma delimited list of groups,
* NULL indicates all */
- char *allow_alloc_nodes;/* comma delimited list of allowed
+ char *allow_alloc_nodes;/* comma delimited list of allowed
* allocating nodes
* NULL indicates all */
@@ -291,21 +291,21 @@ struct feature_record {
uint8_t op_code; /* separator, see FEATURE_OP_ above */
};
-/* job_details - specification of a job's constraints,
+/* job_details - specification of a job's constraints,
* can be purged after initiation */
struct job_details {
uint16_t acctg_freq; /* accounting polling interval */
uint16_t argc; /* count of argv elements */
char **argv; /* arguments for a batch job script */
- time_t begin_time; /* start at this time (srun --begin),
+ time_t begin_time; /* start at this time (srun --begin),
* resets to time first eligible
* (all dependencies satisfied) */
- char *ckpt_dir; /* directory to store checkpoint
+ char *ckpt_dir; /* directory to store checkpoint
* images */
uint16_t contiguous; /* set if requires contiguous nodes */
char *cpu_bind; /* binding map for map/mask_cpu */
uint16_t cpu_bind_type; /* see cpu_bind_type_t */
- uint16_t cpus_per_task; /* number of processors required for
+ uint16_t cpus_per_task; /* number of processors required for
* each task */
List depend_list; /* list of job_ptr:state pairs */
char *dependency; /* wait for other jobs */
@@ -314,13 +314,13 @@ struct job_details {
* as set by Moab */
bitstr_t *exc_node_bitmap; /* bitmap of excluded nodes */
char *exc_nodes; /* excluded nodes */
- List feature_list; /* required features with
+ List feature_list; /* required features with
* node counts */
char *features; /* required features */
/* job constraints: */
uint32_t job_min_cpus; /* minimum processors per node */
uint32_t job_min_memory; /* minimum memory per node (MB) OR
- * memory per allocated
+ * memory per allocated
* CPU | MEM_PER_CPU */
uint32_t job_min_tmp_disk; /* minimum tempdisk per node, MB */
uint32_t magic; /* magic cookie for data integrity */
@@ -329,7 +329,7 @@ struct job_details {
char *mem_bind; /* binding map for map/mask_cpu */
uint16_t mem_bind_type; /* see mem_bind_type_t */
uint32_t min_nodes; /* minimum number of nodes */
- uint16_t nice; /* requested priority change,
+ uint16_t nice; /* requested priority change,
* NICE_OFFSET == no change */
uint16_t ntasks_per_node; /* number of tasks on each node */
uint32_t num_tasks; /* number of tasks to start */
@@ -337,7 +337,7 @@ struct job_details {
uint8_t overcommit; /* processors being over subscribed */
uint16_t plane_size; /* plane size when task_dist =
* SLURM_DIST_PLANE */
- uint8_t prolog_running; /* set while prolog_slurmctld is
+ uint8_t prolog_running; /* set while prolog_slurmctld is
* running */
uint32_t reserved_resources; /* CPU minutes of resources reserved
* for this job while it was pending */
@@ -345,7 +345,7 @@ struct job_details {
uint16_t *req_node_layout; /* task layout for required nodes */
char *req_nodes; /* required nodes */
uint16_t requeue; /* controls ability requeue job */
- char *restart_dir; /* restart execution from ckpt images
+ char *restart_dir; /* restart execution from ckpt images
* in this dir */
uint16_t shared; /* 1 if job can share nodes,
* 0 if job cannot share nodes,
@@ -369,13 +369,13 @@ struct job_record {
uint32_t assoc_id; /* used for accounting plugins */
void *assoc_ptr; /* job's association record ptr, it is
* void* because of interdependencies
- * in the header files, confirm the
+ * in the header files, confirm the
* value before use */
uint16_t batch_flag; /* 1 or 2 if batch job (with script),
* 2 indicates retry mode (one retry) */
check_jobinfo_t check_job; /* checkpoint context, opaque */
uint16_t ckpt_interval; /* checkpoint interval in minutes */
- time_t ckpt_time; /* last time job was periodically
+ time_t ckpt_time; /* last time job was periodically
* checkpointed */
char *comment; /* arbitrary comment */
uint16_t cr_enabled; /* specify if if Consumable Resources
@@ -383,8 +383,8 @@ struct job_record {
* with a finer granularity in its
* node/cpu scheduling (available cpus
* instead of available nodes) than the
- * bluegene and the linear plugins
- * 0 if cr is NOT enabled,
+ * bluegene and the linear plugins
+ * 0 if cr is NOT enabled,
* 1 if cr is enabled */
uint32_t db_index; /* used only for database
* plugins */
@@ -392,17 +392,17 @@ struct job_record {
uint16_t direct_set_prio; /* Priority set directly if
* set the system will not
* change the priority any further. */
- time_t end_time; /* time of termination,
+ time_t end_time; /* time of termination,
* actual or expected */
- uint32_t exit_code; /* exit code for job (status from
+ uint32_t exit_code; /* exit code for job (status from
* wait call) */
uint32_t group_id; /* group submitted under */
uint32_t job_id; /* job ID */
struct job_record *job_next; /* next entry with same hash index */
enum job_states job_state; /* state of the job */
- uint16_t kill_on_node_fail; /* 1 if job should be killed on
+ uint16_t kill_on_node_fail; /* 1 if job should be killed on
* node failure */
- uint16_t kill_on_step_done; /* 1 if job should be killed when
+ uint16_t kill_on_step_done; /* 1 if job should be killed when
* the job step completes, 2 if kill
* in progress */
char *licenses; /* licenses required by the job */
@@ -416,10 +416,10 @@ struct job_record {
char *network; /* network/switch requirement spec */
uint32_t next_step_id; /* next step id to be used */
char *nodes; /* list of nodes allocated to job */
- slurm_addr *node_addr; /* addresses of the nodes allocated to
+ slurm_addr *node_addr; /* addresses of the nodes allocated to
* job */
bitstr_t *node_bitmap; /* bitmap of nodes allocated to job */
- uint32_t node_cnt; /* count of nodes currently
+ uint32_t node_cnt; /* count of nodes currently
* allocated to job */
char *nodes_completing; /* nodes still in completing state
* for this job, used to insure
@@ -432,13 +432,13 @@ struct job_record {
uint32_t priority; /* relative priority of the job,
* zero == held (don't initiate) */
double priority_fs; /* cached value used by sprio command */
- uint16_t qos; /* quality of service,
+ uint16_t qos; /* quality of service,
* used only by Moab */
void *qos_ptr; /* pointer to the quality of
- * service record used for this job,
+ * service record used for this job,
* used only by Moab, it is
* void* because of interdependencies
- * in the header files, confirm the
+ * in the header files, confirm the
* value before use */
uint16_t restart_cnt; /* count of restarts */
uint32_t resv_id; /* reservation ID */
@@ -450,10 +450,10 @@ struct job_record {
select_jobinfo_t *select_jobinfo;/* opaque data, BlueGene */
job_resources_t *job_resrcs; /* details of allocated cores */
char **spank_job_env; /* environment variables for job prolog
- * and epilog scripts as set by SPANK
+ * and epilog scripts as set by SPANK
* plugins */
uint32_t spank_job_env_size; /* element count in spank_env */
- time_t start_time; /* time execution begins,
+ time_t start_time; /* time execution begins,
* actual or expected */
char *state_desc; /* optional details for state_reason */
uint16_t state_reason; /* reason job still pending or failed
@@ -464,11 +464,11 @@ struct job_record {
uint32_t time_limit; /* time_limit minutes or INFINITE,
* NO_VAL implies partition max_time */
time_t tot_sus_time; /* total time in suspend state */
- uint32_t total_procs; /* number of allocated processors,
+ uint32_t total_procs; /* number of allocated processors,
* for accounting */
uint32_t user_id; /* user the job runs as */
uint16_t warn_signal; /* signal to send before end_time */
- uint16_t warn_time; /* when to send signal before
+ uint16_t warn_time; /* when to send signal before
* end_time (secs) */
char *wckey; /* optional wckey */
};
@@ -492,18 +492,18 @@ struct step_record {
char *ckpt_dir; /* path to checkpoint image files */
time_t ckpt_time; /* time of last checkpoint */
bitstr_t *core_bitmap_job; /* bitmap of cores allocated to this
- * step relative to job's nodes,
+ * step relative to job's nodes,
* see src/common/job_resources.h */
uint32_t cpu_count; /* count of step's CPUs */
uint16_t cpus_per_task; /* cpus per task initiated */
- uint16_t cyclic_alloc; /* set for cyclic task allocation
+ uint16_t cyclic_alloc; /* set for cyclic task allocation
* across nodes */
uint16_t exclusive; /* dedicated resources for the step */
uint32_t exit_code; /* highest exit code from any task */
bitstr_t *exit_node_bitmap; /* bitmap of exited nodes */
char *host; /* host for srun communications */
struct job_record* job_ptr; /* ptr to the job that owns the step */
- jobacctinfo_t *jobacct; /* keep track of process info in the
+ jobacctinfo_t *jobacct; /* keep track of process info in the
* step */
uint32_t mem_per_cpu; /* MB memory per CPU, 0=no limit */
char *name; /* name of job step */
@@ -520,7 +520,7 @@ struct step_record {
uint32_t step_id; /* step number */
slurm_step_layout_t *step_layout;/* info about how tasks are laid out
* in the step */
- bitstr_t *step_node_bitmap; /* bitmap of nodes allocated to job
+ bitstr_t *step_node_bitmap; /* bitmap of nodes allocated to job
* step */
/* time_t suspend_time; * time step last suspended or resumed
* implicitly the same as suspend_time
@@ -536,7 +536,7 @@ extern List job_list; /* list of job_record entries */
* Consumable Resources parameters and data structures
\*****************************************************************************/
-/*
+/*
* Define the type of update and of data retrieval that can happen
* from the "select/cons_res" plugin. This information needed to
* support processors as consumable resources. This structure will be
@@ -548,7 +548,7 @@ enum select_plugindata_info {
SELECT_ALLOC_CPUS, /* data-> uint16 alloc cpus (CR support) */
SELECT_ALLOC_LPS, /* data-> uint32 alloc lps (CR support) */
SELECT_AVAIL_MEMORY, /* data-> uint32 avail mem (CR support) */
- SELECT_STATIC_PART, /* data-> uint16, 1 if static partitioning
+ SELECT_STATIC_PART, /* data-> uint16, 1 if static partitioning
* BlueGene support */
SELECT_CONFIG_INFO /* data-> List get .conf info from select
* plugin */
@@ -560,11 +560,11 @@ enum select_plugindata_info {
/*
* abort_job_on_node - Kill the specific job_id on a specific node,
- * the request is not processed immediately, but queued.
- * This is to prevent a flood of pthreads if slurmctld restarts
- * without saved state and slurmd daemons register with a
- * multitude of running jobs. Slurmctld will not recognize
- * these jobs and use this function to kill them - one
+ * the request is not processed immediately, but queued.
+ * This is to prevent a flood of pthreads if slurmctld restarts
+ * without saved state and slurmd daemons register with a
+ * multitude of running jobs. Slurmctld will not recognize
+ * these jobs and use this function to kill them - one
* agent request per node as they register.
* IN job_id - id of the job to be killed
* IN job_ptr - pointer to terminating job (NULL if unknown, e.g. orphaned)
@@ -576,7 +576,7 @@ extern void abort_job_on_node(uint32_t job_id, struct job_record *job_ptr,
/* Given a config_record with it's bitmap already set, update feature_list */
extern void build_config_feature_list(struct config_record *config_ptr);
-/*
+/*
* create_job_record - create an empty job_record including job_details.
* load its values with defaults (zeros, nulls, and magic cookie)
* IN/OUT error_code - set to zero if no error, errno otherwise
@@ -588,7 +588,7 @@ extern void build_config_feature_list(struct config_record *config_ptr);
*/
extern struct job_record * create_job_record (int *error_code);
-/*
+/*
* create_part_record - create a partition record
* RET a pointer to the record or NULL if error
* global: default_part - default partition parameters
@@ -598,7 +598,7 @@ extern struct job_record * create_job_record (int *error_code);
*/
extern struct part_record *create_part_record (void);
-/*
+/*
* delete_step_records - delete step record for specified job_ptr
* IN job_ptr - pointer to job table entry to have step records removed
* IN filter - determine which job steps to delete
@@ -607,24 +607,24 @@ extern struct part_record *create_part_record (void);
*/
extern void delete_step_records (struct job_record *job_ptr, int filter);
-/*
+/*
* delete_job_details - delete a job's detail record and clear it's pointer
- * this information can be deleted as soon as the job is allocated
+ * this information can be deleted as soon as the job is allocated
* resources and running (could need to restart batch job)
* IN job_entry - pointer to job_record to clear the record of
*/
extern void delete_job_details (struct job_record *job_entry);
/*
- * delete_partition - delete the specified partition (actually leave
+ * delete_partition - delete the specified partition (actually leave
* the entry, just flag it as defunct)
* IN job_specs - job specification from RPC
* RET 0 on success, errno otherwise
*/
extern int delete_partition(delete_part_msg_t *part_desc_ptr);
-/*
- * delete_step_record - delete record for job step for specified job_ptr
+/*
+ * delete_step_record - delete record for job step for specified job_ptr
* and step_id
* IN job_ptr - pointer to job table entry to have step record removed
* IN step_id - id of the desired job step
@@ -632,8 +632,8 @@ extern int delete_partition(delete_part_msg_t *part_desc_ptr);
*/
extern int delete_step_record (struct job_record *job_ptr, uint32_t step_id);
-/*
- * drain_nodes - drain one or more nodes,
+/*
+ * drain_nodes - drain one or more nodes,
* no-op for nodes already drained or draining
* IN nodes - nodes to drain
* IN reason - reason to drain the nodes
@@ -676,7 +676,7 @@ extern void dump_step_desc(job_step_create_request_msg_t *step_spec);
extern void excise_node_from_job(struct job_record *job_ptr,
struct node_record *node_ptr);
-/*
+/*
* find_job_record - return a pointer to the job record with the given job_id
* IN job_id - requested job's id
* RET pointer to the job's record, NULL on error
@@ -691,26 +691,26 @@ extern struct job_record *find_job_record (uint32_t job_id);
*/
extern struct node_record *find_first_node_record (bitstr_t *node_bitmap);
-/*
+/*
* find_part_record - find a record for partition with specified name
- * IN name - name of the desired partition
+ * IN name - name of the desired partition
* RET pointer to node partition or NULL if not found
* global: part_list - global partition list
*/
extern struct part_record *find_part_record (char *name);
-/*
- * find_step_record - return a pointer to the step record with the given
+/*
+ * find_step_record - return a pointer to the step record with the given
* job_id and step_id
* IN job_ptr - pointer to job table entry to have step record added
* IN step_id - id of the desired job step
* RET pointer to the job step's record, NULL on error
*/
-extern struct step_record * find_step_record(struct job_record *job_ptr,
+extern struct step_record * find_step_record(struct job_record *job_ptr,
uint32_t step_id);
/*
- * get_job_env - return the environment variables and their count for a
+ * get_job_env - return the environment variables and their count for a
* given job
* IN job_ptr - pointer to job for which data is required
* OUT env_size - number of elements to read
@@ -718,7 +718,7 @@ extern struct step_record * find_step_record(struct job_record *job_ptr,
*/
extern char **get_job_env (struct job_record *job_ptr, uint32_t *env_size);
-/*
+/*
* get_job_script - return the script for a given job
* IN job_ptr - pointer to job for which data is required
* RET point to string containing job script
@@ -731,9 +731,9 @@ extern char *get_job_script (struct job_record *job_ptr);
*/
extern uint32_t get_next_job_id(void);
-/*
- * init_job_conf - initialize the job configuration tables and values.
- * this should be called after creating node information, but
+/*
+ * init_job_conf - initialize the job configuration tables and values.
+ * this should be called after creating node information, but
* before creating any job entries.
* RET 0 if no error, otherwise an error code
* global: last_job_update - time of last job table update
@@ -741,9 +741,9 @@ extern uint32_t get_next_job_id(void);
*/
extern int init_job_conf (void);
-/*
- * init_node_conf - initialize the node configuration tables and values.
- * this should be called before creating any node or configuration
+/*
+ * init_node_conf - initialize the node configuration tables and values.
+ * this should be called before creating any node or configuration
* entries.
* RET 0 if no error, otherwise an error code
* global: node_record_table_ptr - pointer to global node table
@@ -754,9 +754,9 @@ extern int init_job_conf (void);
*/
extern int init_node_conf ();
-/*
- * init_part_conf - initialize the default partition configuration values
- * and create a (global) partition list.
+/*
+ * init_part_conf - initialize the default partition configuration values
+ * and create a (global) partition list.
* this should be called before creating any partition entries.
* RET 0 if no error, otherwise an error code
* global: default_part - default partition values
@@ -767,41 +767,41 @@ extern int init_part_conf (void);
/*
* is_node_down - determine if the specified node's state is DOWN
* IN name - name of the node
- * RET true if node exists and is down, otherwise false
+ * RET true if node exists and is down, otherwise false
*/
extern bool is_node_down (char *name);
/*
* is_node_resp - determine if the specified node's state is responding
* IN name - name of the node
- * RET true if node exists and is responding, otherwise false
+ * RET true if node exists and is responding, otherwise false
*/
extern bool is_node_resp (char *name);
/*
- * job_allocate - create job_records for the suppied job specification and
+ * job_allocate - create job_records for the suppied job specification and
* allocate nodes for it.
* IN job_specs - job specifications
* IN immediate - if set then either initiate the job immediately or fail
- * IN will_run - don't initiate the job if set, just test if it could run
+ * IN will_run - don't initiate the job if set, just test if it could run
* now or later
* OUT resp - will run response (includes start location, time, etc.)
* IN allocate - resource allocation request if set, not a full job
* IN submit_uid -uid of user issuing the request
* OUT job_pptr - set to pointer to job record
- * RET 0 or an error code. If the job would only be able to execute with
- * some change in partition configuration then
+ * RET 0 or an error code. If the job would only be able to execute with
+ * some change in partition configuration then
* ESLURM_REQUESTED_PART_CONFIG_UNAVAILABLE is returned
- * NOTE: If allocating nodes lx[0-7] to a job and those nodes have cpu counts
+ * NOTE: If allocating nodes lx[0-7] to a job and those nodes have cpu counts
* of 4, 4, 4, 4, 8, 8, 4, 4 then num_cpu_groups=3, cpus_per_node={4,8,4}
* and cpu_count_reps={4,2,2}
- * globals: job_list - pointer to global job list
+ * globals: job_list - pointer to global job list
* list_part - global list of partition info
* default_part_loc - pointer to default partition
* NOTE: lock_slurmctld on entry: Read config Write job, Write node, Read part
*/
-extern int job_allocate(job_desc_msg_t * job_specs, int immediate,
- int will_run, will_run_response_msg_t **resp,
+extern int job_allocate(job_desc_msg_t * job_specs, int immediate,
+ int will_run, will_run_response_msg_t **resp,
int allocate, uid_t submit_uid, struct job_record **job_pptr);
/*
@@ -813,21 +813,21 @@ extern int job_allocate(job_desc_msg_t * job_specs, int immediate,
extern int job_cancel_by_assoc_id(uint32_t assoc_id);
/* Perform checkpoint operation on a job */
-extern int job_checkpoint(checkpoint_msg_t *ckpt_ptr, uid_t uid,
+extern int job_checkpoint(checkpoint_msg_t *ckpt_ptr, uid_t uid,
slurm_fd conn_fd);
/* log the completion of the specified job */
extern void job_completion_logger(struct job_record *job_ptr);
/*
- * job_epilog_complete - Note the completion of the epilog script for a
+ * job_epilog_complete - Note the completion of the epilog script for a
* given job
* IN job_id - id of the job for which the epilog was executed
* IN node_name - name of the node on which the epilog was executed
* IN return_code - return code from epilog script
* RET true if job is COMPLETED, otherwise false
*/
-extern bool job_epilog_complete(uint32_t job_id, char *node_name,
+extern bool job_epilog_complete(uint32_t job_id, char *node_name,
uint32_t return_code);
/*
@@ -871,33 +871,33 @@ extern void job_preempt_remove(uint32_t job_id);
* the job requirements is load from the checkpoint file and
* the job id is restored.
*
- * IN ckpt_ptr - checkpoint request message
+ * IN ckpt_ptr - checkpoint request message
* IN uid - user id of the user issuing the RPC
* IN conn_fd - file descriptor on which to send reply
* RET 0 on success, otherwise ESLURM error code
*/
-extern int job_restart(checkpoint_msg_t *ckpt_ptr, uid_t uid,
+extern int job_restart(checkpoint_msg_t *ckpt_ptr, uid_t uid,
slurm_fd conn_fd);
-/*
+/*
* job_signal - signal the specified job
* IN job_id - id of the job to be signaled
* IN signal - signal to send, SIGKILL == cancel the job
* IN batch_flag - signal batch shell only if set
* IN uid - uid of requesting user
- * RET 0 on success, otherwise ESLURM error code
+ * RET 0 on success, otherwise ESLURM error code
* global: job_list - pointer global job list
* last_job_update - time of last job table update
*/
-extern int job_signal(uint32_t job_id, uint16_t signal, uint16_t batch_flag,
+extern int job_signal(uint32_t job_id, uint16_t signal, uint16_t batch_flag,
uid_t uid);
-/*
+/*
* job_step_cancel - cancel the specified job step
* IN job_id - id of the job to be cancelled
* IN step_id - id of the job step to be cancelled
* IN uid - user id of user issuing the RPC
- * RET 0 on success, otherwise ESLURM error code
+ * RET 0 on success, otherwise ESLURM error code
* global: job_list - pointer global job list
* last_job_update - time of last job table update
*/
@@ -936,7 +936,7 @@ extern int job_step_checkpoint_task_comp(checkpoint_task_comp_msg_t *ckpt_ptr,
* job_suspend - perform some suspend/resume operation
* IN sus_ptr - suspend/resume request message
* IN uid - user id of the user issuing the RPC
- * IN conn_fd - file descriptor on which to send reply,
+ * IN conn_fd - file descriptor on which to send reply,
* -1 if none
* IN clear_prio - if set, then clear the job's priority after
* suspending it, this is used to distinguish
@@ -944,20 +944,20 @@ extern int job_step_checkpoint_task_comp(checkpoint_task_comp_msg_t *ckpt_ptr,
* jobs suspended though automatic preemption
* RET 0 on success, otherwise ESLURM error code
*/
-extern int job_suspend(suspend_msg_t *sus_ptr, uid_t uid,
+extern int job_suspend(suspend_msg_t *sus_ptr, uid_t uid,
slurm_fd conn_fd, bool clear_prio);
-/*
+/*
* job_complete - note the normal termination the specified job
* IN job_id - id of the job which completed
* IN uid - user id of user issuing the RPC
* IN requeue - job should be run again if possible
* IN job_return_code - job's return code, if set then set state to JOB_FAILED
- * RET - 0 on success, otherwise ESLURM error code
+ * RET - 0 on success, otherwise ESLURM error code
* global: job_list - pointer global job list
* last_job_update - time of last job table update
*/
-extern int job_complete (uint32_t job_id, uid_t uid, bool requeue,
+extern int job_complete (uint32_t job_id, uid_t uid, bool requeue,
uint32_t job_return_code);
/*
@@ -977,7 +977,7 @@ extern bool job_independent(struct job_record *job_ptr, int will_run);
* IN/OUT bitmap - set of nodes being considered for use
* RET SLURM_SUCCESS or EINVAL if can't filter (exclusive OR of features)
*/
-extern int job_req_node_filter(struct job_record *job_ptr,
+extern int job_req_node_filter(struct job_record *job_ptr,
bitstr_t *avail_bitmap);
/*
@@ -989,41 +989,41 @@ extern int job_req_node_filter(struct job_record *job_ptr,
*/
extern int job_requeue (uid_t uid, uint32_t job_id, slurm_fd conn_fd);
-/*
+/*
* job_step_complete - note normal completion the specified job step
* IN job_id - id of the job to be completed
* IN step_id - id of the job step to be completed
* IN uid - user id of user issuing the RPC
* IN requeue - job should be run again if possible
* IN job_return_code - job's return code, if set then set state to JOB_FAILED
- * RET 0 on success, otherwise ESLURM error code
+ * RET 0 on success, otherwise ESLURM error code
* global: job_list - pointer global job list
* last_job_update - time of last job table update
*/
-extern int job_step_complete (uint32_t job_id, uint32_t job_step_id,
+extern int job_step_complete (uint32_t job_id, uint32_t job_step_id,
uid_t uid, bool requeue, uint32_t job_return_code);
-/*
+/*
* job_step_signal - signal the specified job step
* IN job_id - id of the job to be cancelled
* IN step_id - id of the job step to be cancelled
* IN signal - user id of user issuing the RPC
* IN uid - user id of user issuing the RPC
- * RET 0 on success, otherwise ESLURM error code
+ * RET 0 on success, otherwise ESLURM error code
* global: job_list - pointer global job list
* last_job_update - time of last job table update
*/
-extern int job_step_signal(uint32_t job_id, uint32_t step_id,
+extern int job_step_signal(uint32_t job_id, uint32_t step_id,
uint16_t signal, uid_t uid);
-/*
+/*
* job_time_limit - terminate jobs which have exceeded their time limit
* global: job_list - pointer global job list
* last_job_update - time of last job table update
*/
extern void job_time_limit (void);
-/*
+/*
* check_job_step_time_limit - terminate jobsteps which have exceeded
* their time limit
* IN job_ptr - pointer to job containing steps to check
@@ -1032,8 +1032,8 @@ extern void job_time_limit (void);
extern void check_job_step_time_limit (struct job_record *job_ptr, time_t now);
/*
- * kill_job_by_part_name - Given a partition name, deallocate resource for
- * its jobs and kill them
+ * kill_job_by_part_name - Given a partition name, deallocate resource for
+ * its jobs and kill them
* IN part_name - name of a partition
* RET number of killed jobs
*/
@@ -1050,14 +1050,14 @@ extern void kill_job_on_node(uint32_t job_id, struct job_record *job_ptr,
struct node_record *node_ptr);
/*
- * kill_running_job_by_node_name - Given a node name, deallocate RUNNING
- * or COMPLETING jobs from the node or kill them
+ * kill_running_job_by_node_name - Given a node name, deallocate RUNNING
+ * or COMPLETING jobs from the node or kill them
* IN node_name - name of a node
* RET number of killed jobs
*/
extern int kill_running_job_by_node_name(char *node_name);
-/*
+/*
* kill_step_on_node - determine if the specified job has any job steps
* allocated to the specified node and kill them unless no_kill flag
* is set on the step
@@ -1065,31 +1065,31 @@ extern int kill_running_job_by_node_name(char *node_name);
* IN node_ptr - pointer to a node record
* RET count of killed job steps
*/
-extern int kill_step_on_node(struct job_record *job_ptr,
+extern int kill_step_on_node(struct job_record *job_ptr,
struct node_record *node_ptr);
-/* list_compare_config - compare two entry from the config list based upon
+/* list_compare_config - compare two entry from the config list based upon
* weight, see common/list.h for documentation */
int list_compare_config (void *config_entry1, void *config_entry2);
/*
- * list_find_part - find an entry in the partition list, see common/list.h
+ * list_find_part - find an entry in the partition list, see common/list.h
* for documentation
- * IN key - partition name or "universal_key" for all partitions
- * RET 1 if matches key, 0 otherwise
+ * IN key - partition name or "universal_key" for all partitions
+ * RET 1 if matches key, 0 otherwise
* global- part_list - the global partition list
*/
extern int list_find_part (void *part_entry, void *key);
/*
- * load_all_job_state - load the job state from file, recover from last
+ * load_all_job_state - load the job state from file, recover from last
* checkpoint. Execute this after loading the configuration file data.
* RET 0 or error code
*/
extern int load_all_job_state ( void );
/*
- * load_all_node_state - Load the node state from file, recover on slurmctld
+ * load_all_node_state - Load the node state from file, recover on slurmctld
* restart. Execute this after loading the configuration file data.
* Data goes into common storage.
* IN state_only - if true over-write only node state, features and reason
@@ -1111,8 +1111,8 @@ extern int load_last_job_id( void );
extern void load_part_uid_allow_list ( int force );
/*
- * load_all_part_state - load the partition state from file, recover from
- * slurmctld restart. execute this after loading the configuration
+ * load_all_part_state - load the partition state from file, recover from
+ * slurmctld restart. execute this after loading the configuration
* file data.
*/
extern int load_all_part_state ( void );
@@ -1144,7 +1144,7 @@ extern void make_node_comp(struct node_record *node_ptr,
* IN node_ptr - pointer to node reporting job completion
* IN job_ptr - pointer to job that just completed
*/
-extern void make_node_idle(struct node_record *node_ptr,
+extern void make_node_idle(struct node_record *node_ptr,
struct job_record *job_ptr);
/* msg_to_slurmd - send given msg_type every slurmd, no args */
@@ -1157,9 +1157,9 @@ extern void node_fini (void);
* IN name - name of the node */
extern void node_did_resp (char *name);
-/*
+/*
* node_not_resp - record that the specified node is not responding
- * IN name - name of the node
+ * IN name - name of the node
* IN msg_time - time message was sent
*/
extern void node_not_resp (char *name, time_t msg_time);
@@ -1174,11 +1174,11 @@ extern void node_no_resp_msg(void);
* IN job_id - ID of job for which info is requested
* OUT job_pptr - set to pointer to job record
*/
-extern int job_alloc_info(uint32_t uid, uint32_t job_id,
+extern int job_alloc_info(uint32_t uid, uint32_t job_id,
struct job_record **job_pptr);
-/*
- * pack_all_jobs - dump all job information for all jobs in
+/*
+ * pack_all_jobs - dump all job information for all jobs in
* machine independent form (for network transmission)
* OUT buffer_ptr - the pointer is set to the allocated buffer.
* OUT buffer_size - set to size of the buffer in bytes
@@ -1186,14 +1186,14 @@ extern int job_alloc_info(uint32_t uid, uint32_t job_id,
* IN uid - uid of user making request (for partition filtering)
* global: job_list - global list of job records
* NOTE: the buffer at *buffer_ptr must be xfreed by the caller
- * NOTE: change _unpack_job_desc_msg() in common/slurm_protocol_pack.c
+ * NOTE: change _unpack_job_desc_msg() in common/slurm_protocol_pack.c
* whenever the data format changes
*/
extern void pack_all_jobs(char **buffer_ptr, int *buffer_size,
uint16_t show_flags, uid_t uid);
-/*
- * pack_all_node - dump all configuration and node information for all nodes
+/*
+ * pack_all_node - dump all configuration and node information for all nodes
* in machine independent form (for network transmission)
* OUT buffer_ptr - pointer to the stored data
* OUT buffer_size - set to size of the buffer in bytes
@@ -1207,22 +1207,22 @@ extern void pack_all_jobs(char **buffer_ptr, int *buffer_size,
extern void pack_all_node (char **buffer_ptr, int *buffer_size,
uint16_t show_flags, uid_t uid);
-/*
+/*
* pack_ctld_job_step_info_response_msg - packs job step info
* IN job_id - specific id or zero for all
* IN step_id - specific id or zero for all
* IN uid - user issuing request
* IN show_flags - job step filtering options
- * OUT buffer - location to store data, pointers automatically advanced
+ * OUT buffer - location to store data, pointers automatically advanced
* RET - 0 or error code
* NOTE: MUST free_buf buffer
*/
-extern int pack_ctld_job_step_info_response_msg(uint32_t job_id,
- uint32_t step_id, uid_t uid,
+extern int pack_ctld_job_step_info_response_msg(uint32_t job_id,
+ uint32_t step_id, uid_t uid,
uint16_t show_flags, Buf buffer);
-/*
- * pack_all_part - dump all partition information for all partitions in
+/*
+ * pack_all_part - dump all partition information for all partitions in
* machine independent form (for network transmission)
* OUT buffer_ptr - the pointer is set to the allocated buffer.
* OUT buffer_size - set to size of the buffer in bytes
@@ -1232,15 +1232,15 @@ extern int pack_ctld_job_step_info_response_msg(uint32_t job_id,
* NOTE: the buffer at *buffer_ptr must be xfreed by the caller
* NOTE: change slurm_load_part() in api/part_info.c if data format changes
*/
-extern void pack_all_part(char **buffer_ptr, int *buffer_size,
+extern void pack_all_part(char **buffer_ptr, int *buffer_size,
uint16_t show_flags, uid_t uid);
-/*
- * pack_job - dump all configuration information about a specific job in
+/*
+ * pack_job - dump all configuration information about a specific job in
* machine independent form (for network transmission)
* IN dump_job_ptr - pointer to job for which information is requested
* IN show_flags - job filtering options
- * IN/OUT buffer - buffer in which data is placed, pointers automatically
+ * IN/OUT buffer - buffer in which data is placed, pointers automatically
* updated
* NOTE: change _unpack_job_desc_msg() in common/slurm_protocol_pack.c
* whenever the data format changes
@@ -1248,20 +1248,20 @@ extern void pack_all_part(char **buffer_ptr, int *buffer_size,
extern void pack_job (struct job_record *dump_job_ptr, uint16_t show_flags,
Buf buffer);
-/*
- * pack_part - dump all configuration information about a specific partition
+/*
+ * pack_part - dump all configuration information about a specific partition
* in machine independent form (for network transmission)
* IN part_ptr - pointer to partition for which information is requested
- * IN/OUT buffer - buffer in which data is placed, pointers automatically
+ * IN/OUT buffer - buffer in which data is placed, pointers automatically
* updated
* global: default_part_loc - pointer to the default partition
- * NOTE: if you make any changes here be sure to make the corresponding
+ * NOTE: if you make any changes here be sure to make the corresponding
* changes to load_part_config in api/partition_info.c
*/
extern void pack_part (struct part_record *part_ptr, Buf buffer);
-/*
- * pack_one_job - dump information for one jobs in
+/*
+ * pack_one_job - dump information for one jobs in
* machine independent form (for network transmission)
* OUT buffer_ptr - the pointer is set to the allocated buffer.
* OUT buffer_size - set to size of the buffer in bytes
@@ -1269,7 +1269,7 @@ extern void pack_part (struct part_record *part_ptr, Buf buffer);
* IN show_flags - job filtering options
* IN uid - uid of user making request (for partition filtering)
* NOTE: the buffer at *buffer_ptr must be xfreed by the caller
- * NOTE: change _unpack_job_desc_msg() in common/slurm_protocol_pack.c
+ * NOTE: change _unpack_job_desc_msg() in common/slurm_protocol_pack.c
* whenever the data format changes
*/
extern int pack_one_job(char **buffer_ptr, int *buffer_size,
@@ -1279,7 +1279,7 @@ extern int pack_one_job(char **buffer_ptr, int *buffer_size,
* group access. This must follow a call to part_filter_set() */
extern void part_filter_clear(void);
-/* part_filter_set - Set the partition's hidden flag based upon a user's
+/* part_filter_set - Set the partition's hidden flag based upon a user's
* group access. This must be followed by a call to part_filter_clear() */
extern void part_filter_set(uid_t uid);
@@ -1287,7 +1287,7 @@ extern void part_filter_set(uid_t uid);
extern void part_fini (void);
/*
- * purge_old_job - purge old job records.
+ * purge_old_job - purge old job records.
* the jobs must have completed at least MIN_JOB_AGE minutes ago
* global: job_list - global job table
* last_job_update - time of last job table update
@@ -1303,16 +1303,16 @@ extern void rehash_jobs(void);
/* update first assigned job id as needed on reconfigure */
extern void reset_first_job_id(void);
-/*
- * reset_job_bitmaps - reestablish bitmaps for existing jobs.
- * this should be called after rebuilding node information,
+/*
+ * reset_job_bitmaps - reestablish bitmaps for existing jobs.
+ * this should be called after rebuilding node information,
* but before using any job entries.
* global: last_job_update - time of last job table update
* job_list - pointer to global job list
*/
extern void reset_job_bitmaps (void);
-/* After a node is returned to service, reset the priority of jobs
+/* After a node is returned to service, reset the priority of jobs
* which may have been held due to that node being unavailable */
extern void reset_job_priority(void);
@@ -1325,7 +1325,7 @@ extern void restore_node_features(void);
/* Update time stamps for job step resume */
extern void resume_job_step(struct job_record *job_ptr);
-/* run_backup - this is the backup controller, it should run in standby
+/* run_backup - this is the backup controller, it should run in standby
* mode, assuming control when the primary controller stops responding */
extern void run_backup(void);
@@ -1350,8 +1350,8 @@ extern int send_nodes_to_accounting(time_t event_time);
/*
* set_node_down - make the specified node's state DOWN if possible
- * (not in a DRAIN state), kill jobs as needed
- * IN name - name of the node
+ * (not in a DRAIN state), kill jobs as needed
+ * IN name - name of the node
* IN reason - why the node is DOWN
*/
extern void set_node_down (char *name, char *reason);
@@ -1397,7 +1397,7 @@ extern void step_alloc_lps(struct step_record *step_ptr);
* NOTE: don't free the returned step_record because that is managed through
* the job.
*/
-extern int step_create ( job_step_create_request_msg_t *step_specs,
+extern int step_create ( job_step_create_request_msg_t *step_specs,
struct step_record** new_step_record,
bool kill_job_when_step_done,
bool batch_step );
@@ -1412,7 +1412,7 @@ extern int step_create ( job_step_create_request_msg_t *step_specs,
* IN task_dist - type of task distribution
* IN plane_size - size of plane (only needed for the plane distribution)
* RET - NULL or slurm_step_layout_t *
- * NOTE: you need to free the returned step_layout usually when the
+ * NOTE: you need to free the returned step_layout usually when the
* step is freed.
*/
extern slurm_step_layout_t *step_layout_create(struct step_record *step_ptr,
@@ -1423,20 +1423,20 @@ extern slurm_step_layout_t *step_layout_create(struct step_record *step_ptr,
uint16_t task_dist,
uint32_t plane_size);
-/* start_power_mgr - Start power management thread as needed. The thread
+/* start_power_mgr - Start power management thread as needed. The thread
* terminates automatically at slurmctld shutdown time.
- * IN thread_id - pointer to thread ID of the started pthread.
+ * IN thread_id - pointer to thread ID of the started pthread.
*/
extern void start_power_mgr(pthread_t *thread_id);
/*
- * step_epilog_complete - note completion of epilog on some node and
- * release it's switch windows if appropriate. can perform partition
+ * step_epilog_complete - note completion of epilog on some node and
+ * release it's switch windows if appropriate. can perform partition
* switch window releases.
* IN job_ptr - pointer to job which has completed epilog
* IN node_name - name of node which has completed epilog
*/
-extern int step_epilog_complete(struct job_record *job_ptr,
+extern int step_epilog_complete(struct job_record *job_ptr,
char *node_name);
/*
@@ -1448,7 +1448,7 @@ extern int step_epilog_complete(struct job_record *job_ptr,
* OUT max_rc - highest return code for any step thus far
* RET 0 on success, otherwise ESLURM error code
*/
-extern int step_partial_comp(step_complete_msg_t *req, uid_t uid,
+extern int step_partial_comp(step_complete_msg_t *req, uid_t uid,
int *rem, uint32_t *max_rc);
/* Update time stamps for job step suspend */
@@ -1478,7 +1478,7 @@ extern int update_job (job_desc_msg_t * job_specs, uid_t uid);
* IN new_account - desired account name
* RET SLURM_SUCCESS or error code
*/
-extern int update_job_account(char *module, struct job_record *job_ptr,
+extern int update_job_account(char *module, struct job_record *job_ptr,
char *new_account);
/*
@@ -1488,7 +1488,7 @@ extern int update_job_account(char *module, struct job_record *job_ptr,
* IN new_wckey - desired wckey name
* RET SLURM_SUCCESS or error code
*/
-extern int update_job_wckey(char *module, struct job_record *job_ptr,
+extern int update_job_wckey(char *module, struct job_record *job_ptr,
char *new_wckey);
/* Reset nodes_completing field for all jobs */
@@ -1498,7 +1498,7 @@ extern void update_job_nodes_completing(void);
* uses common slurmctld_conf data structure */
extern void update_logging(void);
-/*
+/*
* update_node - update the configuration data for one or more nodes
* IN update_node_msg - update node request
* RET 0 or error code
@@ -1506,7 +1506,7 @@ extern void update_logging(void);
*/
extern int update_node ( update_node_msg_t * update_node_msg ) ;
-/*
+/*
* update_part - create or update a partition's configuration data
* IN part_desc - description of partition changes
* IN create_flag - create a new partition
@@ -1526,7 +1526,7 @@ extern int update_part (update_part_msg_t * part_desc, bool create_flag);
extern int validate_alloc_node(struct part_record *part_ptr, char* alloc_node);
/*
- * validate_group - validate that the submit uid is authorized to run in
+ * validate_group - validate that the submit uid is authorized to run in
* this partition
* IN part_ptr - pointer to a partition
* IN run_uid - user to run the job as
@@ -1535,16 +1535,16 @@ extern int validate_alloc_node(struct part_record *part_ptr, char* alloc_node);
extern int validate_group (struct part_record *part_ptr, uid_t run_uid);
/*
- * validate_jobs_on_node - validate that any jobs that should be on the node
- * are actually running, if not clean up the job records and/or node
- * records, call this function after validate_node_specs() sets the node
- * state properly
+ * validate_jobs_on_node - validate that any jobs that should be on the node
+ * are actually running, if not clean up the job records and/or node
+ * records, call this function after validate_node_specs() sets the node
+ * state properly
* IN reg_msg - node registration message
*/
extern void validate_jobs_on_node(slurm_node_registration_status_msg_t *reg_msg);
/*
- * validate_node_specs - validate the node's specifications as valid,
+ * validate_node_specs - validate the node's specifications as valid,
* if not set state to down, in any case update last_response
* IN reg_msg - node registration message
* RET 0 if no error, ENOENT if no such node, EINVAL if values too low
@@ -1564,7 +1564,7 @@ extern int validate_nodes_via_front_end(
slurm_node_registration_status_msg_t *reg_msg);
/*
- * validate_super_user - validate that the uid is authorized to see
+ * validate_super_user - validate that the uid is authorized to see
* privileged data (either user root or SlurmUser)
* IN uid - user to validate
* RET true if permitted to run, false otherwise
diff --git a/src/slurmctld/srun_comm.c b/src/slurmctld/srun_comm.c
index ee94432b8a8d7a65c31f0abb0a96f1769c427a24..2882f631ff5550685ab846a1847070f0b66f5af5 100644
--- a/src/slurmctld/srun_comm.c
+++ b/src/slurmctld/srun_comm.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -53,10 +53,10 @@
#define SRUN_LAUNCH_MSG 0
-/* Launch the srun request. Note that retry is always zero since
- * we don't want to clog the system up with messages destined for
- * defunct srun processes
- */
+/* Launch the srun request. Note that retry is always zero since
+ * we don't want to clog the system up with messages destined for
+ * defunct srun processes
+ */
static void _srun_agent_launch(slurm_addr *addr, char *host,
slurm_msg_type_t type, void *msg_args)
{
@@ -81,14 +81,14 @@ extern void srun_allocate (uint32_t job_id)
xassert(job_ptr);
if (job_ptr && job_ptr->alloc_resp_port && job_ptr->alloc_node &&
- job_ptr->resp_host && job_ptr->job_resrcs &&
+ job_ptr->resp_host && job_ptr->job_resrcs &&
job_ptr->job_resrcs->cpu_array_cnt) {
slurm_addr * addr;
resource_allocation_response_msg_t *msg_arg;
job_resources_t *job_resrcs_ptr = job_ptr->job_resrcs;
addr = xmalloc(sizeof(struct sockaddr_in));
- slurm_set_addr(addr, job_ptr->alloc_resp_port,
+ slurm_set_addr(addr, job_ptr->alloc_resp_port,
job_ptr->resp_host);
msg_arg = xmalloc(sizeof(resource_allocation_response_msg_t));
msg_arg->job_id = job_ptr->job_id;
@@ -96,19 +96,19 @@ extern void srun_allocate (uint32_t job_id)
msg_arg->num_cpu_groups = job_resrcs_ptr->cpu_array_cnt;
msg_arg->cpus_per_node = xmalloc(sizeof(uint16_t) *
job_resrcs_ptr->cpu_array_cnt);
- memcpy(msg_arg->cpus_per_node,
+ memcpy(msg_arg->cpus_per_node,
job_resrcs_ptr->cpu_array_value,
(sizeof(uint16_t) * job_resrcs_ptr->cpu_array_cnt));
msg_arg->cpu_count_reps = xmalloc(sizeof(uint32_t) *
job_resrcs_ptr->cpu_array_cnt);
- memcpy(msg_arg->cpu_count_reps,
+ memcpy(msg_arg->cpu_count_reps,
job_resrcs_ptr->cpu_array_reps,
(sizeof(uint32_t) * job_resrcs_ptr->cpu_array_cnt));
msg_arg->node_cnt = job_ptr->node_cnt;
msg_arg->select_jobinfo = select_g_select_jobinfo_copy(
job_ptr->select_jobinfo);
msg_arg->error_code = SLURM_SUCCESS;
- _srun_agent_launch(addr, job_ptr->alloc_node,
+ _srun_agent_launch(addr, job_ptr->alloc_node,
RESPONSE_RESOURCE_ALLOCATION, msg_arg);
}
}
@@ -129,7 +129,7 @@ extern void srun_allocate_abort(struct job_record *job_ptr)
msg_arg = xmalloc(sizeof(srun_timeout_msg_t));
msg_arg->job_id = job_ptr->job_id;
msg_arg->step_id = NO_VAL;
- _srun_agent_launch(addr, job_ptr->alloc_node,
+ _srun_agent_launch(addr, job_ptr->alloc_node,
SRUN_JOB_COMPLETE,
msg_arg);
}
@@ -163,7 +163,7 @@ extern void srun_node_fail (uint32_t job_id, char *node_name)
while ((step_ptr = (struct step_record *) list_next(step_iterator))) {
if (!bit_test(step_ptr->step_node_bitmap, bit_position))
continue; /* job step not on this node */
- if ( (step_ptr->port == 0) ||
+ if ( (step_ptr->port == 0) ||
(step_ptr->host == NULL) ||
(step_ptr->batch_step) ||
(step_ptr->host[0] == '\0') )
@@ -174,9 +174,9 @@ extern void srun_node_fail (uint32_t job_id, char *node_name)
msg_arg->job_id = job_ptr->job_id;
msg_arg->step_id = step_ptr->step_id;
msg_arg->nodelist = xstrdup(node_name);
- _srun_agent_launch(addr, step_ptr->host, SRUN_NODE_FAIL,
+ _srun_agent_launch(addr, step_ptr->host, SRUN_NODE_FAIL,
msg_arg);
- }
+ }
list_iterator_destroy(step_iterator);
if (job_ptr->other_port && job_ptr->alloc_node && job_ptr->resp_host) {
@@ -207,10 +207,10 @@ extern void srun_ping (void)
job_iterator = list_iterator_create(job_list);
while ((job_ptr = (struct job_record *) list_next(job_iterator))) {
xassert (job_ptr->magic == JOB_MAGIC);
-
+
if (!IS_JOB_RUNNING(job_ptr))
continue;
-
+
if ((job_ptr->time_last_active <= old) && job_ptr->other_port
&& job_ptr->alloc_node && job_ptr->resp_host) {
addr = xmalloc(sizeof(struct sockaddr_in));
@@ -237,11 +237,11 @@ extern void srun_timeout (struct job_record *job_ptr)
srun_timeout_msg_t *msg_arg;
ListIterator step_iterator;
struct step_record *step_ptr;
-
+
xassert(job_ptr);
if (!IS_JOB_RUNNING(job_ptr))
return;
-
+
if (job_ptr->other_port && job_ptr->alloc_node && job_ptr->resp_host) {
addr = xmalloc(sizeof(struct sockaddr_in));
slurm_set_addr(addr, job_ptr->other_port, job_ptr->resp_host);
@@ -256,7 +256,7 @@ extern void srun_timeout (struct job_record *job_ptr)
step_iterator = list_iterator_create(job_ptr->step_list);
while ((step_ptr = (struct step_record *) list_next(step_iterator))) {
- if ( (step_ptr->port == 0) ||
+ if ( (step_ptr->port == 0) ||
(step_ptr->host == NULL) ||
(step_ptr->batch_step) ||
(step_ptr->host[0] == '\0') )
@@ -267,9 +267,9 @@ extern void srun_timeout (struct job_record *job_ptr)
msg_arg->job_id = job_ptr->job_id;
msg_arg->step_id = step_ptr->step_id;
msg_arg->timeout = job_ptr->end_time;
- _srun_agent_launch(addr, step_ptr->host, SRUN_TIMEOUT,
+ _srun_agent_launch(addr, step_ptr->host, SRUN_TIMEOUT,
msg_arg);
- }
+ }
list_iterator_destroy(step_iterator);
}
@@ -310,14 +310,14 @@ extern void srun_job_complete (struct job_record *job_ptr)
struct step_record *step_ptr;
xassert(job_ptr);
-
+
if (job_ptr->other_port && job_ptr->alloc_node && job_ptr->resp_host) {
addr = xmalloc(sizeof(struct sockaddr_in));
slurm_set_addr(addr, job_ptr->other_port, job_ptr->resp_host);
msg_arg = xmalloc(sizeof(srun_job_complete_msg_t));
msg_arg->job_id = job_ptr->job_id;
msg_arg->step_id = NO_VAL;
- _srun_agent_launch(addr, job_ptr->alloc_node,
+ _srun_agent_launch(addr, job_ptr->alloc_node,
SRUN_JOB_COMPLETE, msg_arg);
}
@@ -326,7 +326,7 @@ extern void srun_job_complete (struct job_record *job_ptr)
if (step_ptr->batch_step) /* batch script itself */
continue;
srun_step_complete(step_ptr);
- }
+ }
list_iterator_destroy(step_iterator);
}
diff --git a/src/slurmctld/srun_comm.h b/src/slurmctld/srun_comm.h
index 70e06d31d90e41c8a60ed48bdf1fb6a999ddfd7a..346cf3eb8e71ea7a57d84c10eae6287980f34701 100644
--- a/src/slurmctld/srun_comm.h
+++ b/src/slurmctld/srun_comm.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/slurmctld/state_save.c b/src/slurmctld/state_save.c
index e8704899c8a184590fdbec48a0672025c8500841..f2c80411543b380058748fcb66e4a236af49e62e 100644
--- a/src/slurmctld/state_save.c
+++ b/src/slurmctld/state_save.c
@@ -1,37 +1,37 @@
/*****************************************************************************\
- * state_save.c - Keep saved slurmctld state current
+ * state_save.c - Keep saved slurmctld state current
*****************************************************************************
* Copyright (C) 2004-2007 The Regents of the University of California.
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -56,19 +56,19 @@ static int save_jobs = 0, save_nodes = 0, save_parts = 0;
static int save_triggers = 0, save_resv = 0;
static bool run_save_thread = true;
-/* fsync() and close() a file,
+/* fsync() and close() a file,
* Execute fsync() and close() multiple times if necessary and log failures
* RET 0 on success or -1 on error */
extern int fsync_and_close(int fd, char *file_type)
{
int rc = 0, retval, pos;
- /* SLURM state save files are typically stored on shared filesystems,
+ /* SLURM state save files are typically stored on shared filesystems,
* so lets give fysync() three tries to sync the data to disk. */
for (retval = 1, pos = 1; retval && pos < 4; pos++) {
retval = fsync(fd);
if (retval && (errno != EINTR)) {
- error("fsync() error writing %s state save file: %m",
+ error("fsync() error writing %s state save file: %m",
file_type);
}
}
@@ -78,7 +78,7 @@ extern int fsync_and_close(int fd, char *file_type)
for (retval = 1, pos = 1; retval && pos < 4; pos++) {
retval = close(fd);
if (retval && (errno != EINTR)) {
- error("close () error on %s state save file: %m",
+ error("close () error on %s state save file: %m",
file_type);
}
}
@@ -145,7 +145,7 @@ extern void shutdown_state_save(void)
/*
* Run as pthread to keep saving slurmctld state information as needed,
* Use schedule_job_save(), schedule_node_save(), and schedule_part_save()
- * to queue state save of each data structure
+ * to queue state save of each data structure
* no_data IN - unused
* RET - NULL
*/
@@ -157,7 +157,7 @@ extern void *slurmctld_state_save(void *no_data)
/* wait for work to perform */
slurm_mutex_lock(&state_save_lock);
while (1) {
- if (save_jobs + save_nodes + save_parts +
+ if (save_jobs + save_nodes + save_parts +
save_resv + save_triggers)
break; /* do the work */
else if (!run_save_thread) {
@@ -165,7 +165,7 @@ extern void *slurmctld_state_save(void *no_data)
slurm_mutex_unlock(&state_save_lock);
return NULL; /* shutdown */
} else /* wait for more work */
- pthread_cond_wait(&state_save_cond,
+ pthread_cond_wait(&state_save_cond,
&state_save_lock);
}
diff --git a/src/slurmctld/state_save.h b/src/slurmctld/state_save.h
index 92977f325eb7e66c0347b281f84326a831d4fcf2..8b70927fe7815e34f2cdd0099a44bf7324abb5f0 100644
--- a/src/slurmctld/state_save.h
+++ b/src/slurmctld/state_save.h
@@ -1,37 +1,37 @@
/*****************************************************************************\
- * state_save.h - Definitions for keeping saved slurmctld state current
+ * state_save.h - Definitions for keeping saved slurmctld state current
*****************************************************************************
* Copyright (C) 2004-2007 The Regents of the University of California.
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -40,7 +40,7 @@
#ifndef _SLURMCTLD_STATE_SAVE_H
#define _SLURMCTLD_STATE_SAVE_H
-/* fsync() and close() a file,
+/* fsync() and close() a file,
* Execute fsync() and close() multiple times if necessary and log failures
* RET 0 on success or -1 on error */
extern int fsync_and_close(int fd, char *file_type);
@@ -66,7 +66,7 @@ extern void shutdown_state_save(void);
/*
* Run as pthread to keep saving slurmctld state information as needed,
* Use schedule_job_save(), schedule_node_save(), schedule_part_save(),
- * schedule_trigger_save() to queue state save of each data structure
+ * schedule_trigger_save() to queue state save of each data structure
* no_data IN - unused
* RET - NULL
*/
diff --git a/src/slurmctld/step_mgr.c b/src/slurmctld/step_mgr.c
index 138efeed44f906f7bc7db9f4e77bc9e522d8e5e1..96c12e78e55453f8bfa442aa99631fa6f53dfe9e 100644
--- a/src/slurmctld/step_mgr.c
+++ b/src/slurmctld/step_mgr.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -77,7 +77,7 @@ static struct step_record * _create_step_record (struct job_record *job_ptr);
static void _dump_step_layout(struct step_record *step_ptr);
static void _free_step_rec(struct step_record *step_ptr);
static void _pack_ctld_job_step_info(struct step_record *step, Buf buffer);
-static bitstr_t * _pick_step_nodes (struct job_record *job_ptr,
+static bitstr_t * _pick_step_nodes (struct job_record *job_ptr,
job_step_create_request_msg_t *step_spec,
int cpus_per_task, bool batch_step,
int *return_code);
@@ -88,7 +88,7 @@ static int _step_hostname_to_inx(struct step_record *step_ptr,
static void _step_dealloc_lps(struct step_record *step_ptr);
-/*
+/*
* _create_step_record - create an empty step_record for the specified job.
* IN job_ptr - pointer to job table entry to have step record added
* RET a pointer to the record or NULL if error
@@ -124,15 +124,15 @@ static struct step_record * _create_step_record(struct job_record *job_ptr)
}
-/*
+/*
* delete_step_records - delete step record for specified job_ptr
* IN job_ptr - pointer to job table entry to have step records removed
* IN filter - determine which job steps to delete
* 0: delete all job steps
* 1: delete only job steps without a switch allocation
*/
-extern void
-delete_step_records (struct job_record *job_ptr, int filter)
+extern void
+delete_step_records (struct job_record *job_ptr, int filter)
{
ListIterator step_iterator;
struct step_record *step_ptr;
@@ -154,7 +154,7 @@ delete_step_records (struct job_record *job_ptr, int filter)
}
checkpoint_free_jobinfo(step_ptr->check_job);
_free_step_rec(step_ptr);
- }
+ }
list_iterator_destroy (step_iterator);
}
@@ -176,15 +176,15 @@ static void _free_step_rec(struct step_record *step_ptr)
xfree(step_ptr);
}
-/*
- * delete_step_record - delete record for job step for specified job_ptr
+/*
+ * delete_step_record - delete record for job step for specified job_ptr
* and step_id
* IN job_ptr - pointer to job table entry to have step record removed
* IN step_id - id of the desired job step
* RET 0 on success, errno otherwise
*/
-int
-delete_step_record (struct job_record *job_ptr, uint32_t step_id)
+int
+delete_step_record (struct job_record *job_ptr, uint32_t step_id)
{
ListIterator step_iterator;
struct step_record *step_ptr;
@@ -197,13 +197,13 @@ delete_step_record (struct job_record *job_ptr, uint32_t step_id)
while ((step_ptr = (struct step_record *) list_next (step_iterator))) {
if (step_ptr->step_id == step_id) {
list_remove (step_iterator);
-/* FIXME: If job step record is preserved after completion,
- * the switch_g_job_step_complete() must be called upon completion
- * and not upon record purging. Presently both events occur
+/* FIXME: If job step record is preserved after completion,
+ * the switch_g_job_step_complete() must be called upon completion
+ * and not upon record purging. Presently both events occur
* simultaneously. */
if (step_ptr->switch_job) {
switch_g_job_step_complete(
- step_ptr->switch_job,
+ step_ptr->switch_job,
step_ptr->step_layout->node_list);
switch_free_jobinfo (step_ptr->switch_job);
}
@@ -213,7 +213,7 @@ delete_step_record (struct job_record *job_ptr, uint32_t step_id)
error_code = 0;
break;
}
- }
+ }
list_iterator_destroy (step_iterator);
return error_code;
@@ -227,13 +227,13 @@ delete_step_record (struct job_record *job_ptr, uint32_t step_id)
void
dump_step_desc(job_step_create_request_msg_t *step_spec)
{
- debug3("StepDesc: user_id=%u job_id=%u node_count=%u cpu_count=%u",
- step_spec->user_id, step_spec->job_id,
+ debug3("StepDesc: user_id=%u job_id=%u node_count=%u cpu_count=%u",
+ step_spec->user_id, step_spec->job_id,
step_spec->node_count, step_spec->cpu_count);
- debug3(" num_tasks=%u relative=%u task_dist=%u node_list=%s",
- step_spec->num_tasks, step_spec->relative,
+ debug3(" num_tasks=%u relative=%u task_dist=%u node_list=%s",
+ step_spec->num_tasks, step_spec->relative,
step_spec->task_dist, step_spec->node_list);
- debug3(" host=%s port=%u name=%s network=%s exclusive=%u",
+ debug3(" host=%s port=%u name=%s network=%s exclusive=%u",
step_spec->host, step_spec->port, step_spec->name,
step_spec->network, step_spec->exclusive);
debug3(" checkpoint-dir=%s checkpoint_int=%u",
@@ -246,15 +246,15 @@ dump_step_desc(job_step_create_request_msg_t *step_spec)
}
-/*
- * find_step_record - return a pointer to the step record with the given
+/*
+ * find_step_record - return a pointer to the step record with the given
* job_id and step_id
* IN job_ptr - pointer to job table entry to have step record added
* IN step_id - id of the desired job step or NO_VAL for first one
* RET pointer to the job step's record, NULL on error
*/
struct step_record *
-find_step_record(struct job_record *job_ptr, uint32_t step_id)
+find_step_record(struct job_record *job_ptr, uint32_t step_id)
{
ListIterator step_iterator;
struct step_record *step_ptr;
@@ -266,24 +266,24 @@ find_step_record(struct job_record *job_ptr, uint32_t step_id)
while ((step_ptr = (struct step_record *) list_next (step_iterator))) {
if ((step_ptr->step_id == step_id) || (step_id == NO_VAL))
break;
- }
+ }
list_iterator_destroy (step_iterator);
return step_ptr;
}
-/*
+/*
* job_step_signal - signal the specified job step
* IN job_id - id of the job to be cancelled
* IN step_id - id of the job step to be cancelled
* IN signal - user id of user issuing the RPC
* IN uid - user id of user issuing the RPC
- * RET 0 on success, otherwise ESLURM error code
+ * RET 0 on success, otherwise ESLURM error code
* global: job_list - pointer global job list
* last_job_update - time of last job table update
*/
-int job_step_signal(uint32_t job_id, uint32_t step_id,
+int job_step_signal(uint32_t job_id, uint32_t step_id,
uint16_t signal, uid_t uid)
{
struct job_record *job_ptr;
@@ -316,7 +316,7 @@ int job_step_signal(uint32_t job_id, uint32_t step_id,
job_id, step_id);
return ESLURM_INVALID_JOB_ID;
}
-
+
/* save user ID of the one who requested the job be cancelled */
if (signal == SIGKILL) {
step_ptr->requid = uid;
@@ -339,7 +339,7 @@ void signal_step_tasks(struct step_record *step_ptr, uint16_t signal,
int i;
kill_tasks_msg_t *kill_tasks_msg;
agent_arg_t *agent_args = NULL;
-
+
xassert(step_ptr);
agent_args = xmalloc(sizeof(agent_arg_t));
agent_args->msg_type = msg_type;
@@ -349,7 +349,7 @@ void signal_step_tasks(struct step_record *step_ptr, uint16_t signal,
kill_tasks_msg->job_id = step_ptr->job_ptr->job_id;
kill_tasks_msg->job_step_id = step_ptr->step_id;
kill_tasks_msg->signal = signal;
-
+
for (i = 0; i < node_record_count; i++) {
if (bit_test(step_ptr->step_node_bitmap, i) == 0)
continue;
@@ -374,14 +374,14 @@ void signal_step_tasks(struct step_record *step_ptr, uint16_t signal,
}
-/*
+/*
* job_step_complete - note normal completion the specified job step
* IN job_id - id of the job to be completed
* IN step_id - id of the job step to be completed
* IN uid - user id of user issuing the RPC
* IN requeue - job should be run again if possible
* IN job_return_code - job's return code, if set then set state to JOB_FAILED
- * RET 0 on success, otherwise ESLURM error code
+ * RET 0 on success, otherwise ESLURM error code
* global: job_list - pointer global job list
* last_job_update - time of last job table update
*/
@@ -405,7 +405,7 @@ int job_step_complete(uint32_t job_id, uint32_t step_id, uid_t uid,
}
step_ptr = find_step_record(job_ptr, step_id);
- if (step_ptr == NULL)
+ if (step_ptr == NULL)
return ESLURM_INVALID_JOB_ID;
jobacct_storage_g_step_complete(acct_db_conn, step_ptr);
@@ -413,7 +413,7 @@ int job_step_complete(uint32_t job_id, uint32_t step_id, uid_t uid,
if ((job_ptr->kill_on_step_done)
&& (list_count(job_ptr->step_list) <= 1)
- && (!IS_JOB_FINISHED(job_ptr)))
+ && (!IS_JOB_FINISHED(job_ptr)))
return job_complete(job_id, uid, requeue, job_return_code);
last_job_update = time(NULL);
@@ -426,7 +426,7 @@ int job_step_complete(uint32_t job_id, uint32_t step_id, uid_t uid,
return SLURM_SUCCESS;
}
-/*
+/*
* _pick_step_nodes - select nodes for a job step that satisfy its requirements
* we satisfy the super-set of constraints.
* IN job_ptr - pointer to job to have new step started
@@ -439,7 +439,7 @@ int job_step_complete(uint32_t job_id, uint32_t step_id, uid_t uid,
* NOTE: returned bitmap must be freed by the caller using bit_free()
*/
static bitstr_t *
-_pick_step_nodes (struct job_record *job_ptr,
+_pick_step_nodes (struct job_record *job_ptr,
job_step_create_request_msg_t *step_spec,
int cpus_per_task,
bool batch_step, int *return_code)
@@ -462,7 +462,7 @@ _pick_step_nodes (struct job_record *job_ptr,
*return_code = ESLURM_REQUESTED_NODE_CONFIG_UNAVAILABLE;
return NULL;
}
-
+
nodes_avail = bit_copy (job_ptr->node_bitmap);
if (nodes_avail == NULL)
fatal("bit_copy malloc failure");
@@ -481,21 +481,21 @@ _pick_step_nodes (struct job_record *job_ptr,
*return_code = ESLURM_PROLOG_RUNNING;
return NULL;
}
- for (i=bit_ffs(job_ptr->node_bitmap); i<node_record_count;
+ for (i=bit_ffs(job_ptr->node_bitmap); i<node_record_count;
i++) {
if (!bit_test(job_ptr->node_bitmap, i))
continue;
node_ptr = node_record_table_ptr + i;
if (IS_NODE_POWER_SAVE(node_ptr) ||
- IS_NODE_NO_RESPOND(node_ptr)) {
- /* Node is/was powered down. Need to wait
+ IS_NODE_NO_RESPOND(node_ptr)) {
+ /* Node is/was powered down. Need to wait
* for it to start responding again. */
FREE_NULL_BITMAP(nodes_avail);
*return_code = ESLURM_NODES_BUSY;
/* Update job's end-time to allow for node
* boot time. */
if (job_ptr->time_limit != INFINITE) {
- job_ptr->end_time = time(NULL) +
+ job_ptr->end_time = time(NULL) +
(job_ptr->time_limit * 60);
}
return NULL;
@@ -506,7 +506,7 @@ _pick_step_nodes (struct job_record *job_ptr,
}
/* In exclusive mode, just satisfy the processor count.
- * Do not use nodes that have no unused CPUs or insufficient
+ * Do not use nodes that have no unused CPUs or insufficient
* unused memory */
if (step_spec->exclusive) {
int avail_cpus, avail_tasks, total_cpus, total_tasks, node_inx;
@@ -517,7 +517,7 @@ _pick_step_nodes (struct job_record *job_ptr,
bitstr_t *selected_nodes = NULL;
if (step_spec->node_list) {
- error_code = node_name2bitmap(step_spec->node_list,
+ error_code = node_name2bitmap(step_spec->node_list,
false,
&selected_nodes);
if (error_code) {
@@ -551,7 +551,7 @@ _pick_step_nodes (struct job_record *job_ptr,
node_inx++;
if (!bit_test(nodes_avail, i))
continue; /* node now DOWN */
- avail_cpus = job_resrcs_ptr->cpus[node_inx] -
+ avail_cpus = job_resrcs_ptr->cpus[node_inx] -
job_resrcs_ptr->cpus_used[node_inx];
total_cpus = job_resrcs_ptr->cpus[node_inx];
if (cpus_per_task > 0) {
@@ -611,7 +611,7 @@ _pick_step_nodes (struct job_record *job_ptr,
if (step_spec->mem_per_cpu) {
int node_inx = 0, usable_mem;
- for (i=bit_ffs(job_resrcs_ptr->node_bitmap); i<node_record_count;
+ for (i=bit_ffs(job_resrcs_ptr->node_bitmap); i<node_record_count;
i++) {
if (!bit_test(job_resrcs_ptr->node_bitmap, i))
continue;
@@ -623,7 +623,7 @@ _pick_step_nodes (struct job_record *job_ptr,
if (task_cnt <= 0) {
if (step_spec->node_count == INFINITE) {
FREE_NULL_BITMAP(nodes_avail);
- *return_code =
+ *return_code =
ESLURM_INVALID_TASK_MEMORY;
return NULL;
}
@@ -632,7 +632,7 @@ _pick_step_nodes (struct job_record *job_ptr,
task_cnt = job_resrcs_ptr->
memory_allocated[node_inx] /
step_spec->mem_per_cpu;
- mem_blocked_cpus += MIN(task_cnt,
+ mem_blocked_cpus += MIN(task_cnt,
job_resrcs_ptr->
cpus[node_inx]);
}
@@ -648,18 +648,18 @@ _pick_step_nodes (struct job_record *job_ptr,
bitstr_t *selected_nodes = NULL;
if (slurm_get_debug_flags() & DEBUG_FLAG_STEPS)
info("selected nodelist is %s", step_spec->node_list);
- error_code = node_name2bitmap(step_spec->node_list, false,
+ error_code = node_name2bitmap(step_spec->node_list, false,
&selected_nodes);
-
+
if (error_code) {
- info("_pick_step_nodes: invalid node list %s",
+ info("_pick_step_nodes: invalid node list %s",
step_spec->node_list);
bit_free(selected_nodes);
goto cleanup;
}
if (!bit_super_set(selected_nodes, job_ptr->node_bitmap)) {
info ("_pick_step_nodes: requested nodes %s not part "
- "of job %u",
+ "of job %u",
step_spec->node_list, job_ptr->job_id);
bit_free(selected_nodes);
goto cleanup;
@@ -677,7 +677,7 @@ _pick_step_nodes (struct job_record *job_ptr,
* sure we aren't running on an elan switch.
* If we aren't change the number of nodes
* available to the number we were given since
- * that is what the user wants to run on.
+ * that is what the user wants to run on.
*/
if (!strcmp(slurmctld_conf.switch_type,
"switch/elan")) {
@@ -697,14 +697,14 @@ _pick_step_nodes (struct job_record *job_ptr,
if (selected_nodes) {
/* use selected nodes to run the job and
* make them unavailable for future use */
-
+
/* If we have selected more than we requested
* make the available nodes equal to the
* selected nodes and we will pick from that
* list later on in the function.
* Other than that copy the nodes selected as
* the nodes we want.
- */
+ */
if (step_spec->node_count &&
(bit_set_count(selected_nodes) >
step_spec->node_count)) {
@@ -727,12 +727,12 @@ _pick_step_nodes (struct job_record *job_ptr,
if (nodes_picked == NULL)
fatal("bit_alloc malloc failure");
}
-
+
if (step_spec->relative != (uint16_t)NO_VAL) {
- /* Remove first (step_spec->relative) nodes from
+ /* Remove first (step_spec->relative) nodes from
* available list */
bitstr_t *relative_nodes = NULL;
- relative_nodes =
+ relative_nodes =
bit_pick_cnt(nodes_avail, step_spec->relative);
if (relative_nodes == NULL) {
info ("_pick_step_nodes: "
@@ -747,7 +747,7 @@ _pick_step_nodes (struct job_record *job_ptr,
nodes_idle = bit_alloc (bit_size (nodes_avail) );
if (nodes_idle == NULL)
fatal("bit_alloc malloc failure");
- step_iterator =
+ step_iterator =
list_iterator_create(job_ptr->step_list);
while ((step_p = (struct step_record *)
list_next(step_iterator))) {
@@ -756,11 +756,11 @@ _pick_step_nodes (struct job_record *job_ptr,
char *temp;
temp = bitmap2node_name(step_p->
step_node_bitmap);
- info("step %u.%u has nodes %s",
+ info("step %u.%u has nodes %s",
job_ptr->job_id, step_p->step_id, temp);
xfree(temp);
}
- }
+ }
list_iterator_destroy (step_iterator);
bit_not(nodes_idle);
bit_and(nodes_idle, nodes_avail);
@@ -770,22 +770,22 @@ _pick_step_nodes (struct job_record *job_ptr,
char *temp1, *temp2;
temp1 = bitmap2node_name(nodes_avail);
temp2 = bitmap2node_name(nodes_idle);
- info("step pick %u nodes, avail:%s idle:%s",
+ info("step pick %u nodes, avail:%s idle:%s",
step_spec->node_count, temp1, temp2);
xfree(temp1);
xfree(temp2);
}
- /* if user specifies step needs a specific processor count and
+ /* if user specifies step needs a specific processor count and
* all nodes have the same processor count, just translate this to
* a node count */
- if (step_spec->cpu_count && job_ptr->job_resrcs &&
+ if (step_spec->cpu_count && job_ptr->job_resrcs &&
(job_ptr->job_resrcs->cpu_array_cnt == 1) &&
(job_ptr->job_resrcs->cpu_array_value)) {
i = (step_spec->cpu_count +
(job_ptr->job_resrcs->cpu_array_value[0] - 1)) /
job_ptr->job_resrcs->cpu_array_value[0];
- step_spec->node_count = (i > step_spec->node_count) ?
+ step_spec->node_count = (i > step_spec->node_count) ?
i : step_spec->node_count ;
//step_spec->cpu_count = 0;
}
@@ -793,7 +793,7 @@ _pick_step_nodes (struct job_record *job_ptr,
if (step_spec->node_count) {
nodes_picked_cnt = bit_set_count(nodes_picked);
if (slurm_get_debug_flags() & DEBUG_FLAG_STEPS) {
- verbose("got %u %d", step_spec->node_count,
+ verbose("got %u %d", step_spec->node_count,
nodes_picked_cnt);
}
if (nodes_idle &&
@@ -813,15 +813,15 @@ _pick_step_nodes (struct job_record *job_ptr,
nodes_picked_cnt = step_spec->node_count;
}
if (step_spec->node_count > nodes_picked_cnt) {
- node_tmp = bit_pick_cnt(nodes_avail,
- (step_spec->node_count -
+ node_tmp = bit_pick_cnt(nodes_avail,
+ (step_spec->node_count -
nodes_picked_cnt));
if (node_tmp == NULL) {
- if (step_spec->node_count <=
+ if (step_spec->node_count <=
(bit_set_count(nodes_avail) +
- nodes_picked_cnt +
+ nodes_picked_cnt +
mem_blocked_nodes)) {
- *return_code =
+ *return_code =
ESLURM_INVALID_TASK_MEMORY;
}
goto cleanup;
@@ -834,14 +834,14 @@ _pick_step_nodes (struct job_record *job_ptr,
nodes_picked_cnt = step_spec->node_count;
}
}
-
+
if (step_spec->cpu_count) {
/* make sure the selected nodes have enough cpus */
cpus_picked_cnt = _count_cpus(nodes_picked);
/* user is requesting more cpus than we got from the
* picked nodes we should return with an error */
if (step_spec->cpu_count > cpus_picked_cnt) {
- if (step_spec->cpu_count <=
+ if (step_spec->cpu_count <=
(cpus_picked_cnt + mem_blocked_cpus)) {
*return_code = ESLURM_INVALID_TASK_MEMORY;
}
@@ -853,7 +853,7 @@ _pick_step_nodes (struct job_record *job_ptr,
goto cleanup;
}
}
-
+
FREE_NULL_BITMAP(nodes_avail);
FREE_NULL_BITMAP(nodes_idle);
return nodes_picked;
@@ -868,7 +868,7 @@ cleanup:
}
/*
- * _count_cpus - report how many cpus are associated with the identified nodes
+ * _count_cpus - report how many cpus are associated with the identified nodes
* IN bitmap - map of nodes to tally
* RET cpu count
* globals: node_record_count - number of nodes configured
@@ -891,10 +891,10 @@ static int _count_cpus(bitstr_t *bitmap)
}
/* Update the step's core bitmaps, create as needed.
- * Add the specified task count for a specific node in the job's
+ * Add the specified task count for a specific node in the job's
* and step's allocation */
-static void _pick_step_cores(struct step_record *step_ptr,
- job_resources_t *job_resrcs_ptr,
+static void _pick_step_cores(struct step_record *step_ptr,
+ job_resources_t *job_resrcs_ptr,
int job_node_inx, uint16_t task_cnt)
{
int bit_offset, core_inx, i, sock_inx;
@@ -922,7 +922,7 @@ static void _pick_step_cores(struct step_record *step_ptr,
for (sock_inx=0; sock_inx<sockets; sock_inx++) {
bit_offset = get_job_resources_offset(job_resrcs_ptr,
job_node_inx,
- sock_inx,
+ sock_inx,
core_inx);
if (bit_offset < 0)
fatal("get_job_resources_offset");
@@ -934,7 +934,7 @@ static void _pick_step_cores(struct step_record *step_ptr,
bit_set(job_resrcs_ptr->core_bitmap_used, bit_offset);
bit_set(step_ptr->core_bitmap_job, bit_offset);
#if 0
- info("step alloc N:%d S:%dC :%d",
+ info("step alloc N:%d S:%dC :%d",
job_node_inx, sock_inx, core_inx);
#endif
if (--cpu_cnt == 0)
@@ -954,7 +954,7 @@ static void _pick_step_cores(struct step_record *step_ptr,
for (sock_inx=0; sock_inx<sockets; sock_inx++) {
bit_offset = get_job_resources_offset(job_resrcs_ptr,
job_node_inx,
- sock_inx,
+ sock_inx,
core_inx);
if (bit_offset < 0)
fatal("get_job_resources_offset");
@@ -964,7 +964,7 @@ static void _pick_step_cores(struct step_record *step_ptr,
continue; /* already taken by this step */
bit_set(step_ptr->core_bitmap_job, bit_offset);
#if 0
- info("step alloc N:%d S:%dC :%d",
+ info("step alloc N:%d S:%dC :%d",
job_node_inx, sock_inx, core_inx);
#endif
if (--cpu_cnt == 0)
@@ -1034,13 +1034,13 @@ extern void step_alloc_lps(struct step_record *step_ptr)
* cpus_used[] having a higher value than cpus[] */
cpus_alloc = step_ptr->step_layout->tasks[step_node_inx] *
step_ptr->cpus_per_task;
- job_resrcs_ptr->cpus_used[job_node_inx] += cpus_alloc;
+ job_resrcs_ptr->cpus_used[job_node_inx] += cpus_alloc;
if (step_ptr->mem_per_cpu) {
- job_resrcs_ptr->memory_used[job_node_inx] +=
+ job_resrcs_ptr->memory_used[job_node_inx] +=
(step_ptr->mem_per_cpu * cpus_alloc);
}
if (pick_step_cores) {
- _pick_step_cores(step_ptr, job_resrcs_ptr,
+ _pick_step_cores(step_ptr, job_resrcs_ptr,
job_node_inx,
step_ptr->step_layout->
tasks[step_node_inx]);
@@ -1048,7 +1048,7 @@ extern void step_alloc_lps(struct step_record *step_ptr)
if (slurm_get_debug_flags() & DEBUG_FLAG_CPU_BIND)
_dump_step_layout(step_ptr);
if (slurm_get_debug_flags() & DEBUG_FLAG_STEPS) {
- info("step alloc of %s procs: %u of %u",
+ info("step alloc of %s procs: %u of %u",
node_record_table_ptr[i_node].name,
job_resrcs_ptr->cpus_used[job_node_inx],
job_resrcs_ptr->cpus[job_node_inx]);
@@ -1056,11 +1056,11 @@ extern void step_alloc_lps(struct step_record *step_ptr)
if (step_node_inx == (step_ptr->step_layout->node_cnt - 1))
break;
}
-
+
}
/* Dump a job step's CPU binding information.
- * NOTE: The core_bitmap_job and node index are based upon
+ * NOTE: The core_bitmap_job and node index are based upon
* the _job_ allocation */
static void _dump_step_layout(struct step_record *step_ptr)
{
@@ -1076,18 +1076,18 @@ static void _dump_step_layout(struct step_record *step_ptr)
info("step_id:%u.%u", job_ptr->job_id, step_ptr->step_id);
for (i=0, bit_inx= 0, node_inx=0; node_inx<job_resrcs_ptr->nhosts; i++) {
for (rep=0; rep<job_resrcs_ptr->sock_core_rep_count[i]; rep++) {
- for (sock_inx=0;
- sock_inx<job_resrcs_ptr->sockets_per_node[i];
+ for (sock_inx=0;
+ sock_inx<job_resrcs_ptr->sockets_per_node[i];
sock_inx++) {
- for (core_inx=0;
- core_inx<job_resrcs_ptr->cores_per_socket[i];
+ for (core_inx=0;
+ core_inx<job_resrcs_ptr->cores_per_socket[i];
core_inx++) {
if (bit_test(step_ptr->
- core_bitmap_job,
+ core_bitmap_job,
bit_inx++)) {
info("JobNode[%d] Socket[%d] "
"Core[%d] is allocated",
- node_inx, sock_inx,
+ node_inx, sock_inx,
core_inx);
}
}
@@ -1147,7 +1147,7 @@ static void _step_dealloc_lps(struct step_record *step_ptr)
if (step_ptr->mem_per_cpu) {
uint32_t mem_use = step_ptr->mem_per_cpu * cpus_alloc;
if (job_resrcs_ptr->memory_used[job_node_inx] >= mem_use) {
- job_resrcs_ptr->memory_used[job_node_inx] -=
+ job_resrcs_ptr->memory_used[job_node_inx] -=
mem_use;
} else {
error("_step_dealloc_lps: "
@@ -1157,7 +1157,7 @@ static void _step_dealloc_lps(struct step_record *step_ptr)
}
}
if (slurm_get_debug_flags() & DEBUG_FLAG_STEPS) {
- info("step dealloc of %s procs: %u of %u",
+ info("step dealloc of %s procs: %u of %u",
node_record_table_ptr[i_node].name,
job_resrcs_ptr->cpus_used[job_node_inx],
job_resrcs_ptr->cpus[job_node_inx]);
@@ -1192,7 +1192,7 @@ static void _step_dealloc_lps(struct step_record *step_ptr)
* the job.
*/
extern int
-step_create(job_step_create_request_msg_t *step_specs,
+step_create(job_step_create_request_msg_t *step_specs,
struct step_record** new_step_record,
bool kill_job_when_step_done, bool batch_step)
{
@@ -1221,7 +1221,7 @@ step_create(job_step_create_request_msg_t *step_specs,
return ESLURM_DUPLICATE_JOB_ID;
}
- /* NOTE: We have already confirmed the UID originating
+ /* NOTE: We have already confirmed the UID originating
* the request is identical with step_specs->user_id */
if (step_specs->user_id != job_ptr->user_id)
return ESLURM_ACCESS_DENIED ;
@@ -1229,11 +1229,11 @@ step_create(job_step_create_request_msg_t *step_specs,
if (batch_step) {
info("user %u attempting to run batch script within "
"an existing job", step_specs->user_id);
- /* This seems hazardous to allow, but LSF seems to
- * work this way, so don't treat it as an error. */
+ /* This seems hazardous to allow, but LSF seems to
+ * work this way, so don't treat it as an error. */
}
- if (IS_JOB_FINISHED(job_ptr) ||
+ if (IS_JOB_FINISHED(job_ptr) ||
(job_ptr->end_time <= time(NULL)))
return ESLURM_ALREADY_DONE;
@@ -1252,15 +1252,15 @@ step_create(job_step_create_request_msg_t *step_specs,
return ESLURM_TASKDIST_ARBITRARY_UNSUPPORTED;
}
- if ((step_specs->host &&
+ if ((step_specs->host &&
(strlen(step_specs->host) > MAX_STR_LEN)) ||
- (step_specs->node_list &&
+ (step_specs->node_list &&
(strlen(step_specs->node_list) > MAX_STR_LEN)) ||
- (step_specs->network &&
+ (step_specs->network &&
(strlen(step_specs->network) > MAX_STR_LEN)) ||
- (step_specs->name &&
+ (step_specs->name &&
(strlen(step_specs->name) > MAX_STR_LEN)) ||
- (step_specs->ckpt_dir &&
+ (step_specs->ckpt_dir &&
(strlen(step_specs->ckpt_dir) > MAX_STR_LEN)))
return ESLURM_PATHNAME_TOO_LONG;
@@ -1268,10 +1268,10 @@ step_create(job_step_create_request_msg_t *step_specs,
* which makes it so we don't check to see the available cpus
*/
orig_cpu_count = step_specs->cpu_count;
-
+
if (step_specs->overcommit) {
if (step_specs->exclusive) {
- /* Not really a legitimate combination, try to
+ /* Not really a legitimate combination, try to
* exclusively allocate one CPU per task */
step_specs->overcommit = 0;
step_specs->cpu_count = step_specs->num_tasks;
@@ -1285,7 +1285,7 @@ step_create(job_step_create_request_msg_t *step_specs,
/* we set cpus_per_task to 0 if we can't spread them evenly
over the nodes (hetergeneous systems) */
- if (!step_specs->cpu_count
+ if (!step_specs->cpu_count
|| (step_specs->cpu_count % step_specs->num_tasks))
cpus_per_task = 0;
else {
@@ -1315,10 +1315,10 @@ step_create(job_step_create_request_msg_t *step_specs,
else
step_specs->num_tasks = node_count;
}
-
+
if (step_specs->num_tasks >
(node_count*slurmctld_conf.max_tasks_per_node)) {
- error("step has invalid task count: %u",
+ error("step has invalid task count: %u",
step_specs->num_tasks);
bit_free(nodeset);
return ESLURM_BAD_TASK_COUNT;
@@ -1349,11 +1349,11 @@ step_create(job_step_create_request_msg_t *step_specs,
step_specs->node_list, step_specs->node_count);
}
step_ptr->step_node_bitmap = nodeset;
-
+
switch(step_specs->task_dist) {
- case SLURM_DIST_CYCLIC:
- case SLURM_DIST_CYCLIC_CYCLIC:
- case SLURM_DIST_CYCLIC_BLOCK:
+ case SLURM_DIST_CYCLIC:
+ case SLURM_DIST_CYCLIC_CYCLIC:
+ case SLURM_DIST_CYCLIC_BLOCK:
step_ptr->cyclic_alloc = 1;
break;
default:
@@ -1374,7 +1374,7 @@ step_create(job_step_create_request_msg_t *step_specs,
step_ptr->ckpt_dir = xstrdup(step_specs->ckpt_dir);
step_ptr->no_kill = step_specs->no_kill;
- /* step's name and network default to job's values if not
+ /* step's name and network default to job's values if not
* specified in the step specification */
if (step_specs->name && step_specs->name[0])
step_ptr->name = xstrdup(step_specs->name);
@@ -1384,7 +1384,7 @@ step_create(job_step_create_request_msg_t *step_specs,
step_ptr->network = xstrdup(step_specs->network);
else
step_ptr->network = xstrdup(job_ptr->network);
-
+
/* the step time_limit is recorded as submitted (INFINITE
* or partition->max_time by default), but the allocation
* time limits may cut it short */
@@ -1406,10 +1406,10 @@ step_create(job_step_create_request_msg_t *step_specs,
}
step_ptr->time_limit = step_specs->time_limit;
}
-
+
/* a batch script does not need switch info */
if (!batch_step) {
- step_ptr->step_layout =
+ step_ptr->step_layout =
step_layout_create(step_ptr,
step_node_list,
step_specs->node_count,
@@ -1427,10 +1427,10 @@ step_create(job_step_create_request_msg_t *step_specs,
if ((step_specs->resv_port_cnt != (uint16_t) NO_VAL) &&
(step_specs->resv_port_cnt == 0)) {
- /* reserved port count set to maximum task count on
+ /* reserved port count set to maximum task count on
* any node plus one */
for (i=0; i<step_ptr->step_layout->node_cnt; i++) {
- step_specs->resv_port_cnt =
+ step_specs->resv_port_cnt =
MAX(step_specs->resv_port_cnt,
step_ptr->step_layout->tasks[i]);
}
@@ -1440,7 +1440,7 @@ step_create(job_step_create_request_msg_t *step_specs,
step_ptr->resv_port_cnt = step_specs->resv_port_cnt;
i = resv_port_alloc(step_ptr);
if (i != SLURM_SUCCESS) {
- delete_step_record (job_ptr,
+ delete_step_record (job_ptr,
step_ptr->step_id);
return i;
}
@@ -1448,10 +1448,10 @@ step_create(job_step_create_request_msg_t *step_specs,
if (switch_alloc_jobinfo (&step_ptr->switch_job) < 0)
fatal ("step_create: switch_alloc_jobinfo error");
-
- if (switch_build_jobinfo(step_ptr->switch_job,
+
+ if (switch_build_jobinfo(step_ptr->switch_job,
step_ptr->step_layout->node_list,
- step_ptr->step_layout->tasks,
+ step_ptr->step_layout->tasks,
step_ptr->cyclic_alloc,
step_ptr->network) < 0) {
error("switch_build_jobinfo: %m");
@@ -1516,7 +1516,7 @@ extern slurm_step_layout_t *step_layout_create(struct step_record *step_ptr,
} else
usable_cpus = job_resrcs_ptr->cpus[pos];
if (step_ptr->mem_per_cpu) {
- usable_mem =
+ usable_mem =
job_resrcs_ptr->memory_allocated[pos]-
job_resrcs_ptr->memory_used[pos];
usable_mem /= step_ptr->mem_per_cpu;
@@ -1526,13 +1526,13 @@ extern slurm_step_layout_t *step_layout_create(struct step_record *step_ptr,
error("step_layout_create no usable cpus");
return NULL;
}
- debug3("step_layout cpus = %d pos = %d",
+ debug3("step_layout cpus = %d pos = %d",
usable_cpus, pos);
-
+
if ((cpu_inx == -1) ||
(cpus_per_node[cpu_inx] != usable_cpus)) {
cpu_inx++;
-
+
cpus_per_node[cpu_inx] = usable_cpus;
cpu_count_reps[cpu_inx] = 1;
} else
@@ -1572,7 +1572,7 @@ extern slurm_step_layout_t *step_layout_create(struct step_record *step_ptr,
/* layout the tasks on the nodes */
return slurm_step_layout_create(step_node_list,
- cpus_per_node, cpu_count_reps,
+ cpus_per_node, cpu_count_reps,
node_count, num_tasks,
cpus_per_task,
task_dist,
@@ -1591,10 +1591,10 @@ static void _pack_ctld_job_step_info(struct step_record *step_ptr, Buf buffer)
if (step_ptr->step_layout) {
task_cnt = step_ptr->step_layout->task_cnt;
- node_list = step_ptr->step_layout->node_list;
+ node_list = step_ptr->step_layout->node_list;
} else {
task_cnt = step_ptr->job_ptr->num_procs;
- node_list = step_ptr->job_ptr->nodes;
+ node_list = step_ptr->job_ptr->nodes;
}
pack32(step_ptr->job_ptr->job_id, buffer);
pack32(step_ptr->step_id, buffer);
@@ -1628,21 +1628,21 @@ static void _pack_ctld_job_step_info(struct step_record *step_ptr, Buf buffer)
packstr(step_ptr->network, buffer);
pack_bit_fmt(step_ptr->step_node_bitmap, buffer);
packstr(step_ptr->ckpt_dir, buffer);
-
+
}
-/*
+/*
* pack_ctld_job_step_info_response_msg - packs job step info
* IN job_id - specific id or NO_VAL for all
* IN step_id - specific id or NO_VAL for all
* IN uid - user issuing request
* IN show_flags - job step filtering options
- * OUT buffer - location to store data, pointers automatically advanced
+ * OUT buffer - location to store data, pointers automatically advanced
* RET - 0 or error code
* NOTE: MUST free_buf buffer
*/
extern int pack_ctld_job_step_info_response_msg(
- uint32_t job_id, uint32_t step_id, uid_t uid,
+ uint32_t job_id, uint32_t step_id, uid_t uid,
uint16_t show_flags, Buf buffer)
{
ListIterator job_iterator;
@@ -1661,25 +1661,25 @@ extern int pack_ctld_job_step_info_response_msg(
job_iterator = list_iterator_create(job_list);
while ((job_ptr = list_next(job_iterator))) {
- if ((job_id != NO_VAL) && (job_ptr->job_id != job_id))
+ if ((job_id != NO_VAL) && (job_ptr->job_id != job_id))
continue;
- if (((show_flags & SHOW_ALL) == 0)
+ if (((show_flags & SHOW_ALL) == 0)
&& (job_ptr->part_ptr)
&& (job_ptr->part_ptr->hidden))
continue;
-
+
if ((slurmctld_conf.private_data & PRIVATE_DATA_JOBS)
- && (job_ptr->user_id != uid)
+ && (job_ptr->user_id != uid)
&& !validate_super_user(uid))
continue;
-
+
valid_job = 1;
step_iterator = list_iterator_create(job_ptr->step_list);
while ((step_ptr = list_next(step_iterator))) {
- if ((step_id != NO_VAL)
- && (step_ptr->step_id != step_id))
+ if ((step_id != NO_VAL)
+ && (step_ptr->step_id != step_id))
continue;
_pack_ctld_job_step_info(step_ptr, buffer);
steps_packed++;
@@ -1687,7 +1687,7 @@ extern int pack_ctld_job_step_info_response_msg(
list_iterator_destroy(step_iterator);
}
list_iterator_destroy(job_iterator);
-
+
if(list_count(job_list) && !valid_job && !steps_packed)
error_code = ESLURM_INVALID_JOB_ID;
@@ -1703,7 +1703,7 @@ extern int pack_ctld_job_step_info_response_msg(
return error_code;
}
-/*
+/*
* kill_step_on_node - determine if the specified job has any job steps
* allocated to the specified node and kill them unless no_kill flag
* is set on the step
@@ -1711,7 +1711,7 @@ extern int pack_ctld_job_step_info_response_msg(
* IN node_ptr - pointer to a node record
* RET count of killed job steps
*/
-extern int kill_step_on_node(struct job_record *job_ptr,
+extern int kill_step_on_node(struct job_record *job_ptr,
struct node_record *node_ptr)
{
ListIterator step_iterator;
@@ -1723,17 +1723,17 @@ extern int kill_step_on_node(struct job_record *job_ptr,
return found;
bit_position = node_ptr - node_record_table_ptr;
- step_iterator = list_iterator_create (job_ptr->step_list);
+ step_iterator = list_iterator_create (job_ptr->step_list);
while ((step_ptr = (struct step_record *) list_next (step_iterator))) {
if (step_ptr->no_kill ||
(bit_test(step_ptr->step_node_bitmap, bit_position) == 0))
continue;
- info("killing step %u.%u on down node %s",
+ info("killing step %u.%u on down node %s",
job_ptr->job_id, step_ptr->step_id, node_ptr->name);
srun_step_complete(step_ptr);
signal_step_tasks(step_ptr, SIGKILL, REQUEST_TERMINATE_TASKS);
found++;
- }
+ }
list_iterator_destroy (step_iterator);
return found;
@@ -1741,7 +1741,7 @@ extern int kill_step_on_node(struct job_record *job_ptr,
/*
* job_step_checkpoint - perform some checkpoint operation
- * IN ckpt_ptr - checkpoint request message
+ * IN ckpt_ptr - checkpoint request message
* IN uid - user id of the user issuing the RPC
* IN conn_fd - file descriptor on which to send reply
* RET 0 on success, otherwise ESLURM error code
@@ -1756,7 +1756,7 @@ extern int job_step_checkpoint(checkpoint_msg_t *ckpt_ptr,
slurm_msg_t resp_msg;
slurm_msg_t_init(&resp_msg);
-
+
/* find the job */
job_ptr = find_job_record (ckpt_ptr->job_id);
if (job_ptr == NULL) {
@@ -1771,7 +1771,7 @@ extern int job_step_checkpoint(checkpoint_msg_t *ckpt_ptr,
rc = ESLURM_JOB_PENDING;
goto reply;
} else if (IS_JOB_SUSPENDED(job_ptr)) {
- /* job can't get cycles for checkpoint
+ /* job can't get cycles for checkpoint
* if it is already suspended */
rc = ESLURM_DISABLED;
goto reply;
@@ -1788,13 +1788,13 @@ extern int job_step_checkpoint(checkpoint_msg_t *ckpt_ptr,
if (ckpt_ptr->image_dir == NULL) {
ckpt_ptr->image_dir = xstrdup(step_ptr->ckpt_dir);
}
- xstrfmtcat(ckpt_ptr->image_dir, "/%u.%u", job_ptr->job_id,
+ xstrfmtcat(ckpt_ptr->image_dir, "/%u.%u", job_ptr->job_id,
step_ptr->step_id);
- rc = checkpoint_op(ckpt_ptr->job_id, ckpt_ptr->step_id,
+ rc = checkpoint_op(ckpt_ptr->job_id, ckpt_ptr->step_id,
step_ptr, ckpt_ptr->op, ckpt_ptr->data,
- ckpt_ptr->image_dir, &resp_data.event_time,
- &resp_data.error_code,
+ ckpt_ptr->image_dir, &resp_data.event_time,
+ &resp_data.error_code,
&resp_data.error_msg);
last_job_update = time(NULL);
}
@@ -1830,9 +1830,9 @@ extern int job_step_checkpoint_comp(checkpoint_comp_msg_t *ckpt_ptr,
struct step_record *step_ptr;
slurm_msg_t resp_msg;
return_code_msg_t rc_msg;
-
+
slurm_msg_t_init(&resp_msg);
-
+
/* find the job */
job_ptr = find_job_record (ckpt_ptr->job_id);
if (job_ptr == NULL) {
@@ -1851,13 +1851,13 @@ extern int job_step_checkpoint_comp(checkpoint_comp_msg_t *ckpt_ptr,
rc = ESLURM_ALREADY_DONE;
goto reply;
}
-
+
step_ptr = find_step_record(job_ptr, ckpt_ptr->step_id);
if (step_ptr == NULL) {
rc = ESLURM_INVALID_JOB_ID;
goto reply;
} else {
- rc = checkpoint_comp((void *)step_ptr, ckpt_ptr->begin_time,
+ rc = checkpoint_comp((void *)step_ptr, ckpt_ptr->begin_time,
ckpt_ptr->error_code, ckpt_ptr->error_msg);
last_job_update = time(NULL);
}
@@ -1885,9 +1885,9 @@ extern int job_step_checkpoint_task_comp(checkpoint_task_comp_msg_t *ckpt_ptr,
struct step_record *step_ptr;
slurm_msg_t resp_msg;
return_code_msg_t rc_msg;
-
+
slurm_msg_t_init(&resp_msg);
-
+
/* find the job */
job_ptr = find_job_record (ckpt_ptr->job_id);
if (job_ptr == NULL) {
@@ -1906,14 +1906,14 @@ extern int job_step_checkpoint_task_comp(checkpoint_task_comp_msg_t *ckpt_ptr,
rc = ESLURM_ALREADY_DONE;
goto reply;
}
-
+
step_ptr = find_step_record(job_ptr, ckpt_ptr->step_id);
if (step_ptr == NULL) {
rc = ESLURM_INVALID_JOB_ID;
goto reply;
} else {
- rc = checkpoint_task_comp((void *)step_ptr,
- ckpt_ptr->task_id, ckpt_ptr->begin_time,
+ rc = checkpoint_task_comp((void *)step_ptr,
+ ckpt_ptr->task_id, ckpt_ptr->begin_time,
ckpt_ptr->error_code, ckpt_ptr->error_msg);
last_job_update = time(NULL);
}
@@ -1935,7 +1935,7 @@ extern int job_step_checkpoint_task_comp(checkpoint_task_comp_msg_t *ckpt_ptr,
* OUT max_rc - highest return code for any step thus far
* RET 0 on success, otherwise ESLURM error code
*/
-extern int step_partial_comp(step_complete_msg_t *req, uid_t uid,
+extern int step_partial_comp(step_complete_msg_t *req, uid_t uid,
int *rem, uint32_t *max_rc)
{
struct job_record *job_ptr;
@@ -1963,7 +1963,7 @@ extern int step_partial_comp(step_complete_msg_t *req, uid_t uid,
step_ptr = find_step_record(job_ptr, req->job_step_id);
if (step_ptr == NULL) {
- info("step_partial_comp: StepID=%u.%u invalid",
+ info("step_partial_comp: StepID=%u.%u invalid",
req->job_id, req->job_step_id);
return ESLURM_INVALID_JOB_ID;
}
@@ -1982,7 +1982,7 @@ extern int step_partial_comp(step_complete_msg_t *req, uid_t uid,
return SLURM_SUCCESS;
}
if (req->range_last < req->range_first) {
- error("step_partial_comp: JobID=%u range=%u-%u",
+ error("step_partial_comp: JobID=%u range=%u-%u",
req->job_id, req->range_first, req->range_last);
return EINVAL;
}
@@ -2019,8 +2019,8 @@ extern int step_partial_comp(step_complete_msg_t *req, uid_t uid,
/* release all switch windows */
if (step_ptr->switch_job) {
debug2("full switch release for step %u.%u, "
- "nodes %s", req->job_id,
- req->job_step_id,
+ "nodes %s", req->job_id,
+ req->job_step_id,
step_ptr->step_layout->node_list);
switch_g_job_step_complete(
step_ptr->switch_job,
@@ -2044,7 +2044,7 @@ extern int step_partial_comp(step_complete_msg_t *req, uid_t uid,
xrealloc(node_list, new_size );
}
debug2("partitial switch release for step %u.%u, "
- "nodes %s", req->job_id,
+ "nodes %s", req->job_id,
req->job_step_id, node_list);
switch_g_job_step_part_comp(
step_ptr->switch_job, node_list);
@@ -2058,7 +2058,7 @@ extern int step_partial_comp(step_complete_msg_t *req, uid_t uid,
return SLURM_SUCCESS;
}
-/* convert a range of nodes allocated to a step to a hostlist with
+/* convert a range of nodes allocated to a step to a hostlist with
* names of those nodes */
static hostlist_t _step_range_to_hostlist(struct step_record *step_ptr,
uint32_t range_first, uint32_t range_last)
@@ -2072,7 +2072,7 @@ static hostlist_t _step_range_to_hostlist(struct step_record *step_ptr,
node_inx++;
if ((node_inx >= range_first)
&& (node_inx <= range_last)) {
- hostlist_push(hl,
+ hostlist_push(hl,
node_record_table_ptr[i].name);
}
}
@@ -2080,13 +2080,13 @@ static hostlist_t _step_range_to_hostlist(struct step_record *step_ptr,
return hl;
}
-/* convert a single node name to it's offset within a step's
+/* convert a single node name to it's offset within a step's
* nodes allocation. returns -1 on error */
static int _step_hostname_to_inx(struct step_record *step_ptr,
char *node_name)
{
struct node_record *node_ptr;
- int i, node_inx, node_offset = 0;
+ int i, node_inx, node_offset = 0;
node_ptr = find_node_record(node_name);
if (node_ptr == NULL)
@@ -2100,7 +2100,7 @@ static int _step_hostname_to_inx(struct step_record *step_ptr,
return node_offset;
}
-extern int step_epilog_complete(struct job_record *job_ptr,
+extern int step_epilog_complete(struct job_record *job_ptr,
char *node_name)
{
int rc = 0, node_inx, step_offset;
@@ -2115,7 +2115,7 @@ extern int step_epilog_complete(struct job_record *job_ptr,
if ((node_ptr = find_node_record(node_name)) == NULL)
return 0;
node_inx = node_ptr - node_record_table_ptr;
-
+
step_iterator = list_iterator_create(job_ptr->step_list);
while ((step_ptr = (struct step_record *) list_next (step_iterator))) {
if ((!step_ptr->switch_job)
@@ -2133,7 +2133,7 @@ extern int step_epilog_complete(struct job_record *job_ptr,
}
rc++;
debug2("partitial switch release for step %u.%u, "
- "epilog on %s", job_ptr->job_id,
+ "epilog on %s", job_ptr->job_id,
step_ptr->step_id, node_name);
switch_g_job_step_part_comp(
step_ptr->switch_job, node_name);
@@ -2143,8 +2143,8 @@ extern int step_epilog_complete(struct job_record *job_ptr,
return rc;
}
-static void
-_suspend_job_step(struct job_record *job_ptr,
+static void
+_suspend_job_step(struct job_record *job_ptr,
struct step_record *step_ptr, time_t now)
{
if ((job_ptr->suspend_time)
@@ -2173,8 +2173,8 @@ suspend_job_step(struct job_record *job_ptr)
list_iterator_destroy (step_iterator);
}
-static void
-_resume_job_step(struct job_record *job_ptr,
+static void
+_resume_job_step(struct job_record *job_ptr,
struct step_record *step_ptr, time_t now)
{
if ((job_ptr->suspend_time) &&
@@ -2225,7 +2225,7 @@ extern void dump_job_step_state(struct step_record *step_ptr, Buf buffer)
pack32(step_ptr->exit_code, buffer);
if (step_ptr->exit_code != NO_VAL) {
pack_bit_fmt(step_ptr->exit_node_bitmap, buffer);
- pack16((uint16_t) _bitstr_bits(step_ptr->exit_node_bitmap),
+ pack16((uint16_t) _bitstr_bits(step_ptr->exit_node_bitmap),
buffer);
}
if (step_ptr->core_bitmap_job) {
@@ -2255,7 +2255,7 @@ extern void dump_job_step_state(struct step_record *step_ptr, Buf buffer)
}
/*
- * Create a new job step from data in a buffer (as created by
+ * Create a new job step from data in a buffer (as created by
* dump_job_step_state)
* IN/OUT - job_ptr - point to a job for which the step is to be loaded.
* IN/OUT buffer - location to get data from, pointers advanced
@@ -2274,7 +2274,7 @@ extern int load_step_state(struct job_record *job_ptr, Buf buffer)
switch_jobinfo_t *switch_tmp = NULL;
check_jobinfo_t check_tmp = NULL;
slurm_step_layout_t *step_layout = NULL;
-
+
safe_unpack32(&step_id, buffer);
safe_unpack16(&cyclic_alloc, buffer);
safe_unpack16(&port, buffer);
@@ -2361,7 +2361,7 @@ extern int load_step_state(struct job_record *job_ptr, Buf buffer)
slurm_step_layout_destroy(step_ptr->step_layout);
step_ptr->step_layout = step_layout;
-
+
step_ptr->switch_job = switch_tmp;
step_ptr->check_job = check_tmp;
@@ -2369,7 +2369,7 @@ extern int load_step_state(struct job_record *job_ptr, Buf buffer)
if (bit_fmt) {
/* NOTE: This is only recovered if a job step completion
* is actively in progress at step save time. Otherwise
- * the bitmap is NULL. */
+ * the bitmap is NULL. */
step_ptr->exit_node_bitmap = bit_alloc(bit_cnt);
if (step_ptr->exit_node_bitmap == NULL)
fatal("bit_alloc: %m");
@@ -2389,7 +2389,7 @@ extern int load_step_state(struct job_record *job_ptr, Buf buffer)
}
if (step_ptr->step_layout && step_ptr->step_layout->node_list) {
- switch_g_job_step_allocated(switch_tmp,
+ switch_g_job_step_allocated(switch_tmp,
step_ptr->step_layout->node_list);
} else {
switch_g_job_step_allocated(switch_tmp, NULL);
@@ -2447,7 +2447,7 @@ extern void step_checkpoint(void)
(job_ptr->ckpt_interval * 60);
if (ckpt_due > now)
continue;
- /*
+ /*
* DO NOT initiate a checkpoint request if the job is
* started just now, in case it is restarting from checkpoint.
*/
@@ -2467,21 +2467,21 @@ extern void step_checkpoint(void)
continue; /* ignore periodic step ckpt */
}
step_iterator = list_iterator_create (job_ptr->step_list);
- while ((step_ptr = (struct step_record *)
+ while ((step_ptr = (struct step_record *)
list_next (step_iterator))) {
char *image_dir = NULL;
if (step_ptr->ckpt_interval == 0)
continue;
ckpt_due = step_ptr->ckpt_time +
(step_ptr->ckpt_interval * 60);
- if (ckpt_due > now)
+ if (ckpt_due > now)
continue;
- /*
+ /*
* DO NOT initiate a checkpoint request if the step is
- * started just now, in case it is restarting from
+ * started just now, in case it is restarting from
* checkpoint.
*/
- ckpt_due = step_ptr->start_time +
+ ckpt_due = step_ptr->start_time +
(step_ptr->ckpt_interval * 60);
if (ckpt_due > now)
continue;
@@ -2489,11 +2489,11 @@ extern void step_checkpoint(void)
step_ptr->ckpt_time = now;
last_job_update = now;
image_dir = xstrdup(step_ptr->ckpt_dir);
- xstrfmtcat(image_dir, "/%u.%u", job_ptr->job_id,
+ xstrfmtcat(image_dir, "/%u.%u", job_ptr->job_id,
step_ptr->step_id);
- (void) checkpoint_op(job_ptr->job_id,
+ (void) checkpoint_op(job_ptr->job_id,
step_ptr->step_id,
- step_ptr, CHECK_CREATE, 0,
+ step_ptr, CHECK_CREATE, 0,
image_dir, &event_time,
&error_code, &error_msg);
xfree(image_dir);
@@ -2509,7 +2509,7 @@ static void _signal_step_timelimit(struct job_record *job_ptr,
int i;
kill_job_msg_t *kill_step;
agent_arg_t *agent_args = NULL;
-
+
xassert(step_ptr);
agent_args = xmalloc(sizeof(agent_arg_t));
agent_args->msg_type = REQUEST_KILL_TIMELIMIT;
@@ -2524,7 +2524,7 @@ static void _signal_step_timelimit(struct job_record *job_ptr,
kill_step->time = now;
kill_step->select_jobinfo = select_g_select_jobinfo_copy(
job_ptr->select_jobinfo);
-
+
for (i = 0; i < node_record_count; i++) {
if (bit_test(step_ptr->step_node_bitmap, i) == 0)
continue;
@@ -2552,8 +2552,8 @@ static void _signal_step_timelimit(struct job_record *job_ptr,
return;
}
-extern void
-check_job_step_time_limit (struct job_record *job_ptr, time_t now)
+extern void
+check_job_step_time_limit (struct job_record *job_ptr, time_t now)
{
ListIterator step_iterator;
struct step_record *step_ptr;
diff --git a/src/slurmctld/trigger_mgr.c b/src/slurmctld/trigger_mgr.c
index d4e0272a9819cc3f96786ac79277318d0fe2af30..4af08d228023a794a105b9a429dc44c303fcf358 100644
--- a/src/slurmctld/trigger_mgr.c
+++ b/src/slurmctld/trigger_mgr.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -309,9 +309,9 @@ extern int trigger_set(uid_t uid, gid_t gid, trigger_info_msg_t *msg)
if ((slurmctld_conf.slurm_user_id != 0)
&& (slurmctld_conf.slurm_user_id != uid)) {
- /* If SlurmUser is not root, then it is unable to set the
- * appropriate user id and group id for the program to be
- * launched. To prevent the launched program for an arbitrary
+ /* If SlurmUser is not root, then it is unable to set the
+ * appropriate user id and group id for the program to be
+ * launched. To prevent the launched program for an arbitrary
* user being executed as user SlurmUser, disable all other
* users from setting triggers. */
info("Attempt to set trigger by uid %u != SlurmUser", uid);
@@ -616,10 +616,10 @@ static int _open_resv_state_file(char **state_file)
xstrcat(*state_file, "/trigger_state");
state_fd = open(*state_file, O_RDONLY);
if (state_fd < 0) {
- error("Could not open trigger state file %s: %m",
+ error("Could not open trigger state file %s: %m",
*state_file);
} else if (fstat(state_fd, &stat_buf) < 0) {
- error("Could not stat trigger state file %s: %m",
+ error("Could not stat trigger state file %s: %m",
*state_file);
(void) close(state_fd);
} else if (stat_buf.st_size < 10) {
@@ -661,7 +661,7 @@ extern int trigger_state_restore(void)
if (errno == EINTR)
continue;
else {
- error("Read error on %s: %m",
+ error("Read error on %s: %m",
state_file);
break;
}
@@ -747,14 +747,14 @@ static void _trigger_job_event(trig_mgr_info_t *trig_in, time_t now)
if (trig_in->trig_type & TRIGGER_TYPE_DOWN) {
if (trigger_down_nodes_bitmap
- && bit_overlap(trig_in->job_ptr->node_bitmap,
+ && bit_overlap(trig_in->job_ptr->node_bitmap,
trigger_down_nodes_bitmap)) {
if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for job %u down",
trig_in->trig_id, trig_in->job_id);
}
trig_in->state = 1;
- trig_in->trig_time = now +
+ trig_in->trig_time = now +
(trig_in->trig_time - 0x8000);
return;
}
@@ -762,14 +762,14 @@ static void _trigger_job_event(trig_mgr_info_t *trig_in, time_t now)
if (trig_in->trig_type & TRIGGER_TYPE_FAIL) {
if (trigger_fail_nodes_bitmap
- && bit_overlap(trig_in->job_ptr->node_bitmap,
+ && bit_overlap(trig_in->job_ptr->node_bitmap,
trigger_fail_nodes_bitmap)) {
if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for job %u node fail",
trig_in->trig_id, trig_in->job_id);
}
trig_in->state = 1;
- trig_in->trig_time = now +
+ trig_in->trig_time = now +
(trig_in->trig_time - 0x8000);
return;
}
@@ -777,10 +777,10 @@ static void _trigger_job_event(trig_mgr_info_t *trig_in, time_t now)
if (trig_in->trig_type & TRIGGER_TYPE_UP) {
if (trigger_up_nodes_bitmap
- && bit_overlap(trig_in->job_ptr->node_bitmap,
+ && bit_overlap(trig_in->job_ptr->node_bitmap,
trigger_up_nodes_bitmap)) {
trig_in->state = 1;
- trig_in->trig_time = now +
+ trig_in->trig_time = now +
(0x8000 - trig_in->trig_time);
if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for job %u up",
@@ -810,9 +810,9 @@ static void _trigger_node_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->res_id = bitmap2node_name(
trigger_down_nodes_bitmap);
trig_in->state = 1;
- } else if (bit_overlap(trig_in->nodes_bitmap,
+ } else if (bit_overlap(trig_in->nodes_bitmap,
trigger_down_nodes_bitmap)) {
- bit_and(trig_in->nodes_bitmap,
+ bit_and(trig_in->nodes_bitmap,
trigger_down_nodes_bitmap);
xfree(trig_in->res_id);
trig_in->res_id = bitmap2node_name(
@@ -820,7 +820,7 @@ static void _trigger_node_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->state = 1;
}
if (trig_in->state == 1) {
- trig_in->trig_time = now +
+ trig_in->trig_time = now +
(trig_in->trig_time - 0x8000);
if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for node %s down",
@@ -838,9 +838,9 @@ static void _trigger_node_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->res_id = bitmap2node_name(
trigger_drained_nodes_bitmap);
trig_in->state = 1;
- } else if (bit_overlap(trig_in->nodes_bitmap,
+ } else if (bit_overlap(trig_in->nodes_bitmap,
trigger_drained_nodes_bitmap)) {
- bit_and(trig_in->nodes_bitmap,
+ bit_and(trig_in->nodes_bitmap,
trigger_drained_nodes_bitmap);
xfree(trig_in->res_id);
trig_in->res_id = bitmap2node_name(
@@ -848,7 +848,7 @@ static void _trigger_node_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->state = 1;
}
if (trig_in->state == 1) {
- trig_in->trig_time = now +
+ trig_in->trig_time = now +
(trig_in->trig_time - 0x8000);
if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for node %s drained",
@@ -866,9 +866,9 @@ static void _trigger_node_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->res_id = bitmap2node_name(
trigger_fail_nodes_bitmap);
trig_in->state = 1;
- } else if (bit_overlap(trig_in->nodes_bitmap,
+ } else if (bit_overlap(trig_in->nodes_bitmap,
trigger_fail_nodes_bitmap)) {
- bit_and(trig_in->nodes_bitmap,
+ bit_and(trig_in->nodes_bitmap,
trigger_fail_nodes_bitmap);
xfree(trig_in->res_id);
trig_in->res_id = bitmap2node_name(
@@ -876,7 +876,7 @@ static void _trigger_node_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->state = 1;
}
if (trig_in->state == 1) {
- trig_in->trig_time = now +
+ trig_in->trig_time = now +
(trig_in->trig_time - 0x8000);
if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for node %s fail",
@@ -887,7 +887,7 @@ static void _trigger_node_event(trig_mgr_info_t *trig_in, time_t now)
}
if (trig_in->trig_type & TRIGGER_TYPE_IDLE) {
- /* We need to determine which (if any) of these
+ /* We need to determine which (if any) of these
* nodes have been idle for at least the offset time */
time_t min_idle = now - (trig_in->trig_time - 0x8000);
int i;
@@ -934,9 +934,9 @@ static void _trigger_node_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->res_id = bitmap2node_name(
trigger_up_nodes_bitmap);
trig_in->state = 1;
- } else if (bit_overlap(trig_in->nodes_bitmap,
+ } else if (bit_overlap(trig_in->nodes_bitmap,
trigger_up_nodes_bitmap)) {
- bit_and(trig_in->nodes_bitmap,
+ bit_and(trig_in->nodes_bitmap,
trigger_up_nodes_bitmap);
xfree(trig_in->res_id);
trig_in->res_id = bitmap2node_name(
@@ -944,7 +944,7 @@ static void _trigger_node_event(trig_mgr_info_t *trig_in, time_t now)
trig_in->state = 1;
}
if (trig_in->state == 1) {
- trig_in->trig_time = now +
+ trig_in->trig_time = now +
(trig_in->trig_time - 0x8000);
if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
info("trigger[%u] for node %s up",
@@ -966,11 +966,11 @@ static void _trigger_node_event(trig_mgr_info_t *trig_in, time_t now)
}
}
-/* Ideally we would use the existing proctrack plugin to prevent any
+/* Ideally we would use the existing proctrack plugin to prevent any
* processes from escaping our control, but that plugin is tied
* to various slurmd data structures. We just the process group ID
- * to kill the spawned program after MAX_PROG_TIME. Since triggers are
- * meant primarily for system administrators rather than users, this
+ * to kill the spawned program after MAX_PROG_TIME. Since triggers are
+ * meant primarily for system administrators rather than users, this
* may be sufficient. */
static void _trigger_run_program(trig_mgr_info_t *trig_in)
{
@@ -1032,7 +1032,7 @@ static void _trigger_run_program(trig_mgr_info_t *trig_in)
static void _clear_event_triggers(void)
{
if (trigger_down_nodes_bitmap) {
- bit_nclear(trigger_down_nodes_bitmap,
+ bit_nclear(trigger_down_nodes_bitmap,
0, (bit_size(trigger_down_nodes_bitmap) - 1));
}
if (trigger_drained_nodes_bitmap) {
@@ -1040,7 +1040,7 @@ static void _clear_event_triggers(void)
0, (bit_size(trigger_drained_nodes_bitmap) - 1));
}
if (trigger_up_nodes_bitmap) {
- bit_nclear(trigger_up_nodes_bitmap,
+ bit_nclear(trigger_up_nodes_bitmap,
0, (bit_size(trigger_up_nodes_bitmap) - 1));
}
trigger_node_reconfig = false;
@@ -1076,7 +1076,7 @@ extern void trigger_process(void)
if (slurm_get_debug_flags() & DEBUG_FLAG_TRIGGERS) {
info("launching program for trigger[%u]",
trig_in->trig_id);
- info(" uid=%u gid=%u program=%s arg=%s",
+ info(" uid=%u gid=%u program=%s arg=%s",
trig_in->user_id, trig_in->group_id,
trig_in->program, trig_in->res_id);
}
@@ -1084,12 +1084,12 @@ extern void trigger_process(void)
trig_in->trig_time = now;
state_change = true;
_trigger_run_program(trig_in);
- } else if ((trig_in->state == 2) &&
- (difftime(now, trig_in->trig_time) >
+ } else if ((trig_in->state == 2) &&
+ (difftime(now, trig_in->trig_time) >
MAX_PROG_TIME)) {
if (trig_in->group_id != 0) {
killpg(trig_in->group_id, SIGKILL);
- rc = waitpid(trig_in->group_id, &prog_stat,
+ rc = waitpid(trig_in->group_id, &prog_stat,
WNOHANG);
if ((rc > 0) && prog_stat) {
info("trigger uid=%u type=%s:%s "
@@ -1097,7 +1097,7 @@ extern void trigger_process(void)
trig_in->user_id,
_res_type(trig_in->res_type),
_trig_type(trig_in->trig_type),
- WIFEXITED(prog_stat),
+ WIFEXITED(prog_stat),
WTERMSIG(prog_stat));
}
if ((rc == trig_in->group_id) ||
@@ -1106,9 +1106,9 @@ extern void trigger_process(void)
}
if (trig_in->group_id == 0) {
- if (slurm_get_debug_flags() &
+ if (slurm_get_debug_flags() &
DEBUG_FLAG_TRIGGERS) {
- info("purging trigger[%u]",
+ info("purging trigger[%u]",
trig_in->trig_id);
}
list_delete_item(trig_iter);
diff --git a/src/slurmctld/trigger_mgr.h b/src/slurmctld/trigger_mgr.h
index f9a61cccd8114a644eddfebf6479ddf3b5bf33e5..18e0dc5201f5b8743416d024073d4bf1b07bc9c8 100644
--- a/src/slurmctld/trigger_mgr.h
+++ b/src/slurmctld/trigger_mgr.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov> et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/slurmd/slurmd/Makefile.am b/src/slurmd/slurmd/Makefile.am
index 26c533f91789fa9c24c73e5eff5d8374bb44ad2c..30afd9de102741828a72b1611392ed62a7da8daf 100644
--- a/src/slurmd/slurmd/Makefile.am
+++ b/src/slurmd/slurmd/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)
slurmd_LDADD = \
$(top_builddir)/src/common/libdaemonize.la \
$(top_builddir)/src/api/libslurm.o -ldl \
- $(PLPA_LIBS)
+ $(PLPA_LIBS)
SLURMD_SOURCES = \
slurmd.c slurmd.h \
@@ -39,7 +39,7 @@ slurmd_SOURCES = $(SLURMD_SOURCES)
if HAVE_AIX
# We need to set maxdata back to 0 because this effects the "max memory size"
# ulimit, and the ulimit is inherited by child processes.
-slurmd_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) -Wl,-bmaxdata:0x0
+slurmd_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) -Wl,-bmaxdata:0x0
else
slurmd_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
endif
diff --git a/src/slurmd/slurmd/Makefile.in b/src/slurmd/slurmd/Makefile.in
index 4160047c5f5fce39104d249c394fff68b9ae4396..f389cb2d4546a2a6505ed5fed91b7eca138af38b 100644
--- a/src/slurmd/slurmd/Makefile.in
+++ b/src/slurmd/slurmd/Makefile.in
@@ -303,7 +303,7 @@ INCLUDES = -I$(top_srcdir)
slurmd_LDADD = \
$(top_builddir)/src/common/libdaemonize.la \
$(top_builddir)/src/api/libslurm.o -ldl \
- $(PLPA_LIBS)
+ $(PLPA_LIBS)
SLURMD_SOURCES = \
slurmd.c slurmd.h \
@@ -331,7 +331,7 @@ slurmd_SOURCES = $(SLURMD_SOURCES)
# We need to set maxdata back to 0 because this effects the "max memory size"
# ulimit, and the ulimit is inherited by child processes.
-@HAVE_AIX_TRUE@slurmd_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) -Wl,-bmaxdata:0x0
+@HAVE_AIX_TRUE@slurmd_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) -Wl,-bmaxdata:0x0
all: all-am
.SUFFIXES:
diff --git a/src/slurmd/slurmstepd/Makefile.am b/src/slurmd/slurmstepd/Makefile.am
index 21f2e4a7033c3ab720c58953dbc2add4a5a1c649..7d1061d39377cdce3bee76afc920d1ffc4211a48 100644
--- a/src/slurmd/slurmstepd/Makefile.am
+++ b/src/slurmd/slurmstepd/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir)
slurmstepd_LDADD = \
$(top_builddir)/src/common/libdaemonize.la \
$(top_builddir)/src/api/libslurm.o -ldl\
- $(PLPA_LIBS) $(PAM_LIBS) $(UTIL_LIBS)
+ $(PLPA_LIBS) $(PAM_LIBS) $(UTIL_LIBS)
slurmstepd_SOURCES = \
slurmstepd.c slurmstepd.h \
diff --git a/src/slurmd/slurmstepd/Makefile.in b/src/slurmd/slurmstepd/Makefile.in
index c3e98047308e665cfa76549e29a1fcb79f9b431d..dc8de06b11e95620a61bdb159ca26c2cd8f516d3 100644
--- a/src/slurmd/slurmstepd/Makefile.in
+++ b/src/slurmd/slurmstepd/Makefile.in
@@ -306,7 +306,7 @@ INCLUDES = -I$(top_srcdir)
slurmstepd_LDADD = \
$(top_builddir)/src/common/libdaemonize.la \
$(top_builddir)/src/api/libslurm.o -ldl\
- $(PLPA_LIBS) $(PAM_LIBS) $(UTIL_LIBS)
+ $(PLPA_LIBS) $(PAM_LIBS) $(UTIL_LIBS)
slurmstepd_SOURCES = \
slurmstepd.c slurmstepd.h \
diff --git a/src/slurmdbd/Makefile.am b/src/slurmdbd/Makefile.am
index 76308e09457417689c95abb7327ffcad71e7251a..b229e2b2819feba880163670dfde425bf9474fec 100644
--- a/src/slurmdbd/Makefile.am
+++ b/src/slurmdbd/Makefile.am
@@ -27,7 +27,7 @@ slurmdbd_SOURCES = \
slurmdbd.c \
slurmdbd.h
-slurmdbd_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
+slurmdbd_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
force:
$(slurmdbd_LDADD) : force
diff --git a/src/slurmdbd/Makefile.in b/src/slurmdbd/Makefile.in
index 274894249d137a4a8ddae81b377c8e4bc897fbb2..6c0e33b91fadfea666697c7135ce6e2f914c0237 100644
--- a/src/slurmdbd/Makefile.in
+++ b/src/slurmdbd/Makefile.in
@@ -315,7 +315,7 @@ slurmdbd_SOURCES = \
slurmdbd.c \
slurmdbd.h
-slurmdbd_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
+slurmdbd_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
all: all-am
.SUFFIXES:
diff --git a/src/slurmdbd/agent.c b/src/slurmdbd/agent.c
index 3ce1111d56a938c95b3894fed7fb554c37937c2d..1a8370b0ad9d8c2b9c521c30a93ab94a7a2346c4 100644
--- a/src/slurmdbd/agent.c
+++ b/src/slurmdbd/agent.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/slurmdbd/agent.h b/src/slurmdbd/agent.h
index c6c3941287f21e9490c20268206ff530ccff25e1..fcf19033c4f76dcfa1e22d86418837105edb6dce 100644
--- a/src/slurmdbd/agent.h
+++ b/src/slurmdbd/agent.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/slurmdbd/backup.c b/src/slurmdbd/backup.c
index 1aac5b1c51e984d959f7afe581c5de9d2056c40f..1a4d53fc896e3d14a091c448f3dccc4506e25a6d 100644
--- a/src/slurmdbd/backup.c
+++ b/src/slurmdbd/backup.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -61,7 +61,7 @@ static void _open_slurmdbd_fd(slurm_addr dbd_addr)
}
slurmdbd_fd = slurm_open_msg_conn(&dbd_addr);
-
+
if (slurmdbd_fd >= 0)
fd_set_nonblocking(slurmdbd_fd);
}
@@ -82,12 +82,12 @@ static void _reopen_slurmdbd_fd(slurm_addr dbd_addr)
_open_slurmdbd_fd(dbd_addr);
}
-/* run_backup - this is the backup controller, it should run in standby
+/* run_backup - this is the backup controller, it should run in standby
* mode, assuming control when the primary controller stops responding */
extern void run_backup(void)
{
slurm_addr dbd_addr;
-
+
primary_resumed = false;
/* get a connection */
@@ -95,11 +95,11 @@ extern void run_backup(void)
slurmdbd_conf->dbd_host);
if (dbd_addr.sin_port == 0)
- error("Unable to locate SlurmDBD host %s:%u",
+ error("Unable to locate SlurmDBD host %s:%u",
slurmdbd_conf->dbd_host, slurmdbd_conf->dbd_port);
- else
+ else
_open_slurmdbd_fd(dbd_addr);
-
+
/* repeatedly ping Primary */
while (!shutdown_time) {
@@ -117,9 +117,9 @@ extern void run_backup(void)
info("Taking Control");
break;
}
-
+
sleep(1);
- if(!writeable)
+ if(!writeable)
_reopen_slurmdbd_fd(dbd_addr);
}
diff --git a/src/slurmdbd/backup.h b/src/slurmdbd/backup.h
index 9980f3e969506d58a4a34c4d527a872b3867fde5..8e694345cad9fc72300b2efac441674093a348bc 100644
--- a/src/slurmdbd/backup.h
+++ b/src/slurmdbd/backup.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -47,7 +47,7 @@ extern bool primary_resumed;
extern bool backup;
extern bool have_control;
-/* run_backup - this is the backup dbd, it should run in standby
+/* run_backup - this is the backup dbd, it should run in standby
* mode, assuming control when the primary dbd stops responding */
extern void run_backup(void);
diff --git a/src/slurmdbd/proc_req.c b/src/slurmdbd/proc_req.c
index f0542b355346458f8335b532ef998255d310e998..3c64e3d6a853f637bc8b9d521f04bd44048c735f 100644
--- a/src/slurmdbd/proc_req.c
+++ b/src/slurmdbd/proc_req.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -100,7 +100,7 @@ static int _get_reservations(slurmdbd_conn_t *slurmdbd_conn,
Buf in_buffer, Buf *out_buffer, uint32_t *uid);
static int _flush_jobs(slurmdbd_conn_t *slurmdbd_conn,
Buf in_buffer, Buf *out_buffer, uint32_t *uid);
-static int _init_conn(slurmdbd_conn_t *slurmdbd_conn,
+static int _init_conn(slurmdbd_conn_t *slurmdbd_conn,
Buf in_buffer, Buf *out_buffer, uint32_t *uid);
static int _fini_conn(slurmdbd_conn_t *slurmdbd_conn, Buf in_buffer,
Buf *out_buffer);
@@ -162,8 +162,8 @@ static int _step_start(slurmdbd_conn_t *slurmdbd_conn,
* buffer OUT - outgoing response, must be freed by caller
* uid IN/OUT - user ID who initiated the RPC
* RET SLURM_SUCCESS or error code */
-extern int
-proc_req(slurmdbd_conn_t *slurmdbd_conn,
+extern int
+proc_req(slurmdbd_conn_t *slurmdbd_conn,
char *msg, uint32_t msg_size,
bool first, Buf *out_buffer, uint32_t *uid)
{
@@ -179,7 +179,7 @@ proc_req(slurmdbd_conn_t *slurmdbd_conn,
comment = "Initial RPC not DBD_INIT";
error("%s type (%d)", comment, msg_type);
rc = EINVAL;
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_INIT);
} else {
switch (msg_type) {
@@ -204,11 +204,11 @@ proc_req(slurmdbd_conn_t *slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_ADD_USERS:
- rc = _add_users(slurmdbd_conn,
+ rc = _add_users(slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_ADD_WCKEYS:
- rc = _add_wckeys(slurmdbd_conn,
+ rc = _add_wckeys(slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_ADD_RESV:
@@ -216,11 +216,11 @@ proc_req(slurmdbd_conn_t *slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_ARCHIVE_DUMP:
- rc = _archive_dump(slurmdbd_conn,
+ rc = _archive_dump(slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_ARCHIVE_LOAD:
- rc = _archive_load(slurmdbd_conn,
+ rc = _archive_load(slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_CLUSTER_PROCS:
@@ -228,7 +228,7 @@ proc_req(slurmdbd_conn_t *slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_GET_ACCOUNTS:
- rc = _get_accounts(slurmdbd_conn,
+ rc = _get_accounts(slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_GET_ASSOCS:
@@ -253,7 +253,7 @@ proc_req(slurmdbd_conn_t *slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_GET_JOBS_COND:
- rc = _get_jobs_cond(slurmdbd_conn,
+ rc = _get_jobs_cond(slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_GET_PROBS:
@@ -269,11 +269,11 @@ proc_req(slurmdbd_conn_t *slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_GET_WCKEYS:
- rc = _get_wckeys(slurmdbd_conn,
+ rc = _get_wckeys(slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_GET_RESVS:
- rc = _get_reservations(slurmdbd_conn,
+ rc = _get_reservations(slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_GET_USERS:
@@ -286,7 +286,7 @@ proc_req(slurmdbd_conn_t *slurmdbd_conn,
break;
case DBD_INIT:
if (first)
- rc = _init_conn(slurmdbd_conn,
+ rc = _init_conn(slurmdbd_conn,
in_buffer, out_buffer, uid);
else {
comment = "DBD_INIT sent after connection established";
@@ -333,7 +333,7 @@ proc_req(slurmdbd_conn_t *slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_MODIFY_WCKEYS:
- rc = _modify_wckeys(slurmdbd_conn,
+ rc = _modify_wckeys(slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_MODIFY_RESV:
@@ -345,7 +345,7 @@ proc_req(slurmdbd_conn_t *slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_REGISTER_CTLD:
- rc = _register_ctld(slurmdbd_conn, in_buffer,
+ rc = _register_ctld(slurmdbd_conn, in_buffer,
out_buffer, uid);
break;
case DBD_REMOVE_ACCOUNTS:
@@ -373,7 +373,7 @@ proc_req(slurmdbd_conn_t *slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_REMOVE_WCKEYS:
- rc = _remove_wckeys(slurmdbd_conn,
+ rc = _remove_wckeys(slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_REMOVE_RESV:
@@ -381,7 +381,7 @@ proc_req(slurmdbd_conn_t *slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_ROLL_USAGE:
- rc = _roll_usage(slurmdbd_conn,
+ rc = _roll_usage(slurmdbd_conn,
in_buffer, out_buffer, uid);
break;
case DBD_STEP_COMPLETE:
@@ -401,12 +401,12 @@ proc_req(slurmdbd_conn_t *slurmdbd_conn,
break;
}
- if(rc == ESLURM_ACCESS_DENIED)
+ if(rc == ESLURM_ACCESS_DENIED)
error("Security violation, %s",
slurmdbd_msg_type_2_str(msg_type, 1));
}
- xfer_buf_data(in_buffer); /* delete in_buffer struct without
+ xfer_buf_data(in_buffer); /* delete in_buffer struct without
* xfree of msg */
return rc;
@@ -441,7 +441,7 @@ static int _add_accounts(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_ADD_ACCOUNTS: called");
if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
- && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
+ && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< ACCT_ADMIN_OPERATOR) {
acct_user_rec_t user;
@@ -459,16 +459,16 @@ static int _add_accounts(slurmdbd_conn_t *slurmdbd_conn,
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
rc = ESLURM_ACCESS_DENIED;
- goto end_it;
+ goto end_it;
}
/* If the user is a coord of any acct they can add
* accounts they are only able to make associations to
* these accounts if they are coordinators of the
* parent they are trying to add to
- */
+ */
}
- if (slurmdbd_unpack_list_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_list_msg(slurmdbd_conn->rpc_version,
DBD_ADD_ACCOUNTS, &get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_ADD_ACCOUNTS message";
@@ -476,13 +476,13 @@ static int _add_accounts(slurmdbd_conn_t *slurmdbd_conn,
rc = SLURM_ERROR;
goto end_it;
}
-
+
rc = acct_storage_g_add_accounts(slurmdbd_conn->db_conn, *uid,
get_msg->my_list);
end_it:
- slurmdbd_free_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_list_msg(slurmdbd_conn->rpc_version,
get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_ADD_ACCOUNTS);
return rc;
}
@@ -492,8 +492,8 @@ static int _add_account_coords(slurmdbd_conn_t *slurmdbd_conn,
int rc = SLURM_SUCCESS;
dbd_acct_coord_msg_t *get_msg = NULL;
char *comment = NULL;
-
- if (slurmdbd_unpack_acct_coord_msg(slurmdbd_conn->rpc_version,
+
+ if (slurmdbd_unpack_acct_coord_msg(slurmdbd_conn->rpc_version,
&get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_ADD_ACCOUNT_COORDS message";
@@ -501,7 +501,7 @@ static int _add_account_coords(slurmdbd_conn_t *slurmdbd_conn,
rc = SLURM_ERROR;
goto end_it;
}
-
+
debug2("DBD_ADD_ACCOUNT_COORDS: called");
if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
@@ -516,7 +516,7 @@ static int _add_account_coords(slurmdbd_conn_t *slurmdbd_conn,
memset(&user, 0, sizeof(acct_user_rec_t));
user.uid = *uid;
if(assoc_mgr_fill_in_user(
- slurmdbd_conn->db_conn, &user, 1, NULL)
+ slurmdbd_conn->db_conn, &user, 1, NULL)
!= SLURM_SUCCESS) {
comment = "Your user has not been added to the accounting system yet.";
error("%s", comment);
@@ -544,7 +544,7 @@ static int _add_account_coords(slurmdbd_conn_t *slurmdbd_conn,
}
list_iterator_destroy(itr2);
list_iterator_destroy(itr);
-
+
if(bad) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
@@ -553,12 +553,12 @@ static int _add_account_coords(slurmdbd_conn_t *slurmdbd_conn,
}
}
- rc = acct_storage_g_add_coord(slurmdbd_conn->db_conn, *uid,
+ rc = acct_storage_g_add_coord(slurmdbd_conn->db_conn, *uid,
get_msg->acct_list, get_msg->cond);
end_it:
- slurmdbd_free_acct_coord_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_acct_coord_msg(slurmdbd_conn->rpc_version,
get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_ADD_ACCOUNT_COORDS);
return rc;
}
@@ -572,7 +572,7 @@ static int _add_assocs(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_ADD_ASSOCS: called");
- if (slurmdbd_unpack_list_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_list_msg(slurmdbd_conn->rpc_version,
DBD_ADD_ASSOCS, &get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_ADD_ASSOCS message";
@@ -580,9 +580,9 @@ static int _add_assocs(slurmdbd_conn_t *slurmdbd_conn,
rc = SLURM_ERROR;
goto end_it;
}
-
+
if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
- && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
+ && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< ACCT_ADMIN_OPERATOR) {
ListIterator itr = NULL;
ListIterator itr2 = NULL;
@@ -619,7 +619,7 @@ static int _add_assocs(slurmdbd_conn_t *slurmdbd_conn,
if(!strcasecmp(coord->name, account))
break;
}
- if(!coord)
+ if(!coord)
break;
}
list_iterator_destroy(itr2);
@@ -635,9 +635,9 @@ static int _add_assocs(slurmdbd_conn_t *slurmdbd_conn,
rc = acct_storage_g_add_associations(slurmdbd_conn->db_conn, *uid,
get_msg->my_list);
end_it:
- slurmdbd_free_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_list_msg(slurmdbd_conn->rpc_version,
get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_ADD_ASSOCS);
return rc;
}
@@ -651,7 +651,7 @@ static int _add_clusters(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_ADD_CLUSTERS: called");
if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
- && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
+ && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< ACCT_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
@@ -659,7 +659,7 @@ static int _add_clusters(slurmdbd_conn_t *slurmdbd_conn,
goto end_it;
}
- if (slurmdbd_unpack_list_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_list_msg(slurmdbd_conn->rpc_version,
DBD_ADD_CLUSTERS, &get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_ADD_CLUSTERS message";
@@ -667,16 +667,16 @@ static int _add_clusters(slurmdbd_conn_t *slurmdbd_conn,
rc = SLURM_ERROR;
goto end_it;
}
-
- rc = acct_storage_g_add_clusters(slurmdbd_conn->db_conn, *uid,
+
+ rc = acct_storage_g_add_clusters(slurmdbd_conn->db_conn, *uid,
get_msg->my_list);
- if(rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
comment = "Failed to add cluster.";
end_it:
- slurmdbd_free_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_list_msg(slurmdbd_conn->rpc_version,
get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_ADD_CLUSTERS);
return rc;
}
@@ -690,7 +690,7 @@ static int _add_qos(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_ADD_QOS: called");
if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
- && (assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
+ && (assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< ACCT_ADMIN_SUPER_USER)) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
@@ -698,7 +698,7 @@ static int _add_qos(slurmdbd_conn_t *slurmdbd_conn,
goto end_it;
}
- if (slurmdbd_unpack_list_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_list_msg(slurmdbd_conn->rpc_version,
DBD_ADD_QOS, &get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_ADD_QOS message";
@@ -706,16 +706,16 @@ static int _add_qos(slurmdbd_conn_t *slurmdbd_conn,
rc = SLURM_ERROR;
goto end_it;
}
-
+
rc = acct_storage_g_add_qos(slurmdbd_conn->db_conn, *uid,
get_msg->my_list);
- if(rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
comment = "Failed to add qos.";
end_it:
- slurmdbd_free_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_list_msg(slurmdbd_conn->rpc_version,
get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_ADD_QOS);
return rc;
}
@@ -728,14 +728,14 @@ static int _add_users(slurmdbd_conn_t *slurmdbd_conn,
char *comment = NULL;
debug2("DBD_ADD_USERS: called");
if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
- && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
+ && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< ACCT_ADMIN_OPERATOR) {
acct_user_rec_t user;
memset(&user, 0, sizeof(acct_user_rec_t));
user.uid = *uid;
if(assoc_mgr_fill_in_user(
- slurmdbd_conn->db_conn, &user, 1, NULL)
+ slurmdbd_conn->db_conn, &user, 1, NULL)
!= SLURM_SUCCESS) {
comment = "Your user has not been added to the accounting system yet.";
error("%s", comment);
@@ -746,16 +746,16 @@ static int _add_users(slurmdbd_conn_t *slurmdbd_conn,
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
rc = ESLURM_ACCESS_DENIED;
- goto end_it;
+ goto end_it;
}
/* If the user is a coord of any acct they can add
* users they are only able to make associations to
* these users if they are coordinators of the
* account they are trying to add to
- */
+ */
}
- if (slurmdbd_unpack_list_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_list_msg(slurmdbd_conn->rpc_version,
DBD_ADD_USERS, &get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_ADD_USERS message";
@@ -763,14 +763,14 @@ static int _add_users(slurmdbd_conn_t *slurmdbd_conn,
rc = SLURM_ERROR;
goto end_it;
}
-
- rc = acct_storage_g_add_users(slurmdbd_conn->db_conn, *uid,
+
+ rc = acct_storage_g_add_users(slurmdbd_conn->db_conn, *uid,
get_msg->my_list);
end_it:
- slurmdbd_free_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_list_msg(slurmdbd_conn->rpc_version,
get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_ADD_USERS);
return rc;
}
@@ -784,15 +784,15 @@ static int _add_wckeys(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_ADD_WCKEYS: called");
if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
- && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
+ && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< ACCT_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
rc = ESLURM_ACCESS_DENIED;
- goto end_it;
+ goto end_it;
}
- if (slurmdbd_unpack_list_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_list_msg(slurmdbd_conn->rpc_version,
DBD_ADD_WCKEYS, &get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_ADD_WCKEYS message";
@@ -800,14 +800,14 @@ static int _add_wckeys(slurmdbd_conn_t *slurmdbd_conn,
rc = SLURM_ERROR;
goto end_it;
}
-
- rc = acct_storage_g_add_wckeys(slurmdbd_conn->db_conn, *uid,
+
+ rc = acct_storage_g_add_wckeys(slurmdbd_conn->db_conn, *uid,
get_msg->my_list);
end_it:
- slurmdbd_free_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_list_msg(slurmdbd_conn->rpc_version,
get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_ADD_WCKEYS);
return rc;
}
@@ -840,7 +840,7 @@ static int _add_reservation(slurmdbd_conn_t *slurmdbd_conn,
end_it:
slurmdbd_free_rec_msg(slurmdbd_conn->rpc_version,
DBD_ADD_RESV, rec_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_ADD_RESV);
return rc;
}
@@ -855,15 +855,15 @@ static int _archive_dump(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_ARCHIVE_DUMP: called");
if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
- && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
+ && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< ACCT_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
rc = ESLURM_ACCESS_DENIED;
- goto end_it;
+ goto end_it;
}
- if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
DBD_ARCHIVE_DUMP, &get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_ARCHIVE_DUMP message";
@@ -880,7 +880,7 @@ static int _archive_dump(slurmdbd_conn_t *slurmdbd_conn,
if(arch_cond->archive_jobs == (uint16_t)NO_VAL)
arch_cond->archive_jobs = slurmdbd_conf->archive_jobs;
if(!arch_cond->archive_script)
- arch_cond->archive_script =
+ arch_cond->archive_script =
xstrdup(slurmdbd_conf->archive_script);
if(arch_cond->archive_steps == (uint16_t)NO_VAL)
arch_cond->archive_steps = slurmdbd_conf->archive_steps;
@@ -897,15 +897,15 @@ static int _archive_dump(slurmdbd_conn_t *slurmdbd_conn,
rc = jobacct_storage_g_archive(slurmdbd_conn->db_conn, arch_cond);
if(rc != SLURM_SUCCESS) {
- if(errno == EACCES)
+ if(errno == EACCES)
comment = "Problem accessing file.";
else
comment = "Error with request.";
}
end_it:
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_ARCHIVE_DUMP, get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_ARCHIVE_DUMP);
return rc;
}
@@ -919,33 +919,33 @@ static int _archive_load(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_ARCHIVE_LOAD: called");
if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
- && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
+ && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< ACCT_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
rc = ESLURM_ACCESS_DENIED;
- goto end_it;
+ goto end_it;
}
- if (unpack_acct_archive_rec((void *)&arch_rec,
- slurmdbd_conn->rpc_version,
+ if (unpack_acct_archive_rec((void *)&arch_rec,
+ slurmdbd_conn->rpc_version,
in_buffer) != SLURM_SUCCESS) {
comment = "Failed to unpack DBD_ARCHIVE_LOAD message";
error("%s", comment);
rc = SLURM_ERROR;
goto end_it;
}
-
+
rc = jobacct_storage_g_archive_load(slurmdbd_conn->db_conn, arch_rec);
- if(rc == ENOENT)
+ if(rc == ENOENT)
comment = "No archive file given to recover.";
else if(rc != SLURM_SUCCESS)
comment = "Error with request.";
-
+
end_it:
destroy_acct_archive_rec(arch_rec);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_ARCHIVE_LOAD);
return rc;
}
@@ -963,7 +963,7 @@ static int _cluster_procs(slurmdbd_conn_t *slurmdbd_conn,
rc = ESLURM_ACCESS_DENIED;
goto end_it;
}
- if (slurmdbd_unpack_cluster_procs_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_cluster_procs_msg(slurmdbd_conn->rpc_version,
&cluster_procs_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_CLUSTER_PROCS message";
@@ -982,14 +982,14 @@ static int _cluster_procs(slurmdbd_conn_t *slurmdbd_conn,
cluster_procs_msg->proc_count,
cluster_procs_msg->event_time);
end_it:
- slurmdbd_free_cluster_procs_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cluster_procs_msg(slurmdbd_conn->rpc_version,
cluster_procs_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_CLUSTER_PROCS);
return rc;
}
-static int _get_accounts(slurmdbd_conn_t *slurmdbd_conn,
+static int _get_accounts(slurmdbd_conn_t *slurmdbd_conn,
Buf in_buffer, Buf *out_buffer, uint32_t *uid)
{
dbd_cond_msg_t *get_msg = NULL;
@@ -998,17 +998,17 @@ static int _get_accounts(slurmdbd_conn_t *slurmdbd_conn,
int rc = SLURM_SUCCESS;
debug2("DBD_GET_ACCOUNTS: called");
- if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_ACCOUNTS, &get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_GET_ACCOUNTS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR, comment,
DBD_GET_ACCOUNTS);
return SLURM_ERROR;
}
-
+
list_msg.my_list = acct_storage_g_get_accounts(slurmdbd_conn->db_conn,
*uid, get_msg->cond);
if(!errno) {
@@ -1016,17 +1016,17 @@ static int _get_accounts(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_ACCOUNTS, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
- DBD_GOT_ACCOUNTS, &list_msg,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ DBD_GOT_ACCOUNTS, &list_msg,
*out_buffer);
} else {
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
- errno, slurm_strerror(errno),
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ errno, slurm_strerror(errno),
DBD_GET_ACCOUNTS);
- rc = SLURM_ERROR;
+ rc = SLURM_ERROR;
}
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_ACCOUNTS, get_msg);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
@@ -1034,7 +1034,7 @@ static int _get_accounts(slurmdbd_conn_t *slurmdbd_conn,
return rc;
}
-static int _get_assocs(slurmdbd_conn_t *slurmdbd_conn,
+static int _get_assocs(slurmdbd_conn_t *slurmdbd_conn,
Buf in_buffer, Buf *out_buffer, uint32_t *uid)
{
dbd_cond_msg_t *get_msg = NULL;
@@ -1043,17 +1043,17 @@ static int _get_assocs(slurmdbd_conn_t *slurmdbd_conn,
int rc = SLURM_SUCCESS;
debug2("DBD_GET_ASSOCS: called");
- if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_ASSOCS, &get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_GET_ASSOCS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR, comment,
DBD_GET_ASSOCS);
return SLURM_ERROR;
}
-
+
list_msg.my_list = acct_storage_g_get_associations(
slurmdbd_conn->db_conn, *uid, get_msg->cond);
@@ -1062,25 +1062,25 @@ static int _get_assocs(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_ASSOCS, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_ASSOCS, &list_msg, *out_buffer);
} else {
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
- errno, slurm_strerror(errno),
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ errno, slurm_strerror(errno),
DBD_GET_ASSOCS);
- rc = SLURM_ERROR;
+ rc = SLURM_ERROR;
}
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_ASSOCS, get_msg);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
-
+
return rc;
}
-static int _get_clusters(slurmdbd_conn_t *slurmdbd_conn,
+static int _get_clusters(slurmdbd_conn_t *slurmdbd_conn,
Buf in_buffer, Buf *out_buffer, uint32_t *uid)
{
dbd_cond_msg_t *get_msg = NULL;
@@ -1089,17 +1089,17 @@ static int _get_clusters(slurmdbd_conn_t *slurmdbd_conn,
int rc = SLURM_SUCCESS;
debug2("DBD_GET_CLUSTERS: called");
- if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_CLUSTERS, &get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_GET_CLUSTERS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR, comment,
DBD_GET_CLUSTERS);
return SLURM_ERROR;
}
-
+
list_msg.my_list = acct_storage_g_get_clusters(
slurmdbd_conn->db_conn, *uid, get_msg->cond);
@@ -1108,26 +1108,26 @@ static int _get_clusters(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_CLUSTERS, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_CLUSTERS, &list_msg,
*out_buffer);
} else {
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
- errno, slurm_strerror(errno),
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ errno, slurm_strerror(errno),
DBD_GET_CLUSTERS);
- rc = SLURM_ERROR;
+ rc = SLURM_ERROR;
}
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_CLUSTERS, get_msg);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
-
+
return rc;
}
-static int _get_config(slurmdbd_conn_t *slurmdbd_conn,
+static int _get_config(slurmdbd_conn_t *slurmdbd_conn,
Buf in_buffer, Buf *out_buffer, uint32_t *uid)
{
dbd_list_msg_t list_msg = { NULL };
@@ -1138,7 +1138,7 @@ static int _get_config(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = dump_config();
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_CONFIG, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_CONFIG, &list_msg, *out_buffer);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
@@ -1146,7 +1146,7 @@ static int _get_config(slurmdbd_conn_t *slurmdbd_conn,
return SLURM_SUCCESS;
}
-static int _get_jobs(slurmdbd_conn_t *slurmdbd_conn,
+static int _get_jobs(slurmdbd_conn_t *slurmdbd_conn,
Buf in_buffer, Buf *out_buffer, uint32_t *uid)
{
dbd_get_jobs_msg_t *get_jobs_msg = NULL;
@@ -1156,17 +1156,17 @@ static int _get_jobs(slurmdbd_conn_t *slurmdbd_conn,
int rc = SLURM_SUCCESS;
debug2("DBD_GET_JOBS: called");
- if (slurmdbd_unpack_get_jobs_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_get_jobs_msg(slurmdbd_conn->rpc_version,
&get_jobs_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_GET_JOBS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
- SLURM_ERROR, comment,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ SLURM_ERROR, comment,
DBD_GET_JOBS);
return SLURM_ERROR;
}
-
+
memset(&job_cond, 0, sizeof(acct_job_cond_t));
job_cond.acct_list = get_jobs_msg->selected_steps;
@@ -1179,20 +1179,20 @@ static int _get_jobs(slurmdbd_conn_t *slurmdbd_conn,
char *temp = xstrdup_printf("%u", pw_uid);
job_cond.userid_list = list_create(slurm_destroy_char);
list_append(job_cond.userid_list, temp);
- }
+ }
}
if (get_jobs_msg->gid >=0) {
char *temp = xstrdup_printf("%u", get_jobs_msg->gid);
job_cond.groupid_list = list_create(slurm_destroy_char);
list_append(job_cond.groupid_list, temp);
- }
+ }
if (get_jobs_msg->cluster_name) {
job_cond.cluster_list = list_create(NULL);
list_append(job_cond.cluster_list, get_jobs_msg->cluster_name);
- }
-
+ }
+
list_msg.my_list = jobacct_storage_g_get_jobs_cond(
slurmdbd_conn->db_conn, *uid, &job_cond);
@@ -1201,13 +1201,13 @@ static int _get_jobs(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_JOBS, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_JOBS, &list_msg, *out_buffer);
} else {
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
- errno, slurm_strerror(errno),
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ errno, slurm_strerror(errno),
DBD_GET_JOBS);
- rc = SLURM_ERROR;
+ rc = SLURM_ERROR;
}
if(job_cond.cluster_list)
@@ -1221,11 +1221,11 @@ static int _get_jobs(slurmdbd_conn_t *slurmdbd_conn,
if(list_msg.my_list)
list_destroy(list_msg.my_list);
-
+
return rc;
}
-static int _get_jobs_cond(slurmdbd_conn_t *slurmdbd_conn,
+static int _get_jobs_cond(slurmdbd_conn_t *slurmdbd_conn,
Buf in_buffer, Buf *out_buffer, uint32_t *uid)
{
dbd_cond_msg_t *cond_msg = NULL;
@@ -1234,13 +1234,13 @@ static int _get_jobs_cond(slurmdbd_conn_t *slurmdbd_conn,
int rc = SLURM_SUCCESS;
debug2("DBD_GET_JOBS_COND: called");
- if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_JOBS_COND, &cond_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_GET_JOBS_COND message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
- SLURM_ERROR, comment,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ SLURM_ERROR, comment,
DBD_GET_JOBS_COND);
return SLURM_ERROR;
}
@@ -1253,24 +1253,24 @@ static int _get_jobs_cond(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_JOBS, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_JOBS, &list_msg, *out_buffer);
} else {
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
- errno, slurm_strerror(errno),
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ errno, slurm_strerror(errno),
DBD_GET_JOBS_COND);
- rc = SLURM_ERROR;
+ rc = SLURM_ERROR;
}
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_JOBS_COND, cond_msg);
if(list_msg.my_list)
- list_destroy(list_msg.my_list);
-
+ list_destroy(list_msg.my_list);
+
return rc;
}
-static int _get_probs(slurmdbd_conn_t *slurmdbd_conn,
+static int _get_probs(slurmdbd_conn_t *slurmdbd_conn,
Buf in_buffer, Buf *out_buffer, uint32_t *uid)
{
dbd_cond_msg_t *get_msg = NULL;
@@ -1285,24 +1285,24 @@ static int _get_probs(slurmdbd_conn_t *slurmdbd_conn,
< ACCT_ADMIN_OPERATOR) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
ESLURM_ACCESS_DENIED,
comment, DBD_GET_PROBS);
return ESLURM_ACCESS_DENIED;
}
- if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_PROBS, &get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_GET_PROBS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR, comment,
DBD_GET_PROBS);
return SLURM_ERROR;
}
-
+
list_msg.my_list = acct_storage_g_get_problems(
slurmdbd_conn->db_conn, *uid, get_msg->cond);
@@ -1311,25 +1311,25 @@ static int _get_probs(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_PROBS, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_PROBS, &list_msg, *out_buffer);
} else {
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
- errno, slurm_strerror(errno),
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ errno, slurm_strerror(errno),
DBD_GET_PROBS);
- rc = SLURM_ERROR;
+ rc = SLURM_ERROR;
}
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_PROBS, get_msg);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
-
+
return rc;
}
-static int _get_qos(slurmdbd_conn_t *slurmdbd_conn,
+static int _get_qos(slurmdbd_conn_t *slurmdbd_conn,
Buf in_buffer, Buf *out_buffer, uint32_t *uid)
{
dbd_cond_msg_t *cond_msg = NULL;
@@ -1338,17 +1338,17 @@ static int _get_qos(slurmdbd_conn_t *slurmdbd_conn,
int rc = SLURM_SUCCESS;
debug2("DBD_GET_QOS: called");
- if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_QOS, &cond_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_GET_QOS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
- SLURM_ERROR, comment,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ SLURM_ERROR, comment,
DBD_GET_QOS);
return SLURM_ERROR;
}
-
+
list_msg.my_list = acct_storage_g_get_qos(slurmdbd_conn->db_conn, *uid,
cond_msg->cond);
@@ -1360,24 +1360,24 @@ static int _get_qos(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_QOS, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_QOS, &list_msg, *out_buffer);
} else {
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
- errno, slurm_strerror(errno),
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ errno, slurm_strerror(errno),
DBD_GET_QOS);
- rc = SLURM_ERROR;
+ rc = SLURM_ERROR;
}
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_QOS, cond_msg);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
-
+
return rc;
}
-static int _get_txn(slurmdbd_conn_t *slurmdbd_conn,
+static int _get_txn(slurmdbd_conn_t *slurmdbd_conn,
Buf in_buffer, Buf *out_buffer, uint32_t *uid)
{
dbd_cond_msg_t *cond_msg = NULL;
@@ -1386,13 +1386,13 @@ static int _get_txn(slurmdbd_conn_t *slurmdbd_conn,
int rc = SLURM_SUCCESS;
debug2("DBD_GET_TXN: called");
- if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_TXN, &cond_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_GET_TXN message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
- SLURM_ERROR, comment,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ SLURM_ERROR, comment,
DBD_GET_TXN);
return SLURM_ERROR;
}
@@ -1405,20 +1405,20 @@ static int _get_txn(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_TXN, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_TXN, &list_msg, *out_buffer);
} else {
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
- errno, slurm_strerror(errno),
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ errno, slurm_strerror(errno),
DBD_GET_TXN);
- rc = SLURM_ERROR;
+ rc = SLURM_ERROR;
}
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_TXN, cond_msg);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
-
+
return rc;
}
@@ -1436,12 +1436,12 @@ static int _get_usage(uint16_t type, slurmdbd_conn_t *slurmdbd_conn,
info("DBD_GET_USAGE: called type is %s",
slurmdbd_msg_type_2_str(type, 1));
- if (slurmdbd_unpack_usage_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_usage_msg(slurmdbd_conn->rpc_version,
type, &get_msg, in_buffer) !=
SLURM_SUCCESS) {
- comment = "Failed to unpack DBD_GET_USAGE message";
+ comment = "Failed to unpack DBD_GET_USAGE message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR, comment, type);
return SLURM_ERROR;
}
@@ -1461,36 +1461,36 @@ static int _get_usage(uint16_t type, slurmdbd_conn_t *slurmdbd_conn,
default:
comment = "Unknown type of usage to get";
error("%s %u", comment, type);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR, comment, type);
return SLURM_ERROR;
- }
+ }
rc = (*(my_function))(slurmdbd_conn->db_conn, *uid, get_msg->rec, type,
get_msg->start, get_msg->end);
- slurmdbd_free_usage_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_usage_msg(slurmdbd_conn->rpc_version,
type, get_msg);
if(rc != SLURM_SUCCESS) {
comment = "Problem getting usage info";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, type);
return rc;
-
+
}
memset(&got_msg, 0, sizeof(dbd_usage_msg_t));
got_msg.rec = get_msg->rec;
get_msg->rec = NULL;
*out_buffer = init_buf(1024);
pack16((uint16_t) ret_type, *out_buffer);
- slurmdbd_pack_usage_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_usage_msg(slurmdbd_conn->rpc_version,
ret_type, &got_msg, *out_buffer);
-
+
return SLURM_SUCCESS;
}
-static int _get_users(slurmdbd_conn_t *slurmdbd_conn,
+static int _get_users(slurmdbd_conn_t *slurmdbd_conn,
Buf in_buffer, Buf *out_buffer, uint32_t *uid)
{
dbd_cond_msg_t *get_msg = NULL;
@@ -1500,17 +1500,17 @@ static int _get_users(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_GET_USERS: called");
- if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_USERS, &get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_GET_USERS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR, comment,
DBD_GET_USERS);
return SLURM_ERROR;
}
-
+
list_msg.my_list = acct_storage_g_get_users(slurmdbd_conn->db_conn,
*uid, get_msg->cond);
@@ -1519,24 +1519,24 @@ static int _get_users(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_USERS, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_USERS, &list_msg, *out_buffer);
} else {
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
- errno, slurm_strerror(errno),
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ errno, slurm_strerror(errno),
DBD_GET_USERS);
- rc = SLURM_ERROR;
+ rc = SLURM_ERROR;
}
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_USERS, get_msg);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
-
+
return rc;
}
-static int _get_wckeys(slurmdbd_conn_t *slurmdbd_conn,
+static int _get_wckeys(slurmdbd_conn_t *slurmdbd_conn,
Buf in_buffer, Buf *out_buffer, uint32_t *uid)
{
dbd_cond_msg_t *get_msg = NULL;
@@ -1547,27 +1547,27 @@ static int _get_wckeys(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_GET_WCKEYS: called");
if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
- && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
+ && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< ACCT_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
ESLURM_ACCESS_DENIED, comment,
DBD_GET_WCKEYS);
return ESLURM_ACCESS_DENIED;
}
- if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_WCKEYS, &get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_GET_WCKEYS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR, comment,
DBD_GET_WCKEYS);
return SLURM_ERROR;
}
-
+
list_msg.my_list = acct_storage_g_get_wckeys(slurmdbd_conn->db_conn,
*uid, get_msg->cond);
@@ -1576,24 +1576,24 @@ static int _get_wckeys(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_WCKEYS, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_WCKEYS, &list_msg, *out_buffer);
} else {
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
- errno, slurm_strerror(errno),
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ errno, slurm_strerror(errno),
DBD_GET_WCKEYS);
- rc = SLURM_ERROR;
+ rc = SLURM_ERROR;
}
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_WCKEYS, get_msg);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
-
+
return rc;
}
-static int _get_reservations(slurmdbd_conn_t *slurmdbd_conn,
+static int _get_reservations(slurmdbd_conn_t *slurmdbd_conn,
Buf in_buffer, Buf *out_buffer, uint32_t *uid)
{
dbd_cond_msg_t *get_msg = NULL;
@@ -1603,17 +1603,17 @@ static int _get_reservations(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_GET_RESVS: called");
- if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_RESVS, &get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_GET_RESVS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR, comment,
DBD_GET_RESVS);
return SLURM_ERROR;
}
-
+
list_msg.my_list = acct_storage_g_get_reservations(
slurmdbd_conn->db_conn, *uid, get_msg->cond);
@@ -1622,20 +1622,20 @@ static int _get_reservations(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_RESVS, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_RESVS, &list_msg, *out_buffer);
} else {
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
- errno, slurm_strerror(errno),
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ errno, slurm_strerror(errno),
DBD_GET_RESVS);
- rc = SLURM_ERROR;
+ rc = SLURM_ERROR;
}
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_GET_RESVS, get_msg);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
-
+
return rc;
}
@@ -1652,7 +1652,7 @@ static int _flush_jobs(slurmdbd_conn_t *slurmdbd_conn,
rc = ESLURM_ACCESS_DENIED;
goto end_it;
}
- if (slurmdbd_unpack_cluster_procs_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_cluster_procs_msg(slurmdbd_conn->rpc_version,
&cluster_procs_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_FLUSH_JOBS message";
@@ -1668,9 +1668,9 @@ static int _flush_jobs(slurmdbd_conn_t *slurmdbd_conn,
cluster_procs_msg->cluster_name,
cluster_procs_msg->event_time);
end_it:
- slurmdbd_free_cluster_procs_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cluster_procs_msg(slurmdbd_conn->rpc_version,
cluster_procs_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_FLUSH_JOBS);
return rc;
}
@@ -1682,8 +1682,8 @@ static int _init_conn(slurmdbd_conn_t *slurmdbd_conn,
char *comment = NULL;
int rc = SLURM_SUCCESS;
- if ((rc = slurmdbd_unpack_init_msg(slurmdbd_conn->rpc_version,
- &init_msg, in_buffer,
+ if ((rc = slurmdbd_unpack_init_msg(slurmdbd_conn->rpc_version,
+ &init_msg, in_buffer,
slurmdbd_conf->auth_info))
!= SLURM_SUCCESS) {
comment = "Failed to unpack DBD_INIT message";
@@ -1695,15 +1695,15 @@ static int _init_conn(slurmdbd_conn_t *slurmdbd_conn,
comment = "Incompatible RPC version";
error("Incompatible RPC version received "
"(%u not between %d and %d)",
- init_msg->version,
+ init_msg->version,
SLURMDBD_VERSION_MIN, SLURMDBD_VERSION);
rc = SLURM_PROTOCOL_VERSION_ERROR;
goto end_it;
}
*uid = init_msg->uid;
-
+
debug("DBD_INIT: VERSION:%u UID:%u IP:%s CONN:%u",
- init_msg->version, init_msg->uid,
+ init_msg->version, init_msg->uid,
slurmdbd_conn->ip, slurmdbd_conn->newsockfd);
slurmdbd_conn->db_conn = acct_storage_g_get_connection(
false, slurmdbd_conn->newsockfd, init_msg->rollback);
@@ -1714,7 +1714,7 @@ static int _init_conn(slurmdbd_conn_t *slurmdbd_conn,
}
end_it:
slurmdbd_free_init_msg(slurmdbd_conn->rpc_version, init_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_INIT);
return rc;
@@ -1727,14 +1727,14 @@ static int _fini_conn(slurmdbd_conn_t *slurmdbd_conn, Buf in_buffer,
char *comment = NULL;
int rc = SLURM_SUCCESS;
- if (slurmdbd_unpack_fini_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_fini_msg(slurmdbd_conn->rpc_version,
&fini_msg, in_buffer) != SLURM_SUCCESS) {
comment = "Failed to unpack DBD_FINI message";
error("%s", comment);
rc = SLURM_ERROR;
goto end_it;
}
-
+
debug2("DBD_FINI: CLOSE:%u COMMIT:%u",
fini_msg->close_conn, fini_msg->commit);
if(fini_msg->close_conn == 1)
@@ -1743,9 +1743,9 @@ static int _fini_conn(slurmdbd_conn_t *slurmdbd_conn, Buf in_buffer,
rc = acct_storage_g_commit(slurmdbd_conn->db_conn,
fini_msg->commit);
end_it:
- slurmdbd_free_fini_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_fini_msg(slurmdbd_conn->rpc_version,
fini_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_FINI);
return rc;
@@ -1767,7 +1767,7 @@ static int _job_complete(slurmdbd_conn_t *slurmdbd_conn,
rc = ESLURM_ACCESS_DENIED;
goto end_it;
}
- if (slurmdbd_unpack_job_complete_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_job_complete_msg(slurmdbd_conn->rpc_version,
&job_comp_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_JOB_COMPLETE message";
@@ -1801,9 +1801,9 @@ static int _job_complete(slurmdbd_conn_t *slurmdbd_conn,
/* just incase this gets set we need to clear it */
xfree(job.wckey);
end_it:
- slurmdbd_free_job_complete_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_job_complete_msg(slurmdbd_conn->rpc_version,
job_comp_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_JOB_COMPLETE);
return SLURM_SUCCESS;
}
@@ -1820,17 +1820,17 @@ static int _job_start(slurmdbd_conn_t *slurmdbd_conn,
if (*uid != slurmdbd_conf->slurm_user_id) {
comment = "DBD_JOB_START message from invalid uid";
error("%s %u", comment, *uid);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
ESLURM_ACCESS_DENIED, comment,
DBD_JOB_START);
return SLURM_ERROR;
}
- if (slurmdbd_unpack_job_start_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_job_start_msg(slurmdbd_conn->rpc_version,
&job_start_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_JOB_START message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR, comment,
DBD_JOB_START);
return SLURM_ERROR;
@@ -1865,11 +1865,11 @@ static int _job_start(slurmdbd_conn_t *slurmdbd_conn,
job.details = &details;
if(job.start_time) {
- debug2("DBD_JOB_START: START CALL ID:%u NAME:%s INX:%u",
- job_start_msg->job_id, job_start_msg->name,
- job.db_index);
+ debug2("DBD_JOB_START: START CALL ID:%u NAME:%s INX:%u",
+ job_start_msg->job_id, job_start_msg->name,
+ job.db_index);
} else {
- debug2("DBD_JOB_START: ELIGIBLE CALL ID:%u NAME:%s",
+ debug2("DBD_JOB_START: ELIGIBLE CALL ID:%u NAME:%s",
job_start_msg->job_id, job_start_msg->name);
}
id_rc_msg.return_code = jobacct_storage_g_job_start(
@@ -1880,11 +1880,11 @@ static int _job_start(slurmdbd_conn_t *slurmdbd_conn,
if(!job_start_msg->wckey)
xfree(job.wckey);
- slurmdbd_free_job_start_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_job_start_msg(slurmdbd_conn->rpc_version,
job_start_msg);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_ID_RC, *out_buffer);
- slurmdbd_pack_id_rc_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_id_rc_msg(slurmdbd_conn->rpc_version,
&id_rc_msg, *out_buffer);
return SLURM_SUCCESS;
}
@@ -1904,7 +1904,7 @@ static int _job_suspend(slurmdbd_conn_t *slurmdbd_conn,
rc = ESLURM_ACCESS_DENIED;
goto end_it;
}
- if (slurmdbd_unpack_job_suspend_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_job_suspend_msg(slurmdbd_conn->rpc_version,
&job_suspend_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_JOB_SUSPEND message";
@@ -1913,8 +1913,8 @@ static int _job_suspend(slurmdbd_conn_t *slurmdbd_conn,
goto end_it;
}
- debug2("DBD_JOB_SUSPEND: ID:%u STATE:%s",
- job_suspend_msg->job_id,
+ debug2("DBD_JOB_SUSPEND: ID:%u STATE:%s",
+ job_suspend_msg->job_id,
job_state_string((enum job_states) job_suspend_msg->job_state));
memset(&job, 0, sizeof(struct job_record));
@@ -1936,9 +1936,9 @@ static int _job_suspend(slurmdbd_conn_t *slurmdbd_conn,
/* just incase this gets set we need to clear it */
xfree(job.wckey);
end_it:
- slurmdbd_free_job_suspend_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_job_suspend_msg(slurmdbd_conn->rpc_version,
job_suspend_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_JOB_SUSPEND);
return SLURM_SUCCESS;
}
@@ -1957,24 +1957,24 @@ static int _modify_accounts(slurmdbd_conn_t *slurmdbd_conn,
< ACCT_ADMIN_OPERATOR) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
ESLURM_ACCESS_DENIED,
comment, DBD_MODIFY_ACCOUNTS);
return ESLURM_ACCESS_DENIED;
}
- if (slurmdbd_unpack_modify_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_modify_msg(slurmdbd_conn->rpc_version,
DBD_MODIFY_ACCOUNTS, &get_msg,
in_buffer) != SLURM_SUCCESS) {
comment = "Failed to unpack DBD_MODIFY_ACCOUNTS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR,
comment, DBD_MODIFY_ACCOUNTS);
return SLURM_ERROR;
}
-
+
if(!(list_msg.my_list = acct_storage_g_modify_accounts(
slurmdbd_conn->db_conn, *uid, get_msg->cond,
@@ -1993,22 +1993,22 @@ static int _modify_accounts(slurmdbd_conn_t *slurmdbd_conn,
rc = errno;
} else {
rc = errno;
- if(!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
- slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
DBD_MODIFY_ACCOUNTS, get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_MODIFY_ACCOUNTS);
- return rc;
+ return rc;
}
- slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
DBD_MODIFY_ACCOUNTS, get_msg);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_LIST, &list_msg, *out_buffer);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
@@ -2025,17 +2025,17 @@ static int _modify_assocs(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_MODIFY_ASSOCS: called");
- if (slurmdbd_unpack_modify_msg(slurmdbd_conn->rpc_version,
- DBD_MODIFY_ASSOCS, &get_msg,
+ if (slurmdbd_unpack_modify_msg(slurmdbd_conn->rpc_version,
+ DBD_MODIFY_ASSOCS, &get_msg,
in_buffer) != SLURM_SUCCESS) {
comment = "Failed to unpack DBD_MODIFY_ASSOCS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR,
comment, DBD_MODIFY_ASSOCS);
return SLURM_ERROR;
}
-
+
/* All authentication needs to be done inside the plugin since we are
* unable to know what accounts this request is talking about
@@ -2059,22 +2059,22 @@ static int _modify_assocs(slurmdbd_conn_t *slurmdbd_conn,
rc = errno;
} else {
rc = errno;
- if(!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
- slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
DBD_MODIFY_ASSOCS, get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_MODIFY_ASSOCS);
return rc;
}
- slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
DBD_MODIFY_ASSOCS, get_msg);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_LIST, &list_msg, *out_buffer);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
@@ -2095,24 +2095,24 @@ static int _modify_clusters(slurmdbd_conn_t *slurmdbd_conn,
< ACCT_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
ESLURM_ACCESS_DENIED,
comment, DBD_MODIFY_CLUSTERS);
return ESLURM_ACCESS_DENIED;
}
- if (slurmdbd_unpack_modify_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_modify_msg(slurmdbd_conn->rpc_version,
DBD_MODIFY_CLUSTERS, &get_msg,
in_buffer) != SLURM_SUCCESS) {
comment = "Failed to unpack DBD_MODIFY_CLUSTERS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR,
comment, DBD_MODIFY_CLUSTERS);
return SLURM_ERROR;
}
-
+
debug2("DBD_MODIFY_CLUSTERS: called");
if(!(list_msg.my_list = acct_storage_g_modify_clusters(
@@ -2132,22 +2132,22 @@ static int _modify_clusters(slurmdbd_conn_t *slurmdbd_conn,
rc = errno;
} else {
rc = errno;
- if(!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
- slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
DBD_MODIFY_CLUSTERS, get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_MODIFY_CLUSTERS);
return rc;
}
- slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
DBD_MODIFY_CLUSTERS, get_msg);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_LIST, &list_msg, *out_buffer);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
@@ -2168,24 +2168,24 @@ static int _modify_qos(slurmdbd_conn_t *slurmdbd_conn,
< ACCT_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
ESLURM_ACCESS_DENIED,
comment, DBD_MODIFY_QOS);
return ESLURM_ACCESS_DENIED;
}
- if (slurmdbd_unpack_modify_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_modify_msg(slurmdbd_conn->rpc_version,
DBD_MODIFY_QOS, &get_msg,
in_buffer) != SLURM_SUCCESS) {
comment = "Failed to unpack DBD_MODIFY_QOS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR,
comment, DBD_MODIFY_QOS);
return SLURM_ERROR;
}
-
+
debug2("DBD_MODIFY_QOS: called");
if(!(list_msg.my_list = acct_storage_g_modify_qos(
@@ -2208,22 +2208,22 @@ static int _modify_qos(slurmdbd_conn_t *slurmdbd_conn,
rc = errno;
} else {
rc = errno;
- if(!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
- slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
DBD_MODIFY_QOS, get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_MODIFY_QOS);
return rc;
}
- slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
DBD_MODIFY_QOS, get_msg);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_LIST, &list_msg, *out_buffer);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
@@ -2243,26 +2243,26 @@ static int _modify_users(slurmdbd_conn_t *slurmdbd_conn,
*uid);
acct_user_cond_t *user_cond = NULL;
acct_user_rec_t *user_rec = NULL;
-
+
debug2("DBD_MODIFY_USERS: called");
- if (slurmdbd_unpack_modify_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_modify_msg(slurmdbd_conn->rpc_version,
DBD_MODIFY_USERS, &get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_MODIFY_USERS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR,
comment, DBD_MODIFY_USERS);
return SLURM_ERROR;
}
-
+
user_cond = (acct_user_cond_t *)get_msg->cond;
user_rec = (acct_user_rec_t *)get_msg->rec;
-
+
if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& admin_level < ACCT_ADMIN_OPERATOR) {
- if(user_cond && user_cond->assoc_cond
+ if(user_cond && user_cond->assoc_cond
&& user_cond->assoc_cond->user_list
&& (list_count(user_cond->assoc_cond->user_list) == 1)) {
uid_t pw_uid;
@@ -2276,7 +2276,7 @@ static int _modify_users(slurmdbd_conn_t *slurmdbd_conn,
}
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
ESLURM_ACCESS_DENIED,
comment, DBD_MODIFY_USERS);
@@ -2284,9 +2284,9 @@ static int _modify_users(slurmdbd_conn_t *slurmdbd_conn,
}
is_same_user:
-
+
/* same_user can only alter the default account, default wckey
- * nothing else */
+ * nothing else */
if(same_user) {
/* If we add anything else here for the user we will
* need to document it
@@ -2294,16 +2294,16 @@ is_same_user:
if((user_rec->admin_level != ACCT_ADMIN_NOTSET)) {
comment = "You can only change your own default account, default wckey nothing else";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
ESLURM_ACCESS_DENIED,
comment,
DBD_MODIFY_USERS);
-
- return ESLURM_ACCESS_DENIED;
- }
+
+ return ESLURM_ACCESS_DENIED;
+ }
}
- if((user_rec->admin_level != ACCT_ADMIN_NOTSET)
+ if((user_rec->admin_level != ACCT_ADMIN_NOTSET)
&& (*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& (admin_level < user_rec->admin_level)) {
comment = "You have to be the same or higher admin level to change another persons";
@@ -2326,22 +2326,22 @@ is_same_user:
rc = errno;
} else {
rc = errno;
- if(!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
- slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
DBD_MODIFY_USERS, get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_MODIFY_USERS);
return rc;
}
- slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
DBD_MODIFY_USERS, get_msg);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_LIST, &list_msg, *out_buffer);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
@@ -2362,24 +2362,24 @@ static int _modify_wckeys(slurmdbd_conn_t *slurmdbd_conn,
< ACCT_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
ESLURM_ACCESS_DENIED,
comment, DBD_MODIFY_WCKEYS);
return ESLURM_ACCESS_DENIED;
}
- if (slurmdbd_unpack_modify_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_modify_msg(slurmdbd_conn->rpc_version,
DBD_MODIFY_WCKEYS, &get_msg,
in_buffer) != SLURM_SUCCESS) {
comment = "Failed to unpack DBD_MODIFY_WCKEYS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR,
comment, DBD_MODIFY_WCKEYS);
return SLURM_ERROR;
}
-
+
debug2("DBD_MODIFY_WCKEYS: called");
if(!(list_msg.my_list = acct_storage_g_modify_wckeys(
@@ -2399,22 +2399,22 @@ static int _modify_wckeys(slurmdbd_conn_t *slurmdbd_conn,
rc = errno;
} else {
rc = errno;
- if(!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
- slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
DBD_MODIFY_WCKEYS, get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_MODIFY_WCKEYS);
return rc;
}
- slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_modify_msg(slurmdbd_conn->rpc_version,
DBD_MODIFY_WCKEYS, get_msg);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_LIST, &list_msg, *out_buffer);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
@@ -2450,7 +2450,7 @@ static int _modify_reservation(slurmdbd_conn_t *slurmdbd_conn,
end_it:
slurmdbd_free_rec_msg(slurmdbd_conn->rpc_version,
DBD_MODIFY_RESV, rec_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_MODIFY_RESV);
return rc;
}
@@ -2470,7 +2470,7 @@ static int _node_state(slurmdbd_conn_t *slurmdbd_conn,
rc = ESLURM_ACCESS_DENIED;
goto end_it;
}
- if (slurmdbd_unpack_node_state_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_node_state_msg(slurmdbd_conn->rpc_version,
&node_state_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_NODE_STATE message";
@@ -2485,15 +2485,15 @@ static int _node_state(slurmdbd_conn_t *slurmdbd_conn,
node_ptr.node_state = node_state_msg->state;
slurmctld_conf.fast_schedule = 0;
-
+
if(!node_ptr.cpus)
node_state_msg->new_state = DBD_NODE_STATE_UP;
if(node_state_msg->new_state == DBD_NODE_STATE_UP) {
- debug3("DBD_NODE_STATE: NODE:%s STATE:%s REASON:%s TIME:%u",
+ debug3("DBD_NODE_STATE: NODE:%s STATE:%s REASON:%s TIME:%u",
node_state_msg->hostlist,
_node_state_string(node_state_msg->new_state),
- node_state_msg->reason,
+ node_state_msg->reason,
node_state_msg->event_time);
rc = clusteracct_storage_g_node_up(
slurmdbd_conn->db_conn,
@@ -2501,10 +2501,10 @@ static int _node_state(slurmdbd_conn_t *slurmdbd_conn,
&node_ptr,
node_state_msg->event_time);
} else {
- debug2("DBD_NODE_STATE: NODE:%s STATE:%s REASON:%s TIME:%u",
+ debug2("DBD_NODE_STATE: NODE:%s STATE:%s REASON:%s TIME:%u",
node_state_msg->hostlist,
_node_state_string(node_state_msg->new_state),
- node_state_msg->reason,
+ node_state_msg->reason,
node_state_msg->event_time);
rc = clusteracct_storage_g_node_down(
slurmdbd_conn->db_conn,
@@ -2515,9 +2515,9 @@ static int _node_state(slurmdbd_conn_t *slurmdbd_conn,
}
end_it:
- slurmdbd_free_node_state_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_node_state_msg(slurmdbd_conn->rpc_version,
node_state_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_NODE_STATE);
return SLURM_SUCCESS;
}
@@ -2549,7 +2549,7 @@ static int _register_ctld(slurmdbd_conn_t *slurmdbd_conn,
rc = ESLURM_ACCESS_DENIED;
goto end_it;
}
- if (slurmdbd_unpack_register_ctld_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_register_ctld_msg(slurmdbd_conn->rpc_version,
®ister_ctld_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_REGISTER_CTLD message";
@@ -2575,7 +2575,7 @@ static int _register_ctld(slurmdbd_conn_t *slurmdbd_conn,
slurmdbd_conn->db_conn, *uid, &cluster_q, &cluster);
if(errno == EFAULT) {
comment = "Request to register was incomplete";
- rc = SLURM_ERROR;
+ rc = SLURM_ERROR;
} else if(errno == ESLURM_ACCESS_DENIED) {
comment = "Your user doesn't have privilege to preform this action";
rc = ESLURM_ACCESS_DENIED;
@@ -2585,11 +2585,11 @@ static int _register_ctld(slurmdbd_conn_t *slurmdbd_conn,
} else if(!list_msg.my_list || !list_count(list_msg.my_list)) {
comment = "This cluster hasn't been added to accounting yet";
rc = SLURM_ERROR;
- }
-
+ }
+
if(list_msg.my_list)
list_destroy(list_msg.my_list);
-
+
list_destroy(cluster_q.cluster_list);
/*
@@ -2609,7 +2609,7 @@ static int _register_ctld(slurmdbd_conn_t *slurmdbd_conn,
slurm_msg_t_init(&out_msg);
out_msg.msg_type = REQUEST_PING;
out_msg.flags = SLURM_GLOBAL_AUTH_KEY;
- slurm_send_node_msg(slurmdbd_conn->rpc_version,
+ slurm_send_node_msg(slurmdbd_conn->rpc_version,
fd, &out_msg);
/* We probably need to add matching recv_msg function
* for an arbitray fd or should these be fire and forget? */
@@ -2619,9 +2619,9 @@ static int _register_ctld(slurmdbd_conn_t *slurmdbd_conn,
#endif
end_it:
- slurmdbd_free_register_ctld_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_register_ctld_msg(slurmdbd_conn->rpc_version,
register_ctld_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_REGISTER_CTLD);
return rc;
}
@@ -2637,28 +2637,28 @@ static int _remove_accounts(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_REMOVE_ACCOUNTS: called");
if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
- && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
+ && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< ACCT_ADMIN_OPERATOR) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
ESLURM_ACCESS_DENIED,
comment, DBD_REMOVE_ACCOUNTS);
return ESLURM_ACCESS_DENIED;
}
- if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
- DBD_REMOVE_ACCOUNTS, &get_msg,
+ if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
+ DBD_REMOVE_ACCOUNTS, &get_msg,
in_buffer) != SLURM_SUCCESS) {
comment = "Failed to unpack DBD_REMOVE_ACCOUNTS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR,
comment, DBD_REMOVE_ACCOUNTS);
return SLURM_ERROR;
}
-
+
if(!(list_msg.my_list = acct_storage_g_remove_accounts(
slurmdbd_conn->db_conn, *uid, get_msg->cond))) {
if(errno == ESLURM_ACCESS_DENIED) {
@@ -2675,22 +2675,22 @@ static int _remove_accounts(slurmdbd_conn_t *slurmdbd_conn,
rc = errno;
} else {
rc = errno;
- if(!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_REMOVE_ACCOUNTS, get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_REMOVE_ACCOUNTS);
return rc;
}
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_REMOVE_ACCOUNTS, get_msg);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_LIST, &list_msg, *out_buffer);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
@@ -2709,17 +2709,17 @@ static int _remove_account_coords(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_REMOVE_ACCOUNT_COORDS: called");
- if (slurmdbd_unpack_acct_coord_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_acct_coord_msg(slurmdbd_conn->rpc_version,
&get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_REMOVE_ACCOUNT_COORDS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR, comment,
DBD_ADD_ACCOUNT_COORDS);
return SLURM_ERROR;
}
-
+
/* All authentication needs to be done inside the plugin since we are
* unable to know what accounts this request is talking about
* until we process it through the database.
@@ -2742,23 +2742,23 @@ static int _remove_account_coords(slurmdbd_conn_t *slurmdbd_conn,
rc = errno;
} else {
rc = errno;
- if(!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
- slurmdbd_free_acct_coord_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_acct_coord_msg(slurmdbd_conn->rpc_version,
get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
- rc, comment,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ rc, comment,
DBD_REMOVE_ACCOUNT_COORDS);
return rc;
}
- slurmdbd_free_acct_coord_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_acct_coord_msg(slurmdbd_conn->rpc_version,
get_msg);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_LIST, &list_msg, *out_buffer);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
@@ -2775,12 +2775,12 @@ static int _remove_assocs(slurmdbd_conn_t *slurmdbd_conn,
char *comment = NULL;
debug2("DBD_REMOVE_ASSOCS: called");
- if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
DBD_REMOVE_ASSOCS, &get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_REMOVE_ASSOCS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR,
comment, DBD_REMOVE_ASSOCS);
return SLURM_ERROR;
@@ -2807,22 +2807,22 @@ static int _remove_assocs(slurmdbd_conn_t *slurmdbd_conn,
rc = errno;
} else {
rc = errno;
- if(!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_REMOVE_ASSOCS, get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_REMOVE_ASSOCS);
return rc;
}
-
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_REMOVE_ASSOCS, get_msg);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_LIST, &list_msg, *out_buffer);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
@@ -2842,28 +2842,28 @@ static int _remove_clusters(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_REMOVE_CLUSTERS: called");
if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
- && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
+ && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< ACCT_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
ESLURM_ACCESS_DENIED,
comment, DBD_REMOVE_CLUSTERS);
return ESLURM_ACCESS_DENIED;
}
- if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
- DBD_REMOVE_CLUSTERS, &get_msg,
+ if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
+ DBD_REMOVE_CLUSTERS, &get_msg,
in_buffer) != SLURM_SUCCESS) {
comment = "Failed to unpack DBD_REMOVE_CLUSTERS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR,
comment, DBD_REMOVE_CLUSTERS);
return SLURM_ERROR;
}
-
+
if(!(list_msg.my_list = acct_storage_g_remove_clusters(
slurmdbd_conn->db_conn, *uid, get_msg->cond))) {
if(errno == ESLURM_ACCESS_DENIED) {
@@ -2880,22 +2880,22 @@ static int _remove_clusters(slurmdbd_conn_t *slurmdbd_conn,
rc = errno;
} else {
rc = errno;
- if(!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_REMOVE_CLUSTERS, get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_REMOVE_CLUSTERS);
- return rc;
+ return rc;
}
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_REMOVE_CLUSTERS, get_msg);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_LIST, &list_msg, *out_buffer);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
@@ -2914,28 +2914,28 @@ static int _remove_qos(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_REMOVE_QOS: called");
if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
- && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
+ && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< ACCT_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
ESLURM_ACCESS_DENIED,
comment, DBD_REMOVE_QOS);
return ESLURM_ACCESS_DENIED;
}
- if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
- DBD_REMOVE_QOS, &get_msg,
+ if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
+ DBD_REMOVE_QOS, &get_msg,
in_buffer) != SLURM_SUCCESS) {
comment = "Failed to unpack DBD_REMOVE_QOS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR,
comment, DBD_REMOVE_QOS);
return SLURM_ERROR;
}
-
+
if(!(list_msg.my_list = acct_storage_g_remove_qos(
slurmdbd_conn->db_conn, *uid, get_msg->cond))) {
if(errno == ESLURM_ACCESS_DENIED) {
@@ -2952,22 +2952,22 @@ static int _remove_qos(slurmdbd_conn_t *slurmdbd_conn,
rc = errno;
} else {
rc = errno;
- if(!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_REMOVE_QOS, get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_REMOVE_QOS);
- return rc;
+ return rc;
}
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_REMOVE_QOS, get_msg);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_LIST, &list_msg, *out_buffer);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
@@ -2986,28 +2986,28 @@ static int _remove_users(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_REMOVE_USERS: called");
if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
- && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
+ && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< ACCT_ADMIN_OPERATOR) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
ESLURM_ACCESS_DENIED,
comment, DBD_REMOVE_USERS);
return ESLURM_ACCESS_DENIED;
}
- if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
DBD_REMOVE_USERS, &get_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_REMOVE_USERS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR,
comment, DBD_REMOVE_USERS);
return SLURM_ERROR;
}
-
+
if(!(list_msg.my_list = acct_storage_g_remove_users(
slurmdbd_conn->db_conn, *uid, get_msg->cond))) {
if(errno == ESLURM_ACCESS_DENIED) {
@@ -3024,22 +3024,22 @@ static int _remove_users(slurmdbd_conn_t *slurmdbd_conn,
rc = errno;
} else {
rc = errno;
- if(!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_REMOVE_USERS, get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_REMOVE_USERS);
return rc;
}
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_REMOVE_USERS, get_msg);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_LIST, &list_msg, *out_buffer);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
@@ -3058,28 +3058,28 @@ static int _remove_wckeys(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_REMOVE_WCKEYS: called");
if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
- && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
+ && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< ACCT_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
ESLURM_ACCESS_DENIED,
comment, DBD_REMOVE_WCKEYS);
return ESLURM_ACCESS_DENIED;
}
- if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
- DBD_REMOVE_WCKEYS, &get_msg,
+ if (slurmdbd_unpack_cond_msg(slurmdbd_conn->rpc_version,
+ DBD_REMOVE_WCKEYS, &get_msg,
in_buffer) != SLURM_SUCCESS) {
comment = "Failed to unpack DBD_REMOVE_WCKEYS message";
error("%s", comment);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
SLURM_ERROR,
comment, DBD_REMOVE_WCKEYS);
return SLURM_ERROR;
}
-
+
if(!(list_msg.my_list = acct_storage_g_remove_wckeys(
slurmdbd_conn->db_conn, *uid, get_msg->cond))) {
if(errno == ESLURM_ACCESS_DENIED) {
@@ -3096,22 +3096,22 @@ static int _remove_wckeys(slurmdbd_conn_t *slurmdbd_conn,
rc = errno;
} else {
rc = errno;
- if(!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_REMOVE_WCKEYS, get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_REMOVE_WCKEYS);
- return rc;
+ return rc;
}
- slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_cond_msg(slurmdbd_conn->rpc_version,
DBD_REMOVE_WCKEYS, get_msg);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
- slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_pack_list_msg(slurmdbd_conn->rpc_version,
DBD_GOT_LIST, &list_msg, *out_buffer);
if(list_msg.my_list)
list_destroy(list_msg.my_list);
@@ -3147,7 +3147,7 @@ static int _remove_reservation(slurmdbd_conn_t *slurmdbd_conn,
end_it:
slurmdbd_free_rec_msg(slurmdbd_conn->rpc_version,
DBD_REMOVE_RESV, rec_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_REMOVE_RESV);
return rc;
}
@@ -3162,7 +3162,7 @@ static int _roll_usage(slurmdbd_conn_t *slurmdbd_conn,
info("DBD_ROLL_USAGE: called");
if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
- && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
+ && assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< ACCT_ADMIN_OPERATOR) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
@@ -3170,10 +3170,10 @@ static int _roll_usage(slurmdbd_conn_t *slurmdbd_conn,
goto end_it;
}
- if (slurmdbd_unpack_roll_usage_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_roll_usage_msg(slurmdbd_conn->rpc_version,
&get_msg, in_buffer) !=
SLURM_SUCCESS) {
- comment = "Failed to unpack DBD_ROLL_USAGE message";
+ comment = "Failed to unpack DBD_ROLL_USAGE message";
error("%s", comment);
rc = SLURM_ERROR;
goto end_it;
@@ -3184,9 +3184,9 @@ static int _roll_usage(slurmdbd_conn_t *slurmdbd_conn,
get_msg->archive_data);
end_it:
- slurmdbd_free_roll_usage_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_roll_usage_msg(slurmdbd_conn->rpc_version,
get_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_ROLL_USAGE);
return rc;
}
@@ -3207,7 +3207,7 @@ static int _step_complete(slurmdbd_conn_t *slurmdbd_conn,
rc = ESLURM_ACCESS_DENIED;
goto end_it;
}
- if (slurmdbd_unpack_step_complete_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_step_complete_msg(slurmdbd_conn->rpc_version,
&step_comp_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_STEP_COMPLETE message";
@@ -3216,7 +3216,7 @@ static int _step_complete(slurmdbd_conn_t *slurmdbd_conn,
goto end_it;
}
- debug2("DBD_STEP_COMPLETE: ID:%u.%u SUBMIT:%u",
+ debug2("DBD_STEP_COMPLETE: ID:%u.%u SUBMIT:%u",
step_comp_msg->job_id, step_comp_msg->step_id,
step_comp_msg->job_submit_time);
@@ -3247,9 +3247,9 @@ static int _step_complete(slurmdbd_conn_t *slurmdbd_conn,
/* just incase this gets set we need to clear it */
xfree(job.wckey);
end_it:
- slurmdbd_free_step_complete_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_step_complete_msg(slurmdbd_conn->rpc_version,
step_comp_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_STEP_COMPLETE);
return rc;
}
@@ -3271,7 +3271,7 @@ static int _step_start(slurmdbd_conn_t *slurmdbd_conn,
rc = ESLURM_ACCESS_DENIED;
goto end_it;
}
- if (slurmdbd_unpack_step_start_msg(slurmdbd_conn->rpc_version,
+ if (slurmdbd_unpack_step_start_msg(slurmdbd_conn->rpc_version,
&step_start_msg, in_buffer) !=
SLURM_SUCCESS) {
comment = "Failed to unpack DBD_STEP_START message";
@@ -3280,7 +3280,7 @@ static int _step_start(slurmdbd_conn_t *slurmdbd_conn,
goto end_it;
}
- debug2("DBD_STEP_START: ID:%u.%u NAME:%s SUBMIT:%d",
+ debug2("DBD_STEP_START: ID:%u.%u NAME:%s SUBMIT:%d",
step_start_msg->job_id, step_start_msg->step_id,
step_start_msg->name, step_start_msg->job_submit_time);
@@ -3316,9 +3316,9 @@ static int _step_start(slurmdbd_conn_t *slurmdbd_conn,
/* just incase this gets set we need to clear it */
xfree(job.wckey);
end_it:
- slurmdbd_free_step_start_msg(slurmdbd_conn->rpc_version,
+ slurmdbd_free_step_start_msg(slurmdbd_conn->rpc_version,
step_start_msg);
- *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
+ *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
rc, comment, DBD_STEP_START);
return rc;
}
diff --git a/src/slurmdbd/proc_req.h b/src/slurmdbd/proc_req.h
index 82c831b758d1ef55b7d4de59338c14f7c4d770bb..3446710592880d2c4387cfad11b62101813a3b63 100644
--- a/src/slurmdbd/proc_req.h
+++ b/src/slurmdbd/proc_req.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -60,8 +60,8 @@ typedef struct {
* buffer OUT - outgoing response, must be freed by caller
* uid IN/OUT - user ID who initiated the RPC
* RET SLURM_SUCCESS or error code */
-extern int proc_req(slurmdbd_conn_t *slurmdbd_conn, char *msg,
- uint32_t msg_size, bool first, Buf *out_buffer,
+extern int proc_req(slurmdbd_conn_t *slurmdbd_conn, char *msg,
+ uint32_t msg_size, bool first, Buf *out_buffer,
uint32_t *uid);
#endif /* !_PROC_REQ */
diff --git a/src/slurmdbd/read_config.c b/src/slurmdbd/read_config.c
index 1e6558444dd7c9b44c6e1654043808940c6a48ac..874d0ccd15cbb33617212cc55e5285d7722cbe57 100644
--- a/src/slurmdbd/read_config.c
+++ b/src/slurmdbd/read_config.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -69,7 +69,7 @@ static char * _get_conf_path(void);
static time_t boot_time;
/*
- * free_slurmdbd_conf - free storage associated with the global variable
+ * free_slurmdbd_conf - free storage associated with the global variable
* slurmdbd_conf
*/
extern void free_slurmdbd_conf(void)
@@ -119,8 +119,8 @@ static void _clear_slurmdbd_conf(void)
}
/*
- * read_slurmdbd_conf - load the SlurmDBD configuration from the slurmdbd.conf
- * file. Store result into global variable slurmdbd_conf.
+ * read_slurmdbd_conf - load the SlurmDBD configuration from the slurmdbd.conf
+ * file. Store result into global variable slurmdbd_conf.
* This function can be called more than once.
* RET SLURM_SUCCESS if no error, otherwise an error code
*/
@@ -223,16 +223,16 @@ extern int read_slurmdbd_conf(void)
s_p_get_string(&slurmdbd_conf->plugindir, "PluginDir", tbl);
if (s_p_get_string(&temp_str, "PrivateData", tbl)) {
if (strstr(temp_str, "account"))
- slurmdbd_conf->private_data
+ slurmdbd_conf->private_data
|= PRIVATE_DATA_ACCOUNTS;
if (strstr(temp_str, "job"))
- slurmdbd_conf->private_data
+ slurmdbd_conf->private_data
|= PRIVATE_DATA_JOBS;
if (strstr(temp_str, "node"))
- slurmdbd_conf->private_data
+ slurmdbd_conf->private_data
|= PRIVATE_DATA_NODES;
if (strstr(temp_str, "partition"))
- slurmdbd_conf->private_data
+ slurmdbd_conf->private_data
|= PRIVATE_DATA_PARTITIONS;
if (strstr(temp_str, "reservation"))
slurmdbd_conf->private_data
@@ -241,7 +241,7 @@ extern int read_slurmdbd_conf(void)
slurmdbd_conf->private_data
|= PRIVATE_DATA_USAGE;
if (strstr(temp_str, "user"))
- slurmdbd_conf->private_data
+ slurmdbd_conf->private_data
|= PRIVATE_DATA_USERS;
if (strstr(temp_str, "all"))
slurmdbd_conf->private_data = 0xffff;
@@ -275,8 +275,8 @@ extern int read_slurmdbd_conf(void)
"StorageType", tbl);
s_p_get_string(&slurmdbd_conf->storage_user,
"StorageUser", tbl);
-
- if(!s_p_get_boolean((bool *)&slurmdbd_conf->track_wckey,
+
+ if(!s_p_get_boolean((bool *)&slurmdbd_conf->track_wckey,
"TrackWCKey", tbl))
slurmdbd_conf->track_wckey = false;
@@ -311,17 +311,17 @@ extern int read_slurmdbd_conf(void)
slurmdbd_conf->slurm_user_name = xstrdup("root");
slurmdbd_conf->slurm_user_id = 0;
}
-
+
if (slurmdbd_conf->storage_type == NULL)
fatal("StorageType must be specified");
if (!slurmdbd_conf->storage_host)
slurmdbd_conf->storage_host = xstrdup(DEFAULT_STORAGE_HOST);
- if (!slurmdbd_conf->storage_user)
+ if (!slurmdbd_conf->storage_user)
slurmdbd_conf->storage_user = xstrdup(getlogin());
-
- if(!strcmp(slurmdbd_conf->storage_type,
+
+ if(!strcmp(slurmdbd_conf->storage_type,
"accounting_storage/mysql")) {
if(!slurmdbd_conf->storage_port)
slurmdbd_conf->storage_port = DEFAULT_MYSQL_PORT;
@@ -344,32 +344,32 @@ extern int read_slurmdbd_conf(void)
}
if (slurmdbd_conf->archive_dir) {
- if(stat(slurmdbd_conf->archive_dir, &buf) < 0)
+ if(stat(slurmdbd_conf->archive_dir, &buf) < 0)
fatal("Failed to stat the archive directory %s: %m",
slurmdbd_conf->archive_dir);
- if (!(buf.st_mode & S_IFDIR))
+ if (!(buf.st_mode & S_IFDIR))
fatal("rchive directory %s isn't a directory",
slurmdbd_conf->archive_script);
-
- if (access(slurmdbd_conf->archive_dir, W_OK) < 0)
+
+ if (access(slurmdbd_conf->archive_dir, W_OK) < 0)
fatal("rchive directory %s is not writable",
slurmdbd_conf->archive_dir);
}
if (slurmdbd_conf->archive_script) {
- if(stat(slurmdbd_conf->archive_script, &buf) < 0)
+ if(stat(slurmdbd_conf->archive_script, &buf) < 0)
fatal("Failed to stat the archive script %s: %m",
slurmdbd_conf->archive_dir);
- if (!(buf.st_mode & S_IFREG))
+ if (!(buf.st_mode & S_IFREG))
fatal("archive script %s isn't a regular file",
slurmdbd_conf->archive_script);
-
- if (access(slurmdbd_conf->archive_script, X_OK) < 0)
+
+ if (access(slurmdbd_conf->archive_script, X_OK) < 0)
fatal("archive script %s is not executable",
slurmdbd_conf->archive_script);
}
-
+
slurm_mutex_unlock(&conf_mutex);
return SLURM_SUCCESS;
}
@@ -409,26 +409,26 @@ extern void log_config(void)
slurmdbd_conf->purge_job);
else
debug2("PurgeJobMonths = NONE");
-
+
if(slurmdbd_conf->purge_event)
debug2("PurgeEventMonths = %u months",
slurmdbd_conf->purge_event);
else
debug2("PurgeEventMonths = NONE");
-
+
if(slurmdbd_conf->purge_step)
debug2("PurgeStepMonths = %u months",
slurmdbd_conf->purge_step);
else
debug2("PurgeStepMonths = NONE");
-
+
if(slurmdbd_conf->purge_suspend)
debug2("PurgeSuspendMonths= %u months",
slurmdbd_conf->purge_suspend);
else
debug2("PurgeSuspendMonths= NONE");
-
- debug2("SlurmUser = %s(%u)",
+
+ debug2("SlurmUser = %s(%u)",
slurmdbd_conf->slurm_user_name, slurmdbd_conf->slurm_user_id);
debug2("StorageBackupHost = %s", slurmdbd_conf->storage_backup_host);
@@ -489,7 +489,7 @@ static char * _get_conf_path(void)
return path;
}
-/* Dump the configuration in name,value pairs for output to
+/* Dump the configuration in name,value pairs for output to
* "sacctmgr show config", caller must call list_destroy() */
extern List dump_config(void)
{
@@ -613,7 +613,7 @@ extern List dump_config(void)
key_pair->name = xstrdup("PurgeEventMonths");
if(slurmdbd_conf->purge_event) {
key_pair->value = xmalloc(32);
- snprintf(key_pair->value, 32, "%u months",
+ snprintf(key_pair->value, 32, "%u months",
slurmdbd_conf->purge_event);
} else
key_pair->value = xstrdup("NONE");
@@ -623,7 +623,7 @@ extern List dump_config(void)
key_pair->name = xstrdup("PurgeJobMonths");
if(slurmdbd_conf->purge_job) {
key_pair->value = xmalloc(32);
- snprintf(key_pair->value, 32, "%u months",
+ snprintf(key_pair->value, 32, "%u months",
slurmdbd_conf->purge_job);
} else
key_pair->value = xstrdup("NONE");
@@ -633,7 +633,7 @@ extern List dump_config(void)
key_pair->name = xstrdup("PurgeStepMonths");
if(slurmdbd_conf->purge_step) {
key_pair->value = xmalloc(32);
- snprintf(key_pair->value, 32, "%u months",
+ snprintf(key_pair->value, 32, "%u months",
slurmdbd_conf->purge_step);
} else
key_pair->value = xstrdup("NONE");
@@ -643,7 +643,7 @@ extern List dump_config(void)
key_pair->name = xstrdup("PurgeSuspendMonths");
if(slurmdbd_conf->purge_suspend) {
key_pair->value = xmalloc(32);
- snprintf(key_pair->value, 32, "%u months",
+ snprintf(key_pair->value, 32, "%u months",
slurmdbd_conf->purge_suspend);
} else
key_pair->value = xstrdup("NONE");
diff --git a/src/slurmdbd/read_config.h b/src/slurmdbd/read_config.h
index 9f198eb640f8bcaed4f51a95501ee93ba0ebb9e6..a0a1d2585d5240a38f1ba02d035d8d86ac0f90b9 100644
--- a/src/slurmdbd/read_config.h
+++ b/src/slurmdbd/read_config.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -80,7 +80,7 @@ typedef struct slurm_dbd_conf {
char * auth_info; /* authentication info */
char * auth_type; /* authentication mechanism */
uint16_t control_timeout;/* how long to wait before
- * backup takes control */
+ * backup takes control */
char * dbd_addr; /* network address of Slurm DBD */
char * dbd_backup; /* hostname of Slurm DBD backup */
char * dbd_host; /* hostname of Slurm DBD */
@@ -89,13 +89,13 @@ typedef struct slurm_dbd_conf {
char * default_qos; /* default qos setting when
* adding clusters */
char * log_file; /* Log file */
- uint16_t msg_timeout; /* message timeout */
+ uint16_t msg_timeout; /* message timeout */
char * pid_file; /* where to store current PID */
char * plugindir; /* dir to look for plugins */
uint16_t private_data; /* restrict information */
uint16_t purge_event; /* purge events older than
* this in months */
- uint16_t purge_job; /* purge time for job info */
+ uint16_t purge_job; /* purge time for job info */
uint16_t purge_step; /* purge time for step info */
uint16_t purge_suspend; /* purge suspend data older than this
* in months */
@@ -117,7 +117,7 @@ extern slurm_dbd_conf_t *slurmdbd_conf;
/*
- * free_slurmdbd_conf - free storage associated with the global variable
+ * free_slurmdbd_conf - free storage associated with the global variable
* slurmdbd_conf
*/
extern void free_slurmdbd_conf(void);
@@ -133,13 +133,13 @@ extern void slurmdbd_conf_unlock(void);
extern void log_config(void);
/*
- * read_slurmdbd_conf - load the SlurmDBD configuration from the slurmdbd.conf
+ * read_slurmdbd_conf - load the SlurmDBD configuration from the slurmdbd.conf
* file. This function can be called more than once if so desired.
* RET SLURM_SUCCESS if no error, otherwise an error code
*/
extern int read_slurmdbd_conf(void);
-/* Dump the configuration in name,value pairs for output to
+/* Dump the configuration in name,value pairs for output to
* "sacctmgr show config", caller must call list_destroy() */
extern List dump_config(void);
diff --git a/src/slurmdbd/rpc_mgr.c b/src/slurmdbd/rpc_mgr.c
index 9e3ab1b02a684b4e852b84d9c8f0f0f9bbcff4e7..62ba7bcaba349a2919ff0779173489e44ce42eff 100644
--- a/src/slurmdbd/rpc_mgr.c
+++ b/src/slurmdbd/rpc_mgr.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -107,8 +107,8 @@ extern void *rpc_mgr(void *no_data)
/* Prepare to catch SIGUSR1 to interrupt accept().
* This signal is generated by the slurmdbd signal
- * handler thread upon receipt of SIGABRT, SIGINT,
- * or SIGTERM. That thread does all processing of
+ * handler thread upon receipt of SIGABRT, SIGINT,
+ * or SIGTERM. That thread does all processing of
* all signals. */
xsignal(SIGUSR1, _sig_handler);
xsignal_unblock(sigarray);
@@ -118,7 +118,7 @@ extern void *rpc_mgr(void *no_data)
*/
while ((i = _wait_for_server_thread()) >= 0) {
/*
- * accept needed for stream implementation is a no-op in
+ * accept needed for stream implementation is a no-op in
* message implementation that just passes sockfd to newsockfd
*/
if ((newsockfd = slurm_accept_msg_conn(sockfd,
@@ -130,7 +130,7 @@ extern void *rpc_mgr(void *no_data)
continue;
}
fd_set_nonblocking(newsockfd);
-
+
conn_arg = xmalloc(sizeof(slurmdbd_conn_t));
conn_arg->newsockfd = newsockfd;
slurm_get_ip_str(&cli_addr, &conn_arg->orig_port,
@@ -184,7 +184,7 @@ static void * _service_connection(void *arg)
bool fini = false, first = true;
Buf buffer = NULL;
int rc = SLURM_SUCCESS;
-
+
debug2("Opened connection %d from %s", conn->newsockfd, conn->ip);
while (!fini) {
@@ -212,7 +212,7 @@ static void * _service_connection(void *arg)
while (msg_size > offset) {
if (!_fd_readable(conn->newsockfd))
break; /* problem with this socket */
- msg_read = read(conn->newsockfd, (msg + offset),
+ msg_read = read(conn->newsockfd, (msg + offset),
(msg_size - offset));
if (msg_read <= 0) {
error("read(%d): %m", conn->newsockfd);
@@ -229,7 +229,7 @@ static void * _service_connection(void *arg)
"connection %d(%s) uid(%d)",
conn->newsockfd, conn->ip, uid);
if (rc == ESLURM_ACCESS_DENIED
- || rc == SLURM_PROTOCOL_VERSION_ERROR)
+ || rc == SLURM_PROTOCOL_VERSION_ERROR)
fini = true;
}
} else {
@@ -254,7 +254,7 @@ static void * _service_connection(void *arg)
/* Return a buffer containing a DBD_RC (return code) message
* caller must free returned buffer */
-extern Buf make_dbd_rc_msg(uint16_t rpc_version,
+extern Buf make_dbd_rc_msg(uint16_t rpc_version,
int rc, char *comment, uint16_t sent_type)
{
Buf buffer;
@@ -355,7 +355,7 @@ static bool _fd_readable(slurm_fd fd)
return true;
}
-/* Wait until a file is writeable,
+/* Wait until a file is writeable,
* RET false if can not be written to within 5 seconds */
extern bool fd_writeable(slurm_fd fd)
{
@@ -389,7 +389,7 @@ extern bool fd_writeable(slurm_fd fd)
* If not then exit out and notify the sender. This
* is here since a write doesn't always tell you the
* socket is gone, but getting 0 back from a
- * nonblocking read means just that.
+ * nonblocking read means just that.
*/
if (ufds.revents & POLLHUP || (recv(fd, &temp, 1, 0) == 0)) {
debug3("Write connection %d closed", fd);
@@ -412,7 +412,7 @@ extern bool fd_writeable(slurm_fd fd)
return true;
}
-/* Increment thread_count and don't return until its value is no larger
+/* Increment thread_count and don't return until its value is no larger
* than MAX_THREAD_COUNT,
* RET index of free index in slave_pthread_id or -1 to exit */
static int _wait_for_server_thread(void)
@@ -434,13 +434,13 @@ static int _wait_for_server_thread(void)
break;
}
if (rc == -1) {
- /* thread_count and slave_thread_id
+ /* thread_count and slave_thread_id
* out of sync */
fatal("No free slave_thread_id");
}
break;
} else {
- /* wait for state change and retry,
+ /* wait for state change and retry,
* just a delay and not an error.
* This can happen when the epilog completes
* on a bunch of nodes at the same time, which
@@ -450,13 +450,13 @@ static int _wait_for_server_thread(void)
time_t now = time(NULL);
if (difftime(now, last_print_time) > 2) {
verbose("thread_count over "
- "limit (%d), waiting",
+ "limit (%d), waiting",
thread_count);
last_print_time = now;
}
print_it = false;
}
- pthread_cond_wait(&thread_count_cond,
+ pthread_cond_wait(&thread_count_cond,
&thread_count_lock);
}
}
@@ -518,7 +518,7 @@ static void _wait_for_thread_fini(void)
for (j=0; j<MAX_THREAD_COUNT; j++) {
if (slave_thread_id[j] == 0)
continue;
- info("rpc_mgr sending SIGKILL to thread %u",
+ info("rpc_mgr sending SIGKILL to thread %u",
slave_thread_id[j]);
if (pthread_kill(slave_thread_id[j], SIGKILL)) {
slave_thread_id[j] = 0;
diff --git a/src/slurmdbd/rpc_mgr.h b/src/slurmdbd/rpc_mgr.h
index 3fc62c66f83b47dbc94d91b029b0522f8e84dd53..9728cea9b65278561df6c55c0a1b57fc723f563e 100644
--- a/src/slurmdbd/rpc_mgr.h
+++ b/src/slurmdbd/rpc_mgr.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -46,7 +46,7 @@ extern bool fd_writeable(slurm_fd fd);
/* Return a buffer containing a DBD_RC (return code) message
* caller must free returned buffer */
-extern Buf make_dbd_rc_msg(uint16_t rpc_version,
+extern Buf make_dbd_rc_msg(uint16_t rpc_version,
int rc, char *comment, uint16_t sent_type);
/* Process incoming RPCs. Meant to execute as a pthread */
diff --git a/src/slurmdbd/slurmdbd.c b/src/slurmdbd/slurmdbd.c
index 441b2e8b725c7fdb9827bca2e6315d91967fe61f..2c0674789f9c5adcf3b6af79059e5384933ee9d6 100644
--- a/src/slurmdbd/slurmdbd.c
+++ b/src/slurmdbd/slurmdbd.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
error("Unable to block signals");
db_conn = acct_storage_g_get_connection(false, 0, false);
-
+
/* Create attached thread for signal handling */
slurm_attr_init(&thread_attr);
if (pthread_create(&signal_handler_thread, &thread_attr,
@@ -146,12 +146,12 @@ int main(int argc, char *argv[])
memset(&assoc_init_arg, 0, sizeof(assoc_init_args_t));
- /* If we are tacking wckey we need to cache
+ /* If we are tacking wckey we need to cache
wckeys, if we aren't only cache the users and qos */
assoc_init_arg.cache_level = ASSOC_MGR_CACHE_USER | ASSOC_MGR_CACHE_QOS;
if(slurmdbd_conf->track_wckey)
assoc_init_arg.cache_level |= ASSOC_MGR_CACHE_WCKEY;
-
+
if(assoc_mgr_init(db_conn, &assoc_init_arg) == SLURM_ERROR) {
error("Problem getting cache of data");
acct_storage_g_close_connection(&db_conn);
@@ -170,7 +170,7 @@ int main(int argc, char *argv[])
backup = true;
run_backup();
if(!shutdown_time)
- assoc_mgr_refresh_lists(db_conn, NULL);
+ assoc_mgr_refresh_lists(db_conn, NULL);
} else if (slurmdbd_conf->dbd_host &&
(!strcmp(slurmdbd_conf->dbd_host, node_name) ||
!strcmp(slurmdbd_conf->dbd_host, "localhost"))) {
@@ -182,11 +182,11 @@ int main(int argc, char *argv[])
node_name, slurmdbd_conf->dbd_host,
slurmdbd_conf->dbd_backup);
}
-
+
if(!shutdown_time) {
/* Create attached thread to process incoming RPCs */
slurm_attr_init(&thread_attr);
- if (pthread_create(&rpc_handler_thread, &thread_attr,
+ if (pthread_create(&rpc_handler_thread, &thread_attr,
rpc_mgr, NULL))
fatal("pthread_create error %m");
slurm_attr_destroy(&thread_attr);
@@ -216,7 +216,7 @@ int main(int argc, char *argv[])
if(rpc_handler_thread)
pthread_join(rpc_handler_thread, NULL);
- if(backup && primary_resumed) {
+ if(backup && primary_resumed) {
shutdown_time = 0;
info("Backup has given up control");
}
@@ -225,19 +225,19 @@ int main(int argc, char *argv[])
break;
}
/* Daemon termination handled here */
-
+
if(signal_handler_thread)
pthread_join(signal_handler_thread, NULL);
-
+
end_it:
acct_storage_g_close_connection(&db_conn);
-
+
if (slurmdbd_conf->pid_file &&
(unlink(slurmdbd_conf->pid_file) < 0)) {
verbose("Unable to remove pidfile '%s': %m",
slurmdbd_conf->pid_file);
}
-
+
assoc_mgr_fini(NULL);
slurm_acct_storage_fini();
slurm_auth_fini();
@@ -267,9 +267,9 @@ static void _init_config(void)
(void) setrlimit(RLIMIT_CORE, &rlim);
}
if (getrlimit(RLIMIT_STACK, &rlim) == 0) {
- /* slurmctld can spawn lots of pthreads.
- * Set the (per thread) stack size to a
- * more "reasonable" value to avoid running
+ /* slurmctld can spawn lots of pthreads.
+ * Set the (per thread) stack size to a
+ * more "reasonable" value to avoid running
* out of virtual memory and dying */
rlim.rlim_cur = rlim.rlim_max;
(void) setrlimit(RLIMIT_STACK, &rlim);
@@ -313,7 +313,7 @@ static void _parse_commandline(int argc, char *argv[])
}
}
-/* _usage - print a message describing the command line arguments of
+/* _usage - print a message describing the command line arguments of
* slurmctld */
static void _usage(char *prog_name)
{
@@ -329,12 +329,12 @@ static void _usage(char *prog_name)
}
/* Reset slurmctld logging based upon configuration parameters */
-static void _update_logging(void)
+static void _update_logging(void)
{
/* Preserve execute line arguments (if any) */
if (debug_level) {
slurmdbd_conf->debug_level = MIN(
- (LOG_LEVEL_INFO + debug_level),
+ (LOG_LEVEL_INFO + debug_level),
(LOG_LEVEL_END - 1));
}
@@ -369,12 +369,12 @@ static void _kill_old_slurmdbd(void)
info("Killing old slurmdbd[%ld]", (long) oldpid);
kill(oldpid, SIGTERM);
- /*
+ /*
* Wait for previous daemon to terminate
*/
- if (fd_get_readw_lock(fd) < 0)
+ if (fd_get_readw_lock(fd) < 0)
fatal("Unable to wait for readw lock: %m");
- (void) close(fd); /* Ignore errors */
+ (void) close(fd); /* Ignore errors */
}
}
@@ -392,14 +392,14 @@ static void _init_pidfile(void)
return;
}
-/* Become a daemon (child of init) and
+/* Become a daemon (child of init) and
* "cd" to the LogFile directory (if one is configured) */
static void _daemonize(void)
{
if (daemon(1, 1))
error("daemon(): %m");
log_alter(log_opts, LOG_DAEMON, slurmdbd_conf->log_file);
-
+
if (slurmdbd_conf->log_file &&
(slurmdbd_conf->log_file[0] == '/')) {
char *slash_ptr, *work_dir;
@@ -422,7 +422,7 @@ static void _rollup_handler_cancel()
slurm_mutex_lock(&rollup_lock);
if(rollup_handler_thread)
pthread_cancel(rollup_handler_thread);
- slurm_mutex_unlock(&rollup_lock);
+ slurm_mutex_unlock(&rollup_lock);
}
/* _rollup_handler - Process rollup duties */
@@ -451,7 +451,7 @@ static void *_rollup_handler(void *db_conn)
debug2("running rollup at %s", ctime(&start_time));
acct_storage_g_roll_usage(db_conn, 0, 0, 1);
running_rollup = 0;
- slurm_mutex_unlock(&rollup_lock);
+ slurm_mutex_unlock(&rollup_lock);
/* sleep for an hour */
tm.tm_sec = 0;
@@ -526,7 +526,7 @@ static void *_signal_handler(void *no_data)
}
-/* Reset some signals to their default state to clear any
+/* Reset some signals to their default state to clear any
* inherited signal states */
static void _default_sigaction(int sig)
{
@@ -551,7 +551,7 @@ static void _become_slurm_user(void)
/* Determine SlurmUser gid */
slurm_user_gid = gid_from_uid(slurmdbd_conf->slurm_user_id);
if (slurm_user_gid == (gid_t) -1) {
- fatal("Failed to determine gid of SlurmUser(%u)",
+ fatal("Failed to determine gid of SlurmUser(%u)",
slurmdbd_conf->slurm_user_id);
}
@@ -563,7 +563,7 @@ static void _become_slurm_user(void)
fatal("Failed to drop supplementary groups, "
"setgroups: %m");
} else if ((slurmdbd_conf->slurm_user_id != getuid()) &&
- initgroups(slurmdbd_conf->slurm_user_name,
+ initgroups(slurmdbd_conf->slurm_user_name,
slurm_user_gid)) {
fatal("Failed to set supplementary groups, "
"initgroups: %m");
diff --git a/src/slurmdbd/slurmdbd.h b/src/slurmdbd/slurmdbd.h
index 0ad104f1cec6a955e0d4b60dd3828271260615ee..c1138dc30ee4e48ca2688736ca6f5fe724e77e98 100644
--- a/src/slurmdbd/slurmdbd.h
+++ b/src/slurmdbd/slurmdbd.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/smap/Makefile.am b/src/smap/Makefile.am
index cb5115a52981ea84a9296b1c4536ceaa00071643..18e3f7a41eb243d6c04f49cd4b0391955b84c154 100644
--- a/src/smap/Makefile.am
+++ b/src/smap/Makefile.am
@@ -6,8 +6,8 @@
AUTOMAKE_OPTIONS = foreign
-LIBS=$(NCURSES)
-INCLUDES = -I$(top_srcdir) $(BG_INCLUDES)
+LIBS=$(NCURSES)
+INCLUDES = -I$(top_srcdir) $(BG_INCLUDES)
if HAVE_SOME_CURSES
@@ -17,7 +17,7 @@ smap_LDADD = \
$(top_builddir)/src/plugins/select/bluegene/block_allocator/libbluegene_block_allocator.la \
$(top_builddir)/src/api/libslurm.o -ldl
-noinst_HEADERS = smap.h
+noinst_HEADERS = smap.h
smap_SOURCES = smap.c \
job_functions.c partition_functions.c \
configure_functions.c grid_functions.c \
diff --git a/src/smap/Makefile.in b/src/smap/Makefile.in
index 1292ccd5a2b0b15a0720ccce5598155c25d814d9..f7f61129cc03d97b1e4e855ed058379610bffc3a 100644
--- a/src/smap/Makefile.in
+++ b/src/smap/Makefile.in
@@ -184,7 +184,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
-LIBS = $(NCURSES)
+LIBS = $(NCURSES)
LIBTOOL = @LIBTOOL@
LIB_LDFLAGS = @LIB_LDFLAGS@
LIPO = @LIPO@
@@ -312,12 +312,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-INCLUDES = -I$(top_srcdir) $(BG_INCLUDES)
+INCLUDES = -I$(top_srcdir) $(BG_INCLUDES)
@HAVE_SOME_CURSES_TRUE@smap_LDADD = \
@HAVE_SOME_CURSES_TRUE@ $(top_builddir)/src/plugins/select/bluegene/block_allocator/libbluegene_block_allocator.la \
@HAVE_SOME_CURSES_TRUE@ $(top_builddir)/src/api/libslurm.o -ldl
-@HAVE_SOME_CURSES_TRUE@noinst_HEADERS = smap.h
+@HAVE_SOME_CURSES_TRUE@noinst_HEADERS = smap.h
@HAVE_SOME_CURSES_TRUE@smap_SOURCES = smap.c \
@HAVE_SOME_CURSES_TRUE@ job_functions.c partition_functions.c \
@HAVE_SOME_CURSES_TRUE@ configure_functions.c grid_functions.c \
diff --git a/src/smap/configure_functions.c b/src/smap/configure_functions.c
index 5495e671a49ceaad640a0c6335d727da40462767..598d54fca8d82716a2a2fad484e5cbebf3de662a 100644
--- a/src/smap/configure_functions.c
+++ b/src/smap/configure_functions.c
@@ -7,32 +7,32 @@
* Written by Danny Auble <da@llnl.gov>
*
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -46,7 +46,7 @@ typedef struct {
int color;
char letter;
List nodes;
- ba_request_t *request;
+ ba_request_t *request;
} allocated_block_t;
static void _delete_allocated_blocks(List allocated_blocks);
@@ -75,7 +75,7 @@ char *layout_mode = "STATIC";
static void _delete_allocated_blocks(List allocated_blocks)
{
allocated_block_t *allocated_block = NULL;
-
+
while ((allocated_block = list_pop(allocated_blocks)) != NULL) {
remove_block(allocated_block->nodes,0);
list_destroy(allocated_block->nodes);
@@ -88,14 +88,14 @@ static void _delete_allocated_blocks(List allocated_blocks)
static allocated_block_t *_make_request(ba_request_t *request)
{
List results = list_create(NULL);
- ListIterator results_i;
+ ListIterator results_i;
allocated_block_t *allocated_block = NULL;
ba_node_t *current = NULL;
-
+
if (!allocate_block(request, results)){
memset(error_string,0,255);
- sprintf(error_string,"allocate failure for %dx%dx%d",
- request->geometry[0], request->geometry[1],
+ sprintf(error_string,"allocate failure for %dx%dx%d",
+ request->geometry[0], request->geometry[1],
request->geometry[2]);
return NULL;
} else {
@@ -105,7 +105,7 @@ static allocated_block_t *_make_request(ba_request_t *request)
"THIS ALLOCATION DIM %s!!!!!!!", pass);
xfree(pass);
}
-
+
allocated_block = (allocated_block_t *)xmalloc(
sizeof(allocated_block_t));
allocated_block->request = request;
@@ -127,7 +127,7 @@ static int _set_layout(char *com)
{
int i=0;
int len = strlen(com);
-
+
while(i<len) {
if(!strncasecmp(com+i, "dynamic", 7)) {
layout_mode = "DYNAMIC";
@@ -143,12 +143,12 @@ static int _set_layout(char *com)
}
}
if(i>=len) {
- sprintf(error_string,
+ sprintf(error_string,
"You didn't put in a mode that I recognized. \n"
"Please use (STATIC, OVERLAP, or DYNAMIC)\n");
return 0;
}
- sprintf(error_string,
+ sprintf(error_string,
"LayoutMode set to %s\n", layout_mode);
return 1;
}
@@ -165,15 +165,15 @@ static int _set_base_part_cnt(char *com)
i++;
}
}
- if(i>=len) {
- sprintf(error_string,
+ if(i>=len) {
+ sprintf(error_string,
"I didn't notice the number you typed in\n");
return 0;
}
base_part_node_cnt = atoi(&com[i]);
- sprintf(error_string,
+ sprintf(error_string,
"BasePartitionNodeCnt set to %d\n", base_part_node_cnt);
-
+
return 1;
}
@@ -189,15 +189,15 @@ static int _set_nodecard_cnt(char *com)
i++;
}
}
- if(i>=len) {
- sprintf(error_string,
+ if(i>=len) {
+ sprintf(error_string,
"I didn't notice the number you typed in\n");
return 0;
}
nodecard_node_cnt = atoi(&com[i]);
- sprintf(error_string,
+ sprintf(error_string,
"NodeCardNodeCnt set to %d\n", nodecard_node_cnt);
-
+
return 1;
}
@@ -206,7 +206,7 @@ static int _create_allocation(char *com, List allocated_blocks)
int i=6, geoi=-1, starti=-1, i2=0, small32=-1, small128=-1;
int len = strlen(com);
allocated_block_t *allocated_block = NULL;
- ba_request_t *request = (ba_request_t*) xmalloc(sizeof(ba_request_t));
+ ba_request_t *request = (ba_request_t*) xmalloc(sizeof(ba_request_t));
int diff=0;
#ifndef HAVE_BGL
int small16=-1, small64=-1, small256=-1;
@@ -222,7 +222,7 @@ static int _create_allocation(char *com, List allocated_blocks)
request->deny_pass = 0;
request->avail_node_bitmap = NULL;
- while(i<len) {
+ while(i<len) {
if(!strncasecmp(com+i, "mesh", 4)) {
request->conn_type=SELECT_MESH;
i+=4;
@@ -231,13 +231,13 @@ static int _create_allocation(char *com, List allocated_blocks)
i+=5;
} else if(!strncasecmp(com+i, "deny", 4)) {
i+=4;
- if(strstr(com+i, "X"))
+ if(strstr(com+i, "X"))
request->deny_pass |= PASS_DENY_X;
- if(strstr(com+i, "Y"))
+ if(strstr(com+i, "Y"))
request->deny_pass |= PASS_DENY_Y;
- if(strstr(com+i, "Z"))
+ if(strstr(com+i, "Z"))
request->deny_pass |= PASS_DENY_Z;
- if(!strcasecmp(com+i, "ALL"))
+ if(!strcasecmp(com+i, "ALL"))
request->deny_pass |= PASS_DENY_ALL;
} else if(!strncasecmp(com+i, "nodecard", 8)) {
small32=0;
@@ -259,9 +259,9 @@ static int _create_allocation(char *com, List allocated_blocks)
i+=8;
} else if(!strncasecmp(com+i, "start", 5)) {
request->start_req=1;
- i+=5;
- } else if(request->start_req
- && starti<0
+ i+=5;
+ } else if(request->start_req
+ && starti<0
&& ((com[i] >= '0' && com[i] <= '9')
|| (com[i] >= 'A' && com[i] <= 'Z'))) {
starti=i;
@@ -272,7 +272,7 @@ static int _create_allocation(char *com, List allocated_blocks)
} else if(small128 == 0 && (com[i] >= '0' && com[i] <= '9')) {
small128=i;
i++;
- }
+ }
#ifndef HAVE_BGL
else if(!strncasecmp(com+i, "16CN", 4)) {
small16=0;
@@ -292,7 +292,7 @@ static int _create_allocation(char *com, List allocated_blocks)
} else if(small256 == 0 && (com[i] >= '0' && com[i] <= '9')) {
small256=i;
i++;
- }
+ }
#endif
else if(geoi<0 && ((com[i] >= '0' && com[i] <= '9')
|| (com[i] >= 'A' && com[i] <= 'Z'))) {
@@ -301,9 +301,9 @@ static int _create_allocation(char *com, List allocated_blocks)
} else {
i++;
}
-
- }
-
+
+ }
+
if(request->conn_type == SELECT_SMALL) {
int total = 512;
#ifndef HAVE_BGL
@@ -333,12 +333,12 @@ static int _create_allocation(char *com, List allocated_blocks)
total -= request->small128 * 128;
}
if(total < 0) {
- sprintf(error_string,
+ sprintf(error_string,
"You asked for %d more nodes than "
"are in a Midplane\n", total * 2);
geoi = -1;
- }
+ }
#ifndef HAVE_BGL
while(total > 0) {
@@ -382,7 +382,7 @@ static int _create_allocation(char *com, List allocated_blocks)
if(geoi<0 && !request->size) {
memset(error_string,0,255);
- sprintf(error_string,
+ sprintf(error_string,
"No size or dimension specified, please re-enter");
} else {
i2=geoi;
@@ -399,18 +399,18 @@ static int _create_allocation(char *com, List allocated_blocks)
/* for geometery */
if(diff>1) {
request->geometry[X] =
- xstrntol(&com[geoi],
- NULL, diff,
+ xstrntol(&com[geoi],
+ NULL, diff,
10);
} else {
request->geometry[X] =
- xstrntol(&com[geoi],
- NULL, diff,
+ xstrntol(&com[geoi],
+ NULL, diff,
HOSTLIST_BASE);
}
geoi += diff;
diff = geoi;
-
+
while(com[geoi-1]!='x' && geoi<len)
geoi++;
if(geoi==len)
@@ -418,13 +418,13 @@ static int _create_allocation(char *com, List allocated_blocks)
diff = geoi - diff;
if(diff>1) {
request->geometry[Y] =
- xstrntol(&com[geoi],
- NULL, diff,
+ xstrntol(&com[geoi],
+ NULL, diff,
10);
} else {
- request->geometry[Y] =
- xstrntol(&com[geoi],
- NULL, diff,
+ request->geometry[Y] =
+ xstrntol(&com[geoi],
+ NULL, diff,
HOSTLIST_BASE);
}
geoi += diff;
@@ -434,15 +434,15 @@ static int _create_allocation(char *com, List allocated_blocks)
if(geoi==len)
goto geo_error_message;
diff = geoi - diff;
-
+
if(diff>1) {
request->geometry[Z] =
- xstrntol(&com[geoi],
- NULL, diff,
+ xstrntol(&com[geoi],
+ NULL, diff,
10);
} else {
- request->geometry[Z] =
- xstrntol(&com[geoi],
+ request->geometry[Z] =
+ xstrntol(&com[geoi],
NULL, diff,
HOSTLIST_BASE);
}
@@ -467,15 +467,15 @@ static int _create_allocation(char *com, List allocated_blocks)
HOSTLIST_BASE);
}
starti += diff;
- if(starti==len)
+ if(starti==len)
goto start_request;
-
+
starti++;
i2 = starti;
while(com[i2]!='x' && i2<len)
i2++;
diff = i2-starti;
-
+
if(diff>1) {
request->start[Y] = xstrntol(&com[starti],
NULL, diff,
@@ -486,15 +486,15 @@ static int _create_allocation(char *com, List allocated_blocks)
HOSTLIST_BASE);
}
starti += diff;
- if(starti==len)
+ if(starti==len)
goto start_request;
-
+
starti++;
i2 = starti;
while(com[i2]!=' ' && i2<len)
i2++;
diff = i2-starti;
-
+
if(diff>1) {
request->start[Z] = xstrntol(&com[starti],
NULL, diff,
@@ -508,35 +508,35 @@ static int _create_allocation(char *com, List allocated_blocks)
start_request:
if(!strcasecmp(layout_mode,"OVERLAP"))
reset_ba_system(true);
-
+
/*
- Here is where we do the allocating of the partition.
+ Here is where we do the allocating of the partition.
It will send a request back which we will throw into
- a list just incase we change something later.
+ a list just incase we change something later.
*/
if(!new_ba_request(request)) {
memset(error_string,0,255);
if(request->size!=-1) {
- sprintf(error_string,
+ sprintf(error_string,
"Problems with request for %d\n"
"Either you put in something "
"that doesn't work,\n"
"or we are unable to process "
- "your request.",
+ "your request.",
request->size);
} else
- sprintf(error_string,
+ sprintf(error_string,
"Problems with request for %dx%dx%d\n"
"Either you put in something "
"that doesn't work,\n"
"or we are unable to process "
- "your request.",
- request->geometry[0],
- request->geometry[1],
+ "your request.",
+ request->geometry[0],
+ request->geometry[1],
request->geometry[2]);
} else {
if((allocated_block = _make_request(request)) != NULL)
- list_append(allocated_blocks,
+ list_append(allocated_blocks,
allocated_block);
else {
i2 = strlen(error_string);
@@ -544,23 +544,23 @@ static int _create_allocation(char *com, List allocated_blocks)
"\nGeo requested was %d (%dx%dx%d)\n"
"Start position was %dx%dx%d",
request->size,
- request->geometry[0],
- request->geometry[1],
+ request->geometry[0],
+ request->geometry[1],
request->geometry[2],
- request->start[0],
- request->start[1],
+ request->start[0],
+ request->start[1],
request->start[2]);
}
}
}
return 1;
-
+
geo_error_message:
memset(error_string,0,255);
- sprintf(error_string,
+ sprintf(error_string,
"Error in geo dimension "
"specified, please re-enter");
-
+
return 0;
}
@@ -572,7 +572,7 @@ static int _resolve(char *com)
char *rack_mid = NULL;
int *coord = NULL;
#endif
-
+
while(com[i] != '\0') {
if((i>0) && (com[i-1] != ' '))
break;
@@ -580,11 +580,11 @@ static int _resolve(char *com)
}
if(com[i] == 'r')
com[i] = 'R';
-
- memset(error_string,0,255);
+
+ memset(error_string,0,255);
#ifdef HAVE_BG_FILES
if (!have_db2) {
- sprintf(error_string, "Must be on BG SN to resolve\n");
+ sprintf(error_string, "Must be on BG SN to resolve\n");
goto resolve_error;
}
@@ -594,31 +594,31 @@ static int _resolve(char *com)
}
if(com[i] != 'R') {
rack_mid = find_bp_rack_mid(com+i);
-
+
if(rack_mid)
- sprintf(error_string,
+ sprintf(error_string,
"X=%c Y=%c Z=%c resolves to %s\n",
com[X+i],com[Y+i],com[Z+i], rack_mid);
else
- sprintf(error_string,
+ sprintf(error_string,
"X=%c Y=%c Z=%c has no resolve\n",
com[X+i],com[Y+i],com[Z+i]);
-
+
} else {
coord = find_bp_loc(com+i);
-
+
if(coord)
- sprintf(error_string,
+ sprintf(error_string,
"%s resolves to X=%d Y=%d Z=%d\n",
com+i,coord[X],coord[Y],coord[Z]);
else
- sprintf(error_string, "%s has no resolve.\n",
- com+i);
+ sprintf(error_string, "%s has no resolve.\n",
+ com+i);
}
resolve_error:
#else
- sprintf(error_string,
- "Must be on BG SN to resolve.\n");
+ sprintf(error_string,
+ "Must be on BG SN to resolve.\n");
#endif
wnoutrefresh(text_win);
doupdate();
@@ -629,17 +629,17 @@ static int _change_state_all_bps(char *com, int state)
{
char allnodes[50];
memset(allnodes,0,50);
-
+
#ifdef HAVE_3D
- sprintf(allnodes, "000x%c%c%c",
+ sprintf(allnodes, "000x%c%c%c",
alpha_num[DIM_SIZE[X]-1], alpha_num[DIM_SIZE[Y]-1],
alpha_num[DIM_SIZE[Z]-1]);
#else
- sprintf(allnodes, "0-%d",
+ sprintf(allnodes, "0-%d",
DIM_SIZE[X]);
#endif
return _change_state_bps(allnodes, state);
-
+
}
static int _change_state_bps(char *com, int state)
{
@@ -660,19 +660,19 @@ static int _change_state_bps(char *com, int state)
used = true;
c_state = "down";
}
- while(i<len
+ while(i<len
&& (com[i] < '0' || com[i] > 'Z'
|| (com[i] > '9' && com[i] < 'A')))
i++;
if(i>(len-1)) {
memset(error_string,0,255);
- sprintf(error_string,
+ sprintf(error_string,
"You didn't specify any nodes to make %s. "
- "in statement '%s'",
+ "in statement '%s'",
c_state, com);
return 0;
}
-
+
#ifdef HAVE_3D
if ((com[i+3] == 'x')
|| (com[i+3] == '-')) {
@@ -681,7 +681,7 @@ static int _change_state_bps(char *com, int state)
(((com[i+j] >= '0') && (com[i+j] <= '9')) ||
((com[i+j] >= 'A') && (com[i+j] <= 'Z'))))
continue;
- goto error_message2;
+ goto error_message2;
}
number = xstrntol(com + i, NULL,
@@ -690,13 +690,13 @@ static int _change_state_bps(char *com, int state)
start[Y] = (number % (HOSTLIST_BASE * HOSTLIST_BASE))
/ HOSTLIST_BASE;
start[Z] = (number % HOSTLIST_BASE);
-
+
i += 4;
for(j=0; j<3; j++) {
if (((i+j) <= len) &&
(((com[i+j] >= '0') && (com[i+j] <= '9')) ||
((com[i+j] >= 'A') && (com[i+j] <= 'Z'))))
- continue;
+ continue;
goto error_message2;
}
number = xstrntol(com + i, NULL,
@@ -704,7 +704,7 @@ static int _change_state_bps(char *com, int state)
end[X] = number / (HOSTLIST_BASE * HOSTLIST_BASE);
end[Y] = (number % (HOSTLIST_BASE * HOSTLIST_BASE))
/ HOSTLIST_BASE;
- end[Z] = (number % HOSTLIST_BASE);
+ end[Z] = (number % HOSTLIST_BASE);
} else {
for(j=0; j<3; j++) {
if (((i+j) <= len) &&
@@ -730,11 +730,11 @@ static int _change_state_bps(char *com, int state)
|| end[Y]>DIM_SIZE[Y]-1
|| end[Z]>DIM_SIZE[Z]-1))
goto error_message;
-
+
for(x=start[X];x<=end[X];x++) {
for(y=start[Y];y<=end[Y];y++) {
for(z=start[Z];z<=end[Z];z++) {
- if(ba_system_ptr->grid[x][y][z].letter
+ if(ba_system_ptr->grid[x][y][z].letter
!= opposite)
continue;
ba_system_ptr->grid[x][y][z].color = 0;
@@ -749,14 +749,14 @@ static int _change_state_bps(char *com, int state)
start[X] = xstrntol(com + i, NULL,
BA_SYSTEM_DIMENSIONS, HOSTLIST_BASE);
i += 4;
- end[X] = xstrntol(com + i, NULL,
+ end[X] = xstrntol(com + i, NULL,
BA_SYSTEM_DIMENSIONS, HOSTLIST_BASE);
} else {
- start[X] = end[X] = xstrntol(com + i, NULL,
- BA_SYSTEM_DIMENSIONS,
+ start[X] = end[X] = xstrntol(com + i, NULL,
+ BA_SYSTEM_DIMENSIONS,
HOSTLIST_BASE);
}
-
+
if((start[X]>end[X])
|| (start[X]<0)
|| (end[X]>DIM_SIZE[X]-1))
@@ -766,27 +766,27 @@ static int _change_state_bps(char *com, int state)
ba_system_ptr->grid[x].color = 0;
ba_system_ptr->grid[x].letter = letter;
ba_system_ptr->grid[x].used = used;
- }
+ }
#endif
return 1;
error_message:
memset(error_string,0,255);
#ifdef HAVE_BG
- sprintf(error_string,
+ sprintf(error_string,
"Problem with base partitions, "
"specified range was %d%d%dx%d%d%d",
alpha_num[start[X]],alpha_num[start[Y]],alpha_num[start[Z]],
alpha_num[end[X]],alpha_num[end[Y]],alpha_num[end[Z]]);
#else
- sprintf(error_string,
+ sprintf(error_string,
"Problem with nodes, specified range was %d-%d",
start[X],end[X]);
-#endif
+#endif
return 0;
#ifdef HAVE_3D
error_message2:
memset(error_string,0,255);
- sprintf(error_string,
+ sprintf(error_string,
"There was a problem with '%s'\nIn your request '%s'"
"You need to specify XYZ or XYZxXYZ",
com+i,com);
@@ -801,14 +801,14 @@ static int _remove_allocation(char *com, List allocated_blocks)
int len = strlen(com);
char letter;
- int color_count = 0;
+ int color_count = 0;
while(com[i-1]!=' ' && i<len) {
i++;
}
-
+
if(i>(len-1)) {
memset(error_string,0,255);
- sprintf(error_string,
+ sprintf(error_string,
"You need to specify which letter to delete.");
return 0;
} else {
@@ -816,22 +816,22 @@ static int _remove_allocation(char *com, List allocated_blocks)
results_i = list_iterator_create(allocated_blocks);
while((allocated_block = list_next(results_i)) != NULL) {
if(found) {
- if(redo_block(allocated_block->nodes,
+ if(redo_block(allocated_block->nodes,
allocated_block->
request->geometry,
allocated_block->
- request->conn_type,
+ request->conn_type,
color_count) == SLURM_ERROR) {
memset(error_string,0,255);
- sprintf(error_string,
+ sprintf(error_string,
"problem redoing the part.");
return 0;
}
- allocated_block->letter =
+ allocated_block->letter =
letters[color_count%62];
allocated_block->color =
colors[color_count%6];
-
+
} else if(allocated_block->letter == letter) {
found=1;
remove_block(allocated_block->nodes,
@@ -845,7 +845,7 @@ static int _remove_allocation(char *com, List allocated_blocks)
}
list_iterator_destroy(results_i);
}
-
+
return 1;
}
@@ -857,9 +857,9 @@ static int _alter_allocation(char *com, List allocated_blocks)
/* int len = strlen(com); */
/* bool rotate = false; */
/* bool elongate = false; */
-
+
/* while(i<len) { */
-
+
/* while(com[i-1]!=' ' && i<len) { */
/* i++; */
/* } */
@@ -878,7 +878,7 @@ static int _alter_allocation(char *com, List allocated_blocks)
/* } else { */
/* i++; */
/* } */
-
+
/* } */
return 1;
}
@@ -888,22 +888,22 @@ static int _copy_allocation(char *com, List allocated_blocks)
ListIterator results_i;
allocated_block_t *allocated_block = NULL;
allocated_block_t *temp_block = NULL;
- ba_request_t *request = NULL;
-
+ ba_request_t *request = NULL;
+
int i=1;
int len = strlen(com);
char letter = '\0';
int count = 1;
int *geo = NULL, *geo_ptr = NULL;
-
+
/* look for the space after copy */
- while(com[i-1]!=' ' && i<len)
+ while(com[i-1]!=' ' && i<len)
i++;
-
+
if(i<=len) {
/* Here we are looking for a real number for the count
instead of the HOSTLIST_BASE so atoi is ok
- */
+ */
if(com[i]>='0' && com[i]<='9')
count = atoi(com+i);
else {
@@ -912,7 +912,7 @@ static int _copy_allocation(char *com, List allocated_blocks)
if(com[i]!='\n') {
while(com[i-1]!=' ' && i<len)
i++;
-
+
if(com[i]>='0' && com[i]<='9')
count = atoi(com+i);
}
@@ -927,20 +927,20 @@ static int _copy_allocation(char *com, List allocated_blocks)
break;
}
list_iterator_destroy(results_i);
-
+
if(!letter)
allocated_block = temp_block;
-
+
if(!allocated_block) {
memset(error_string,0,255);
- sprintf(error_string,
+ sprintf(error_string,
"Could not find requested record to copy");
return 0;
}
-
+
for(i=0;i<count;i++) {
- request = (ba_request_t*) xmalloc(sizeof(ba_request_t));
-
+ request = (ba_request_t*) xmalloc(sizeof(ba_request_t));
+
request->geometry[X] = allocated_block->request->geometry[X];
request->geometry[Y] = allocated_block->request->geometry[Y];
request->geometry[Z] = allocated_block->request->geometry[Z];
@@ -956,7 +956,7 @@ static int _copy_allocation(char *com, List allocated_blocks)
#endif
request->small32 = allocated_block->request->small32;
request->small128 = allocated_block->request->small128;
-
+
request->rotate_count= 0;
request->elongate_count = 0;
request->elongate_geos = list_create(NULL);
@@ -968,24 +968,24 @@ static int _copy_allocation(char *com, List allocated_blocks)
geo[X] = geo_ptr[X];
geo[Y] = geo_ptr[Y];
geo[Z] = geo_ptr[Z];
-
+
list_append(request->elongate_geos, geo);
}
list_iterator_destroy(results_i);
-
+
if((allocated_block = _make_request(request)) == NULL) {
memset(error_string,0,255);
- sprintf(error_string,
+ sprintf(error_string,
"Problem with the copy\n"
"Are you sure there is enough room for it?");
xfree(request);
return 0;
}
list_append(allocated_blocks, allocated_block);
-
+
}
return 1;
-
+
}
static int _save_allocation(char *com, List allocated_blocks)
@@ -999,12 +999,12 @@ static int _save_allocation(char *com, List allocated_blocks)
char *conn_type = NULL;
char *extra = NULL;
- ListIterator results_i;
-
+ ListIterator results_i;
+
memset(filename,0,50);
if(len>5)
while(i<len) {
-
+
while(com[i-1]!=' ' && i<len) {
i++;
}
@@ -1015,7 +1015,7 @@ static int _save_allocation(char *com, List allocated_blocks)
}
}
if(filename[0]=='\0') {
- time_t now_time = time(NULL);
+ time_t now_time = time(NULL);
sprintf(filename,"bluegene.conf.%ld",
(long int) now_time);
}
@@ -1052,13 +1052,13 @@ static int _save_allocation(char *com, List allocated_blocks)
while((allocated_block = list_next(results_i)) != NULL) {
if(allocated_block->request->conn_type == SELECT_TORUS)
conn_type = "TORUS";
- else if(allocated_block->request->conn_type
+ else if(allocated_block->request->conn_type
== SELECT_MESH)
conn_type = "MESH";
else {
conn_type = "SMALL";
#ifndef HAVE_BGL
- xstrfmtcat(extra,
+ xstrfmtcat(extra,
" 16CNBlocks=%d 32CNBlocks=%d "
"64CNBlocks=%d 128CNBlocks=%d "
"256CNBlocks=%d",
@@ -1068,22 +1068,22 @@ static int _save_allocation(char *com, List allocated_blocks)
allocated_block->request->small128,
allocated_block->request->small256);
#else
- xstrfmtcat(extra,
+ xstrfmtcat(extra,
" 32CNBlocks=%d 128CNBlocks=%d",
allocated_block->request->small32,
allocated_block->request->small128);
#endif
}
- xstrfmtcat(save_string, "BPs=%s Type=%s",
- allocated_block->request->save_name,
+ xstrfmtcat(save_string, "BPs=%s Type=%s",
+ allocated_block->request->save_name,
conn_type);
if(extra) {
xstrfmtcat(save_string, "%s\n", extra);
xfree(extra);
- } else
+ } else
xstrcat(save_string, "\n");
-
+
}
list_iterator_destroy(results_i);
fputs(save_string, file_ptr);
@@ -1110,15 +1110,15 @@ static int _add_bg_record(blockreq_t *blockreq, List allocated_blocks)
int j = 0, number;
int len = 0;
int x,y,z;
-
+
geo[X] = 0;
geo[Y] = 0;
geo[Z] = 0;
-
+
start1[X] = -1;
start1[Y] = -1;
start1[Z] = -1;
-
+
end1[X] = -1;
end1[Y] = -1;
end1[Z] = -1;
@@ -1135,7 +1135,7 @@ static int _add_bg_record(blockreq_t *blockreq, List allocated_blocks)
conn_type = "torus";
break;
}
-
+
nodes = blockreq->block;
if(!nodes)
return SLURM_SUCCESS;
@@ -1147,15 +1147,15 @@ static int _add_bg_record(blockreq_t *blockreq, List allocated_blocks)
&& (nodes[j+8] == ']' || nodes[j+8] == ',')
&& (nodes[j+4] == 'x' || nodes[j+4] == '-')) {
j++;
- number = xstrntol(nodes + j, NULL,
+ number = xstrntol(nodes + j, NULL,
BA_SYSTEM_DIMENSIONS, HOSTLIST_BASE);
start[X] = number / (HOSTLIST_BASE * HOSTLIST_BASE);
start[Y] = (number % (HOSTLIST_BASE * HOSTLIST_BASE))
/ HOSTLIST_BASE;
start[Z] = (number % HOSTLIST_BASE);
-
+
j += 4;
- number = xstrntol(nodes + j, NULL,
+ number = xstrntol(nodes + j, NULL,
BA_SYSTEM_DIMENSIONS, HOSTLIST_BASE);
end[X] = number / (HOSTLIST_BASE * HOSTLIST_BASE);
end[Y] = (number % (HOSTLIST_BASE * HOSTLIST_BASE))
@@ -1169,8 +1169,8 @@ static int _add_bg_record(blockreq_t *blockreq, List allocated_blocks)
start1[Y] = start[Y];
start1[Z] = start[Z];
}
- for (x = start[X]; x <= end[X]; x++)
- for (y = start[Y]; y <= end[Y]; y++)
+ for (x = start[X]; x <= end[X]; x++)
+ for (y = start[Y]; y <= end[Y]; y++)
for (z = start[Z]; z <= end[Z]; z++) {
if(x>end1[X]) {
geo[X]++;
@@ -1191,13 +1191,13 @@ static int _add_bg_record(blockreq_t *blockreq, List allocated_blocks)
j--;
} else if((nodes[j] >= '0' && nodes[j] <= '9')
|| (nodes[j] >= 'A' && nodes[j] <= 'Z')) {
- number = xstrntol(nodes + j, NULL,
+ number = xstrntol(nodes + j, NULL,
BA_SYSTEM_DIMENSIONS, HOSTLIST_BASE);
start[X] = number / (HOSTLIST_BASE * HOSTLIST_BASE);
start[Y] = (number % (HOSTLIST_BASE * HOSTLIST_BASE))
/ HOSTLIST_BASE;
start[Z] = (number % HOSTLIST_BASE);
-
+
j+=3;
diff = 0;
if(diff > largest_diff) {
@@ -1227,16 +1227,16 @@ static int _add_bg_record(blockreq_t *blockreq, List allocated_blocks)
memset(com,0,255);
sprintf(com,"create %dx%dx%d %s start %dx%dx%d "
"small32=%d small128=%d",
- geo[X], geo[Y], geo[Z], conn_type,
+ geo[X], geo[Y], geo[Z], conn_type,
start1[X], start1[Y], start1[Z],
blockreq->small32, blockreq->small128);
- if(!strcasecmp(layout_mode, "OVERLAP"))
+ if(!strcasecmp(layout_mode, "OVERLAP"))
reset_ba_system(false);
-
+
set_all_bps_except(nodes);
_create_allocation(com, allocated_blocks);
reset_all_removed_bps();
-
+
#endif
return SLURM_SUCCESS;
}
@@ -1255,7 +1255,7 @@ static int _load_configuration(char *com, List allocated_blocks)
memset(filename,0,100);
if(len>5)
- while(i<len) {
+ while(i<len) {
while(com[i-1]!=' ' && i<len) {
i++;
}
@@ -1265,14 +1265,14 @@ static int _load_configuration(char *com, List allocated_blocks)
j++;
if(j>100) {
memset(error_string,0,255);
- sprintf(error_string,
+ sprintf(error_string,
"filename is too long needs "
"to be under 100 chars");
return 0;
}
}
}
-
+
if(filename[0]=='\0') {
sprintf(filename,"bluegene.conf");
}
@@ -1287,28 +1287,28 @@ static int _load_configuration(char *com, List allocated_blocks)
if (!s_p_get_string(&layout, "LayoutMode", tbl)) {
memset(error_string,0,255);
- sprintf(error_string,
+ sprintf(error_string,
"Warning: LayoutMode was not specified in "
"bluegene.conf defaulting to STATIC partitioning");
} else {
_set_layout(layout);
xfree(layout);
}
-
+
if(strcasecmp(layout_mode, "DYNAMIC")) {
- if (!s_p_get_array((void ***)&blockreq_array,
+ if (!s_p_get_array((void ***)&blockreq_array,
&count, "BPs", tbl)) {
memset(error_string,0,255);
- sprintf(error_string,
+ sprintf(error_string,
"WARNING: no blocks defined in "
"bluegene.conf");
}
-
+
for (i = 0; i < count; i++) {
_add_bg_record(blockreq_array[i], allocated_blocks);
}
}
-
+
s_p_hashtbl_destroy(tbl);
return 1;
}
@@ -1373,21 +1373,21 @@ static void _print_text_command(allocated_block_t *allocated_block)
{
wattron(text_win,
COLOR_PAIR(allocated_block->color));
-
+
mvwprintw(text_win, main_ycord,
main_xcord, "%c", allocated_block->letter);
main_xcord += 4;
- if(allocated_block->request->conn_type==SELECT_TORUS)
+ if(allocated_block->request->conn_type==SELECT_TORUS)
mvwprintw(text_win, main_ycord,
main_xcord, "TORUS");
else if (allocated_block->request->conn_type==SELECT_MESH)
mvwprintw(text_win, main_ycord,
main_xcord, "MESH");
- else
+ else
mvwprintw(text_win, main_ycord,
main_xcord, "SMALL");
main_xcord += 7;
-
+
if(allocated_block->request->rotate)
mvwprintw(text_win, main_ycord,
main_xcord, "Y");
@@ -1395,7 +1395,7 @@ static void _print_text_command(allocated_block_t *allocated_block)
mvwprintw(text_win, main_ycord,
main_xcord, "N");
main_xcord += 7;
-
+
if(allocated_block->request->elongate)
mvwprintw(text_win, main_ycord,
main_xcord, "Y");
@@ -1407,41 +1407,41 @@ static void _print_text_command(allocated_block_t *allocated_block)
mvwprintw(text_win, main_ycord,
main_xcord, "%d", allocated_block->request->size);
main_xcord += 10;
-
+
if(allocated_block->request->conn_type == SELECT_SMALL) {
#ifndef HAVE_BGL
mvwprintw(text_win, main_ycord,
- main_xcord, "%d",
+ main_xcord, "%d",
allocated_block->request->small16);
main_xcord += 5;
#endif
mvwprintw(text_win, main_ycord,
- main_xcord, "%d",
+ main_xcord, "%d",
allocated_block->request->small32);
main_xcord += 5;
#ifndef HAVE_BGL
mvwprintw(text_win, main_ycord,
- main_xcord, "%d",
+ main_xcord, "%d",
allocated_block->request->small64);
main_xcord += 5;
#endif
mvwprintw(text_win, main_ycord,
- main_xcord, "%d",
+ main_xcord, "%d",
allocated_block->request->small128);
main_xcord += 6;
#ifndef HAVE_BGL
mvwprintw(text_win, main_ycord,
- main_xcord, "%d",
+ main_xcord, "%d",
allocated_block->request->small256);
main_xcord += 6;
#endif
-
+
} else
#ifndef HAVE_BGL
main_xcord += 27;
#else
main_xcord += 11;
-#endif
+#endif
mvwprintw(text_win, main_ycord,
main_xcord, "%s",
@@ -1456,16 +1456,16 @@ static void _print_text_command(allocated_block_t *allocated_block)
void get_command(void)
{
char com[255];
-
+
int text_width, text_startx;
allocated_block_t *allocated_block = NULL;
int i=0;
int count=0;
-
+
WINDOW *command_win;
List allocated_blocks;
ListIterator results_i;
-
+
if(params.commandline) {
printf("Configure won't work with commandline mode.\n");
printf("Please remove the -c from the commandline.\n");
@@ -1474,19 +1474,19 @@ void get_command(void)
}
init_wires();
allocated_blocks = list_create(NULL);
-
- text_width = text_win->_maxx;
+
+ text_width = text_win->_maxx;
text_startx = text_win->_begx;
command_win = newwin(3, text_width - 1, LINES - 4, text_startx + 1);
echo();
-
+
while (strcmp(com, "quit")) {
clear_window(grid_win);
print_grid(0);
clear_window(text_win);
box(text_win, 0, 0);
box(grid_win, 0, 0);
-
+
if (!params.no_header)
_print_header_command();
@@ -1498,22 +1498,22 @@ void get_command(void)
main_xcord=1;
i++;
}
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
- main_xcord,
+ main_xcord,
"%c",
error_string[i++]);
main_xcord++;
}
main_ycord++;
- main_xcord=1;
- memset(error_string,0,255);
+ main_xcord=1;
+ memset(error_string,0,255);
}
results_i = list_iterator_create(allocated_blocks);
-
- count = list_count(allocated_blocks)
- - (LINES-(main_ycord+5));
-
+
+ count = list_count(allocated_blocks)
+ - (LINES-(main_ycord+5));
+
if(count<0)
count=0;
i=0;
@@ -1522,27 +1522,27 @@ void get_command(void)
_print_text_command(allocated_block);
i++;
}
- list_iterator_destroy(results_i);
-
+ list_iterator_destroy(results_i);
+
wnoutrefresh(text_win);
wnoutrefresh(grid_win);
doupdate();
clear_window(command_win);
-
+
box(command_win, 0, 0);
mvwprintw(command_win, 0, 3,
"Input Command: (type quit to change view, "
"exit to exit)");
wmove(command_win, 1, 1);
wgetstr(command_win, com);
-
+
if (!strcmp(com, "exit")) {
endwin();
_delete_allocated_blocks(allocated_blocks);
ba_fini();
exit(0);
- }
-
+ }
+
if (!strcmp(com, "quit") || !strcmp(com, "\\q")) {
break;
} else if (!strncasecmp(com, "layout", 6)) {
@@ -1559,8 +1559,8 @@ void get_command(void)
main_ycord,
main_xcord, "%s", com);
} else if (!strncasecmp(com, "drain", 5)) {
- mvwprintw(text_win,
- main_ycord,
+ mvwprintw(text_win,
+ main_ycord,
main_xcord, "%s", com);
} else if (!strncasecmp(com, "alldown", 7)) {
_change_state_all_bps(com, NODE_STATE_DOWN);
@@ -1571,7 +1571,7 @@ void get_command(void)
} else if (!strncasecmp(com, "up", 2)) {
_change_state_bps(com, NODE_STATE_IDLE);
} else if (!strncasecmp(com, "remove", 6)
- || !strncasecmp(com, "delete", 6)
+ || !strncasecmp(com, "delete", 6)
|| !strncasecmp(com, "drop", 4)) {
_remove_allocation(com, allocated_blocks);
} else if (!strncasecmp(com, "alter", 5)) {
@@ -1579,7 +1579,7 @@ void get_command(void)
} else if (!strncasecmp(com, "create", 6)) {
_create_allocation(com, allocated_blocks);
} else if (!strncasecmp(com, "copy", 4)
- || !strncasecmp(com, "c ", 2)
+ || !strncasecmp(com, "c ", 2)
|| !strncasecmp(com, "c\0", 2)) {
_copy_allocation(com, allocated_blocks);
} else if (!strncasecmp(com, "save", 4)) {
@@ -1598,7 +1598,7 @@ void get_command(void)
_delete_allocated_blocks(allocated_blocks);
params.display = 0;
noecho();
-
+
clear_window(text_win);
main_xcord = 1;
main_ycord = 1;
diff --git a/src/smap/grid_functions.c b/src/smap/grid_functions.c
index 283fdca1972697d1d233f76e3759183140c5e58a..d67a4876809eb76773eb5612f1406aa571b5eeb2 100644
--- a/src/smap/grid_functions.c
+++ b/src/smap/grid_functions.c
@@ -7,32 +7,32 @@
* Written by Danny Auble <da@llnl.gov>
*
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -75,16 +75,16 @@ extern int set_grid_name(char *nodes, int count)
y = _coord(node[i-2]);
z = _coord(node[i-1]);
}
- if ((ba_system_ptr->grid[x][y][z].state
+ if ((ba_system_ptr->grid[x][y][z].state
!= NODE_STATE_DOWN) &&
- (!(ba_system_ptr->grid[x][y][z].state
+ (!(ba_system_ptr->grid[x][y][z].state
& NODE_STATE_DRAIN)) &&
- (x >= 0) && (x < DIM_SIZE[X]) &&
- (y >= 0) && (y < DIM_SIZE[Y]) &&
+ (x >= 0) && (x < DIM_SIZE[X]) &&
+ (y >= 0) && (y < DIM_SIZE[Y]) &&
(z >= 0) && (z < DIM_SIZE[Z])) {
- ba_system_ptr->grid[x][y][z].letter =
+ ba_system_ptr->grid[x][y][z].letter =
letters[count%62];
- ba_system_ptr->grid[x][y][z].color =
+ ba_system_ptr->grid[x][y][z].color =
colors[count%6];
}
free(node);
@@ -102,20 +102,20 @@ extern int set_grid_inx(int start, int end, int count)
for (y = DIM_SIZE[Y] - 1; y >= 0; y--) {
for (z = 0; z < DIM_SIZE[Z]; z++) {
for (x = 0; x < DIM_SIZE[X]; x++) {
- if ((ba_system_ptr->grid[x][y][z].index
+ if ((ba_system_ptr->grid[x][y][z].index
< start)
- || (ba_system_ptr->grid[x][y][z].index
- > end))
+ || (ba_system_ptr->grid[x][y][z].index
+ > end))
continue;
- if ((ba_system_ptr->grid[x][y][z].state
+ if ((ba_system_ptr->grid[x][y][z].state
== NODE_STATE_DOWN)
- || (ba_system_ptr->grid[x][y][z].state
+ || (ba_system_ptr->grid[x][y][z].state
& NODE_STATE_DRAIN))
continue;
- ba_system_ptr->grid[x][y][z].letter =
+ ba_system_ptr->grid[x][y][z].letter =
letters[count%62];
- ba_system_ptr->grid[x][y][z].color =
+ ba_system_ptr->grid[x][y][z].color =
colors[count%6];
}
}
@@ -123,7 +123,7 @@ extern int set_grid_inx(int start, int end, int count)
#else
for (x = 0; x < DIM_SIZE[X]; x++) {
if ((ba_system_ptr->grid[x].index < start)
- || (ba_system_ptr->grid[x].index > end))
+ || (ba_system_ptr->grid[x].index > end))
continue;
if ((ba_system_ptr->grid[x].state == NODE_STATE_DOWN)
|| (ba_system_ptr->grid[x].state & NODE_STATE_DRAIN))
@@ -154,7 +154,7 @@ extern int set_grid_bg(int *start, int *end, int count, int set)
assert(start[Y] >= 0);
assert(end[Z] < DIM_SIZE[Z]);
assert(start[Z] >= 0);
-
+
for (x = start[X]; x <= end[X]; x++) {
for (y = start[Y]; y <= end[Y]; y++) {
for (z = start[Z]; z <= end[Z]; z++) {
@@ -162,19 +162,19 @@ extern int set_grid_bg(int *start, int *end, int count, int set)
block if the set flag is specified
or if the letter hasn't been set yet
*/
- if(set
+ if(set
|| ((ba_system_ptr->grid[x][y][z].letter
== '.')
- && (ba_system_ptr->grid[x][y][z].letter
+ && (ba_system_ptr->grid[x][y][z].letter
!= '#'))) {
-
+
ba_system_ptr->
- grid[x][y][z].letter =
+ grid[x][y][z].letter =
letters[count%62];
ba_system_ptr->
- grid[x][y][z].color =
+ grid[x][y][z].color =
colors[count%6];
- }
+ }
i++;
}
}
@@ -182,14 +182,14 @@ extern int set_grid_bg(int *start, int *end, int count, int set)
#else
for (x = start[X]; x <= end[X]; x++) {
if(!set) {
- ba_system_ptr->grid[x].letter =
+ ba_system_ptr->grid[x].letter =
letters[count%62];
- ba_system_ptr->grid[x].color =
+ ba_system_ptr->grid[x].color =
colors[count%6];
}
i++;
}
-
+
#endif
return i;
@@ -219,7 +219,7 @@ extern void print_grid(int dir)
init_pair(ba_system_ptr->
grid[x][y][z].color,
ba_system_ptr->
- grid[x][y][z].color,
+ grid[x][y][z].color,
7);
wattron(grid_win,
@@ -250,18 +250,18 @@ extern void print_grid(int dir)
COLOR_BLACK);
else
init_pair(ba_system_ptr->grid[x].color,
- ba_system_ptr->grid[x].color,
+ ba_system_ptr->grid[x].color,
7);
-
+
wattron(grid_win,
COLOR_PAIR(ba_system_ptr->grid[x].color));
-
+
mvwprintw(grid_win,
grid_ycord, grid_xcord, "%c",
ba_system_ptr->grid[x].letter);
wattroff(grid_win,
COLOR_PAIR(ba_system_ptr->grid[x].color));
-
+
grid_xcord++;
if(grid_xcord==grid_win->_maxx) {
grid_xcord=1;
@@ -292,8 +292,8 @@ bitstr_t *get_requested_node_bitmap()
&new_node_ptr, SHOW_ALL);
if (error_code == SLURM_SUCCESS)
slurm_free_node_info_msg(old_node_ptr);
- else if (slurm_get_errno() == SLURM_NO_CHANGE_IN_DATA)
- return bitmap;
+ else if (slurm_get_errno() == SLURM_NO_CHANGE_IN_DATA)
+ return bitmap;
} else
error_code = slurm_load_node((time_t) NULL, &new_node_ptr,
SHOW_ALL);
diff --git a/src/smap/job_functions.c b/src/smap/job_functions.c
index 6b67eb43a66021f250bbdd3d82ad5cbcb4eaad1c..d502247eb9f5fcc75e1f793d5177521a1048b7e3 100644
--- a/src/smap/job_functions.c
+++ b/src/smap/job_functions.c
@@ -7,32 +7,32 @@
* Written by Danny Auble <da@llnl.gov>
*
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -70,7 +70,7 @@ extern void get_job(void)
new_job_ptr = job_info_ptr;
}
} else
- error_code = slurm_load_jobs((time_t) NULL, &new_job_ptr,
+ error_code = slurm_load_jobs((time_t) NULL, &new_job_ptr,
show_flags);
if (error_code) {
@@ -78,7 +78,7 @@ extern void get_job(void)
if(!params.commandline) {
mvwprintw(text_win,
main_ycord, 1,
- "slurm_load_job: %s",
+ "slurm_load_job: %s",
slurm_strerror(slurm_get_errno()));
main_ycord++;
} else {
@@ -95,9 +95,9 @@ extern void get_job(void)
recs = new_job_ptr->record_count;
else
recs = 0;
-
+
if(!params.commandline)
- if((text_line_cnt+printed_jobs) > count)
+ if((text_line_cnt+printed_jobs) > count)
text_line_cnt--;
printed_jobs = 0;
count = 0;
@@ -108,7 +108,7 @@ extern void get_job(void)
job_ptr = &(new_job_ptr->job_array[i]);
if(!IS_JOB_PENDING(job_ptr) && !IS_JOB_RUNNING(job_ptr)
&& !IS_JOB_SUSPENDED(job_ptr)
- && !IS_JOB_COMPLETING(job_ptr))
+ && !IS_JOB_COMPLETING(job_ptr))
continue; /* job has completed */
if(nodes_req) {
int overlap = 0;
@@ -116,7 +116,7 @@ extern void get_job(void)
inx2bitstr(loc_bitmap, job_ptr->node_inx);
overlap = bit_overlap(loc_bitmap, nodes_req);
FREE_NULL_BITMAP(loc_bitmap);
- if(!overlap)
+ if(!overlap)
continue;
}
@@ -134,9 +134,9 @@ extern void get_job(void)
if(!params.commandline) {
if((count>=text_line_cnt)
- && (printed_jobs
+ && (printed_jobs
< (text_win->_maxy-3))) {
- job_ptr->num_procs =
+ job_ptr->num_procs =
(int)letters[count%62];
wattron(text_win,
COLOR_PAIR(colors[count%6]));
@@ -144,26 +144,26 @@ extern void get_job(void)
wattroff(text_win,
COLOR_PAIR(colors[count%6]));
printed_jobs++;
- }
+ }
} else {
job_ptr->num_procs = (int)letters[count%62];
_print_text_job(job_ptr);
}
- count++;
+ count++;
}
if(count==128)
count=0;
}
-
+
for (i = 0; i < recs; i++) {
job_ptr = &(new_job_ptr->job_array[i]);
-
+
if (!IS_JOB_PENDING(job_ptr))
continue; /* job has completed */
if(!params.commandline) {
if((count>=text_line_cnt)
- && (printed_jobs
+ && (printed_jobs
< (text_win->_maxy-3))) {
xfree(job_ptr->nodes);
job_ptr->nodes = xstrdup("waiting...");
@@ -174,7 +174,7 @@ extern void get_job(void)
wattroff(text_win,
COLOR_PAIR(colors[count%6]));
printed_jobs++;
- }
+ }
} else {
xfree(job_ptr->nodes);
job_ptr->nodes = xstrdup("waiting...");
@@ -182,8 +182,8 @@ extern void get_job(void)
_print_text_job(job_ptr);
printed_jobs++;
}
- count++;
-
+ count++;
+
if(count==128)
count=0;
}
@@ -193,7 +193,7 @@ extern void get_job(void)
if(!params.commandline)
main_ycord++;
-
+
job_info_ptr = new_job_ptr;
return;
}
@@ -276,15 +276,15 @@ static int _print_text_job(job_info_t * job_ptr)
uint32_t node_cnt = 0;
char *ionodes = NULL, *uname;
time_t now_time = time(NULL);
-
+
#ifdef HAVE_BG
- select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_IONODES,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo,
+ SELECT_JOBDATA_IONODES,
&ionodes);
- select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_NODE_CNT,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo,
+ SELECT_JOBDATA_NODE_CNT,
&node_cnt);
- if(!strcasecmp(job_ptr->nodes,"waiting..."))
+ if(!strcasecmp(job_ptr->nodes,"waiting..."))
xfree(ionodes);
#else
node_cnt = job_ptr->num_nodes;
@@ -308,19 +308,19 @@ static int _print_text_job(job_info_t * job_ptr)
main_xcord += 10;
#ifdef HAVE_BG
mvwprintw(text_win, main_ycord,
- main_xcord, "%.16s",
- select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
- time_buf,
- sizeof(time_buf),
+ main_xcord, "%.16s",
+ select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
+ time_buf,
+ sizeof(time_buf),
SELECT_PRINT_BG_ID));
main_xcord += 18;
#endif
#ifdef HAVE_CRAY_XT
mvwprintw(text_win, main_ycord,
- main_xcord, "%.16s",
- select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
- time_buf,
- sizeof(time_buf),
+ main_xcord, "%.16s",
+ select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
+ time_buf,
+ sizeof(time_buf),
SELECT_PRINT_RESV_ID));
main_xcord += 18;
#endif
@@ -348,29 +348,29 @@ static int _print_text_job(job_info_t * job_ptr)
time_buf);
main_xcord += 11;
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
main_xcord, "%5s", tmp_cnt);
-
+
main_xcord += 6;
tempxcord = main_xcord;
-
+
i=0;
while (job_ptr->nodes[i] != '\0') {
if ((printed = mvwaddch(text_win,
- main_ycord,
+ main_ycord,
main_xcord,
job_ptr->nodes[i])) < 0) {
xfree(ionodes);
return printed;
}
main_xcord++;
- width = text_win->_maxx
+ width = text_win->_maxx
- main_xcord;
if (job_ptr->nodes[i] == '[')
prefixlen = i + 1;
- else if (job_ptr->nodes[i] == ','
+ else if (job_ptr->nodes[i] == ','
&& (width - 9) <= 0) {
main_ycord++;
main_xcord = tempxcord + prefixlen;
@@ -378,9 +378,9 @@ static int _print_text_job(job_info_t * job_ptr)
i++;
}
if(ionodes) {
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
- main_xcord, "[%s]",
+ main_xcord, "[%s]",
ionodes);
main_xcord += strlen(ionodes)+2;
xfree(ionodes);
@@ -392,17 +392,17 @@ static int _print_text_job(job_info_t * job_ptr)
printf("%8d ", job_ptr->job_id);
printf("%9.9s ", job_ptr->partition);
#ifdef HAVE_BG
- printf("%16.16s ",
- select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
- time_buf,
- sizeof(time_buf),
+ printf("%16.16s ",
+ select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
+ time_buf,
+ sizeof(time_buf),
SELECT_PRINT_BG_ID));
#endif
#ifdef HAVE_CRAY_XT
- printf("%16.16s ",
- select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
- time_buf,
- sizeof(time_buf),
+ printf("%16.16s ",
+ select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
+ time_buf,
+ sizeof(time_buf),
SELECT_PRINT_RESV_ID));
#endif
uname = uid_to_string((uid_t) job_ptr->user_id);
@@ -417,11 +417,11 @@ static int _print_text_job(job_info_t * job_ptr)
time_diff = now_time - job_ptr->start_time;
secs2time_str(time_diff, time_buf, sizeof(time_buf));
}
-
+
printf("%10.10s ", time_buf);
printf("%5s ", tmp_cnt);
-
+
printf("%s", job_ptr->nodes);
if(ionodes) {
printf("[%s]", ionodes);
@@ -429,7 +429,7 @@ static int _print_text_job(job_info_t * job_ptr)
}
printf("\n");
-
+
}
return printed;
diff --git a/src/smap/opts.c b/src/smap/opts.c
index 3ea796e720304eb95d3c2deee7b93bf12bbfb70a..ff3005abdf69aaa324006c90c52723e5954ad5a0 100644
--- a/src/smap/opts.c
+++ b/src/smap/opts.c
@@ -16,15 +16,15 @@
* 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
+ * 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
+ * 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
+ * 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
@@ -69,7 +69,7 @@ extern void parse_command_line(int argc, char *argv[])
{"hide", no_argument, 0, OPT_LONG_HIDE},
{NULL, 0, 0, 0}
};
-
+
while ((opt_char =
getopt_long(argc, argv, "cD:hi:I:n:QR:vV",
long_options, &option_index)) != -1) {
@@ -93,7 +93,7 @@ extern void parse_command_line(int argc, char *argv[])
tmp = COMMANDS;
else if (!strcmp(optarg, "r"))
tmp = RESERVATIONS;
-
+
params.display = tmp;
break;
case 'h':
diff --git a/src/smap/partition_functions.c b/src/smap/partition_functions.c
index a5d318599104daee65aa3c270db1545e53bbbee8..8cd5add15c5f716870b252ac3daa5691b5af37d6 100644
--- a/src/smap/partition_functions.c
+++ b/src/smap/partition_functions.c
@@ -1,39 +1,39 @@
/*****************************************************************************\
- * partition_functions.c - Functions related to partition display
+ * partition_functions.c - Functions related to partition display
* mode of smap.
*****************************************************************************
* Copyright (C) 2004-2007 The Regents of the University of California.
* Copyright (C) 2008 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -58,7 +58,7 @@ typedef struct {
int letter_num;
List nodelist;
char *nodes;
- int node_cnt;
+ int node_cnt;
bool printed;
int size;
char *slurm_part_name;
@@ -73,7 +73,7 @@ static List block_list = NULL;
static int _marknodes(db2_block_info_t *block_ptr, int count);
#endif
static void _print_header_part(void);
-static int _print_text_part(partition_info_t *part_ptr,
+static int _print_text_part(partition_info_t *part_ptr,
db2_block_info_t *db2_info_ptr);
#ifdef HAVE_BG
static void _block_list_del(void *object);
@@ -93,7 +93,7 @@ extern void get_slurm_part()
bitstr_t *nodes_req = NULL;
if (part_info_ptr) {
- error_code = slurm_load_partitions(part_info_ptr->last_update,
+ error_code = slurm_load_partitions(part_info_ptr->last_update,
&new_part_ptr, SHOW_ALL);
if (error_code == SLURM_SUCCESS)
slurm_free_partition_info_msg(part_info_ptr);
@@ -102,7 +102,7 @@ extern void get_slurm_part()
new_part_ptr = part_info_ptr;
}
} else {
- error_code = slurm_load_partitions((time_t) NULL,
+ error_code = slurm_load_partitions((time_t) NULL,
&new_part_ptr, SHOW_ALL);
}
if (error_code) {
@@ -120,10 +120,10 @@ extern void get_slurm_part()
}
return;
}
-
+
if (!params.no_header)
_print_header_part();
-
+
if (new_part_ptr)
recs = new_part_ptr->record_count;
else
@@ -137,7 +137,7 @@ extern void get_slurm_part()
for (i = 0; i < recs; i++) {
j = 0;
part = new_part_ptr->partition_array[i];
-
+
if (!part.nodes || (part.nodes[0] == '\0'))
continue; /* empty partition */
if(nodes_req) {
@@ -146,9 +146,9 @@ extern void get_slurm_part()
inx2bitstr(loc_bitmap, part.node_inx);
overlap = bit_overlap(loc_bitmap, nodes_req);
FREE_NULL_BITMAP(loc_bitmap);
- if(!overlap)
+ if(!overlap)
continue;
- }
+ }
while (part.node_inx[j] >= 0) {
set_grid_inx(part.node_inx[j],
part.node_inx[j + 1], count);
@@ -168,13 +168,13 @@ extern void get_slurm_part()
_print_text_part(&part, NULL);
}
count++;
-
+
}
if(count==128)
count=0;
if (params.commandline && params.iterate)
printf("\n");
-
+
part_info_ptr = new_part_ptr;
return;
}
@@ -196,7 +196,7 @@ extern void get_bg_part()
bitstr_t *nodes_req = NULL;
if (part_info_ptr) {
- error_code = slurm_load_partitions(part_info_ptr->last_update,
+ error_code = slurm_load_partitions(part_info_ptr->last_update,
&new_part_ptr, SHOW_ALL);
if (error_code == SLURM_SUCCESS)
slurm_free_partition_info_msg(part_info_ptr);
@@ -205,7 +205,7 @@ extern void get_bg_part()
new_part_ptr = part_info_ptr;
}
} else {
- error_code = slurm_load_partitions((time_t) NULL,
+ error_code = slurm_load_partitions((time_t) NULL,
&new_part_ptr, SHOW_ALL);
}
@@ -225,7 +225,7 @@ extern void get_bg_part()
return;
}
if (bg_info_ptr) {
- error_code = slurm_load_block_info(bg_info_ptr->last_update,
+ error_code = slurm_load_block_info(bg_info_ptr->last_update,
&new_bg_ptr);
if (error_code == SLURM_SUCCESS)
slurm_free_block_info_msg(&bg_info_ptr);
@@ -234,7 +234,7 @@ extern void get_bg_part()
new_bg_ptr = bg_info_ptr;
}
} else {
- error_code = slurm_load_block_info((time_t) NULL,
+ error_code = slurm_load_block_info((time_t) NULL,
&new_bg_ptr);
}
if (error_code) {
@@ -263,7 +263,7 @@ extern void get_bg_part()
}
}
if (!params.commandline)
- if((new_bg_ptr->record_count - text_line_cnt)
+ if((new_bg_ptr->record_count - text_line_cnt)
< (text_win->_maxy-3))
text_line_cnt--;
if(params.hl)
@@ -272,50 +272,50 @@ extern void get_bg_part()
if(nodes_req) {
int overlap = 0;
bitstr_t *loc_bitmap = bit_alloc(bit_size(nodes_req));
- inx2bitstr(loc_bitmap,
+ inx2bitstr(loc_bitmap,
new_bg_ptr->block_array[i].bp_inx);
overlap = bit_overlap(loc_bitmap, nodes_req);
FREE_NULL_BITMAP(loc_bitmap);
- if(!overlap)
+ if(!overlap)
continue;
}
if(params.io_bit && new_bg_ptr->block_array[i].ionodes) {
int overlap = 0;
bitstr_t *loc_bitmap =
bit_alloc(bit_size(params.io_bit));
- inx2bitstr(loc_bitmap,
+ inx2bitstr(loc_bitmap,
new_bg_ptr->block_array[i].ionode_inx);
overlap = bit_overlap(loc_bitmap,
params.io_bit);
FREE_NULL_BITMAP(loc_bitmap);
- if(!overlap)
+ if(!overlap)
continue;
}
-
+
block_ptr = xmalloc(sizeof(db2_block_info_t));
-
- block_ptr->bg_block_name
+
+ block_ptr->bg_block_name
= xstrdup(new_bg_ptr->block_array[i].bg_block_id);
block_ptr->nodes = xstrdup(new_bg_ptr->block_array[i].nodes);
block_ptr->nodelist = list_create(_nodelist_del);
_make_nodelist(block_ptr->nodes,block_ptr->nodelist);
-
- block_ptr->bg_user_name
+
+ block_ptr->bg_user_name
= xstrdup(new_bg_ptr->block_array[i].owner_name);
block_ptr->state = new_bg_ptr->block_array[i].state;
block_ptr->bg_conn_type = new_bg_ptr->block_array[i].conn_type;
#ifdef HAVE_BGL
block_ptr->bg_node_use = new_bg_ptr->block_array[i].node_use;
#endif
- block_ptr->ionodes
+ block_ptr->ionodes
= xstrdup(new_bg_ptr->block_array[i].ionodes);
block_ptr->node_cnt = new_bg_ptr->block_array[i].node_cnt;
-
+
itr = list_iterator_create(block_list);
- while ((found_block = (db2_block_info_t*)list_next(itr))
+ while ((found_block = (db2_block_info_t*)list_next(itr))
!= NULL) {
if(!strcmp(block_ptr->nodes, found_block->nodes)) {
- block_ptr->letter_num =
+ block_ptr->letter_num =
found_block->letter_num;
break;
}
@@ -333,7 +333,7 @@ extern void get_bg_part()
list_append(block_list, block_ptr);
}
-
+
if (!params.no_header)
_print_header_part();
@@ -345,19 +345,19 @@ extern void get_bg_part()
for (i = 0; i < recs; i++) {
j = 0;
part = new_part_ptr->partition_array[i];
-
+
if (!part.nodes || (part.nodes[0] == '\0'))
continue; /* empty partition */
nodelist = list_create(_nodelist_del);
- _make_nodelist(part.nodes,nodelist);
-
+ _make_nodelist(part.nodes,nodelist);
+
if (block_list) {
itr = list_iterator_create(block_list);
- while ((block_ptr = (db2_block_info_t*)
+ while ((block_ptr = (db2_block_info_t*)
list_next(itr)) != NULL) {
if(_in_slurm_partition(nodelist,
block_ptr->nodelist)) {
- block_ptr->slurm_part_name
+ block_ptr->slurm_part_name
= xstrdup(part.name);
}
}
@@ -369,7 +369,7 @@ extern void get_bg_part()
/* Report the BG Blocks */
if (block_list) {
itr = list_iterator_create(block_list);
- while ((block_ptr = (db2_block_info_t*)
+ while ((block_ptr = (db2_block_info_t*)
list_next(itr)) != NULL) {
if (params.commandline)
block_ptr->printed = 1;
@@ -378,13 +378,13 @@ extern void get_bg_part()
block_ptr->printed = 1;
}
_print_rest(block_ptr);
- count++;
+ count++;
}
-
+
list_iterator_destroy(itr);
}
-
+
if (params.commandline && params.iterate)
printf("\n");
@@ -401,18 +401,18 @@ static int _marknodes(db2_block_info_t *block_ptr, int count)
int start[BA_SYSTEM_DIMENSIONS];
int end[BA_SYSTEM_DIMENSIONS];
int number = 0;
-
+
block_ptr->letter_num = count;
while (block_ptr->nodes[j] != '\0') {
if ((block_ptr->nodes[j] == '['
|| block_ptr->nodes[j] == ',')
- && (block_ptr->nodes[j+8] == ']'
+ && (block_ptr->nodes[j+8] == ']'
|| block_ptr->nodes[j+8] == ',')
&& (block_ptr->nodes[j+4] == 'x'
|| block_ptr->nodes[j+4] == '-')) {
j++;
number = xstrntol(block_ptr->nodes + j,
- NULL, BA_SYSTEM_DIMENSIONS,
+ NULL, BA_SYSTEM_DIMENSIONS,
HOSTLIST_BASE);
start[X] = number / (HOSTLIST_BASE * HOSTLIST_BASE);
start[Y] = (number % (HOSTLIST_BASE * HOSTLIST_BASE))
@@ -420,23 +420,23 @@ static int _marknodes(db2_block_info_t *block_ptr, int count)
start[Z] = (number % HOSTLIST_BASE);
j += 4;
number = xstrntol(block_ptr->nodes + j,
- NULL, BA_SYSTEM_DIMENSIONS,
+ NULL, BA_SYSTEM_DIMENSIONS,
HOSTLIST_BASE);
end[X] = number / (HOSTLIST_BASE * HOSTLIST_BASE);
end[Y] = (number % (HOSTLIST_BASE * HOSTLIST_BASE))
/ HOSTLIST_BASE;
end[Z] = (number % HOSTLIST_BASE);
j += 3;
-
- if(block_ptr->state != RM_PARTITION_FREE)
+
+ if(block_ptr->state != RM_PARTITION_FREE)
block_ptr->size += set_grid_bg(start,
end,
count,
1);
else
- block_ptr->size += set_grid_bg(start,
- end,
- count,
+ block_ptr->size += set_grid_bg(start,
+ end,
+ count,
0);
if(block_ptr->nodes[j] != ',')
break;
@@ -445,18 +445,18 @@ static int _marknodes(db2_block_info_t *block_ptr, int count)
&& block_ptr->nodes[j] <= '9')
|| (block_ptr->nodes[j] >= 'A'
&& block_ptr->nodes[j] <= 'Z')) {
-
+
number = xstrntol(block_ptr->nodes + j,
- NULL, BA_SYSTEM_DIMENSIONS,
+ NULL, BA_SYSTEM_DIMENSIONS,
HOSTLIST_BASE);
start[X] = number / (HOSTLIST_BASE * HOSTLIST_BASE);
start[Y] = (number % (HOSTLIST_BASE * HOSTLIST_BASE))
/ HOSTLIST_BASE;
start[Z] = (number % HOSTLIST_BASE);
j+=3;
- block_ptr->size += set_grid_bg(start,
- start,
- count,
+ block_ptr->size += set_grid_bg(start,
+ start,
+ count,
0);
if(block_ptr->nodes[j] != ',')
break;
@@ -477,39 +477,39 @@ static void _print_header_part(void)
mvwprintw(text_win, main_ycord,
main_xcord, "PARTITION");
main_xcord += 10;
-
+
if (params.display != BGPART) {
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
main_xcord, "AVAIL");
main_xcord += 7;
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
main_xcord, "TIMELIMIT");
main_xcord += 11;
} else {
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
main_xcord, "BG_BLOCK");
main_xcord += 18;
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
main_xcord, "STATE");
main_xcord += 7;
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
main_xcord, "JOBID");
main_xcord += 8;
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
main_xcord, "USER");
main_xcord += 9;
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
main_xcord, "CONN");
main_xcord += 7;
#ifdef HAVE_BGL
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
main_xcord, "NODE_USE");
main_xcord += 10;
@@ -548,12 +548,12 @@ static void _print_header_part(void)
#ifdef HAVE_BG
printf("BP_LIST\n");
#else
- printf("NODELIST\n");
+ printf("NODELIST\n");
#endif
- }
+ }
}
-static int _print_text_part(partition_info_t *part_ptr,
+static int _print_text_part(partition_info_t *part_ptr,
db2_block_info_t *db2_info_ptr)
{
int printed = 0;
@@ -566,96 +566,96 @@ static int _print_text_part(partition_info_t *part_ptr,
char tmp_char[8];
#ifdef HAVE_BG
- convert_num_unit((float)part_ptr->total_nodes, tmp_cnt,
+ convert_num_unit((float)part_ptr->total_nodes, tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
#else
snprintf(tmp_cnt, sizeof(tmp_cnt), "%u", part_ptr->total_nodes);
#endif
if(!params.commandline) {
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
- main_xcord, "%c",
+ main_xcord, "%c",
part_ptr->root_only);
main_xcord += 4;
if (part_ptr->name) {
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
- main_xcord, "%.9s",
+ main_xcord, "%.9s",
part_ptr->name);
main_xcord += 10;
if (params.display != BGPART) {
if (part_ptr->state_up)
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
- main_xcord,
+ main_xcord,
"up");
else
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
- main_xcord,
+ main_xcord,
"down");
main_xcord += 7;
-
+
if (part_ptr->max_time == INFINITE)
- snprintf(time_buf, sizeof(time_buf),
+ snprintf(time_buf, sizeof(time_buf),
"infinite");
else {
secs2time_str((part_ptr->max_time
* 60),
- time_buf,
+ time_buf,
sizeof(time_buf));
}
-
+
width = strlen(time_buf);
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
- main_xcord + (9 - width),
- "%s",
+ main_xcord + (9 - width),
+ "%s",
time_buf);
main_xcord += 11;
- }
+ }
} else
main_xcord += 10;
if (params.display == BGPART) {
if (db2_info_ptr) {
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
- main_xcord, "%.16s",
+ main_xcord, "%.16s",
db2_info_ptr->bg_block_name);
main_xcord += 18;
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
- main_xcord,
+ main_xcord,
bg_block_state_string(
db2_info_ptr->state));
main_xcord += 7;
-
+
if(db2_info_ptr->job_running > NO_JOB_RUNNING)
- snprintf(tmp_char, sizeof(tmp_char),
+ snprintf(tmp_char, sizeof(tmp_char),
"%d",
db2_info_ptr->job_running);
else
snprintf(tmp_char, sizeof(tmp_char),
"-");
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
- main_xcord,
+ main_xcord,
"%.8s", tmp_char);
main_xcord += 8;
-
- mvwprintw(text_win,
+
+ mvwprintw(text_win,
main_ycord,
- main_xcord, "%.8s",
+ main_xcord, "%.8s",
db2_info_ptr->bg_user_name);
main_xcord += 9;
-
- mvwprintw(text_win,
+
+ mvwprintw(text_win,
main_ycord,
- main_xcord, "%.5s",
+ main_xcord, "%.5s",
conn_type_string(
db2_info_ptr->
bg_conn_type));
@@ -669,40 +669,40 @@ static int _print_text_part(partition_info_t *part_ptr,
main_xcord += 10;
#endif
} else {
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
main_xcord, "?");
main_xcord += 18;
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
main_xcord, "?");
main_xcord += 7;
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
main_xcord, "?");
main_xcord += 8;
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
main_xcord, "?");
main_xcord += 9;
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
main_xcord, "?");
main_xcord += 7;
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
main_xcord, "?");
main_xcord += 10;
}
}
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
main_xcord, "%5s", tmp_cnt);
-
+
main_xcord += 7;
tempxcord = main_xcord;
-
+
if (params.display == BGPART)
nodes = part_ptr->allow_groups;
else
@@ -710,10 +710,10 @@ static int _print_text_part(partition_info_t *part_ptr,
i=0;
prefixlen = i;
while (nodes && nodes[i]) {
- width = text_win->_maxx
+ width = text_win->_maxx
- main_xcord;
- if (!prefixlen && nodes[i] == '['
+ if (!prefixlen && nodes[i] == '['
&& nodes[i - 1] == ',')
prefixlen = i + 1;
@@ -728,7 +728,7 @@ static int _print_text_part(partition_info_t *part_ptr,
if ((printed = mvwaddch(text_win,
- main_ycord,
+ main_ycord,
main_xcord,
nodes[i])) < 0)
return printed;
@@ -738,74 +738,74 @@ static int _print_text_part(partition_info_t *part_ptr,
}
if((params.display == BGPART) && db2_info_ptr
&& (db2_info_ptr->ionodes)) {
- mvwprintw(text_win,
+ mvwprintw(text_win,
main_ycord,
- main_xcord, "[%s]",
+ main_xcord, "[%s]",
db2_info_ptr->ionodes);
}
-
+
main_xcord = 1;
main_ycord++;
} else {
if (part_ptr->name) {
printf("%9.9s ", part_ptr->name);
-
+
if (params.display != BGPART) {
if (part_ptr->state_up)
printf(" up ");
else
printf(" down ");
-
+
if (part_ptr->max_time == INFINITE)
- snprintf(time_buf, sizeof(time_buf),
+ snprintf(time_buf, sizeof(time_buf),
"infinite");
else {
- secs2time_str((part_ptr->max_time
+ secs2time_str((part_ptr->max_time
* 60),
- time_buf,
+ time_buf,
sizeof(time_buf));
}
-
+
width = strlen(time_buf);
- printf("%9.9s ", time_buf);
- }
+ printf("%9.9s ", time_buf);
+ }
}
if (params.display == BGPART) {
if (db2_info_ptr) {
printf("%16.16s ",
db2_info_ptr->bg_block_name);
- printf("%5.5s ",
+ printf("%5.5s ",
bg_block_state_string(
db2_info_ptr->state));
-
+
if(db2_info_ptr->job_running > NO_JOB_RUNNING)
- snprintf(tmp_char, sizeof(tmp_char),
+ snprintf(tmp_char, sizeof(tmp_char),
"%d",
db2_info_ptr->job_running);
else
snprintf(tmp_char, sizeof(tmp_char),
"-");
-
+
printf("%8.8s ", tmp_char);
printf("%8.8s ", db2_info_ptr->bg_user_name);
-
+
printf("%5.5s ", conn_type_string(
db2_info_ptr->bg_conn_type));
#ifdef HAVE_BGL
printf("%9.9s ", node_use_string(
db2_info_ptr->bg_node_use));
#endif
- }
+ }
}
-
+
printf("%5s ", tmp_cnt);
-
+
if (params.display == BGPART)
nodes = part_ptr->allow_groups;
else
nodes = part_ptr->nodes;
-
+
if((params.display == BGPART) && db2_info_ptr
&& (db2_info_ptr->ionodes)) {
printf("%s[%s]\n", nodes, db2_info_ptr->ionodes);
@@ -828,9 +828,9 @@ static void _block_list_del(void *object)
xfree(block_ptr->ionodes);
if(block_ptr->nodelist)
list_destroy(block_ptr->nodelist);
-
+
xfree(block_ptr);
-
+
}
}
@@ -843,7 +843,7 @@ static void _nodelist_del(void *object)
static int _list_match_all(void *object, void *key)
{
-
+
return 1;
}
@@ -854,7 +854,7 @@ static int _in_slurm_partition(List slurm_nodes, List bg_nodes)
int *coord = NULL;
int *slurm_coord = NULL;
int found = 0;
-
+
bg_itr = list_iterator_create(bg_nodes);
slurm_itr = list_iterator_create(slurm_nodes);
while ((coord = list_next(bg_itr)) != NULL) {
@@ -866,7 +866,7 @@ static int _in_slurm_partition(List slurm_nodes, List bg_nodes)
&& (coord[Z] == slurm_coord[Z])) {
found=1;
break;
- }
+ }
}
if(!found) {
break;
@@ -874,18 +874,18 @@ static int _in_slurm_partition(List slurm_nodes, List bg_nodes)
}
list_iterator_destroy(slurm_itr);
list_iterator_destroy(bg_itr);
-
+
if(found)
return 1;
else
return 0;
-
+
}
static int _print_rest(db2_block_info_t *block_ptr)
{
partition_info_t part;
-
+
if(block_ptr->node_cnt == 0)
block_ptr->node_cnt = block_ptr->size;
part.total_nodes = block_ptr->node_cnt;
@@ -899,13 +899,13 @@ static int _print_rest(db2_block_info_t *block_ptr)
part.allow_groups = block_ptr->nodes;
part.root_only = (int) letters[block_ptr->letter_num%62];
if(!params.commandline) {
- wattron(text_win,
+ wattron(text_win,
COLOR_PAIR(colors[block_ptr->letter_num%6]));
_print_text_part(&part, block_ptr);
wattroff(text_win,
COLOR_PAIR(colors[block_ptr->letter_num%6]));
} else {
- _print_text_part(&part, block_ptr);
+ _print_text_part(&part, block_ptr);
}
return SLURM_SUCCESS;
}
@@ -914,7 +914,7 @@ static int _addto_nodelist(List nodelist, int *start, int *end)
{
int *coord = NULL;
int x,y,z;
-
+
if(end[X] >= DIM_SIZE[X]
|| end[Y] >= DIM_SIZE[Y]
|| end[Z] >= DIM_SIZE[Z]) {
@@ -926,7 +926,7 @@ static int _addto_nodelist(List nodelist, int *start, int *end)
assert(start[X] >= 0);
assert(start[Y] >= 0);
assert(start[X] >= 0);
-
+
for (x = start[X]; x <= end[X]; x++) {
for (y = start[Y]; y <= end[Y]; y++) {
for (z = start[Z]; z <= end[Z]; z++) {
@@ -947,24 +947,24 @@ static int _make_nodelist(char *nodes, List nodelist)
int number;
int start[BA_SYSTEM_DIMENSIONS];
int end[BA_SYSTEM_DIMENSIONS];
-
+
if(!nodelist)
nodelist = list_create(_nodelist_del);
while (nodes[j] != '\0') {
if ((nodes[j] == '['
|| nodes[j] == ',')
- && (nodes[j+8] == ']'
+ && (nodes[j+8] == ']'
|| nodes[j+8] == ',')
&& (nodes[j+4] == 'x'
|| nodes[j+4] == '-')) {
j++;
- number = xstrntol(nodes + j, NULL,
+ number = xstrntol(nodes + j, NULL,
BA_SYSTEM_DIMENSIONS, HOSTLIST_BASE);
start[X] = number / (HOSTLIST_BASE * HOSTLIST_BASE);
start[Y] = (number % (HOSTLIST_BASE * HOSTLIST_BASE))
/ HOSTLIST_BASE;
start[Z] = (number % HOSTLIST_BASE);
-
+
j += 4;
number = xstrntol(nodes + j, NULL,
BA_SYSTEM_DIMENSIONS, HOSTLIST_BASE);
@@ -972,7 +972,7 @@ static int _make_nodelist(char *nodes, List nodelist)
end[Y] = (number % (HOSTLIST_BASE * HOSTLIST_BASE))
/ HOSTLIST_BASE;
end[Z] = (number % HOSTLIST_BASE);
-
+
j += 3;
_addto_nodelist(nodelist, start, end);
if(nodes[j] != ',')
@@ -980,7 +980,7 @@ static int _make_nodelist(char *nodes, List nodelist)
j--;
} else if((nodes[j] >= '0' && nodes[j] <= '9')
|| (nodes[j] >= 'A' && nodes[j] <= 'Z')) {
-
+
number = xstrntol(nodes + j, NULL,
BA_SYSTEM_DIMENSIONS, HOSTLIST_BASE);
start[X] = number / (HOSTLIST_BASE * HOSTLIST_BASE);
diff --git a/src/smap/reservation_functions.c b/src/smap/reservation_functions.c
index 8a81c18e91fe0b481c5a13d9a769087868f6f7a9..c3c9ddc5860c9889318262b60191a2496d2c3a20 100644
--- a/src/smap/reservation_functions.c
+++ b/src/smap/reservation_functions.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * reservation_functions.c - Functions related to reservation display mode
+ * reservation_functions.c - Functions related to reservation display mode
* of smap.
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -72,7 +72,7 @@ extern void get_reservation(void)
if(!params.commandline) {
mvwprintw(text_win,
main_ycord, 1,
- "slurm_load_reservations: %s",
+ "slurm_load_reservations: %s",
slurm_strerror(slurm_get_errno()));
main_ycord++;
} else {
@@ -91,7 +91,7 @@ extern void get_reservation(void)
recs = 0;
if (!params.commandline) {
- if((text_line_cnt+printed_resv) > count)
+ if((text_line_cnt+printed_resv) > count)
text_line_cnt--;
}
printed_resv = 0;
@@ -106,7 +106,7 @@ extern void get_reservation(void)
inx2bitstr(loc_bitmap, resv.node_inx);
overlap = bit_overlap(loc_bitmap, nodes_req);
FREE_NULL_BITMAP(loc_bitmap);
- if(!overlap)
+ if(!overlap)
continue;
}
@@ -139,13 +139,13 @@ extern void get_reservation(void)
wattroff(text_win,
COLOR_PAIR(colors[count%6]));
printed_resv++;
- }
+ }
} else {
/* put the letter code into "flags" field */
resv.flags = (int)letters[count%62];
_print_text_resv(&resv);
}
- count++;
+ count++;
}
if (count==128)
count=0;
@@ -156,7 +156,7 @@ extern void get_reservation(void)
if (!params.commandline)
main_ycord++;
-
+
resv_info_ptr = new_resv_ptr;
return;
}
@@ -180,7 +180,7 @@ static void _print_header_resv(void)
main_xcord, "%5.5s ", "NODES");
main_xcord += 7;
mvwprintw(text_win, main_ycord,
- main_xcord, "%30.30s ",
+ main_xcord, "%30.30s ",
"ACCESS_CONTROL(Accounts,Users)");
main_xcord += 32;
mvwprintw(text_win, main_ycord,
@@ -201,9 +201,9 @@ static void _print_text_resv(reserve_info_t * resv_ptr)
{
char start_str[32], end_str[32], acl[32];
- slurm_make_time_str(&resv_ptr->start_time, start_str,
+ slurm_make_time_str(&resv_ptr->start_time, start_str,
sizeof(start_str));
- slurm_make_time_str(&resv_ptr->end_time, end_str,
+ slurm_make_time_str(&resv_ptr->end_time, end_str,
sizeof(end_str));
if (resv_ptr->accounts && resv_ptr->accounts[0] &&
@@ -257,7 +257,7 @@ static void _print_text_resv(reserve_info_t * resv_ptr)
printf("%s ", resv_ptr->node_list);
printf("\n");
-
+
}
}
diff --git a/src/smap/smap.c b/src/smap/smap.c
index 06462c8114343b694fe2d18b00033b1f5e49c36f..920453c1cbfc93906b6574023ec2c82a81e32539 100644
--- a/src/smap/smap.c
+++ b/src/smap/smap.c
@@ -7,32 +7,32 @@
* Written by Danny Auble <da@llnl.gov>
*
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -88,10 +88,10 @@ int main(int argc, char *argv[])
int i;
int rc;
#ifdef HAVE_BG
- int mapset = 0;
+ int mapset = 0;
#endif
//char *name;
-
+
log_init(xbasename(argv[0]), opts, SYSLOG_FACILITY_DAEMON, NULL);
parse_command_line(argc, argv);
if (params.verbose) {
@@ -110,11 +110,11 @@ int main(int argc, char *argv[])
exit(1);
sleep(10); /* keep trying to reconnect */
}
-
+
ba_init(new_node_ptr, 0);
-
+
if(params.resolve) {
-
+
#ifdef HAVE_BG_FILES
if (!have_db2) {
printf("Required libraries can not be found "
@@ -138,14 +138,14 @@ int main(int argc, char *argv[])
printf("X=%c Y=%c Z=%c resolves to %s\n",
params.resolve[X+i],
params.resolve[Y+i],
- params.resolve[Z+i],
+ params.resolve[Z+i],
rack_mid);
else
printf("X=%c Y=%c Z=%c has no resolve\n",
params.resolve[X+i],
params.resolve[Y+i],
params.resolve[Z+i]);
-
+
} else {
int *coord = find_bp_loc(params.resolve);
if(coord)
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
params.resolve,
coord[X], coord[Y], coord[Z]);
else
- printf("%s has no resolve.\n",
+ printf("%s has no resolve.\n",
params.resolve);
}
part_fini:
@@ -165,10 +165,10 @@ part_fini:
exit(0);
}
if(!params.commandline) {
-
+
signal(SIGWINCH, (void (*)(int))_resize_handler);
initscr();
-
+
#ifdef HAVE_3D
height = DIM_SIZE[Y] * DIM_SIZE[Z] + DIM_SIZE[Y] + 3;
width = DIM_SIZE[X] + DIM_SIZE[Z] + 3;
@@ -183,15 +183,15 @@ part_fini:
endwin();
error("Screen is too small make sure the screen "
"is at least %dx%d\n"
- "Right now it is %dx%d\n",
- width,
- height,
- COLS,
+ "Right now it is %dx%d\n",
+ width,
+ height,
+ COLS,
LINES);
ba_fini();
exit(1);
}
-
+
raw();
keypad(stdscr, TRUE);
noecho();
@@ -200,11 +200,11 @@ part_fini:
nodelay(stdscr, TRUE);
start_color();
_set_pairs();
-
+
grid_win = newwin(height, width, starty, startx);
max_display = grid_win->_maxy * grid_win->_maxx;
//scrollok(grid_win, TRUE);
-
+
#ifdef HAVE_3D
startx = width;
COLS -= 2;
@@ -214,20 +214,20 @@ part_fini:
startx = 0;
starty = height;
height = LINES - height;
-
+
#endif
-
+
text_win = newwin(height, width, starty, startx);
}
while (!end) {
if(!params.commandline) {
_get_option();
redraw:
-
+
clear_window(text_win);
clear_window(grid_win);
move(0,0);
-
+
init_grid(new_node_ptr);
main_xcord = 1;
main_ycord = 1;
@@ -270,40 +270,40 @@ part_fini:
break;
#endif
}
-
+
if(!params.commandline) {
//wscrl(grid_win,-1);
box(text_win, 0, 0);
wnoutrefresh(text_win);
-
+
print_grid(grid_line_cnt * (grid_win->_maxx-1));
box(grid_win, 0, 0);
wnoutrefresh(grid_win);
-
+
doupdate();
-
+
node_info_ptr = new_node_ptr;
if (node_info_ptr) {
error_code = slurm_load_node(
- node_info_ptr->last_update,
+ node_info_ptr->last_update,
&new_node_ptr, SHOW_ALL);
if (error_code == SLURM_SUCCESS)
slurm_free_node_info_msg(
node_info_ptr);
- else if (slurm_get_errno()
+ else if (slurm_get_errno()
== SLURM_NO_CHANGE_IN_DATA) {
error_code = SLURM_SUCCESS;
new_node_ptr = node_info_ptr;
}
} else {
- error_code = slurm_load_node((time_t) NULL,
+ error_code = slurm_load_node((time_t) NULL,
&new_node_ptr, SHOW_ALL);
}
if (error_code && (quiet_flag != 1)) {
if(!params.commandline) {
mvwprintw(
text_win,
- main_ycord,
+ main_ycord,
1,
"slurm_load_node: %s",
slurm_strerror(
@@ -332,16 +332,16 @@ part_fini:
}
} else
break;
-
+
}
-
+
if(!params.commandline) {
nodelay(stdscr, FALSE);
getch();
endwin();
}
ba_fini();
-
+
exit(0);
}
@@ -354,7 +354,7 @@ static int _get_option()
case KEY_RIGHT:
case '-':
case '_':
- text_line_cnt++;
+ text_line_cnt++;
return 1;
break;
case KEY_LEFT:
@@ -363,12 +363,12 @@ static int _get_option()
text_line_cnt--;
if(text_line_cnt<0) {
text_line_cnt = 0;
- return 0;
-
+ return 0;
+
}
return 1;
break;
-
+
case 's':
text_line_cnt = 0;
grid_line_cnt = 0;
@@ -413,12 +413,12 @@ static int _get_option()
case 'd':
case KEY_DOWN:
grid_line_cnt++;
- if((((grid_line_cnt-2) * (grid_win->_maxx-1)) +
+ if((((grid_line_cnt-2) * (grid_win->_maxx-1)) +
max_display) > DIM_SIZE[X]) {
grid_line_cnt--;
- return 0;
+ return 0;
}
-
+
return 1;
break;
#endif
@@ -437,14 +437,14 @@ static void *_resize_handler(int sig)
int startx=0, starty=0;
int height, width;
main_ycord = 1;
-
+
/* clear existing data and update to avoid ghost during resize */
clear_window(text_win);
clear_window(grid_win);
doupdate();
delwin(grid_win);
delwin(text_win);
-
+
endwin();
COLS=0;
LINES=0;
@@ -471,10 +471,10 @@ static void *_resize_handler(int sig)
ba_fini();
exit(0);
}
-
+
grid_win = newwin(height, width, starty, startx);
max_display = grid_win->_maxy * grid_win->_maxx;
-
+
#ifdef HAVE_3D
startx = width;
COLS -= 2;
@@ -484,11 +484,11 @@ static void *_resize_handler(int sig)
startx = 0;
starty = height;
height = LINES - height;
-
+
#endif
-
+
text_win = newwin(height, width, starty, startx);
-
+
print_date();
switch (params.display) {
case JOBS:
diff --git a/src/smap/smap.h b/src/smap/smap.h
index 2f91ce8954730125fb962926753de04deee3ac47..01eb5929b988d7fba72310d7355174201479aaa5 100644
--- a/src/smap/smap.h
+++ b/src/smap/smap.h
@@ -16,15 +16,15 @@
* 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
+ * 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
+ * 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
+ * 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
@@ -120,7 +120,7 @@ typedef struct {
bool no_header;
hostlist_t hl;
char *resolve;
- int verbose;
+ int verbose;
} smap_parameters_t;
extern WINDOW *grid_win;
diff --git a/src/sprio/opts.c b/src/sprio/opts.c
index 6525ad80ed7871895f79e652dd5a8b0b58d3c083..6923057b47b24608629f6ca9c832b065a99040fb 100644
--- a/src/sprio/opts.c
+++ b/src/sprio/opts.c
@@ -15,15 +15,15 @@
* 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
+ * 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
+ * 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
@@ -70,7 +70,7 @@ static List _build_job_list( char* str );
static List _build_user_list( char* str );
static char *_get_prefix(char *token);
static void _help( void );
-static void _parse_token( char *token, char *field, int *field_size,
+static void _parse_token( char *token, char *field, int *field_size,
bool *right_justify, char **suffix);
static void _print_options( void );
static void _print_version( void );
@@ -320,7 +320,7 @@ _get_prefix( char *token )
* OUT suffix - string containing everthing after the field specification
*/
static void
-_parse_token( char *token, char *field, int *field_size, bool *right_justify,
+_parse_token( char *token, char *field, int *field_size, bool *right_justify,
char **suffix)
{
int i = 0;
diff --git a/src/sprio/print.c b/src/sprio/print.c
index c46789ed4755a1c211f04a6b0e1977f0e394c93c..e4f9415548aeb4c2086573f7a5a6ce4195726ec8 100644
--- a/src/sprio/print.c
+++ b/src/sprio/print.c
@@ -5,11 +5,11 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Don Lipari <lipari1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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)
diff --git a/src/sprio/print.h b/src/sprio/print.h
index fa33426885868976f4c03ac0972c33a54836a74c..d842fa2fd535ec29db9f603b399c532a71e661de 100644
--- a/src/sprio/print.h
+++ b/src/sprio/print.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Joey Ekstrom <ekstrom1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/sprio/sprio.c b/src/sprio/sprio.c
index f2e7f75498ad4cf6857349905a82a69f54f03d40..f3d056c07ceeed4c609510e7f43da29e4ccc1fc7 100644
--- a/src/sprio/sprio.c
+++ b/src/sprio/sprio.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Don Lipari <lipari1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/sprio/sprio.h b/src/sprio/sprio.h
index d98503f60183e34e6181944f3bd639443c5f1214..60f585471168df53cb27a592a766418e40854e42 100644
--- a/src/sprio/sprio.h
+++ b/src/sprio/sprio.h
@@ -15,15 +15,15 @@
* 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
+ * 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
+ * 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
diff --git a/src/squeue/print.c b/src/squeue/print.c
index 9a860ccf54f9d408841cbac388c18a5a40616119..9373d9c98a89737122aa8ce1a0e512d17e284b6a 100644
--- a/src/squeue/print.c
+++ b/src/squeue/print.c
@@ -4,35 +4,35 @@
* Copyright (C) 2002-2007 The Regents of the University of California.
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Joey Ekstrom <ekstrom1@llnl.gov>,
+ * Written by Joey Ekstrom <ekstrom1@llnl.gov>,
* Morris Jette <jette1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -70,7 +70,7 @@ static int _print_str(char *str, int width, bool right, bool cut_output);
int print_steps(List steps, List format)
{
print_step_from_format(NULL, format);
-
+
if (list_count(steps) > 0) {
job_step_info_t *step = NULL;
ListIterator i = list_iterator_create(steps);
@@ -101,7 +101,7 @@ int print_jobs_array(job_info_t * jobs, int size, List format)
list_append(l, (void *) &jobs[i]);
}
sort_jobs_by_start_time (l);
- if (ni)
+ if (ni)
slurm_free_node_info_msg (ni);
sort_job_list (l);
@@ -118,7 +118,7 @@ int print_steps_array(job_step_info_t * steps, int size, List format)
if (!params.no_header)
print_step_from_format(NULL, format);
-
+
if (size > 0) {
int i = 0;
List step_list;
@@ -212,7 +212,7 @@ int _print_secs(long time, int width, bool right, bool cut_output)
if ((time < 0) || (time > (365 * 24 * 3600)))
snprintf(str, FORMAT_STRING_SIZE, "INVALID");
- else if (days)
+ else if (days)
snprintf(str, FORMAT_STRING_SIZE,
"%ld-%2.2ld:%2.2ld:%2.2ld",
days, hours, minutes, seconds);
@@ -277,7 +277,7 @@ int print_job_from_format(job_info_t * job, List list)
}
int
-job_format_add_function(List list, int width, bool right, char *suffix,
+job_format_add_function(List list, int width, bool right, char *suffix,
int (*function) (job_info_t *, int, bool, char*))
{
job_format_t *tmp = (job_format_t *) xmalloc(sizeof(job_format_t));
@@ -351,9 +351,9 @@ int _print_job_name(job_info_t * job, int width, bool right, char* suffix)
{
if (job == NULL) /* Print the Header instead */
_print_str("NAME", width, right, true);
- else
+ else
_print_str(job->name, width, right, true);
-
+
if (suffix)
printf("%s", suffix);
return SLURM_SUCCESS;
@@ -363,9 +363,9 @@ int _print_job_wckey(job_info_t * job, int width, bool right, char* suffix)
{
if (job == NULL) /* Print the Header instead */
_print_str("WCKEY", width, right, true);
- else
+ else
_print_str(job->wckey, width, right, true);
-
+
if (suffix)
printf("%s", suffix);
return SLURM_SUCCESS;
@@ -437,7 +437,7 @@ int _print_job_job_state(job_info_t * job, int width, bool right, char* suffix)
return SLURM_SUCCESS;
}
-int _print_job_job_state_compact(job_info_t * job, int width, bool right,
+int _print_job_job_state_compact(job_info_t * job, int width, bool right,
char* suffix)
{
if (job == NULL) /* Print the Header instead */
@@ -450,7 +450,7 @@ int _print_job_job_state_compact(job_info_t * job, int width, bool right,
return SLURM_SUCCESS;
}
-int _print_job_time_left(job_info_t * job, int width, bool right,
+int _print_job_time_left(job_info_t * job, int width, bool right,
char* suffix)
{
if (job == NULL) /* Print the Header instead */
@@ -468,7 +468,7 @@ int _print_job_time_left(job_info_t * job, int width, bool right,
return SLURM_SUCCESS;
}
-int _print_job_time_limit(job_info_t * job, int width, bool right,
+int _print_job_time_limit(job_info_t * job, int width, bool right,
char* suffix)
{
if (job == NULL) /* Print the Header instead */
@@ -484,7 +484,7 @@ int _print_job_time_limit(job_info_t * job, int width, bool right,
return SLURM_SUCCESS;
}
-int _print_job_time_used(job_info_t * job, int width, bool right,
+int _print_job_time_used(job_info_t * job, int width, bool right,
char* suffix)
{
if (job == NULL) /* Print the Header instead */
@@ -517,7 +517,7 @@ long job_time_used(job_info_t * job_ptr)
return (long) (difftime(end_time, job_ptr->start_time));
}
-int _print_job_time_start(job_info_t * job, int width, bool right,
+int _print_job_time_start(job_info_t * job, int width, bool right,
char* suffix)
{
if (job == NULL) /* Print the Header instead */
@@ -549,7 +549,7 @@ int _print_job_priority(job_info_t * job, int width, bool right, char* suffix)
if (job == NULL) /* Print the Header instead */
_print_str("PRIORITY", width, right, true);
else {
- double prio = (double) job->priority /
+ double prio = (double) job->priority /
(double) ((uint32_t) 0xffffffff);
sprintf(temp, "%16.14f", prio);
_print_str(temp, width, right, true);
@@ -589,14 +589,14 @@ int _print_job_nodes(job_info_t * job, int width, bool right, char* suffix)
return SLURM_SUCCESS;
}
-int _print_job_reason_list(job_info_t * job, int width, bool right,
+int _print_job_reason_list(job_info_t * job, int width, bool right,
char* suffix)
{
uint16_t base_state = 0;
if (job)
base_state = job->job_state & JOB_STATE_BASE;
-
+
if (job == NULL) { /* Print the Header instead */
#ifdef HAVE_BG
_print_str("BP_LIST(REASON)", width, right, false);
@@ -616,14 +616,14 @@ int _print_job_reason_list(job_info_t * job, int width, bool right,
} else {
char *nodes = xstrdup(job->nodes);
char *ionodes = NULL;
- select_g_select_jobinfo_get(job->select_jobinfo,
- SELECT_JOBDATA_IONODES,
+ select_g_select_jobinfo_get(job->select_jobinfo,
+ SELECT_JOBDATA_IONODES,
&ionodes);
if(ionodes) {
xstrfmtcat(nodes, "[%s]", ionodes);
xfree(ionodes);
_print_str(nodes, width, right, false);
- } else
+ } else
_print_nodes(nodes, width, right, false);
xfree(nodes);
}
@@ -668,10 +668,10 @@ int _print_job_num_procs(job_info_t * job, int width, bool right, char* suffix)
cnt += job->job_resrcs->cpu_array_value[i] *
job->job_resrcs->cpu_array_reps[i];
}
- convert_num_unit((float)cnt, tmp_char,
+ convert_num_unit((float)cnt, tmp_char,
sizeof(tmp_char), UNIT_NONE);
} else {
- convert_num_unit((float)job->num_procs, tmp_char,
+ convert_num_unit((float)job->num_procs, tmp_char,
sizeof(tmp_char), UNIT_NONE);
}
_print_str(tmp_char, width, right, true);
@@ -681,7 +681,7 @@ int _print_job_num_procs(job_info_t * job, int width, bool right, char* suffix)
return SLURM_SUCCESS;
}
-int _print_job_num_nodes(job_info_t * job, int width, bool right_justify,
+int _print_job_num_nodes(job_info_t * job, int width, bool right_justify,
char* suffix)
{
uint32_t node_cnt = 0;
@@ -691,8 +691,8 @@ int _print_job_num_nodes(job_info_t * job, int width, bool right_justify,
_print_str("NODES", width, right_justify, true);
else {
#ifdef HAVE_BG
- select_g_select_jobinfo_get(job->select_jobinfo,
- SELECT_JOBDATA_NODE_CNT,
+ select_g_select_jobinfo_get(job->select_jobinfo,
+ SELECT_JOBDATA_NODE_CNT,
&node_cnt);
#endif
if ((node_cnt == 0) || (node_cnt == NO_VAL))
@@ -728,7 +728,7 @@ static int _get_node_cnt(job_info_t * job)
return node_cnt;
}
-int _print_job_num_sct(job_info_t * job, int width, bool right_justify,
+int _print_job_num_sct(job_info_t * job, int width, bool right_justify,
char* suffix)
{
char sockets[10];
@@ -736,11 +736,11 @@ int _print_job_num_sct(job_info_t * job, int width, bool right_justify,
char threads[10];
char sct[(10+1)*3];
if (job) {
- convert_num_unit((float)job->min_sockets, sockets,
+ convert_num_unit((float)job->min_sockets, sockets,
sizeof(sockets), UNIT_NONE);
- convert_num_unit((float)job->min_cores, cores,
+ convert_num_unit((float)job->min_cores, cores,
sizeof(cores), UNIT_NONE);
- convert_num_unit((float)job->min_threads, threads,
+ convert_num_unit((float)job->min_threads, threads,
sizeof(threads), UNIT_NONE);
sct[0] = '\0';
strcat(sct, sockets);
@@ -766,7 +766,7 @@ static int _nodes_in_list(char *node_list)
return count;
}
-int _print_job_shared(job_info_t * job, int width, bool right_justify,
+int _print_job_shared(job_info_t * job, int width, bool right_justify,
char* suffix)
{
if (job == NULL) /* Print the Header instead */
@@ -779,7 +779,7 @@ int _print_job_shared(job_info_t * job, int width, bool right_justify,
return SLURM_SUCCESS;
}
-int _print_job_contiguous(job_info_t * job, int width, bool right_justify,
+int _print_job_contiguous(job_info_t * job, int width, bool right_justify,
char* suffix)
{
if (job == NULL) /* Print the Header instead */
@@ -787,21 +787,21 @@ int _print_job_contiguous(job_info_t * job, int width, bool right_justify,
else {
_print_int(job->contiguous, width, right_justify, true);
}
-
+
if (suffix)
printf("%s", suffix);
return SLURM_SUCCESS;
}
-int _print_job_min_procs(job_info_t * job, int width, bool right_justify,
+int _print_job_min_procs(job_info_t * job, int width, bool right_justify,
char* suffix)
{
char tmp_char[8];
-
+
if (job == NULL) /* Print the Header instead */
_print_str("MIN_CPUS", width, right_justify, true);
else {
- convert_num_unit((float)job->job_min_cpus, tmp_char,
+ convert_num_unit((float)job->job_min_cpus, tmp_char,
sizeof(tmp_char), UNIT_NONE);
_print_str(tmp_char, width, right_justify, true);
}
@@ -810,15 +810,15 @@ int _print_job_min_procs(job_info_t * job, int width, bool right_justify,
return SLURM_SUCCESS;
}
-int _print_job_min_sockets(job_info_t * job, int width, bool right_justify,
+int _print_job_min_sockets(job_info_t * job, int width, bool right_justify,
char* suffix)
{
char tmp_char[8];
-
+
if (job == NULL) /* Print the Header instead */
_print_str("MIN_SOCKETS", width, right_justify, true);
else {
- convert_num_unit((float)job->min_sockets, tmp_char,
+ convert_num_unit((float)job->min_sockets, tmp_char,
sizeof(tmp_char), UNIT_NONE);
_print_str(tmp_char, width, right_justify, true);
}
@@ -827,15 +827,15 @@ int _print_job_min_sockets(job_info_t * job, int width, bool right_justify,
return SLURM_SUCCESS;
}
-int _print_job_min_cores(job_info_t * job, int width, bool right_justify,
+int _print_job_min_cores(job_info_t * job, int width, bool right_justify,
char* suffix)
{
char tmp_char[8];
-
+
if (job == NULL) /* Print the Header instead */
_print_str("MIN_CORES", width, right_justify, true);
else {
- convert_num_unit((float)job->min_cores, tmp_char,
+ convert_num_unit((float)job->min_cores, tmp_char,
sizeof(tmp_char), UNIT_NONE);
_print_str(tmp_char, width, right_justify, true);
}
@@ -844,7 +844,7 @@ int _print_job_min_cores(job_info_t * job, int width, bool right_justify,
return SLURM_SUCCESS;
}
-int _print_job_min_threads(job_info_t * job, int width, bool right_justify,
+int _print_job_min_threads(job_info_t * job, int width, bool right_justify,
char* suffix)
{
char tmp_char[8];
@@ -852,7 +852,7 @@ int _print_job_min_threads(job_info_t * job, int width, bool right_justify,
if (job == NULL) /* Print the Header instead */
_print_str("MIN_THREADS", width, right_justify, true);
else {
- convert_num_unit((float)job->min_threads, tmp_char,
+ convert_num_unit((float)job->min_threads, tmp_char,
sizeof(tmp_char), UNIT_NONE);
_print_str(tmp_char, width, right_justify, true);
}
@@ -861,48 +861,48 @@ int _print_job_min_threads(job_info_t * job, int width, bool right_justify,
return SLURM_SUCCESS;
}
-int _print_job_min_memory(job_info_t * job, int width, bool right_justify,
+int _print_job_min_memory(job_info_t * job, int width, bool right_justify,
char* suffix)
{
char min_mem[10];
char tmp_char[21];
-
+
if (job == NULL) /* Print the Header instead */
_print_str("MIN_MEMORY", width, right_justify, true);
else {
tmp_char[0] = '\0';
job->job_min_memory &= (~MEM_PER_CPU);
- convert_num_unit((float)job->job_min_memory, min_mem,
+ convert_num_unit((float)job->job_min_memory, min_mem,
sizeof(min_mem), UNIT_NONE);
strcat(tmp_char, min_mem);
_print_str(tmp_char, width, right_justify, true);
}
-
+
if (suffix)
printf("%s", suffix);
return SLURM_SUCCESS;
}
int
-_print_job_min_tmp_disk(job_info_t * job, int width, bool right_justify,
+_print_job_min_tmp_disk(job_info_t * job, int width, bool right_justify,
char* suffix)
{
char tmp_char[10];
-
+
if (job == NULL) /* Print the Header instead */
_print_str("MIN_TMP_DISK", width, right_justify, true);
else {
- convert_num_unit((float)job->job_min_tmp_disk,
+ convert_num_unit((float)job->job_min_tmp_disk,
tmp_char, sizeof(tmp_char), UNIT_NONE);
_print_str(tmp_char, width, right_justify, true);
}
-
+
if (suffix)
printf("%s", suffix);
return SLURM_SUCCESS;
}
-int _print_job_req_nodes(job_info_t * job, int width, bool right_justify,
+int _print_job_req_nodes(job_info_t * job, int width, bool right_justify,
char* suffix)
{
if (job == NULL) /* Print the Header instead */
@@ -914,7 +914,7 @@ int _print_job_req_nodes(job_info_t * job, int width, bool right_justify,
return SLURM_SUCCESS;
}
-int _print_job_exc_nodes(job_info_t * job, int width, bool right_justify,
+int _print_job_exc_nodes(job_info_t * job, int width, bool right_justify,
char* suffix)
{
if (job == NULL) /* Print the Header instead */
@@ -927,7 +927,7 @@ int _print_job_exc_nodes(job_info_t * job, int width, bool right_justify,
}
int
-_print_job_req_node_inx(job_info_t * job, int width, bool right_justify,
+_print_job_req_node_inx(job_info_t * job, int width, bool right_justify,
char* suffix)
{
if (job == NULL) /* Print the Header instead */
@@ -950,7 +950,7 @@ _print_job_req_node_inx(job_info_t * job, int width, bool right_justify,
}
int
-_print_job_exc_node_inx(job_info_t * job, int width, bool right_justify,
+_print_job_exc_node_inx(job_info_t * job, int width, bool right_justify,
char* suffix)
{
if (job == NULL) /* Print the Header instead */
@@ -972,7 +972,7 @@ _print_job_exc_node_inx(job_info_t * job, int width, bool right_justify,
return SLURM_SUCCESS;
}
-int _print_job_features(job_info_t * job, int width, bool right_justify,
+int _print_job_features(job_info_t * job, int width, bool right_justify,
char* suffix)
{
if (job == NULL) /* Print the Header instead */
@@ -1009,7 +1009,7 @@ int _print_job_comment(job_info_t * job, int width, bool right_justify,
}
int _print_job_dependency(job_info_t * job, int width, bool right_justify,
- char* suffix)
+ char* suffix)
{
if (job == NULL) /* Print the Header instead */
_print_str("DEPENDENCY", width, right_justify, true);
@@ -1018,7 +1018,7 @@ int _print_job_dependency(job_info_t * job, int width, bool right_justify,
else
_print_str("", width, right_justify, true);
if (suffix)
- printf("%s", suffix);
+ printf("%s", suffix);
return SLURM_SUCCESS;
}
@@ -1035,7 +1035,7 @@ int _print_job_qos(job_info_t * job, int width, bool right_justify,
}
int _print_job_select_jobinfo(job_info_t * job, int width, bool right_justify,
- char* suffix)
+ char* suffix)
{
char select_buf[100];
@@ -1048,7 +1048,7 @@ int _print_job_select_jobinfo(job_info_t * job, int width, bool right_justify,
_print_str(select_buf, width, right_justify, true);
if (suffix)
- printf("%s", suffix);
+ printf("%s", suffix);
return SLURM_SUCCESS;
}
@@ -1086,7 +1086,7 @@ int print_step_from_format(job_step_info_t * job_step, List list)
}
list_iterator_destroy(i);
printf("\n");
-#if 0
+#if 0
if (job_step == NULL) {
int inx;
/* one-origin for no trailing space */
@@ -1094,13 +1094,13 @@ int print_step_from_format(job_step_info_t * job_step, List list)
printf("-");
printf("\n");
}
-#endif
+#endif
return SLURM_SUCCESS;
}
int
-step_format_add_function(List list, int width, bool right_justify,
- char* suffix,
+step_format_add_function(List list, int width, bool right_justify,
+ char* suffix,
int (*function) (job_step_info_t *, int, bool, char*))
{
step_format_t *tmp =
@@ -1133,7 +1133,7 @@ int _print_step_id(job_step_info_t * step, int width, bool right, char* suffix)
return SLURM_SUCCESS;
}
-int _print_step_partition(job_step_info_t * step, int width, bool right,
+int _print_step_partition(job_step_info_t * step, int width, bool right,
char* suffix)
{
char id[FORMAT_STRING_SIZE];
@@ -1149,7 +1149,7 @@ int _print_step_partition(job_step_info_t * step, int width, bool right,
return SLURM_SUCCESS;
}
-int _print_step_prefix(job_step_info_t * step, int width, bool right,
+int _print_step_prefix(job_step_info_t * step, int width, bool right,
char* suffix)
{
if (suffix)
@@ -1157,7 +1157,7 @@ int _print_step_prefix(job_step_info_t * step, int width, bool right,
return SLURM_SUCCESS;
}
-int _print_step_user_id(job_step_info_t * step, int width, bool right,
+int _print_step_user_id(job_step_info_t * step, int width, bool right,
char* suffix)
{
if (step == NULL) /* Print the Header instead */
@@ -1169,7 +1169,7 @@ int _print_step_user_id(job_step_info_t * step, int width, bool right,
return SLURM_SUCCESS;
}
-int _print_step_user_name(job_step_info_t * step, int width, bool right,
+int _print_step_user_name(job_step_info_t * step, int width, bool right,
char* suffix)
{
if (step == NULL) /* Print the Header instead */
@@ -1184,7 +1184,7 @@ int _print_step_user_name(job_step_info_t * step, int width, bool right,
return SLURM_SUCCESS;
}
-int _print_step_time_limit(job_step_info_t * step, int width, bool right,
+int _print_step_time_limit(job_step_info_t * step, int width, bool right,
char* suffix)
{
if (step == NULL) /* Print the Header instead */
@@ -1198,7 +1198,7 @@ int _print_step_time_limit(job_step_info_t * step, int width, bool right,
return SLURM_SUCCESS;
}
-int _print_step_time_start(job_step_info_t * step, int width, bool right,
+int _print_step_time_start(job_step_info_t * step, int width, bool right,
char* suffix)
{
if (step == NULL) /* Print the Header instead */
@@ -1210,7 +1210,7 @@ int _print_step_time_start(job_step_info_t * step, int width, bool right,
return SLURM_SUCCESS;
}
-int _print_step_time_used(job_step_info_t * step, int width, bool right,
+int _print_step_time_used(job_step_info_t * step, int width, bool right,
char* suffix)
{
if (step == NULL) /* Print the Header instead */
@@ -1236,7 +1236,7 @@ int _print_step_name(job_step_info_t * step, int width, bool right,
return SLURM_SUCCESS;
}
-int _print_step_nodes(job_step_info_t * step, int width, bool right,
+int _print_step_nodes(job_step_info_t * step, int width, bool right,
char* suffix)
{
if (step == NULL) { /* Print the Header instead */
@@ -1245,14 +1245,14 @@ int _print_step_nodes(job_step_info_t * step, int width, bool right,
#else
_print_str("NODELIST", width, right, false);
#endif
- } else
+ } else
_print_nodes(step->nodes, width, right, false);
if (suffix)
printf("%s", suffix);
return SLURM_SUCCESS;
}
-int _print_step_num_tasks(job_step_info_t * step, int width, bool right,
+int _print_step_num_tasks(job_step_info_t * step, int width, bool right,
char* suffix)
{
if (step == NULL) /* Print the Header instead */
@@ -1264,7 +1264,7 @@ int _print_step_num_tasks(job_step_info_t * step, int width, bool right,
return SLURM_SUCCESS;
}
-/* filter job records per input specifications,
+/* filter job records per input specifications,
* returns >0 if job should be filter out (not printed) */
static int _filter_job(job_info_t * job)
{
@@ -1301,7 +1301,7 @@ static int _filter_job(job_info_t * job)
if (filter == 1)
return 2;
}
-
+
if (params.account_list) {
filter = 1;
iterator = list_iterator_create(params.account_list);
@@ -1337,7 +1337,7 @@ static int _filter_job(job_info_t * job)
iterator = list_iterator_create(params.state_list);
while ((state_id = list_next(iterator))) {
if ((*state_id == job->job_state) ||
- ((*state_id == JOB_COMPLETING) &&
+ ((*state_id == JOB_COMPLETING) &&
(*state_id & job->job_state)) ||
((*state_id == JOB_CONFIGURING) &&
(*state_id & job->job_state))) {
@@ -1379,7 +1379,7 @@ static int _filter_job(job_info_t * job)
return 0;
}
-/* filter step records per input specifications,
+/* filter step records per input specifications,
* returns 1 if step should be filter out (not printed) */
static int _filter_step(job_step_info_t * step)
{
@@ -1432,7 +1432,7 @@ static int _filter_step(job_step_info_t * step)
return 3;
}
- if ((params.nodes)
+ if ((params.nodes)
&& ((step->nodes == NULL)
|| (!hostset_intersects(params.nodes, step->nodes))))
return 5;
@@ -1456,15 +1456,15 @@ static int _filter_step(job_step_info_t * step)
static int _adjust_completing (job_info_t *job_ptr, node_info_msg_t **ni)
{
- hostlist_t hl = NULL;
+ hostlist_t hl = NULL;
int i, j;
char buf[8192];
if (!(job_ptr->job_state & JOB_COMPLETING))
return (0);
- /* NOTE: We want to load all nodes (show_all flag set)
- * so that node index values from the job records are
+ /* NOTE: We want to load all nodes (show_all flag set)
+ * so that node index values from the job records are
* valid for cross-referencing */
if ((*ni == NULL) && (slurm_load_node (0, ni, 1) < 0)) {
error ("Unable the load node information: %m");
@@ -1476,7 +1476,7 @@ static int _adjust_completing (job_info_t *job_ptr, node_info_msg_t **ni)
if (job_ptr->node_inx[i] == -1)
break;
if (i >= (*ni)->record_count) {
- error ("Invalid node index for job %u",
+ error ("Invalid node index for job %u",
job_ptr->job_id);
break;
}
@@ -1493,9 +1493,9 @@ static int _adjust_completing (job_info_t *job_ptr, node_info_msg_t **ni)
hostlist_uniq(hl);
hostlist_ranged_string (hl, 8192, buf);
hostlist_destroy(hl);
- job_ptr->num_nodes = MAX(job_ptr->num_nodes,
+ job_ptr->num_nodes = MAX(job_ptr->num_nodes,
_nodes_in_list(job_ptr->nodes));
xfree (job_ptr->nodes);
- job_ptr->nodes = xstrdup (buf);
+ job_ptr->nodes = xstrdup (buf);
return (0);
}
diff --git a/src/squeue/print.h b/src/squeue/print.h
index 43fdf1a106456d6d23c0bbc8f4cbee924bc26bae..131b9417489d75d84283bef37bab5d7e7b6556cd 100644
--- a/src/squeue/print.h
+++ b/src/squeue/print.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Joey Ekstrom <ekstrom1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -77,7 +77,7 @@ int print_step_from_format(job_step_info_t * job_step, List list);
/*****************************************************************************
* Job Line Format Options
*****************************************************************************/
-int job_format_add_function(List list, int width, bool right_justify,
+int job_format_add_function(List list, int width, bool right_justify,
char *suffix,
int (*function) (job_info_t *, int, bool, char*));
@@ -176,83 +176,83 @@ int job_format_add_function(List list, int width, bool right_justify,
/*****************************************************************************
* Job Line Print Functions
*****************************************************************************/
-int _print_job_job_id(job_info_t * job, int width, bool right_justify,
+int _print_job_job_id(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_partition(job_info_t * job, int width, bool right_justify,
+int _print_job_partition(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_prefix(job_info_t * job, int width, bool right_justify,
+int _print_job_prefix(job_info_t * job, int width, bool right_justify,
char* suffix);
int _print_job_reason(job_info_t * job, int width, bool right_justify,
char* suffix);
int _print_job_reason_list(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_name(job_info_t * job, int width, bool right_justify,
+int _print_job_name(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_wckey(job_info_t * job, int width, bool right_justify,
+int _print_job_wckey(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_user_id(job_info_t * job, int width, bool right_justify,
+int _print_job_user_id(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_user_name(job_info_t * job, int width, bool right_justify,
+int _print_job_user_name(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_group_id(job_info_t * job, int width, bool right_justify,
+int _print_job_group_id(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_group_name(job_info_t * job, int width, bool right_justify,
+int _print_job_group_name(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_job_state(job_info_t * job, int width, bool right_justify,
+int _print_job_job_state(job_info_t * job, int width, bool right_justify,
char* suffix);
int _print_job_job_state_compact(job_info_t * job, int width,
bool right_justify, char* suffix);
-int _print_job_time_left(job_info_t * job, int width, bool right_justify,
+int _print_job_time_left(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_time_limit(job_info_t * job, int width, bool right_justify,
+int _print_job_time_limit(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_time_used(job_info_t * job, int width, bool right_justify,
+int _print_job_time_used(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_time_start(job_info_t * job, int width, bool right_justify,
+int _print_job_time_start(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_time_end(job_info_t * job, int width, bool right_justify,
+int _print_job_time_end(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_priority(job_info_t * job, int width, bool right_justify,
+int _print_job_priority(job_info_t * job, int width, bool right_justify,
char* suffix);
int _print_job_priority_long(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_nodes(job_info_t * job, int width, bool right_justify,
+int _print_job_nodes(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_node_inx(job_info_t * job, int width, bool right_justify,
+int _print_job_node_inx(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_partition(job_info_t * job, int width, bool right_justify,
+int _print_job_partition(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_num_procs(job_info_t * job, int width, bool right_justify,
+int _print_job_num_procs(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_num_nodes(job_info_t * job, int width, bool right_justify,
+int _print_job_num_nodes(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_num_sct(job_info_t * job, int width, bool right_justify,
+int _print_job_num_sct(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_shared(job_info_t * job, int width, bool right_justify,
+int _print_job_shared(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_contiguous(job_info_t * job, int width, bool right_justify,
+int _print_job_contiguous(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_min_procs(job_info_t * job, int width, bool right_justify,
+int _print_job_min_procs(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_min_sockets(job_info_t * job, int width, bool right_justify,
+int _print_job_min_sockets(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_min_cores(job_info_t * job, int width, bool right_justify,
+int _print_job_min_cores(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_min_threads(job_info_t * job, int width, bool right_justify,
+int _print_job_min_threads(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_min_memory(job_info_t * job, int width, bool right_justify,
+int _print_job_min_memory(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_min_tmp_disk(job_info_t * job, int width, bool right_justify,
+int _print_job_min_tmp_disk(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_req_nodes(job_info_t * job, int width, bool right_justify,
+int _print_job_req_nodes(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_exc_nodes(job_info_t * job, int width, bool right_justify,
+int _print_job_exc_nodes(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_req_node_inx(job_info_t * job, int width, bool right_justify,
+int _print_job_req_node_inx(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_exc_node_inx(job_info_t * job, int width, bool right_justify,
+int _print_job_exc_node_inx(job_info_t * job, int width, bool right_justify,
char* suffix);
-int _print_job_features(job_info_t * job, int width, bool right_justify,
+int _print_job_features(job_info_t * job, int width, bool right_justify,
char* suffix);
int _print_job_account(job_info_t * job, int width, bool right_justify,
char* suffix);
@@ -271,7 +271,7 @@ int _print_job_reservation(job_info_t * job, int width, bool right_justify,
* Step Print Format Functions
*****************************************************************************/
int step_format_add_function(List list, int width, bool right_justify,
- char * suffix,
+ char * suffix,
int (*function) (job_step_info_t *, int, bool, char *));
#define step_format_add_id(list,wid,right,suffix) \
diff --git a/src/squeue/sort.c b/src/squeue/sort.c
index c43f88775eec7770637c30ace92a2f87625cf2bd..1c7e0c0ebd234b31674b5ea2f608c31bdb8e4ab4 100644
--- a/src/squeue/sort.c
+++ b/src/squeue/sort.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -99,7 +99,7 @@ void sort_job_list(List job_list)
for (i=(strlen(params.sort)-1); i >= 0; i--) {
reverse_order = false;
- if ((params.sort[i] == ',') ||
+ if ((params.sort[i] == ',') ||
(params.sort[i] == '+') || params.sort[i] == '-')
continue;
if ((i > 0) && (params.sort[i-1] == '-'))
@@ -183,7 +183,7 @@ void sort_step_list(List step_list)
params.sort = xstrdup("P,i"); /* Partition, step id */
for (i=(strlen(params.sort)-1); i >= 0; i--) {
reverse_order = false;
- if ((params.sort[i] == ',') ||
+ if ((params.sort[i] == ',') ||
(params.sort[i] == '+') || params.sort[i] == '-')
continue;
if ((i > 0) && (params.sort[i-1] == '-'))
diff --git a/src/squeue/squeue.c b/src/squeue/squeue.c
index 255f73507def127ada7eb26466536366d9f4cdf3..223536fd1ae5a7dfdd38cd2c8150d91b55cf794b 100644
--- a/src/squeue/squeue.c
+++ b/src/squeue/squeue.c
@@ -4,35 +4,35 @@
* Copyright (C) 2002-2007 The Regents of the University of California.
* Copyright (C) 2008-2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Joey Ekstrom <ekstrom1@llnl.gov>,
+ * Written by Joey Ekstrom <ekstrom1@llnl.gov>,
* Morris Jette <jette1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -66,8 +66,8 @@ static void _print_date( void );
static int _print_job (void);
static int _print_job_steps( void );
-int
-main (int argc, char *argv[])
+int
+main (int argc, char *argv[])
{
log_options_t opts = LOG_OPTS_STDERR_ONLY ;
int error_code = SLURM_SUCCESS;
@@ -79,18 +79,18 @@ main (int argc, char *argv[])
log_alter(opts, SYSLOG_FACILITY_USER, NULL);
}
max_line_size = _get_window_width( );
-
- while (1)
+
+ while (1)
{
if ((!params.no_header) &&
(params.iterate || params.verbose || params.long_list))
_print_date ();
-
+
if ( params.step_flag )
error_code = _print_job_steps( );
else
error_code = _print_job( );
-
+
if ( params.iterate ) {
printf( "\n");
sleep( params.iterate );
@@ -106,7 +106,7 @@ main (int argc, char *argv[])
}
/* get_window_width - return the size of the window STDOUT goes to */
-static int
+static int
_get_window_width( void )
{
int width = 80;
@@ -131,7 +131,7 @@ _get_window_width( void )
/* _print_job - print the specified job's information */
static int
-_print_job ( void )
+_print_job ( void )
{
static job_info_msg_t * old_job_ptr = NULL, * new_job_ptr;
int error_code;
@@ -182,9 +182,9 @@ _print_job ( void )
old_job_ptr = new_job_ptr;
if (job_id)
old_job_ptr->last_update = (time_t) 0;
-
+
if (params.verbose) {
- printf ("last_update_time=%ld\n",
+ printf ("last_update_time=%ld\n",
(long) new_job_ptr->last_update);
}
@@ -198,7 +198,7 @@ _print_job ( void )
if (params.format_list == NULL)
parse_format(params.format);
- print_jobs_array( new_job_ptr->job_array, new_job_ptr->record_count ,
+ print_jobs_array( new_job_ptr->job_array, new_job_ptr->record_count ,
params.format_list ) ;
return SLURM_SUCCESS;
}
@@ -219,7 +219,7 @@ _print_job_steps( void )
if (old_step_ptr) {
/* Use a last_update time of 0 so that we can get an updated
* run_time for jobs rather than just its start_time */
- error_code = slurm_get_job_steps ((time_t) 0, NO_VAL, NO_VAL,
+ error_code = slurm_get_job_steps ((time_t) 0, NO_VAL, NO_VAL,
&new_step_ptr, show_flags);
if (error_code == SLURM_SUCCESS)
slurm_free_job_step_info_response_msg( old_step_ptr );
@@ -229,7 +229,7 @@ _print_job_steps( void )
}
}
else
- error_code = slurm_get_job_steps ((time_t) 0, NO_VAL, NO_VAL,
+ error_code = slurm_get_job_steps ((time_t) 0, NO_VAL, NO_VAL,
&new_step_ptr, show_flags);
if (error_code) {
slurm_perror ("slurm_get_job_steps error");
@@ -238,7 +238,7 @@ _print_job_steps( void )
old_step_ptr = new_step_ptr;
if (params.verbose) {
- printf ("last_update_time=%ld\n",
+ printf ("last_update_time=%ld\n",
(long) new_step_ptr->last_update);
}
@@ -247,14 +247,14 @@ _print_job_steps( void )
if (params.format_list == NULL)
parse_format(params.format);
- print_steps_array( new_step_ptr->job_steps,
- new_step_ptr->job_step_count,
+ print_steps_array( new_step_ptr->job_steps,
+ new_step_ptr->job_step_count,
params.format_list );
return SLURM_SUCCESS;
}
-static void
+static void
_print_date( void )
{
time_t now;
diff --git a/src/squeue/squeue.h b/src/squeue/squeue.h
index afdda319dae14d4b9d3e90236132a363c7a54775..e43229765af047d1822fdc3f9c8fb145edf905e7 100644
--- a/src/squeue/squeue.h
+++ b/src/squeue/squeue.h
@@ -16,15 +16,15 @@
* 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
+ * 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
+ * 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
diff --git a/src/sreport/assoc_reports.c b/src/sreport/assoc_reports.c
index 5cfa93f00b5d7cafb6160cc63bc9f18633039185..550964277a88e74278c15ea75408c99850f61266 100644
--- a/src/sreport/assoc_reports.c
+++ b/src/sreport/assoc_reports.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/sreport/assoc_reports.h b/src/sreport/assoc_reports.h
index 7ba023cd546d4c9e6d63c7bfac1fd13d5684f26f..472dba46d08cd7e358c5fec024f55893e6565669 100644
--- a/src/sreport/assoc_reports.h
+++ b/src/sreport/assoc_reports.h
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/sreport/cluster_reports.c b/src/sreport/cluster_reports.c
index c38cabab46639ef7663d3acce815f70898b0d6d2..9d6db115103ed732175560d60351d1cfcb913d44 100644
--- a/src/sreport/cluster_reports.c
+++ b/src/sreport/cluster_reports.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -105,7 +105,7 @@ static int _set_wckey_cond(int *start, int argc, char *argv[],
}
}
- if(!end && !strncasecmp(argv[i], "all_clusters",
+ if(!end && !strncasecmp(argv[i], "all_clusters",
MAX(command_len, 1))) {
local_cluster_flag = 1;
} else if(!end && !strncasecmp(argv[i], "withdeleted",
@@ -136,7 +136,7 @@ static int _set_wckey_cond(int *start, int argc, char *argv[],
MAX(command_len, 1))) {
if(format_list)
slurm_addto_char_list(format_list, argv[i]+end);
- } else if (!strncasecmp (argv[i], "Start",
+ } else if (!strncasecmp (argv[i], "Start",
MAX(command_len, 1))) {
wckey_cond->usage_start = parse_time(argv[i]+end, 1);
set = 1;
@@ -152,7 +152,7 @@ static int _set_wckey_cond(int *start, int argc, char *argv[],
exit_code=1;
fprintf(stderr, " Unknown condition: %s\n", argv[i]);
}
- }
+ }
(*start) = i;
@@ -209,17 +209,17 @@ static int _set_assoc_cond(int *start, int argc, char *argv[],
}
}
- if(!end && !strncasecmp(argv[i], "all_clusters",
+ if(!end && !strncasecmp(argv[i], "all_clusters",
MAX(command_len, 1))) {
local_cluster_flag = 1;
} else if (!end && !strncasecmp (argv[i], "Tree",
MAX(command_len, 4))) {
tree_display = 1;
} else if(!end
- || !strncasecmp (argv[i], "Users",
+ || !strncasecmp (argv[i], "Users",
MAX(command_len, 1))) {
if(!assoc_cond->user_list)
- assoc_cond->user_list =
+ assoc_cond->user_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->user_list,
argv[i]+end);
@@ -232,7 +232,7 @@ static int _set_assoc_cond(int *start, int argc, char *argv[],
slurm_addto_char_list(assoc_cond->acct_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp (argv[i], "Clusters",
+ } else if (!strncasecmp (argv[i], "Clusters",
MAX(command_len, 1))) {
slurm_addto_char_list(assoc_cond->cluster_list,
argv[i]+end);
@@ -243,7 +243,7 @@ static int _set_assoc_cond(int *start, int argc, char *argv[],
} else if (!strncasecmp (argv[i], "Format",
MAX(command_len, 1))) {
if(format_list)
- slurm_addto_char_list(format_list,
+ slurm_addto_char_list(format_list,
argv[i]+end);
} else if (!strncasecmp (argv[i], "Start",
MAX(command_len, 1))) {
@@ -322,7 +322,7 @@ static int _set_cluster_cond(int *start, int argc, char *argv[],
} else if (!strncasecmp (argv[i], "End", MAX(command_len, 1))) {
cluster_cond->usage_end = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp (argv[i], "Format",
+ } else if (!strncasecmp (argv[i], "Format",
MAX(command_len, 1))) {
if(format_list)
slurm_addto_char_list(format_list,
@@ -379,11 +379,11 @@ static int _setup_print_fields_list(List format_list)
char *tmp_char = NULL;
int command_len = 0;
int newlen = 0;
-
+
if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
- }
+ }
command_len = strlen(object);
@@ -396,7 +396,7 @@ static int _setup_print_fields_list(List format_list)
else
field->len = 15;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("allocated", object,
+ } else if(!strncasecmp("allocated", object,
MAX(command_len, 2))) {
field->type = PRINT_CLUSTER_ACPU;
field->name = xstrdup("Allocated");
@@ -407,13 +407,13 @@ static int _setup_print_fields_list(List format_list)
else
field->len = 12;
field->print_routine = sreport_print_time;
- } else if(!strncasecmp("Cluster", object,
+ } else if(!strncasecmp("Cluster", object,
MAX(command_len, 2))) {
field->type = PRINT_CLUSTER_NAME;
field->name = xstrdup("Cluster");
field->len = 9;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("cpucount", object,
+ } else if(!strncasecmp("cpucount", object,
MAX(command_len, 2))) {
field->type = PRINT_CLUSTER_CPUS;
field->name = xstrdup("CPU count");
@@ -444,7 +444,7 @@ static int _setup_print_fields_list(List format_list)
field->name = xstrdup("Login");
field->len = 9;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("overcommited", object,
+ } else if(!strncasecmp("overcommited", object,
MAX(command_len, 1))) {
field->type = PRINT_CLUSTER_OCPU;
field->name = xstrdup("Over Comm");
@@ -518,10 +518,10 @@ static int _setup_print_fields_list(List format_list)
continue;
}
- if(newlen)
+ if(newlen)
field->len = newlen;
-
- list_append(print_fields_list, field);
+
+ list_append(print_fields_list, field);
}
list_iterator_destroy(itr);
@@ -531,7 +531,7 @@ static int _setup_print_fields_list(List format_list)
static List _get_cluster_list(int argc, char *argv[], uint32_t *total_time,
char *report_name, List format_list)
{
- acct_cluster_cond_t *cluster_cond =
+ acct_cluster_cond_t *cluster_cond =
xmalloc(sizeof(acct_cluster_cond_t));
int i=0;
List cluster_list = NULL;
@@ -540,7 +540,7 @@ static List _get_cluster_list(int argc, char *argv[], uint32_t *total_time,
cluster_cond->with_usage = 1;
_set_cluster_cond(&i, argc, argv, cluster_cond, format_list);
-
+
cluster_list = acct_storage_g_get_clusters(db_conn, my_uid,
cluster_cond);
if(!cluster_list) {
@@ -555,20 +555,20 @@ static List _get_cluster_list(int argc, char *argv[], uint32_t *total_time,
time_t my_start = cluster_cond->usage_start;
time_t my_end = cluster_cond->usage_end-1;
- slurm_make_time_str(&my_start,
+ slurm_make_time_str(&my_start,
start_char, sizeof(start_char));
slurm_make_time_str(&my_end,
end_char, sizeof(end_char));
printf("----------------------------------------"
"----------------------------------------\n");
- printf("%s %s - %s (%d*cpus secs)\n",
- report_name, start_char, end_char,
+ printf("%s %s - %s (%d*cpus secs)\n",
+ report_name, start_char, end_char,
(int)(cluster_cond->usage_end
- cluster_cond->usage_start));
switch(time_format) {
case SREPORT_TIME_PERCENT:
printf("Time reported in %s\n", time_format_string);
- break;
+ break;
default:
printf("Time reported in CPU %s\n", time_format_string);
break;
@@ -579,14 +579,14 @@ static List _get_cluster_list(int argc, char *argv[], uint32_t *total_time,
(*total_time) = cluster_cond->usage_end - cluster_cond->usage_start;
destroy_acct_cluster_cond(cluster_cond);
-
+
return cluster_list;
}
extern int cluster_account_by_user(int argc, char *argv[])
{
int rc = SLURM_SUCCESS;
- acct_association_cond_t *assoc_cond =
+ acct_association_cond_t *assoc_cond =
xmalloc(sizeof(acct_association_cond_t));
acct_cluster_cond_t cluster_cond;
ListIterator itr = NULL;
@@ -616,8 +616,8 @@ extern int cluster_account_by_user(int argc, char *argv[])
_set_assoc_cond(&i, argc, argv, assoc_cond, format_list);
- if(!list_count(format_list))
- slurm_addto_char_list(format_list,
+ if(!list_count(format_list))
+ slurm_addto_char_list(format_list,
"Cluster,Ac,Login,Proper,Used");
_setup_print_fields_list(format_list);
@@ -664,23 +664,23 @@ extern int cluster_account_by_user(int argc, char *argv[])
list_append(sreport_cluster_list, sreport_cluster);
sreport_cluster->name = xstrdup(cluster->name);
- sreport_cluster->assoc_list =
+ sreport_cluster->assoc_list =
list_create(destroy_sreport_assoc_rec);
/* get the amount of time and the average cpu count
during the time we are looking at */
itr2 = list_iterator_create(cluster->accounting_list);
while((accting = list_next(itr2))) {
- sreport_cluster->cpu_secs += accting->alloc_secs
- + accting->down_secs + accting->idle_secs
+ sreport_cluster->cpu_secs += accting->alloc_secs
+ + accting->down_secs + accting->idle_secs
+ accting->resv_secs;
sreport_cluster->cpu_count += accting->cpu_count;
}
list_iterator_destroy(itr2);
- sreport_cluster->cpu_count /=
+ sreport_cluster->cpu_count /=
list_count(cluster->accounting_list);
-
+
/* now add the associations of interest here by user */
while((assoc = list_next(assoc_itr))) {
acct_accounting_rec_t *accting2 = NULL;
@@ -691,28 +691,28 @@ extern int cluster_account_by_user(int argc, char *argv[])
continue;
}
- if(strcmp(cluster->name, assoc->cluster))
+ if(strcmp(cluster->name, assoc->cluster))
continue;
sreport_assoc = xmalloc(sizeof(sreport_assoc_rec_t));
-
- list_append(sreport_cluster->assoc_list,
+
+ list_append(sreport_cluster->assoc_list,
sreport_assoc);
sreport_assoc->acct = xstrdup(assoc->acct);
sreport_assoc->parent_acct =
xstrdup(assoc->parent_acct);
sreport_assoc->user = xstrdup(assoc->user);
-
+
/* get the amount of time this assoc used
during the time we are looking at */
itr2 = list_iterator_create(assoc->accounting_list);
while((accting2 = list_next(itr2))) {
- sreport_assoc->cpu_secs +=
+ sreport_assoc->cpu_secs +=
(uint64_t)accting2->alloc_secs;
}
list_iterator_destroy(itr2);
- list_delete_item(assoc_itr);
+ list_delete_item(assoc_itr);
}
list_iterator_reset(assoc_itr);
}
@@ -731,21 +731,21 @@ extern int cluster_account_by_user(int argc, char *argv[])
char end_char[20];
time_t my_start = assoc_cond->usage_start;
time_t my_end = assoc_cond->usage_end-1;
-
+
slurm_make_time_str(&my_start, start_char, sizeof(start_char));
slurm_make_time_str(&my_end, end_char, sizeof(end_char));
printf("----------------------------------------"
"----------------------------------------\n");
- printf("Cluster/Account/User Utilization %s - %s (%d secs)\n",
- start_char, end_char,
+ printf("Cluster/Account/User Utilization %s - %s (%d secs)\n",
+ start_char, end_char,
(int)(assoc_cond->usage_end - assoc_cond->usage_start));
-
+
switch(time_format) {
case SREPORT_TIME_PERCENT:
printf("Time reported in %s\n", time_format_string);
- break;
+ break;
default:
- printf("Time reported in CPU %s\n",
+ printf("Time reported in CPU %s\n",
time_format_string);
break;
}
@@ -758,16 +758,16 @@ extern int cluster_account_by_user(int argc, char *argv[])
field_count = list_count(print_fields_list);
list_sort(sreport_cluster_list, (ListCmpF)sort_cluster_dec);
-
+
cluster_itr = list_iterator_create(sreport_cluster_list);
while((sreport_cluster = list_next(cluster_itr))) {
- //list_sort(sreport_cluster->assoc_list,
+ //list_sort(sreport_cluster->assoc_list,
// (ListCmpF)sort_assoc_dec);
- if(tree_list)
+ if(tree_list)
list_flush(tree_list);
- else
+ else
tree_list = list_create(destroy_acct_print_tree);
-
+
itr = list_iterator_create(sreport_cluster->assoc_list);
while((sreport_assoc = list_next(itr))) {
int curr_inx = 1;
@@ -784,7 +784,7 @@ extern int cluster_account_by_user(int argc, char *argv[])
if(sreport_assoc->user) {
local_acct =
xstrdup_printf(
- "|%s",
+ "|%s",
sreport_assoc->acct);
parent_acct =
sreport_assoc->acct;
@@ -804,10 +804,10 @@ extern int cluster_account_by_user(int argc, char *argv[])
sreport_assoc->acct;
}
field->print_routine(
- field,
+ field,
print_acct,
(curr_inx == field_count));
-
+
break;
case PRINT_CLUSTER_NAME:
field->print_routine(
@@ -826,16 +826,16 @@ extern int cluster_account_by_user(int argc, char *argv[])
pwd = getpwnam(
sreport_assoc->user);
if(pwd) {
- tmp_char =
+ tmp_char =
strtok(pwd->pw_gecos,
",");
if(!tmp_char)
- tmp_char =
+ tmp_char =
pwd->pw_gecos;
}
field->print_routine(field,
tmp_char,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_CLUSTER_AMOUNT_USED:
@@ -861,27 +861,27 @@ extern int cluster_account_by_user(int argc, char *argv[])
list_iterator_destroy(cluster_itr);
end_it:
destroy_acct_association_cond(assoc_cond);
-
+
if(assoc_list) {
list_destroy(assoc_list);
assoc_list = NULL;
}
-
+
if(first_list) {
list_destroy(first_list);
first_list = NULL;
}
-
+
if(cluster_list) {
list_destroy(cluster_list);
cluster_list = NULL;
}
-
+
if(sreport_cluster_list) {
list_destroy(sreport_cluster_list);
sreport_cluster_list = NULL;
}
-
+
if(print_fields_list) {
list_destroy(print_fields_list);
print_fields_list = NULL;
@@ -918,7 +918,7 @@ extern int cluster_user_by_account(int argc, char *argv[])
_set_assoc_cond(&i, argc, argv, assoc_cond, format_list);
- if(!list_count(format_list))
+ if(!list_count(format_list))
slurm_addto_char_list(format_list,
"Cluster,Login,Proper,Ac,Used");
@@ -963,23 +963,23 @@ extern int cluster_user_by_account(int argc, char *argv[])
list_append(sreport_cluster_list, sreport_cluster);
sreport_cluster->name = xstrdup(cluster->name);
- sreport_cluster->user_list =
+ sreport_cluster->user_list =
list_create(destroy_sreport_user_rec);
/* get the amount of time and the average cpu count
during the time we are looking at */
itr2 = list_iterator_create(cluster->accounting_list);
while((accting = list_next(itr2))) {
- sreport_cluster->cpu_secs += accting->alloc_secs
- + accting->down_secs + accting->idle_secs
+ sreport_cluster->cpu_secs += accting->alloc_secs
+ + accting->down_secs + accting->idle_secs
+ accting->resv_secs;
sreport_cluster->cpu_count += accting->cpu_count;
}
list_iterator_destroy(itr2);
- sreport_cluster->cpu_count /=
+ sreport_cluster->cpu_count /=
list_count(cluster->accounting_list);
-
+
/* now add the associations of interest here by user */
while((assoc = list_next(assoc_itr))) {
struct passwd *passwd_ptr = NULL;
@@ -994,7 +994,7 @@ extern int cluster_user_by_account(int argc, char *argv[])
continue;
}
- if(strcmp(cluster->name, assoc->cluster))
+ if(strcmp(cluster->name, assoc->cluster))
continue;
/* make sure we add all associations to this
@@ -1003,17 +1003,17 @@ extern int cluster_user_by_account(int argc, char *argv[])
record otherwise
*/
user_itr = list_iterator_create(
- sreport_cluster->user_list);
+ sreport_cluster->user_list);
while((sreport_user = list_next(user_itr))) {
if(!strcmp(sreport_user->name, assoc->user)
&& !strcmp(sreport_user->acct, assoc->acct))
- break;
+ break;
}
list_iterator_destroy(user_itr);
if(!sreport_user) {
passwd_ptr = getpwnam(assoc->user);
- if(passwd_ptr)
+ if(passwd_ptr)
uid = passwd_ptr->pw_uid;
/* In this report we are using the sreport user
structure to store the information we want
@@ -1025,16 +1025,16 @@ extern int cluster_user_by_account(int argc, char *argv[])
sreport_user->name = xstrdup(assoc->user);
sreport_user->uid = uid;
sreport_user->acct = xstrdup(assoc->acct);
-
+
list_append(sreport_cluster->user_list,
sreport_user);
- }
+ }
/* get the amount of time this assoc used
during the time we are looking at */
itr2 = list_iterator_create(assoc->accounting_list);
while((accting2 = list_next(itr2))) {
- sreport_user->cpu_secs +=
+ sreport_user->cpu_secs +=
(uint64_t)accting2->alloc_secs;
}
list_iterator_destroy(itr2);
@@ -1055,21 +1055,21 @@ extern int cluster_user_by_account(int argc, char *argv[])
char end_char[20];
time_t my_start = assoc_cond->usage_start;
time_t my_end = assoc_cond->usage_end-1;
-
+
slurm_make_time_str(&my_start, start_char, sizeof(start_char));
slurm_make_time_str(&my_end, end_char, sizeof(end_char));
printf("----------------------------------------"
"----------------------------------------\n");
- printf("Cluster/User/Account Utilization %s - %s (%d secs)\n",
- start_char, end_char,
+ printf("Cluster/User/Account Utilization %s - %s (%d secs)\n",
+ start_char, end_char,
(int)(assoc_cond->usage_end - assoc_cond->usage_start));
-
+
switch(time_format) {
case SREPORT_TIME_PERCENT:
printf("Time reported in %s\n", time_format_string);
- break;
+ break;
default:
- printf("Time reported in CPU %s\n",
+ printf("Time reported in CPU %s\n",
time_format_string);
break;
}
@@ -1084,7 +1084,7 @@ extern int cluster_user_by_account(int argc, char *argv[])
cluster_itr = list_iterator_create(sreport_cluster_list);
while((sreport_cluster = list_next(cluster_itr))) {
list_sort(sreport_cluster->user_list, (ListCmpF)sort_user_dec);
-
+
itr = list_iterator_create(sreport_cluster->user_list);
while((sreport_user = list_next(itr))) {
int curr_inx = 1;
@@ -1118,16 +1118,16 @@ extern int cluster_user_by_account(int argc, char *argv[])
case PRINT_CLUSTER_USER_PROPER:
pwd = getpwnam(sreport_user->name);
if(pwd) {
- tmp_char =
+ tmp_char =
strtok(pwd->pw_gecos,
",");
if(!tmp_char)
- tmp_char =
+ tmp_char =
pwd->pw_gecos;
}
field->print_routine(field,
tmp_char,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_CLUSTER_AMOUNT_USED:
@@ -1153,22 +1153,22 @@ extern int cluster_user_by_account(int argc, char *argv[])
list_iterator_destroy(cluster_itr);
end_it:
destroy_acct_association_cond(assoc_cond);
-
+
if(assoc_list) {
list_destroy(assoc_list);
assoc_list = NULL;
}
-
+
if(cluster_list) {
list_destroy(cluster_list);
cluster_list = NULL;
}
-
+
if(sreport_cluster_list) {
list_destroy(sreport_cluster_list);
sreport_cluster_list = NULL;
}
-
+
if(print_fields_list) {
list_destroy(print_fields_list);
print_fields_list = NULL;
@@ -1205,8 +1205,8 @@ extern int cluster_user_by_wckey(int argc, char *argv[])
_set_wckey_cond(&i, argc, argv, wckey_cond, format_list);
- if(!list_count(format_list))
- slurm_addto_char_list(format_list,
+ if(!list_count(format_list))
+ slurm_addto_char_list(format_list,
"Cluster,Login,Proper,WCkey,Used");
_setup_print_fields_list(format_list);
@@ -1250,23 +1250,23 @@ extern int cluster_user_by_wckey(int argc, char *argv[])
list_append(sreport_cluster_list, sreport_cluster);
sreport_cluster->name = xstrdup(cluster->name);
- sreport_cluster->user_list =
+ sreport_cluster->user_list =
list_create(destroy_sreport_user_rec);
/* get the amount of time and the average cpu count
during the time we are looking at */
itr2 = list_iterator_create(cluster->accounting_list);
while((accting = list_next(itr2))) {
- sreport_cluster->cpu_secs += accting->alloc_secs
- + accting->down_secs + accting->idle_secs
+ sreport_cluster->cpu_secs += accting->alloc_secs
+ + accting->down_secs + accting->idle_secs
+ accting->resv_secs;
sreport_cluster->cpu_count += accting->cpu_count;
}
list_iterator_destroy(itr2);
- sreport_cluster->cpu_count /=
+ sreport_cluster->cpu_count /=
list_count(cluster->accounting_list);
-
+
/* now add the wckeys of interest here by user */
while((wckey = list_next(wckey_itr))) {
struct passwd *passwd_ptr = NULL;
@@ -1280,11 +1280,11 @@ extern int cluster_user_by_wckey(int argc, char *argv[])
continue;
}
- if(strcmp(cluster->name, wckey->cluster))
+ if(strcmp(cluster->name, wckey->cluster))
continue;
passwd_ptr = getpwnam(wckey->user);
- if(passwd_ptr)
+ if(passwd_ptr)
uid = passwd_ptr->pw_uid;
/* In this report we are using the sreport user
structure to store the information we want
@@ -1295,15 +1295,15 @@ extern int cluster_user_by_wckey(int argc, char *argv[])
sreport_user->name = xstrdup(wckey->user);
sreport_user->uid = uid;
sreport_user->acct = xstrdup(wckey->name);
-
+
list_append(sreport_cluster->user_list,
sreport_user);
-
+
/* get the amount of time this wckey used
during the time we are looking at */
itr2 = list_iterator_create(wckey->accounting_list);
while((accting2 = list_next(itr2))) {
- sreport_user->cpu_secs +=
+ sreport_user->cpu_secs +=
(uint64_t)accting2->alloc_secs;
}
list_iterator_destroy(itr2);
@@ -1324,21 +1324,21 @@ extern int cluster_user_by_wckey(int argc, char *argv[])
char end_char[20];
time_t my_start = wckey_cond->usage_start;
time_t my_end = wckey_cond->usage_end-1;
-
+
slurm_make_time_str(&my_start, start_char, sizeof(start_char));
slurm_make_time_str(&my_end, end_char, sizeof(end_char));
printf("----------------------------------------"
"----------------------------------------\n");
- printf("Cluster/User/WCKey Utilization %s - %s (%d secs)\n",
- start_char, end_char,
+ printf("Cluster/User/WCKey Utilization %s - %s (%d secs)\n",
+ start_char, end_char,
(int)(wckey_cond->usage_end - wckey_cond->usage_start));
-
+
switch(time_format) {
case SREPORT_TIME_PERCENT:
printf("Time reported in %s\n", time_format_string);
- break;
+ break;
default:
- printf("Time reported in CPU %s\n",
+ printf("Time reported in CPU %s\n",
time_format_string);
break;
}
@@ -1353,7 +1353,7 @@ extern int cluster_user_by_wckey(int argc, char *argv[])
cluster_itr = list_iterator_create(sreport_cluster_list);
while((sreport_cluster = list_next(cluster_itr))) {
list_sort(sreport_cluster->user_list, (ListCmpF)sort_user_dec);
-
+
itr = list_iterator_create(sreport_cluster->user_list);
while((sreport_user = list_next(itr))) {
int curr_inx = 1;
@@ -1387,16 +1387,16 @@ extern int cluster_user_by_wckey(int argc, char *argv[])
case PRINT_CLUSTER_USER_PROPER:
pwd = getpwnam(sreport_user->name);
if(pwd) {
- tmp_char =
+ tmp_char =
strtok(pwd->pw_gecos,
",");
if(!tmp_char)
- tmp_char =
+ tmp_char =
pwd->pw_gecos;
}
field->print_routine(field,
tmp_char,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_CLUSTER_AMOUNT_USED:
@@ -1422,22 +1422,22 @@ extern int cluster_user_by_wckey(int argc, char *argv[])
list_iterator_destroy(cluster_itr);
end_it:
destroy_acct_wckey_cond(wckey_cond);
-
+
if(wckey_list) {
list_destroy(wckey_list);
wckey_list = NULL;
}
-
+
if(cluster_list) {
list_destroy(cluster_list);
cluster_list = NULL;
}
-
+
if(sreport_cluster_list) {
list_destroy(sreport_cluster_list);
sreport_cluster_list = NULL;
}
-
+
if(print_fields_list) {
list_destroy(print_fields_list);
print_fields_list = NULL;
@@ -1457,7 +1457,7 @@ extern int cluster_utilization(int argc, char *argv[])
print_field_t *field = NULL;
uint32_t total_time = 0;
- List cluster_list = NULL;
+ List cluster_list = NULL;
List format_list = list_create(slurm_destroy_char);
int field_count = 0;
@@ -1467,10 +1467,10 @@ extern int cluster_utilization(int argc, char *argv[])
if(!(cluster_list = _get_cluster_list(argc, argv, &total_time,
"Cluster Utilization",
- format_list)))
+ format_list)))
goto end_it;
- if(!list_count(format_list))
+ if(!list_count(format_list))
slurm_addto_char_list(format_list, "Cl,al,d,planned,i,res,rep");
_setup_print_fields_list(format_list);
@@ -1495,7 +1495,7 @@ extern int cluster_utilization(int argc, char *argv[])
continue;
memset(&total_acct, 0, sizeof(cluster_accounting_rec_t));
-
+
itr3 = list_iterator_create(cluster->accounting_list);
while((accting = list_next(itr3))) {
total_acct.alloc_secs += accting->alloc_secs;
@@ -1509,10 +1509,10 @@ extern int cluster_utilization(int argc, char *argv[])
list_iterator_destroy(itr3);
total_acct.cpu_count /= list_count(cluster->accounting_list);
-
+
local_total_time =
(uint64_t)total_time * (uint64_t)total_acct.cpu_count;
- total_reported = total_acct.alloc_secs + total_acct.down_secs
+ total_reported = total_acct.alloc_secs + total_acct.down_secs
+ total_acct.pdown_secs + total_acct.idle_secs
+ total_acct.resv_secs;
@@ -1521,62 +1521,62 @@ extern int cluster_utilization(int argc, char *argv[])
case PRINT_CLUSTER_NAME:
field->print_routine(field,
cluster->name,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_CLUSTER_CPUS:
field->print_routine(field,
total_acct.cpu_count,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_CLUSTER_ACPU:
field->print_routine(field,
total_acct.alloc_secs,
total_reported,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_CLUSTER_DCPU:
field->print_routine(field,
total_acct.down_secs,
total_reported,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_CLUSTER_ICPU:
field->print_routine(field,
total_acct.idle_secs,
total_reported,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_CLUSTER_RCPU:
field->print_routine(field,
total_acct.resv_secs,
total_reported,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_CLUSTER_OCPU:
field->print_routine(field,
total_acct.over_secs,
total_reported,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_CLUSTER_PDCPU:
field->print_routine(field,
total_acct.pdown_secs,
total_reported,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_CLUSTER_TOTAL:
field->print_routine(field,
total_reported,
local_total_time,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
default:
@@ -1599,7 +1599,7 @@ end_it:
list_destroy(cluster_list);
cluster_list = NULL;
}
-
+
if(print_fields_list) {
list_destroy(print_fields_list);
print_fields_list = NULL;
@@ -1611,7 +1611,7 @@ end_it:
extern int cluster_wckey_by_user(int argc, char *argv[])
{
int rc = SLURM_SUCCESS;
- acct_wckey_cond_t *wckey_cond =
+ acct_wckey_cond_t *wckey_cond =
xmalloc(sizeof(acct_wckey_cond_t));
acct_cluster_cond_t cluster_cond;
ListIterator itr = NULL;
@@ -1637,8 +1637,8 @@ extern int cluster_wckey_by_user(int argc, char *argv[])
_set_wckey_cond(&i, argc, argv, wckey_cond, format_list);
- if(!list_count(format_list))
- slurm_addto_char_list(format_list,
+ if(!list_count(format_list))
+ slurm_addto_char_list(format_list,
"Cluster,WCKey,Login,Proper,Used");
_setup_print_fields_list(format_list);
@@ -1681,23 +1681,23 @@ extern int cluster_wckey_by_user(int argc, char *argv[])
list_append(sreport_cluster_list, sreport_cluster);
sreport_cluster->name = xstrdup(cluster->name);
- sreport_cluster->assoc_list =
+ sreport_cluster->assoc_list =
list_create(destroy_sreport_assoc_rec);
/* get the amount of time and the average cpu count
during the time we are looking at */
itr2 = list_iterator_create(cluster->accounting_list);
while((accting = list_next(itr2))) {
- sreport_cluster->cpu_secs += accting->alloc_secs
- + accting->down_secs + accting->idle_secs
+ sreport_cluster->cpu_secs += accting->alloc_secs
+ + accting->down_secs + accting->idle_secs
+ accting->resv_secs;
sreport_cluster->cpu_count += accting->cpu_count;
}
list_iterator_destroy(itr2);
- sreport_cluster->cpu_count /=
+ sreport_cluster->cpu_count /=
list_count(cluster->accounting_list);
-
+
/* now add the wckeys of interest here by user */
while((wckey = list_next(wckey_itr))) {
acct_accounting_rec_t *accting2 = NULL;
@@ -1710,14 +1710,14 @@ extern int cluster_wckey_by_user(int argc, char *argv[])
continue;
}
- if(strcmp(cluster->name, wckey->cluster))
+ if(strcmp(cluster->name, wckey->cluster))
continue;
/* find the parent */
par_itr = list_iterator_create(
sreport_cluster->assoc_list);
while((parent_assoc = list_next(par_itr))) {
- if(!parent_assoc->user
+ if(!parent_assoc->user
&& !strcmp(parent_assoc->acct, wckey->name))
break;
}
@@ -1725,15 +1725,15 @@ extern int cluster_wckey_by_user(int argc, char *argv[])
if(!parent_assoc) {
parent_assoc = xmalloc(
sizeof(sreport_assoc_rec_t));
-
- list_append(sreport_cluster->assoc_list,
+
+ list_append(sreport_cluster->assoc_list,
parent_assoc);
parent_assoc->acct = xstrdup(wckey->name);
}
sreport_assoc = xmalloc(sizeof(sreport_assoc_rec_t));
-
- list_append(sreport_cluster->assoc_list,
+
+ list_append(sreport_cluster->assoc_list,
sreport_assoc);
sreport_assoc->acct = xstrdup(wckey->name);
@@ -1743,13 +1743,13 @@ extern int cluster_wckey_by_user(int argc, char *argv[])
during the time we are looking at */
itr2 = list_iterator_create(wckey->accounting_list);
while((accting2 = list_next(itr2))) {
- sreport_assoc->cpu_secs +=
+ sreport_assoc->cpu_secs +=
(uint64_t)accting2->alloc_secs;
- parent_assoc->cpu_secs +=
+ parent_assoc->cpu_secs +=
(uint64_t)accting2->alloc_secs;
}
list_iterator_destroy(itr2);
- list_delete_item(wckey_itr);
+ list_delete_item(wckey_itr);
}
list_iterator_reset(wckey_itr);
}
@@ -1766,21 +1766,21 @@ extern int cluster_wckey_by_user(int argc, char *argv[])
char end_char[20];
time_t my_start = wckey_cond->usage_start;
time_t my_end = wckey_cond->usage_end-1;
-
+
slurm_make_time_str(&my_start, start_char, sizeof(start_char));
slurm_make_time_str(&my_end, end_char, sizeof(end_char));
printf("----------------------------------------"
"----------------------------------------\n");
- printf("Cluster/WCKey/User Utilization %s - %s (%d secs)\n",
- start_char, end_char,
+ printf("Cluster/WCKey/User Utilization %s - %s (%d secs)\n",
+ start_char, end_char,
(int)(wckey_cond->usage_end - wckey_cond->usage_start));
-
+
switch(time_format) {
case SREPORT_TIME_PERCENT:
printf("Time reported in %s\n", time_format_string);
- break;
+ break;
default:
- printf("Time reported in CPU %s\n",
+ printf("Time reported in CPU %s\n",
time_format_string);
break;
}
@@ -1793,16 +1793,16 @@ extern int cluster_wckey_by_user(int argc, char *argv[])
field_count = list_count(print_fields_list);
list_sort(sreport_cluster_list, (ListCmpF)sort_cluster_dec);
-
+
cluster_itr = list_iterator_create(sreport_cluster_list);
while((sreport_cluster = list_next(cluster_itr))) {
- //list_sort(sreport_cluster->wckey_list,
+ //list_sort(sreport_cluster->wckey_list,
// (ListCmpF)sort_wckey_dec);
- if(tree_list)
+ if(tree_list)
list_flush(tree_list);
- else
+ else
tree_list = list_create(destroy_acct_print_tree);
-
+
itr = list_iterator_create(sreport_cluster->assoc_list);
while((sreport_assoc = list_next(itr))) {
int curr_inx = 1;
@@ -1814,10 +1814,10 @@ extern int cluster_wckey_by_user(int argc, char *argv[])
switch(field->type) {
case PRINT_CLUSTER_WCKEY:
field->print_routine(
- field,
+ field,
sreport_assoc->acct,
(curr_inx == field_count));
-
+
break;
case PRINT_CLUSTER_NAME:
field->print_routine(
@@ -1836,16 +1836,16 @@ extern int cluster_wckey_by_user(int argc, char *argv[])
pwd = getpwnam(
sreport_assoc->user);
if(pwd) {
- tmp_char =
+ tmp_char =
strtok(pwd->pw_gecos,
",");
if(!tmp_char)
- tmp_char =
+ tmp_char =
pwd->pw_gecos;
}
field->print_routine(field,
tmp_char,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_CLUSTER_AMOUNT_USED:
@@ -1871,22 +1871,22 @@ extern int cluster_wckey_by_user(int argc, char *argv[])
list_iterator_destroy(cluster_itr);
end_it:
destroy_acct_wckey_cond(wckey_cond);
-
+
if(wckey_list) {
list_destroy(wckey_list);
wckey_list = NULL;
}
-
+
if(cluster_list) {
list_destroy(cluster_list);
cluster_list = NULL;
}
-
+
if(sreport_cluster_list) {
list_destroy(sreport_cluster_list);
sreport_cluster_list = NULL;
}
-
+
if(print_fields_list) {
list_destroy(print_fields_list);
print_fields_list = NULL;
diff --git a/src/sreport/cluster_reports.h b/src/sreport/cluster_reports.h
index 2efbffe995723c84aca5310b4553e4b79aea9184..220e750566ffe15f612128dfc3f86f8a3ddc16ad 100644
--- a/src/sreport/cluster_reports.h
+++ b/src/sreport/cluster_reports.h
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/sreport/common.c b/src/sreport/common.c
index faaf4c42336aacc3e3c2002f32a1879f3d0cbfad..51d79ce6044b7e0e625da32148bffe12c206cdbe 100644
--- a/src/sreport/common.c
+++ b/src/sreport/common.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -45,24 +45,24 @@ extern void sreport_print_time(print_field_t *field,
{
int abs_len = abs(field->len);
- if(!total_time)
+ if(!total_time)
total_time = 1;
/* (value == unset) || (value == cleared) */
if((value == NO_VAL) || (value == INFINITE)) {
- if(print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
;
else if(print_fields_parsable_print)
- printf("|");
- else
+ printf("|");
+ else
printf("%-*s ", abs_len, " ");
} else {
char *output = NULL;
double percent = (double)value;
double temp_d = (double)value;
-
+
switch(time_format) {
case SREPORT_TIME_SECS:
output = xstrdup_printf("%llu", value);
@@ -79,7 +79,7 @@ extern void sreport_print_time(print_field_t *field,
percent /= total_time;
percent *= 100;
output = xstrdup_printf("%.2lf%%", percent);
- break;
+ break;
case SREPORT_TIME_SECS_PER:
percent /= total_time;
percent *= 100;
@@ -105,13 +105,13 @@ extern void sreport_print_time(print_field_t *field,
output = xstrdup_printf("%.0lf", temp_d);
break;
}
-
- if(print_fields_parsable_print
+
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%s", output);
else if(print_fields_parsable_print)
- printf("%s|", output);
+ printf("%s|", output);
else if(field->len == abs_len)
printf("%*.*s ", abs_len, abs_len, output);
else
@@ -124,7 +124,7 @@ extern void sreport_print_time(print_field_t *field,
extern int parse_option_end(char *option)
{
int end = 0;
-
+
if(!option)
return 0;
@@ -200,7 +200,7 @@ extern void addto_char_list(List char_list, char *names)
if(!tmp_char)
list_append(char_list, name);
- else
+ else
xfree(name);
list_iterator_reset(itr);
}
@@ -216,15 +216,15 @@ extern void addto_char_list(List char_list, char *names)
if(!strcasecmp(tmp_char, name))
break;
}
-
+
if(!tmp_char)
list_append(char_list, name);
- else
+ else
xfree(name);
}
- }
+ }
list_iterator_destroy(itr);
-}
+}
extern int set_start_end_time(time_t *start, time_t *end)
{
@@ -243,7 +243,7 @@ extern int set_start_end_time(time_t *start, time_t *end)
return SLURM_ERROR;
}
end_tm.tm_hour = 0;
- //(*end) = mktime(&end_tm);
+ //(*end) = mktime(&end_tm);
} else {
temp_time = sent_end;
if(!localtime_r(&temp_time, &end_tm)) {
@@ -256,11 +256,11 @@ extern int set_start_end_time(time_t *start, time_t *end)
if(end_tm.tm_min >= 30)
end_tm.tm_hour++;
}
-
+
end_tm.tm_sec = 0;
end_tm.tm_min = 0;
end_tm.tm_isdst = -1;
- (*end) = mktime(&end_tm);
+ (*end) = mktime(&end_tm);
if(!sent_start) {
if(!localtime_r(&my_time, &start_tm)) {
@@ -270,7 +270,7 @@ extern int set_start_end_time(time_t *start, time_t *end)
}
start_tm.tm_hour = 0;
start_tm.tm_mday--;
- //(*start) = mktime(&start_tm);
+ //(*start) = mktime(&start_tm);
} else {
temp_time = sent_start;
if(!localtime_r(&temp_time, &start_tm)) {
@@ -286,16 +286,16 @@ extern int set_start_end_time(time_t *start, time_t *end)
start_tm.tm_sec = 0;
start_tm.tm_min = 0;
start_tm.tm_isdst = -1;
- (*start) = mktime(&start_tm);
+ (*start) = mktime(&start_tm);
- if((*end)-(*start) < 3600)
+ if((*end)-(*start) < 3600)
(*end) = (*start) + 3600;
/* info("now got %d and %d sent", (*start), (*end)); */
/* char start_char[20]; */
/* char end_char[20]; */
/* time_t my_start = (*start); */
/* time_t my_end = (*end); */
-
+
/* slurm_make_time_str(&my_start, */
/* start_char, sizeof(start_char)); */
/* slurm_make_time_str(&my_end, */
@@ -330,7 +330,7 @@ extern void destroy_sreport_user_rec(void *object)
extern void destroy_sreport_cluster_rec(void *object)
{
- sreport_cluster_rec_t *sreport_cluster =
+ sreport_cluster_rec_t *sreport_cluster =
(sreport_cluster_rec_t *)object;
if(sreport_cluster) {
if(sreport_cluster->assoc_list)
@@ -342,11 +342,11 @@ extern void destroy_sreport_cluster_rec(void *object)
}
}
-/*
+/*
* Comparator used for sorting users largest cpu to smallest cpu
- *
+ *
* returns: 1: user_a > user_b 0: user_a == user_b -1: user_a < user_b
- *
+ *
*/
extern int sort_user_dec(sreport_user_rec_t *user_a, sreport_user_rec_t *user_b)
{
@@ -368,17 +368,17 @@ extern int sort_user_dec(sreport_user_rec_t *user_a, sreport_user_rec_t *user_b)
return 1;
else if (diff < 0)
return -1;
-
+
return 0;
}
-/*
+/*
* Comparator used for sorting clusters alphabetically
- *
- * returns: 1: cluster_a > cluster_b
+ *
+ * returns: 1: cluster_a > cluster_b
* 0: cluster_a == cluster_b
* -1: cluster_a < cluster_b
- *
+ *
*/
extern int sort_cluster_dec(sreport_cluster_rec_t *cluster_a,
sreport_cluster_rec_t *cluster_b)
@@ -394,19 +394,19 @@ extern int sort_cluster_dec(sreport_cluster_rec_t *cluster_a,
return 1;
else if (diff < 0)
return -1;
-
+
return 0;
}
-/*
+/*
* Comparator used for sorting assocs alphabetically by acct and then
* by user. The association with a total count of time is at the top
* of the accts.
- *
- * returns: -1: assoc_a > assoc_b
+ *
+ * returns: -1: assoc_a > assoc_b
* 0: assoc_a == assoc_b
* 1: assoc_a < assoc_b
- *
+ *
*/
extern int sort_assoc_dec(sreport_assoc_rec_t *assoc_a,
sreport_assoc_rec_t *assoc_b)
@@ -422,7 +422,7 @@ extern int sort_assoc_dec(sreport_assoc_rec_t *assoc_a,
return 1;
else if (diff < 0)
return -1;
-
+
if(!assoc_a->user && assoc_b->user)
return 1;
else if(!assoc_b->user)
@@ -434,18 +434,18 @@ extern int sort_assoc_dec(sreport_assoc_rec_t *assoc_a,
return 1;
else if (diff < 0)
return -1;
-
+
return 0;
}
-/*
+/*
* Comparator used for sorting resvs largest cpu to smallest cpu
- *
+ *
* returns: 1: resv_a > resv_b 0: resv_a == resv_b -1: resv_a < resv_b
- *
+ *
*/
-extern int sort_reservations_dec(acct_reservation_rec_t *resv_a,
+extern int sort_reservations_dec(acct_reservation_rec_t *resv_a,
acct_reservation_rec_t *resv_b)
{
int diff = 0;
@@ -469,7 +469,7 @@ extern int sort_reservations_dec(acct_reservation_rec_t *resv_a,
return 1;
else if (diff < 0)
return -1;
-
+
if(resv_a->time_start < resv_b->time_start)
return 1;
else if(resv_a->time_start > resv_b->time_start)
@@ -482,7 +482,7 @@ extern int get_uint(char *in_value, uint32_t *out_value, char *type)
{
char *ptr = NULL, *meat = NULL;
long num;
-
+
if(!(meat = strip_quotes(in_value, NULL))) {
error("Problem with strip_quotes");
return SLURM_ERROR;
@@ -494,7 +494,7 @@ extern int get_uint(char *in_value, uint32_t *out_value, char *type)
return SLURM_ERROR;
}
xfree(meat);
-
+
if (num < 0)
*out_value = INFINITE; /* flag to clear */
else
diff --git a/src/sreport/job_reports.c b/src/sreport/job_reports.c
index 94a059dfa3c4936002111f7b2442a502bbad2e4f..7a9be22754d77c8dc42d736346436d9760c11148 100644
--- a/src/sreport/job_reports.c
+++ b/src/sreport/job_reports.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -116,13 +116,13 @@ static void _destroy_cluster_grouping(void *object)
}
}
-/*
+/*
* Comparator used for sorting clusters alphabetically
- *
- * returns: 1: cluster_a > cluster_b
+ *
+ * returns: 1: cluster_a > cluster_b
* 0: cluster_a == cluster_b
* -1: cluster_a < cluster_b
- *
+ *
*/
extern int _sort_cluster_grouping_dec(cluster_grouping_t *cluster_a,
cluster_grouping_t *cluster_b)
@@ -138,17 +138,17 @@ extern int _sort_cluster_grouping_dec(cluster_grouping_t *cluster_a,
return 1;
else if (diff < 0)
return -1;
-
+
return 0;
}
-/*
+/*
* Comparator used for sorting clusters alphabetically
- *
- * returns: 1: acct_a > acct_b
+ *
+ * returns: 1: acct_a > acct_b
* 0: acct_a == acct_b
* -1: acct_a < acct_b
- *
+ *
*/
extern int _sort_acct_grouping_dec(acct_grouping_t *acct_a,
acct_grouping_t *acct_b)
@@ -164,7 +164,7 @@ extern int _sort_acct_grouping_dec(acct_grouping_t *acct_a,
return 1;
else if (diff < 0)
return -1;
-
+
return 0;
}
@@ -205,7 +205,7 @@ extern int _addto_uid_char_list(List char_list, char *names)
if (!isdigit((int) *name)) {
struct passwd *pwd;
if (!(pwd=getpwnam(name))) {
- fprintf(stderr,
+ fprintf(stderr,
"Invalid user "
"id: %s\n",
name);
@@ -215,7 +215,7 @@ extern int _addto_uid_char_list(List char_list, char *names)
name = xstrdup_printf(
"%d", pwd->pw_uid);
}
-
+
while((tmp_char = list_next(itr))) {
if(!strcasecmp(tmp_char, name))
break;
@@ -224,7 +224,7 @@ extern int _addto_uid_char_list(List char_list, char *names)
if(!tmp_char) {
list_append(char_list, name);
count++;
- } else
+ } else
xfree(name);
list_iterator_reset(itr);
}
@@ -242,11 +242,11 @@ extern int _addto_uid_char_list(List char_list, char *names)
if((i-start) > 0) {
name = xmalloc((i-start)+1);
memcpy(name, names+start, (i-start));
-
+
if (!isdigit((int) *name)) {
struct passwd *pwd;
if (!(pwd=getpwnam(name))) {
- fprintf(stderr,
+ fprintf(stderr,
"Invalid user id: %s\n",
name);
exit(1);
@@ -254,22 +254,22 @@ extern int _addto_uid_char_list(List char_list, char *names)
xfree(name);
name = xstrdup_printf("%d", pwd->pw_uid);
}
-
+
while((tmp_char = list_next(itr))) {
if(!strcasecmp(tmp_char, name))
break;
}
-
+
if(!tmp_char) {
list_append(char_list, name);
count++;
- } else
+ } else
xfree(name);
}
- }
+ }
list_iterator_destroy(itr);
return count;
-}
+}
static int _set_cond(int *start, int argc, char *argv[],
acct_job_cond_t *job_cond,
@@ -304,13 +304,13 @@ static int _set_cond(int *start, int argc, char *argv[],
MAX(command_len, 2))) {
flat_view = true;
continue;
- } else if(!end
+ } else if(!end
|| !strncasecmp (argv[i], "Clusters",
MAX(command_len, 1))) {
slurm_addto_char_list(job_cond->cluster_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp (argv[i], "Accounts",
+ } else if (!strncasecmp (argv[i], "Accounts",
MAX(command_len, 2))) {
if(!job_cond->acct_list)
job_cond->acct_list =
@@ -343,7 +343,7 @@ static int _set_cond(int *start, int argc, char *argv[],
} else if (!strncasecmp (argv[i], "grouping",
MAX(command_len, 2))) {
if(grouping_list)
- slurm_addto_char_list(grouping_list,
+ slurm_addto_char_list(grouping_list,
argv[i]+end);
} else if (!strncasecmp (argv[i], "Jobs",
MAX(command_len, 1))) {
@@ -354,7 +354,7 @@ static int _set_cond(int *start, int argc, char *argv[],
job_cond->step_list =
list_create(slurm_destroy_char);
- while ((end_char = strstr(start_char, ","))
+ while ((end_char = strstr(start_char, ","))
&& start_char) {
*end_char = 0;
while (isspace(*start_char))
@@ -364,7 +364,7 @@ static int _set_cond(int *start, int argc, char *argv[],
selected_step = xmalloc(
sizeof(jobacct_selected_step_t));
list_append(job_cond->step_list, selected_step);
-
+
dot = strstr(start_char, ".");
if (dot == NULL) {
debug2("No jobstep requested");
@@ -376,9 +376,9 @@ static int _set_cond(int *start, int argc, char *argv[],
selected_step->jobid = atoi(start_char);
start_char = end_char + 1;
}
-
+
set = 1;
- } else if(!strncasecmp (argv[i], "Nodes",
+ } else if(!strncasecmp (argv[i], "Nodes",
MAX(command_len, 1))) {
if(job_cond->used_nodes) {
error("You already specified nodes '%s' "
@@ -409,7 +409,7 @@ static int _set_cond(int *start, int argc, char *argv[],
_addto_uid_char_list(job_cond->userid_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp (argv[i], "Wckeys",
+ } else if (!strncasecmp (argv[i], "Wckeys",
MAX(command_len, 2))) {
if(!job_cond->wckey_list)
job_cond->wckey_list =
@@ -453,7 +453,7 @@ static int _setup_print_fields_list(List format_list)
if(!format_list || !list_count(format_list)) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" We need a format list to set up the print.\n");
return SLURM_ERROR;
}
@@ -466,11 +466,11 @@ static int _setup_print_fields_list(List format_list)
char *tmp_char = NULL;
int command_len = 0;
int newlen = 0;
-
+
if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
- }
+ }
command_len = strlen(object);
@@ -486,7 +486,7 @@ static int _setup_print_fields_list(List format_list)
field->name = xstrdup("Cluster");
field->len = 9;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("CpuCount", object,
+ } else if(!strncasecmp("CpuCount", object,
MAX(command_len, 2))) {
field->type = PRINT_JOB_CPUS;
field->name = xstrdup("CPU Count");
@@ -529,10 +529,10 @@ static int _setup_print_fields_list(List format_list)
continue;
}
- if(newlen)
+ if(newlen)
field->len = newlen;
-
- list_append(print_fields_list, field);
+
+ list_append(print_fields_list, field);
}
list_iterator_destroy(itr);
@@ -583,10 +583,10 @@ static int _setup_grouping_print_fields_list(List grouping_list)
last_object = object;
if((tmp_char = strstr(object, "\%"))) {
int newlen = atoi(tmp_char+1);
- if(newlen)
+ if(newlen)
field->len = newlen;
}
- list_append(grouping_print_fields_list, field);
+ list_append(grouping_print_fields_list, field);
}
list_iterator_destroy(itr);
@@ -609,10 +609,10 @@ static int _setup_grouping_print_fields_list(List grouping_list)
field->print_routine = sreport_print_time;
if((tmp_char = strstr(last_object, "\%"))) {
int newlen = atoi(tmp_char+1);
- if(newlen)
+ if(newlen)
field->len = newlen;
}
- list_append(grouping_print_fields_list, field);
+ list_append(grouping_print_fields_list, field);
}
return SLURM_SUCCESS;
@@ -632,7 +632,7 @@ extern int job_sizes_grouped_by_top_acct(int argc, char *argv[])
ListIterator local_itr = NULL;
ListIterator acct_itr = NULL;
ListIterator group_itr = NULL;
-
+
jobacct_job_rec_t *job = NULL;
cluster_grouping_t *cluster_group = NULL;
@@ -643,7 +643,7 @@ extern int job_sizes_grouped_by_top_acct(int argc, char *argv[])
print_field_t total_field;
uint32_t total_time = 0;
sreport_time_format_t temp_format;
-
+
List job_list = NULL;
List cluster_list = NULL;
List assoc_list = NULL;
@@ -660,13 +660,13 @@ extern int job_sizes_grouped_by_top_acct(int argc, char *argv[])
print_fields_list = list_create(destroy_print_field);
_set_cond(&i, argc, argv, job_cond, format_list, grouping_list);
-
+
if(!list_count(format_list))
slurm_addto_char_list(format_list, "Cl,a");
- if(!list_count(grouping_list))
+ if(!list_count(grouping_list))
slurm_addto_char_list(grouping_list, "50,250,500,1000");
-
+
_setup_print_fields_list(format_list);
list_destroy(format_list);
@@ -698,8 +698,8 @@ extern int job_sizes_grouped_by_top_acct(int argc, char *argv[])
slurm_make_time_str(&my_end, end_char, sizeof(end_char));
printf("----------------------------------------"
"----------------------------------------\n");
- printf("Job Sizes %s - %s (%d secs)\n",
- start_char, end_char,
+ printf("Job Sizes %s - %s (%d secs)\n",
+ start_char, end_char,
(int)(job_cond->usage_end - job_cond->usage_start));
if(print_job_count)
printf("Units are in number of jobs ran\n");
@@ -727,10 +727,10 @@ extern int job_sizes_grouped_by_top_acct(int argc, char *argv[])
job_cond->acct_list = list_create(NULL);
list_append(job_cond->acct_list, "root");
}
- assoc_cond.parent_acct_list = job_cond->acct_list;
+ assoc_cond.parent_acct_list = job_cond->acct_list;
assoc_list = acct_storage_g_get_associations(db_conn, my_uid,
&assoc_cond);
-
+
if(!assoc_list) {
debug2(" No assoc list given.\n");
goto no_assocs;
@@ -739,11 +739,11 @@ extern int job_sizes_grouped_by_top_acct(int argc, char *argv[])
itr = list_iterator_create(assoc_list);
while((assoc = list_next(itr))) {
while((cluster_group = list_next(cluster_itr))) {
- if(!strcmp(assoc->cluster, cluster_group->cluster))
+ if(!strcmp(assoc->cluster, cluster_group->cluster))
break;
}
if(!cluster_group) {
- cluster_group =
+ cluster_group =
xmalloc(sizeof(cluster_grouping_t));
cluster_group->cluster = xstrdup(assoc->cluster);
cluster_group->acct_list =
@@ -756,8 +756,8 @@ extern int job_sizes_grouped_by_top_acct(int argc, char *argv[])
if(!strcmp(assoc->acct, acct_group->acct))
break;
}
- list_iterator_destroy(acct_itr);
-
+ list_iterator_destroy(acct_itr);
+
if(!acct_group) {
uint32_t last_size = 0;
char *group = NULL;
@@ -813,14 +813,14 @@ no_assocs:
* really run here */
continue;
}
- if(job->cluster)
+ if(job->cluster)
local_cluster = job->cluster;
- if(job->account)
+ if(job->account)
local_account = job->account;
list_iterator_reset(cluster_itr);
while((cluster_group = list_next(cluster_itr))) {
- if(!strcmp(local_cluster, cluster_group->cluster))
+ if(!strcmp(local_cluster, cluster_group->cluster))
break;
}
if(!cluster_group) {
@@ -839,20 +839,20 @@ no_assocs:
acct_itr = list_iterator_create(cluster_group->acct_list);
while((acct_group = list_next(acct_itr))) {
- if(!flat_view
+ if(!flat_view
&& (acct_group->lft != (uint32_t)NO_VAL)
&& (job->lft != (uint32_t)NO_VAL)) {
/* keep separate since we don't want
- * to so a strcmp if we don't have to
+ * to so a strcmp if we don't have to
*/
- if(job->lft > acct_group->lft
+ if(job->lft > acct_group->lft
&& job->lft < acct_group->rgt)
break;
} else if(!strcmp(acct_group->acct, local_account))
break;
}
- list_iterator_destroy(acct_itr);
-
+ list_iterator_destroy(acct_itr);
+
if(!acct_group) {
char *group = NULL;
uint32_t last_size = 0;
@@ -894,31 +894,31 @@ no_assocs:
continue;
list_append(local_group->jobs, job);
local_group->count++;
- total_secs = (uint64_t)job->elapsed
+ total_secs = (uint64_t)job->elapsed
* (uint64_t)job->alloc_cpus;
local_group->cpu_secs += total_secs;
acct_group->cpu_secs += total_secs;
cluster_group->cpu_secs += total_secs;
}
- list_iterator_destroy(local_itr);
+ list_iterator_destroy(local_itr);
}
list_iterator_destroy(group_itr);
list_destroy(grouping_list);
list_iterator_destroy(itr);
-
+
// time_format = SREPORT_TIME_PERCENT;
-
+
itr = list_iterator_create(print_fields_list);
itr2 = list_iterator_create(grouping_print_fields_list);
list_sort(cluster_list, (ListCmpF)_sort_cluster_grouping_dec);
list_iterator_reset(cluster_itr);
while((cluster_group = list_next(cluster_itr))) {
-
+
list_sort(cluster_group->acct_list,
(ListCmpF)_sort_acct_grouping_dec);
acct_itr = list_iterator_create(cluster_group->acct_list);
while((acct_group = list_next(acct_itr))) {
-
+
while((field = list_next(itr))) {
switch(field->type) {
case PRINT_JOB_CLUSTER:
@@ -965,7 +965,7 @@ no_assocs:
}
list_iterator_reset(itr2);
list_iterator_destroy(local_itr);
-
+
temp_format = time_format;
time_format = SREPORT_TIME_PERCENT;
total_field.print_routine(&total_field,
@@ -985,22 +985,22 @@ end_it:
print_job_count = 0;
destroy_acct_job_cond(job_cond);
-
+
if(job_list) {
list_destroy(job_list);
job_list = NULL;
}
-
+
if(assoc_list) {
list_destroy(assoc_list);
assoc_list = NULL;
}
-
+
if(cluster_list) {
list_destroy(cluster_list);
cluster_list = NULL;
}
-
+
if(print_fields_list) {
list_destroy(print_fields_list);
print_fields_list = NULL;
@@ -1027,7 +1027,7 @@ extern int job_sizes_grouped_by_wckey(int argc, char *argv[])
ListIterator cluster_itr = NULL;
ListIterator local_itr = NULL;
ListIterator acct_itr = NULL;
- ListIterator group_itr = NULL;
+ ListIterator group_itr = NULL;
jobacct_job_rec_t *job = NULL;
cluster_grouping_t *cluster_group = NULL;
@@ -1038,7 +1038,7 @@ extern int job_sizes_grouped_by_wckey(int argc, char *argv[])
print_field_t total_field;
uint32_t total_time = 0;
sreport_time_format_t temp_format;
-
+
List job_list = NULL;
List cluster_list = NULL;
List wckey_list = NULL;
@@ -1053,13 +1053,13 @@ extern int job_sizes_grouped_by_wckey(int argc, char *argv[])
print_fields_list = list_create(destroy_print_field);
_set_cond(&i, argc, argv, job_cond, format_list, grouping_list);
-
+
if(!list_count(format_list))
slurm_addto_char_list(format_list, "Cl,wc");
- if(!list_count(grouping_list))
+ if(!list_count(grouping_list))
slurm_addto_char_list(grouping_list, "50,250,500,1000");
-
+
_setup_print_fields_list(format_list);
list_destroy(format_list);
@@ -1082,7 +1082,7 @@ extern int job_sizes_grouped_by_wckey(int argc, char *argv[])
wckey_cond.cluster_list = job_cond->cluster_list;
wckey_list = acct_storage_g_get_wckeys(db_conn, my_uid, &wckey_cond);
-
+
if(print_fields_have_header) {
char start_char[20];
char end_char[20];
@@ -1093,8 +1093,8 @@ extern int job_sizes_grouped_by_wckey(int argc, char *argv[])
slurm_make_time_str(&my_end, end_char, sizeof(end_char));
printf("----------------------------------------"
"----------------------------------------\n");
- printf("Job Sizes by Wckey %s - %s (%d secs)\n",
- start_char, end_char,
+ printf("Job Sizes by Wckey %s - %s (%d secs)\n",
+ start_char, end_char,
(int)(job_cond->usage_end - job_cond->usage_start));
if(print_job_count)
printf("Units are in number of jobs ran\n");
@@ -1118,11 +1118,11 @@ extern int job_sizes_grouped_by_wckey(int argc, char *argv[])
itr = list_iterator_create(wckey_list);
while((wckey = list_next(itr))) {
while((cluster_group = list_next(cluster_itr))) {
- if(!strcmp(wckey->cluster, cluster_group->cluster))
+ if(!strcmp(wckey->cluster, cluster_group->cluster))
break;
}
if(!cluster_group) {
- cluster_group =
+ cluster_group =
xmalloc(sizeof(cluster_grouping_t));
cluster_group->cluster = xstrdup(wckey->cluster);
cluster_group->acct_list =
@@ -1135,8 +1135,8 @@ extern int job_sizes_grouped_by_wckey(int argc, char *argv[])
if(!strcmp(wckey->name, acct_group->acct))
break;
}
- list_iterator_destroy(acct_itr);
-
+ list_iterator_destroy(acct_itr);
+
if(!acct_group) {
uint32_t last_size = 0;
char *group = NULL;
@@ -1191,14 +1191,14 @@ no_assocs:
* really run here */
continue;
}
- if(job->cluster)
+ if(job->cluster)
local_cluster = job->cluster;
- if(job->account)
+ if(job->account)
local_account = job->account;
list_iterator_reset(cluster_itr);
while((cluster_group = list_next(cluster_itr))) {
- if(!strcmp(local_cluster, cluster_group->cluster))
+ if(!strcmp(local_cluster, cluster_group->cluster))
break;
}
if(!cluster_group) {
@@ -1213,8 +1213,8 @@ no_assocs:
if(!strcmp(job->wckey, acct_group->acct))
break;
}
- list_iterator_destroy(acct_itr);
-
+ list_iterator_destroy(acct_itr);
+
if(!acct_group) {
/* here we are only looking for groups that
* were added with the associations above
@@ -1230,30 +1230,30 @@ no_assocs:
continue;
list_append(local_group->jobs, job);
local_group->count++;
- total_secs = (uint64_t)job->elapsed
+ total_secs = (uint64_t)job->elapsed
* (uint64_t)job->alloc_cpus;
local_group->cpu_secs += total_secs;
acct_group->cpu_secs += total_secs;
cluster_group->cpu_secs += total_secs;
}
- list_iterator_destroy(local_itr);
+ list_iterator_destroy(local_itr);
}
list_iterator_destroy(group_itr);
list_destroy(grouping_list);
list_iterator_destroy(itr);
-
+
// time_format = SREPORT_TIME_PERCENT;
-
+
itr = list_iterator_create(print_fields_list);
itr2 = list_iterator_create(grouping_print_fields_list);
list_sort(cluster_list, (ListCmpF)_sort_cluster_grouping_dec);
list_iterator_reset(cluster_itr);
while((cluster_group = list_next(cluster_itr))) {
- list_sort(cluster_group->acct_list,
+ list_sort(cluster_group->acct_list,
(ListCmpF)_sort_acct_grouping_dec);
acct_itr = list_iterator_create(cluster_group->acct_list);
while((acct_group = list_next(acct_itr))) {
-
+
while((field = list_next(itr))) {
switch(field->type) {
case PRINT_JOB_CLUSTER:
@@ -1300,7 +1300,7 @@ no_assocs:
}
list_iterator_reset(itr2);
list_iterator_destroy(local_itr);
-
+
temp_format = time_format;
time_format = SREPORT_TIME_PERCENT;
total_field.print_routine(&total_field,
@@ -1320,22 +1320,22 @@ end_it:
print_job_count = 0;
destroy_acct_job_cond(job_cond);
-
+
if(job_list) {
list_destroy(job_list);
job_list = NULL;
}
-
+
if(wckey_list) {
list_destroy(wckey_list);
wckey_list = NULL;
}
-
+
if(cluster_list) {
list_destroy(cluster_list);
cluster_list = NULL;
}
-
+
if(print_fields_list) {
list_destroy(print_fields_list);
print_fields_list = NULL;
diff --git a/src/sreport/job_reports.h b/src/sreport/job_reports.h
index 249e9cd005414bd8374933773d3f6f31da6260c2..672d1b6bd6b8d314533d0c771c9e30aed7df93b5 100644
--- a/src/sreport/job_reports.h
+++ b/src/sreport/job_reports.h
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/sreport/resv_reports.c b/src/sreport/resv_reports.c
index 338bed0b5868c9ca5bf1e7051d1d7aae20dc28f0..62dce0b1c36cd6c0e1bb2b331da8912c3afacb0b 100644
--- a/src/sreport/resv_reports.c
+++ b/src/sreport/resv_reports.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -105,12 +105,12 @@ static int _set_resv_cond(int *start, int argc, char *argv[],
MAX(command_len, 1))) {
local_cluster_flag = 1;
} else if(!end
- || !strncasecmp (argv[i], "Names",
+ || !strncasecmp (argv[i], "Names",
MAX(command_len, 1))) {
if(!resv_cond->name_list)
- resv_cond->name_list =
+ resv_cond->name_list =
list_create(slurm_destroy_char);
- slurm_addto_char_list(resv_cond->name_list,
+ slurm_addto_char_list(resv_cond->name_list,
argv[i]+end);
set = 1;
} else if (!strncasecmp (argv[i], "Clusters",
@@ -126,19 +126,19 @@ static int _set_resv_cond(int *start, int argc, char *argv[],
/* FIX ME: make flags work here */
//resv_cond->flags = parse_resv_flags(argv[i]+end);
set = 1;
- } else if (!strncasecmp (argv[i], "Format",
+ } else if (!strncasecmp (argv[i], "Format",
MAX(command_len, 2))) {
if(format_list)
slurm_addto_char_list(format_list,
argv[i]+end);
- } else if (!strncasecmp (argv[i], "Ids",
+ } else if (!strncasecmp (argv[i], "Ids",
MAX(command_len, 1))) {
if(!resv_cond->id_list)
- resv_cond->id_list =
+ resv_cond->id_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(resv_cond->id_list, argv[i]+end);
set = 1;
- } else if(!strncasecmp (argv[i], "Nodes",
+ } else if(!strncasecmp (argv[i], "Nodes",
MAX(command_len, 1))) {
if(resv_cond->nodes) {
error("You already specified nodes '%s' "
@@ -201,16 +201,16 @@ static int _setup_print_fields_list(List format_list)
char *tmp_char = NULL;
int command_len = 0;
int newlen = 0;
-
+
if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
- }
+ }
command_len = strlen(object);
field = xmalloc(sizeof(print_field_t));
- if(!strncasecmp("allocated", object,
+ if(!strncasecmp("allocated", object,
MAX(command_len, 2))) {
field->type = PRINT_RESV_ACPU;
field->name = xstrdup("Allocated");
@@ -227,13 +227,13 @@ static int _setup_print_fields_list(List format_list)
field->name = xstrdup("Associations");
field->len = 15;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("Cluster", object,
+ } else if(!strncasecmp("Cluster", object,
MAX(command_len, 2))) {
field->type = PRINT_RESV_CLUSTER;
field->name = xstrdup("Cluster");
field->len = 9;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("cpucount", object,
+ } else if(!strncasecmp("cpucount", object,
MAX(command_len, 2))) {
field->type = PRINT_RESV_CPUS;
field->name = xstrdup("CPU count");
@@ -264,31 +264,31 @@ static int _setup_print_fields_list(List format_list)
field->name = xstrdup("Nodes");
field->len = 15;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("Name", object,
+ } else if(!strncasecmp("Name", object,
MAX(command_len, 2))) {
field->type = PRINT_RESV_NAME;
field->name = xstrdup("Name");
field->len = 9;
field->print_routine = print_fields_str;
- } else if(!strncasecmp("Start", object,
+ } else if(!strncasecmp("Start", object,
MAX(command_len, 2))) {
field->type = PRINT_RESV_START;
field->name = xstrdup("Start");
field->len = 19;
field->print_routine = print_fields_date;
- } else if(!strncasecmp("End", object,
+ } else if(!strncasecmp("End", object,
MAX(command_len, 2))) {
field->type = PRINT_RESV_END;
field->name = xstrdup("End");
field->len = 19;
field->print_routine = print_fields_date;
- } else if(!strncasecmp("TotalTime", object,
+ } else if(!strncasecmp("TotalTime", object,
MAX(command_len, 2))) {
field->type = PRINT_RESV_TIME;
field->name = xstrdup("TotalTime");
field->len = 9;
field->print_routine = print_fields_time_from_secs;
- } else if(!strncasecmp("CPUTime", object,
+ } else if(!strncasecmp("CPUTime", object,
MAX(command_len, 2))) {
field->type = PRINT_RESV_CPUTIME;
field->name = xstrdup("CPUTime");
@@ -301,10 +301,10 @@ static int _setup_print_fields_list(List format_list)
continue;
}
- if(newlen)
+ if(newlen)
field->len = newlen;
-
- list_append(print_fields_list, field);
+
+ list_append(print_fields_list, field);
}
list_iterator_destroy(itr);
@@ -322,7 +322,7 @@ static List _get_resv_list(int argc, char *argv[],
resv_cond->with_usage = 1;
_set_resv_cond(&i, argc, argv, resv_cond, format_list);
-
+
resv_list = acct_storage_g_get_reservations(db_conn, my_uid,
resv_cond);
if(!resv_list) {
@@ -337,18 +337,18 @@ static List _get_resv_list(int argc, char *argv[],
time_t my_start = resv_cond->time_start;
time_t my_end = resv_cond->time_end-1;
- slurm_make_time_str(&my_start,
+ slurm_make_time_str(&my_start,
start_char, sizeof(start_char));
slurm_make_time_str(&my_end,
end_char, sizeof(end_char));
printf("----------------------------------------"
"----------------------------------------\n");
- printf("%s %s - %s\n",
+ printf("%s %s - %s\n",
report_name, start_char, end_char);
switch(time_format) {
case SREPORT_TIME_PERCENT:
printf("Time reported in %s\n", time_format_string);
- break;
+ break;
default:
printf("Time reported in CPU %s\n", time_format_string);
break;
@@ -358,7 +358,7 @@ static List _get_resv_list(int argc, char *argv[],
}
destroy_acct_reservation_cond(resv_cond);
-
+
return resv_list;
}
@@ -374,8 +374,8 @@ extern int resv_utilization(int argc, char *argv[])
print_field_t *field = NULL;
int32_t total_time = 0;
- List resv_list = NULL;
- List tot_resv_list = NULL;
+ List resv_list = NULL;
+ List tot_resv_list = NULL;
List format_list = list_create(slurm_destroy_char);
int field_count = 0;
@@ -385,10 +385,10 @@ extern int resv_utilization(int argc, char *argv[])
if(!(resv_list = _get_resv_list(argc, argv,
"Reservation Utilization",
- format_list)))
+ format_list)))
goto end_it;
- if(!list_count(format_list))
+ if(!list_count(format_list))
slurm_addto_char_list(format_list,
"Cl,name,start,end,al,i");
@@ -396,7 +396,7 @@ extern int resv_utilization(int argc, char *argv[])
list_destroy(format_list);
/* we will just use the pointers returned from the
- get_resv_list here, so don't remove them
+ get_resv_list here, so don't remove them
*/
tot_resv_list = list_create(NULL);
@@ -431,18 +431,18 @@ extern int resv_utilization(int argc, char *argv[])
break;
}
}
- if(!tot_resv)
+ if(!tot_resv)
list_append(tot_resv_list, resv);
-
+
list_iterator_reset(tot_itr);
}
-
+
list_sort(tot_resv_list, (ListCmpF)sort_reservations_dec);
list_iterator_reset(tot_itr);
while((tot_resv = list_next(tot_itr))) {
uint64_t idle_secs = 0, total_reported = 0;
int curr_inx = 1;
-
+
total_time = tot_resv->time_end - tot_resv->time_start;
if(total_time <= 0)
continue;
@@ -456,76 +456,76 @@ extern int resv_utilization(int argc, char *argv[])
case PRINT_RESV_NAME:
field->print_routine(field,
tot_resv->name,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_RESV_CLUSTER:
field->print_routine(field,
tot_resv->cluster,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_RESV_CPUS:
field->print_routine(field,
tot_resv->cpus,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_RESV_ACPU:
field->print_routine(field,
tot_resv->alloc_secs,
total_reported,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_RESV_DCPU:
field->print_routine(field,
tot_resv->down_secs,
total_reported,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_RESV_ICPU:
field->print_routine(field,
idle_secs,
total_reported,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_RESV_NODES:
field->print_routine(field,
tot_resv->nodes,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_RESV_ASSOCS:
field->print_routine(field,
tot_resv->assocs,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_RESV_START:
field->print_routine(field,
tot_resv->time_start,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_RESV_END:
field->print_routine(field,
tot_resv->time_end,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_RESV_TIME:
field->print_routine(field,
total_time,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_RESV_CPUTIME:
field->print_routine(field,
total_reported,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
default:
diff --git a/src/sreport/resv_reports.h b/src/sreport/resv_reports.h
index 50d674a4735f761812fed2a605de686fdf6277dc..816fe599002c976870c11ddbc747e4c2fdc427eb 100644
--- a/src/sreport/resv_reports.h
+++ b/src/sreport/resv_reports.h
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/sreport/sreport.c b/src/sreport/sreport.c
index a58998f06594d00c7f306e611a7f603e77f79a59..fa7835972f838e7d7170a6bbdea3b4703fab6b3a 100644
--- a/src/sreport/sreport.c
+++ b/src/sreport/sreport.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -72,8 +72,8 @@ static int _set_time_format(char *format);
static int _set_sort(char *format);
static void _usage ();
-int
-main (int argc, char *argv[])
+int
+main (int argc, char *argv[])
{
int error_code = SLURM_SUCCESS, i, opt_char, input_field_count;
char **input_fields;
@@ -135,7 +135,7 @@ main (int argc, char *argv[])
print_fields_have_header = 0;
break;
case (int)'p':
- print_fields_parsable_print =
+ print_fields_parsable_print =
PRINT_FIELDS_PARSABLE_ENDING;
break;
case (int)'P':
@@ -160,7 +160,7 @@ main (int argc, char *argv[])
break;
default:
exit_code = 1;
- fprintf(stderr, "getopt error, returned %c\n",
+ fprintf(stderr, "getopt error, returned %c\n",
opt_char);
exit(exit_code);
}
@@ -174,7 +174,7 @@ main (int argc, char *argv[])
if (optind < argc) {
for (i = optind; i < argc; i++) {
input_fields[input_field_count++] = argv[i];
- }
+ }
}
db_conn = acct_storage_g_get_connection(false, 0, false);
@@ -189,7 +189,7 @@ main (int argc, char *argv[])
else
error_code = _get_command (&input_field_count, input_fields);
while (error_code == SLURM_SUCCESS) {
- error_code = _process_command (input_field_count,
+ error_code = _process_command (input_field_count,
input_fields);
if (error_code || exit_flag)
break;
@@ -225,12 +225,12 @@ static char *_getline(const char *prompt)
}
#endif
-/*
- * _job_rep - Reports having to do with jobs
+/*
+ * _job_rep - Reports having to do with jobs
* IN argc - count of arguments
* IN argv - list of arguments
*/
-static void _job_rep (int argc, char *argv[])
+static void _job_rep (int argc, char *argv[])
{
int error_code = SLURM_SUCCESS;
int command_len = strlen(argv[0]);
@@ -240,7 +240,7 @@ static void _job_rep (int argc, char *argv[])
if (!strncasecmp (argv[0], "SizesByAccount", MAX(command_len, 1))) {
error_code = job_sizes_grouped_by_top_acct(
(argc - 1), &argv[1]);
- } else if (!strncasecmp (argv[0],
+ } else if (!strncasecmp (argv[0],
"SizesByWcKey", MAX(command_len, 8))) {
error_code = job_sizes_grouped_by_wckey(
(argc - 1), &argv[1]);
@@ -250,18 +250,18 @@ static void _job_rep (int argc, char *argv[])
fprintf(stderr, "Valid job reports are, ");
fprintf(stderr, "\"SizesByAccount, and SizesByWckey\"\n");
}
-
+
if (error_code) {
exit_code = 1;
}
}
-/*
- * _user_rep - Reports having to do with users
+/*
+ * _user_rep - Reports having to do with users
* IN argc - count of arguments
* IN argv - list of arguments
*/
-static void _user_rep (int argc, char *argv[])
+static void _user_rep (int argc, char *argv[])
{
int error_code = SLURM_SUCCESS;
@@ -272,19 +272,19 @@ static void _user_rep (int argc, char *argv[])
fprintf(stderr, "Not valid report %s\n", argv[0]);
fprintf(stderr, "Valid user reports are, ");
fprintf(stderr, "\"Top\"\n");
- }
-
+ }
+
if (error_code) {
exit_code = 1;
}
}
-/*
- * _resv_rep - Reports having to do with reservations
+/*
+ * _resv_rep - Reports having to do with reservations
* IN argc - count of arguments
* IN argv - list of arguments
*/
-static void _resv_rep (int argc, char *argv[])
+static void _resv_rep (int argc, char *argv[])
{
int error_code = SLURM_SUCCESS;
@@ -295,19 +295,19 @@ static void _resv_rep (int argc, char *argv[])
fprintf(stderr, "Not valid report %s\n", argv[0]);
fprintf(stderr, "Valid reservation reports are, ");
fprintf(stderr, "\"Utilization\"\n");
- }
-
+ }
+
if (error_code) {
exit_code = 1;
}
}
-/*
- * _cluster_rep - Reports having to do with clusters
+/*
+ * _cluster_rep - Reports having to do with clusters
* IN argc - count of arguments
* IN argv - list of arguments
*/
-static void _cluster_rep (int argc, char *argv[])
+static void _cluster_rep (int argc, char *argv[])
{
int error_code = SLURM_SUCCESS;
@@ -332,18 +332,18 @@ static void _cluster_rep (int argc, char *argv[])
"\"UserUtilizationByWckey\", \"Utilization\", "
"and \"WCKeyUtilizationByUser\"\n");
}
-
+
if (error_code) {
exit_code = 1;
}
}
-/*
- * _assoc_rep - Reports having to do with jobs
+/*
+ * _assoc_rep - Reports having to do with jobs
* IN argc - count of arguments
* IN argv - list of arguments
*/
-static void _assoc_rep (int argc, char *argv[])
+static void _assoc_rep (int argc, char *argv[])
{
int error_code = SLURM_SUCCESS;
@@ -357,8 +357,8 @@ static void _assoc_rep (int argc, char *argv[])
* OUT argc - location to store count of arguments
* OUT argv - location to store the argument list
*/
-static int
-_get_command (int *argc, char **argv)
+static int
+_get_command (int *argc, char **argv)
{
char *in_line;
static char *last_in_line = NULL;
@@ -401,11 +401,11 @@ _get_command (int *argc, char **argv)
continue;
if (((*argc) + 1) > MAX_INPUT_FIELDS) { /* bogus input line */
exit_code = 1;
- fprintf (stderr,
+ fprintf (stderr,
"%s: can not process over %d words\n",
command_name, input_words);
return E2BIG;
- }
+ }
argv[(*argc)++] = &in_line[i];
for (i++; i < in_line_size; i++) {
if (in_line[i] == '\042') {
@@ -424,9 +424,9 @@ _get_command (int *argc, char **argv)
in_line[i] = '\0';
break;
}
- }
+ }
}
- return 0;
+ return 0;
}
@@ -436,7 +436,7 @@ static void _print_version(void)
if (quiet_flag == -1) {
long version = slurm_api_version();
printf("slurm_api_version: %ld, %ld.%ld.%ld\n", version,
- SLURM_VERSION_MAJOR(version),
+ SLURM_VERSION_MAJOR(version),
SLURM_VERSION_MINOR(version),
SLURM_VERSION_MICRO(version));
}
@@ -449,7 +449,7 @@ static void _print_version(void)
* RET 0 or errno (only for errors fatal to sreport)
*/
static int
-_process_command (int argc, char *argv[])
+_process_command (int argc, char *argv[])
{
int command_len = 0;
@@ -459,32 +459,32 @@ _process_command (int argc, char *argv[])
fprintf(stderr, "no input");
return 0;
}
-
+
command_len = strlen(argv[0]);
if ((strncasecmp (argv[0], "association", MAX(command_len, 1)) == 0)) {
if (argc < 2) {
exit_code = 1;
if (quiet_flag != 1)
- fprintf(stderr,
- "too few arguments for keyword:%s\n",
+ fprintf(stderr,
+ "too few arguments for keyword:%s\n",
argv[0]);
- } else
+ } else
_assoc_rep((argc - 1), &argv[1]);
} else if ((strncasecmp (argv[0], "cluster",
MAX(command_len, 2)) == 0)) {
if (argc < 2) {
exit_code = 1;
if (quiet_flag != 1)
- fprintf(stderr,
- "too few arguments for keyword:%s\n",
+ fprintf(stderr,
+ "too few arguments for keyword:%s\n",
argv[0]);
- } else
+ } else
_cluster_rep((argc - 1), &argv[1]);
} else if (strncasecmp (argv[0], "help", MAX(command_len, 2)) == 0) {
if (argc > 1) {
exit_code = 1;
- fprintf (stderr,
+ fprintf (stderr,
"too many arguments for keyword:%s\n",
argv[0]);
}
@@ -493,10 +493,10 @@ _process_command (int argc, char *argv[])
if (argc < 2) {
exit_code = 1;
if (quiet_flag != 1)
- fprintf(stderr,
- "too few arguments for keyword:%s\n",
+ fprintf(stderr,
+ "too few arguments for keyword:%s\n",
argv[0]);
- } else
+ } else
_job_rep((argc - 1), &argv[1]);
} else if (strncasecmp (argv[0], "quiet", MAX(command_len, 4)) == 0) {
if (argc > 1) {
@@ -510,8 +510,8 @@ _process_command (int argc, char *argv[])
(strncasecmp (argv[0], "quit", MAX(command_len, 4)) == 0)) {
if (argc > 1) {
exit_code = 1;
- fprintf (stderr,
- "too many arguments for keyword:%s\n",
+ fprintf (stderr,
+ "too many arguments for keyword:%s\n",
argv[0]);
}
exit_flag = 1;
@@ -522,10 +522,10 @@ _process_command (int argc, char *argv[])
if (argc < 2) {
exit_code = 1;
if (quiet_flag != 1)
- fprintf(stderr,
- "too few arguments for keyword:%s\n",
+ fprintf(stderr,
+ "too few arguments for keyword:%s\n",
argv[0]);
- } else
+ } else
_resv_rep((argc - 1), &argv[1]);
} else if (strncasecmp (argv[0], "sort", MAX(command_len, 1)) == 0) {
if (argc < 2) {
@@ -533,7 +533,7 @@ _process_command (int argc, char *argv[])
fprintf (stderr,
"too few arguments for keyword:%s\n",
argv[0]);
- } else
+ } else
_set_sort(argv[1]);
} else if (strncasecmp (argv[0], "time", MAX(command_len, 1)) == 0) {
if (argc < 2) {
@@ -541,7 +541,7 @@ _process_command (int argc, char *argv[])
fprintf (stderr,
"too few arguments for keyword:%s\n",
argv[0]);
- } else
+ } else
_set_time_format(argv[1]);
} else if (strncasecmp (argv[0], "verbose", MAX(command_len, 4)) == 0) {
if (argc > 1) {
@@ -549,7 +549,7 @@ _process_command (int argc, char *argv[])
fprintf (stderr,
"too many arguments for %s keyword\n",
argv[0]);
- }
+ }
quiet_flag = -1;
} else if (strncasecmp (argv[0], "version", MAX(command_len, 4)) == 0) {
if (argc > 1) {
@@ -557,22 +557,22 @@ _process_command (int argc, char *argv[])
fprintf (stderr,
"too many arguments for %s keyword\n",
argv[0]);
- }
+ }
_print_version();
} else if ((strncasecmp (argv[0], "user", MAX(command_len, 1)) == 0)) {
if (argc < 2) {
exit_code = 1;
if (quiet_flag != 1)
- fprintf(stderr,
- "too few arguments for keyword:%s\n",
+ fprintf(stderr,
+ "too few arguments for keyword:%s\n",
argv[0]);
- } else
+ } else
_user_rep((argc - 1), &argv[1]);
} else {
exit_code = 1;
fprintf (stderr, "invalid keyword: %s\n", argv[0]);
}
-
+
return 0;
}
@@ -602,7 +602,7 @@ static int _set_time_format(char *format)
time_format = SREPORT_TIME_PERCENT;
time_format_string = "Percentage of Total";
} else {
- fprintf (stderr, "unknown time format %s", format);
+ fprintf (stderr, "unknown time format %s", format);
return SLURM_ERROR;
}
@@ -618,7 +618,7 @@ static int _set_sort(char *format)
} else if (strncasecmp (format, "Time", MAX(command_len, 6)) == 0) {
sort_flag = SREPORT_SORT_TIME;
} else {
- fprintf (stderr, "unknown timesort format %s", format);
+ fprintf (stderr, "unknown timesort format %s", format);
return SLURM_ERROR;
}
@@ -788,6 +788,6 @@ sreport [<OPTION>] [<COMMAND>] \n\
\n\
\n\
All commands and options are case-insensitive. \n\n");
-
+
}
diff --git a/src/sreport/sreport.h b/src/sreport/sreport.h
index 656f101765be5039e01f68a377abf5bca2fb608a..89e930487b9b8e0727c7e8d5368d5033b3fb0ff8 100644
--- a/src/sreport/sreport.h
+++ b/src/sreport/sreport.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -153,7 +153,7 @@ extern int sort_cluster_dec(sreport_cluster_rec_t *cluster_a,
sreport_cluster_rec_t *cluster_b);
extern int sort_assoc_dec(sreport_assoc_rec_t *assoc_a,
sreport_assoc_rec_t *assoc_b);
-extern int sort_reservations_dec(acct_reservation_rec_t *resv_a,
+extern int sort_reservations_dec(acct_reservation_rec_t *resv_a,
acct_reservation_rec_t *resv_b);
extern int get_uint(char *in_value, uint32_t *out_value, char *type);
diff --git a/src/sreport/user_reports.c b/src/sreport/user_reports.c
index 27d8e77e7cb72b1baaf110b5687cfc5f0a5d045c..44a5ab0ec465a7749f9e55a40c77f5d1c7d55395 100644
--- a/src/sreport/user_reports.c
+++ b/src/sreport/user_reports.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -71,12 +71,12 @@ static int _set_cond(int *start, int argc, char *argv[],
user_cond->with_deleted = 1;
user_cond->with_assocs = 1;
if(!user_cond->assoc_cond) {
- user_cond->assoc_cond =
+ user_cond->assoc_cond =
xmalloc(sizeof(acct_association_cond_t));
user_cond->assoc_cond->with_usage = 1;
}
assoc_cond = user_cond->assoc_cond;
-
+
if(!assoc_cond->cluster_list)
assoc_cond->cluster_list = list_create(slurm_destroy_char);
for (i=(*start); i<argc; i++) {
@@ -86,7 +86,7 @@ static int _set_cond(int *start, int argc, char *argv[],
else
command_len=end-1;
- if(!end && !strncasecmp(argv[i], "all_clusters",
+ if(!end && !strncasecmp(argv[i], "all_clusters",
MAX(command_len, 1))) {
local_cluster_flag = 1;
continue;
@@ -94,10 +94,10 @@ static int _set_cond(int *start, int argc, char *argv[],
MAX(command_len, 1))) {
group_accts = 1;
} else if(!end
- || !strncasecmp (argv[i], "Users",
+ || !strncasecmp (argv[i], "Users",
MAX(command_len, 1))) {
if(!assoc_cond->user_list)
- assoc_cond->user_list =
+ assoc_cond->user_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->user_list,
argv[i]+end);
@@ -118,7 +118,7 @@ static int _set_cond(int *start, int argc, char *argv[],
} else if (!strncasecmp (argv[i], "End", MAX(command_len, 1))) {
assoc_cond->usage_end = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp (argv[i], "Format",
+ } else if (!strncasecmp (argv[i], "Format",
MAX(command_len, 1))) {
if(format_list)
slurm_addto_char_list(format_list, argv[i]+end);
@@ -129,7 +129,7 @@ static int _set_cond(int *start, int argc, char *argv[],
} else if (!strncasecmp (argv[i], "TopCount",
MAX(command_len, 1))) {
if (get_uint(argv[i]+end, &top_limit, "TopCount")
- != SLURM_SUCCESS)
+ != SLURM_SUCCESS)
exit_code = 1;
} else {
exit_code=1;
@@ -166,7 +166,7 @@ static int _setup_print_fields_list(List format_list)
if(!format_list || !list_count(format_list)) {
exit_code=1;
- fprintf(stderr,
+ fprintf(stderr,
" We need a format list to set up the print.\n");
return SLURM_ERROR;
}
@@ -179,11 +179,11 @@ static int _setup_print_fields_list(List format_list)
char *tmp_char = NULL;
int command_len = 0;
int newlen = 0;
-
+
if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
- }
+ }
command_len = strlen(object);
@@ -226,10 +226,10 @@ static int _setup_print_fields_list(List format_list)
continue;
}
- if(newlen)
+ if(newlen)
field->len = newlen;
-
- list_append(print_fields_list, field);
+
+ list_append(print_fields_list, field);
}
list_iterator_destroy(itr);
@@ -267,7 +267,7 @@ extern int user_top(int argc, char *argv[])
user_cond->assoc_cond->without_parent_info = 1;
- if(!list_count(format_list))
+ if(!list_count(format_list))
slurm_addto_char_list(format_list, "Cl,L,P,A,U");
_setup_print_fields_list(format_list);
@@ -312,21 +312,21 @@ extern int user_top(int argc, char *argv[])
list_append(cluster_list, sreport_cluster);
sreport_cluster->name = xstrdup(cluster->name);
- sreport_cluster->user_list =
+ sreport_cluster->user_list =
list_create(destroy_sreport_user_rec);
/* get the amount of time and the average cpu count
during the time we are looking at */
cluster_itr = list_iterator_create(cluster->accounting_list);
while((accting = list_next(cluster_itr))) {
- sreport_cluster->cpu_secs += accting->alloc_secs
- + accting->down_secs + accting->idle_secs
+ sreport_cluster->cpu_secs += accting->alloc_secs
+ + accting->down_secs + accting->idle_secs
+ accting->resv_secs;
sreport_cluster->cpu_count += accting->cpu_count;
}
list_iterator_destroy(cluster_itr);
- sreport_cluster->cpu_count /=
+ sreport_cluster->cpu_count /=
list_count(cluster->accounting_list);
}
list_iterator_destroy(itr);
@@ -342,15 +342,15 @@ extern int user_top(int argc, char *argv[])
slurm_make_time_str(&my_end, end_char, sizeof(end_char));
printf("----------------------------------------"
"----------------------------------------\n");
- printf("Top %u Users %s - %s (%d secs)\n",
- top_limit, start_char, end_char,
- (int)(user_cond->assoc_cond->usage_end
+ printf("Top %u Users %s - %s (%d secs)\n",
+ top_limit, start_char, end_char,
+ (int)(user_cond->assoc_cond->usage_end
- user_cond->assoc_cond->usage_start));
-
+
switch(time_format) {
case SREPORT_TIME_PERCENT:
printf("Time reported in %s\n", time_format_string);
- break;
+ break;
default:
printf("Time reported in CPU %s\n", time_format_string);
break;
@@ -365,22 +365,22 @@ extern int user_top(int argc, char *argv[])
struct passwd *passwd_ptr = NULL;
if(!user->assoc_list || !list_count(user->assoc_list))
continue;
-
+
passwd_ptr = getpwnam(user->name);
- if(passwd_ptr)
+ if(passwd_ptr)
user->uid = passwd_ptr->pw_uid;
else
- user->uid = (uint32_t)NO_VAL;
-
+ user->uid = (uint32_t)NO_VAL;
+
itr2 = list_iterator_create(user->assoc_list);
while((assoc = list_next(itr2))) {
if(!assoc->accounting_list
|| !list_count(assoc->accounting_list))
continue;
-
+
while((sreport_cluster = list_next(cluster_itr))) {
- if(!strcmp(sreport_cluster->name,
+ if(!strcmp(sreport_cluster->name,
assoc->cluster)) {
ListIterator user_itr = NULL;
if(!group_accts) {
@@ -388,20 +388,20 @@ extern int user_top(int argc, char *argv[])
goto new_user;
}
user_itr = list_iterator_create
- (sreport_cluster->user_list);
- while((sreport_user
+ (sreport_cluster->user_list);
+ while((sreport_user
= list_next(user_itr))) {
- if(sreport_user->uid
+ if(sreport_user->uid
!= NO_VAL) {
- if(sreport_user->uid
+ if(sreport_user->uid
== user->uid)
break;
- } else if(sreport_user->name
+ } else if(sreport_user->name
&& !strcasecmp(
sreport_user->
name,
user->name))
- break;
+ break;
}
list_iterator_destroy(user_itr);
new_user:
@@ -417,7 +417,7 @@ extern int user_top(int argc, char *argv[])
list_create
(slurm_destroy_char);
list_append(sreport_cluster->
- user_list,
+ user_list,
sreport_user);
}
break;
@@ -427,20 +427,20 @@ extern int user_top(int argc, char *argv[])
error("This cluster '%s' hasn't "
"registered yet, but we have jobs "
"that ran?", assoc->cluster);
- sreport_cluster =
+ sreport_cluster =
xmalloc(sizeof(sreport_cluster_rec_t));
list_append(cluster_list, sreport_cluster);
sreport_cluster->name = xstrdup(assoc->cluster);
- sreport_cluster->user_list =
+ sreport_cluster->user_list =
list_create(destroy_sreport_user_rec);
- sreport_user =
+ sreport_user =
xmalloc(sizeof(sreport_user_rec_t));
sreport_user->name = xstrdup(assoc->user);
sreport_user->uid = user->uid;
- sreport_user->acct_list =
+ sreport_user->acct_list =
list_create(slurm_destroy_char);
- list_append(sreport_cluster->user_list,
+ list_append(sreport_cluster->user_list,
sreport_user);
}
list_iterator_reset(cluster_itr);
@@ -453,11 +453,11 @@ extern int user_top(int argc, char *argv[])
list_iterator_destroy(itr3);
if(!object)
- list_append(sreport_user->acct_list,
+ list_append(sreport_user->acct_list,
xstrdup(assoc->acct));
itr3 = list_iterator_create(assoc->accounting_list);
while((assoc_acct = list_next(itr3))) {
- sreport_user->cpu_secs +=
+ sreport_user->cpu_secs +=
(uint64_t)assoc_acct->alloc_secs;
/* sreport_cluster->cpu_secs += */
/* (uint64_t)assoc_acct->alloc_secs; */
@@ -465,7 +465,7 @@ extern int user_top(int argc, char *argv[])
list_iterator_destroy(itr3);
}
list_iterator_destroy(itr2);
- }
+ }
list_iterator_destroy(itr);
itr2 = list_iterator_create(print_fields_list);
@@ -477,7 +477,7 @@ extern int user_top(int argc, char *argv[])
while((sreport_cluster = list_next(cluster_itr))) {
int count = 0;
list_sort(sreport_cluster->user_list, (ListCmpF)sort_user_dec);
-
+
itr = list_iterator_create(sreport_cluster->user_list);
while((sreport_user = list_next(itr))) {
int curr_inx = 1;
@@ -513,7 +513,7 @@ extern int user_top(int argc, char *argv[])
case PRINT_USER_LOGIN:
field->print_routine(field,
sreport_user->name,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_USER_PROPER:
@@ -522,12 +522,12 @@ extern int user_top(int argc, char *argv[])
tmp_char = strtok(pwd->pw_gecos,
",");
if(!tmp_char)
- tmp_char =
+ tmp_char =
pwd->pw_gecos;
}
field->print_routine(field,
tmp_char,
- (curr_inx ==
+ (curr_inx ==
field_count));
break;
case PRINT_USER_USED:
@@ -560,17 +560,17 @@ end_it:
*/
group_accts = 0;
destroy_acct_user_cond(user_cond);
-
+
if(user_list) {
list_destroy(user_list);
user_list = NULL;
}
-
+
if(cluster_list) {
list_destroy(cluster_list);
cluster_list = NULL;
}
-
+
if(print_fields_list) {
list_destroy(print_fields_list);
print_fields_list = NULL;
diff --git a/src/sreport/user_reports.h b/src/sreport/user_reports.h
index a4288780a518c7f05f244b35ec30dbe25f950530..1ccd7ddab1bd0ae106e5e91f2cd047a751e2ba50 100644
--- a/src/sreport/user_reports.h
+++ b/src/sreport/user_reports.h
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/srun/Makefile.am b/src/srun/Makefile.am
index 7a39a597db930be893e54e8d92bd440bf651ad7c..73a9cc2f6e620e4494951abed949691aae773c2d 100644
--- a/src/srun/Makefile.am
+++ b/src/srun/Makefile.am
@@ -28,7 +28,7 @@ convenience_libs = \
$(top_builddir)/src/api/libslurm.o -ldl
srun_LDADD = \
- $(convenience_libs)
+ $(convenience_libs)
srun_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
@@ -36,10 +36,10 @@ force:
$(convenience_libs) : force
@cd `dirname $@` && $(MAKE) `basename $@`
-# debugging information is required for symbols in the debugger
+# debugging information is required for symbols in the debugger
# module so that a debugger can debugger to spawned tasks
debugger.o : debugger.c
- $(COMPILE) -c -g -o debugger.o $(srcdir)/debugger.c
+ $(COMPILE) -c -g -o debugger.o $(srcdir)/debugger.c
install-exec-local:
umask 022; \
diff --git a/src/srun/Makefile.in b/src/srun/Makefile.in
index 4aed635515ca75be24c76bc536c66a37fd253db6..9b771ffda5a80cce7e049793dea7f3410e4dd700 100644
--- a/src/srun/Makefile.in
+++ b/src/srun/Makefile.in
@@ -318,7 +318,7 @@ convenience_libs = \
$(top_builddir)/src/api/libslurm.o -ldl
srun_LDADD = \
- $(convenience_libs)
+ $(convenience_libs)
srun_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
all: all-am
@@ -653,10 +653,10 @@ force:
$(convenience_libs) : force
@cd `dirname $@` && $(MAKE) `basename $@`
-# debugging information is required for symbols in the debugger
+# debugging information is required for symbols in the debugger
# module so that a debugger can debugger to spawned tasks
debugger.o : debugger.c
- $(COMPILE) -c -g -o debugger.o $(srcdir)/debugger.c
+ $(COMPILE) -c -g -o debugger.o $(srcdir)/debugger.c
install-exec-local:
umask 022; \
diff --git a/src/srun/allocate.c b/src/srun/allocate.c
index 75d99e6f99f5d2574aff71ad68d20eef6dbf6489..d581f378367604967d2917f12ef4e84a3cf2308d 100644
--- a/src/srun/allocate.c
+++ b/src/srun/allocate.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -139,11 +139,11 @@ static void _job_complete_handler(srun_job_complete_msg_t *msg)
}
/*
- * Job has been notified of it's approaching time limit.
+ * Job has been notified of it's approaching time limit.
* Job will be killed shortly after timeout.
* This RPC can arrive multiple times with the same or updated timeouts.
* FIXME: We may want to signal the job or perform other action for this.
- * FIXME: How much lead time do we want for this message? Some jobs may
+ * FIXME: How much lead time do we want for this message? Some jobs may
* require tens of minutes to gracefully terminate.
*/
static void _timeout_handler(srun_timeout_msg_t *msg)
@@ -152,7 +152,7 @@ static void _timeout_handler(srun_timeout_msg_t *msg)
if (msg->timeout != last_timeout) {
last_timeout = msg->timeout;
- verbose("job time limit to be reached at %s",
+ verbose("job time limit to be reached at %s",
ctime(&msg->timeout));
}
}
@@ -162,7 +162,7 @@ static void _user_msg_handler(srun_user_msg_t *msg)
info("%s", msg->msg);
}
-static void _ping_handler(srun_ping_msg_t *msg)
+static void _ping_handler(srun_ping_msg_t *msg)
{
/* the api will respond so there really isn't anything to do
here */
@@ -192,13 +192,13 @@ static bool _retry(void)
} else if (errno == EINTR) {
/* srun may be interrupted by the BLCR checkpoint signal */
/*
- * XXX: this will cause the old job cancelled and a new
+ * XXX: this will cause the old job cancelled and a new
* job allocated
*/
debug("Syscall interrupted while allocating resources, "
"retrying.");
return true;
- } else if (opt.immediate &&
+ } else if (opt.immediate &&
((errno == ETIMEDOUT) || (errno == ESLURM_NODES_BUSY))) {
error("Unable to allocate resources: %s",
slurm_strerror(ESLURM_NODES_BUSY));
@@ -243,7 +243,7 @@ static int _wait_bluegene_block_ready(resource_allocation_response_msg_t *alloc)
if (i) {
sleep(POLL_SLEEP);
rc = _blocks_dealloc();
- if ((rc == 0) || (rc == -1))
+ if ((rc == 0) || (rc == -1))
cur_delay += POLL_SLEEP;
debug2("still waiting");
}
@@ -287,9 +287,9 @@ static int _blocks_dealloc(void)
{
static block_info_msg_t *bg_info_ptr = NULL, *new_bg_ptr = NULL;
int rc = 0, error_code = 0, i;
-
+
if (bg_info_ptr) {
- error_code = slurm_load_block_info(bg_info_ptr->last_update,
+ error_code = slurm_load_block_info(bg_info_ptr->last_update,
&new_bg_ptr);
if (error_code == SLURM_SUCCESS)
slurm_free_block_info_msg(&bg_info_ptr);
@@ -307,7 +307,7 @@ static int _blocks_dealloc(void)
return -1;
}
for (i=0; i<new_bg_ptr->record_count; i++) {
- if(new_bg_ptr->block_array[i].state
+ if(new_bg_ptr->block_array[i].state
== RM_PARTITION_DEALLOCATING) {
rc = 1;
break;
@@ -344,7 +344,7 @@ allocate_test(void)
job_desc_msg_t *j = job_desc_msg_create_from_opts();
if(!j)
return SLURM_ERROR;
-
+
rc = slurm_job_will_run(j);
job_desc_msg_destroy(j);
return rc;
@@ -359,7 +359,7 @@ allocate_nodes(void)
if (!j)
return NULL;
-
+
/* Do not re-use existing job id when submitting new job
* from within a running job */
if ((j->job_id != NO_VAL) && !opt.jobid_set) {
@@ -394,10 +394,10 @@ allocate_nodes(void)
/* cancelled by signal */
break;
} else if(!resp && !_retry()) {
- break;
+ break;
}
}
-
+
if (resp && !destroy_job) {
/*
* Allocation granted!
@@ -449,7 +449,7 @@ ignore_signal(int signo)
/* do nothing */
}
-int
+int
cleanup_allocation()
{
slurm_allocation_msg_thr_destroy(msg_thr);
@@ -525,9 +525,9 @@ job_desc_msg_create_from_opts ()
job_desc_msg_t *j = xmalloc(sizeof(*j));
char buf[8192];
hostlist_t hl = NULL;
-
+
slurm_init_job_desc_msg(j);
-
+
j->contiguous = opt.contiguous;
j->features = opt.constraints;
if (opt.immediate == 1)
@@ -538,10 +538,10 @@ job_desc_msg_create_from_opts ()
j->name = xstrdup(opt.cmd_name);
j->reservation = xstrdup(opt.reservation);
j->wckey = xstrdup(opt.wckey);
-
+
j->req_nodes = xstrdup(opt.nodelist);
-
- /* simplify the job allocation nodelist,
+
+ /* simplify the job allocation nodelist,
* not laying out tasks until step */
if(j->req_nodes) {
hl = hostlist_create(j->req_nodes);
@@ -555,7 +555,7 @@ job_desc_msg_create_from_opts ()
xfree(j->req_nodes);
j->req_nodes = xstrdup(buf);
}
-
+
if(opt.distribution == SLURM_DIST_ARBITRARY
&& !j->req_nodes) {
error("With Arbitrary distribution you need to "
@@ -627,7 +627,7 @@ job_desc_msg_create_from_opts ()
if (opt.conn_type != (uint16_t) NO_VAL)
j->conn_type = opt.conn_type;
-
+
if (opt.reboot)
j->reboot = 1;
if (opt.no_rotate)
@@ -729,7 +729,7 @@ create_job_step(srun_job_t *job, bool use_all_cpus)
job->ctx_params.cpu_count = job->ctx_params.node_count;
else
job->ctx_params.cpu_count = opt.nprocs*opt.cpus_per_task;
-
+
job->ctx_params.relative = (uint16_t)opt.relative;
job->ctx_params.ckpt_interval = (uint16_t)opt.ckpt_interval;
job->ctx_params.ckpt_dir = opt.ckpt_dir;
@@ -757,8 +757,8 @@ create_job_step(srun_job_t *job, bool use_all_cpus)
job->ctx_params.plane_size = opt.plane_size;
break;
default:
- job->ctx_params.task_dist = (job->ctx_params.task_count <=
- job->ctx_params.node_count)
+ job->ctx_params.task_dist = (job->ctx_params.task_count <=
+ job->ctx_params.node_count)
? SLURM_DIST_CYCLIC : SLURM_DIST_BLOCK;
opt.distribution = job->ctx_params.task_dist;
break;
@@ -767,18 +767,18 @@ create_job_step(srun_job_t *job, bool use_all_cpus)
job->ctx_params.overcommit = opt.overcommit ? 1 : 0;
job->ctx_params.node_list = opt.nodelist;
-
+
job->ctx_params.network = opt.network;
job->ctx_params.no_kill = opt.no_kill;
if (opt.job_name_set_cmd && opt.job_name)
job->ctx_params.name = opt.job_name;
else
job->ctx_params.name = opt.cmd_name;
-
- debug("requesting job %u, user %u, nodes %u including (%s)",
+
+ debug("requesting job %u, user %u, nodes %u including (%s)",
job->ctx_params.job_id, job->ctx_params.uid,
job->ctx_params.node_count, job->ctx_params.node_list);
- debug("cpus %u, tasks %u, name %s, relative %u",
+ debug("cpus %u, tasks %u, name %s, relative %u",
job->ctx_params.cpu_count, job->ctx_params.task_count,
job->ctx_params.name, job->ctx_params.relative);
begin_time = time(NULL);
@@ -793,21 +793,21 @@ create_job_step(srun_job_t *job, bool use_all_cpus)
if (job->step_ctx != NULL) {
if (i > 0)
info("Job step created");
-
+
break;
}
rc = slurm_get_errno();
- if (((opt.immediate != 0) &&
+ if (((opt.immediate != 0) &&
((opt.immediate == 1) ||
(difftime(time(NULL), begin_time) > opt.immediate))) ||
((rc != ESLURM_NODES_BUSY) && (rc != ESLURM_PORTS_BUSY) &&
- (rc != ESLURM_PROLOG_RUNNING) &&
+ (rc != ESLURM_PROLOG_RUNNING) &&
(rc != ESLURM_DISABLED))) {
error ("Unable to create job step: %m");
return -1;
}
-
+
if (i == 0) {
info("Job step creation temporarily disabled, "
"retrying");
@@ -833,13 +833,13 @@ create_job_step(srun_job_t *job, bool use_all_cpus)
}
slurm_step_ctx_get(job->step_ctx, SLURM_STEP_CTX_STEPID, &job->stepid);
- /* Number of hosts in job may not have been initialized yet if
+ /* Number of hosts in job may not have been initialized yet if
* --jobid was used or only SLURM_JOB_ID was set in user env.
* Reset the value here just in case.
*/
slurm_step_ctx_get(job->step_ctx, SLURM_STEP_CTX_NUM_HOSTS,
&job->nhosts);
-
+
/*
* Recreate filenames which may depend upon step id
*/
diff --git a/src/srun/allocate.h b/src/srun/allocate.h
index 79da6884450d1ee48cfe5da3f284600d89ccc039..d11d232be309ed3ba756cf7d564373e1a938de9b 100644
--- a/src/srun/allocate.h
+++ b/src/srun/allocate.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -50,7 +50,7 @@ typedef struct slurmctld_communication_addr {
slurmctld_comm_addr_t slurmctld_comm_addr;
-/*
+/*
* Allocate nodes from the slurm controller -- retrying the attempt
* if the controller appears to be down, and optionally waiting for
* resources if none are currently available (see opt.immediate)
@@ -82,7 +82,7 @@ slurm_fd slurmctld_msg_init(void);
*/
job_desc_msg_t * job_desc_msg_create_from_opts ();
-/*
+/*
* Destroy (free memory from) a job_desc_msg_t object allocated with
* job_desc_msg_create()
*/
diff --git a/src/srun/core-format.c b/src/srun/core-format.c
index 4d61f9eddf5fa888aa1f1d7b25c4917d368c5c1a..6d0f89590f7321053e366cbfa2bde7876e6f5f41 100644
--- a/src/srun/core-format.c
+++ b/src/srun/core-format.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -48,7 +48,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-//#include "src/common/env.h"
+//#include "src/common/env.h"
#include "src/srun/core-format.h"
#include "src/common/log.h"
#include "src/common/env.h"
@@ -70,7 +70,7 @@ struct core_format_info {
*/
struct core_format_info core_types[] = {
{ CORE_NORMAL,
- "normal",
+ "normal",
"Default full corefile (do nothing)"
},
{ CORE_LIGHT,
@@ -81,7 +81,7 @@ struct core_format_info core_types[] = {
"lcb",
"liblwcf Lightweight Corefile Browser compliant"
},
- { CORE_LIST,
+ { CORE_LIST,
"list",
"list valid core format types"
},
@@ -117,7 +117,7 @@ static void _print_valid_core_types (void)
(stat("/usr/local/lib/" LIB_LIGHT, &buf) < 0))
continue;
}
- if (ci->type != CORE_LIST)
+ if (ci->type != CORE_LIST)
info (" %-8s -- %s", ci->name, ci->descr);
}
return;
diff --git a/src/srun/core-format.h b/src/srun/core-format.h
index bdafdeaf8408a853455c650bc79e9f22b89454f6..4158d40dc0eb33df0ded365142cb8a4954a3f99a 100644
--- a/src/srun/core-format.h
+++ b/src/srun/core-format.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
diff --git a/src/srun/debugger.c b/src/srun/debugger.c
index 77adfd68eb8b43226167826e4107917d9afb9055..485795b5d3bc08cd89f9887d981a7ac3a1b8f7a4 100644
--- a/src/srun/debugger.c
+++ b/src/srun/debugger.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <grondona1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -59,10 +59,10 @@ char *totalview_jobid;
void MPIR_Breakpoint(void)
{
- /*
- * This just notifies parallel debugger that some event of
+ /*
+ * This just notifies parallel debugger that some event of
* interest occurred.
- */
+ */
debug("In MPIR_Breakpoint");
}
diff --git a/src/srun/debugger.h b/src/srun/debugger.h
index d401d6851d1c73c0ab29640e0552cb46faf23ec3..663653a3a1016a7c1488d2f9a9f91192eda15a38 100644
--- a/src/srun/debugger.h
+++ b/src/srun/debugger.h
@@ -1,8 +1,8 @@
/****************************************************************************\
* debugger.h - definitions needed for TotalView interactions
*****************************************************************************
- * This file was supplied by James Cownie <jcownie@etnus.com> and provides
- * information required to interface Slurm to the TotalView debugger from
+ * This file was supplied by James Cownie <jcownie@etnus.com> and provides
+ * information required to interface Slurm to the TotalView debugger from
* the Etnus Corporation. For more information about TotalView, see
* http://www.etnus.com/
\*****************************************************************************/
@@ -51,7 +51,7 @@
#ifdef HAVE_BG_FILES
/* On bluegene systems the below structure is defined here. So as to
* not confict with allocate.c including this file we will just use the
- * definition there instead of defining it here.
+ * definition there instead of defining it here.
*/
# include "src/plugins/select/bluegene/wrap_rm_api.h"
#else
@@ -66,7 +66,7 @@ typedef struct {
extern MPIR_PROCDESC *MPIR_proctable;
extern int MPIR_proctable_size;
-/* Various global variables which a debugger can use for
+/* Various global variables which a debugger can use for
* 1) finding out what the state of the program is at
* the time the magic breakpoint is hit.
* 2) inform the process that it has been attached to and is
@@ -77,9 +77,9 @@ extern VOLATILE int MPIR_debug_gate;
extern int MPIR_being_debugged; /* Cause extra info on internal state
* to be maintained
*/
-
+
/* Values for the debug_state, this seems to be all we need at the moment
- * but that may change...
+ * but that may change...
*/
#define MPIR_DEBUG_SPAWNED 1
#define MPIR_DEBUG_ABORTING 2
@@ -92,6 +92,6 @@ extern void MPIR_Breakpoint(void);
/* Value for totalview %J expansion in bulk launch string
*/
-extern char *totalview_jobid;
+extern char *totalview_jobid;
#endif
diff --git a/src/srun/fname.c b/src/srun/fname.c
index 47e6ecc5a83ab57f81256275ad59b0c675072aad..582b564db047a9b81359fe5b97971c45ba5b7aa1 100644
--- a/src/srun/fname.c
+++ b/src/srun/fname.c
@@ -15,15 +15,15 @@
* 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
+ * 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
+ * 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
@@ -55,7 +55,7 @@
#include "src/common/xstring.h"
#include "src/common/xassert.h"
-/*
+/*
* Max zero-padding width allowed
*/
#define MAX_WIDTH 10
@@ -89,11 +89,11 @@ fname_create(srun_job_t *job, char *format)
}
if (strncasecmp(format, "none", (size_t) 4) == 0) {
- /*
+ /*
* Set type to IO_PER_TASK so that /dev/null is opened
* on every node, which should be more efficient
*/
- fname->type = IO_PER_TASK;
+ fname->type = IO_PER_TASK;
fname->name = xstrdup ("/dev/null");
return fname;
}
@@ -140,7 +140,7 @@ fname_create(srun_job_t *job, char *format)
xmemcat(name, q, p - 1);
xstrfmtcat(name, "%0*d", wid, job->jobid);
- if ((*p == 'J') && (job->stepid != NO_VAL))
+ if ((*p == 'J') && (job->stepid != NO_VAL))
xstrfmtcat(name, ".%d", job->stepid);
q = ++p;
break;
@@ -159,14 +159,14 @@ fname_create(srun_job_t *job, char *format)
p++;
}
- if (q != p)
+ if (q != p)
xmemcat(name, q, p);
fname->name = name;
return fname;
}
-void
+void
fname_destroy(fname_t *f)
{
if (f->name)
@@ -174,7 +174,7 @@ fname_destroy(fname_t *f)
xfree(f);
}
-char *
+char *
fname_remote_string (fname_t *f)
{
if ((f->type == IO_PER_TASK) || (f->type == IO_ONE))
diff --git a/src/srun/fname.h b/src/srun/fname.h
index 574fb6852596e971b6e8b11dbf4d8f5a283ed7fa..0d0023d67983beb173231863f978cf17f331f9be 100644
--- a/src/srun/fname.h
+++ b/src/srun/fname.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -41,14 +41,14 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
-#endif
+#endif
#include "src/srun/srun_job.h"
/*
* Create an filename from a (probably user supplied) filename format.
* fname_create() will expand the format as much as possible for srun,
- * leaving node or task specific format specifiers for the remote
+ * leaving node or task specific format specifiers for the remote
* slurmd to handle.
*/
diff --git a/src/srun/multi_prog.c b/src/srun/multi_prog.c
index 693d5d580006f9eedc626a486ba31f344d2371a2..11330193aa350523230b8c0971023a335e3a6678 100644
--- a/src/srun/multi_prog.c
+++ b/src/srun/multi_prog.c
@@ -2,7 +2,7 @@
* multi_prog.c - executing program according to task rank
* set MPIR_PROCDESC accordingly
*
- * NOTE: The logic could be eliminated if slurmstepd kept track of the
+ * NOTE: The logic could be eliminated if slurmstepd kept track of the
* executable name for each task and returned that inforatmion in a new
* launch response message (with multiple executable names).
*****************************************************************************
@@ -22,15 +22,15 @@
* 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
+ * 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
+ * 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
+ * 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
@@ -155,7 +155,7 @@ _set_exec_names(char *ranks, char *exec_name, int ntasks)
low_num = MAX(0, num);
num = strtol(ptrptr+1, &ptrptr, 10);
if ((ptrptr[0] != ',') && (ptrptr[0] != '\0'))
- goto invalid;
+ goto invalid;
high_num = MIN((ntasks-1), num);
_set_range(low_num, high_num, exec_path);
} else
@@ -193,15 +193,15 @@ mpir_set_multi_name(int ntasks, const char *config_fname)
while (fgets(line, sizeof(line), config_fd)) {
line_num ++;
if (strlen (line) >= (sizeof(line) - 1)) {
- error ("Line %d of configuration file %s too long",
+ error ("Line %d of configuration file %s too long",
line_num, config_fname);
fclose(config_fd);
return -1;
- }
+ }
p = line;
while (*p != '\0' && isspace (*p)) /* remove leading spaces */
p ++;
-
+
if (*p == '#') /* only whole-line comments handled */
continue;
@@ -211,7 +211,7 @@ mpir_set_multi_name(int ntasks, const char *config_fname)
ranks = strtok_r(p, " \t\n", &ptrptr);
exec_name = strtok_r(NULL, " \t\n", &ptrptr);
if (!ranks || !exec_name) {
- error("Line %d of configuration file %s is invalid",
+ error("Line %d of configuration file %s is invalid",
line_num, config_fname);
fclose(config_fd);
return -1;
@@ -376,15 +376,15 @@ verify_multi_name(char *config_fname, int ntasks)
while (fgets(line, sizeof(line), config_fd)) {
line_num ++;
if (strlen (line) >= (sizeof(line) - 1)) {
- error ("Line %d of configuration file %s too long",
+ error ("Line %d of configuration file %s too long",
line_num, config_fname);
rc = -1;
goto fini;
- }
+ }
p = line;
while (*p != '\0' && isspace (*p)) /* remove leading spaces */
p ++;
-
+
if (*p == '#') /* only whole-line comments handled */
continue;
@@ -394,13 +394,13 @@ verify_multi_name(char *config_fname, int ntasks)
ranks = strtok_r(p, " \t\n", &ptrptr);
exec_name = strtok_r(NULL, " \t\n", &ptrptr);
if (!ranks || !exec_name) {
- error("Line %d of configuration file %s invalid",
+ error("Line %d of configuration file %s invalid",
line_num, config_fname);
rc = -1;
goto fini;
}
if (_validate_ranks(ranks, ntasks, task_mask)) {
- error("Line %d of configuration file %s invalid",
+ error("Line %d of configuration file %s invalid",
line_num, config_fname);
rc = -1;
goto fini;
@@ -410,7 +410,7 @@ verify_multi_name(char *config_fname, int ntasks)
for (i=0; i<ntasks; i++) {
if (!bit_test(task_mask, i)) {
error("Configuration file %s invalid, "
- "no record for task id %d",
+ "no record for task id %d",
config_fname, i);
rc = -1;
goto fini;
diff --git a/src/srun/multi_prog.h b/src/srun/multi_prog.h
index 1405a14dad86ab7a900d95507e991d2a85ee521b..14cedbc6b188046fc567f04468d417f98bb9baa5 100644
--- a/src/srun/multi_prog.h
+++ b/src/srun/multi_prog.h
@@ -18,15 +18,15 @@
* 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
+ * 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
+ * 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
+ * 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
@@ -41,7 +41,7 @@
#ifndef _SRUN_MULTI_PROG_H
#define _SRUN_MULTI_PROG_H
-/* set global MPIR_PROCDESC executable names based upon multi-program
+/* set global MPIR_PROCDESC executable names based upon multi-program
* configuration file */
extern int mpir_set_multi_name(int ntasks, const char *config_fname);
extern void mpir_init(int num_tasks);
diff --git a/src/srun/opt.c b/src/srun/opt.c
index 6fc768bcea345c64cf9c3ec95daced50815bd9f1..3abfedb79bf0d6d4e54585147475e4417215e599 100644
--- a/src/srun/opt.c
+++ b/src/srun/opt.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <grondona1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -246,7 +246,7 @@ int initialize_and_process_args(int argc, char *argv[])
}
/*
- * If the node list supplied is a file name, translate that into
+ * If the node list supplied is a file name, translate that into
* a list of nodes, we orphan the data pointed to
* RET true if the node list is a valid one
*/
@@ -256,9 +256,9 @@ static bool _valid_node_list(char **node_list_pptr)
/* If we are using Arbitrary and we specified the number of
procs to use then we need exactly this many since we are
- saying, lay it out this way! Same for max and min nodes.
+ saying, lay it out this way! Same for max and min nodes.
Other than that just read in as many in the hostfile */
- if(opt.nprocs_set)
+ if(opt.nprocs_set)
count = opt.nprocs;
else if(opt.nodes_set) {
if(opt.max_nodes)
@@ -319,7 +319,7 @@ static void _opt_default()
opt.nprocs = 1;
opt.nprocs_set = false;
- opt.cpus_per_task = 1;
+ opt.cpus_per_task = 1;
opt.cpus_set = false;
opt.min_nodes = 1;
opt.max_nodes = 0;
@@ -327,8 +327,8 @@ static void _opt_default()
opt.min_cores_per_socket = NO_VAL; /* requested min cores */
opt.min_threads_per_core = NO_VAL; /* requested min threads */
opt.ntasks_per_node = NO_VAL; /* ntask max limits */
- opt.ntasks_per_socket = NO_VAL;
- opt.ntasks_per_core = NO_VAL;
+ opt.ntasks_per_socket = NO_VAL;
+ opt.ntasks_per_core = NO_VAL;
opt.nodes_set = false;
opt.cpu_bind_type = 0;
opt.cpu_bind = NULL;
@@ -404,7 +404,7 @@ static void _opt_default()
opt.max_launch_time = 120;/* 120 seconds to launch job */
opt.max_exit_timeout= 60; /* Warn user 60 seconds after task exit */
/* Default launch msg timeout */
- opt.msg_timeout = slurm_get_msg_timeout();
+ opt.msg_timeout = slurm_get_msg_timeout();
for (i=0; i<SYSTEM_DIMENSIONS; i++)
opt.geometry[i] = (uint16_t) NO_VAL;
@@ -418,7 +418,7 @@ static void _opt_default()
opt.euid = (uid_t) -1;
opt.egid = (gid_t) -1;
-
+
opt.propagate = NULL; /* propagate specific rlimits */
opt.prolog = slurm_get_srun_prolog();
@@ -437,7 +437,7 @@ static void _opt_default()
pmi_server_max_threads(opt.max_threads);
opt.msg_timeout = 15;
}
-
+
opt.pty = false;
opt.open_mode = 0;
opt.acctg_freq = -1;
@@ -448,8 +448,8 @@ static void _opt_default()
/*---[ env var processing ]-----------------------------------------------*/
/*
- * try to use a similar scheme as popt.
- *
+ * try to use a similar scheme as popt.
+ *
* in order to add a new env var (to be processed like an option):
*
* define a new entry into env_vars[], if the option is a simple int
@@ -539,7 +539,7 @@ static void _opt_env()
env_vars_t *e = env_vars;
while (e->var) {
- if ((val = getenv(e->var)) != NULL)
+ if ((val = getenv(e->var)) != NULL)
_process_env_var(e, val);
e++;
}
@@ -566,7 +566,7 @@ _process_env_var(env_vars_t *e, const char *val)
if (val != NULL) {
*((int *) e->arg) = (int) strtol(val, &end, 10);
if (!(end && *end == '\0')) {
- error("%s=%s invalid. ignoring...",
+ error("%s=%s invalid. ignoring...",
e->var, val);
}
}
@@ -577,9 +577,9 @@ _process_env_var(env_vars_t *e, const char *val)
break; /* ignore it, passed from salloc */
dt = verify_dist_type(val, &opt.plane_size);
if (dt == SLURM_DIST_UNKNOWN) {
- error("\"%s=%s\" -- invalid distribution type. "
+ error("\"%s=%s\" -- invalid distribution type. "
"ignoring...", e->var, val);
- } else
+ } else
opt.distribution = dt;
break;
@@ -596,8 +596,8 @@ _process_env_var(env_vars_t *e, const char *val)
break;
case OPT_NODES:
- opt.nodes_set = get_resource_arg_range( val ,"OPT_NODES",
- &opt.min_nodes,
+ opt.nodes_set = get_resource_arg_range( val ,"OPT_NODES",
+ &opt.min_nodes,
&opt.max_nodes, false);
if (opt.nodes_set == false) {
error("\"%s=%s\" -- invalid node count. ignoring...",
@@ -633,7 +633,7 @@ _process_env_var(env_vars_t *e, const char *val)
case OPT_CORE:
opt.core_type = core_format_type (val);
break;
-
+
case OPT_CONN_TYPE:
opt.conn_type = verify_conn_type(val);
break;
@@ -666,7 +666,7 @@ _process_env_var(env_vars_t *e, const char *val)
break;
case OPT_SIGNAL:
- if (get_signal_opts(optarg, &opt.warn_signal,
+ if (get_signal_opts(optarg, &opt.warn_signal,
&opt.warn_time)) {
error("Invalid signal specification: %s", optarg);
exit(error_exit);
@@ -683,7 +683,7 @@ _process_env_var(env_vars_t *e, const char *val)
* Get a decimal integer from arg.
*
* Returns the integer on success, exits program on failure.
- *
+ *
*/
static int
_get_int(const char *arg, const char *what, bool positive)
@@ -832,7 +832,7 @@ static void set_options(const int argc, char **argv)
opt.progname = xbasename(argv[0]);
else
error("opt.progname is already set.");
- optind = 0;
+ optind = 0;
while((opt_char = getopt_long(argc, argv, opt_string,
optz, &option_index)) != -1) {
switch (opt_char) {
@@ -871,7 +871,7 @@ static void set_options(const int argc, char **argv)
break;
case (int)'c':
opt.cpus_set = true;
- opt.cpus_per_task =
+ opt.cpus_per_task =
_get_int(optarg, "cpus-per-task", false);
break;
case (int)'C':
@@ -949,28 +949,28 @@ static void set_options(const int argc, char **argv)
opt.licenses = xstrdup(optarg);
break;
case (int)'m':
- opt.distribution = verify_dist_type(optarg,
+ opt.distribution = verify_dist_type(optarg,
&opt.plane_size);
if (opt.distribution == SLURM_DIST_UNKNOWN) {
- error("distribution type `%s' "
+ error("distribution type `%s' "
"is not recognized", optarg);
exit(error_exit);
}
break;
case (int)'n':
opt.nprocs_set = true;
- opt.nprocs =
+ opt.nprocs =
_get_int(optarg, "number of tasks", true);
break;
case (int)'N':
- opt.nodes_set =
- get_resource_arg_range( optarg,
+ opt.nodes_set =
+ get_resource_arg_range( optarg,
"requested node count",
&opt.min_nodes,
&opt.max_nodes, true );
-
+
if (opt.nodes_set == false) {
- error("invalid resource allocation -N `%s'",
+ error("invalid resource allocation -N `%s'",
optarg);
exit(error_exit);
}
@@ -1020,7 +1020,7 @@ static void set_options(const int argc, char **argv)
opt.time_limit_str = xstrdup(optarg);
break;
case (int)'T':
- opt.max_threads =
+ opt.max_threads =
_get_int(optarg, "max_threads", true);
pmi_server_max_threads(opt.max_threads);
break;
@@ -1047,7 +1047,7 @@ static void set_options(const int argc, char **argv)
if (!_valid_node_list(&opt.exc_nodes))
exit(error_exit);
break;
- case (int)'X':
+ case (int)'X':
opt.disable_status = true;
break;
case (int)'Z':
@@ -1085,10 +1085,10 @@ static void set_options(const int argc, char **argv)
case LONG_OPT_MINCORES:
verbose("mincores option has been deprecated, use "
"cores-per-socket");
- opt.min_cores_per_socket = _get_int(optarg,
+ opt.min_cores_per_socket = _get_int(optarg,
"mincores", true);
if (opt.min_cores_per_socket < 0) {
- error("invalid mincores constraint %s",
+ error("invalid mincores constraint %s",
optarg);
exit(error_exit);
}
@@ -1096,10 +1096,10 @@ static void set_options(const int argc, char **argv)
case LONG_OPT_MINSOCKETS:
verbose("minsockets option has been deprecated, use "
"sockets-per-node");
- opt.min_sockets_per_node = _get_int(optarg,
+ opt.min_sockets_per_node = _get_int(optarg,
"minsockets",true);
if (opt.min_sockets_per_node < 0) {
- error("invalid minsockets constraint %s",
+ error("invalid minsockets constraint %s",
optarg);
exit(error_exit);
}
@@ -1107,10 +1107,10 @@ static void set_options(const int argc, char **argv)
case LONG_OPT_MINTHREADS:
verbose("minthreads option has been deprecated, use "
"threads-per-core");
- opt.min_threads_per_core = _get_int(optarg,
+ opt.min_threads_per_core = _get_int(optarg,
"minthreads",true);
if (opt.min_threads_per_core < 0) {
- error("invalid minthreads constraint %s",
+ error("invalid minthreads constraint %s",
optarg);
exit(error_exit);
}
@@ -1118,7 +1118,7 @@ static void set_options(const int argc, char **argv)
case LONG_OPT_MEM:
opt.job_min_memory = (int) str_to_bytes(optarg);
if (opt.job_min_memory < 0) {
- error("invalid memory constraint %s",
+ error("invalid memory constraint %s",
optarg);
exit(error_exit);
}
@@ -1126,7 +1126,7 @@ static void set_options(const int argc, char **argv)
case LONG_OPT_MEM_PER_CPU:
opt.mem_per_cpu = (int) str_to_bytes(optarg);
if (opt.mem_per_cpu < 0) {
- error("invalid memory constraint %s",
+ error("invalid memory constraint %s",
optarg);
exit(error_exit);
}
@@ -1158,15 +1158,15 @@ static void set_options(const int argc, char **argv)
opt.jobid_set = true;
break;
case LONG_OPT_TIMEO:
- opt.msg_timeout =
+ opt.msg_timeout =
_get_int(optarg, "msg-timeout", true);
break;
case LONG_OPT_LAUNCH:
- opt.max_launch_time =
+ opt.max_launch_time =
_get_int(optarg, "max-launch-time", true);
break;
case LONG_OPT_XTO:
- opt.max_exit_timeout =
+ opt.max_exit_timeout =
_get_int(optarg, "max-exit-timeout", true);
break;
case LONG_OPT_UID:
@@ -1195,7 +1195,7 @@ static void set_options(const int argc, char **argv)
break;
case LONG_OPT_DEBUG_TS:
opt.debugger_test = true;
- /* make other parameters look like debugger
+ /* make other parameters look like debugger
* is really attached */
opt.parallel_debug = true;
MPIR_being_debugged = 1;
@@ -1323,7 +1323,7 @@ static void set_options(const int argc, char **argv)
true);
break;
case LONG_OPT_NTASKSPERSOCKET:
- opt.ntasks_per_socket = _get_int(optarg,
+ opt.ntasks_per_socket = _get_int(optarg,
"ntasks-per-socket", true);
break;
case LONG_OPT_NTASKSPERCORE:
@@ -1385,7 +1385,7 @@ static void set_options(const int argc, char **argv)
else if ((optarg[0] == 't') || (optarg[0] == 'T'))
opt.open_mode = OPEN_MODE_TRUNCATE;
else {
- error("Invalid --open-mode argument: %s. Ignored",
+ error("Invalid --open-mode argument: %s. Ignored",
optarg);
}
break;
@@ -1410,7 +1410,7 @@ static void set_options(const int argc, char **argv)
opt.restart_dir = xstrdup(optarg);
break;
case LONG_OPT_SIGNAL:
- if (get_signal_opts(optarg, &opt.warn_signal,
+ if (get_signal_opts(optarg, &opt.warn_signal,
&opt.warn_time)) {
error("Invalid signal specification: %s",
optarg);
@@ -1427,7 +1427,7 @@ static void set_options(const int argc, char **argv)
spank_option_table_destroy (optz);
}
-/* Load the multi_prog config file into argv, pass the entire file contents
+/* Load the multi_prog config file into argv, pass the entire file contents
* in order to avoid having to read the file on every node. We could parse
* the infomration here too for loading the MPIR records for TotalView */
static void _load_multi(int *argc, char **argv)
@@ -1452,10 +1452,10 @@ static void _load_multi(int *argc, char **argv)
exit(error_exit);
}
data_buf = xmalloc(stat_buf.st_size + 1);
- while ((i = read(config_fd, &data_buf[data_read], stat_buf.st_size
+ while ((i = read(config_fd, &data_buf[data_read], stat_buf.st_size
- data_read)) != 0) {
if (i < 0) {
- error("Error reading multi_prog config file %s",
+ error("Error reading multi_prog config file %s",
argv[0]);
exit(error_exit);
} else
@@ -1488,7 +1488,7 @@ static void _opt_args(int argc, char **argv)
/* Check to see if user has specified enough resources to
* satisfy the plane distribution with the specified
- * plane_size.
+ * plane_size.
* if (n/plane_size < N) and ((N-1) * plane_size >= n) -->
* problem Simple check will not catch all the problem/invalid
* cases.
@@ -1501,7 +1501,7 @@ static void _opt_args(int argc, char **argv)
#if(0)
info("Too few processes ((n/plane_size) %d < N %d) "
"and ((N-1)*(plane_size) %d >= n %d)) ",
- opt.nprocs/opt.plane_size, opt.min_nodes,
+ opt.nprocs/opt.plane_size, opt.min_nodes,
(opt.min_nodes-1)*opt.plane_size, opt.nprocs);
#endif
error("Too few processes for the requested "
@@ -1510,7 +1510,7 @@ static void _opt_args(int argc, char **argv)
}
}
}
-
+
#ifdef HAVE_AIX
if (opt.network == NULL) {
opt.network = "us,sn_all,bulk_xfer";
@@ -1555,14 +1555,14 @@ static void _opt_args(int argc, char **argv)
if ((fullpath = search_path(opt.cwd, opt.argv[0], false, X_OK))) {
xfree(opt.argv[0]);
opt.argv[0] = fullpath;
- }
+ }
}
if (opt.multi_prog && verify_multi_name(opt.argv[0], opt.nprocs))
exit(error_exit);
}
-/*
+/*
* _opt_verify : perform some post option processing verification
*
*/
@@ -1645,19 +1645,19 @@ static bool _opt_verify(void)
/* set up the proc and node counts based on the arbitrary list
of nodes */
if((opt.distribution == SLURM_DIST_ARBITRARY)
- && (!opt.nodes_set || !opt.nprocs_set)) {
+ && (!opt.nodes_set || !opt.nprocs_set)) {
hostlist_t hl = hostlist_create(opt.nodelist);
if(!opt.nprocs_set) {
opt.nprocs_set = 1;
opt.nprocs = hostlist_count(hl);
- }
+ }
if(!opt.nodes_set) {
opt.nodes_set = 1;
hostlist_uniq(hl);
opt.min_nodes = opt.max_nodes = hostlist_count(hl);
}
hostlist_destroy(hl);
- }
+ }
/* now if max is set make sure we have <= max_nodes in the
* nodelist but only if it isn't arbitrary since the user has
@@ -1675,7 +1675,7 @@ static bool _opt_verify(void)
char *name = hostlist_pop(hl);
if(name)
free(name);
- else
+ else
break;
i++;
}
@@ -1684,7 +1684,7 @@ static bool _opt_verify(void)
opt.nodelist = xstrdup(buf);
}
hostlist_destroy(hl);
- }
+ }
if ((opt.argc == 0) && (opt.test_only == false)) {
@@ -1704,7 +1704,7 @@ static bool _opt_verify(void)
verified = false;
}
- if ((opt.min_nodes <= 0) || (opt.max_nodes < 0) ||
+ if ((opt.min_nodes <= 0) || (opt.max_nodes < 0) ||
(opt.max_nodes && (opt.min_nodes > opt.max_nodes))) {
error("invalid number of nodes (-N %d-%d)\n",
opt.min_nodes, opt.max_nodes);
@@ -1741,7 +1741,7 @@ static bool _opt_verify(void)
verified = false;
}
- /* bound max_threads/cores from ntasks_cores/sockets */
+ /* bound max_threads/cores from ntasks_cores/sockets */
if (opt.ntasks_per_core > 0) {
/* if cpu_bind_type doesn't already have a auto pref,
* choose the level based on the level of ntasks
@@ -1783,8 +1783,8 @@ static bool _opt_verify(void)
opt.nodes_set = true;
}
}
- if ((opt.nodes_set || opt.extra_set) &&
- ((opt.min_nodes == opt.max_nodes) || (opt.max_nodes == 0)) &&
+ if ((opt.nodes_set || opt.extra_set) &&
+ ((opt.min_nodes == opt.max_nodes) || (opt.max_nodes == 0)) &&
!opt.nprocs_set) {
/* 1 proc / node default */
opt.nprocs = opt.min_nodes;
@@ -1831,23 +1831,23 @@ static bool _opt_verify(void)
} else if (opt.nodes_set && opt.nprocs_set) {
/*
- * Make sure that the number of
+ * Make sure that the number of
* max_nodes is <= number of tasks
*/
- if (opt.nprocs < opt.max_nodes)
+ if (opt.nprocs < opt.max_nodes)
opt.max_nodes = opt.nprocs;
-
- /*
- * make sure # of procs >= min_nodes
+
+ /*
+ * make sure # of procs >= min_nodes
*/
if (opt.nprocs < opt.min_nodes) {
- info ("Warning: can't run %d processes on %d "
- "nodes, setting nnodes to %d",
+ info ("Warning: can't run %d processes on %d "
+ "nodes, setting nnodes to %d",
opt.nprocs, opt.min_nodes, opt.nprocs);
opt.min_nodes = opt.nprocs;
- if (opt.max_nodes
+ if (opt.max_nodes
&& (opt.min_nodes > opt.max_nodes) )
opt.max_nodes = opt.min_nodes;
if (hl_cnt > opt.min_nodes) {
@@ -1858,8 +1858,8 @@ static bool _opt_verify(void)
host = hostlist_pop(hl);
free(host);
}
- hostlist_ranged_string(hl,
- strlen(opt.nodelist)+1,
+ hostlist_ranged_string(hl,
+ strlen(opt.nodelist)+1,
opt.nodelist);
}
}
@@ -1874,12 +1874,12 @@ static bool _opt_verify(void)
opt.max_threads = 1;
pmi_server_max_threads(opt.max_threads);
} else if (opt.max_threads > MAX_THREADS) {
- error("Thread value exceeds defined limit, reset to %d",
+ error("Thread value exceeds defined limit, reset to %d",
MAX_THREADS);
}
if (opt.labelio && opt.unbuffered) {
- error("Do not specify both -l (--label) and "
+ error("Do not specify both -l (--label) and "
"-u (--unbuffered)");
exit(error_exit);
}
@@ -1902,7 +1902,7 @@ static bool _opt_verify(void)
if (opt.ckpt_interval_str) {
opt.ckpt_interval = time_str2mins(opt.ckpt_interval_str);
- if ((opt.ckpt_interval < 0) &&
+ if ((opt.ckpt_interval < 0) &&
(opt.ckpt_interval != INFINITE)) {
error("Invalid checkpoint interval specification");
exit(error_exit);
@@ -1912,10 +1912,10 @@ static bool _opt_verify(void)
if (! opt.ckpt_dir)
opt.ckpt_dir = xstrdup(opt.cwd);
- if ((opt.euid != (uid_t) -1) && (opt.euid != opt.uid))
+ if ((opt.euid != (uid_t) -1) && (opt.euid != opt.uid))
opt.uid = opt.euid;
- if ((opt.egid != (gid_t) -1) && (opt.egid != opt.gid))
+ if ((opt.egid != (gid_t) -1) && (opt.egid != opt.gid))
opt.gid = opt.egid;
if (slurm_verify_cpu_bind(NULL, &opt.cpu_bind,
@@ -1952,7 +1952,7 @@ extern char *spank_get_job_env(const char *name)
return NULL;
}
-extern int spank_set_job_env(const char *name, const char *value,
+extern int spank_set_job_env(const char *name, const char *value,
int overwrite)
{
int i, len;
@@ -2018,7 +2018,7 @@ extern int spank_unset_job_env(const char *name)
}
/* helper function for printing options
- *
+ *
* warning: returns pointer to memory allocated on the stack.
*/
static char *print_constraints()
@@ -2039,7 +2039,7 @@ static char *print_constraints()
if (opt.contiguous == true)
xstrcat(buf, "contiguous ");
-
+
if (opt.nodelist != NULL)
xstrfmtcat(buf, "nodelist=%s ", opt.nodelist);
@@ -2075,7 +2075,7 @@ static void _opt_list()
info("nodes : %d %s", opt.min_nodes,
opt.nodes_set ? "(set)" : "(default)");
}
- info("jobid : %u %s", opt.jobid,
+ info("jobid : %u %s", opt.jobid,
opt.jobid_set ? "(set)" : "(default)");
info("partition : %s",
opt.partition == NULL ? "default" : opt.partition);
@@ -2085,7 +2085,7 @@ static void _opt_list()
info("distribution : %s", format_task_dist_states(opt.distribution));
if(opt.distribution == SLURM_DIST_PLANE)
info("plane size : %u", opt.plane_size);
- info("cpu_bind : %s",
+ info("cpu_bind : %s",
opt.cpu_bind == NULL ? "default" : opt.cpu_bind);
info("mem_bind : %s",
opt.mem_bind == NULL ? "default" : opt.mem_bind);
@@ -2131,7 +2131,7 @@ static void _opt_list()
info("reboot : %s", opt.reboot ? "no" : "yes");
info("rotate : %s", opt.no_rotate ? "yes" : "no");
info("preserve_env : %s", tf_(opt.preserve_env));
-
+
#ifdef HAVE_BGL
if (opt.blrtsimage)
info("BlrtsImage : %s", opt.blrtsimage);
@@ -2305,16 +2305,16 @@ static void _help(void)
" -x, --exclude=hosts... exclude a specific list of hosts\n"
" -Z, --no-allocate don't allocate nodes (must supply -w)\n"
"\n"
-"Consumable resources related options:\n"
-" --exclusive allocate nodes in exclusive mode when\n"
+"Consumable resources related options:\n"
+" --exclusive allocate nodes in exclusive mode when\n"
" cpu consumable resource is enabled\n"
" or don't share CPUs for job steps\n"
" --mem-per-cpu=MB maximum amount of real memory per allocated\n"
-" cpu required by the job.\n"
-" --mem >= --mem-per-cpu if --mem is specified.\n"
-" --resv-ports reserve communication ports\n"
+" cpu required by the job.\n"
+" --mem >= --mem-per-cpu if --mem is specified.\n"
+" --resv-ports reserve communication ports\n"
"\n"
-"Affinity/Multi-core options: (when the task/affinity plugin is enabled)\n"
+"Affinity/Multi-core options: (when the task/affinity plugin is enabled)\n"
" -B --extra-node-info=S[:C[:T]] Expands to:\n"
" --sockets-per-node=S number of sockets per node to allocate\n"
" --cores-per-socket=C number of cores per socket to allocate\n"
@@ -2356,7 +2356,7 @@ static void _help(void)
" If wanting to run in HTC mode (only for 1\n"
" midplane and below). You can use HTC_S for\n"
" SMP, HTC_D for Dual, HTC_V for\n"
-" virtual node mode, and HTC_L for Linux mode.\n"
+" virtual node mode, and HTC_L for Linux mode.\n"
" --cnload-image=path path to compute node image for bluegene block. Default if not set\n"
" --mloader-image=path path to mloader image for bluegene block. Default if not set\n"
" --ioload-image=path path to ioload image for bluegene block. Default if not set\n"
diff --git a/src/srun/opt.h b/src/srun/opt.h
index 035bc62ab9a9c82466f4049a2f1258c8f275d0ad..282e1dfb8d9ee7fb6e9f0d7cd9bff90a67004ec2 100644
--- a/src/srun/opt.h
+++ b/src/srun/opt.h
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <grondona1@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -82,7 +82,7 @@ extern enum modes mode;
typedef struct srun_options {
- char *progname; /* argv[0] of this program or
+ char *progname; /* argv[0] of this program or
* configuration file if multi_prog */
bool multi_prog; /* multiple programs to execute */
char user[MAX_USERNAME];/* local username */
@@ -92,14 +92,14 @@ typedef struct srun_options {
gid_t egid; /* effective group --gid=group */
char *cwd; /* current working directory */
bool cwd_set; /* true if cwd is explicitly set */
-
+
int nprocs; /* --nprocs=n, -n n */
bool nprocs_set; /* true if nprocs explicitly set */
int cpus_per_task; /* --cpus-per-task=n, -c n */
bool cpus_set; /* true if cpus_per_task explicitly set */
int32_t max_threads; /* --threads, -T (threads in srun) */
- int32_t min_nodes; /* --nodes=n, -N n */
- int32_t max_nodes; /* --nodes=x-n, -N x-n */
+ int32_t min_nodes; /* --nodes=n, -N n */
+ int32_t max_nodes; /* --nodes=x-n, -N x-n */
int32_t min_sockets_per_node; /* --sockets-per-node=n */
int32_t min_cores_per_socket; /* --cores-per-socket=n */
int32_t min_threads_per_core; /* --threads-per-core=n */
@@ -124,7 +124,7 @@ typedef struct srun_options {
distribution; /* --distribution=, -m dist */
uint32_t plane_size; /* lllp distribution -> plane_size for
* when -m plane=<# of lllp per
- * plane> */
+ * plane> */
char *cmd_name; /* name of command to execute */
char *job_name; /* --job-name=, -J name */
bool job_name_set_cmd; /* true if job_name set by cmd line option */
@@ -146,7 +146,7 @@ typedef struct srun_options {
bool join; /* --join, -j */
/* no longer need these, they are set globally : */
- /*int verbose;*/ /* -v, --verbose */
+ /*int verbose;*/ /* -v, --verbose */
/*int debug;*/ /* -d, --debug */
int immediate; /* -I, --immediate=secs */
@@ -227,7 +227,7 @@ extern opt_t opt;
extern int error_exit; /* exit code for slurm errors */
extern int immediate_exit; /* exit code for --imediate option & busy */
-/* return whether any constraints were specified by the user
+/* return whether any constraints were specified by the user
* (if new constraints are added above, might want to add them to this
* macro or move this to a function if it gets a little complicated)
*/
@@ -251,7 +251,7 @@ int initialize_and_process_args(int argc, char *argv[]);
/* external functions available for SPANK plugins to modify the environment
* exported to the SLURM Prolog and Epilog programs */
extern char *spank_get_job_env(const char *name);
-extern int spank_set_job_env(const char *name, const char *value,
+extern int spank_set_job_env(const char *name, const char *value,
int overwrite);
extern int spank_unset_job_env(const char *name);
diff --git a/src/srun/srun.c b/src/srun/srun.c
index 509187b20dffacc5cf7f3c241b0dacbf9a63ad7c..b98d9efdf88d41fce8020e7a68da7fa9b128212a 100644
--- a/src/srun/srun.c
+++ b/src/srun/srun.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * srun.c - user interface to allocate resources, submit jobs, and execute
+ * srun.c - user interface to allocate resources, submit jobs, and execute
* parallel jobs.
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <grondona@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -104,7 +104,7 @@
#endif /* defined HAVE_DECL_STRSIGNAL && !HAVE_DECL_STRSIGNAL */
#ifndef OPEN_MPI_PORT_ERROR
-/* This exit code indicates the launched Open MPI tasks could
+/* This exit code indicates the launched Open MPI tasks could
* not open the reserved port. It was already open by some
* other process. */
#define OPEN_MPI_PORT_ERROR 108
@@ -216,7 +216,7 @@ int srun(int ac, char **av)
*/
if (atexit((void (*) (void)) spank_fini) < 0)
error("Failed to register atexit handler for plugins: %m");
-
+
/* set default options, process commandline arguments, and
* verify some basic values
*/
@@ -248,7 +248,7 @@ int srun(int ac, char **av)
(void) _set_rlimit_env();
_set_prio_process_env();
(void) _set_umask_env();
-
+
/* Set up slurmctld message handler */
slurmctld_msg_init();
@@ -265,12 +265,12 @@ int srun(int ac, char **av)
} else if (opt.no_alloc) {
info("do not allocate resources");
- job = job_create_noalloc();
+ job = job_create_noalloc();
if (create_job_step(job, false) < 0) {
exit(error_exit);
}
} else if ((resp = existing_allocation())) {
-
+
job_id = resp->job_id;
if (opt.alloc_nodelist == NULL)
opt.alloc_nodelist = xstrdup(resp->node_list);
@@ -296,14 +296,14 @@ int srun(int ac, char **av)
exit(error_exit);
}
#endif
-
- if ( !(resp = allocate_nodes()) )
+
+ if ( !(resp = allocate_nodes()) )
exit(error_exit);
got_alloc = 1;
_print_job_information(resp);
_set_cpu_env_var(resp);
job = job_create_allocation(resp);
-
+
opt.exclusive = false; /* not applicable for this step */
if (!opt.job_name_set_cmd && opt.job_name_set_env) {
/* use SLURM_JOB_NAME env var */
@@ -313,7 +313,7 @@ int srun(int ac, char **av)
slurm_complete_job(resp->job_id, 1);
exit(error_exit);
}
-
+
slurm_free_resource_allocation_response_msg(resp);
}
@@ -347,7 +347,7 @@ int srun(int ac, char **av)
env->batch_flag = 0;
if (job) {
uint16_t *tasks = NULL;
- slurm_step_ctx_get(job->step_ctx, SLURM_STEP_CTX_TASKS,
+ slurm_step_ctx_get(job->step_ctx, SLURM_STEP_CTX_TASKS,
&tasks);
env->select_jobinfo = job->select_jobinfo;
@@ -362,7 +362,7 @@ int srun(int ac, char **av)
int fd = STDIN_FILENO;
/* Save terminal settings for restore */
- tcgetattr(fd, &termdefaults);
+ tcgetattr(fd, &termdefaults);
tcgetattr(fd, &term);
/* Set raw mode on local tty */
cfmakeraw(&term);
@@ -379,7 +379,7 @@ int srun(int ac, char **av)
setup_env(env, opt.preserve_env);
xfree(env->task_count);
xfree(env);
-
+
re_launch:
task_state = task_state_create(opt.nprocs);
slurm_step_launch_params_t_init(&launch_params);
@@ -399,7 +399,7 @@ int srun(int ac, char **av)
launch_params.cpu_bind = opt.cpu_bind;
launch_params.cpu_bind_type = opt.cpu_bind_type;
launch_params.mem_bind = opt.mem_bind;
- launch_params.mem_bind_type = opt.mem_bind_type;
+ launch_params.mem_bind_type = opt.mem_bind_type;
launch_params.open_mode = opt.open_mode;
if (opt.acctg_freq >= 0)
launch_params.acctg_freq = opt.acctg_freq;
@@ -437,7 +437,7 @@ int srun(int ac, char **av)
update_job_state(job, SRUN_JOB_LAUNCHING);
launch_start_time = time(NULL);
- if (slurm_step_launch(job->step_ctx, &launch_params, &callbacks) !=
+ if (slurm_step_launch(job->step_ctx, &launch_params, &callbacks) !=
SLURM_SUCCESS) {
error("Application launch failed: %m");
global_rc = 1;
@@ -584,11 +584,11 @@ static char *_uint16_array_to_str(int array_len, const uint16_t *array)
}
previous = 0;
}
-
+
return str;
}
-static void
+static void
_print_job_information(resource_allocation_response_msg_t *resp)
{
int i;
@@ -623,13 +623,13 @@ static int _set_umask_env(void)
mask = (int)umask(0);
umask(mask);
- sprintf(mask_char, "0%d%d%d",
+ sprintf(mask_char, "0%d%d%d",
((mask>>6)&07), ((mask>>3)&07), mask&07);
if (setenvf(NULL, "SLURM_UMASK", "%s", mask_char) < 0) {
error ("unable to set SLURM_UMASK in environment");
return SLURM_FAILURE;
}
- debug ("propagating UMASK=%s", mask_char);
+ debug ("propagating UMASK=%s", mask_char);
return SLURM_SUCCESS;
}
@@ -697,9 +697,9 @@ static void _set_cpu_env_var(resource_allocation_response_msg_t *resp)
error("unable to set SLURM_JOB_CPUS_PER_NODE in environment");
xfree(tmp);
return;
-}
+}
-/* Set SLURM_RLIMIT_* environment variables with current resource
+/* Set SLURM_RLIMIT_* environment variables with current resource
* limit values, reset RLIMIT_NOFILE to maximum possible value */
static int _set_rlimit_env(void)
{
@@ -725,7 +725,7 @@ static int _set_rlimit_env(void)
rc = SLURM_FAILURE;
continue;
}
-
+
cur = (unsigned long) rlim->rlim_cur;
snprintf(name, sizeof(name), "SLURM_RLIMIT_%s", rli->name);
if (opt.propagate && rli->propagate_flag == PROPAGATE_RLIMITS)
@@ -735,17 +735,17 @@ static int _set_rlimit_env(void)
format = "U%lu";
else
format = "%lu";
-
+
if (setenvf (NULL, name, format, cur) < 0) {
error ("unable to set %s in environment", name);
rc = SLURM_FAILURE;
continue;
}
-
+
debug ("propagating RLIMIT_%s=%lu", rli->name, cur);
}
- /*
+ /*
* Now increase NOFILE to the max available for this srun
*/
if (getrlimit (RLIMIT_NOFILE, rlim) < 0)
@@ -753,7 +753,7 @@ static int _set_rlimit_env(void)
if (rlim->rlim_cur < rlim->rlim_max) {
rlim->rlim_cur = rlim->rlim_max;
- if (setrlimit (RLIMIT_NOFILE, rlim) < 0)
+ if (setrlimit (RLIMIT_NOFILE, rlim) < 0)
return (error ("Unable to increase max no. files: %m"));
}
@@ -851,7 +851,7 @@ _is_local_file (fname_t *fname)
{
if (fname->name == NULL)
return 1;
-
+
if (fname->taskid != -1)
return 1;
@@ -882,7 +882,7 @@ _set_stdio_fds(srun_job_t *job, slurm_step_io_fds_t *cio_fds)
* create stdin file descriptor
*/
if (_is_local_file(job->ifname)) {
- if ((job->ifname->name == NULL) ||
+ if ((job->ifname->name == NULL) ||
(job->ifname->taskid != -1)) {
cio_fds->in.fd = STDIN_FILENO;
} else {
@@ -931,7 +931,7 @@ _set_stdio_fds(srun_job_t *job, slurm_step_io_fds_t *cio_fds)
cio_fds->err.fd = cio_fds->out.fd;
cio_fds->err.taskid = cio_fds->out.taskid;
} else if (_is_local_file(job->efname)) {
- if ((job->efname->name == NULL) ||
+ if ((job->efname->name == NULL) ||
(job->efname->taskid != -1)) {
cio_fds->err.fd = STDERR_FILENO;
} else {
@@ -946,9 +946,9 @@ _set_stdio_fds(srun_job_t *job, slurm_step_io_fds_t *cio_fds)
}
/* Plugins must be able to resolve symbols.
- * Since srun statically links with src/api/libslurmhelper rather than
- * dynamicaly linking with libslurm, we need to reference all needed
- * symbols within srun. None of the functions below are actually
+ * Since srun statically links with src/api/libslurmhelper rather than
+ * dynamicaly linking with libslurm, we need to reference all needed
+ * symbols within srun. None of the functions below are actually
* used, but we need to load the symbols. */
static void _define_symbols(void)
{
@@ -1054,7 +1054,7 @@ _hostset_to_string(hostset_t hs)
}
/* Convert an array of task IDs into a list of host names
- * RET: the string, caller must xfree() this value */
+ * RET: the string, caller must xfree() this value */
static char *
_task_ids_to_host_list(int ntasks, uint32_t taskids[])
{
@@ -1086,7 +1086,7 @@ _task_ids_to_host_list(int ntasks, uint32_t taskids[])
/* Convert an array of task IDs into a string.
* RET: the string, caller must xfree() this value
- * NOTE: the taskids array is not necessarily in numeric order,
+ * NOTE: the taskids array is not necessarily in numeric order,
* so we use existing bitmap functions to format */
static char *
_task_array_to_string(int ntasks, uint32_t taskids[])
@@ -1201,7 +1201,7 @@ _task_finish(task_exit_msg_t *msg)
normal_exit = 1;
}
else if (_is_openmpi_port_error(rc)) {
- _handle_openmpi_port_error(tasks, hosts,
+ _handle_openmpi_port_error(tasks, hosts,
job->step_ctx);
} else {
error("%s: %s %s: Exited with exit code %d",
@@ -1247,7 +1247,7 @@ static void _handle_intr()
static time_t last_intr = 0;
static time_t last_intr_sent = 0;
- if (!opt.quit_on_intr &&
+ if (!opt.quit_on_intr &&
(((time(NULL) - last_intr) > 1) && !opt.disable_status)) {
if (job->state < SRUN_JOB_FORCETERM)
info("interrupt (one more within 1 sec to abort)");
@@ -1330,7 +1330,7 @@ static int _setup_signals()
xassert(job);
xassert(job->step_ctx);
- while ((signo = sigarray[i++]))
+ while ((signo = sigarray[i++]))
xsignal(signo, _handle_signal);
/* special case for SIGPIPE since we don't want to print stuff
* and get into a locked up state
diff --git a/src/srun/srun.h b/src/srun/srun.h
index 7822092a5cdc4322505ce17332eb2bb014a59589..6f130d34f592f771534dd535fe141d288d8ac7ad 100644
--- a/src/srun/srun.h
+++ b/src/srun/srun.h
@@ -5,21 +5,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/src/srun/srun.wrapper.c b/src/srun/srun.wrapper.c
index 712a7724baa51a97f0390a099bf0e3baa4415755..2d2e229e5d5aaf34f7ce96968cb0f9b722ef447c 100644
--- a/src/srun/srun.wrapper.c
+++ b/src/srun/srun.wrapper.c
@@ -1,8 +1,8 @@
-/*
+/*
* srun.wrapper.c - srun command wrapper for use with debuggers
* srun is the SLURM parallel job initiator and resource allocator
*
- * For TotalView, a parallel job debugger from
+ * For TotalView, a parallel job debugger from
* TotalView Technologies, LLC <http://www.TotalViewTech.com>
* Type "<ctrl-a>" to specify arguments for srun
* Type "g" to start the program
diff --git a/src/srun/srun_job.c b/src/srun/srun_job.c
index b59fa5cc4ca4a0d9fd82c33733f99bc1174dd761..d8f3177e17c3733fa34c367f23a2f1415501f8dd 100644
--- a/src/srun/srun_job.c
+++ b/src/srun/srun_job.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <grondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -93,7 +93,7 @@ static srun_job_t *_job_create_structure(allocation_info_t *info);
static char * _normalize_hostlist(const char *hostlist);
-/*
+/*
* Create an srun job structure w/out an allocation response msg.
* (i.e. use the command line options)
*/
@@ -111,23 +111,23 @@ job_create_noalloc(void)
}
srand48(getpid());
ai->jobid = MIN_NOALLOC_JOBID +
- ((uint32_t) lrand48() %
+ ((uint32_t) lrand48() %
(MAX_NOALLOC_JOBID - MIN_NOALLOC_JOBID + 1));
ai->stepid = (uint32_t) (lrand48());
ai->nodelist = opt.nodelist;
ai->nnodes = hostlist_count(hl);
hostlist_destroy(hl);
-
+
cpn = (opt.nprocs + ai->nnodes - 1) / ai->nnodes;
ai->cpus_per_node = &cpn;
ai->cpu_count_reps = &ai->nnodes;
-
- /*
+
+ /*
* Create job, then fill in host addresses
*/
job = _job_create_structure(ai);
-
+
job_update_io_fnames(job);
error:
@@ -136,7 +136,7 @@ job_create_noalloc(void)
}
-/*
+/*
* Create an srun job structure for a step w/out an allocation response msg.
* (i.e. inside an allocation)
*/
@@ -150,7 +150,7 @@ job_step_create_allocation(resource_allocation_response_msg_t *resp)
char buf[8192];
int count = 0;
uint32_t alloc_count = 0;
-
+
ai->jobid = job_id;
ai->stepid = NO_VAL;
ai->nodelist = opt.alloc_nodelist;
@@ -159,12 +159,12 @@ job_step_create_allocation(resource_allocation_response_msg_t *resp)
alloc_count = hostlist_count(hl);
ai->nnodes = alloc_count;
hostlist_destroy(hl);
-
+
if (opt.exc_nodes) {
hostlist_t exc_hl = hostlist_create(opt.exc_nodes);
hostlist_t inc_hl = NULL;
char *node_name = NULL;
-
+
hl = hostlist_create(ai->nodelist);
if(opt.nodelist) {
inc_hl = hostlist_create(opt.nodelist);
@@ -249,7 +249,7 @@ job_step_create_allocation(resource_allocation_response_msg_t *resp)
/* remove more nodes than needed for
allocation */
int i=0;
- for(i=count; i>ai->nnodes; i--)
+ for(i=count; i>ai->nnodes; i--)
hostlist_delete_nth(hl, i);
}
hostlist_ranged_string(hl, sizeof(buf), buf);
@@ -257,7 +257,7 @@ job_step_create_allocation(resource_allocation_response_msg_t *resp)
opt.nodelist = xstrdup(buf);
}
- hostlist_destroy(hl);
+ hostlist_destroy(hl);
} else {
if (!opt.nodes_set) {
/* we don't want to set the number of nodes =
@@ -282,9 +282,9 @@ job_step_create_allocation(resource_allocation_response_msg_t *resp)
/* xfree(ai->nodelist); */
/* ai->nodelist = xstrdup(buf); */
}
-
+
/* get the correct number of hosts to run tasks on */
- if(opt.nodelist) {
+ if(opt.nodelist) {
hl = hostlist_create(opt.nodelist);
if(opt.distribution != SLURM_DIST_ARBITRARY)
hostlist_uniq(hl);
@@ -293,7 +293,7 @@ job_step_create_allocation(resource_allocation_response_msg_t *resp)
hostlist_destroy(hl);
goto error;
}
-
+
hostlist_ranged_string(hl, sizeof(buf), buf);
count = hostlist_count(hl);
hostlist_destroy(hl);
@@ -305,8 +305,8 @@ job_step_create_allocation(resource_allocation_response_msg_t *resp)
/* ai->nodelist = xstrdup(buf); */
xfree(opt.nodelist);
opt.nodelist = xstrdup(buf);
- }
-
+ }
+
if(opt.distribution == SLURM_DIST_ARBITRARY) {
if(count != opt.nprocs) {
error("You asked for %d tasks but specified %d nodes",
@@ -326,7 +326,7 @@ job_step_create_allocation(resource_allocation_response_msg_t *resp)
/* info("looking for %d nodes out of %s with a must list of %s", */
/* ai->nnodes, ai->nodelist, opt.nodelist); */
- /*
+ /*
* Create job
*/
job = _job_create_structure(ai);
@@ -369,13 +369,13 @@ update_job_state(srun_job_t *job, srun_job_state_t state)
if (job->state < state) {
job->state = state;
pthread_cond_signal(&job->state_cond);
-
+
}
pthread_mutex_unlock(&job->state_mutex);
return;
}
-srun_job_state_t
+srun_job_state_t
job_state(srun_job_t *job)
{
srun_job_state_t state;
@@ -386,7 +386,7 @@ job_state(srun_job_t *job)
}
-void
+void
job_force_termination(srun_job_t *job)
{
static int kill_sent = 0;
@@ -458,9 +458,9 @@ _job_create_structure(allocation_info_t *ainfo)
pthread_cond_init(&job->state_cond, NULL);
job->state = SRUN_JOB_INIT;
- job->nodelist = xstrdup(ainfo->nodelist);
+ job->nodelist = xstrdup(ainfo->nodelist);
job->stepid = ainfo->stepid;
-
+
#ifdef HAVE_FRONT_END /* Limited job step support */
opt.overcommit = true;
job->nhosts = 1;
@@ -479,7 +479,7 @@ _job_create_structure(allocation_info_t *ainfo)
}
return NULL;
}
- if ((ainfo->cpus_per_node == NULL) ||
+ if ((ainfo->cpus_per_node == NULL) ||
(ainfo->cpu_count_reps == NULL)) {
error("cpus_per_node array is not set");
return NULL;
@@ -487,7 +487,7 @@ _job_create_structure(allocation_info_t *ainfo)
#endif
job->select_jobinfo = ainfo->select_jobinfo;
job->jobid = ainfo->jobid;
-
+
job->ntasks = opt.nprocs;
for (i=0; i<ainfo->num_cpu_groups; i++) {
job->cpu_count += ainfo->cpus_per_node[i] *
@@ -495,10 +495,10 @@ _job_create_structure(allocation_info_t *ainfo)
}
job->rc = -1;
-
+
job_update_io_fnames(job);
-
- return (job);
+
+ return (job);
}
void
diff --git a/src/srun/srun_job.h b/src/srun/srun_job.h
index 6b899cbafd648ec9137ff1c8e0a5500bd5601890..08f297d3448511fe819a33c78ab249923153a379 100644
--- a/src/srun/srun_job.h
+++ b/src/srun/srun_job.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -94,7 +94,7 @@ typedef struct srun_job {
uint32_t nhosts; /* node count */
uint32_t ntasks; /* task count */
srun_job_state_t state; /* job state */
- pthread_mutex_t state_mutex;
+ pthread_mutex_t state_mutex;
pthread_cond_t state_cond;
int rc; /* srun return code */
@@ -110,7 +110,7 @@ typedef struct srun_job {
/* Pseudo terminial support */
pthread_t pty_id; /* pthread to communicate window size changes */
- int pty_fd; /* file to communicate window size changes */
+ int pty_fd; /* file to communicate window size changes */
uint16_t pty_port; /* used to communicate window size changes */
uint8_t ws_col; /* window size, columns */
uint8_t ws_row; /* window size, row count */
diff --git a/src/srun/srun_pty.c b/src/srun/srun_pty.c
index ddf9535b9d5b1ee39ed7e5229963ee2c8ab7f98e..d92f1881ce96a86db6ec1150cd3bb2ed3a0e3977 100644
--- a/src/srun/srun_pty.c
+++ b/src/srun/srun_pty.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -72,7 +72,7 @@
static int pty_sigarray[] = { SIGWINCH, 0 };
static int winch;
-/*
+/*
* Static prototypes
*/
static void _handle_sigwinch(int sig);
diff --git a/src/srun/srun_pty.h b/src/srun/srun_pty.h
index 6f473ef5a053b730d582d12bdfcddab76f7c2507..d85a5ccecdb5f8dac7485c3c24ada70144d5be5e 100644
--- a/src/srun/srun_pty.h
+++ b/src/srun/srun_pty.h
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Moe Jette <jette@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/srun_cr/srun_cr.c b/src/srun_cr/srun_cr.c
index a2a1b0663876af20e5f76f3d284db55ed17161ca..930fb422ffd1a55a595d939adfab54d45e81dac6 100644
--- a/src/srun_cr/srun_cr.c
+++ b/src/srun_cr/srun_cr.c
@@ -4,32 +4,32 @@
* Copyright (C) 2009 National University of Defense Technology, China.
* Written by Hongia Cao.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -117,9 +117,9 @@ signal_child (int sig, siginfo_t *siginfo, void *context)
signal_self(sig);
return;
}
-
+
if ((siginfo->si_code > 0) && /* si_code > 0 indicates sent by kernel */
- (sig == SIGILL || sig == SIGFPE ||
+ (sig == SIGILL || sig == SIGFPE ||
sig == SIGBUS || sig == SIGSEGV )) {
/* This signal is OUR error, so we don't forward */
signal_self(sig);
@@ -144,7 +144,7 @@ mimic_exit(int status)
struct rlimit r;
r.rlim_cur = r.rlim_max = 0;
(void)setrlimit(RLIMIT_CORE, &r);
-
+
/* now raise the signal */
signal_self(WTERMSIG(status));
} else {
@@ -158,8 +158,8 @@ on_child_exit(int signum)
{
int status;
- /*
- * if srun_cr is checkpoint/restart-ed after srun exited,
+ /*
+ * if srun_cr is checkpoint/restart-ed after srun exited,
* srun_pid will be the pid of the new srun.
*/
cr_enter_cs(cr_id);
@@ -203,7 +203,7 @@ static int
init_srun_argv(int argc, char **argv)
{
int i;
-
+
srun_argv = (char **)xmalloc(sizeof(char *) * (argc + 3));
srun_argv[0] = cr_run_path;
@@ -238,7 +238,7 @@ create_listen_socket(void)
close (listen_fd); /* close possible old socket */
-
+
sprintf(cr_sock_addr, "/tmp/sock.srun_cr.%u", (unsigned int)getpid());
listen_fd = socket(AF_UNIX, SOCK_STREAM, 0);
@@ -246,14 +246,14 @@ create_listen_socket(void)
error("failed to create listen socket: %m");
return -1;
}
-
+
sa.sun_family = AF_UNIX;
strcpy(sa.sun_path, cr_sock_addr);
sa_len = strlen(sa.sun_path) + sizeof(sa.sun_family);
unlink(sa.sun_path); /* remove possible old socket */
- setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR,
+ setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR,
(void*)&re_use_addr, sizeof(int));
if (bind(listen_fd, (struct sockaddr *)&sa, sa_len) < 0) {
@@ -269,7 +269,7 @@ create_listen_socket(void)
}
fd_set_nonblocking(listen_fd);
-
+
return listen_fd;
}
@@ -299,7 +299,7 @@ fork_exec_srun(void)
* or Ctrl-C will cause SIGINT duplicated
*/
setpgrp();
-
+
update_env("SLURM_SRUN_CR_SOCKET", cr_sock_addr);
/*
@@ -307,7 +307,7 @@ fork_exec_srun(void)
*/
sigemptyset(&sigset);
pthread_sigmask(SIG_SETMASK, &sigset, NULL);
-
+
execv(srun_argv[0], srun_argv);
perror("failed execv srun");
exit(-1);
@@ -334,7 +334,7 @@ get_step_image_dir(int cr)
if (cr) { /* checkpoint */
ckpt_info = cr_get_checkpoint_info();
if (!ckpt_info) {
- error("failed to get checkpoint info: %s",
+ error("failed to get checkpoint info: %s",
cr_strerror(errno));
return NULL;
}
@@ -342,7 +342,7 @@ get_step_image_dir(int cr)
} else { /* retart */
rstrt_info = cr_get_restart_info();
if (!rstrt_info) {
- error("failed to get restart info: %s",
+ error("failed to get restart info: %s",
cr_strerror(errno));
return NULL;
}
@@ -382,7 +382,7 @@ cr_callback(void *unused)
xfree(step_image_dir);
}
rc = cr_checkpoint(rc); /* dump */
-
+
if (rc < 0) {
fatal("checkpoint failed: %s", cr_strerror(errno));
} else if (rc == 0) {
@@ -406,7 +406,7 @@ cr_callback(void *unused)
/* XXX: step_launched => listen_fd valid */
step_launched = 0;
-
+
debug2("step not launched.");
pthread_cond_broadcast(&step_launch_cond);
@@ -415,7 +415,7 @@ cr_callback(void *unused)
return 0;
}
-int
+int
main(int argc, char **argv)
{
int debug_level, sig, srun_fd;
@@ -425,7 +425,7 @@ main(int argc, char **argv)
unsigned int ca_len = sizeof(ca);
atexit(remove_listen_socket);
-
+
/* copied from srun */
debug_level = _slurm_debug_env_val();
logopt.stderr_level += debug_level;
@@ -434,12 +434,12 @@ main(int argc, char **argv)
if (init_srun_argv(argc, argv)) {
fatal("failed to initialize arguments for running srun");
}
-
+
if ((cr_id = cr_init()) < 0) {
fatal("failed to initialize libcr: %s", cr_strerror(errno));
}
(void)cr_register_callback(cr_callback, NULL, CR_THREAD_CONTEXT);
-
+
/* forward signals. copied from cr_restart */
sa.sa_sigaction = signal_child;
sa.sa_flags = SA_RESTART | SA_NODEFER | SA_SIGINFO;
@@ -465,7 +465,7 @@ main(int argc, char **argv)
pthread_mutex_lock(&step_launch_mutex);
while (step_launched) {
/* just avoid busy waiting */
- pthread_cond_wait(&step_launch_cond,
+ pthread_cond_wait(&step_launch_cond,
&step_launch_mutex);
}
pthread_mutex_unlock(&step_launch_mutex);
@@ -478,7 +478,7 @@ main(int argc, char **argv)
srun_fd = accept(listen_fd, (struct sockaddr*)&ca, &ca_len);
if (srun_fd < 0) {
/* restarted before enter CS. socket will not be restored */
- if (errno == EBADF) {
+ if (errno == EBADF) {
cr_leave_cs(cr_id);
continue;
} else {
@@ -488,7 +488,7 @@ main(int argc, char **argv)
_read_info_from_srun(srun_fd);
close(srun_fd);
-
+
step_launched = 1;
debug2("step launched");
@@ -529,7 +529,7 @@ static void
_read_info_from_srun(int srun_fd)
{
int len;
-
+
if (read(srun_fd, &jobid, sizeof(uint32_t)) != sizeof(uint32_t)) {
fatal("failed to read jobid: %m");
}
diff --git a/src/sshare/Makefile.am b/src/sshare/Makefile.am
index cb7a8feff1f4c792ca4e50ccf1fed874450dc8e5..e935d03f6365374534daf6fddde6892a999efa64 100644
--- a/src/sshare/Makefile.am
+++ b/src/sshare/Makefile.am
@@ -13,7 +13,7 @@ sshare_LDADD = \
sshare_SOURCES = \
process.c \
- sshare.c sshare.h
+ sshare.c sshare.h
sshare_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
diff --git a/src/sshare/Makefile.in b/src/sshare/Makefile.in
index 3945caa03b04c681cfeb50650e5553420d9027d7..b93ecd0f55f7e67c05f9ae877aa52d217e7484d5 100644
--- a/src/sshare/Makefile.in
+++ b/src/sshare/Makefile.in
@@ -301,7 +301,7 @@ sshare_LDADD = \
sshare_SOURCES = \
process.c \
- sshare.c sshare.h
+ sshare.c sshare.h
sshare_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
all: all-am
diff --git a/src/sshare/process.c b/src/sshare/process.c
index c32c4c5699571e0d8fd6536a1cc076c2af131332..2be11d327ffbe19722bc0c489b25d476ebd11198 100644
--- a/src/sshare/process.c
+++ b/src/sshare/process.c
@@ -1,36 +1,36 @@
/*****************************************************************************\
- * process.c - process the return from get_share_info.
+ * process.c - process the return from get_share_info.
*****************************************************************************
* Copyright (C) 2008 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -150,7 +150,7 @@ extern int process(shares_response_msg_t *resp)
}
if((tmp_char = strstr(object, "\%"))) {
int newlen = atoi(tmp_char+1);
- if(newlen)
+ if(newlen)
field->len = newlen;
}
list_append(print_fields_list, field);
@@ -180,18 +180,18 @@ extern int process(shares_response_msg_t *resp)
while((field = list_next(itr2))) {
switch(field->type) {
case PRINT_ACCOUNT:
- if(assoc->user)
+ if(assoc->user)
local_acct = xstrdup_printf(
"|%s", assoc->name);
- else
+ else
local_acct = xstrdup(assoc->name);
-
+
print_acct = get_tree_acct_name(
local_acct,
assoc->parent, tree_list);
xfree(local_acct);
field->print_routine(
- field,
+ field,
print_acct,
(curr_inx == field_count));
break;
@@ -202,7 +202,7 @@ extern int process(shares_response_msg_t *resp)
(curr_inx == field_count));
break;
case PRINT_EUSED:
- field->print_routine(field,
+ field->print_routine(field,
assoc->usage_efctv,
(curr_inx == field_count));
break;
@@ -214,12 +214,12 @@ extern int process(shares_response_msg_t *resp)
(curr_inx == field_count));
break;
case PRINT_ID:
- field->print_routine(field,
+ field->print_routine(field,
assoc->assoc_id,
(curr_inx == field_count));
break;
case PRINT_NORMS:
- field->print_routine(field,
+ field->print_routine(field,
assoc->shares_norm,
(curr_inx == field_count));
break;
@@ -234,14 +234,14 @@ extern int process(shares_response_msg_t *resp)
(curr_inx == field_count));
break;
case PRINT_RAWU:
- field->print_routine(field,
+ field->print_routine(field,
assoc->usage_raw,
(curr_inx == field_count));
break;
case PRINT_USER:
if(assoc->user)
tmp_char = assoc->name;
- field->print_routine(field,
+ field->print_routine(field,
tmp_char,
(curr_inx == field_count));
break;
@@ -257,9 +257,9 @@ extern int process(shares_response_msg_t *resp)
printf("\n");
}
- if(tree_list)
+ if(tree_list)
list_destroy(tree_list);
-
+
list_iterator_destroy(itr2);
list_iterator_destroy(itr);
list_destroy(print_fields_list);
diff --git a/src/sshare/sshare.c b/src/sshare/sshare.c
index 094deef174289e99d2681f5cc5442604462c6ee1..b2ecbd74d368a2db17e6d38eebb3f5b9a2aaa96a 100644
--- a/src/sshare/sshare.c
+++ b/src/sshare/sshare.c
@@ -1,37 +1,37 @@
/*****************************************************************************\
* sshare.c - tool for listing the shares of association in
- * relationship to the cluster running on.
+ * relationship to the cluster running on.
*****************************************************************************
* Copyright (C) 2008 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -51,15 +51,15 @@ int long_flag; /* exceeds 80 character limit with more info */
int verbosity; /* count of -v options */
uint32_t my_uid = 0;
-static int _get_info(shares_request_msg_t *shares_req,
+static int _get_info(shares_request_msg_t *shares_req,
shares_response_msg_t **shares_resp);
static int _addto_name_char_list(List char_list, char *names, bool gid);
static char * _convert_to_name(int id, bool gid);
static void _print_version( void );
static void _usage ();
-int
-main (int argc, char *argv[])
+int
+main (int argc, char *argv[])
{
int error_code = SLURM_SUCCESS, opt_char;
log_options_t opts = LOG_OPTS_STDERR_ONLY;
@@ -115,7 +115,7 @@ main (int argc, char *argv[])
all_users = 1;
break;
case 'A':
- if(!req_msg.acct_list)
+ if(!req_msg.acct_list)
req_msg.acct_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(req_msg.acct_list, optarg);
@@ -132,7 +132,7 @@ main (int argc, char *argv[])
print_fields_have_header = 0;
break;
case 'p':
- print_fields_parsable_print =
+ print_fields_parsable_print =
PRINT_FIELDS_PARSABLE_ENDING;
break;
case 'P':
@@ -146,7 +146,7 @@ main (int argc, char *argv[])
}
all_users = 0;
if(!req_msg.user_list)
- req_msg.user_list =
+ req_msg.user_list =
list_create(slurm_destroy_char);
_addto_name_char_list(req_msg.user_list, optarg, 0);
break;
@@ -164,7 +164,7 @@ main (int argc, char *argv[])
exit(0);
default:
exit_code = 1;
- fprintf(stderr, "getopt error, returned %c\n",
+ fprintf(stderr, "getopt error, returned %c\n",
opt_char);
exit(exit_code);
}
@@ -177,18 +177,18 @@ main (int argc, char *argv[])
}
if(all_users) {
- if(req_msg.user_list
+ if(req_msg.user_list
&& list_count(req_msg.user_list)) {
list_destroy(req_msg.user_list);
req_msg.user_list = NULL;
}
if(verbosity)
fprintf(stderr, "Users requested:\n\t: all\n");
- } else if (verbosity && req_msg.user_list
+ } else if (verbosity && req_msg.user_list
&& list_count(req_msg.user_list)) {
fprintf(stderr, "Users requested:\n");
ListIterator itr = list_iterator_create(req_msg.user_list);
- while((temp = list_next(itr)))
+ while((temp = list_next(itr)))
fprintf(stderr, "\t: %s\n", temp);
list_iterator_destroy(itr);
} else if(!req_msg.user_list || !list_count(req_msg.user_list)) {
@@ -206,11 +206,11 @@ main (int argc, char *argv[])
if(req_msg.acct_list && list_count(req_msg.acct_list)) {
fprintf(stderr, "Accounts requested:\n");
ListIterator itr = list_iterator_create(req_msg.acct_list);
- while((temp = list_next(itr)))
+ while((temp = list_next(itr)))
fprintf(stderr, "\t: %s\n", temp);
list_iterator_destroy(itr);
} else {
- if(req_msg.acct_list
+ if(req_msg.acct_list
&& list_count(req_msg.acct_list)) {
list_destroy(req_msg.acct_list);
req_msg.acct_list = NULL;
@@ -240,7 +240,7 @@ main (int argc, char *argv[])
exit(exit_code);
}
-static int _get_info(shares_request_msg_t *shares_req,
+static int _get_info(shares_request_msg_t *shares_req,
shares_response_msg_t **shares_resp)
{
int rc;
@@ -252,18 +252,18 @@ static int _get_info(shares_request_msg_t *shares_req,
req_msg.msg_type = REQUEST_SHARE_INFO;
req_msg.data = shares_req;
-
+
if (slurm_send_recv_controller_msg(&req_msg, &resp_msg) < 0)
return SLURM_ERROR;
-
+
switch (resp_msg.msg_type) {
case RESPONSE_SHARE_INFO:
*shares_resp = (shares_response_msg_t *) resp_msg.data;
break;
case RESPONSE_SLURM_RC:
rc = ((return_code_msg_t *) resp_msg.data)->return_code;
- slurm_free_return_code_msg(resp_msg.data);
- if (rc)
+ slurm_free_return_code_msg(resp_msg.data);
+ if (rc)
slurm_seterrno_ret(rc);
*shares_resp = NULL;
break;
@@ -272,7 +272,7 @@ static int _get_info(shares_request_msg_t *shares_req,
break;
}
- return SLURM_PROTOCOL_SUCCESS;
+ return SLURM_PROTOCOL_SUCCESS;
}
/* returns number of objects added to list */
@@ -315,7 +315,7 @@ static int _addto_name_char_list(List char_list, char *names, bool gid)
name = _convert_to_name(
id, gid);
}
-
+
while((tmp_char = list_next(itr))) {
if(!strcasecmp(tmp_char, name))
break;
@@ -324,7 +324,7 @@ static int _addto_name_char_list(List char_list, char *names, bool gid)
if(!tmp_char) {
list_append(char_list, name);
count++;
- } else
+ } else
xfree(name);
list_iterator_reset(itr);
}
@@ -342,28 +342,28 @@ static int _addto_name_char_list(List char_list, char *names, bool gid)
if((i-start) > 0) {
name = xmalloc((i-start)+1);
memcpy(name, names+start, (i-start));
-
+
if (isdigit((int) *name)) {
int id = atoi(name);
xfree(name);
name = _convert_to_name(id, gid);
}
-
+
while((tmp_char = list_next(itr))) {
if(!strcasecmp(tmp_char, name))
break;
}
-
+
if(!tmp_char) {
list_append(char_list, name);
count++;
- } else
+ } else
xfree(name);
}
- }
+ }
list_iterator_destroy(itr);
return count;
-}
+}
static char *_convert_to_name(int id, bool gid)
{
@@ -393,7 +393,7 @@ static void _print_version(void)
if (quiet_flag == -1) {
long version = slurm_api_version();
printf("slurm_api_version: %ld, %ld.%ld.%ld\n", version,
- SLURM_VERSION_MAJOR(version),
+ SLURM_VERSION_MAJOR(version),
SLURM_VERSION_MINOR(version),
SLURM_VERSION_MICRO(version));
}
diff --git a/src/sshare/sshare.h b/src/sshare/sshare.h
index 2be0a071dc5dd94f6a31a4d3321535ad4af6d13f..ca733d29f33900a6987627da895c89620475080d 100644
--- a/src/sshare/sshare.h
+++ b/src/sshare/sshare.h
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/sstat/Makefile.am b/src/sstat/Makefile.am
index 41cf9df325d1bf1802eb808522a64717f95e1fe8..2d48f5ced2cbb70531825a9f210b4adafc58b70f 100644
--- a/src/sstat/Makefile.am
+++ b/src/sstat/Makefile.am
@@ -9,7 +9,7 @@ bin_PROGRAMS = sstat
sstat_LDADD = $(top_builddir)/src/api/libslurm.o -ldl
-noinst_HEADERS = sstat.c
+noinst_HEADERS = sstat.c
sstat_SOURCES = sstat.c process.c print.c options.c
force:
diff --git a/src/sstat/Makefile.in b/src/sstat/Makefile.in
index 7f056cc5259cdc4a7ca4a8d395db8f71b3686c91..cf8fac6f08fb32d2c02880e25316b9e08612ba1f 100644
--- a/src/sstat/Makefile.in
+++ b/src/sstat/Makefile.in
@@ -297,7 +297,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
INCLUDES = -I$(top_srcdir)
sstat_LDADD = $(top_builddir)/src/api/libslurm.o -ldl
-noinst_HEADERS = sstat.c
+noinst_HEADERS = sstat.c
sstat_SOURCES = sstat.c process.c print.c options.c
sstat_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
all: all-am
diff --git a/src/sstat/options.c b/src/sstat/options.c
index fdfbc5c7335c254b4c28995c726effbe3031c097..1ec06ed7a8e6a1711c508591b632519fb6ac13d7 100644
--- a/src/sstat/options.c
+++ b/src/sstat/options.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -119,7 +119,7 @@ void _do_help(void)
_usage();
break;
default:
- fprintf(stderr, "sacct bug: params.opt_help=%d\n",
+ fprintf(stderr, "sacct bug: params.opt_help=%d\n",
params.opt_help);
}
}
@@ -136,7 +136,7 @@ static int _addto_job_list(List job_list, char *names)
char *name = NULL, *dot = NULL;
jobacct_selected_step_t *selected_step = NULL;
jobacct_selected_step_t *curr_step = NULL;
-
+
ListIterator itr = NULL;
char quote_c = '\0';
int quote = 0;
@@ -182,9 +182,9 @@ static int _addto_job_list(List job_list, char *names)
xfree(name);
while((curr_step = list_next(itr))) {
- if((curr_step->jobid
+ if((curr_step->jobid
== selected_step->jobid)
- && (curr_step->stepid
+ && (curr_step->stepid
== selected_step->
stepid))
break;
@@ -194,7 +194,7 @@ static int _addto_job_list(List job_list, char *names)
list_append(job_list,
selected_step);
count++;
- } else
+ } else
destroy_jobacct_selected_step(
selected_step);
list_iterator_reset(itr);
@@ -223,7 +223,7 @@ static int _addto_job_list(List job_list, char *names)
while((curr_step = list_next(itr))) {
if((curr_step->jobid == selected_step->jobid)
- && (curr_step->stepid
+ && (curr_step->stepid
== selected_step->stepid))
break;
}
@@ -231,14 +231,14 @@ static int _addto_job_list(List job_list, char *names)
if(!curr_step) {
list_append(job_list, selected_step);
count++;
- } else
+ } else
destroy_jobacct_selected_step(
selected_step);
}
- }
+ }
list_iterator_destroy(itr);
return count;
-}
+}
int decode_state_char(char *state)
{
@@ -260,7 +260,7 @@ int decode_state_char(char *state)
return JOB_NODE_FAIL;
else
return -1; // unknown
-}
+}
void parse_command_line(int argc, char **argv)
{
@@ -309,7 +309,7 @@ void parse_command_line(int argc, char **argv)
break;
case 'j':
if ((strspn(optarg, "0123456789, ") < strlen(optarg))
- && (strspn(optarg, ".0123456789, ")
+ && (strspn(optarg, ".0123456789, ")
< strlen(optarg))) {
fprintf(stderr, "Invalid jobs list: %s\n",
optarg);
@@ -327,11 +327,11 @@ void parse_command_line(int argc, char **argv)
xstrfmtcat(params.opt_field_list, "%s,", optarg);
break;
case 'p':
- print_fields_parsable_print =
+ print_fields_parsable_print =
PRINT_FIELDS_PARSABLE_ENDING;
break;
case 'P':
- print_fields_parsable_print =
+ print_fields_parsable_print =
PRINT_FIELDS_PARSABLE_NO_ENDING;
break;
case 'v':
@@ -350,7 +350,7 @@ void parse_command_line(int argc, char **argv)
break;
case ':':
case '?': /* getopt() has explained it */
- exit(1);
+ exit(1);
}
}
@@ -362,7 +362,7 @@ void parse_command_line(int argc, char **argv)
if (optind < argc) {
optarg = argv[optind];
if ((strspn(optarg, "0123456789, ") < strlen(optarg))
- && (strspn(optarg, ".0123456789, ")
+ && (strspn(optarg, ".0123456789, ")
< strlen(optarg))) {
fprintf(stderr, "Invalid jobs list: %s\n",
optarg);
@@ -374,7 +374,7 @@ void parse_command_line(int argc, char **argv)
_addto_job_list(params.opt_job_list, optarg);
}
- if(!params.opt_field_list)
+ if(!params.opt_field_list)
xstrfmtcat(params.opt_field_list, "%s,", STAT_FIELDS);
if (params.opt_verbose) {
@@ -385,16 +385,16 @@ void parse_command_line(int argc, char **argv)
/* specific jobs requested? */
if (params.opt_verbose && params.opt_job_list
- && list_count(params.opt_job_list)) {
+ && list_count(params.opt_job_list)) {
debug("Jobs requested:\n");
itr = list_iterator_create(params.opt_job_list);
while((selected_step = list_next(itr))) {
- if(selected_step->stepid != NO_VAL)
+ if(selected_step->stepid != NO_VAL)
debug("\t: %d.%d\n",
selected_step->jobid,
selected_step->stepid);
- else
- debug("\t: %d\n",
+ else
+ debug("\t: %d\n",
selected_step->jobid);
}
list_iterator_destroy(itr);
diff --git a/src/sstat/print.c b/src/sstat/print.c
index 69f33d1c17d8dafa88647ae168d7c3f8f6e3fef8..86ca691c6edd3113a3a832800c06f6ab588d6d4c 100644
--- a/src/sstat/print.c
+++ b/src/sstat/print.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -53,8 +53,8 @@ char *_elapsed_time(long secs, long usecs)
if(secs < 0 || secs == NO_VAL)
return NULL;
-
-
+
+
while (usecs >= 1E6) {
secs++;
usecs -= 1E6;
@@ -68,7 +68,7 @@ char *_elapsed_time(long secs, long usecs)
hours = (secs / 3600) % 24;
days = secs / 86400;
- if (days)
+ if (days)
str = xstrdup_printf("%ld-%2.2ld:%2.2ld:%2.2ld",
days, hours, minutes, seconds);
else if (hours)
@@ -89,12 +89,12 @@ void print_fields(jobacct_step_rec_t *step)
list_iterator_reset(print_fields_itr);
while((field = list_next(print_fields_itr))) {
char *tmp_char = NULL;
-
+
switch(field->type) {
case PRINT_AVECPU:
-
+
tmp_char = _elapsed_time((int)step->sacct.ave_cpu, 0);
-
+
field->print_routine(field,
tmp_char,
(curr_inx == field_count));
@@ -104,7 +104,7 @@ void print_fields(jobacct_step_rec_t *step)
convert_num_unit((float)step->sacct.ave_pages,
outbuf, sizeof(outbuf),
UNIT_KILO);
-
+
field->print_routine(field,
outbuf,
(curr_inx == field_count));
@@ -113,7 +113,7 @@ void print_fields(jobacct_step_rec_t *step)
convert_num_unit((float)step->sacct.ave_rss,
outbuf, sizeof(outbuf),
UNIT_KILO);
-
+
field->print_routine(field,
outbuf,
(curr_inx == field_count));
@@ -122,7 +122,7 @@ void print_fields(jobacct_step_rec_t *step)
convert_num_unit((float)step->sacct.ave_vsize,
outbuf, sizeof(outbuf),
UNIT_KILO);
-
+
field->print_routine(field,
outbuf,
(curr_inx == field_count));
@@ -131,7 +131,7 @@ void print_fields(jobacct_step_rec_t *step)
snprintf(outbuf, sizeof(outbuf), "%u.%u",
step->job_ptr->jobid,
step->stepid);
-
+
field->print_routine(field,
outbuf,
(curr_inx == field_count));
@@ -140,7 +140,7 @@ void print_fields(jobacct_step_rec_t *step)
convert_num_unit((float)step->sacct.max_pages,
outbuf, sizeof(outbuf),
UNIT_KILO);
-
+
field->print_routine(field,
outbuf,
(curr_inx == field_count));
@@ -163,7 +163,7 @@ void print_fields(jobacct_step_rec_t *step)
convert_num_unit((float)step->sacct.max_rss,
outbuf, sizeof(outbuf),
UNIT_KILO);
-
+
field->print_routine(field,
outbuf,
(curr_inx == field_count));
@@ -186,7 +186,7 @@ void print_fields(jobacct_step_rec_t *step)
convert_num_unit((float)step->sacct.max_vsize,
outbuf, sizeof(outbuf),
UNIT_KILO);
-
+
field->print_routine(field,
outbuf,
(curr_inx == field_count));
@@ -241,7 +241,7 @@ void print_fields(jobacct_step_rec_t *step)
xfree(tmp_char);
break;
case PRINT_TOTALCPU:
- tmp_char = _elapsed_time(step->tot_cpu_sec,
+ tmp_char = _elapsed_time(step->tot_cpu_sec,
step->tot_cpu_usec);
field->print_routine(field,
diff --git a/src/sstat/process.c b/src/sstat/process.c
index df11df8242c1e4c2ea2c189d7444cb03e360c922..0ed7f34f8381d6b56bd1b21b6541e0d89e90dde6 100644
--- a/src/sstat/process.c
+++ b/src/sstat/process.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -48,13 +48,13 @@ char *find_hostname(uint32_t pos, char *hosts)
if(!hosts || (pos == (uint32_t)NO_VAL))
return NULL;
-
+
hostlist = hostlist_create(hosts);
temp = hostlist_nth(hostlist, pos);
if(temp) {
host = xstrdup(temp);
free(temp);
- }
+ }
hostlist_destroy(hostlist);
return host;
}
@@ -66,20 +66,20 @@ void aggregate_sacct(sacct_t *dest, sacct_t *from)
dest->max_vsize_id = from->max_vsize_id;
}
dest->ave_vsize += from->ave_vsize;
-
+
if(dest->max_rss < from->max_rss) {
dest->max_rss = from->max_rss;
dest->max_rss_id = from->max_rss_id;
}
dest->ave_rss += from->ave_rss;
-
+
if(dest->max_pages < from->max_pages) {
dest->max_pages = from->max_pages;
dest->max_pages_id = from->max_pages_id;
}
dest->ave_pages += from->ave_pages;
-
- if((dest->min_cpu > from->min_cpu)
+
+ if((dest->min_cpu > from->min_cpu)
|| (dest->min_cpu == (float)NO_VAL)) {
dest->min_cpu = from->min_cpu;
dest->min_cpu_id = from->min_cpu_id;
diff --git a/src/sstat/sstat.c b/src/sstat/sstat.c
index ef15d3f024704022d2ad3d8c3c02d1fffd45c1a4..a30109696e391f747cb49ddb219a47a6ae3253ac 100644
--- a/src/sstat/sstat.c
+++ b/src/sstat/sstat.c
@@ -5,32 +5,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -41,7 +41,7 @@
void _destroy_steps(void *object);
void _print_header(void);
void *_stat_thread(void *args);
-int _sstat_query(slurm_step_layout_t *step_layout, uint32_t job_id,
+int _sstat_query(slurm_step_layout_t *step_layout, uint32_t job_id,
uint32_t step_id);
int _process_results();
int _do_stat(uint32_t jobid, uint32_t stepid);
@@ -51,26 +51,26 @@ int _do_stat(uint32_t jobid, uint32_t stepid);
*/
sstat_parameters_t params;
print_field_t fields[] = {
- {10, "AveCPU", print_fields_str, PRINT_AVECPU},
- {10, "AvePages", print_fields_str, PRINT_AVEPAGES},
- {10, "AveRSS", print_fields_str, PRINT_AVERSS},
- {10, "AveVMSize", print_fields_str, PRINT_AVEVSIZE},
- {10, "JobID", print_fields_str, PRINT_JOBID},
- {8, "MaxPages", print_fields_str, PRINT_MAXPAGES},
- {12, "MaxPagesNode", print_fields_str, PRINT_MAXPAGESNODE},
- {14, "MaxPagesTask", print_fields_int, PRINT_MAXPAGESTASK},
+ {10, "AveCPU", print_fields_str, PRINT_AVECPU},
+ {10, "AvePages", print_fields_str, PRINT_AVEPAGES},
+ {10, "AveRSS", print_fields_str, PRINT_AVERSS},
+ {10, "AveVMSize", print_fields_str, PRINT_AVEVSIZE},
+ {10, "JobID", print_fields_str, PRINT_JOBID},
+ {8, "MaxPages", print_fields_str, PRINT_MAXPAGES},
+ {12, "MaxPagesNode", print_fields_str, PRINT_MAXPAGESNODE},
+ {14, "MaxPagesTask", print_fields_int, PRINT_MAXPAGESTASK},
{10, "MaxRSS", print_fields_str, PRINT_MAXRSS},
{10, "MaxRSSNode", print_fields_str, PRINT_MAXRSSNODE},
{10, "MaxRSSTask", print_fields_int, PRINT_MAXRSSTASK},
- {10, "MaxVMSize", print_fields_str, PRINT_MAXVSIZE},
- {14, "MaxVMSizeNode", print_fields_str, PRINT_MAXVSIZENODE},
- {14, "MaxVMSizeTask", print_fields_int, PRINT_MAXVSIZETASK},
- {10, "MinCPU", print_fields_str, PRINT_MINCPU},
- {10, "MinCPUNode", print_fields_str, PRINT_MINCPUNODE},
- {10, "MinCPUTask", print_fields_int, PRINT_MINCPUTASK},
+ {10, "MaxVMSize", print_fields_str, PRINT_MAXVSIZE},
+ {14, "MaxVMSizeNode", print_fields_str, PRINT_MAXVSIZENODE},
+ {14, "MaxVMSizeTask", print_fields_int, PRINT_MAXVSIZETASK},
+ {10, "MinCPU", print_fields_str, PRINT_MINCPU},
+ {10, "MinCPUNode", print_fields_str, PRINT_MINCPUNODE},
+ {10, "MinCPUTask", print_fields_int, PRINT_MINCPUTASK},
{8, "NTasks", print_fields_int, PRINT_NTASKS},
- {10, "SystemCPU", print_fields_str, PRINT_SYSTEMCPU},
- {10, "TotalCPU", print_fields_str, PRINT_TOTALCPU},
+ {10, "SystemCPU", print_fields_str, PRINT_SYSTEMCPU},
+ {10, "TotalCPU", print_fields_str, PRINT_TOTALCPU},
{0, NULL, NULL, 0}};
List jobs = NULL;
@@ -93,14 +93,14 @@ int _sstat_query(slurm_step_layout_t *step_layout, uint32_t job_id,
int rc = SLURM_SUCCESS;
int ntasks = 0;
int tot_tasks = 0;
- debug("getting the stat of job %d on %d nodes",
+ debug("getting the stat of job %d on %d nodes",
job_id, step_layout->node_cnt);
memset(&job, 0, sizeof(jobacct_job_rec_t));
job.jobid = job_id;
memset(&step, 0, sizeof(jobacct_step_rec_t));
-
+
memset(&temp_sacct, 0, sizeof(sacct_t));
temp_sacct.min_cpu = (float)NO_VAL;
memset(&step.sacct, 0, sizeof(sacct_t));
@@ -118,39 +118,39 @@ int _sstat_query(slurm_step_layout_t *step_layout, uint32_t job_id,
r.jobacct = jobacct_gather_g_create(NULL);
msg.msg_type = MESSAGE_STAT_JOBACCT;
msg.data = &r;
-
+
ret_list = slurm_send_recv_msgs(step_layout->node_list, &msg, 0, false);
if (!ret_list) {
error("got an error no list returned");
goto cleanup;
}
-
- itr = list_iterator_create(ret_list);
+
+ itr = list_iterator_create(ret_list);
while((ret_data_info = list_next(itr))) {
switch (ret_data_info->type) {
case MESSAGE_STAT_JOBACCT:
jobacct_msg = (stat_jobacct_msg_t *)
ret_data_info->data;
if(jobacct_msg) {
- debug2("got it back for job %d",
+ debug2("got it back for job %d",
jobacct_msg->job_id);
jobacct_gather_g_2_sacct(
- &temp_sacct,
+ &temp_sacct,
jobacct_msg->jobacct);
ntasks += jobacct_msg->num_tasks;
aggregate_sacct(&step.sacct, &temp_sacct);
}
break;
case RESPONSE_SLURM_RC:
- rc = slurm_get_return_code(ret_data_info->type,
+ rc = slurm_get_return_code(ret_data_info->type,
ret_data_info->data);
- error("there was an error with the request rc = %s",
+ error("there was an error with the request rc = %s",
slurm_strerror(rc));
break;
default:
- rc = slurm_get_return_code(ret_data_info->type,
+ rc = slurm_get_return_code(ret_data_info->type,
ret_data_info->data);
- error("unknown return given %d rc = %s",
+ error("unknown return given %d rc = %s",
ret_data_info->type, slurm_strerror(rc));
break;
}
@@ -158,9 +158,9 @@ int _sstat_query(slurm_step_layout_t *step_layout, uint32_t job_id,
list_iterator_destroy(itr);
list_destroy(ret_list);
- tot_tasks += ntasks;
+ tot_tasks += ntasks;
cleanup:
-
+
if(tot_tasks) {
step.sacct.ave_cpu /= tot_tasks;
step.sacct.ave_cpu /= 100;
@@ -170,7 +170,7 @@ cleanup:
step.sacct.ave_pages /= tot_tasks;
step.ntasks = tot_tasks;
}
- jobacct_gather_g_destroy(r.jobacct);
+ jobacct_gather_g_destroy(r.jobacct);
return SLURM_SUCCESS;
}
@@ -189,18 +189,18 @@ int _do_stat(uint32_t jobid, uint32_t stepid)
req.step_id = stepid;
req_msg.msg_type = REQUEST_STEP_LAYOUT;
req_msg.data = &req;
-
+
if (slurm_send_recv_controller_msg(&req_msg, &resp_msg) < 0) {
return SLURM_ERROR;
}
-
+
switch (resp_msg.msg_type) {
case RESPONSE_STEP_LAYOUT:
step_layout = (slurm_step_layout_t *)resp_msg.data;
break;
case RESPONSE_SLURM_RC:
rc = ((return_code_msg_t *) resp_msg.data)->return_code;
- slurm_free_return_code_msg(resp_msg.data);
+ slurm_free_return_code_msg(resp_msg.data);
printf("problem getting job: %s\n", slurm_strerror(rc));
slurm_seterrno_ret(rc);
break;
@@ -208,18 +208,18 @@ int _do_stat(uint32_t jobid, uint32_t stepid)
slurm_seterrno_ret(SLURM_UNEXPECTED_MSG_ERROR);
break;
}
-
+
if(!step_layout) {
error("didn't get the job record rc = %s", slurm_strerror(rc));
return rc;
}
_sstat_query(step_layout, jobid, stepid);
-
+
print_fields(&step);
-
- slurm_step_layout_destroy(step_layout);
-
+
+ slurm_step_layout_destroy(step_layout);
+
return rc;
}
@@ -228,7 +228,7 @@ int main(int argc, char **argv)
ListIterator itr = NULL;
uint32_t stepid = 0;
jobacct_selected_step_t *selected_step = NULL;
-
+
print_fields_list = list_create(NULL);
print_fields_itr = list_iterator_create(print_fields_list);
@@ -247,26 +247,26 @@ int main(int argc, char **argv)
job_step_info_response_msg_t *step_ptr = NULL;
int i = 0;
if(slurm_get_job_steps(
- 0, selected_step->jobid, NO_VAL,
+ 0, selected_step->jobid, NO_VAL,
&step_ptr, SHOW_ALL)) {
error("couldn't get steps for job %u",
selected_step->jobid);
continue;
}
for (i = 0; i < step_ptr->job_step_count; i++) {
- _do_stat(selected_step->jobid,
+ _do_stat(selected_step->jobid,
step_ptr->job_steps[i].step_id);
}
slurm_free_job_step_info_response_msg(step_ptr);
continue;
- } else
+ } else
stepid = 0;
_do_stat(selected_step->jobid, stepid);
}
list_iterator_destroy(itr);
xfree(params.opt_field_list);
- if(params.opt_job_list)
+ if(params.opt_job_list)
list_destroy(params.opt_job_list);
if(print_fields_itr)
diff --git a/src/sstat/sstat.h b/src/sstat/sstat.h
index 242e803689d9611947a61c5abc425295e3f6e695..9d3735b03fe2ed1c7b10170016678ac6ddb510bc 100644
--- a/src/sstat/sstat.h
+++ b/src/sstat/sstat.h
@@ -8,32 +8,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
diff --git a/src/strigger/opts.c b/src/strigger/opts.c
index 8b2e8adadfae5a7036dfe6b1ae3540f39e3e993b..716c0d1d11e549ed3f8eefb3f06a46e916b823b5 100644
--- a/src/strigger/opts.c
+++ b/src/strigger/opts.c
@@ -16,15 +16,15 @@
* 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
+ * 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
+ * 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
@@ -288,7 +288,7 @@ static void _validate_options( void )
"--set, --get or --clear");
exit(1);
}
-
+
if (params.mode_clear
&& ((params.trigger_id + params.job_id + params.user_id) == 0)) {
error("You must specify a --id, --jobid, or --user to clear");
@@ -296,7 +296,7 @@ static void _validate_options( void )
}
if (params.mode_set
- && ((params.node_down + params.node_drained + params.node_fail +
+ && ((params.node_down + params.node_drained + params.node_fail +
params.node_idle + params.node_up + params.reconfig +
params.job_fini + params.time_limit + params.block_err) == 0)) {
error("You must specify a trigger (--block_err, --down, --up, "
diff --git a/src/strigger/strigger.c b/src/strigger/strigger.c
index e2ae18228811b87e2c8196b00b3725ae1efb0d53..bf69a59e50624be123995d6639a5cc805b88ad6f 100644
--- a/src/strigger/strigger.c
+++ b/src/strigger/strigger.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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.
@@ -189,18 +189,18 @@ static int _get_trigger(void)
for (i=0; i<trig_msg->record_count; i++) {
/* perform filtering */
if (params.block_err) {
- if (trig_msg->trigger_array[i].trig_type
+ if (trig_msg->trigger_array[i].trig_type
!= TRIGGER_TYPE_BLOCK_ERR)
continue;
}
if (params.job_fini) {
- if (trig_msg->trigger_array[i].trig_type
+ if (trig_msg->trigger_array[i].trig_type
!= TRIGGER_TYPE_FINI)
continue;
}
if (params.job_id) {
long jid;
- if (trig_msg->trigger_array[i].res_type
+ if (trig_msg->trigger_array[i].res_type
!= TRIGGER_RES_TYPE_JOB)
continue;
jid = atol(trig_msg->trigger_array[i].res_id);
@@ -208,28 +208,28 @@ static int _get_trigger(void)
continue;
}
if (params.node_down) {
- if ((trig_msg->trigger_array[i].res_type
+ if ((trig_msg->trigger_array[i].res_type
!= TRIGGER_RES_TYPE_NODE)
- || (trig_msg->trigger_array[i].trig_type
+ || (trig_msg->trigger_array[i].trig_type
!= TRIGGER_TYPE_DOWN))
continue;
}
if (params.node_drained) {
- if ((trig_msg->trigger_array[i].res_type
+ if ((trig_msg->trigger_array[i].res_type
!= TRIGGER_RES_TYPE_NODE)
- || (trig_msg->trigger_array[i].trig_type
+ || (trig_msg->trigger_array[i].trig_type
!= TRIGGER_TYPE_DRAINED))
continue;
}
if (params.node_fail) {
- if ((trig_msg->trigger_array[i].res_type
+ if ((trig_msg->trigger_array[i].res_type
!= TRIGGER_RES_TYPE_NODE)
- || (trig_msg->trigger_array[i].trig_type
+ || (trig_msg->trigger_array[i].trig_type
!= TRIGGER_TYPE_FAIL))
continue;
}
if (params.node_id) {
- if (trig_msg->trigger_array[i].res_type
+ if (trig_msg->trigger_array[i].res_type
!= TRIGGER_RES_TYPE_NODE)
continue;
}
@@ -241,21 +241,21 @@ static int _get_trigger(void)
continue;
}
if (params.node_up) {
- if ((trig_msg->trigger_array[i].res_type
+ if ((trig_msg->trigger_array[i].res_type
!= TRIGGER_RES_TYPE_NODE)
- || (trig_msg->trigger_array[i].trig_type
+ || (trig_msg->trigger_array[i].trig_type
!= TRIGGER_TYPE_UP))
continue;
}
if (params.time_limit) {
- if ((trig_msg->trigger_array[i].res_type
+ if ((trig_msg->trigger_array[i].res_type
!= TRIGGER_RES_TYPE_JOB)
- || (trig_msg->trigger_array[i].trig_type
+ || (trig_msg->trigger_array[i].trig_type
!= TRIGGER_TYPE_TIME))
continue;
}
if (params.trigger_id) {
- if (params.trigger_id !=
+ if (params.trigger_id !=
trig_msg->trigger_array[i].trig_id)
continue;
}
diff --git a/src/strigger/strigger.h b/src/strigger/strigger.h
index f973da29be7f66733d4d275c7da5b571adf9bc53..364fdacf5493fdecbabb06fb2d39d176bc243685 100644
--- a/src/strigger/strigger.h
+++ b/src/strigger/strigger.h
@@ -16,15 +16,15 @@
* 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
+ * 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
+ * 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
diff --git a/src/sview/Makefile.am b/src/sview/Makefile.am
index d78449c6e13222030fdd4de4a56549d84713f585..443483e4ad774c2619da7c8416804828fa2935f4 100644
--- a/src/sview/Makefile.am
+++ b/src/sview/Makefile.am
@@ -22,7 +22,7 @@ force:
$(sview_LDADD) : force
@cd `dirname $@` && $(MAKE) `basename $@`
-sview_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) $(BG_LDFLAGS) $(GTK_LIBS)
+sview_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) $(BG_LDFLAGS) $(GTK_LIBS)
sview_CFLAGS = $(GTK_CFLAGS)
else
diff --git a/src/sview/Makefile.in b/src/sview/Makefile.in
index 84feff0f607b9a975f92b24afeff6d6a80c1ddb1..aa14e4144180124dd72bba50c6dad9f54ed434cd 100644
--- a/src/sview/Makefile.in
+++ b/src/sview/Makefile.in
@@ -324,7 +324,7 @@ INCLUDES = -I$(top_srcdir) $(BG_INCLUDES)
@HAVE_GTK_TRUE@ block_info.c node_info.c resv_info.c \
@HAVE_GTK_TRUE@ submit_info.c admin_info.c common.c
-@HAVE_GTK_TRUE@sview_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) $(BG_LDFLAGS) $(GTK_LIBS)
+@HAVE_GTK_TRUE@sview_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) $(BG_LDFLAGS) $(GTK_LIBS)
@HAVE_GTK_TRUE@sview_CFLAGS = $(GTK_CFLAGS)
@HAVE_GTK_FALSE@EXTRA_sview_SOURCES = sview.h sview.c popups.c grid.c part_info.c job_info.c \
@HAVE_GTK_FALSE@ block_info.c node_info.c resv_info.c \
diff --git a/src/sview/admin_info.c b/src/sview/admin_info.c
index b32e201057c7572b199ccb97ca4434816f5b397c..632b498e3fc2fb315ee36ab89a533962c9e62a5d 100644
--- a/src/sview/admin_info.c
+++ b/src/sview/admin_info.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * admin_info.c - Functions related to admin display
+ * admin_info.c - Functions related to admin display
* mode of sview.
*****************************************************************************
* Copyright (C) 2004-2007 The Regents of the University of California.
@@ -8,21 +8,21 @@
* Written by Danny Auble <da@llnl.gov>
*
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -32,13 +32,13 @@
#define _DEBUG 0
-enum {
+enum {
SORTID_POS = POS_LOC,
- SORTID_PARTITION,
- SORTID_AVAIL,
- SORTID_TIMELIMIT,
- SORTID_NODES,
- SORTID_NODELIST,
+ SORTID_PARTITION,
+ SORTID_AVAIL,
+ SORTID_TIMELIMIT,
+ SORTID_NODES,
+ SORTID_NODELIST,
SORTID_CNT
};
@@ -67,11 +67,11 @@ static display_data_t *local_display_data = NULL;
extern void get_info_admin(GtkTable *table, display_data_t *display_data)
{
- local_display_data = display_data;
+ local_display_data = display_data;
}
-extern void set_menus_admin(void *arg, GtkTreePath *path,
+extern void set_menus_admin(void *arg, GtkTreePath *path,
GtkMenu *menu, int type)
{
GtkTreeView *tree_view = (GtkTreeView *)arg;
@@ -107,7 +107,7 @@ extern void row_clicked_admin(GtkTreeView *tree_view,
g_error("problem getting line number");
return;
}
-
+
/* part_ptr = &new_part_ptr->partition_array[line]; */
/* if(!(info = slurm_sprint_partition_info(part_ptr, 0))) { */
/* info = xmalloc(100); */
@@ -118,12 +118,12 @@ extern void row_clicked_admin(GtkTreeView *tree_view,
popup = gtk_dialog_new();
label = gtk_label_new(info);
- gtk_box_pack_end(GTK_BOX(GTK_DIALOG(popup)->vbox),
+ gtk_box_pack_end(GTK_BOX(GTK_DIALOG(popup)->vbox),
label, TRUE, TRUE, 0);
xfree(info);
gtk_widget_show(label);
-
+
gtk_widget_show(popup);
-
+
}
diff --git a/src/sview/block_info.c b/src/sview/block_info.c
index d02cfe029f8175e19bff65c5e19eddd5beff8785..6a9804f77bdb244a2164111ed900c1409af0c13b 100644
--- a/src/sview/block_info.c
+++ b/src/sview/block_info.c
@@ -1,28 +1,28 @@
/*****************************************************************************\
- * block_info.c - Functions related to Bluegene block display
+ * block_info.c - Functions related to Bluegene block display
* mode of sview.
*****************************************************************************
* Copyright (C) 2004-2007 The Regents of the University of California.
* Copyright (C) 2008 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
- *
+ *
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -44,7 +44,7 @@ typedef struct {
#endif
rm_partition_state_t state;
int size;
- int node_cnt;
+ int node_cnt;
int *bp_inx; /* list index pairs into node_table for *nodes:
* start_range_1, end_range_1,
* start_range_2, .., -1 */
@@ -60,10 +60,10 @@ typedef struct {
char *imageramdisk; /* ImageRamDisk for this block */
} sview_block_info_t;
-enum {
+enum {
SORTID_POS = POS_LOC,
SORTID_BLOCK,
- SORTID_NODELIST,
+ SORTID_NODELIST,
SORTID_COLOR,
SORTID_CONN,
SORTID_JOB,
@@ -77,10 +77,10 @@ enum {
SORTID_IMAGERAMDISK,
SORTID_IMAGEMLOADER,
#endif
- SORTID_NODES,
- SORTID_PARTITION,
+ SORTID_NODES,
+ SORTID_PARTITION,
SORTID_STATE,
- SORTID_UPDATED,
+ SORTID_UPDATED,
#ifdef HAVE_BGL
SORTID_USE,
#endif
@@ -93,7 +93,7 @@ enum {
static display_data_t display_data_block[] = {
{G_TYPE_INT, SORTID_POS, NULL, FALSE, EDIT_NONE, refresh_block,
create_model_block, admin_edit_block},
- {G_TYPE_STRING, SORTID_BLOCK, "Block ID",
+ {G_TYPE_STRING, SORTID_BLOCK, "Block ID",
TRUE, EDIT_NONE, refresh_block,
create_model_block, admin_edit_block},
{G_TYPE_STRING, SORTID_COLOR, NULL, TRUE, EDIT_NONE,
@@ -104,14 +104,14 @@ static display_data_t display_data_block[] = {
create_model_block, admin_edit_block},
{G_TYPE_STRING, SORTID_USER, "User", TRUE, EDIT_NONE, refresh_block,
create_model_block, admin_edit_block},
- {G_TYPE_STRING, SORTID_NODES, "Node Count",
+ {G_TYPE_STRING, SORTID_NODES, "Node Count",
TRUE, EDIT_NONE, refresh_block, create_model_block, admin_edit_block},
- {G_TYPE_STRING, SORTID_CONN, "Connection Type",
+ {G_TYPE_STRING, SORTID_CONN, "Connection Type",
FALSE, EDIT_NONE, refresh_block,
create_model_block, admin_edit_block},
{G_TYPE_STRING, SORTID_NODELIST, "BP List", TRUE, EDIT_NONE, refresh_block,
create_model_block, admin_edit_block},
- {G_TYPE_STRING, SORTID_PARTITION, "Partition",
+ {G_TYPE_STRING, SORTID_PARTITION, "Partition",
TRUE, EDIT_NONE, refresh_block,
create_model_block, admin_edit_block},
#ifdef HAVE_BGL
@@ -131,7 +131,7 @@ static display_data_t display_data_block[] = {
#endif
{G_TYPE_STRING, SORTID_IMAGEMLOADER, "Image Mloader",
FALSE, EDIT_NONE, refresh_block, create_model_block, admin_edit_block},
- {G_TYPE_POINTER, SORTID_NODE_INX, NULL, FALSE, EDIT_NONE,
+ {G_TYPE_POINTER, SORTID_NODE_INX, NULL, FALSE, EDIT_NONE,
refresh_resv, create_model_resv, admin_edit_resv},
{G_TYPE_INT, SORTID_SMALL_BLOCK, NULL, FALSE, EDIT_NONE, refresh_block,
create_model_block, admin_edit_block},
@@ -159,7 +159,7 @@ static display_data_t *local_display_data = NULL;
static int _in_slurm_partition(int *part_inx, int *block_inx);
static void _append_block_record(sview_block_info_t *block_ptr,
- GtkTreeStore *treestore, GtkTreeIter *iter,
+ GtkTreeStore *treestore, GtkTreeIter *iter,
int line);
static void _block_list_del(void *object)
@@ -181,7 +181,7 @@ static void _block_list_del(void *object)
it isn't copied like the chars and is freed in the api
*/
xfree(block_ptr);
-
+
}
}
@@ -189,7 +189,7 @@ static int _in_slurm_partition(int *part_inx, int *bp_inx)
{
int found = 0;
int i=0, j=0;
-
+
while(bp_inx[i] >= 0) {
j = 0;
found = 0;
@@ -205,31 +205,31 @@ static int _in_slurm_partition(int *part_inx, int *bp_inx)
return 0;
i += 2;
}
-
+
return 1;
}
static void _layout_block_record(GtkTreeView *treeview,
- sview_block_info_t *block_ptr,
+ sview_block_info_t *block_ptr,
int update)
{
char tmp_cnt[18];
GtkTreeIter iter;
- GtkTreeStore *treestore =
+ GtkTreeStore *treestore =
GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-
- add_display_treestore_line(update, treestore, &iter,
+
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_block,
SORTID_NODELIST),
block_ptr->nodes);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_block,
SORTID_CONN),
conn_type_string(
block_ptr->bg_conn_type));
#ifdef HAVE_BGL
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_block,
SORTID_IMAGEBLRTS),
block_ptr->imageblrts);
@@ -261,71 +261,71 @@ static void _layout_block_record(GtkTreeView *treeview,
#endif
if(block_ptr->job_running > NO_JOB_RUNNING)
- snprintf(tmp_cnt, sizeof(tmp_cnt),
+ snprintf(tmp_cnt, sizeof(tmp_cnt),
"%d", block_ptr->job_running);
else
snprintf(tmp_cnt, sizeof(tmp_cnt), "-");
-
- add_display_treestore_line(update, treestore, &iter,
+
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_block,
SORTID_JOB),
tmp_cnt);
#ifdef HAVE_BGL
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_block,
SORTID_USE),
node_use_string(block_ptr->bg_node_use));
-#endif
+#endif
convert_num_unit((float)block_ptr->node_cnt, tmp_cnt, sizeof(tmp_cnt),
UNIT_NONE);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_block,
SORTID_NODES),
tmp_cnt);
-
- add_display_treestore_line(update, treestore, &iter,
+
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_block,
SORTID_PARTITION),
block_ptr->slurm_part_name);
- add_display_treestore_line(update, treestore, &iter,
- find_col_name(display_data_block,
+ add_display_treestore_line(update, treestore, &iter,
+ find_col_name(display_data_block,
SORTID_STATE),
bg_block_state_string(block_ptr->state));
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_block,
SORTID_USER),
block_ptr->bg_user_name);
}
-static void _update_block_record(sview_block_info_t *block_ptr,
+static void _update_block_record(sview_block_info_t *block_ptr,
GtkTreeStore *treestore, GtkTreeIter *iter)
{
char tmp_cnt[18];
-
+
gtk_tree_store_set(treestore, iter, SORTID_COLOR,
sview_colors[block_ptr->color_inx], -1);
- gtk_tree_store_set(treestore, iter, SORTID_BLOCK,
+ gtk_tree_store_set(treestore, iter, SORTID_BLOCK,
block_ptr->bg_block_name, -1);
- gtk_tree_store_set(treestore, iter, SORTID_PARTITION,
+ gtk_tree_store_set(treestore, iter, SORTID_PARTITION,
block_ptr->slurm_part_name, -1);
- gtk_tree_store_set(treestore, iter, SORTID_STATE,
+ gtk_tree_store_set(treestore, iter, SORTID_STATE,
bg_block_state_string(block_ptr->state), -1);
- gtk_tree_store_set(treestore, iter, SORTID_USER,
+ gtk_tree_store_set(treestore, iter, SORTID_USER,
block_ptr->bg_user_name, -1);
if(block_ptr->job_running > NO_JOB_RUNNING)
- snprintf(tmp_cnt, sizeof(tmp_cnt),
+ snprintf(tmp_cnt, sizeof(tmp_cnt),
"%d", block_ptr->job_running);
else
snprintf(tmp_cnt, sizeof(tmp_cnt), "-");
-
+
gtk_tree_store_set(treestore, iter, SORTID_JOB, tmp_cnt, -1);
- gtk_tree_store_set(treestore, iter, SORTID_CONN,
+ gtk_tree_store_set(treestore, iter, SORTID_CONN,
conn_type_string(block_ptr->bg_conn_type), -1);
#ifdef HAVE_BGL
- gtk_tree_store_set(treestore, iter, SORTID_USE,
+ gtk_tree_store_set(treestore, iter, SORTID_USE,
node_use_string(block_ptr->bg_node_use), -1);
-#endif
+#endif
convert_num_unit((float)block_ptr->node_cnt, tmp_cnt, sizeof(tmp_cnt),
UNIT_NONE);
gtk_tree_store_set(treestore, iter, SORTID_NODES, tmp_cnt, -1);
@@ -333,7 +333,7 @@ static void _update_block_record(sview_block_info_t *block_ptr,
gtk_tree_store_set(treestore, iter, SORTID_NODELIST,
block_ptr->nodes, -1);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_NODE_INX, block_ptr->bp_inx, -1);
#ifdef HAVE_BGL
@@ -347,13 +347,13 @@ static void _update_block_record(sview_block_info_t *block_ptr,
gtk_tree_store_set(treestore, iter, SORTID_IMAGERAMDISK,
block_ptr->imageramdisk, -1);
- gtk_tree_store_set(treestore, iter, SORTID_SMALL_BLOCK,
+ gtk_tree_store_set(treestore, iter, SORTID_SMALL_BLOCK,
block_ptr->small_block, -1);
gtk_tree_store_set(treestore, iter, SORTID_UPDATED, 1, -1);
-
+
return;
}
-
+
static void _append_block_record(sview_block_info_t *block_ptr,
GtkTreeStore *treestore, GtkTreeIter *iter,
int line)
@@ -363,7 +363,7 @@ static void _append_block_record(sview_block_info_t *block_ptr,
_update_block_record(block_ptr, treestore, iter);
}
-static void _update_info_block(List block_list,
+static void _update_info_block(List block_list,
GtkTreeView *tree_view)
{
ListIterator itr;
@@ -384,8 +384,8 @@ static void _update_info_block(List block_list,
if (gtk_tree_model_get_iter(model, &iter, path)) {
/* make sure all the partitions are still here */
while(1) {
- gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
- SORTID_UPDATED, 0, -1);
+ gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
+ SORTID_UPDATED, 0, -1);
if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
@@ -394,46 +394,46 @@ static void _update_info_block(List block_list,
/* Report the BG Blocks */
-
+
itr = list_iterator_create(block_list);
while ((block_ptr = (sview_block_info_t*) list_next(itr))) {
if(block_ptr->node_cnt == 0)
block_ptr->node_cnt = block_ptr->size;
if(!block_ptr->slurm_part_name)
block_ptr->slurm_part_name = xstrdup("no part");
-
+
/* get the iter, or find out the list is empty goto add */
if (!gtk_tree_model_get_iter(model, &iter, path)) {
goto adding;
}
line = 0;
while(1) {
- /* search for the jobid and check to see if
+ /* search for the jobid and check to see if
it is in the list */
- gtk_tree_model_get(model, &iter, SORTID_BLOCK,
+ gtk_tree_model_get(model, &iter, SORTID_BLOCK,
&name, -1);
if(!strcmp(name, block_ptr->bg_block_name)) {
/* update with new info */
g_free(name);
- _update_block_record(block_ptr,
- GTK_TREE_STORE(model),
+ _update_block_record(block_ptr,
+ GTK_TREE_STORE(model),
&iter);
goto found;
}
g_free(name);
-
+
line++;
if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
}
adding:
- _append_block_record(block_ptr, GTK_TREE_STORE(model),
+ _append_block_record(block_ptr, GTK_TREE_STORE(model),
&iter, line);
found:
;
}
-
+
list_iterator_destroy(itr);
if(host)
free(host);
@@ -473,7 +473,7 @@ static List _create_block_list(partition_info_msg_t *part_info_ptr,
partition_info_t part;
sview_block_info_t *block_ptr = NULL;
char tmp_nodes[50];
-
+
if(!changed && block_list) {
return block_list;
}
@@ -488,8 +488,8 @@ static List _create_block_list(partition_info_msg_t *part_info_ptr,
}
for (i=0; i<block_info_ptr->record_count; i++) {
block_ptr = xmalloc(sizeof(sview_block_info_t));
-
- block_ptr->bg_block_name
+
+ block_ptr->bg_block_name
= xstrdup(block_info_ptr->
block_array[i].bg_block_id);
@@ -499,15 +499,15 @@ static List _create_block_list(partition_info_msg_t *part_info_ptr,
continue;
#ifdef HAVE_BG_FILES
- block_ptr->color_inx =
+ block_ptr->color_inx =
atoi(block_ptr->bg_block_name+7);
#else
- block_ptr->color_inx =
+ block_ptr->color_inx =
atoi(block_ptr->bg_block_name+3);
#endif
block_ptr->color_inx %= sview_colors_cnt;
-
- block_ptr->nodes
+
+ block_ptr->nodes
= xstrdup(block_info_ptr->block_array[i].nodes);
if(block_info_ptr->block_array[i].ionodes) {
block_ptr->small_block = 1;
@@ -518,8 +518,8 @@ static List _create_block_list(partition_info_msg_t *part_info_ptr,
xfree(block_ptr->nodes);
block_ptr->nodes = xstrdup(tmp_nodes);
}
-
- block_ptr->bg_user_name
+
+ block_ptr->bg_user_name
= xstrdup(block_info_ptr->
block_array[i].owner_name);
#ifdef HAVE_BGL
@@ -532,24 +532,24 @@ static List _create_block_list(partition_info_msg_t *part_info_ptr,
block_info_ptr->block_array[i].mloaderimage);
block_ptr->imageramdisk = xstrdup(
block_info_ptr->block_array[i].ramdiskimage);
-
- block_ptr->state
+
+ block_ptr->state
= block_info_ptr->block_array[i].state;
- block_ptr->bg_conn_type
+ block_ptr->bg_conn_type
= block_info_ptr->block_array[i].conn_type;
#ifdef HAVE_BGL
- block_ptr->bg_node_use
+ block_ptr->bg_node_use
= block_info_ptr->block_array[i].node_use;
#endif
- block_ptr->node_cnt
+ block_ptr->node_cnt
= block_info_ptr->block_array[i].node_cnt;
- block_ptr->bp_inx
+ block_ptr->bp_inx
= block_info_ptr->block_array[i].bp_inx;
for(j = 0; j < part_info_ptr->record_count; j++) {
part = part_info_ptr->partition_array[j];
if(_in_slurm_partition(part.node_inx,
block_ptr->bp_inx)) {
- block_ptr->slurm_part_name
+ block_ptr->slurm_part_name
= xstrdup(part.name);
break;
}
@@ -561,7 +561,7 @@ static List _create_block_list(partition_info_msg_t *part_info_ptr,
list_append(block_list, block_ptr);
}
-
+
list_sort(block_list,
(ListCmpF)_sview_block_sort_aval_dec);
@@ -580,7 +580,7 @@ void _display_info_block(List block_list,
int update = 0;
GtkTreeView *treeview = NULL;
ListIterator itr = NULL;
-
+
if(!spec_info->search_info->gchar_data) {
info = xstrdup("No pointer given!");
goto finished;
@@ -590,7 +590,7 @@ need_refresh:
if(!spec_info->display_widget) {
treeview = create_treeview_2cols_attach_to_table(
popup_win->table);
- spec_info->display_widget =
+ spec_info->display_widget =
gtk_widget_ref(GTK_WIDGET(treeview));
} else {
treeview = GTK_TREE_VIEW(spec_info->display_widget);
@@ -605,14 +605,14 @@ need_refresh:
/* we want to over ride any subgrp in error
state */
enum node_states state = NODE_STATE_UNKNOWN;
-
+
if(block_ptr->state == RM_PARTITION_ERROR)
state = NODE_STATE_ERROR;
else if(block_ptr->job_running > NO_JOB_RUNNING)
state = NODE_STATE_ALLOCATED;
else
state = NODE_STATE_IDLE;
-
+
j = 0;
while(block_ptr->bp_inx[j] >= 0) {
change_grid_color(
@@ -632,34 +632,34 @@ need_refresh:
post_setup_popup_grid_list(popup_win);
if(!found) {
- if(!popup_win->not_found) {
+ if(!popup_win->not_found) {
char *temp = "BLOCK DOESN'T EXSIST\n";
GtkTreeIter iter;
GtkTreeModel *model = NULL;
-
+
/* only time this will be run so no update */
model = gtk_tree_view_get_model(treeview);
- add_display_treestore_line(0,
- GTK_TREE_STORE(model),
+ add_display_treestore_line(0,
+ GTK_TREE_STORE(model),
&iter,
temp, "");
}
popup_win->not_found = true;
} else {
- if(popup_win->not_found) {
+ if(popup_win->not_found) {
popup_win->not_found = false;
gtk_widget_destroy(spec_info->display_widget);
-
+
goto need_refresh;
}
}
gtk_widget_show(spec_info->display_widget);
-
+
finished:
return;
}
-
+
extern void refresh_block(GtkAction *action, gpointer user_data)
{
popup_info_t *popup_win = (popup_info_t *)user_data;
@@ -680,18 +680,18 @@ extern int get_new_info_block(block_info_msg_t **block_ptr,
time_t now = time(NULL);
static time_t last;
static bool changed = 0;
-
+
if(!force && ((now - last) < global_sleep_time)) {
if(*block_ptr != bg_info_ptr)
error_code = SLURM_SUCCESS;
*block_ptr = bg_info_ptr;
- if(changed)
+ if(changed)
return SLURM_SUCCESS;
return error_code;
}
last = now;
if (bg_info_ptr) {
- error_code = slurm_load_block_info(bg_info_ptr->last_update,
+ error_code = slurm_load_block_info(bg_info_ptr->last_update,
&new_bg_ptr);
if (error_code == SLURM_SUCCESS) {
slurm_free_block_info_msg(&bg_info_ptr);
@@ -702,16 +702,16 @@ extern int get_new_info_block(block_info_msg_t **block_ptr,
changed = 0;
}
} else {
- error_code = slurm_load_block_info((time_t) NULL,
+ error_code = slurm_load_block_info((time_t) NULL,
&new_bg_ptr);
changed = 1;
}
bg_info_ptr = new_bg_ptr;
- if(*block_ptr != bg_info_ptr)
+ if(*block_ptr != bg_info_ptr)
error_code = SLURM_SUCCESS;
-
+
*block_ptr = new_bg_ptr;
#endif
return error_code;
@@ -734,46 +734,46 @@ extern int update_state_block(GtkDialog *dialog,
GTK_WINDOW(main_window),
GTK_DIALOG_MODAL
| GTK_DIALOG_DESTROY_WITH_PARENT,
- NULL));
+ NULL));
no_dialog = 1;
}
slurm_init_update_block_msg(&block_msg);
block_msg.bg_block_id = (char *)blockid;
-
+
label = gtk_dialog_add_button(dialog,
GTK_STOCK_YES, GTK_RESPONSE_OK);
gtk_window_set_default(GTK_WINDOW(dialog), label);
gtk_dialog_add_button(dialog,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-
+
if(!strcasecmp("Error", type)
|| !strcasecmp("Put block in error state", type)) {
- snprintf(tmp_char, sizeof(tmp_char),
+ snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to put block %s "
"in an error state?",
blockid);
block_msg.state = RM_PARTITION_ERROR;
} else {
- snprintf(tmp_char, sizeof(tmp_char),
+ snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to put block %s "
"in a free state?",
blockid);
block_msg.state = RM_PARTITION_FREE;
}
-
+
label = gtk_label_new(tmp_char);
-
+
gtk_box_pack_start(GTK_BOX(dialog->vbox), label, FALSE, FALSE, 0);
gtk_widget_show_all(GTK_WIDGET(dialog));
i = gtk_dialog_run(dialog);
if (i == GTK_RESPONSE_OK) {
if(slurm_update_block(&block_msg) == SLURM_SUCCESS) {
- snprintf(tmp_char, sizeof(tmp_char),
+ snprintf(tmp_char, sizeof(tmp_char),
"Block %s updated successfully",
blockid);
} else {
- snprintf(tmp_char, sizeof(tmp_char),
+ snprintf(tmp_char, sizeof(tmp_char),
"Problem updating block %s.",
blockid);
}
@@ -797,17 +797,17 @@ extern GtkListStore *create_model_block(int type)
gtk_list_store_set(model, &iter,
0, "Error",
1, SORTID_STATE,
- -1);
+ -1);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
0, "Free",
1, SORTID_STATE,
- -1);
+ -1);
break;
default:
break;
}
-
+
return model;
}
@@ -819,17 +819,17 @@ extern void admin_edit_block(GtkCellRendererText *cell,
GtkTreeStore *treestore = GTK_TREE_STORE(data);
GtkTreePath *path = gtk_tree_path_new_from_string(path_string);
GtkTreeIter iter;
- int column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell),
+ int column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell),
"column"));
-
+
char *blockid = NULL;
char *old_text = NULL;
if(!new_text || !strcmp(new_text, ""))
goto no_input;
gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path);
- gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter,
- SORTID_BLOCK, &blockid,
+ gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter,
+ SORTID_BLOCK, &blockid,
column, &old_text,
-1);
switch(column) {
@@ -875,10 +875,10 @@ extern void get_info_block(GtkTable *table, display_data_t *display_data)
display_widget = NULL;
goto display_it;
}
-
+
if((part_error_code = get_new_info_part(&part_info_ptr, force_refresh))
- == SLURM_NO_CHANGE_IN_DATA) {
-
+ == SLURM_NO_CHANGE_IN_DATA) {
+
} else if (part_error_code != SLURM_SUCCESS) {
if(view == ERROR_VIEW)
goto end_it;
@@ -888,18 +888,18 @@ extern void get_info_block(GtkTable *table, display_data_t *display_data)
sprintf(error_char, "slurm_load_partitions: %s",
slurm_strerror(slurm_get_errno()));
label = gtk_label_new(error_char);
- gtk_table_attach_defaults(GTK_TABLE(table),
+ gtk_table_attach_defaults(GTK_TABLE(table),
label,
- 0, 1, 0, 1);
- gtk_widget_show(label);
+ 0, 1, 0, 1);
+ gtk_widget_show(label);
display_widget = gtk_widget_ref(label);
goto end_it;
}
- if((block_error_code = get_new_info_block(&block_ptr,
+ if((block_error_code = get_new_info_block(&block_ptr,
force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
- if((!display_widget || view == ERROR_VIEW)
+ if((!display_widget || view == ERROR_VIEW)
|| (part_error_code != SLURM_NO_CHANGE_IN_DATA)) {
goto display_it;
}
@@ -913,14 +913,14 @@ extern void get_info_block(GtkTable *table, display_data_t *display_data)
sprintf(error_char, "slurm_load_block: %s",
slurm_strerror(slurm_get_errno()));
label = gtk_label_new(error_char);
- gtk_table_attach_defaults(table,
+ gtk_table_attach_defaults(table,
label,
- 0, 1, 0, 1);
- gtk_widget_show(label);
+ 0, 1, 0, 1);
+ gtk_widget_show(label);
display_widget = gtk_widget_ref(label);
goto end_it;
}
-
+
display_it:
block_list = _create_block_list(part_info_ptr, block_ptr,
@@ -956,11 +956,11 @@ display_it:
tree_view = create_treeview(local_display_data,
&grid_button_list);
display_widget = gtk_widget_ref(GTK_WIDGET(tree_view));
- gtk_table_attach_defaults(table,
+ gtk_table_attach_defaults(table,
GTK_WIDGET(tree_view),
- 0, 1, 0, 1);
- /* since this function sets the model of the tree_view
- to the treestore we don't really care about
+ 0, 1, 0, 1);
+ /* since this function sets the model of the tree_view
+ to the treestore we don't really care about
the return value */
create_treestore(tree_view, display_data_block,
SORTID_CNT, SORTID_NODELIST, SORTID_COLOR);
@@ -970,7 +970,7 @@ display_it:
end_it:
toggled = FALSE;
force_refresh = FALSE;
-
+
return;
}
@@ -992,7 +992,7 @@ extern void specific_info_block(popup_info_t *popup_win)
int j=0, i=-1;
hostset_t hostset = NULL;
ListIterator itr = NULL;
-
+
if(!spec_info->display_widget) {
setup_popup_info(popup_win, display_data_block, SORTID_CNT);
}
@@ -1002,11 +1002,11 @@ extern void specific_info_block(popup_info_t *popup_win)
spec_info->display_widget = NULL;
goto display_it;
}
-
- if((part_error_code = get_new_info_part(&part_info_ptr,
+
+ if((part_error_code = get_new_info_part(&part_info_ptr,
popup_win->force_refresh))
- == SLURM_NO_CHANGE_IN_DATA) {
-
+ == SLURM_NO_CHANGE_IN_DATA) {
+
} else if (part_error_code != SLURM_SUCCESS) {
if(spec_info->view == ERROR_VIEW)
goto end_it;
@@ -1016,24 +1016,24 @@ extern void specific_info_block(popup_info_t *popup_win)
sprintf(error_char, "slurm_load_partitions: %s",
slurm_strerror(slurm_get_errno()));
label = gtk_label_new(error_char);
- gtk_table_attach_defaults(popup_win->table,
+ gtk_table_attach_defaults(popup_win->table,
label,
- 0, 1, 0, 1);
- gtk_widget_show(label);
+ 0, 1, 0, 1);
+ gtk_widget_show(label);
spec_info->display_widget = gtk_widget_ref(label);
goto end_it;
}
- if((block_error_code =
+ if((block_error_code =
get_new_info_block(&block_info_ptr, popup_win->force_refresh))
- == SLURM_NO_CHANGE_IN_DATA) {
- if((!spec_info->display_widget
- || spec_info->view == ERROR_VIEW)
+ == SLURM_NO_CHANGE_IN_DATA) {
+ if((!spec_info->display_widget
+ || spec_info->view == ERROR_VIEW)
|| (part_error_code != SLURM_NO_CHANGE_IN_DATA)) {
goto display_it;
}
changed = 0;
-
+
} else if (block_error_code != SLURM_SUCCESS) {
if(spec_info->view == ERROR_VIEW)
goto end_it;
@@ -1043,14 +1043,14 @@ extern void specific_info_block(popup_info_t *popup_win)
sprintf(error_char, "slurm_load_block: %s",
slurm_strerror(slurm_get_errno()));
label = gtk_label_new(error_char);
- gtk_table_attach_defaults(popup_win->table,
+ gtk_table_attach_defaults(popup_win->table,
label,
- 0, 1, 0, 1);
- gtk_widget_show(label);
+ 0, 1, 0, 1);
+ gtk_widget_show(label);
spec_info->display_widget = gtk_widget_ref(label);
goto end_it;
}
-
+
display_it:
block_list = _create_block_list(part_info_ptr, block_info_ptr,
changed);
@@ -1064,13 +1064,13 @@ display_it:
if(spec_info->type != INFO_PAGE && !spec_info->display_widget) {
tree_view = create_treeview(local_display_data,
&popup_win->grid_button_list);
- spec_info->display_widget =
+ spec_info->display_widget =
gtk_widget_ref(GTK_WIDGET(tree_view));
- gtk_table_attach_defaults(popup_win->table,
+ gtk_table_attach_defaults(popup_win->table,
GTK_WIDGET(tree_view),
- 0, 1, 0, 1);
- /* since this function sets the model of the tree_view
- to the treestore we don't really care about
+ 0, 1, 0, 1);
+ /* since this function sets the model of the tree_view
+ to the treestore we don't really care about
the return value */
create_treestore(tree_view, popup_win->display_data,
SORTID_CNT, SORTID_BLOCK, SORTID_COLOR);
@@ -1085,7 +1085,7 @@ display_it:
/* just linking to another list, don't free the inside, just
the list */
- send_block_list = list_create(NULL);
+ send_block_list = list_create(NULL);
itr = list_iterator_create(block_list);
i = -1;
while ((block_ptr = list_next(itr))) {
@@ -1096,8 +1096,8 @@ display_it:
i++;
switch(spec_info->type) {
case PART_PAGE:
- if(strcmp(block_ptr->slurm_part_name,
- search_info->gchar_data))
+ if(strcmp(block_ptr->slurm_part_name,
+ search_info->gchar_data))
continue;
break;
case RESV_PAGE:
@@ -1111,16 +1111,16 @@ display_it:
hostset_destroy(hostset);
continue;
}
- hostset_destroy(hostset);
+ hostset_destroy(hostset);
break;
case BLOCK_PAGE:
switch(search_info->search_type) {
case SEARCH_BLOCK_NAME:
if(!search_info->gchar_data)
continue;
-
- if(strcmp(block_ptr->bg_block_name,
- search_info->gchar_data))
+
+ if(strcmp(block_ptr->bg_block_name,
+ search_info->gchar_data))
continue;
break;
case SEARCH_BLOCK_SIZE:
@@ -1135,7 +1135,7 @@ display_it:
continue;
if(block_ptr->state != search_info->int_data)
continue;
-
+
break;
default:
continue;
@@ -1143,8 +1143,8 @@ display_it:
}
break;
case JOB_PAGE:
- if(strcmp(block_ptr->bg_block_name,
- search_info->gchar_data))
+ if(strcmp(block_ptr->bg_block_name,
+ search_info->gchar_data))
continue;
break;
default:
@@ -1152,14 +1152,14 @@ display_it:
continue;
}
list_push(send_block_list, block_ptr);
-
+
if(block_ptr->state == RM_PARTITION_ERROR)
state = NODE_STATE_ERROR;
else if(block_ptr->job_running > NO_JOB_RUNNING)
state = NODE_STATE_ALLOCATED;
else
state = NODE_STATE_IDLE;
-
+
j=0;
while(block_ptr->bp_inx[j] >= 0) {
change_grid_color(
@@ -1172,14 +1172,14 @@ display_it:
}
list_iterator_destroy(itr);
post_setup_popup_grid_list(popup_win);
-
- _update_info_block(send_block_list,
+
+ _update_info_block(send_block_list,
GTK_TREE_VIEW(spec_info->display_widget));
list_destroy(send_block_list);
end_it:
popup_win->toggled = 0;
popup_win->force_refresh = 0;
-
+
return;
}
@@ -1207,8 +1207,8 @@ extern void set_menus_block(void *arg, void *arg2, GtkTreePath *path, int type)
if (!gtk_tree_model_get_iter(model, &iter, path)) {
g_error("error getting iter from model\n");
break;
- }
-
+ }
+
popup_all_block(model, &iter, INFO_PAGE);
break;
@@ -1247,25 +1247,25 @@ extern void popup_all_block(GtkTreeModel *model, GtkTreeIter *iter, int id)
case NODE_PAGE:
snprintf(title, 100, "Base Partition(s) in block %s", name);
break;
- case SUBMIT_PAGE:
+ case SUBMIT_PAGE:
snprintf(title, 100, "Submit job on %s", name);
break;
- case INFO_PAGE:
+ case INFO_PAGE:
snprintf(title, 100, "Full info for block %s", name);
break;
default:
g_print("Block got %d\n", id);
}
-
+
itr = list_iterator_create(popup_list);
while((popup_win = list_next(itr))) {
if(popup_win->spec_info)
if(!strcmp(popup_win->spec_info->title, title)) {
break;
- }
+ }
}
list_iterator_destroy(itr);
-
+
if(!popup_win) {
if(id == INFO_PAGE)
popup_win = create_popup_info(id, BLOCK_PAGE, title);
@@ -1293,8 +1293,8 @@ extern void popup_all_block(GtkTreeModel *model, GtkTreeIter *iter, int id)
gtk_tree_model_get(model, iter, SORTID_PARTITION, &name, -1);
popup_win->spec_info->search_info->gchar_data = name;
break;
- case RESV_PAGE:
- case NODE_PAGE:
+ case RESV_PAGE:
+ case NODE_PAGE:
g_free(name);
gtk_tree_model_get(model, iter, SORTID_NODELIST, &name, -1);
gtk_tree_model_get(model, iter, SORTID_SMALL_BLOCK, &i, -1);
@@ -1320,10 +1320,10 @@ extern void popup_all_block(GtkTreeModel *model, GtkTreeIter *iter, int id)
g_print("block got %d\n", id);
}
-
+
if (!g_thread_create((gpointer)popup_thr, popup_win, FALSE, &error))
{
- g_printerr ("Failed to create part popup thread: %s\n",
+ g_printerr ("Failed to create part popup thread: %s\n",
error->message);
return;
}
@@ -1340,12 +1340,12 @@ extern void admin_block(GtkTreeModel *model, GtkTreeIter *iter, char *type)
gtk_window_set_transient_for(GTK_WINDOW(popup), NULL);
gtk_tree_model_get(model, iter, SORTID_BLOCK, &blockid, -1);
-
+
update_state_block(GTK_DIALOG(popup), blockid, type);
-
+
g_free(blockid);
gtk_widget_destroy(popup);
-
+
return;
}
diff --git a/src/sview/common.c b/src/sview/common.c
index b784074540cfc0445ea9aab0873f399208a2d216..c5d755e4dea6128648acdbf95bb41286899ccc30 100644
--- a/src/sview/common.c
+++ b/src/sview/common.c
@@ -7,21 +7,21 @@
* Written by Danny Auble <da@llnl.gov>
*
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -62,22 +62,22 @@ static int _sort_iter_compare_func_char(GtkTreeModel *model,
int ret = 0;
int len1 = 0, len2 = 0;
gchar *name1 = NULL, *name2 = NULL;
-
+
gtk_tree_model_get(model, a, sortcol, &name1, -1);
gtk_tree_model_get(model, b, sortcol, &name2, -1);
-
+
if (name1 == NULL || name2 == NULL) {
if (name1 == NULL && name2 == NULL)
goto cleanup; /* both equal => ret = 0 */
-
+
ret = (name1 == NULL) ? -1 : 1;
} else {
- /* sort like a human would
+ /* sort like a human would
meaning snowflake2 would be greater than
snowflake12 */
len1 = strlen(name1);
len2 = strlen(name2);
- while((ret < len1) && (!g_ascii_isdigit(name1[ret])))
+ while((ret < len1) && (!g_ascii_isdigit(name1[ret])))
ret++;
if(ret < len1) {
if(!g_ascii_strncasecmp(name1, name2, ret)) {
@@ -91,7 +91,7 @@ static int _sort_iter_compare_func_char(GtkTreeModel *model,
} else {
ret = g_ascii_strcasecmp(name1, name2);
}
-
+
} else {
ret = g_ascii_strcasecmp(name1, name2);
}
@@ -99,7 +99,7 @@ static int _sort_iter_compare_func_char(GtkTreeModel *model,
cleanup:
g_free(name1);
g_free(name2);
-
+
return ret;
}
@@ -114,10 +114,10 @@ static int _sort_iter_compare_func_int(GtkTreeModel *model,
gtk_tree_model_get(model, a, sortcol, &int1, -1);
gtk_tree_model_get(model, b, sortcol, &int2, -1);
-
+
if (int1 != int2)
ret = (int1 > int2) ? 1 : -1;
-
+
return ret;
}
@@ -129,14 +129,14 @@ static int _sort_iter_compare_func_nodes(GtkTreeModel *model,
int sortcol = GPOINTER_TO_INT(userdata);
int ret = 0;
gchar *name1 = NULL, *name2 = NULL;
-
+
gtk_tree_model_get(model, a, sortcol, &name1, -1);
gtk_tree_model_get(model, b, sortcol, &name2, -1);
-
+
if (name1 == NULL || name2 == NULL) {
if (name1 == NULL && name2 == NULL)
goto cleanup; /* both equal => ret = 0 */
-
+
ret = (name1 == NULL) ? -1 : 1;
} else {
uint64_t int1=0, int2=0, tmp_int;
@@ -153,13 +153,13 @@ static int _sort_iter_compare_func_nodes(GtkTreeModel *model,
while(name1[spot] && g_ascii_isdigit(name1[spot])) {
spot++;
}
-
+
if(!name1[spot]) {
} else if(name1[spot] == 'K')
tmp_int *= 1024;
else if(name1[spot] == 'M')
tmp_int *= 1048576;
- else if(name1[spot] == 'G')
+ else if(name1[spot] == 'G')
tmp_int *= 1073741824;
int1 += tmp_int;
@@ -177,31 +177,31 @@ static int _sort_iter_compare_func_nodes(GtkTreeModel *model,
while(name2[spot] && g_ascii_isdigit(name2[spot])) {
spot++;
}
-
+
if(!name2[spot]) {
} else if(name2[spot] == 'K')
tmp_int *= 1024;
else if(name2[spot] == 'M')
tmp_int *= 1048576;
- else if(name2[spot] == 'G')
+ else if(name2[spot] == 'G')
tmp_int *= 1073741824;
int2 += tmp_int;
}
if (int1 != int2)
- ret = (int1 > int2) ? 1 : -1;
+ ret = (int1 > int2) ? 1 : -1;
}
cleanup:
g_free(name1);
g_free(name2);
-
+
return ret;
}
-/* Make a BlueGene node name into a numeric representation of
- * its location.
- * Value is low_coordinate * 1,000,000 +
+/* Make a BlueGene node name into a numeric representation of
+ * its location.
+ * Value is low_coordinate * 1,000,000 +
* high_coordinate * 1,000 + I/O node (999 if none)
* (e.g. bg123[4] -> 123,123,004, bg[234x235] -> 234,235,999)
*/
@@ -240,14 +240,14 @@ static int _sort_iter_compare_func_bp_list(GtkTreeModel *model,
int sortcol = GPOINTER_TO_INT(userdata);
int ret = 0;
gchar *name1 = NULL, *name2 = NULL;
-
+
gtk_tree_model_get(model, a, sortcol, &name1, -1);
gtk_tree_model_get(model, b, sortcol, &name2, -1);
-
+
if ((name1 == NULL) || (name2 == NULL)) {
if ((name1 == NULL) && (name2 == NULL))
goto cleanup; /* both equal => ret = 0 */
-
+
ret = (name1 == NULL) ? -1 : 1;
} else {
/* Sort in numeric order based upon coordinates */
@@ -256,7 +256,7 @@ static int _sort_iter_compare_func_bp_list(GtkTreeModel *model,
cleanup:
g_free(name1);
g_free(name2);
-
+
return ret;
}
@@ -281,14 +281,14 @@ static void *_editing_thr(gpointer arg)
sleep(5);
gdk_threads_enter();
msg_id = GPOINTER_TO_INT(arg);
- gtk_statusbar_remove(GTK_STATUSBAR(main_statusbar),
+ gtk_statusbar_remove(GTK_STATUSBAR(main_statusbar),
STATUS_ADMIN_EDIT, msg_id);
gdk_flush();
gdk_threads_leave();
- return NULL;
+ return NULL;
}
-static void _add_col_to_treeview(GtkTreeView *tree_view,
+static void _add_col_to_treeview(GtkTreeView *tree_view,
display_data_t *display_data, int color_column)
{
GtkTreeViewColumn *col = gtk_tree_view_column_new();
@@ -310,19 +310,19 @@ static void _add_col_to_treeview(GtkTreeView *tree_view,
NULL);
} else
renderer = gtk_cell_renderer_text_new();
-
+
g_signal_connect(renderer, "editing-started",
G_CALLBACK(_editing_started), NULL);
g_signal_connect(renderer, "editing-canceled",
G_CALLBACK(_editing_canceled), NULL);
-
+
g_signal_connect(renderer, "edited",
- G_CALLBACK(display_data->admin_edit),
+ G_CALLBACK(display_data->admin_edit),
gtk_tree_view_get_model(tree_view));
-
- g_object_set_data(G_OBJECT(renderer), "column",
+
+ g_object_set_data(G_OBJECT(renderer), "column",
GINT_TO_POINTER(display_data->id));
-
+
gtk_tree_view_column_pack_start(col, renderer, TRUE);
if(display_data->id == color_column) {
@@ -340,11 +340,11 @@ static void _add_col_to_treeview(GtkTreeView *tree_view,
gtk_tree_view_column_set_resizable(col, true);
gtk_tree_view_column_set_sort_column_id(col, display_data->id);
gtk_tree_view_column_set_title(col, display_data->name);
- }
+ }
gtk_tree_view_append_column(tree_view, col);
}
-static void _toggle_state_changed(GtkCheckMenuItem *menuitem,
+static void _toggle_state_changed(GtkCheckMenuItem *menuitem,
display_data_t *display_data)
{
if(display_data->show)
@@ -355,7 +355,7 @@ static void _toggle_state_changed(GtkCheckMenuItem *menuitem,
refresh_main(NULL, NULL);
}
-static void _popup_state_changed(GtkCheckMenuItem *menuitem,
+static void _popup_state_changed(GtkCheckMenuItem *menuitem,
display_data_t *display_data)
{
popup_info_t *popup_win = (popup_info_t *) display_data->user_data;
@@ -367,52 +367,52 @@ static void _popup_state_changed(GtkCheckMenuItem *menuitem,
(display_data->refresh)(NULL, display_data->user_data);
}
-static void _selected_page(GtkMenuItem *menuitem,
+static void _selected_page(GtkMenuItem *menuitem,
display_data_t *display_data)
{
treedata_t *treedata = (treedata_t *)display_data->user_data;
switch(display_data->extra) {
case PART_PAGE:
- popup_all_part(treedata->model, &treedata->iter,
+ popup_all_part(treedata->model, &treedata->iter,
display_data->id);
break;
case JOB_PAGE:
- popup_all_job(treedata->model, &treedata->iter,
+ popup_all_job(treedata->model, &treedata->iter,
display_data->id);
break;
case NODE_PAGE:
- popup_all_node(treedata->model, &treedata->iter,
+ popup_all_node(treedata->model, &treedata->iter,
display_data->id);
break;
- case BLOCK_PAGE:
- popup_all_block(treedata->model, &treedata->iter,
+ case BLOCK_PAGE:
+ popup_all_block(treedata->model, &treedata->iter,
display_data->id);
break;
- case RESV_PAGE:
- popup_all_resv(treedata->model, &treedata->iter,
+ case RESV_PAGE:
+ popup_all_resv(treedata->model, &treedata->iter,
display_data->id);
break;
case ADMIN_PAGE:
switch(display_data->id) {
case JOB_PAGE:
- admin_job(treedata->model, &treedata->iter,
+ admin_job(treedata->model, &treedata->iter,
display_data->name);
break;
case PART_PAGE:
- admin_part(treedata->model, &treedata->iter,
+ admin_part(treedata->model, &treedata->iter,
display_data->name);
break;
case BLOCK_PAGE:
- admin_block(treedata->model, &treedata->iter,
+ admin_block(treedata->model, &treedata->iter,
display_data->name);
break;
case RESV_PAGE:
- admin_resv(treedata->model, &treedata->iter,
+ admin_resv(treedata->model, &treedata->iter,
display_data->name);
break;
case NODE_PAGE:
- admin_node(treedata->model, &treedata->iter,
+ admin_node(treedata->model, &treedata->iter,
display_data->name);
break;
default:
@@ -433,16 +433,16 @@ extern int get_row_number(GtkTreeView *tree_view, GtkTreePath *path)
GtkTreeModel *model = gtk_tree_view_get_model(tree_view);
GtkTreeIter iter;
int line = 0;
-
+
if(!model) {
g_error("error getting the model from the tree_view");
return -1;
}
-
+
if (!gtk_tree_model_get_iter(model, &iter, path)) {
g_error("get row, error getting iter from model");
return -1;
- }
+ }
gtk_tree_model_get(model, &iter, POS_LOC, &line, -1);
return line;
}
@@ -480,16 +480,16 @@ extern void *get_pointer(GtkTreeView *tree_view, GtkTreePath *path, int loc)
GtkTreeModel *model = gtk_tree_view_get_model(tree_view);
GtkTreeIter iter;
void *ptr = NULL;
-
+
if(!model) {
g_error("error getting the model from the tree_view");
return ptr;
}
-
+
if (!gtk_tree_model_get_iter(model, &iter, path)) {
g_error("get pointer, error getting iter from model");
return ptr;
- }
+ }
gtk_tree_model_get(model, &iter, loc, &ptr, -1);
return ptr;
}
@@ -513,10 +513,10 @@ extern void make_fields_menu(popup_info_t *popup_win, GtkMenu *menu,
continue;
if(display_data->id != i)
continue;
-
+
menuitem = gtk_check_menu_item_new_with_label(
- display_data->name);
-
+ display_data->name);
+
gtk_check_menu_item_set_active(
GTK_CHECK_MENU_ITEM(menuitem),
display_data->show);
@@ -524,12 +524,12 @@ extern void make_fields_menu(popup_info_t *popup_win, GtkMenu *menu,
display_data->user_data = popup_win;
g_signal_connect(
menuitem, "toggled",
- G_CALLBACK(_popup_state_changed),
+ G_CALLBACK(_popup_state_changed),
display_data);
} else {
g_signal_connect(
menuitem, "toggled",
- G_CALLBACK(_toggle_state_changed),
+ G_CALLBACK(_toggle_state_changed),
display_data);
}
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -548,20 +548,20 @@ extern void make_options_menu(GtkTreeView *tree_view, GtkTreePath *path,
if (!gtk_tree_model_get_iter(treedata->model, &treedata->iter, path)) {
g_error("make menus error getting iter from model\n");
return;
- }
+ }
if(display_data->user_data)
xfree(display_data->user_data);
-
+
while(display_data++) {
if(display_data->id == -1)
break;
if(!display_data->name)
continue;
-
+
display_data->user_data = treedata;
- menuitem = gtk_menu_item_new_with_label(display_data->name);
+ menuitem = gtk_menu_item_new_with_label(display_data->name);
g_signal_connect(menuitem, "activate",
- G_CALLBACK(_selected_page),
+ G_CALLBACK(_selected_page),
display_data);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
}
@@ -573,25 +573,25 @@ extern GtkScrolledWindow *create_scrolled_window()
GtkWidget *table = NULL;
table = gtk_table_new(1, 1, FALSE);
- gtk_container_set_border_width(GTK_CONTAINER(table), 10);
+ gtk_container_set_border_width(GTK_CONTAINER(table), 10);
scrolled_window = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new(
- NULL, NULL));
+ NULL, NULL));
gtk_container_set_border_width(GTK_CONTAINER(scrolled_window), 10);
-
+
gtk_scrolled_window_set_policy(scrolled_window,
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
-
+
gtk_scrolled_window_add_with_viewport(scrolled_window, table);
-
+
return scrolled_window;
}
extern GtkWidget *create_entry()
{
GtkWidget *entry = gtk_entry_new();
-
+
gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
return entry;
@@ -603,23 +603,23 @@ extern void create_page(GtkNotebook *notebook, display_data_t *display_data)
GtkWidget *event_box = NULL;
GtkWidget *label = NULL;
int err;
-
+
event_box = gtk_event_box_new();
gtk_event_box_set_above_child(GTK_EVENT_BOX(event_box), FALSE);
g_signal_connect(G_OBJECT(event_box), "button-press-event",
G_CALLBACK(tab_pressed),
display_data);
-
+
label = gtk_label_new(display_data->name);
gtk_container_add(GTK_CONTAINER(event_box), label);
gtk_widget_show(label);
//(display_data->set_fields)(GTK_MENU(menu));
- if((err = gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
- GTK_WIDGET(scrolled_window),
+ if((err = gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+ GTK_WIDGET(scrolled_window),
event_box)) == -1) {
g_error("Couldn't add page to notebook\n");
}
-
+
display_data->extra = err;
}
@@ -632,7 +632,7 @@ extern GtkTreeView *create_treeview(display_data_t *local, List *button_list)
signal_params->display_data = local;
signal_params->button_list = button_list;
-
+
g_signal_connect(G_OBJECT(tree_view), "button-press-event",
G_CALLBACK(row_clicked),
signal_params);
@@ -648,8 +648,8 @@ extern GtkTreeView *create_treeview(display_data_t *local, List *button_list)
extern GtkTreeView *create_treeview_2cols_attach_to_table(GtkTable *table)
{
GtkTreeView *tree_view = GTK_TREE_VIEW(gtk_tree_view_new());
- GtkTreeStore *treestore =
- gtk_tree_store_new(3, GTK_TYPE_STRING,
+ GtkTreeStore *treestore =
+ gtk_tree_store_new(3, GTK_TYPE_STRING,
GTK_TYPE_STRING, GTK_TYPE_STRING);
GtkTreeViewColumn *col = gtk_tree_view_column_new();
GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
@@ -657,13 +657,13 @@ extern GtkTreeView *create_treeview_2cols_attach_to_table(GtkTable *table)
gtk_table_attach_defaults(table,
GTK_WIDGET(tree_view),
0, 1, 0, 1);
-
+
gtk_tree_view_set_model(tree_view, GTK_TREE_MODEL(treestore));
gtk_tree_view_column_pack_start(col, renderer, TRUE);
- gtk_tree_view_column_add_attribute(col, renderer,
+ gtk_tree_view_column_add_attribute(col, renderer,
"text", DISPLAY_NAME);
- gtk_tree_view_column_add_attribute(col, renderer,
+ gtk_tree_view_column_add_attribute(col, renderer,
"font", DISPLAY_FONT);
gtk_tree_view_column_set_title(col, "Name");
gtk_tree_view_column_set_resizable(col, true);
@@ -673,9 +673,9 @@ extern GtkTreeView *create_treeview_2cols_attach_to_table(GtkTable *table)
col = gtk_tree_view_column_new();
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_column_pack_start(col, renderer, TRUE);
- gtk_tree_view_column_add_attribute(col, renderer,
+ gtk_tree_view_column_add_attribute(col, renderer,
"text", DISPLAY_VALUE);
- gtk_tree_view_column_add_attribute(col, renderer,
+ gtk_tree_view_column_add_attribute(col, renderer,
"font", DISPLAY_FONT);
gtk_tree_view_column_set_title(col, "Value");
gtk_tree_view_column_set_resizable(col, true);
@@ -686,7 +686,7 @@ extern GtkTreeView *create_treeview_2cols_attach_to_table(GtkTable *table)
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_column_pack_start(col, renderer, TRUE);
gtk_tree_view_column_set_visible(col, false);
- gtk_tree_view_column_add_attribute(col, renderer,
+ gtk_tree_view_column_add_attribute(col, renderer,
"text", DISPLAY_FONT);
gtk_tree_view_append_column(tree_view, col);
@@ -694,7 +694,7 @@ extern GtkTreeView *create_treeview_2cols_attach_to_table(GtkTable *table)
return tree_view;
}
-extern GtkTreeStore *create_treestore(GtkTreeView *tree_view,
+extern GtkTreeStore *create_treestore(GtkTreeView *tree_view,
display_data_t *display_data,
int count, int sort_column,
int color_column)
@@ -702,36 +702,36 @@ extern GtkTreeStore *create_treestore(GtkTreeView *tree_view,
GtkTreeStore *treestore = NULL;
GType types[count];
int i=0;
-
+
/*set up the types defined in the display_data_t */
for(i=0; i<count; i++) {
types[display_data[i].id] = display_data[i].type;
}
-
+
treestore = gtk_tree_store_newv(count, types);
if(!treestore) {
g_print("Can't create treestore.\n");
return NULL;
}
-
+
gtk_tree_view_set_model(tree_view, GTK_TREE_MODEL(treestore));
for(i=1; i<count; i++) {
- if(!display_data[i].show)
+ if(!display_data[i].show)
continue;
-
+
_add_col_to_treeview(tree_view, &display_data[i], color_column);
- if(!display_data[i].name)
+ if(!display_data[i].name)
continue;
switch(display_data[i].type) {
case G_TYPE_INT:
gtk_tree_sortable_set_sort_func(
- GTK_TREE_SORTABLE(treestore),
- display_data[i].id,
+ GTK_TREE_SORTABLE(treestore),
+ display_data[i].id,
_sort_iter_compare_func_int,
- GINT_TO_POINTER(display_data[i].id),
- NULL);
-
+ GINT_TO_POINTER(display_data[i].id),
+ NULL);
+
break;
case G_TYPE_STRING:
if(!strcasecmp(display_data[i].name, "Nodes")
@@ -739,28 +739,28 @@ extern GtkTreeStore *create_treestore(GtkTreeView *tree_view,
|| !strcasecmp(display_data[i].name, "Real Memory")
|| !strcasecmp(display_data[i].name, "Tmp Disk")) {
gtk_tree_sortable_set_sort_func(
- GTK_TREE_SORTABLE(treestore),
- display_data[i].id,
+ GTK_TREE_SORTABLE(treestore),
+ display_data[i].id,
_sort_iter_compare_func_nodes,
- GINT_TO_POINTER(display_data[i].id),
- NULL);
+ GINT_TO_POINTER(display_data[i].id),
+ NULL);
break;
} else if(!strcasecmp(display_data[i].name,
"BP List")) {
gtk_tree_sortable_set_sort_func(
- GTK_TREE_SORTABLE(treestore),
- display_data[i].id,
+ GTK_TREE_SORTABLE(treestore),
+ display_data[i].id,
_sort_iter_compare_func_bp_list,
- GINT_TO_POINTER(display_data[i].id),
- NULL);
+ GINT_TO_POINTER(display_data[i].id),
+ NULL);
break;
} else {
gtk_tree_sortable_set_sort_func(
- GTK_TREE_SORTABLE(treestore),
- display_data[i].id,
+ GTK_TREE_SORTABLE(treestore),
+ display_data[i].id,
_sort_iter_compare_func_char,
- GINT_TO_POINTER(display_data[i].id),
- NULL);
+ GINT_TO_POINTER(display_data[i].id),
+ NULL);
break;
}
default:
@@ -768,30 +768,30 @@ extern GtkTreeStore *create_treestore(GtkTreeView *tree_view,
(int)display_data[i].type);
}
}
- gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(treestore),
- sort_column,
+ gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(treestore),
+ sort_column,
GTK_SORT_ASCENDING);
-
+
g_object_unref(treestore);
return treestore;
}
-extern gboolean right_button_pressed(GtkTreeView *tree_view,
+extern gboolean right_button_pressed(GtkTreeView *tree_view,
GtkTreePath *path,
- GdkEventButton *event,
+ GdkEventButton *event,
const signal_params_t *signal_params,
int type)
{
GtkMenu *menu = GTK_MENU(gtk_menu_new());
display_data_t *display_data = signal_params->display_data;
-
+
if(type == ROW_CLICKED) {
/* These next 2 functions are there to keep the keyboard in
sync */
gtk_tree_view_set_cursor(tree_view, path, NULL, false);
gtk_widget_grab_focus(GTK_WIDGET(tree_view));
-
+
/* highlight the nodes from this row */
(display_data->set_menu)(tree_view, *signal_params->button_list,
path, ROW_LEFT_CLICKED);
@@ -805,7 +805,7 @@ extern gboolean right_button_pressed(GtkTreeView *tree_view,
return true;
}
-extern gboolean left_button_pressed(GtkTreeView *tree_view,
+extern gboolean left_button_pressed(GtkTreeView *tree_view,
GtkTreePath *path,
const signal_params_t *signal_params)
{
@@ -816,7 +816,7 @@ extern gboolean left_button_pressed(GtkTreeView *tree_view,
GtkTreeModel *model = gtk_tree_view_get_model(tree_view);
display_data_t *display_data = signal_params->display_data;
static gpointer *last_user_data = NULL;
-
+
/* These next 2 functions are there to keep the keyboard in
sync */
gtk_tree_view_set_cursor(tree_view, path, NULL, false);
@@ -825,16 +825,16 @@ extern gboolean left_button_pressed(GtkTreeView *tree_view,
/* highlight the nodes from this row */
(display_data->set_menu)(tree_view, *signal_params->button_list,
path, ROW_LEFT_CLICKED);
-
+
/* make sure it was a double click */
if (!gtk_tree_model_get_iter(model, &iter, path)) {
g_error("left pressed, error getting iter from model\n");
return rc;
- }
- if(!(now-last_time)
+ }
+ if(!(now-last_time)
&& (!last_user_data || (iter.user_data == last_user_data))) {
/* double click */
- (display_data->set_menu)(tree_view, NULL, path, FULL_CLICKED);
+ (display_data->set_menu)(tree_view, NULL, path, FULL_CLICKED);
}
last_user_data = iter.user_data;
@@ -856,11 +856,11 @@ extern gboolean row_activated(GtkTreeView *tree_view, GtkTreePath *path,
path, ROW_LEFT_CLICKED);
/* display the full info */
(display_data->set_menu)(tree_view, NULL, path, FULL_CLICKED);
-
+
return false;
}
-extern gboolean row_clicked(GtkTreeView *tree_view, GdkEventButton *event,
+extern gboolean row_clicked(GtkTreeView *tree_view, GdkEventButton *event,
const signal_params_t *signal_params)
{
GtkTreePath *path = NULL;
@@ -868,7 +868,7 @@ extern gboolean row_clicked(GtkTreeView *tree_view, GdkEventButton *event,
gboolean did_something = FALSE;
if(!gtk_tree_view_get_path_at_pos(tree_view,
- (gint) event->x,
+ (gint) event->x,
(gint) event->y,
&path, NULL, NULL, NULL)) {
return did_something;
@@ -878,7 +878,7 @@ extern gboolean row_clicked(GtkTreeView *tree_view, GdkEventButton *event,
gtk_tree_selection_unselect_all(selection);
gtk_tree_selection_select_path(selection, path);
- if(event->x <= 20) {
+ if(event->x <= 20) {
/* When you try to resize a column this event happens
for some reason. Resizing always happens in the
first 2 of x so if that happens just return and
@@ -892,13 +892,13 @@ extern gboolean row_clicked(GtkTreeView *tree_view, GdkEventButton *event,
tree_view, path, signal_params);
} else if(event->button == 3) {
/* right click */
- right_button_pressed(tree_view, path, event,
+ right_button_pressed(tree_view, path, event,
signal_params, ROW_CLICKED);
did_something = TRUE;
} else if(!admin_mode)
did_something = TRUE;
gtk_tree_path_free(path);
-
+
return did_something;
}
@@ -913,7 +913,7 @@ extern popup_info_t *create_popup_info(int type, int dest_type, char *title)
popup_info_t *popup_win = xmalloc(sizeof(popup_info_t));
list_push(popup_list, popup_win);
-
+
popup_win->spec_info = xmalloc(sizeof(specific_info_t));
popup_win->spec_info->search_info =
xmalloc(sizeof(sview_search_info_t));
@@ -939,7 +939,7 @@ extern popup_info_t *create_popup_info(int type, int dest_type, char *title)
popup_win->force_refresh = 0;
popup_win->type = dest_type;
popup_win->not_found = false;
- gtk_window_set_default_size(GTK_WINDOW(popup_win->popup),
+ gtk_window_set_default_size(GTK_WINDOW(popup_win->popup),
600, 400);
gtk_window_set_transient_for(GTK_WINDOW(popup_win->popup), NULL);
popup = popup_win->popup;
@@ -947,17 +947,17 @@ extern popup_info_t *create_popup_info(int type, int dest_type, char *title)
popup_win->event_box = gtk_event_box_new();
label = gtk_label_new(popup_win->spec_info->title);
gtk_container_add(GTK_CONTAINER(popup_win->event_box), label);
-
+
g_signal_connect(G_OBJECT(popup_win->event_box),
"button-press-event",
G_CALLBACK(redo_popup),
popup_win);
-
+
gtk_event_box_set_above_child(
- GTK_EVENT_BOX(popup_win->event_box),
+ GTK_EVENT_BOX(popup_win->event_box),
FALSE);
-
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
+
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
popup_win->event_box, FALSE, FALSE, 0);
window = create_scrolled_window();
@@ -971,58 +971,58 @@ extern popup_info_t *create_popup_info(int type, int dest_type, char *title)
popup_win->grid_button_list = NULL;
table = gtk_table_new(1, 2, FALSE);
-
+
gtk_table_attach(GTK_TABLE(table), GTK_WIDGET(window), 0, 1, 0, 1,
GTK_SHRINK, GTK_EXPAND | GTK_FILL,
0, 0);
-
+
window = create_scrolled_window();
bin = GTK_BIN(&window->container);
view = GTK_VIEWPORT(bin->child);
bin = GTK_BIN(&view->bin);
popup_win->table = GTK_TABLE(bin->child);
- gtk_table_attach_defaults(GTK_TABLE(table), GTK_WIDGET(window),
+ gtk_table_attach_defaults(GTK_TABLE(table), GTK_WIDGET(window),
1, 2, 0, 1);
-
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
+
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
table, TRUE, TRUE, 0);
-
+
g_signal_connect(G_OBJECT(popup_win->popup), "delete_event",
- G_CALLBACK(delete_popup),
+ G_CALLBACK(delete_popup),
popup_win->spec_info->title);
g_signal_connect(G_OBJECT(popup_win->popup), "response",
- G_CALLBACK(_handle_response),
+ G_CALLBACK(_handle_response),
popup_win);
-
+
gtk_widget_show_all(popup_win->popup);
return popup_win;
}
-extern void setup_popup_info(popup_info_t *popup_win,
- display_data_t *display_data,
+extern void setup_popup_info(popup_info_t *popup_win,
+ display_data_t *display_data,
int cnt)
{
int i = 0;
-
+
popup_win->display_data = xmalloc(sizeof(display_data_t)*(cnt+2));
for(i=0; i<cnt+1; i++) {
- memcpy(&popup_win->display_data[i],
- &display_data[i],
+ memcpy(&popup_win->display_data[i],
+ &display_data[i],
sizeof(display_data_t));
}
}
-extern void redo_popup(GtkWidget *widget, GdkEventButton *event,
+extern void redo_popup(GtkWidget *widget, GdkEventButton *event,
popup_info_t *popup_win)
{
if(event->button == 3) {
GtkMenu *menu = GTK_MENU(gtk_menu_new());
-
- (popup_win->display_data->set_menu)(popup_win, menu,
- NULL,
+
+ (popup_win->display_data->set_menu)(popup_win, menu,
+ NULL,
POPUP_CLICKED);
-
+
gtk_widget_show_all(GTK_WIDGET(menu));
gtk_menu_popup(menu, NULL, NULL, NULL, NULL,
(event != NULL) ? event->button : 0,
@@ -1048,7 +1048,7 @@ extern void destroy_specific_info(void *arg)
if(spec_info) {
xfree(spec_info->title);
- destroy_search_info(spec_info->search_info);
+ destroy_search_info(spec_info->search_info);
if(spec_info->display_widget) {
gtk_widget_destroy(spec_info->display_widget);
@@ -1061,13 +1061,13 @@ extern void destroy_specific_info(void *arg)
extern void destroy_popup_info(void *arg)
{
popup_info_t *popup_win = (popup_info_t *)arg;
-
+
if(popup_win) {
*popup_win->running = 0;
//g_print("locking destroy_popup_info\n");
g_static_mutex_lock(&sview_mutex);
//g_print("locked\n");
- /* these are all childern of each other so must
+ /* these are all childern of each other so must
be freed in this order */
if(popup_win->grid_button_list) {
list_destroy(popup_win->grid_button_list);
@@ -1089,19 +1089,19 @@ extern void destroy_popup_info(void *arg)
gtk_widget_destroy(popup_win->popup);
popup_win->popup = NULL;
}
-
+
destroy_specific_info(popup_win->spec_info);
xfree(popup_win->display_data);
xfree(popup_win);
g_static_mutex_unlock(&sview_mutex);
}
-
+
}
extern void destroy_signal_params(void *arg)
{
signal_params_t *signal_params = (signal_params_t *)arg;
-
+
if(signal_params) {
xfree(signal_params);
}
@@ -1111,7 +1111,7 @@ extern gboolean delete_popup(GtkWidget *widget, GtkWidget *event, char *title)
{
ListIterator itr = list_iterator_create(popup_list);
popup_info_t *popup_win = NULL;
-
+
while((popup_win = list_next(itr))) {
if(popup_win->spec_info) {
if(!strcmp(popup_win->spec_info->title, title)) {
@@ -1123,7 +1123,7 @@ extern gboolean delete_popup(GtkWidget *widget, GtkWidget *event, char *title)
}
}
list_iterator_destroy(itr);
-
+
return FALSE;
}
@@ -1142,13 +1142,13 @@ extern void *popup_thr(popup_info_t *popup_win)
case NODE_PAGE:
specifc_info = specific_info_node;
break;
- case BLOCK_PAGE:
+ case BLOCK_PAGE:
specifc_info = specific_info_block;
break;
- case RESV_PAGE:
+ case RESV_PAGE:
specifc_info = specific_info_resv;
break;
- case SUBMIT_PAGE:
+ case SUBMIT_PAGE:
default:
g_print("thread got unknown type %d\n", popup_win->type);
return NULL;
@@ -1167,7 +1167,7 @@ extern void *popup_thr(popup_info_t *popup_win)
g_static_mutex_unlock(&sview_mutex);
//g_print("done popup_thr\n");
sleep(global_sleep_time);
- }
+ }
return NULL;
}
@@ -1176,14 +1176,14 @@ extern void remove_old(GtkTreeModel *model, int updated)
GtkTreePath *path = gtk_tree_path_new_first();
GtkTreeIter iter;
int i;
-
+
/* remove all old partitions */
if (gtk_tree_model_get_iter(model, &iter, path)) {
while(1) {
gtk_tree_model_get(model, &iter, updated, &i, -1);
if(!i) {
if(!gtk_tree_store_remove(
- GTK_TREE_STORE(model),
+ GTK_TREE_STORE(model),
&iter))
break;
else
@@ -1205,7 +1205,7 @@ extern GtkWidget *create_pulldown_combo(display_data_t *display_data,
GtkTreeIter iter;
GtkCellRenderer *renderer = NULL;
int i=0;
-
+
store = gtk_list_store_new(2, G_TYPE_INT, G_TYPE_STRING);
for(i=0; i<count; i++) {
if(display_data[i].id == -1)
@@ -1215,13 +1215,13 @@ extern GtkWidget *create_pulldown_combo(display_data_t *display_data,
1, display_data[i].name, -1);
}
combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store));
-
- g_object_unref(store);
+
+ g_object_unref(store);
renderer = gtk_cell_renderer_text_new();
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, TRUE);
gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(combo), renderer,
"text", 1);
-
+
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
return combo;
}
@@ -1230,7 +1230,7 @@ extern GtkWidget *create_pulldown_combo(display_data_t *display_data,
* str_tolower - convert string to all lower case
* upper_str IN - upper case input string
* RET - lower case version of upper_str, caller must be xfree
- */
+ */
extern char *str_tolower(char *upper_str)
{
int i = strlen(upper_str) + 1;
@@ -1262,15 +1262,15 @@ extern char *get_reason()
char *user_name = NULL;
char time_buf[64], time_str[32];
time_t now = time(NULL);
-
+
gtk_container_set_border_width(GTK_CONTAINER(table), 10);
-
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
+
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
table, FALSE, FALSE, 0);
-
- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
+
+ gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
gtk_table_attach_defaults(GTK_TABLE(table), entry, 1, 2, 0, 1);
-
+
gtk_widget_show_all(popup);
response = gtk_dialog_run (GTK_DIALOG(popup));
@@ -1293,13 +1293,13 @@ extern char *get_reason()
xstrcat(reason_str, time_buf);
}
slurm_make_time_str(&now, time_str, sizeof(time_str));
- snprintf(time_buf, sizeof(time_buf), "@%s]", time_str);
+ snprintf(time_buf, sizeof(time_buf), "@%s]", time_str);
xstrcat(reason_str, time_buf);
- } else
+ } else
reason_str = xstrdup("cancelled");
end_it:
- gtk_widget_destroy(popup);
-
+ gtk_widget_destroy(popup);
+
return reason_str;
}
@@ -1309,7 +1309,7 @@ extern void display_admin_edit(GtkTable *table, void *type_msg, int *row,
GCallback changed_callback,
GCallback focus_callback,
void (*set_active)(
- GtkComboBox *combo,
+ GtkComboBox *combo,
GtkTreeModel *model, GtkTreeIter *iter,
int type))
{
@@ -1330,32 +1330,32 @@ extern void display_admin_edit(GtkTable *table, void *type_msg, int *row,
}
entry = gtk_combo_box_new_with_model(model2);
g_object_unref(model2);
-
+
/* (callback)_set_active_combo_part(GTK_COMBO_BOX(entry), model, */
/* iter, display_data->id); */
(set_active)(GTK_COMBO_BOX(entry), model,
iter, display_data->id);
-
+
g_signal_connect(entry, "changed",
changed_callback,
type_msg);
-
+
renderer = gtk_cell_renderer_text_new();
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(entry),
renderer, TRUE);
gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(entry),
renderer, "text", 0);
} else if(display_data->extra == EDIT_TEXTBOX) {
- char *temp_char = NULL;
+ char *temp_char = NULL;
/* other edittable items that are unknown */
entry = create_entry();
gtk_tree_model_get(model, iter,
display_data->id,
&temp_char, -1);
- gtk_entry_set_max_length(GTK_ENTRY(entry),
+ gtk_entry_set_max_length(GTK_ENTRY(entry),
(DEFAULT_ENTRY_LENGTH +
display_data->id));
-
+
if(temp_char) {
gtk_entry_set_text(GTK_ENTRY(entry),
temp_char);
@@ -1368,7 +1368,7 @@ extern void display_admin_edit(GtkTable *table, void *type_msg, int *row,
return;
label = gtk_label_new(display_data->name);
gtk_table_attach(table, label, 0, 1, *row, (*row)+1,
- GTK_FILL | GTK_EXPAND, GTK_SHRINK,
+ GTK_FILL | GTK_EXPAND, GTK_SHRINK,
0, 0);
gtk_table_attach(table, entry, 1, 2, *row, (*row)+1,
GTK_FILL, GTK_SHRINK,
@@ -1381,7 +1381,7 @@ extern void display_edit_note(char *edit_note)
GError *error = NULL;
int msg_id = 0;
gtk_statusbar_pop(GTK_STATUSBAR(main_statusbar), STATUS_ADMIN_EDIT);
- msg_id = gtk_statusbar_push(GTK_STATUSBAR(main_statusbar),
+ msg_id = gtk_statusbar_push(GTK_STATUSBAR(main_statusbar),
STATUS_ADMIN_EDIT,
edit_note);
if (!g_thread_create(_editing_thr, GINT_TO_POINTER(msg_id),
@@ -1407,12 +1407,12 @@ extern void add_display_treestore_line(int update,
char *display_name = NULL;
GtkTreePath *path = gtk_tree_path_new_first();
gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), iter, path);
-
+
while(1) {
- /* search for the jobid and check to see if
+ /* search for the jobid and check to see if
it is in the list */
gtk_tree_model_get(GTK_TREE_MODEL(treestore), iter,
- DISPLAY_NAME,
+ DISPLAY_NAME,
&display_name, -1);
if(!strcmp(display_name, name)) {
/* update with new info */
@@ -1420,19 +1420,19 @@ extern void add_display_treestore_line(int update,
goto found;
}
g_free(display_name);
-
+
if(!gtk_tree_model_iter_next(GTK_TREE_MODEL(treestore),
iter)) {
return;
}
}
-
+
} else {
gtk_tree_store_append(treestore, iter, NULL);
}
found:
gtk_tree_store_set(treestore, iter,
- DISPLAY_NAME, name,
+ DISPLAY_NAME, name,
DISPLAY_VALUE, value,
-1);
@@ -1455,12 +1455,12 @@ extern void add_display_treestore_line_with_font(
char *display_name = NULL;
GtkTreePath *path = gtk_tree_path_new_first();
gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), iter, path);
-
+
while(1) {
- /* search for the jobid and check to see if
+ /* search for the jobid and check to see if
it is in the list */
gtk_tree_model_get(GTK_TREE_MODEL(treestore), iter,
- DISPLAY_NAME,
+ DISPLAY_NAME,
&display_name, -1);
if(!strcmp(display_name, name)) {
/* update with new info */
@@ -1468,19 +1468,19 @@ extern void add_display_treestore_line_with_font(
goto found;
}
g_free(display_name);
-
+
if(!gtk_tree_model_iter_next(GTK_TREE_MODEL(treestore),
iter)) {
return;
}
}
-
+
} else {
gtk_tree_store_append(treestore, iter, NULL);
}
found:
gtk_tree_store_set(treestore, iter,
- DISPLAY_NAME, name,
+ DISPLAY_NAME, name,
DISPLAY_VALUE, value,
DISPLAY_FONT, font,
-1);
@@ -1496,21 +1496,21 @@ extern void sview_widget_modify_bg(GtkWidget *widget, GtkStateType state,
/* START_TIMER; */
if(grid_speedup) {
/* For some reason, QT Themes have a very slow call to for
- * gtk_widget_modify_bg as of 7-6-09.
+ * gtk_widget_modify_bg as of 7-6-09.
* Here we only take around 40 microsecs where
* gtk_widget_modify_bg takes around 2500. This isn't
* that big of a deal on most systems, but if you have
* like 10000 nodes this makes an outrageous
* difference. You must follow this up by doing a
* gtk_widget_set_sensitive 0, and then 1 on the
- * parent container to make the color stick.
+ * parent container to make the color stick.
*/
GtkRcStyle *rc_style = gtk_widget_get_modifier_style (widget);
widget->style->bg[state] = color;
rc_style->bg[state] = color;
rc_style->color_flags[state] |= GTK_RC_BG;
gtk_widget_reset_rc_styles (widget);
- } else
+ } else
gtk_widget_modify_bg(widget, state, &color);
/* END_TIMER; */
diff --git a/src/sview/grid.c b/src/sview/grid.c
index 1d636d2a7324daba25344c5f2f6871cd74e07b59..6c1c4c41fd334d99bed9db8bd4cc83d282236205 100644
--- a/src/sview/grid.c
+++ b/src/sview/grid.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -45,7 +45,7 @@
List grid_button_list = NULL;
List blinking_button_list = NULL;
-char *sview_colors[] = {"#0000FF", "#00FF00", "#00FFFF", "#FFFF00",
+char *sview_colors[] = {"#0000FF", "#00FF00", "#00FFFF", "#FFFF00",
"#FF0000", "#4D4DC6", "#F09A09", "#BDFA19",
"#715627", "#6A8CA2", "#4C7127", "#25B9B9",
"#A020F0", "#8293ED", "#FFA500", "#FFC0CB",
@@ -75,10 +75,10 @@ static gboolean _mouseover_node(GtkWidget *widget, GdkEventButton *event,
grid_button->last_state = GTK_WIDGET_STATE(widget);
#ifdef GTK2_USE_TOOLTIP
- gtk_widget_set_tooltip_text(grid_button->button,
+ gtk_widget_set_tooltip_text(grid_button->button,
grid_button->node_name);
#else
- if(!grid_button->tip)
+ if(!grid_button->tip)
grid_button->tip = gtk_tooltips_new();
gtk_tooltips_set_tip(grid_button->tip,
grid_button->button,
@@ -99,7 +99,7 @@ static gboolean _mouseoff_node(GtkWidget *widget, GdkEventButton *event,
return rc;
}
-static gboolean _open_node(GtkWidget *widget, GdkEventButton *event,
+static gboolean _open_node(GtkWidget *widget, GdkEventButton *event,
grid_button_t *grid_button)
{
if(event->button == 1) {
@@ -113,7 +113,7 @@ static gboolean _open_node(GtkWidget *widget, GdkEventButton *event,
}
#ifdef HAVE_BG
-static void _open_block(GtkWidget *widget, GdkEventButton *event,
+static void _open_block(GtkWidget *widget, GdkEventButton *event,
grid_button_t *grid_button)
{
GError *error = NULL;
@@ -121,7 +121,7 @@ static void _open_block(GtkWidget *widget, GdkEventButton *event,
ListIterator itr = NULL;
popup_info_t *popup_win = NULL;
- snprintf(title, 100,
+ snprintf(title, 100,
"Info about block containing %s", grid_button->node_name);
itr = list_iterator_create(popup_list);
@@ -129,7 +129,7 @@ static void _open_block(GtkWidget *widget, GdkEventButton *event,
if(popup_win->spec_info)
if(!strcmp(popup_win->spec_info->title, title)) {
break;
- }
+ }
}
list_iterator_destroy(itr);
@@ -142,10 +142,10 @@ static void _open_block(GtkWidget *widget, GdkEventButton *event,
if (!g_thread_create((gpointer)popup_thr, popup_win,
FALSE, &error)) {
g_printerr ("Failed to create block "
- "grid popup thread: %s\n",
+ "grid popup thread: %s\n",
error->message);
return;
- }
+ }
} else
gtk_window_present(GTK_WINDOW(popup_win->popup));
return;
@@ -158,29 +158,29 @@ static void _add_button_signals(grid_button_t *grid_button)
"button-press-event",
G_CALLBACK(_open_node),
grid_button);
- g_signal_connect(G_OBJECT(grid_button->button),
+ g_signal_connect(G_OBJECT(grid_button->button),
"enter-notify-event",
G_CALLBACK(_mouseover_node),
grid_button);
- g_signal_connect(G_OBJECT(grid_button->button),
+ g_signal_connect(G_OBJECT(grid_button->button),
"leave-notify-event",
G_CALLBACK(_mouseoff_node),
grid_button);
}
-/*
+/*
* Comparator used for sorting buttons
- *
- * returns: -1: button_a->inx > button_b->inx
+ *
+ * returns: -1: button_a->inx > button_b->inx
* 0: rec_a == rec_b
* 1: rec_a < rec_b
- *
+ *
*/
static int _sort_button_inx(grid_button_t *button_a, grid_button_t *button_b)
{
int inx_a = button_a->inx;
int inx_b = button_b->inx;
-
+
if (inx_a < inx_b)
return -1;
else if (inx_a > inx_b)
@@ -198,7 +198,7 @@ void _put_button_as_down(grid_button_t *grid_button, int state)
return;
}
- gtk_widget_destroy(grid_button->button);
+ gtk_widget_destroy(grid_button->button);
grid_button->color = NULL;
grid_button->color_inx = MAKE_DOWN;
grid_button->button = gtk_event_box_new();
@@ -206,7 +206,7 @@ void _put_button_as_down(grid_button_t *grid_button, int state)
gtk_event_box_set_above_child(GTK_EVENT_BOX(grid_button->button),
FALSE);
_add_button_signals(grid_button);
-
+
/* if(grid_button->frame) */
/* gtk_container_add(GTK_CONTAINER(grid_button->frame), */
/* grid_button->button); */
@@ -218,7 +218,7 @@ void _put_button_as_down(grid_button_t *grid_button, int state)
(grid_button->table_y+1),
GTK_SHRINK, GTK_SHRINK,
1, 1);
-
+
//gdk_color_parse("black", &color);
//sview_widget_modify_bg(grid_button->button, GTK_STATE_NORMAL, color);
//gdk_color_parse(white_color, &color);
@@ -226,12 +226,12 @@ void _put_button_as_down(grid_button_t *grid_button, int state)
if(state == NODE_STATE_DRAIN)
image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_ERROR,
GTK_ICON_SIZE_SMALL_TOOLBAR);
- else
+ else
image = gtk_image_new_from_stock(GTK_STOCK_CANCEL,
GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_container_add(GTK_CONTAINER(grid_button->button), image);
gtk_widget_show_all(grid_button->button);
- return;
+ return;
}
@@ -240,11 +240,11 @@ void _put_button_as_up(grid_button_t *grid_button)
if(GTK_IS_BUTTON(grid_button->button)) {
return;
}
- gtk_widget_destroy(grid_button->button);
+ gtk_widget_destroy(grid_button->button);
grid_button->button = gtk_button_new();
gtk_widget_set_size_request(grid_button->button, 10, 10);
_add_button_signals(grid_button);
-
+
/* if(grid_button->frame) */
/* gtk_container_add(GTK_CONTAINER(grid_button->frame), */
/* grid_button->button); */
@@ -266,7 +266,7 @@ void _put_button_as_inactive(grid_button_t *grid_button)
//gtk_widget_set_sensitive (grid_button->button, FALSE);
return;
}
- gtk_widget_destroy(grid_button->button);
+ gtk_widget_destroy(grid_button->button);
grid_button->button = gtk_button_new();
gtk_widget_set_size_request(grid_button->button, 10, 10);
//gtk_widget_set_sensitive (grid_button->button, FALSE);
@@ -334,16 +334,16 @@ extern grid_button_t *create_grid_button_from_another(
if(color_inx >= 0) {
color_inx %= sview_colors_cnt;
new_col = sview_colors[color_inx];
- } else if(color_inx == MAKE_BLACK)
+ } else if(color_inx == MAKE_BLACK)
new_col = blank_color;
- else
+ else
new_col = white_color;
-
+
send_grid_button = xmalloc(sizeof(grid_button_t));
memcpy(send_grid_button, grid_button, sizeof(grid_button_t));
node_base_state = send_grid_button->state & NODE_STATE_BASE;
send_grid_button->color_inx = color_inx;
-
+
/* need to set the table to empty because we will want to fill
this into the new table later */
send_grid_button->table = NULL;
@@ -352,7 +352,7 @@ extern grid_button_t *create_grid_button_from_another(
//gtk_widget_set_sensitive (send_grid_button->button, FALSE);
gdk_color_parse(new_col, &color);
send_grid_button->color = new_col;
- sview_widget_modify_bg(send_grid_button->button,
+ sview_widget_modify_bg(send_grid_button->button,
GTK_STATE_NORMAL, color);
/* sview_widget_modify_bg(send_grid_button->button, */
/* GTK_STATE_PRELIGHT, color); */
@@ -365,7 +365,7 @@ extern grid_button_t *create_grid_button_from_another(
GTK_EVENT_BOX(send_grid_button->button),
FALSE);
gdk_color_parse("black", &color);
- sview_widget_modify_bg(send_grid_button->button,
+ sview_widget_modify_bg(send_grid_button->button,
GTK_STATE_NORMAL, color);
//gdk_color_parse("white", &color);
/* sview_widget_modify_bg(send_grid_button->button, */
@@ -379,7 +379,7 @@ extern grid_button_t *create_grid_button_from_another(
GtkWidget *image = gtk_image_new_from_stock(
GTK_STOCK_DIALOG_ERROR,
GTK_ICON_SIZE_SMALL_TOOLBAR);
-
+
send_grid_button->button = gtk_event_box_new();
gtk_event_box_set_above_child(
GTK_EVENT_BOX(send_grid_button->button),
@@ -392,20 +392,20 @@ extern grid_button_t *create_grid_button_from_another(
/* GTK_STATE_PRELIGHT, color); */
gtk_container_add(
GTK_CONTAINER(send_grid_button->button),
- image);
+ image);
} else {
send_grid_button->button = gtk_button_new();
- send_grid_button->color = new_col;
+ send_grid_button->color = new_col;
gdk_color_parse(new_col, &color);
- sview_widget_modify_bg(send_grid_button->button,
+ sview_widget_modify_bg(send_grid_button->button,
GTK_STATE_NORMAL, color);
/* sview_widget_modify_bg(send_grid_button->button, */
/* GTK_STATE_PRELIGHT, color); */
}
gtk_widget_set_size_request(send_grid_button->button, 10, 10);
-
+
send_grid_button->node_name = xstrdup(name);
-
+
return send_grid_button;
}
@@ -419,18 +419,18 @@ extern char *change_grid_color(List button_list, int start, int end,
uint16_t node_base_state;
GdkColor color;
char *new_col = NULL;
-
+
if(!button_list)
return NULL;
if(color_inx >= 0) {
color_inx %= sview_colors_cnt;
new_col = sview_colors[color_inx];
- } else if(color_inx == MAKE_BLACK)
+ } else if(color_inx == MAKE_BLACK)
new_col = blank_color;
- else
+ else
new_col = white_color;
-
+
gdk_color_parse(new_col, &color);
itr = list_iterator_create(button_list);
@@ -438,9 +438,9 @@ extern char *change_grid_color(List button_list, int start, int end,
enum node_states state = grid_button->state;
if(start != -1)
if ((grid_button->inx < start)
- || (grid_button->inx > end))
+ || (grid_button->inx > end))
continue;
-
+
if(only_change_unused && grid_button->used)
continue;
@@ -450,29 +450,29 @@ extern char *change_grid_color(List button_list, int start, int end,
_put_button_as_inactive(grid_button);
grid_button->color = new_col;
grid_button->color_inx = color_inx;
- sview_widget_modify_bg(grid_button->button,
+ sview_widget_modify_bg(grid_button->button,
GTK_STATE_NORMAL, color);
/* sview_widget_modify_bg(grid_button->button, */
/* GTK_STATE_PRELIGHT, */
/* color); */
}
-
+
continue;
}
if(state_override != NODE_STATE_UNKNOWN)
state = state_override;
node_base_state = state & NODE_STATE_BASE;
-
+
if (node_base_state == NODE_STATE_DOWN) {
_put_button_as_down(grid_button, NODE_STATE_DOWN);
- } else if ((state & NODE_STATE_DRAIN)
+ } else if ((state & NODE_STATE_DRAIN)
|| (node_base_state == NODE_STATE_ERROR)) {
_put_button_as_down(grid_button, NODE_STATE_DRAIN);
} else if(grid_button->color_inx != color_inx) {
_put_button_as_up(grid_button);
grid_button->color = new_col;
grid_button->color_inx = color_inx;
- sview_widget_modify_bg(grid_button->button,
+ sview_widget_modify_bg(grid_button->button,
GTK_STATE_NORMAL, color);
/* sview_widget_modify_bg(grid_button->button, */
/* GTK_STATE_PRELIGHT, color); */
@@ -493,15 +493,15 @@ extern void highlight_grid(GtkTreeView *tree_view, GtkTreePath *path,
GtkTreeIter iter;
int *node_inx = NULL;
/* static int *last_node_inx = NULL; */
- int j=0;
-
+ int j=0;
+
if(!button_list)
return;
if (!gtk_tree_model_get_iter(model, &iter, path)) {
g_error("highlight, error getting iter from model\n");
return;
- }
+ }
gtk_tree_model_get(model, &iter, node_inx_id, &node_inx, -1);
if(!node_inx)
@@ -509,7 +509,7 @@ extern void highlight_grid(GtkTreeView *tree_view, GtkTreePath *path,
itr = list_iterator_create(button_list);
while((grid_button = list_next(itr))) {
- if((node_inx[j] < 0)
+ if((node_inx[j] < 0)
|| (grid_button->inx < node_inx[j])
|| (grid_button->inx > node_inx[j+1])) {
/* clear everyone else */
@@ -529,7 +529,7 @@ extern void highlight_grid(GtkTreeView *tree_view, GtkTreePath *path,
/* else if(last_node_inx && (last_node_inx == node_inx)) */
/* gtk_widget_set_state(grid_button->button, */
/* GTK_STATE_NORMAL); */
-
+
if(grid_button->inx == node_inx[j+1])
j+=2;
}
@@ -556,7 +556,7 @@ extern void highlight_grid_range(int start, int end, List button_list)
!= GTK_STATE_NORMAL))
gtk_widget_set_state(
grid_button->button,
- GTK_STATE_NORMAL);
+ GTK_STATE_NORMAL);
continue;
}
/* highlight this one, if it is already hightlighted,
@@ -585,13 +585,13 @@ extern void set_grid_used(List button_list, int start, int end,
while((grid_button = list_next(itr))) {
if(start != -1)
if ((grid_button->inx < start)
- || (grid_button->inx > end))
+ || (grid_button->inx > end))
continue;
grid_button->used = used;
if(reset_highlight)
gtk_widget_set_state(grid_button->button,
GTK_STATE_NORMAL);
-
+
}
list_iterator_destroy(itr);
@@ -605,15 +605,15 @@ extern void get_button_list_from_main(List *button_list, int start, int end,
ListIterator button_itr = NULL;
grid_button_t *grid_button = NULL;
grid_button_t *send_grid_button = NULL;
-
+
if(!*button_list)
*button_list = list_create(destroy_grid_button);
-
+
color_inx %= sview_colors_cnt;
itr = list_iterator_create(grid_button_list);
while((grid_button = list_next(itr))) {
if ((grid_button->inx < start)
- || (grid_button->inx > end))
+ || (grid_button->inx > end))
continue;
button_itr = list_iterator_create(*button_list);
while((send_grid_button = list_next(button_itr))) {
@@ -623,7 +623,7 @@ extern void get_button_list_from_main(List *button_list, int start, int end,
list_iterator_destroy(button_itr);
if(send_grid_button)
continue;
-
+
send_grid_button = create_grid_button_from_another(
grid_button, grid_button->node_name, color_inx);
if(send_grid_button) {
@@ -642,7 +642,7 @@ extern List copy_main_button_list(int initial_color)
grid_button_t *grid_button = NULL;
grid_button_t *send_grid_button = NULL;
List button_list = list_create(destroy_grid_button);
-
+
itr = list_iterator_create(grid_button_list);
while((grid_button = list_next(itr))) {
send_grid_button = create_grid_button_from_another(
@@ -659,7 +659,7 @@ extern List copy_main_button_list(int initial_color)
}
#ifdef HAVE_BG
-extern void add_extra_bluegene_buttons(List *button_list, int inx,
+extern void add_extra_bluegene_buttons(List *button_list, int inx,
int *color_inx)
{
block_info_msg_t *block_ptr = NULL;
@@ -676,24 +676,24 @@ extern void add_extra_bluegene_buttons(List *button_list, int inx,
uint16_t orig_state;
error_code = get_new_info_block(&block_ptr, 0);
-
- if (error_code != SLURM_SUCCESS
+
+ if (error_code != SLURM_SUCCESS
&& error_code != SLURM_NO_CHANGE_IN_DATA) {
return;
}
-
- if(!*button_list)
+
+ if(!*button_list)
*button_list = list_create(NULL);
-
+
*color_inx %= sview_colors_cnt;
-
+
itr = list_iterator_create(grid_button_list);
while((grid_button = list_next(itr))) {
if (grid_button->inx == inx)
break;
}
list_iterator_destroy(itr);
-
+
if(!grid_button)
return;
orig_state = grid_button->state;
@@ -706,13 +706,13 @@ extern void add_extra_bluegene_buttons(List *button_list, int inx,
list_remove(itr);
}
list_iterator_destroy(itr);
-
+
for (i=0; i < block_ptr->record_count; i++) {
bg_info_ptr = &block_ptr->block_array[i];
if(!_block_in_node(bg_info_ptr->bp_inx, inx))
continue;
found = 1;
- nodes = bg_info_ptr->nodes;
+ nodes = bg_info_ptr->nodes;
if(bg_info_ptr->ionodes) {
sprintf(tmp_nodes, "%s[%s]", nodes,
bg_info_ptr->ionodes);
@@ -738,11 +738,11 @@ extern void add_extra_bluegene_buttons(List *button_list, int inx,
"button-press-event",
G_CALLBACK(_open_block),
send_grid_button);
- g_signal_connect(G_OBJECT(grid_button->button),
+ g_signal_connect(G_OBJECT(grid_button->button),
"enter-notify-event",
G_CALLBACK(_mouseover_node),
grid_button);
- g_signal_connect(G_OBJECT(grid_button->button),
+ g_signal_connect(G_OBJECT(grid_button->button),
"leave-notify-event",
G_CALLBACK(_mouseoff_node),
grid_button);
@@ -783,9 +783,9 @@ extern void put_buttons_in_table(GtkTable *table, List button_list)
grid_button_t *grid_button = NULL;
ListIterator itr = NULL;
int node_count = list_count(button_list);
-
+
list_sort(button_list, (ListCmpF) _sort_button_inx);
-
+
#ifdef HAVE_3D
node_count = DIM_SIZE[X];
table_x = DIM_SIZE[X] + DIM_SIZE[Z];
@@ -808,14 +808,14 @@ extern void put_buttons_in_table(GtkTable *table, List button_list)
#ifdef HAVE_3D
grid_button->table = table;
gtk_table_attach(table, grid_button->button,
- grid_button->table_x,
+ grid_button->table_x,
(grid_button->table_x+1),
grid_button->table_y,
(grid_button->table_y+1),
GTK_SHRINK, GTK_SHRINK,
1, 1);
if(!grid_button->table_x)
- gtk_table_set_row_spacing(table,
+ gtk_table_set_row_spacing(table,
grid_button->table_y, 5);
#else
grid_button->table = table;
@@ -825,9 +825,9 @@ extern void put_buttons_in_table(GtkTable *table, List button_list)
coord_x, (coord_x+1), coord_y, (coord_y+1),
GTK_SHRINK, GTK_SHRINK,
1, 1);
-
+
coord_x++;
-
+
if(coord_x == table_x) {
coord_x = 0;
coord_y++;
@@ -835,12 +835,12 @@ extern void put_buttons_in_table(GtkTable *table, List button_list)
gtk_table_set_row_spacing(
table, coord_y-1, 5);
}
-
+
}
-
+
if(coord_y == table_y)
break;
-
+
if(coord_x && !(coord_x%10)) {
gtk_table_set_col_spacing(table,
coord_x-1,
@@ -861,24 +861,24 @@ extern int get_system_stats(GtkTable *table)
int changed = 1;
static GtkWidget *label = NULL;
char error_char[100];
-
+
if(label)
gtk_widget_destroy(label);
if((error_code = get_new_info_node(&node_info_ptr, force_refresh))
- == SLURM_NO_CHANGE_IN_DATA) {
+ == SLURM_NO_CHANGE_IN_DATA) {
changed = 0;
- } else if (error_code != SLURM_SUCCESS) {
+ } else if (error_code != SLURM_SUCCESS) {
snprintf(error_char, 100, "slurm_load_node: %s\n",
slurm_strerror(error_code));
label = gtk_label_new(error_char);
gtk_table_attach_defaults(table, label, 0, 1, 0, 1);
gtk_widget_show(label);
-
+
return SLURM_ERROR;
}
- ba_init(node_info_ptr, 0);
+ ba_init(node_info_ptr, 0);
if(grid_button_list)
return SLURM_SUCCESS;
grid_button_list = list_create(destroy_grid_button);
@@ -901,7 +901,7 @@ extern int setup_grid_table(GtkTable *table, List button_list, List node_list)
sview_node_info_t *sview_node_info_ptr = NULL;
#ifdef HAVE_3D
- int default_y_offset= (DIM_SIZE[Z] * DIM_SIZE[Y])
+ int default_y_offset= (DIM_SIZE[Z] * DIM_SIZE[Y])
+ (DIM_SIZE[Y] - DIM_SIZE[Z]);
node_count = DIM_SIZE[X];
table_x = DIM_SIZE[X] + DIM_SIZE[Z];
@@ -935,7 +935,7 @@ extern int setup_grid_table(GtkTable *table, List button_list, List node_list)
coords of each node in xyz format and apply an x
and y offset to get a coord_x and coord_y. This is
not needed for linear systems since they can be
- laid out in any fashion
+ laid out in any fashion
*/
if (i < 4) {
g_error("bad node name %s\n",
@@ -965,12 +965,12 @@ extern int setup_grid_table(GtkTable *table, List button_list, List node_list)
gtk_widget_set_size_request(grid_button->button, 10, 10);
_add_button_signals(grid_button);
list_append(button_list, grid_button);
-
+
gtk_table_attach(table, grid_button->button,
coord_x, (coord_x+1),
coord_y, (coord_y+1),
GTK_SHRINK, GTK_SHRINK,
- 1, 1);
+ 1, 1);
/* gtk_container_add(GTK_CONTAINER(grid_button->frame), */
/* grid_button->button); */
@@ -981,18 +981,18 @@ extern int setup_grid_table(GtkTable *table, List button_list, List node_list)
hit the side of the table and then incrememnt the
coord_y. We add space inbetween each 10th row.
*/
- coord_x++;
+ coord_x++;
if(coord_x == table_x) {
coord_x = 0;
coord_y++;
- if(!(coord_y%10))
+ if(!(coord_y%10))
gtk_table_set_row_spacing(table, coord_y-1, 5);
}
-
+
if(coord_y == table_y)
break;
-
- if(coord_x && !(coord_x%10))
+
+ if(coord_x && !(coord_x%10))
gtk_table_set_col_spacing(table, coord_x-1, 5);
#endif
}
@@ -1020,7 +1020,7 @@ extern void sview_init_grid(bool reset_highlight)
grid_button_t *grid_button = NULL;
if((error_code = get_new_info_node(&node_info_ptr, force_refresh))
- == SLURM_NO_CHANGE_IN_DATA) {
+ == SLURM_NO_CHANGE_IN_DATA) {
/* need to clear out old data */
set_grid_used(grid_button_list, -1, -1, false, reset_highlight);
return;
@@ -1080,7 +1080,7 @@ extern void setup_popup_grid_list(popup_info_t *popup_win)
extern void post_setup_popup_grid_list(popup_info_t *popup_win)
{
/* refresh the pointer */
- if(popup_win->model
+ if(popup_win->model
&& gtk_tree_store_iter_is_valid(GTK_TREE_STORE(popup_win->model),
&popup_win->iter)) {
gtk_tree_model_get(popup_win->model, &popup_win->iter,
@@ -1091,8 +1091,8 @@ extern void post_setup_popup_grid_list(popup_info_t *popup_win)
}
if(popup_win->node_inx) {
- int j=0;
- while(popup_win->node_inx[j] >= 0) {
+ int j=0;
+ while(popup_win->node_inx[j] >= 0) {
change_grid_color(
popup_win->grid_button_list,
popup_win->node_inx[j],
diff --git a/src/sview/job_info.c b/src/sview/job_info.c
index 1e2f779cbb92764038f696acb1d3fb094bc0e48a..865eca2e400240a17b72be8470602da02da522af 100644
--- a/src/sview/job_info.c
+++ b/src/sview/job_info.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * job_info.c - Functions related to job display
+ * job_info.c - Functions related to job display
* mode of sview.
*****************************************************************************
* Copyright (C) 2004-2007 The Regents of the University of California.
@@ -7,22 +7,22 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
*
- * CODE-OCEC-09-009. All rights reserved.
- *
+ * CODE-OCEC-09-009. All rights reserved.
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -33,7 +33,7 @@
#include "src/sview/sview.h"
#include "src/common/parse_time.h"
#include <grp.h>
-
+
#define _DEBUG 0
#define MAX_CANCEL_RETRY 10
#define SIZE(a) (sizeof(a)/sizeof(a[0]))
@@ -50,7 +50,7 @@ typedef struct {
List step_list;
} sview_job_info_t;
-enum {
+enum {
EDIT_SIGNAL = 1,
EDIT_SIGNAL_USER,
EDIT_CANCEL,
@@ -60,21 +60,21 @@ enum {
};
/* These need to be in alpha order (except POS and CNT) */
-enum {
+enum {
SORTID_POS = POS_LOC,
SORTID_ACCOUNT,
SORTID_ACTION,
- SORTID_ALLOC,
+ SORTID_ALLOC,
SORTID_ALLOC_NODE,
#ifdef HAVE_CRAY_XT
SORTID_ALPS_RESV_ID,
#endif
SORTID_BATCH,
#ifdef HAVE_BG
- SORTID_NODELIST,
+ SORTID_NODELIST,
SORTID_NODELIST_EXC,
SORTID_NODELIST_REQ,
- SORTID_BLOCK,
+ SORTID_BLOCK,
#endif
SORTID_COLOR,
SORTID_COMMAND,
@@ -90,13 +90,13 @@ enum {
SORTID_CPU_MAX,
#endif
SORTID_CPUS_PER_TASK,
- SORTID_DEPENDENCY,
+ SORTID_DEPENDENCY,
SORTID_EXIT_CODE,
SORTID_FEATURES,
#ifdef HAVE_BG
SORTID_GEOMETRY,
#endif
- SORTID_GROUP_ID,
+ SORTID_GROUP_ID,
#ifdef HAVE_BG
#ifdef HAVE_BGL
SORTID_IMAGE_BLRTS,
@@ -109,8 +109,8 @@ enum {
SORTID_IMAGE_MLOADER,
#endif
#endif
- SORTID_JOBID,
- SORTID_LICENSES,
+ SORTID_JOBID,
+ SORTID_LICENSES,
SORTID_CPU_REQ,
SORTID_MEM_MIN,
SORTID_TMP_DISK,
@@ -124,14 +124,14 @@ enum {
SORTID_NODELIST_EXC,
SORTID_NODELIST_REQ,
#endif
- SORTID_NODE_INX,
+ SORTID_NODE_INX,
SORTID_NODES,
SORTID_NODES_MAX,
SORTID_NODES_MIN,
/* SORTID_NTASKS_PER_CORE, */
/* SORTID_NTASKS_PER_NODE, */
/* SORTID_NTASKS_PER_SOCKET, */
- SORTID_PARTITION,
+ SORTID_PARTITION,
SORTID_PRIORITY,
SORTID_QOS,
SORTID_REASON,
@@ -160,7 +160,7 @@ enum {
SORTID_SMALL_BLOCK,
#endif
SORTID_UPDATED,
- SORTID_USER_ID,
+ SORTID_USER_ID,
SORTID_WCKEY,
SORTID_WORKDIR,
SORTID_CNT
@@ -168,7 +168,7 @@ enum {
/* extra field here is for choosing the type of edit you that will
* take place. If you choose EDIT_MODEL (means only display a set of
- * known options) create it in function create_model_*.
+ * known options) create it in function create_model_*.
*/
static display_data_t display_data_job[] = {
@@ -187,11 +187,11 @@ static display_data_t display_data_job[] = {
#ifdef HAVE_BG
{G_TYPE_STRING, SORTID_BLOCK, "BG Block", TRUE, EDIT_NONE, refresh_job,
create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_GEOMETRY, "Geometry",
+ {G_TYPE_STRING, SORTID_GEOMETRY, "Geometry",
FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_ROTATE, "Rotate",
+ {G_TYPE_STRING, SORTID_ROTATE, "Rotate",
FALSE, EDIT_MODEL, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_CONNECTION, "Connection",
+ {G_TYPE_STRING, SORTID_CONNECTION, "Connection",
FALSE, EDIT_MODEL, refresh_job, create_model_job, admin_edit_job},
#ifdef HAVE_BGL
{G_TYPE_STRING, SORTID_IMAGE_BLRTS, "Image Blrts",
@@ -210,7 +210,7 @@ static display_data_t display_data_job[] = {
FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
#endif
#ifdef HAVE_CRAY_XT
- {G_TYPE_STRING, SORTID_ALPS_RESV_ID, "ALPS Resv ID", TRUE, EDIT_NONE,
+ {G_TYPE_STRING, SORTID_ALPS_RESV_ID, "ALPS Resv ID", TRUE, EDIT_NONE,
refresh_job, create_model_job, admin_edit_job},
#endif
{G_TYPE_STRING, SORTID_USER_ID, "UserID", TRUE, EDIT_NONE,
@@ -253,40 +253,40 @@ static display_data_t display_data_job[] = {
#else
{G_TYPE_STRING, SORTID_NODELIST, "NodeList", TRUE,
EDIT_NONE, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_NODELIST_EXC, "NodeList Excluded",
+ {G_TYPE_STRING, SORTID_NODELIST_EXC, "NodeList Excluded",
FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_NODELIST_REQ, "NodeList Requested",
+ {G_TYPE_STRING, SORTID_NODELIST_REQ, "NodeList Requested",
FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
#endif
- {G_TYPE_STRING, SORTID_CONTIGUOUS, "Contiguous", FALSE, EDIT_MODEL,
+ {G_TYPE_STRING, SORTID_CONTIGUOUS, "Contiguous", FALSE, EDIT_MODEL,
refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_REQUEUE, "Requeue", FALSE, EDIT_MODEL,
+ {G_TYPE_STRING, SORTID_REQUEUE, "Requeue", FALSE, EDIT_MODEL,
refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_INT, SORTID_RESTARTS, "Restart Count", FALSE, EDIT_NONE,
+ {G_TYPE_INT, SORTID_RESTARTS, "Restart Count", FALSE, EDIT_NONE,
refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_PRIORITY, "Priority", FALSE,
+ {G_TYPE_STRING, SORTID_PRIORITY, "Priority", FALSE,
EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
{G_TYPE_STRING, SORTID_EXIT_CODE, "Exit Code", FALSE,
EDIT_NONE, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_BATCH, "Batch Flag", FALSE,
+ {G_TYPE_STRING, SORTID_BATCH, "Batch Flag", FALSE,
EDIT_NONE, refresh_job, create_model_job, admin_edit_job},
#ifdef HAVE_BG
- {G_TYPE_STRING, SORTID_CPU_MAX, "CPUs Max",
+ {G_TYPE_STRING, SORTID_CPU_MAX, "CPUs Max",
FALSE, EDIT_NONE, refresh_job, create_model_job, admin_edit_job},
#endif
- {G_TYPE_STRING, SORTID_CPU_NUM, "CPU Count",
+ {G_TYPE_STRING, SORTID_CPU_NUM, "CPU Count",
FALSE, EDIT_NONE, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_TASKS, "Task Count",
+ {G_TYPE_STRING, SORTID_TASKS, "Task Count",
FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
{G_TYPE_STRING, SORTID_SHARED, "Shared", FALSE,
EDIT_MODEL, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_CPUS_PER_TASK, "CPUs per Task",
+ {G_TYPE_STRING, SORTID_CPUS_PER_TASK, "CPUs per Task",
FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
{G_TYPE_STRING, SORTID_RESV_NAME, "Reservation Name",
FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_NODES_MIN, "Nodes Min",
+ {G_TYPE_STRING, SORTID_NODES_MIN, "Nodes Min",
FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_NODES_MAX, "Nodes Max",
+ {G_TYPE_STRING, SORTID_NODES_MAX, "Nodes Max",
FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
/* {G_TYPE_STRING, SORTID_SOCKETS_MIN, "Min Sockets", */
/* FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job}, */
@@ -300,25 +300,25 @@ static display_data_t display_data_job[] = {
/* FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job}, */
/* {G_TYPE_STRING, SORTID_THREADS_MAX, "Max Threads", */
/* FALSE, EDIT_NONE, refresh_job, create_model_job, admin_edit_job}, */
- {G_TYPE_STRING, SORTID_CPU_REQ, "Min CPUs Per Node",
+ {G_TYPE_STRING, SORTID_CPU_REQ, "Min CPUs Per Node",
FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_MEM_MIN, "Min Memory Per Node",
+ {G_TYPE_STRING, SORTID_MEM_MIN, "Min Memory Per Node",
FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_TMP_DISK, "Min Tmp Disk Per Node",
+ {G_TYPE_STRING, SORTID_TMP_DISK, "Min Tmp Disk Per Node",
FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_NICE, "Nice",
+ {G_TYPE_STRING, SORTID_NICE, "Nice",
FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_ACCOUNT, "Account",
+ {G_TYPE_STRING, SORTID_ACCOUNT, "Account",
FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_QOS, "QOS", FALSE,
+ {G_TYPE_STRING, SORTID_QOS, "QOS", FALSE,
EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_REASON, "Reason Waiting",
+ {G_TYPE_STRING, SORTID_REASON, "Reason Waiting",
FALSE, EDIT_NONE, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_FEATURES, "Features",
+ {G_TYPE_STRING, SORTID_FEATURES, "Features",
FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_LICENSES, "Licenses",
+ {G_TYPE_STRING, SORTID_LICENSES, "Licenses",
FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_DEPENDENCY, "Dependency",
+ {G_TYPE_STRING, SORTID_DEPENDENCY, "Dependency",
FALSE, EDIT_TEXTBOX, refresh_job, create_model_job, admin_edit_job},
{G_TYPE_STRING, SORTID_ALLOC_NODE, "Alloc Node : Sid",
FALSE, EDIT_NONE, refresh_job, create_model_job, admin_edit_job},
@@ -329,16 +329,16 @@ static display_data_t display_data_job[] = {
/* {G_TYPE_STRING, SORTID_NTASKS_PER_CORE, "Num tasks per Core", */
/* FALSE, EDIT_NONE, refresh_job, create_model_job, admin_edit_job}, */
#ifdef HAVE_AIX
- {G_TYPE_STRING, SORTID_NETWORK, "Network",
+ {G_TYPE_STRING, SORTID_NETWORK, "Network",
FALSE, EDIT_NONE, refresh_job, create_model_job, admin_edit_job},
#endif
- {G_TYPE_STRING, SORTID_COMMAND, "Command",
+ {G_TYPE_STRING, SORTID_COMMAND, "Command",
FALSE, EDIT_NONE, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_STRING, SORTID_COMMENT, "Comment",
+ {G_TYPE_STRING, SORTID_COMMENT, "Comment",
FALSE, EDIT_NONE, refresh_job, create_model_job, admin_edit_job},
{G_TYPE_STRING, SORTID_WORKDIR, "Work Dir",
FALSE, EDIT_NONE, refresh_job, create_model_job, admin_edit_job},
- {G_TYPE_POINTER, SORTID_NODE_INX, NULL, FALSE, EDIT_NONE,
+ {G_TYPE_POINTER, SORTID_NODE_INX, NULL, FALSE, EDIT_NONE,
refresh_job, create_model_job, admin_edit_job},
#ifdef HAVE_BG
{G_TYPE_INT, SORTID_SMALL_BLOCK, NULL, FALSE, EDIT_NONE, refresh_job,
@@ -405,23 +405,23 @@ static display_data_t *local_display_data = NULL;
static char *got_edit_signal = NULL;
-static void _update_info_step(sview_job_info_t *sview_job_info_ptr,
- GtkTreeModel *model,
+static void _update_info_step(sview_job_info_t *sview_job_info_ptr,
+ GtkTreeModel *model,
GtkTreeIter *step_iter,
GtkTreeIter *iter);
/* translate name name to number */
-static uint16_t _xlate_signal_name(const char *signal_name)
+static uint16_t _xlate_signal_name(const char *signal_name)
{
uint16_t sig_num = (uint16_t)NO_VAL;
char *end_ptr, *sig_names = NULL;
int i;
-
+
sig_num = (uint16_t) strtol(signal_name, &end_ptr, 10);
-
+
if ((*end_ptr == '\0') && (sig_num != 0))
return sig_num;
-
+
for (i=0; i<SIZE(sig_name_num); i++) {
if (strcasecmp(sig_name_num[i].name, signal_name) == 0) {
xfree(sig_names);
@@ -432,11 +432,11 @@ static uint16_t _xlate_signal_name(const char *signal_name)
else {
xstrcat(sig_names, ",");
xstrcat(sig_names, sig_name_num[i].name);
- }
+ }
}
xfree(sig_names);
return (uint16_t)NO_VAL;
-}
+}
static void _cancel_job_id (uint32_t job_id, uint16_t signal)
{
@@ -466,10 +466,10 @@ static void _cancel_job_id (uint32_t job_id, uint16_t signal)
if ((error_code != ESLURM_ALREADY_DONE) &&
(error_code != ESLURM_INVALID_JOB_ID)) {
temp = g_strdup_printf(
- "Kill job error on job id %u: %s",
+ "Kill job error on job id %u: %s",
job_id, slurm_strerror(slurm_get_errno()));
display_edit_note(temp);
- g_free(temp);
+ g_free(temp);
} else {
display_edit_note(slurm_strerror(slurm_get_errno()));
}
@@ -477,7 +477,7 @@ static void _cancel_job_id (uint32_t job_id, uint16_t signal)
temp = g_strdup_printf("Signal successfully sent to job %u",
job_id);
display_edit_note(temp);
- g_free(temp);
+ g_free(temp);
}
}
@@ -510,8 +510,8 @@ static void _cancel_step_id(uint32_t job_id, uint32_t step_id,
error_code = slurm_get_errno();
if (error_code != ESLURM_ALREADY_DONE) {
temp = g_strdup_printf(
- "Kill job error on job step id %u.%u: %s",
- job_id, step_id,
+ "Kill job error on job step id %u.%u: %s",
+ job_id, step_id,
slurm_strerror(slurm_get_errno()));
display_edit_note(temp);
g_free(temp);
@@ -523,11 +523,11 @@ static void _cancel_step_id(uint32_t job_id, uint32_t step_id,
"Signal successfully sent to job step %u.%u",
job_id, step_id);
display_edit_note(temp);
- g_free(temp);
+ g_free(temp);
}
}
-static void _set_active_combo_job(GtkComboBox *combo,
+static void _set_active_combo_job(GtkComboBox *combo,
GtkTreeModel *model, GtkTreeIter *iter,
int type)
{
@@ -551,9 +551,9 @@ static void _set_active_combo_job(GtkComboBox *combo,
action = 4;
else if(!strcmp(temp_char, "requeue"))
action = 5;
- else
+ else
action = 0;
-
+
break;
case SORTID_SHARED:
case SORTID_CONTIGUOUS:
@@ -565,9 +565,9 @@ static void _set_active_combo_job(GtkComboBox *combo,
action = 0;
else if(!strcmp(temp_char, "no"))
action = 1;
- else
+ else
action = 0;
-
+
break;
#ifdef HAVE_BG
case SORTID_CONNECTION:
@@ -577,7 +577,7 @@ static void _set_active_combo_job(GtkComboBox *combo,
action = 1;
else if(!strcmp(temp_char, "nav"))
action = 2;
- else
+ else
action = 0;
break;
#endif
@@ -587,7 +587,7 @@ static void _set_active_combo_job(GtkComboBox *combo,
g_free(temp_char);
end_it:
gtk_combo_box_set_active(combo, action);
-
+
}
@@ -612,7 +612,7 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
if(!job_msg)
return NULL;
-
+
switch(column) {
case SORTID_ACTION:
xfree(got_edit_signal);
@@ -626,7 +626,7 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
temp_int = INFINITE;
else
temp_int = time_str2mins((char *)new_text);
-
+
type = "timelimit";
if(temp_int <= 0 && temp_int != INFINITE)
goto return_error;
@@ -634,7 +634,7 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
break;
case SORTID_PRIORITY:
temp_int = strtol(new_text, (char **)NULL, 10);
-
+
type = "priority";
if(temp_int < 0)
goto return_error;
@@ -652,11 +652,11 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
break;
case SORTID_CPU_REQ:
temp_int = strtol(new_text, &p, 10);
- if (*p == 'k' || *p == 'K')
+ if (*p == 'k' || *p == 'K')
temp_int *= 1024;
- else if(*p == 'm' || *p == 'M')
+ else if(*p == 'm' || *p == 'M')
temp_int *= 1048576;
-
+
type = "min cpus per node";
if(temp_int <= 0)
goto return_error;
@@ -664,7 +664,7 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
break;
case SORTID_TASKS:
temp_int = strtol(new_text, (char **)NULL, 10);
-
+
type = "requested tasks";
if(temp_int <= 0)
goto return_error;
@@ -672,7 +672,7 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
break;
case SORTID_CPUS_PER_TASK:
temp_int = strtol(new_text, (char **)NULL, 10);
-
+
type = "cpus per task";
if(temp_int <= 0)
goto return_error;
@@ -684,9 +684,9 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
break;
case SORTID_NODES_MIN:
temp_int = strtol(new_text, &p, 10);
- if (*p == 'k' || *p == 'K')
+ if (*p == 'k' || *p == 'K')
temp_int *= 1024;
- else if(*p == 'm' || *p == 'M')
+ else if(*p == 'm' || *p == 'M')
temp_int *= 1048576;
type = "min nodes";
@@ -696,11 +696,11 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
break;
case SORTID_NODES_MAX:
temp_int = strtol(new_text, &p, 10);
- if (*p == 'k' || *p == 'K')
+ if (*p == 'k' || *p == 'K')
temp_int *= 1024;
- else if(*p == 'm' || *p == 'M')
+ else if(*p == 'm' || *p == 'M')
temp_int *= 1048576;
-
+
type = "max nodes";
if(temp_int <= 0)
goto return_error;
@@ -708,11 +708,11 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
break;
case SORTID_MEM_MIN:
temp_int = strtol(new_text, (char **)NULL, 10);
- if (*p == 'k' || *p == 'K')
+ if (*p == 'k' || *p == 'K')
temp_int *= 1024;
- else if(*p == 'm' || *p == 'M')
+ else if(*p == 'm' || *p == 'M')
temp_int *= 1048576;
-
+
type = "min memory per node";
if(temp_int <= 0)
goto return_error;
@@ -720,53 +720,53 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
break;
case SORTID_TMP_DISK:
temp_int = strtol(new_text, (char **)NULL, 10);
- if (*p == 'k' || *p == 'K')
+ if (*p == 'k' || *p == 'K')
temp_int *= 1024;
- else if(*p == 'm' || *p == 'M')
+ else if(*p == 'm' || *p == 'M')
temp_int *= 1048576;
-
+
type = "min tmp disk per node";
if(temp_int <= 0)
goto return_error;
job_msg->job_min_tmp_disk = (uint32_t)temp_int;
break;
- case SORTID_PARTITION:
+ case SORTID_PARTITION:
job_msg->partition = xstrdup(new_text);
type = "partition";
break;
- case SORTID_NAME:
+ case SORTID_NAME:
job_msg->name = xstrdup(new_text);
type = "name";
break;
- case SORTID_WCKEY:
+ case SORTID_WCKEY:
job_msg->wckey = xstrdup(new_text);
type = "wckey";
break;
case SORTID_SHARED:
- if (!strcasecmp(new_text, "yes"))
+ if (!strcasecmp(new_text, "yes"))
job_msg->shared = 1;
- else
+ else
job_msg->shared = 0;
-
+
type = "shared";
break;
case SORTID_CONTIGUOUS:
- if (!strcasecmp(new_text, "yes"))
+ if (!strcasecmp(new_text, "yes"))
job_msg->contiguous = 1;
- else
+ else
job_msg->contiguous = 0;
-
- type = "contiguous";
+
+ type = "contiguous";
break;
case SORTID_REQUEUE:
- if (!strcasecmp(new_text, "yes"))
+ if (!strcasecmp(new_text, "yes"))
job_msg->requeue = 1;
- else
+ else
job_msg->requeue = 0;
-
- type = "requeue";
+
+ type = "requeue";
break;
- case SORTID_NODELIST_REQ:
+ case SORTID_NODELIST_REQ:
job_msg->req_nodes = xstrdup(new_text);
type = "requested nodelist";
break;
@@ -774,24 +774,24 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
job_msg->exc_nodes = xstrdup(new_text);
type = "excluded nodelist";
break;
- case SORTID_FEATURES:
+ case SORTID_FEATURES:
job_msg->features = xstrdup(new_text);
type = "features";
break;
- case SORTID_LICENSES:
+ case SORTID_LICENSES:
job_msg->licenses = xstrdup(new_text);
type = "licenses";
break;
- case SORTID_ACCOUNT:
+ case SORTID_ACCOUNT:
job_msg->account = xstrdup(new_text);
type = "account";
break;
- case SORTID_QOS:
+ case SORTID_QOS:
job_msg->qos = xstrdup(new_text);
type = "qos";
break;
case SORTID_DEPENDENCY:
- job_msg->dependency = xstrdup(new_text);
+ job_msg->dependency = xstrdup(new_text);
type = "dependency";
break;
#ifdef HAVE_BG
@@ -814,7 +814,7 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
break;
}
geometry_tmp = next_ptr;
- token = strtok_r(geometry_tmp, delimiter,
+ token = strtok_r(geometry_tmp, delimiter,
&next_ptr);
}
if (token != NULL) {
@@ -822,26 +822,26 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
xfree(original_ptr);
goto return_error;
}
-
+
if(!job_msg->select_jobinfo)
- job_msg->select_jobinfo
+ job_msg->select_jobinfo
= select_g_select_jobinfo_alloc();
select_g_select_jobinfo_set(job_msg->select_jobinfo,
SELECT_JOBDATA_GEOMETRY,
(void *) &geo);
-
+
break;
case SORTID_ROTATE:
- type = "rotate";
+ type = "rotate";
if (!strcasecmp(new_text, "yes")) {
rotate = 1;
-
+
} else {
rotate = 0;
-
+
}
if(!job_msg->select_jobinfo)
- job_msg->select_jobinfo
+ job_msg->select_jobinfo
= select_g_select_jobinfo_alloc();
select_g_select_jobinfo_set(job_msg->select_jobinfo,
SELECT_JOBDATA_ROTATE,
@@ -857,46 +857,46 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
conn_type = SELECT_NAV;
}
if(!job_msg->select_jobinfo)
- job_msg->select_jobinfo
+ job_msg->select_jobinfo
= select_g_select_jobinfo_alloc();
select_g_select_jobinfo_set(job_msg->select_jobinfo,
SELECT_JOBDATA_CONN_TYPE,
(void *) &conn_type);
-
+
break;
#ifdef HAVE_BGL
case SORTID_IMAGE_BLRTS:
type = "BlrtsImage";
if(!job_msg->select_jobinfo)
- job_msg->select_jobinfo
+ job_msg->select_jobinfo
= select_g_select_jobinfo_alloc();
select_g_select_jobinfo_set(job_msg->select_jobinfo,
SELECT_JOBDATA_BLRTS_IMAGE,
(void *) new_text);
break;
#endif
- case SORTID_IMAGE_LINUX:
+ case SORTID_IMAGE_LINUX:
type = "LinuxImage";
if(!job_msg->select_jobinfo)
- job_msg->select_jobinfo
+ job_msg->select_jobinfo
= select_g_select_jobinfo_alloc();
select_g_select_jobinfo_set(job_msg->select_jobinfo,
SELECT_JOBDATA_LINUX_IMAGE,
(void *) new_text);
break;
- case SORTID_IMAGE_MLOADER:
+ case SORTID_IMAGE_MLOADER:
type = "MloaderImage";
if(!job_msg->select_jobinfo)
- job_msg->select_jobinfo
+ job_msg->select_jobinfo
= select_g_select_jobinfo_alloc();
select_g_select_jobinfo_set(job_msg->select_jobinfo,
SELECT_JOBDATA_MLOADER_IMAGE,
(void *) new_text);
break;
- case SORTID_IMAGE_RAMDISK:
+ case SORTID_IMAGE_RAMDISK:
type = "RamdiskImage";
if(!job_msg->select_jobinfo)
- job_msg->select_jobinfo
+ job_msg->select_jobinfo
= select_g_select_jobinfo_alloc();
select_g_select_jobinfo_set(job_msg->select_jobinfo,
SELECT_JOBDATA_RAMDISK_IMAGE,
@@ -935,7 +935,7 @@ static void _admin_edit_combo_box_job(GtkComboBox *combo,
GtkTreeIter iter;
int column = 0;
char *name = NULL;
-
+
if(!job_msg)
return;
@@ -948,28 +948,28 @@ static void _admin_edit_combo_box_job(GtkComboBox *combo,
g_print("nothing selected\n");
return;
}
-
+
gtk_tree_model_get(model, &iter, 0, &name, -1);
gtk_tree_model_get(model, &iter, 1, &column, -1);
-
+
_set_job_msg(job_msg, name, column);
g_free(name);
}
static gboolean _admin_focus_out_job(GtkEntry *entry,
- GdkEventFocus *event,
+ GdkEventFocus *event,
job_desc_msg_t *job_msg)
{
int type = gtk_entry_get_max_length(entry);
const char *name = gtk_entry_get_text(entry);
type -= DEFAULT_ENTRY_LENGTH;
_set_job_msg(job_msg, name, type);
-
+
return false;
}
-static GtkWidget *_admin_full_edit_job(job_desc_msg_t *job_msg,
+static GtkWidget *_admin_full_edit_job(job_desc_msg_t *job_msg,
GtkTreeModel *model, GtkTreeIter *iter)
{
GtkScrolledWindow *window = create_scrolled_window();
@@ -987,8 +987,8 @@ static GtkWidget *_admin_full_edit_job(job_desc_msg_t *job_msg,
bin = GTK_BIN(&view->bin);
table = GTK_TABLE(bin->child);
gtk_table_resize(table, SORTID_CNT, 2);
-
- gtk_table_set_homogeneous(table, FALSE);
+
+ gtk_table_set_homogeneous(table, FALSE);
for(i = 0; i < SORTID_CNT; i++) {
while(display_data++) {
@@ -999,7 +999,7 @@ static GtkWidget *_admin_full_edit_job(job_desc_msg_t *job_msg,
if(display_data->id != i)
continue;
display_admin_edit(
- table, job_msg, &row, model, iter,
+ table, job_msg, &row, model, iter,
display_data,
G_CALLBACK(_admin_edit_combo_box_job),
G_CALLBACK(_admin_focus_out_job),
@@ -1009,7 +1009,7 @@ static GtkWidget *_admin_full_edit_job(job_desc_msg_t *job_msg,
display_data = display_data_job;
}
gtk_table_resize(table, row, 2);
-
+
return GTK_WIDGET(window);
}
@@ -1035,7 +1035,7 @@ static int _get_node_cnt(job_info_t * job)
/* this needs to be freed by xfree() */
static void _convert_char_to_job_and_step(const char *data,
- int *jobid, int *stepid)
+ int *jobid, int *stepid)
{
int i = 0;
@@ -1056,8 +1056,8 @@ static void _convert_char_to_job_and_step(const char *data,
return;
}
-static void _layout_job_record(GtkTreeView *treeview,
- sview_job_info_t *sview_job_info_ptr,
+static void _layout_job_record(GtkTreeView *treeview,
+ sview_job_info_t *sview_job_info_ptr,
int update)
{
char *nodes = NULL, *reason = NULL, *uname = NULL;
@@ -1070,7 +1070,7 @@ static void _layout_job_record(GtkTreeView *treeview,
uint16_t term_sig = 0;
GtkTreeIter iter;
- GtkTreeStore *treestore =
+ GtkTreeStore *treestore =
GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
if(!treestore)
@@ -1091,273 +1091,273 @@ static void _layout_job_record(GtkTreeView *treeview,
(difftime(now_time,
job_ptr->suspend_time)
+ job_ptr->pre_sus_time);
- } else
+ } else
now_time = (time_t)difftime(
now_time, job_ptr->start_time);
}
suspend_secs = (time(NULL) - job_ptr->start_time) - now_time;
secs2time_str(now_time, running_char, sizeof(running_char));
-
- nodes = sview_job_info_ptr->nodes;
+
+ nodes = sview_job_info_ptr->nodes;
}
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_ACCOUNT),
job_ptr->account);
snprintf(tmp_char, sizeof(tmp_char), "%s:%u",
job_ptr->alloc_node, job_ptr->alloc_sid);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_ALLOC_NODE),
tmp_char);
#ifdef HAVE_CRAY_XT
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_ALPS_RESV_ID),
+ SORTID_ALPS_RESV_ID),
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_RESV_ID));
#endif
if(job_ptr->batch_flag)
sprintf(tmp_char, "yes");
else
sprintf(tmp_char, "no");
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_BATCH),
tmp_char);
#ifdef HAVE_BG
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_NODELIST),
+ SORTID_NODELIST),
nodes);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_NODELIST_EXC),
job_ptr->exc_nodes);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_NODELIST_REQ),
job_ptr->req_nodes);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_BLOCK),
+ SORTID_BLOCK),
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_BG_ID));
#endif
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_COMMAND),
job_ptr->command);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_COMMENT),
job_ptr->comment);
#ifdef HAVE_BG
-
- add_display_treestore_line(update, treestore, &iter,
+
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_CONNECTION),
+ SORTID_CONNECTION),
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_CONNECTION));
#endif
if(job_ptr->contiguous)
sprintf(tmp_char, "yes");
else
sprintf(tmp_char, "no");
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_CONTIGUOUS),
tmp_char);
#ifdef HAVE_BG
- convert_num_unit((float)job_ptr->num_procs, tmp_char, sizeof(tmp_char),
+ convert_num_unit((float)job_ptr->num_procs, tmp_char, sizeof(tmp_char),
UNIT_NONE);
#else
snprintf(tmp_char, sizeof(tmp_char), "%u", job_ptr->num_procs);
#endif
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_CPU_NUM),
- tmp_char);
+ tmp_char);
#ifdef HAVE_BG
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_CPU_MAX),
+ SORTID_CPU_MAX),
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_MAX_CPUS));
#endif
- if(job_ptr->cpus_per_task > 0)
+ if(job_ptr->cpus_per_task > 0)
sprintf(tmp_char, "%u", job_ptr->cpus_per_task);
- else
+ else
sprintf(tmp_char, " ");
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_CPUS_PER_TASK),
tmp_char);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_DEPENDENCY),
job_ptr->dependency);
-
+
if (WIFSIGNALED(job_ptr->exit_code))
term_sig = WTERMSIG(job_ptr->exit_code);
snprintf(tmp_char, sizeof(tmp_char), "%u:%u",
WEXITSTATUS(job_ptr->exit_code), term_sig);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_EXIT_CODE),
tmp_char);
-
- add_display_treestore_line(update, treestore, &iter,
+
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_FEATURES),
job_ptr->features);
-
+
#ifdef HAVE_BG
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_GEOMETRY),
+ SORTID_GEOMETRY),
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_GEOMETRY));
#endif
group_info = getgrgid((gid_t)job_ptr->group_id);
- if (group_info && group_info->gr_name[0])
+ if (group_info && group_info->gr_name[0])
snprintf(tmp_char, sizeof(tmp_char), "%s", group_info->gr_name);
- else
+ else
snprintf(tmp_char, sizeof(tmp_char), "%u", job_ptr->group_id);
-
- add_display_treestore_line(update, treestore, &iter,
+
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_GROUP_ID),
+ SORTID_GROUP_ID),
tmp_char);
-#ifdef HAVE_BG
+#ifdef HAVE_BG
#ifdef HAVE_BGL
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_IMAGE_BLRTS),
+ SORTID_IMAGE_BLRTS),
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_BLRTS_IMAGE));
#endif
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_IMAGE_LINUX),
+ SORTID_IMAGE_LINUX),
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_LINUX_IMAGE));
-
- add_display_treestore_line(update, treestore, &iter,
+
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_IMAGE_MLOADER),
+ SORTID_IMAGE_MLOADER),
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_MLOADER_IMAGE));
-
- add_display_treestore_line(update, treestore, &iter,
+
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_IMAGE_RAMDISK),
+ SORTID_IMAGE_RAMDISK),
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_RAMDISK_IMAGE));
#endif
- snprintf(tmp_char, sizeof(tmp_char), "%u", job_ptr->job_id);
- add_display_treestore_line(update, treestore, &iter,
+ snprintf(tmp_char, sizeof(tmp_char), "%u", job_ptr->job_id);
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_JOBID),
+ SORTID_JOBID),
tmp_char);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_LICENSES),
job_ptr->licenses);
-
- convert_num_unit((float)job_ptr->job_min_cpus,
+
+ convert_num_unit((float)job_ptr->job_min_cpus,
tmp_char, sizeof(tmp_char), UNIT_NONE);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_CPU_REQ),
- tmp_char);
+ tmp_char);
- if(job_ptr->job_min_memory > 0)
- convert_num_unit((float)job_ptr->job_min_memory,
+ if(job_ptr->job_min_memory > 0)
+ convert_num_unit((float)job_ptr->job_min_memory,
tmp_char, sizeof(tmp_char), UNIT_MEGA);
- else
+ else
sprintf(tmp_char, " ");
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_MEM_MIN),
tmp_char);
- if(job_ptr->job_min_tmp_disk > 0)
- convert_num_unit((float)job_ptr->job_min_tmp_disk,
+ if(job_ptr->job_min_tmp_disk > 0)
+ convert_num_unit((float)job_ptr->job_min_tmp_disk,
tmp_char, sizeof(tmp_char), UNIT_MEGA);
- else
+ else
sprintf(tmp_char, " ");
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_TMP_DISK),
tmp_char);
-
- add_display_treestore_line(update, treestore, &iter,
+
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_NAME),
+ SORTID_NAME),
job_ptr->name);
-
+
#ifdef HAVE_AIX
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_NETWORK),
job_ptr->network);
#endif
- if(job_ptr->job_min_memory > 0)
+ if(job_ptr->job_min_memory > 0)
sprintf(tmp_char, "%u", job_ptr->nice - NICE_OFFSET);
- else
+ else
sprintf(tmp_char, " ");
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_NICE),
+ SORTID_NICE),
tmp_char);
-
+
#ifndef HAVE_BG
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_NODELIST),
+ SORTID_NODELIST),
nodes);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_NODELIST_EXC),
job_ptr->exc_nodes);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_NODELIST_REQ),
job_ptr->req_nodes);
@@ -1367,50 +1367,50 @@ static void _layout_job_record(GtkTreeView *treeview,
convert_num_unit((float)sview_job_info_ptr->node_cnt,
tmp_char, sizeof(tmp_char), UNIT_NONE);
#else
- snprintf(tmp_char, sizeof(tmp_char), "%u",
+ snprintf(tmp_char, sizeof(tmp_char), "%u",
sview_job_info_ptr->node_cnt);
#endif
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_NODES),
+ SORTID_NODES),
tmp_char);
#ifdef HAVE_BG
convert_num_unit((float)sview_job_info_ptr->node_cnt,
tmp_char, sizeof(tmp_char), UNIT_NONE);
#else
- snprintf(tmp_char, sizeof(tmp_char), "%u",
+ snprintf(tmp_char, sizeof(tmp_char), "%u",
job_ptr->max_nodes);
#endif
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_NODES_MAX),
+ SORTID_NODES_MAX),
tmp_char);
#ifdef HAVE_BG
convert_num_unit((float)sview_job_info_ptr->node_cnt,
tmp_char, sizeof(tmp_char), UNIT_NONE);
#else
- snprintf(tmp_char, sizeof(tmp_char), "%u",
+ snprintf(tmp_char, sizeof(tmp_char), "%u",
job_ptr->num_nodes);
#endif
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_NODES_MIN),
+ SORTID_NODES_MIN),
tmp_char);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_PARTITION),
job_ptr->partition);
sprintf(tmp_char, "%u", job_ptr->priority);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_PRIORITY),
tmp_char);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_QOS),
job_ptr->qos);
@@ -1419,7 +1419,7 @@ static void _layout_job_record(GtkTreeView *treeview,
reason = job_ptr->state_desc;
else
reason = job_reason_string(job_ptr->state_reason);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_REASON), reason);
@@ -1427,29 +1427,29 @@ static void _layout_job_record(GtkTreeView *treeview,
sprintf(tmp_char, "yes");
else
sprintf(tmp_char, "no");
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_REQUEUE),
tmp_char);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_RESV_NAME),
job_ptr->resv_name);
- snprintf(tmp_char, sizeof(tmp_char), "%u", job_ptr->restart_cnt);
- add_display_treestore_line(update, treestore, &iter,
+ snprintf(tmp_char, sizeof(tmp_char), "%u", job_ptr->restart_cnt);
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_RESTARTS),
tmp_char);
#ifdef HAVE_BG
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_ROTATE),
+ SORTID_ROTATE),
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_ROTATE));
#endif
@@ -1457,31 +1457,31 @@ static void _layout_job_record(GtkTreeView *treeview,
sprintf(tmp_char, "yes");
else
sprintf(tmp_char, "no");
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_SHARED),
tmp_char);
- add_display_treestore_line(update, treestore, &iter,
- find_col_name(display_data_job,
- SORTID_STATE),
+ add_display_treestore_line(update, treestore, &iter,
+ find_col_name(display_data_job,
+ SORTID_STATE),
job_state_string(job_ptr->job_state));
slurm_make_time_str((time_t *)&job_ptr->eligible_time, tmp_char,
sizeof(tmp_char));
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_TIME_ELIGIBLE),
+ SORTID_TIME_ELIGIBLE),
tmp_char);
- if ((job_ptr->time_limit == INFINITE) &&
+ if ((job_ptr->time_limit == INFINITE) &&
(job_ptr->end_time > time(NULL)))
sprintf(tmp_char, "NONE");
- else
+ else
slurm_make_time_str((time_t *)&job_ptr->end_time, tmp_char,
sizeof(tmp_char));
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_TIME_END),
+ SORTID_TIME_END),
tmp_char);
if (job_ptr->time_limit == NO_VAL)
@@ -1491,52 +1491,52 @@ static void _layout_job_record(GtkTreeView *treeview,
else
secs2time_str((job_ptr->time_limit * 60),
tmp_char, sizeof(tmp_char));
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_TIMELIMIT),
+ SORTID_TIMELIMIT),
tmp_char);
-
- add_display_treestore_line(update, treestore, &iter,
+
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_TIME_RUNNING),
+ SORTID_TIME_RUNNING),
running_char);
slurm_make_time_str((time_t *)&job_ptr->start_time, tmp_char,
sizeof(tmp_char));
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_TIME_START),
+ SORTID_TIME_START),
tmp_char);
slurm_make_time_str((time_t *)&job_ptr->submit_time, tmp_char,
sizeof(tmp_char));
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_TIME_SUBMIT),
+ SORTID_TIME_SUBMIT),
tmp_char);
secs2time_str(suspend_secs, tmp_char, sizeof(tmp_char));
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_TIME_SUSPEND),
+ SORTID_TIME_SUSPEND),
tmp_char);
uname = uid_to_string((uid_t)job_ptr->user_id);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_USER_ID), uname);
xfree(uname);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_WCKEY),
- job_ptr->wckey);
-
- add_display_treestore_line(update, treestore, &iter,
+ SORTID_WCKEY),
+ job_ptr->wckey);
+
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_WORKDIR),
job_ptr->work_dir);
}
-static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
+static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
GtkTreeStore *treestore,
GtkTreeIter *iter)
{
@@ -1549,9 +1549,9 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
job_info_t *job_ptr = sview_job_info_ptr->job_ptr;
struct group *group_info = NULL;
uint16_t term_sig = 0;
-
+
#ifdef HAVE_BG
- gtk_tree_store_set(treestore, iter, SORTID_SMALL_BLOCK,
+ gtk_tree_store_set(treestore, iter, SORTID_SMALL_BLOCK,
sview_job_info_ptr->small_block, -1);
#endif
gtk_tree_store_set(treestore, iter, SORTID_UPDATED, 1, -1);
@@ -1563,20 +1563,20 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
now_time = job_ptr->pre_sus_time;
else {
if (!IS_JOB_RUNNING(job_ptr) &&
- (job_ptr->end_time != 0))
+ (job_ptr->end_time != 0))
now_time = job_ptr->end_time;
if (job_ptr->suspend_time) {
now_time = (time_t)
(difftime(now_time,
job_ptr->suspend_time)
+ job_ptr->pre_sus_time);
- } else
+ } else
now_time = (time_t)difftime(
now_time, job_ptr->start_time);
}
suspend_secs = (time(NULL) - job_ptr->start_time) - now_time;
secs2time_str(now_time, tmp_char, sizeof(tmp_char));
- nodes = sview_job_info_ptr->nodes;
+ nodes = sview_job_info_ptr->nodes;
}
gtk_tree_store_set(treestore, iter, SORTID_COLOR,
sview_colors[sview_job_info_ptr->color_inx], -1);
@@ -1590,10 +1590,10 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
slurm_make_time_str((time_t *)&job_ptr->start_time, tmp_char,
sizeof(tmp_char));
gtk_tree_store_set(treestore, iter, SORTID_TIME_START, tmp_char, -1);
- if ((job_ptr->time_limit == INFINITE) &&
+ if ((job_ptr->time_limit == INFINITE) &&
(job_ptr->end_time > time(NULL)))
sprintf(tmp_char, "NONE");
- else
+ else
slurm_make_time_str((time_t *)&job_ptr->end_time, tmp_char,
sizeof(tmp_char));
gtk_tree_store_set(treestore, iter, SORTID_TIME_END, tmp_char, -1);
@@ -1608,126 +1608,126 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
secs2time_str((job_ptr->time_limit * 60),
tmp_char, sizeof(tmp_char));
gtk_tree_store_set(treestore, iter, SORTID_TIMELIMIT, tmp_char, -1);
-
+
gtk_tree_store_set(treestore, iter, SORTID_ALLOC, 1, -1);
gtk_tree_store_set(treestore, iter, SORTID_JOBID, job_ptr->job_id, -1);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_PARTITION, job_ptr->partition, -1);
snprintf(tmp_char, sizeof(tmp_char), "%s:%u",
job_ptr->alloc_node, job_ptr->alloc_sid);
gtk_tree_store_set(treestore, iter, SORTID_ALLOC_NODE, tmp_char, -1);
-
+
group_info = getgrgid((gid_t) job_ptr->group_id );
- if ( group_info && group_info->gr_name[ 0 ] )
+ if ( group_info && group_info->gr_name[ 0 ] )
snprintf(tmp_char, sizeof(tmp_char), "%s", group_info->gr_name);
- else
+ else
snprintf(tmp_char, sizeof(tmp_char), "%u", job_ptr->group_id);
-
- gtk_tree_store_set(treestore, iter,
- SORTID_GROUP_ID,
+
+ gtk_tree_store_set(treestore, iter,
+ SORTID_GROUP_ID,
tmp_char, -1);
uname = uid_to_string((uid_t)job_ptr->user_id);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_USER_ID, uname, -1);
xfree(uname);
#ifdef HAVE_BG
- gtk_tree_store_set(treestore, iter,
- SORTID_BLOCK,
+ gtk_tree_store_set(treestore, iter,
+ SORTID_BLOCK,
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_BG_ID), -1);
-
- gtk_tree_store_set(treestore, iter,
- SORTID_CONNECTION,
+
+ gtk_tree_store_set(treestore, iter,
+ SORTID_CONNECTION,
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_CONNECTION), -1);
- gtk_tree_store_set(treestore, iter,
- SORTID_GEOMETRY,
+ gtk_tree_store_set(treestore, iter,
+ SORTID_GEOMETRY,
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_GEOMETRY), -1);
- gtk_tree_store_set(treestore, iter,
- SORTID_ROTATE,
+ gtk_tree_store_set(treestore, iter,
+ SORTID_ROTATE,
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_ROTATE), -1);
- gtk_tree_store_set(treestore, iter,
- SORTID_CPU_MAX,
+ gtk_tree_store_set(treestore, iter,
+ SORTID_CPU_MAX,
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_MAX_CPUS), -1);
#ifdef HAVE_BGL
- gtk_tree_store_set(treestore, iter,
- SORTID_IMAGE_BLRTS,
+ gtk_tree_store_set(treestore, iter,
+ SORTID_IMAGE_BLRTS,
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_BLRTS_IMAGE), -1);
#endif
- gtk_tree_store_set(treestore, iter,
- SORTID_IMAGE_LINUX,
+ gtk_tree_store_set(treestore, iter,
+ SORTID_IMAGE_LINUX,
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_LINUX_IMAGE), -1);
-
- gtk_tree_store_set(treestore, iter,
- SORTID_IMAGE_MLOADER,
+
+ gtk_tree_store_set(treestore, iter,
+ SORTID_IMAGE_MLOADER,
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_MLOADER_IMAGE), -1);
-
- gtk_tree_store_set(treestore, iter,
- SORTID_IMAGE_RAMDISK,
+
+ gtk_tree_store_set(treestore, iter,
+ SORTID_IMAGE_RAMDISK,
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
- SELECT_PRINT_RAMDISK_IMAGE), -1);
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
+ SELECT_PRINT_RAMDISK_IMAGE), -1);
#endif
#ifdef HAVE_CRAY_XT
- gtk_tree_store_set(treestore, iter,
- SORTID_ALPS_RESV_ID,
+ gtk_tree_store_set(treestore, iter,
+ SORTID_ALPS_RESV_ID,
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- tmp_char,
- sizeof(tmp_char),
+ job_ptr->select_jobinfo,
+ tmp_char,
+ sizeof(tmp_char),
SELECT_PRINT_RESV_ID), -1);
#endif
gtk_tree_store_set(treestore, iter, SORTID_NAME, job_ptr->name, -1);
gtk_tree_store_set(treestore, iter, SORTID_WCKEY, job_ptr->wckey, -1);
- gtk_tree_store_set(treestore, iter,
- SORTID_STATE,
+ gtk_tree_store_set(treestore, iter,
+ SORTID_STATE,
job_state_string(job_ptr->job_state), -1);
- gtk_tree_store_set(treestore, iter,
- SORTID_STATE_NUM,
+ gtk_tree_store_set(treestore, iter,
+ SORTID_STATE_NUM,
job_ptr->job_state, -1);
-
+
#ifdef HAVE_BG
convert_num_unit((float)sview_job_info_ptr->node_cnt,
tmp_char, sizeof(tmp_char), UNIT_NONE);
#else
sprintf(tmp_char, "%u", sview_job_info_ptr->node_cnt);
#endif
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_NODES, tmp_char, -1);
#ifdef HAVE_BG
@@ -1736,12 +1736,12 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
#else
snprintf(tmp_char, sizeof(tmp_char), "%u", job_ptr->num_procs);
#endif
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_CPU_NUM, tmp_char, -1);
-
+
gtk_tree_store_set(treestore, iter, SORTID_NODELIST, nodes, -1);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_NODE_INX, job_ptr->node_inx, -1);
gtk_tree_store_set(treestore, iter, SORTID_NODELIST_REQ,
@@ -1753,47 +1753,47 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
sprintf(tmp_char, "yes");
else
sprintf(tmp_char, "no");
-
- gtk_tree_store_set(treestore, iter,
+
+ gtk_tree_store_set(treestore, iter,
SORTID_CONTIGUOUS, tmp_char, -1);
if(job_ptr->shared)
sprintf(tmp_char, "yes");
else
sprintf(tmp_char, "no");
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_SHARED, tmp_char, -1);
-
+
if(job_ptr->batch_flag)
sprintf(tmp_char, "yes");
else
sprintf(tmp_char, "no");
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_BATCH, tmp_char, -1);
if(job_ptr->requeue)
sprintf(tmp_char, "yes");
else
sprintf(tmp_char, "no");
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_REQUEUE, tmp_char, -1);
-
- gtk_tree_store_set(treestore, iter,
+
+ gtk_tree_store_set(treestore, iter,
SORTID_RESTARTS, job_ptr->restart_cnt, -1);
-
+
sprintf(tmp_char, "%u", sview_job_info_ptr->node_cnt);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_NODES_MIN, tmp_char, -1);
if(job_ptr->max_nodes > 0) {
sprintf(tmp_char, "%u", sview_job_info_ptr->node_cnt);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_NODES_MAX, tmp_char, -1);
}
if(job_ptr->cpus_per_task > 0) {
sprintf(tmp_char, "%u", job_ptr->cpus_per_task);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_CPUS_PER_TASK, tmp_char, -1);
}
- convert_num_unit((float)job_ptr->job_min_cpus,
+ convert_num_unit((float)job_ptr->job_min_cpus,
tmp_char, sizeof(tmp_char), UNIT_NONE);
gtk_tree_store_set(treestore, iter,
SORTID_CPU_REQ, tmp_char, -1);
@@ -1804,21 +1804,21 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
/* sprintf(tmp_char, "%u", job_ptr->min_sockets); */
/* gtk_tree_store_set(treestore, iter, */
/* SORTID_SOCKETS_MIN, tmp_char, -1); */
-
+
/* sprintf(tmp_char, "%u", job_ptr->min_cores); */
/* gtk_tree_store_set(treestore, iter, */
/* SORTID_CORES_MIN, tmp_char, -1); */
-
+
/* sprintf(tmp_char, "%u", job_ptr->min_threads); */
/* gtk_tree_store_set(treestore, iter, */
/* SORTID_THREADS_MIN, tmp_char, -1); */
-
- convert_num_unit((float)job_ptr->job_min_memory,
+
+ convert_num_unit((float)job_ptr->job_min_memory,
tmp_char, sizeof(tmp_char), UNIT_MEGA);
gtk_tree_store_set(treestore, iter,
SORTID_MEM_MIN, tmp_char, -1);
- convert_num_unit((float)job_ptr->job_min_tmp_disk,
+ convert_num_unit((float)job_ptr->job_min_tmp_disk,
tmp_char, sizeof(tmp_char), UNIT_MEGA);
gtk_tree_store_set(treestore, iter,
SORTID_TMP_DISK, tmp_char, -1);
@@ -1835,7 +1835,7 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
sprintf(tmp_char, "%u", job_ptr->priority);
gtk_tree_store_set(treestore, iter,
SORTID_PRIORITY, tmp_char, -1);
-
+
if(WIFSIGNALED(job_ptr->exit_code))
term_sig = WTERMSIG(job_ptr->exit_code);
snprintf(tmp_char, sizeof(tmp_char), "%u:%u",
@@ -1874,16 +1874,16 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
&step_iter, iter);
if(gtk_tree_model_iter_children(GTK_TREE_MODEL(treestore),
&step_iter, iter))
- _update_info_step(sview_job_info_ptr,
+ _update_info_step(sview_job_info_ptr,
GTK_TREE_MODEL(treestore), &step_iter, iter);
else
- _update_info_step(sview_job_info_ptr,
+ _update_info_step(sview_job_info_ptr,
GTK_TREE_MODEL(treestore), NULL, iter);
-
+
return;
}
-static void _layout_step_record(GtkTreeView *treeview,
+static void _layout_step_record(GtkTreeView *treeview,
job_step_info_t *step_ptr,
int update)
{
@@ -1893,7 +1893,7 @@ static void _layout_step_record(GtkTreeView *treeview,
time_t now_time = time(NULL);
GtkTreeIter iter;
enum job_states state;
- GtkTreeStore *treestore =
+ GtkTreeStore *treestore =
GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
if(!treestore)
@@ -1901,31 +1901,31 @@ static void _layout_step_record(GtkTreeView *treeview,
convert_num_unit((float)step_ptr->num_cpus, tmp_char, sizeof(tmp_char),
UNIT_NONE);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_CPU_NUM),
tmp_char);
uname = uid_to_string((uid_t)step_ptr->user_id);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_USER_ID), uname);
xfree(uname);
- snprintf(tmp_char, sizeof(tmp_char), "%u.%u",
+ snprintf(tmp_char, sizeof(tmp_char), "%u.%u",
step_ptr->job_id,
- step_ptr->step_id);
- add_display_treestore_line(update, treestore, &iter,
+ step_ptr->step_id);
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_JOBID),
tmp_char);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_NAME),
step_ptr->name);
-
- if(!step_ptr->nodes
+
+ if(!step_ptr->nodes
|| !strcasecmp(step_ptr->nodes,"waiting...")) {
sprintf(tmp_time,"00:00:00");
nodes = "waiting...";
@@ -1938,22 +1938,22 @@ static void _layout_step_record(GtkTreeView *treeview,
convert_num_unit((float)step_ptr->num_tasks,
tmp_char, sizeof(tmp_char), UNIT_NONE);
#else
- convert_num_unit((float)_nodes_in_list(nodes),
+ convert_num_unit((float)_nodes_in_list(nodes),
tmp_char, sizeof(tmp_char), UNIT_NONE);
#endif
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_NODES),
tmp_char);
state = JOB_RUNNING;
}
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_NODELIST),
nodes);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_PARTITION),
step_ptr->partition);
@@ -1962,7 +1962,7 @@ static void _layout_step_record(GtkTreeView *treeview,
find_col_name(display_data_job,
SORTID_STATE),
job_state_string(state));
-
+
if (step_ptr->time_limit == NO_VAL)
sprintf(tmp_char, "Partition Limit");
else if(step_ptr->time_limit == INFINITE)
@@ -1970,25 +1970,25 @@ static void _layout_step_record(GtkTreeView *treeview,
else
secs2time_str((step_ptr->time_limit * 60),
tmp_char, sizeof(tmp_char));
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_TIMELIMIT),
+ SORTID_TIMELIMIT),
tmp_char);
-
- add_display_treestore_line(update, treestore, &iter,
+
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
- SORTID_TIME_RUNNING),
+ SORTID_TIME_RUNNING),
tmp_time);
-
+
convert_num_unit((float)step_ptr->num_tasks, tmp_char, sizeof(tmp_char),
UNIT_NONE);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_TASKS),
tmp_char);
}
-static void _update_step_record(job_step_info_t *step_ptr,
+static void _update_step_record(job_step_info_t *step_ptr,
GtkTreeStore *treestore,
GtkTreeIter *iter)
{
@@ -1999,7 +1999,7 @@ static void _update_step_record(job_step_info_t *step_ptr,
enum job_states state;
gtk_tree_store_set(treestore, iter, SORTID_UPDATED, 1, -1);
- if(!step_ptr->nodes
+ if(!step_ptr->nodes
|| !strcasecmp(step_ptr->nodes,"waiting...")) {
sprintf(tmp_char,"00:00:00");
nodes = "waiting...";
@@ -2012,10 +2012,10 @@ static void _update_step_record(job_step_info_t *step_ptr,
convert_num_unit((float)step_ptr->num_tasks,
tmp_char, sizeof(tmp_char), UNIT_NONE);
#else
- convert_num_unit((float)_nodes_in_list(nodes),
+ convert_num_unit((float)_nodes_in_list(nodes),
tmp_char, sizeof(tmp_char), UNIT_NONE);
#endif
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_NODES, tmp_char, -1);
state = JOB_RUNNING;
}
@@ -2023,14 +2023,14 @@ static void _update_step_record(job_step_info_t *step_ptr,
gtk_tree_store_set(treestore, iter,
SORTID_STATE,
job_state_string(state), -1);
-
- gtk_tree_store_set(treestore, iter,
+
+ gtk_tree_store_set(treestore, iter,
SORTID_TIME_RUNNING, tmp_time, -1);
-
+
gtk_tree_store_set(treestore, iter, SORTID_ALLOC, 0, -1);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_JOBID, step_ptr->step_id, -1);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_PARTITION, step_ptr->partition, -1);
/* #ifdef HAVE_BG */
/* gtk_tree_store_set(treestore, iter, */
@@ -2042,35 +2042,35 @@ static void _update_step_record(job_step_info_t *step_ptr,
/* SELECT_PRINT_BG_ID), -1); */
/* #endif */
uname = uid_to_string((uid_t)step_ptr->user_id);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_USER_ID, uname, -1);
xfree(uname);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_NAME, step_ptr->name, -1);
-
+
convert_num_unit((float)step_ptr->num_tasks, tmp_char, sizeof(tmp_char),
UNIT_NONE);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_TASKS, tmp_char, -1);
convert_num_unit((float)step_ptr->num_cpus, tmp_char, sizeof(tmp_char),
UNIT_NONE);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_CPU_NUM, tmp_char, -1);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_NODELIST, nodes, -1);
-
+
return;
}
-static void _append_job_record(sview_job_info_t *sview_job_info_ptr,
+static void _append_job_record(sview_job_info_t *sview_job_info_ptr,
GtkTreeStore *treestore, GtkTreeIter *iter,
int line)
{
gtk_tree_store_append(treestore, iter, NULL);
gtk_tree_store_set(treestore, iter, SORTID_POS, line, -1);
- _update_job_record(sview_job_info_ptr, treestore, iter);
+ _update_job_record(sview_job_info_ptr, treestore, iter);
}
static void _append_step_record(job_step_info_t *step_ptr,
@@ -2084,8 +2084,8 @@ static void _append_step_record(job_step_info_t *step_ptr,
_update_step_record(step_ptr, treestore, &step_iter);
}
-static void _update_info_step(sview_job_info_t *sview_job_info_ptr,
- GtkTreeModel *model,
+static void _update_info_step(sview_job_info_t *sview_job_info_ptr,
+ GtkTreeModel *model,
GtkTreeIter *step_iter,
GtkTreeIter *iter)
{
@@ -2095,15 +2095,15 @@ static void _update_info_step(sview_job_info_t *sview_job_info_ptr,
int set = 0;
ListIterator itr = NULL;
job_step_info_t *step_ptr = NULL;
-
+
memset(&first_step_iter, 0, sizeof(GtkTreeIter));
/* make sure all the steps are still here */
if (step_iter) {
first_step_iter = *step_iter;
while(1) {
- gtk_tree_store_set(GTK_TREE_STORE(model), step_iter,
- SORTID_UPDATED, 0, -1);
+ gtk_tree_store_set(GTK_TREE_STORE(model), step_iter,
+ SORTID_UPDATED, 0, -1);
if(!gtk_tree_model_iter_next(model, step_iter)) {
break;
}
@@ -2117,29 +2117,29 @@ static void _update_info_step(sview_job_info_t *sview_job_info_ptr,
if (!step_iter) {
goto adding;
} else {
- memcpy(step_iter, &first_step_iter,
+ memcpy(step_iter, &first_step_iter,
sizeof(GtkTreeIter));
}
while(1) {
- /* search for the jobid and check to see if
+ /* search for the jobid and check to see if
it is in the list */
- gtk_tree_model_get(model, step_iter, SORTID_JOBID,
+ gtk_tree_model_get(model, step_iter, SORTID_JOBID,
&stepid, -1);
if(stepid == (int)step_ptr->step_id) {
/* update with new info */
_update_step_record(step_ptr,
- GTK_TREE_STORE(model),
+ GTK_TREE_STORE(model),
step_iter);
goto found;
- }
-
+ }
+
if(!gtk_tree_model_iter_next(model, step_iter)) {
step_iter = NULL;
break;
}
}
adding:
- _append_step_record(step_ptr, GTK_TREE_STORE(model),
+ _append_step_record(step_ptr, GTK_TREE_STORE(model),
iter, sview_job_info_ptr->job_ptr->job_id);
found:
;
@@ -2150,11 +2150,11 @@ static void _update_info_step(sview_job_info_t *sview_job_info_ptr,
step_iter = &first_step_iter;
/* clear all steps that aren't active */
while(1) {
- gtk_tree_model_get(model, step_iter,
+ gtk_tree_model_get(model, step_iter,
SORTID_UPDATED, &i, -1);
if(!i) {
if(!gtk_tree_store_remove(
- GTK_TREE_STORE(model),
+ GTK_TREE_STORE(model),
step_iter))
break;
else
@@ -2166,7 +2166,7 @@ static void _update_info_step(sview_job_info_t *sview_job_info_ptr,
}
}
return;
-}
+}
static void _update_info_job(List info_list,
GtkTreeView *tree_view)
@@ -2184,8 +2184,8 @@ static void _update_info_job(List info_list,
/* make sure all the jobs are still here */
if (gtk_tree_model_get_iter(model, &iter, path)) {
while(1) {
- gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
- SORTID_UPDATED, 0, -1);
+ gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
+ SORTID_UPDATED, 0, -1);
if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
@@ -2201,25 +2201,25 @@ static void _update_info_job(List info_list,
}
line = 0;
while(1) {
- /* search for the jobid and check to see if
+ /* search for the jobid and check to see if
it is in the list */
- gtk_tree_model_get(model, &iter, SORTID_JOBID,
+ gtk_tree_model_get(model, &iter, SORTID_JOBID,
&jobid, -1);
if(jobid == job_ptr->job_id) {
/* update with new info */
_update_job_record(sview_job_info,
- GTK_TREE_STORE(model),
+ GTK_TREE_STORE(model),
&iter);
goto found;
}
-
+
line++;
if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
}
- adding:
- _append_job_record(sview_job_info, GTK_TREE_STORE(model),
+ adding:
+ _append_job_record(sview_job_info, GTK_TREE_STORE(model),
&iter, line);
found:
;
@@ -2230,7 +2230,7 @@ static void _update_info_job(List info_list,
gtk_tree_path_free(path);
/* remove all old jobs */
remove_old(model, SORTID_UPDATED);
- return;
+ return;
}
static void _job_info_list_del(void *object)
@@ -2276,7 +2276,7 @@ static List _create_job_info_list(job_info_msg_t *job_info_ptr,
sview_job_info_t *sview_job_info_ptr = NULL;
job_info_t *job_ptr = NULL;
job_step_info_t *step_ptr = NULL;
-
+
#ifdef HAVE_BG
char *ionodes = NULL;
char tmp_char[50];
@@ -2288,7 +2288,7 @@ static List _create_job_info_list(job_info_msg_t *job_info_ptr,
if(!changed && info_list) {
goto update_color;
}
-
+
if(info_list) {
list_destroy(info_list);
list_destroy(odd_info_list);
@@ -2300,7 +2300,7 @@ static List _create_job_info_list(job_info_msg_t *job_info_ptr,
g_print("malloc error\n");
return NULL;
}
-
+
for(i=0; i<job_info_ptr->record_count; i++) {
job_ptr = &(job_info_ptr->job_array[i]);
sview_job_info_ptr = xmalloc(sizeof(sview_job_info_t));
@@ -2311,11 +2311,11 @@ static List _create_job_info_list(job_info_msg_t *job_info_ptr,
sview_job_info_ptr->color_inx =
job_ptr->job_id % sview_colors_cnt;
#ifdef HAVE_BG
- select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_IONODES,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo,
+ SELECT_JOBDATA_IONODES,
&ionodes);
- select_g_select_jobinfo_get(job_ptr->select_jobinfo,
- SELECT_JOBDATA_NODE_CNT,
+ select_g_select_jobinfo_get(job_ptr->select_jobinfo,
+ SELECT_JOBDATA_NODE_CNT,
&sview_job_info_ptr->node_cnt);
if(ionodes) {
sview_job_info_ptr->small_block = 1;
@@ -2339,7 +2339,7 @@ static List _create_job_info_list(job_info_msg_t *job_info_ptr,
count++;
count++; // for the -1;
#endif
-
+
for(j = 0; j < step_info_ptr->job_step_count; j++) {
step_ptr = &(step_info_ptr->job_steps[j]);
if(step_ptr->job_id == job_ptr->job_id) {
@@ -2358,18 +2358,18 @@ static List _create_job_info_list(job_info_msg_t *job_info_ptr,
xfree(step_ptr->node_inx);
step_ptr->node_inx =
xmalloc(sizeof(int) * count);
- memcpy(step_ptr->node_inx, job_ptr->node_inx,
+ memcpy(step_ptr->node_inx, job_ptr->node_inx,
sizeof(int) * count);
#endif
- list_append(sview_job_info_ptr->step_list,
+ list_append(sview_job_info_ptr->step_list,
step_ptr);
- }
+ }
}
list_append(odd_info_list, sview_job_info_ptr);
-
+
if(!IS_JOB_PENDING(job_ptr) &&
!IS_JOB_RUNNING(job_ptr) &&
- !IS_JOB_SUSPENDED(job_ptr) &&
+ !IS_JOB_SUSPENDED(job_ptr) &&
!IS_JOB_COMPLETING(job_ptr)) {
continue;
}
@@ -2409,22 +2409,22 @@ need_refresh:
if(!spec_info->display_widget) {
treeview = create_treeview_2cols_attach_to_table(
popup_win->table);
- spec_info->display_widget =
+ spec_info->display_widget =
gtk_widget_ref(GTK_WIDGET(treeview));
} else {
treeview = GTK_TREE_VIEW(spec_info->display_widget);
update = 1;
}
-
+
itr = list_iterator_create(info_list);
while((sview_job_info = (sview_job_info_t*) list_next(itr))) {
i++;
if(sview_job_info->job_ptr->job_id ==
- spec_info->search_info->int_data)
+ spec_info->search_info->int_data)
break;
}
list_iterator_destroy(itr);
-
+
if(!sview_job_info) {
/* not found */
} else if(spec_info->search_info->int_data2 == NO_VAL) {
@@ -2456,7 +2456,7 @@ need_refresh:
step_ptr->step_id, false, 0);
j += 2;
}
- _layout_step_record(treeview,
+ _layout_step_record(treeview,
step_ptr, update);
found = 1;
break;
@@ -2467,21 +2467,21 @@ need_refresh:
post_setup_popup_grid_list(popup_win);
if(!found) {
- if(!popup_win->not_found) {
+ if(!popup_win->not_found) {
char *temp = "JOB ALREADY FINISHED OR NOT FOUND\n";
GtkTreeIter iter;
GtkTreeModel *model = NULL;
-
+
/* only time this will be run so no update */
model = gtk_tree_view_get_model(treeview);
- add_display_treestore_line(0,
- GTK_TREE_STORE(model),
+ add_display_treestore_line(0,
+ GTK_TREE_STORE(model),
&iter,
temp, "");
- if(spec_info->search_info->int_data2 != NO_VAL)
+ if(spec_info->search_info->int_data2 != NO_VAL)
add_display_treestore_line(
- 1,
- GTK_TREE_STORE(model),
+ 1,
+ GTK_TREE_STORE(model),
&iter,
find_col_name(display_data_job,
SORTID_STATE),
@@ -2489,10 +2489,10 @@ need_refresh:
}
popup_win->not_found = true;
} else {
- if(popup_win->not_found) {
+ if(popup_win->not_found) {
popup_win->not_found = false;
gtk_widget_destroy(spec_info->display_widget);
-
+
goto need_refresh;
}
}
@@ -2512,7 +2512,7 @@ extern void refresh_job(GtkAction *action, gpointer user_data)
specific_info_job(popup_win);
}
-extern int get_new_info_job(job_info_msg_t **info_ptr,
+extern int get_new_info_job(job_info_msg_t **info_ptr,
int force)
{
static job_info_msg_t *job_info_ptr = NULL, *new_job_ptr = NULL;
@@ -2521,12 +2521,12 @@ extern int get_new_info_job(job_info_msg_t **info_ptr,
time_t now = time(NULL);
static time_t last;
static bool changed = 0;
-
+
if(!force && ((now - last) < global_sleep_time)) {
- if(*info_ptr != job_info_ptr)
+ if(*info_ptr != job_info_ptr)
error_code = SLURM_SUCCESS;
*info_ptr = job_info_ptr;
- if(changed)
+ if(changed)
return SLURM_SUCCESS;
return error_code;
}
@@ -2544,20 +2544,20 @@ extern int get_new_info_job(job_info_msg_t **info_ptr,
changed = 0;
}
} else {
- error_code = slurm_load_jobs((time_t) NULL, &new_job_ptr,
+ error_code = slurm_load_jobs((time_t) NULL, &new_job_ptr,
show_flags);
changed = 1;
}
job_info_ptr = new_job_ptr;
- if(*info_ptr != job_info_ptr)
+ if(*info_ptr != job_info_ptr)
error_code = SLURM_SUCCESS;
*info_ptr = new_job_ptr;
return error_code;
}
-extern int get_new_info_job_step(job_step_info_response_msg_t **info_ptr,
+extern int get_new_info_job_step(job_step_info_response_msg_t **info_ptr,
int force)
{
static job_step_info_response_msg_t *old_step_ptr = NULL;
@@ -2567,20 +2567,20 @@ extern int get_new_info_job_step(job_step_info_response_msg_t **info_ptr,
time_t now = time(NULL);
static time_t last;
static bool changed = 0;
-
+
if(!force && ((now - last) < global_sleep_time)) {
- if(*info_ptr != old_step_ptr)
+ if(*info_ptr != old_step_ptr)
error_code = SLURM_SUCCESS;
*info_ptr = old_step_ptr;
- if(changed)
+ if(changed)
return SLURM_SUCCESS;
return error_code;
}
last = now;
show_flags |= SHOW_ALL;
if (old_step_ptr) {
- error_code = slurm_get_job_steps(old_step_ptr->last_update,
- NO_VAL, NO_VAL, &new_step_ptr,
+ error_code = slurm_get_job_steps(old_step_ptr->last_update,
+ NO_VAL, NO_VAL, &new_step_ptr,
show_flags);
if (error_code == SLURM_SUCCESS) {
slurm_free_job_step_info_response_msg(old_step_ptr);
@@ -2591,13 +2591,13 @@ extern int get_new_info_job_step(job_step_info_response_msg_t **info_ptr,
changed = 0;
}
} else {
- error_code = slurm_get_job_steps((time_t) NULL, NO_VAL, NO_VAL,
+ error_code = slurm_get_job_steps((time_t) NULL, NO_VAL, NO_VAL,
&new_step_ptr, show_flags);
changed = 1;
}
old_step_ptr = new_step_ptr;
- if(*info_ptr != old_step_ptr)
+ if(*info_ptr != old_step_ptr)
error_code = SLURM_SUCCESS;
*info_ptr = new_step_ptr;
@@ -2608,7 +2608,7 @@ extern GtkListStore *create_model_job(int type)
{
GtkListStore *model = NULL;
GtkTreeIter iter;
-
+
switch(type) {
case SORTID_ACTION:
model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
@@ -2616,27 +2616,27 @@ extern GtkListStore *create_model_job(int type)
gtk_list_store_set(model, &iter,
1, SORTID_ACTION,
0, "None",
- -1);
+ -1);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
1, SORTID_ACTION,
0, "Cancel",
- -1);
+ -1);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
1, SORTID_ACTION,
0, "Suspend/Resume",
- -1);
+ -1);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
1, SORTID_ACTION,
0, "Checkpoint",
- -1);
+ -1);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
1, SORTID_ACTION,
0, "requeue",
- -1);
+ -1);
break;
case SORTID_SHARED:
case SORTID_CONTIGUOUS:
@@ -2649,12 +2649,12 @@ extern GtkListStore *create_model_job(int type)
gtk_list_store_set(model, &iter,
0, "yes",
1, type,
- -1);
+ -1);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
0, "no",
1, type,
- -1);
+ -1);
break;
#ifdef HAVE_BG
case SORTID_CONNECTION:
@@ -2663,17 +2663,17 @@ extern GtkListStore *create_model_job(int type)
gtk_list_store_set(model, &iter,
0, "torus",
1, SORTID_CONNECTION,
- -1);
+ -1);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
0, "mesh",
1, SORTID_CONNECTION,
- -1);
+ -1);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
0, "nav",
1, SORTID_CONNECTION,
- -1);
+ -1);
break;
#endif
default:
@@ -2692,38 +2692,38 @@ extern void admin_edit_job(GtkCellRendererText *cell,
GtkTreePath *path = gtk_tree_path_new_from_string(path_string);
GtkTreeIter iter;
job_desc_msg_t *job_msg = xmalloc(sizeof(job_desc_msg_t));
-
+
char *temp = NULL;
char *old_text = NULL;
const char *type = NULL;
int stepid = NO_VAL;
- int column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell),
+ int column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell),
"column"));
if(!new_text || !strcmp(new_text, ""))
goto no_input;
-
+
gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path);
- slurm_init_job_desc_msg(job_msg);
- gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter,
- SORTID_JOBID, &job_msg->job_id,
+ slurm_init_job_desc_msg(job_msg);
+ gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter,
+ SORTID_JOBID, &job_msg->job_id,
column, &old_text,
-1);
- gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter,
+ gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter,
SORTID_ALLOC, &stepid, -1);
if(stepid)
stepid = NO_VAL;
else {
stepid = job_msg->job_id;
- gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter,
+ gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter,
SORTID_POS, &job_msg->job_id, -1);
}
-
+
type = _set_job_msg(job_msg, new_text, column);
- if(errno)
+ if(errno)
goto print_error;
-
+
if(got_edit_signal) {
temp = got_edit_signal;
got_edit_signal = NULL;
@@ -2731,7 +2731,7 @@ extern void admin_edit_job(GtkCellRendererText *cell,
xfree(temp);
goto no_input;
}
-
+
if(old_text && !strcmp(old_text, new_text)) {
temp = g_strdup_printf("No change in value.");
@@ -2752,13 +2752,13 @@ extern void admin_edit_job(GtkCellRendererText *cell,
type,
new_text);
}
-
+
display_edit_note(temp);
g_free(temp);
no_input:
slurm_free_job_desc_msg(job_msg);
-
+
gtk_tree_path_free (path);
g_free(old_text);
g_static_mutex_unlock(&sview_mutex);
@@ -2781,7 +2781,7 @@ extern void get_info_job(GtkTable *table, display_data_t *display_data)
sview_job_info_t *sview_job_info_ptr = NULL;
job_info_t *job_ptr = NULL;
ListIterator itr = NULL;
-
+
if(display_data)
local_display_data = display_data;
if(!table) {
@@ -2796,7 +2796,7 @@ extern void get_info_job(GtkTable *table, display_data_t *display_data)
if((job_error_code = get_new_info_job(&job_info_ptr, force_refresh))
== SLURM_NO_CHANGE_IN_DATA){
-
+
} else if (job_error_code != SLURM_SUCCESS) {
if(view == ERROR_VIEW)
goto end_it;
@@ -2806,13 +2806,13 @@ extern void get_info_job(GtkTable *table, display_data_t *display_data)
sprintf(error_char, "slurm_load_job: %s",
slurm_strerror(slurm_get_errno()));
label = gtk_label_new(error_char);
- gtk_table_attach_defaults(table, label, 0, 1, 0, 1);
- gtk_widget_show(label);
+ gtk_table_attach_defaults(table, label, 0, 1, 0, 1);
+ gtk_widget_show(label);
display_widget = gtk_widget_ref(GTK_WIDGET(label));
goto end_it;
}
- if((step_error_code = get_new_info_job_step(&step_info_ptr,
+ if((step_error_code = get_new_info_job_step(&step_info_ptr,
force_refresh))
== SLURM_NO_CHANGE_IN_DATA){
if((!display_widget || view == ERROR_VIEW)
@@ -2828,18 +2828,18 @@ extern void get_info_job(GtkTable *table, display_data_t *display_data)
sprintf(error_char, "slurm_load_job_step: %s",
slurm_strerror(slurm_get_errno()));
label = gtk_label_new(error_char);
- gtk_table_attach_defaults(table, label, 0, 1, 0, 1);
- gtk_widget_show(label);
+ gtk_table_attach_defaults(table, label, 0, 1, 0, 1);
+ gtk_widget_show(label);
display_widget = gtk_widget_ref(GTK_WIDGET(label));
goto end_it;
}
display_it:
-
+
info_list = _create_job_info_list(job_info_ptr, step_info_ptr,
changed, 0);
if(!info_list)
return;
-
+
/* set up the grid */
itr = list_iterator_create(info_list);
while ((sview_job_info_ptr = list_next(itr))) {
@@ -2868,13 +2868,13 @@ display_it:
if(!display_widget) {
tree_view = create_treeview(local_display_data,
&grid_button_list);
-
+
display_widget = gtk_widget_ref(GTK_WIDGET(tree_view));
- gtk_table_attach_defaults(GTK_TABLE(table),
+ gtk_table_attach_defaults(GTK_TABLE(table),
GTK_WIDGET(tree_view),
- 0, 1, 0, 1);
- /* since this function sets the model of the tree_view
- to the treestore we don't really care about
+ 0, 1, 0, 1);
+ /* since this function sets the model of the tree_view
+ to the treestore we don't really care about
the return value */
create_treestore(tree_view, display_data_job,
SORTID_CNT, SORTID_TIME_SUBMIT, SORTID_COLOR);
@@ -2885,7 +2885,7 @@ display_it:
end_it:
toggled = FALSE;
force_refresh = FALSE;
-
+
return;
}
@@ -2905,12 +2905,12 @@ extern void specific_info_job(popup_info_t *popup_win)
int changed = 1;
int j=0, i=-1;
sview_job_info_t *sview_job_info_ptr = NULL;
- job_info_t *job_ptr = NULL;
+ job_info_t *job_ptr = NULL;
ListIterator itr = NULL;
char name[30], *uname = NULL;
hostset_t hostset = NULL;
int name_diff;
-
+
if(!spec_info->display_widget)
setup_popup_info(popup_win, display_data_job, SORTID_CNT);
@@ -2923,31 +2923,31 @@ extern void specific_info_job(popup_info_t *popup_win)
if((job_error_code =
get_new_info_job(&job_info_ptr, popup_win->force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
-
+
} else if (job_error_code != SLURM_SUCCESS) {
if(spec_info->view == ERROR_VIEW)
goto end_it;
spec_info->view = ERROR_VIEW;
if(spec_info->display_widget)
gtk_widget_destroy(spec_info->display_widget);
-
+
sprintf(error_char, "slurm_load_job: %s",
slurm_strerror(slurm_get_errno()));
label = gtk_label_new(error_char);
- gtk_table_attach_defaults(GTK_TABLE(popup_win->table),
+ gtk_table_attach_defaults(GTK_TABLE(popup_win->table),
label,
- 0, 1, 0, 1);
- gtk_widget_show(label);
+ 0, 1, 0, 1);
+ gtk_widget_show(label);
spec_info->display_widget = gtk_widget_ref(GTK_WIDGET(label));
goto end_it;
}
- if((step_error_code =
+ if((step_error_code =
get_new_info_job_step(&step_info_ptr, popup_win->force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
- if((!spec_info->display_widget
+ if((!spec_info->display_widget
|| spec_info->view == ERROR_VIEW)
- || (job_error_code != SLURM_NO_CHANGE_IN_DATA))
+ || (job_error_code != SLURM_NO_CHANGE_IN_DATA))
goto display_it;
changed = 0;
} else if (step_error_code != SLURM_SUCCESS) {
@@ -2959,9 +2959,9 @@ extern void specific_info_job(popup_info_t *popup_win)
sprintf(error_char, "slurm_load_job_step: %s",
slurm_strerror(slurm_get_errno()));
label = gtk_label_new(error_char);
- gtk_table_attach_defaults(popup_win->table, label,
- 0, 1, 0, 1);
- gtk_widget_show(label);
+ gtk_table_attach_defaults(popup_win->table, label,
+ 0, 1, 0, 1);
+ gtk_widget_show(label);
spec_info->display_widget = gtk_widget_ref(GTK_WIDGET(label));
goto end_it;
}
@@ -2970,25 +2970,25 @@ display_it:
changed, 1);
if(!info_list)
return;
-
+
if(spec_info->view == ERROR_VIEW && spec_info->display_widget) {
gtk_widget_destroy(spec_info->display_widget);
spec_info->display_widget = NULL;
}
-
+
if(spec_info->type != INFO_PAGE && !spec_info->display_widget) {
tree_view = create_treeview(local_display_data,
&popup_win->grid_button_list);
-
- spec_info->display_widget =
+
+ spec_info->display_widget =
gtk_widget_ref(GTK_WIDGET(tree_view));
- gtk_table_attach_defaults(popup_win->table,
+ gtk_table_attach_defaults(popup_win->table,
GTK_WIDGET(tree_view),
- 0, 1, 0, 1);
- /* since this function sets the model of the tree_view
- to the treestore we don't really care about
+ 0, 1, 0, 1);
+ /* since this function sets the model of the tree_view
+ to the treestore we don't really care about
the return value */
- create_treestore(tree_view, popup_win->display_data,
+ create_treestore(tree_view, popup_win->display_data,
SORTID_CNT, SORTID_TIME_SUBMIT, SORTID_COLOR);
}
@@ -3000,10 +3000,10 @@ display_it:
goto end_it;
}
-
+
/* just linking to another list, don't free the inside, just
the list */
- send_info_list = list_create(NULL);
+ send_info_list = list_create(NULL);
itr = list_iterator_create(info_list);
i = -1;
while ((sview_job_info_ptr = list_next(itr))) {
@@ -3043,7 +3043,7 @@ display_it:
if(!search_info->gchar_data)
continue;
uname = uid_to_string(job_ptr->user_id);
- name_diff = strcmp(uname,
+ name_diff = strcmp(uname,
search_info->gchar_data);
xfree(uname);
if(name_diff)
@@ -3059,7 +3059,7 @@ display_it:
default:
break;
}
- break;
+ break;
case PART_PAGE:
if(strcmp(search_info->gchar_data,
job_ptr->partition))
@@ -3072,9 +3072,9 @@ display_it:
break;
case BLOCK_PAGE:
select_g_select_jobinfo_sprint(
- job_ptr->select_jobinfo,
- name,
- sizeof(name),
+ job_ptr->select_jobinfo,
+ name,
+ sizeof(name),
SELECT_PRINT_BG_ID);
if(strcmp(search_info->gchar_data, name))
continue;
@@ -3082,19 +3082,19 @@ display_it:
case NODE_PAGE:
if(!job_ptr->nodes)
continue;
-
+
if(!(hostset = hostset_create(search_info->gchar_data)))
continue;
if(!hostset_intersects(hostset, job_ptr->nodes)) {
hostset_destroy(hostset);
continue;
}
- hostset_destroy(hostset);
+ hostset_destroy(hostset);
break;
default:
continue;
}
-
+
list_push(send_info_list, sview_job_info_ptr);
j=0;
while(job_ptr->node_inx[j] >= 0) {
@@ -3112,7 +3112,7 @@ display_it:
_update_info_job(send_info_list,
GTK_TREE_VIEW(spec_info->display_widget));
-
+
list_destroy(send_info_list);
end_it:
popup_win->toggled = 0;
@@ -3144,8 +3144,8 @@ extern void set_menus_job(void *arg, void *arg2, GtkTreePath *path, int type)
if (!gtk_tree_model_get_iter(model, &iter, path)) {
g_error("job error getting iter from model\n");
break;
- }
-
+ }
+
popup_all_job(model, &iter, INFO_PAGE);
break;
@@ -3187,26 +3187,26 @@ extern void popup_all_job(GtkTreeModel *model, GtkTreeIter *iter, int id)
snprintf(title, 100, "Partition with job %d", jobid);
else
snprintf(title, 100, "Partition with job %d.%d",
- jobid, stepid);
+ jobid, stepid);
break;
case RESV_PAGE:
if(stepid == NO_VAL)
snprintf(title, 100, "Reservation with job %d", jobid);
else
snprintf(title, 100, "Reservation with job %d.%d",
- jobid, stepid);
+ jobid, stepid);
break;
case NODE_PAGE:
if(stepid == NO_VAL) {
#ifdef HAVE_BG
- snprintf(title, 100,
+ snprintf(title, 100,
"Base partition(s) running job %d", jobid);
#else
snprintf(title, 100, "Node(s) running job %d", jobid);
#endif
} else {
#ifdef HAVE_BG
- snprintf(title, 100,
+ snprintf(title, 100,
"Base partition(s) running job %d.%d",
jobid, stepid);
#else
@@ -3215,33 +3215,33 @@ extern void popup_all_job(GtkTreeModel *model, GtkTreeIter *iter, int id)
#endif
}
break;
- case BLOCK_PAGE:
+ case BLOCK_PAGE:
if(stepid == NO_VAL)
snprintf(title, 100, "Block with job %d", jobid);
else
snprintf(title, 100, "Block with job %d.%d",
jobid, stepid);
break;
- case INFO_PAGE:
+ case INFO_PAGE:
if(stepid == NO_VAL)
snprintf(title, 100, "Full info for job %d", jobid);
else
snprintf(title, 100, "Full info for job %d.%d",
- jobid, stepid);
+ jobid, stepid);
break;
default:
g_print("jobs got id %d\n", id);
}
-
+
itr = list_iterator_create(popup_list);
while((popup_win = list_next(itr))) {
if(popup_win->spec_info)
if(!strcmp(popup_win->spec_info->title, title)) {
break;
- }
+ }
}
list_iterator_destroy(itr);
-
+
if(!popup_win) {
if(id == INFO_PAGE)
popup_win = create_popup_info(id, JOB_PAGE, title);
@@ -3251,7 +3251,7 @@ extern void popup_all_job(GtkTreeModel *model, GtkTreeIter *iter, int id)
gtk_window_present(GTK_WINDOW(popup_win->popup));
return;
}
-
+
/* Pass the model and the structs from the iter so we can always get
the current node_inx.
*/
@@ -3287,24 +3287,24 @@ extern void popup_all_job(GtkTreeModel *model, GtkTreeIter *iter, int id)
popup_win->spec_info->search_info->gchar_data = name;
break;
#ifdef HAVE_BG
- case BLOCK_PAGE:
+ case BLOCK_PAGE:
gtk_tree_model_get(model, iter, SORTID_BLOCK, &name, -1);
popup_win->spec_info->search_info->gchar_data = name;
break;
#endif
- case SUBMIT_PAGE:
+ case SUBMIT_PAGE:
break;
case INFO_PAGE:
popup_win->spec_info->search_info->int_data = jobid;
popup_win->spec_info->search_info->int_data2 = stepid;
break;
-
+
default:
g_print("jobs got %d\n", id);
}
if (!g_thread_create((gpointer)popup_thr, popup_win, FALSE, &error))
{
- g_printerr ("Failed to create part popup thread: %s\n",
+ g_printerr ("Failed to create part popup thread: %s\n",
error->message);
return;
}
@@ -3315,7 +3315,7 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter, char *type)
int jobid = NO_VAL;
int stepid = NO_VAL;
int state = 0;
- int response = 0;
+ int response = 0;
char tmp_char[255];
char *tmp_char_ptr = NULL;
int edit_type = 0;
@@ -3330,7 +3330,7 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter, char *type)
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
NULL);
gtk_window_set_transient_for(GTK_WINDOW(popup), NULL);
-
+
gtk_tree_model_get(model, iter, SORTID_JOBID, &jobid, -1);
gtk_tree_model_get(model, iter, SORTID_ALLOC, &stepid, -1);
if(stepid)
@@ -3340,8 +3340,8 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter, char *type)
gtk_tree_model_get(model, iter, SORTID_POS, &jobid, -1);
}
slurm_init_job_desc_msg(job_msg);
-
-
+
+
if(!strcasecmp("Signal", type)) {
label = gtk_dialog_add_button(GTK_DIALOG(popup),
GTK_STOCK_OK, GTK_RESPONSE_OK);
@@ -3358,13 +3358,13 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter, char *type)
gtk_window_set_default(GTK_WINDOW(popup), label);
gtk_dialog_add_button(GTK_DIALOG(popup),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-
+
if(stepid != NO_VAL)
- snprintf(tmp_char, sizeof(tmp_char),
+ snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to cancel job %u.%u?",
jobid, stepid);
else
- snprintf(tmp_char, sizeof(tmp_char),
+ snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to cancel job %u?",
jobid);
label = gtk_label_new(tmp_char);
@@ -3383,11 +3383,11 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter, char *type)
tmp_char_ptr = "suspend";
if(stepid != NO_VAL)
- snprintf(tmp_char, sizeof(tmp_char),
+ snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to %s job %u.%u?",
tmp_char_ptr, jobid, stepid);
else
- snprintf(tmp_char, sizeof(tmp_char),
+ snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to %s job %u?",
tmp_char_ptr, jobid);
label = gtk_label_new(tmp_char);
@@ -3400,7 +3400,7 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter, char *type)
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
gtk_window_set_default_size(GTK_WINDOW(popup), 200, 400);
- snprintf(tmp_char, sizeof(tmp_char),
+ snprintf(tmp_char, sizeof(tmp_char),
"Editing job %u think before you type",
jobid);
label = gtk_label_new(tmp_char);
@@ -3409,10 +3409,10 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter, char *type)
entry = _admin_full_edit_job(job_msg, model, iter);
}
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
label, FALSE, FALSE, 0);
if(entry)
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
entry, TRUE, TRUE, 0);
gtk_widget_show_all(popup);
response = gtk_dialog_run (GTK_DIALOG(popup));
@@ -3429,7 +3429,7 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter, char *type)
g_free(tmp_char_ptr);
break;
}
-
+
/* fall through to the cancel now the signal
* is set (Default is SIGKILL from above for
* just a regular cancel).
@@ -3437,9 +3437,9 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter, char *type)
case EDIT_CANCEL:
if(stepid == NO_VAL)
_cancel_job_id(jobid, signal);
- else
+ else
_cancel_step_id(jobid, stepid, signal);
-
+
break;
case EDIT_SUSPEND:
if(state == JOB_SUSPENDED)
@@ -3452,7 +3452,7 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter, char *type)
tmp_char_ptr, jobid);
display_edit_note(tmp_char_ptr);
g_free(tmp_char_ptr);
-
+
} else {
if(state == JOB_SUSPENDED)
tmp_char_ptr = "resumed";
@@ -3463,10 +3463,10 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter, char *type)
tmp_char_ptr, jobid);
display_edit_note(tmp_char_ptr);
g_free(tmp_char_ptr);
- }
+ }
break;
case EDIT_EDIT:
- if(got_edit_signal)
+ if(got_edit_signal)
goto end_it;
if(slurm_update_job(job_msg) == SLURM_SUCCESS) {
tmp_char_ptr = g_strdup_printf(
@@ -3497,7 +3497,7 @@ end_it:
got_edit_signal = NULL;
admin_job(model, iter, type);
xfree(type);
- }
+ }
return;
}
diff --git a/src/sview/node_info.c b/src/sview/node_info.c
index 56f378972818667d976e4fa6fb5a8bec418f1313..9b6d8e168f99c3e78e52ef13320daa17a227ae7d 100644
--- a/src/sview/node_info.c
+++ b/src/sview/node_info.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * node_info.c - Functions related to node display
+ * node_info.c - Functions related to node display
* mode of sview.
*****************************************************************************
* Copyright (C) 2004-2007 The Regents of the University of California.
@@ -8,21 +8,21 @@
* Written by Danny Auble <da@llnl.gov>
*
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -36,24 +36,24 @@ int cpus_per_node = 1;
int g_node_scaling = 1;
/* These need to be in alpha order (except POS and CNT) */
-enum {
+enum {
SORTID_POS = POS_LOC,
SORTID_COLOR,
- SORTID_CPUS,
+ SORTID_CPUS,
SORTID_CORES,
- SORTID_DISK,
- SORTID_ERR_CPUS,
- SORTID_FEATURES,
- SORTID_MEMORY,
- SORTID_NAME,
+ SORTID_DISK,
+ SORTID_ERR_CPUS,
+ SORTID_FEATURES,
+ SORTID_MEMORY,
+ SORTID_NAME,
SORTID_REASON,
SORTID_SOCKETS,
SORTID_STATE,
SORTID_STATE_NUM,
SORTID_THREADS,
- SORTID_UPDATED,
- SORTID_USED_CPUS,
- SORTID_WEIGHT,
+ SORTID_UPDATED,
+ SORTID_USED_CPUS,
+ SORTID_WEIGHT,
SORTID_CNT
};
@@ -80,13 +80,13 @@ static display_data_t display_data_node[] = {
EDIT_NONE, refresh_node, create_model_node, admin_edit_node},
{G_TYPE_INT, SORTID_THREADS, "Threads", TRUE,
EDIT_NONE, refresh_node, create_model_node, admin_edit_node},
- {G_TYPE_STRING, SORTID_MEMORY, "Real Memory", TRUE,
+ {G_TYPE_STRING, SORTID_MEMORY, "Real Memory", TRUE,
EDIT_NONE, refresh_node, create_model_node, admin_edit_node},
{G_TYPE_STRING, SORTID_DISK, "Tmp Disk", TRUE, EDIT_NONE, refresh_node,
create_model_node, admin_edit_node},
{G_TYPE_INT, SORTID_WEIGHT,"Weight", FALSE, EDIT_NONE, refresh_node,
create_model_node, admin_edit_node},
- {G_TYPE_STRING, SORTID_FEATURES, "Features", FALSE,
+ {G_TYPE_STRING, SORTID_FEATURES, "Features", FALSE,
EDIT_TEXTBOX, refresh_node, create_model_node, admin_edit_node},
{G_TYPE_STRING, SORTID_REASON, "Reason", FALSE,
EDIT_NONE, refresh_node, create_model_node, admin_edit_node},
@@ -129,28 +129,28 @@ static void _layout_node_record(GtkTreeView *treeview,
int update)
{
char tmp_cnt[50];
- char *upper = NULL, *lower = NULL;
+ char *upper = NULL, *lower = NULL;
GtkTreeIter iter;
uint16_t err_cpus = 0, alloc_cpus = 0;
int idle_cpus = node_ptr->cpus;
- GtkTreeStore *treestore =
+ GtkTreeStore *treestore =
GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
if(!treestore)
return;
-
+
add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_node,
SORTID_NAME),
node_ptr->name);
-
+
convert_num_unit((float)node_ptr->cpus, tmp_cnt, sizeof(tmp_cnt),
UNIT_NONE);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_node,
SORTID_CPUS),
tmp_cnt);
- select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
+ select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ALLOCATED,
&alloc_cpus);
@@ -162,14 +162,14 @@ static void _layout_node_record(GtkTreeView *treeview,
alloc_cpus *= cpus_per_node;
#endif
idle_cpus -= alloc_cpus;
- convert_num_unit((float)alloc_cpus, tmp_cnt,
+ convert_num_unit((float)alloc_cpus, tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_node,
SORTID_USED_CPUS),
tmp_cnt);
- select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
+ select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ERROR,
&err_cpus);
@@ -179,67 +179,67 @@ static void _layout_node_record(GtkTreeView *treeview,
#endif
idle_cpus -= err_cpus;
convert_num_unit((float)err_cpus, tmp_cnt, sizeof(tmp_cnt), UNIT_NONE);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_node,
SORTID_ERR_CPUS),
tmp_cnt);
upper = node_state_string(node_ptr->node_state);
lower = str_tolower(upper);
-
+
add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_node,
SORTID_STATE),
lower);
xfree(lower);
-
+
convert_num_unit((float)node_ptr->cores, tmp_cnt, sizeof(tmp_cnt),
UNIT_NONE);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_node,
SORTID_CORES),
tmp_cnt);
convert_num_unit((float)node_ptr->sockets, tmp_cnt, sizeof(tmp_cnt),
UNIT_NONE);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_node,
SORTID_SOCKETS),
tmp_cnt);
convert_num_unit((float)node_ptr->threads, tmp_cnt, sizeof(tmp_cnt),
UNIT_NONE);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_node,
SORTID_THREADS),
tmp_cnt);
convert_num_unit((float)node_ptr->real_memory, tmp_cnt, sizeof(tmp_cnt),
UNIT_MEGA);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_node,
SORTID_MEMORY),
tmp_cnt);
convert_num_unit((float)node_ptr->tmp_disk, tmp_cnt, sizeof(tmp_cnt),
UNIT_MEGA);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_node,
SORTID_DISK),
tmp_cnt);
snprintf(tmp_cnt, sizeof(tmp_cnt), "%u", node_ptr->weight);
add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_node,
- SORTID_WEIGHT),
+ SORTID_WEIGHT),
tmp_cnt);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_node,
- SORTID_FEATURES),
+ SORTID_FEATURES),
node_ptr->features);
add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_node,
- SORTID_REASON),
+ SORTID_REASON),
node_ptr->reason);
return;
}
@@ -248,36 +248,36 @@ static void _update_node_record(node_info_t *node_ptr,
GtkTreeStore *treestore, GtkTreeIter *iter)
{
char tmp_cnt[17];
- char *upper = NULL, *lower = NULL;
+ char *upper = NULL, *lower = NULL;
uint16_t err_cpus = 0, alloc_cpus = 0;
int idle_cpus = node_ptr->cpus;
-
+
/* gtk_tree_store_set(treestore, iter, SORTID_COLOR, */
/* sview_colors[sview_job_info_ptr->color_inx], -1); */
gtk_tree_store_set(treestore, iter, SORTID_NAME, node_ptr->name, -1);
- gtk_tree_store_set(treestore, iter, SORTID_STATE_NUM,
+ gtk_tree_store_set(treestore, iter, SORTID_STATE_NUM,
node_ptr->node_state, -1);
gtk_tree_store_set(treestore, iter, SORTID_CPUS, node_ptr->cpus, -1);
- select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
+ select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ALLOCATED,
&alloc_cpus);
#ifdef HAVE_BG
- if(!alloc_cpus
+ if(!alloc_cpus
&& (IS_NODE_ALLOCATED(node_ptr) || IS_NODE_COMPLETING(node_ptr)))
alloc_cpus = node_ptr->cpus;
else
alloc_cpus *= cpus_per_node;
#endif
idle_cpus -= alloc_cpus;
- convert_num_unit((float)alloc_cpus, tmp_cnt,
+ convert_num_unit((float)alloc_cpus, tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
gtk_tree_store_set(treestore, iter, SORTID_USED_CPUS,
tmp_cnt, -1);
- select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
+ select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ERROR,
&err_cpus);
@@ -290,12 +290,12 @@ static void _update_node_record(node_info_t *node_ptr,
gtk_tree_store_set(treestore, iter, SORTID_ERR_CPUS,
tmp_cnt, -1);
- if((alloc_cpus && err_cpus)
+ if((alloc_cpus && err_cpus)
|| (idle_cpus && (idle_cpus != node_ptr->cpus))) {
node_ptr->node_state &= NODE_STATE_FLAGS;
node_ptr->node_state |= NODE_STATE_MIXED;
}
-
+
upper = node_state_string(node_ptr->node_state);
lower = str_tolower(upper);
@@ -313,14 +313,14 @@ static void _update_node_record(node_info_t *node_ptr,
convert_num_unit((float)node_ptr->tmp_disk, tmp_cnt, sizeof(tmp_cnt),
UNIT_MEGA);
gtk_tree_store_set(treestore, iter, SORTID_DISK, tmp_cnt, -1);
- gtk_tree_store_set(treestore, iter, SORTID_WEIGHT,
+ gtk_tree_store_set(treestore, iter, SORTID_WEIGHT,
node_ptr->weight, -1);
- gtk_tree_store_set(treestore, iter, SORTID_FEATURES,
+ gtk_tree_store_set(treestore, iter, SORTID_FEATURES,
node_ptr->features, -1);
- gtk_tree_store_set(treestore, iter, SORTID_REASON,
+ gtk_tree_store_set(treestore, iter, SORTID_REASON,
node_ptr->reason, -1);
- gtk_tree_store_set(treestore, iter, SORTID_UPDATED, 1, -1);
-
+ gtk_tree_store_set(treestore, iter, SORTID_UPDATED, 1, -1);
+
return;
}
@@ -347,8 +347,8 @@ static void _update_info_node(List info_list, GtkTreeView *tree_view)
if (gtk_tree_model_get_iter(model, &iter, path)) {
/* make sure all the partitions are still here */
while(1) {
- gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
- SORTID_UPDATED, 0, -1);
+ gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
+ SORTID_UPDATED, 0, -1);
if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
@@ -363,20 +363,20 @@ static void _update_info_node(List info_list, GtkTreeView *tree_view)
}
while(1) {
- /* search for the node name and check to see if
+ /* search for the node name and check to see if
it is in the list */
- gtk_tree_model_get(model, &iter, SORTID_NAME,
+ gtk_tree_model_get(model, &iter, SORTID_NAME,
&name, -1);
if(!strcmp(name, node_ptr->name)) {
/* update with new info */
g_free(name);
- _update_node_record(node_ptr,
- GTK_TREE_STORE(model),
+ _update_node_record(node_ptr,
+ GTK_TREE_STORE(model),
&iter);
goto found;
}
g_free(name);
-
+
if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
@@ -388,7 +388,7 @@ static void _update_info_node(List info_list, GtkTreeView *tree_view)
;
}
list_iterator_destroy(itr);
-
+
gtk_tree_path_free(path);
/* remove all old nodes */
remove_old(model, SORTID_UPDATED);
@@ -422,13 +422,13 @@ need_refresh:
if(!spec_info->display_widget) {
treeview = create_treeview_2cols_attach_to_table(
popup_win->table);
- spec_info->display_widget =
+ spec_info->display_widget =
gtk_widget_ref(GTK_WIDGET(treeview));
} else {
treeview = GTK_TREE_VIEW(spec_info->display_widget);
update = 1;
}
-
+
itr = list_iterator_create(info_list);
while ((sview_node_info = (sview_node_info_t*) list_next(itr))) {
node_ptr = sview_node_info->node_ptr;
@@ -453,11 +453,11 @@ need_refresh:
_layout_node_record(treeview, node_ptr, update);
found = 1;
break;
- }
+ }
}
list_iterator_destroy(itr);
if(!found) {
- if(!popup_win->not_found) {
+ if(!popup_win->not_found) {
#ifdef HAVE_BG
char *temp = "BP NOT FOUND\n";
#else
@@ -465,20 +465,20 @@ need_refresh:
#endif
GtkTreeIter iter;
GtkTreeModel *model = NULL;
-
+
/* only time this will be run so no update */
model = gtk_tree_view_get_model(treeview);
- add_display_treestore_line(0,
- GTK_TREE_STORE(model),
+ add_display_treestore_line(0,
+ GTK_TREE_STORE(model),
&iter,
temp, "");
}
popup_win->not_found = true;
} else {
- if(popup_win->not_found) {
+ if(popup_win->not_found) {
popup_win->not_found = false;
gtk_widget_destroy(spec_info->display_widget);
-
+
goto need_refresh;
}
put_buttons_in_table(popup_win->grid_table,
@@ -507,11 +507,11 @@ extern List create_node_info_list(node_info_msg_t *node_info_ptr, int changed)
int i = 0;
sview_node_info_t *sview_node_info_ptr = NULL;
node_info_t *node_ptr = NULL;
-
+
if(!changed && info_list) {
goto update_color;
}
-
+
if(info_list) {
list_destroy(info_list);
}
@@ -521,19 +521,19 @@ extern List create_node_info_list(node_info_msg_t *node_info_ptr, int changed)
g_print("malloc error\n");
return NULL;
}
-
+
for (i=0; i<node_info_ptr->record_count; i++) {
node_ptr = &(node_info_ptr->node_array[i]);
if (!node_ptr->name || (node_ptr->name[0] == '\0'))
continue; /* bad node */
-
+
sview_node_info_ptr = xmalloc(sizeof(sview_node_info_t));
list_append(info_list, sview_node_info_ptr);
sview_node_info_ptr->node_ptr = node_ptr;
sview_node_info_ptr->pos = i;
}
update_color:
-
+
return info_list;
}
@@ -550,9 +550,9 @@ extern int get_new_info_node(node_info_msg_t **info_ptr, int force)
if(*info_ptr != node_info_ptr)
error_code = SLURM_SUCCESS;
*info_ptr = node_info_ptr;
- if(changed)
+ if(changed)
return SLURM_SUCCESS;
-
+
return error_code;
}
last = now;
@@ -570,13 +570,13 @@ extern int get_new_info_node(node_info_msg_t **info_ptr, int force)
changed = 0;
}
} else {
- error_code = slurm_load_node((time_t) NULL, &new_node_ptr,
+ error_code = slurm_load_node((time_t) NULL, &new_node_ptr,
show_flags);
changed = 1;
}
node_info_ptr = new_node_ptr;
- if(*info_ptr != node_info_ptr)
+ if(*info_ptr != node_info_ptr)
error_code = SLURM_SUCCESS;
if(new_node_ptr && changed) {
int i;
@@ -585,7 +585,7 @@ extern int get_new_info_node(node_info_msg_t **info_ptr, int force)
int idle_cpus;
g_node_scaling = new_node_ptr->node_scaling;
- cpus_per_node =
+ cpus_per_node =
new_node_ptr->node_array[0].cpus / g_node_scaling;
for (i=0; i<node_info_ptr->record_count; i++) {
@@ -594,24 +594,24 @@ extern int get_new_info_node(node_info_msg_t **info_ptr, int force)
continue; /* bad node */
idle_cpus = node_ptr->cpus;
-
+
slurm_get_select_nodeinfo(
- node_ptr->select_nodeinfo,
+ node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ALLOCATED,
&alloc_cpus);
#ifdef HAVE_BG
- if(!alloc_cpus
- && (IS_NODE_ALLOCATED(node_ptr)
+ if(!alloc_cpus
+ && (IS_NODE_ALLOCATED(node_ptr)
|| IS_NODE_COMPLETING(node_ptr)))
alloc_cpus = node_ptr->cpus;
else
alloc_cpus *= cpus_per_node;
#endif
idle_cpus -= alloc_cpus;
-
+
slurm_get_select_nodeinfo(
- node_ptr->select_nodeinfo,
+ node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ERROR,
&err_cpus);
@@ -620,19 +620,19 @@ extern int get_new_info_node(node_info_msg_t **info_ptr, int force)
#endif
idle_cpus -= err_cpus;
- if ((alloc_cpus && err_cpus) ||
+ if ((alloc_cpus && err_cpus) ||
(idle_cpus && (idle_cpus != node_ptr->cpus))) {
- if(err_cpus)
- node_ptr->node_state
+ if(err_cpus)
+ node_ptr->node_state
|= NODE_STATE_DRAIN;
-
+
node_ptr->node_state &= NODE_STATE_FLAGS;
node_ptr->node_state |= NODE_STATE_MIXED;
} else if(err_cpus) {
- node_ptr->node_state &= NODE_STATE_FLAGS;
+ node_ptr->node_state &= NODE_STATE_FLAGS;
node_ptr->node_state |= NODE_STATE_ERROR;
}
-
+
/* if(alloc_cpus && err_cpus && !idle_cpus) { */
/* node_ptr->node_state &= NODE_STATE_FLAGS; */
/* node_ptr->node_state |= NODE_STATE_AE; */
@@ -648,7 +648,7 @@ extern int get_new_info_node(node_info_msg_t **info_ptr, int force)
/* } */
}
}
-
+
*info_ptr = new_node_ptr;
return error_code;
}
@@ -664,18 +664,18 @@ extern int update_features_node(GtkDialog *dialog, const char *nodelist,
int response = 0;
int no_dialog = 0;
int rc = SLURM_SUCCESS;
-
+
if(!dialog) {
snprintf(tmp_char, sizeof(tmp_char),
"Update Features for Node(s) %s?", nodelist);
-
+
dialog = GTK_DIALOG(
gtk_dialog_new_with_buttons(
tmp_char,
GTK_WINDOW(main_window),
GTK_DIALOG_MODAL
| GTK_DIALOG_DESTROY_WITH_PARENT,
- NULL));
+ NULL));
no_dialog = 1;
}
label = gtk_dialog_add_button(dialog,
@@ -688,25 +688,25 @@ extern int update_features_node(GtkDialog *dialog, const char *nodelist,
node_msg->features = NULL;
node_msg->reason = NULL;
node_msg->node_state = (uint16_t) NO_VAL;
-
+
snprintf(tmp_char, sizeof(tmp_char),
"Features for Node(s) %s?", nodelist);
- label = gtk_label_new(tmp_char);
- gtk_box_pack_start(GTK_BOX(dialog->vbox),
+ label = gtk_label_new(tmp_char);
+ gtk_box_pack_start(GTK_BOX(dialog->vbox),
label, FALSE, FALSE, 0);
-
+
entry = create_entry();
if(!entry)
goto end_it;
- if(old_features)
+ if(old_features)
gtk_entry_set_text(GTK_ENTRY(entry), old_features);
-
+
gtk_box_pack_start(GTK_BOX(dialog->vbox), entry, TRUE, TRUE, 0);
gtk_widget_show_all(GTK_WIDGET(dialog));
-
+
response = gtk_dialog_run(dialog);
- if (response == GTK_RESPONSE_OK) {
+ if (response == GTK_RESPONSE_OK) {
node_msg->features =
xstrdup(gtk_entry_get_text(GTK_ENTRY(entry)));
if(!node_msg->features) {
@@ -721,7 +721,7 @@ extern int update_features_node(GtkDialog *dialog, const char *nodelist,
nodelist);
display_edit_note(edit);
g_free(edit);
-
+
} else {
edit = g_strdup_printf(
"Problem updating nodes %s.",
@@ -735,15 +735,15 @@ end_it:
slurm_free_update_node_msg(node_msg);
if(no_dialog)
gtk_widget_destroy(GTK_WIDGET(dialog));
-
+
return rc;
}
-
+
extern int update_state_node(GtkDialog *dialog,
const char *nodelist, const char *type)
{
uint16_t state = (uint16_t) NO_VAL;
- char *upper = NULL, *lower = NULL;
+ char *upper = NULL, *lower = NULL;
int i = 0;
int rc = SLURM_SUCCESS;
char tmp_char[100];
@@ -759,7 +759,7 @@ extern int update_state_node(GtkDialog *dialog,
GTK_WINDOW(main_window),
GTK_DIALOG_MODAL
| GTK_DIALOG_DESTROY_WITH_PARENT,
- NULL));
+ NULL));
no_dialog = 1;
}
label = gtk_dialog_add_button(dialog,
@@ -773,7 +773,7 @@ extern int update_state_node(GtkDialog *dialog,
node_msg->node_names = xstrdup(nodelist);
if(!strncasecmp("drain", type, 5)) {
- snprintf(tmp_char, sizeof(tmp_char),
+ snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to drain nodes %s?\n\n"
"Please put reason.",
nodelist);
@@ -781,7 +781,7 @@ extern int update_state_node(GtkDialog *dialog,
label = gtk_label_new(tmp_char);
state = NODE_STATE_DRAIN;
} else if(!strncasecmp("resume", type, 5)) {
- snprintf(tmp_char, sizeof(tmp_char),
+ snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to resume nodes %s?",
nodelist);
label = gtk_label_new(tmp_char);
@@ -795,10 +795,10 @@ extern int update_state_node(GtkDialog *dialog,
upper = node_state_string(i);
lower = str_tolower(upper);
if(!strcmp(lower, type)) {
- snprintf(tmp_char, sizeof(tmp_char),
+ snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to set "
"nodes %s to %s?",
- nodelist, lower);
+ nodelist, lower);
label = gtk_label_new(tmp_char);
state = i;
xfree(lower);
@@ -812,7 +812,7 @@ extern int update_state_node(GtkDialog *dialog,
node_msg->node_state = (uint16_t)state;
gtk_box_pack_start(GTK_BOX(dialog->vbox), label, FALSE, FALSE, 0);
if(entry)
- gtk_box_pack_start(GTK_BOX(dialog->vbox),
+ gtk_box_pack_start(GTK_BOX(dialog->vbox),
entry, TRUE, TRUE, 0);
gtk_widget_show_all(GTK_WIDGET(dialog));
i = gtk_dialog_run(dialog);
@@ -850,7 +850,7 @@ extern int update_state_node(GtkDialog *dialog,
nodelist);
display_edit_note(lower);
g_free(lower);
-
+
} else {
lower = g_strdup_printf(
"Problem updating nodes %s.",
@@ -863,17 +863,17 @@ end_it:
slurm_free_update_node_msg(node_msg);
if(no_dialog)
gtk_widget_destroy(GTK_WIDGET(dialog));
-
+
return rc;
}
-
+
extern GtkListStore *create_model_node(int type)
{
GtkListStore *model = NULL;
GtkTreeIter iter;
- char *upper = NULL, *lower = NULL;
+ char *upper = NULL, *lower = NULL;
int i=0;
-
+
switch(type) {
case SORTID_STATE:
model = gtk_list_store_new(2, G_TYPE_STRING,
@@ -882,17 +882,17 @@ extern GtkListStore *create_model_node(int type)
gtk_list_store_set(model, &iter,
0, "drain",
1, i,
- -1);
+ -1);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
0, "NoResp",
1, i,
- -1);
+ -1);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
0, "resume",
1, i,
- -1);
+ -1);
for(i = 0; i < NODE_STATE_END; i++) {
upper = node_state_string(i);
gtk_list_store_append(model, &iter);
@@ -903,7 +903,7 @@ extern GtkListStore *create_model_node(int type)
-1);
xfree(lower);
}
-
+
break;
}
@@ -919,7 +919,7 @@ extern void admin_edit_node(GtkCellRendererText *cell,
GtkTreePath *path = gtk_tree_path_new_from_string(path_string);
GtkTreeIter iter;
char *nodelist = NULL;
- int column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell),
+ int column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell),
"column"));
if(!new_text || !strcmp(new_text, ""))
goto no_input;
@@ -927,12 +927,12 @@ extern void admin_edit_node(GtkCellRendererText *cell,
gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path);
switch(column) {
case SORTID_STATE:
- gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter,
- SORTID_NAME,
+ gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter,
+ SORTID_NAME,
&nodelist, -1);
-
- update_state_node(NULL, nodelist, new_text);
-
+
+ update_state_node(NULL, nodelist, new_text);
+
g_free(nodelist);
default:
break;
@@ -956,7 +956,7 @@ extern void get_info_node(GtkTable *table, display_data_t *display_data)
int i = 0;
sview_node_info_t *sview_node_info_ptr = NULL;
ListIterator itr = NULL;
-
+
if(display_data)
local_display_data = display_data;
if(!table) {
@@ -970,7 +970,7 @@ extern void get_info_node(GtkTable *table, display_data_t *display_data)
}
if((error_code = get_new_info_node(&node_info_ptr, force_refresh))
- == SLURM_NO_CHANGE_IN_DATA) {
+ == SLURM_NO_CHANGE_IN_DATA) {
if(!display_widget || view == ERROR_VIEW)
goto display_it;
changed = 0;
@@ -983,10 +983,10 @@ extern void get_info_node(GtkTable *table, display_data_t *display_data)
sprintf(error_char, "slurm_load_node: %s",
slurm_strerror(slurm_get_errno()));
label = gtk_label_new(error_char);
- gtk_table_attach_defaults(table,
+ gtk_table_attach_defaults(table,
label,
- 0, 1, 0, 1);
- gtk_widget_show(label);
+ 0, 1, 0, 1);
+ gtk_widget_show(label);
display_widget = gtk_widget_ref(label);
goto end_it;
}
@@ -1016,13 +1016,13 @@ display_it:
if(!display_widget) {
tree_view = create_treeview(local_display_data,
&grid_button_list);
-
+
display_widget = gtk_widget_ref(GTK_WIDGET(tree_view));
gtk_table_attach_defaults(GTK_TABLE(table),
GTK_WIDGET(tree_view),
- 0, 1, 0, 1);
- /* since this function sets the model of the tree_view
- to the treestore we don't really care about
+ 0, 1, 0, 1);
+ /* since this function sets the model of the tree_view
+ to the treestore we don't really care about
the return value */
create_treestore(tree_view, display_data_node,
SORTID_CNT, SORTID_NAME, SORTID_COLOR);
@@ -1033,7 +1033,7 @@ end_it:
toggled = FALSE;
force_refresh = 1;
return;
-
+
}
extern void specific_info_node(popup_info_t *popup_win)
@@ -1050,23 +1050,23 @@ extern void specific_info_node(popup_info_t *popup_win)
int changed = 1;
sview_node_info_t *sview_node_info_ptr = NULL;
node_info_t *node_ptr = NULL;
- hostlist_t hostlist = NULL;
+ hostlist_t hostlist = NULL;
hostlist_iterator_t host_itr = NULL;
int i = -1;
sview_search_info_t *search_info = spec_info->search_info;
bool drain_flag1 = false, comp_flag1 = false, no_resp_flag1 = false;
bool drain_flag2 = false, comp_flag2 = false, no_resp_flag2 = false;
-
+
if(!spec_info->display_widget)
setup_popup_info(popup_win, display_data_node, SORTID_CNT);
-
+
if(node_info_ptr && popup_win->toggled) {
gtk_widget_destroy(spec_info->display_widget);
spec_info->display_widget = NULL;
goto display_it;
}
-
- if((error_code = get_new_info_node(&node_info_ptr,
+
+ if((error_code = get_new_info_node(&node_info_ptr,
popup_win->force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
if(!spec_info->display_widget || spec_info->view == ERROR_VIEW)
@@ -1081,14 +1081,14 @@ extern void specific_info_node(popup_info_t *popup_win)
sprintf(error_char, "slurm_load_node: %s",
slurm_strerror(slurm_get_errno()));
label = gtk_label_new(error_char);
- gtk_table_attach_defaults(popup_win->table,
+ gtk_table_attach_defaults(popup_win->table,
label,
- 0, 1, 0, 1);
- gtk_widget_show(label);
+ 0, 1, 0, 1);
+ gtk_widget_show(label);
spec_info->display_widget = gtk_widget_ref(label);
return;
}
-display_it:
+display_it:
info_list = create_node_info_list(node_info_ptr, changed);
if(!info_list)
@@ -1101,16 +1101,16 @@ display_it:
if(spec_info->type != INFO_PAGE && !spec_info->display_widget) {
tree_view = create_treeview(local_display_data,
&popup_win->grid_button_list);
-
- spec_info->display_widget =
+
+ spec_info->display_widget =
gtk_widget_ref(GTK_WIDGET(tree_view));
gtk_table_attach_defaults(popup_win->table,
GTK_WIDGET(tree_view),
- 0, 1, 0, 1);
- /* since this function sets the model of the tree_view
- to the treestore we don't really care about
+ 0, 1, 0, 1);
+ /* since this function sets the model of the tree_view
+ to the treestore we don't really care about
the return value */
- create_treestore(tree_view, popup_win->display_data,
+ create_treestore(tree_view, popup_win->display_data,
SORTID_CNT, SORTID_NAME, SORTID_COLOR);
}
@@ -1118,18 +1118,18 @@ display_it:
if(spec_info->type == INFO_PAGE) {
if(popup_win->grid_button_list) {
list_destroy(popup_win->grid_button_list);
- }
+ }
popup_win->grid_button_list = list_create(destroy_grid_button);
-
+
_display_info_node(info_list, popup_win);
goto end_it;
}
setup_popup_grid_list(popup_win);
-
+
/* just linking to another list, don't free the inside, just
the list */
- send_info_list = list_create(NULL);
+ send_info_list = list_create(NULL);
if(search_info->gchar_data) {
hostlist = hostlist_create(search_info->gchar_data);
host_itr = hostlist_iterator_create(hostlist);
@@ -1141,8 +1141,8 @@ display_it:
comp_flag1 = (search_info->int_data & NODE_STATE_COMPLETING);
no_resp_flag1 = (search_info->int_data
& NODE_STATE_NO_RESPOND);
- }
-
+ }
+
itr = list_iterator_create(info_list);
while ((sview_node_info_ptr = list_next(itr))) {
uint16_t tmp_16 = 0;
@@ -1150,19 +1150,19 @@ display_it:
char *host = NULL;
i++;
node_ptr = sview_node_info_ptr->node_ptr;
-
+
switch(search_info->search_type) {
case SEARCH_NODE_STATE:
if(search_info->int_data == NO_VAL)
continue;
-
+
drain_flag2 = (node_ptr->node_state
& NODE_STATE_DRAIN);
comp_flag2 = (node_ptr->node_state
& NODE_STATE_COMPLETING);
no_resp_flag2 = (node_ptr->node_state
& NODE_STATE_NO_RESPOND);
-
+
if(drain_flag1 && drain_flag2)
break;
else if(comp_flag1 && comp_flag2)
@@ -1171,20 +1171,20 @@ display_it:
break;
if(node_ptr->node_state != search_info->int_data) {
- if((search_info->int_data & NODE_STATE_BASE)
+ if((search_info->int_data & NODE_STATE_BASE)
== NODE_STATE_ALLOCATED) {
select_g_select_nodeinfo_get(
- node_ptr->select_nodeinfo,
+ node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ALLOCATED,
&tmp_16);
if(tmp_16)
break;
}
- if((search_info->int_data & NODE_STATE_BASE)
+ if((search_info->int_data & NODE_STATE_BASE)
== NODE_STATE_ERROR) {
select_g_select_nodeinfo_get(
- node_ptr->select_nodeinfo,
+ node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ERROR,
&tmp_16);
@@ -1194,7 +1194,7 @@ display_it:
continue;
}
break;
-
+
case SEARCH_NODE_NAME:
default:
/* Nothing to do here since we just are
@@ -1203,16 +1203,16 @@ display_it:
}
if(!search_info->gchar_data)
continue;
- while((host = hostlist_next(host_itr))) {
+ while((host = hostlist_next(host_itr))) {
if(!strcmp(host, node_ptr->name)) {
free(host);
found = 1;
- break;
+ break;
}
free(host);
}
hostlist_iterator_reset(host_itr);
-
+
if(!found)
continue;
list_push(send_info_list, sview_node_info_ptr);
@@ -1227,15 +1227,15 @@ display_it:
hostlist_destroy(hostlist);
}
- _update_info_node(send_info_list,
+ _update_info_node(send_info_list,
GTK_TREE_VIEW(spec_info->display_widget));
list_destroy(send_info_list);
end_it:
popup_win->toggled = 0;
popup_win->force_refresh = 0;
-
+
return;
-
+
}
extern void set_menus_node(void *arg, void *arg2, GtkTreePath *path, int type)
@@ -1260,7 +1260,7 @@ extern void set_menus_node(void *arg, void *arg2, GtkTreePath *path, int type)
if (!gtk_tree_model_get_iter(model, &iter, path)) {
g_error("error getting iter from model\n");
break;
- }
+ }
gtk_tree_model_get(model, &iter, SORTID_POS, &node_inx, -1);
highlight_grid_range(node_inx, node_inx, button_list);
break;
@@ -1272,8 +1272,8 @@ extern void set_menus_node(void *arg, void *arg2, GtkTreePath *path, int type)
if (!gtk_tree_model_get_iter(model, &iter, path)) {
g_error("error getting iter from model\n");
break;
- }
-
+ }
+
popup_all_node(model, &iter, INFO_PAGE);
break;
@@ -1319,47 +1319,47 @@ extern void popup_all_node_name(char *name, int id)
case RESV_PAGE:
snprintf(title, 100, "Reservation(s) with %s %s", node, name);
break;
- case BLOCK_PAGE:
+ case BLOCK_PAGE:
snprintf(title, 100, "Blocks(s) with %s %s", node, name);
break;
- case SUBMIT_PAGE:
+ case SUBMIT_PAGE:
snprintf(title, 100, "Submit job on %s %s", node, name);
break;
- case INFO_PAGE:
+ case INFO_PAGE:
snprintf(title, 100, "Full Info for %s %s", node, name);
break;
default:
g_print("%s got %d\n", node, id);
}
-
+
itr = list_iterator_create(popup_list);
while((popup_win = list_next(itr))) {
if(popup_win->spec_info)
if(!strcmp(popup_win->spec_info->title, title)) {
break;
- }
+ }
}
list_iterator_destroy(itr);
-
+
if(!popup_win) {
if(id == INFO_PAGE)
popup_win = create_popup_info(id, NODE_PAGE, title);
else
popup_win = create_popup_info(NODE_PAGE, id, title);
popup_win->spec_info->search_info->gchar_data = g_strdup(name);
- if (!g_thread_create((gpointer)popup_thr, popup_win,
+ if (!g_thread_create((gpointer)popup_thr, popup_win,
FALSE, &error))
{
g_printerr ("Failed to create node popup thread: "
- "%s\n",
+ "%s\n",
error->message);
return;
}
- } else
+ } else
gtk_window_present(GTK_WINDOW(popup_win->popup));
}
-static void _selected_page(GtkMenuItem *menuitem,
+static void _selected_page(GtkMenuItem *menuitem,
display_data_t *display_data)
{
switch(display_data->extra) {
@@ -1388,11 +1388,11 @@ extern void admin_menu_node_name(char *name, GdkEventButton *event)
break;
if(!display_data->name)
continue;
-
+
display_data->user_data = name;
- menuitem = gtk_menu_item_new_with_label(display_data->name);
+ menuitem = gtk_menu_item_new_with_label(display_data->name);
g_signal_connect(menuitem, "activate",
- G_CALLBACK(_selected_page),
+ G_CALLBACK(_selected_page),
display_data);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
}
@@ -1411,13 +1411,13 @@ extern void admin_node(GtkTreeModel *model, GtkTreeIter *iter, char *type)
if(!strcasecmp("Update Features", type)) /* get old features */
gtk_tree_model_get(model, iter, SORTID_FEATURES,
&old_features, -1);
-
+
admin_node_name(name, old_features, type);
if(name)
g_free(name);
if(old_features)
- g_free(old_features);
+ g_free(old_features);
return;
}
@@ -1437,7 +1437,7 @@ extern void admin_node_name(char *name, char *old_features, char *type)
update_state_node(GTK_DIALOG(popup), name, type);
gtk_widget_destroy(popup);
-
+
return;
}
diff --git a/src/sview/part_info.c b/src/sview/part_info.c
index 57add2e67011abe7ee033a71577fa6c7dbdc15b2..c5c0dd443a8ee009bd3b96d059113860b2f895e1 100644
--- a/src/sview/part_info.c
+++ b/src/sview/part_info.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * part_info.c - Functions related to partition display
+ * part_info.c - Functions related to partition display
* mode of sview.
*****************************************************************************
* Copyright (C) 2004-2006 The Regents of the University of California.
@@ -7,21 +7,21 @@
* Written by Danny Auble <da@llnl.gov>
*
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -50,52 +50,52 @@ typedef struct {
/* Collection of data for printing reports. Like data is combined here */
typedef struct {
int color_inx;
- /* part_info contains partition, avail, max_time, job_size,
+ /* part_info contains partition, avail, max_time, job_size,
* root, share, groups */
partition_info_t* part_ptr;
List sub_list;
} sview_part_info_t;
-enum {
+enum {
EDIT_PART_STATE = 1,
EDIT_EDIT
};
/* These need to be in alpha order (except POS and CNT) */
-enum {
+enum {
SORTID_POS = POS_LOC,
#ifdef HAVE_BG
- SORTID_NODELIST,
- SORTID_NODES_ALLOWED,
+ SORTID_NODELIST,
+ SORTID_NODES_ALLOWED,
#endif
SORTID_COLOR,
- SORTID_CPUS,
+ SORTID_CPUS,
SORTID_DEFAULT,
- SORTID_FEATURES,
+ SORTID_FEATURES,
SORTID_GROUPS,
SORTID_HIDDEN,
SORTID_JOB_SIZE,
- SORTID_MEM,
- SORTID_NAME,
+ SORTID_MEM,
+ SORTID_NAME,
#ifndef HAVE_BG
- SORTID_NODELIST,
- SORTID_NODES_ALLOWED,
+ SORTID_NODELIST,
+ SORTID_NODES_ALLOWED,
#endif
SORTID_NODE_INX,
SORTID_NODE_STATE,
SORTID_NODE_STATE_NUM,
- SORTID_NODES,
+ SORTID_NODES,
SORTID_NODES_MAX,
SORTID_NODES_MIN,
- SORTID_ONLY_LINE,
- SORTID_PART_STATE,
+ SORTID_ONLY_LINE,
+ SORTID_PART_STATE,
SORTID_PRIORITY,
SORTID_REASON,
- SORTID_ROOT,
- SORTID_SHARE,
- SORTID_TMP_DISK,
- SORTID_TIMELIMIT,
- SORTID_UPDATED,
+ SORTID_ROOT,
+ SORTID_SHARE,
+ SORTID_TMP_DISK,
+ SORTID_TIMELIMIT,
+ SORTID_UPDATED,
SORTID_CNT
};
@@ -111,13 +111,13 @@ static display_data_t display_data_part[] = {
EDIT_MODEL, refresh_part, create_model_part, admin_edit_part},
{G_TYPE_STRING, SORTID_PART_STATE, "Part State", TRUE,
EDIT_MODEL, refresh_part, create_model_part, admin_edit_part},
- {G_TYPE_STRING, SORTID_TIMELIMIT, "Time Limit",
+ {G_TYPE_STRING, SORTID_TIMELIMIT, "Time Limit",
TRUE, EDIT_TEXTBOX, refresh_part, create_model_part, admin_edit_part},
{G_TYPE_STRING, SORTID_NODES, "Node Count",
TRUE, EDIT_NONE, refresh_part, create_model_part, admin_edit_part},
- {G_TYPE_STRING, SORTID_CPUS, "CPU Count",
+ {G_TYPE_STRING, SORTID_CPUS, "CPU Count",
FALSE, EDIT_NONE, refresh_part, create_model_part, admin_edit_part},
- {G_TYPE_STRING, SORTID_NODE_STATE, "Node State",
+ {G_TYPE_STRING, SORTID_NODE_STATE, "Node State",
TRUE, EDIT_MODEL, refresh_part,
create_model_part, admin_edit_part},
{G_TYPE_STRING, SORTID_JOB_SIZE, "Job Size", FALSE,
@@ -160,7 +160,7 @@ static display_data_t display_data_part[] = {
create_model_part, admin_edit_part},
{G_TYPE_INT, SORTID_ONLY_LINE, NULL, FALSE, EDIT_NONE, refresh_part,
create_model_part, admin_edit_part},
- {G_TYPE_POINTER, SORTID_NODE_INX, NULL, FALSE, EDIT_NONE,
+ {G_TYPE_POINTER, SORTID_NODE_INX, NULL, FALSE, EDIT_NONE,
refresh_part, create_model_part, admin_edit_part},
{G_TYPE_INT, SORTID_UPDATED, NULL, FALSE, EDIT_NONE, refresh_part,
create_model_part, admin_edit_part},
@@ -213,28 +213,28 @@ static void _append_part_sub_record(sview_part_sub_t *sview_part_sub,
GtkTreeStore *treestore, GtkTreeIter *iter,
int line);
-static int _build_min_max_32_string(char *buffer, int buf_size,
+static int _build_min_max_32_string(char *buffer, int buf_size,
uint32_t min, uint32_t max, bool range)
{
char tmp_min[8];
char tmp_max[8];
convert_num_unit((float)min, tmp_min, sizeof(tmp_min), UNIT_NONE);
convert_num_unit((float)max, tmp_max, sizeof(tmp_max), UNIT_NONE);
-
+
if (max == min)
return snprintf(buffer, buf_size, "%s", tmp_max);
else if (range) {
if (max == (uint32_t) INFINITE)
- return snprintf(buffer, buf_size, "%s-infinite",
+ return snprintf(buffer, buf_size, "%s-infinite",
tmp_min);
else
- return snprintf(buffer, buf_size, "%s-%s",
+ return snprintf(buffer, buf_size, "%s-%s",
tmp_min, tmp_max);
} else
return snprintf(buffer, buf_size, "%s+", tmp_min);
}
-static void _set_active_combo_part(GtkComboBox *combo,
+static void _set_active_combo_part(GtkComboBox *combo,
GtkTreeModel *model, GtkTreeIter *iter,
int type)
{
@@ -254,9 +254,9 @@ static void _set_active_combo_part(GtkComboBox *combo,
action = 0;
else if(!strcmp(temp_char, "no"))
action = 1;
- else
+ else
action = 0;
-
+
break;
case SORTID_SHARE:
if(!strcmp(temp_char, "yes"))
@@ -267,7 +267,7 @@ static void _set_active_combo_part(GtkComboBox *combo,
action = 2;
else if(!strcmp(temp_char, "exclusive"))
action = 3;
- else
+ else
action = 0;
break;
case SORTID_PART_STATE:
@@ -275,7 +275,7 @@ static void _set_active_combo_part(GtkComboBox *combo,
action = 0;
else if(!strcmp(temp_char, "down"))
action = 1;
- else
+ else
action = 0;
break;
case SORTID_NODE_STATE:
@@ -290,13 +290,13 @@ static void _set_active_combo_part(GtkComboBox *combo,
unknown_found++;
continue;
}
-
+
if(!strcasecmp(temp_char, upper)) {
action = i + 2 - unknown_found;
break;
}
}
-
+
break;
default:
break;
@@ -304,7 +304,7 @@ static void _set_active_combo_part(GtkComboBox *combo,
g_free(temp_char);
end_it:
gtk_combo_box_set_active(combo, action);
-
+
}
/* don't free this char */
@@ -319,22 +319,22 @@ static const char *_set_part_msg(update_part_msg_t *part_msg,
if(!part_msg)
return NULL;
-
+
switch(column) {
case SORTID_DEFAULT:
- if (!strcasecmp(new_text, "yes"))
+ if (!strcasecmp(new_text, "yes"))
part_msg->default_part = 1;
else
part_msg->default_part = 0;
-
+
type = "default";
break;
case SORTID_HIDDEN:
- if (!strcasecmp(new_text, "yes"))
+ if (!strcasecmp(new_text, "yes"))
part_msg->hidden = 1;
else
part_msg->hidden = 0;
-
+
type = "hidden";
break;
case SORTID_TIMELIMIT:
@@ -342,7 +342,7 @@ static const char *_set_part_msg(update_part_msg_t *part_msg,
temp_int = INFINITE;
else
temp_int = time_str2mins((char *)new_text);
-
+
type = "timelimit";
if(temp_int <= 0 && temp_int != INFINITE)
goto return_error;
@@ -356,7 +356,7 @@ static const char *_set_part_msg(update_part_msg_t *part_msg,
case SORTID_NODES_MIN:
temp_int = strtol(new_text, (char **)NULL, 10);
type = "min_nodes";
-
+
if(temp_int <= 0)
goto return_error;
part_msg->min_nodes = (uint32_t)temp_int;
@@ -367,7 +367,7 @@ static const char *_set_part_msg(update_part_msg_t *part_msg,
} else {
temp_int = strtol(new_text, (char **)NULL, 10);
}
-
+
type = "max_nodes";
if(temp_int <= 0 && temp_int != INFINITE)
goto return_error;
@@ -379,7 +379,7 @@ static const char *_set_part_msg(update_part_msg_t *part_msg,
} else {
part_msg->root_only = 0;
}
-
+
type = "root";
break;
case SORTID_SHARE:
@@ -422,13 +422,13 @@ static const char *_set_part_msg(update_part_msg_t *part_msg,
got_features_edit_signal = xstrdup(new_text);
break;
}
-
+
return type;
return_error:
errno = 1;
return type;
-
+
}
static void _admin_edit_combo_box_part(GtkComboBox *combo,
@@ -438,7 +438,7 @@ static void _admin_edit_combo_box_part(GtkComboBox *combo,
GtkTreeIter iter;
int column = 0;
char *name = NULL;
-
+
if(!part_msg)
return;
@@ -461,18 +461,18 @@ static void _admin_edit_combo_box_part(GtkComboBox *combo,
}
static gboolean _admin_focus_out_part(GtkEntry *entry,
- GdkEventFocus *event,
+ GdkEventFocus *event,
update_part_msg_t *part_msg)
{
int type = gtk_entry_get_max_length(entry);
const char *name = gtk_entry_get_text(entry);
type -= DEFAULT_ENTRY_LENGTH;
_set_part_msg(part_msg, name, type);
-
+
return false;
}
-static GtkWidget *_admin_full_edit_part(update_part_msg_t *part_msg,
+static GtkWidget *_admin_full_edit_part(update_part_msg_t *part_msg,
GtkTreeModel *model, GtkTreeIter *iter)
{
GtkScrolledWindow *window = create_scrolled_window();
@@ -490,8 +490,8 @@ static GtkWidget *_admin_full_edit_part(update_part_msg_t *part_msg,
bin = GTK_BIN(&view->bin);
table = GTK_TABLE(bin->child);
gtk_table_resize(table, SORTID_CNT, 2);
-
- gtk_table_set_homogeneous(table, FALSE);
+
+ gtk_table_set_homogeneous(table, FALSE);
for(i = 0; i < SORTID_CNT; i++) {
while(display_data++) {
@@ -502,7 +502,7 @@ static GtkWidget *_admin_full_edit_part(update_part_msg_t *part_msg,
if(display_data->id != i)
continue;
display_admin_edit(
- table, part_msg, &row, model, iter,
+ table, part_msg, &row, model, iter,
display_data,
G_CALLBACK(_admin_edit_combo_box_part),
G_CALLBACK(_admin_focus_out_part),
@@ -512,12 +512,12 @@ static GtkWidget *_admin_full_edit_part(update_part_msg_t *part_msg,
display_data = display_data_part;
}
gtk_table_resize(table, row, 2);
-
+
return GTK_WIDGET(window);
}
static void _subdivide_part(sview_part_info_t *sview_part_info,
- GtkTreeModel *model,
+ GtkTreeModel *model,
GtkTreeIter *sub_iter,
GtkTreeIter *iter)
{
@@ -534,8 +534,8 @@ static void _subdivide_part(sview_part_info_t *sview_part_info,
if (sub_iter) {
first_sub_iter = *sub_iter;
while(1) {
- gtk_tree_store_set(GTK_TREE_STORE(model), sub_iter,
- SORTID_UPDATED, 0, -1);
+ gtk_tree_store_set(GTK_TREE_STORE(model), sub_iter,
+ SORTID_UPDATED, 0, -1);
if(!gtk_tree_model_iter_next(model, sub_iter)) {
break;
}
@@ -549,7 +549,7 @@ static void _subdivide_part(sview_part_info_t *sview_part_info,
SORTID_ONLY_LINE, 1, -1);
sview_part_sub = list_next(itr);
_update_part_sub_record(sview_part_sub,
- GTK_TREE_STORE(model),
+ GTK_TREE_STORE(model),
iter);
} else {
while((sview_part_sub = list_next(itr))) {
@@ -557,34 +557,34 @@ static void _subdivide_part(sview_part_info_t *sview_part_info,
i = NO_VAL;
goto adding;
} else {
- memcpy(sub_iter, &first_sub_iter,
- sizeof(GtkTreeIter));
+ memcpy(sub_iter, &first_sub_iter,
+ sizeof(GtkTreeIter));
}
line = 0;
while(1) {
/* search for the state number and
check to see if it is in the list */
- gtk_tree_model_get(model, sub_iter,
- SORTID_NODE_STATE_NUM,
+ gtk_tree_model_get(model, sub_iter,
+ SORTID_NODE_STATE_NUM,
&state, -1);
if(state == sview_part_sub->node_state) {
/* update with new info */
_update_part_sub_record(
sview_part_sub,
- GTK_TREE_STORE(model),
+ GTK_TREE_STORE(model),
sub_iter);
goto found;
- }
-
+ }
+
line++;
- if(!gtk_tree_model_iter_next(model,
+ if(!gtk_tree_model_iter_next(model,
sub_iter)) {
break;
}
}
adding:
- _append_part_sub_record(sview_part_sub,
- GTK_TREE_STORE(model),
+ _append_part_sub_record(sview_part_sub,
+ GTK_TREE_STORE(model),
iter, line);
/* if(i == NO_VAL) */
/* line++; */
@@ -598,11 +598,11 @@ static void _subdivide_part(sview_part_info_t *sview_part_info,
sub_iter = &first_sub_iter;
/* clear all steps that aren't active */
while(1) {
- gtk_tree_model_get(model, sub_iter,
+ gtk_tree_model_get(model, sub_iter,
SORTID_UPDATED, &i, -1);
if(!i) {
if(!gtk_tree_store_remove(
- GTK_TREE_STORE(model),
+ GTK_TREE_STORE(model),
sub_iter))
break;
else
@@ -616,7 +616,7 @@ static void _subdivide_part(sview_part_info_t *sview_part_info,
return;
}
-static void _layout_part_record(GtkTreeView *treeview,
+static void _layout_part_record(GtkTreeView *treeview,
sview_part_info_t *sview_part_info,
int update)
{
@@ -638,9 +638,9 @@ static void _layout_part_record(GtkTreeView *treeview,
int yes_no = -1;
int up_down = -1;
uint32_t limit_set = NO_VAL;
- GtkTreeStore *treestore =
+ GtkTreeStore *treestore =
GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-
+
memset(&alloc_part_sub, 0, sizeof(sview_part_sub_t));
memset(&idle_part_sub, 0, sizeof(sview_part_sub_t));
memset(&other_part_sub, 0, sizeof(sview_part_sub_t));
@@ -675,21 +675,21 @@ static void _layout_part_record(GtkTreeView *treeview,
}
list_iterator_destroy(itr);
- convert_num_unit((float)alloc_part_sub.node_cnt,
+ convert_num_unit((float)alloc_part_sub.node_cnt,
tmp_cnt, sizeof(tmp_cnt), UNIT_NONE);
- convert_num_unit((float)idle_part_sub.node_cnt,
+ convert_num_unit((float)idle_part_sub.node_cnt,
tmp_cnt1, sizeof(tmp_cnt1), UNIT_NONE);
- convert_num_unit((float)other_part_sub.node_cnt,
+ convert_num_unit((float)other_part_sub.node_cnt,
tmp_cnt2, sizeof(tmp_cnt2), UNIT_NONE);
snprintf(ind_cnt, sizeof(ind_cnt), "%s/%s/%s",
tmp_cnt, tmp_cnt1, tmp_cnt2);
for(i = 0; i < SORTID_CNT; i++) {
switch(i) {
- case SORTID_PART_STATE:
+ case SORTID_PART_STATE:
up_down = part_ptr->state_up;
break;
- case SORTID_CPUS:
+ case SORTID_CPUS:
convert_num_unit((float)part_ptr->total_cpus,
tmp_cnt, sizeof(tmp_cnt),
UNIT_NONE);
@@ -698,7 +698,7 @@ static void _layout_part_record(GtkTreeView *treeview,
case SORTID_DEFAULT:
yes_no = part_ptr->default_part;
break;
- case SORTID_FEATURES:
+ case SORTID_FEATURES:
sview_part_sub = list_peek(sview_part_info->sub_list);
temp_char = sview_part_sub->features;
break;
@@ -712,26 +712,26 @@ static void _layout_part_record(GtkTreeView *treeview,
yes_no = part_ptr->hidden;
break;
case SORTID_JOB_SIZE:
- _build_min_max_32_string(time_buf, sizeof(time_buf),
- part_ptr->min_nodes,
+ _build_min_max_32_string(time_buf, sizeof(time_buf),
+ part_ptr->min_nodes,
part_ptr->max_nodes, true);
temp_char = time_buf;
break;
- case SORTID_MEM:
+ case SORTID_MEM:
convert_num_unit((float)other_part_sub.mem_total,
tmp_cnt, sizeof(tmp_cnt),
UNIT_MEGA);
temp_char = tmp_cnt;
break;
- case SORTID_NODELIST:
+ case SORTID_NODELIST:
temp_char = part_ptr->nodes;
break;
- case SORTID_NODES_ALLOWED:
+ case SORTID_NODES_ALLOWED:
temp_char = part_ptr->allow_alloc_nodes;
break;
- case SORTID_NODES:
+ case SORTID_NODES:
#ifdef HAVE_BG
- convert_num_unit((float)part_ptr->total_nodes, tmp_cnt,
+ convert_num_unit((float)part_ptr->total_nodes, tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
#else
sprintf(tmp_cnt, "%u", part_ptr->total_nodes);
@@ -746,42 +746,42 @@ static void _layout_part_record(GtkTreeView *treeview,
break;
case SORTID_NODE_INX:
break;
- case SORTID_ONLY_LINE:
+ case SORTID_ONLY_LINE:
break;
case SORTID_PRIORITY:
convert_num_unit((float)part_ptr->priority,
time_buf, sizeof(time_buf), UNIT_NONE);
temp_char = time_buf;
- break;
+ break;
case SORTID_REASON:
sview_part_sub = list_peek(sview_part_info->sub_list);
temp_char = sview_part_sub->features;
break;
- case SORTID_ROOT:
+ case SORTID_ROOT:
yes_no = part_ptr->root_only;
break;
- case SORTID_SHARE:
+ case SORTID_SHARE:
if(part_ptr->max_share & SHARED_FORCE) {
- snprintf(tmp_buf, sizeof(tmp_buf), "force:%u",
- (part_ptr->max_share
- & ~(SHARED_FORCE)));
+ snprintf(tmp_buf, sizeof(tmp_buf), "force:%u",
+ (part_ptr->max_share
+ & ~(SHARED_FORCE)));
temp_char = tmp_buf;
} else if(part_ptr->max_share == 0)
temp_char = "exclusive";
else if(part_ptr->max_share > 1) {
- snprintf(tmp_buf, sizeof(tmp_buf), "yes:%u",
+ snprintf(tmp_buf, sizeof(tmp_buf), "yes:%u",
part_ptr->max_share);
temp_char = tmp_buf;
- } else
+ } else
temp_char = "no";
break;
- case SORTID_TMP_DISK:
+ case SORTID_TMP_DISK:
convert_num_unit(
- (float)other_part_sub.disk_total,
+ (float)other_part_sub.disk_total,
time_buf, sizeof(time_buf), UNIT_NONE);
temp_char = time_buf;
break;
- case SORTID_TIMELIMIT:
+ case SORTID_TIMELIMIT:
limit_set = part_ptr->max_time;
break;
default:
@@ -789,15 +789,15 @@ static void _layout_part_record(GtkTreeView *treeview,
}
if(up_down != -1) {
- if(up_down)
+ if(up_down)
temp_char = "up";
- else
+ else
temp_char = "down";
up_down = -1;
} if(yes_no != -1) {
- if(yes_no)
+ if(yes_no)
temp_char = "yes";
- else
+ else
temp_char = "no";
yes_no = -1;
} else if(limit_set != NO_VAL) {
@@ -805,7 +805,7 @@ static void _layout_part_record(GtkTreeView *treeview,
temp_char = "infinite";
else {
convert_num_unit(
- (float)limit_set,
+ (float)limit_set,
time_buf, sizeof(time_buf), UNIT_NONE);
temp_char = time_buf;
}
@@ -814,7 +814,7 @@ static void _layout_part_record(GtkTreeView *treeview,
if(temp_char) {
add_display_treestore_line(
- update, treestore, &iter,
+ update, treestore, &iter,
find_col_name(display_data_part,
i),
temp_char);
@@ -830,7 +830,7 @@ static void _layout_part_record(GtkTreeView *treeview,
}
static void _update_part_record(sview_part_info_t *sview_part_info,
- GtkTreeStore *treestore,
+ GtkTreeStore *treestore,
GtkTreeIter *iter)
{
char time_buf[20], tmp_buf[20];
@@ -839,7 +839,7 @@ static void _update_part_record(sview_part_info_t *sview_part_info,
partition_info_t *part_ptr = sview_part_info->part_ptr;
GtkTreeIter sub_iter;
int childern = 0;
-
+
gtk_tree_store_set(treestore, iter, SORTID_COLOR,
sview_colors[sview_part_info->color_inx], -1);
@@ -850,33 +850,33 @@ static void _update_part_record(sview_part_info_t *sview_part_info,
else
temp_char = "no";
gtk_tree_store_set(treestore, iter, SORTID_DEFAULT, temp_char, -1);
-
+
if(part_ptr->hidden)
temp_char = "yes";
else
temp_char = "no";
gtk_tree_store_set(treestore, iter, SORTID_HIDDEN, temp_char, -1);
-
- if (part_ptr->state_up)
+
+ if (part_ptr->state_up)
temp_char = "up";
else
temp_char = "down";
gtk_tree_store_set(treestore, iter, SORTID_PART_STATE, temp_char, -1);
-
+
if (part_ptr->max_time == INFINITE)
snprintf(time_buf, sizeof(time_buf), "infinite");
else {
- secs2time_str((part_ptr->max_time * 60),
+ secs2time_str((part_ptr->max_time * 60),
time_buf, sizeof(time_buf));
}
-
+
gtk_tree_store_set(treestore, iter, SORTID_TIMELIMIT, time_buf, -1);
-
- _build_min_max_32_string(time_buf, sizeof(time_buf),
- part_ptr->min_nodes,
+
+ _build_min_max_32_string(time_buf, sizeof(time_buf),
+ part_ptr->min_nodes,
part_ptr->max_nodes, true);
gtk_tree_store_set(treestore, iter, SORTID_JOB_SIZE, time_buf, -1);
-
+
convert_num_unit((float)part_ptr->priority,
time_buf, sizeof(time_buf), UNIT_NONE);
gtk_tree_store_set(treestore, iter, SORTID_PRIORITY,
@@ -885,18 +885,18 @@ static void _update_part_record(sview_part_info_t *sview_part_info,
if (part_ptr->min_nodes == (uint32_t) INFINITE)
snprintf(time_buf, sizeof(time_buf), "infinite");
else {
- convert_num_unit((float)part_ptr->min_nodes,
+ convert_num_unit((float)part_ptr->min_nodes,
time_buf, sizeof(time_buf), UNIT_NONE);
}
- gtk_tree_store_set(treestore, iter, SORTID_NODES_MIN,
+ gtk_tree_store_set(treestore, iter, SORTID_NODES_MIN,
time_buf, -1);
if (part_ptr->max_nodes == (uint32_t) INFINITE)
snprintf(time_buf, sizeof(time_buf), "infinite");
else {
- convert_num_unit((float)part_ptr->max_nodes,
+ convert_num_unit((float)part_ptr->max_nodes,
time_buf, sizeof(time_buf), UNIT_NONE);
}
- gtk_tree_store_set(treestore, iter, SORTID_NODES_MAX,
+ gtk_tree_store_set(treestore, iter, SORTID_NODES_MAX,
time_buf, -1);
if(part_ptr->root_only)
@@ -904,29 +904,29 @@ static void _update_part_record(sview_part_info_t *sview_part_info,
else
temp_char = "no";
gtk_tree_store_set(treestore, iter, SORTID_ROOT, temp_char, -1);
-
+
if(part_ptr->max_share & SHARED_FORCE) {
- snprintf(tmp_buf, sizeof(tmp_buf), "force:%u",
- (part_ptr->max_share & ~(SHARED_FORCE)));
+ snprintf(tmp_buf, sizeof(tmp_buf), "force:%u",
+ (part_ptr->max_share & ~(SHARED_FORCE)));
temp_char = tmp_buf;
} else if(part_ptr->max_share == 0)
temp_char = "exclusive";
else if(part_ptr->max_share > 1) {
- snprintf(tmp_buf, sizeof(tmp_buf), "yes:%u",
+ snprintf(tmp_buf, sizeof(tmp_buf), "yes:%u",
part_ptr->max_share);
temp_char = tmp_buf;
- } else
+ } else
temp_char = "no";
gtk_tree_store_set(treestore, iter, SORTID_SHARE, temp_char, -1);
-
+
if(part_ptr->allow_groups)
temp_char = part_ptr->allow_groups;
else
temp_char = "all";
gtk_tree_store_set(treestore, iter, SORTID_GROUPS, temp_char, -1);
-
+
#ifdef HAVE_BG
- convert_num_unit((float)part_ptr->total_nodes, tmp_cnt,
+ convert_num_unit((float)part_ptr->total_nodes, tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
#else
sprintf(tmp_cnt, "%u", part_ptr->total_nodes);
@@ -934,37 +934,37 @@ static void _update_part_record(sview_part_info_t *sview_part_info,
gtk_tree_store_set(treestore, iter, SORTID_NODES, tmp_cnt, -1);
#ifdef HAVE_BG
- convert_num_unit((float)part_ptr->total_cpus, tmp_cnt,
+ convert_num_unit((float)part_ptr->total_cpus, tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
#else
sprintf(tmp_cnt, "%u", part_ptr->total_cpus);
#endif
gtk_tree_store_set(treestore, iter, SORTID_CPUS, tmp_cnt, -1);
- gtk_tree_store_set(treestore, iter, SORTID_NODELIST,
+ gtk_tree_store_set(treestore, iter, SORTID_NODELIST,
part_ptr->nodes, -1);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_NODE_INX, part_ptr->node_inx, -1);
-
+
gtk_tree_store_set(treestore, iter, SORTID_ONLY_LINE, 0, -1);
/* clear out info for the main listing */
gtk_tree_store_set(treestore, iter, SORTID_NODE_STATE, "", -1);
gtk_tree_store_set(treestore, iter, SORTID_NODE_STATE_NUM, -1, -1);
gtk_tree_store_set(treestore, iter, SORTID_TMP_DISK, "", -1);
gtk_tree_store_set(treestore, iter, SORTID_MEM, "", -1);
- gtk_tree_store_set(treestore, iter, SORTID_UPDATED, 1, -1);
- gtk_tree_store_set(treestore, iter, SORTID_FEATURES, "", -1);
- gtk_tree_store_set(treestore, iter, SORTID_REASON, "", -1);
-
+ gtk_tree_store_set(treestore, iter, SORTID_UPDATED, 1, -1);
+ gtk_tree_store_set(treestore, iter, SORTID_FEATURES, "", -1);
+ gtk_tree_store_set(treestore, iter, SORTID_REASON, "", -1);
+
childern = gtk_tree_model_iter_children(GTK_TREE_MODEL(treestore),
&sub_iter, iter);
if(gtk_tree_model_iter_children(GTK_TREE_MODEL(treestore),
&sub_iter, iter))
- _subdivide_part(sview_part_info,
+ _subdivide_part(sview_part_info,
GTK_TREE_MODEL(treestore), &sub_iter, iter);
else
- _subdivide_part(sview_part_info,
+ _subdivide_part(sview_part_info,
GTK_TREE_MODEL(treestore), NULL, iter);
return;
@@ -977,37 +977,37 @@ static void _update_part_sub_record(sview_part_sub_t *sview_part_sub,
char *cpu_tmp = NULL;
char *node_tmp = NULL;
partition_info_t *part_ptr = sview_part_sub->part_ptr;
- char *upper = NULL, *lower = NULL;
+ char *upper = NULL, *lower = NULL;
char tmp[MAXHOSTRANGELEN];
gtk_tree_store_set(treestore, iter, SORTID_NAME, part_ptr->name, -1);
-
+
upper = node_state_string(sview_part_sub->node_state);
lower = str_tolower(upper);
- gtk_tree_store_set(treestore, iter, SORTID_NODE_STATE,
+ gtk_tree_store_set(treestore, iter, SORTID_NODE_STATE,
lower, -1);
xfree(lower);
-
+
gtk_tree_store_set(treestore, iter, SORTID_NODE_STATE_NUM,
sview_part_sub->node_state, -1);
if((sview_part_sub->node_state & NODE_STATE_BASE) == NODE_STATE_MIXED) {
if(sview_part_sub->cpu_alloc_cnt) {
convert_num_unit((float)sview_part_sub->cpu_alloc_cnt,
- tmp_cnt,
+ tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
xstrfmtcat(cpu_tmp, "Alloc:%s", tmp_cnt);
#ifdef HAVE_BG
convert_num_unit((float)(sview_part_sub->cpu_alloc_cnt
/ cpus_per_node),
- tmp_cnt,
+ tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
xstrfmtcat(node_tmp, "Alloc:%s", tmp_cnt);
#endif
}
if(sview_part_sub->cpu_error_cnt) {
convert_num_unit((float)sview_part_sub->cpu_error_cnt,
- tmp_cnt,
+ tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
if(cpu_tmp)
xstrcat(cpu_tmp, " ");
@@ -1015,7 +1015,7 @@ static void _update_part_sub_record(sview_part_sub_t *sview_part_sub,
#ifdef HAVE_BG
convert_num_unit((float)(sview_part_sub->cpu_error_cnt
/ cpus_per_node),
- tmp_cnt,
+ tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
if(node_tmp)
xstrcat(node_tmp, " ");
@@ -1024,7 +1024,7 @@ static void _update_part_sub_record(sview_part_sub_t *sview_part_sub,
}
if(sview_part_sub->cpu_idle_cnt) {
convert_num_unit((float)sview_part_sub->cpu_idle_cnt,
- tmp_cnt,
+ tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
if(cpu_tmp)
xstrcat(cpu_tmp, " ");
@@ -1032,7 +1032,7 @@ static void _update_part_sub_record(sview_part_sub_t *sview_part_sub,
#ifdef HAVE_BG
convert_num_unit((float)(sview_part_sub->cpu_idle_cnt
/ cpus_per_node),
- tmp_cnt,
+ tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
if(node_tmp)
xstrcat(node_tmp, " ");
@@ -1046,17 +1046,17 @@ static void _update_part_sub_record(sview_part_sub_t *sview_part_sub,
}
gtk_tree_store_set(treestore, iter, SORTID_CPUS, cpu_tmp, -1);
xfree(cpu_tmp);
-
- convert_num_unit((float)sview_part_sub->disk_total, tmp_cnt,
+
+ convert_num_unit((float)sview_part_sub->disk_total, tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
gtk_tree_store_set(treestore, iter, SORTID_TMP_DISK, tmp_cnt, -1);
-
- convert_num_unit((float)sview_part_sub->mem_total, tmp_cnt,
+
+ convert_num_unit((float)sview_part_sub->mem_total, tmp_cnt,
sizeof(tmp_cnt), UNIT_MEGA);
gtk_tree_store_set(treestore, iter, SORTID_MEM, tmp_cnt, -1);
-
+
if(!node_tmp) {
- convert_num_unit((float)sview_part_sub->node_cnt, tmp_cnt,
+ convert_num_unit((float)sview_part_sub->node_cnt, tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
node_tmp = xstrdup(tmp_cnt);
}
@@ -1064,15 +1064,15 @@ static void _update_part_sub_record(sview_part_sub_t *sview_part_sub,
xfree(node_tmp);
hostlist_ranged_string(sview_part_sub->hl, sizeof(tmp), tmp);
- gtk_tree_store_set(treestore, iter, SORTID_NODELIST,
+ gtk_tree_store_set(treestore, iter, SORTID_NODELIST,
tmp, -1);
- gtk_tree_store_set(treestore, iter, SORTID_UPDATED, 1, -1);
-
+ gtk_tree_store_set(treestore, iter, SORTID_UPDATED, 1, -1);
+
gtk_tree_store_set(treestore, iter, SORTID_FEATURES,
sview_part_sub->features, -1);
gtk_tree_store_set(treestore, iter, SORTID_REASON,
sview_part_sub->reason, -1);
-
+
return;
}
@@ -1090,13 +1090,13 @@ static void _append_part_sub_record(sview_part_sub_t *sview_part_sub,
int line)
{
GtkTreeIter sub_iter;
-
+
gtk_tree_store_append(treestore, &sub_iter, iter);
gtk_tree_store_set(treestore, &sub_iter, SORTID_POS, line, -1);
_update_part_sub_record(sview_part_sub, treestore, &sub_iter);
}
-static void _update_info_part(List info_list,
+static void _update_info_part(List info_list,
GtkTreeView *tree_view)
{
GtkTreePath *path = gtk_tree_path_new_first();
@@ -1112,8 +1112,8 @@ static void _update_info_part(List info_list,
if (gtk_tree_model_get_iter(model, &iter, path)) {
/* make sure all the partitions are still here */
while(1) {
- gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
- SORTID_UPDATED, 0, -1);
+ gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
+ SORTID_UPDATED, 0, -1);
if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
@@ -1126,30 +1126,30 @@ static void _update_info_part(List info_list,
/* get the iter, or find out the list is empty goto add */
if (!gtk_tree_model_get_iter(model, &iter, path)) {
goto adding;
- }
+ }
line = 0;
while(1) {
- /* search for the jobid and check to see if
+ /* search for the jobid and check to see if
it is in the list */
- gtk_tree_model_get(model, &iter, SORTID_NAME,
+ gtk_tree_model_get(model, &iter, SORTID_NAME,
&part_name, -1);
if(!strcmp(part_name, part_ptr->name)) {
/* update with new info */
g_free(part_name);
- _update_part_record(sview_part_info,
- GTK_TREE_STORE(model),
+ _update_part_record(sview_part_info,
+ GTK_TREE_STORE(model),
&iter);
goto found;
}
g_free(part_name);
-
+
line++;
if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
}
adding:
- _append_part_record(sview_part_info, GTK_TREE_STORE(model),
+ _append_part_record(sview_part_info, GTK_TREE_STORE(model),
&iter, line);
found:
;
@@ -1190,15 +1190,15 @@ static void _destroy_part_sub(void *object)
}
}
-static void _update_sview_part_sub(sview_part_sub_t *sview_part_sub,
- node_info_t *node_ptr,
+static void _update_sview_part_sub(sview_part_sub_t *sview_part_sub,
+ node_info_t *node_ptr,
int node_scaling)
{
int cpus_per_node = 1;
int idle_cpus = node_ptr->cpus;
uint16_t err_cpus = 0, alloc_cpus = 0;
- if(node_scaling)
+ if(node_scaling)
cpus_per_node = node_ptr->cpus / node_scaling;
xassert(sview_part_sub);
@@ -1217,12 +1217,12 @@ static void _update_sview_part_sub(sview_part_sub_t *sview_part_sub,
}
if((sview_part_sub->node_state & NODE_STATE_BASE) == NODE_STATE_MIXED) {
- slurm_get_select_nodeinfo(node_ptr->select_nodeinfo,
+ slurm_get_select_nodeinfo(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ALLOCATED,
&alloc_cpus);
#ifdef HAVE_BG
- if(!alloc_cpus
+ if(!alloc_cpus
&& (IS_NODE_ALLOCATED(node_ptr)
|| IS_NODE_COMPLETING(node_ptr)))
alloc_cpus = node_ptr->cpus;
@@ -1230,8 +1230,8 @@ static void _update_sview_part_sub(sview_part_sub_t *sview_part_sub,
alloc_cpus *= cpus_per_node;
#endif
idle_cpus -= alloc_cpus;
-
- slurm_get_select_nodeinfo(node_ptr->select_nodeinfo,
+
+ slurm_get_select_nodeinfo(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ERROR,
&err_cpus);
@@ -1251,18 +1251,18 @@ static void _update_sview_part_sub(sview_part_sub_t *sview_part_sub,
hostlist_push(sview_part_sub->hl, node_ptr->name);
}
-/*
- * _create_sview_part_sub - create an sview_part_sub record for
+/*
+ * _create_sview_part_sub - create an sview_part_sub record for
* the given partition
* sview_part_sub OUT - ptr to an inited sview_part_sub_t
*/
static sview_part_sub_t *_create_sview_part_sub(partition_info_t *part_ptr,
- node_info_t *node_ptr,
+ node_info_t *node_ptr,
int node_scaling)
{
- sview_part_sub_t *sview_part_sub_ptr =
+ sview_part_sub_t *sview_part_sub_ptr =
xmalloc(sizeof(sview_part_sub_t));
-
+
if (!part_ptr) {
g_print("got no part_ptr!\n");
xfree(sview_part_sub_ptr);
@@ -1284,7 +1284,7 @@ static sview_part_sub_t *_create_sview_part_sub(partition_info_t *part_ptr,
static int _insert_sview_part_sub(sview_part_info_t *sview_part_info,
partition_info_t *part_ptr,
- node_info_t *node_ptr,
+ node_info_t *node_ptr,
int node_scaling)
{
sview_part_sub_t *sview_part_sub = NULL;
@@ -1293,35 +1293,35 @@ static int _insert_sview_part_sub(sview_part_info_t *sview_part_info,
while((sview_part_sub = list_next(itr))) {
if(sview_part_sub->node_state
== node_ptr->node_state) {
- _update_sview_part_sub(sview_part_sub,
+ _update_sview_part_sub(sview_part_sub,
node_ptr,
node_scaling);
break;
}
}
list_iterator_destroy(itr);
-
+
if(!sview_part_sub) {
if((sview_part_sub = _create_sview_part_sub(
part_ptr, node_ptr, node_scaling)))
- list_push(sview_part_info->sub_list,
+ list_push(sview_part_info->sub_list,
sview_part_sub);
}
return SLURM_SUCCESS;
}
-/*
- * _create_sview_part_info - create an sview_part_info record for
+/*
+ * _create_sview_part_info - create an sview_part_info record for
* the given partition
* part_ptr IN - pointer to partition record to add
* sview_part_info OUT - ptr to an inited sview_part_info_t
*/
static sview_part_info_t *_create_sview_part_info(partition_info_t* part_ptr)
{
- sview_part_info_t *sview_part_info =
+ sview_part_info_t *sview_part_info =
xmalloc(sizeof(sview_part_info_t));
-
-
+
+
sview_part_info->part_ptr = part_ptr;
sview_part_info->sub_list = list_create(_destroy_part_sub);
return sview_part_info;
@@ -1353,7 +1353,7 @@ static int _sview_sub_part_sort(sview_part_sub_t* rec_a,
{
int size_a = rec_a->node_state & NODE_STATE_BASE;
int size_b = rec_b->node_state & NODE_STATE_BASE;
-
+
if (size_a < size_b)
return -1;
else if (size_a > size_b)
@@ -1375,7 +1375,7 @@ static List _create_part_info_list(partition_info_msg_t *part_info_ptr,
if(!changed && info_list) {
return info_list;
}
-
+
if(info_list) {
list_destroy(info_list);
}
@@ -1389,7 +1389,7 @@ static List _create_part_info_list(partition_info_msg_t *part_info_ptr,
part_ptr = &(part_info_ptr->partition_array[i]);
if (!part_ptr->nodes || (part_ptr->nodes[0] == '\0'))
continue; /* empty partition */
-
+
sview_part_info = _create_sview_part_info(part_ptr);
list_append(info_list, sview_part_info);
sview_part_info->color_inx = i % sview_colors_cnt;
@@ -1406,10 +1406,10 @@ static List _create_part_info_list(partition_info_msg_t *part_info_ptr,
part_ptr,
node_ptr,
g_node_scaling);
- }
+ }
j2 += 2;
}
- list_sort(sview_part_info->sub_list,
+ list_sort(sview_part_info->sub_list,
(ListCmpF)_sview_sub_part_sort);
}
list_sort(info_list, (ListCmpF)_sview_part_sort_aval_dec);
@@ -1434,14 +1434,14 @@ void _display_info_part(List info_list, popup_info_t *popup_win)
//info = xstrdup("No pointer given!");
goto finished;
}
- if(!list_count(popup_win->grid_button_list))
+ if(!list_count(popup_win->grid_button_list))
first_time = 1;
need_refresh:
if(!spec_info->display_widget) {
treeview = create_treeview_2cols_attach_to_table(
popup_win->table);
- spec_info->display_widget =
+ spec_info->display_widget =
gtk_widget_ref(GTK_WIDGET(treeview));
} else {
treeview = GTK_TREE_VIEW(spec_info->display_widget);
@@ -1472,31 +1472,31 @@ need_refresh:
post_setup_popup_grid_list(popup_win);
if(!found) {
- if(!popup_win->not_found) {
+ if(!popup_win->not_found) {
char *temp = "PARTITION DOESN'T EXSIST\n";
GtkTreeIter iter;
GtkTreeModel *model = NULL;
-
+
/* only time this will be run so no update */
model = gtk_tree_view_get_model(treeview);
- add_display_treestore_line(0,
- GTK_TREE_STORE(model),
+ add_display_treestore_line(0,
+ GTK_TREE_STORE(model),
&iter,
temp, "");
}
popup_win->not_found = true;
} else {
- if(popup_win->not_found) {
+ if(popup_win->not_found) {
popup_win->not_found = false;
gtk_widget_destroy(spec_info->display_widget);
-
+
goto need_refresh;
}
}
gtk_widget_show(spec_info->display_widget);
-
+
finished:
-
+
return;
}
@@ -1518,18 +1518,18 @@ extern int get_new_info_part(partition_info_msg_t **part_ptr, int force)
time_t now = time(NULL);
static time_t last;
static bool changed = 0;
-
+
if(!force && ((now - last) < global_sleep_time)) {
if(*part_ptr != part_info_ptr)
error_code = SLURM_SUCCESS;
*part_ptr = part_info_ptr;
- if(changed)
+ if(changed)
return SLURM_SUCCESS;
return error_code;
}
last = now;
if (part_info_ptr) {
- error_code = slurm_load_partitions(part_info_ptr->last_update,
+ error_code = slurm_load_partitions(part_info_ptr->last_update,
&new_part_ptr, SHOW_ALL);
if (error_code == SLURM_SUCCESS) {
slurm_free_partition_info_msg(part_info_ptr);
@@ -1540,14 +1540,14 @@ extern int get_new_info_part(partition_info_msg_t **part_ptr, int force)
changed = 0;
}
} else {
- error_code = slurm_load_partitions((time_t) NULL,
+ error_code = slurm_load_partitions((time_t) NULL,
&new_part_ptr, SHOW_ALL);
changed = 1;
}
-
+
part_info_ptr = new_part_ptr;
- if(*part_ptr != part_info_ptr)
+ if(*part_ptr != part_info_ptr)
error_code = SLURM_SUCCESS;
*part_ptr = new_part_ptr;
@@ -1558,7 +1558,7 @@ extern GtkListStore *create_model_part(int type)
{
GtkListStore *model = NULL;
GtkTreeIter iter;
- char *upper = NULL, *lower = NULL;
+ char *upper = NULL, *lower = NULL;
int i=0;
switch(type) {
case SORTID_DEFAULT:
@@ -1567,12 +1567,12 @@ extern GtkListStore *create_model_part(int type)
gtk_list_store_set(model, &iter,
0, "yes",
1, SORTID_DEFAULT,
- -1);
+ -1);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
0, "no",
1, SORTID_DEFAULT,
- -1);
+ -1);
break;
case SORTID_HIDDEN:
@@ -1581,12 +1581,12 @@ extern GtkListStore *create_model_part(int type)
gtk_list_store_set(model, &iter,
0, "yes",
1, SORTID_HIDDEN,
- -1);
+ -1);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
0, "no",
1, SORTID_HIDDEN,
- -1);
+ -1);
break;
case SORTID_PRIORITY:
@@ -1600,12 +1600,12 @@ extern GtkListStore *create_model_part(int type)
gtk_list_store_set(model, &iter,
0, "yes",
1, SORTID_ROOT,
- -1);
+ -1);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
0, "no",
1, SORTID_ROOT,
- -1);
+ -1);
break;
case SORTID_SHARE:
model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
@@ -1618,13 +1618,13 @@ extern GtkListStore *create_model_part(int type)
gtk_list_store_set(model, &iter,
0, "no",
1, SORTID_SHARE,
- -1);
+ -1);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
0, "yes",
1, SORTID_SHARE,
-1);
- gtk_list_store_append(model, &iter);
+ gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
0, "exclusive",
1, SORTID_SHARE,
@@ -1640,12 +1640,12 @@ extern GtkListStore *create_model_part(int type)
gtk_list_store_set(model, &iter,
0, "up",
1, SORTID_PART_STATE,
- -1);
+ -1);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
0, "down",
1, SORTID_PART_STATE,
- -1);
+ -1);
break;
case SORTID_NODE_STATE:
model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
@@ -1653,17 +1653,17 @@ extern GtkListStore *create_model_part(int type)
gtk_list_store_set(model, &iter,
0, "drain",
1, SORTID_NODE_STATE,
- -1);
+ -1);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
0, "resume",
1, SORTID_NODE_STATE,
- -1);
+ -1);
for(i = 0; i < NODE_STATE_END; i++) {
upper = node_state_string(i);
if(!strcmp(upper, "UNKNOWN"))
continue;
-
+
gtk_list_store_append(model, &iter);
lower = str_tolower(upper);
gtk_list_store_set(model, &iter,
@@ -1672,7 +1672,7 @@ extern GtkListStore *create_model_part(int type)
-1);
xfree(lower);
}
-
+
break;
}
@@ -1688,28 +1688,28 @@ extern void admin_edit_part(GtkCellRendererText *cell,
GtkTreePath *path = gtk_tree_path_new_from_string(path_string);
GtkTreeIter iter;
update_part_msg_t *part_msg = xmalloc(sizeof(update_part_msg_t));
-
+
char *temp = NULL;
char *old_text = NULL;
const char *type = NULL;
- int column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell),
+ int column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell),
"column"));
-
+
if(!new_text || !strcmp(new_text, ""))
goto no_input;
-
+
gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path);
if(column != SORTID_NODE_STATE) {
slurm_init_part_desc_msg(part_msg);
- gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter,
- SORTID_NAME, &temp,
+ gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter,
+ SORTID_NAME, &temp,
column, &old_text,
-1);
part_msg->name = xstrdup(temp);
g_free(temp);
}
-
+
type = _set_part_msg(part_msg, new_text, column);
if(errno)
goto print_error;
@@ -1725,7 +1725,7 @@ extern void admin_edit_part(GtkCellRendererText *cell,
admin_part(GTK_TREE_MODEL(treestore), &iter, (char *)type);
goto no_input;
}
-
+
if(column != SORTID_NODE_STATE && column != SORTID_FEATURES ) {
if(old_text && !strcmp(old_text, new_text)) {
temp = g_strdup_printf("No change in value.");
@@ -1745,7 +1745,7 @@ extern void admin_edit_part(GtkCellRendererText *cell,
new_text);
}
display_edit_note(temp);
- g_free(temp);
+ g_free(temp);
}
no_input:
slurm_free_update_part_msg(part_msg);
@@ -1773,7 +1773,7 @@ extern void get_info_part(GtkTable *table, display_data_t *display_data)
sview_part_info_t *sview_part_info = NULL;
partition_info_t *part_ptr = NULL;
ListIterator itr = NULL;
-
+
if(display_data)
local_display_data = display_data;
if(!table) {
@@ -1785,10 +1785,10 @@ extern void get_info_part(GtkTable *table, display_data_t *display_data)
display_widget = NULL;
goto display_it;
}
-
+
if((part_error_code = get_new_info_part(&part_info_ptr, force_refresh))
- == SLURM_NO_CHANGE_IN_DATA) {
- // just goto the new info node
+ == SLURM_NO_CHANGE_IN_DATA) {
+ // just goto the new info node
} else if (part_error_code != SLURM_SUCCESS) {
if(view == ERROR_VIEW)
goto end_it;
@@ -1805,7 +1805,7 @@ extern void get_info_part(GtkTable *table, display_data_t *display_data)
}
if((node_error_code = get_new_info_node(&node_info_ptr, force_refresh))
- == SLURM_NO_CHANGE_IN_DATA) {
+ == SLURM_NO_CHANGE_IN_DATA) {
// just goto the new info node select
} else if (node_error_code != SLURM_SUCCESS) {
if(view == ERROR_VIEW)
@@ -1823,8 +1823,8 @@ extern void get_info_part(GtkTable *table, display_data_t *display_data)
}
if((block_error_code = get_new_info_block(&block_ptr, force_refresh))
- == SLURM_NO_CHANGE_IN_DATA) {
- if((!display_widget || view == ERROR_VIEW)
+ == SLURM_NO_CHANGE_IN_DATA) {
+ if((!display_widget || view == ERROR_VIEW)
|| (part_error_code != SLURM_NO_CHANGE_IN_DATA)
|| (node_error_code != SLURM_NO_CHANGE_IN_DATA)) {
goto display_it;
@@ -1839,10 +1839,10 @@ extern void get_info_part(GtkTable *table, display_data_t *display_data)
sprintf(error_char, "slurm_load_block: %s",
slurm_strerror(slurm_get_errno()));
label = gtk_label_new(error_char);
- gtk_table_attach_defaults(table,
+ gtk_table_attach_defaults(table,
label,
- 0, 1, 0, 1);
- gtk_widget_show(label);
+ 0, 1, 0, 1);
+ gtk_widget_show(label);
display_widget = gtk_widget_ref(label);
goto end_it;
}
@@ -1861,7 +1861,7 @@ display_it:
part_ptr = sview_part_info->part_ptr;
j=0;
while(part_ptr->node_inx[j] >= 0) {
-
+
change_grid_color(grid_button_list,
part_ptr->node_inx[j],
part_ptr->node_inx[j+1],
@@ -1889,8 +1889,8 @@ display_it:
gtk_table_attach_defaults(table,
GTK_WIDGET(tree_view),
0, 1, 0, 1);
- /* since this function sets the model of the tree_view
- to the treestore we don't really care about
+ /* since this function sets the model of the tree_view
+ to the treestore we don't really care about
the return value */
create_treestore(tree_view, display_data_part,
SORTID_CNT, SORTID_NAME, SORTID_COLOR);
@@ -1900,7 +1900,7 @@ display_it:
end_it:
toggled = FALSE;
force_refresh = FALSE;
-
+
return;
}
@@ -1924,20 +1924,20 @@ extern void specific_info_part(popup_info_t *popup_win)
partition_info_t *part_ptr = NULL;
ListIterator itr = NULL;
hostset_t hostset = NULL;
-
+
if(!spec_info->display_widget)
setup_popup_info(popup_win, display_data_part, SORTID_CNT);
-
+
if(spec_info->display_widget && popup_win->toggled) {
gtk_widget_destroy(spec_info->display_widget);
spec_info->display_widget = NULL;
goto display_it;
}
- if((part_error_code = get_new_info_part(&part_info_ptr,
+ if((part_error_code = get_new_info_part(&part_info_ptr,
popup_win->force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
-
+
} else if (part_error_code != SLURM_SUCCESS) {
if(spec_info->view == ERROR_VIEW)
goto end_it;
@@ -1951,14 +1951,14 @@ extern void specific_info_part(popup_info_t *popup_win)
label = gtk_label_new(error_char);
spec_info->display_widget = gtk_widget_ref(GTK_WIDGET(label));
gtk_table_attach_defaults(popup_win->table, label, 0, 1, 0, 1);
- gtk_widget_show(label);
+ gtk_widget_show(label);
goto end_it;
}
- if((node_error_code = get_new_info_node(&node_info_ptr,
+ if((node_error_code = get_new_info_node(&node_info_ptr,
popup_win->force_refresh))
- == SLURM_NO_CHANGE_IN_DATA) {
-
+ == SLURM_NO_CHANGE_IN_DATA) {
+
} else if (node_error_code != SLURM_SUCCESS) {
if(spec_info->view == ERROR_VIEW)
goto end_it;
@@ -1975,9 +1975,9 @@ extern void specific_info_part(popup_info_t *popup_win)
}
if((block_error_code = get_new_info_block(&block_ptr, force_refresh))
- == SLURM_NO_CHANGE_IN_DATA) {
+ == SLURM_NO_CHANGE_IN_DATA) {
if((!spec_info->display_widget
- || spec_info->view == ERROR_VIEW)
+ || spec_info->view == ERROR_VIEW)
|| (part_error_code != SLURM_NO_CHANGE_IN_DATA)
|| (node_error_code != SLURM_NO_CHANGE_IN_DATA))
goto display_it;
@@ -1993,53 +1993,53 @@ extern void specific_info_part(popup_info_t *popup_win)
label = gtk_label_new(error_char);
spec_info->display_widget = gtk_widget_ref(label);
gtk_table_attach_defaults(popup_win->table, label, 0, 1, 0, 1);
- gtk_widget_show(label);
+ gtk_widget_show(label);
goto end_it;
}
-display_it:
-
+display_it:
+
info_list = _create_part_info_list(part_info_ptr,
node_info_ptr,
block_ptr,
changed);
if(!info_list)
- return;
-
+ return;
+
if(spec_info->view == ERROR_VIEW && spec_info->display_widget) {
gtk_widget_destroy(spec_info->display_widget);
spec_info->display_widget = NULL;
}
-
+
if(spec_info->type != INFO_PAGE && !spec_info->display_widget) {
tree_view = create_treeview(local_display_data,
&popup_win->grid_button_list);
-
- spec_info->display_widget =
+
+ spec_info->display_widget =
gtk_widget_ref(GTK_WIDGET(tree_view));
gtk_table_attach_defaults(popup_win->table,
GTK_WIDGET(tree_view),
0, 1, 0, 1);
-
- /* since this function sets the model of the tree_view
- to the treestore we don't really care about
+
+ /* since this function sets the model of the tree_view
+ to the treestore we don't really care about
the return value */
- create_treestore(tree_view, popup_win->display_data,
+ create_treestore(tree_view, popup_win->display_data,
SORTID_CNT, SORTID_NAME, SORTID_COLOR);
}
-
+
setup_popup_grid_list(popup_win);
spec_info->view = INFO_VIEW;
if(spec_info->type == INFO_PAGE) {
_display_info_part(info_list, popup_win);
goto end_it;
- }
-
+ }
+
/* just linking to another list, don't free the inside, just
the list */
- send_info_list = list_create(NULL);
-
+ send_info_list = list_create(NULL);
+
itr = list_iterator_create(info_list);
i = -1;
while ((sview_part_info_ptr = list_next(itr))) {
@@ -2058,13 +2058,13 @@ display_it:
hostset_destroy(hostset);
continue;
}
- hostset_destroy(hostset);
+ hostset_destroy(hostset);
break;
case PART_PAGE:
case BLOCK_PAGE:
case JOB_PAGE:
- if(strcmp(part_ptr->name,
- spec_info->search_info->gchar_data))
+ if(strcmp(part_ptr->name,
+ spec_info->search_info->gchar_data))
continue;
break;
default:
@@ -2085,14 +2085,14 @@ display_it:
}
list_iterator_destroy(itr);
post_setup_popup_grid_list(popup_win);
-
- _update_info_part(send_info_list,
+
+ _update_info_part(send_info_list,
GTK_TREE_VIEW(spec_info->display_widget));
list_destroy(send_info_list);
end_it:
popup_win->toggled = 0;
popup_win->force_refresh = 0;
-
+
return;
}
@@ -2120,8 +2120,8 @@ extern void set_menus_part(void *arg, void *arg2, GtkTreePath *path, int type)
if (!gtk_tree_model_get_iter(model, &iter, path)) {
g_error("error getting iter from model\n");
break;
- }
-
+ }
+
popup_all_part(model, &iter, INFO_PAGE);
break;
@@ -2145,9 +2145,9 @@ extern void popup_all_part(GtkTreeModel *model, GtkTreeIter *iter, int id)
popup_info_t *popup_win = NULL;
GError *error = NULL;
GtkTreeIter par_iter;
-
+
gtk_tree_model_get(model, iter, SORTID_NAME, &name, -1);
-
+
switch(id) {
case JOB_PAGE:
snprintf(title, 100, "Job(s) in partition %s", name);
@@ -2163,11 +2163,11 @@ extern void popup_all_part(GtkTreeModel *model, GtkTreeIter *iter, int id)
SORTID_NODE_STATE, &state, -1);
#ifdef HAVE_BG
if(!state || !strlen(state))
- snprintf(title, 100,
+ snprintf(title, 100,
"Base partition(s) in partition %s",
name);
else
- snprintf(title, 100,
+ snprintf(title, 100,
"Base partition(s) in partition %s "
"that are in '%s' state",
name, state);
@@ -2176,31 +2176,31 @@ extern void popup_all_part(GtkTreeModel *model, GtkTreeIter *iter, int id)
snprintf(title, 100, "Node(s) in partition %s ",
name);
else
- snprintf(title, 100,
+ snprintf(title, 100,
"Node(s) in partition %s that are in "
"'%s' state",
name, state);
#endif
break;
- case BLOCK_PAGE:
+ case BLOCK_PAGE:
snprintf(title, 100, "Block(s) in partition %s", name);
break;
- case SUBMIT_PAGE:
+ case SUBMIT_PAGE:
snprintf(title, 100, "Submit job in partition %s", name);
break;
- case INFO_PAGE:
+ case INFO_PAGE:
snprintf(title, 100, "Full info for partition %s", name);
break;
default:
g_print("part got %d\n", id);
}
-
+
itr = list_iterator_create(popup_list);
while((popup_win = list_next(itr))) {
if(popup_win->spec_info)
if(!strcmp(popup_win->spec_info->title, title)) {
break;
- }
+ }
}
list_iterator_destroy(itr);
@@ -2225,7 +2225,7 @@ extern void popup_all_part(GtkTreeModel *model, GtkTreeIter *iter, int id)
switch(id) {
case JOB_PAGE:
- case BLOCK_PAGE:
+ case BLOCK_PAGE:
case INFO_PAGE:
popup_win->spec_info->search_info->gchar_data = name;
//specific_info_job(popup_win);
@@ -2235,11 +2235,11 @@ extern void popup_all_part(GtkTreeModel *model, GtkTreeIter *iter, int id)
g_free(name);
/* we want to include the parent's nodes here not just
the subset */
- if(gtk_tree_model_iter_parent(model, &par_iter, iter))
+ if(gtk_tree_model_iter_parent(model, &par_iter, iter))
gtk_tree_model_get(model, &par_iter,
SORTID_NODELIST, &name, -1);
else
- gtk_tree_model_get(model, iter,
+ gtk_tree_model_get(model, iter,
SORTID_NODELIST, &name, -1);
popup_win->spec_info->search_info->gchar_data = name;
if(state && strlen(state)) {
@@ -2250,24 +2250,24 @@ extern void popup_all_part(GtkTreeModel *model, GtkTreeIter *iter, int id)
&popup_win->spec_info->search_info->int_data,
-1);
} else {
- popup_win->spec_info->search_info->search_type =
+ popup_win->spec_info->search_info->search_type =
SEARCH_NODE_NAME;
}
g_free(state);
-
+
//specific_info_node(popup_win);
break;
- case SUBMIT_PAGE:
+ case SUBMIT_PAGE:
break;
default:
g_print("part got unknown type %d\n", id);
}
if (!g_thread_create((gpointer)popup_thr, popup_win, FALSE, &error))
{
- g_printerr ("Failed to create part popup thread: %s\n",
+ g_printerr ("Failed to create part popup thread: %s\n",
error->message);
return;
- }
+ }
}
extern void admin_part(GtkTreeModel *model, GtkTreeIter *iter, char *type)
@@ -2278,7 +2278,7 @@ extern void admin_part(GtkTreeModel *model, GtkTreeIter *iter, char *type)
char tmp_char[100];
char *temp = NULL;
int edit_type = 0;
- int response = 0;
+ int response = 0;
GtkWidget *label = NULL;
GtkWidget *entry = NULL;
GtkWidget *popup = gtk_dialog_new_with_buttons(
@@ -2291,9 +2291,9 @@ extern void admin_part(GtkTreeModel *model, GtkTreeIter *iter, char *type)
gtk_tree_model_get(model, iter, SORTID_NAME, &partid, -1);
gtk_tree_model_get(model, iter, SORTID_NODELIST, &nodelist, -1);
slurm_init_part_desc_msg(part_msg);
-
+
part_msg->name = xstrdup(partid);
-
+
if(!strcasecmp("Change Part State Up/Down", type)) {
char *state = NULL;
label = gtk_dialog_add_button(GTK_DIALOG(popup),
@@ -2310,7 +2310,7 @@ extern void admin_part(GtkTreeModel *model, GtkTreeIter *iter, char *type)
part_msg->state_up = 0;
}
g_free(state);
- snprintf(tmp_char, sizeof(tmp_char),
+ snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to set partition %s %s?",
partid, temp);
label = gtk_label_new(tmp_char);
@@ -2323,7 +2323,7 @@ extern void admin_part(GtkTreeModel *model, GtkTreeIter *iter, char *type)
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
gtk_window_set_default_size(GTK_WINDOW(popup), 200, 400);
- snprintf(tmp_char, sizeof(tmp_char),
+ snprintf(tmp_char, sizeof(tmp_char),
"Editing partition %s think before you type",
partid);
label = gtk_label_new(tmp_char);
@@ -2331,9 +2331,9 @@ extern void admin_part(GtkTreeModel *model, GtkTreeIter *iter, char *type)
entry = _admin_full_edit_part(part_msg, model, iter);
} else if(!strncasecmp("Update", type, 6)) {
char *old_features = NULL;
- if(got_features_edit_signal)
+ if(got_features_edit_signal)
old_features = got_features_edit_signal;
- else
+ else
gtk_tree_model_get(model, iter, SORTID_FEATURES,
&old_features, -1);
update_features_node(GTK_DIALOG(popup),
@@ -2341,7 +2341,7 @@ extern void admin_part(GtkTreeModel *model, GtkTreeIter *iter, char *type)
if(got_features_edit_signal) {
got_features_edit_signal = NULL;
xfree(old_features);
- } else
+ } else
g_free(old_features);
goto end_it;
} else {
@@ -2350,10 +2350,10 @@ extern void admin_part(GtkTreeModel *model, GtkTreeIter *iter, char *type)
goto end_it;
}
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
label, FALSE, FALSE, 0);
if(entry)
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
entry, TRUE, TRUE, 0);
gtk_widget_show_all(popup);
response = gtk_dialog_run (GTK_DIALOG(popup));
@@ -2372,7 +2372,7 @@ extern void admin_part(GtkTreeModel *model, GtkTreeIter *iter, char *type)
g_free(temp);
}
end_it:
-
+
g_free(partid);
g_free(nodelist);
slurm_free_update_part_msg(part_msg);
@@ -2382,11 +2382,11 @@ end_it:
got_edit_signal = NULL;
admin_part(model, iter, type);
xfree(type);
- }
+ }
if(got_features_edit_signal) {
- type = "Update Features";
- admin_part(model, iter, type);
- }
+ type = "Update Features";
+ admin_part(model, iter, type);
+ }
return;
}
diff --git a/src/sview/popups.c b/src/sview/popups.c
index dadf56561fecd6742fc31b7a8cc64be68acc545e..d76b40782446a527495e105a26e479905334cb9f 100644
--- a/src/sview/popups.c
+++ b/src/sview/popups.c
@@ -7,32 +7,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -45,11 +45,11 @@ void *_refresh_thr(gpointer arg)
int msg_id = GPOINTER_TO_INT(arg);
sleep(5);
gdk_threads_enter();
- gtk_statusbar_remove(GTK_STATUSBAR(main_statusbar),
+ gtk_statusbar_remove(GTK_STATUSBAR(main_statusbar),
STATUS_REFRESH, msg_id);
gdk_flush();
gdk_threads_leave();
- return NULL;
+ return NULL;
}
static gboolean _delete_popup(GtkWidget *widget,
@@ -68,15 +68,15 @@ void _search_entry(sview_search_info_t *sview_search_info)
ListIterator itr = NULL;
popup_info_t *popup_win = NULL;
GError *error = NULL;
- char *upper = NULL, *lower = NULL;
-
+ char *upper = NULL, *lower = NULL;
+
if(sview_search_info->int_data == NO_VAL &&
- (!sview_search_info->gchar_data
+ (!sview_search_info->gchar_data
|| !strlen(sview_search_info->gchar_data))) {
g_print("nothing given to search for.\n");
return;
}
-
+
switch(sview_search_info->search_type) {
case SEARCH_JOB_STATE:
id = JOB_PAGE;
@@ -109,7 +109,7 @@ void _search_entry(sview_search_info_t *sview_search_info)
break;
case SEARCH_BLOCK_SIZE:
id = BLOCK_PAGE;
- sview_search_info->int_data =
+ sview_search_info->int_data =
revert_num_unit(sview_search_info->gchar_data);
if(sview_search_info->int_data == -1)
return;
@@ -118,7 +118,7 @@ void _search_entry(sview_search_info_t *sview_search_info)
break;
case SEARCH_PARTITION_NAME:
id = PART_PAGE;
- snprintf(title, 100, "Partition %s info",
+ snprintf(title, 100, "Partition %s info",
sview_search_info->gchar_data);
break;
case SEARCH_PARTITION_STATE:
@@ -150,7 +150,7 @@ void _search_entry(sview_search_info_t *sview_search_info)
snprintf(title, 100, "Node(s) in the %s state", lower);
#endif
xfree(lower);
-
+
break;
case SEARCH_RESERVATION_NAME:
id = RESV_PAGE;
@@ -160,16 +160,16 @@ void _search_entry(sview_search_info_t *sview_search_info)
default:
g_print("unknown search type %d.\n",
sview_search_info->search_type);
-
+
return;
- }
-
+ }
+
itr = list_iterator_create(popup_list);
while((popup_win = list_next(itr))) {
if(popup_win->spec_info)
if(!strcmp(popup_win->spec_info->title, title)) {
break;
- }
+ }
}
list_iterator_destroy(itr);
@@ -184,14 +184,14 @@ void _search_entry(sview_search_info_t *sview_search_info)
if (!g_thread_create((gpointer)popup_thr, popup_win, FALSE, &error))
{
- g_printerr ("Failed to create main popup thread: %s\n",
+ g_printerr ("Failed to create main popup thread: %s\n",
error->message);
return;
}
return;
}
-static GtkTreeStore *_local_create_treestore_2cols(GtkWidget *popup,
+static GtkTreeStore *_local_create_treestore_2cols(GtkWidget *popup,
int x, int y)
{
GtkScrolledWindow *window = create_scrolled_window();
@@ -205,13 +205,13 @@ static GtkTreeStore *_local_create_treestore_2cols(GtkWidget *popup,
view = GTK_VIEWPORT(bin->child);
bin = GTK_BIN(&view->bin);
table = GTK_TABLE(bin->child);
-
- gtk_window_set_default_size(GTK_WINDOW(popup),
+
+ gtk_window_set_default_size(GTK_WINDOW(popup),
x, y);
-
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
+
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
GTK_WIDGET(window), TRUE, TRUE, 0);
-
+
treeview = create_treeview_2cols_attach_to_table(table);
treestore = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
return treestore;
@@ -240,18 +240,18 @@ static void _layout_ctl_conf(GtkTreeStore *treestore,
if(!slurm_ctl_conf_ptr)
return;
- slurm_make_time_str((time_t *)&slurm_ctl_conf_ptr->last_update,
+ slurm_make_time_str((time_t *)&slurm_ctl_conf_ptr->last_update,
temp_str, sizeof(temp_str));
add_display_treestore_line_with_font(
- update, treestore, &iter,
+ update, treestore, &iter,
"Configuration data as of", temp_str, "bold");
-
+
ret_list = slurm_ctl_conf_2_key_pairs(slurm_ctl_conf_ptr);
if(ret_list) {
itr = list_iterator_create(ret_list);
while((key_pair = list_next(itr))) {
- add_display_treestore_line(update, treestore, &iter,
- key_pair->name,
+ add_display_treestore_line(update, treestore, &iter,
+ key_pair->name,
key_pair->value);
}
list_iterator_destroy(itr);
@@ -261,14 +261,14 @@ static void _layout_ctl_conf(GtkTreeStore *treestore,
if (!slurm_ctl_conf_ptr->select_conf_key_pairs)
return;
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
"", NULL);
- add_display_treestore_line_with_font(update, treestore, &iter,
+ add_display_treestore_line_with_font(update, treestore, &iter,
select_title, NULL, "bold");
itr = list_iterator_create(
(List)slurm_ctl_conf_ptr->select_conf_key_pairs);
while((key_pair = list_next(itr))) {
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
key_pair->name, key_pair->value);
}
list_iterator_destroy(itr);
@@ -284,7 +284,7 @@ extern void create_config_popup(GtkAction *action, gpointer user_data)
GTK_RESPONSE_OK,
NULL);
int error_code;
- GtkTreeStore *treestore =
+ GtkTreeStore *treestore =
_local_create_treestore_2cols(popup, 600, 400);
static slurm_ctl_conf_info_msg_t *old_slurm_ctl_conf_ptr = NULL;
slurm_ctl_conf_info_msg_t *slurm_ctl_conf_ptr = NULL;
@@ -293,8 +293,8 @@ extern void create_config_popup(GtkAction *action, gpointer user_data)
G_CALLBACK(_delete_popup), NULL);
g_signal_connect(G_OBJECT(popup), "response",
G_CALLBACK(_delete_popup), NULL);
-
-
+
+
if (old_slurm_ctl_conf_ptr) {
error_code = slurm_load_ctl_conf(
old_slurm_ctl_conf_ptr->last_update,
@@ -307,12 +307,12 @@ extern void create_config_popup(GtkAction *action, gpointer user_data)
}
}
else
- error_code = slurm_load_ctl_conf((time_t) NULL,
+ error_code = slurm_load_ctl_conf((time_t) NULL,
&slurm_ctl_conf_ptr);
_layout_ctl_conf(treestore, slurm_ctl_conf_ptr);
-
-
+
+
gtk_widget_show_all(popup);
return;
@@ -327,19 +327,19 @@ extern void create_daemon_popup(GtkAction *action, gpointer user_data)
GTK_STOCK_CLOSE,
GTK_RESPONSE_OK,
NULL);
-
+
int update = 0;
slurm_ctl_conf_info_msg_t *conf;
char me[MAX_SLURM_NAME], *b, *c, *n;
int actld = 0, ctld = 0, d = 0;
- GtkTreeStore *treestore =
+ GtkTreeStore *treestore =
_local_create_treestore_2cols(popup, 300, 100);
GtkTreeIter iter;
g_signal_connect(G_OBJECT(popup), "delete_event",
G_CALLBACK(_delete_popup), NULL);
g_signal_connect(G_OBJECT(popup), "response",
G_CALLBACK(_delete_popup), NULL);
-
+
slurm_conf_init(NULL);
conf = slurm_conf_lock();
@@ -368,15 +368,15 @@ extern void create_daemon_popup(GtkAction *action, gpointer user_data)
xfree(n);
}
if (actld && ctld)
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
"Slurmctld", "1");
if (actld && d)
add_display_treestore_line(update, treestore, &iter,
"Slurmd", "1");
-
+
gtk_widget_show_all(popup);
-
+
return;
}
@@ -387,8 +387,8 @@ extern void create_search_popup(GtkAction *action, gpointer user_data)
GTK_WINDOW(user_data),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
NULL);
-
- int response = 0;
+
+ int response = 0;
GtkWidget *label = NULL;
GtkWidget *entry = NULL;
GtkTreeModel *model = NULL;
@@ -399,13 +399,13 @@ extern void create_search_popup(GtkAction *action, gpointer user_data)
sview_search_info.gchar_data = NULL;
sview_search_info.int_data = NO_VAL;
sview_search_info.int_data2 = NO_VAL;
-
+
label = gtk_dialog_add_button(GTK_DIALOG(popup),
GTK_STOCK_OK, GTK_RESPONSE_OK);
gtk_window_set_default(GTK_WINDOW(popup), label);
gtk_dialog_add_button(GTK_DIALOG(popup),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-
+
if(!strcmp(name, "jobid")) {
sview_search_info.search_type = SEARCH_JOB_ID;
entry = create_entry();
@@ -426,7 +426,7 @@ extern void create_search_popup(GtkAction *action, gpointer user_data)
{G_TYPE_NONE, JOB_NODE_FAIL, "Node Failure", TRUE, -1},
{G_TYPE_NONE, -1, NULL, FALSE, -1}
};
-
+
sview_search_info.search_type = SEARCH_JOB_STATE;
entry = create_pulldown_combo(pulldown_display_data, PAGE_CNT);
label = gtk_label_new("Which state?");
@@ -440,13 +440,13 @@ extern void create_search_popup(GtkAction *action, gpointer user_data)
{G_TYPE_NONE, 1, "Up", TRUE, -1},
{G_TYPE_NONE, -1, NULL, FALSE, -1}
};
-
+
sview_search_info.search_type = SEARCH_PARTITION_STATE;
entry = create_pulldown_combo(pulldown_display_data, PAGE_CNT);
label = gtk_label_new("Which state?");
} else if(!strcmp(name, "node_name")) {
sview_search_info.search_type = SEARCH_NODE_NAME;
- entry = create_entry();
+ entry = create_entry();
#ifdef HAVE_BG
label = gtk_label_new("Which base partition(s)?\n"
"(ranged or comma separated)");
@@ -472,7 +472,7 @@ extern void create_search_popup(GtkAction *action, gpointer user_data)
sview_search_info.search_type = SEARCH_NODE_STATE;
entry = create_pulldown_combo(pulldown_display_data, PAGE_CNT);
label = gtk_label_new("Which state?");
- }
+ }
#ifdef HAVE_BG
else if(!strcmp(name, "bg_block_name")) {
sview_search_info.search_type = SEARCH_BLOCK_NAME;
@@ -513,11 +513,11 @@ extern void create_search_popup(GtkAction *action, gpointer user_data)
goto end_it;
}
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
label, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
entry, FALSE, FALSE, 0);
-
+
gtk_widget_show_all(popup);
response = gtk_dialog_run (GTK_DIALOG(popup));
@@ -540,7 +540,7 @@ extern void create_search_popup(GtkAction *action, gpointer user_data)
g_print("nothing selected\n");
return;
}
-
+
gtk_tree_model_get(model, &iter, 0,
&sview_search_info.int_data, -1);
break;
@@ -555,15 +555,15 @@ extern void create_search_popup(GtkAction *action, gpointer user_data)
g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
break;
default:
-
+
break;
}
-
+
_search_entry(&sview_search_info);
}
end_it:
gtk_widget_destroy(popup);
-
+
return;
}
@@ -575,7 +575,7 @@ extern void change_refresh_popup(GtkAction *action, gpointer user_data)
1, 10000,
5, 60,
1);
- GtkWidget *spin_button =
+ GtkWidget *spin_button =
gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 1, 0);
GtkWidget *popup = gtk_dialog_new_with_buttons(
"Refresh Interval",
@@ -595,39 +595,39 @@ extern void change_refresh_popup(GtkAction *action, gpointer user_data)
label = gtk_label_new("Interval in Seconds ");
gtk_container_set_border_width(GTK_CONTAINER(table), 10);
-
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
+
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
table, FALSE, FALSE, 0);
-
- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
+
+ gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
gtk_table_attach_defaults(GTK_TABLE(table), spin_button, 1, 2, 0, 1);
-
+
gtk_widget_show_all(popup);
response = gtk_dialog_run (GTK_DIALOG(popup));
if (response == GTK_RESPONSE_OK)
{
- global_sleep_time =
+ global_sleep_time =
gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON(spin_button));
temp = g_strdup_printf("Refresh Interval set to %d seconds.",
global_sleep_time);
- gtk_statusbar_pop(GTK_STATUSBAR(main_statusbar),
+ gtk_statusbar_pop(GTK_STATUSBAR(main_statusbar),
STATUS_REFRESH);
- response = gtk_statusbar_push(GTK_STATUSBAR(main_statusbar),
+ response = gtk_statusbar_push(GTK_STATUSBAR(main_statusbar),
STATUS_REFRESH,
temp);
g_free(temp);
if (!g_thread_create(_refresh_thr, GINT_TO_POINTER(response),
FALSE, &error))
{
- g_printerr ("Failed to create refresh thread: %s\n",
+ g_printerr ("Failed to create refresh thread: %s\n",
error->message);
}
}
gtk_widget_destroy(popup);
-
+
return;
}
diff --git a/src/sview/resv_info.c b/src/sview/resv_info.c
index 03bfbb0384a3d0c359d7510e600a9171dd61f31c..a54f07ff59ea3fc26eda462970683231098af7a5 100644
--- a/src/sview/resv_info.c
+++ b/src/sview/resv_info.c
@@ -1,26 +1,26 @@
/*****************************************************************************\
- * resv_info.c - Functions related to advanced reservation display
+ * resv_info.c - Functions related to advanced reservation display
* mode of sview.
*****************************************************************************
* Copyright (C) 2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette@llnl.gov>
- * CODE-OCEC-09-009. All rights reserved.
- *
+ * CODE-OCEC-09-009. All rights reserved.
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -29,7 +29,7 @@
#include "src/common/uid.h"
#include "src/sview/sview.h"
#include "src/common/parse_time.h"
-
+
#define _DEBUG 0
/* Collection of data for printing reports. Like data is combined here */
@@ -38,13 +38,13 @@ typedef struct {
reserve_info_t *resv_ptr;
} sview_resv_info_t;
-enum {
+enum {
EDIT_REMOVE = 1,
EDIT_EDIT
};
/* These need to be in alpha order (except POS and CNT) */
-enum {
+enum {
SORTID_POS = POS_LOC,
SORTID_ACCOUNTS,
SORTID_ACTION,
@@ -66,39 +66,39 @@ enum {
/* extra field here is for choosing the type of edit you that will
* take place. If you choose EDIT_MODEL (means only display a set of
- * known options) create it in function create_model_*.
+ * known options) create it in function create_model_*.
*/
static display_data_t display_data_resv[] = {
- {G_TYPE_INT, SORTID_POS, NULL, FALSE, EDIT_NONE,
+ {G_TYPE_INT, SORTID_POS, NULL, FALSE, EDIT_NONE,
refresh_resv, create_model_resv, admin_edit_resv},
- {G_TYPE_STRING, SORTID_NAME, "Name", TRUE, EDIT_NONE,
+ {G_TYPE_STRING, SORTID_NAME, "Name", TRUE, EDIT_NONE,
refresh_resv, create_model_resv, admin_edit_resv},
{G_TYPE_STRING, SORTID_COLOR, NULL, TRUE, EDIT_NONE,
refresh_resv, create_model_resv, admin_edit_resv},
{G_TYPE_STRING, SORTID_ACTION, "Action", FALSE, EDIT_MODEL,
refresh_resv, create_model_resv, admin_edit_resv},
- {G_TYPE_STRING, SORTID_NODE_CNT, "Node Count", TRUE, EDIT_TEXTBOX,
+ {G_TYPE_STRING, SORTID_NODE_CNT, "Node Count", TRUE, EDIT_TEXTBOX,
refresh_resv, create_model_resv, admin_edit_resv},
- {G_TYPE_STRING, SORTID_NODE_LIST, "NodeList", TRUE, EDIT_TEXTBOX,
+ {G_TYPE_STRING, SORTID_NODE_LIST, "NodeList", TRUE, EDIT_TEXTBOX,
refresh_resv, create_model_resv, admin_edit_resv},
- {G_TYPE_STRING, SORTID_TIME_START, "Time Start", TRUE, EDIT_TEXTBOX,
+ {G_TYPE_STRING, SORTID_TIME_START, "Time Start", TRUE, EDIT_TEXTBOX,
refresh_resv, create_model_resv, admin_edit_resv},
- {G_TYPE_STRING, SORTID_TIME_END, "Time End", TRUE, EDIT_TEXTBOX,
+ {G_TYPE_STRING, SORTID_TIME_END, "Time End", TRUE, EDIT_TEXTBOX,
refresh_resv, create_model_resv, admin_edit_resv},
- {G_TYPE_STRING, SORTID_DURATION, "Duration", FALSE, EDIT_TEXTBOX,
+ {G_TYPE_STRING, SORTID_DURATION, "Duration", FALSE, EDIT_TEXTBOX,
refresh_resv, create_model_resv, admin_edit_resv},
- {G_TYPE_STRING, SORTID_ACCOUNTS, "Accounts", FALSE, EDIT_TEXTBOX,
+ {G_TYPE_STRING, SORTID_ACCOUNTS, "Accounts", FALSE, EDIT_TEXTBOX,
refresh_resv, create_model_resv, admin_edit_resv},
- {G_TYPE_STRING, SORTID_USERS, "Users", FALSE, EDIT_TEXTBOX,
+ {G_TYPE_STRING, SORTID_USERS, "Users", FALSE, EDIT_TEXTBOX,
refresh_resv, create_model_resv, admin_edit_resv},
- {G_TYPE_STRING, SORTID_PARTITION, "Partition", FALSE, EDIT_TEXTBOX,
+ {G_TYPE_STRING, SORTID_PARTITION, "Partition", FALSE, EDIT_TEXTBOX,
refresh_resv, create_model_resv, admin_edit_resv},
- {G_TYPE_STRING, SORTID_FEATURES, "Features", FALSE, EDIT_TEXTBOX,
+ {G_TYPE_STRING, SORTID_FEATURES, "Features", FALSE, EDIT_TEXTBOX,
refresh_resv, create_model_resv, admin_edit_resv},
- {G_TYPE_STRING, SORTID_FLAGS, "Flags", FALSE, EDIT_NONE,
+ {G_TYPE_STRING, SORTID_FLAGS, "Flags", FALSE, EDIT_NONE,
refresh_resv, create_model_resv, admin_edit_resv},
- {G_TYPE_POINTER, SORTID_NODE_INX, NULL, FALSE, EDIT_NONE,
+ {G_TYPE_POINTER, SORTID_NODE_INX, NULL, FALSE, EDIT_NONE,
refresh_resv, create_model_resv, admin_edit_resv},
{G_TYPE_INT, SORTID_UPDATED, NULL, FALSE, EDIT_NONE,
refresh_resv, create_model_resv, admin_edit_resv},
@@ -128,7 +128,7 @@ static char *got_edit_signal = NULL;
/*
* _parse_flags is used to parse the Flags= option. It handles
- * daily, weekly, and maint, optionally preceded by + or -,
+ * daily, weekly, and maint, optionally preceded by + or -,
* separated by a comma but no spaces.
*/
static uint32_t _parse_flags(const char *flagstr)
@@ -154,30 +154,30 @@ static uint32_t _parse_flags(const char *flagstr)
curr += taglen;
if (flip)
outflags |= RESERVE_FLAG_NO_MAINT;
- else
+ else
outflags |= RESERVE_FLAG_MAINT;
- } else if ((strncasecmp(curr, "Overlap",MAX(taglen,1))
+ } else if ((strncasecmp(curr, "Overlap",MAX(taglen,1))
== 0) && (!flip)) {
curr += taglen;
outflags |= RESERVE_FLAG_OVERLAP;
- } else if (strncasecmp(curr, "Ignore_Jobs", MAX(taglen,1))
+ } else if (strncasecmp(curr, "Ignore_Jobs", MAX(taglen,1))
== 0) {
curr += taglen;
if (flip)
outflags |= RESERVE_FLAG_NO_IGN_JOB;
- else
+ else
outflags |= RESERVE_FLAG_IGN_JOBS;
} else if (strncasecmp(curr, "Daily", MAX(taglen,1)) == 0) {
curr += taglen;
if (flip)
outflags |= RESERVE_FLAG_NO_DAILY;
- else
+ else
outflags |= RESERVE_FLAG_DAILY;
} else if (strncasecmp(curr, "Weekly", MAX(taglen,1)) == 0) {
curr += taglen;
if (flip)
outflags |= RESERVE_FLAG_NO_WEEKLY;
- else
+ else
outflags |= RESERVE_FLAG_WEEKLY;
} else {
char *temp = g_strdup_printf("Error parsing flags %s.",
@@ -188,13 +188,13 @@ static uint32_t _parse_flags(const char *flagstr)
break;
}
- if (*curr == ',')
+ if (*curr == ',')
curr++;
}
return outflags;
}
-static void _set_active_combo_resv(GtkComboBox *combo,
+static void _set_active_combo_resv(GtkComboBox *combo,
GtkTreeModel *model, GtkTreeIter *iter,
int type)
{
@@ -210,9 +210,9 @@ static void _set_active_combo_resv(GtkComboBox *combo,
action = 0;
else if(!strcmp(temp_char, "remove"))
action = 1;
- else
+ else
action = 0;
-
+
break;
default:
break;
@@ -220,7 +220,7 @@ static void _set_active_combo_resv(GtkComboBox *combo,
g_free(temp_char);
end_it:
gtk_combo_box_set_active(combo, action);
-
+
}
/* don't free this char */
@@ -231,15 +231,15 @@ static const char *_set_resv_msg(resv_desc_msg_t *resv_msg,
char *type = NULL;
int temp_int = 0;
uint32_t f;
-
+
/* need to clear errno here (just in case) */
errno = 0;
if(!resv_msg)
return NULL;
-
+
switch(column) {
- case SORTID_ACCOUNTS:
+ case SORTID_ACCOUNTS:
resv_msg->accounts = xstrdup(new_text);
type = "accounts";
break;
@@ -268,7 +268,7 @@ static const char *_set_resv_msg(resv_desc_msg_t *resv_msg,
case SORTID_FLAGS:
f = _parse_flags(new_text);
type = "flags";
- if(f == (uint32_t)NO_VAL)
+ if(f == (uint32_t)NO_VAL)
goto return_error;
resv_msg->flags = f;
break;
@@ -278,7 +278,7 @@ static const char *_set_resv_msg(resv_desc_msg_t *resv_msg,
break;
case SORTID_NODE_CNT:
temp_int = strtol(new_text, (char **)NULL, 10);
-
+
type = "Node Count";
if(temp_int <= 0)
goto return_error;
@@ -296,7 +296,7 @@ static const char *_set_resv_msg(resv_desc_msg_t *resv_msg,
resv_msg->start_time = parse_time((char *)new_text, 0);
type = "start time";
break;
- case SORTID_USERS:
+ case SORTID_USERS:
resv_msg->users = xstrdup(new_text);
type = "users";
break;
@@ -328,7 +328,7 @@ static void _admin_edit_combo_box_resv(GtkComboBox *combo,
GtkTreeIter iter;
int column = 0;
char *name = NULL;
-
+
if(!resv_msg)
return;
@@ -353,18 +353,18 @@ static void _admin_edit_combo_box_resv(GtkComboBox *combo,
static gboolean _admin_focus_out_resv(GtkEntry *entry,
- GdkEventFocus *event,
+ GdkEventFocus *event,
resv_desc_msg_t *resv_msg)
{
int type = gtk_entry_get_max_length(entry);
const char *name = gtk_entry_get_text(entry);
type -= DEFAULT_ENTRY_LENGTH;
_set_resv_msg(resv_msg, name, type);
-
+
return false;
}
-static GtkWidget *_admin_full_edit_resv(resv_desc_msg_t *resv_msg,
+static GtkWidget *_admin_full_edit_resv(resv_desc_msg_t *resv_msg,
GtkTreeModel *model, GtkTreeIter *iter)
{
GtkScrolledWindow *window = create_scrolled_window();
@@ -382,8 +382,8 @@ static GtkWidget *_admin_full_edit_resv(resv_desc_msg_t *resv_msg,
bin = GTK_BIN(&view->bin);
table = GTK_TABLE(bin->child);
gtk_table_resize(table, SORTID_CNT, 2);
-
- gtk_table_set_homogeneous(table, FALSE);
+
+ gtk_table_set_homogeneous(table, FALSE);
for(i = 0; i < SORTID_CNT; i++) {
while(display_data++) {
@@ -394,7 +394,7 @@ static GtkWidget *_admin_full_edit_resv(resv_desc_msg_t *resv_msg,
if(display_data->id != i)
continue;
display_admin_edit(
- table, resv_msg, &row, model, iter,
+ table, resv_msg, &row, model, iter,
display_data,
G_CALLBACK(_admin_edit_combo_box_resv),
G_CALLBACK(_admin_focus_out_resv),
@@ -404,11 +404,11 @@ static GtkWidget *_admin_full_edit_resv(resv_desc_msg_t *resv_msg,
display_data = display_data_resv;
}
gtk_table_resize(table, row, 2);
-
+
return GTK_WIDGET(window);
}
-static void _layout_resv_record(GtkTreeView *treeview,
+static void _layout_resv_record(GtkTreeView *treeview,
sview_resv_info_t *sview_resv_info,
int update)
{
@@ -417,10 +417,10 @@ static void _layout_resv_record(GtkTreeView *treeview,
reserve_info_t *resv_ptr = sview_resv_info->resv_ptr;
char *temp_char = NULL;
- GtkTreeStore *treestore =
+ GtkTreeStore *treestore =
GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-
- add_display_treestore_line(update, treestore, &iter,
+
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_resv,
SORTID_ACCOUNTS),
resv_ptr->accounts);
@@ -428,67 +428,67 @@ static void _layout_resv_record(GtkTreeView *treeview,
secs2time_str((uint32_t)difftime(resv_ptr->end_time,
resv_ptr->start_time),
time_buf, sizeof(time_buf));
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_resv,
- SORTID_DURATION),
+ SORTID_DURATION),
time_buf);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_resv,
SORTID_FEATURES),
resv_ptr->features);
temp_char = reservation_flags_string(resv_ptr->flags);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_resv,
SORTID_FLAGS),
temp_char);
xfree(temp_char);
- convert_num_unit((float)resv_ptr->node_cnt,
+ convert_num_unit((float)resv_ptr->node_cnt,
time_buf, sizeof(time_buf), UNIT_NONE);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_resv,
- SORTID_NODE_CNT),
+ SORTID_NODE_CNT),
time_buf);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_resv,
SORTID_NODE_LIST),
resv_ptr->node_list);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_resv,
SORTID_PARTITION),
resv_ptr->partition);
slurm_make_time_str((time_t *)&resv_ptr->end_time, time_buf,
sizeof(time_buf));
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_resv,
- SORTID_TIME_END),
+ SORTID_TIME_END),
time_buf);
slurm_make_time_str((time_t *)&resv_ptr->start_time, time_buf,
sizeof(time_buf));
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_resv,
- SORTID_TIME_START),
+ SORTID_TIME_START),
time_buf);
- add_display_treestore_line(update, treestore, &iter,
+ add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_resv,
SORTID_USERS),
resv_ptr->users);
}
-static void _update_resv_record(sview_resv_info_t *sview_resv_info_ptr,
+static void _update_resv_record(sview_resv_info_t *sview_resv_info_ptr,
GtkTreeStore *treestore,
GtkTreeIter *iter)
{
char *tmp_ptr = NULL;
char tmp_char[50];
reserve_info_t *resv_ptr = sview_resv_info_ptr->resv_ptr;
-
+
gtk_tree_store_set(treestore, iter, SORTID_COLOR,
sview_colors[sview_resv_info_ptr->color_inx], -1);
gtk_tree_store_set(treestore, iter, SORTID_UPDATED, 1, -1);
@@ -496,8 +496,8 @@ static void _update_resv_record(sview_resv_info_t *sview_resv_info_ptr,
gtk_tree_store_set(treestore, iter,
SORTID_ACCOUNTS, resv_ptr->accounts, -1);
- secs2time_str((uint32_t)difftime(resv_ptr->end_time,
- resv_ptr->start_time),
+ secs2time_str((uint32_t)difftime(resv_ptr->end_time,
+ resv_ptr->start_time),
tmp_char, sizeof(tmp_char));
gtk_tree_store_set(treestore, iter, SORTID_DURATION, tmp_char, -1);
@@ -517,16 +517,16 @@ static void _update_resv_record(sview_resv_info_t *sview_resv_info_ptr,
convert_num_unit((float)resv_ptr->node_cnt,
tmp_char, sizeof(tmp_char), UNIT_NONE);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_NODE_CNT, tmp_char, -1);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_NODE_LIST, resv_ptr->node_list, -1);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_NODE_INX, resv_ptr->node_inx, -1);
- gtk_tree_store_set(treestore, iter,
+ gtk_tree_store_set(treestore, iter,
SORTID_PARTITION, resv_ptr->partition, -1);
slurm_make_time_str((time_t *)&resv_ptr->start_time, tmp_char,
@@ -535,20 +535,20 @@ static void _update_resv_record(sview_resv_info_t *sview_resv_info_ptr,
gtk_tree_store_set(treestore, iter,
SORTID_USERS, resv_ptr->users, -1);
-
+
return;
}
-static void _append_resv_record(sview_resv_info_t *sview_resv_info_ptr,
+static void _append_resv_record(sview_resv_info_t *sview_resv_info_ptr,
GtkTreeStore *treestore, GtkTreeIter *iter,
int line)
{
gtk_tree_store_append(treestore, iter, NULL);
gtk_tree_store_set(treestore, iter, SORTID_POS, line, -1);
- _update_resv_record(sview_resv_info_ptr, treestore, iter);
+ _update_resv_record(sview_resv_info_ptr, treestore, iter);
}
-static void _update_info_resv(List info_list,
+static void _update_info_resv(List info_list,
GtkTreeView *tree_view)
{
GtkTreePath *path = gtk_tree_path_new_first();
@@ -564,8 +564,8 @@ static void _update_info_resv(List info_list,
if (gtk_tree_model_get_iter(model, &iter, path)) {
/* make sure all the reserves are still here */
while(1) {
- gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
- SORTID_UPDATED, 0, -1);
+ gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
+ SORTID_UPDATED, 0, -1);
if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
@@ -578,18 +578,18 @@ static void _update_info_resv(List info_list,
/* get the iter, or find out the list is empty goto add */
if (!gtk_tree_model_get_iter(model, &iter, path)) {
goto adding;
- }
+ }
line = 0;
while(1) {
- /* search for the jobid and check to see if
+ /* search for the jobid and check to see if
it is in the list */
- gtk_tree_model_get(model, &iter, SORTID_NAME,
+ gtk_tree_model_get(model, &iter, SORTID_NAME,
&resv_name, -1);
if(!strcmp(resv_name, resv_ptr->name)) {
/* update with new info */
g_free(resv_name);
- _update_resv_record(sview_resv_info,
- GTK_TREE_STORE(model),
+ _update_resv_record(sview_resv_info,
+ GTK_TREE_STORE(model),
&iter);
goto found;
}
@@ -601,7 +601,7 @@ static void _update_info_resv(List info_list,
}
}
adding:
- _append_resv_record(sview_resv_info, GTK_TREE_STORE(model),
+ _append_resv_record(sview_resv_info, GTK_TREE_STORE(model),
&iter, line);
found:
;
@@ -628,7 +628,7 @@ static int _sview_resv_sort_aval_dec(sview_resv_info_t* rec_a,
return 1;
if(rec_a->resv_ptr->node_list && rec_b->resv_ptr->node_list) {
- size_a = strcmp(rec_a->resv_ptr->node_list,
+ size_a = strcmp(rec_a->resv_ptr->node_list,
rec_b->resv_ptr->node_list);
if (size_a < 0)
return -1;
@@ -646,10 +646,10 @@ static List _create_resv_info_list(reserve_info_msg_t *resv_info_ptr,
sview_resv_info_t *sview_resv_info_ptr = NULL;
reserve_info_t *resv_ptr = NULL;
- if(!changed && info_list)
+ if(!changed && info_list)
goto update_color;
-
- if(info_list)
+
+ if(info_list)
list_flush(info_list);
else
info_list = list_create(_resv_info_list_del);
@@ -658,7 +658,7 @@ static List _create_resv_info_list(reserve_info_msg_t *resv_info_ptr,
g_print("malloc error\n");
return NULL;
}
-
+
for(i=0; i<resv_info_ptr->record_count; i++) {
resv_ptr = &(resv_info_ptr->reservation_array[i]);
sview_resv_info_ptr = xmalloc(sizeof(sview_resv_info_t));
@@ -695,7 +695,7 @@ need_refresh:
if(!spec_info->display_widget) {
treeview = create_treeview_2cols_attach_to_table(
popup_win->table);
- spec_info->display_widget =
+ spec_info->display_widget =
gtk_widget_ref(GTK_WIDGET(treeview));
} else {
treeview = GTK_TREE_VIEW(spec_info->display_widget);
@@ -712,7 +712,7 @@ need_refresh:
change_grid_color(
popup_win->grid_button_list,
resv_ptr->node_inx[j],
- resv_ptr->node_inx[j+1],
+ resv_ptr->node_inx[j+1],
sview_resv_info->color_inx,
true, 0);
j += 2;
@@ -726,31 +726,31 @@ need_refresh:
post_setup_popup_grid_list(popup_win);
if(!found) {
- if(!popup_win->not_found) {
+ if(!popup_win->not_found) {
char *temp = "RESERVATION DOESN'T EXSIST\n";
GtkTreeIter iter;
GtkTreeModel *model = NULL;
-
+
/* only time this will be run so no update */
model = gtk_tree_view_get_model(treeview);
- add_display_treestore_line(0,
- GTK_TREE_STORE(model),
+ add_display_treestore_line(0,
+ GTK_TREE_STORE(model),
&iter,
temp, "");
}
popup_win->not_found = true;
} else {
- if(popup_win->not_found) {
+ if(popup_win->not_found) {
popup_win->not_found = false;
gtk_widget_destroy(spec_info->display_widget);
-
+
goto need_refresh;
}
}
gtk_widget_show(spec_info->display_widget);
-
+
finished:
-
+
return;
}
@@ -764,7 +764,7 @@ extern void refresh_resv(GtkAction *action, gpointer user_data)
specific_info_resv(popup_win);
}
-extern int get_new_info_resv(reserve_info_msg_t **info_ptr,
+extern int get_new_info_resv(reserve_info_msg_t **info_ptr,
int force)
{
static reserve_info_msg_t *resv_info_ptr = NULL, *new_resv_ptr = NULL;
@@ -772,12 +772,12 @@ extern int get_new_info_resv(reserve_info_msg_t **info_ptr,
time_t now = time(NULL);
static time_t last;
static bool changed = 0;
-
+
if(!force && ((now - last) < global_sleep_time)) {
- if(*info_ptr != resv_info_ptr)
+ if(*info_ptr != resv_info_ptr)
error_code = SLURM_SUCCESS;
*info_ptr = resv_info_ptr;
- if(changed)
+ if(changed)
return SLURM_SUCCESS;
return error_code;
}
@@ -794,14 +794,14 @@ extern int get_new_info_resv(reserve_info_msg_t **info_ptr,
changed = 0;
}
} else {
- error_code = slurm_load_reservations((time_t) NULL,
+ error_code = slurm_load_reservations((time_t) NULL,
&new_resv_ptr);
changed = 1;
}
resv_info_ptr = new_resv_ptr;
- if(*info_ptr != resv_info_ptr)
+ if(*info_ptr != resv_info_ptr)
error_code = SLURM_SUCCESS;
*info_ptr = new_resv_ptr;
@@ -820,12 +820,12 @@ extern GtkListStore *create_model_resv(int type)
gtk_list_store_set(model, &iter,
1, SORTID_ACTION,
0, "None",
- -1);
+ -1);
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
1, SORTID_ACTION,
0, "Remove",
- -1);
+ -1);
break;
default:
break;
@@ -842,31 +842,31 @@ extern void admin_edit_resv(GtkCellRendererText *cell,
GtkTreePath *path = gtk_tree_path_new_from_string(path_string);
GtkTreeIter iter;
resv_desc_msg_t *resv_msg = xmalloc(sizeof(resv_desc_msg_t));
-
+
char *temp = NULL;
char *old_text = NULL;
const char *type = NULL;
-
- int column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell),
+
+ int column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell),
"column"));
if(!new_text || !strcmp(new_text, ""))
goto no_input;
-
+
gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path);
- slurm_init_resv_desc_msg(resv_msg);
- gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter,
- SORTID_NAME, &temp,
+ slurm_init_resv_desc_msg(resv_msg);
+ gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter,
+ SORTID_NAME, &temp,
column, &old_text,
-1);
resv_msg->name = xstrdup(temp);
g_free(temp);
type = _set_resv_msg(resv_msg, new_text, column);
- if(errno)
+ if(errno)
goto print_error;
-
+
if(got_edit_signal) {
temp = got_edit_signal;
got_edit_signal = NULL;
@@ -874,7 +874,7 @@ extern void admin_edit_resv(GtkCellRendererText *cell,
xfree(temp);
goto no_input;
}
-
+
if(old_text && !strcmp(old_text, new_text)) {
temp = g_strdup_printf("No change in value.");
} else if(slurm_update_reservation(resv_msg) == SLURM_SUCCESS) {
@@ -895,13 +895,13 @@ extern void admin_edit_resv(GtkCellRendererText *cell,
type,
new_text);
}
-
+
display_edit_note(temp);
g_free(temp);
no_input:
slurm_free_resv_desc_msg(resv_msg);
-
+
gtk_tree_path_free (path);
g_free(old_text);
g_static_mutex_unlock(&sview_mutex);
@@ -923,7 +923,7 @@ extern void get_info_resv(GtkTable *table, display_data_t *display_data)
sview_resv_info_t *sview_resv_info_ptr = NULL;
reserve_info_t *resv_ptr = NULL;
time_t now = time(NULL);
-
+
if(display_data)
local_display_data = display_data;
if(!table) {
@@ -948,8 +948,8 @@ extern void get_info_resv(GtkTable *table, display_data_t *display_data)
sprintf(error_char, "slurm_load_reservations: %s",
slurm_strerror(slurm_get_errno()));
label = gtk_label_new(error_char);
- gtk_table_attach_defaults(table, label, 0, 1, 0, 1);
- gtk_widget_show(label);
+ gtk_table_attach_defaults(table, label, 0, 1, 0, 1);
+ gtk_widget_show(label);
display_widget = gtk_widget_ref(GTK_WIDGET(label));
goto end_it;
}
@@ -994,8 +994,8 @@ display_it:
gtk_table_attach_defaults(table,
GTK_WIDGET(tree_view),
0, 1, 0, 1);
- /* since this function sets the model of the tree_view
- to the treestore we don't really care about
+ /* since this function sets the model of the tree_view
+ to the treestore we don't really care about
the return value */
create_treestore(tree_view, display_data_resv,
SORTID_CNT, SORTID_TIME_START, SORTID_COLOR);
@@ -1005,7 +1005,7 @@ display_it:
end_it:
toggled = FALSE;
force_refresh = FALSE;
-
+
return;
}
@@ -1026,7 +1026,7 @@ extern void specific_info_resv(popup_info_t *popup_win)
int j=0, i=-1;
hostset_t hostset = NULL;
ListIterator itr = NULL;
-
+
if(!spec_info->display_widget) {
setup_popup_info(popup_win, display_data_resv, SORTID_CNT);
}
@@ -1036,13 +1036,13 @@ extern void specific_info_resv(popup_info_t *popup_win)
spec_info->display_widget = NULL;
goto display_it;
}
-
- if((resv_error_code =
+
+ if((resv_error_code =
get_new_info_resv(&resv_info_ptr, popup_win->force_refresh))
- == SLURM_NO_CHANGE_IN_DATA) {
+ == SLURM_NO_CHANGE_IN_DATA) {
if(!spec_info->display_widget || spec_info->view == ERROR_VIEW)
goto display_it;
- changed = 0;
+ changed = 0;
} else if (resv_error_code != SLURM_SUCCESS) {
if(spec_info->view == ERROR_VIEW)
goto end_it;
@@ -1052,16 +1052,16 @@ extern void specific_info_resv(popup_info_t *popup_win)
sprintf(error_char, "get_new_info_resv: %s",
slurm_strerror(slurm_get_errno()));
label = gtk_label_new(error_char);
- gtk_table_attach_defaults(popup_win->table,
+ gtk_table_attach_defaults(popup_win->table,
label,
- 0, 1, 0, 1);
- gtk_widget_show(label);
+ 0, 1, 0, 1);
+ gtk_widget_show(label);
spec_info->display_widget = gtk_widget_ref(label);
goto end_it;
}
-
+
display_it:
-
+
resv_list = _create_resv_info_list(resv_info_ptr, changed);
if(!resv_list)
@@ -1074,13 +1074,13 @@ display_it:
if(spec_info->type != INFO_PAGE && !spec_info->display_widget) {
tree_view = create_treeview(local_display_data,
&popup_win->grid_button_list);
- spec_info->display_widget =
+ spec_info->display_widget =
gtk_widget_ref(GTK_WIDGET(tree_view));
- gtk_table_attach_defaults(popup_win->table,
+ gtk_table_attach_defaults(popup_win->table,
GTK_WIDGET(tree_view),
- 0, 1, 0, 1);
- /* since this function sets the model of the tree_view
- to the treestore we don't really care about
+ 0, 1, 0, 1);
+ /* since this function sets the model of the tree_view
+ to the treestore we don't really care about
the return value */
create_treestore(tree_view, popup_win->display_data,
SORTID_CNT, SORTID_TIME_START, SORTID_COLOR);
@@ -1096,30 +1096,30 @@ display_it:
/* just linking to another list, don't free the inside, just
the list */
- send_resv_list = list_create(NULL);
+ send_resv_list = list_create(NULL);
itr = list_iterator_create(resv_list);
i = -1;
while ((sview_resv_info_ptr = list_next(itr))) {
i++;
- resv_ptr = sview_resv_info_ptr->resv_ptr;
+ resv_ptr = sview_resv_info_ptr->resv_ptr;
switch(spec_info->type) {
case PART_PAGE:
case BLOCK_PAGE:
case NODE_PAGE:
if(!resv_ptr->node_list)
continue;
-
+
if(!(hostset = hostset_create(search_info->gchar_data)))
continue;
if(!hostset_intersects(hostset, resv_ptr->node_list)) {
hostset_destroy(hostset);
continue;
}
- hostset_destroy(hostset);
+ hostset_destroy(hostset);
break;
case JOB_PAGE:
- if(strcmp(resv_ptr->name,
- search_info->gchar_data))
+ if(strcmp(resv_ptr->name,
+ search_info->gchar_data))
continue;
break;
case RESV_PAGE:
@@ -1127,9 +1127,9 @@ display_it:
case SEARCH_RESERVATION_NAME:
if(!search_info->gchar_data)
continue;
-
- if(strcmp(resv_ptr->name,
- search_info->gchar_data))
+
+ if(strcmp(resv_ptr->name,
+ search_info->gchar_data))
continue;
break;
default:
@@ -1146,7 +1146,7 @@ display_it:
change_grid_color(
popup_win->grid_button_list,
resv_ptr->node_inx[j],
- resv_ptr->node_inx[j+1],
+ resv_ptr->node_inx[j+1],
sview_resv_info_ptr->color_inx,
true, 0);
j += 2;
@@ -1155,13 +1155,13 @@ display_it:
list_iterator_destroy(itr);
post_setup_popup_grid_list(popup_win);
- _update_info_resv(send_resv_list,
+ _update_info_resv(send_resv_list,
GTK_TREE_VIEW(spec_info->display_widget));
list_destroy(send_resv_list);
end_it:
popup_win->toggled = 0;
popup_win->force_refresh = 0;
-
+
return;
}
@@ -1189,8 +1189,8 @@ extern void set_menus_resv(void *arg, void *arg2, GtkTreePath *path, int type)
if (!gtk_tree_model_get_iter(model, &iter, path)) {
g_error("error getting iter from model\n");
break;
- }
-
+ }
+
popup_all_resv(model, &iter, INFO_PAGE);
break;
@@ -1211,7 +1211,7 @@ extern void popup_all_resv(GtkTreeModel *model, GtkTreeIter *iter, int id)
ListIterator itr = NULL;
popup_info_t *popup_win = NULL;
GError *error = NULL;
-
+
gtk_tree_model_get(model, iter, SORTID_NAME, &name, -1);
switch(id) {
@@ -1223,7 +1223,7 @@ extern void popup_all_resv(GtkTreeModel *model, GtkTreeIter *iter, int id)
break;
case NODE_PAGE:
#ifdef HAVE_BG
- snprintf(title, 100,
+ snprintf(title, 100,
"Base partitions(s) in reservation %s",
name);
#else
@@ -1231,25 +1231,25 @@ extern void popup_all_resv(GtkTreeModel *model, GtkTreeIter *iter, int id)
name);
#endif
break;
- case BLOCK_PAGE:
+ case BLOCK_PAGE:
snprintf(title, 100, "Block(s) in reservation %s", name);
break;
- case SUBMIT_PAGE:
+ case SUBMIT_PAGE:
snprintf(title, 100, "Submit job in reservation %s", name);
break;
- case INFO_PAGE:
+ case INFO_PAGE:
snprintf(title, 100, "Full info for reservation %s", name);
break;
default:
g_print("resv got %d\n", id);
}
-
+
itr = list_iterator_create(popup_list);
while((popup_win = list_next(itr))) {
if(popup_win->spec_info)
if(!strcmp(popup_win->spec_info->title, title)) {
break;
- }
+ }
}
list_iterator_destroy(itr);
@@ -1277,27 +1277,27 @@ extern void popup_all_resv(GtkTreeModel *model, GtkTreeIter *iter, int id)
popup_win->spec_info->search_info->gchar_data = name;
//specific_info_job(popup_win);
break;
- case BLOCK_PAGE:
+ case BLOCK_PAGE:
case NODE_PAGE:
case PART_PAGE:
g_free(name);
gtk_tree_model_get(model, iter, SORTID_NODE_LIST, &name, -1);
popup_win->spec_info->search_info->gchar_data = name;
- popup_win->spec_info->search_info->search_type =
+ popup_win->spec_info->search_info->search_type =
SEARCH_NODE_NAME;
//specific_info_node(popup_win);
break;
- case SUBMIT_PAGE:
+ case SUBMIT_PAGE:
break;
default:
g_print("resv got unknown type %d\n", id);
}
if (!g_thread_create((gpointer)popup_thr, popup_win, FALSE, &error))
{
- g_printerr ("Failed to create resv popup thread: %s\n",
+ g_printerr ("Failed to create resv popup thread: %s\n",
error->message);
return;
- }
+ }
}
extern void admin_resv(GtkTreeModel *model, GtkTreeIter *iter, char *type)
@@ -1308,7 +1308,7 @@ extern void admin_resv(GtkTreeModel *model, GtkTreeIter *iter, char *type)
char tmp_char[100];
char *temp = NULL;
int edit_type = 0;
- int response = 0;
+ int response = 0;
GtkWidget *label = NULL;
GtkWidget *entry = NULL;
GtkWidget *popup = gtk_dialog_new_with_buttons(
@@ -1322,9 +1322,9 @@ extern void admin_resv(GtkTreeModel *model, GtkTreeIter *iter, char *type)
slurm_init_resv_desc_msg(resv_msg);
memset(&resv_name_msg, 0, sizeof(reservation_name_msg_t));
-
+
resv_msg->name = xstrdup(resvid);
-
+
if(!strcasecmp("Remove", type)) {
resv_name_msg.name = resvid;
@@ -1333,8 +1333,8 @@ extern void admin_resv(GtkTreeModel *model, GtkTreeIter *iter, char *type)
gtk_window_set_default(GTK_WINDOW(popup), label);
gtk_dialog_add_button(GTK_DIALOG(popup),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-
- snprintf(tmp_char, sizeof(tmp_char),
+
+ snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to remove "
"reservation %s?",
resvid);
@@ -1348,7 +1348,7 @@ extern void admin_resv(GtkTreeModel *model, GtkTreeIter *iter, char *type)
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
gtk_window_set_default_size(GTK_WINDOW(popup), 200, 400);
- snprintf(tmp_char, sizeof(tmp_char),
+ snprintf(tmp_char, sizeof(tmp_char),
"Editing reservation %s think before you type",
resvid);
label = gtk_label_new(tmp_char);
@@ -1356,10 +1356,10 @@ extern void admin_resv(GtkTreeModel *model, GtkTreeIter *iter, char *type)
entry = _admin_full_edit_resv(resv_msg, model, iter);
}
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
label, FALSE, FALSE, 0);
if(entry)
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
entry, TRUE, TRUE, 0);
gtk_widget_show_all(popup);
response = gtk_dialog_run (GTK_DIALOG(popup));
@@ -1376,12 +1376,12 @@ extern void admin_resv(GtkTreeModel *model, GtkTreeIter *iter, char *type)
temp = g_strdup_printf(
"Problem removing reservation %s.",
resvid);
- }
+ }
display_edit_note(temp);
g_free(temp);
break;
case EDIT_EDIT:
- if(got_edit_signal)
+ if(got_edit_signal)
goto end_it;
if(slurm_update_reservation(resv_msg)
== SLURM_SUCCESS) {
@@ -1401,7 +1401,7 @@ extern void admin_resv(GtkTreeModel *model, GtkTreeIter *iter, char *type)
}
}
end_it:
-
+
g_free(resvid);
slurm_free_resv_desc_msg(resv_msg);
gtk_widget_destroy(popup);
@@ -1410,7 +1410,7 @@ end_it:
got_edit_signal = NULL;
admin_resv(model, iter, type);
xfree(type);
- }
+ }
return;
}
diff --git a/src/sview/submit_info.c b/src/sview/submit_info.c
index 7495a18c761f51a8314f318818319d4d99a1ccb6..088f28c8de8c89dcf615d51b2919cda648d12063 100644
--- a/src/sview/submit_info.c
+++ b/src/sview/submit_info.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * submit_info.c - Functions related to submit display
+ * submit_info.c - Functions related to submit display
* mode of sview.
*****************************************************************************
* Copyright (C) 2004-2006 The Regents of the University of California.
@@ -7,21 +7,21 @@
* Written by Danny Auble <da@llnl.gov>
*
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -31,13 +31,13 @@
#define _DEBUG 0
-enum {
+enum {
SORTID_POS = POS_LOC,
- SORTID_PARTITION,
- SORTID_AVAIL,
- SORTID_TIMELIMIT,
- SORTID_NODES,
- SORTID_NODELIST,
+ SORTID_PARTITION,
+ SORTID_AVAIL,
+ SORTID_TIMELIMIT,
+ SORTID_NODES,
+ SORTID_NODELIST,
SORTID_CNT
};
@@ -66,7 +66,7 @@ static display_data_t *local_display_data = NULL;
extern void get_info_submit(GtkTable *table, display_data_t *display_data)
{
- local_display_data = display_data;
+ local_display_data = display_data;
}
@@ -109,7 +109,7 @@ extern void row_clicked_submit(GtkTreeView *tree_view,
g_error("problem getting line number");
return;
}
-
+
/* part_ptr = &new_part_ptr->partition_array[line]; */
/* if(!(info = slurm_sprint_partition_info(part_ptr, 0))) { */
/* info = xmalloc(100); */
@@ -120,12 +120,12 @@ extern void row_clicked_submit(GtkTreeView *tree_view,
popup = gtk_dialog_new();
label = gtk_label_new(info);
- gtk_box_pack_end(GTK_BOX(GTK_DIALOG(popup)->vbox),
+ gtk_box_pack_end(GTK_BOX(GTK_DIALOG(popup)->vbox),
label, TRUE, TRUE, 0);
xfree(info);
gtk_widget_show(label);
-
+
gtk_widget_show(popup);
-
+
}
diff --git a/src/sview/sview.c b/src/sview/sview.c
index 8b36c55c9489e1daffa8ea4299753e165cc9bbdb..5722de5b688ce14912a888c36dd5dc1f9f27e9df 100644
--- a/src/sview/sview.c
+++ b/src/sview/sview.c
@@ -6,32 +6,32 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>, et. al.
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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
+ * 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
+ * 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
+ * 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.
@@ -72,36 +72,36 @@ int grid_speedup = 0;
display_data_t main_display_data[] = {
{G_TYPE_NONE, JOB_PAGE, "Jobs", TRUE, -1,
refresh_main, create_model_job, admin_edit_job,
- get_info_job, specific_info_job,
+ get_info_job, specific_info_job,
set_menus_job, NULL},
{G_TYPE_NONE, STEP_PAGE, NULL, FALSE, -1,
refresh_main, NULL, NULL, NULL,
NULL, NULL, NULL},
- {G_TYPE_NONE, PART_PAGE, "Partitions", TRUE, -1,
+ {G_TYPE_NONE, PART_PAGE, "Partitions", TRUE, -1,
refresh_main, create_model_part, admin_edit_part,
- get_info_part, specific_info_part,
+ get_info_part, specific_info_part,
set_menus_part, NULL},
- {G_TYPE_NONE, RESV_PAGE, "Reservations", TRUE, -1,
+ {G_TYPE_NONE, RESV_PAGE, "Reservations", TRUE, -1,
refresh_main, create_model_resv, admin_edit_resv,
- get_info_resv, specific_info_resv,
+ get_info_resv, specific_info_resv,
set_menus_resv, NULL},
#ifdef HAVE_BG
{G_TYPE_NONE, BLOCK_PAGE, "BG Blocks", TRUE, -1,
refresh_main, NULL, NULL,
- get_info_block, specific_info_block,
+ get_info_block, specific_info_block,
set_menus_block, NULL},
{G_TYPE_NONE, NODE_PAGE, "Base Partitions", FALSE, -1,
refresh_main, NULL, NULL,
- get_info_node, specific_info_node,
+ get_info_node, specific_info_node,
set_menus_node, NULL},
#else
{G_TYPE_NONE, BLOCK_PAGE, "BG Blocks", FALSE, -1,
refresh_main, NULL, NULL,
- get_info_block, specific_info_block,
+ get_info_block, specific_info_block,
set_menus_block, NULL},
{G_TYPE_NONE, NODE_PAGE, "Nodes", FALSE, -1,
refresh_main, NULL, NULL,
- get_info_node, specific_info_node,
+ get_info_node, specific_info_node,
set_menus_node, NULL},
#endif
{G_TYPE_NONE, SUBMIT_PAGE, "Submit Job", FALSE, -1,
@@ -124,18 +124,18 @@ void *_page_thr(void *arg)
bool reset_highlight = true;
/* DEF_TIMERS; */
xfree(page);
-
+
if(!grid_init) {
/* we need to signal any threads that are waiting */
g_mutex_lock(grid_mutex);
g_cond_signal(grid_cond);
g_mutex_unlock(grid_mutex);
-
+
/* wait for the grid to be inited */
g_mutex_lock(grid_mutex);
g_cond_wait(grid_cond, grid_mutex);
g_mutex_unlock(grid_mutex);
-
+
/* if the grid isn't there just return */
if(!grid_init)
return NULL;
@@ -144,7 +144,7 @@ void *_page_thr(void *arg)
thread_count++;
gdk_flush();
gdk_threads_leave();
- while(page_running[num]) {
+ while(page_running[num]) {
/* START_TIMER; */
g_static_mutex_lock(&sview_mutex);
gdk_threads_enter();
@@ -157,22 +157,22 @@ void *_page_thr(void *arg)
/* END_TIMER; */
/* g_print("got for initeration: %s\n", TIME_STR); */
sleep(global_sleep_time);
-
+
gdk_threads_enter();
if(thread_count > 1) {
gdk_flush();
- gdk_threads_leave();
+ gdk_threads_leave();
break;
}
gdk_flush();
gdk_threads_leave();
-
- }
+
+ }
gdk_threads_enter();
thread_count--;
gdk_flush();
gdk_threads_leave();
-
+
return NULL;
}
@@ -184,7 +184,7 @@ void *_grid_init_thr(void *arg)
GtkViewport *view = NULL;
GtkTable *table = NULL;
int rc = SLURM_SUCCESS;
-
+
while(!grid_init && !fini) {
gdk_threads_enter();
page = gtk_notebook_get_current_page(
@@ -200,17 +200,17 @@ void *_grid_init_thr(void *arg)
rc = get_system_stats(table);
gdk_flush();
gdk_threads_leave();
-
+
if(rc != SLURM_SUCCESS)
sleep(global_sleep_time);
else
grid_init = 1;
-
+
}
g_mutex_lock(grid_mutex);
g_cond_signal(grid_cond);
g_mutex_unlock(grid_mutex);
-
+
return NULL;
}
@@ -232,7 +232,7 @@ static void _page_switched(GtkNotebook *notebook,
page_thr_t *page_thr = NULL;
GError *error = NULL;
static int started_grid_init = 0;
-
+
/* make sure we aren't adding the page, and really asking for info */
if(adding)
return;
@@ -246,15 +246,15 @@ static void _page_switched(GtkNotebook *notebook,
}
started_grid_init = 1;
}
-
+
if(running != -1) {
page_running[running] = 0;
- }
-
+ }
+
for(i=0; i<PAGE_CNT; i++) {
if(main_display_data[i].id == -1)
break;
- else if(!main_display_data[i].show)
+ else if(!main_display_data[i].show)
continue;
if(main_display_data[i].extra == page_num)
break;
@@ -263,7 +263,7 @@ static void _page_switched(GtkNotebook *notebook,
if(main_display_data[i].extra != page_num) {
g_print("page %d not found\n", page_num);
return;
- }
+ }
if(main_display_data[i].get_info) {
running = i;
page_running[i] = 1;
@@ -273,13 +273,13 @@ static void _page_switched(GtkNotebook *notebook,
return;
}
- page_thr = xmalloc(sizeof(page_thr_t));
+ page_thr = xmalloc(sizeof(page_thr_t));
page_thr->page_num = i;
page_thr->table = table;
-
+
if (!g_thread_create(_page_thr, page_thr, FALSE, &error))
{
- g_printerr ("Failed to create page thread: %s\n",
+ g_printerr ("Failed to create page thread: %s\n",
error->message);
return;
}
@@ -292,22 +292,22 @@ static void _set_admin_mode(GtkToggleAction *action)
if(admin_mode) {
admin_mode = FALSE;
- gtk_statusbar_pop(GTK_STATUSBAR(main_statusbar),
+ gtk_statusbar_pop(GTK_STATUSBAR(main_statusbar),
STATUS_ADMIN_MODE);
} else {
admin_mode = TRUE;
- gtk_statusbar_push(GTK_STATUSBAR(main_statusbar),
+ gtk_statusbar_push(GTK_STATUSBAR(main_statusbar),
STATUS_ADMIN_MODE,
"Admin mode activated! "
"Think before you alter anything.");
}
- gtk_action_group_set_sensitive(admin_action_group, admin_mode);
+ gtk_action_group_set_sensitive(admin_action_group, admin_mode);
}
static void _set_grid(GtkToggleAction *action)
{
static bool open = TRUE;
-
+
if(open) {
gtk_widget_hide(grid_window);
open = FALSE;
@@ -315,7 +315,7 @@ static void _set_grid(GtkToggleAction *action)
gtk_widget_show(grid_window);
open = TRUE;
}
-
+
return;
}
@@ -336,7 +336,7 @@ static void _tab_pos(GtkRadioAction *action,
GtkRadioAction *extra,
GtkNotebook *notebook)
{
- gtk_notebook_set_tab_pos(notebook,
+ gtk_notebook_set_tab_pos(notebook,
gtk_radio_action_get_current_value(action));
}
@@ -431,65 +431,65 @@ static GtkWidget *_get_menubar_menu(GtkWidget *window, GtkWidget *notebook)
{"options", NULL, "_Options", "<alt>o"},
{"displays", NULL, "_Query", "<alt>q"},
{"search", GTK_STOCK_FIND, "Search", ""},
- {"jobid", NULL, "Job ID",
- "", "Search for jobid",
+ {"jobid", NULL, "Job ID",
+ "", "Search for jobid",
G_CALLBACK(create_search_popup)},
- {"user_jobs", NULL, "Specific User's Job(s)",
- "", "Search for a specific users job(s)",
+ {"user_jobs", NULL, "Specific User's Job(s)",
+ "", "Search for a specific users job(s)",
G_CALLBACK(create_search_popup)},
- {"state_jobs", NULL, "Job(s) in a Specific State",
- "", "Search for job(s) in a specific state",
+ {"state_jobs", NULL, "Job(s) in a Specific State",
+ "", "Search for job(s) in a specific state",
G_CALLBACK(create_search_popup)},
#ifdef HAVE_BG
- {"bg_block_name", NULL, "BG Block Name",
- "", "Search for a specific BG Block",
+ {"bg_block_name", NULL, "BG Block Name",
+ "", "Search for a specific BG Block",
G_CALLBACK(create_search_popup)},
- {"bg_block_size", NULL, "BG Block Size",
- "",
- "Search for BG Blocks having given size in cnodes",
+ {"bg_block_size", NULL, "BG Block Size",
+ "",
+ "Search for BG Blocks having given size in cnodes",
G_CALLBACK(create_search_popup)},
- {"bg_block_state", NULL, "BG Block State",
- "",
- "Search for BG Blocks having given state",
+ {"bg_block_state", NULL, "BG Block State",
+ "",
+ "Search for BG Blocks having given state",
G_CALLBACK(create_search_popup)},
#endif
- {"partition_name", NULL, "Slurm Partition Name",
- "", "Search for a specific SLURM partition",
+ {"partition_name", NULL, "Slurm Partition Name",
+ "", "Search for a specific SLURM partition",
G_CALLBACK(create_search_popup)},
- {"partition_state", NULL, "Slurm Partition State",
- "", "Search for SLURM partitions in a given state",
+ {"partition_state", NULL, "Slurm Partition State",
+ "", "Search for SLURM partitions in a given state",
G_CALLBACK(create_search_popup)},
- {"node_name", NULL,
+ {"node_name", NULL,
#ifdef HAVE_BG
"Base Partition(s) Name",
- "", "Search for a specific Base Partition(s)",
+ "", "Search for a specific Base Partition(s)",
#else
- "Node(s) Name",
- "", "Search for a specific Node(s)",
+ "Node(s) Name",
+ "", "Search for a specific Node(s)",
#endif
- G_CALLBACK(create_search_popup)},
- {"node_state", NULL,
+ G_CALLBACK(create_search_popup)},
+ {"node_state", NULL,
#ifdef HAVE_BG
"Base Partition State",
- "", "Search for a Base Partition in a given state",
+ "", "Search for a Base Partition in a given state",
#else
- "Node State",
- "", "Search for a Node in a given state",
+ "Node State",
+ "", "Search for a Node in a given state",
#endif
- G_CALLBACK(create_search_popup)},
- {"reservation_name", NULL, "Reservation Name",
- "", "Search for reservation",
+ G_CALLBACK(create_search_popup)},
+ {"reservation_name", NULL, "Reservation Name",
+ "", "Search for reservation",
G_CALLBACK(create_search_popup)},
{"tab_pos", NULL, "_Tab Pos"},
- {"interval", GTK_STOCK_REFRESH, "Set Refresh _Interval",
- "<control>i", "Change Refresh Interval",
+ {"interval", GTK_STOCK_REFRESH, "Set Refresh _Interval",
+ "<control>i", "Change Refresh Interval",
G_CALLBACK(change_refresh_popup)},
- {"refresh", GTK_STOCK_REFRESH, "Refresh",
+ {"refresh", GTK_STOCK_REFRESH, "Refresh",
"F5", "Refreshes page", G_CALLBACK(refresh_main)},
- {"config", GTK_STOCK_INFO, "_Config Info",
- "<control>c", "Displays info from slurm.conf file",
+ {"config", GTK_STOCK_INFO, "_Config Info",
+ "<control>c", "Displays info from slurm.conf file",
G_CALLBACK(create_config_popup)},
- {"exit", GTK_STOCK_QUIT, "E_xit",
+ {"exit", GTK_STOCK_QUIT, "E_xit",
"<control>x", "Exits Program", G_CALLBACK(_delete)},
{"help", NULL, "_Help", "<alt>h"},
{"about", GTK_STOCK_ABOUT, "A_bout", "<control>b"},
@@ -497,57 +497,57 @@ static GtkWidget *_get_menubar_menu(GtkWidget *window, GtkWidget *notebook)
};
GtkActionEntry admin_entries[] = {
- {"reconfig", GTK_STOCK_REDO, "SLUR_M Reconfigure",
- "<control>m", "Reconfigures System",
+ {"reconfig", GTK_STOCK_REDO, "SLUR_M Reconfigure",
+ "<control>m", "Reconfigures System",
G_CALLBACK(_reconfigure)},
};
GtkRadioActionEntry radio_entries[] = {
- {"tab_top", GTK_STOCK_GOTO_TOP, "_Top",
+ {"tab_top", GTK_STOCK_GOTO_TOP, "_Top",
"<control>T", "Move tabs to top", 2},
- {"tab_bottom", GTK_STOCK_GOTO_BOTTOM, "_Bottom",
+ {"tab_bottom", GTK_STOCK_GOTO_BOTTOM, "_Bottom",
"<control>B", "Move tabs to the bottom", 3},
- {"tab_left", GTK_STOCK_GOTO_FIRST, "_Left",
+ {"tab_left", GTK_STOCK_GOTO_FIRST, "_Left",
"<control>L", "Move tabs to the Left", 4},
- {"tab_right", GTK_STOCK_GOTO_LAST, "_Right",
+ {"tab_right", GTK_STOCK_GOTO_LAST, "_Right",
"<control>R", "Move tabs to the Right", 1}
};
GtkToggleActionEntry toggle_entries[] = {
{"grid", GTK_STOCK_SELECT_COLOR, "Show _Grid",
- "<control>g", "Visual display of cluster",
+ "<control>g", "Visual display of cluster",
G_CALLBACK(_set_grid), TRUE},
- {"admin", GTK_STOCK_PREFERENCES,
- "_Admin Mode", "<control>a",
- "Allows user to change or update information",
- G_CALLBACK(_set_admin_mode),
- FALSE}
+ {"admin", GTK_STOCK_PREFERENCES,
+ "_Admin Mode", "<control>a",
+ "Allows user to change or update information",
+ G_CALLBACK(_set_admin_mode),
+ FALSE}
};
-
+
/* Make an accelerator group (shortcut keys) */
action_group = gtk_action_group_new ("MenuActions");
- gtk_action_group_add_actions(action_group, entries,
+ gtk_action_group_add_actions(action_group, entries,
G_N_ELEMENTS(entries), window);
- gtk_action_group_add_radio_actions(action_group, radio_entries,
- G_N_ELEMENTS(radio_entries),
+ gtk_action_group_add_radio_actions(action_group, radio_entries,
+ G_N_ELEMENTS(radio_entries),
0, G_CALLBACK(_tab_pos), notebook);
- gtk_action_group_add_toggle_actions(action_group, toggle_entries,
- G_N_ELEMENTS(toggle_entries),
+ gtk_action_group_add_toggle_actions(action_group, toggle_entries,
+ G_N_ELEMENTS(toggle_entries),
NULL);
admin_action_group = gtk_action_group_new ("MenuAdminActions");
- gtk_action_group_add_actions(admin_action_group, admin_entries,
+ gtk_action_group_add_actions(admin_action_group, admin_entries,
G_N_ELEMENTS(admin_entries),
window);
- gtk_action_group_set_sensitive(admin_action_group, FALSE);
-
+ gtk_action_group_set_sensitive(admin_action_group, FALSE);
+
ui_manager = gtk_ui_manager_new();
gtk_ui_manager_insert_action_group(ui_manager, action_group, 0);
gtk_ui_manager_insert_action_group(ui_manager, admin_action_group, 1);
-
+
accel_group = gtk_ui_manager_get_accel_group(ui_manager);
gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
- if (!gtk_ui_manager_add_ui_from_string (ui_manager, ui_description,
+ if (!gtk_ui_manager_add_ui_from_string (ui_manager, ui_description,
-1, &error))
{
g_error("building menus failed: %s", error->message);
@@ -561,7 +561,7 @@ static GtkWidget *_get_menubar_menu(GtkWidget *window, GtkWidget *notebook)
void *_popup_thr_main(void *arg)
{
- popup_thr(arg);
+ popup_thr(arg);
return NULL;
}
@@ -574,7 +574,7 @@ extern void refresh_main(GtkAction *action, gpointer user_data)
_page_switched(GTK_NOTEBOOK(main_notebook), NULL, page, NULL);
}
-extern void tab_pressed(GtkWidget *widget, GdkEventButton *event,
+extern void tab_pressed(GtkWidget *widget, GdkEventButton *event,
display_data_t *display_data)
{
signal_params_t signal_params;
@@ -585,9 +585,9 @@ extern void tab_pressed(GtkWidget *widget, GdkEventButton *event,
gtk_notebook_set_current_page(GTK_NOTEBOOK(main_notebook),
display_data->extra);
if(event->button == 3) {
- right_button_pressed(NULL, NULL, event,
+ right_button_pressed(NULL, NULL, event,
&signal_params, TAB_CLICKED);
- }
+ }
}
int main(int argc, char *argv[])
@@ -601,7 +601,7 @@ int main(int argc, char *argv[])
if(getenv("SVIEW_GRID_SPEEDUP"))
grid_speedup = 1;
-
+
_init_pages();
g_thread_init(NULL);
gdk_threads_init();
@@ -620,7 +620,7 @@ int main(int argc, char *argv[])
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(grid_window),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
-
+
/* #ifdef HAVE_BG */
/* gtk_widget_set_size_request(grid_window, 164, -1); */
/* #endif */
@@ -629,7 +629,7 @@ int main(int argc, char *argv[])
main_window = gtk_dialog_new();
g_signal_connect(G_OBJECT(main_window), "delete_event",
G_CALLBACK(_delete), NULL);
-
+
gtk_window_set_title(GTK_WINDOW(main_window), "Sview");
gtk_window_set_default_size(GTK_WINDOW(main_window), 1000, 450);
gtk_container_set_border_width(
@@ -641,7 +641,7 @@ int main(int argc, char *argv[])
NULL);
table = gtk_table_new(1, 2, FALSE);
gtk_table_set_homogeneous(GTK_TABLE(table), FALSE);
- gtk_container_set_border_width(GTK_CONTAINER(table), 1);
+ gtk_container_set_border_width(GTK_CONTAINER(table), 1);
/* Create a menu */
menubar = _get_menubar_menu(main_window, main_notebook);
gtk_table_attach_defaults(GTK_TABLE(table), menubar, 0, 1, 0, 1);
@@ -649,9 +649,9 @@ int main(int argc, char *argv[])
gtk_notebook_popup_enable(GTK_NOTEBOOK(main_notebook));
gtk_notebook_set_scrollable(GTK_NOTEBOOK(main_notebook), TRUE);
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(main_notebook), GTK_POS_TOP);
-
+
main_statusbar = gtk_statusbar_new();
- gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(main_statusbar),
+ gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(main_statusbar),
FALSE);
/* Pack it all together */
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(main_window)->vbox),
@@ -662,18 +662,18 @@ int main(int argc, char *argv[])
GTK_SHRINK, GTK_EXPAND | GTK_FILL,
0, 0);
gtk_table_attach_defaults(GTK_TABLE(table), main_notebook, 1, 2, 0, 1);
-
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(main_window)->vbox),
- table, TRUE, TRUE, 0);
+
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(main_window)->vbox),
- main_statusbar, FALSE, FALSE, 0);
-
+ table, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(main_window)->vbox),
+ main_statusbar, FALSE, FALSE, 0);
+
for(i=0; i<PAGE_CNT; i++) {
if(main_display_data[i].id == -1)
break;
- else if(!main_display_data[i].show)
+ else if(!main_display_data[i].show)
continue;
- create_page(GTK_NOTEBOOK(main_notebook),
+ create_page(GTK_NOTEBOOK(main_notebook),
&main_display_data[i]);
}
diff --git a/src/sview/sview.h b/src/sview/sview.h
index d5dd3945930d56cf4d6b59e9fb1d372820d78f13..b2d8eee0b78d905b58e37f268a881f2dde468530 100644
--- a/src/sview/sview.h
+++ b/src/sview/sview.h
@@ -92,16 +92,16 @@
#define MAKE_BLACK -2
#define MAKE_WHITE -1
-enum { JOB_PAGE,
- STEP_PAGE,
+enum { JOB_PAGE,
+ STEP_PAGE,
PART_PAGE,
- NODE_PAGE,
- BLOCK_PAGE,
+ NODE_PAGE,
+ BLOCK_PAGE,
RESV_PAGE,
SUBMIT_PAGE,
ADMIN_PAGE,
INFO_PAGE,
- PAGE_CNT
+ PAGE_CNT
};
enum { TAB_CLICKED,
ROW_LEFT_CLICKED,
@@ -120,13 +120,13 @@ enum { STATUS_ADMIN_MODE,
};
enum { DISPLAY_NAME,
- DISPLAY_VALUE,
- DISPLAY_FONT
+ DISPLAY_VALUE,
+ DISPLAY_FONT
};
enum { EDIT_NONE,
EDIT_MODEL,
- EDIT_TEXTBOX
+ EDIT_TEXTBOX
};
typedef enum { SEARCH_JOB_ID = 1,
@@ -163,7 +163,7 @@ typedef struct {
char *nodes;
char *partition;
-
+
int node_field_size;
} sview_parameters_t;
@@ -204,7 +204,7 @@ struct specific_info {
int view;
sview_search_info_t *search_info;
char *title;
- GtkWidget *display_widget;
+ GtkWidget *display_widget;
};
struct popup_info {
@@ -278,7 +278,7 @@ extern bool admin_mode;
extern GtkWidget *main_statusbar;
extern GtkWidget *main_window;
extern GtkTable *main_grid_table;
-extern GStaticMutex sview_mutex;
+extern GStaticMutex sview_mutex;
extern int cpus_per_node;
extern int g_node_scaling;
extern int grid_speedup;
@@ -295,7 +295,7 @@ extern void print_date();
//sview.c
extern void refresh_main(GtkAction *action, gpointer user_data);
-extern void tab_pressed(GtkWidget *widget, GdkEventButton *event,
+extern void tab_pressed(GtkWidget *widget, GdkEventButton *event,
display_data_t *display_data);
//popups.c
@@ -321,7 +321,7 @@ extern void get_button_list_from_main(List *button_list, int start, int end,
int color_inx);
extern List copy_main_button_list(int initial_color);
#ifdef HAVE_BG
-extern void add_extra_bluegene_buttons(List *button_list, int inx,
+extern void add_extra_bluegene_buttons(List *button_list, int inx,
int *color_inx);
#endif
extern void add_extra_cr_buttons(List *button_list, node_info_t *node_ptr);
@@ -371,7 +371,7 @@ extern void admin_edit_job(GtkCellRendererText *cell,
const char *new_text,
gpointer data);
extern int get_new_info_job(job_info_msg_t **info_ptr, int force);
-extern int get_new_info_job_step(job_step_info_response_msg_t **info_ptr,
+extern int get_new_info_job_step(job_step_info_response_msg_t **info_ptr,
int force);
extern void get_info_job(GtkTable *table, display_data_t *display_data);
extern void specific_info_job(popup_info_t *popup_win);
@@ -428,35 +428,35 @@ extern const char *find_col_name(display_data_t *display_data, int type);
extern void load_header(GtkTreeView *tree_view, display_data_t *display_data);
extern void make_fields_menu(popup_info_t *popup_win, GtkMenu *menu,
display_data_t *display_data, int count);
-extern void make_options_menu(GtkTreeView *tree_view, GtkTreePath *path,
+extern void make_options_menu(GtkTreeView *tree_view, GtkTreePath *path,
GtkMenu *menu, display_data_t *display_data);
extern GtkScrolledWindow *create_scrolled_window();
extern GtkWidget *create_entry();
extern void create_page(GtkNotebook *notebook, display_data_t *display_data);
extern GtkTreeView *create_treeview(display_data_t *local, List *button_list);
extern GtkTreeView *create_treeview_2cols_attach_to_table(GtkTable *table);
-extern GtkTreeStore *create_treestore(GtkTreeView *tree_view,
+extern GtkTreeStore *create_treestore(GtkTreeView *tree_view,
display_data_t *display_data,
int count, int sort_column,
int color_column);
-extern gboolean right_button_pressed(GtkTreeView *tree_view, GtkTreePath *path,
- GdkEventButton *event,
+extern gboolean right_button_pressed(GtkTreeView *tree_view, GtkTreePath *path,
+ GdkEventButton *event,
const signal_params_t *signal_params,
int type);
-extern gboolean left_button_pressed(GtkTreeView *tree_view,
+extern gboolean left_button_pressed(GtkTreeView *tree_view,
GtkTreePath *path,
const signal_params_t *signal_params);
extern gboolean row_activated(GtkTreeView *tree_view, GtkTreePath *path,
GtkTreeViewColumn *column,
const signal_params_t *signal_params);
-extern gboolean row_clicked(GtkTreeView *tree_view, GdkEventButton *event,
+extern gboolean row_clicked(GtkTreeView *tree_view, GdkEventButton *event,
const signal_params_t *signal_params);
extern popup_info_t *create_popup_info(int type, int dest_type, char *title);
-extern void setup_popup_info(popup_info_t *popup_win,
- display_data_t *display_data,
+extern void setup_popup_info(popup_info_t *popup_win,
+ display_data_t *display_data,
int cnt);
-extern void redo_popup(GtkWidget *widget, GdkEventButton *event,
+extern void redo_popup(GtkWidget *widget, GdkEventButton *event,
popup_info_t *popup_win);
extern void destroy_search_info(void *arg);
@@ -477,7 +477,7 @@ extern void display_admin_edit(GtkTable *table, void *type_msg, int *row,
GCallback changed_callback,
GCallback focus_callback,
void (*set_active)(
- GtkComboBox *combo,
+ GtkComboBox *combo,
GtkTreeModel *model, GtkTreeIter *iter,
int type));
extern void display_edit_note(char *edit_note);
diff --git a/testsuite/expect/README b/testsuite/expect/README
index 28e719cb544b020791bcb3f08b10c6184f3aeb30..16d2cdbdffa4c89c8e503d5701ce9fd62673024c 100644
--- a/testsuite/expect/README
+++ b/testsuite/expect/README
@@ -26,56 +26,56 @@
############################################################################
This directory contains a battery of SLURM regression tests. The tests make
-use of the "expect" scripting language. You can create "globals.local" and
-identify locations of files to be used in testing, especially the variable
-"slurm_dir". These tests expect single node jobs submitted to the default
-partition to respond within a 120 seconds. If that is not the case, modify
-the value of "max_job_delay" in the "globals.local" file to an appropriate
-value or the tests will report failures due to timeouts. If there are file
-propagation delays (e.g. due to NFS), the value of "max_file_delay" in the
+use of the "expect" scripting language. You can create "globals.local" and
+identify locations of files to be used in testing, especially the variable
+"slurm_dir". These tests expect single node jobs submitted to the default
+partition to respond within a 120 seconds. If that is not the case, modify
+the value of "max_job_delay" in the "globals.local" file to an appropriate
+value or the tests will report failures due to timeouts. If there are file
+propagation delays (e.g. due to NFS), the value of "max_file_delay" in the
"globals.local" file may need modification. For example:
$ cat globals.local
set slurm_dir "/usr/local"
set max_job_delay 300
-Each test can be executed independently. Upon successful completion, the test
-will print "SUCCESS" and terminate with an exit code of zero. Upon failure,
-the test will typically print "FAILURE" and an explanation of the failure.
-The message "WARNING" indicates that the cluster configuration can not fully
-test some option (e.g. only one node or partition) and the test terminates
-with an exit code of zero. In the event of a configuration problem or other
-catastrophic test failure other messages could be printed and their cause
-should be investigated. In either case, failing tests will terminate with a
+Each test can be executed independently. Upon successful completion, the test
+will print "SUCCESS" and terminate with an exit code of zero. Upon failure,
+the test will typically print "FAILURE" and an explanation of the failure.
+The message "WARNING" indicates that the cluster configuration can not fully
+test some option (e.g. only one node or partition) and the test terminates
+with an exit code of zero. In the event of a configuration problem or other
+catastrophic test failure other messages could be printed and their cause
+should be investigated. In either case, failing tests will terminate with a
non-zero exit code and successful tests will terminate with a zero exit code.
-The script "regression" will execute all of the tests and summarize the
-results. Standard output contains detailed logging of all events, which is
-quite verbose. Failure information is written to standard error. A good
-way to run "regression" is to write its standard output to one file and
+The script "regression" will execute all of the tests and summarize the
+results. Standard output contains detailed logging of all events, which is
+quite verbose. Failure information is written to standard error. A good
+way to run "regression" is to write its standard output to one file and
either write standard error to another file or print it to the terminal.
Execution time of the full test suite is roughly 80 minutes, but can vary
-considerably with the architecuture, configuration, and system load. Some
-tests send e-mail, so check for four e-mail messages set the the user
-running the tests. Here is an example.
+considerably with the architecuture, configuration, and system load. Some
+tests send e-mail, so check for four e-mail messages set the the user
+running the tests. Here is an example.
$ ./regression >slurm.test.tux.Aug3
Completions:357
Failures: 0
Time (sec): 4375
Remember to check for mail send by tests
-When failures do occur, check the standard output for details. Searching
-for the keyword "FAILURE" will typically locate the failing test. Note
-that some of the tests are architecture or configuration specific. Also
-note that most tests are designed to be run as a normal user. Tests 3.#
-are designed to be run as user root or SlurmUser, but will be skipped
-when the full test suite is executed as an unpriviledged user. The full
-test suite is typically executed many times by the SLURM developers on a
+When failures do occur, check the standard output for details. Searching
+for the keyword "FAILURE" will typically locate the failing test. Note
+that some of the tests are architecture or configuration specific. Also
+note that most tests are designed to be run as a normal user. Tests 3.#
+are designed to be run as user root or SlurmUser, but will be skipped
+when the full test suite is executed as an unpriviledged user. The full
+test suite is typically executed many times by the SLURM developers on a
variety of systems before a SLURM release is made. This has resulted in
-high system reliability. When SLURM bugs are found or features added,
+high system reliability. When SLURM bugs are found or features added,
this test suite is expanded.
-A summary of each test is shown below. There are also scripts to emulate
-some commands on systems lacking them (e.g. AIX). These include pkill and
+A summary of each test is shown below. There are also scripts to emulate
+some commands on systems lacking them (e.g. AIX). These include pkill and
usleep.
############################################################################
@@ -83,20 +83,20 @@ usleep.
test1.# Testing of srun options.
===================================
test1.1 Confirm that a job executes with appropriate user id and group id.
-test1.2 Confirm that a job executes with the proper task count (--nprocs
+test1.2 Confirm that a job executes with the proper task count (--nprocs
and --overcommit options).
test1.3 Confirm that srun reports a proper version number (--version option).
test1.4 Confirm that srun usage option works (--usage option).
test1.5 Confirm that srun help option works (--help option).
-test1.6 Confirm that srun sets appropriate working directory (--chdir
+test1.6 Confirm that srun sets appropriate working directory (--chdir
option).
test1.7 Confirm that job time limit function works (--time option).
-test1.8 Confirm that basic srun stdin, stdout, and stderr options work
- (--input, --output, and --error option respectively).
+test1.8 Confirm that basic srun stdin, stdout, and stderr options work
+ (--input, --output, and --error option respectively).
test1.9 Test of srun verbose mode (--verbose option).
test1.10 Test of srun/slurmd debug mode (--debug option).
test1.11 Test job name option (--job-name).
-test1.12 Test of --checkpoint option. This does not validate the
+test1.12 Test of --checkpoint option. This does not validate the
checkpoint file itself.
test1.13 Test of immediate allocation option (--immediate option).
test1.14 Test exclusive resource allocation for a step (--exclusive option).
@@ -104,18 +104,18 @@ test1.15 Test of wait option (--wait option).
test1.16 Confirm that srun buffering can be disabled (--unbuffered option).
test1.17 Test of srun --open-mode (truncate or append) option.
test1.18 Test of --licenses option
-test1.19 Test srun stdout/err file name formatting (--output and --error
+test1.19 Test srun stdout/err file name formatting (--output and --error
options with %j, %J, %n, %s and %t specifications).
-test1.20 Test srun stdout/err disabling (--output and --error options with
+test1.20 Test srun stdout/err disabling (--output and --error options with
argument of "none").
-test1.21 Test srun stdin/out routing with specific task number (--input
+test1.21 Test srun stdin/out routing with specific task number (--input
and --output options with numeric argument).
test1.22 Confirm that a job executes with various launch thread fanouts
(--threads option).
-test1.23 Verify node configuration specification (--mem, --mincpus, and
+test1.23 Verify node configuration specification (--mem, --mincpus, and
--tmp options).
test1.24 Verify node configuration specification (--constraint option).
-test1.25 Submit job to not be killed on node failure (--no-kill option).
+test1.25 Submit job to not be killed on node failure (--no-kill option).
NOTE: We need to actually kill slurmd daemons to fully test this.
test1.26 Submit job directly to slurmd without use of slurmctld scheduler.
(--no-allocate option). NOTE: Needs to run as SlurmUser or root.
@@ -124,7 +124,7 @@ test1.28 Verify that user environment variables are propagated to the job.
test1.29 Verify that user user limits are propagated to the job.
test1.30 Test of increasing job sizes.
test1.31 Verify that SLURM directed environment variables are processed:
- SLURM_DEBUG, SLURM_NNODES, SLURM_NPROCS, SLURM_OVERCOMMIT,
+ SLURM_DEBUG, SLURM_NNODES, SLURM_NPROCS, SLURM_OVERCOMMIT,
SLURM_STDOUTMODE.
test1.32 Test of srun signal forwarding
test1.33 Test of srun application exit code reporting
@@ -139,7 +139,7 @@ test1.40 Test of job account (--account option).
test1.41 Validate SLURM debugger infrastructure (--debugger-test option).
test1.42 Test of job dependencies (--dependency option).
test1.43 Test of slurm_job_will_run API, (srun --test-only option).
-test1.44 Read srun's stdout slowly and test for lost data.
+test1.44 Read srun's stdout slowly and test for lost data.
test1.45 Test srun option --preserve-env
test1.46 Test srun option --kill-on-bad-exit
test1.47 Test of job dependencies with singleton parameter.
@@ -161,7 +161,7 @@ test1.60 Test of labelling output when writing a file per task or per node
test1.61 Test of srun job step time limit
**NOTE** The following tests attempt to utilize multiple CPUs or partitions,
- The test will print "WARNING" and terminate with an exit code of
+ The test will print "WARNING" and terminate with an exit code of
zero if the cluster configuration does not permit proper testing.
test1.80 Confirm that a job executes with the proper task distribution
(--nodes and --distribution options).
@@ -171,7 +171,7 @@ test1.82 Confirm that a job executes with the specified nodes
(--nodelist and --exclude options).
test1.83 Test of contiguous option with multiple nodes (--contiguous option).
Also see test1.14.
-test1.84 Test of cpus-per-task option on a single node (--cpus-per-task
+test1.84 Test of cpus-per-task option on a single node (--cpus-per-task
option).
test1.85 REMOVED
test1.86 Confirm node selection from within a job step on existing allocation
@@ -186,14 +186,14 @@ test1.92 Test of task distribution support on multi-core systems.
test1.93 Test of LAM-MPI functionality
**NOTE** The above tests for mutliple processor/partition systems only
-test2.# Testing of scontrol options (to be run as unprivileged user).
+test2.# Testing of scontrol options (to be run as unprivileged user).
========================================================================
test2.1 Validate scontrol version command.
test2.2 Validate scontrol help command.
test2.3 Validate scontrol ping command.
test2.4 Validate scontrol exit, quit, and !! commands.
-test2.5 Validate scontrol show commands for configuation, daemons,
- nodes, and partitions.
+test2.5 Validate scontrol show commands for configuation, daemons,
+ nodes, and partitions.
test2.6 Validate scontrol verbose and quite options.
test2.7 Validate scontrol pidinfo command.
test2.8 Validate scontrol show commands for jobs and steps.
@@ -203,7 +203,7 @@ test2.11 Validate scontrol listpids command.
test2.12 Validate scontrol show topology option.
-test3.# Testing of scontrol options (best run as SlurmUser or root).
+test3.# Testing of scontrol options (best run as SlurmUser or root).
=======================================================================
test3.1 Validate scontrol reconfigure command.
test3.2 Validate scontrol update command for partitions.
@@ -216,7 +216,7 @@ test3.8 Test of batch job requeue.
test3.9 Test of "scontrol show slurmd"
test3.10 Test of "scontrol notify <jobid> <message>"
test3.11 Validate scontrol create, delete, and update of reservations.
-UNTESTED "scontrol abort" would stop slurm
+UNTESTED "scontrol abort" would stop slurm
UNTESTED "scontrol shutdown" would stop slurm
@@ -224,9 +224,9 @@ test4.# Testing of sinfo options.
====================================
test4.1 Confirm sinfo usage option works (--usage option).
test4.2 Confirm sinfo help option works (--help option).
-test4.3 Test partition information, both long and short (--long and
+test4.3 Test partition information, both long and short (--long and
--summarize options) and partition filtering (--partition option).
-test4.4 Test node information, both regular and long (--Node, --long,
+test4.4 Test node information, both regular and long (--Node, --long,
and --exact options).
test4.5 Test sinfo node information filtering (--state and --nodes options).
test4.6 Test sinfo iteration (--iterate option).
@@ -234,7 +234,7 @@ test4.7 Confirm that sinfo verbose option works (--verbose option).
test4.8 Check sinfo output without header (--noheader option).
test4.9 Check sinfo formating options (--format option and SINFO_FORMAT
environment variable).
-test4.10 Confirm that sinfo reports a proper version number (--version
+test4.10 Confirm that sinfo reports a proper version number (--version
option).
test4.11 Test down node reason display (--list-reasons option).
test4.12 Test cpu total and allocation numbers.
@@ -245,17 +245,17 @@ test5.# Testing of squeue options.
test5.1 Confirm squeue usage option works (--usage option).
test5.2 Confirm squeue help option works (--help option).
test5.3 Test squeue iteration (--iterate option).
-test5.4 Test squeue formating options (--noheader, --format and --step
+test5.4 Test squeue formating options (--noheader, --format and --step
options and SQUEUE_FORMAT environment variable).
test5.5 Test squeue sorting (--sort option).
-test5.6 Test squeue filtering (--jobs, --node, --states, --steps and
+test5.6 Test squeue filtering (--jobs, --node, --states, --steps and
--user options).
test5.7 Confirm that squeue verbose option works (--verbose option).
-test5.8 Confirm that squeue reports a proper version number (--version
+test5.8 Confirm that squeue reports a proper version number (--version
option).
-test6.# Testing of scancel options.
+test6.# Testing of scancel options.
======================================
test6.1 Validate scancel usage option (--usage option).
test6.2 Validate scancel help option (--help option).
@@ -266,36 +266,36 @@ test6.6 Confirm that scancel reports a proper version number (-V option).
test6.7 Validate scancel signal option (--signal and --verbose options).
test6.8 Validate scancel state and name filters (--state and --name options).
test6.9 Validate scancel of individual job steps (job.step specification).
-test6.10 Validate scancel user and partition filters, delete all remaining
+test6.10 Validate scancel user and partition filters, delete all remaining
jobs (--partition and --user options).
-test6.11 Validate scancel quiet option, no warning if job gone
+test6.11 Validate scancel quiet option, no warning if job gone
(--quiet option).
test6.12 Test scancel signal to batch script (--batch option)
-test6.13 Test routing all signals through slurmctld rather than directly
+test6.13 Test routing all signals through slurmctld rather than directly
to slurmd (undocumented --ctld option).
test6.14 Test scancel nodelist option (--nodelist or -w)
test7.# Testing of other functionality.
==========================================
-test7.1 Test priorities slurmctld assigns to jobs. Uses srun --hold and
+test7.1 Test priorities slurmctld assigns to jobs. Uses srun --hold and
--batch options.
-test7.2 Test of PMI functions available via API library. Tests
+test7.2 Test of PMI functions available via API library. Tests
--pmi-threads option in srun command.
test7.3 Test of slurm_step_launch API with spawn_io=true
(needed by poe on IBM AIX systems).
-test7.4 Test of TotalView operation with srun, with and without bulk
+test7.4 Test of TotalView operation with srun, with and without bulk
transfer.
test7.5 Test of TotalView termination logic for srun.
test7.6 Test of TotalView operation with sattach
-test7.7 Test of sched/wiki2 plugin. This is intended to execute in the
+test7.7 Test of sched/wiki2 plugin. This is intended to execute in the
place of Moab or Maui and emulate its actions to confirm proper
- operation of the plugin.
+ operation of the plugin.
test7.8 Test of sched/wiki plugin. This is intended to execute in the
place of Maui and emulate its actions to confirm proper
operation of the plugin.
test7.9 Test that no files are open in spawned tasks (except stdin,
stdout, and stderr) to insure successful checkpoint/restart.
-test7.10 Test if we can trick SLURM into using the wrong user ID
+test7.10 Test if we can trick SLURM into using the wrong user ID
through an LD_PRELOAD option.
test7.11 Test of SPANK plugin.
@@ -336,9 +336,9 @@ test10.7 Test job information, (-Dj option).
test10.8 Test job information, in commandline mode (-Dj -c option).
test10.9 Test smap iteration (--iterate option).
test10.10 Check smap output without header (--noheader option).
-test10.11 Confirm that smap reports a proper version number
+test10.11 Confirm that smap reports a proper version number
(--version option).
-test10.12 Test bg base partition XYZ to Rack Midplane and back
+test10.12 Test bg base partition XYZ to Rack Midplane and back
resolution (--resolve option).
test10.13 Test bluegene.conf file creation and validate it (-Dc option).
@@ -357,7 +357,7 @@ test11.7 Test of hostfile logic (with poe)
test12.# Testing of sacct command and options
===============================================
test12.1 Test sacct --help option.
-test12.2 Test validity/accuracy of accounting data for exit code,
+test12.2 Test validity/accuracy of accounting data for exit code,
memory and real-time information along with stating a running job.
test12.3 (EMPTY)
test12.4 Test sacct --b, g, j, l, n, p, u, v options.
@@ -379,7 +379,7 @@ test14.4 Test sbcast file overwrite (--force option).
test14.5 Test sbcast time preservation (--preserve option).
test14.6 Test sbcast logging (--verbose option).
test14.7 Test sbcast security issues.
-test14.8 Test sbcast transmission buffer options (--size and
+test14.8 Test sbcast transmission buffer options (--size and
--fanout options).
@@ -414,9 +414,9 @@ test15.19 Confirm that a job executes with the proper node count
test15.20 Confirm that a job executes with the specified nodes
(--nodelist and --exclude options).
test15.21 Test of contiguous option with multiple nodes (--contiguous option).
-test15.22 Test of partition specification on job submission (--partition
+test15.22 Test of partition specification on job submission (--partition
option).
-test15.23 Test of environment variables that control salloc actions:
+test15.23 Test of environment variables that control salloc actions:
SALLOC_DEBUG and SALLOC_TIMELIMIT
test15.24 Test of --overcommit option.
test15.25 Test of job account(--account option).
@@ -439,7 +439,7 @@ test17.3 Confirm that sbatch reports a proper version number
(--version option).
test17.4 Confirm that as sbatch job executes as the appropriate user and
group.
-test17.5 Confirm that sbatch stdout, and stderr options work (--output
+test17.5 Confirm that sbatch stdout, and stderr options work (--output
and --error option respectively, including use of %j specification)
test17.6 Confirm that a job executes with the proper task count (--tasks
option).
@@ -461,7 +461,7 @@ test17.15 Verify that user user limits are propagated to the job
test17.16 Verify that command line arguments get forwarded to job script
test17.17 Confirm that node sharing flags are respected (--nodelist and
--share options)
-test17.18 Test of job dependencies and deferred begin time (--depedency
+test17.18 Test of job dependencies and deferred begin time (--depedency
and --begin options).
test17.19 REMOVED
test17.20 Test of mail options (--mail-type and --mail-user options)
@@ -531,7 +531,7 @@ test21.24 sacctmgr dump file
test21.25 sacctmgr show config
test21.26 sacctmgr +=, -= modify QoS test
-test22.# Testing of sreport commands and options.
+test22.# Testing of sreport commands and options.
These also test the sacctmgr archive dump/load functions.
=================================================
test22.1 sreport cluster utilization report
diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index e5e34cc356d43d55c1819a8d0c2dd8b7bf8cc00f..a0c3e2e7c70b1d60219eae33dba4e855d468c17c 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -17,21 +17,21 @@
# Written by Morris Jette <jette1@llnl.gov>
# Additions by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# Please also read the supplied 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.
-#
+#
# 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.
@@ -81,8 +81,8 @@ cset qdel "${slurm_dir}/bin/qdel"
cset qstat "${slurm_dir}/bin/qstat"
cset qsub "${slurm_dir}/bin/qsub"
-# If length of string partition is zero, use output of function
-# default_partition, otherwise use the partition explicitly
+# If length of string partition is zero, use output of function
+# default_partition, otherwise use the partition explicitly
# named in your globals.local file (or below) for poe commands
cset partition ""
@@ -142,8 +142,8 @@ cset bin_wc "wc"
cset bin_printenv "printenv"
#
-# Let the commands complete without expect timing out waiting for a
-# response. Single node jobs submitted to the default partition should
+# Let the commands complete without expect timing out waiting for a
+# response. Single node jobs submitted to the default partition should
# be initiated within this number of seconds.
# for interactive slurm jobs: cset timeout $max_job_delay
#
@@ -290,7 +290,7 @@ proc get_my_nuid { } {
}
}
log_user 1
-
+
return $nuid
}
@@ -322,7 +322,7 @@ proc get_my_uid { } {
}
}
log_user 1
-
+
return $uid
}
@@ -354,7 +354,7 @@ proc get_my_gid { } {
}
}
log_user 1
-
+
return $gid
}
@@ -368,7 +368,7 @@ proc get_my_gid { } {
#
# Returns: A non-zero return code indicates a failure.
#
-# NOTE: Use slow_kill instead of kill_salloc if you can capture
+# NOTE: Use slow_kill instead of kill_salloc if you can capture
# the process id
#
################################################################
@@ -404,7 +404,7 @@ proc kill_salloc { } {
#
# Returns: A non-zero return code indicates a failure.
#
-# NOTE: Use slow_kill instead of kill_srun if you can capture
+# NOTE: Use slow_kill instead of kill_srun if you can capture
# the process id
#
################################################################
@@ -452,8 +452,8 @@ proc print_header { test_id } {
#
# Proc: wait_for_file
#
-# Purpose: Wait for the specified file to exist and have a
-# non-zero size. Note that if JobFileAppend=0 is
+# Purpose: Wait for the specified file to exist and have a
+# non-zero size. Note that if JobFileAppend=0 is
# configured, a file can exist and be purged then
# be re-created.
#
@@ -483,7 +483,7 @@ proc wait_for_file { file_name } {
#
# Proc: wait_for_job
#
-# Purpose: Wait for a previously submitted SLURM job to reach
+# Purpose: Wait for a previously submitted SLURM job to reach
# the desired state, exponential back-off 1 to 10 seconds
#
# Returns: A non-zero return code indicates a failure.
@@ -495,7 +495,7 @@ proc wait_for_file { file_name } {
# DONE any terminated state
# RUNNING job is running
#
-# NOTE: We sleep for two seconds before replying that a job is
+# NOTE: We sleep for two seconds before replying that a job is
# done to give time for I/O completion (stdout/stderr files)
#
################################################################
@@ -573,7 +573,7 @@ proc wait_for_job { job_id desired_state } {
#
# Proc: wait_for_step
#
-# Purpose: Wait for a job step to be found, exponential back-off
+# Purpose: Wait for a job step to be found, exponential back-off
# 1 to 10 seconds
#
# Returns: A non-zero return code indicates a failure.
@@ -614,8 +614,8 @@ proc wait_for_step { step_id } {
#
# Proc: test_assoc_enforced
#
-# Purpose: Determine if we need an association to run a job.
-# This is based upon
+# Purpose: Determine if we need an association to run a job.
+# This is based upon
# the value of AccountingStorageEnforce in the slurm.conf.
#
# Returns level of association enforcement, 0 if none
@@ -733,7 +733,7 @@ proc test_topology { } {
#
# Proc: test_track_wckey
#
-# Purpose: Determine if we track workload characterization keys.
+# Purpose: Determine if we track workload characterization keys.
# This is based upon the value of TrackWCKey in the slurm.conf.
#
# Returns value of TrackWCKey
@@ -790,8 +790,8 @@ proc test_wiki_sched { } {
# Proc: test_account_storage
#
# Purpose: Determine if we are using a usable accounting storage
-# package.
-# This is based upon
+# package.
+# This is based upon
# the value of AccountingStorageType in the slurm.conf.
#
# Returns 1 if the system is running an accounting storage type
@@ -815,7 +815,7 @@ proc test_account_storage { } {
}
}
log_user 1
-
+
return $account_storage
}
@@ -867,7 +867,7 @@ proc get_default_acct { user } {
if { !$user } {
spawn $bin_id -un
- expect {
+ expect {
-re "($alpha_numeric_under)" {
set user $expect_out(1,string)
}
@@ -888,7 +888,7 @@ proc get_default_acct { user } {
}
}
log_user 1
-
+
return $def_acct
}
@@ -897,8 +897,8 @@ proc get_default_acct { user } {
# Proc: test_front_end
#
# Purpose: Determine if the execution host is one in which the
-# slurmd daemon executes on a front-end node rather than the
-# compute hosts (e.g. Blue Gene systems). This is based upon
+# slurmd daemon executes on a front-end node rather than the
+# compute hosts (e.g. Blue Gene systems). This is based upon
# the value of SelectType in the slurm.conf.
#
# Returns 1 if the system uses a front-end, 0 otherwise
@@ -929,7 +929,7 @@ proc test_front_end { } {
}
}
log_user 1
-
+
return $front_end
}
@@ -1018,7 +1018,7 @@ proc test_bluegene { } {
}
}
log_user 1
-
+
return $bluegene
}
@@ -1048,7 +1048,7 @@ proc test_select_type { } {
}
}
log_user 1
-
+
return $type
}
@@ -1078,7 +1078,7 @@ proc test_select_type_params { } {
}
}
log_user 1
-
+
return $params
}
@@ -1107,7 +1107,7 @@ proc test_aix {} {
#
# Proc: test_super_user
#
-# Purpose: Determine if user is a SLURM super user (i.e. user
+# Purpose: Determine if user is a SLURM super user (i.e. user
# root or configured SlurmUser)
#
################################################################
@@ -1389,9 +1389,9 @@ proc is_super_user { } {
}
################################################################
-#
#
-#
+#
+#
################################################################
proc check_acct_associations { } {
global sacctmgr number
@@ -1407,9 +1407,9 @@ proc check_acct_associations { } {
set s_pid [spawn $sacctmgr -n -p list assoc wopi wopl withd format=lft,rgt]
expect {
-re "($number)\\|($number)\\|" {
- # Here we are checking if we have duplicates and
+ # Here we are checking if we have duplicates and
# setting up an array to check for holes later
-
+
set num1 $expect_out(1,string)
set num2 $expect_out(2,string)
set first [info exists found($num1)]
@@ -1417,10 +1417,10 @@ proc check_acct_associations { } {
#send_user "$first=$num1 $sec=$num2\n";
if { $first } {
send_user "FAILURE: found lft $num1 again\n"
- set rc 0
+ set rc 0
} elseif { $sec } {
send_user "FAILURE: found rgt $num2 again\n"
- set rc 0
+ set rc 0
} else {
set found($num1) 1
set found($num2) 1
@@ -1455,9 +1455,9 @@ proc check_acct_associations { } {
}
################################################################
-#
#
-#
+#
+#
################################################################
proc check_accounting_admin_level { } {
global sacctmgr alpha alpha_numeric_under bin_id
@@ -1507,9 +1507,9 @@ proc check_accounting_admin_level { } {
}
################################################################
-#
#
-#
+#
+#
################################################################
proc get_cluster_name { } {
global scontrol alpha_numeric_under
@@ -1569,7 +1569,7 @@ proc get_bluegene_layout { } {
}
}
log_user 1
-
+
return $layout
}
@@ -1604,7 +1604,7 @@ proc get_bluegene_psets { } {
}
}
log_user 1
-
+
return $psets
}
@@ -1642,7 +1642,7 @@ proc get_bluegene_type { } {
}
}
log_user 1
-
+
return $type
}
@@ -1677,7 +1677,7 @@ proc get_bluegene_procs_per_cnode { } {
}
}
log_user 1
-
+
return $cpu_cnt
}
@@ -1712,7 +1712,7 @@ proc get_bluegene_cnodes_per_mp { } {
}
}
log_user 1
-
+
return $node_cnt
}
@@ -1747,6 +1747,6 @@ proc get_node_cnt { } {
}
}
log_user 1
-
+
return $node_cnt
}
diff --git a/testsuite/expect/globals_accounting b/testsuite/expect/globals_accounting
index 95b90e0d217ddd4b87f7bf767d730b5a93e80878..de2266e0ceba2835c8b82bde9e6785cfdb1be2ff 100644
--- a/testsuite/expect/globals_accounting
+++ b/testsuite/expect/globals_accounting
@@ -18,21 +18,21 @@
# Written by Morris Jette <jette1@llnl.gov>
# Additions by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# Please also read the supplied 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.
-#
+#
# 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.
@@ -44,7 +44,7 @@ set timeout 60
#
# Use sacctmgr to create a cluster
-#
+#
proc add_cluster {name qos fairshare grpcpu grpjob grpnode grpsubmit maxcpumin maxcpu maxjob maxnode maxsubmit maxwall} {
global sacctmgr timeout
@@ -162,7 +162,7 @@ proc add_cluster {name qos fairshare grpcpu grpjob grpnode grpsubmit maxcpumin m
send_user "\nFAILURE: Our associations don't line up\n"
incr exit_code 1
}
-
+
return $exit_code
}
@@ -475,7 +475,7 @@ proc remove_acct { cluster name } {
#
proc mod_acct { cluster wparent name wdesc worg qos fairshare grpcpumin grpcpu grpjob grpnode grpsubmit grpwall maxcpumin maxcpu maxjob maxnode maxsubmit maxwall parent desc org } {
global sacctmgr timeout
-
+
set exit_code 0
set matches 0
set expected 0
@@ -641,7 +641,7 @@ proc mod_acct { cluster wparent name wdesc worg qos fairshare grpcpumin grpcpu g
got $matches needed $expected\n"
incr exit_code 1
}
-
+
if { ![check_acct_associations] } {
send_user "\nFAILURE: Our associations don't line up\n"
incr exit_code 1
@@ -904,7 +904,7 @@ proc remove_user { cluster acct user } {
#
proc mod_user { cluster account name part wadmin wdacct wdwckey qos fairshare grpcpumin grpcpu grpjob grpnode grpsubmit grpwall maxcpumin maxcpu maxjob maxnode maxsubmit maxwall admin dacct dwckey } {
global sacctmgr timeout
-
+
set exit_code 0
set matches 0
set expected 0
@@ -1078,7 +1078,7 @@ proc mod_user { cluster account name part wadmin wdacct wdwckey qos fairshare gr
got $matches needed $expected\n"
incr exit_code 1
}
-
+
if { ![check_acct_associations] } {
send_user "\nFAILURE: Our associations don't line up\n"
incr exit_code 1
@@ -1088,7 +1088,7 @@ proc mod_user { cluster account name part wadmin wdacct wdwckey qos fairshare gr
#
# Use sacctmgr to create a QoS
-#
+#
proc add_qos {name} {
global sacctmgr timeout
@@ -1141,7 +1141,7 @@ proc add_qos {name} {
send_user "\nFAILURE: Our associations don't line up\n"
incr exit_code 1
}
-
+
return $exit_code
}
@@ -1397,7 +1397,7 @@ proc archive_load { file } {
wait
}
}
-
+
if {$matches != 1} {
send_user "\nFAILURE: sacctmgr didn't load archive correctly.\n"
incr exit_code 1
diff --git a/testsuite/expect/mpi-testscripts/allred.c b/testsuite/expect/mpi-testscripts/allred.c
index b89b7ae0a763f2db6d0553aa78bfe39e8d74a8e7..55220b0df44801acb4c813e6018341e4b5d24340 100644
--- a/testsuite/expect/mpi-testscripts/allred.c
+++ b/testsuite/expect/mpi-testscripts/allred.c
@@ -41,24 +41,24 @@ out = (int *)malloc( count * sizeof(int) );
sol = (int *)malloc( count * sizeof(int) );
/* OLD TEST WILL BREAK WITH LARGE NUMBERS OF TASKS... */
/*
-for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = i*size;
+for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = i*size;
*(out + i) = 0; }
*/
if (rank < MAX_SUM_RANK) {
- for (i=0; i<count; i++) {
- *(in + i) = i;
+ for (i=0; i<count; i++) {
+ *(in + i) = i;
*(sol + i) = i*size_max_sum_rank;
*(out + i) = 0; }
} else {
- for (i=0; i<count; i++) {
- *(in + i) = 0;
+ for (i=0; i<count; i++) {
+ *(in + i) = 0;
*(sol + i) = i*size_max_sum_rank;
*(out + i) = 0; }
- }
+ }
MPI_Allreduce( in, out, count, MPI_INT, MPI_SUM, MPI_COMM_WORLD );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_INT and op MPI_SUM\n", rank );
free( in );
free( out );
@@ -74,24 +74,24 @@ out = (long *)malloc( count * sizeof(long) );
sol = (long *)malloc( count * sizeof(long) );
/* OLD TEST WILL BREAK WITH LARGE NUMBERS OF TASKS... */
/*
-for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = i*size;
+for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = i*size;
*(out + i) = 0; }
*/
if (rank < MAX_SUM_RANK) {
- for (i=0; i<count; i++) {
- *(in + i) = i;
+ for (i=0; i<count; i++) {
+ *(in + i) = i;
*(sol + i) = i*size_max_sum_rank;
*(out + i) = 0; }
} else {
- for (i=0; i<count; i++) {
- *(in + i) = 0;
+ for (i=0; i<count; i++) {
+ *(in + i) = 0;
*(sol + i) = i*size_max_sum_rank;
*(out + i) = 0; }
- }
+ }
MPI_Allreduce( in, out, count, MPI_LONG, MPI_SUM, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG and op MPI_SUM\n", rank );
free( in );
free( out );
@@ -107,24 +107,24 @@ out = (short *)malloc( count * sizeof(short) );
sol = (short *)malloc( count * sizeof(short) );
/* OLD TEST WILL BREAK WITH LARGE NUMBERS OF TASKS... */
/*
-for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = i*size;
+for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = i*size;
*(out + i) = 0; }
*/
if (rank < MAX_SUM_RANK) {
- for (i=0; i<count; i++) {
- *(in + i) = i;
+ for (i=0; i<count; i++) {
+ *(in + i) = i;
*(sol + i) = i*size_max_sum_rank;
*(out + i) = 0; }
} else {
- for (i=0; i<count; i++) {
- *(in + i) = 0;
+ for (i=0; i<count; i++) {
+ *(in + i) = 0;
*(sol + i) = i*size_max_sum_rank;
*(out + i) = 0; }
- }
+ }
MPI_Allreduce( in, out, count, MPI_SHORT, MPI_SUM, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT and op MPI_SUM\n", rank );
free( in );
free( out );
@@ -140,24 +140,24 @@ out = (unsigned short *)malloc( count * sizeof(unsigned short) );
sol = (unsigned short *)malloc( count * sizeof(unsigned short) );
/* OLD TEST WILL BREAK WITH LARGE NUMBERS OF TASKS... */
/*
-for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = i*size;
+for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = i*size;
*(out + i) = 0; }
*/
if (rank < MAX_SUM_RANK) {
- for (i=0; i<count; i++) {
- *(in + i) = i;
+ for (i=0; i<count; i++) {
+ *(in + i) = i;
*(sol + i) = i*size_max_sum_rank;
*(out + i) = 0; }
} else {
- for (i=0; i<count; i++) {
- *(in + i) = 0;
+ for (i=0; i<count; i++) {
+ *(in + i) = 0;
*(sol + i) = i*size_max_sum_rank;
*(out + i) = 0; }
- }
+ }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_SHORT, MPI_SUM, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_SHORT and op MPI_SUM\n", rank );
free( in );
free( out );
@@ -173,24 +173,24 @@ out = (unsigned *)malloc( count * sizeof(unsigned) );
sol = (unsigned *)malloc( count * sizeof(unsigned) );
/* OLD TEST WILL BREAK WITH LARGE NUMBERS OF TASKS... */
/*
-for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = i*size;
+for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = i*size;
*(out + i) = 0; }
*/
if (rank < MAX_SUM_RANK) {
- for (i=0; i<count; i++) {
- *(in + i) = i;
+ for (i=0; i<count; i++) {
+ *(in + i) = i;
*(sol + i) = i*size_max_sum_rank;
*(out + i) = 0; }
} else {
- for (i=0; i<count; i++) {
- *(in + i) = 0;
+ for (i=0; i<count; i++) {
+ *(in + i) = 0;
*(sol + i) = i*size_max_sum_rank;
*(out + i) = 0; }
- }
+ }
MPI_Allreduce( in, out, count, MPI_UNSIGNED, MPI_SUM, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED and op MPI_SUM\n", rank );
free( in );
free( out );
@@ -206,24 +206,24 @@ out = (unsigned long *)malloc( count * sizeof(unsigned long) );
sol = (unsigned long *)malloc( count * sizeof(unsigned long) );
/* OLD TEST WILL BREAK WITH LARGE NUMBERS OF TASKS... */
/*
-for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = i*size;
+for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = i*size;
*(out + i) = 0; }
*/
if (rank < MAX_SUM_RANK) {
- for (i=0; i<count; i++) {
- *(in + i) = i;
+ for (i=0; i<count; i++) {
+ *(in + i) = i;
*(sol + i) = i*size_max_sum_rank;
*(out + i) = 0; }
} else {
- for (i=0; i<count; i++) {
- *(in + i) = 0;
+ for (i=0; i<count; i++) {
+ *(in + i) = 0;
*(sol + i) = i*size_max_sum_rank;
*(out + i) = 0; }
- }
+ }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_LONG, MPI_SUM, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_LONG and op MPI_SUM\n", rank );
free( in );
free( out );
@@ -239,24 +239,24 @@ out = (float *)malloc( count * sizeof(float) );
sol = (float *)malloc( count * sizeof(float) );
/* OLD TEST WILL BREAK WITH LARGE NUMBERS OF TASKS... */
/*
-for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = i*size;
+for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = i*size;
*(out + i) = 0; }
*/
if (rank < MAX_SUM_RANK) {
- for (i=0; i<count; i++) {
- *(in + i) = (float) i;
+ for (i=0; i<count; i++) {
+ *(in + i) = (float) i;
*(sol + i) = ((float) i)*((float) size_max_sum_rank);
*(out + i) = 0.0; }
} else {
- for (i=0; i<count; i++) {
- *(in + i) = 0.0;
+ for (i=0; i<count; i++) {
+ *(in + i) = 0.0;
*(sol + i) = ((float) i)*((float) size_max_sum_rank);
*(out + i) = 0.0; }
- }
+ }
MPI_Allreduce( in, out, count, MPI_FLOAT, MPI_SUM, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_FLOAT and op MPI_SUM\n", rank );
free( in );
free( out );
@@ -272,24 +272,24 @@ out = (double *)malloc( count * sizeof(double) );
sol = (double *)malloc( count * sizeof(double) );
/* OLD TEST WILL BREAK WITH LARGE NUMBERS OF TASKS... */
/*
-for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = i*size;
+for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = i*size;
*(out + i) = 0; }
*/
if (rank < MAX_SUM_RANK) {
- for (i=0; i<count; i++) {
- *(in + i) = (double) i;
+ for (i=0; i<count; i++) {
+ *(in + i) = (double) i;
*(sol + i) = ((double) i)*((double) size_max_sum_rank);
*(out + i) = 0.0; }
} else {
- for (i=0; i<count; i++) {
- *(in + i) = 0.0;
+ for (i=0; i<count; i++) {
+ *(in + i) = 0.0;
*(sol + i) = ((double) i)*((double) size_max_sum_rank);
*(out + i) = 0.0; }
- }
+ }
MPI_Allreduce( in, out, count, MPI_DOUBLE, MPI_SUM, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_DOUBLE and op MPI_SUM\n", rank );
free( in );
free( out );
@@ -315,28 +315,28 @@ out = (int *)malloc( count * sizeof(int) );
sol = (int *)malloc( count * sizeof(int) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = (i > 0) ? (int)(pow((double)(i),(double)size)+0.1) : 0;
+for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = (i > 0) ? (int)(pow((double)(i),(double)size)+0.1) : 0;
*(out + i) = 0; }
*/
if (rank < MAX_PROD_RANK) {
- for (i=0; i<count; i++) {
- *(in + i) = i;
+ for (i=0; i<count; i++) {
+ *(in + i) = i;
*(sol + i) = 1;
- for (j=0; j<size_max_prod_rank; j++) {
+ for (j=0; j<size_max_prod_rank; j++) {
*(sol + i) = (*(sol + i)) * i; }
*(out + i) = 0; }
} else {
- for (i=0; i<count; i++) {
- *(in + i) = 1;
+ for (i=0; i<count; i++) {
+ *(in + i) = 1;
*(sol + i) = 1;
- for (j=0; j<size_max_prod_rank; j++) {
+ for (j=0; j<size_max_prod_rank; j++) {
*(sol + i) = (*(sol + i)) * i; }
*(out + i) = 0; }
- }
+ }
MPI_Allreduce( in, out, count, MPI_INT, MPI_PROD, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_INT and op MPI_PROD\n", rank );
free( in );
free( out );
@@ -352,28 +352,28 @@ out = (long *)malloc( count * sizeof(long) );
sol = (long *)malloc( count * sizeof(long) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = (i > 0) ? (int)(pow((double)(i),(double)size)+0.1) : 0;
+for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = (i > 0) ? (int)(pow((double)(i),(double)size)+0.1) : 0;
*(out + i) = 0; }
*/
if (rank < MAX_PROD_RANK) {
- for (i=0; i<count; i++) {
- *(in + i) = i;
+ for (i=0; i<count; i++) {
+ *(in + i) = i;
*(sol + i) = 1;
- for (j=0; j<size_max_prod_rank; j++) {
+ for (j=0; j<size_max_prod_rank; j++) {
*(sol + i) = (*(sol + i)) * i; }
*(out + i) = 0; }
} else {
- for (i=0; i<count; i++) {
- *(in + i) = 1;
+ for (i=0; i<count; i++) {
+ *(in + i) = 1;
*(sol + i) = 1;
- for (j=0; j<size_max_prod_rank; j++) {
+ for (j=0; j<size_max_prod_rank; j++) {
*(sol + i) = (*(sol + i)) * i; }
*(out + i) = 0; }
- }
+ }
MPI_Allreduce( in, out, count, MPI_LONG, MPI_PROD, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG and op MPI_PROD\n", rank );
free( in );
free( out );
@@ -389,28 +389,28 @@ out = (short *)malloc( count * sizeof(short) );
sol = (short *)malloc( count * sizeof(short) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = (i > 0) ? (int)(pow((double)(i),(double)size)+0.1) : 0;
+for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = (i > 0) ? (int)(pow((double)(i),(double)size)+0.1) : 0;
*(out + i) = 0; }
*/
if (rank < MAX_PROD_RANK) {
- for (i=0; i<count; i++) {
- *(in + i) = i;
+ for (i=0; i<count; i++) {
+ *(in + i) = i;
*(sol + i) = 1;
- for (j=0; j<size_max_prod_rank; j++) {
+ for (j=0; j<size_max_prod_rank; j++) {
*(sol + i) = (*(sol + i)) * i; }
*(out + i) = 0; }
} else {
- for (i=0; i<count; i++) {
- *(in + i) = 1;
+ for (i=0; i<count; i++) {
+ *(in + i) = 1;
*(sol + i) = 1;
- for (j=0; j<size_max_prod_rank; j++) {
+ for (j=0; j<size_max_prod_rank; j++) {
*(sol + i) = (*(sol + i)) * i; }
*(out + i) = 0; }
- }
+ }
MPI_Allreduce( in, out, count, MPI_SHORT, MPI_PROD, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT and op MPI_PROD\n", rank );
free( in );
free( out );
@@ -426,28 +426,28 @@ out = (unsigned short *)malloc( count * sizeof(unsigned short) );
sol = (unsigned short *)malloc( count * sizeof(unsigned short) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = (i > 0) ? (int)(pow((double)(i),(double)size)+0.1) : 0;
+for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = (i > 0) ? (int)(pow((double)(i),(double)size)+0.1) : 0;
*(out + i) = 0; }
*/
if (rank < MAX_PROD_RANK) {
- for (i=0; i<count; i++) {
- *(in + i) = i;
+ for (i=0; i<count; i++) {
+ *(in + i) = i;
*(sol + i) = 1;
- for (j=0; j<size_max_prod_rank; j++) {
+ for (j=0; j<size_max_prod_rank; j++) {
*(sol + i) = (*(sol + i)) * i; }
*(out + i) = 0; }
} else {
- for (i=0; i<count; i++) {
- *(in + i) = 1;
+ for (i=0; i<count; i++) {
+ *(in + i) = 1;
*(sol + i) = 1;
- for (j=0; j<size_max_prod_rank; j++) {
+ for (j=0; j<size_max_prod_rank; j++) {
*(sol + i) = (*(sol + i)) * i; }
*(out + i) = 0; }
- }
+ }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_SHORT, MPI_PROD, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_SHORT and op MPI_PROD\n", rank );
free( in );
free( out );
@@ -463,28 +463,28 @@ out = (unsigned *)malloc( count * sizeof(unsigned) );
sol = (unsigned *)malloc( count * sizeof(unsigned) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = (i > 0) ? (int)(pow((double)(i),(double)size)+0.1) : 0;
+for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = (i > 0) ? (int)(pow((double)(i),(double)size)+0.1) : 0;
*(out + i) = 0; }
*/
if (rank < MAX_PROD_RANK) {
- for (i=0; i<count; i++) {
- *(in + i) = i;
+ for (i=0; i<count; i++) {
+ *(in + i) = i;
*(sol + i) = 1;
- for (j=0; j<size_max_prod_rank; j++) {
+ for (j=0; j<size_max_prod_rank; j++) {
*(sol + i) = (*(sol + i)) * i; }
*(out + i) = 0; }
} else {
- for (i=0; i<count; i++) {
- *(in + i) = 1;
+ for (i=0; i<count; i++) {
+ *(in + i) = 1;
*(sol + i) = 1;
- for (j=0; j<size_max_prod_rank; j++) {
+ for (j=0; j<size_max_prod_rank; j++) {
*(sol + i) = (*(sol + i)) * i; }
*(out + i) = 0; }
- }
+ }
MPI_Allreduce( in, out, count, MPI_UNSIGNED, MPI_PROD, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED and op MPI_PROD\n", rank );
free( in );
free( out );
@@ -500,28 +500,28 @@ out = (unsigned long *)malloc( count * sizeof(unsigned long) );
sol = (unsigned long *)malloc( count * sizeof(unsigned long) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = (i > 0) ? (int)(pow((double)(i),(double)size)+0.1) : 0;
+for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = (i > 0) ? (int)(pow((double)(i),(double)size)+0.1) : 0;
*(out + i) = 0; }
*/
if (rank < MAX_PROD_RANK) {
- for (i=0; i<count; i++) {
- *(in + i) = i;
+ for (i=0; i<count; i++) {
+ *(in + i) = i;
*(sol + i) = 1;
- for (j=0; j<size_max_prod_rank; j++) {
+ for (j=0; j<size_max_prod_rank; j++) {
*(sol + i) = (*(sol + i)) * i; }
*(out + i) = 0; }
} else {
- for (i=0; i<count; i++) {
- *(in + i) = 1;
+ for (i=0; i<count; i++) {
+ *(in + i) = 1;
*(sol + i) = 1;
- for (j=0; j<size_max_prod_rank; j++) {
+ for (j=0; j<size_max_prod_rank; j++) {
*(sol + i) = (*(sol + i)) * i; }
*(out + i) = 0; }
- }
+ }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_LONG, MPI_PROD, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_LONG and op MPI_PROD\n", rank );
free( in );
free( out );
@@ -537,28 +537,28 @@ out = (float *)malloc( count * sizeof(float) );
sol = (float *)malloc( count * sizeof(float) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = (i > 0) ? (int)(pow((double)(i),(double)size)+0.1) : 0;
+for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = (i > 0) ? (int)(pow((double)(i),(double)size)+0.1) : 0;
*(out + i) = 0; }
*/
if (rank < MAX_PROD_RANK) {
- for (i=0; i<count; i++) {
- *(in + i) = (float) i;
+ for (i=0; i<count; i++) {
+ *(in + i) = (float) i;
*(sol + i) = 1.0;
- for (j=0; j<size_max_prod_rank; j++) {
+ for (j=0; j<size_max_prod_rank; j++) {
*(sol + i) = (float) (*(sol + i)) * (float) i; }
*(out + i) = 0.0; }
} else {
- for (i=0; i<count; i++) {
- *(in + i) = 1.0;
+ for (i=0; i<count; i++) {
+ *(in + i) = 1.0;
*(sol + i) = (float) 1;
- for (j=0; j<size_max_prod_rank; j++) {
+ for (j=0; j<size_max_prod_rank; j++) {
*(sol + i) = (*(sol + i)) * (float) i; }
*(out + i) = 0.0; }
- }
+ }
MPI_Allreduce( in, out, count, MPI_FLOAT, MPI_PROD, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_FLOAT and op MPI_PROD\n", rank );
free( in );
free( out );
@@ -574,29 +574,29 @@ out = (double *)malloc( count * sizeof(double) );
sol = (double *)malloc( count * sizeof(double) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = (i > 0) ? (int)(pow((double)(i),(double)size)+0.1) : 0;
+for (i=0; i<count; i++) { *(in + i) = i; *(sol + i) = (i > 0) ? (int)(pow((double)(i),(double)size)+0.1) : 0;
*(out + i) = 0; }
*/
if (rank < MAX_PROD_RANK) {
- for (i=0; i<count; i++) {
- *(in + i) = (double) i;
+ for (i=0; i<count; i++) {
+ *(in + i) = (double) i;
*(sol + i) = 1.0;
- for (j=0; j<size_max_prod_rank; j++) {
+ for (j=0; j<size_max_prod_rank; j++) {
*(sol + i) = (double) (*(sol + i)) * (double) i; }
*(out + i) = 0.0; }
} else {
- for (i=0; i<count; i++) {
- *(in + i) = 1.0;
+ for (i=0; i<count; i++) {
+ *(in + i) = 1.0;
*(sol + i) = (double) 1;
- for (j=0; j<size_max_prod_rank; j++) {
+ for (j=0; j<size_max_prod_rank; j++) {
*(sol + i) = (*(sol + i)) * (double) i; }
*(out + i) = 0.0; }
- }
+ }
MPI_Allreduce( in, out, count, MPI_DOUBLE, MPI_PROD, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;
fprintf (stderr, "MPI_DOUBLE choked: got: %f; expected %f\n", *(out + i),*(sol + i));}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_DOUBLE and op MPI_PROD\n", rank );
free( in );
free( out );
@@ -621,11 +621,11 @@ int i, fnderr=0;
in = (int *)malloc( count * sizeof(int) );
out = (int *)malloc( count * sizeof(int) );
sol = (int *)malloc( count * sizeof(int) );
-for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = (size - 1 + i);
+for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = (size - 1 + i);
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_INT, MPI_MAX, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_INT and op MPI_MAX\n", rank );
free( in );
free( out );
@@ -639,11 +639,11 @@ int i, fnderr=0;
in = (long *)malloc( count * sizeof(long) );
out = (long *)malloc( count * sizeof(long) );
sol = (long *)malloc( count * sizeof(long) );
-for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = (size - 1 + i);
+for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = (size - 1 + i);
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_LONG, MPI_MAX, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG and op MPI_MAX\n", rank );
free( in );
free( out );
@@ -657,11 +657,11 @@ int i, fnderr=0;
in = (short *)malloc( count * sizeof(short) );
out = (short *)malloc( count * sizeof(short) );
sol = (short *)malloc( count * sizeof(short) );
-for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = (size - 1 + i);
+for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = (size - 1 + i);
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_SHORT, MPI_MAX, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT and op MPI_MAX\n", rank );
free( in );
free( out );
@@ -675,11 +675,11 @@ int i, fnderr=0;
in = (unsigned short *)malloc( count * sizeof(unsigned short) );
out = (unsigned short *)malloc( count * sizeof(unsigned short) );
sol = (unsigned short *)malloc( count * sizeof(unsigned short) );
-for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = (size - 1 + i);
+for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = (size - 1 + i);
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_SHORT, MPI_MAX, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_SHORT and op MPI_MAX\n", rank );
free( in );
free( out );
@@ -693,11 +693,11 @@ int i, fnderr=0;
in = (unsigned *)malloc( count * sizeof(unsigned) );
out = (unsigned *)malloc( count * sizeof(unsigned) );
sol = (unsigned *)malloc( count * sizeof(unsigned) );
-for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = (size - 1 + i);
+for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = (size - 1 + i);
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED, MPI_MAX, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED and op MPI_MAX\n", rank );
free( in );
free( out );
@@ -711,11 +711,11 @@ int i, fnderr=0;
in = (unsigned long *)malloc( count * sizeof(unsigned long) );
out = (unsigned long *)malloc( count * sizeof(unsigned long) );
sol = (unsigned long *)malloc( count * sizeof(unsigned long) );
-for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = (size - 1 + i);
+for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = (size - 1 + i);
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_LONG, MPI_MAX, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_LONG and op MPI_MAX\n", rank );
free( in );
free( out );
@@ -729,11 +729,11 @@ int i, fnderr=0;
in = (float *)malloc( count * sizeof(float) );
out = (float *)malloc( count * sizeof(float) );
sol = (float *)malloc( count * sizeof(float) );
-for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = (size - 1 + i);
+for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = (size - 1 + i);
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_FLOAT, MPI_MAX, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_FLOAT and op MPI_MAX\n", rank );
free( in );
free( out );
@@ -747,11 +747,11 @@ int i, fnderr=0;
in = (double *)malloc( count * sizeof(double) );
out = (double *)malloc( count * sizeof(double) );
sol = (double *)malloc( count * sizeof(double) );
-for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = (size - 1 + i);
+for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = (size - 1 + i);
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_DOUBLE, MPI_MAX, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_DOUBLE and op MPI_MAX\n", rank );
free( in );
free( out );
@@ -775,11 +775,11 @@ int i, fnderr=0;
in = (int *)malloc( count * sizeof(int) );
out = (int *)malloc( count * sizeof(int) );
sol = (int *)malloc( count * sizeof(int) );
-for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = i;
+for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = i;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_INT, MPI_MIN, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_INT and op MPI_MIN\n", rank );
free( in );
free( out );
@@ -793,11 +793,11 @@ int i, fnderr=0;
in = (long *)malloc( count * sizeof(long) );
out = (long *)malloc( count * sizeof(long) );
sol = (long *)malloc( count * sizeof(long) );
-for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = i;
+for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = i;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_LONG, MPI_MIN, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG and op MPI_MIN\n", rank );
free( in );
free( out );
@@ -811,11 +811,11 @@ int i, fnderr=0;
in = (short *)malloc( count * sizeof(short) );
out = (short *)malloc( count * sizeof(short) );
sol = (short *)malloc( count * sizeof(short) );
-for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = i;
+for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = i;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_SHORT, MPI_MIN, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT and op MPI_MIN\n", rank );
free( in );
free( out );
@@ -829,11 +829,11 @@ int i, fnderr=0;
in = (unsigned short *)malloc( count * sizeof(unsigned short) );
out = (unsigned short *)malloc( count * sizeof(unsigned short) );
sol = (unsigned short *)malloc( count * sizeof(unsigned short) );
-for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = i;
+for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = i;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_SHORT, MPI_MIN, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_SHORT and op MPI_MIN\n", rank );
free( in );
free( out );
@@ -847,11 +847,11 @@ int i, fnderr=0;
in = (unsigned *)malloc( count * sizeof(unsigned) );
out = (unsigned *)malloc( count * sizeof(unsigned) );
sol = (unsigned *)malloc( count * sizeof(unsigned) );
-for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = i;
+for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = i;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED, MPI_MIN, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED and op MPI_MIN\n", rank );
free( in );
free( out );
@@ -865,11 +865,11 @@ int i, fnderr=0;
in = (unsigned long *)malloc( count * sizeof(unsigned long) );
out = (unsigned long *)malloc( count * sizeof(unsigned long) );
sol = (unsigned long *)malloc( count * sizeof(unsigned long) );
-for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = i;
+for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = i;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_LONG, MPI_MIN, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_LONG and op MPI_MIN\n", rank );
free( in );
free( out );
@@ -883,11 +883,11 @@ int i, fnderr=0;
in = (float *)malloc( count * sizeof(float) );
out = (float *)malloc( count * sizeof(float) );
sol = (float *)malloc( count * sizeof(float) );
-for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = i;
+for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = i;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_FLOAT, MPI_MIN, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_FLOAT and op MPI_MIN\n", rank );
free( in );
free( out );
@@ -901,11 +901,11 @@ int i, fnderr=0;
in = (double *)malloc( count * sizeof(double) );
out = (double *)malloc( count * sizeof(double) );
sol = (double *)malloc( count * sizeof(double) );
-for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = i;
+for (i=0; i<count; i++) { *(in + i) = (rank + i); *(sol + i) = i;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_DOUBLE, MPI_MIN, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_DOUBLE and op MPI_MIN\n", rank );
free( in );
free( out );
@@ -933,7 +933,7 @@ out = (int *)malloc( count * sizeof(int) );
sol = (int *)malloc( count * sizeof(int) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = (size > 1);
+for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = (size > 1);
*(out + i) = 0; }
*/
if (rank) {
@@ -950,7 +950,7 @@ for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (!(*(out + i))) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_INT and op MPI_LOR\n", rank );
free( in );
free( out );
@@ -964,11 +964,11 @@ int i, fnderr=0;
in = (long *)malloc( count * sizeof(long) );
out = (long *)malloc( count * sizeof(long) );
sol = (long *)malloc( count * sizeof(long) );
-for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = (size > 1);
+for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = (size > 1);
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_LONG, MPI_LOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG and op MPI_LOR\n", rank );
free( in );
free( out );
@@ -982,11 +982,11 @@ int i, fnderr=0;
in = (short *)malloc( count * sizeof(short) );
out = (short *)malloc( count * sizeof(short) );
sol = (short *)malloc( count * sizeof(short) );
-for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = (size > 1);
+for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = (size > 1);
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_SHORT, MPI_LOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT and op MPI_LOR\n", rank );
free( in );
free( out );
@@ -1000,11 +1000,11 @@ int i, fnderr=0;
in = (unsigned short *)malloc( count * sizeof(unsigned short) );
out = (unsigned short *)malloc( count * sizeof(unsigned short) );
sol = (unsigned short *)malloc( count * sizeof(unsigned short) );
-for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = (size > 1);
+for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = (size > 1);
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_SHORT, MPI_LOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_SHORT and op MPI_LOR\n", rank );
free( in );
free( out );
@@ -1018,11 +1018,11 @@ int i, fnderr=0;
in = (unsigned *)malloc( count * sizeof(unsigned) );
out = (unsigned *)malloc( count * sizeof(unsigned) );
sol = (unsigned *)malloc( count * sizeof(unsigned) );
-for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = (size > 1);
+for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = (size > 1);
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED, MPI_LOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED and op MPI_LOR\n", rank );
free( in );
free( out );
@@ -1036,11 +1036,11 @@ int i, fnderr=0;
in = (unsigned long *)malloc( count * sizeof(unsigned long) );
out = (unsigned long *)malloc( count * sizeof(unsigned long) );
sol = (unsigned long *)malloc( count * sizeof(unsigned long) );
-for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = (size > 1);
+for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = (size > 1);
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_LONG, MPI_LOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_LONG and op MPI_LOR\n", rank );
free( in );
free( out );
@@ -1062,7 +1062,7 @@ out = (int *)malloc( count * sizeof(int) );
sol = (int *)malloc( count * sizeof(int) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
*(out + i) = 0; }
*/
for (i=0; i<count; i++) { *(in + i) = 0; *(out + i) = 0x1; }
@@ -1073,7 +1073,7 @@ MPI_Allreduce( in, out, count, MPI_INT, MPI_LOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (*(out + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_INT and op MPI_LOR\n", rank );
free( in );
free( out );
@@ -1089,7 +1089,7 @@ out = (long *)malloc( count * sizeof(long) );
sol = (long *)malloc( count * sizeof(long) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
*(out + i) = 0; }
*/
for (i=0; i<count; i++) { *(in + i) = 0; *(out + i) = 0x1; }
@@ -1100,7 +1100,7 @@ MPI_Allreduce( in, out, count, MPI_LONG, MPI_LOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (*(out + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG and op MPI_LOR\n", rank );
free( in );
free( out );
@@ -1116,7 +1116,7 @@ out = (short *)malloc( count * sizeof(short) );
sol = (short *)malloc( count * sizeof(short) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
*(out + i) = 0; }
*/
for (i=0; i<count; i++) { *(in + i) = 0; *(out + i) = 0x1; }
@@ -1127,7 +1127,7 @@ MPI_Allreduce( in, out, count, MPI_SHORT, MPI_LOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (*(out + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT and op MPI_LOR\n", rank );
free( in );
free( out );
@@ -1143,7 +1143,7 @@ out = (unsigned short *)malloc( count * sizeof(unsigned short) );
sol = (unsigned short *)malloc( count * sizeof(unsigned short) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
*(out + i) = 0; }
*/
for (i=0; i<count; i++) { *(in + i) = 0; *(out + i) = 0x1; }
@@ -1154,7 +1154,7 @@ MPI_Allreduce( in, out, count, MPI_UNSIGNED_SHORT, MPI_LOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (*(out + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_SHORT and op MPI_LOR\n", rank );
free( in );
free( out );
@@ -1170,7 +1170,7 @@ out = (unsigned *)malloc( count * sizeof(unsigned) );
sol = (unsigned *)malloc( count * sizeof(unsigned) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
*(out + i) = 0; }
*/
for (i=0; i<count; i++) { *(in + i) = 0; *(out + i) = 0x1; }
@@ -1181,7 +1181,7 @@ MPI_Allreduce( in, out, count, MPI_UNSIGNED, MPI_LOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (*(out + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED and op MPI_LOR\n", rank );
free( in );
free( out );
@@ -1197,7 +1197,7 @@ out = (unsigned long *)malloc( count * sizeof(unsigned long) );
sol = (unsigned long *)malloc( count * sizeof(unsigned long) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
*(out + i) = 0; }
*/
for (i=0; i<count; i++) { *(in + i) = 0; *(out + i) = 0x1; }
@@ -1208,7 +1208,7 @@ MPI_Allreduce( in, out, count, MPI_UNSIGNED_LONG, MPI_LOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (*(out + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_LONG and op MPI_LOR\n", rank );
free( in );
free( out );
@@ -1234,7 +1234,7 @@ out = (int *)malloc( count * sizeof(int) );
sol = (int *)malloc( count * sizeof(int) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = (rank == 1); *(sol + i) = (size > 1);
+for (i=0; i<count; i++) { *(in + i) = (rank == 1); *(sol + i) = (size > 1);
*(out + i) = 0; }
*/
if (rank == 1) {
@@ -1248,7 +1248,7 @@ MPI_Allreduce( in, out, count, MPI_INT, MPI_LXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (!(*(out + i))) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_INT and op MPI_LXOR\n", rank);
free( in );
free( out );
@@ -1262,11 +1262,11 @@ int i, fnderr=0;
in = (long *)malloc( count * sizeof(long) );
out = (long *)malloc( count * sizeof(long) );
sol = (long *)malloc( count * sizeof(long) );
-for (i=0; i<count; i++) { *(in + i) = (rank == 1); *(sol + i) = (size > 1);
+for (i=0; i<count; i++) { *(in + i) = (rank == 1); *(sol + i) = (size > 1);
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_LONG, MPI_LXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG and op MPI_LXOR\n", rank );
free( in );
free( out );
@@ -1280,11 +1280,11 @@ int i, fnderr=0;
in = (short *)malloc( count * sizeof(short) );
out = (short *)malloc( count * sizeof(short) );
sol = (short *)malloc( count * sizeof(short) );
-for (i=0; i<count; i++) { *(in + i) = (rank == 1); *(sol + i) = (size > 1);
+for (i=0; i<count; i++) { *(in + i) = (rank == 1); *(sol + i) = (size > 1);
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_SHORT, MPI_LXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT and op MPI_LXOR\n", rank );
free( in );
free( out );
@@ -1298,11 +1298,11 @@ int i, fnderr=0;
in = (unsigned short *)malloc( count * sizeof(unsigned short) );
out = (unsigned short *)malloc( count * sizeof(unsigned short) );
sol = (unsigned short *)malloc( count * sizeof(unsigned short) );
-for (i=0; i<count; i++) { *(in + i) = (rank == 1); *(sol + i) = (size > 1);
+for (i=0; i<count; i++) { *(in + i) = (rank == 1); *(sol + i) = (size > 1);
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_SHORT, MPI_LXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_SHORT and op MPI_LXOR\n", rank );
free( in );
free( out );
@@ -1316,11 +1316,11 @@ int i, fnderr=0;
in = (unsigned *)malloc( count * sizeof(unsigned) );
out = (unsigned *)malloc( count * sizeof(unsigned) );
sol = (unsigned *)malloc( count * sizeof(unsigned) );
-for (i=0; i<count; i++) { *(in + i) = (rank == 1); *(sol + i) = (size > 1);
+for (i=0; i<count; i++) { *(in + i) = (rank == 1); *(sol + i) = (size > 1);
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED, MPI_LXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED and op MPI_LXOR\n", rank );
free( in );
free( out );
@@ -1334,11 +1334,11 @@ int i, fnderr=0;
in = (unsigned long *)malloc( count * sizeof(unsigned long) );
out = (unsigned long *)malloc( count * sizeof(unsigned long) );
sol = (unsigned long *)malloc( count * sizeof(unsigned long) );
-for (i=0; i<count; i++) { *(in + i) = (rank == 1); *(sol + i) = (size > 1);
+for (i=0; i<count; i++) { *(in + i) = (rank == 1); *(sol + i) = (size > 1);
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_LONG, MPI_LXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_LONG and op MPI_LXOR\n", rank );
free( in );
free( out );
@@ -1358,11 +1358,11 @@ int i, fnderr=0;
in = (int *)malloc( count * sizeof(int) );
out = (int *)malloc( count * sizeof(int) );
sol = (int *)malloc( count * sizeof(int) );
-for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_INT, MPI_LXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_INT and op MPI_LXOR\n", rank );
free( in );
free( out );
@@ -1376,11 +1376,11 @@ int i, fnderr=0;
in = (long *)malloc( count * sizeof(long) );
out = (long *)malloc( count * sizeof(long) );
sol = (long *)malloc( count * sizeof(long) );
-for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_LONG, MPI_LXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG and op MPI_LXOR\n", rank );
free( in );
free( out );
@@ -1394,11 +1394,11 @@ int i, fnderr=0;
in = (short *)malloc( count * sizeof(short) );
out = (short *)malloc( count * sizeof(short) );
sol = (short *)malloc( count * sizeof(short) );
-for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_SHORT, MPI_LXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT and op MPI_LXOR\n", rank );
free( in );
free( out );
@@ -1412,11 +1412,11 @@ int i, fnderr=0;
in = (unsigned short *)malloc( count * sizeof(unsigned short) );
out = (unsigned short *)malloc( count * sizeof(unsigned short) );
sol = (unsigned short *)malloc( count * sizeof(unsigned short) );
-for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_SHORT, MPI_LXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_SHORT and op MPI_LXOR\n", rank );
free( in );
free( out );
@@ -1430,11 +1430,11 @@ int i, fnderr=0;
in = (unsigned *)malloc( count * sizeof(unsigned) );
out = (unsigned *)malloc( count * sizeof(unsigned) );
sol = (unsigned *)malloc( count * sizeof(unsigned) );
-for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED, MPI_LXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED and op MPI_LXOR\n", rank );
free( in );
free( out );
@@ -1448,11 +1448,11 @@ int i, fnderr=0;
in = (unsigned long *)malloc( count * sizeof(unsigned long) );
out = (unsigned long *)malloc( count * sizeof(unsigned long) );
sol = (unsigned long *)malloc( count * sizeof(unsigned long) );
-for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_LONG, MPI_LXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_LONG and op MPI_LXOR\n", rank );
free( in );
free( out );
@@ -1472,11 +1472,11 @@ int i, fnderr=0;
in = (int *)malloc( count * sizeof(int) );
out = (int *)malloc( count * sizeof(int) );
sol = (int *)malloc( count * sizeof(int) );
-for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_INT, MPI_LXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_INT and op MPI_LXOR\n", rank );
free( in );
free( out );
@@ -1490,11 +1490,11 @@ int i, fnderr=0;
in = (long *)malloc( count * sizeof(long) );
out = (long *)malloc( count * sizeof(long) );
sol = (long *)malloc( count * sizeof(long) );
-for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_LONG, MPI_LXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG and op MPI_LXOR\n", rank );
free( in );
free( out );
@@ -1508,11 +1508,11 @@ int i, fnderr=0;
in = (short *)malloc( count * sizeof(short) );
out = (short *)malloc( count * sizeof(short) );
sol = (short *)malloc( count * sizeof(short) );
-for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_SHORT, MPI_LXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT and op MPI_LXOR\n", rank );
free( in );
free( out );
@@ -1526,11 +1526,11 @@ int i, fnderr=0;
in = (unsigned short *)malloc( count * sizeof(unsigned short) );
out = (unsigned short *)malloc( count * sizeof(unsigned short) );
sol = (unsigned short *)malloc( count * sizeof(unsigned short) );
-for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_SHORT, MPI_LXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_SHORT and op MPI_LXOR\n", rank );
free( in );
free( out );
@@ -1544,11 +1544,11 @@ int i, fnderr=0;
in = (unsigned *)malloc( count * sizeof(unsigned) );
out = (unsigned *)malloc( count * sizeof(unsigned) );
sol = (unsigned *)malloc( count * sizeof(unsigned) );
-for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED, MPI_LXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED and op MPI_LXOR\n", rank );
free( in );
free( out );
@@ -1562,11 +1562,11 @@ int i, fnderr=0;
in = (unsigned long *)malloc( count * sizeof(unsigned long) );
out = (unsigned long *)malloc( count * sizeof(unsigned long) );
sol = (unsigned long *)malloc( count * sizeof(unsigned long) );
-for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_LONG, MPI_LXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_LONG and op MPI_LXOR\n", rank );
free( in );
free( out );
@@ -1592,7 +1592,7 @@ out = (int *)malloc( count * sizeof(int) );
sol = (int *)malloc( count * sizeof(int) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = 0;
*(out + i) = 0; }
*/
for (i=0; i<count; i++) { *(in + i) = 0x1; *(out + i) = 0; }
@@ -1604,7 +1604,7 @@ for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (!(*(out + i))) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_INT and op MPI_LAND\n", rank );
free( in );
free( out );
@@ -1620,7 +1620,7 @@ out = (long *)malloc( count * sizeof(long) );
sol = (long *)malloc( count * sizeof(long) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = 0;
*(out + i) = 0; }
*/
for (i=0; i<count; i++) { *(in + i) = 0x1; *(out + i) = 0; }
@@ -1632,7 +1632,7 @@ for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (!(*(out + i))) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG and op MPI_LAND\n", rank );
free( in );
free( out );
@@ -1648,7 +1648,7 @@ out = (short *)malloc( count * sizeof(short) );
sol = (short *)malloc( count * sizeof(short) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = 0;
*(out + i) = 0; }
*/
for (i=0; i<count; i++) { *(in + i) = 0x1; *(out + i) = 0; }
@@ -1660,7 +1660,7 @@ for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (!(*(out + i))) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT and op MPI_LAND\n", rank );
free( in );
free( out );
@@ -1676,7 +1676,7 @@ out = (unsigned short *)malloc( count * sizeof(unsigned short) );
sol = (unsigned short *)malloc( count * sizeof(unsigned short) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = 0;
*(out + i) = 0; }
*/
for (i=0; i<count; i++) { *(in + i) = 0x1; *(out + i) = 0; }
@@ -1688,7 +1688,7 @@ for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (!(*(out + i))) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_SHORT and op MPI_LAND\n", rank );
free( in );
free( out );
@@ -1705,7 +1705,7 @@ sol = (unsigned *)malloc( count * sizeof(unsigned) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/* BUT NOT THIS ONE - CHANGING IT ANYWAY... */
/*
-for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = 0;
*(out + i) = 0; }
*/
for (i=0; i<count; i++) { *(in + i) = 0x1; *(out + i) = 0; }
@@ -1718,7 +1718,7 @@ for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (!(*(out + i))) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED and op MPI_LAND\n", rank );
free( in );
free( out );
@@ -1734,7 +1734,7 @@ out = (unsigned long *)malloc( count * sizeof(unsigned long) );
sol = (unsigned long *)malloc( count * sizeof(unsigned long) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = (rank & 0x1); *(sol + i) = 0;
*(out + i) = 0; }
*/
for (i=0; i<count; i++) { *(in + i) = 0x1; *(out + i) = 0; }
@@ -1746,7 +1746,7 @@ for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (!(*(out + i))) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_LONG and op MPI_LAND\n", rank );
free( in );
free( out );
@@ -1768,7 +1768,7 @@ out = (int *)malloc( count * sizeof(int) );
sol = (int *)malloc( count * sizeof(int) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 1;
+for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 1;
*(out + i) = 0; }
*/
for (i=0; i<count; i++) { *(in + i) = 0; *(out + i) = 0x1; }
@@ -1780,7 +1780,7 @@ for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (*(out + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_INT and op MPI_LAND\n", rank );
free( in );
free( out );
@@ -1796,7 +1796,7 @@ out = (long *)malloc( count * sizeof(long) );
sol = (long *)malloc( count * sizeof(long) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 1;
+for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 1;
*(out + i) = 0; }
*/
for (i=0; i<count; i++) { *(in + i) = 0; *(out + i) = 0x1; }
@@ -1808,7 +1808,7 @@ for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (*(out + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG and op MPI_LAND\n", rank );
free( in );
free( out );
@@ -1824,7 +1824,7 @@ out = (short *)malloc( count * sizeof(short) );
sol = (short *)malloc( count * sizeof(short) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 1;
+for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 1;
*(out + i) = 0; }
*/
for (i=0; i<count; i++) { *(in + i) = 0; *(out + i) = 0x1; }
@@ -1836,7 +1836,7 @@ for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (*(out + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT and op MPI_LAND\n", rank );
free( in );
free( out );
@@ -1852,7 +1852,7 @@ out = (unsigned short *)malloc( count * sizeof(unsigned short) );
sol = (unsigned short *)malloc( count * sizeof(unsigned short) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 1;
+for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 1;
*(out + i) = 0; }
*/
for (i=0; i<count; i++) { *(in + i) = 0; *(out + i) = 0x1; }
@@ -1863,10 +1863,10 @@ MPI_Allreduce( in, out, count, MPI_UNSIGNED_SHORT, MPI_LAND, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (*(out + i)) {errcnt++; fnderr++;
-fprintf( stderr,
+fprintf( stderr,
"(%d) MPI_UNSIGNED_SHORT MPI_LAND index %d\n", rank, i );}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_SHORT and op MPI_LAND\n", rank );
free( in );
free( out );
@@ -1882,7 +1882,7 @@ out = (unsigned *)malloc( count * sizeof(unsigned) );
sol = (unsigned *)malloc( count * sizeof(unsigned) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 1;
+for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 1;
*(out + i) = 0; }
*/
for (i=0; i<count; i++) { *(in + i) = 0; *(out + i) = 0x1; }
@@ -1894,7 +1894,7 @@ for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (*(out + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED and op MPI_LAND\n", rank );
free( in );
free( out );
@@ -1910,7 +1910,7 @@ out = (unsigned long *)malloc( count * sizeof(unsigned long) );
sol = (unsigned long *)malloc( count * sizeof(unsigned long) );
/* OLD TEST SEEMS TO BE BROKEN AT LEAST ON BlueGeneL... */
/*
-for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 1;
+for (i=0; i<count; i++) { *(in + i) = 1; *(sol + i) = 1;
*(out + i) = 0; }
*/
for (i=0; i<count; i++) { *(in + i) = 0; *(out + i) = 0x1; }
@@ -1922,7 +1922,7 @@ for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
*/
for (i=0; i<count; i++) { if (*(out + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_LONG and op MPI_LAND\n", rank );
free( in );
free( out );
@@ -1948,11 +1948,11 @@ int i, fnderr=0;
in = (int *)malloc( count * sizeof(int) );
out = (int *)malloc( count * sizeof(int) );
sol = (int *)malloc( count * sizeof(int) );
-for (i=0; i<count; i++) { *(in + i) = rank & 0x3; *(sol + i) = (size < 3) ? size - 1 : 0x3;
+for (i=0; i<count; i++) { *(in + i) = rank & 0x3; *(sol + i) = (size < 3) ? size - 1 : 0x3;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_INT, MPI_BOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_INT and op MPI_BOR\n", rank );
free( in );
free( out );
@@ -1966,11 +1966,11 @@ int i, fnderr=0;
in = (long *)malloc( count * sizeof(long) );
out = (long *)malloc( count * sizeof(long) );
sol = (long *)malloc( count * sizeof(long) );
-for (i=0; i<count; i++) { *(in + i) = rank & 0x3; *(sol + i) = (size < 3) ? size - 1 : 0x3;
+for (i=0; i<count; i++) { *(in + i) = rank & 0x3; *(sol + i) = (size < 3) ? size - 1 : 0x3;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_LONG, MPI_BOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG and op MPI_BOR\n", rank );
free( in );
free( out );
@@ -1984,11 +1984,11 @@ int i, fnderr=0;
in = (short *)malloc( count * sizeof(short) );
out = (short *)malloc( count * sizeof(short) );
sol = (short *)malloc( count * sizeof(short) );
-for (i=0; i<count; i++) { *(in + i) = rank & 0x3; *(sol + i) = (size < 3) ? size - 1 : 0x3;
+for (i=0; i<count; i++) { *(in + i) = rank & 0x3; *(sol + i) = (size < 3) ? size - 1 : 0x3;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_SHORT, MPI_BOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT and op MPI_BOR\n", rank );
free( in );
free( out );
@@ -2002,11 +2002,11 @@ int i, fnderr=0;
in = (unsigned short *)malloc( count * sizeof(unsigned short) );
out = (unsigned short *)malloc( count * sizeof(unsigned short) );
sol = (unsigned short *)malloc( count * sizeof(unsigned short) );
-for (i=0; i<count; i++) { *(in + i) = rank & 0x3; *(sol + i) = (size < 3) ? size - 1 : 0x3;
+for (i=0; i<count; i++) { *(in + i) = rank & 0x3; *(sol + i) = (size < 3) ? size - 1 : 0x3;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_SHORT, MPI_BOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_SHORT and op MPI_BOR\n", rank );
free( in );
free( out );
@@ -2020,11 +2020,11 @@ int i, fnderr=0;
in = (unsigned *)malloc( count * sizeof(unsigned) );
out = (unsigned *)malloc( count * sizeof(unsigned) );
sol = (unsigned *)malloc( count * sizeof(unsigned) );
-for (i=0; i<count; i++) { *(in + i) = rank & 0x3; *(sol + i) = (size < 3) ? size - 1 : 0x3;
+for (i=0; i<count; i++) { *(in + i) = rank & 0x3; *(sol + i) = (size < 3) ? size - 1 : 0x3;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED, MPI_BOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED and op MPI_BOR\n", rank );
free( in );
free( out );
@@ -2038,11 +2038,11 @@ int i, fnderr=0;
in = (unsigned long *)malloc( count * sizeof(unsigned long) );
out = (unsigned long *)malloc( count * sizeof(unsigned long) );
sol = (unsigned long *)malloc( count * sizeof(unsigned long) );
-for (i=0; i<count; i++) { *(in + i) = rank & 0x3; *(sol + i) = (size < 3) ? size - 1 : 0x3;
+for (i=0; i<count; i++) { *(in + i) = rank & 0x3; *(sol + i) = (size < 3) ? size - 1 : 0x3;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_LONG, MPI_BOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_LONG and op MPI_BOR\n", rank );
free( in );
free( out );
@@ -2056,11 +2056,11 @@ int i, fnderr=0;
in = (unsigned char *)malloc( count * sizeof(unsigned char) );
out = (unsigned char *)malloc( count * sizeof(unsigned char) );
sol = (unsigned char *)malloc( count * sizeof(unsigned char) );
-for (i=0; i<count; i++) { *(in + i) = rank & 0x3; *(sol + i) = (size < 3) ? size - 1 : 0x3;
+for (i=0; i<count; i++) { *(in + i) = rank & 0x3; *(sol + i) = (size < 3) ? size - 1 : 0x3;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_BYTE, MPI_BOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_BYTE and op MPI_BOR\n", rank );
free( in );
free( out );
@@ -2084,11 +2084,11 @@ int i, fnderr=0;
in = (int *)malloc( count * sizeof(int) );
out = (int *)malloc( count * sizeof(int) );
sol = (int *)malloc( count * sizeof(int) );
-for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : ~0); *(sol + i) = i;
+for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : ~0); *(sol + i) = i;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_INT, MPI_BAND, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_INT and op MPI_BAND\n", rank );
free( in );
free( out );
@@ -2102,11 +2102,11 @@ int i, fnderr=0;
in = (long *)malloc( count * sizeof(long) );
out = (long *)malloc( count * sizeof(long) );
sol = (long *)malloc( count * sizeof(long) );
-for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : ~0); *(sol + i) = i;
+for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : ~0); *(sol + i) = i;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_LONG, MPI_BAND, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG and op MPI_BAND\n", rank );
free( in );
free( out );
@@ -2120,11 +2120,11 @@ int i, fnderr=0;
in = (short *)malloc( count * sizeof(short) );
out = (short *)malloc( count * sizeof(short) );
sol = (short *)malloc( count * sizeof(short) );
-for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : ~0); *(sol + i) = i;
+for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : ~0); *(sol + i) = i;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_SHORT, MPI_BAND, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT and op MPI_BAND\n", rank );
free( in );
free( out );
@@ -2138,11 +2138,11 @@ int i, fnderr=0;
in = (unsigned short *)malloc( count * sizeof(unsigned short) );
out = (unsigned short *)malloc( count * sizeof(unsigned short) );
sol = (unsigned short *)malloc( count * sizeof(unsigned short) );
-for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : ~0); *(sol + i) = i;
+for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : ~0); *(sol + i) = i;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_SHORT, MPI_BAND, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_SHORT and op MPI_BAND\n", rank );
free( in );
free( out );
@@ -2156,11 +2156,11 @@ int i, fnderr=0;
in = (unsigned *)malloc( count * sizeof(unsigned) );
out = (unsigned *)malloc( count * sizeof(unsigned) );
sol = (unsigned *)malloc( count * sizeof(unsigned) );
-for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : ~0); *(sol + i) = i;
+for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : ~0); *(sol + i) = i;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED, MPI_BAND, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED and op MPI_BAND\n", rank );
free( in );
free( out );
@@ -2174,11 +2174,11 @@ int i, fnderr=0;
in = (unsigned long *)malloc( count * sizeof(unsigned long) );
out = (unsigned long *)malloc( count * sizeof(unsigned long) );
sol = (unsigned long *)malloc( count * sizeof(unsigned long) );
-for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : ~0); *(sol + i) = i;
+for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : ~0); *(sol + i) = i;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_LONG, MPI_BAND, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_LONG and op MPI_BAND\n", rank );
free( in );
free( out );
@@ -2192,11 +2192,11 @@ int i, fnderr=0;
in = (unsigned char *)malloc( count * sizeof(unsigned char) );
out = (unsigned char *)malloc( count * sizeof(unsigned char) );
sol = (unsigned char *)malloc( count * sizeof(unsigned char) );
-for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : ~0); *(sol + i) = i;
+for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : ~0); *(sol + i) = i;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_BYTE, MPI_BAND, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_BYTE and op MPI_BAND\n", rank );
free( in );
free( out );
@@ -2216,11 +2216,11 @@ int i, fnderr=0;
in = (int *)malloc( count * sizeof(int) );
out = (int *)malloc( count * sizeof(int) );
sol = (int *)malloc( count * sizeof(int) );
-for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : 0); *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : 0); *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_INT, MPI_BAND, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_INT and op MPI_BAND\n", rank );
free( in );
free( out );
@@ -2234,11 +2234,11 @@ int i, fnderr=0;
in = (long *)malloc( count * sizeof(long) );
out = (long *)malloc( count * sizeof(long) );
sol = (long *)malloc( count * sizeof(long) );
-for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : 0); *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : 0); *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_LONG, MPI_BAND, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG and op MPI_BAND\n", rank );
free( in );
free( out );
@@ -2252,11 +2252,11 @@ int i, fnderr=0;
in = (short *)malloc( count * sizeof(short) );
out = (short *)malloc( count * sizeof(short) );
sol = (short *)malloc( count * sizeof(short) );
-for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : 0); *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : 0); *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_SHORT, MPI_BAND, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT and op MPI_BAND\n", rank );
free( in );
free( out );
@@ -2270,11 +2270,11 @@ int i, fnderr=0;
in = (unsigned short *)malloc( count * sizeof(unsigned short) );
out = (unsigned short *)malloc( count * sizeof(unsigned short) );
sol = (unsigned short *)malloc( count * sizeof(unsigned short) );
-for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : 0); *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : 0); *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_SHORT, MPI_BAND, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_SHORT and op MPI_BAND\n", rank );
free( in );
free( out );
@@ -2288,11 +2288,11 @@ int i, fnderr=0;
in = (unsigned *)malloc( count * sizeof(unsigned) );
out = (unsigned *)malloc( count * sizeof(unsigned) );
sol = (unsigned *)malloc( count * sizeof(unsigned) );
-for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : 0); *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : 0); *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED, MPI_BAND, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED and op MPI_BAND\n", rank );
free( in );
free( out );
@@ -2306,11 +2306,11 @@ int i, fnderr=0;
in = (unsigned long *)malloc( count * sizeof(unsigned long) );
out = (unsigned long *)malloc( count * sizeof(unsigned long) );
sol = (unsigned long *)malloc( count * sizeof(unsigned long) );
-for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : 0); *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = (rank == size-1 ? i : 0); *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_LONG, MPI_BAND, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_LONG and op MPI_BAND\n", rank );
free( in );
free( out );
@@ -2334,11 +2334,11 @@ int i, fnderr=0;
in = (int *)malloc( count * sizeof(int) );
out = (int *)malloc( count * sizeof(int) );
sol = (int *)malloc( count * sizeof(int) );
-for (i=0; i<count; i++) { *(in + i) = (rank == 1)*0xf0 ; *(sol + i) = (size > 1)*0xf0 ;
+for (i=0; i<count; i++) { *(in + i) = (rank == 1)*0xf0 ; *(sol + i) = (size > 1)*0xf0 ;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_INT, MPI_BXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_INT and op MPI_BXOR\n", rank );
free( in );
free( out );
@@ -2352,11 +2352,11 @@ int i, fnderr=0;
in = (long *)malloc( count * sizeof(long) );
out = (long *)malloc( count * sizeof(long) );
sol = (long *)malloc( count * sizeof(long) );
-for (i=0; i<count; i++) { *(in + i) = (rank == 1)*0xf0 ; *(sol + i) = (size > 1)*0xf0 ;
+for (i=0; i<count; i++) { *(in + i) = (rank == 1)*0xf0 ; *(sol + i) = (size > 1)*0xf0 ;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_LONG, MPI_BXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG and op MPI_BXOR\n", rank );
free( in );
free( out );
@@ -2370,11 +2370,11 @@ int i, fnderr=0;
in = (short *)malloc( count * sizeof(short) );
out = (short *)malloc( count * sizeof(short) );
sol = (short *)malloc( count * sizeof(short) );
-for (i=0; i<count; i++) { *(in + i) = (rank == 1)*0xf0 ; *(sol + i) = (size > 1)*0xf0 ;
+for (i=0; i<count; i++) { *(in + i) = (rank == 1)*0xf0 ; *(sol + i) = (size > 1)*0xf0 ;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_SHORT, MPI_BXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT and op MPI_BXOR\n", rank );
free( in );
free( out );
@@ -2388,11 +2388,11 @@ int i, fnderr=0;
in = (unsigned short *)malloc( count * sizeof(unsigned short) );
out = (unsigned short *)malloc( count * sizeof(unsigned short) );
sol = (unsigned short *)malloc( count * sizeof(unsigned short) );
-for (i=0; i<count; i++) { *(in + i) = (rank == 1)*0xf0 ; *(sol + i) = (size > 1)*0xf0 ;
+for (i=0; i<count; i++) { *(in + i) = (rank == 1)*0xf0 ; *(sol + i) = (size > 1)*0xf0 ;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_SHORT, MPI_BXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_SHORT and op MPI_BXOR\n", rank );
free( in );
free( out );
@@ -2406,11 +2406,11 @@ int i, fnderr=0;
in = (unsigned *)malloc( count * sizeof(unsigned) );
out = (unsigned *)malloc( count * sizeof(unsigned) );
sol = (unsigned *)malloc( count * sizeof(unsigned) );
-for (i=0; i<count; i++) { *(in + i) = (rank == 1)*0xf0 ; *(sol + i) = (size > 1)*0xf0 ;
+for (i=0; i<count; i++) { *(in + i) = (rank == 1)*0xf0 ; *(sol + i) = (size > 1)*0xf0 ;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED, MPI_BXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED and op MPI_BXOR\n", rank );
free( in );
free( out );
@@ -2424,11 +2424,11 @@ int i, fnderr=0;
in = (unsigned long *)malloc( count * sizeof(unsigned long) );
out = (unsigned long *)malloc( count * sizeof(unsigned long) );
sol = (unsigned long *)malloc( count * sizeof(unsigned long) );
-for (i=0; i<count; i++) { *(in + i) = (rank == 1)*0xf0 ; *(sol + i) = (size > 1)*0xf0 ;
+for (i=0; i<count; i++) { *(in + i) = (rank == 1)*0xf0 ; *(sol + i) = (size > 1)*0xf0 ;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_LONG, MPI_BXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_LONG and op MPI_BXOR\n", rank );
free( in );
free( out );
@@ -2448,11 +2448,11 @@ int i, fnderr=0;
in = (int *)malloc( count * sizeof(int) );
out = (int *)malloc( count * sizeof(int) );
sol = (int *)malloc( count * sizeof(int) );
-for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_INT, MPI_BXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_INT and op MPI_BXOR\n", rank );
free( in );
free( out );
@@ -2466,11 +2466,11 @@ int i, fnderr=0;
in = (long *)malloc( count * sizeof(long) );
out = (long *)malloc( count * sizeof(long) );
sol = (long *)malloc( count * sizeof(long) );
-for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_LONG, MPI_BXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG and op MPI_BXOR\n", rank );
free( in );
free( out );
@@ -2484,11 +2484,11 @@ int i, fnderr=0;
in = (short *)malloc( count * sizeof(short) );
out = (short *)malloc( count * sizeof(short) );
sol = (short *)malloc( count * sizeof(short) );
-for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_SHORT, MPI_BXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT and op MPI_BXOR\n", rank );
free( in );
free( out );
@@ -2502,11 +2502,11 @@ int i, fnderr=0;
in = (unsigned short *)malloc( count * sizeof(unsigned short) );
out = (unsigned short *)malloc( count * sizeof(unsigned short) );
sol = (unsigned short *)malloc( count * sizeof(unsigned short) );
-for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_SHORT, MPI_BXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_SHORT and op MPI_BXOR\n", rank );
free( in );
free( out );
@@ -2520,11 +2520,11 @@ int i, fnderr=0;
in = (unsigned *)malloc( count * sizeof(unsigned) );
out = (unsigned *)malloc( count * sizeof(unsigned) );
sol = (unsigned *)malloc( count * sizeof(unsigned) );
-for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED, MPI_BXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED and op MPI_BXOR\n", rank );
free( in );
free( out );
@@ -2538,11 +2538,11 @@ int i, fnderr=0;
in = (unsigned long *)malloc( count * sizeof(unsigned long) );
out = (unsigned long *)malloc( count * sizeof(unsigned long) );
sol = (unsigned long *)malloc( count * sizeof(unsigned long) );
-for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = 0; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_LONG, MPI_BXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_LONG and op MPI_BXOR\n", rank );
free( in );
free( out );
@@ -2562,11 +2562,11 @@ int i, fnderr=0;
in = (int *)malloc( count * sizeof(int) );
out = (int *)malloc( count * sizeof(int) );
sol = (int *)malloc( count * sizeof(int) );
-for (i=0; i<count; i++) { *(in + i) = ~0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = ~0; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_INT, MPI_BXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_INT and op MPI_BXOR\n", rank );
free( in );
free( out );
@@ -2580,11 +2580,11 @@ int i, fnderr=0;
in = (long *)malloc( count * sizeof(long) );
out = (long *)malloc( count * sizeof(long) );
sol = (long *)malloc( count * sizeof(long) );
-for (i=0; i<count; i++) { *(in + i) = ~0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = ~0; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_LONG, MPI_BXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG and op MPI_BXOR\n", rank );
free( in );
free( out );
@@ -2598,11 +2598,11 @@ int i, fnderr=0;
in = (short *)malloc( count * sizeof(short) );
out = (short *)malloc( count * sizeof(short) );
sol = (short *)malloc( count * sizeof(short) );
-for (i=0; i<count; i++) { *(in + i) = ~0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = ~0; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_SHORT, MPI_BXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT and op MPI_BXOR\n", rank );
free( in );
free( out );
@@ -2616,11 +2616,11 @@ int i, fnderr=0;
in = (unsigned short *)malloc( count * sizeof(unsigned short) );
out = (unsigned short *)malloc( count * sizeof(unsigned short) );
sol = (unsigned short *)malloc( count * sizeof(unsigned short) );
-for (i=0; i<count; i++) { *(in + i) = ~0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = ~0; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_SHORT, MPI_BXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_SHORT and op MPI_BXOR\n", rank );
free( in );
free( out );
@@ -2634,11 +2634,11 @@ int i, fnderr=0;
in = (unsigned *)malloc( count * sizeof(unsigned) );
out = (unsigned *)malloc( count * sizeof(unsigned) );
sol = (unsigned *)malloc( count * sizeof(unsigned) );
-for (i=0; i<count; i++) { *(in + i) = ~0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = ~0; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED, MPI_BXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED and op MPI_BXOR\n", rank );
free( in );
free( out );
@@ -2652,11 +2652,11 @@ int i, fnderr=0;
in = (unsigned long *)malloc( count * sizeof(unsigned long) );
out = (unsigned long *)malloc( count * sizeof(unsigned long) );
sol = (unsigned long *)malloc( count * sizeof(unsigned long) );
-for (i=0; i<count; i++) { *(in + i) = ~0; *(sol + i) = 0;
+for (i=0; i<count; i++) { *(in + i) = ~0; *(sol + i) = 0;
*(out + i) = 0; }
MPI_Allreduce( in, out, count, MPI_UNSIGNED_LONG, MPI_BXOR, comm );
for (i=0; i<count; i++) { if (*(out + i) != *(sol + i)) {errcnt++; fnderr++;}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_UNSIGNED_LONG and op MPI_BXOR\n", rank );
free( in );
free( out );
@@ -2687,12 +2687,12 @@ for (i=0; i<count; i++) { (in + i)->a = (rank + i); (in + i)->b = rank;
MPI_Allreduce( in, out, count, MPI_2INT, MPI_MAXLOC, comm );
for (i=0; i<count; i++) { if ((out + i)->a != (sol + i)->a ||
(out + i)->b != (sol + i)->b) {
- errcnt++; fnderr++;
+ errcnt++; fnderr++;
fprintf( stderr, "(%d) Expected (%d,%d) got (%d,%d)\n", rank,
(int)((sol + i)->a),
(sol+i)->b, (int)((out+i)->a), (out+i)->b );
}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_2INT and op MPI_MAXLOC (%d of %d wrong)\n",
rank, fnderr, count );
free( in );
@@ -2713,12 +2713,12 @@ for (i=0; i<count; i++) { (in + i)->a = (rank + i); (in + i)->b = rank;
MPI_Allreduce( in, out, count, MPI_LONG_INT, MPI_MAXLOC, comm );
for (i=0; i<count; i++) { if ((out + i)->a != (sol + i)->a ||
(out + i)->b != (sol + i)->b) {
- errcnt++; fnderr++;
+ errcnt++; fnderr++;
fprintf( stderr, "(%d) Expected (%d,%d) got (%d,%d)\n", rank,
(int)((sol + i)->a),
(sol+i)->b, (int)((out+i)->a), (out+i)->b );
}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG_INT and op MPI_MAXLOC (%d of %d wrong)\n",
rank, fnderr, count );
free( in );
@@ -2739,12 +2739,12 @@ for (i=0; i<count; i++) { (in + i)->a = (rank + i); (in + i)->b = rank;
MPI_Allreduce( in, out, count, MPI_SHORT_INT, MPI_MAXLOC, comm );
for (i=0; i<count; i++) { if ((out + i)->a != (sol + i)->a ||
(out + i)->b != (sol + i)->b) {
- errcnt++; fnderr++;
+ errcnt++; fnderr++;
fprintf( stderr, "(%d) Expected (%d,%d) got (%d,%d)\n", rank,
(int)((sol + i)->a),
(sol+i)->b, (int)((out+i)->a), (out+i)->b );
}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT_INT and op MPI_MAXLOC (%d of %d wrong)\n",
rank, fnderr, count );
free( in );
@@ -2765,12 +2765,12 @@ for (i=0; i<count; i++) { (in + i)->a = (rank + i); (in + i)->b = rank;
MPI_Allreduce( in, out, count, MPI_FLOAT_INT, MPI_MAXLOC, comm );
for (i=0; i<count; i++) { if ((out + i)->a != (sol + i)->a ||
(out + i)->b != (sol + i)->b) {
- errcnt++; fnderr++;
+ errcnt++; fnderr++;
fprintf( stderr, "(%d) Expected (%d,%d) got (%d,%d)\n", rank,
(int)((sol + i)->a),
(sol+i)->b, (int)((out+i)->a), (out+i)->b );
}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_FLOAT_INT and op MPI_MAXLOC (%d of %d wrong)\n",
rank, fnderr, count );
free( in );
@@ -2791,12 +2791,12 @@ for (i=0; i<count; i++) { (in + i)->a = (rank + i); (in + i)->b = rank;
MPI_Allreduce( in, out, count, MPI_DOUBLE_INT, MPI_MAXLOC, comm );
for (i=0; i<count; i++) { if ((out + i)->a != (sol + i)->a ||
(out + i)->b != (sol + i)->b) {
- errcnt++; fnderr++;
+ errcnt++; fnderr++;
fprintf( stderr, "(%d) Expected (%d,%d) got (%d,%d)\n", rank,
(int)((sol + i)->a),
(sol+i)->b, (int)((out+i)->a), (out+i)->b );
}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_DOUBLE_INT and op MPI_MAXLOC (%d of %d wrong)\n",
rank, fnderr, count );
free( in );
@@ -2829,12 +2829,12 @@ for (i=0; i<count; i++) { (in + i)->a = (rank + i); (in + i)->b = rank;
MPI_Allreduce( in, out, count, MPI_2INT, MPI_MINLOC, comm );
for (i=0; i<count; i++) { if ((out + i)->a != (sol + i)->a ||
(out + i)->b != (sol + i)->b) {
- errcnt++; fnderr++;
+ errcnt++; fnderr++;
fprintf( stderr, "(%d) Expected (%d,%d) got (%d,%d)\n", rank,
(int)((sol + i)->a),
(sol+i)->b, (int)((out+i)->a), (out+i)->b );
}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_2INT and op MPI_MINLOC (%d of %d wrong)\n",
rank, fnderr, count );
free( in );
@@ -2855,12 +2855,12 @@ for (i=0; i<count; i++) { (in + i)->a = (rank + i); (in + i)->b = rank;
MPI_Allreduce( in, out, count, MPI_LONG_INT, MPI_MINLOC, comm );
for (i=0; i<count; i++) { if ((out + i)->a != (sol + i)->a ||
(out + i)->b != (sol + i)->b) {
- errcnt++; fnderr++;
+ errcnt++; fnderr++;
fprintf( stderr, "(%d) Expected (%d,%d) got (%d,%d)\n", rank,
(int)((sol + i)->a),
(sol+i)->b, (int)((out+i)->a), (out+i)->b );
}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_LONG_INT and op MPI_MINLOC (%d of %d wrong)\n",
rank, fnderr, count );
free( in );
@@ -2881,12 +2881,12 @@ for (i=0; i<count; i++) { (in + i)->a = (rank + i); (in + i)->b = rank;
MPI_Allreduce( in, out, count, MPI_SHORT_INT, MPI_MINLOC, comm );
for (i=0; i<count; i++) { if ((out + i)->a != (sol + i)->a ||
(out + i)->b != (sol + i)->b) {
- errcnt++; fnderr++;
+ errcnt++; fnderr++;
fprintf( stderr, "(%d) Expected (%d,%d) got (%d,%d)\n", rank,
(int)((sol + i)->a),
(sol+i)->b, (int)((out+i)->a), (out+i)->b );
}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_SHORT_INT and op MPI_MINLOC (%d of %d wrong)\n",
rank, fnderr, count );
free( in );
@@ -2907,12 +2907,12 @@ for (i=0; i<count; i++) { (in + i)->a = (rank + i); (in + i)->b = rank;
MPI_Allreduce( in, out, count, MPI_FLOAT_INT, MPI_MINLOC, comm );
for (i=0; i<count; i++) { if ((out + i)->a != (sol + i)->a ||
(out + i)->b != (sol + i)->b) {
- errcnt++; fnderr++;
+ errcnt++; fnderr++;
fprintf( stderr, "(%d) Expected (%d,%d) got (%d,%d)\n", rank,
(int)((sol + i)->a),
(sol+i)->b, (int)((out+i)->a), (out+i)->b );
}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_FLOAT_INT and op MPI_MINLOC (%d of %d wrong)\n",
rank, fnderr, count );
free( in );
@@ -2933,12 +2933,12 @@ for (i=0; i<count; i++) { (in + i)->a = (rank + i); (in + i)->b = rank;
MPI_Allreduce( in, out, count, MPI_DOUBLE_INT, MPI_MINLOC, comm );
for (i=0; i<count; i++) { if ((out + i)->a != (sol + i)->a ||
(out + i)->b != (sol + i)->b) {
- errcnt++; fnderr++;
+ errcnt++; fnderr++;
fprintf( stderr, "(%d) Expected (%d,%d) got (%d,%d)\n", rank,
(int)((sol + i)->a),
(sol+i)->b, (int)((out+i)->a), (out+i)->b );
}}
-if (fnderr) fprintf( stderr,
+if (fnderr) fprintf( stderr,
"(%d) Error for type MPI_DOUBLE_INT and op MPI_MINLOC (%d of %d wrong)\n",
rank, fnderr, count );
free( in );
@@ -2958,7 +2958,7 @@ if (gerr > 0) {
printf( "Found %d errors overall on %d\n", gerr, rank );
}
else {
- if (!rank)
+ if (!rank)
printf( "PASSED!", gerr, rank );
}
diff --git a/testsuite/expect/mpi-testscripts/alltoall_timed.c b/testsuite/expect/mpi-testscripts/alltoall_timed.c
index 187bd7babb089c62e3f0d0a4bd891e404d0e8092..a917337bbe4c218808a7f02f6f69d9a31fad8878 100644
--- a/testsuite/expect/mpi-testscripts/alltoall_timed.c
+++ b/testsuite/expect/mpi-testscripts/alltoall_timed.c
@@ -22,7 +22,7 @@ int main(int argc, char **argv)
}
MPI_Comm_rank(MPI_COMM_WORLD,&me);
-
+
out=(int *)calloc(tasks, sizeof(int));
in=(int *)calloc(tasks,sizeof(int));
for(i=0;i<tasks;i++) out[i] = me;
diff --git a/testsuite/expect/pkill b/testsuite/expect/pkill
index 9ad91586d65450d332800c09091d5cbffb660290..d9843aa11bb69d0623469924b71300d66e074236 100755
--- a/testsuite/expect/pkill
+++ b/testsuite/expect/pkill
@@ -1,28 +1,28 @@
#!/usr/bin/env bash
############################################################################
-# This shell processes pkill commands as required by the test scripts
-# on systems lacking the pkill commands (e.g. AIX). It does not
+# This shell processes pkill commands as required by the test scripts
+# on systems lacking the pkill commands (e.g. AIX). It does not
# interpret all pkill options, only those required for these tests.
############################################################################
# Copyright (C) 2002 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# Please also read the supplied 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.
-#
+#
# 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.
diff --git a/testsuite/expect/regression b/testsuite/expect/regression
index a54f8def643a7243e2ec13fa93733f64f0f07826..430e4d6051d7421b1ebf7a79a8088e172448e823 100755
--- a/testsuite/expect/regression
+++ b/testsuite/expect/regression
@@ -3,29 +3,29 @@
# Purpose: Test of SLURM functionality
# Executes the full battery of tests.
#
-# Output: "Failures:#\nCompletions:#" with a count of tests executed
-# successfully and failures respectively. The exit code is zero
+# Output: "Failures:#\nCompletions:#" with a count of tests executed
+# successfully and failures respectively. The exit code is zero
# only if all tests executed successfully.
############################################################################
# Copyright (C) 2002 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# Please also read the supplied 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.
-#
+#
# 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.
@@ -34,7 +34,7 @@
FAILURES=0
COMPLETIONS=0
-# Make sure we are in the desired directory before possibly
+# Make sure we are in the desired directory before possibly
# removing files the user does not want to lose.
if [ ! -x ./regression ]; then
echo "FAILURE: cd to 'testsuite/expect' before starting 'regression'"
@@ -47,7 +47,7 @@ fi
# Remove any recently edited back-up files
-/bin/rm -f test*.*% test*input test*output test*error
+/bin/rm -f test*.*% test*input test*output test*error
# Run the tests in this directory
/bin/date
@@ -90,7 +90,7 @@ echo "Remember to check for mail send by tests" >& 2
if [ $FAILURES -eq 0 ]
then
- /bin/rm -f test*input test*output test*error
+ /bin/rm -f test*input test*output test*error
exit 0
else
exit 1
diff --git a/testsuite/expect/regression.py b/testsuite/expect/regression.py
index 5d1675ba2e0b05e2c41cc7160b5d89a78ad51fe9..a40cba62cfc41bbd1c02d04630a094afcac0c848 100755
--- a/testsuite/expect/regression.py
+++ b/testsuite/expect/regression.py
@@ -4,21 +4,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Christopher J. Morrone <morrone2@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# Please also read the supplied 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.1 b/testsuite/expect/test1.1
index 68bda71f0357adcc96e029b01bf82ce46202923b..377bf5ee42c061b5132da6edf37bedabf255e947 100755
--- a/testsuite/expect/test1.1
+++ b/testsuite/expect/test1.1
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -92,12 +92,12 @@ if {$got_job_grps == 0} {
send_user "\nFAILURE: Did not get user info from slurm job\n"
exit 1
}
-
+
#
-# Confirm the user id and group id in the slurm job matches that
+# Confirm the user id and group id in the slurm job matches that
# of the local 'id' execution.
#
-
+
if {[string compare $login_grp_info $job_grp_info] != 0} {
send_user "\nFAILURE: Login and slurm user info mismatch\n"
set exit_code 1
diff --git a/testsuite/expect/test1.10 b/testsuite/expect/test1.10
index e8a20438f7b1342e131a712eaf2e2bc8e080f5ad..e429ca15b1c24134d3507329ff4457186970b6cf 100755
--- a/testsuite/expect/test1.10
+++ b/testsuite/expect/test1.10
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.11 b/testsuite/expect/test1.11
index 6f4108c9ab84344ae797c031cbdcf2842e4412c9..89e05d7bc2eddc34ec9428eccd5e97c217a75f23 100755
--- a/testsuite/expect/test1.11
+++ b/testsuite/expect/test1.11
@@ -1,35 +1,35 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Test of batch job and job name options (--batch and --job-name
+# Test of batch job and job name options (--batch and --job-name
# options).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# Note: This script generates and then deletes files in the working directory
+# Note: This script generates and then deletes files in the working directory
# named test1.11.input, test1.11.output, and test1.11.error
############################################################################
# Copyright (C) 2002 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.12 b/testsuite/expect/test1.12
index 8e3ca8137290fe8aa777a067f2b29886d6795b6c..014dc9b38beb8a89c37f63800f61d4fce8e69a00 100755
--- a/testsuite/expect/test1.12
+++ b/testsuite/expect/test1.12
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Test of --checkpoint option. This does not validate the
+# Test of --checkpoint option. This does not validate the
# checkpoint file itself.
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -67,7 +67,7 @@ expect {
eof {
wait
}
-}
+}
if {$ckpt_out == -1} {
send_user "\nFAILURE: No Checkpoint time reported for job step\n"
set exit_code 1
diff --git a/testsuite/expect/test1.13 b/testsuite/expect/test1.13
index 265acbf1f51a2762a6d0d7fc8d3870594cc95554..e8546e8e025a6af700a5b6fb8eca2c8d0b8b7a6d 100755
--- a/testsuite/expect/test1.13
+++ b/testsuite/expect/test1.13
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -39,7 +39,7 @@ set matches 0
print_header $test_id
#
-# Spawn a srun immediate execution job with hold (priority==0) option,
+# Spawn a srun immediate execution job with hold (priority==0) option,
# The job can't run immediately with a priority of zero
#
set timeout 10
diff --git a/testsuite/expect/test1.14 b/testsuite/expect/test1.14
index d49d6916fef08940e3850d6a9b62d227eef20f6b..fa8aa94509c5df561dbea19fdaaa7ad66ec3a040 100755
--- a/testsuite/expect/test1.14
+++ b/testsuite/expect/test1.14
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test1.15 b/testsuite/expect/test1.15
index 2786bd56a386324f6169f073f866903d128e102a..e732046202eb44fe094c2d1a037ee85ee5f6f2e8 100755
--- a/testsuite/expect/test1.15
+++ b/testsuite/expect/test1.15
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.16 b/testsuite/expect/test1.16
index c6ab9f48246a258d30a5bcbd183b665aeb211752..0069b72d66f31ccaf95ce95696eb5e5d075fc331 100755
--- a/testsuite/expect/test1.16
+++ b/testsuite/expect/test1.16
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -74,7 +74,7 @@ expect {
#
# Confirm message send before '\n' (unbuffered).
#
-
+
if {$matches != 1} {
send_user "\nFAILURE: srun --unbuffered option failure\n"
exec $bin_rm -f $scratch_file
diff --git a/testsuite/expect/test1.17 b/testsuite/expect/test1.17
index 8502f234a909b2a53bdb68a1e0f1e3c2eabed601..92176b238968753357bb420f5cb27d6c539f95aa 100755
--- a/testsuite/expect/test1.17
+++ b/testsuite/expect/test1.17
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.18 b/testsuite/expect/test1.18
index a21ee539a7fcf40ef5e342b026baf91843f1136c..fd267fcd391cba5e6439f2f207dc47d66a08258c 100755
--- a/testsuite/expect/test1.18
+++ b/testsuite/expect/test1.18
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.19 b/testsuite/expect/test1.19
index 4622c03628de6d917c6d4da70fec3456e4d8cc47..7fb44c1baf595497f4f6268ea4a0d0da9fd6a573 100755
--- a/testsuite/expect/test1.19
+++ b/testsuite/expect/test1.19
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Test srun stdout/err file name formatting (--output and --error
+# Test srun stdout/err file name formatting (--output and --error
# options with %j, %J, %n, %s and %t specifications).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -90,7 +90,7 @@ if {$file_cnt != $task_cnt} {
}
#
-# Spawn a shell via srun that includes "jobid" (%j) in stderr
+# Spawn a shell via srun that includes "jobid" (%j) in stderr
# file name and confirm it is created
#
set job_id 0
diff --git a/testsuite/expect/test1.2 b/testsuite/expect/test1.2
index deed651515b8638c3c8858e53fb6e89ad17938f6..5343180319e4fbdaa74d8857cceced41981736b8 100755
--- a/testsuite/expect/test1.2
+++ b/testsuite/expect/test1.2
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Confirm that a job executes with the proper task count (--nprocs
+# Confirm that a job executes with the proper task count (--nprocs
# and --overcommit options).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.20 b/testsuite/expect/test1.20
index 7caa3db2845f792940acd05e2d1c281cda7e2894..5ce335a23090447549030d31b77f5ea5dc66dbce 100755
--- a/testsuite/expect/test1.20
+++ b/testsuite/expect/test1.20
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Test srun stdout/err disabling (--output and --error options with
+# Test srun stdout/err disabling (--output and --error options with
# argument of "none").
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.21 b/testsuite/expect/test1.21
index 4a0fc271edea78f7aa851e322f5522a18a07e831..e9ff518aaca327e96d3cbb133a067e83fb5b2a1d 100755
--- a/testsuite/expect/test1.21
+++ b/testsuite/expect/test1.21
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.22 b/testsuite/expect/test1.22
index bf079a46bd9e0554bd0d2fb2628cd46933e5a4b0..061bb4417722fea1aab4ecf3bee86a2ebc5fd972 100755
--- a/testsuite/expect/test1.22
+++ b/testsuite/expect/test1.22
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -75,7 +75,7 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 0\n"
- set exit_code 1
+ set exit_code 1
}
#
@@ -88,7 +88,7 @@ expect {
-re "Memory required by task is not available" {
send_user "\nWARNING: DefMemPerTask is configured too high for this test\n"
set host_0 "warn"
- }
+ }
-re "0: ($alpha_numeric_under)" {
set host_0 $expect_out(1,string)
exp_continue
@@ -108,7 +108,7 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {$exit_code == 0} {
diff --git a/testsuite/expect/test1.23 b/testsuite/expect/test1.23
index 4c505716c0e50f21c39e37965f20ff28395cfa0a..5cd1e162f236dc5c08100a25a8e3a680d72ba56b 100755
--- a/testsuite/expect/test1.23
+++ b/testsuite/expect/test1.23
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Verify node configuration specification (--mem, --mincpus, and
+# Verify node configuration specification (--mem, --mincpus, and
# --tmp options).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -74,11 +74,11 @@ expect {
if {[string compare $host_0 ""] != 0} {
send_user "\nFAILURE: job ran with invalid mincpus option\n"
- set exit_code 1
+ set exit_code 1
}
if {$err_msg != 1} {
send_user "\nFAILURE: job failed to report required error\n"
- set exit_code 1
+ set exit_code 1
}
#
@@ -104,7 +104,7 @@ expect {
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: job failed with valid mincpus option\n"
- set exit_code 1
+ set exit_code 1
}
#
@@ -136,17 +136,17 @@ expect {
if {[string compare $host_0 ""] != 0} {
send_user "\nFAILURE: job ran with invalid mem option\n"
- set exit_code 1
+ set exit_code 1
}
if {$err_msg != 1} {
send_user "\nFAILURE: job failed to report required error\n"
- set exit_code 1
+ set exit_code 1
}
#
# Submit a job with what should be valid mem requirement.
#
-# We can't set --mem=1 or the job will abort for lack of memory,
+# We can't set --mem=1 or the job will abort for lack of memory,
# so we just use a small value that should be valid if the node
# is properly configured.
#
@@ -176,7 +176,7 @@ expect {
if {$err_msg == 0 && [string compare $host_0 ""] == 0} {
send_user "\nFAILURE: job failed with valid mem option\n"
- set exit_code 1
+ set exit_code 1
}
#
@@ -208,11 +208,11 @@ expect {
if {[string compare $host_0 ""] != 0} {
send_user "\nFAILURE: job ran with invalid tmp option\n"
- set exit_code 1
+ set exit_code 1
}
if {$err_msg != 1} {
send_user "\nFAILURE: job failed to report required error\n"
- set exit_code 1
+ set exit_code 1
}
#
@@ -238,7 +238,7 @@ expect {
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: job failed with valid tmp option\n"
- set exit_code 1
+ set exit_code 1
}
if {$exit_code == 0} {
diff --git a/testsuite/expect/test1.24 b/testsuite/expect/test1.24
index d0b1d1f31c10802fce4468ac31df8260bcff811d..6b33af2baf6751f6a468cbb06b9f500e5dc9a069 100755
--- a/testsuite/expect/test1.24
+++ b/testsuite/expect/test1.24
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -73,11 +73,11 @@ expect {
if {[string compare $host_0 ""] != 0} {
send_user "\nFAILURE: job ran with invalid constraint option\n"
- set exit_code 1
+ set exit_code 1
}
if {$err_msg != 1} {
send_user "\nFAILURE: job failed to report required error\n"
- set exit_code 1
+ set exit_code 1
}
diff --git a/testsuite/expect/test1.25 b/testsuite/expect/test1.25
index 6ff7348177e29cfdd7fb4a1312c2f81fb24cde83..0bb46c8a7bac2439d8b89eb93ea22d173e6e3df6 100755
--- a/testsuite/expect/test1.25
+++ b/testsuite/expect/test1.25
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Submit job to not be killed on node failure (--no-kill option).
+# Submit job to not be killed on node failure (--no-kill option).
# NOTE: We need to actually kill slurmd daemons to fully test this.
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.26 b/testsuite/expect/test1.26
index cb27e48a28079e2071642246c651181d80373512..32a5b7adfb7602140b0e6a5bf21e5b9ecbb9db7b 100755
--- a/testsuite/expect/test1.26
+++ b/testsuite/expect/test1.26
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -54,9 +54,9 @@ if {[test_bluegene] == 1} {
#
# Submit a 1 node job and record the node name
#
-# NOTE: Check explicity for "^0:" or "\n0:. Otherwise in srun verbose mode we
+# NOTE: Check explicity for "^0:" or "\n0:. Otherwise in srun verbose mode we
# can get a hostname ending with 0 in the messages that gets used to generate
-# a bad value for host_0 below.
+# a bad value for host_0 below.
#
set host_0 ""
set nodelist_name ""
@@ -90,11 +90,11 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 0\n"
- exit 1
+ exit 1
}
if {[string compare $nodelist_name ""] == 0} {
send_user "\nFAILURE: Did not get nodelist_name of task 0\n"
- exit 1
+ exit 1
}
set include_node $host_0
@@ -149,7 +149,7 @@ if {[string compare $host_1 $include_node]} {
#
# Run three tasks at a time on some node and do so repeatedly
# This checks for slurmd race conditions
-# The sleep between cycles is to make sure the job step completion
+# The sleep between cycles is to make sure the job step completion
# logic has time to be processed (slurmd -> slurmctld messages)
# Note: process output in order of expected completion
#
diff --git a/testsuite/expect/test1.27 b/testsuite/expect/test1.27
index 36c099b207a5ed549a9537c5e4c69750140e0c06..343ef0991178fafa9e729eb7e1957ba393498e39 100755
--- a/testsuite/expect/test1.27
+++ b/testsuite/expect/test1.27
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.28 b/testsuite/expect/test1.28
index 0a26e559239e5d266799688eb4903c44c49f55ac..ea99c4b912389c36a5f1ca2e84f3f1fb77637468 100755
--- a/testsuite/expect/test1.28
+++ b/testsuite/expect/test1.28
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.29 b/testsuite/expect/test1.29
index 19bc09f8221885291d4864b5f38583dbe29ebf27..383106c855ed1074c03fe6b7b97952fa873b9868 100755
--- a/testsuite/expect/test1.29
+++ b/testsuite/expect/test1.29
@@ -7,28 +7,28 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# Note: AIX does not support the NPROC limit, but this test should
+# Note: AIX does not support the NPROC limit, but this test should
# otherwise succeed
############################################################################
# Copyright (C) 2002 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -58,7 +58,7 @@ if {[test_front_end] != 0 && [test_super_user] == 0} {
#
# Delete left-over programs and rebuild them.
-# We use our own program to get ulimit values since the output
+# We use our own program to get ulimit values since the output
# of the ulimit program is inconsistent across systems.
#
exec $bin_rm -f $file_prog_get $file_err $file_in $file_out
diff --git a/testsuite/expect/test1.29.prog.c b/testsuite/expect/test1.29.prog.c
index def3342732b5e8d7f7f34c4831f2baaa9cb9306b..228b1143c2d6145db03e5a8ee0b3c62306272117 100644
--- a/testsuite/expect/test1.29.prog.c
+++ b/testsuite/expect/test1.29.prog.c
@@ -1,27 +1,27 @@
/*****************************************************************************\
- * proc1.29.proc.c - Simple user limit set program for SLURM regression
- * test1.29. Get the core, fsize, nofile, and nproc limits and print their
+ * proc1.29.proc.c - Simple user limit set program for SLURM regression
+ * test1.29. Get the core, fsize, nofile, and nproc limits and print their
* values in the same format as SLURM environment variables.
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
@@ -32,7 +32,7 @@
#include <sys/resource.h>
#include <unistd.h>
-main (int argc, char **argv)
+main (int argc, char **argv)
{
struct rlimit u_limit;
int exit_code = 0;
diff --git a/testsuite/expect/test1.3 b/testsuite/expect/test1.3
index 3a900099604b12617a0eafe73ff110f316852505..841a051a9ba8b37af960dfcc707f4cef2e3a0aba 100755
--- a/testsuite/expect/test1.3
+++ b/testsuite/expect/test1.3
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.30 b/testsuite/expect/test1.30
index 72cd9008e30a3e17cd698e2606229208ecae0788..6602437d36acdb659f38ce6040508da836f59c25 100755
--- a/testsuite/expect/test1.30
+++ b/testsuite/expect/test1.30
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.31 b/testsuite/expect/test1.31
index 8aca35928e02b12cefc3dcdbd2325b62b0455fa9..487ea79b255a478bebe5fdf7670c2db2def424d9 100755
--- a/testsuite/expect/test1.31
+++ b/testsuite/expect/test1.31
@@ -2,7 +2,7 @@
############################################################################
# Purpose: Test of SLURM functionality
# Verify that SLURM directed environment variables are processed:
-# SLURM_DEBUG, SLURM_NNODES, SLURN_NPROCS, SLURM_OVERCOMMIT,
+# SLURM_DEBUG, SLURM_NNODES, SLURN_NPROCS, SLURM_OVERCOMMIT,
# SLURM_STDOUTMODE.
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -96,7 +96,7 @@ expect {
}
if {$job_id == 0} {
- send_user "\nFAILURE: did not get job_id\n"
+ send_user "\nFAILURE: did not get job_id\n"
exit 1
}
diff --git a/testsuite/expect/test1.32 b/testsuite/expect/test1.32
index 4bf36b9b2b477a88a989fb6d0a049992ccf014ed..c845bf91c7acc27f18753e2c2de169f0a8c32775 100755
--- a/testsuite/expect/test1.32
+++ b/testsuite/expect/test1.32
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -50,7 +50,7 @@ if { [test_xcpu] } {
exit $exit_code
}
-
+
#
# Delete left-over program and rebuild it
#
@@ -74,10 +74,10 @@ expect {
#
# Spawn initial program via srun
# Note: For systems supporting proper pthreads, instead use
-# exec $bin_kill -USR1 $srun_pid, otherwise we need pkill
+# exec $bin_kill -USR1 $srun_pid, otherwise we need pkill
# and can get multiple signals delivered
# Note: We send the signals right after task startup rather than
-# interspersed with messages because some versions of
+# interspersed with messages because some versions of
# Expect have difficulties handling unbuffered srun output
#
set timeout $max_job_delay
diff --git a/testsuite/expect/test1.32.prog.c b/testsuite/expect/test1.32.prog.c
index 8cec2a3b086e7ce4b84c82faaff81d27656ec651..6cb2efe0ba107cf8ab91ba068377ef98a6cf16e6 100644
--- a/testsuite/expect/test1.32.prog.c
+++ b/testsuite/expect/test1.32.prog.c
@@ -1,26 +1,26 @@
/*****************************************************************************\
- * prog1.32.prog.c - Simple signal catching test program for SLURM regression
+ * prog1.32.prog.c - Simple signal catching test program for SLURM regression
* test1.32. Report caught signals. Exit after SIGUSR1 and SIGUSR2 received.
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
@@ -55,7 +55,7 @@ void sig_handler(int sig)
}
}
-main (int argc, char **argv)
+main (int argc, char **argv)
{
struct sigaction act;
diff --git a/testsuite/expect/test1.33 b/testsuite/expect/test1.33
index ca8892efff83026995a807f1a662b45c403c31b8..2d60e7e52fb83ee443c24f2df1c25090f481f894 100755
--- a/testsuite/expect/test1.33
+++ b/testsuite/expect/test1.33
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.34 b/testsuite/expect/test1.34
index 62a13553782b8cae9095c8efc73c3d4e94f90b8f..91ec002bf40eb7fa4390c961459acb23ad5ad7fa 100755
--- a/testsuite/expect/test1.34
+++ b/testsuite/expect/test1.34
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.34.prog.c b/testsuite/expect/test1.34.prog.c
index 3bceda4e84259b87cacb5dd8d7e83502b38ea8f1..981b6cc366a61f28073646732082e833a60a0be2 100644
--- a/testsuite/expect/test1.34.prog.c
+++ b/testsuite/expect/test1.34.prog.c
@@ -5,21 +5,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
diff --git a/testsuite/expect/test1.35 b/testsuite/expect/test1.35
index 35690c4df5d00c2e22e7c7311ca740dd6d19c7d7..dfb2935c73bcfa3d4c83092856c93cd26271b326 100755
--- a/testsuite/expect/test1.35
+++ b/testsuite/expect/test1.35
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.36 b/testsuite/expect/test1.36
index ad2c4d062941049ff4f1d896ca3f3047c9b67f50..97374aca695ff53a685f7d8a052ce68187194be0 100755
--- a/testsuite/expect/test1.36
+++ b/testsuite/expect/test1.36
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.37 b/testsuite/expect/test1.37
index 47e84a5e2287ad59dea1329ba077dd38abe9002f..e54af8b348876a3b246c147a0c3fa5ab6bea630d 100755
--- a/testsuite/expect/test1.37
+++ b/testsuite/expect/test1.37
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.38 b/testsuite/expect/test1.38
index 548529921cb05dc23d8afca055a69bba7cc33013..f861f5d0ed1ace7d4fa23b410c43d9fdcda3bfd5 100755
--- a/testsuite/expect/test1.38
+++ b/testsuite/expect/test1.38
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -92,7 +92,7 @@ expect {
-re "WAITING" {
set match_wait 1
# make sure the task gets started
- sleep 1
+ sleep 1
exec $bin_kill -INT $srun_pid
exp_continue
}
diff --git a/testsuite/expect/test1.39 b/testsuite/expect/test1.39
index 55263f2561b949b3c1cfd98ab703deb2c39c1671..5afff6212fea9cd277c8b212b8972d43ebf9d879 100755
--- a/testsuite/expect/test1.39
+++ b/testsuite/expect/test1.39
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -105,7 +105,7 @@ foreach filename [glob -nocomplain *core.light] {
spawn $bin_file $filename
expect {
-re "text" {
- incr matches
+ incr matches
exp_continue
}
timeout {
diff --git a/testsuite/expect/test1.39.prog.c b/testsuite/expect/test1.39.prog.c
index 9892d2a3d48cecf0080e655ec8e1493d21e7c7fa..336a2d9db9d4f624442dfddf0e18f4cdf6e24c1a 100644
--- a/testsuite/expect/test1.39.prog.c
+++ b/testsuite/expect/test1.39.prog.c
@@ -1,33 +1,33 @@
/*****************************************************************************\
- * prog1.39.prog.c - Simple program to generate segmentation violation and
+ * prog1.39.prog.c - Simple program to generate segmentation violation and
* generate a core file for use by test1.39.
*****************************************************************************
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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 <stdlib.h>
-main (int argc, char **argv)
+main (int argc, char **argv)
{
char *a = NULL, b[1];
diff --git a/testsuite/expect/test1.4 b/testsuite/expect/test1.4
index f7aee300bb470c732db542449bc3d67e7a6ce1fd..10a12c7b2192f0fe5c977b4bbe6bb146e784da3d 100755
--- a/testsuite/expect/test1.4
+++ b/testsuite/expect/test1.4
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.40 b/testsuite/expect/test1.40
index cc05a090520270bbd27cef021ef51e15b1d4a794..edf53896a7c5cc9229c8d5b22acac072bdbcbce1 100755
--- a/testsuite/expect/test1.40
+++ b/testsuite/expect/test1.40
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.41 b/testsuite/expect/test1.41
index 33067ee6a281ed8c35a3cdf820bc7591e4bc455c..314195904fc2a1f117e4580e135ae52d13cdfeab 100755
--- a/testsuite/expect/test1.41
+++ b/testsuite/expect/test1.41
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -43,7 +43,7 @@ print_header $test_id
#
# Submit a slurm job that will execute 'id' on 1 node and over task_cnt tasks
#
-# Timeout is max_job_delay (to spawn task) +
+# Timeout is max_job_delay (to spawn task) +
# 60 (job time limit) +
# 60 (slurmctld time limit check poll interval) +
# KillWait (120 secs on BlueGene per IBM recommendation)
diff --git a/testsuite/expect/test1.42 b/testsuite/expect/test1.42
index 5b50a011c321dafd931fd8e01c3233a54d4a305e..3286c3816f258bce1b55df629ec477c892440778 100755
--- a/testsuite/expect/test1.42
+++ b/testsuite/expect/test1.42
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.43 b/testsuite/expect/test1.43
index a953acb384394f6133c1a3fdb43cec412c8a780c..c46b2d09f4f1157f0953c11bfdb3d1005bef75c7 100755
--- a/testsuite/expect/test1.43
+++ b/testsuite/expect/test1.43
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.44 b/testsuite/expect/test1.44
index 093c42f7835f8f312c14e9cc7d6667370762535f..7e46b6e9008d21c094b180d22d705a5dd9a01093 100755
--- a/testsuite/expect/test1.44
+++ b/testsuite/expect/test1.44
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Chris Morrone <morrone2@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.45 b/testsuite/expect/test1.45
index bd86ae31546cf16725f2ecaf1fe38e48880bca65..f763e5eea97ae21fc082bb68315be775f79bcc38 100755
--- a/testsuite/expect/test1.45
+++ b/testsuite/expect/test1.45
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Dave Bremer <dbremer@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.46 b/testsuite/expect/test1.46
index 9f748ff1d526729c7caa7c062ca9e6508445fa81..af0b6d0c618607fb73fff72d8b87d44882fb6ab8 100755
--- a/testsuite/expect/test1.46
+++ b/testsuite/expect/test1.46
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.47 b/testsuite/expect/test1.47
index 37c4eb9bb7e8101c0bce5c5d6b915fe35a7052b6..5d2537cfe53093c25a679874795aad6734437baa 100755
--- a/testsuite/expect/test1.47
+++ b/testsuite/expect/test1.47
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.48 b/testsuite/expect/test1.48
index 0101d55b1f717cdd1abc9cb68d6028dfbdb6c443..0ccb69a08b1ce5b160972945a369c9674c2ef415 100755
--- a/testsuite/expect/test1.48
+++ b/testsuite/expect/test1.48
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -94,7 +94,7 @@ if {$got_job_grps == 0} {
send_user "\nFAILURE: Did not get user info from slurm job\n"
exit 1
}
-
+
if {$exit_code == 0} {
send_user "\nSUCCESS\n"
}
diff --git a/testsuite/expect/test1.49 b/testsuite/expect/test1.49
index 1f170a5ae40eae263a923f9f18659536b4d9840b..d1db655e3c5f22d8608ae8f0c4db2fa3f2c542ff 100755
--- a/testsuite/expect/test1.49
+++ b/testsuite/expect/test1.49
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -45,7 +45,7 @@ set file_out_post "$cwd/test$test_id.output_post"
print_header $test_id
#
-# Delete left-over scripts and rebuild,
+# Delete left-over scripts and rebuild,
# The sleep command just forces slurmd to kill the user's (long running) epilog
#
file delete $task_prolog $task_epilog
@@ -70,7 +70,7 @@ make_bash_script $file_in "
#
# Submit a slurm job that will execute $tasks tasks
-# Note: If running on more than one node and writing to an
+# Note: If running on more than one node and writing to an
# NFS file, overwritting of data has been observed, this
# causes the test to fail
#
@@ -164,10 +164,10 @@ if {$matches != $tasks} {
send_user "\nFAILURE: task epilog output is missing or uid mismatch ($matches:$tasks)\n"
set exit_code 1
}
-
+
if {$exit_code == 0} {
- exec $bin_rm -f $task_prolog $task_epilog $file_in
+ exec $bin_rm -f $task_prolog $task_epilog $file_in
exec $bin_rm -f $file_out_pre $file_out_post
send_user "\nSUCCESS\n"
}
diff --git a/testsuite/expect/test1.5 b/testsuite/expect/test1.5
index 6d98842cce7426f224fcede36ab1ca5a79a43e58..a97132c4dc4ba4a262b70f4a6763a02097ad4c2d 100755
--- a/testsuite/expect/test1.5
+++ b/testsuite/expect/test1.5
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.50 b/testsuite/expect/test1.50
index 504cdeecd41fc36ded45ee63db1bb6ca8e455c93..4bb28ee5e18f49069eadcc55a53ce7ac655c7b8b 100755
--- a/testsuite/expect/test1.50
+++ b/testsuite/expect/test1.50
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.51 b/testsuite/expect/test1.51
index be4e6adbf79a9c34cbc205fa012757faaf481130..e3d6ef77f6d9480a8ecd01a4d9e912a79d40e34a 100755
--- a/testsuite/expect/test1.51
+++ b/testsuite/expect/test1.51
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.52 b/testsuite/expect/test1.52
index 73d383aa4f5e667559fff02ea78258163cbcdc54..a4fe9a09760b3dddbfb641fbabb7e86cecc91bfd 100755
--- a/testsuite/expect/test1.52
+++ b/testsuite/expect/test1.52
@@ -2,7 +2,7 @@
############################################################################
# Purpose: Test of srun functionality
# Test of hostfile option (-hostfile).
-#
+#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -75,7 +75,7 @@ expect {
}
}
if { ($node_count < 3) || ($max_nodes < 3) } {
- send_user "WARNING: system must have at least 3 nodes to run this test on.\n"
+ send_user "WARNING: system must have at least 3 nodes to run this test on.\n"
exit $exit_code
}
diff --git a/testsuite/expect/test1.53 b/testsuite/expect/test1.53
index 96247f2228beee472243e86667a4998fecd9e36b..c42ded219a40e1794e46815457299bdcd8d4ede2 100755
--- a/testsuite/expect/test1.53
+++ b/testsuite/expect/test1.53
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.53.prog.c b/testsuite/expect/test1.53.prog.c
index 0032dc3d9796167f26a00f10b89a413bd8efcf2b..1a7ff6b9acd65862be9f1f1aa6b37ea48b889933 100644
--- a/testsuite/expect/test1.53.prog.c
+++ b/testsuite/expect/test1.53.prog.c
@@ -31,7 +31,7 @@ void sig_handler(int sig)
}
}
-main (int argc, char **argv)
+main (int argc, char **argv)
{
struct sigaction act;
time_t begin_time = time(NULL);
diff --git a/testsuite/expect/test1.54 b/testsuite/expect/test1.54
index 595cbefef3e19b0006ed302dcc71be7cd4ae8ebc..a7fae870599ca23a44085b2f704d7c52ba5e3096 100755
--- a/testsuite/expect/test1.54
+++ b/testsuite/expect/test1.54
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -104,7 +104,7 @@ if {$exit_code != 0} {
#
# Submit a slurm job that will execute different executables and check debug info
#
-# Timeout is max_job_delay (to spawn task) +
+# Timeout is max_job_delay (to spawn task) +
# 60 (job time limit) +
# 60 (slurmctld time limit check poll interval) +
# KillWait
@@ -167,7 +167,7 @@ if {$exit_code != 0} {
}
#
-# Submit a slurm job that asks for more tasks than specified in our
+# Submit a slurm job that asks for more tasks than specified in our
# configuration file
#
set matches 0
diff --git a/testsuite/expect/test1.55 b/testsuite/expect/test1.55
index 05bdda069b613edd8e3309944490df66dbb9bfa4..f00409db3d36d2cd51714359d0d4291a73969066 100755
--- a/testsuite/expect/test1.55
+++ b/testsuite/expect/test1.55
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Christopher J. Morrone <morrone2@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.56 b/testsuite/expect/test1.56
index 24509eb34f3a21a36f9b103e7757022c521b8b5f..09d9b6b7011f2757a0ededf3a435cd8737b185e3 100755
--- a/testsuite/expect/test1.56
+++ b/testsuite/expect/test1.56
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Christopher J. Morrone <morrone2@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.57 b/testsuite/expect/test1.57
index cc865333014f9452012140696bc33a5a4b420f9c..4ce2a916845093045fb4b878aedbfb494b7445f0 100755
--- a/testsuite/expect/test1.57
+++ b/testsuite/expect/test1.57
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -52,7 +52,7 @@ spawn $bin_date
expect {
-re "($number)($number):($number)($number):($number)($number)" {
set hours [expr 10 * $expect_out(1,string) + $expect_out(2,string)]
- set minutes [expr 10 * $expect_out(3,string) + $expect_out(4,string)]
+ set minutes [expr 10 * $expect_out(3,string) + $expect_out(4,string)]
set seconds [expr 10 * $expect_out(5,string) + $expect_out(6,string)]
}
eof {
diff --git a/testsuite/expect/test1.58 b/testsuite/expect/test1.58
index bb92683d03e4d862252c9752dd2b2d9120fed990..f3ee2068c29183fe4d94a180e8fc6a4450635cf8 100755
--- a/testsuite/expect/test1.58
+++ b/testsuite/expect/test1.58
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Christopher J. Morrone <morrone2@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.59 b/testsuite/expect/test1.59
index fed6407bebcd7ac61f730aa5f7e3ea900ed7fa0d..be7d4f574ee63a96f32a0422904b80f00bebbf0e 100755
--- a/testsuite/expect/test1.59
+++ b/testsuite/expect/test1.59
@@ -2,7 +2,7 @@
############################################################################
# Purpose: Test of srun functionality
# Test of hostfile option (-hostfile) inside of an allocation.
-#
+#
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# UCRL-CODE-217948.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -52,7 +52,7 @@ if { [test_front_end] } {
if {[string compare [switch_type] "elan"] == 0} {
send_user "\nWARNING: This test incompatible with Elan switch\n"
exit $exit_code
-}
+}
#find out if we have enough nodes to test functionality
set partition [default_partition]
spawn $scontrol show partition $partition
@@ -70,7 +70,7 @@ expect {
exit $exit_code
}
exp_continue
- }
+ }
timeout {
send_user "\nFAILURE: scontrol not responding\n"
exit 1
@@ -121,7 +121,7 @@ for {set i 0} {$i<4} {incr i} {
expect {
-re $prompt {
#send_user "srun completed\n"
- }
+ }
}
set 1node0 $node0
set 1node1 $node1
@@ -260,13 +260,13 @@ send "unset SLURM_HOSTFILE\r"
expect {
-re $prompt {
#send_user "srun completed\n"
- }
+ }
}
-
+
# try with commandline -w option
for {set i 0} {$i<5} {incr i} {
set extra ""
-
+
if { $i==1 } {
if { $node0 == 0 || $node1 == 0 || $node2 == 0 } {
send_user "\nFAILURE: node names not set from \
@@ -316,7 +316,7 @@ for {set i 0} {$i<5} {incr i} {
set 4node4 0
set extra " -m arbitrary -w $node1,$node0,$node0,$node0,$node0 -n4"
}
-
+
set node0 0
set node1 0
set node2 0
@@ -326,9 +326,9 @@ for {set i 0} {$i<5} {incr i} {
#
# execute srun with a specific node count
#
-
+
send "$srun -l $extra -O $bin_printenv SLURMD_NODENAME\r"
-
+
expect {
-re "($number): ($alpha_numeric_under)" {
set task_id $expect_out(1,string)
@@ -354,7 +354,7 @@ for {set i 0} {$i<5} {incr i} {
set exit_code 1
}
exp_continue
- }
+ }
-re $prompt {
#send_user "srun completed\n"
}
@@ -402,7 +402,7 @@ for {set i 0} {$i<5} {incr i} {
if { [string compare $node2 $4node0] } {
send_user "\nFAILURE: we only asked for 1 node in the allocation and we were unable to get it\n"
set exit_code 1
- }
+ }
}
}
diff --git a/testsuite/expect/test1.6 b/testsuite/expect/test1.6
index f2f338e87d1cd9ecbc65a76050b9320677684304..900e4fb2a857c0d143c5b2ad041fd41cfe3038f4 100755
--- a/testsuite/expect/test1.6
+++ b/testsuite/expect/test1.6
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.60 b/testsuite/expect/test1.60
index f283276b25cc4623ef700ea7fbbb49d1bc0890f0..d409a4d8524903fca27caa757253207b72efcf40 100755
--- a/testsuite/expect/test1.60
+++ b/testsuite/expect/test1.60
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Dave Bremer <dbremer@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.61 b/testsuite/expect/test1.61
index f743fcd93fe2b2e40ad65cc8a2cf1c085b7a2c94..0583f9cf3d5bb219aae24841f79f2780ae94ea2d 100755
--- a/testsuite/expect/test1.61
+++ b/testsuite/expect/test1.61
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.7 b/testsuite/expect/test1.7
index 95fef27af743093aa22f9c82df4510119cc07636..c58dae804e5545881e7c9e1fb35b80265a86dcbd 100755
--- a/testsuite/expect/test1.7
+++ b/testsuite/expect/test1.7
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -96,14 +96,14 @@ if {$inactive_limit < $sleep_time} {
}
#
-# Execute a couple of three minute jobs; one with a one minute time
-# limit and the other with a four minute time limit. Confirm jobs
-# are terminated on a timeout as required. Note that SLURM time
-# limit enforcement has a resolution of about one minute.
+# Execute a couple of three minute jobs; one with a one minute time
+# limit and the other with a four minute time limit. Confirm jobs
+# are terminated on a timeout as required. Note that SLURM time
+# limit enforcement has a resolution of about one minute.
#
-# Ideally the job gets a "job exceeded timelimit" followed by a
-# "Terminated" message, but if the timing is bad only the "Terminated"
-# message gets sent. This is due to srun recognizing job termination
+# Ideally the job gets a "job exceeded timelimit" followed by a
+# "Terminated" message, but if the timing is bad only the "Terminated"
+# message gets sent. This is due to srun recognizing job termination
# prior to the message from slurmd being processed.
#
set timeout [expr $max_job_delay + $sleep_time]
diff --git a/testsuite/expect/test1.8 b/testsuite/expect/test1.8
index ddc93829cd70c660181cb679ea5e288aff6e93bb..9d3c5bb2ac4c4cd75448bd2f7866ac7462004017 100755
--- a/testsuite/expect/test1.8
+++ b/testsuite/expect/test1.8
@@ -1,35 +1,35 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Confirm that srun stdin, stdout, and stderr options work (--input,
+# Confirm that srun stdin, stdout, and stderr options work (--input,
# --output, and --error option respectively).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# Note: This script generates and then deletes files in the working directory
+# Note: This script generates and then deletes files in the working directory
# named test1.8.input, test1.8.output, and test1.8.error
############################################################################
# Copyright (C) 2002 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.80 b/testsuite/expect/test1.80
index 2240f1447ed211f17e847ed80ed4d5510bde4933..cc54bcab403ebfedb71409d1142b4e8cfeb4860c 100755
--- a/testsuite/expect/test1.80
+++ b/testsuite/expect/test1.80
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -50,7 +50,7 @@ if { [test_front_end] } {
#
set timeout $max_job_delay
set expected_layout [list 0 0 1 1]
-set tested_layout [list -1 -1 -1 -1]
+set tested_layout [list -1 -1 -1 -1]
set srun_pid [spawn $srun -O -N2 -n4 -l --distribution=block -t1 $bin_printenv SLURM_NODEID]
expect {
-re "More processors requested than permitted" {
@@ -97,7 +97,7 @@ if {[test_front_end] != 0} {
#
set timeout $max_job_delay
set expected_layout [list 0 1 0 1]
-set tested_layout [list -1 -1 -1 -1]
+set tested_layout [list -1 -1 -1 -1]
set srun_pid [spawn $srun -O -N2 -n4 -l --distribution=cyclic -t1 $bin_printenv SLURM_NODEID]
expect {
-re "More processors requested than permitted" {
diff --git a/testsuite/expect/test1.81 b/testsuite/expect/test1.81
index d7c4f64f80047dd79e305c805ea2460e134c1c04..a1e7982a1f4903f4e8ddfdbd716f037157cdffdb 100755
--- a/testsuite/expect/test1.81
+++ b/testsuite/expect/test1.81
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,7 +41,7 @@ set exit_code 0
print_header $test_id
#
-# Submit a 1 node job and validate that we don't get more than one
+# Submit a 1 node job and validate that we don't get more than one
#
set host_0 ""
set task_cnt 0
@@ -54,7 +54,7 @@ expect {
if { [test_front_end] } {
set can_not_run 1
send_user "\nWARNING: error expected, Testing is incompatible with front-end systems\n"
-#
+#
}
exp_continue
}
@@ -146,7 +146,7 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get SLURM_NODEID of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_1 ""] != 0} {
send_user "\nFAILURE: Started two tasks instead of one\n"
@@ -196,25 +196,25 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get SLURM_NODEID of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_3 ""] != 0} {
send_user "\nFAILURE: Started more than three tasks\n"
- set exit_code 1
+ set exit_code 1
}
set dup_host 0
if {[string compare $host_0 $host_1] == 0} {
- set dup_host 1
+ set dup_host 1
}
if {[string compare $host_0 $host_2] == 0} {
- set dup_host 1
+ set dup_host 1
}
if {[string compare $host_0 $host_3] == 0} {
- set dup_host 1
+ set dup_host 1
}
if {$dup_host == 1} {
send_user "\nFAILURE: Re-used a node in the allocation\n"
- set exit_code 1
+ set exit_code 1
}
#
@@ -261,29 +261,29 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get SLURM_NODEID of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_1 ""] == 0} {
send_user "\nFAILURE: Did not get SLURM_NODEID of task 1\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_3 ""] != 0} {
send_user "\nFAILURE: Started more than three tasks\n"
- set exit_code 1
+ set exit_code 1
}
set dup_host 0
if {[string compare $host_0 $host_1] == 0} {
- set dup_host 1
+ set dup_host 1
}
if {[string compare $host_0 $host_2] == 0} {
- set dup_host 1
+ set dup_host 1
}
if {[string compare $host_0 $host_3] == 0} {
- set dup_host 1
+ set dup_host 1
}
if {$dup_host == 1} {
send_user "\nFAILURE: Re-used a node in the allocation\n"
- set exit_code 1
+ set exit_code 1
}
if {$exit_code == 0} {
diff --git a/testsuite/expect/test1.82 b/testsuite/expect/test1.82
index a3ce30b6bb16ce546a93dfbab11fc929f13eb512..89d8750f47e2fbd9e95d0f459a92f1ab674c9063 100755
--- a/testsuite/expect/test1.82
+++ b/testsuite/expect/test1.82
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -107,15 +107,15 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_1 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 1\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_2 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 2\n"
- set exit_code 1
+ set exit_code 1
}
if {[test_front_end] != 0} {
send_user "\nWARNING: Additional testing is incompatible with front-end systems\n"
@@ -124,19 +124,19 @@ if {[test_front_end] != 0} {
}
if {[string compare $host_3 ""] != 0} {
send_user "\nFAILURE: Started more than three tasks\n"
- set exit_code 1
+ set exit_code 1
}
set dup_hostname 0
if {[string compare $host_0 $host_1] == 0} {
- incr dup_hostname
+ incr dup_hostname
}
if {[string compare $host_0 $host_2] == 0} {
- incr dup_hostname 1
+ incr dup_hostname 1
}
if {$dup_hostname == 1} {
send_user "\nFAILURE: Re-used a node in the allocation\n"
- set exit_code 1
+ set exit_code 1
}
set exclude_node $host_0
set include_node $host_2
@@ -148,15 +148,15 @@ set host_0 ""
set host_1 ""
set host_2 ""
set timeout $max_job_delay
-set srun_pid [spawn $srun -N2 -l --exclude=$exclude_node -t1 $bin_printenv SLURMD_NODENAME]
+set srun_pid [spawn $srun -N2 -l --exclude=$exclude_node -t1 $bin_printenv SLURMD_NODENAME]
expect {
-re "Invalid node name specified" {
send_user "\nWARNING: Appears you are using "
send_user "multiple slurmd testing.\n"
send_user "This test won't work in that fashion.\n"
- exit 0
+ exit 0
}
-
+
-re "($number): ($alpha_numeric_under)" {
if {$expect_out(1,string) == 0} {
set host_0 $expect_out(2,string)
@@ -184,26 +184,26 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_1 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 1\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_2 ""] != 0} {
send_user "\nFAILURE: Started more than two tasks\n"
- set exit_code 1
+ set exit_code 1
}
set dup_hostname 0
if {[string compare $host_0 $exclude_node] == 0} {
- set dup_hostname 1
+ set dup_hostname 1
}
if {[string compare $host_1 $exclude_node] == 0} {
- set dup_hostname 1
+ set dup_hostname 1
}
if {$dup_hostname == 1} {
send_user "\nFAILURE: Allocated an excluded node\n"
- set exit_code 1
+ set exit_code 1
}
#
@@ -238,19 +238,19 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_1 ""] != 0} {
send_user "\nFAILURE: Started more than one task\n"
- set exit_code 1
+ set exit_code 1
}
set dup_hostname 0
if {[string compare $host_0 $include_node] == 0} {
- set dup_hostname 1
+ set dup_hostname 1
}
if {$dup_hostname == 0} {
send_user "\nFAILURE: Allocation lacked an included node\n"
- set exit_code 1
+ set exit_code 1
}
if {$exit_code == 0} {
diff --git a/testsuite/expect/test1.83 b/testsuite/expect/test1.83
index 94f54a66b49e8ebf4eedc51caf8fbd0e28edfd3c..51500e2cc0ea763d548999ce4d7398b108e04442 100755
--- a/testsuite/expect/test1.83
+++ b/testsuite/expect/test1.83
@@ -9,8 +9,8 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# NOTE: This assumes node names are of the form <alpha><number>, where
-# the value of <number> indicates the nodes relative location.
+# NOTE: This assumes node names are of the form <alpha><number>, where
+# the value of <number> indicates the nodes relative location.
# Change tha node name parsing logic as needed for other formats.
############################################################################
# Copyright (C) 2002-2007 The Regents of the University of California.
@@ -18,21 +18,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -121,15 +121,15 @@ if {[test_front_end] != 0} {
if {[string compare $host_0_name ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 0\n"
- exit 1
+ exit 1
}
if {[string compare $host_1_name ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 1\n"
- exit 1
+ exit 1
}
if {[string compare $host_2_name ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 2\n"
- exit 1
+ exit 1
}
#
@@ -141,11 +141,11 @@ set host_2_num [get_suffix $host_2_name]
if {$host_1_num != [expr $host_0_num + 1]} {
send_user "\nFAILURE: node sequence number not contiguous\n"
- set exit_code 1
+ set exit_code 1
}
if {$host_2_num != [expr $host_1_num + 1]} {
send_user "\nFAILURE: node sequence number not contiguous\n"
- set exit_code 1
+ set exit_code 1
}
if {$exit_code == 0} {
diff --git a/testsuite/expect/test1.84 b/testsuite/expect/test1.84
index aa09c011fb4c17dcb566693da9ce25d300eda5b0..7cd0011c31bf0232ab65353f7fe70694eeea096f 100755
--- a/testsuite/expect/test1.84
+++ b/testsuite/expect/test1.84
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Test of cpus-per-task option on a single node (--cpus-per-task
+# Test of cpus-per-task option on a single node (--cpus-per-task
# option).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -9,29 +9,29 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# NOTE: This assumes node names are of the form <alpha><number>, where
-# the value of <number> indicates the nodes relative location.
+# NOTE: This assumes node names are of the form <alpha><number>, where
+# the value of <number> indicates the nodes relative location.
# Change tha node name parsing logic as needed for other formats.
############################################################################
# Copyright (C) 2002-2006 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -108,7 +108,7 @@ if {$fat_nodes == 1} {
#
if {[string compare $host ""] == 0} {
send_user "\nFAILURE: Did not get hostname\n"
- exit 1
+ exit 1
}
if {$cpu_cnt != $task_cnt} {
send_user "FAILURE: should have run $cpu_cnt tasks (one per CPU) "
@@ -131,7 +131,7 @@ expect {
send_user "\nWARNING: Appears you are using "
send_user "multiple slurmd testing.\n"
send_user "This test won't work in that fashion.\n"
- exit 0
+ exit 0
}
-re "$number: ($alpha_numeric_under)" {
incr task_cnt
@@ -153,7 +153,7 @@ expect {
if {$task_cnt != [expr $cpu_cnt / 2]} {
send_user "\nFAILURE: Improper task count for given cpus-per-task\n"
send_user "NOTE: This could be due to memory limit per allocated CPU\n\n"
- set exit_code 1
+ set exit_code 1
}
if {$exit_code == 0} {
diff --git a/testsuite/expect/test1.86 b/testsuite/expect/test1.86
index 7f5edcaf8bf4190331fef885a17b1a36f289cd41..e1748bbe2d0edaf948d97daa09d4601f03add1a0 100755
--- a/testsuite/expect/test1.86
+++ b/testsuite/expect/test1.86
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -61,7 +61,7 @@ make_bash_script $file_in "
"
#
-# Expect seems to have trouble parsing with this test due to a bug in Expect.
+# Expect seems to have trouble parsing with this test due to a bug in Expect.
# It overwrites the stdout parsed with stdin to the commands
# Change PATH to shorten the strings, which seems to help
#
@@ -109,7 +109,7 @@ expect {
set host_inx $expect_out(1,string)
if {$host_inx == 0} {
set host_0 $expect_out(2,string)
- }
+ }
if {$host_inx == 1} {
set host_1 $expect_out(2,string)
}
@@ -138,11 +138,11 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_1 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 1\n"
- set exit_code 1
+ set exit_code 1
}
if {$exit_code != 0} {
exit $exit_code
@@ -159,7 +159,7 @@ expect {
incr matches
} else {
send_user "\nFAILURE: wrong node responded\n"
- set exit_code 1
+ set exit_code 1
}
exp_continue
}
@@ -196,7 +196,7 @@ expect {
incr matches
} else {
send_user "\nFAILURE: wrong node responded\n"
- set exit_code 1
+ set exit_code 1
}
exp_continue
}
@@ -233,14 +233,14 @@ expect {
send_user "multiple slurmd testing.\n"
send_user "This test won't work in that fashion.\n"
send "exit\r"
- exit 0
+ exit 0
}
-re "0: ($alpha_numeric_under)" {
if {[string compare $expect_out(1,string) $host_0] == 0} {
incr matches
} else {
send_user "\nFAILURE: wrong node responded\n"
- set exit_code 1
+ set exit_code 1
}
exp_continue
}
@@ -277,7 +277,7 @@ expect {
incr matches
} else {
send_user "\nFAILURE: wrong node responded\n"
- set exit_code 1
+ set exit_code 1
}
exp_continue
}
diff --git a/testsuite/expect/test1.87 b/testsuite/expect/test1.87
index eb4f327d1b50ffcf8fc44eb6dd1574470d448156..3fdc8320e55be74c71ef06f72c82de9f05674449 100755
--- a/testsuite/expect/test1.87
+++ b/testsuite/expect/test1.87
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -144,19 +144,19 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_1 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 1\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_2 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 2\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_3 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 3\n"
- set exit_code 1
+ set exit_code 1
}
if {$exit_code != 0} {
exit $exit_code
@@ -229,7 +229,7 @@ expect {
incr matches
} else {
send_user "\nFAILURE: wrong node responded\n"
- set exit_code 1
+ set exit_code 1
}
}
if { $host_num == 1 } {
@@ -237,12 +237,12 @@ expect {
incr matches
} else {
send_user "\nFAILURE: wrong node responded\n"
- set exit_code 1
+ set exit_code 1
}
}
if { $host_num > 1 } {
send_user "\nFAILURE: too many tasks responded\n"
- set exit_code 1
+ set exit_code 1
}
exp_continue
}
@@ -282,7 +282,7 @@ expect {
}
-re "($number): ($alpha_numeric_under)" {
send_user "\nFAILURE: running where we shouldn't be able to run\n"
- set exit_code 1
+ set exit_code 1
exp_continue
}
-re "Unable to contact" {
diff --git a/testsuite/expect/test1.88 b/testsuite/expect/test1.88
index 6fdb0bf865db155a5a5b079da8d3265f29ba8f48..9b10b86141cdb303478afc53bb1e6bdba8eaedf2 100755
--- a/testsuite/expect/test1.88
+++ b/testsuite/expect/test1.88
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -73,7 +73,7 @@ if {$use_pmi} {
} else {
exec $mpicc -o $test_prog ${test_prog}.c
}
-
+
# Delete left-over stdout/err files
file delete $file_out $file_err
diff --git a/testsuite/expect/test1.88.prog.c b/testsuite/expect/test1.88.prog.c
index 1539f050a208d696a5695b5949477175fb7144a4..a37e6a63cc21d07ad459f2134d7df70703396978 100644
--- a/testsuite/expect/test1.88.prog.c
+++ b/testsuite/expect/test1.88.prog.c
@@ -5,21 +5,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Dong Ang <dahn@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
@@ -44,7 +44,7 @@ static void pass_its_neighbor(const int rank, const int size, const int* buf)
MPI_Waitall(2, request, status);
uname(&uts);
- fprintf(stdout, "Rank[%d] on %s just received msg from Rank %d\n",
+ fprintf(stdout, "Rank[%d] on %s just received msg from Rank %d\n",
rank, uts.nodename, *buf);
}
diff --git a/testsuite/expect/test1.89 b/testsuite/expect/test1.89
index 12d7517aa025eeb31f2af403e088d18eedb0b6ca..1c6c473e0921e0a5ad947b798ca4fb2017748c67 100755
--- a/testsuite/expect/test1.89
+++ b/testsuite/expect/test1.89
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -496,7 +496,7 @@ expect {
wait
}
}
-
+
if {$exit_code == 0} {
exec $bin_rm -f $file_prog
send_user "\nSUCCESS\n"
diff --git a/testsuite/expect/test1.89.prog.c b/testsuite/expect/test1.89.prog.c
index 8383de0579a3ed28346a8ca90b75d9dbbd13339d..49bbd2b0f0411ef66fd3959116c9608170acbdd8 100644
--- a/testsuite/expect/test1.89.prog.c
+++ b/testsuite/expect/test1.89.prog.c
@@ -40,7 +40,7 @@ static void _load_mask(cpu_set_t *mask)
int rc;
#ifdef SCHED_GETAFFINITY_THREE_ARGS
- rc = sched_getaffinity((pid_t) 0, (unsigned int) sizeof(cpu_set_t),
+ rc = sched_getaffinity((pid_t) 0, (unsigned int) sizeof(cpu_set_t),
mask);
#else
rc = sched_getaffinity((pid_t) 0, mask);
@@ -61,8 +61,8 @@ static int _mask_to_int(cpu_set_t *mask)
}
return rc;
}
-
-
+
+
main (int argc, char **argv)
{
char *task_str;
diff --git a/testsuite/expect/test1.9 b/testsuite/expect/test1.9
index 10b426d943634c371cdaa64224dca5f3d666fb11..c8202105d5243e644533aca0fee535d56045222f 100755
--- a/testsuite/expect/test1.9
+++ b/testsuite/expect/test1.9
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test1.90 b/testsuite/expect/test1.90
index 5b208850646afa69d11270ed72a314e7c5020f9b..2edfc95301ad43035578007eebf319a4bc72dbc9 100755
--- a/testsuite/expect/test1.90
+++ b/testsuite/expect/test1.90
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -548,7 +548,7 @@ expect {
wait
}
}
-
+
if {$exit_code == 0} {
exec $bin_rm -f $file_prog
send_user "\nSUCCESS\n"
diff --git a/testsuite/expect/test1.90.prog.c b/testsuite/expect/test1.90.prog.c
index fbde23f2a83de2b6f37c7e0a007a1253ea0c20fe..f2d7719fe6f12578c22f1142702cb5f462d9a355 100644
--- a/testsuite/expect/test1.90.prog.c
+++ b/testsuite/expect/test1.90.prog.c
@@ -70,7 +70,7 @@ main (int argc, char **argv)
task_id = atoi(task_str);
_load_cpu_mask(&cpu_mask);
_load_mem_mask(&mem_mask);
- printf("TASK_ID:%d,CPU_MASK:%lu,MEM_MASK:%lu\n",
+ printf("TASK_ID:%d,CPU_MASK:%lu,MEM_MASK:%lu\n",
task_id, _mask_to_int(&cpu_mask), _mask_to_int(&mem_mask));
exit(0);
}
diff --git a/testsuite/expect/test1.91 b/testsuite/expect/test1.91
index d27e71553d432a92aa4fb895c98835cad0429af0..c89c66e1efdcfaaa5b617cfab9b1cb6876d6faf1 100755
--- a/testsuite/expect/test1.91
+++ b/testsuite/expect/test1.91
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -452,7 +452,7 @@ expect {
wait
}
}
-
+
if {$exit_code == 0} {
exec $bin_rm -f $file_prog
send_user "\nSUCCESS\n"
diff --git a/testsuite/expect/test1.91.prog.c b/testsuite/expect/test1.91.prog.c
index c5d8705b56ad1377309f9b7f3067a0cc45af4056..2b80ac1ff9908ead7232caf5de31025398e92c10 100644
--- a/testsuite/expect/test1.91.prog.c
+++ b/testsuite/expect/test1.91.prog.c
@@ -40,7 +40,7 @@ static void _load_mask(cpu_set_t *mask)
int rc;
#ifdef SCHED_GETAFFINITY_THREE_ARGS
- rc = sched_getaffinity((pid_t) 0, (unsigned int) sizeof(cpu_set_t),
+ rc = sched_getaffinity((pid_t) 0, (unsigned int) sizeof(cpu_set_t),
mask);
#else
rc = sched_getaffinity((pid_t) 0, mask);
@@ -61,8 +61,8 @@ static int _mask_to_int(cpu_set_t *mask)
}
return rc;
}
-
-
+
+
main (int argc, char **argv)
{
char *task_str;
diff --git a/testsuite/expect/test1.92 b/testsuite/expect/test1.92
index 01909d4db7dfa03fc4f5f6509f625b7e6a83637f..39f87186e52e68e3acd34706907ad99ff923f1c9 100755
--- a/testsuite/expect/test1.92
+++ b/testsuite/expect/test1.92
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -290,7 +290,7 @@ expect {
wait
}
}
-
+
if {$exit_code == 0} {
send_user "\nSUCCESS\n"
} else {
diff --git a/testsuite/expect/test1.93 b/testsuite/expect/test1.93
index 4bcaf4f96b12f06824f3a8f84a6ac519d565c798..69a1f12473f7fd664e732409871ae5193251f2f6 100755
--- a/testsuite/expect/test1.93
+++ b/testsuite/expect/test1.93
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -95,7 +95,7 @@ expect {
set host_inx $expect_out(1,string)
if {$host_inx == 0} {
set host_0 $expect_out(2,string)
- }
+ }
if {$host_inx == 1} {
set host_1 $expect_out(2,string)
}
diff --git a/testsuite/expect/test10.1 b/testsuite/expect/test10.1
index dced62c79c30732439bade426dba519eee95c119..c440befd3719d498e9626298ae6135fbf7484005 100755
--- a/testsuite/expect/test10.1
+++ b/testsuite/expect/test10.1
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -46,7 +46,7 @@ if {[file exists $smap] == 0} {
#
# Report the smap usage format
#
-spawn $smap --usage
+spawn $smap --usage
expect {
-re "Usage: .*seconds.*" {
incr matches
diff --git a/testsuite/expect/test10.10 b/testsuite/expect/test10.10
index ef15fcee1c841477ac01918eb121791baacacd33..619e052988ff2e882ce56a47e8dc08fefb06c425 100755
--- a/testsuite/expect/test10.10
+++ b/testsuite/expect/test10.10
@@ -1,9 +1,9 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Check --noheader option in smap in curses mode
+# Check --noheader option in smap in curses mode
# (--noheader option).
-#
+#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -49,7 +49,7 @@ if {[file exists $smap] == 0} {
# Check the the --noheader option in smap
# in curses format.
#
-set timeout 10
+set timeout 10
spawn $smap --noheader
#exp_internal -f test10.10.log 1
expect {
@@ -101,7 +101,7 @@ expect {
-re "NODELIST" {
set stuff [concat $stuff "10"]
incr matches
- exp_continue
+ exp_continue
}
-re "20\[0-1]\[0-9]" {
set stuff [concat $stuff "11"]
@@ -111,8 +111,8 @@ expect {
exp_continue
}
"qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqj" {
- # This is the bottom line of the smap box I know it
- # looks wierd, but this is what expect sees it as.
+ # This is the bottom line of the smap box I know it
+ # looks wierd, but this is what expect sees it as.
# exec sleep 1
send "\r"
exp_continue
diff --git a/testsuite/expect/test10.11 b/testsuite/expect/test10.11
index e0116c80edd027fe7649ab799146cd9af3cf52b8..1d96d5b04009ab07e8dc9985fa70e1ccbfcf2245 100755
--- a/testsuite/expect/test10.11
+++ b/testsuite/expect/test10.11
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test10.12 b/testsuite/expect/test10.12
index 5748d980c7425d8e2cfa57b05e9d5d2354db7ae8..cff853bbffc308c9258a9ab0dbf816900a178e7c 100755
--- a/testsuite/expect/test10.12
+++ b/testsuite/expect/test10.12
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -84,7 +84,7 @@ set check 0
if {$exit_code != 1} {
#
# Test smap resolve ablilty
- # for Rack Midplane to XYZ coords
+ # for Rack Midplane to XYZ coords
#
spawn $smap --resolve R000
expect {
@@ -109,7 +109,7 @@ if {$exit_code != 1} {
}
if {$check != 1} {
- send_user "\nFAILURE: smap resolve failed for Rack Midplane to XYZ.\n"
+ send_user "\nFAILURE: smap resolve failed for Rack Midplane to XYZ.\n"
set exit_code 1
}
diff --git a/testsuite/expect/test10.13 b/testsuite/expect/test10.13
index 8307fd2ef213e5e0e476e813ff0a4ca3a8c145f4..6c6e41cd5dc84435b4d65175a373f6e59dcae859 100755
--- a/testsuite/expect/test10.13
+++ b/testsuite/expect/test10.13
@@ -1,9 +1,9 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Check bluegene.conf file creation
+# Check bluegene.conf file creation
# (-Dc option).
-#
+#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -62,8 +62,8 @@ expect {
}
-re "BG SYSTEM" {
set non_bg 1
- exp_continue
- }
+ exp_continue
+ }
-re "TORUS" {
set created 1
exp_continue
@@ -78,8 +78,8 @@ expect {
}
incr matches
exp_continue
- }
-
+ }
+
timeout {
send_user "\nFAILURE: smap not responding\n"
set created 1
@@ -175,7 +175,7 @@ if { $exit_code != 1 } {
}
}
-exec rm -f $file
+exec rm -f $file
if {$exit_code == 0} {
send_user "\nSUCCESS\n"
}
diff --git a/testsuite/expect/test10.2 b/testsuite/expect/test10.2
index aaae364b374040d2e463a4e1be1bcb81490247a7..e056e2219f27fcee0be798f904c3aa561f7c5a2f 100755
--- a/testsuite/expect/test10.2
+++ b/testsuite/expect/test10.2
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -46,7 +46,7 @@ if {[file exists $smap] == 0} {
#
# Report the smap help message
#
-spawn $smap --help
+spawn $smap --help
expect {
-re "Usage:" {
incr matches
diff --git a/testsuite/expect/test10.3 b/testsuite/expect/test10.3
index d9ad533b6a11f64bc22cf712c11afde76398e256..918cf04dfe2f2b922c1cc1aa693faf892e68100f 100755
--- a/testsuite/expect/test10.3
+++ b/testsuite/expect/test10.3
@@ -1,9 +1,9 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Check slurm partition display in smap in curses mode
+# Check slurm partition display in smap in curses mode
# (-Ds option).
-#
+#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -78,14 +78,14 @@ expect {
-re "NODELIST" {
incr matches
send "q"
- exp_continue
+ exp_continue
}
-re "BP_LIST" {
incr matches
send "q"
exp_continue
}
-
+
timeout {
send_user "\nFAILURE: smap not responding\n"
set exit_code 1
diff --git a/testsuite/expect/test10.4 b/testsuite/expect/test10.4
index 1b009245d7910e2c6a2a187e9bd7acc373d9708e..7ff958d3d95eae3830c7e43b692175538b9a3a3c 100755
--- a/testsuite/expect/test10.4
+++ b/testsuite/expect/test10.4
@@ -1,9 +1,9 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Check slurm partition display in smap in commandline mode
+# Check slurm partition display in smap in commandline mode
# (-Ds -c option).
-#
+#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -68,13 +68,13 @@ expect {
}
-re "NODELIST" {
incr matches
- exp_continue
+ exp_continue
}
-re "BP_LIST" {
incr matches
exp_continue
}
-
+
timeout {
send_user "\nFAILURE: smap not responding\n"
set exit_code 1
diff --git a/testsuite/expect/test10.5 b/testsuite/expect/test10.5
index 45d04acf1d744f07badfc6b8226244a6309209bb..95b5734f116c7481bdce95f365220df27079f22a 100755
--- a/testsuite/expect/test10.5
+++ b/testsuite/expect/test10.5
@@ -1,9 +1,9 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Check BG partition display in smap in curses mode
+# Check BG partition display in smap in curses mode
# (-Db option).
-#
+#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -59,7 +59,7 @@ expect {
-re "BG SYSTEM" {
set non_bg 1
exp_continue
- }
+ }
-re "ID" {
incr matches
exp_continue
@@ -91,7 +91,7 @@ expect {
-re "NODELIST" {
incr matches
send "q"
- exp_continue
+ exp_continue
}
-re "BP_LIST" {
incr matches
diff --git a/testsuite/expect/test10.6 b/testsuite/expect/test10.6
index 5620669c542880e3782420e05606111cf1e598cd..0be8565ae95e060b9cab6677d3a5f6080acd2400 100755
--- a/testsuite/expect/test10.6
+++ b/testsuite/expect/test10.6
@@ -1,9 +1,9 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Check BG partition display in smap in commandline mode
+# Check BG partition display in smap in commandline mode
# (-Db -c option).
-#
+#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -81,7 +81,7 @@ expect {
}
-re "NODELIST" {
incr matches
- exp_continue
+ exp_continue
}
-re "BP_LIST" {
incr matches
diff --git a/testsuite/expect/test10.7 b/testsuite/expect/test10.7
index c9175fbffa15a3e4f247a5a00d1bac13521cf141..2b76b7437fe511c9c50dc708dfe5ead155f86594 100755
--- a/testsuite/expect/test10.7
+++ b/testsuite/expect/test10.7
@@ -1,9 +1,9 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Check job information display in smap in curses mode
+# Check job information display in smap in curses mode
# (-Dj option).
-#
+#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -95,9 +95,9 @@ expect {
set stuff [concat $stuff "10"]
incr matches
send "q"
- exp_continue
+ exp_continue
}
-
+
timeout {
send_user "\nFAILURE: smap not responding\n"
set exit_code 1
diff --git a/testsuite/expect/test10.8 b/testsuite/expect/test10.8
index 24d8c2dc317f9ab82f4c4a4bd0458d9b757287f5..f48cc4ae3ce1859b643e681fe813f852cbeb1b4a 100755
--- a/testsuite/expect/test10.8
+++ b/testsuite/expect/test10.8
@@ -1,9 +1,9 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Check job information display in smap in commandline mode
+# Check job information display in smap in commandline mode
# (-Dj -c option).
-#
+#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -89,14 +89,14 @@ expect {
-re "NODELIST" {
set stuff [concat $stuff "10"]
incr matches
- exp_continue
+ exp_continue
}
-re "BP_LIST" {
set stuff [concat $stuff "10"]
incr matches
exp_continue
}
-
+
timeout {
send_user "\nFAILURE: smap not responding\n"
set exit_code 1
diff --git a/testsuite/expect/test10.9 b/testsuite/expect/test10.9
index 938a58f3f338a80f018897566871d0b16f9fe489..709b31f3a6bc0b072b34c9135b2a25e3af4b4522 100755
--- a/testsuite/expect/test10.9
+++ b/testsuite/expect/test10.9
@@ -1,9 +1,9 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Check --iterate option in curses mode
+# Check --iterate option in curses mode
# (--iterate 1 option).
-#
+#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -70,7 +70,7 @@ expect {
}
exp_continue
}
-
+
timeout {
send_user "\nFAILURE: smap not responding\n"
set exit_code 1
diff --git a/testsuite/expect/test11.1 b/testsuite/expect/test11.1
index 10e6bf9e47bde8232da4c8129c41a0314fe54e48..81fa38d9891d3e9d021dd7f7a32174785d358d65 100755
--- a/testsuite/expect/test11.1
+++ b/testsuite/expect/test11.1
@@ -3,7 +3,7 @@
# Purpose: Test of POE functionality
# Test of nodes options (-nodes).
# Test of procs options (-procs).
-#
+#
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -83,7 +83,7 @@ expect {
wait
}
}
-
+
if {$node_count != $num_nodes} {
send_user "\nFAILURE: Did not get proper node count\n"
diff --git a/testsuite/expect/test11.2 b/testsuite/expect/test11.2
index 058f7b45f1c602b979236b689e1edecdf0b9136c..e5bdd15132ca74329aa3b3b2b09ac6767650ea1f 100755
--- a/testsuite/expect/test11.2
+++ b/testsuite/expect/test11.2
@@ -1,9 +1,9 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of POE functionality
-# Test of Network options being set correctly.
+# Test of Network options being set correctly.
# (-euilib and -euidevice)
-#
+#
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -79,7 +79,7 @@ expect {
eof {
}
}
-
+
if { $found_device != 1 } {
send_user "\nFAILURE: device '$device' was not set correctly\
@@ -105,7 +105,7 @@ expect {
eof {
}
}
-
+
if {[string compare $mode $found_mode]} {
send_user "\nFAILURE: mode '$mode' was not set correctly\
@@ -141,20 +141,20 @@ expect {
eof {
}
}
-
+
if {[string compare $mode $found_mode]} {
send_user "\nFAILURE: mode '$mode' was not set correctly\
got '$found_mode'\n"
set exit_code 1
}
-
+
if {[string compare $device $found_device]} {
send_user "\nFAILURE: device '$device' was not set correctly\
got '$found_device'\n"
set exit_code 1
}
-
+
if {$exit_code == 0} {
send_user "\nSUCCESS\n"
}
diff --git a/testsuite/expect/test11.3 b/testsuite/expect/test11.3
index 1d81520c7398758030ed12f08bf1b840cdbef7eb..6ed4cd50a827ac018b7a34be8670d586fbe24040 100755
--- a/testsuite/expect/test11.3
+++ b/testsuite/expect/test11.3
@@ -1,9 +1,9 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of POE functionality
-# Test of Network protocol being set correctly.
+# Test of Network protocol being set correctly.
# (-msg_api)
-#
+#
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -54,7 +54,7 @@ if { [string length $partition] == 0 } {
}
set protocols { "mpi" "lapi" "mpi_lapi" }
-
+
foreach proto $protocols {
#
# execute poe with a specific node count
@@ -70,7 +70,7 @@ foreach proto $protocols {
incr proto_count
incr found
}
- }
+ }
exp_continue
}
-re "slurm job ($number)" {
@@ -91,7 +91,7 @@ if { $proto_count != $protos || !$proto_count } {
send_user "\nFAILURE: not all protocols worked got $proto_count looking for $protos\n"
set exit_code 1
}
-
+
if {$exit_code == 0} {
send_user "\nSUCCESS\n"
}
diff --git a/testsuite/expect/test11.4 b/testsuite/expect/test11.4
index 60fa0658bd993a5cff752511289ab1cf9af36d64..f68eaa65cdbbe7e2381574adf95729283bb5f43d 100755
--- a/testsuite/expect/test11.4
+++ b/testsuite/expect/test11.4
@@ -2,7 +2,7 @@
############################################################################
# Purpose: Test of POE functionality
# Test of running mpi jobs
-#
+#
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -89,7 +89,7 @@ if { $job_ran != $job_count } {
send_user "\nFAILURE: not all jobs worked\n"
set exit_code 1
}
-
+
if {$exit_code == 0} {
send_user "\nSUCCESS\n"
}
diff --git a/testsuite/expect/test11.5 b/testsuite/expect/test11.5
index 071c064a93ae80193e1f6ca4f7294bde148bf6a6..62b6b0589f8ed06b1666d80f71f234f804c5068b 100755
--- a/testsuite/expect/test11.5
+++ b/testsuite/expect/test11.5
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test11.6 b/testsuite/expect/test11.6
index 0e1bc988f7080375058817a58e6f43157611d56c..f32637d1ace07e87a7c2c1dd918b19dec3698446 100755
--- a/testsuite/expect/test11.6
+++ b/testsuite/expect/test11.6
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -120,7 +120,7 @@ expect {
# Make sure the job does not finish if checkpoint completes
#
set timeout 40
-set spawn_id $poe_id
+set spawn_id $poe_id
expect {
-re "FINI" {
if {$ckpt_success == 1} {
@@ -138,7 +138,7 @@ expect {
wait
}
}
-
+
if {$exit_code == 0} {
exec rm -f $file_in
send_user "\nSUCCESS\n"
diff --git a/testsuite/expect/test11.7 b/testsuite/expect/test11.7
index dea129556fdc8eb036488cb434897d99a6fb5f27..8d4ffc14dcf3158cf01361f09e812a89ef6a528a 100755
--- a/testsuite/expect/test11.7
+++ b/testsuite/expect/test11.7
@@ -2,7 +2,7 @@
############################################################################
# Purpose: Test of POE functionality
# Test of hostfile option (-hostfile).
-#
+#
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -70,7 +70,7 @@ expect {
exit $exit_code
}
exp_continue
- }
+ }
timeout {
send_user "\nFAILURE: scontrol not responding\n"
exit 1
diff --git a/testsuite/expect/test12.1 b/testsuite/expect/test12.1
index 33e00ce9c0824c5bb61f961de002ffc6a765a2bd..acef13dbfa305412a5e4724ff520ea9fff3c9e47 100755
--- a/testsuite/expect/test12.1
+++ b/testsuite/expect/test12.1
@@ -13,21 +13,21 @@
# Written by Morris Jette <jette1@llnl.gov>
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -44,7 +44,7 @@ print_header $test_id
#
# Report the sacct help format
#
-
+
spawn $sacct --help
expect {
-re "SLURM accounting storage is disabled" {
diff --git a/testsuite/expect/test12.2 b/testsuite/expect/test12.2
index 64f2e548325f060014085ca074c503e7b4d0d4ce..caf7eecd8e24ae16f17d5246250298ce4b19c3dc 100755
--- a/testsuite/expect/test12.2
+++ b/testsuite/expect/test12.2
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -111,7 +111,7 @@ proc _get_mem {prog} {
return 1
} elseif { $ave_used != $mem_used } {
send_user "\nFAILURE: sstat stat memory task not equal to ave memory\n"
- return 1
+ return 1
}
# Compute error in KB
set diff_mem [expr $mem_used - $mem_size]
@@ -230,7 +230,7 @@ if {[wait_for_job $job_id "DONE"] != 0} {
#
# Report basic sacct info
#
-
+
spawn $sacct --noheader -P --job=$job_id.0 --fields jobid,jobname,state,exitcode
expect {
-re "$job_id\.0" {
diff --git a/testsuite/expect/test12.2.prog.c b/testsuite/expect/test12.2.prog.c
index 108266944dcda1a679360dd38900afecff6cea2d..ed647ec1ea486475fcfd45dfbb36f9bfc0d21ee4 100644
--- a/testsuite/expect/test12.2.prog.c
+++ b/testsuite/expect/test12.2.prog.c
@@ -6,21 +6,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
@@ -30,13 +30,13 @@
#include <string.h>
#include <unistd.h>
-main (int argc, char **argv)
+main (int argc, char **argv)
{
int exit_code, sleep_time, mem_kb;
char *mem;
if (argc != 4) {
- fprintf(stderr,
+ fprintf(stderr,
"Usage: %s <exit_code> <sleep_time> <mem_kb>\n",
argv[0]);
exit(1);
@@ -48,7 +48,7 @@ main (int argc, char **argv)
mem = malloc(mem_kb * 1024);
/* need to do a memset on the memory or AIX will not give it
- * to me!
+ * to me!
*/
memset(mem, 0, (mem_kb * 1024));
sleep(sleep_time);
diff --git a/testsuite/expect/test12.4 b/testsuite/expect/test12.4
index f9fd464c8dd6acff10ebf91e72076de51ff46d1c..efc4c6eee7bb06506ada648cc2d6b3c7c06a3c8d 100755
--- a/testsuite/expect/test12.4
+++ b/testsuite/expect/test12.4
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test12.5 b/testsuite/expect/test12.5
index 215ba09c229e77f2fa1ad12862ac83ca5feb6841..501959a4f208606086c29b73bdbd0344181ab294 100755
--- a/testsuite/expect/test12.5
+++ b/testsuite/expect/test12.5
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test13.1 b/testsuite/expect/test13.1
index c5b9189904b1be148e9c833486e81726428a5183..0fa4c467c33e4c98c74fb403aa98060b703d7dfd 100755
--- a/testsuite/expect/test13.1
+++ b/testsuite/expect/test13.1
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -39,7 +39,7 @@ print_header $test_id
#
# Report the slurm network and use it to establish window parameters
-#
+#
# windows_per_node - switch windows available per node
# windows_iterations - job steps to run after initial switch window allocation
# for a persistent job step
diff --git a/testsuite/expect/test14.1 b/testsuite/expect/test14.1
index 6792f64bf68d97d8cc1ca09fb49664c2b38031c0..87f28c0890730f29569b77f0757674fd6beb63b4 100755
--- a/testsuite/expect/test14.1
+++ b/testsuite/expect/test14.1
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Report the sbcast usage format
#
-
-spawn $sbcast --usage
+
+spawn $sbcast --usage
expect {
-re "Usage: .*SOURCE DEST.*" {
incr matches
diff --git a/testsuite/expect/test14.2 b/testsuite/expect/test14.2
index c0c0a75c9071d2db1f91aa52bcc05273a4236562..d69970260ccb21321b4e053de162af4bb65e1715 100755
--- a/testsuite/expect/test14.2
+++ b/testsuite/expect/test14.2
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Report the sbcast help message
#
-
-spawn $sbcast --help
+
+spawn $sbcast --help
expect {
-re "Usage:" {
incr matches
diff --git a/testsuite/expect/test14.3 b/testsuite/expect/test14.3
index e6e18b82ddb21799360ce3807fbac90d7bb70a8f..2deded0dea6f74205880e29869e3f805e214082a 100755
--- a/testsuite/expect/test14.3
+++ b/testsuite/expect/test14.3
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Confirm that sbcast reports a proper version number (--version
+# Confirm that sbcast reports a proper version number (--version
# option).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test14.4 b/testsuite/expect/test14.4
index 5ce4397d2c3f16092505d95d23a343be203af966..76923af247d07dbd2e9d8fd5a4ebedfbcbbe728f 100755
--- a/testsuite/expect/test14.4
+++ b/testsuite/expect/test14.4
@@ -7,28 +7,28 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# Note: This script generates and then deletes files in the working directory
+# Note: This script generates and then deletes files in the working directory
# named test14.4.input, test14.4.output, and test14.4.error
############################################################################
# Copyright (C) 2006 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test14.5 b/testsuite/expect/test14.5
index 838265dfc1658b1933ecd082b768067f065ac479..d778ff362cedfd41954a5faa9534cc30673406d9 100755
--- a/testsuite/expect/test14.5
+++ b/testsuite/expect/test14.5
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test14.6 b/testsuite/expect/test14.6
index feaea6d05d47fba8dc518d332e3e89871a66abf3..b155be9e74ea0e624cab5a5026fd05522f9c12d0 100755
--- a/testsuite/expect/test14.6
+++ b/testsuite/expect/test14.6
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test14.7 b/testsuite/expect/test14.7
index e464c6d8f1b367976580ee1dc917e76ee837d67f..47a01ca056ba258e684eb4506b4a2f7f2aac2d32 100755
--- a/testsuite/expect/test14.7
+++ b/testsuite/expect/test14.7
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test14.8 b/testsuite/expect/test14.8
index 937dae2322b627914cdd67dd9ab8550136a5adf6..58f4b823580ff4e4efedc6c1a424481fa444bb4a 100755
--- a/testsuite/expect/test14.8
+++ b/testsuite/expect/test14.8
@@ -8,28 +8,28 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# Note: This script generates and then deletes files in the working directory
+# Note: This script generates and then deletes files in the working directory
# named test14.8.input and test14.8.output
############################################################################
# Copyright (C) 2006 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test15.1 b/testsuite/expect/test15.1
index 7cf9bcb078d6f270d13769bf5a1d7c3a34a91dcb..a2f2c9f9cb0a6fa714700d6b2726ffb5f50b880a 100755
--- a/testsuite/expect/test15.1
+++ b/testsuite/expect/test15.1
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Report the salloc usage format
#
-
-spawn $salloc --usage
+
+spawn $salloc --usage
expect {
-re "Usage: .*salloc.*" {
incr matches
diff --git a/testsuite/expect/test15.10 b/testsuite/expect/test15.10
index 32571a90befb1fb6c5239f1cef165e070c357301..4fc4d513fe76bde39a11240d8c7a9bf522c939e8 100755
--- a/testsuite/expect/test15.10
+++ b/testsuite/expect/test15.10
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Confirm that a job allocates the proper procesor count (--tasks)
+# Confirm that a job allocates the proper procesor count (--tasks)
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -72,7 +72,7 @@ for {set inx 1} {$inx < 4} {set inx [expr $inx * 2]} {
send_user "$tasks_get < $tasks_set\n"
set exit_code 1
} else {
- send_user "test of $tasks_get processors good\n\n"
+ send_user "test of $tasks_get processors good\n\n"
}
wait
}
diff --git a/testsuite/expect/test15.11 b/testsuite/expect/test15.11
index ae398cf9abe64425f03250d6c3a1942e0ac210e1..04f167fbfe26c15c9c9652f2cfe5c809c5b12b04 100755
--- a/testsuite/expect/test15.11
+++ b/testsuite/expect/test15.11
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test15.12 b/testsuite/expect/test15.12
index 7156228f17810ce465781ebbaf44ced126867e48..1fbec7c39f7eb3698a433494c0ae87d54efafcee 100755
--- a/testsuite/expect/test15.12
+++ b/testsuite/expect/test15.12
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -50,7 +50,7 @@ if {[test_wiki_sched] == 1} {
#
set err_msg 0
set timeout $max_job_delay
-spawn $salloc -N1 -t1 --constraint=invalid,constraint salloc -t1 $bin_bash
+spawn $salloc -N1 -t1 --constraint=invalid,constraint salloc -t1 $bin_bash
expect {
-re "error:.*Invalid feature specification" {
send_user "This error is expected, no worries\n"
@@ -78,7 +78,7 @@ expect {
}
if {$err_msg != 1} {
send_user "\nFAILURE: job failed to report required error\n"
- set exit_code 1
+ set exit_code 1
}
if {$exit_code == 0} {
diff --git a/testsuite/expect/test15.13 b/testsuite/expect/test15.13
index 50195ae73fb1cd90dfdfef728f3931f8e528cb88..ef64cba49bfbb86a027730a85660d859155bd5d7 100755
--- a/testsuite/expect/test15.13
+++ b/testsuite/expect/test15.13
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test15.14 b/testsuite/expect/test15.14
index fb1e04bf526fa0f14dbe92558fdabf4edfa87406..c201ffe6595cc66637b7b29206c26db251a1e6cc 100755
--- a/testsuite/expect/test15.14
+++ b/testsuite/expect/test15.14
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test15.15 b/testsuite/expect/test15.15
index a2fa207ea37834ed9c5c4e69ca9a1cb9c6039531..515e55e623af95cb354f81a971c7fbc6dbfab2a0 100755
--- a/testsuite/expect/test15.15
+++ b/testsuite/expect/test15.15
@@ -2,7 +2,7 @@
############################################################################
# Purpose: Test of SLURM functionality
# Test of user signal upon allocation (--bell and --no-bell options).
-# We can't really confirm these are processed, but just make sure
+# We can't really confirm these are processed, but just make sure
# that salloc does not choke on the options
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test15.16 b/testsuite/expect/test15.16
index 8c685f653c623ed7ce067950a3d50fc03cab8b0d..bbf82eb407854991ab3dc4c37c185ed882149306 100755
--- a/testsuite/expect/test15.16
+++ b/testsuite/expect/test15.16
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test15.17 b/testsuite/expect/test15.17
index 261e1b8195e3fd7c1f75337ba01521e4cfb61ced..e91d6632a02f042e69564a0d4ae4d1ec7405c0e2 100755
--- a/testsuite/expect/test15.17
+++ b/testsuite/expect/test15.17
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test15.18 b/testsuite/expect/test15.18
index 515d4a1287ebb696a550eaea2929b630466feb24..5d31e9e6242c72ea7feecd279429573b6b384cb7 100755
--- a/testsuite/expect/test15.18
+++ b/testsuite/expect/test15.18
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test15.19 b/testsuite/expect/test15.19
index fd0b53e33167c6637e68815736539ebc793cb972..69e0ea9577c75769147d2c6befc1495bb8054307 100755
--- a/testsuite/expect/test15.19
+++ b/testsuite/expect/test15.19
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -41,7 +41,7 @@ set exit_code 0
print_header $test_id
#
-# Submit a 1 node job and validate that we don't get more than one
+# Submit a 1 node job and validate that we don't get more than one
#
set can_not_run 0
set job_id 0
@@ -168,7 +168,7 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get SLURM_NODENAME of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_1 ""] != 0} {
send_user "\nFAILURE: Started two tasks instead of one\n"
@@ -226,25 +226,25 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get SLURMD_NODENAME of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_3 ""] != 0} {
send_user "\nFAILURE: Started more than three tasks\n"
- set exit_code 1
+ set exit_code 1
}
set dup_host 0
if {[string compare $host_0 $host_1] == 0} {
- set dup_host 1
+ set dup_host 1
}
if {[string compare $host_0 $host_2] == 0} {
- set dup_host 1
+ set dup_host 1
}
if {[string compare $host_0 $host_3] == 0} {
- set dup_host 1
+ set dup_host 1
}
if {$dup_host == 1} {
send_user "\nFAILURE: Re-used a node in the allocation\n"
- set exit_code 1
+ set exit_code 1
}
#
@@ -303,29 +303,29 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get SLURMD_NODENAME of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_1 ""] == 0} {
send_user "\nFAILURE: Did not get SLURMD_NODENAME of task 1\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_3 ""] != 0} {
send_user "\nFAILURE: Started more than three tasks\n"
- set exit_code 1
+ set exit_code 1
}
set dup_host 0
if {[string compare $host_0 $host_1] == 0} {
- set dup_host 1
+ set dup_host 1
}
if {[string compare $host_0 $host_2] == 0} {
- set dup_host 1
+ set dup_host 1
}
if {[string compare $host_0 $host_3] == 0} {
- set dup_host 1
+ set dup_host 1
}
if {$dup_host == 1} {
send_user "\nFAILURE: Re-used a node in the allocation\n"
- set exit_code 1
+ set exit_code 1
}
if {$exit_code == 0} {
diff --git a/testsuite/expect/test15.2 b/testsuite/expect/test15.2
index db94ad9f148a56d483b1b9ebf79f83fb903e089f..9160d94580e1d25ea0e40a9d033ab91ad7986bc9 100755
--- a/testsuite/expect/test15.2
+++ b/testsuite/expect/test15.2
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Report the salloc help message
#
-
-spawn $salloc --help
+
+spawn $salloc --help
expect {
-re "Usage:" {
incr matches
diff --git a/testsuite/expect/test15.20 b/testsuite/expect/test15.20
index cdbcd3cebe03d781c2ca5c6f0ecb133e3fe3c483..af3bbe382cd94f3a1d8b1cd4361593b02c657eb1 100755
--- a/testsuite/expect/test15.20
+++ b/testsuite/expect/test15.20
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -119,15 +119,15 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_1 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 1\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_2 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 2\n"
- set exit_code 1
+ set exit_code 1
}
if {[test_front_end] != 0} {
send_user "\nWARNING: Additional testing is incompatible with front-end systems\n"
@@ -136,19 +136,19 @@ if {[test_front_end] != 0} {
}
if {[string compare $host_3 ""] != 0} {
send_user "\nFAILURE: Started more than three tasks\n"
- set exit_code 1
+ set exit_code 1
}
set dup_hostname 0
if {[string compare $host_0 $host_1] == 0} {
- incr dup_hostname
+ incr dup_hostname
}
if {[string compare $host_0 $host_2] == 0} {
- incr dup_hostname 1
+ incr dup_hostname 1
}
if {$dup_hostname == 1} {
send_user "\nFAILURE: Re-used a node in the allocation\n"
- set exit_code 1
+ set exit_code 1
}
set exclude_node $host_0
set include_node $host_2
@@ -171,9 +171,9 @@ expect {
send_user "\nWARNING: Appears you are using "
send_user "multiple slurmd testing.\n"
send_user "This test won't work in that fashion.\n"
- exit 0
+ exit 0
}
-
+
-re "($number): ($alpha_numeric_under)" {
if {$expect_out(1,string) == 0} {
set host_0 $expect_out(2,string)
@@ -204,26 +204,26 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_1 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 1\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_2 ""] != 0} {
send_user "\nFAILURE: Started more than two tasks\n"
- set exit_code 1
+ set exit_code 1
}
set dup_hostname 0
if {[string compare $host_0 $exclude_node] == 0} {
- set dup_hostname 1
+ set dup_hostname 1
}
if {[string compare $host_1 $exclude_node] == 0} {
- set dup_hostname 1
+ set dup_hostname 1
}
if {$dup_hostname == 1} {
send_user "\nFAILURE: Allocated an excluded node\n"
- set exit_code 1
+ set exit_code 1
}
#
@@ -266,19 +266,19 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_1 ""] != 0} {
send_user "\nFAILURE: Started more than one task\n"
- set exit_code 1
+ set exit_code 1
}
set dup_hostname 0
if {[string compare $host_0 $include_node] == 0} {
- set dup_hostname 1
+ set dup_hostname 1
}
if {$dup_hostname == 0} {
send_user "\nFAILURE: Allocation lacked an included node\n"
- set exit_code 1
+ set exit_code 1
}
if {$exit_code == 0} {
diff --git a/testsuite/expect/test15.21 b/testsuite/expect/test15.21
index ac8e6ba30ead1d5eb9be35e85c8d9f28c736a2ad..43ea422b7cd549986cd5040c3d871d2a23d5df39 100755
--- a/testsuite/expect/test15.21
+++ b/testsuite/expect/test15.21
@@ -8,8 +8,8 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# NOTE: This assumes node names are of the form <alpha><number>, where
-# the value of <number> indicates the nodes relative location.
+# NOTE: This assumes node names are of the form <alpha><number>, where
+# the value of <number> indicates the nodes relative location.
# Change tha node name parsing logic as needed for other formats.
############################################################################
# Copyright (C) 2002-2007 The Regents of the University of California.
@@ -17,21 +17,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -131,15 +131,15 @@ if {[test_front_end] != 0} {
if {[string compare $host_0_name ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_1_name ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 1\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_2_name ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 2\n"
- set exit_code 1
+ set exit_code 1
}
#
@@ -147,11 +147,11 @@ if {[string compare $host_2_name ""] == 0} {
#
if {$host_1_num != [expr $host_0_num + 1]} {
send_user "\nFAILURE: node sequence number not contiguous\n"
- set exit_code 1
+ set exit_code 1
}
if {$host_2_num != [expr $host_1_num + 1]} {
send_user "\nFAILURE: node sequence number not contiguous\n"
- set exit_code 1
+ set exit_code 1
}
if {$exit_code == 0} {
diff --git a/testsuite/expect/test15.22 b/testsuite/expect/test15.22
index dc0889737b24b1487906f24aadb5e194b8f79863..a3e88ff4fdc2b1ed84165f6ccc65bfbeed6c8d14 100755
--- a/testsuite/expect/test15.22
+++ b/testsuite/expect/test15.22
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Test of partition specification on job submission (--partition
+# Test of partition specification on job submission (--partition
# option).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -46,7 +46,7 @@ print_header $test_id
#
# Identify the partitions in the cluster, identifying the default
#
-spawn $sinfo --summarize
+spawn $sinfo --summarize
expect {
-re "($end_of_line)($alpha_numeric_under)(\[ \*\]) *up" {
if (![string compare $expect_out(3,string) "*"]) {
@@ -74,7 +74,7 @@ expect {
#
set job_id 0
set timeout $max_job_delay
-set salloc_pid [spawn $salloc --partition=$def_part_name -t1 $bin_sleep 1]
+set salloc_pid [spawn $salloc --partition=$def_part_name -t1 $bin_sleep 1]
expect {
-re "Granted job allocation ($number)" {
set job_id $expect_out(1,string)
@@ -132,7 +132,7 @@ if (![string compare $other_part_name ""]) {
# Submit job explicitly to a non-default partition
#
set job_id 0
-set salloc_pid [spawn $salloc --partition=$other_part_name -t1 $bin_sleep 1]
+set salloc_pid [spawn $salloc --partition=$other_part_name -t1 $bin_sleep 1]
expect {
-re "Granted job allocation ($number)" {
set job_id $expect_out(1,string)
diff --git a/testsuite/expect/test15.23 b/testsuite/expect/test15.23
index 90b37d0e89caf52462c33d1dbfe31489d2f30411..79163580f675a176d677c76011650f5f9520db51 100755
--- a/testsuite/expect/test15.23
+++ b/testsuite/expect/test15.23
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -78,7 +78,7 @@ expect {
}
if {$job_id == 0} {
- send_user "\nFAILURE: did not get job_id\n"
+ send_user "\nFAILURE: did not get job_id\n"
exit 1
}
diff --git a/testsuite/expect/test15.24 b/testsuite/expect/test15.24
index 3cb43167e8a3964af79cef47f795b7a704252306..dab6652bab9cebc2ac588f72a327ff2f8e1155c4 100755
--- a/testsuite/expect/test15.24
+++ b/testsuite/expect/test15.24
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test15.25 b/testsuite/expect/test15.25
index 3dc9311c62ee5bbce7c6ac3b332e16cd07f1ac6a..9f03b947a1ef8de9b8f3d1e746594b0827f23304 100755
--- a/testsuite/expect/test15.25
+++ b/testsuite/expect/test15.25
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test15.3 b/testsuite/expect/test15.3
index d1b57f83f1f2be8e3915d102f2e6624fd0cb5574..4eed88819b8f7500f08fea4ce2082b69c5525494 100755
--- a/testsuite/expect/test15.3
+++ b/testsuite/expect/test15.3
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Confirm that salloc reports a proper version number (--version
+# Confirm that salloc reports a proper version number (--version
# option).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test15.4 b/testsuite/expect/test15.4
index 9ed6428898199f97a9d6135e38dac5a217629305..4c7d10df0f9fe0004441c3a512f2a37ccd0d9532 100755
--- a/testsuite/expect/test15.4
+++ b/testsuite/expect/test15.4
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -103,9 +103,9 @@ if {$got_job_grps == 0} {
send_user "\nFAILURE: Did not get user info from slurm job\n"
exit 1
}
-
+
#
-# Confirm the user id and group id in the slurm job matches that
+# Confirm the user id and group id in the slurm job matches that
# of the local 'id' execution.
#
diff --git a/testsuite/expect/test15.5 b/testsuite/expect/test15.5
index 849a03633719382c9cb861403ebfa14a37e1bf94..221b3518d8f00c03d0c05d339f89722417a0e985 100755
--- a/testsuite/expect/test15.5
+++ b/testsuite/expect/test15.5
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Confirm that job time limit function works (--time and
+# Confirm that job time limit function works (--time and
# --kill-command options).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -104,14 +104,14 @@ proc date {} {
}
#
-# Execute a couple of three minute jobs; one with a one minute time
-# limit and the other with a four minute time limit. Confirm jobs
-# are terminated on a timeout as required. Note that SLURM time
-# limit enforcement has a resolution of about one minute.
+# Execute a couple of three minute jobs; one with a one minute time
+# limit and the other with a four minute time limit. Confirm jobs
+# are terminated on a timeout as required. Note that SLURM time
+# limit enforcement has a resolution of about one minute.
#
-# Ideally the job gets a "job exceeded timelimit" followed by a
-# "Terminated" message, but if the timing is bad only the "Terminated"
-# message gets sent. This is due to salloc recognizing job termination
+# Ideally the job gets a "job exceeded timelimit" followed by a
+# "Terminated" message, but if the timing is bad only the "Terminated"
+# message gets sent. This is due to salloc recognizing job termination
# prior to the message from slurmd being processed.
#
set timeout [expr $max_job_delay + $sleep_time]
diff --git a/testsuite/expect/test15.6 b/testsuite/expect/test15.6
index 93721b05ccec9aa0724bd39b4d53704e90875113..dd6b23284c95e91604410ee3d52182f199e3fb79 100755
--- a/testsuite/expect/test15.6
+++ b/testsuite/expect/test15.6
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -62,7 +62,7 @@ expect {
}
-re "debug" {
if {$verbosity < 2} {
- set verbosity 2
+ set verbosity 2
}
exp_continue
}
diff --git a/testsuite/expect/test15.7 b/testsuite/expect/test15.7
index 5a55b6e9af754498269faf2f7894381a7ea80611..fc44f2037c394c6bca7a1a15aa0a1f0c0972f388 100755
--- a/testsuite/expect/test15.7
+++ b/testsuite/expect/test15.7
@@ -1,9 +1,9 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Test of processors, memory, and temporary disk space
+# Test of processors, memory, and temporary disk space
# constraints options (--mincpus, --mem, and --tmp options).
-# Also test that priority zero job is not started (--hold
+# Also test that priority zero job is not started (--hold
# option).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test15.8 b/testsuite/expect/test15.8
index 8ab9e5b4521b181e0a708c555af28e48de25d3f8..a7662dcbf93d16b0cb42c018b51b27fbf12c58b4 100755
--- a/testsuite/expect/test15.8
+++ b/testsuite/expect/test15.8
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -39,7 +39,7 @@ set matches 0
print_header $test_id
#
-# Spawn a srun immediate execution job with hold (priority==0) option,
+# Spawn a srun immediate execution job with hold (priority==0) option,
# The job can't run immediately with a priority of zero
#
set timeout 10
diff --git a/testsuite/expect/test15.9 b/testsuite/expect/test15.9
index d6eaa21cd3273ba049731b7924010ea10bf74c89..f4f4455154002d02d9a3d7c3d78998e6e7aa2d89 100755
--- a/testsuite/expect/test15.9
+++ b/testsuite/expect/test15.9
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test16.1 b/testsuite/expect/test16.1
index 62aa8c403d89bfc0c22cb69fa360239eb39d3e14..33d0e56fa3bde29698c56b1c5d02f3526558cf2d 100755
--- a/testsuite/expect/test16.1
+++ b/testsuite/expect/test16.1
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Report the sattach usage format
#
-
-spawn $sattach --usage
+
+spawn $sattach --usage
expect {
-re "Usage: .*sattach.*" {
incr matches
diff --git a/testsuite/expect/test16.2 b/testsuite/expect/test16.2
index 260d481d1ae45e18837eb5378d3da64ac160af7c..7b04a664c3c120201648da34b297601245b46a45 100755
--- a/testsuite/expect/test16.2
+++ b/testsuite/expect/test16.2
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Report the sattach help message
#
-
-spawn $sattach --help
+
+spawn $sattach --help
expect {
-re "Usage:" {
incr matches
diff --git a/testsuite/expect/test16.3 b/testsuite/expect/test16.3
index 7d17abc34087a6c0ccb8e726acaf9366d066c4d2..0b8d89986933fd182703b7835753bbd742323fb9 100755
--- a/testsuite/expect/test16.3
+++ b/testsuite/expect/test16.3
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Confirm that sattach reports a proper version number (--version
+# Confirm that sattach reports a proper version number (--version
# option).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test16.4 b/testsuite/expect/test16.4
index 65327840b613202fbf3ca2b235b24f503dfefdbf..5497f183cd42684afe6a93c5fd0cb40ac2c203f8 100755
--- a/testsuite/expect/test16.4
+++ b/testsuite/expect/test16.4
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Basic sattach functionality test (--layout, --verbose, --label
+# Basic sattach functionality test (--layout, --verbose, --label
# and --output-filter options).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test16.4.prog.c b/testsuite/expect/test16.4.prog.c
index 752a5c874b14d235c610788aeebb764baf861084..92993bcfa0145900bd77787c5ebd5da1e3b88559 100644
--- a/testsuite/expect/test16.4.prog.c
+++ b/testsuite/expect/test16.4.prog.c
@@ -6,21 +6,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
@@ -30,7 +30,7 @@
#include <string.h>
#include <unistd.h>
-main (int argc, char **argv)
+main (int argc, char **argv)
{
char in_line[10];
int i;
diff --git a/testsuite/expect/test17.1 b/testsuite/expect/test17.1
index 871390c0ec71f87c9aefe9413bbef7a1d249b7e5..0fea20af793293739537741f47c5bd0b819bff60 100755
--- a/testsuite/expect/test17.1
+++ b/testsuite/expect/test17.1
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Report the sbatch usage format
#
-
-spawn $sbatch --usage
+
+spawn $sbatch --usage
expect {
-re "Usage: .*sbatch.*" {
incr matches
diff --git a/testsuite/expect/test17.10 b/testsuite/expect/test17.10
index 6b11c3283a0fabcd44d7b010845763ee383fcfe1..7370cad6075899268c03295b7d05ed8ee3fd75d3 100755
--- a/testsuite/expect/test17.10
+++ b/testsuite/expect/test17.10
@@ -1,9 +1,9 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Test of processors, memory, and temporary disk space
+# Test of processors, memory, and temporary disk space
# constraints options (--mincpus, --mem, and --tmp options).
-# Also test that priority zero job is not started (--hold
+# Also test that priority zero job is not started (--hold
# option).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test17.11 b/testsuite/expect/test17.11
index 1cc60d2c7e6a5fa1d2a793b5c9873af10f47ee14..c9bf0c6f4c34140c3abe964560946c91d136e6c5 100755
--- a/testsuite/expect/test17.11
+++ b/testsuite/expect/test17.11
@@ -2,7 +2,7 @@
############################################################################
# Purpose: Test of SLURM functionality
# Test of shared and contiguous options (--shared and --contiguous).
-# Also uses --hold option.
+# Also uses --hold option.
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test17.12 b/testsuite/expect/test17.12
index 86a79e696f7f878b205a160bc62928c0a15013b8..4cd83e4656c7c608eb46ef67790ae3212f9208e9 100755
--- a/testsuite/expect/test17.12
+++ b/testsuite/expect/test17.12
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -59,7 +59,7 @@ make_bash_script $file_in "
#
set err_msg 0
set timeout $max_job_delay
-spawn $sbatch -N1 --constraint=invalid,constraint -t1 $file_in
+spawn $sbatch -N1 --constraint=invalid,constraint -t1 $file_in
expect {
-re "error:.*Invalid feature specification" {
send_user "This error is expected, no worries\n"
@@ -83,7 +83,7 @@ expect {
}
if {$err_msg != 1} {
send_user "\nFAILURE: job failed to report required error\n"
- set exit_code 1
+ set exit_code 1
}
if {$exit_code == 0} {
diff --git a/testsuite/expect/test17.13 b/testsuite/expect/test17.13
index a296430c31fcdc033ede3ec7c3c23605583ee918..3184a785198c7e9f851fc4df3875648161fa8535 100755
--- a/testsuite/expect/test17.13
+++ b/testsuite/expect/test17.13
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test17.14 b/testsuite/expect/test17.14
index 11660d64158440a38c1ed5ad40a3102c6ba3d8e3..baa92b2bccc1e41f4cb3ba265edc380b398243ec 100755
--- a/testsuite/expect/test17.14
+++ b/testsuite/expect/test17.14
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test17.15 b/testsuite/expect/test17.15
index 371368baee08be4c59484c1799c70535591b697f..794aa838b9fd80b60e842cf969f98898891bcb45 100755
--- a/testsuite/expect/test17.15
+++ b/testsuite/expect/test17.15
@@ -7,28 +7,28 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# Note: AIX does not support the NPROC limit, but this test should
+# Note: AIX does not support the NPROC limit, but this test should
# otherwise succeed
############################################################################
# Copyright (C) 2002-2006 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -53,7 +53,7 @@ print_header $test_id
#
# Delete left-over programs and rebuild them.
-# We use our own program to get ulimit values since the output
+# We use our own program to get ulimit values since the output
# of the ulimit program is inconsistent across systems.
#
exec $bin_rm -f $file_prog_get $file_err $file_in $file_out
diff --git a/testsuite/expect/test17.15.prog.c b/testsuite/expect/test17.15.prog.c
index 5c98849257644fccdbf1cea97113d1ff50dabcc1..23ddff30eb6eb6e19217fad28e35dc78a159320e 100644
--- a/testsuite/expect/test17.15.prog.c
+++ b/testsuite/expect/test17.15.prog.c
@@ -1,27 +1,27 @@
/*****************************************************************************\
- * proc1.29.proc.c - Simple user limit set program for SLURM regression
- * test1.29. Get the core, fsize, nofile, and nproc limits and print their
+ * proc1.29.proc.c - Simple user limit set program for SLURM regression
+ * test1.29. Get the core, fsize, nofile, and nproc limits and print their
* values in the same format as SLURM environment variables.
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -32,7 +32,7 @@
#include <sys/resource.h>
#include <unistd.h>
-main (int argc, char **argv)
+main (int argc, char **argv)
{
struct rlimit u_limit;
int exit_code = 0;
diff --git a/testsuite/expect/test17.16 b/testsuite/expect/test17.16
index f10d8aaef563b41dbc399e1753a93c0b1960bd8b..0d2803de4a1392a4a74b43a57a127011b4b9f102 100755
--- a/testsuite/expect/test17.16
+++ b/testsuite/expect/test17.16
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test17.17 b/testsuite/expect/test17.17
index 5473c3c92f2ee910ecc14fc624af5d509b7e9d1e..7d897f0020c85a38d226c34b778c5f86eee498af 100755
--- a/testsuite/expect/test17.17
+++ b/testsuite/expect/test17.17
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Confirm that node sharing flags are respected (--nodelist and
+# Confirm that node sharing flags are respected (--nodelist and
# --share options).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -85,8 +85,8 @@ exec $bin_rm -f $file_in
make_bash_script $file_in "$srun $bin_sleep 5"
#
-# Submit two jobs to the same node, one with no sharing, the other
-# with sharing permitted. Insure the first job completes before the
+# Submit two jobs to the same node, one with no sharing, the other
+# with sharing permitted. Insure the first job completes before the
# second job is started.
#
set sbatch_pid [spawn $sbatch -N1 --exclusive --nodelist=$nodelist_name -t1 --output=$file_out --error=$file_err $file_in]
@@ -119,7 +119,7 @@ expect {
exp_continue
}
-re "JobState=RUN" {
- set waited 0
+ set waited 0
exp_continue
}
timeout {
diff --git a/testsuite/expect/test17.18 b/testsuite/expect/test17.18
index f852c7a6026ca00ad393a1583f517094df485874..2443beb69a01ede5c77946d4b512623dcfe107f3 100755
--- a/testsuite/expect/test17.18
+++ b/testsuite/expect/test17.18
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Test of job dependencies and deferred begin time (--depedency
+# Test of job dependencies and deferred begin time (--depedency
# and --begin options).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test17.2 b/testsuite/expect/test17.2
index 73bb39af16bb185398f7c662730ef7a2934b9d07..babdbb132ee71d90acb24928b298b34bbea987f9 100755
--- a/testsuite/expect/test17.2
+++ b/testsuite/expect/test17.2
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Report the sbatch help message
#
-
-spawn $sbatch --help
+
+spawn $sbatch --help
expect {
-re "Usage:" {
incr matches
diff --git a/testsuite/expect/test17.20 b/testsuite/expect/test17.20
index 7a352b07a4488fdebc647f2ca4dc5bea884ab5e4..41067ba76889ecefd5e90bb17cd0534102075600 100755
--- a/testsuite/expect/test17.20
+++ b/testsuite/expect/test17.20
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -78,7 +78,7 @@ make_bash_script $file_in "$bin_id -un"
# Submit a slurm job that will execute 'id'
#
set job_id 0
-spawn $sbatch -N1 -t1 --job-name=test$test_id --output=$file_out --mail-type=all --mail-user=$login_grp_info $file_in
+spawn $sbatch -N1 -t1 --job-name=test$test_id --output=$file_out --mail-type=all --mail-user=$login_grp_info $file_in
expect {
-re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
@@ -121,7 +121,7 @@ if {$got_job_grps == 0} {
send_user "\nFAILURE: Did not get user info from slurm job\n"
exit 1
}
-
+
if {$exit_code == 0} {
file delete $file_in $file_out
send_user "\nSUCCESS\n"
diff --git a/testsuite/expect/test17.21 b/testsuite/expect/test17.21
index 6759e8a046c7f56cb7b93e89b340aea7b4cc8a10..d773cb5a83f67080b026b7ea60bbafd85d07f406 100755
--- a/testsuite/expect/test17.21
+++ b/testsuite/expect/test17.21
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -99,7 +99,7 @@ expect {
send_user "This error was expected, no worries\n\n"
set match 1
exp_continue
- }
+ }
-re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
send_user "\nFAILURE: Test B was supposed to fail submission\n"
diff --git a/testsuite/expect/test17.22 b/testsuite/expect/test17.22
index 4856d07e826003868a37455c96b3198d0ad4b555..3342eaa42d741918f46b6a98180a6fdbd8e69dcb 100755
--- a/testsuite/expect/test17.22
+++ b/testsuite/expect/test17.22
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test17.23 b/testsuite/expect/test17.23
index 407b9a012f14185f047228f233483d6963e50759..a70eb47b6ded2ac3b76cb902e219bbc68df2c36d 100755
--- a/testsuite/expect/test17.23
+++ b/testsuite/expect/test17.23
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test17.24 b/testsuite/expect/test17.24
index 5607f7525ed71e9a259f9111073f9012a8dc5b80..9a816e069245e45b94d354324d0e1ac99220335d 100755
--- a/testsuite/expect/test17.24
+++ b/testsuite/expect/test17.24
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -81,7 +81,7 @@ if { $job_id == 0 } {
}
#
-# Submit job to dummy partition name just to see that --partition gets
+# Submit job to dummy partition name just to see that --partition gets
# processed
#
set job_id 0
diff --git a/testsuite/expect/test17.25 b/testsuite/expect/test17.25
index b2ef269fac301661208f118c240c7dc6f2777c20..1edfed26106868dd6601405c5e0cf1dbf77b443e 100755
--- a/testsuite/expect/test17.25
+++ b/testsuite/expect/test17.25
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -94,7 +94,7 @@ expect {
}
if {$job_id == 0} {
- send_user "\nFAILURE: did not get job_id\n"
+ send_user "\nFAILURE: did not get job_id\n"
exit 1
}
if {$matches != 3} {
diff --git a/testsuite/expect/test17.26 b/testsuite/expect/test17.26
index 0782a580392903b1d0465694bfc5192db948ba3f..d928263f40df331ba1b4838a9f6b36a1216cbb2d 100755
--- a/testsuite/expect/test17.26
+++ b/testsuite/expect/test17.26
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test17.27 b/testsuite/expect/test17.27
index 062912f6180bb342b0ecb98ef81de481546fdb6e..5f0367d360893f04da1834e51d6d03870a6fdb43 100755
--- a/testsuite/expect/test17.27
+++ b/testsuite/expect/test17.27
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -136,15 +136,15 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_1 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 1\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_2 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 2\n"
- set exit_code 1
+ set exit_code 1
}
if {[test_front_end] != 0} {
send_user "\nWARNING: Additional testing is incompatible with front-end systems\n"
@@ -153,19 +153,19 @@ if {[test_front_end] != 0} {
}
if {[string compare $host_3 ""] != 0} {
send_user "\nFAILURE: Started more than three tasks\n"
- set exit_code 1
+ set exit_code 1
}
set dup_hostname 0
if {[string compare $host_0 $host_1] == 0} {
- incr dup_hostname
+ incr dup_hostname
}
if {[string compare $host_0 $host_2] == 0} {
- incr dup_hostname 1
+ incr dup_hostname 1
}
if {$dup_hostname == 1} {
send_user "\nFAILURE: Re-used a node in the allocation\n"
- set exit_code 1
+ set exit_code 1
}
set exclude_node $host_0
set include_node $host_2
@@ -224,26 +224,26 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_1 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 1\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_2 ""] != 0} {
send_user "\nFAILURE: Started more than two tasks\n"
- set exit_code 1
+ set exit_code 1
}
set dup_hostname 0
if {[string compare $host_0 $exclude_node] == 0} {
- set dup_hostname 1
+ set dup_hostname 1
}
if {[string compare $host_1 $exclude_node] == 0} {
- set dup_hostname 1
+ set dup_hostname 1
}
if {$dup_hostname == 1} {
send_user "\nFAILURE: Allocated an excluded node\n"
- set exit_code 1
+ set exit_code 1
}
#
@@ -297,19 +297,19 @@ expect {
#
if {[string compare $host_0 ""] == 0} {
send_user "\nFAILURE: Did not get hostname of task 0\n"
- set exit_code 1
+ set exit_code 1
}
if {[string compare $host_1 ""] != 0} {
send_user "\nFAILURE: Started more than one task\n"
- set exit_code 1
+ set exit_code 1
}
set dup_hostname 0
if {[string compare $host_0 $include_node] == 0} {
- set dup_hostname 1
+ set dup_hostname 1
}
if {$dup_hostname == 0} {
send_user "\nFAILURE: Allocation lacked an included node\n"
- set exit_code 1
+ set exit_code 1
}
if {$exit_code == 0} {
diff --git a/testsuite/expect/test17.28 b/testsuite/expect/test17.28
index 292c0b6764d3e87017179399ed8e83dea8c31b1e..b89b3db2156cc9d3c6cf87a56b75f5bcb1adc5f4 100755
--- a/testsuite/expect/test17.28
+++ b/testsuite/expect/test17.28
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -91,7 +91,7 @@ cancel_job $job_id
#
# Build input script file
-# NOTE: The initial sleep is so that all of the submissions have time
+# NOTE: The initial sleep is so that all of the submissions have time
# to occur before contending with a multitude of job step creations.
# This is especially important on very slow systems (e.g. AIX).
#
@@ -112,7 +112,7 @@ expect {
send_user "This error was expected, no worries\n\n"
incr matches
exp_continue
- }
+ }
-re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
exp_continue
diff --git a/testsuite/expect/test17.29 b/testsuite/expect/test17.29
index 7843c5559b5ffd5158bd2ddcbf5eb0f700b17fa2..e6a21cc47c128d0b9f1eff4437ade8600ca2113f 100755
--- a/testsuite/expect/test17.29
+++ b/testsuite/expect/test17.29
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test17.3 b/testsuite/expect/test17.3
index c256a6dd963774910c136582ef5704807a52256c..1875abbde6d16b045b4caabe3cbabb6cee4879ad 100755
--- a/testsuite/expect/test17.3
+++ b/testsuite/expect/test17.3
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Confirm that sbatch reports a proper version number (--version
+# Confirm that sbatch reports a proper version number (--version
# option).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test17.31 b/testsuite/expect/test17.31
index bd12b38c3e96b86cf7fa37af05006e04002cef1f..ce81c1cfdba266a61644bd21f825da22dad08cf2 100755
--- a/testsuite/expect/test17.31
+++ b/testsuite/expect/test17.31
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -83,7 +83,7 @@ append min_mem_mb $min_mem "mb"
#
# Build input script file
-# NOTE: The initial sleep is so that all of the submissions have time
+# NOTE: The initial sleep is so that all of the submissions have time
# to occur before contending with a multitude of job step creations.
# This is especially important on very slow systems (e.g. AIX).
#
@@ -105,7 +105,7 @@ expect {
set exit_code 1
} else {
incr matches
- }
+ }
exp_continue
}
-re "nodes$whitespace: ($number)" {
diff --git a/testsuite/expect/test17.32 b/testsuite/expect/test17.32
index eace6c8984b642ea494ea1df7a286f2b82aa611c..b2a5a44c62edd0c0d8041d899dbe355721a9a261 100755
--- a/testsuite/expect/test17.32
+++ b/testsuite/expect/test17.32
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test17.33 b/testsuite/expect/test17.33
index e30d07af440d7c5ac2e217fc9313199cb16c0585..d579a90205033cb5b1298985c3f6ce121598c5ea 100755
--- a/testsuite/expect/test17.33
+++ b/testsuite/expect/test17.33
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test17.4 b/testsuite/expect/test17.4
index 116e2b1ece8edcbf438e0efb8b25f1034b796d6d..9bc2917c381f75423f60b2ab0701f480e5809c8d 100755
--- a/testsuite/expect/test17.4
+++ b/testsuite/expect/test17.4
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Confirm that as sbatch job executes as the appropriate user and
+# Confirm that as sbatch job executes as the appropriate user and
# group.
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -74,7 +74,7 @@ make_bash_script $file_in "
$bin_id
"
-spawn $sbatch -N1 -t1 --output=$file_out $file_in
+spawn $sbatch -N1 -t1 --output=$file_out $file_in
expect {
-re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
@@ -123,9 +123,9 @@ if {$got_job_grps == 0} {
send_user "\nFAILURE: Did not get user info from slurm job\n"
exit 1
}
-
+
#
-# Confirm the user id and group id in the slurm job matches that
+# Confirm the user id and group id in the slurm job matches that
# of the local 'id' execution.
#
if {[string compare $login_grp_info $job_grp_info] != 0} {
diff --git a/testsuite/expect/test17.5 b/testsuite/expect/test17.5
index 47c9c6b8ed10d28af5df60ef96adccab28d900eb..bd12d15df0ef4a29081047abf5f3f74e7bc8e079 100755
--- a/testsuite/expect/test17.5
+++ b/testsuite/expect/test17.5
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Confirm that sbatch stdout, and stderr options work (--output
+# Confirm that sbatch stdout, and stderr options work (--output
# and --error option respectively, including use of %j specification)
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -64,7 +64,7 @@ make_bash_script $file_script "
"
#
-# Spawn a shell via sbatch that submits from a different directory and uses stdout/err
+# Spawn a shell via sbatch that submits from a different directory and uses stdout/err
# and confirm their contents
#
set job_id 0
@@ -278,10 +278,10 @@ if { [file exists $file_out2] } {
set exit_code 1
}
if { [file exists $file_err2] } {
- send_user "\nFAILURE: Found unexpected stderr file $file_err2\n"
+ send_user "\nFAILURE: Found unexpected stderr file $file_err2\n"
set exit_code 1
}
-
+
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_script $file_out $file_err
send_user "\nSUCCESS\n"
diff --git a/testsuite/expect/test17.6 b/testsuite/expect/test17.6
index 5f4f46797cb8bad3a53e0a62c8029f1ce043637c..78a80946470fb3d6fb5fae7d5fe15c2a5e010fcc 100755
--- a/testsuite/expect/test17.6
+++ b/testsuite/expect/test17.6
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test17.7 b/testsuite/expect/test17.7
index 59d2ad878b490b0a92df8b6de825555621017147..ec85ee5cbe79614725582019e32747dd0acbc9d9 100755
--- a/testsuite/expect/test17.7
+++ b/testsuite/expect/test17.7
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test17.8 b/testsuite/expect/test17.8
index 9a990ba36bb8424b75a5d6fde468069e18751b91..08d2532275cd0a25522ee91bb8f1dc3311eb5aba 100755
--- a/testsuite/expect/test17.8
+++ b/testsuite/expect/test17.8
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test17.9 b/testsuite/expect/test17.9
index 6b4e6b3dfdff3ae6ad43d1eab97d3dae2d1a7ec7..5abcaa67f335f79c14074e294198b8979d626cbd 100755
--- a/testsuite/expect/test17.9
+++ b/testsuite/expect/test17.9
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test19.1 b/testsuite/expect/test19.1
index d2d63c597ccdf9437396eebb6974336486aad6c1..6c9525db4933141cd026335485aea803d479dc7a 100755
--- a/testsuite/expect/test19.1
+++ b/testsuite/expect/test19.1
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -38,7 +38,7 @@ set matches 0
print_header $test_id
-spawn $strigger --help
+spawn $strigger --help
expect {
-re "Usage:" {
incr matches
diff --git a/testsuite/expect/test19.2 b/testsuite/expect/test19.2
index e4d5f88945fd0a9936d1efc1651331c1753a2b9a..65c440c3222896a3c56cd94d4e110073f14a0f26 100755
--- a/testsuite/expect/test19.2
+++ b/testsuite/expect/test19.2
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -38,7 +38,7 @@ set matches 0
print_header $test_id
-spawn $strigger --usage
+spawn $strigger --usage
expect {
-re "Usage:" {
incr matches
diff --git a/testsuite/expect/test19.3 b/testsuite/expect/test19.3
index c6a3721e83c170c4443ea8b188ac187214fbc497..e724e38327ec5b4ac63876121f622e47a8b2c17f 100755
--- a/testsuite/expect/test19.3
+++ b/testsuite/expect/test19.3
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test19.4 b/testsuite/expect/test19.4
index cc56e7434a547039f037e4e7577ad1ee38167275..3ce2c0a51ffd200a0c15470497b2278adb3b2df0 100755
--- a/testsuite/expect/test19.4
+++ b/testsuite/expect/test19.4
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test19.5 b/testsuite/expect/test19.5
index d54a0248db3b132606e6fa76e49298e30d752d4d..708f432671c14c9a7821b93a6afb398b6b557464 100755
--- a/testsuite/expect/test19.5
+++ b/testsuite/expect/test19.5
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -203,7 +203,7 @@ if {[wait_for_file $file_out_time] != 0} {
wait
}
}
-# Trigger events happen on a periodic basis, so there is likely to
+# Trigger events happen on a periodic basis, so there is likely to
# be a delay up to 20 seconds
if {$run_time < 30 || $run_time > 59} {
send_user "\nFAILURE: file $file_out_time contents are bad, run time\n"
@@ -214,7 +214,7 @@ if {[wait_for_file $file_out_fini] != 0} {
send_user "\nFAILURE: file $file_out_fini is missing\n"
set exit_code 1
} else {
-# Check that job run time was one minute. If SLURM is configured to
+# Check that job run time was one minute. If SLURM is configured to
# power down idle nodes, this could possibly take a bit more time.
set job_fini 0
spawn $bin_cat $file_out_fini
@@ -239,7 +239,7 @@ if {[wait_for_file $file_out_fini] != 0} {
cancel_job $job_id
if {$exit_code == 0} {
- exec $bin_rm -f $file_in $file_in_fini $file_in_time
+ exec $bin_rm -f $file_in $file_in_fini $file_in_time
exec $bin_rm -f $file_out_fini $file_out_time
send_user "\nSUCCESS\n"
}
diff --git a/testsuite/expect/test19.6 b/testsuite/expect/test19.6
index f7c81e878c583a0e0e98f3866ec1debed8a29604..c243480a1716a891a717d0de3e75d9968ac9abe0 100755
--- a/testsuite/expect/test19.6
+++ b/testsuite/expect/test19.6
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -396,7 +396,7 @@ expect {
if {$matches == 0} {
send_user "\nFAILURE: trigger clear failure\n"
set exit_code
-}
+}
#
# Check for any remaining triggers
diff --git a/testsuite/expect/test19.7 b/testsuite/expect/test19.7
index 2d8a1bb706eea1cfaf285ee2be9d10fd96bd8fdd..8b9c0504bc0623467943fb74b9fb43fadf9eade9 100755
--- a/testsuite/expect/test19.7
+++ b/testsuite/expect/test19.7
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -147,7 +147,7 @@ expect {
}
}
#
-# Depending upon timing of when slurmctld checks triggers, this
+# Depending upon timing of when slurmctld checks triggers, this
# might be processed immediately and not found by "strigger --get"
#
#if {$idle_matches == 0} {
diff --git a/testsuite/expect/test2.1 b/testsuite/expect/test2.1
index 635057a33ae8d1c26facea1073d489625487ca86..c3932c3c0591d6481a5cb570be491756ca2aa0dc 100755
--- a/testsuite/expect/test2.1
+++ b/testsuite/expect/test2.1
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Report the scontrol version number
#
-
-spawn $scontrol version
+
+spawn $scontrol version
expect {
-re "slurm ($number)\.($number)\.($number).*\n" {
incr version
diff --git a/testsuite/expect/test2.10 b/testsuite/expect/test2.10
index aaf7c26f842c45963636fcdbfba783e3d2d757d7..58b58a40ab7f6984cb6b721cbb0983379976c64c 100755
--- a/testsuite/expect/test2.10
+++ b/testsuite/expect/test2.10
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test2.11 b/testsuite/expect/test2.11
index 284da675916db44e18e7dbe6b4dcc07c43d875b2..3d8eac25cdcee5aea5c3e350e4280cd00cb36277 100755
--- a/testsuite/expect/test2.11
+++ b/testsuite/expect/test2.11
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test2.12 b/testsuite/expect/test2.12
index 6753b534a3fa69f8b54e82de485fccb6d2af9840..93cbc2639e179f84e59c7128725e08eec7681af1 100755
--- a/testsuite/expect/test2.12
+++ b/testsuite/expect/test2.12
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -87,7 +87,7 @@ if {$matches == 0} {
# Report one slurm switch
#
set matches 0
-spawn $scontrol show topology $switch_name
+spawn $scontrol show topology $switch_name
expect {
-re "SwitchName" {
incr matches
diff --git a/testsuite/expect/test2.2 b/testsuite/expect/test2.2
index b5f8f18b2b8e9f1aeb71dce099168785765de9f5..744d43dab9fc34d97ac90d8be57ccaed97ecb7e4 100755
--- a/testsuite/expect/test2.2
+++ b/testsuite/expect/test2.2
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Report the scontrol help message
#
-
-spawn $scontrol help
+
+spawn $scontrol help
expect {
-re "Valid <COMMAND> values are:" {
incr matches
diff --git a/testsuite/expect/test2.3 b/testsuite/expect/test2.3
index 60bb9cec22882169e41854c93467a9ec41828c4a..680e73ced03abce4dbac04aecac59cfd91a63974 100755
--- a/testsuite/expect/test2.3
+++ b/testsuite/expect/test2.3
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Report the slurm daemon status
#
-
-spawn $scontrol ping
+
+spawn $scontrol ping
expect {
-re "Slurmctld.primary/backup" {
incr matches
diff --git a/testsuite/expect/test2.4 b/testsuite/expect/test2.4
index 388614b7b259882546bb17fb0ac9026456f1f680..f291a64637481084aefd87d75f776e7a5a70ea42 100755
--- a/testsuite/expect/test2.4
+++ b/testsuite/expect/test2.4
@@ -7,29 +7,29 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# NOTE: The interaction processing is a bit strange to deal with the
-# behavior of readline() in RedHat 9, that keeps printing the prompt
+# NOTE: The interaction processing is a bit strange to deal with the
+# behavior of readline() in RedHat 9, that keeps printing the prompt
# for each keystroke.
############################################################################
# Copyright (C) 2002 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -47,7 +47,7 @@ print_header $test_id
set matches 0
set ping_sent 0
set exit_sent 0
-spawn $scontrol
+spawn $scontrol
expect {
-re "Slurmctld.primary/backup" {
incr matches
@@ -86,7 +86,7 @@ if {$matches != 1} {
set matches 0
set ping_sent 0
set quit_sent 0
-spawn $scontrol
+spawn $scontrol
expect {
-re "Slurmctld.primary/backup" {
incr matches
@@ -126,7 +126,7 @@ set matches 0
set ping_sent 0
set excl_sent 0
set quit_sent 0
-spawn $scontrol
+spawn $scontrol
expect {
-re "Slurmctld.primary/backup" {
incr matches
diff --git a/testsuite/expect/test2.5 b/testsuite/expect/test2.5
index 8a318bc7806301c5c43d63a0f675491f262702db..7bf685b21e22b9b5106f4cb2f78a1290a8e4ec87 100755
--- a/testsuite/expect/test2.5
+++ b/testsuite/expect/test2.5
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Validate scontrol show commands for configuation, daemons,
+# Validate scontrol show commands for configuation, daemons,
# nodes, and partitions.
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test2.6 b/testsuite/expect/test2.6
index 986de666513b7c915bb9ebecb9bbdf76dcf9915f..83eb723cf2559b12f9ce84213140da1357b00bce 100755
--- a/testsuite/expect/test2.6
+++ b/testsuite/expect/test2.6
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test2.7 b/testsuite/expect/test2.7
index 4c4f1e69dfb5739801239b846154f967f5cea3d7..935122c1889c8551f566a5cea235ec18d51291ef 100755
--- a/testsuite/expect/test2.7
+++ b/testsuite/expect/test2.7
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test2.8 b/testsuite/expect/test2.8
index 7f98664483539461282c3a761ca6e35940df0020..2948650f75ff33540feba2e5530aef0ad5afb380 100755
--- a/testsuite/expect/test2.8
+++ b/testsuite/expect/test2.8
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test2.9 b/testsuite/expect/test2.9
index 3f66b2a7f06c6e37048bdae9ef3c86c35d731540..cad05a400b8ff408dd4fab402f161ce451b07a73 100755
--- a/testsuite/expect/test2.9
+++ b/testsuite/expect/test2.9
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -40,8 +40,8 @@ print_header $test_id
#
# Unless a job is hung in completing state, there is typically no output
#
-
-spawn $scontrol completing
+
+spawn $scontrol completing
expect {
-re "invalid keyword" {
send_user "\nFAILURE: scontrol did not recognize \'completing\' command\n"
diff --git a/testsuite/expect/test20.1 b/testsuite/expect/test20.1
index 657e77043272a7d244c7b696debba64dd084b1ea..cf60eb3549ba39dab893dd3b79199a2305fc8082 100755
--- a/testsuite/expect/test20.1
+++ b/testsuite/expect/test20.1
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test20.2 b/testsuite/expect/test20.2
index 64f533533d0135276c6470a6f304371aa2ebab3e..5b909fddfa639aa884823caed96e8b77e3df86b5 100755
--- a/testsuite/expect/test20.2
+++ b/testsuite/expect/test20.2
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test20.3 b/testsuite/expect/test20.3
index cc2955dfb1ff6e57049b4f44f29b4f2edd1ee013..adf6c54f67d89e562f95b7deea40dc7ea359f284 100755
--- a/testsuite/expect/test20.3
+++ b/testsuite/expect/test20.3
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test20.4 b/testsuite/expect/test20.4
index dd862a574ebe703768ec056b2245dafbadb1b623..e69acc5360ee108c1c6fb83f6b800bacf06bd444 100755
--- a/testsuite/expect/test20.4
+++ b/testsuite/expect/test20.4
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
diff --git a/testsuite/expect/test21.1 b/testsuite/expect/test21.1
index c5b22065739782bc4e5ce543abc1d74be2a4963f..5a82cee7953de46ebcdbf4fe3d46b64d6d93db9f 100755
--- a/testsuite/expect/test21.1
+++ b/testsuite/expect/test21.1
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test21.10 b/testsuite/expect/test21.10
index 10d4efb352ea0703a77a61d1e2412fc69777e28f..0ccdd1bd8f87d9de1042713f4ad9cf662d8d4c5a 100755
--- a/testsuite/expect/test21.10
+++ b/testsuite/expect/test21.10
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test21.11 b/testsuite/expect/test21.11
index 229890062e27d1b35563b000cf02fe87fc6ccd2b..79a424d40ade8d4d4d2b4222c63131a88ad475cc 100755
--- a/testsuite/expect/test21.11
+++ b/testsuite/expect/test21.11
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -78,7 +78,7 @@ if { [test_account_storage] == 0 } {
send_user "\nWARNING: This test can't be run without a usable AccountStorageType\n"
exit 0
}
-
+
#
# Verify if Administrator privileges
#
diff --git a/testsuite/expect/test21.12 b/testsuite/expect/test21.12
index 457b7a6ba7330e69bc80b462be622c8105192a6d..999303b7de4f8faed6d4d5ae2dcd6bf6fcd2a49c 100755
--- a/testsuite/expect/test21.12
+++ b/testsuite/expect/test21.12
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -80,7 +80,7 @@ if { [test_account_storage] == 0 } {
send_user "\nWARNING: This test can't be run without a usable AccountStorageType\n"
exit 0
}
-
+
#
# Verify if Administrator privileges
#
diff --git a/testsuite/expect/test21.13 b/testsuite/expect/test21.13
index 60035fbe4d68c13e30ed4de28fb991aba0f2f09c..c8df4de270d51a7b88e3cf8a7a54cc377918e367 100755
--- a/testsuite/expect/test21.13
+++ b/testsuite/expect/test21.13
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# sacctmgr modify account, descriptions, limits
+# sacctmgr modify account, descriptions, limits
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -107,7 +107,7 @@ if { $exit_code } {
exit $exit_code
}
-# OK This is the real test, first test change the desc and org of the accounts
+# OK This is the real test, first test change the desc and org of the accounts
incr exit_code [mod_acct "" "" "$nm1,$nm2,$nm3" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" $ds2 $or2]
if { $exit_code } {
remove_acct "" "$nm1,$nm2,$nm3"
@@ -143,7 +143,7 @@ if {$matches != 3} {
incr exit_code 1
}
-# Next, test change the limits of the accounts
+# Next, test change the limits of the accounts
incr exit_code [mod_acct "" "" "$nm1" "" "" "" $fs2 "" "" "" "" "" "" $mc2 "" $mj2 $mn2 "" $mw2 "" "" ""]
if { $exit_code } {
remove_acct "" "$nm1,$nm2,$nm3"
@@ -180,7 +180,7 @@ if {$matches != 6} {
incr exit_code 1
}
-# Next, test change the desc and limits of the accounts
+# Next, test change the desc and limits of the accounts
incr exit_code [mod_acct "" "" "$nm1" "" "" "" -1 "" "" "" "" "" "" -1 "" -1 -1 "" -1 "" $ds1 $or1]
if { $exit_code } {
remove_acct "" "$nm1,$nm2,$nm3"
@@ -198,7 +198,7 @@ expect {
send_user "FAILURE: there was a problem with the sacctmgr command\n"
incr exit_code 1
}
- # Any time you use () around something you need to combine all
+ # Any time you use () around something you need to combine all
# those things together since you can miss some and they be thrown away
-re "($nm1.$ds1.$or1.($tc1|$tc2).1.....|($nm2|$nm3).$ds2.$or2.($tc1|$tc2).1.....)" {
incr matches
diff --git a/testsuite/expect/test21.14 b/testsuite/expect/test21.14
index e4f97c8f01259e5b85f65cf415b84dc6295f113c..9f8faa822f6eab31e2722bc9ee88b3c2cbe856d0 100755
--- a/testsuite/expect/test21.14
+++ b/testsuite/expect/test21.14
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# sacctmgr modify accounts, descriptions, limits,
+# sacctmgr modify accounts, descriptions, limits,
# and parents down and up the tree
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -105,7 +105,7 @@ if { $exit_code } {
exit $exit_code
}
-# OK This is the real test, first test change the desc and org of the accounts
+# OK This is the real test, first test change the desc and org of the accounts
incr exit_code [mod_acct "" "" "$nm1,$nm2,$nm3" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" $ds2 $or2]
if { $exit_code } {
remove_acct "" "$nm1,$nm2,$nm3"
@@ -141,7 +141,7 @@ if {$matches != 3} {
incr exit_code 1
}
-# Next, test change the limits of the accounts
+# Next, test change the limits of the accounts
incr exit_code [mod_acct "" "" "$nm1,$nm2,$nm3" "" "" "" $fs2 "" "" "" "" "" "" $mc2 "" $mj2 $mn2 "" $mw2 "" "" ""]
if { $exit_code } {
remove_acct "" "$nm1,$nm2,$nm3"
@@ -177,7 +177,7 @@ if {$matches != 6} {
incr exit_code 1
}
-# Next, test change the desc and limits of the accounts
+# Next, test change the desc and limits of the accounts
incr exit_code [mod_acct "" "" "$nm1,$nm3" "" "" "" -1 "" "" "" "" "" "" -1 "" -1 -1 "" -1 "" $ds1 $or1]
if { $exit_code } {
remove_acct "" "$nm1,$nm2,$nm3"
@@ -195,7 +195,7 @@ expect {
send_user "FAILURE: there was a problem with the sacctmgr command\n"
incr exit_code 1
}
- # Any time you use () around something you need to combine all
+ # Any time you use () around something you need to combine all
# those things together since you can miss some and they be thrown away
-re "(($nm1|$nm3).$ds1.$or1.($tc1|$tc2).1.....|$nm2.$ds2.$or2.($tc1|$tc2).$fs2.$mc2.$mj2.$mn2.$mw2.)" {
incr matches
@@ -256,7 +256,7 @@ if {$matches != 2} {
incr exit_code 1
}
-# Next, test change the parent of $n2 to be $n3 on $tc1
+# Next, test change the parent of $n2 to be $n3 on $tc1
# making the child the parent
incr exit_code [mod_acct "$tc1" "" "$nm2" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "$nm3" "" ""]
if { $exit_code } {
@@ -294,7 +294,7 @@ if {$matches != 4} {
}
-# Next, test change the parent of $n3 to be $n2 on $tc1 again
+# Next, test change the parent of $n3 to be $n2 on $tc1 again
# only this time the parent will become the child instead of it being a sibling.
incr exit_code [mod_acct "$tc1" "" "$nm3" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "$nm2" "" ""]
if { $exit_code } {
diff --git a/testsuite/expect/test21.15 b/testsuite/expect/test21.15
index b9ffde2128c4bac6c01302187164a4d29daa6558..ea5cfd256da08e1a9070dda94271bc7b0e5ea898 100755
--- a/testsuite/expect/test21.15
+++ b/testsuite/expect/test21.15
@@ -2,7 +2,7 @@
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr add user
-#
+#
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test21.16 b/testsuite/expect/test21.16
index 7c3c26d77f21d6e38b623b2de7bf6eb6b2f22185..6b8aeed2b3f90ea3251a938c7f8cb2e64ced3a93 100755
--- a/testsuite/expect/test21.16
+++ b/testsuite/expect/test21.16
@@ -2,7 +2,7 @@
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr add multiple users
-#
+#
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test21.17 b/testsuite/expect/test21.17
index e3e87e9ef0939932633cc915609b603c77d689fd..3bf9b51b8fca8cd16e92b2943cca7a0dd81c9ee1 100755
--- a/testsuite/expect/test21.17
+++ b/testsuite/expect/test21.17
@@ -2,7 +2,7 @@
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr modify a user
-#
+#
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -144,7 +144,7 @@ if { $exit_code } {
exit $exit_code
}
-# First test change the AdminLevel and DefaultAccount of a user
+# First test change the AdminLevel and DefaultAccount of a user
# cluster account name part wadmin wdacct wdwckey qos fairshare grpcpumin grpcpu grpjob grpnode grpsubmit grpwall maxcpumin maxcpu maxjob maxnode maxsubmit maxwall admin dacct dwckey
incr exit_code [mod_user "" "" $us1 "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" $alo $nm2 ""]
@@ -186,7 +186,7 @@ if {$matches != 3} {
# Next, test change the limits of one user
# cluster account name part wadmin wdacct wdwckey qos fairshare grpcpumin grpcpu grpjob grpnode grpsubmit grpwall maxcpumin maxcpu maxjob maxnode maxsubmit maxwall admin dacct dwckey
-
+
incr exit_code [mod_user "$tc1,$tc2,$tc3" "" "$us2" "" "" "" "" "" $fs2 "" "" "" "" "" "" $mc2 "" $mj2 $mn2 "" $mw2 "" "" ""]
if { $exit_code } {
remove_user "" "" "$us1,$us2,$us3"
diff --git a/testsuite/expect/test21.18 b/testsuite/expect/test21.18
index 4e3bc716297acaaca40582547ef6bb911829cd1b..e0d7d57ebbd2207c6dbf2dafea774e18bb8dfaa6 100755
--- a/testsuite/expect/test21.18
+++ b/testsuite/expect/test21.18
@@ -2,7 +2,7 @@
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr modify multiple users
-#
+#
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -144,8 +144,8 @@ if { $exit_code } {
exit $exit_code
}
-# First test change the AdminLevel and DefaultAccount of the accounts
-# cluster account name part wadmin wdacct wdwckey qos fairshare grpcpumin grpcpu grpjob grpnode grpsubmit grpwall maxcpumin maxcpu maxjob maxnode maxsubmit maxwall admin dacct dwckey
+# First test change the AdminLevel and DefaultAccount of the accounts
+# cluster account name part wadmin wdacct wdwckey qos fairshare grpcpumin grpcpu grpjob grpnode grpsubmit grpwall maxcpumin maxcpu maxjob maxnode maxsubmit maxwall admin dacct dwckey
incr exit_code [mod_user "" "" "$us1,$us2,$us3" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" $alo $nm2 ""]
if { $exit_code } {
remove_user "" "" "$us1,$us2,$us3"
@@ -183,7 +183,7 @@ if {$matches != 3} {
incr exit_code 1
}
-# Test change the AdminLevel and DefaultAccount of two accounts
+# Test change the AdminLevel and DefaultAccount of two accounts
# cluster account name part wadmin wdacct wdwckey qos fairshare grpcpumin grpcpu grpjob grpnode grpsubmit grpwall maxcpumin maxcpu maxjob maxnode maxsubmit maxwall admin dacct dwckey
incr exit_code [mod_user "" "" "$us1,$us3" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" $ala $nm3 ""]
if { $exit_code } {
@@ -224,7 +224,7 @@ if {$matches != 3} {
# Next, test change the limits of the users
# cluster account name part wadmin wdacct wdwckey qos fairshare grpcpumin grpcpu grpjob grpnode grpsubmit grpwall maxcpumin maxcpu maxjob maxnode maxsubmit maxwall admin dacct dwckey
-
+
incr exit_code [mod_user "$tc1,$tc2" "" "$us1,$us2,$us3" "" "" "" "" "" $fs2 "" "" "" "" "" "" $mc2 "" $mj2 $mn2 "" $mw2 "" "" ""]
if { $exit_code } {
remove_user "" "" "$us1,$us2,$us3"
@@ -262,7 +262,7 @@ if {$matches != 18} {
incr exit_code 1
}
-# Next, test change the limits of two users
+# Next, test change the limits of two users
# adminlevel defaultaccount fs maxcpu maxjob maxnodes maxwall waccounts wcluster wnames
incr exit_code [mod_user "" "" "$us1,$us3" "" "" "" "" "" $fs3 "" "" "" "" "" "" $mc3 "" $mj3 $mn3 "" $mw3 "" "" ""]
@@ -283,7 +283,7 @@ expect {
send_user "FAILURE: there was a problem with the sacctmgr command\n"
incr exit_code 1
}
- # Any time you use () around something you need to combine all
+ # Any time you use () around something you need to combine all
# those things together since you can miss some and they be thrown away
-re "(($us1|$us3).($tc1|$tc2).$fs3.$mc3.$mj3.$mn3.$mw3.|$us2.($tc1|$tc2).$fs2.$mc2.$mj2.$mn2.$mw2.)" {
incr matches
diff --git a/testsuite/expect/test21.19 b/testsuite/expect/test21.19
index 5061c6994268f25c1d9108cdfdb5968bb9e68d70..c39ca2baed9a479d05a89f298e1b666d100e1210 100755
--- a/testsuite/expect/test21.19
+++ b/testsuite/expect/test21.19
@@ -2,7 +2,7 @@
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr add a coordinator
-#
+#
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -144,7 +144,7 @@ if { $exit_code } {
exit $exit_code
}
-# Add a coordinator
+# Add a coordinator
# accounts names
incr exit_code [add_coor $nm1 $us1]
if { $exit_code } {
@@ -183,7 +183,7 @@ if {$matches != 3} {
incr exit_code 1
}
-# Next, add coordinator to two users
+# Next, add coordinator to two users
incr exit_code [add_coor "$nm1,$nm3" "$us2,$us3"]
if { $exit_code } {
remove_user "" "" "$us1,$us2,$us3"
diff --git a/testsuite/expect/test21.2 b/testsuite/expect/test21.2
index 8c69361faadf9c790dcced4a0ec8a635e4441efe..f214c038eacde7c246f7698de63d60cde772bbb9 100755
--- a/testsuite/expect/test21.2
+++ b/testsuite/expect/test21.2
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -42,7 +42,7 @@ print_header $test_id
#
# Report the sacctmgr help format
#
-
+
spawn $sacctmgr --help
expect {
-re "commit changes immediately" {
diff --git a/testsuite/expect/test21.20 b/testsuite/expect/test21.20
index 5aa13512839eda7aaf49c684185f1f2b7942881a..e60a9be025a221df9814c7f7e4e6c847933b4f84 100755
--- a/testsuite/expect/test21.20
+++ b/testsuite/expect/test21.20
@@ -2,7 +2,7 @@
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr QoS modify test
-#
+#
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test21.21 b/testsuite/expect/test21.21
index 8490c3d5f05234b45b699e57dd7d6e4c6c233a4c..2d1d41f527a45de24505dd8abb3b8ff7325f2c87 100755
--- a/testsuite/expect/test21.21
+++ b/testsuite/expect/test21.21
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test21.22 b/testsuite/expect/test21.22
index 2c1229b8b0c0418098f1f9d03c2169d28d7785e0..92b970dc582dd07f17adf3293a620be5df12573b 100755
--- a/testsuite/expect/test21.22
+++ b/testsuite/expect/test21.22
@@ -2,7 +2,7 @@
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr load data file
-#
+#
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -235,7 +235,7 @@ exec echo "$par - $nm3" >>$file_in
exec echo "$usr - $us2:$coo=$nm3:$dac=$nm2:$fs=$fs2:$mm=$mm1:$mc=$mc1:$mj=$mj1:$mn=$mn1:$ms=$ms1:$mw=$mw1:$qs=$qs1:$al=$ala" >>$file_in
#
-# Second input file - to modify and add associations to the original
+# Second input file - to modify and add associations to the original
#
exec echo "$clu - $cl1:$class=$class2" >>$file_in2
exec echo "$par - $roo" >>$file_in2
@@ -645,7 +645,7 @@ expect {
incr matches
exp_continue
}
-
+
"$class1 -> $class2" {
incr matches
exp_continue
diff --git a/testsuite/expect/test21.23 b/testsuite/expect/test21.23
index f4a55b106c49fe17f5f02babfd96212b21ccd6b7..b8fd364ad6ca85e86c7c1cb3c07ee2761da36e3a 100755
--- a/testsuite/expect/test21.23
+++ b/testsuite/expect/test21.23
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test21.24 b/testsuite/expect/test21.24
index 29eac34e2fdbdaf9ac067164e2ae852f33d1d409..d76cae64eab6dc7be5bc0126abe37fbb988cb9e4 100755
--- a/testsuite/expect/test21.24
+++ b/testsuite/expect/test21.24
@@ -2,7 +2,7 @@
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr dump test
-#
+#
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -289,7 +289,7 @@ if { $exit_code } {
}
#add users
-# cluster account name part adminlevel defaultaccount defaultwckey wckeys qoslevel Fairshare GrpCPUMins GrpCPUs GrpJobs GrpNodes GrpSubmitJobs GrpWall MaxCPUMins MaxCPUs MaxJobs MaxNodes MaxSubmitJobs MaxWallDurationPerJob
+# cluster account name part adminlevel defaultaccount defaultwckey wckeys qoslevel Fairshare GrpCPUMins GrpCPUs GrpJobs GrpNodes GrpSubmitJobs GrpWall MaxCPUMins MaxCPUs MaxJobs MaxNodes MaxSubmitJobs MaxWallDurationPerJob
incr exit_code [add_user "$tc3" "$nm4" "$us3" "" "$ala" "$nm3" "$wk3" "$wk1,$wk2,$wk4" "$qs2" "$fs3" "$gm3" "$gc3" "$gj3" "$gn3" "$gs3" "$gw3" "$mm3" "$mc3" "$mj3" "$mn3" "$ms3" "$mw3" ]
if { $exit_code } {
remove_user "" "" "$us1,$us2,$us3,$us4"
@@ -316,7 +316,7 @@ if { $exit_code } {
remove_cluster "$tc1,$tc2,$tc3"
exit $exit_code
}
-
+
exec $bin_rm -f $file_out4
set matches 0
diff --git a/testsuite/expect/test21.25 b/testsuite/expect/test21.25
index 4cfca560f7147c87691b3586dad54693032ea6c8..c96ac3c76e11fe9c7255bd2b720ef0a84b13a66f 100755
--- a/testsuite/expect/test21.25
+++ b/testsuite/expect/test21.25
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test21.26 b/testsuite/expect/test21.26
index c0e9484a118e866095471fa59108350eb1a7ef09..fd8adc2f75c50a1089a523e6b3edae7f31add558 100755
--- a/testsuite/expect/test21.26
+++ b/testsuite/expect/test21.26
@@ -2,7 +2,7 @@
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr +=, -= modify QoS test
-#
+#
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -79,7 +79,7 @@ remove_user "" "" "$user1"
remove_acct "" "$account1,$account2"
remove_qos "$qos1"
-# get the qos of root on the cluster since we are going to set it to
+# get the qos of root on the cluster since we are going to set it to
# nothing here. And put it back at the end of the test.
set match 0
set my_pid [eval spawn $sacctmgr list cluster $cluster1 format=cluster,qos -np]
diff --git a/testsuite/expect/test21.3 b/testsuite/expect/test21.3
index ed8d3bcc4ef40eca813ab8702bb9d288924316c8..ea89a329b26e50d5fc276505e1a32f21512b8c71 100755
--- a/testsuite/expect/test21.3
+++ b/testsuite/expect/test21.3
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -42,7 +42,7 @@ print_header $test_id
#
# Report the sacctmgr version format
#
-
+
spawn $sacctmgr -V
expect {
-re "slurm \[0-9]*.\[0-9]*.\[0-9]*" {
diff --git a/testsuite/expect/test21.4 b/testsuite/expect/test21.4
index 8df35976264173d0366e4d584c65413471a8289d..cec11a7e8ab24cde2366d4a62c687ba9b0a06b87 100755
--- a/testsuite/expect/test21.4
+++ b/testsuite/expect/test21.4
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -42,7 +42,7 @@ print_header $test_id
#
# Report the sacctmgr version keyword
#
-
+
spawn $sacctmgr --version
expect {
-re "slurm \[0-9]*.\[0-9]*.\[0-9]*" {
diff --git a/testsuite/expect/test21.5 b/testsuite/expect/test21.5
index e2351232809caebbf31e86ad809cdb7cdfe00b2d..d020fad69f3aaeafd9bd6fec59c42728996ffa21 100755
--- a/testsuite/expect/test21.5
+++ b/testsuite/expect/test21.5
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test21.6 b/testsuite/expect/test21.6
index a88aa7a8e1328e21760c3f410316a005bc3f3702..4b2aeea5ffa5786d85fdd48fdb71b4a303884eed 100755
--- a/testsuite/expect/test21.6
+++ b/testsuite/expect/test21.6
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test21.7 b/testsuite/expect/test21.7
index 09764c2ae528f7b3f9939c5ab6adc3f2ae7708ab..5e5f4fb106de165ea3da1a77d4cb7cf1db6656f5 100755
--- a/testsuite/expect/test21.7
+++ b/testsuite/expect/test21.7
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test21.8 b/testsuite/expect/test21.8
index 599bcb23b18ab3bf0108b76f19a72a723ad9ae22..67312d4f0d4eda21143c3779baf9f8545e78a320 100755
--- a/testsuite/expect/test21.8
+++ b/testsuite/expect/test21.8
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -91,7 +91,7 @@ if { [test_account_storage] == 0 } {
send_user "\nWARNING: This test can't be run without a usable AccountStorageType\n"
exit 0
}
-
+
#
# Verify if Administrator privileges
#
diff --git a/testsuite/expect/test21.9 b/testsuite/expect/test21.9
index d4d031ccf776868a08fceb69e66b8684f331f081..461ebc19608c97c10f2e38d8fcee7b95636aaaf2 100755
--- a/testsuite/expect/test21.9
+++ b/testsuite/expect/test21.9
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -91,7 +91,7 @@ if { [test_account_storage] == 0 } {
send_user "\nWARNING: This test can't be run without a usable AccountStorageType\n"
exit 0
}
-
+
#
# Verify if Administrator privileges
#
diff --git a/testsuite/expect/test22.1 b/testsuite/expect/test22.1
index 1811e8495301292eecac70eec9770d453a80eb0a..aef0524a8785126fd70775ddb08dd8f77aa036b7 100755
--- a/testsuite/expect/test22.1
+++ b/testsuite/expect/test22.1
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -65,7 +65,7 @@ set midnight 1201766400
# Mon Dec 31 23:00:00 2007
set period_start 1199170800
# Thu Jan 31 23:59:59 2008
-set period_end 1201852799
+set period_end 1201852799
set start_str [timestamp -format %Y-%m-%dT%X -seconds $period_start]
set end_str [timestamp -format %Y-%m-%dT%X -seconds $period_end]
@@ -387,15 +387,15 @@ set start_str [timestamp -format %Y-%m-%dT%X -seconds $period_start]
set end_str [timestamp -format %Y-%m-%dT%X -seconds $period_end]
set reported [expr ($period_end - $period_start) * $cluster_cpus]
-set down [expr ($period_end-$node0_down_start) * $node0_cpus]
+set down [expr ($period_end-$node0_down_start) * $node0_cpus]
set alloc_sec [expr ($period_end-$job1_start) * $node1_cpus]
set resv 0
set idle [expr $reported - ($down + $alloc_sec + $resv)]
-set down [format "%d\\\(%.2f%%\\\)" $down [expr double($down * 100)/$reported]]
-set alloc [format "%d\\\(%.2f%%\\\)" $alloc_sec [expr double($alloc_sec * 100)/$reported]]
+set down [format "%d\\\(%.2f%%\\\)" $down [expr double($down * 100)/$reported]]
+set alloc [format "%d\\\(%.2f%%\\\)" $alloc_sec [expr double($alloc_sec * 100)/$reported]]
set resv [format "%d\\\(%.2f%%\\\)" $resv [expr double($resv * 100)/$reported]]
-set idle [format "%d\\\(%.2f%%\\\)" $idle [expr double($idle * 100)/$reported]]
+set idle [format "%d\\\(%.2f%%\\\)" $idle [expr double($idle * 100)/$reported]]
set reported [format "%d\\\(%.2f%%\\\)" $reported 100]
send_user "\nTesting sreport for first hour\n"
@@ -602,7 +602,7 @@ set down [expr ($node0_down_end-$period_start) * $node0_cpus]
set alloc_sec [expr ($job1_end-$period_start) * $job1_cpus]
set resv [expr ($period_end - $job2_elig) * $job2_cpus]
set idle [expr $reported - ($down + $alloc_sec + $resv)]
-# do the same logic inside the plugin to figure out the correct
+# do the same logic inside the plugin to figure out the correct
# idle time and resv time
if {$idle < 0 } {
set resv [expr $resv + $idle]
@@ -611,10 +611,10 @@ if {$idle < 0 } {
set resv 0
}
}
-set down [format "%d\\\(%.2f%%\\\)" $down [expr double($down * 100)/$reported]]
-set alloc [format "%d\\\(%.2f%%\\\)" $alloc_sec [expr double($alloc_sec * 100)/$reported]]
+set down [format "%d\\\(%.2f%%\\\)" $down [expr double($down * 100)/$reported]]
+set alloc [format "%d\\\(%.2f%%\\\)" $alloc_sec [expr double($alloc_sec * 100)/$reported]]
set resv [format "%d\\\(%.2f%%\\\)" $resv [expr double($resv * 100)/$reported]]
-set idle [format "%d\\\(%.2f%%\\\)" $idle [expr double($idle * 100)/$reported]]
+set idle [format "%d\\\(%.2f%%\\\)" $idle [expr double($idle * 100)/$reported]]
set reported [format "%d\\\(%.2f%%\\\)" $reported 100]
send_user "\nTesting sreport for second hour\n"
@@ -827,7 +827,7 @@ set resv [expr $resv + (($job3_start - $job3_elig) * $job3_cpus)]
set over 9000
set resv [expr $resv - $over]
set idle [expr $reported - ($down + $alloc_sec + $resv)]
-# do the same logic inside the plugin to figure out the correct
+# do the same logic inside the plugin to figure out the correct
# idle time and resv time
if {$idle < 0 } {
set resv [expr $resv + $idle]
@@ -836,19 +836,19 @@ if {$idle < 0 } {
set resv 0
}
}
-set down [format "%d\\\(%.2f%%\\\)" $down [expr double($down * 100)/$reported]]
-set alloc [format "%d\\\(%.2f%%\\\)" $alloc_sec [expr double($alloc_sec * 100)/$reported]]
+set down [format "%d\\\(%.2f%%\\\)" $down [expr double($down * 100)/$reported]]
+set alloc [format "%d\\\(%.2f%%\\\)" $alloc_sec [expr double($alloc_sec * 100)/$reported]]
set resv [format "%d\\\(%.2f%%\\\)" $resv [expr double($resv * 100)/$reported]]
-set idle [format "%d\\\(%.2f%%\\\)" $idle [expr double($idle * 100)/$reported]]
-set over [format "%d\\\(%.2f%%\\\)" $over [expr double($over * 100)/$reported]]
-
-set job1_alloc_str [format "%d\\\(%.2f%%\\\)" $job1_alloc [expr double($job1_alloc * 100)/$reported]]
-set job2_alloc_str [format "%d\\\(%.2f%%\\\)" $job2_alloc [expr double($job2_alloc * 100)/$reported]]
-set job3_alloc_str [format "%d\\\(%.2f%%\\\)" $job3_alloc [expr double($job3_alloc * 100)/$reported]]
-set total_alloc_str [format "%d\\\(%.2f%%\\\)" $total_alloc [expr double($total_alloc * 100)/$reported]]
-set acct1_alloc_str [format "%d\\\(%.2f%%\\\)" $acct1_alloc [expr double($acct1_alloc * 100)/$reported]]
-set acct2_alloc_str [format "%d\\\(%.2f%%\\\)" $acct2_alloc [expr double($acct2_alloc * 100)/$reported]]
-set acct3_alloc_str [format "%d\\\(%.2f%%\\\)" $acct3_alloc [expr double($acct3_alloc * 100)/$reported]]
+set idle [format "%d\\\(%.2f%%\\\)" $idle [expr double($idle * 100)/$reported]]
+set over [format "%d\\\(%.2f%%\\\)" $over [expr double($over * 100)/$reported]]
+
+set job1_alloc_str [format "%d\\\(%.2f%%\\\)" $job1_alloc [expr double($job1_alloc * 100)/$reported]]
+set job2_alloc_str [format "%d\\\(%.2f%%\\\)" $job2_alloc [expr double($job2_alloc * 100)/$reported]]
+set job3_alloc_str [format "%d\\\(%.2f%%\\\)" $job3_alloc [expr double($job3_alloc * 100)/$reported]]
+set total_alloc_str [format "%d\\\(%.2f%%\\\)" $total_alloc [expr double($total_alloc * 100)/$reported]]
+set acct1_alloc_str [format "%d\\\(%.2f%%\\\)" $acct1_alloc [expr double($acct1_alloc * 100)/$reported]]
+set acct2_alloc_str [format "%d\\\(%.2f%%\\\)" $acct2_alloc [expr double($acct2_alloc * 100)/$reported]]
+set acct3_alloc_str [format "%d\\\(%.2f%%\\\)" $acct3_alloc [expr double($acct3_alloc * 100)/$reported]]
set reported [format "%d\\\(%.2f%%\\\)" $reported 100]
send_user "\nTesting sreport for 3 days\n"
@@ -1114,7 +1114,7 @@ if {$exit_code == 0} {
incr exit_code [remove_user "" "" $users]
incr exit_code [remove_acct "" $accounts]
incr exit_code [remove_cluster "$cluster"]
-
+
exec $bin_rm -f $sql_in
exec $bin_rm -f $sql_rem
if {$exit_code == 0} {
diff --git a/testsuite/expect/test22.2 b/testsuite/expect/test22.2
index 4abcb74b11a9e1deb488da19e26b6041588d4e5c..39df66bdb0800ace52c1b0791a0eb9373b932a0f 100755
--- a/testsuite/expect/test22.2
+++ b/testsuite/expect/test22.2
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -117,7 +117,7 @@ proc sreport_opt { soption } {
set not_support 1
exp_continue
}
- -re "Cluster|Account|0-49 cpus|50-249 cpus|250-499 cpus|500-999 cpus|1000 cpus|of cluster" {
+ -re "Cluster|Account|0-49 cpus|50-249 cpus|250-499 cpus|500-999 cpus|1000 cpus|of cluster" {
if {$debug} {send_user "\nmatch4\n"}
incr matches
exp_continue
diff --git a/testsuite/expect/test23.1 b/testsuite/expect/test23.1
index 4d1634eb73d169c968aa40e054936f444a9e62c2..b4905a80189ff7b161bb9098f85c9ad176506436 100755
--- a/testsuite/expect/test23.1
+++ b/testsuite/expect/test23.1
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -61,7 +61,7 @@ proc sstat_job { soption } {
if { $soption == "e" || $soption == "-helpformat" } {
- spawn $sstat -$soption
+ spawn $sstat -$soption
expect {
-re "AveCPU *AvePages *AveRSS *AveVMSize" {
if {$debug} {send_user "\nmatch1\n"}
@@ -106,7 +106,7 @@ proc sstat_job { soption } {
if { $soption == "h" || $soption == "-help" } {
- spawn $sstat -$soption
+ spawn $sstat -$soption
expect {
-re "sstat...OPTION" {
if {$debug} {send_user "\nmatch6\n"}
@@ -141,7 +141,7 @@ proc sstat_job { soption } {
if { $soption == "-usage" } {
- spawn $sstat -$soption
+ spawn $sstat -$soption
expect {
-re "Usage: sstat .options. -j .job..stepid." {
if {$debug} {send_user "\nmatch9\n"}
@@ -171,7 +171,7 @@ proc sstat_job { soption } {
if { $soption == "V" || $soption == "-version" } {
- spawn $sstat -$soption
+ spawn $sstat -$soption
expect {
-re "slurm ($number).($number)." {
if {$debug} {send_user "\nmatch11\n"}
diff --git a/testsuite/expect/test23.2 b/testsuite/expect/test23.2
index 3618ffb84415dfdfc9016fe49bd32fedf4dcb8af..ee4749cc0e7e15026d9f6c86c5efa2dd4da488f8 100755
--- a/testsuite/expect/test23.2
+++ b/testsuite/expect/test23.2
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Test sstat --helpformat option.
+# Test sstat --helpformat option.
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test23.3 b/testsuite/expect/test23.3
index 67080abddbeaa85671c42735d8c6546fa868e257..7f3e99f9ff8886ce8d462d95a05a0481b439ae82 100755
--- a/testsuite/expect/test23.3
+++ b/testsuite/expect/test23.3
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,25 +41,25 @@ set test_acct "test_acct"
set timeout 60
print_header $test_id
-set ac AveCPU
-set ap AvePages
-set ar AveRSS
+set ac AveCPU
+set ap AvePages
+set ar AveRSS
set av AveVMSize
-set ji JobID
-set mp MaxPages
-set mpn MaxPagesNode
+set ji JobID
+set mp MaxPages
+set mpn MaxPagesNode
set mpt MaxPagesTask
-set mr MaxRSS
-set mrn MaxRSSNode
-set mrt MaxRSSTask
+set mr MaxRSS
+set mrn MaxRSSNode
+set mrt MaxRSSTask
set mvs MaxVMSize
-set mvn MaxVMSizeNode
-set mvt MaxVMSizeTask
-set mc MinCPU
+set mvn MaxVMSizeNode
+set mvt MaxVMSizeTask
+set mc MinCPU
set mn MinCPUNode
-set mt MinCPUTask
-set nt NTasks
-set sc SystemCPU
+set mt MinCPUTask
+set nt NTasks
+set sc SystemCPU
set tc TotalCPU
#
# Check accounting config and bail if not found.
@@ -311,7 +311,7 @@ proc sstat_job { soption job_id} {
-re "JobID|MaxVMSize|MaxVMSizeNode|MaxVMSizeTask| \
AveVMSize|MaxRSS|MaxRSSNode|MaxRSSTask|AveRSS| \
MaxPages|MaxPagesNode|MaxPagesTask|AvePages| \
- MinCPU|MinCPUNode|MinCPUTask|AveCPU|NTasks" {
+ MinCPU|MinCPUNode|MinCPUTask|AveCPU|NTasks" {
if {$debug} {send_user "\nmatch4\n"}
incr matches
exp_continue
diff --git a/testsuite/expect/test24.1 b/testsuite/expect/test24.1
index b3097c795ae03577e2f09f2dce02c075a36d2b6f..95717691c0734c8cd457c7932d6f2afa629feb9d 100755
--- a/testsuite/expect/test24.1
+++ b/testsuite/expect/test24.1
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -42,17 +42,17 @@ set matches 0
print_header $test_id
#
-# Delete left-over programs and rebuild them
+# Delete left-over programs and rebuild them
#
file delete $test_prog
send_user "build_dir is $build_dir\n"
if {[test_aix]} {
send_user "$bin_cc ${test_prog}.c -ldl -lntbl -fno-gcse -fno-strict-aliasing -Wl,-brtl -Wl,-bgcbypass:1000 -Wl,-bexpfull -Wl,-bmaxdata:0x70000000 -Wl,-brtl -g -lpthreads -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o ${build_dir}/src/sshare/process.o\n"
- exec $bin_cc ${test_prog}.c -ldl -lntbl -fno-gcse -fno-strict-aliasing -Wl,-brtl -Wl,-bgcbypass:1000 -Wl,-bexpfull -Wl,-bmaxdata:0x70000000 -Wl,-brtl -g -lpthreads -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o ${build_dir}/src/sshare/process.o
+ exec $bin_cc ${test_prog}.c -ldl -lntbl -fno-gcse -fno-strict-aliasing -Wl,-brtl -Wl,-bgcbypass:1000 -Wl,-bexpfull -Wl,-bmaxdata:0x70000000 -Wl,-brtl -g -lpthreads -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o ${build_dir}/src/sshare/process.o
} else {
send_user "$bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o ${build_dir}/src/sshare/process.o -ldl -export-dynamic \n"
- exec $bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o ${build_dir}/src/sshare/process.o -ldl -export-dynamic
+ exec $bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o ${build_dir}/src/sshare/process.o -ldl -export-dynamic
}
exec $bin_chmod 700 $test_prog
@@ -90,7 +90,7 @@ expect {
"AccountC|User3|1|0.050000|0|0.000000|0.150000|" {
incr matches
exp_continue
- }
+ }
"AccountD||60|0.600000|25|0.250000|0.250000|" {
incr matches
exp_continue
@@ -106,7 +106,7 @@ expect {
"AccountF||35|0.350000|0|0.000000|0.145833|" {
incr matches
exp_continue
- }
+ }
"AccountF|User5|1|0.350000|0|0.000000|0.145833|" {
incr matches
exp_continue
diff --git a/testsuite/expect/test24.1.prog.c b/testsuite/expect/test24.1.prog.c
index ea6fb70785d2d6ec10b1e2e18de737ea34e87e13..1eb7df76aa092aa8a733ed59754ae4afb720fb3e 100644
--- a/testsuite/expect/test24.1.prog.c
+++ b/testsuite/expect/test24.1.prog.c
@@ -1,27 +1,27 @@
/*****************************************************************************\
* test24.1.prog.c - link and test algo of the multifactor plugin.
- *
- * Usage: test24.1.prog
+ *
+ * Usage: test24.1.prog
*****************************************************************************
* Copyright (C) 2009 Lawrence Livermore National Security.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
@@ -73,7 +73,7 @@ int _setup_assoc_list()
acct_association_rec_t *assoc = NULL;
/* make the main list */
assoc_mgr_association_list = list_create(destroy_acct_association_rec);
-
+
/* we just want make it so we setup_childern so just pretend
we are running off cache */
running_cache = 1;
@@ -86,7 +86,7 @@ int _setup_assoc_list()
memset(&update, 0, sizeof(acct_update_object_t));
update.type = ACCT_ADD_ASSOC;
update.objects = list_create(destroy_acct_association_rec);
-
+
/* Since we don't want to worry about lft and rgt's here we
* need to put the assocs in hierarchical order using push
* not append. */
@@ -213,7 +213,7 @@ int main (int argc, char **argv)
log_alter(logopt, 0, NULL);
print_fields_have_header = 0;
print_fields_parsable_print = PRINT_FIELDS_PARSABLE_ENDING;
-
+
conf = slurm_conf_lock();
/* force priority type to be multifactor */
xfree(conf->priority_type);
diff --git a/testsuite/expect/test24.2 b/testsuite/expect/test24.2
index 1344b4f1096173ad3f9226bb2f4cc1c99a1229ec..b8b59241357fc57702703e11b13bdd37c53b2291 100755
--- a/testsuite/expect/test24.2
+++ b/testsuite/expect/test24.2
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -66,7 +66,7 @@ proc sshare_opt { soption } {
send_user "$sshare -$soption \n"
if { $soption == "-help"|| $soption == "-usage" } {
-
+
spawn $sshare -$soption
expect {
-re "SLURM accounting storage is disabled" {
@@ -130,7 +130,7 @@ proc sshare_opt { soption } {
set not_support 2
exp_continue
}
- -re "Account|User|Raw Shares|Norm Shares|Raw Usage|Norm Usage|Effectv Usage" {
+ -re "Account|User|Raw Shares|Norm Shares|Raw Usage|Norm Usage|Effectv Usage" {
if {$debug} {send_user "\nmatch4\n"}
incr matches
exp_continue
diff --git a/testsuite/expect/test25.1 b/testsuite/expect/test25.1
index a4d59ca5c2f92b6ffec87a3ebb47143d63351659..187af3dbb2707e0973dbd460f7c97572fba13ad1 100755
--- a/testsuite/expect/test25.1
+++ b/testsuite/expect/test25.1
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -63,7 +63,7 @@ proc def_cpu_cnt { } {
spawn $sinfo -h -o "%P %C" -p $partition --state=idle
expect {
-re "$partition ($number)(K?)/($number)(K?)" {
- set cpu_cnt $expect_out(3,string)
+ set cpu_cnt $expect_out(3,string)
if {[string compare $expect_out(4,string) ""]} {
set cpu_cnt [expr $cpu_cnt * 1024]
}
@@ -100,7 +100,7 @@ proc sub_job { cpu_cnt } {
spawn $sbatch --output=/dev/null --error=/dev/null -n $cpu_cnt --exclusive $file_in
expect {
-re "Submitted batch job ($number)" {
- set job_id $expect_out(1,string)
+ set job_id $expect_out(1,string)
exp_continue
}
timeout {
@@ -197,7 +197,7 @@ proc sprio_opt { soption } {
set not_support 1
exp_continue
}
- -re "Usage: sprio .-j jid.s.. .-u user_name.s.. .-o format. .--usage. .-hlnvVw." {
+ -re "Usage: sprio .-j jid.s.. .-u user_name.s.. .-o format. .--usage. .-hlnvVw." {
if {$debug} {send_user "\nmatch5\n"}
incr matches
exp_continue
@@ -326,7 +326,7 @@ proc sprio_args { soption sargs jobid} {
set not_support 1
exp_continue
}
- -re "JOBID|PRIORITY|AGE|FAIRSHARE|JOBSIZE|PARTITION|QOS" {
+ -re "JOBID|PRIORITY|AGE|FAIRSHARE|JOBSIZE|PARTITION|QOS" {
if {$debug} {send_user "\nmatch9\n"}
incr matches
exp_continue
@@ -360,12 +360,12 @@ proc sprio_args { soption sargs jobid} {
set not_support 1
exp_continue
}
- -re "JOBID.*PRIORITY" {
+ -re "JOBID.*PRIORITY" {
if {$debug} {send_user "\nmatch10\n"}
incr matches
exp_continue
}
- -re "$jobid *$number" {
+ -re "$jobid *$number" {
if {$debug} {send_user "\nmatch11\n"}
incr matches
exp_continue
@@ -399,12 +399,12 @@ proc sprio_args { soption sargs jobid} {
set not_support 1
exp_continue
}
- -re "JOBID USER PRIORITY AGE FAIRSHARE JOBSIZE PARTITION QOS NICE" {
+ -re "JOBID USER PRIORITY AGE FAIRSHARE JOBSIZE PARTITION QOS NICE" {
if {$debug} {send_user "\nmatch12\n"}
incr matches
exp_continue
}
- -re "$jobid.*$number *$number *$number *$number *$number *$number *$number" {
+ -re "$jobid.*$number *$number *$number *$number *$number *$number *$number" {
if {$debug} {send_user "\nmatch13\n"}
incr matches
exp_continue
@@ -438,12 +438,12 @@ proc sprio_args { soption sargs jobid} {
set not_support 1
exp_continue
}
- -re "JOBID *PRIORITY" {
+ -re "JOBID *PRIORITY" {
if {$debug} {send_user "\nmatch14\n"}
incr matches
exp_continue
}
- -re "$jobid *$float" {
+ -re "$jobid *$float" {
if {$debug} {send_user "\nmatch15\n"}
incr matches
exp_continue
@@ -487,7 +487,7 @@ proc sprio_args { soption sargs jobid} {
incr matches
exp_continue
}
- -re "$jobid *.* *$float *$number *$float *$number *$float *$number *$float *$number *$float *$number *$float *$number *$number" {
+ -re "$jobid *.* *$float *$number *$float *$number *$float *$number *$float *$number *$float *$number *$float *$number *$number" {
if {$debug} {send_user "\nmatch18\n"}
incr matches
exp_continue
@@ -521,12 +521,12 @@ proc sprio_args { soption sargs jobid} {
set not_support 1
exp_continue
}
- -re "JOBID *USER" {
+ -re "JOBID *USER" {
if {$debug} {send_user "\nmatch19\n"}
incr matches
exp_continue
}
- -re "$jobid *$sargs" {
+ -re "$jobid *$sargs" {
if {$debug} {send_user "\nmatch20\n"}
incr matches
exp_continue
@@ -560,12 +560,12 @@ proc sprio_args { soption sargs jobid} {
set not_support 1
exp_continue
}
- -re "JOBID *USER" {
+ -re "JOBID *USER" {
if {$debug} {send_user "\nmatch21\n"}
incr matches
exp_continue
}
- -re "$jobid *$sargs" {
+ -re "$jobid *$sargs" {
if {$debug} {send_user "\nmatch22\n"}
incr matches
exp_continue
@@ -599,17 +599,17 @@ proc sprio_args { soption sargs jobid} {
set not_support 1
exp_continue
}
- -re "format.*job_flag.*jobs.*$jobid.*verbose" {
+ -re "format.*job_flag.*jobs.*$jobid.*verbose" {
if {$debug} {send_user "\nmatch23\n"}
incr matches
exp_continue
}
- -re "JOBID *PRIORITY" {
+ -re "JOBID *PRIORITY" {
if {$debug} {send_user "\nmatch24\n"}
incr matches
exp_continue
}
- -re "$jobid *$number" {
+ -re "$jobid *$number" {
if {$debug} {send_user "\nmatch25\n"}
incr matches
exp_continue
@@ -719,7 +719,7 @@ if {!$exit_code} {
#
# Cancel jobs
#
-cancel_job $jobid1
+cancel_job $jobid1
cancel_job $jobid2
#
diff --git a/testsuite/expect/test3.1 b/testsuite/expect/test3.1
index 20656c90d12b13bb80cbb810023b5c7abf6511a8..f2cddefbd90c3bb10e0594c25ee243f26d2f1086 100755
--- a/testsuite/expect/test3.1
+++ b/testsuite/expect/test3.1
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -73,7 +73,7 @@ if {[wait_for_job $job_id RUNNING] != 0} {
#
# Issue scontrol reconfigure
#
-spawn $scontrol reconfigure
+spawn $scontrol reconfigure
expect {
-re "slurm_reconfigure error: Invalid user id" {
exp_continue
diff --git a/testsuite/expect/test3.10 b/testsuite/expect/test3.10
index 67ea4c99ded02b223e6ffe7bb4503a834fe09e3c..6f8a11a81f5dd9fce4362f8a84fb6c6c8f3fcfef 100755
--- a/testsuite/expect/test3.10
+++ b/testsuite/expect/test3.10
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -102,7 +102,7 @@ if {$matches == 0} {
send_user "\nFAILURE: notification not received by srun\n"
set exit_code 1
}
-
+
cancel_job $job_id
if {$exit_code == 0} {
send_user "\nSUCCESS\n"
diff --git a/testsuite/expect/test3.11 b/testsuite/expect/test3.11
index 2d2dd91b0dc23d7bf6ebfd7e8159d029da06fcaa..1ff0d1f0ce2b03418a62f2ba04868a8b07476b8f 100755
--- a/testsuite/expect/test3.11
+++ b/testsuite/expect/test3.11
@@ -12,21 +12,21 @@
# Written by Dave Bremer <dbremer@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
#
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -203,7 +203,7 @@ proc update_res { res_name res_params failure_expected } {
proc delete_res { res_name } {
global scontrol
set ret_code 0
-
+
spawn $scontrol delete ReservationName=$res_name
expect {
-re "invalid" {
@@ -272,7 +272,7 @@ expect {
#
# TEST 1
-# Make a list of lists with a series of parameters to test. All the tests
+# Make a list of lists with a series of parameters to test. All the tests
# in goodtests should pass, all those in badtests should fail.
#
set badtests "
@@ -375,7 +375,7 @@ if {$ret_code != 0} {
#
# TEST 3
-# Make a reservation, submit a job to it, confirm that the job is paired
+# Make a reservation, submit a job to it, confirm that the job is paired
# with the reservation.
#
diff --git a/testsuite/expect/test3.2 b/testsuite/expect/test3.2
index 4118cbdd4dc8e0ac4ceab3068ff5421e0b9921be..fc0e3bd998cbefc5cc1dea48bd5f5776f525b151 100755
--- a/testsuite/expect/test3.2
+++ b/testsuite/expect/test3.2
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -54,7 +54,7 @@ proc run_job { part_name } {
expect {
-re "Unable to contact" {
send_user "\nFAILURE: slurm appears to be down\n"
- return 1
+ return 1
}
-re "uid" {
set rc 0
@@ -80,7 +80,7 @@ proc run_job { part_name } {
#
# Identify a partition and its state
#
-spawn $scontrol show part
+spawn $scontrol show part
expect {
-re "PartitionName=($alpha_numeric_under)" {
if {[string compare $part_name ""] == 0} {
@@ -96,7 +96,7 @@ expect {
wait
}
}
-
+
spawn $scontrol show part $part_name
expect {
-re "State=($alpha_cap) " {
@@ -151,7 +151,7 @@ if {$job_runable == 0} {
#
# Change that partition's state
#
-spawn $scontrol update PartitionName=$part_name State=$part_new_state
+spawn $scontrol update PartitionName=$part_name State=$part_new_state
expect {
-re "slurm_update error: ($alpha_numeric_under) ($alpha_numeric_under)" {
set access_err 0
@@ -217,7 +217,7 @@ if {$job_runable == 1} {
#
# Return that partition's state to its old value
#
-spawn $scontrol update PartitionName=$part_name State=$part_old_state
+spawn $scontrol update PartitionName=$part_name State=$part_old_state
expect {
-re "slurm_update error: Invalid user id" {
exp_continue
diff --git a/testsuite/expect/test3.3 b/testsuite/expect/test3.3
index a50315e29dd36d889565287a228de61383afe596..7e545cb9ad2dd2ed89f995b0caf5fb86a21aea4c 100755
--- a/testsuite/expect/test3.3
+++ b/testsuite/expect/test3.3
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -45,7 +45,7 @@ print_header $test_id
#
# Identify a node and its state
#
-spawn $scontrol show node
+spawn $scontrol show node
expect {
-re "NodeName=($alpha_numeric_under) State=IDLE " {
if {[string compare $node_name ""] == 0} {
@@ -57,7 +57,7 @@ expect {
-re "NodeName=($alpha_numeric_under) State=ALLOCATED " {
if {[string compare $node_name ""] == 0} {
set node_name $expect_out(1,string)
- set node_old_state "ALLOCATED"
+ set node_old_state "ALLOCATED"
}
exp_continue
}
@@ -153,7 +153,7 @@ if {$authorized == 1} {
#
# Return that node's state to its old value
#
-spawn $scontrol update NodeName=$node_name State=RESUME
+spawn $scontrol update NodeName=$node_name State=RESUME
expect {
-re "slurm_update error: Invalid user id" {
exp_continue
diff --git a/testsuite/expect/test3.4 b/testsuite/expect/test3.4
index 125fd0e89fbae1876c4b60826b12e5ec3f576566..55c9b7de76abd09ba5609050db739f1f546041b7 100755
--- a/testsuite/expect/test3.4
+++ b/testsuite/expect/test3.4
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -90,7 +90,7 @@ expect {
#
# Change that job's priority
#
-spawn $scontrol update JobId=$job_id Priority=$new_prio
+spawn $scontrol update JobId=$job_id Priority=$new_prio
expect {
-re "slurm_update error: Access.*denied" {
send_user "\nWARNING: User not authorized to modify jobs\n"
diff --git a/testsuite/expect/test3.5 b/testsuite/expect/test3.5
index 6e72334e079f90fe8e518d3f2f617b7d94da15b1..c2a09d8ac33a3affef8b30c8d7284ddf0f747886 100755
--- a/testsuite/expect/test3.5
+++ b/testsuite/expect/test3.5
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test3.6 b/testsuite/expect/test3.6
index 9fdf7578a18a618b64760d4580ff30e887b1717f..8edaa78ef3d166f15caa27cb50a8537ca326225d 100755
--- a/testsuite/expect/test3.6
+++ b/testsuite/expect/test3.6
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -84,14 +84,14 @@ if {$found == 1} {
}
#
-# We only reach this point if a hidden partition must be
-# created to test this feature, which only super users can do
+# We only reach this point if a hidden partition must be
+# created to test this feature, which only super users can do
#
if {[test_super_user] == 0} {
send_user "\nWARNING: can not test more unless SlurmUser or root\n"
exit $exit_code
}
-
+
#
# Confirm the partition name does not already exist
#
diff --git a/testsuite/expect/test3.7 b/testsuite/expect/test3.7
index 102dfa0bf27995b9a9c3f44fba63608691888873..292ef8d3157c51cd538148b23616aef9e94d6578 100755
--- a/testsuite/expect/test3.7
+++ b/testsuite/expect/test3.7
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -196,9 +196,9 @@ if {$job_id2 == 0} {
#
# Stop job 1 and let job 2 begin,
-# Stop job 2 and let job 1 complete,
+# Stop job 2 and let job 1 complete,
# Then resume job 2
-# The sleep commands are added so the program can recognize
+# The sleep commands are added so the program can recognize
# that it has been suspended.
#
sleep 5
diff --git a/testsuite/expect/test3.7.prog.c b/testsuite/expect/test3.7.prog.c
index 356ee2cb0064c1088ddbfd7677886d71cfe7bbee..599b7eb5a3e9533eb11596fecad45f9012f1cde9 100644
--- a/testsuite/expect/test3.7.prog.c
+++ b/testsuite/expect/test3.7.prog.c
@@ -8,21 +8,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
diff --git a/testsuite/expect/test3.8 b/testsuite/expect/test3.8
index 6421c6fbf50a56010e8c30dd4de0697224e73342..82c0a0d9ed5519529439dd5151ac10abee835709 100755
--- a/testsuite/expect/test3.8
+++ b/testsuite/expect/test3.8
@@ -7,29 +7,29 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# Note: This script generates and then deletes files in the working directory
-# named test3.8.input, test.3.8.output, test.3.8.error, and
+# Note: This script generates and then deletes files in the working directory
+# named test3.8.input, test.3.8.output, test.3.8.error, and
# test3.8.run.*
############################################################################
# Copyright (C) 2006 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -65,7 +65,7 @@ make_bash_script $file_in "
then
$bin_touch $file_flag_4
elif \[ -f $file_flag_2 \]
- then
+ then
$bin_touch $file_flag_3
elif \[ -f $file_flag_1 \]
then
@@ -178,7 +178,7 @@ if {[file exists $file_flag_4]} {
}
#
-# Now run the same test, but with job requeue disabled via the
+# Now run the same test, but with job requeue disabled via the
# srun --no-requeue option
#
set job_id 0
diff --git a/testsuite/expect/test3.9 b/testsuite/expect/test3.9
index 459853547c5c5ea1cfcfe97111ae3da767f07368..76a161f204558db11d7519e8178d8a02df06baca 100755
--- a/testsuite/expect/test3.9
+++ b/testsuite/expect/test3.9
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test4.1 b/testsuite/expect/test4.1
index 986fefcc33db44afccbfe209981a40b70b7422fd..e1cfed362a6a2c21ae19e42b355f7c58d50da8b3 100755
--- a/testsuite/expect/test4.1
+++ b/testsuite/expect/test4.1
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Report the sinfo usage format
#
-
-spawn $sinfo --usage
+
+spawn $sinfo --usage
expect {
-re "Usage: .*partition.*" {
incr matches
diff --git a/testsuite/expect/test4.10 b/testsuite/expect/test4.10
index 0a7867791328412cde9aff7b8b8053f9111dfc15..360f3729d4d9b2c39c185420e3cb10625fe70f67 100755
--- a/testsuite/expect/test4.10
+++ b/testsuite/expect/test4.10
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test4.11 b/testsuite/expect/test4.11
index bbd1f52228b27a16efac7897d5e630a53d71ee00..60c386a1b0782c8710f64cca61094d4ec99ae427 100755
--- a/testsuite/expect/test4.11
+++ b/testsuite/expect/test4.11
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,7 +41,7 @@ print_header $test_id
#
# Check the sinfo --list-reasons option output
#
-
+
spawn $sinfo --list-reasons
expect {
-re "REASON *NODELIST" {
diff --git a/testsuite/expect/test4.12 b/testsuite/expect/test4.12
index 2c1ac5b36d8d7b254ec00a99f44086d86cea9579..d7d8ae84b63cde7f00096a7404b9e2694889c292 100755
--- a/testsuite/expect/test4.12
+++ b/testsuite/expect/test4.12
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -48,7 +48,7 @@ set node_scaling 0
proc scontrol_test { node proc_cnt } {
global scontrol number prompt
- upvar spawn_id spawn_id
+ upvar spawn_id spawn_id
set found 0
set rc 0
@@ -88,13 +88,13 @@ proc scontrol_test { node proc_cnt } {
proc sinfo_test_1 { node proc_cnt total_procs idle_cpus } {
global sinfo number prompt
- upvar spawn_id spawn_id
+ upvar spawn_id spawn_id
set found 0
set rc 0
send "$sinfo -o \"%C %A %N\" -h -n $node\r"
- # make sure we get by the sinfo command so we don't
+ # make sure we get by the sinfo command so we don't
# think the %'s are a prompt
expect {
"%C %A %N" {
@@ -119,7 +119,7 @@ proc sinfo_test_1 { node proc_cnt total_procs idle_cpus } {
if {[string compare $expect_out(8,string) ""]} {
set num_total [expr $num_total * 1024]
}
-
+
if { $num_alloc != $proc_cnt } {
send_user "\nFAILURE: sinfo 1 allocated cpus wrong, got $num_alloc but needed $proc_cnt\n"
set rc 1
@@ -143,7 +143,7 @@ proc sinfo_test_1 { node proc_cnt total_procs idle_cpus } {
}
eof {
wait
- }
+ }
}
if {!$found} {
@@ -156,14 +156,14 @@ proc sinfo_test_1 { node proc_cnt total_procs idle_cpus } {
proc sinfo_test_2 { node proc_cnt total_procs } {
global sinfo number prompt node_scaling
- upvar spawn_id spawn_id
+ upvar spawn_id spawn_id
set rc 0
set num_alloc 0
set num_idle 0
set alloc_nodes 1
set total_nodes 1
-
+
if {$node_scaling} {
set alloc_nodes [expr $proc_cnt / $node_scaling]
set total_nodes [expr $total_procs / $node_scaling]
@@ -171,7 +171,7 @@ proc sinfo_test_2 { node proc_cnt total_procs } {
set idle_nodes [expr $total_nodes - $alloc_nodes]
send "$sinfo -o \"%t %D %N\" -h -n $node\r"
- # make sure we get by the sinfo command so we don't
+ # make sure we get by the sinfo command so we don't
# think the %'s are a prompt
expect {
"%t %D %N" {
@@ -203,7 +203,7 @@ proc sinfo_test_2 { node proc_cnt total_procs } {
wait
}
}
-
+
if { $num_alloc != $alloc_nodes } {
send_user "\nFAILURE: sinfo 2 allocated nodes wrong, got $num_alloc but needed $alloc_nodes\n"
set rc 1
@@ -211,22 +211,22 @@ proc sinfo_test_2 { node proc_cnt total_procs } {
send_user "\nFAILURE: sinfo 2 idle nodes wrong, got $num_idle but needed $idle_nodes\n"
set rc 1
}
-
+
return $rc
}
# allocate a set of nodes (node_cnt) and the quit right after
proc allocate_and_quit { node proc_cnt total_procs } {
- global salloc scontrol sinfo number alpha_numeric_under
+ global salloc scontrol sinfo number alpha_numeric_under
global prompt select_type procs_per_node
-
+
set job_id 0
set num_alloc 0
set block ""
set rc 0
set timeout 60
set idle_cpus [expr $total_procs - $proc_cnt]
-
+
set mypid [spawn $salloc -w $node -N1 -n $proc_cnt bash]
expect {
-re "Granted job allocation ($number)" {
@@ -240,7 +240,7 @@ proc allocate_and_quit { node proc_cnt total_procs } {
send "exit\r"
return 1
}
-
+
# test for sinfo to give me the correct cpu count
if { [sinfo_test_1 $node $proc_cnt $total_procs $idle_cpus] } {
@@ -277,7 +277,7 @@ proc allocate_and_quit { node proc_cnt total_procs } {
}
############################################################################
-# test starts here
+# test starts here
############################################################################
print_header $test_id
@@ -289,7 +289,7 @@ set def_part_found 0
spawn $sinfo
expect {
-re "($alpha_numeric_under)\\\* " {
- set def_part $expect_out(1,string)
+ set def_part $expect_out(1,string)
set def_part_found 1
exp_continue
}
@@ -318,7 +318,7 @@ expect {
exp_continue
}
-re " Nodes=($alpha_numeric_nodelist)" {
- set def_hostlist $expect_out(1,string)
+ set def_hostlist $expect_out(1,string)
exp_continue
}
-re " BasePartitions=($alpha_numeric_nodelist)" {
@@ -337,7 +337,7 @@ set host_cnt 0
spawn $scontrol show hostnames $def_hostlist
expect {
-re "($alpha_numeric_under)" {
- set host_name($host_cnt) $expect_out(1,string)
+ set host_name($host_cnt) $expect_out(1,string)
incr host_cnt
exp_continue
}
@@ -361,7 +361,7 @@ set inode_procs 0
spawn $scontrol -o show node $def_hostlist
expect {
-re "NodeName=($alpha_numeric_under) .*CoresPerSocket=($number) .*CPUTot=($number)(K?).* Sockets=($number) State=IDLE ThreadsPerCore=($number)" {
- set inode_name $expect_out(1,string)
+ set inode_name $expect_out(1,string)
set inode_cores_per_socket $expect_out(2,string)
set inode_procs $expect_out(3,string)
if {[string compare $expect_out(4,string) ""]} {
@@ -397,18 +397,18 @@ if {![string compare $select_type "bluegene"]} {
exit 1
}
set psets [get_bluegene_psets]
-
+
if {$psets == 0} {
send_user "\nFAILURE: No psets are set on this system\n"
exit 1
}
set type [get_bluegene_type]
-
+
if {$type == 0} {
send_user "\nFAILURE: No bluegene type found \n"
exit 1
- }
-
+ }
+
if {![string compare $type "P"]} {
if {$psets >= 32} {
set smallest 16
@@ -428,7 +428,7 @@ if {![string compare $select_type "bluegene"]} {
} else {
send_user "\nFAILURE: unknown bluegene system type '$type'\n";
exit 1
- }
+ }
set node_scaling [get_bluegene_procs_per_cnode]
set smallest [expr $smallest * $node_scaling]
} elseif {![string compare $select_type "linear"]} {
diff --git a/testsuite/expect/test4.2 b/testsuite/expect/test4.2
index 7e09e4c4fae5bd4191d6a5ebbc24e9fd6d51a915..acb8929bf6d3783edd925ea711f92b344095fa24 100755
--- a/testsuite/expect/test4.2
+++ b/testsuite/expect/test4.2
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Report the sinfo help message
#
-
-spawn $sinfo --help
+
+spawn $sinfo --help
expect {
-re "Usage:" {
incr matches
diff --git a/testsuite/expect/test4.3 b/testsuite/expect/test4.3
index 7ee122278913132e793b54153c294e5aceda6cb9..32c68dcacc4bc797078cb9bcc818c6d0cc49684a 100755
--- a/testsuite/expect/test4.3
+++ b/testsuite/expect/test4.3
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Check partition information, both long and short (--long and
+# Check partition information, both long and short (--long and
# --summarize options) and partition filtering (--partition option).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -43,13 +43,13 @@ print_header $test_id
#
# Check the sinfo summarize format
-# Just looking for the regular expression "\*" causes errors in
-# looking for the default partition, so the logic looks for an
-# alpha-numeric partition name followed by the state (up|down)
+# Just looking for the regular expression "\*" causes errors in
+# looking for the default partition, so the logic looks for an
+# alpha-numeric partition name followed by the state (up|down)
# then looks for the partition name suffix of "*"
#
-
-spawn $sinfo --summarize
+
+spawn $sinfo --summarize
expect {
-re "PARTITION" {
incr matches
@@ -107,7 +107,7 @@ if {$def_part == 0} {
#
# Check the sinfo summarize format with partition filter
#
-
+
set matches 0
spawn $sinfo --summarize --partition=$def_part_name
expect {
@@ -136,9 +136,9 @@ if {$matches != 1} {
#
# Check the sinfo regular format
#
-
+
set matches 0
-spawn $sinfo
+spawn $sinfo
expect {
-re "PARTITION" {
incr matches
@@ -197,9 +197,9 @@ if {$matches != 6} {
#
# Check the sinfo long format
#
-
+
set matches 0
-spawn $sinfo --long
+spawn $sinfo --long
expect {
-re "PARTITION" {
incr matches
diff --git a/testsuite/expect/test4.4 b/testsuite/expect/test4.4
index 85c066fc57ef1584651908441ea89c255d652ab7..c0fdc0818544f6f2852a3ae8b14fb881b7584926 100755
--- a/testsuite/expect/test4.4
+++ b/testsuite/expect/test4.4
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Check node information, both regular and long (--Node, --long,
+# Check node information, both regular and long (--Node, --long,
# and --exact options).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -42,8 +42,8 @@ print_header $test_id
#
# Check the sinfo regular format
#
-
-spawn $sinfo --Node
+
+spawn $sinfo --Node
expect {
-re "NODELIST" {
incr matches
@@ -87,7 +87,7 @@ if {$matches != 4} {
#
# Check the sinfo long format
#
-
+
set matches 0
set ranges 0
spawn $sinfo --Node --long --exact
diff --git a/testsuite/expect/test4.5 b/testsuite/expect/test4.5
index 4f8c93d5d7122996156c0899896734affbcb5d94..f4f7a6059ea0efc1d6f9d4ab2beb0f2164727a90 100755
--- a/testsuite/expect/test4.5
+++ b/testsuite/expect/test4.5
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Check sinfo node information filtering (--state and --nodes
+# Check sinfo node information filtering (--state and --nodes
# options).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -46,7 +46,7 @@ print_header $test_id
#
# Check the sinfo long format looking for filtering options
#
-
+
spawn $sinfo --Node --long --exact
expect {
-re "($end_of_line)($name_string) *($number) *($name_string) *($alpha_cap)" {
@@ -74,7 +74,7 @@ expect {
#
# Use sinfo state filter
#
-
+
spawn $sinfo --Node --long --exact --state=$node_state
expect {
-re "($end_of_line)($name_string) *($number) *($name_string) *($alpha_cap)" {
@@ -99,7 +99,7 @@ expect {
#
# Use sinfo node name filter
#
-
+
spawn $sinfo --Node --long --exact --nodes=$node_name
expect {
-re "($end_of_line)($name_string) *($number) *($name_string) *($alpha_cap)" {
diff --git a/testsuite/expect/test4.6 b/testsuite/expect/test4.6
index bdc667ae6862ac6b45afa9284e723cdad1726c89..11005f8c62a72585319935f83e3f47fc0436daf5 100755
--- a/testsuite/expect/test4.6
+++ b/testsuite/expect/test4.6
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,7 +41,7 @@ print_header $test_id
#
# Check the sinfo iteration
#
-
+
spawn $sinfo --iterate=2
expect {
-re "PARTITION" {
diff --git a/testsuite/expect/test4.7 b/testsuite/expect/test4.7
index 8c5c58a64c7935e3664d5bd895fce9d2d51a0a00..ea18d82791592d9668ed141733751b32e3b7d025 100755
--- a/testsuite/expect/test4.7
+++ b/testsuite/expect/test4.7
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Confirm that input options are printed
#
-
-spawn $sinfo --verbose
+
+spawn $sinfo --verbose
expect {
-re "iterate" {
incr matches
diff --git a/testsuite/expect/test4.8 b/testsuite/expect/test4.8
index 515c0297ba6a93939ffdcd682bee06d56563c1ad..b49dc00781493379a102cb4e6b9eed9d792671be 100755
--- a/testsuite/expect/test4.8
+++ b/testsuite/expect/test4.8
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Look for header or underline
#
-
-spawn $sinfo --noheader
+
+spawn $sinfo --noheader
expect {
-re "PARTITION" {
incr matches
@@ -50,7 +50,7 @@ expect {
}
-re "Unable to contact" {
send_user "\nFAILURE: slurm appears to be down\n"
- exit 1
+ exit 1
}
timeout {
send_user "\nFAILURE: sinfo not responding\n"
@@ -69,7 +69,7 @@ if {$matches != 0} {
#
# Look for header or underline
#
-
+
spawn $sinfo --noheader --Node
expect {
-re "PARTITION" {
@@ -78,7 +78,7 @@ expect {
}
-re "Unable to contact" {
send_user "\nFAILURE: slurm appears to be down\n"
- exit 1
+ exit 1
}
timeout {
send_user "\nFAILURE: sinfo not responding\n"
@@ -97,7 +97,7 @@ if {$matches != 0} {
#
# Look for header or underline
#
-
+
spawn $sinfo --noheader --summarize
expect {
-re "PARTITION" {
@@ -106,7 +106,7 @@ expect {
}
-re "Unable to contact" {
send_user "\nFAILURE: slurm appears to be down\n"
- exit 1
+ exit 1
}
timeout {
send_user "\nFAILURE: sinfo not responding\n"
diff --git a/testsuite/expect/test4.9 b/testsuite/expect/test4.9
index 863574b356f391c5a4ec24337584759d85d4e30d..56f7412387800f710aded378b95424f8bb11e446 100755
--- a/testsuite/expect/test4.9
+++ b/testsuite/expect/test4.9
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -43,7 +43,7 @@ print_header $test_id
# Check the sinfo format output via command line
#
-# For some reason, quoting the format value breaks expect,
+# For some reason, quoting the format value breaks expect,
# but this passes the entire format in a single argv entry
set format "--format=partition=%P node_cnt=%D"
spawn $sinfo --noheader $format
diff --git a/testsuite/expect/test5.1 b/testsuite/expect/test5.1
index f7ee36bdb6469b2f9934f2bbb6918c3e928db5d1..4848ef435eddfab6e4b93d96a7974899575a8e8d 100755
--- a/testsuite/expect/test5.1
+++ b/testsuite/expect/test5.1
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Report the squeue usage format
#
-
-spawn $squeue --usage
+
+spawn $squeue --usage
expect {
-re "Usage: .*usage.*" {
incr matches
diff --git a/testsuite/expect/test5.2 b/testsuite/expect/test5.2
index d9b3fc2fd0899fa65b8d6e2ef6054c360aa0141e..27b217b1722b14a7488e45bfdc04c1506361a055 100755
--- a/testsuite/expect/test5.2
+++ b/testsuite/expect/test5.2
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Report the squeue help message
#
-
-spawn $squeue --help
+
+spawn $squeue --help
expect {
-re "Usage:" {
incr matches
diff --git a/testsuite/expect/test5.3 b/testsuite/expect/test5.3
index b7ce8fd3ae36a726734729671807b58673858c83..b0a196d9c81985161ade4e834107ac867e6f4d1d 100755
--- a/testsuite/expect/test5.3
+++ b/testsuite/expect/test5.3
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,7 +41,7 @@ print_header $test_id
#
# Check the squeue iteration
#
-
+
spawn $squeue --iterate=2
expect {
-re "PARTITION" {
diff --git a/testsuite/expect/test5.4 b/testsuite/expect/test5.4
index 78bac69282a53397aea5a5ca997e477747c2b574..c502c09e1167faae04e7de33832efe92519ee3ce 100755
--- a/testsuite/expect/test5.4
+++ b/testsuite/expect/test5.4
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Check squeue formating options (--noheader, --format and --step
+# Check squeue formating options (--noheader, --format and --step
# options and SQUEUE_FORMAT environment variable).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -127,7 +127,7 @@ if {$have_header > 0} {
# Check the squeue format output via command line option
#
-# For some reason, quoting the format value breaks expect,
+# For some reason, quoting the format value breaks expect,
# but this passes the entire format in a single argv entry
set format "--format=jid=%i uid=%U"
set have_job_ids 0
@@ -161,7 +161,7 @@ if {$have_job_ids == 1} {
}
#
-# Check the squeue format output via SQUEUE_FORMAT environment
+# Check the squeue format output via SQUEUE_FORMAT environment
# variable
#
diff --git a/testsuite/expect/test5.5 b/testsuite/expect/test5.5
index b3fc8ebd924b1da3f3b36260bff4a4ea9d673a55..1834d68a8fd53a91bdfacda7e82f89b0ca237af4 100755
--- a/testsuite/expect/test5.5
+++ b/testsuite/expect/test5.5
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test5.6 b/testsuite/expect/test5.6
index 22401d5f0acbd30edb0457fd7c7a58db51e03d16..4b1d1244ae8a5650d9df7480ca2e54cb9bcccba1 100755
--- a/testsuite/expect/test5.6
+++ b/testsuite/expect/test5.6
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Test squeue filtering (--jobs, --node, --states, --steps and
+# Test squeue filtering (--jobs, --node, --states, --steps and
# --user options).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -99,7 +99,7 @@ if {$job_id2 == 0} {
# Check the squeue job filter option
#
set job_found 0
-spawn $squeue --format=%i --jobs $job_id2
+spawn $squeue --format=%i --jobs $job_id2
expect {
-re "($number)" {
set tmp_id $expect_out(1,string)
@@ -127,7 +127,7 @@ if {$job_found == 0} {
#
# Check the squeue state filter option
#
-spawn $squeue --format=%t --noheader --states=PD
+spawn $squeue --format=%t --noheader --states=PD
expect {
-re "($alpha_cap)" {
if {[string compare $expect_out(1,string) "PD"]} {
@@ -148,7 +148,7 @@ expect {
#
# Check the squeue user filter option with name
#
-spawn $bin_id -un
+spawn $bin_id -un
expect {
-re "($alpha_numeric_under)" {
set this_user $expect_out(1,string)
@@ -158,7 +158,7 @@ expect {
wait
}
}
-spawn $squeue --format=%u --noheader --user=$this_user
+spawn $squeue --format=%u --noheader --user=$this_user
expect {
-re "($alpha_numeric_under)" {
if {[string compare $expect_out(1,string) $this_user]} {
@@ -268,7 +268,7 @@ if {$node_name_set == 1} {
# First get partition name(s)
set partition1 ""
set partition2 ""
-spawn $squeue --format=%P --noheader
+spawn $squeue --format=%P --noheader
expect {
-re "($alpha_numeric_under)" {
if {![string compare $partition1 ""]} {
@@ -316,7 +316,7 @@ expect {
wait_for_job $job_id1 "RUNNING"
exec $bin_sleep 10
set job_found 0
-spawn $squeue --format=%i --steps $job_id1.0
+spawn $squeue --format=%i --steps $job_id1.0
expect {
-re "($number).($number)" {
set tmp_id $expect_out(1,string)
diff --git a/testsuite/expect/test5.7 b/testsuite/expect/test5.7
index b7b70b08b5b9ba8a5a479d02f63d9172a69a6b92..159c6970ed353ec81b69c26e14b3d779dd66a789 100755
--- a/testsuite/expect/test5.7
+++ b/testsuite/expect/test5.7
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Confirm that input options are printed
#
-
-spawn $squeue --verbose
+
+spawn $squeue --verbose
expect {
-re "iterate" {
incr matches
@@ -54,7 +54,7 @@ expect {
}
-re "Unable to contact" {
send_user "\nFAILURE: slurm appears to be down\n"
- exit 1
+ exit 1
}
timeout {
send_user "\nFAILURE: squeue not responding\n"
diff --git a/testsuite/expect/test5.8 b/testsuite/expect/test5.8
index e81731c981b6f7c9e2763c9a52d8cc0e96b8a801..31208e56dcdb601646d9afc049f70c83f87841e8 100755
--- a/testsuite/expect/test5.8
+++ b/testsuite/expect/test5.8
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test6.1 b/testsuite/expect/test6.1
index bbdda4db386370dd587519bbcdbd34c5878bb40e..2034917c16af33cecbda2a468693956a2ad29c12 100755
--- a/testsuite/expect/test6.1
+++ b/testsuite/expect/test6.1
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Report the scancel usage format
#
-
-spawn $scancel --usage
+
+spawn $scancel --usage
expect {
-re "Usage: .*usage.*" {
incr matches
diff --git a/testsuite/expect/test6.10 b/testsuite/expect/test6.10
index 30d1086e3af0bbf73f93bac11916bcab7f0949cb..e12a3bf66387806eb2d9fdbf57f8c63326401669 100755
--- a/testsuite/expect/test6.10
+++ b/testsuite/expect/test6.10
@@ -1,35 +1,35 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Test scancel user and partition filters, delete all remaining jobs
+# Test scancel user and partition filters, delete all remaining jobs
# (--partition and --user options).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# Note: This script generates and then deletes files in the working directory
+# Note: This script generates and then deletes files in the working directory
# named test6.10.input
############################################################################
# Copyright (C) 2002 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test6.11 b/testsuite/expect/test6.11
index e1bf2423117e05374d21f4bcc5d49df073d0853b..dd95c4b9e63c226c7020361452c6669a72059328 100755
--- a/testsuite/expect/test6.11
+++ b/testsuite/expect/test6.11
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test6.12 b/testsuite/expect/test6.12
index f650e68ce45f62dcbb995956ce384cf11b3fa709..f1f6a628737f47a567bb0e93ecea54df81402c78 100755
--- a/testsuite/expect/test6.12
+++ b/testsuite/expect/test6.12
@@ -7,28 +7,28 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# Note: This script generates and then deletes files in the working directory
+# Note: This script generates and then deletes files in the working directory
# named test6.12.input, test6.12.output, and test6.12.error
############################################################################
# Copyright (C) 2002-2006 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -121,7 +121,7 @@ expect {
# (the srun) to exit. If it did not trap SIGINT, the "wait" would
# be killed by the SIGINT, then the batch script would exit triggering
# a kill of the entire job.
-#
+#
spawn $scancel --batch -s INT $job_id
expect {
eof {
@@ -181,7 +181,7 @@ if {$job_id == 0} {
}
#
-# Wait for job to start running and
+# Wait for job to start running and
# send SIGHUP and confirm that job gets cancelled
#
if {[wait_for_job $job_id "RUNNING"] != 0} {
diff --git a/testsuite/expect/test6.13 b/testsuite/expect/test6.13
index 5915cd9c6674f23275df29d7934018c84fe53d78..3f8328bc6c05c7989608eb9205f0fefe84036220 100755
--- a/testsuite/expect/test6.13
+++ b/testsuite/expect/test6.13
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Test routing all signals through slurmctld rather than directly
+# Test routing all signals through slurmctld rather than directly
# to slurmd (undocumented --ctld option).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# UCRL-CODE-217948.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test6.13.prog.c b/testsuite/expect/test6.13.prog.c
index 0473eac5bd3948d1e291c5f9d3c8e95384612af7..eb6317cdd31d3138aff86b70e4adb60e0c76d9f6 100644
--- a/testsuite/expect/test6.13.prog.c
+++ b/testsuite/expect/test6.13.prog.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * prog6.13.prog.c - Simple signal catching test program for Moab regression
+ * prog6.13.prog.c - Simple signal catching test program for Moab regression
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
@@ -30,7 +30,7 @@ void sig_handler(int sig)
}
}
-main (int argc, char **argv)
+main (int argc, char **argv)
{
struct sigaction act;
time_t begin_time = time(NULL);
diff --git a/testsuite/expect/test6.14 b/testsuite/expect/test6.14
index cc0311d3014ce86267e347a5df6a2edf92f19d64..a1f7793159847a7daabfc4918a1b0333b6fc3aba 100755
--- a/testsuite/expect/test6.14
+++ b/testsuite/expect/test6.14
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by David Bremer <dbremer@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -94,7 +94,7 @@ expect {
-re "($number) *($alpha_numeric) *\r\n" {
set job_id $expect_out(1,string)
set node_name $expect_out(2,string)
-
+
#This test doesn't need to track jobs that it didn't submit.
if { [lsearch $submitted_jobs $job_id] == -1 } {
exp_continue
@@ -140,14 +140,14 @@ for {set ii 0} {$ii < [llength $job_map]} {incr ii} {
#returned from squeue. Don't worry if an unknown job
#gets cancelled, because maybe one of our submitted
#jobs will start running while we cancel other jobs
- #Issue cancel commands node by node until all the
+ #Issue cancel commands node by node until all the
#jobs submitted for this test are gone.
set job_id $expect_out(1,string)
set job_index [lsearch $job_list $job_id]
if {$job_index != -1} {
set job_list [lreplace $job_list $job_index $job_index]
- }
+ }
set job_index [lsearch $submitted_jobs $job_id]
if {$job_index != -1} {
set submitted_jobs [lreplace $submitted_jobs $job_index $job_index]
diff --git a/testsuite/expect/test6.2 b/testsuite/expect/test6.2
index 3b9418565be257239f5a1de28dec21a6b2d1a54f..67666ffe564c4456e4e874d47d2f7a7accf5ed83 100755
--- a/testsuite/expect/test6.2
+++ b/testsuite/expect/test6.2
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Report the scancel help message
#
-
-spawn $scancel --help
+
+spawn $scancel --help
expect {
-re "Usage:" {
incr matches
diff --git a/testsuite/expect/test6.3 b/testsuite/expect/test6.3
index a2a637527b5dbe53d86009dc2d40db982bad9607..4b0b717abd325e1b011054a9d74f25beb09a9310 100755
--- a/testsuite/expect/test6.3
+++ b/testsuite/expect/test6.3
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test6.4 b/testsuite/expect/test6.4
index f3d6276bfa6fff60287f8ea080917dc395d7afb0..c5c4650da61797aadc17a39ecf194327052f5875 100755
--- a/testsuite/expect/test6.4
+++ b/testsuite/expect/test6.4
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test6.5 b/testsuite/expect/test6.5
index 5a13b6b68d90b80438570959f97cfd2e713dfe7a..9d78850f90491855d353c6cb99137b3b28f7db94 100755
--- a/testsuite/expect/test6.5
+++ b/testsuite/expect/test6.5
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test6.6 b/testsuite/expect/test6.6
index a8d391a1168a1ac7dbd3b316af8d1bb4fc8077ae..d5cef1be3e618ac23ad62e3141aa6cb24df2e810 100755
--- a/testsuite/expect/test6.6
+++ b/testsuite/expect/test6.6
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -41,8 +41,8 @@ print_header $test_id
#
# Report the scancel version number
#
-
-spawn $scancel -V
+
+spawn $scancel -V
expect {
-re "slurm ($number)\.($number)\.($number).*\n" {
incr version
diff --git a/testsuite/expect/test6.7 b/testsuite/expect/test6.7
index 0362de9f60e895f551fad179b57c1418b4b60b50..9ef7ce8b8198d74bef709a8b8cd0849a75847310 100755
--- a/testsuite/expect/test6.7
+++ b/testsuite/expect/test6.7
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -150,7 +150,7 @@ if {[wait_for_file $file_out] == 0} {
#
# Variation of above to test signal of batch script processes
-# Note that job termination sends SIGCONT/SIGTERM, hence the
+# Note that job termination sends SIGCONT/SIGTERM, hence the
# duplicate sleep call
#
exec rm -f $file_in $file_out
diff --git a/testsuite/expect/test6.7.prog.c b/testsuite/expect/test6.7.prog.c
index 846dce55fe0d39905ff2b6ffdea16a1c273afdfc..e085fb8db47d1e7bd809e5cf585fb54247d0f1d4 100644
--- a/testsuite/expect/test6.7.prog.c
+++ b/testsuite/expect/test6.7.prog.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * prog6.7.prog.c - Simple signal catching test program for Moab regression
+ * prog6.7.prog.c - Simple signal catching test program for Moab regression
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
@@ -30,7 +30,7 @@ void sig_handler(int sig)
}
}
-main (int argc, char **argv)
+main (int argc, char **argv)
{
struct sigaction act;
time_t begin_time = time(NULL);
diff --git a/testsuite/expect/test6.8 b/testsuite/expect/test6.8
index a7dbcc21a26cf521c2b084cbc45316a05128eba0..6ccdfc74893fe9efb89db4c8f7104c44a4602b4d 100755
--- a/testsuite/expect/test6.8
+++ b/testsuite/expect/test6.8
@@ -7,28 +7,28 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# Note: This script generates and then deletes files in the working directory
+# Note: This script generates and then deletes files in the working directory
# named test6.8.input
############################################################################
# Copyright (C) 2002 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test6.9 b/testsuite/expect/test6.9
index 3a12bc04415587bae7ca29056b5a3c132dbf344e..450711e9322850f0642686b6232c03a3ea1ef5c6 100755
--- a/testsuite/expect/test6.9
+++ b/testsuite/expect/test6.9
@@ -7,28 +7,28 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# Note: This script generates and then deletes files in the working directory
+# Note: This script generates and then deletes files in the working directory
# named test6.9.input
############################################################################
# Copyright (C) 2002-2006 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test7.1 b/testsuite/expect/test7.1
index 839f807a54b991e35d275249d8d54ce35c07d1b9..adb880c02fc796ff2adc02a1517a9ac2778a6814 100755
--- a/testsuite/expect/test7.1
+++ b/testsuite/expect/test7.1
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Test priorities assigned to jobs. Uses srun --hold and --batch options.
+# Test priorities assigned to jobs. Uses srun --hold and --batch options.
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
# "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test7.10 b/testsuite/expect/test7.10
index 00211a0981fc3ed5b4afefeba5e4af653b15f8c8..ba730eb2dd8b4b0b223cb97417ebe0d8fa570d35 100755
--- a/testsuite/expect/test7.10
+++ b/testsuite/expect/test7.10
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test7.11 b/testsuite/expect/test7.11
index 01a04aa9c33a39d3247b939a594f43ad764f6e11..66f1d911b9f41ec385e5d391f9b0abb13ab3f4c0 100755
--- a/testsuite/expect/test7.11
+++ b/testsuite/expect/test7.11
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -118,12 +118,12 @@ expect {
# Allow enough time for configuration file in NFS to be propogated
# to all nodes of cluster
-exec sleep 60
+exec sleep 60
#
# Test of srun help message
#
-# NOTE: Expect parsing failures have been noted running "$srun --help"
+# NOTE: Expect parsing failures have been noted running "$srun --help"
# directly, so we build a script containing a pipe to tail
#
@@ -157,7 +157,7 @@ if {$matches != 2} {
#
# Test of alloc help message
#
-# NOTE: Expect parsing failures have been noted running "$salloc --help"
+# NOTE: Expect parsing failures have been noted running "$salloc --help"
# directly, so we build a script containing a pipe to tail
#
@@ -187,7 +187,7 @@ if {$matches != 1} {
#
# Test of sbatch help message
#
-# NOTE: Expect parsing failures have been noted running "$sbatch --help"
+# NOTE: Expect parsing failures have been noted running "$sbatch --help"
# directly, so we build a script containing a pipe to tail
#
@@ -217,8 +217,8 @@ exec $bin_rm -f $file_in
#
# Test of locally logged messages().
-# We update the plugstatck.conf in this script since NFS delays may
-# prevent it from having the same state as the submit host.
+# We update the plugstatck.conf in this script since NFS delays may
+# prevent it from having the same state as the submit host.
#
make_bash_script $file_in "
$bin_cp $new_spank_conf $spank_conf_file
diff --git a/testsuite/expect/test7.11.prog.c b/testsuite/expect/test7.11.prog.c
index c67630ffc911389367f4cdfbe2c065ebd2988234..91024e2bdecf3a55adc5d300e960076bf68097c5 100644
--- a/testsuite/expect/test7.11.prog.c
+++ b/testsuite/expect/test7.11.prog.c
@@ -5,21 +5,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
@@ -57,7 +57,7 @@ struct spank_option spank_options[] =
};
struct spank_option spank_options_reg[] =
{
- { "test_suite_reg", "[opt_arg]",
+ { "test_suite_reg", "[opt_arg]",
"Registered component of slurm test suite.", 2, 0,
_test_opt_process
},
@@ -82,7 +82,7 @@ int slurm_spank_init(spank_t sp, int ac, char **av)
if ((context != S_CTX_LOCAL) && (context != S_CTX_REMOTE) &&
(context != S_CTX_ALLOCATOR))
slurm_error("spank_context error");
- if (SPANK_JOB_ENV_TESTS &&
+ if (SPANK_JOB_ENV_TESTS &&
((context == S_CTX_LOCAL) || (context == S_CTX_ALLOCATOR))) {
/* Testing logic for spank_job_env options */
char *test_value;
@@ -131,10 +131,10 @@ int slurm_spank_task_init(spank_t sp, int ac, char **av)
fprintf(fp, "slurm_spank_task_init: opt_arg=%d\n", opt_arg);
if (spank_get_item(sp, S_JOB_UID, &my_uid) == ESPANK_SUCCESS)
fprintf(fp, "spank_get_item: my_uid=%d\n", my_uid);
- if (spank_get_item(sp, S_JOB_ARGV, &argc, &argv) ==
+ if (spank_get_item(sp, S_JOB_ARGV, &argc, &argv) ==
ESPANK_SUCCESS) {
for (i=0; i<argc; i++) {
- fprintf(fp, "spank_get_item: argv[%d]=%s\n",
+ fprintf(fp, "spank_get_item: argv[%d]=%s\n",
i, argv[i]);
}
}
diff --git a/testsuite/expect/test7.2 b/testsuite/expect/test7.2
index bc789cc0337e40ae2d62e81b5549c121f112b207..497678b38bac34145f740a37fcf625124c5ec28e 100755
--- a/testsuite/expect/test7.2
+++ b/testsuite/expect/test7.2
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Test of PMI functions available via API library. Tests
+# Test of PMI functions available via API library. Tests
# --pmi-threads option in srun command.
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -69,7 +69,7 @@ if { [test_bluegene] } {
# Test uses srun based task launch
# Adjust time limits as needed for large task counts */
-# times are here vv
+# times are here vv
set timeout [expr $max_job_delay + 60]
set srun_pid [spawn $srun -l -N$node_cnt -n$task_cnt -O -t1 --threads=1 $file_prog_get]
expect {
diff --git a/testsuite/expect/test7.2.prog.c b/testsuite/expect/test7.2.prog.c
index 8f6fad51a6df22e2700864c1e1faabd904d3943f..76581d4d8fa30cec1d08dba5a8276252d0dc6c71 100644
--- a/testsuite/expect/test7.2.prog.c
+++ b/testsuite/expect/test7.2.prog.c
@@ -5,21 +5,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
@@ -141,7 +141,7 @@ main (int argc, char **argv)
free(clique_ranks);
if ((rc = PMI_KVS_Get_name_length_max(&kvs_name_len)) != PMI_SUCCESS) {
- printf("FAILURE: PMI_KVS_Get_name_length_max: %d, task %d\n",
+ printf("FAILURE: PMI_KVS_Get_name_length_max: %d, task %d\n",
rc, pmi_rank);
exit(1);
}
@@ -150,7 +150,7 @@ main (int argc, char **argv)
#endif
kvs_name = malloc(kvs_name_len);
if ((rc = PMI_KVS_Get_my_name(kvs_name, kvs_name_len)) != PMI_SUCCESS) {
- printf("FAILURE: PMI_KVS_Get_my_name: %d, task %d\n", rc,
+ printf("FAILURE: PMI_KVS_Get_my_name: %d, task %d\n", rc,
pmi_rank);
exit(1);
}
@@ -158,13 +158,13 @@ main (int argc, char **argv)
printf("PMI_KVS_Get_my_name = %s\n", kvs_name);
#endif
if ((rc = PMI_KVS_Get_key_length_max(&key_len)) != PMI_SUCCESS) {
- printf("FAILURE: PMI_KVS_Get_key_length_max: %d, task %d\n",
+ printf("FAILURE: PMI_KVS_Get_key_length_max: %d, task %d\n",
rc, pmi_rank);
exit(1);
}
key = malloc(key_len);
if ((rc = PMI_KVS_Get_value_length_max(&val_len)) != PMI_SUCCESS) {
- printf("FAILURE: PMI_KVS_Get_value_length_max: %d, task %d\n",
+ printf("FAILURE: PMI_KVS_Get_value_length_max: %d, task %d\n",
rc, pmi_rank);
exit(1);
}
@@ -177,7 +177,7 @@ main (int argc, char **argv)
snprintf(key, key_len, "ATTR_1_%d", procid);
snprintf(val, val_len, "A%d", procid+OFFSET_1);
if ((rc = PMI_KVS_Put(kvs_name, key, val)) != PMI_SUCCESS) {
- printf("FAILURE: PMI_KVS_Put(%s,%s,%s): %d, task %d\n",
+ printf("FAILURE: PMI_KVS_Put(%s,%s,%s): %d, task %d\n",
kvs_name, key, val, rc, pmi_rank);
exit(1);
}
@@ -212,13 +212,13 @@ main (int argc, char **argv)
/* Now lets get all keypairs and validate */
for (i=0; i<pmi_size; i++) {
snprintf(key, key_len, "ATTR_1_%d", i);
- if ((rc = PMI_KVS_Get(kvs_name, key, val, val_len))
+ if ((rc = PMI_KVS_Get(kvs_name, key, val, val_len))
!= PMI_SUCCESS) {
- printf("FAILURE: PMI_KVS_Get(%s): %d, task %d\n",
+ printf("FAILURE: PMI_KVS_Get(%s): %d, task %d\n",
key, rc, pmi_rank);
exit(1);
}
- if ((val[0] != 'A')
+ if ((val[0] != 'A')
|| ((atoi(&val[1])-OFFSET_1) != i)) {
printf("FAILURE: Bad keypair %s=%s, task %d\n",
key, val, pmi_rank);
@@ -231,11 +231,11 @@ main (int argc, char **argv)
snprintf(key, key_len, "attr_2_%d", i);
if ((rc = PMI_KVS_Get(kvs_name, key, val, val_len))
!= PMI_SUCCESS) {
- printf("FAILURE: PMI_KVS_Get(%s): %d, task %d\n",
+ printf("FAILURE: PMI_KVS_Get(%s): %d, task %d\n",
key, rc, pmi_rank);
exit(1);
}
- if ((val[0] != 'B')
+ if ((val[0] != 'B')
|| ((atoi(&val[1])-OFFSET_2) != i)) {
printf("FAILURE: Bad keypair %s=%s, task %d\n",
key,val, pmi_rank);
@@ -248,7 +248,7 @@ main (int argc, char **argv)
}
/* use iterator */
- if ((rc = PMI_KVS_Iter_first(kvs_name, key, key_len, val,
+ if ((rc = PMI_KVS_Iter_first(kvs_name, key, key_len, val,
val_len)) != PMI_SUCCESS) {
printf("FAILURE: PMI_KVS_iter_first: %d, task %d\n", rc,
pmi_rank);
@@ -258,20 +258,20 @@ main (int argc, char **argv)
if (key[0] == '\0') {
if (i != (pmi_size * 2)) {
printf("FAILURE: PMI_KVS_iter_next "
- "cycle count(%d, %d), task %d\n",
+ "cycle count(%d, %d), task %d\n",
i, pmi_size, pmi_rank);
}
break;
}
#if _DEBUG
if ((pmi_size <= 8) && (pmi_rank == 1)) { /* limit output */
- printf("PMI_KVS_Iter_next(%s,%d): %s=%s\n", kvs_name,
+ printf("PMI_KVS_Iter_next(%s,%d): %s=%s\n", kvs_name,
i, key, val);
}
#endif
- if ((rc = PMI_KVS_Iter_next(kvs_name, key, key_len,
+ if ((rc = PMI_KVS_Iter_next(kvs_name, key, key_len,
val, val_len)) != PMI_SUCCESS) {
- printf("FAILURE: PMI_KVS_iter_next: %d, task %d\n",
+ printf("FAILURE: PMI_KVS_iter_next: %d, task %d\n",
rc, pmi_rank);
exit(1);
}
@@ -318,7 +318,7 @@ main (int argc, char **argv)
snprintf(key, key_len, "ATTR_1_%d", i);
if ((rc = PMI_KVS_Get(kvs_name, key, val, val_len))
!= PMI_SUCCESS) {
- printf("FAILURE: PMI_KVS_Get(%s): %d, task %d\n",
+ printf("FAILURE: PMI_KVS_Get(%s): %d, task %d\n",
key, rc, pmi_rank);
exit(1);
}
@@ -335,7 +335,7 @@ main (int argc, char **argv)
snprintf(key, key_len, "attr_4_%d", i);
if ((rc = PMI_KVS_Get(kvs_name, key, val, val_len))
!= PMI_SUCCESS) {
- printf("FAILURE: PMI_KVS_Get(%s): %d, task %d\n",
+ printf("FAILURE: PMI_KVS_Get(%s): %d, task %d\n",
key, rc, pmi_rank);
exit(1);
}
@@ -355,15 +355,15 @@ main (int argc, char **argv)
* This load exceeds that of MPICH2 by a very wide margin */
#if _DEBUG
printf("Starting %d interations each with %d PMI_KVS_Put and \n"
- " one each PMI_KVS_Commit and KVS_Barrier\n",
+ " one each PMI_KVS_Commit and KVS_Barrier\n",
BARRIER_CNT, PUTS_PER_BARRIER);
- fflush(stdout);
+ fflush(stdout);
#endif
for (i=0; i<BARRIER_CNT; i++) {
for (j=0; j<PUTS_PER_BARRIER; j++) {
snprintf(key, key_len, "ATTR_%d_%d_%d", i, j, procid);
snprintf(val, val_len, "C%d", procid+OFFSET_1);
- if ((rc = PMI_KVS_Put(kvs_name, key, val)) !=
+ if ((rc = PMI_KVS_Put(kvs_name, key, val)) !=
PMI_SUCCESS) {
printf("FAILURE: PMI_KVS_Put(%s,%s,%s): "
"%d, task %d\n",
@@ -372,12 +372,12 @@ main (int argc, char **argv)
}
}
if ((rc= PMI_KVS_Commit(kvs_name)) != PMI_SUCCESS) {
- printf("FAILURE: PMI_KVS_Commit: %d, task %d\n",
+ printf("FAILURE: PMI_KVS_Commit: %d, task %d\n",
rc, pmi_rank);
exit(1);
}
if ((rc = PMI_Barrier()) != PMI_SUCCESS) {
- printf("FAILURE: PMI_Barrier: %d, task %d\n",
+ printf("FAILURE: PMI_Barrier: %d, task %d\n",
rc, pmi_rank);
exit(1);
}
@@ -403,9 +403,9 @@ main (int argc, char **argv)
#if _DEBUG
printf("PMI_KVS_Put(%s,KVS_KEY,KVS_VAL)\n", kvs_name);
#endif
- if ((rc = PMI_KVS_Get(kvs_name, "KVS_KEY", val, val_len)) !=
+ if ((rc = PMI_KVS_Get(kvs_name, "KVS_KEY", val, val_len)) !=
PMI_SUCCESS) {
- printf("FAILURE: PMI_KVS_Get(%s, KVS_KEY): %d, task %d\n",
+ printf("FAILURE: PMI_KVS_Get(%s, KVS_KEY): %d, task %d\n",
kvs_name, rc, pmi_rank);
exit(1);
}
@@ -413,13 +413,13 @@ main (int argc, char **argv)
printf("PMI_KVS_Get(%s,%s) %s\n", kvs_name, "KVS_KEY", val);
#endif
if ((rc = PMI_KVS_Destroy(kvs_name)) != PMI_SUCCESS) {
- printf("FAILURE: PMI_KVS_Destroy(%s): %d, task %d\n",
+ printf("FAILURE: PMI_KVS_Destroy(%s): %d, task %d\n",
kvs_name, rc, pmi_rank);
exit(1);
}
- if ((rc = PMI_KVS_Get(kvs_name, "KVS_KEY", val, val_len)) !=
+ if ((rc = PMI_KVS_Get(kvs_name, "KVS_KEY", val, val_len)) !=
PMI_ERR_INVALID_KVS) {
- printf("FAILURE: PMI_KVS_Get(%s, KVS_KEY): %d, task %d\n",
+ printf("FAILURE: PMI_KVS_Get(%s, KVS_KEY): %d, task %d\n",
kvs_name, rc, pmi_rank);
exit(1);
}
@@ -433,7 +433,7 @@ main (int argc, char **argv)
delta_t = (tv2.tv_sec - tv1.tv_sec) * 1000000;
delta_t += tv2.tv_usec - tv1.tv_usec;
snprintf(tv_str, sizeof(tv_str), "usec=%ld", delta_t);
- printf("PMI test ran successfully, for task %d, %s\n",
+ printf("PMI test ran successfully, for task %d, %s\n",
pmi_rank, tv_str);
}
if (pmi_rank == 0) {
diff --git a/testsuite/expect/test7.3 b/testsuite/expect/test7.3
index 2328a1a26aaea7df21c5c102c4b2cb74d0c5f448..2ee89a6c428e2b43048745decbdde995dc151968 100755
--- a/testsuite/expect/test7.3
+++ b/testsuite/expect/test7.3
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -47,7 +47,7 @@ if {[test_front_end] != 0} {
}
#
-# Delete left-over programs and rebuild them
+# Delete left-over programs and rebuild them
#
file delete $io_prog $test_prog
diff --git a/testsuite/expect/test7.3.io.c b/testsuite/expect/test7.3.io.c
index cc33dd8b7f9211937edb274445c95e19c57ef8d2..831e32372b75e1f693f86eec7a3b5320f1f4a1ac 100644
--- a/testsuite/expect/test7.3.io.c
+++ b/testsuite/expect/test7.3.io.c
@@ -3,28 +3,28 @@
* API function (required for "poe" launch on IBM
* AIX systems).
*
- * Writes short message to stdout, another from stderr, reads message from
+ * Writes short message to stdout, another from stderr, reads message from
* stdin and writes it back to stdout with header.
*****************************************************************************
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
diff --git a/testsuite/expect/test7.3.prog.c b/testsuite/expect/test7.3.prog.c
index b63aaee92a1350f1ef8896f676a72fb742b0ff2a..6592d2925d269075ef59f1d612d7da45c2ad2cb1 100644
--- a/testsuite/expect/test7.3.prog.c
+++ b/testsuite/expect/test7.3.prog.c
@@ -2,28 +2,28 @@
* test7.3.prog.c - Test of "user managed" IO with the slurm_step_launch()
* API function (required for "poe" launch on IBM
* AIX systems).
- *
+ *
* Usage: test7.3.prog [min_nodes] [max_nodes] [tasks]
*****************************************************************************
* Copyright (C) 2004 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
@@ -89,7 +89,7 @@ int main (int argc, char *argv[])
while ((job_resp->node_list == NULL) ||
(strlen(job_resp->node_list) == 0)) {
sleep(5);
- if (slurm_allocation_lookup_lite(job_resp->job_id,
+ if (slurm_allocation_lookup_lite(job_resp->job_id,
&job_resp) &&
(slurm_get_errno() != ESLURM_JOB_PENDING)) {
slurm_perror("slurm_confirm_allocation");
@@ -145,7 +145,7 @@ int main (int argc, char *argv[])
launch->argc = 1;
launch->user_managed_io = true; /* This is the key to using
"user managed" IO */
-
+
if (slurm_step_launch(ctx, launch, NULL) != SLURM_SUCCESS) {
slurm_perror("slurm_step_launch");
rc = 1;
diff --git a/testsuite/expect/test7.4 b/testsuite/expect/test7.4
index 4b7634a161b0e0e04c979001d94fc4d31ae08e45..9229621de418adce6679df24ac44cb5af251a901 100755
--- a/testsuite/expect/test7.4
+++ b/testsuite/expect/test7.4
@@ -13,11 +13,11 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov> and Dong Ang <dahn@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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)
@@ -33,12 +33,12 @@
# 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.
@@ -56,7 +56,7 @@ set no_bulk "dset TV::bulk_launch_enabled false"
print_header $test_id
#
-# Put desired SLURM install directory at head of search path for bulk launch
+# Put desired SLURM install directory at head of search path for bulk launch
# command to work (runs "srun" without path)
#
set env(PATH) "$slurm_dir/bin:$env(PATH)"
diff --git a/testsuite/expect/test7.4.prog.c b/testsuite/expect/test7.4.prog.c
index e8e7843e5d444930440c5d5c4fd34754731cec44..16fd9075bc005987c1e02bedcd4e96e7e048cd61 100644
--- a/testsuite/expect/test7.4.prog.c
+++ b/testsuite/expect/test7.4.prog.c
@@ -5,21 +5,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Dong Ang <dahn@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
@@ -41,7 +41,7 @@ static void pass_its_neighbor(const int rank, const int size, const int* buf)
MPI_COMM_WORLD, &request[1]);
MPI_Waitall(2, request, status);
- fprintf(stdout, "Rank[%d] I just received msg from Rank %d\n",
+ fprintf(stdout, "Rank[%d] I just received msg from Rank %d\n",
rank, *buf);
}
diff --git a/testsuite/expect/test7.5 b/testsuite/expect/test7.5
index 4dd4ed2e9f263ce6ae24bc8b87ecb19f02c124ac..bc2edf3b7f573d887d1503f6f73a53f860051b33 100755
--- a/testsuite/expect/test7.5
+++ b/testsuite/expect/test7.5
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -50,7 +50,7 @@ if { [test_xcpu] } {
exit $exit_code
}
-
+
#
# Delete left-over program and rebuild it
#
@@ -74,10 +74,10 @@ expect {
#
# Spawn initial program via srun and terminate with SIGTERM
# Note: For systems supporting proper pthreads, instead use
-# exec $bin_kill -TERM $srun_pid, otherwise we need pkill
+# exec $bin_kill -TERM $srun_pid, otherwise we need pkill
# and can get multiple signals delivered
# Note: We send the signal right after task startup rather than
-# interspersed with messages because some versions of
+# interspersed with messages because some versions of
# Expect have difficulties handling unbuffered srun output
#
set timeout $max_job_delay
diff --git a/testsuite/expect/test7.5.prog.c b/testsuite/expect/test7.5.prog.c
index 76e80423a208457c7d9816e530d8d0e989a0fc75..e59046c311d3a45ea01a5a4eec6c5986499e726a 100644
--- a/testsuite/expect/test7.5.prog.c
+++ b/testsuite/expect/test7.5.prog.c
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * prog7.5.prog.c - Simple signal catching test program for SLURM regression
+ * prog7.5.prog.c - Simple signal catching test program for SLURM regression
* test7.5. Report caught signals. Block SIGTERM.
*****************************************************************************
* Copyright (C) 2002-2007 The Regents of the University of California.
@@ -7,21 +7,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
@@ -51,7 +51,7 @@ void sig_handler(int sig)
}
}
-main (int argc, char **argv)
+main (int argc, char **argv)
{
struct sigaction act;
diff --git a/testsuite/expect/test7.6 b/testsuite/expect/test7.6
index 97f8a90a79751104e7331933dcc025fcbd70dd63..bedf0e07de3d1a00ab6b5e29b366c84953657463 100755
--- a/testsuite/expect/test7.6
+++ b/testsuite/expect/test7.6
@@ -12,11 +12,11 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov> and Dong Ang <dahn@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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)
@@ -32,12 +32,12 @@
# 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.
@@ -122,7 +122,7 @@ if {$job_id == 0} {
}
#
-# Now run totalviewcli (command line interface to TotalView) and attach to
+# Now run totalviewcli (command line interface to TotalView) and attach to
# the job step using sattach
#
set matches 0
diff --git a/testsuite/expect/test7.6.prog.c b/testsuite/expect/test7.6.prog.c
index 5df6a573f94778471bcf539e3de89ba8d6f87ef3..43018f804e8e993755c9b7a7967e4ddf180e438c 100644
--- a/testsuite/expect/test7.6.prog.c
+++ b/testsuite/expect/test7.6.prog.c
@@ -5,21 +5,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Dong Ang <dahn@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
@@ -41,7 +41,7 @@ static void pass_its_neighbor(const int rank, const int size, const int* buf)
MPI_COMM_WORLD, &request[1]);
MPI_Waitall(2, request, status);
- fprintf(stdout, "Rank[%d] I just received msg from Rank %d\n",
+ fprintf(stdout, "Rank[%d] I just received msg from Rank %d\n",
rank, *buf);
}
diff --git a/testsuite/expect/test7.7 b/testsuite/expect/test7.7
index af61fd2e6446715397f66c306ffb94ceeb0af9bd..4d1010c05c4a9b4545dc47726e5a6b813903f667 100755
--- a/testsuite/expect/test7.7
+++ b/testsuite/expect/test7.7
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test7.7.crypto.c b/testsuite/expect/test7.7.crypto.c
index 153c2ef57bc6c4a0b75e602dbf26183127f5b9eb..34fd4149c20c9db3eb66e328f82bf9a816ecc863 100644
--- a/testsuite/expect/test7.7.crypto.c
+++ b/testsuite/expect/test7.7.crypto.c
@@ -1,7 +1,7 @@
/*****************************************************************************\
* crypto.c - DES cryptographic routines.
*****************************************************************************
- * Produced by Cluster Resources, Inc., no rights reserved.
+ * Produced by Cluster Resources, Inc., no rights reserved.
\*****************************************************************************/
#include <stdint.h>
#include <stdio.h>
@@ -16,14 +16,14 @@
* DESCRIPTION
* Compute a DES digest for a CRC according to a particular
* key.
- *
+ *
* ARGUMENTS
* lword (in/out) - The CRC to encode, which becomes the first
* lexical segment of the checksum.
* irword (in/out ) - The key with which to encode the CRC,
* which becomes the second lexical segment of
* the checksum.
- *
+ *
* RETURNS
* None.
*
@@ -68,11 +68,11 @@ static void des( uint32_t *lword, uint32_t *irword )
**************************************************************
* DESCRIPTION
* Compute a cyclic redundancy check (CRC) character-wise.
- *
+ *
* ARGUMENTS
* crc (in) - The CRC computed thus far.
* onech (in) - The character to be added to the CRC.
- *
+ *
* RETURNS
* The new CRC value.
*
@@ -102,7 +102,7 @@ static uint16_t compute_crc( uint16_t crc, uint8_t onech )
* DESCRIPTION
* Compute a Wiki checksum for the current message contents
* and return the result as a Wiki name-value pair.
- *
+ *
* ARGUMENTS
* sum (out) - The string in which to store the resulting
* checksum.
@@ -110,7 +110,7 @@ static uint16_t compute_crc( uint16_t crc, uint8_t onech )
* coordinated with the scheduler so that they
* both use the same value. It is a string of
* ASCII decimal digits.
- *
+ *
* RETURNS
* None.
**************************************************************/
diff --git a/testsuite/expect/test7.7.prog.c b/testsuite/expect/test7.7.prog.c
index 28b4c287145c9ce3ba94226b9e818784942451fb..1a0bed977d9e09400f015627124916b514606bf5 100644
--- a/testsuite/expect/test7.7.prog.c
+++ b/testsuite/expect/test7.7.prog.c
@@ -6,21 +6,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
@@ -63,7 +63,7 @@ static int _conn_wiki_port(char *host, int port)
wiki_addr.sin_port = htons(port);
memcpy(&wiki_addr.sin_addr.s_addr, hptr->h_addr, hptr->h_length);
sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (connect(sock_fd, (struct sockaddr *) &wiki_addr,
+ if (connect(sock_fd, (struct sockaddr *) &wiki_addr,
sizeof(wiki_addr))) {
perror("connect");
exit(1);
@@ -98,7 +98,7 @@ static int _conn_event_port(char *host, int port)
if (rc == 0)
break;
if ((errno != EINVAL) || (i > 5)) {
- printf("WARNING: bind to port %i; %s\n",
+ printf("WARNING: bind to port %i; %s\n",
port, strerror(errno));
return -1;
}
@@ -187,7 +187,7 @@ static char *_recv_msg(int fd)
exit(1);
}
return buf;
-}
+}
static int _xmit(char *msg)
{
@@ -274,7 +274,7 @@ static void _get_nodes(void)
/* Dump all data */
snprintf(out_msg, sizeof(out_msg),
- "TS=%u AUTH=root DT=%s",
+ "TS=%u AUTH=root DT=%s",
(uint32_t) now, "CMD=GETNODES ARG=0:ALL");
if (_xmit(out_msg))
exit(1);
@@ -367,9 +367,9 @@ static void _modify_job(long my_job_id)
/* "JOBNAME=foo " */
/* "RFEATURES=big " */
/* "PARTITION=pdebug " */
- /* "NODES=2 " */
+ /* "NODES=2 " */
/* "DEPEND=afterany:3 " */
- /* "INVALID=123 " */
+ /* "INVALID=123 " */
/* "VARIABLELIST=TEST_ENV1=test_val1 " */
"VARIABLELIST=TEST_ENV1=test_val1,TEST_ENV2=test_val2 "
"TIMELIMIT=10 BANK=test_bank",
@@ -447,7 +447,7 @@ static void _single_msg(void)
snprintf(out_msg, sizeof(out_msg),
"TS=%u AUTH=root DT=CMD=%s",
- (uint32_t) now,
+ (uint32_t) now,
"JOBWILLRUN ARG=JOBID=65537,bgl[000x733] "
"JOBID=65539,bgl[000x733] JOBID=65538,bgl[000x733]");
if (_xmit(out_msg))
@@ -469,7 +469,7 @@ int main(int argc, char * argv[])
sched_port = atoi(argv[5]);
is_bluegene = atoi(argv[6]);
printf("auth_key=%s control_addr=%s e_port=%d job_id=%d sched_port=%d "
- "is_bluegene=%d\n",
+ "is_bluegene=%d\n",
auth_key, control_addr, e_port, job_id, sched_port, is_bluegene);
#if _DEBUG
diff --git a/testsuite/expect/test7.8 b/testsuite/expect/test7.8
index 5918ed78d4968b3ddbfc5e2750c92c73806b9cc6..ff28bae8f7b1aa95e8fd88e6e030d2e01d12349f 100755
--- a/testsuite/expect/test7.8
+++ b/testsuite/expect/test7.8
@@ -13,21 +13,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test7.8.prog.c b/testsuite/expect/test7.8.prog.c
index 8fef8c2b78f90f37749faf933100baef926f4dc4..f5cccdb823150d69dc914d92164fbd09da19b146 100644
--- a/testsuite/expect/test7.8.prog.c
+++ b/testsuite/expect/test7.8.prog.c
@@ -5,21 +5,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
@@ -55,9 +55,9 @@ static int _conn_wiki_port(char *host, int port)
bzero((char *) &wiki_addr, sizeof(wiki_addr));
wiki_addr.sin_family = AF_INET;
wiki_addr.sin_port = htons(port);
- memcpy(&wiki_addr.sin_addr.s_addr, hptr->h_addr, hptr->h_length);
+ memcpy(&wiki_addr.sin_addr.s_addr, hptr->h_addr, hptr->h_length);
sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (connect(sock_fd, (struct sockaddr *) &wiki_addr,
+ if (connect(sock_fd, (struct sockaddr *) &wiki_addr,
sizeof(wiki_addr))) {
perror("connect");
exit(1);
@@ -144,7 +144,7 @@ static char *_recv_msg(int fd)
exit(1);
}
return buf;
-}
+}
static void _xmit(char *msg)
{
@@ -163,7 +163,7 @@ static void _xmit(char *msg)
if (sc != 0) {
fprintf(stderr, "RPC failure\n");
exit(1);
- }
+ }
free(in_msg);
close(wiki_fd);
}
@@ -187,7 +187,7 @@ static void _get_nodes(void)
/* Dump all data */
snprintf(out_msg, sizeof(out_msg),
- "TS=%u AUTH=root DT=%s",
+ "TS=%u AUTH=root DT=%s",
(uint32_t) now, "CMD=GETNODES ARG=0:ALL");
_xmit(out_msg);
}
@@ -211,7 +211,7 @@ static void _modify_job(long my_job_id)
snprintf(out_msg, sizeof(out_msg),
"TS=%u AUTH=root DT=CMD=MODIFYJOB ARG=%ld "
/* "PARTITION=pdebug " */
- /* "NODES=2 " */
+ /* "NODES=2 " */
/* "DEPEND=afterany:3 " */
/* "INVALID=123 " */
"TIMELIMIT=10 BANK=test_bank",
@@ -256,7 +256,7 @@ static void _suspend_job(long my_job_id)
int main(int argc, char * argv[])
{
if (argc != 6) {
- printf("Usage: %s, control_addr job_id1 job_id2 sched_port is_bluegene\n",
+ printf("Usage: %s, control_addr job_id1 job_id2 sched_port is_bluegene\n",
argv[0]);
exit(1);
}
@@ -266,7 +266,7 @@ int main(int argc, char * argv[])
job_id2 = atoi(argv[3]);
sched_port = atoi(argv[4]);
is_bluegene = atoi(argv[5]);
- printf("control_addr=%s job_id=%ld,%ld sched_port=%d is_bluegene=%d\n",
+ printf("control_addr=%s job_id=%ld,%ld sched_port=%d is_bluegene=%d\n",
control_addr, job_id1, job_id2, sched_port, is_bluegene);
_get_jobs();
diff --git a/testsuite/expect/test7.9 b/testsuite/expect/test7.9
index 2f823ee2f74cf1ca1b804b718b54695c8973d973..92108243a4d570cb69abe1e49ed9ed9906b2c2c7 100755
--- a/testsuite/expect/test7.9
+++ b/testsuite/expect/test7.9
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -43,7 +43,7 @@ set iterations 50
print_header $test_id
#
-# Test is incompatible with proctrack/aix, proctrack/rms, proctrack/sgi_job,
+# Test is incompatible with proctrack/aix, proctrack/rms, proctrack/sgi_job,
# and switch/elan
#
# Each leave open files, although we could clear the proctrack related files
@@ -89,7 +89,7 @@ if {$invalid == 1} {
#
# Delete left-over programs and rebuild them.
-# We use our own program to get ulimit values since the output
+# We use our own program to get ulimit values since the output
# of the ulimit program is inconsistent across systems.
#
exec $bin_rm -f $file_prog $file_in $file_out
diff --git a/testsuite/expect/test7.9.prog.c b/testsuite/expect/test7.9.prog.c
index 6b8c0db10a1ebe5fd3ed62d0e4d6b19e882460a6..3809f4dd4176315baf72883415bd166fdc97d3c3 100644
--- a/testsuite/expect/test7.9.prog.c
+++ b/testsuite/expect/test7.9.prog.c
@@ -5,21 +5,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -36,7 +36,7 @@
#define _DEBUG 0
#define _EXTREME_DEBUG 0
-main (int argc, char **argv)
+main (int argc, char **argv)
{
int i;
struct stat buf;
@@ -44,7 +44,7 @@ main (int argc, char **argv)
/* sleep for 0 to 100 msec to induce some randomness
* and better detect any synchronization issues */
usleep(time(NULL) % 100000);
-
+
/* start at fd=3
* skip stdin, stdout, and stderr */
for (i=3; i<256; i++) {
diff --git a/testsuite/expect/test8.1 b/testsuite/expect/test8.1
index 6bcf8d79b0e6289b709648735582016f47d6359a..d1135fde676adbfd370af696705f68baf3545d1b 100755
--- a/testsuite/expect/test8.1
+++ b/testsuite/expect/test8.1
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -39,7 +39,7 @@ set job_id 0
set connection "TORUS"
set conn_letter "Tt"
set geometry "1x1x1"
-set num_nodes 512-512
+set num_nodes 512-512
set cycle_count 2
print_header $test_id
diff --git a/testsuite/expect/test8.2 b/testsuite/expect/test8.2
index 38f8fc8cd5a16687f7264be64e63ee6bef905572..0fc139ac3f6c3736194219177f70b09ac38938f6 100755
--- a/testsuite/expect/test8.2
+++ b/testsuite/expect/test8.2
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test8.3 b/testsuite/expect/test8.3
index 25923580ee30de84d1905d3e3273f6367ae6f2a3..dea5f91594a019f887b4bdc611983e3915d83ccc 100755
--- a/testsuite/expect/test8.3
+++ b/testsuite/expect/test8.3
@@ -7,28 +7,28 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# Note: This script generates and then deletes files in the working directory
+# Note: This script generates and then deletes files in the working directory
# named test8.3.input
############################################################################
# Copyright (C) 2004 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test8.4 b/testsuite/expect/test8.4
index 3a1f8c7568308aefde911f598e3de8a8ef63f2f0..6cc1bc048a2dafd35c6845772b22d3e443782654 100755
--- a/testsuite/expect/test8.4
+++ b/testsuite/expect/test8.4
@@ -8,28 +8,28 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# Note: This script generates and then deletes a file in the working
+# Note: This script generates and then deletes a file in the working
# directory named test8.4.prog
############################################################################
# Copyright (C) 2004 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test8.4.prog.c b/testsuite/expect/test8.4.prog.c
index d5582171c6d5c6ab3354037a8184fc29b8a409ca..e6633b46f8acf4c99b77f6653f223138462af4fc 100644
--- a/testsuite/expect/test8.4.prog.c
+++ b/testsuite/expect/test8.4.prog.c
@@ -5,21 +5,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Dong Ang <dahn@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
@@ -41,7 +41,7 @@ static void pass_its_neighbor(const int rank, const int size, const int* buf)
MPI_COMM_WORLD, &request[1]);
MPI_Waitall(2, request, status);
- fprintf(stdout, "Rank[%d] I just received msg from Rank %d\n",
+ fprintf(stdout, "Rank[%d] I just received msg from Rank %d\n",
rank, *buf);
}
diff --git a/testsuite/expect/test8.5 b/testsuite/expect/test8.5
index aa27299fa458991fde393a1bab6cf84f349c1a06..e4180cf90f3dcd1e53bc611c6cb1f7b1aebefe36 100755
--- a/testsuite/expect/test8.5
+++ b/testsuite/expect/test8.5
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -44,7 +44,7 @@ set matches 0
set sleep_time 1
proc run_and_test { size } {
- global number sbatch scontrol
+ global number sbatch scontrol
global file_out file_err file_in procs_per_cnode
set job_id 0
@@ -107,8 +107,8 @@ proc run_and_test { size } {
send_user "\nFAILURE: Bluegene $size cnode block not created correctly\n"
set exit_code 1
}
-
-
+
+
return $exit_code
}
diff --git a/testsuite/expect/test8.6 b/testsuite/expect/test8.6
index 5992ea06ff2a6a52c5a354d77860f833ba843b1f..cb7763be2b6724d53135d0c3ea83967cd9494b37 100755
--- a/testsuite/expect/test8.6
+++ b/testsuite/expect/test8.6
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -45,7 +45,7 @@ set sleep_time 5
# make a bunch of blocks of the specified size (node_cnt)
proc run_batch_jobs { node_cnt job_cnt } {
global sbatch number file_in
- set start_cnt 0
+ set start_cnt 0
for {set inx 0} {$inx < $job_cnt} {incr inx} {
set sbatch_pid [spawn $sbatch --output=/dev/null -t5 -N$node_cnt-$node_cnt $file_in]
expect {
@@ -79,7 +79,7 @@ proc run_batch_jobs { node_cnt job_cnt } {
}
}
}
-
+
return $start_cnt
}
@@ -111,13 +111,13 @@ proc wait_for_all_jobs { } {
}
}
log_user 1
- if {$matches == 0} {
+ if {$matches == 0} {
send_user "All jobs complete\n"
break
}
if {$matches > 0} {
send_user " $matches jobs remaining\n"
-# Moab can slow throughput down a lot,
+# Moab can slow throughput down a lot,
# so don't return here
# if {$matches == $last_matches} {
# send_user "Running jobs hung\n"
@@ -146,10 +146,10 @@ proc run_bgl_test { } {
if {$psets >= 16} {
incr started [run_batch_jobs 32 $32node_block_cnt]
}
-
- incr started [run_batch_jobs 128 $128node_block_cnt]
- incr started [run_batch_jobs 512 $512node_block_cnt]
-
+
+ incr started [run_batch_jobs 128 $128node_block_cnt]
+ incr started [run_batch_jobs 512 $512node_block_cnt]
+
if {$num_nodes >= 1024} {
incr started [run_batch_jobs 1k $1knode_block_cnt]
if {$num_nodes >= 4096} {
@@ -167,7 +167,7 @@ proc run_bgl_test { } {
incr started [run_batch_jobs 1k $1knode_block_cnt]
}
- incr started [run_batch_jobs 512 $512node_block_cnt]
+ incr started [run_batch_jobs 512 $512node_block_cnt]
incr started [run_batch_jobs 128 $128node_block_cnt]
@@ -175,7 +175,7 @@ proc run_bgl_test { } {
incr started [run_batch_jobs 32 $32node_block_cnt]
}
- incr started [run_batch_jobs 512 $512node_block_cnt]
+ incr started [run_batch_jobs 512 $512node_block_cnt]
return $started;
}
@@ -207,11 +207,11 @@ proc run_bgp_test { } {
if {$psets >= 8} {
incr started [run_batch_jobs 64 $64node_block_cnt]
}
-
- incr started [run_batch_jobs 128 $128node_block_cnt]
- incr started [run_batch_jobs 256 $256node_block_cnt]
- incr started [run_batch_jobs 512 $512node_block_cnt]
-
+
+ incr started [run_batch_jobs 128 $128node_block_cnt]
+ incr started [run_batch_jobs 256 $256node_block_cnt]
+ incr started [run_batch_jobs 512 $512node_block_cnt]
+
if {$num_nodes >= 1024} {
incr started [run_batch_jobs 1k $1knode_block_cnt]
if {$num_nodes >= 4096} {
@@ -229,8 +229,8 @@ proc run_bgp_test { } {
incr started [run_batch_jobs 1k $1knode_block_cnt]
}
- incr started [run_batch_jobs 512 $512node_block_cnt]
- incr started [run_batch_jobs 256 $256node_block_cnt]
+ incr started [run_batch_jobs 512 $512node_block_cnt]
+ incr started [run_batch_jobs 256 $256node_block_cnt]
incr started [run_batch_jobs 128 $128node_block_cnt]
if {$psets >= 8} {
incr started [run_batch_jobs 64 $64node_block_cnt]
@@ -244,7 +244,7 @@ proc run_bgp_test { } {
incr started [run_batch_jobs 16 $16node_block_cnt]
}
- incr started [run_batch_jobs 512 $512node_block_cnt]
+ incr started [run_batch_jobs 512 $512node_block_cnt]
return $started;
}
@@ -271,7 +271,7 @@ if {$psets == 0} {
exit 1
}
-set num_nodes [expr [get_node_cnt] * [get_bluegene_cnodes_per_mp]]
+set num_nodes [expr [get_node_cnt] * [get_bluegene_cnodes_per_mp]]
if {$num_nodes == 0} {
send_user "\nFAILURE: No nodes are found on this system\n"
exit 1
diff --git a/testsuite/expect/test8.7 b/testsuite/expect/test8.7
index fffbf968da7d83054c54d4897fae0a41dfc84502..817d184d9578da870e818e148907d70b5efbeb0c 100755
--- a/testsuite/expect/test8.7
+++ b/testsuite/expect/test8.7
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
diff --git a/testsuite/expect/test8.7.crypto.c b/testsuite/expect/test8.7.crypto.c
index 153c2ef57bc6c4a0b75e602dbf26183127f5b9eb..34fd4149c20c9db3eb66e328f82bf9a816ecc863 100644
--- a/testsuite/expect/test8.7.crypto.c
+++ b/testsuite/expect/test8.7.crypto.c
@@ -1,7 +1,7 @@
/*****************************************************************************\
* crypto.c - DES cryptographic routines.
*****************************************************************************
- * Produced by Cluster Resources, Inc., no rights reserved.
+ * Produced by Cluster Resources, Inc., no rights reserved.
\*****************************************************************************/
#include <stdint.h>
#include <stdio.h>
@@ -16,14 +16,14 @@
* DESCRIPTION
* Compute a DES digest for a CRC according to a particular
* key.
- *
+ *
* ARGUMENTS
* lword (in/out) - The CRC to encode, which becomes the first
* lexical segment of the checksum.
* irword (in/out ) - The key with which to encode the CRC,
* which becomes the second lexical segment of
* the checksum.
- *
+ *
* RETURNS
* None.
*
@@ -68,11 +68,11 @@ static void des( uint32_t *lword, uint32_t *irword )
**************************************************************
* DESCRIPTION
* Compute a cyclic redundancy check (CRC) character-wise.
- *
+ *
* ARGUMENTS
* crc (in) - The CRC computed thus far.
* onech (in) - The character to be added to the CRC.
- *
+ *
* RETURNS
* The new CRC value.
*
@@ -102,7 +102,7 @@ static uint16_t compute_crc( uint16_t crc, uint8_t onech )
* DESCRIPTION
* Compute a Wiki checksum for the current message contents
* and return the result as a Wiki name-value pair.
- *
+ *
* ARGUMENTS
* sum (out) - The string in which to store the resulting
* checksum.
@@ -110,7 +110,7 @@ static uint16_t compute_crc( uint16_t crc, uint8_t onech )
* coordinated with the scheduler so that they
* both use the same value. It is a string of
* ASCII decimal digits.
- *
+ *
* RETURNS
* None.
**************************************************************/
diff --git a/testsuite/expect/test8.7.prog.c b/testsuite/expect/test8.7.prog.c
index 8c13b76ecc4d21f4dae3ee056a4a8eff5eef2c94..a710c99d8170afda56d607f9446ce81084777af4 100644
--- a/testsuite/expect/test8.7.prog.c
+++ b/testsuite/expect/test8.7.prog.c
@@ -5,21 +5,21 @@
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* CODE-OCEC-09-009. All rights reserved.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <https://computing.llnl.gov/linux/slurm/>.
* 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.
- *
+ *
* 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.
@@ -57,9 +57,9 @@ static int _conn_wiki_port(char *host, int port)
bzero((char *) &wiki_addr, sizeof(wiki_addr));
wiki_addr.sin_family = AF_INET;
wiki_addr.sin_port = htons(port);
- memcpy(&wiki_addr.sin_addr.s_addr, hptr->h_addr, hptr->h_length);
+ memcpy(&wiki_addr.sin_addr.s_addr, hptr->h_addr, hptr->h_length);
sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (connect(sock_fd, (struct sockaddr *) &wiki_addr,
+ if (connect(sock_fd, (struct sockaddr *) &wiki_addr,
sizeof(wiki_addr))) {
perror("connect");
exit(1);
@@ -175,7 +175,7 @@ static char *_recv_msg(int fd)
exit(1);
}
return buf;
-}
+}
static void _xmit(char *msg)
{
@@ -200,7 +200,7 @@ static void _xmit(char *msg)
if (sc != 0) {
fprintf(stderr, "RPC FAILURE\n");
exit(1);
- }
+ }
free(in_msg);
close(wiki_fd);
}
@@ -248,7 +248,7 @@ static void _get_nodes(void)
/* Dump all data */
snprintf(out_msg, sizeof(out_msg),
- "TS=%u AUTH=root DT=%s",
+ "TS=%u AUTH=root DT=%s",
(uint32_t) now, "CMD=GETNODES ARG=0:ALL");
_xmit(out_msg);
}
@@ -305,7 +305,7 @@ int main(int argc, char * argv[])
job_id4 = atoi(argv[8]);
printf("auth_key=%s control_addr=%s e_port=%d sched_port=%d\n",
auth_key, control_addr, e_port, sched_port);
- printf("job_id1=%d job_id2=%d job_id3=%d job_id4=%d \n",
+ printf("job_id1=%d job_id2=%d job_id3=%d job_id4=%d \n",
job_id1, job_id2, job_id3, job_id4);
_initialize();
diff --git a/testsuite/expect/test8.8 b/testsuite/expect/test8.8
index dd2c85d9b2b142cde75230b05cd4f85858276b1a..bd5cf76509eb831fdb7fb515350b3aba73cf0e60 100755
--- a/testsuite/expect/test8.8
+++ b/testsuite/expect/test8.8
@@ -12,21 +12,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Danny Auble <da@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -207,7 +207,7 @@ proc is_block_in_state { block state } {
proc check_node { node error_cnt alloc_cnt } {
global scontrol sinfo procs_per_cnode number prompt
- upvar spawn_id spawn_id
+ upvar spawn_id spawn_id
set error_procs [expr $error_cnt * $procs_per_cnode]
set alloc_procs [expr $alloc_cnt * $procs_per_cnode]
@@ -217,15 +217,15 @@ proc check_node { node error_cnt alloc_cnt } {
send "$scontrol show node $node\r"
expect {
-nocase -re "CPUAlloc=$alloc_procs" {
- incr match
+ incr match
exp_continue
}
-nocase -re "CPUErr=$error_procs" {
- incr match
+ incr match
exp_continue
}
-nocase -re "CPUTot=($number)" {
- incr match
+ incr match
set total_procs $expect_out(1,string)
exp_continue
}
@@ -254,7 +254,7 @@ proc check_node { node error_cnt alloc_cnt } {
set match 0
send "$sinfo -h --format \"%C %A\" -n $node\r"
- # make sure we get by the sinfo command so we don't
+ # make sure we get by the sinfo command so we don't
# think the %'s are a prompt
expect {
"%C %A" {
@@ -279,17 +279,17 @@ proc check_node { node error_cnt alloc_cnt } {
if {[string compare $expect_out(8,string) ""]} {
set num_total [expr $num_total * 1024]
}
-
+
set num_nodes_alloc $expect_out(9,string)
if {[string compare $expect_out(10,string) ""]} {
set num_nodes_alloc [expr $num_nodes_alloc * 1024]
}
-
+
set num_nodes_idle $expect_out(11,string)
if {[string compare $expect_out(12,string) ""]} {
set num_nodes_idle [expr $num_nodes_idle * 1024]
}
-
+
if { $num_alloc != $alloc_procs } {
send_user "\nFAILURE: sinfo 1 allocated cpus wrong, got $num_alloc but needed $alloc_procs\n"
set rc 1
@@ -335,9 +335,9 @@ proc check_node { node error_cnt alloc_cnt } {
# set a block in a error state
proc change_block_state { block state} {
global scontrol
-
+
set exit_code 0
-
+
set my_pid [spawn $scontrol update blockname=$block state=$state]
expect {
-re "slurm_update error:" {
@@ -361,14 +361,14 @@ proc change_block_state { block state} {
if { $exit_code } {
return $exit_code
}
-
+
return [is_block_in_state $block $state]
}
# set a block in a error state
proc change_subbp_state { node ionodes state } {
global scontrol smap
-
+
set exit_code 0
set my_pid [spawn $scontrol update subbpname=$node\[$ionodes\] state=$state]
@@ -394,16 +394,16 @@ proc change_subbp_state { node ionodes state } {
if { $exit_code } {
return $exit_code
}
-
+
set match 0
set my_pid [spawn $smap -Db -c -h -n $node -I $ionodes]
expect {
-nocase -re "$state" {
- incr match
+ incr match
exp_continue
}
-re "$node" {
- incr match
+ incr match
exp_continue
}
-re "Unable to contact" {
@@ -424,7 +424,7 @@ proc change_subbp_state { node ionodes state } {
send_user "\nFAILURE: Subbp did not go into $state state. $match\n"
set exit_code 1
}
-
+
return $exit_code
}
@@ -453,7 +453,7 @@ if {$psets == 0} {
exit 1
}
-set num_nodes [expr [get_node_cnt] * [get_bluegene_cnodes_per_mp]]
+set num_nodes [expr [get_node_cnt] * [get_bluegene_cnodes_per_mp]]
if {$num_nodes == 0} {
send_user "\nFAILURE: No nodes are found on this system\n"
exit 1
@@ -501,7 +501,7 @@ if {$smallest > 32} {
set error_block 32
}
-# allocate the entire system. this should work on all layout types since a
+# allocate the entire system. this should work on all layout types since a
# full block is always makable unless they aren't using the entire system.
# however it may not work with all configurations.
set block [allocate_and_quit $num_nodes "" 0 0]
@@ -526,7 +526,7 @@ if {$exit_code} {
if {![string compare $layout "Dynamic"]} {
# lets make 1 ionode in an error state
set exit_code [change_subbp_state $first_node "0" "error"]
- #allocate something with that node
+ #allocate something with that node
set block [allocate_and_quit $smallest $first_node $error_block 1]
#free the block no matter what for rest of tests
diff --git a/testsuite/expect/test9.1 b/testsuite/expect/test9.1
index 4512b0d187e41fa3915e85b072a0c875630660fe..916ea76a1277a96acd3732db16fcb904654a08f1 100755
--- a/testsuite/expect/test9.1
+++ b/testsuite/expect/test9.1
@@ -6,7 +6,7 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# Note: This script generates and then deletes files in the working directory
+# Note: This script generates and then deletes files in the working directory
# named test9.1.input and test9.1.output
############################################################################
# Copyright (C) 2002-2007 The Regents of the University of California.
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -72,7 +72,7 @@ proc run_cat_job { input_file output_file } {
expect {
-re "Unable to contact" {
send_user "\nFAILURE: slurm appears to be down\n"
- return 1
+ return 1
}
timeout {
send_user "\nFAILURE: srun not responding\n"
diff --git a/testsuite/expect/test9.2 b/testsuite/expect/test9.2
index 52bfc1e4cfb0371cfa4eaf9e29c183c0080cc578..a8aa732104f9448031c9d7b44b1825a8de64a9d1 100755
--- a/testsuite/expect/test9.2
+++ b/testsuite/expect/test9.2
@@ -6,7 +6,7 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# Note: This script generates and then deletes files in the working directory
+# Note: This script generates and then deletes files in the working directory
# named test9.2.output
############################################################################
# Copyright (C) 2002-2007 The Regents of the University of California.
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -60,7 +60,7 @@ set task_cnt $max_stress_tasks
print_header $test_id
-# Execute an srun job to print hostname to output_file with task_cnt tasks per node,
+# Execute an srun job to print hostname to output_file with task_cnt tasks per node,
# wait for completion
# Returns 0 on successful completion, returns 1 otherwise
proc run_hostname_job { output_file } {
@@ -71,7 +71,7 @@ proc run_hostname_job { output_file } {
expect {
-re "Unable to contact" {
send_user "\nFAILURE: slurm appears to be down\n"
- return 1
+ return 1
}
timeout {
send_user "\nFAILURE: srun not responding\n"
diff --git a/testsuite/expect/test9.3 b/testsuite/expect/test9.3
index 110acc032966512a94c22eb4227e017469296096..b2306830df3b04fc69575059cc532c8ce35791a0 100755
--- a/testsuite/expect/test9.3
+++ b/testsuite/expect/test9.3
@@ -6,7 +6,7 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# Note: This script generates and then deletes files in the working directory
+# Note: This script generates and then deletes files in the working directory
# named test9.3.output
############################################################################
# Copyright (C) 2002-2007 The Regents of the University of California.
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -61,7 +61,7 @@ set task_cnt $max_stress_tasks
print_header $test_id
-# Execute an srun job to cat input_file to output_file with task_cnt tasks
+# Execute an srun job to cat input_file to output_file with task_cnt tasks
# per node, wait for completion
# Returns 0 on successful completion, returns 1 otherwise
proc run_cat_job { input_file output_file } {
@@ -72,7 +72,7 @@ proc run_cat_job { input_file output_file } {
expect {
-re "Unable to contact" {
send_user "\nFAILURE: slurm appears to be down\n"
- return 1
+ return 1
}
timeout {
send_user "\nFAILURE: srun not responding\n"
diff --git a/testsuite/expect/test9.4 b/testsuite/expect/test9.4
index 38fbdbcc49f99d1696bc504f9922eda3f93caaff..17bb322c6ce2f62d7c436f3a90e0292692b5e1eb 100755
--- a/testsuite/expect/test9.4
+++ b/testsuite/expect/test9.4
@@ -6,11 +6,11 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
#
-# Note: To avoid one minute NFS propogation delays in the output files,
-# we create them ahead of time. Without explicity file creation,
+# Note: To avoid one minute NFS propogation delays in the output files,
+# we create them ahead of time. Without explicity file creation,
# this test requires about one minute per cycle to execute.
#
-# Note: This script generates and then deletes files in the working
+# Note: This script generates and then deletes files in the working
# directory named test9.4.input, test9.4.[0-9]+.input, and
# test9.4.[0-9]+.output
############################################################################
@@ -19,21 +19,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -68,7 +68,7 @@ set task_cnt $max_stress_tasks
print_header $test_id
-# Execute an srun job to print hostname to output_file with task_cnt tasks
+# Execute an srun job to print hostname to output_file with task_cnt tasks
# per node, wait for completion
# Returns 0 on successful completion, returns 1 otherwise
proc run_cat_job { input_file output_file } {
@@ -77,7 +77,7 @@ proc run_cat_job { input_file output_file } {
expect {
-re "Unable to contact" {
send_user "\nFAILURE: slurm appears to be down\n"
- return 1
+ return 1
}
timeout {
send_user "\nFAILURE: srun not responding\n"
@@ -105,7 +105,7 @@ set srun_pid [spawn $srun -e /dev/null -i $file_in -o $file_in_task -N$node_cnt
expect {
-re "Unable to contact" {
send_user "\nFAILURE: slurm appears to be down\n"
- exit 1
+ exit 1
}
timeout {
send_user "\nFAILURE: srun not responding\n"
diff --git a/testsuite/expect/test9.5 b/testsuite/expect/test9.5
index e86c152e6a4f4f1e1c8783fd82a09de83253dd93..8858c8fbf57eeb4ce3c6de45ce1861ae5360273a 100755
--- a/testsuite/expect/test9.5
+++ b/testsuite/expect/test9.5
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -59,7 +59,7 @@ set task_cnt $max_stress_tasks
print_header $test_id
-# Execute an srun job to print hostname to output_file with task_cnt tasks
+# Execute an srun job to print hostname to output_file with task_cnt tasks
# per node, wait for completion
# Returns 0 on successful completion, returns 1 otherwise
proc run_cat_job { input_file output_file } {
@@ -70,7 +70,7 @@ proc run_cat_job { input_file output_file } {
expect {
-re "Unable to contact" {
send_user "\nFAILURE: slurm appears to be down\n"
- return 1
+ return 1
}
timeout {
send_user "\nFAILURE: srun not responding\n"
@@ -99,7 +99,7 @@ set srun_pid [spawn $srun -e /dev/null -i $file_in -o $file_in_task -N$node_cnt
expect {
-re "Unable to contact" {
send_user "\nFAILURE: slurm appears to be down\n"
- exit 1
+ exit 1
}
timeout {
send_user "\nFAILURE: srun not responding\n"
diff --git a/testsuite/expect/test9.6 b/testsuite/expect/test9.6
index dd11aef621118b852c78db26b917dc5614ff7a96..fa94927b871e2b157661bb255c2319e1aea0a37a 100755
--- a/testsuite/expect/test9.6
+++ b/testsuite/expect/test9.6
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -62,7 +62,7 @@ set task_cnt $max_stress_tasks
print_header $test_id
-# Execute an srun job to cat input_file to output_file with task_cnt tasks
+# Execute an srun job to cat input_file to output_file with task_cnt tasks
# per node, wait for completion
# Returns 0 on successful completion, returns 1 otherwise
proc run_cat_job { input_file output_file } {
@@ -73,7 +73,7 @@ proc run_cat_job { input_file output_file } {
expect {
-re "Unable to contact" {
send_user "\nFAILURE: slurm appears to be down\n"
- return 1
+ return 1
}
timeout {
send_user "\nFAILURE: srun not responding\n"
diff --git a/testsuite/expect/test9.7 b/testsuite/expect/test9.7
index 5f266a5de9d0ff195b75bde647758a7f29beadfd..ef8cb7fcb5dec1035395cbc7b6fbecfca4cc206c 100755
--- a/testsuite/expect/test9.7
+++ b/testsuite/expect/test9.7
@@ -11,21 +11,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -42,7 +42,7 @@ set task_cnt 10
print_header $test_id
#
-# A single slurmd can't handle a large task count without
+# A single slurmd can't handle a large task count without
# running out of memory and pthreads
#
if {[test_front_end] != 0} {
diff --git a/testsuite/expect/test9.7.bash b/testsuite/expect/test9.7.bash
index 716b89d7bbedc0851901d4321826ba58e02e47aa..bcf025b6664b057785e11949cf7996cdc9223e8e 100755
--- a/testsuite/expect/test9.7.bash
+++ b/testsuite/expect/test9.7.bash
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash
############################################################################
# Simple SLURM stress test
# Usage: <prog> <exec1> <exec2> <exec3> <sleep_time> <iterations>
@@ -8,21 +8,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# Please also read the supplied 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.
-#
+#
# 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.
@@ -59,7 +59,7 @@ if [ $# -gt 5 ]; then
if [ $5 ]; then
bluegene=1
fi
-fi
+fi
exit_code=0
inx=1
diff --git a/testsuite/expect/test9.8 b/testsuite/expect/test9.8
index aeb0d8d23ce12229555932bf5f0a6248cda5287d..d3c2e3b78e529ac85f0c07d2350fdb723e4cd106 100755
--- a/testsuite/expect/test9.8
+++ b/testsuite/expect/test9.8
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Stress test with maximum slurmctld message concurrency.
-# We start a large number of job steps, the simultaneously
+# We start a large number of job steps, the simultaneously
# cancel them all. Message can get lost/restransmitted, so
# there is a delayed test for job step removal.
#
@@ -14,21 +14,21 @@
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# 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.
-#
+#
# 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.
@@ -47,7 +47,7 @@ set task_cnt 60
print_header $test_id
#
-# A single slurmd can't handle a large task count without
+# A single slurmd can't handle a large task count without
# running out of memory and pthreads
#
if {[test_front_end] != 0} {
@@ -56,7 +56,7 @@ if {[test_front_end] != 0} {
#
# Build input script file
-# NOTE: The initial sleep is so that all of the submissions have time
+# NOTE: The initial sleep is so that all of the submissions have time
# to occur before contending with a multitude of job step creations.
# This is especially important on very slow systems (e.g. AIX).
#
@@ -102,7 +102,7 @@ if {$start_cnt < $job_cnt} {
}
#
-# Give the jobs a few seconds to get initiated, check for steps,
+# Give the jobs a few seconds to get initiated, check for steps,
# then kill them all
#
set user_name ""
@@ -116,13 +116,13 @@ expect {
eof {
wait
}
-
+
}
#
# There could be hundreds of job steps, we don't want to see
# the details, but want to make sure that we did start a bunch
#
-# Determine if this is AIX (for task count, federation switch
+# Determine if this is AIX (for task count, federation switch
# prevents each node from running more than 16 tasks)
#
if {[test_aix]} {
@@ -206,7 +206,7 @@ expect {
# due to a very busy system (reports FAILURE above)
#
# Increasing the MessageTimeout configuration parameter
-# should fix this problem.
+# should fix this problem.
#
if {$running_jobs != 0} {
send_user "\nFAILURE: jobs not all cancelled\n"
@@ -258,7 +258,7 @@ if {$completing_jobs != 0} {
}
if {$completing_jobs != 0} {
send_user "\nFAILURE: Jobs not completing. Subsequent tests may fail!\n"
-}
+}
if {$exit_code == 0} {
exec $bin_rm -f $file_in
diff --git a/testsuite/expect/usleep b/testsuite/expect/usleep
index c6011dac6ac6be9ce2f44dc8c76c80ebd511ec3a..54b448ccd80cf4c461c5d9d39dd71f1e7a6f0dc7 100755
--- a/testsuite/expect/usleep
+++ b/testsuite/expect/usleep
@@ -1,28 +1,28 @@
#!/usr/bin/env bash
############################################################################
-# This shell processes usleep commands as required by the test scripts
-# on systems lacking the usleep command (e.g. AIX). It does not
+# This shell processes usleep commands as required by the test scripts
+# on systems lacking the usleep command (e.g. AIX). It does not
# interpret all usleep options, only those required for these tests.
############################################################################
# Copyright (C) 2002 The Regents of the University of California.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
-#
+#
# This file is part of SLURM, a resource management program.
# For details, see <https://computing.llnl.gov/linux/slurm/>.
# Please also read the supplied 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.
-#
+#
# 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.