76 |
|
#define AMBFLUSH (BUFSIZ/AMBVALSIZ) |
77 |
|
|
78 |
|
#define newambval() (AMBVAL *)malloc(sizeof(AMBVAL)) |
79 |
– |
#define freeav(av) free((void *)av); |
79 |
|
|
80 |
|
static void initambfile(int creat); |
81 |
|
static void avsave(AMBVAL *av); |
183 |
|
(flen - lastpos)/AMBVALSIZ); |
184 |
|
error(WARNING, errmsg); |
185 |
|
fseek(ambfp, lastpos, SEEK_SET); |
187 |
– |
#ifndef _WIN32 /* XXX we need a replacement for that one */ |
186 |
|
ftruncate(fileno(ambfp), (off_t)lastpos); |
189 |
– |
#endif |
187 |
|
} |
188 |
|
} else if ((ambfp = fopen(ambfile, "w+")) != NULL) { |
189 |
|
initambfile(1); /* else create new file */ |
193 |
|
sprintf(errmsg, "cannot open ambient file \"%s\"", ambfile); |
194 |
|
error(SYSTEM, errmsg); |
195 |
|
} |
199 |
– |
#if 0 |
200 |
– |
flockfile(ambfp); /* application-level lock */ |
201 |
– |
#endif |
196 |
|
#ifdef F_SETLKW |
197 |
|
aflock(F_UNLCK); /* release file */ |
198 |
|
#endif |
213 |
|
lastpos = -1; |
214 |
|
} |
215 |
|
/* free ambient tree */ |
216 |
< |
unloadatree(&atrunk, &avfree); |
216 |
> |
unloadatree(&atrunk, avfree); |
217 |
|
/* reset state variables */ |
218 |
|
avsum = 0.; |
219 |
|
navsum = 0; |
1071 |
|
} |
1072 |
|
atp = atfreelist; |
1073 |
|
atfreelist = atp->kid; |
1074 |
< |
memset((char *)atp, '\0', 8*sizeof(AMBTREE)); |
1074 |
> |
memset(atp, 0, 8*sizeof(AMBTREE)); |
1075 |
|
return(atp); |
1076 |
|
} |
1077 |
|
|
1097 |
|
/* transfer values at this node */ |
1098 |
|
for (av = at->alist; av != NULL; av = at->alist) { |
1099 |
|
at->alist = av->next; |
1100 |
+ |
av->next = NULL; |
1101 |
|
(*f)(av); |
1102 |
|
} |
1103 |
|
if (at->kid == NULL) |
1175 |
|
{ |
1176 |
|
AMBVAL **avlpp; |
1177 |
|
|
1178 |
< |
avlpp = (AMBVAL **)bsearch((char *)&avaddr, (char *)avlist2, |
1179 |
< |
nambvals, sizeof(AMBVAL *), &aposcmp); |
1178 |
> |
avlpp = (AMBVAL **)bsearch(&avaddr, avlist2, |
1179 |
> |
nambvals, sizeof(AMBVAL *), aposcmp); |
1180 |
|
if (avlpp == NULL) |
1181 |
|
error(CONSISTENCY, "address not found in avlmemi"); |
1182 |
|
return(avlpp - avlist2); |
1219 |
|
} |
1220 |
|
if (avlist1 == NULL) { /* no time tracking -- rebuild tree? */ |
1221 |
|
if (avlist2 != NULL) |
1222 |
< |
free((void *)avlist2); |
1222 |
> |
free(avlist2); |
1223 |
|
if (always) { /* rebuild without sorting */ |
1224 |
|
oldatrunk = atrunk; |
1225 |
|
atrunk.alist = NULL; |
1226 |
|
atrunk.kid = NULL; |
1227 |
< |
unloadatree(&oldatrunk, &avinsert); |
1227 |
> |
unloadatree(&oldatrunk, avinsert); |
1228 |
|
} |
1229 |
|
} else { /* sort memory by last access time */ |
1230 |
|
/* |
1241 |
|
eputs(errmsg); |
1242 |
|
#endif |
1243 |
|
i_avlist = 0; |
1244 |
< |
unloadatree(&atrunk, &av2list); /* empty current tree */ |
1244 |
> |
unloadatree(&atrunk, av2list); /* empty current tree */ |
1245 |
|
#ifdef DEBUG |
1246 |
|
if (i_avlist < nambvals) |
1247 |
|
error(CONSISTENCY, "missing ambient values in sortambvals"); |
1248 |
|
#endif |
1249 |
< |
qsort((char *)avlist1, nambvals, sizeof(struct avl), alatcmp); |
1250 |
< |
qsort((char *)avlist2, nambvals, sizeof(AMBVAL *), aposcmp); |
1249 |
> |
qsort(avlist1, nambvals, sizeof(struct avl), alatcmp); |
1250 |
> |
qsort(avlist2, nambvals, sizeof(AMBVAL *), aposcmp); |
1251 |
|
for (i = 0; i < nambvals; i++) { |
1252 |
|
if (avlist1[i].p == NULL) |
1253 |
|
continue; |
1263 |
|
avinsert(avlist2[j]); |
1264 |
|
avlist1[j].p = NULL; |
1265 |
|
} |
1266 |
< |
free((void *)avlist1); |
1267 |
< |
free((void *)avlist2); |
1266 |
> |
free(avlist1); |
1267 |
> |
free(avlist2); |
1268 |
|
/* compute new sort interval */ |
1269 |
|
sortintvl = ambclock - lastsort; |
1270 |
|
if (sortintvl >= MAX_SORT_INTVL/2) |