DistRen Changeset - b7292b0017bf · protofusion repositories

Changeset - b7292b0017bf

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 16 years ago 2009-10-14 00:21:27
ohnobinki@ohnopublishing.net

reorganization for style and libxml2 usage

1 file changed with 32 insertions and 23 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -462,68 +462,66 @@ void distrenjob_remove(struct distrenjob @@
 /* Grabs config info from confs */
 int distrend_do_config(int argc, char *argv[], struct distrend_config **config)
+{
   cfg_opt_t myopts_listen[] =
+    {
       CFG_SIMPLE_STR("type", NULL),
       CFG_SIMPLE_STR("path", NULL),
       CFG_SIMPLE_INT("port", NULL),
       CFG_END()
     };
   cfg_opt_t myopts[] =
+    {
       CFG_SEC("listen",  /* this must be imported into struct listens (which must still be declared) */
           myopts_listen,
           CFGF_MULTI),
       CFG_SIMPLE_STR("datadir", NULL),
       CFG_END()
     };
   struct distrenjob *distrenjob;
   int tmp;
   xmlinit();
   /*
    * test xml2distrenjob()
    */
   tmp = xml2distrenjob(&distrenjob, "distrenjob.xml.example");
   if(tmp)
     fprintf(stderr, "xml2distrenjob() returned %d. Try to cd to distren/doc if you want to test out the xml2distrenjob() function. (This will only fix this error if the error is due to an inability of the xml library to access distrenjob.xml.example)\n\n", tmp);
   else
     fprintf(stderr, "using email ``%s'' for user ``%s'' -- reading in XML files and pulling data from them using libxml2+XPath works!!!\n", distrenjob->email, distrenjob->submitter);
   fprintf(stderr, "%s:%d running config\n", __FILE__, __LINE__);
   *config = malloc(sizeof(struct distrend_config));
   myopts[1].simple_value = &(*config)->datadir;
   options_init(argc, argv, &(*config)->mycfg, myopts, "daemon", &(*config)->options);
   fprintf(stderr, "using %s as datadir\n", (*config)->datadir);
   xmlcleanup();
   return 0;
+}
 int distrend_config_free(struct distrend_config *config)
+{
   options_free(config->options);
   free(config);
   return 0;
+}
 /* ************************** XML Functions ************************* */
 // writes the general_info.xml file which is a copy of the general_info structure
 // except that it doesn't hold free_clients and rendering_clients
 void updateGeneralInfo()
+{
   xmlTextWriterPtr writer;
   char *tmp;
   writer = xmlNewTextWriterFilename("general_info.xml", 0);
   xmlTextWriterStartDocument(writer, NULL, "utf-8", NULL);
   xmlTextWriterStartElement(writer, (xmlChar*)"general_info");
   _distren_asprintf(&tmp, "%d", general_info.jobs_in_queue);
@@ @@ -876,100 +874,109 @@ void printJobInfo(struct distrenjob *job @@
+}
 void printAllJobnums(struct distrenjob *head)
+{
   struct distrenjob *current_job;
   int total_jobs;
   printf("job numbers in the order they will be processed:");
   total_jobs = 0;
   for(current_job = head; !current_job; current_job = current_job->next)
+    {
       printf("%d", current_job->jobnum);
       total_jobs++;
+    }
   printf("%d jobs in queue", total_jobs);
+}
 /* ************************** Main ************************* */
 int main(int argc, char *argv[])
+{
   /* Argument-parser */
   int counter = 0;
   int test = 0; // Have some fun if-ness that does fun stuff when this is 1
   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;
+          }
+  }
   int counter;
   int test; // Have some fun if-ness that does fun stuff when this is 1
   struct distrenjob head;
   head.priority = 0; // make head have the highest priority
   int cont;
   struct distrend_listenset *listenset;
   struct distrend_config *config;
   enum clientstatus
+  {
     CLIENTSTATUS_UNINITIALIZED = 0,
     CLIENTSTATUS_BUSY = 1,
     CLIENTSTATUS_IDLE = 2
   } clientstatus;
   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);
   int command;
   jobnum_t jobnum;
   struct distrenjob *tmp_job;
   struct frameset *tmp_frame;
   int type;
   char *name;
   char *submitter;
   char *email;
   int priority;
   int width;
   int height;
   int start_frame;
   int end_frame;
   size_t read_buf;
   head.priority = 0; // make head have the highest priority
   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;
   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);
   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");
     fprintf(stderr, "\t4 \tAdd a job\n");
     fprintf(stderr, "\t5 \tDelete a job\n");
     fprintf(stderr, "\t6 \tPrint jobnums in queue\n");
     fprintf(stderr, "\t7 \tQuit\n");
     scanf("%d", &command);
     switch(command)
+    {
     case 1:
       fprintf(stderr, "Job number: ");
       scanf("%d", &jobnum);
       printJob(distrenjob_get(&head, jobnum));
       break;
     case 2:
       fprintf(stderr, "Job number: ");
       scanf("%d", &jobnum);
       printJobInfo(distrenjob_get(&head, jobnum));
@@ @@ -1031,26 +1038,28 @@ int main(int argc, char *argv[]) @@
       /* 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(&head, &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(&head, job, frame->num); // @TODO: Make sure this actually works.
+      	}
       distrend_action_free(action);
+    }
   distrend_unlisten(listenset);
   distrend_config_free(config);
   xmlcleanup();
   return 0;
+}

0 comments (0 inline, 0 general)