DistRen Changeset - f76e2b988e54 · protofusion repositories

Changeset - f76e2b988e54

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Ethan Zonca (ethanzonca) - 16 years ago 2010-03-14 00:52:39
e@ethanzonca.com

Other fixes

1 file changed with 1 insertions and 0 deletions:

src/server/simpleslave.c

0 comments (0 inline, 0 general)

src/server/simpleslave.c

➞

Show inline comments

@@ @@ -144,48 +144,49 @@ int main(int argc, char *argv[]) @@
     /* If we got a frame */
     if(haveWork)
+      {
         fprintf(stderr,"Got work from server...\n");
         /* @TODO: Add remotio hooks */
         // jobnum = remoteio_read(jobnum); /* Set jobnum from remoteio (we could use info from struct, but we need this info to download the xmlfile */
         // framenum = remoteio_read(jobnum); /* Set framenum from remoteio */
         // outputExt = remotio)read(outputExt); /* Set output extension from remotio */
         fprintf(stderr, "Preparing to render frame %d in job %d\n", framenum, jobnum);
         prepareJobPaths(jobnum, framenum, outputExt, datadir, &urltoTar, &pathtoTar, &pathtoJobfile, &urltoOutput, &pathtoOutput);
         // free(outputExt);
         int dlret = downloadTar(urltoTar, pathtoTar);
         if(dlret == 0)
           fprintf(stderr,"Got data tarball\n");
         else if(dlret == 3)
           return 0; // ouput dir doesn't exist
         else
           fprintf(stderr,"Using existing tarball...\n");
         unpackJob(datadir, pathtoTar);
         /* Execute blender */
         fprintf(stderr,"Executing blender on file %s", pathtoJobfile);
         if(exec_blender(pathtoJobfile, pathtoOutput, framenum))
+          {
             fprintf(stderr,"Error running Blender. Check your installation and/or your PATH.\n");
             return 1;
+          }
         free(pathtoJobfile);
         /* Post-execution */
         fprintf(stderr, "Finished frame %d in job %d, uploading...\n", framenum, jobnum);
         uploadOutput(pathtoOutput, urltoOutput, jobnum, framenum, slavekey); // @TODO: Handle return value
         free(urltoOutput);
         free(pathtoOutput);
         // Tell the server that rendering and upload are complete
 	_web_finishframe(slavekey, password, jobnum, framenum);
+      }
     else
       fprintf(stderr,"Nothing to do. Idling...\n");
     // @TODO: If the server says that every frame for the last jobnum is finished, OR if the data is getting old
     if(1 == 0)
+      {
         // Note: individual frames are already deleted after uploading,

0 comments (0 inline, 0 general)