105 |
|
int fd; /* corresponding file descriptor */ |
106 |
|
HDGRID *hproto; /* holodeck section grid */ |
107 |
|
{ |
108 |
+ |
long rtrunc; |
109 |
|
long fpos; |
110 |
|
register HOLO *hp; |
111 |
|
register int n; |
145 |
|
hdattach(fd); |
146 |
|
/* check rays on disk */ |
147 |
|
fpos = hdfilen(fd); |
148 |
< |
biglob(hp)->nrd = 0; |
148 |
> |
biglob(hp)->nrd = rtrunc = 0; |
149 |
|
for (n = hproto == NULL ? nbeams(hp) : 0; n > 0; n--) |
150 |
|
if (hp->bi[n].nrd) |
151 |
< |
if (hp->bi[n].fo + hp->bi[n].nrd > fpos) |
152 |
< |
hp->bi[n].nrd = 0; /* off end */ |
153 |
< |
else |
151 |
> |
if (hp->bi[n].fo + hp->bi[n].nrd > fpos) { |
152 |
> |
rtrunc += hp->bi[n].nrd; |
153 |
> |
hp->bi[n].nrd = 0; |
154 |
> |
} else |
155 |
|
biglob(hp)->nrd += hp->bi[n].nrd; |
156 |
+ |
if (rtrunc) { |
157 |
+ |
sprintf(errmsg, "truncated section, %ld rays lost (%.1f%%)", |
158 |
+ |
rtrunc, 100.*rtrunc/(rtrunc+biglob(hp)->nrd)); |
159 |
+ |
error(WARNING, errmsg); |
160 |
+ |
} |
161 |
|
/* add to holodeck list */ |
162 |
|
for (n = 0; n < HDMAX; n++) |
163 |
|
if (hdlist[n] == NULL) { |
379 |
|
int (*bf)(); /* callback function (optional) */ |
380 |
|
{ |
381 |
|
unsigned origcachesize, memuse; |
375 |
– |
register BEAM *bp; |
382 |
|
int bytesloaded, needbytes, bytes2free; |
383 |
+ |
register BEAM *bp; |
384 |
|
register int i; |
385 |
|
/* precheck consistency */ |
386 |
|
for (i = n; i--; ) |
390 |
|
qsort((char *)hb, n, sizeof(HDBEAMI), hdfilord); |
391 |
|
bytesloaded = 0; /* run through loaded beams */ |
392 |
|
for ( ; n && (bp = hb->h->bl[hb->b]) != NULL; n--, hb++) { |
393 |
< |
bp->tick = hdclock; /* preempt swap */ |
393 |
> |
bp->tick = hdclock; /* preempt swap */ |
394 |
|
bytesloaded += bp->nrm; |
395 |
|
if (bf != NULL) |
396 |
< |
(*bf)(bp, hb->h, hb->b); |
396 |
> |
(*bf)(bp, hb); |
397 |
|
} |
398 |
|
bytesloaded *= sizeof(RAYVAL); |
399 |
|
if ((origcachesize = hdcachesize) > 0) { |
412 |
|
} |
413 |
|
for (i = 0; i < n; i++) |
414 |
|
if ((bp = hdgetbeam(hb[i].h, hb[i].b)) != NULL && bf != NULL) |
415 |
< |
(*bf)(bp, hb[i].h, hb[i].b); |
415 |
> |
(*bf)(bp, hb+i); |
416 |
|
hdcachesize = origcachesize; /* resume dynamic swapping */ |
417 |
|
} |
418 |
|
|
712 |
|
if (hp == NULL) { /* NULL means clean up everything */ |
713 |
|
while (hdlist[0] != NULL) |
714 |
|
hddone(hdlist[0]); |
715 |
+ |
free((char *)hdfragl); |
716 |
+ |
hdfragl = NULL; nhdfragls = 0; |
717 |
|
return; |
718 |
|
} |
719 |
|
/* flush all data and free memory */ |