diff --git a/src/server/slavefuncs.c b/src/server/slavefuncs.c --- a/src/server/slavefuncs.c +++ b/src/server/slavefuncs.c @@ -288,19 +288,19 @@ return 1; // Success /** Executor function for Blender operations */ int exec_blender(char *input, char *output, int frame) { - fprintf(stderr,"Preparing to execute...\n"); int ret; char *frame_str; + _distren_asprintf(&frame_str, "%i", frame); char *command = "blender"; // @TODO: We currently expect this to be in PATH char *cmd[] = { command, "-b", "-o", output, input, "-f", frame_str, (char *)NULL }; // arguments for blender + fprintf(stderr,"Preparing to execute command: %s \"-b\" \"-o\" %s %s \"-f\" %s\n", command, output, input, frame_str); + char buf[10]; struct execio *testrem; size_t readlen; - _distren_asprintf(&frame_str, "%i", frame); - fprintf(stderr,"Executing: %s\n", frame_str); ret = execio_open(&testrem, command, cmd); buf[9] = '\0'; @@ -477,7 +477,7 @@ int unpackJob(char *outdir, char *pathto } -void prepareJobPaths(int jobnum, int framenum, char *outputExt, char *datadir, char **urltoTar,char **pathtoTar,char **pathtoJob, char **pathtoJobfile,char **urltoOutput,char **pathtoOutput) +void prepareJobPaths(int jobnum, int framenum, char *outputExt, char *datadir, char **urltoTar,char **pathtoTar,char **pathtoJob, char **pathtoJobfile,char **urltoOutput,char **pathtoOutput, char **pathtoOutdir) { // Variable Preparation char *jobdatapath; @@ -488,6 +488,7 @@ void prepareJobPaths(int jobnum, int fra _distren_asprintf(pathtoJobfile, "%s/%s/job.blend", datadir, jobdatapath ); // Prepares the path to the jobfile _distren_asprintf(urltoOutput, "http://distren.org/slaveUpload.php"); // Prepares the URL where output is posted _distren_asprintf(pathtoOutput, "%s/%s/output/job%d-frame%d.%s", datadir, jobdatapath, jobnum, framenum, outputExt ); + _distren_asprintf(pathtoOutdir, "%s/%s/output", datadir, jobdatapath); free(jobdatapath); } @@ -656,7 +657,7 @@ void _web_finishframe(int slavekey, char struct _web_memorystruct data = _web_getrequest(url); free(url); - fprintf(stderr,"Got data: %s\n", data.memory); + fprintf(stderr,"%s\n", data.memory); if(data.memory) free(data.memory); } @@ -667,7 +668,7 @@ void _web_startframe(int slavekey, char struct _web_memorystruct data = _web_getrequest(url); free(url); - fprintf(stderr,"Got data: %s\n", data.memory); + fprintf(stderr,"%s\n", data.memory); if(data.memory) free(data.memory); }