DistRen Changeset - 726c7e105f83 · protofusion repositories

Changeset - 726c7e105f83

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 16 years ago 2009-12-03 00:36:17
ohnobinki@ohnopublishing.net

add struct distrend_config to struct general_info

1 file changed with 8 insertions and 7 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -51,12 +51,14 @@ @@
 /* ******************* Structs ************************ */
 struct general_info
+{
   struct distrenjob head;
   struct distrend_config *config;
   int jobs_in_queue;
   unsigned int free_clients;
   unsigned int rendering_clients;
   unsigned int total_finished_jobs;
   unsigned int total_frames_rendered;
   unsigned int highest_jobnum;
@@ @@ -1087,13 +1089,12 @@ int main(int argc, char *argv[]) @@
   int test; // Interactive test mode if 1
   struct general_info general_info;
   int cont;
   struct distrend_clientset *clients;
   struct distrend_config *config;
   enum clientstatus
+  {
     CLIENTSTATUS_UNINITIALIZED = 0,
     CLIENTSTATUS_BUSY = 1,
     CLIENTSTATUS_IDLE = 2
@@ @@ -1130,16 +1131,16 @@ int main(int argc, char *argv[]) @@
     	  fprintf(stderr, "Entering into test mode...\n\n");
 		  test=1;
+      }
+    }
   cont = 1;
   if(distrend_do_config(argc, argv, &config))
+  if(distrend_do_config(argc, argv, &general_info.config))
     return 1;
   if(start_data(&general_info, config->datadir))
+  if(start_data(&general_info, general_info.config->datadir))
+    {
       fprintf(stderr, "%s:%d: start_data() failed\n", __FILE__, __LINE__);
       return 1;
+    }
   // pre-loaded jobs for testing
@@ @@ -1219,20 +1220,20 @@ int main(int argc, char *argv[]) @@
       return 0;
     default:
       fprintf(stderr, "Invalid input, please try again.\n");
+    }
+  }
   distrend_listen(config, &clients);
+  distrend_listen(general_info.config, &clients);
   /* This is called the "main loop" */
   while(cont)
+    {
       struct distrend_action *action;
       int clientsays = 0; /*< temporary example variable, will be replaced when we can handle messages */
       distrend_accept(config, clients, &action);
+      distrend_accept(general_info.config, clients, &action);
       cont = distrend_do(action);
       /* Make the following code more event-driven */
       frame_watchdog(&general_info.head);
@@ @@ -1257,13 +1258,13 @@ int main(int argc, char *argv[]) @@
       	  finish_frame(&general_info, job, frame->num); // @TODO: Make sure this actually works.
+      	}
       distrend_action_free(action);
+    }
   distrend_unlisten(config->listens, clients);
   distrend_config_free(config);
   distrend_unlisten(general_info.config->listens, clients);
   distrend_config_free(general_info.config);
   xmlcleanup();
   return 0;
+}

0 comments (0 inline, 0 general)