--- ray/src/hd/rholo4.c 1997/12/12 11:13:17 3.13 +++ ray/src/hd/rholo4.c 1997/12/22 17:42:03 3.16 @@ -13,7 +13,7 @@ static char SCCSid[] = "$SunId$ SGI"; #include #ifndef HDSUF -#define HDSUF ".hdisp" +#define HDSUF ".hdi" #endif static int inp_flags; @@ -124,7 +124,7 @@ int block; disp_result(DS_STARTIMM, 0, NULL); bundle_set(BS_ADD, (PACKHEAD *)buf, msg.nbytes/sizeof(PACKHEAD)); disp_result(DS_ENDIMM, 0, NULL); - disp_check(0); /* hack -- delete usu. follows add */ + disp_flush(); break; case DR_ADJSET: /* adjust calculation set members */ if (msg.nbytes % sizeof(PACKHEAD)) @@ -148,21 +148,17 @@ int block; case DR_KILL: /* kill computation process(es) */ if (msg.nbytes) error(INTERNAL, "bad DR_KILL from display process"); - if (nprocs > 0) { - done_packets(flush_queue()); - if (end_rtrace()) - error(WARNING, "bad status returned by rtrace"); - } else + if (nprocs > 0) + done_rtrace(); + else error(WARNING, "no rtrace process to kill"); break; case DR_RESTART: /* restart computation process(es) */ if (msg.nbytes) error(INTERNAL, "bad DR_RESTART from display process"); - if (ncprocs > nprocs) { - checkrad(); - if (start_rtrace() < 1) - error(WARNING, "cannot restart rtrace"); - } else if (nprocs > 0) + if (ncprocs > nprocs) + new_rtrace(); + else if (nprocs > 0) error(WARNING, "rtrace already runnning"); else error(WARNING, "holodeck not open for writing");