DistRen Changeset - e8abe91d635f · protofusion repositories

Changeset - e8abe91d635f

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Ethan Zonca (ethanzonca) - 15 years ago 2010-06-26 01:30:23
e@ethanzonca.com

Backported tar to standard slave

3 files changed with 5 insertions and 5 deletions:

TODO

src/server/simpleslave.c

src/server/slave.c

0 comments (0 inline, 0 general)

TODO

➞

Show inline comments

@@ @@ -36,7 +36,6 @@ Master @@
 Slave
   B-UnpackJob() and supporting functions need to work
   E-Restore tar functionality after unpackJob() is functional
   E-Add calls to remoteio, once it works or even before it works -> write message API functions and API
   =-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) -> signal handling (SIGTSTP vs. SIGSTOP), distrenslave_control cmdline interface
@@ @@ -47,6 +46,8 @@ Slave @@
   x=Add lockout of slaves below a certain version
   x-Add simpleslave with code to work around nonexisting server codebase
   x-Backport SimpleSlave functionality to slave code
   x-Restore tar functionality after unpackJob() is functional (6/26/10: unpackJob isn't functional, but tar re-implemented)
 Options

src/server/simpleslave.c

➞

Show inline comments

@@ @@ -218,7 +218,7 @@ int main(int argc, char *argv[]) @@
         // Check if tar exists already
         struct stat jbuffer;
-        int jstatus = stat(pathtoJobfile, &jbuffer);
+        int jstatus = stat(pathtoTar, &jbuffer);
         if(jstatus == -1){
           fprintf(stderr,"Main job file does not exist, extracting...\n");

src/server/slave.c

➞

Show inline comments

@@ @@ -163,8 +163,7 @@ int main(int argc, char *argv[]) @@
   char *pathtoOutdir;  /* Full path to output directory */
   char *pathtoRenderOutput;  /* Contains blender framenum placeholder */
   // Temporary for uncomressed testing @TODO: remove
   char *urltoJobfile;
   char *urltoJobfile; /* No longer used, url to .blend on server */
   char *pathtoJob;     /* Full path to job data folder */
   char *pathtoJobfile; /* Full path to the job's main file */
@@ @@ -235,7 +234,7 @@ int main(int argc, char *argv[]) @@
         // Decompress tarball
         struct stat jbuffer;
-        int jstatus = stat(pathtoJobfile, &jbuffer);
+        int jstatus = stat(pathtoTar, &jbuffer);
         if(jstatus == -1){
           if(DEBUG)
             fprintf(stderr,"Main job file does not exist, extracting...\n");

0 comments (0 inline, 0 general)