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

@@ @@ -144,7 +144,7 @@ void remotio_send_to_client() @@
+}
 /** 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){
@@ @@ -155,6 +155,7 @@ int start_data(struct distrenjob *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;
@@ @@ -162,7 +163,11 @@ int start_data(struct distrenjob *head) @@
     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;
+  }
+}
@@ @@ -951,6 +956,7 @@ int main(int argc, char *argv[]) @@
     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;
@@ @@ -997,7 +1003,6 @@ int main(int argc, char *argv[]) @@
   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);

0 comments (0 inline, 0 general)