mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2026-01-06 09:41:07 +01:00
Code Releases Activity

Optimized putoldhistentryontop() so that when resizehistents() calls it

Browse source 
repeatedly while HIST_EXPIRE_DUPS_FIRST is set, it doesn't re-scan the
already-checked hist items (avoiding potentially slow operation).
This commit is contained in:
Wayne Davison 2002-02-16 09:15:07 +00:00
parent 86aa24922b
commit e706f12937
1 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Src/hist.c
View file

@ -914,25 +914,31 @@ gethistent(int ev, int nearmatch)
}
static void
putoldhistentryontop(void)
putoldhistentryontop(short keep_going)
{
Histent he = hist_ring->down;
static Histent next = NULL;
Histent he = keep_going? next : hist_ring->down;
next = he->down;
if (isset(HISTEXPIREDUPSFIRST) && !(he->flags & HIST_DUP)) {
int max_unique_ct = getiparam("SAVEHIST");
static int max_unique_ct = 0;
if (!keep_going)
max_unique_ct = getiparam("SAVEHIST");
do {
if (max_unique_ct-- <= 0) {
max_unique_ct = 0;
he = hist_ring->down;
break;
}
he = he->down;
he = next;
next = he->down;
} while (he != hist_ring->down && !(he->flags & HIST_DUP));
if (he != hist_ring->down) {
he->up->down = he->down;
he->down->up = he->up;
he->up = hist_ring;
he->down = hist_ring->down;
hist_ring->down = he->down->up = he;
}
}
if (he != hist_ring->down) {
he->up->down = he->down;
he->down->up = he->up;
he->up = hist_ring;
he->down = hist_ring->down;
hist_ring->down = he->down->up = he;
}
hist_ring = he;
}
@ -963,7 +969,7 @@ prepnexthistent(void)
histlinect++;
}
else {
putoldhistentryontop();
putoldhistentryontop(0);
freehistdata(hist_ring, 0);
}
hist_ring->histnum = ++curhist;
@ -1762,9 +1768,13 @@ inithist(void)
void
resizehistents(void)
{
while (histlinect > histsiz) {
putoldhistentryontop();
if (histlinect > histsiz) {
putoldhistentryontop(0);
freehistnode((HashNode)hist_ring);
while (histlinect > histsiz) {
putoldhistentryontop(1);
freehistnode((HashNode)hist_ring);
}
}
}