165 |
|
static int runcom(char *cs); |
166 |
|
static int rmfile(char *fn); |
167 |
|
static int mvfile(char *fold, char *fnew); |
168 |
< |
static int next_process(void); |
168 |
> |
static int next_process(int reserve); |
169 |
|
static void wait_process(int all); |
170 |
|
static void finish_process(void); |
171 |
|
static void badvalue(int vc); |
751 |
|
op = addarg(op, "-ds .4"); |
752 |
|
else |
753 |
|
op = addarg(op, "-ds 0"); |
754 |
< |
op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .5"); |
754 |
> |
op = addarg(op, "-dt .2 -dc .25 -dr 0 -ss 0 -st .5"); |
755 |
|
if (vdef(AMBFILE)) { |
756 |
|
sprintf(op, " -af %s", vval(AMBFILE)); |
757 |
|
op += strlen(op); |
826 |
|
op = addarg(op, "-ds .2 -dj .9"); |
827 |
|
else |
828 |
|
op = addarg(op, "-ds .3"); |
829 |
< |
op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1"); |
829 |
> |
op = addarg(op, "-dt .1 -dc .5 -dr 1 -ss 1 -st .1"); |
830 |
|
if ( (overture = vint(INDIRECT)) ) { |
831 |
|
sprintf(op, " -ab %d", overture); |
832 |
|
op += strlen(op); |
904 |
|
op = addarg(op, "-ds .1 -dj .9"); |
905 |
|
else |
906 |
|
op = addarg(op, "-ds .2"); |
907 |
< |
op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01"); |
907 |
> |
op = addarg(op, "-dt .05 -dc .75 -dr 3 -ss 16 -st .01"); |
908 |
|
sprintf(op, " -ab %d", overture=vint(INDIRECT)+1); |
909 |
|
op += strlen(op); |
910 |
|
if (vdef(AMBFILE)) { |
1371 |
|
fprintf(fp, "%d %d\n", xdiv, ydiv); |
1372 |
|
fclose(fp); |
1373 |
|
} |
1374 |
< |
} else if (next_process()) { |
1374 |
> |
} else if (next_process(0)) { |
1375 |
|
if (pfile != NULL) |
1376 |
|
sleep(10); |
1377 |
|
continue; |
1384 |
|
sprintf(combuf, "%s -R %s %s%s %s %s%s%s -o %s %s", |
1385 |
|
c_rpiece, sfile, rppopt, rep, vw, |
1386 |
|
res, opts, po, rawfile, oct1name); |
1387 |
< |
while (children_running < nprocs-1 && |
1388 |
< |
next_process()) { |
1387 |
> |
while (next_process(1)) { |
1388 |
|
sleep(10); |
1389 |
|
combuf[strlen(c_rpiece)+2] = 'F'; |
1390 |
|
} |
1396 |
|
} else { |
1397 |
|
if (overture) { /* run overture calculation */ |
1398 |
|
sprintf(combuf, |
1399 |
< |
"%s%s %s%s -x 64 -y 64 -ps 1 %s > %s", |
1399 |
> |
"%s%s %s%s -x 64 -y 64 -ps 1 %s > %s", |
1400 |
|
c_rpict, rep, vw, opts, |
1401 |
|
oct1name, overfile); |
1402 |
< |
if (runcom(combuf)) { |
1403 |
< |
fprintf(stderr, |
1402 |
> |
if (!do_rpiece || !next_process(0)) { |
1403 |
> |
if (runcom(combuf)) { |
1404 |
> |
fprintf(stderr, |
1405 |
|
"%s: error in overture for view %s\n", |
1406 |
< |
progname, vs); |
1407 |
< |
quit(1); |
1408 |
< |
} |
1406 |
> |
progname, vs); |
1407 |
> |
quit(1); |
1408 |
> |
} |
1409 |
|
#ifndef NULL_DEVICE |
1410 |
< |
rmfile(overfile); |
1410 |
> |
rmfile(overfile); |
1411 |
|
#endif |
1412 |
+ |
} else if (do_rpiece) |
1413 |
+ |
sleep(20); |
1414 |
|
} |
1415 |
|
if (do_rpiece) { |
1416 |
|
sprintf(combuf, "%s -F %s %s%s %s %s%s%s -o %s %s", |
1417 |
|
c_rpiece, sfile, rppopt, rep, vw, |
1418 |
|
res, opts, po, rawfile, oct1name); |
1419 |
< |
while (children_running < nprocs-1 && |
1418 |
< |
next_process()) |
1419 |
> |
while (next_process(1)) |
1420 |
|
sleep(10); |
1421 |
|
} else { |
1422 |
|
sprintf(combuf, "%s%s %s %s%s%s%s %s > %s", |
1547 |
|
|
1548 |
|
#ifdef RHAS_FORK_EXEC |
1549 |
|
static int |
1550 |
< |
next_process(void) /* fork the next process (max. nprocs) */ |
1550 |
> |
next_process(int reserve) /* fork the next process */ |
1551 |
|
{ |
1552 |
|
RT_PID child_pid; |
1553 |
|
|
1558 |
|
progname); |
1559 |
|
quit(1); |
1560 |
|
} |
1561 |
+ |
if (reserve > 0 && children_running >= nprocs-reserve) |
1562 |
+ |
return(0); /* caller holding back process(es) */ |
1563 |
|
if (children_running >= nprocs) |
1564 |
|
wait_process(0); /* wait for someone to finish */ |
1565 |
|
fflush(NULL); /* flush output */ |
1566 |
|
child_pid = fork(); /* split process */ |
1567 |
|
if (child_pid == 0) { /* we're the child */ |
1568 |
|
children_running = -1; |
1569 |
+ |
nprocs = 1; |
1570 |
|
return(0); |
1571 |
|
} |
1572 |
|
if (child_pid > 0) { /* we're the parent */ |
1608 |
|
} |
1609 |
|
#else /* ! RHAS_FORK_EXEC */ |
1610 |
|
static int |
1611 |
< |
next_process(void) |
1611 |
> |
next_process(int reserve) |
1612 |
|
{ |
1613 |
|
return(0); /* cannot start new process */ |
1614 |
|
} |