DistRen Changeset - 14f43a497bd7 · protofusion repositories

Changeset - 14f43a497bd7

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

ethanzonca - 16 years ago 2009-09-05 20:23:15

made start_data() actually do something

2 files changed with 8 insertions and 2 deletions:

src/server/distrend.c

src/server/slave.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -29,13 +29,13 @@ @@
 #include <confuse.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <malloc.h>
 #include <unistd.h> /* getopt */
 #include <time.h>
+#include <sys/stat.h>
 /* ******************* Structs ************************ */
 // Gets config info from confs
 struct distrend_config
+{
@@ @@ -121,25 +121,28 @@ void distrend_unlisten() @@
    This is probably just a placeholder for remotio
 */
 void remotio_send_to_client()
+{
 	// I am futile!
+}
 /** Fill variables after crash / shutdown from XML dumps */
 int start_data(){
   if(1 == 0){
   struct stat buffer;
   if(stat(SYSCONFDIR "/data.xml", &buffer) == 0){
     // retrieve total_finished_jobs and total_finished_frames from xml file
     fprintf(stderr,"Parsing XML files and restoring previous state...\n");
     return 1;
+  }
   else{
     general_info.total_finished_jobs = 0;
     general_info.total_frames_rendered = 0;
     fprintf(stderr,"Can't find XML dump, starting up fresh.\n");
     return 2;
+  }
   free(&buffer); // @TODO: Is this pointless?
+}
 /** Finish-Setter: Sets a frame to the "completed" status.*/
 void finish_frame(struct distrenjob *distrenjob, int frame){
   distrenjob->frameset[frame].status = 2;
   distrenjob->frameset[frame].time_to_render = (clock() - distrenjob[jobnum].frameset[frame].start_time); // Consider changing time-to-render to time-for-frame or something?

src/server/slave.c

➞

Show inline comments

@@ @@ -127,14 +127,17 @@ char *urltoOutput; // Full URL where o @@
 char *pathtoJobfile; // Full path to the job's main file
 char *pathtoXml;     // Full path to the job's xml file
 char *pathtoOutput;  // Full path to the output (rendered) file
 char *outputExt;     // Output Extension (e.g., JPG)
 int threads = sysconf(_SC_NPROCESSORS_ONLN); // Equals the number of currently online processors
 // FOR Win32: int threads = sysinfo.dwNumberOfProcessors;
 struct distrenjob *myjob; // Structure to hold data gathered from the XML file
 // If the slave is getting job info...
 if(gotframe ==1)
+  {
     /* @TODO: fix these remoteio_read's */
     jobnum = remoteio_read(jobnum); // Set jobnum from remoteio (we could use info from struct, but we need this info to download the xmlfile)
     framenum = remoteio_read(jobnum); // Set framenum from remoteio

0 comments (0 inline, 0 general)