ecacb0a15e8ddbe9b2e62381e30621ba70f82d8f markd Sun Jun 28 14:36:10 2020 -0700 dynamic server tests working diff --git src/jkOwnLib/genoFind.c src/jkOwnLib/genoFind.c index b359c0c..50612e8 100644 --- src/jkOwnLib/genoFind.c +++ src/jkOwnLib/genoFind.c @@ -133,31 +133,31 @@ if (gf != NULL) { freeMem(gf->lists); freeMem(gf->listSizes); freeMem(gf->allocated); if ((sources = gf->sources) != NULL) { for (i=0; i<gf->sourceCount; ++i) bitFree(&sources[i].maskedBits); freeMem(sources); } freez(pGenoFind); } } -static struct genoFind *loadGenoFind(FILE *f, void *memMapped) +static struct genoFind *genoFindLoad(FILE *f, void *memMapped) /* construct one genoFind from mapped file */ { struct genoFind *gf; AllocVar(gf); // read the parameters mustRead(f, &gf->maxPat, sizeof(gf->maxPat)); mustRead(f, &gf->minMatch, sizeof(gf->minMatch)); mustRead(f, &gf->maxGap, sizeof(gf->maxGap)); mustRead(f, &gf->tileSize, sizeof(gf->tileSize)); mustRead(f, &gf->stepSize, sizeof(gf->stepSize)); mustRead(f, &gf->tileSpaceSize, sizeof(gf->tileSpaceSize)); mustRead(f, &gf->tileMask, sizeof(gf->tileMask)); mustRead(f, &gf->sourceCount, sizeof(gf->sourceCount)); mustRead(f, &gf->isPep, sizeof(gf->isPep)); @@ -297,35 +297,35 @@ mustRead(f, &gfIdx->isTrans, sizeof(gfIdx->isTrans)); if (isTrans != gfIdx->isTrans) errAbort("index file isTrans==%d and -trans==%d", gfIdx->isTrans, isTrans); gfIdx->memLength = fileSize(fileName); gfIdx->memMapped = mmap(NULL, gfIdx->memLength, PROT_READ, MAP_SHARED, fileno(f), 0); if (gfIdx->memMapped == MAP_FAILED) errnoAbort("mmap of index file failed: %s", fileName); if (madvise(gfIdx->memMapped, gfIdx->memLength, MADV_RANDOM | MADV_WILLNEED) < 0) errnoAbort("madvise of index file failed: %s", fileName); if (isTrans) { int i, j; for (i = 0; i < 2; i++) for (j = 0; j < 3; j++) - gfIdx->transGf[i][j] = loadGenoFind(f, gfIdx->memMapped); + gfIdx->transGf[i][j] = genoFindLoad(f, gfIdx->memMapped); } else { - gfIdx->untransGf = loadGenoFind(f, gfIdx->memMapped); + gfIdx->untransGf = genoFindLoad(f, gfIdx->memMapped); } carefulClose(&f); return gfIdx; } int gfPowerOf20(int n) /* Return a 20 to the n */ { int res = 20; while (--n > 0) res *= 20; return res; } void gfCheckTileSize(int tileSize, boolean isPep)