| 551 |
|
} |
| 552 |
|
|
| 553 |
|
|
| 554 |
< |
static AMBVAL **avlist1, **avlist2; /* ambient value lists for sorting */ |
| 554 |
> |
static struct avl { |
| 555 |
> |
AMBVAL *p; |
| 556 |
> |
unsigned long t; |
| 557 |
> |
} *avlist1; /* ambient value list with ticks */ |
| 558 |
> |
static AMBVAL **avlist2; /* memory positions for sorting */ |
| 559 |
|
static int i_avlist; /* index for lists */ |
| 560 |
|
|
| 561 |
|
|
| 562 |
|
static |
| 563 |
|
av2list(av) |
| 564 |
< |
AMBVAL *av; |
| 564 |
> |
register AMBVAL *av; |
| 565 |
|
{ |
| 566 |
|
#ifdef DEBUG |
| 567 |
|
if (i_avlist >= nambvals) |
| 568 |
|
error(CONSISTENCY, "too many ambient values in av2list1"); |
| 569 |
|
#endif |
| 570 |
< |
avlist1[i_avlist] = avlist2[i_avlist] = av; |
| 571 |
< |
i_avlist++; |
| 570 |
> |
avlist1[i_avlist].p = avlist2[i_avlist] = av; |
| 571 |
> |
avlist1[i_avlist++].t = av->latick; |
| 572 |
|
} |
| 573 |
|
|
| 574 |
|
|
| 575 |
|
static int |
| 576 |
< |
alatcmp(avp1, avp2) /* compare ambient values for MRA */ |
| 577 |
< |
AMBVAL **avp1, **avp2; |
| 576 |
> |
alatcmp(av1, av2) /* compare ambient values for MRA */ |
| 577 |
> |
struct avl *av1, *av2; |
| 578 |
|
{ |
| 579 |
< |
register long lc = (**avp2).latick - (**avp1).latick; |
| 579 |
> |
register long lc = av2->t - av1->t; |
| 580 |
|
return(lc<0 ? -1 : lc>0 ? 1 : 0); |
| 581 |
|
} |
| 582 |
|
|
| 589 |
|
} |
| 590 |
|
|
| 591 |
|
|
| 592 |
< |
#if 1 |
| 592 |
> |
#if 1 |
| 593 |
|
static int |
| 594 |
|
avlmemi(avaddr) /* find list position from address */ |
| 595 |
|
AMBVAL *avaddr; |
| 635 |
|
* tree will be rebuilt with the new accuracy parameter. |
| 636 |
|
*/ |
| 637 |
|
if (tracktime) { /* allocate pointer arrays to sort */ |
| 634 |
– |
avlist1 = (AMBVAL **)malloc(nambvals*sizeof(AMBVAL *)); |
| 638 |
|
avlist2 = (AMBVAL **)malloc(nambvals*sizeof(AMBVAL *)); |
| 639 |
< |
} else |
| 640 |
< |
avlist1 = avlist2 = NULL; |
| 641 |
< |
if (avlist2 == NULL) { /* no time tracking -- rebuild tree? */ |
| 642 |
< |
if (avlist1 != NULL) |
| 643 |
< |
free((char *)avlist1); |
| 639 |
> |
avlist1 = (struct avl *)malloc(nambvals*sizeof(struct avl)); |
| 640 |
> |
} else { |
| 641 |
> |
avlist2 = NULL; |
| 642 |
> |
avlist1 = NULL; |
| 643 |
> |
} |
| 644 |
> |
if (avlist1 == NULL) { /* no time tracking -- rebuild tree? */ |
| 645 |
> |
if (avlist2 != NULL) |
| 646 |
> |
free((char *)avlist2); |
| 647 |
|
if (always) { /* rebuild without sorting */ |
| 648 |
|
copystruct(&oldatrunk, &atrunk); |
| 649 |
|
atrunk.alist = NULL; |
| 670 |
|
if (i_avlist < nambvals) |
| 671 |
|
error(CONSISTENCY, "missing ambient values in sortambvals"); |
| 672 |
|
#endif |
| 673 |
< |
qsort((char *)avlist1, nambvals, sizeof(AMBVAL *), alatcmp); |
| 673 |
> |
qsort((char *)avlist1, nambvals, sizeof(struct avl), alatcmp); |
| 674 |
|
qsort((char *)avlist2, nambvals, sizeof(AMBVAL *), aposcmp); |
| 675 |
|
for (i = 0; i < nambvals; i++) { |
| 676 |
< |
if (avlist1[i] == NULL) |
| 676 |
> |
if (avlist1[i].p == NULL) |
| 677 |
|
continue; |
| 678 |
|
tap = avlist2[i]; |
| 679 |
|
copystruct(&tav, tap); |
| 680 |
< |
for (j = i; (pnext = avlist1[j]) != tap; |
| 680 |
> |
for (j = i; (pnext = avlist1[j].p) != tap; |
| 681 |
|
j = avlmemi(pnext)) { |
| 682 |
|
copystruct(avlist2[j], pnext); |
| 683 |
|
avinsert(avlist2[j]); |
| 684 |
< |
avlist1[j] = NULL; |
| 684 |
> |
avlist1[j].p = NULL; |
| 685 |
|
} |
| 686 |
|
copystruct(avlist2[j], &tav); |
| 687 |
|
avinsert(avlist2[j]); |
| 688 |
< |
avlist1[j] = NULL; |
| 688 |
> |
avlist1[j].p = NULL; |
| 689 |
|
} |
| 690 |
|
free((char *)avlist1); |
| 691 |
|
free((char *)avlist2); |
