DistRen Changeset - 4d01516c95d1 · protofusion repositories

Changeset - 4d01516c95d1

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

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

Reorganization, cleanup

1 file changed with 141 insertions and 115 deletions:

src/server/distrend.c

141

115

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -45,13 +45,12 @@ @@
 #include <libxml/tree.h>
 #include <libxml/xmlmemory.h>
 #include <libxml/xmlreader.h>
 #include <libxml/xmlwriter.h>
 /* ******************* Structs ************************ */
 struct general_info
+{
   struct distrenjob head;
   struct distrend_config *config;
@@ @@ -73,29 +72,155 @@ struct general_info @@
   unsigned long total_render_power;
   unsigned long total_priority_pieces;
 };
 /*
   internally defined funcs's prototypes @TODO: Make all functions nice and proper
 */
 void distrenjob_remove(struct general_info *, struct distrenjob *bj);
 /***********************************
   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);
 int mortition(struct general_info *geninfo, struct distrenjob *job);
 int restoreJobState(struct distrenjob *job);
 int prepare_distrenjob(struct general_info *geninfo, int type, char *name, char *submitter, int priority, int start_frame, int end_frame, int width, int height);
 int distrenjob_enqueue(struct general_info *geninfo, struct distrenjob *job);
 int change_job_priority(struct general_info *geninfo, struct distrenjob *job, int new_priority);
 int find_jobframe(struct general_info *geninfo, struct distrenjob **job, struct frameset **frame);
 int find_jobframe_from_job(struct distrenjob *distrenjob_ptr, struct distrenjob **job, struct frameset **frame);
 int find_jobframe_new(struct general_info *geninfo, int rend_pwr, struct distrenjob **job, struct frameset **frame);
 int find_jobframe_again(struct general_info *geninfo, int jobnum, int rend_pwr, struct distrenjob **job, struct frameset **frame);
 void frame_watchdog(struct distrenjob *distrenjob_head);
 struct distrenjob *distrenjob_get(struct distrenjob *head, jobnum_t jobnum);
 int distrenjob_enqueue(struct general_info *, struct distrenjob *job);
 int mortition(struct general_info *, struct distrenjob *job);
 int update_xml_joblist(struct general_info *);
 int createQueueFromXML(struct general_info*);
 int reCreateQueueFromXML(struct general_info*, xmlDocPtr doc, xmlNodePtr current);
 void update_general_info(struct general_info*);
 int import_general_info(struct general_info*);
 void distrenjob_remove(struct general_info *geninfo, struct distrenjob *bj);
 int distrend_do_config(int argc, char *argv[], struct distrend_config **config);
 int distrend_config_free(struct distrend_config *config);
 /* **************XML Functions**************** */
 void update_general_info(struct general_info *geninfo);
 int import_general_info(struct general_info *general_info);
 int restore_distrenjob(struct general_info *geninfo, struct distrenjob **distrenjob, jobnum_t jobnum);
 int updateJobStatsXML(struct distrenjob *job);
 int update_xml_joblist(struct general_info *geninfo);
 int createQueueFromXML(struct general_info *geninfo);
 int reCreateQueueFromXML(struct general_info *geninfo, xmlDocPtr doc, xmlNodePtr current);
 int job_getserialfilename(char **filename, struct general_info *, unsigned int jobnum, int createdir);
 int distren_mkdir_recurse(char *fname);
 /* **************Test Functions**************** */
 int printFrameInfo(struct frameset *frame);
 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 ************************* */
 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,
     CLIENTSTATUS_IDLE = 2
   } clientstatus;
   xmlinit();
   for(counter = 0; counter < argc; counter ++)
+    {
       if(strcmp(argv[counter], "-h") == 0)
+      {
     	  fprintf(stderr, "Usage: distrend [option] \nStarts the distrend server\n\t-h\tshow this help\n\t-t\tlaunches queue testing interface \n");
 		  return 2;
+      }
       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",
 		    general_info.config->datadir);
   if(start_data(&general_info))
+    {
       fprintf(stderr, "%s:%d: start_data() failed\n", __FILE__, __LINE__);
       return 1;
+    }
   /** 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
  interactiveTest(test, general_info);
   distrend_listen(general_info.config, &clients);
   /* This is called the "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)
+	{
 	  int returnnum = find_jobframe(&general_info, &job, &frame); // Finds a frame to render
 	  if(returnnum)
+	    {
 	      fprintf(stderr,"No frames are available to render at this time. Idling...\n");
 	      sleep(10);
+	    }
 	  else
 	    remotio_send_to_client(frame->num, job->jobnum); // Pseudo-sends data to client
+	}
       /* If the client states that they finished the frame */
       	if(clientsays == DISTREN_REQUEST_DONEFRAME){
       	  clientstatus = CLIENTSTATUS_IDLE; // Sets the client back to idle
       	  finish_frame(&general_info, job, frame->num); // @TODO: Make sure this actually works.
+      	}
     } /* while(!general_info.config->die) */
   distrend_unlisten(general_info.config->listens, clients);
   distrend_config_free(general_info.config);
   xmlcleanup();
   /** free() paths */
   free(general_info.files.geninfo);
   return 0;
