Add squeue formatted print option %Q to print a job's integer priority.

NEWS

@@ -18,6 +18,7 @@ documents those changes that are of interest to users and admins.
  -- Copied job stat logic out of sacct into sstat in the future sacct -stat 
     will be deprecated.
  -- Correct sbatch processing of --nice option with negative values.
+ -- Add squeue formatted print option %Q to print a job's integer priority.
 
 * Changes in SLURM 1.3.2
 ========================

doc/man/man1/squeue.1

-.TH SQUEUE "1" "December 2006" "squeue 1.2" "Slurm components"
+.TH SQUEUE "1" "May 2008" "squeue 1.3" "Slurm components"
 
 .SH "NAME"
 squeue \- view information about jobs located in the SLURM scheduling queue.
@@ -189,7 +189,8 @@ Minimum number of nodes requested by the job.
 Are contiguous nodes requested by the job
 .TP
 \fB%p\fR
-Priority of the job (converted to a floating point number between 0.0 and 1.0
+Priority of the job (converted to a floating point number between 0.0 and 1.0).
+Also see \fB%Q\fR.
 .TP
 \fB%P\fR 
 Partition of the job or job step
@@ -197,6 +198,10 @@ Partition of the job or job step
 \fB%q\fR 
 Comment associated with the job
 .TP
+\fB%Q\fR
+Priority of the job (generally a very large unsigned integer).
+Also see \fB%p\fR.
+.TP
 \fB%r\fR
 The reason a job is in its current state.
 See the \fBJOB REASON CODES\fR section below for more information.

src/squeue/opts.c

@@ -558,6 +558,11 @@ extern int parse_format( char* format )
 				                        field_size, 
 				                        right_justify, 
 				                        suffix );
+			else if (field[0] == 'Q')
+				 job_format_add_priority_long( params.format_list,
+							field_size,
+							right_justify,
+							suffix );
 			else if (field[0] == 'r')
 				job_format_add_reason( params.format_list,
 							field_size,

src/squeue/print.c

 /*****************************************************************************\
  *  print.c - squeue print job functions
- *  $Id$
  *****************************************************************************
- *  Copyright (C) 2002 The Regents of the University of California.
+ *  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 Joey Ekstrom <ekstrom1@llnl.gov>, 
  *             Morris Jette <jette1@llnl.gov>, et. al.
@@ -525,6 +525,20 @@ int _print_job_priority(job_info_t * job, int width, bool right, char* suffix)
 	return SLURM_SUCCESS;
 }
 
+int _print_job_priority_long(job_info_t * job, int width, bool right, char* suffix)
+{
+	char temp[FORMAT_STRING_SIZE];
+	if (job == NULL)	/* Print the Header instead */
+		_print_str("PRIORITY", width, right, true);
+	else {
+		sprintf(temp, "%u", job->priority);
+		_print_str(temp, width, right, true);
+	}
+	if (suffix)
+		printf("%s", suffix);
+	return SLURM_SUCCESS;
+}
+
 int _print_job_nodes(job_info_t * job, int width, bool right, char* suffix)
 {
 	if (job == NULL) {       /* Print the Header instead */

src/squeue/print.h

@@ -115,6 +115,8 @@ int job_format_add_function(List list, int width, bool right_justify,
 	job_format_add_function(list,wid,right,suffix,_print_job_time_end)
 #define job_format_add_priority(list,wid,right,suffix) \
 	job_format_add_function(list,wid,right,suffix,_print_job_priority)
+#define job_format_add_priority_long(list,wid,right,suffix) \
+	job_format_add_function(list,wid,right,suffix,_print_job_priority_long)
 #define job_format_add_nodes(list,wid,right,suffix) \
 	job_format_add_function(list,wid,right,suffix,_print_job_nodes)
 #define job_format_add_node_inx(list,wid,right,suffix) \
@@ -203,6 +205,8 @@ 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, 
 			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, 
 			char* suffix);
 int _print_job_node_inx(job_info_t * job, int width, bool right_justify,