瀏覽代碼

bsearch: simplify and optimize

maintainer's note: the key observation here is that the compared
element is the first slot of the second ceil(half) of the array, and
thus can be removed for further comparison when it does not match, so
that we descend into the second ceil(half)-1 rather than ceil(half)
elements. this change ensures that nel strictly decreases with each
iteration, so that the case of != but nel==1 does not need to be
special-cased anymore.
Fangrui Song 6 年之前
父節點
當前提交
3d8322c7ad
共有 1 個文件被更改,包括 6 次插入6 次删除
  1. 6 6
      src/stdlib/bsearch.c

+ 6 - 6
src/stdlib/bsearch.c

@@ -7,13 +7,13 @@ void *bsearch(const void *key, const void *base, size_t nel, size_t width, int (
 	while (nel > 0) {
 		try = (char *)base + width*(nel/2);
 		sign = cmp(key, try);
-		if (!sign) return try;
-		else if (nel == 1) break;
-		else if (sign < 0)
+		if (sign < 0) {
 			nel /= 2;
-		else {
-			base = try;
-			nel -= nel/2;
+		} else if (sign > 0) {
+			base = (char *)try + width;
+			nel -= nel/2+1;
+		} else {
+			return try;
 		}
 	}
 	return NULL;