+}
 /* ********************** Functions ************************* */
 /** Dumps all data in RAM to an xml file (such as current jobs, etc) which is parsed by start_data. Remember to invoke this before shutting down! @TODO: Fill this stub*/
 int xml_dump()
+{
@@ @@ -1093,33 +1218,13 @@ int printAllJobnums(struct distrenjob *h @@
   fprintf(stderr, "\n%d jobs in queue\n\n", total_jobs);
   return 1;
+}
 /* ************************** Main ************************* */
 int main(int argc, char *argv[])
+{
   /* Argument-parser */
   int counter;
   int test; /*< Interactive mode if 1 */
   struct general_info general_info;
   int cont;
   struct distrend_clientset *clients;
   enum clientstatus
+  {
     CLIENTSTATUS_UNINITIALIZED = 0,
     CLIENTSTATUS_BUSY = 1,
     CLIENTSTATUS_IDLE = 2
   } clientstatus;
 int interactiveTest(int test, struct general_info general_info){
   int command;
   jobnum_t jobnum;
   struct distrenjob *tmp_job;
   struct frameset *tmp_frame;
   int type;
   char *name;
@@ @@ -1129,48 +1234,12 @@ int main(int argc, char *argv[]) @@
   int width;
   int height;
   int start_frame;
   int end_frame;
   size_t read_buf;
   xmlinit();
   test = 0;
   for(counter = 0; counter < argc; counter ++)
+    {
       if(strcmp(argv[counter], "-h") == 0)
+      {
     	  fprintf(stderr, "Usage: distrend [option] \nStarts the distrend server\n\t-h\tshow this help\n\t-t\tlaunches queue testing interface \n");
 		  return 2;
+      }
       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",
 		    general_info.config->datadir);
   if(start_data(&general_info))
+    {
       fprintf(stderr, "%s:%d: start_data() failed\n", __FILE__, __LINE__);
       return 1;
+    }
   /** 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);
   while(test == 1)
+  {
     fprintf(stderr, "Welcome to DistRen Alpha Interactive Test Mode\n\n");
     fprintf(stderr, "\t1 \tPrint all frames in a job\n");
     fprintf(stderr, "\t2 \tExamine certain job\n");
     fprintf(stderr, "\t3 \tGet a frame to render\n");
@@ @@ -1235,60 +1304,17 @@ int main(int argc, char *argv[]) @@
       fprintf(stderr, "\nTimestamp: %lu", (long)general_info.timestamp);
       fprintf(stderr, "\nTotal priority pieces: %ld", general_info.total_priority_pieces);
       fprintf(stderr, "\nTotal render power: %ld\n", general_info.total_render_power);
       break;
     case 8:
       fprintf(stderr,"Goodbye.\n");
-      return 0;
+       test = 0;
     default:
       fprintf(stderr, "Invalid input, please try again.\n");
+    }
+  }
   distrend_listen(general_info.config, &clients);
   /* This is called the "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)
+	{
 	  int returnnum = find_jobframe(&general_info, &job, &frame); // Finds a frame to render
 	  if(returnnum)
+	    {
 	      fprintf(stderr,"No frames are available to render at this time. Idling...\n");
 	      sleep(10);
+	    }
 	  else
 	    remotio_send_to_client(frame->num, job->jobnum); // Pseudo-sends data to client
+	}
       /* If the client states that they finished the frame */
       	if(clientsays == DISTREN_REQUEST_DONEFRAME){
       	  clientstatus = CLIENTSTATUS_IDLE; // Sets the client back to idle
       	  finish_frame(&general_info, job, frame->num); // @TODO: Make sure this actually works.
+      	}
     } /* while(!general_info.config->die) */
   distrend_unlisten(general_info.config->listens, clients);
   distrend_config_free(general_info.config);
   xmlcleanup();
   /** free() paths */
   free(general_info.files.geninfo);
   return 0;
+}
 /**
    constructs the filename for a distrenjob's serialized XML
    to be stored/retrieved from/in.

0 comments (0 inline, 0 general)