From 2dfa3ff622d81a50e3a00aa0de302f69ca903e1b Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Fri, 25 Oct 2013 09:19:19 -0700
Subject: [PATCH] hostlist performance improvements
Reorder some logis in the hostlist functions for performance improvement
specifically for "if (A & B) ..." move the fastest tests first (test
A should take less time than test B).
---
src/common/hostlist.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/common/hostlist.c b/src/common/hostlist.c
index 2d5e55313ff..0416c55f2ce 100644
--- a/src/common/hostlist.c
+++ b/src/common/hostlist.c
@@ -1090,8 +1090,8 @@ 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)
+ if ((h1->hi > h2->lo)
+ && (hostrange_prefix_cmp(h1, h2) == 0)
&& (hostrange_width_combine(h1, h2))) {
if (!(new = hostrange_copy(h1)))
@@ -1408,8 +1408,8 @@ static int hostlist_push_range(hostlist_t hl, hostrange_t hr)
goto error;
if (hl->nranges > 0
- && hostrange_prefix_cmp(tail, hr) == 0
&& tail->hi == hr->lo - 1
+ && hostrange_prefix_cmp(tail, hr) == 0
&& hostrange_width_combine(tail, hr)) {
tail->hi = hr->hi;
} else {
@@ -2448,8 +2448,8 @@ static void hostlist_collapse(hostlist_t hl)
hostrange_t hprev = hl->hr[i - 1];
hostrange_t hnext = hl->hr[i];
- if (hostrange_prefix_cmp(hprev, hnext) == 0 &&
- hprev->hi == hnext->lo - 1 &&
+ if (hprev->hi == hnext->lo - 1 &&
+ hostrange_prefix_cmp(hprev, hnext) == 0 &&
hostrange_width_combine(hprev, hnext)) {
hprev->hi = hnext->hi;
hostlist_delete_range(hl, i);
--
GitLab