483 |
|
} |
484 |
|
|
485 |
|
|
486 |
+ |
int |
487 |
|
hdfreefrag(hp, i) /* free a file fragment */ |
488 |
|
HOLO *hp; |
489 |
|
int i; |
493 |
|
register int j, k; |
494 |
|
|
495 |
|
if (bi->nrd <= 0) |
496 |
< |
return; |
496 |
> |
return(0); |
497 |
|
DCHECK(hp->fd < 0 | hp->fd >= nhdfragls || !hdfragl[hp->fd].nlinks, |
498 |
|
CONSISTENCY, "bad file descriptor in hdfreefrag"); |
499 |
|
f = &hdfragl[hp->fd]; |
513 |
|
if (j >= MAXFRAGB*FRAGBLK) { |
514 |
|
f->nfrags = j--; /* stop list growth */ |
515 |
|
if (bi->nrd <= f->fi[j].nrd) |
516 |
< |
return; /* new one no better than discard */ |
516 |
> |
return(0); /* new one no better than discard */ |
517 |
|
} |
518 |
|
#endif |
519 |
|
if (j % FRAGBLK == 0) { /* more (or less) free list space */ |
525 |
|
(j+FRAGBLK)*sizeof(BEAMI)); |
526 |
|
if (newp == NULL) { |
527 |
|
f->nfrags--; /* graceful failure */ |
528 |
< |
return; |
528 |
> |
return(0); |
529 |
|
} |
530 |
|
f->fi = newp; |
531 |
|
} |
554 |
|
} |
555 |
|
biglob(hp)->nrd -= bi->nrd; /* tell fragment it's free */ |
556 |
|
bi->nrd = 0; |
557 |
< |
bi->fo = 0; |
557 |
> |
bi->fo = 0L; |
558 |
> |
return(1); |
559 |
|
} |
560 |
|
|
561 |
|
|
589 |
|
unsigned int4 nrays; |
590 |
|
{ |
591 |
|
register struct fraglist *f; |
592 |
< |
register int j, k; |
592 |
> |
register int j; |
593 |
|
long nfo; |
594 |
|
|
595 |
|
if (nrays == 0) |
597 |
|
DCHECK(fd < 0 | fd >= nhdfragls || !hdfragl[fd].nlinks, |
598 |
|
CONSISTENCY, "bad file descriptor in hdallocfrag"); |
599 |
|
f = &hdfragl[fd]; |
600 |
< |
k = -1; /* find closest-sized fragment */ |
601 |
< |
for (j = f->nfrags; j-- > 0; ) |
602 |
< |
if (f->fi[j].nrd >= nrays && |
603 |
< |
(k < 0 || f->fi[j].nrd < f->fi[k].nrd)) |
602 |
< |
if (f->fi[k=j].nrd == nrays) |
603 |
< |
break; |
604 |
< |
if (k < 0) { /* no fragment -- extend file */ |
600 |
> |
for (j = f->nfrags; j-- > 0; ) /* first fit algorithm */ |
601 |
> |
if (f->fi[j].nrd >= nrays) |
602 |
> |
break; |
603 |
> |
if (j < 0) { /* no fragment -- extend file */ |
604 |
|
nfo = f->flen; |
605 |
|
f->flen += nrays*sizeof(RAYVAL); |
606 |
|
} else { /* else use fragment */ |
607 |
< |
nfo = f->fi[k].fo; |
608 |
< |
f->fi[k].fo += nrays*sizeof(RAYVAL); |
609 |
< |
f->fi[k].nrd -= nrays; |
607 |
> |
nfo = f->fi[j].fo; |
608 |
> |
f->fi[j].fo += nrays*sizeof(RAYVAL); |
609 |
> |
f->fi[j].nrd -= nrays; |
610 |
|
} |
611 |
|
return(nfo); |
612 |
|
} |
644 |
|
hp->bi[i].fo = nfo; |
645 |
|
} else |
646 |
|
hp->bi[i].fo = 0L; |
647 |
< |
biglob(hp)->nrd += hp->bi[i].nrd = nrays; |
647 |
> |
biglob(hp)->nrd += nrays - hp->bi[i].nrd; |
648 |
> |
hp->bi[i].nrd = nrays; |
649 |
|
markdirty(hp, i); /* section directory now out of date */ |
650 |
|
return(1); |
651 |
|
} |
720 |
|
if (hp->bi[i].nrd) { |
721 |
|
if (hdfragflags&FF_KILL) |
722 |
|
hdfreefrag(hp, i); |
723 |
+ |
biglob(hp)->nrd -= hp->bi[i].nrd; |
724 |
|
hp->bi[i].nrd = 0; /* make sure it's gone */ |
725 |
|
hp->bi[i].fo = 0L; |
726 |
|
} |