DistRen Changeset - b1047896c37b · protofusion repositories

Changeset - b1047896c37b

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

ethanzonca - 16 years ago 2009-10-14 16:14:35

Hopeful Merge

1 file changed with 8 insertions and 3 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -135,43 +135,48 @@ 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(struct distrenjob *head)
+int start_data(struct distrenjob *head, char *datadir)
+{
   struct stat buffer;
   if(stat("general_info.xml", &buffer) == 0){
     importGeneralInfo();
     fprintf(stderr,"Parsing XML files and restoring previous state...\n");
     createQueueFromXML(head);
     return 1;
+  }
   else{
     fprintf(stderr,"Couldn't find XML dump, starting up fresh.\n");
     general_info.total_finished_jobs = 0;
     general_info.total_frames_rendered = 0;
     general_info.free_clients = 0;
     general_info.highest_jobnum = 0;
     general_info.jobs_in_queue = 0;
     general_info.rendering_clients = 0;
     general_info.hibernate = 0;
     fprintf(stderr,"Couldn't find XML dump, starting up fresh.\n");
     // Create the stor directory
     // char *stor;
     // _distren_asprintf(&stor, "%s/stor", datadir);
     // mkdir(stor);
     return 2;
+  }
+}
 /** Finish-Setter: Sets a frame to the "completed" status.*/
 void finish_frame(struct distrenjob *head, struct distrenjob *distrenjob, int frame)
+{
   distrenjob->frameset[frame].status = FRAMESETSTATUS_DONE;
   distrenjob->total_render_time = distrenjob->total_render_time + (clock() - distrenjob[jobnum].frameset[frame].start_time);
   distrenjob->completed_frames++;
   distrenjob->assigned_frames--;
   general_info.total_frames_rendered++; // Increase total frames var for stats
@@ @@ -942,24 +947,25 @@ int main(int argc, char *argv[]) @@
   int cont;
   struct distrend_listenset *listenset;
   struct distrend_config *config;
   enum clientstatus
+  {
     CLIENTSTATUS_UNINITIALIZED = 0,
     CLIENTSTATUS_BUSY = 1,
     CLIENTSTATUS_IDLE = 2
   } clientstatus;
   // initialize general_info struct, this should be done by start_data()
   general_info.jobs_in_queue = 0;
   general_info.free_clients = 0;
   general_info.rendering_clients = 0;
   general_info.total_finished_jobs = 0;
   general_info.total_frames_rendered = 0;
   general_info.highest_jobnum = 0;
   general_info.hibernate = 0;
   int command;
   jobnum_t jobnum;
   struct distrenjob *tmp_job;
@@ @@ -988,25 +994,24 @@ int main(int argc, char *argv[]) @@
 	  return 2;
+	}
       else if(strcmp(argv[counter], "-t") == 0)
+	{
 	  fprintf(stderr, "Entering into test mode...\n\n");
 	  test=1;
+	}
+    }
   cont = 1;
   memset(&head, '\0', sizeof(struct distrenjob));
   //start_data(&head); // Starts fresh or loads data from xml dump. Should we grab the return?
   distrend_do_config(argc, argv, &config);
   // pre-loaded jobs for testing
   prepare_distrenjob(&head, 1, "awesome", "LordOfWar", "onlylordofwar@gmail.com", 4, 1, 100, 640, 480);
   while(test == 1)
+  {
     fprintf(stderr, "Welcome to DistRen Alpha Interactive Test Mode\n\n");
     fprintf(stderr, "\t1 \tPrint all frames in a job\n");
     fprintf(stderr, "\t2 \tExamine certain job\n");
     fprintf(stderr, "\t3 \tGet a frame to render\n");

0 comments (0 inline, 0 general)