DistRen Changeset - 12f00f880402 · protofusion repositories

Changeset - 12f00f880402

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

ethanzonca@localhost.localdomain - 16 years ago 2009-11-23 22:27:49
ethanzonca@localhost.localdomain

Added test code for execio, minor edits

3 files changed with 12 insertions and 8 deletions:

src/server/slave.c

src/server/slavefuncs.c

src/server/slavefuncs.h

0 comments (0 inline, 0 general)

src/server/slave.c

➞

Show inline comments

@@ @@ -101,8 +101,8 @@ int main(int argc, char *argv[]) @@
   struct distrenjob *myjob; /* Structure to hold data gathered from the XML file */
   int cont = 1;
   int framesInLocalQueue = 1;
   int cont = 0;
   int framesInLocalQueue = 0;
   while(cont)
+    {
@@ @@ -172,7 +172,7 @@ int main(int argc, char *argv[]) @@
         /** 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 */
           exec_blender(pathtoJobfile, pathtoOutput, framenum); /* @TODO: This warning should be fixed :D */
           break;
+        }
@@ @@ -190,6 +190,9 @@ int main(int argc, char *argv[]) @@
       delete_jobdata(jobnum, datadir);
+    }
+  }
 /* Test code for execio
   fprintf(stderr,"Testing out execioness");
   exec_blender("/home/ethanzonca/Blender/houses.blend", "/home/ethanzonca/Blender/out.png", 1);
   */
   return 0;
+}

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -214,8 +214,9 @@ return 1; // Success @@
 /** Executor function for Blender operations */
-void exec_blender(struct distrenjob* distrenjob, char *input, char *output, int frame)
 void exec_blender(char *input, char *output, int frame)
+{
   fprintf(stderr,"Preparing to execute...\n");
   int ret;
   char *frame_str;
@@ @@ -242,7 +243,7 @@ void exec_blender(struct distrenjob* dis @@
        // @TODO: Better location for this code?
       tell_the_server(DISTREN_REQUEST_PROGRESS);
       fprintf(stderr, "Rendering...");
+      fprintf(stderr, "Rendering...\n");
+    }
   execio_close(testrem);
   /* end execio code */
@@ @@ -251,7 +252,7 @@ void exec_blender(struct distrenjob* dis @@
     fprintf(stderr,"Error starting Blender. Check your install.\n");
+  }
   else{
-    fprintf(stderr,"Blender at least started nicely, we don't know if it rendered anything though.\n");
+    fprintf(stderr,"Execution was successful.\n");
+  }
   // Consider placing the following in the exec_blender() function

src/server/slavefuncs.h

➞

Show inline comments

@@ @@ -36,7 +36,7 @@ int ssh_keygen(); @@
 int register_user(char *username, char *email);
 int login_user(char *username);
 int conf_replace(char *username);
-void exec_blender(struct distrenjob* distrenjob, char *input, char *output, int frame);
 void exec_blender(char *input, char *output, int frame);
 void xmlinit();
 void xmlcleanup();

0 comments (0 inline, 0 general)