Skip to content
Snippets Groups Projects
Commit b94733a9 authored by Moe Jette's avatar Moe Jette
Browse files

Make proc count be uint32_t for consistency with slurmctld.

parent fe118f7c
No related branches found
No related tags found
No related merge requests found
...@@ -109,7 +109,7 @@ static int _find_best_block_match(struct job_record* job_ptr, ...@@ -109,7 +109,7 @@ static int _find_best_block_match(struct job_record* job_ptr,
int rot_cnt = 0; int rot_cnt = 0;
int created = 0; int created = 0;
int found = 0; int found = 0;
int max_procs = (uint16_t) NO_VAL; uint32_t max_procs = NO_VAL;
List lists_of_lists = NULL; List lists_of_lists = NULL;
List temp_list = NULL; List temp_list = NULL;
char tmp_char[256]; char tmp_char[256];
...@@ -296,11 +296,10 @@ try_again: ...@@ -296,11 +296,10 @@ try_again:
/* Check processor count */ /* Check processor count */
proc_cnt = record->bp_count * record->cpus_per_bp; proc_cnt = record->bp_count * record->cpus_per_bp;
debug3("asking for %d-%d looking at %d", debug3("asking for %u-%u looking at %d",
req_procs, max_procs, proc_cnt); req_procs, max_procs, proc_cnt);
if ((proc_cnt < req_procs) if ((proc_cnt < req_procs)
|| (max_procs != (uint16_t) NO_VAL || ((max_procs != NO_VAL) && (proc_cnt > max_procs))) {
&& proc_cnt > max_procs)) {
/* We use the proccessor count per partition here /* We use the proccessor count per partition here
mostly to see if we can run on a smaller partition. mostly to see if we can run on a smaller partition.
*/ */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment