aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2018-06-23 10:40:11 +0300
committerSergey Poznyakoff <gray@gnu.org>2018-06-23 10:40:11 +0300
commit9b7336575bf6bfa4b2683289308fea2670dfa3e3 (patch)
tree3c7f05e6aedfd278ecf02a7e0635e4eeb1f425a6 /src
parente917544c090a960c7904e3ef7b237b113f794ffd (diff)
downloadgdbm-9b7336575bf6bfa4b2683289308fea2670dfa3e3.tar.gz
gdbm-9b7336575bf6bfa4b2683289308fea2670dfa3e3.tar.bz2
Maintain correct ordering of the avail table after coalescing.
* src/falloc.c (_gdbm_put_av_elem): Float the merged entry to its proper position to preserve the sorting order. * THANKS: Thanks Adam Sampson
Diffstat (limited to 'src')
-rw-r--r--src/falloc.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/src/falloc.c b/src/falloc.c
index 6571d9b..2fb8ea1 100644
--- a/src/falloc.c
+++ b/src/falloc.c
@@ -418,27 +418,38 @@ _gdbm_put_av_elem (avail_elem new_el, avail_elem av_table[], int *av_count,
+ new_el.av_size) == av_table[index].av_adr)
{
/* Update this entry. */
av_table[index].av_adr = new_el.av_adr;
av_table[index].av_size += new_el.av_size;
}
/* Not contiguous */
else
{
index++;
continue;
}
-
- /* If we got here, we're done. */
- return TRUE;
+
+ /* Coalescing breaks the sorting order, so we need to
+ restore it */
+ while (index + 1 < *av_count
+ && av_table[index].av_size > av_table[index + 1].av_size)
+ {
+ avail_elem t = av_table[index];
+ av_table[index] = av_table[index + 1];
+ av_table[index + 1] = t;
+ index++;
+ }
+
+ /* we're done. */
+ return TRUE;
}
}
/* Search for place to put element. List is sorted by size. */
index = 0;
while (index < *av_count && av_table[index].av_size < new_el.av_size)
{
index++;
}
/* Move all others up one. */
index1 = *av_count-1;

Return to:

Send suggestions and report system problems to the System administrator.