diff --git a/TODO b/TODO --- a/TODO +++ b/TODO @@ -22,8 +22,8 @@ Slave *-Other XML-writing/reading +Parse XML file and toss data in blendjob struct +Update exec_blender() to use the struct rather than other vars - -Add errorcatchers to return in libcurl functions -=-Make code more flexible for different types of jobs + -Add errorcatchers to return in libcurl functions, can we detect 404? +=-Make code more flexible for different types of jobs and operating systems (such as paths, libs, etc) -Add code to allow pausing/resuming of the slave (including a running blender process) -Add a threads variable for software that doesn't support threads (blender takes care of this by itself) diff --git a/src/server/slave.c b/src/server/slave.c --- a/src/server/slave.c +++ b/src/server/slave.c @@ -113,11 +113,11 @@ options_init(argc,argv,&my_cfg, myopts, -/* These should all be filled by remotio and other code @TODO: Make this less blender-specific and more jobtype-flexible */ +/* These should all be filled by remotio and other code @TODO: Make this less blender-specific and more jobtype-flexible... how should we go about doing this? */ int jobnum; int framenum; -/* These should be filled by the xml file that comes with a job */ +/* These should be filled by the xml file that comes with a job @TODO: Add calls to the xml function that ohnobinki's working on */ char *outputExt = "JPG"; char *outputRes = "1600x1200"; @@ -138,7 +138,7 @@ if(gotframe ==1) char *outdir; char *jobdatapath; - fprintf(stderr, "Received %d in job %d, preparing to render...",framenum,jobnum); + fprintf(stderr, "Received %d in job %d, preparing to render...\n",framenum,jobnum); /** Variable Preparation @@ -162,14 +162,14 @@ if(gotframe ==1) } _distren_asprintf(&outdir, "/tmp/distren/job%d", jobnum); /*< @todo free() */ - mkdir("/tmp/distren", 0750); + mkdir("/tmp/distren", 0750); /* @TODO: This is a tad linux-specific... */ mkdir(outdir, 0750); _distren_asprintf(&tarcmd, "tar -xvf \"%s\" -C \"%s\"", pathtoTar, outdir); system(tarcmd); free(tarcmd); - // exec_blender(blendjob, pathtoJobfile, pathtoOutput, framenum); // @TODO: Make a xml --> struct function + // exec_blender(blendjob, pathtoJobfile, pathtoOutput, framenum); // @TODO: Implement the xml --> struct function // Consider placing the following in the exec_blender() function while(busy == 1){