DistRen Changeset - dbcd59c49d54 · protofusion repositories

Changeset - dbcd59c49d54

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

LordOfWar - 16 years ago 2009-10-09 17:15:02

updated start_data to use new functions

1 file changed with 4 insertions and 2 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -72,12 +72,13 @@ void distrenjob_remove(struct distrenjob @@
 struct distrenjob *distrenjob_get(struct distrenjob *head, jobnum_t jobnum);
 void distrenjob_enqueue(struct distrenjob *head, struct distrenjob *job);
 void mortition(struct distrenjob *head, struct distrenjob *job);
 int makeJobDataXML(struct distrenjob *job);
 int updateJobListXML(struct distrenjob *head);
 int createQueueFromXML(struct distrenjob *head);
 int reCreateQueueFromXML(struct distrenjob *head, xmlDocPtr doc, xmlNodePtr current);
 /* Global Vars, eliminate these */
 jobnum_t jobnum = 0; // The next job number to create in the queue
 int hcfjob; // Highest consecutively finished job
@@ @@ -132,21 +133,22 @@ void distrend_unlisten() @@
 void remotio_send_to_client()
+{
 	// I am futile!
+}
 /** Fill variables after crash / shutdown from XML dumps */
 int start_data()
+int start_data(struct distrenjob *head)
+{
   general_info.hibernate = 0;
   struct stat buffer;
   if(stat(SYSCONFDIR "/data.xml", &buffer) == 0){
     // @TODO: retrieve total_finished_jobs and total_finished_frames from xml file
     fprintf(stderr,"Parsing XML files and restoring previous state...\n");
     createQueueFromXML(head);
     return 1;
+  }
   else{
     general_info.total_finished_jobs = 0;
     general_info.total_frames_rendered = 0;
     fprintf(stderr,"Couldn't find XML dump, starting up fresh.\n");
@@ @@ -765,13 +767,13 @@ int main(int argc, char *argv[]) @@
     CLIENTSTATUS_IDLE = 2
   } clientstatus;
   cont = 1;
   memset(&head, '\0', sizeof(struct distrenjob));
   start_data(); // Starts fresh or loads data from xml dump. Should we grab the return?
+  start_data(&head); // Starts fresh or loads data from xml dump. Should we grab the return?
   distrend_do_config(argc, argv, &config);
   int command;
   jobnum_t jobnum;
   struct distrenjob *tmp_job;

0 comments (0 inline, 0 general)