More calculation about how many fds are available

This commit is contained in:
Eric Fischer
2016-04-01 15:31:34 -07:00
parent 24deae5a43
commit 560add2ccd
+7 -7
View File
@@ -1135,11 +1135,13 @@ void radix(struct reader *reader, int nreaders, int *indexfd, int *geomfd) {
printf("you have %lld files and %lld memory\n", (long long) rl.rlim_cur, mem); printf("you have %lld files and %lld memory\n", (long long) rl.rlim_cur, mem);
long long availfiles = rl.rlim_cur long long availfiles = rl.rlim_cur - 2 * nreaders // each reader has a geom and an index
- 2 * nreaders // each reader has a geom and an index - 3 // pool, meta, mbtiless
- 3; // stdin, stdout, stderr - 3; // stdin, stdout, stderr
int splitbits = log(availfiles) / log(2); int splitbits = log(availfiles / 2) / log(2);
printf("can skim off %d bits\n", splitbits);
int geomfds[nreaders]; int geomfds[nreaders];
int indexfds[nreaders]; int indexfds[nreaders];
@@ -2256,8 +2258,7 @@ int main(int argc, char **argv) {
layer = optarg; layer = optarg;
break; break;
case 'L': case 'L': {
{
char *cp = strchr(optarg, ':'); char *cp = strchr(optarg, ':');
if (cp == NULL || cp == optarg) { if (cp == NULL || cp == optarg) {
fprintf(stderr, "%s: -L requires layername:file\n", argv[0]); fprintf(stderr, "%s: -L requires layername:file\n", argv[0]);
@@ -2279,8 +2280,7 @@ int main(int argc, char **argv) {
src->next = sources; src->next = sources;
sources = src; sources = src;
nsources++; nsources++;
} } break;
break;
case 'z': case 'z':
maxzoom = atoi(optarg); maxzoom = atoi(optarg);