# HG changeset patch # User ethanzonca # Date 2009-10-14 16:14:35 # Node ID b1047896c37ba2473e9c0b714342b40291ef14bc # Parent 122fb7609b6364339f1e93defa24bbdc644532ce Hopeful Merge diff --git a/src/server/distrend.c b/src/server/distrend.c --- a/src/server/distrend.c +++ b/src/server/distrend.c @@ -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);