diff --git a/src/server/slave.c b/src/server/slave.c --- a/src/server/slave.c +++ b/src/server/slave.c @@ -84,7 +84,6 @@ int main(int argc, char *argv[]) int jobnum; /* The job number that we're currently working */ int framenum; /* @TODO: Remotio should fill this */ - int gotframe = 0; /* set this to 1 after data for a job is received from the server */ int busy = 0; /* Client business 1=busy 0=idle */ char *urltoTar; /* Full URL to the server-side location of job#.tgz */ @@ -102,89 +101,95 @@ int main(int argc, char *argv[]) struct distrenjob *myjob; /* Structure to hold data gathered from the XML file */ - /* If the server says that every frame for the last jobnum is finished, - * OR if the data is getting old - */ - if(1 == 0){ - delete_jobdata(jobnum, datadir); - } - - /* If we got a frame */ - if(gotframe != 0) + int cont = 1; + int framesInLocalQueue = 1; + + while(cont) { - /* @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 */ - jobnum = 0; - //framenum = remoteio_read(jobnum); /* Set framenum from remoteio */ - framenum = 0; + /* If we got a frame */ + if(framesInLocalQueue > 0) + { + /* @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 */ + jobnum = 0; + //framenum = remoteio_read(jobnum); /* Set framenum from remoteio */ + framenum = 0; - fprintf(stderr, "Received %d in job %d, preparing to render...\n", framenum, jobnum); + fprintf(stderr, "Preparing to render frame %d in job %d\n", framenum, jobnum); - /** - Variable Preparation - @todo find where to free() all of these - */ - _distren_asprintf(&jobdatapath, "job%d", jobnum); - _distren_asprintf(&urltoTar, "http://protofusion.org/distren/stor/job%d/job%d.tar.gz", jobnum); // Prepares URL to download from - _distren_asprintf(&pathtoTar, "%s/stor/jobdata/job%d.tar.gz", datadir, jobnum); // Prepares destination to save to - _distren_asprintf(&pathtoJobfile, "%s/%s/job.blend", datadir, jobdatapath ); // Prepares the path to the jobfile - _distren_asprintf(&urltoOutput, "http://protofusion.org/distren/stor/tmp/", jobdatapath ); // Prepares the URL where output is posted - _distren_asprintf(&pathtoXml, "%s/job%d/job%d.xml", datadir, jobnum ); // Prepares the path to the job's XML file + /** + Variable Preparation + @todo find where to free() all of these + */ + _distren_asprintf(&jobdatapath, "job%d", jobnum); + _distren_asprintf(&urltoTar, "http://protofusion.org/distren/stor/job%d/job%d.tar.gz", jobnum); // Prepares URL to download from + _distren_asprintf(&pathtoTar, "%s/stor/jobdata/job%d.tar.gz", datadir, jobnum); // Prepares destination to save to + _distren_asprintf(&pathtoJobfile, "%s/%s/job.blend", datadir, jobdatapath ); // Prepares the path to the jobfile + _distren_asprintf(&urltoOutput, "http://protofusion.org/distren/stor/tmp/", jobdatapath ); // Prepares the URL where output is posted + _distren_asprintf(&pathtoXml, "%s/job%d/job%d.xml", datadir, jobnum ); // Prepares the path to the job's XML file - // Downloads the job tar if it isn't present. - struct stat buffer; - int fstatus = stat(pathtoJobfile, &buffer); - if(fstatus == -1) - { - /* Downloads the Tar */ - if( curlget(urltoTar, pathtoTar) == 0) - fprintf(stderr, "Job data retrieved successfully\n"); - else - fprintf(stderr, "Downloading job data from server failed. Check your network connection.\n"); - } - else - fprintf(stderr, "Using cached job file...\n"); + // Downloads the job tar if it isn't present. + struct stat buffer; + int fstatus = stat(pathtoJobfile, &buffer); + if(fstatus == -1) + { + /* Downloads the Tar */ + if( curlget(urltoTar, pathtoTar) == 0) + fprintf(stderr, "Job data retrieved successfully\n"); + else + fprintf(stderr, "Downloading job data from server failed. Check your network connection.\n"); + } + else + fprintf(stderr, "Using cached job file...\n"); - _distren_asprintf(&outdir, "/tmp/distren/job%d", jobnum); /*< @TODO: free() */ - mkdir("/tmp/distren", 0750); /* @TODO: Make this less *nix-specific */ - mkdir(outdir, 0750); + _distren_asprintf(&outdir, "/tmp/distren/job%d", jobnum); /*< @TODO: free() */ + mkdir("/tmp/distren", 0750); /* @TODO: Make this less *nix-specific */ + mkdir(outdir, 0750); - _distren_asprintf(&tarcmd, "tar -xvf \"%s\" -C \"%s\"", pathtoTar, outdir); /* @TODO: Make this portable. Libtar or something? */ - system(tarcmd); - free(tarcmd); + _distren_asprintf(&tarcmd, "tar -xvf \"%s\" -C \"%s\"", pathtoTar, outdir); /* @TODO: Make this portable. Libtar or something? */ + system(tarcmd); + free(tarcmd); + + /* Parses a job's XML file, puts data in the myjob struct */ + if(xml2distrenjob(&myjob, pathtoXml) == 0) + { + fprintf(stderr, "Well, the XML craziness may have worked. Maybe. \n"); - /* Parses a job's XML file, puts data in the myjob struct */ - if(xml2distrenjob(&myjob, pathtoXml) == 0) - { - fprintf(stderr, "Well, the XML craziness may have worked. Maybe. \n"); - - /* Frees things up if it was successful. xml2distrenjob() really (usually) only fails if malloc'ing inside it fails */ - distrenjob_free(&myjob); - } - else - { - fprintf(stderr, "I think the XML craziness may have failed, so I'll terminate just for fun.\n"); - return 1; - } + /* Frees things up if it was successful. xml2distrenjob() really (usually) only fails if malloc'ing inside it fails */ + distrenjob_free(&myjob); + } + else + { + fprintf(stderr, "I think the XML craziness may have failed, so I'll terminate just for fun.\n"); + return 1; + } - /* Variable-fillers which require XML */ - outputExt = myjob->output_format; /* @TODO: FIXME! <-- NEVER! */ - /* Prepares the path to the jobfile */ - _distren_asprintf(&pathtoOutput, "%s/job%d/output/job%d-frame%d.%s", datadir, jobnum, jobnum, framenum, outputExt ); + /* Variable-fillers which require XML */ + outputExt = myjob->output_format; /* @TODO: FIXME! <-- I WILL! */ + /* Prepares the path to the jobfile */ + _distren_asprintf(&pathtoOutput, "%s/job%d/output/job%d-frame%d.%s", datadir, jobnum, jobnum, framenum, outputExt ); - /** Series of ifs for jobtype based on xml content */ - if(1 == 1) - exec_blender(myjob, pathtoJobfile, pathtoOutput, framenum); /* @TODO: This warning should be fixed :D */ + /** Series of ifs for jobtype based on xml content */ + while(1 == 1){ + exec_blender(myjob, pathtoJobfile, pathtoOutput, framenum); /* @TODO: This warning should be fixed :D */ + break; + } - /* When blender is finished, run this... */ - fprintf(stderr, "Finished frame %d in job %d, uploading...", framenum, jobnum); - curlpost(pathtoOutput, urltoOutput); /* uploads (HTML POST) the output at outputpath to the server at outputurl */ - tell_the_server(DISTREN_REQUEST_DONEFRAME); /* Tells the server that it's finished rendering this frame */ - busy = 0; - /* Slave now becomes idle, doesn't need to tell the server anything, ssh handles this. */ + /* When blender is finished, run this... */ + fprintf(stderr, "Finished frame %d in job %d, uploading...", framenum, jobnum); + curlpost(pathtoOutput, urltoOutput); /* uploads (HTML POST) the output at outputpath to the server at outputurl */ + tell_the_server(DISTREN_REQUEST_DONEFRAME); /* Tells the server that it's finished rendering this frame */ + busy = 0; + /* Slave now becomes idle, doesn't need to tell the server anything, ssh handles this. */ + framesInLocalQueue--; + } + + // If the server says that every frame for the last jobnum is finished, OR if the data is getting old + if(1 == 0){ + delete_jobdata(jobnum, datadir); } - + } return 0; }