DistRen Changeset - afc21acbe5ef · protofusion repositories

Changeset - afc21acbe5ef

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Ethan Zonca (ethanzonca) - 16 years ago 2010-02-09 19:12:13
e@ethanzonca.com

Commenting, more cleanup

1 file changed with 14 insertions and 11 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -71,16 +71,15 @@ struct general_info @@
   time_t timestamp;
   unsigned long total_render_power;
   unsigned long total_priority_pieces;
 };
 /***********************************
 /* *********************************************
   Function Prototypes
  *********************************** */
+   ********************************************* */
 /* ************General Functions************* */
 int xml_dump();
 int distrend_do();
 int start_data(struct general_info *general_info);
 void finish_frame(struct general_info *geninfo, struct distrenjob *distrenjob, int frame);
@@ @@ -114,22 +113,19 @@ int printJob(struct distrenjob *job); @@
 int printJobInfo(struct distrenjob *job);
 int printAllJobnums(struct distrenjob *head);
 int interactiveTest(int test, struct general_info general_info);
 int job_getserialfilename(char **filename, struct general_info *geninfo, unsigned int jobnum, int createdir);
 int distren_mkdir_recurse(char *dirname);
 /* ************************** Main ************************* */
 /* **************** Main ********************* */
 int main(int argc, char *argv[])
+{
   /* Parse arguments */
   int counter;
   int test = 0; /*< Interactive mode if 1 */
   struct general_info general_info;
   int cont;
   struct distrend_clientset *clients;
   enum clientstatus
+  {
     CLIENTSTATUS_UNINITIALIZED = 0,
     CLIENTSTATUS_BUSY = 1,
@@ @@ -149,13 +145,13 @@ int main(int argc, char *argv[]) @@
       else if(strcmp(argv[counter], "-t") == 0)
+      {
     	  fprintf(stderr, "Entering into test mode...\n\n");
 		  test=1;
+      }
+    }
-  cont = 1;
   if(distrend_do_config(argc, argv, &general_info.config))
     return 1;
   /** preset paths */
   _distren_asprintf(&general_info.files.geninfo, "%s/general_info.xml",
@@ @@ -168,27 +164,27 @@ int main(int argc, char *argv[]) @@
+    }
   /** pre-loaded jobs for testing */
   prepare_distrenjob(&general_info, 1, "awesome", "LordOfWar", 8, 1, 100, 640, 480);
   prepare_distrenjob(&general_info, 1, "hamburger", "ohnobinki", 3, 1, 50, 1280, 720);
- // Execute test function
+  /** Execute test function */
  interactiveTest(test, general_info);
   distrend_listen(general_info.config, &clients);
   /* This is called the "main loop" */
   /* Main Loop */
   while(!general_info.config->die)
+    {
       int clientsays = 0; /*< temporary example variable, will be replaced when we can handle messages */
       distrend_accept(general_info.config, clients);
       /* Make the following code more event-driven */
       frame_watchdog(&general_info.head);
       struct frameset *frame;
       struct distrenjob *job;
       /* If the client is idle, must be modified for climbing through linked list of clients (client->clientnum) */
       if(clientstatus == CLIENTSTATUS_IDLE)
+	{
@@ @@ -1144,12 +1140,14 @@ int reCreateQueueFromXML(struct general_ @@
   job->next = holder;
   return 0;
+}
 /* ************************** Test Functions ************************* */
 /** Prints info about frames in a frameset */
 int printFrameInfo(struct frameset *frame)
+{
   char *status;
   status = NULL;
@@ @@ -1171,24 +1169,26 @@ int printFrameInfo(struct frameset *fram @@
   printf("frame #: %d --> %s\n", frame->num, status);
   free(status);
   return 0;
+}
 /** Prints information about all frames in a job */
 int printJob(struct distrenjob *job)
+{
   int counter;
   fprintf(stderr, "frame_num: status\n");
   for(counter = 0; counter < job->total_frames; counter++)
+    {
       printFrameInfo(&job->frameset[counter]);
+    }
   return 1;
+}
 /** Prints information about a job */
 int printJobInfo(struct distrenjob *job)
+{
   fprintf(stderr, "type: %d\n", job->type);
   fprintf(stderr, "name: %s\n", job->name);
   fprintf(stderr, "submitter: %s\n", job->submitter);
   fprintf(stderr, "priority: %d\n", job->priority);
@@ @@ -1200,12 +1200,13 @@ int printJobInfo(struct distrenjob *job) @@
   fprintf(stderr, "prev_frame: %d\n", job->prev_frame_index);
   fprintf(stderr, "render power: %ld\n", job->assigned_render_power);
   return 1;
+}
 /** Print all jobnums in the queue */
 int printAllJobnums(struct distrenjob *head)
+{
   struct distrenjob *current_job;
   int total_jobs;
   fprintf(stderr, "job numbers in the order they will be processed:\n");
@@ @@ -1218,12 +1219,13 @@ int printAllJobnums(struct distrenjob *h @@
   fprintf(stderr, "\n%d jobs in queue\n\n", total_jobs);
   return 1;
+}
 /** Interactive test for the queuing system */
 int interactiveTest(int test, struct general_info general_info){
   int command;
   jobnum_t jobnum;
   struct distrenjob *tmp_job;
   struct frameset *tmp_frame;
   int type;
@@ @@ -1334,12 +1336,13 @@ int job_getserialfilename(char **filenam @@
   if(createdir)
     return distren_mkdir_recurse(*filename);
   return 0;
+}
 /** Creates directories recursively */
 int distren_mkdir_recurse(char *dirname)
+{
   size_t counter;
   char *nextdir;
   nextdir = strdup(dirname);

0 comments (0 inline, 0 general)