DistRen Changeset - f26936aa69e0 · protofusion repositories

Changeset - f26936aa69e0

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 16 years ago 2010-01-03 12:52:04
ohnobinki@ohnopublishing.net

cleanup distrend_do_config() slightly

1 file changed with 5 insertions and 15 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -238,26 +238,26 @@ int restoreJobState(struct distrenjob *j @@
       free(path_and_number);
+    }
   return !isJobDone;
+}
 /**
    creates a structure from starting data, then calls another
    function to actually add that struct to the queue.
 */
 int prepare_distrenjob(struct general_info *geninfo, int type, char *name, char *submitter, char *email, int priority, int start_frame, int end_frame, int width, int height)
+{
   int counter;
   int counter2;
   int counter;
   int tmp;
   char *path_with_num;
   char *serialfile;
   struct distrenjob *distrenjob;
   tmp = distrenjob_new(&distrenjob);
   if(tmp)
     return 1;
   geninfo->highest_jobnum ++;
   distrenjob->jobnum = geninfo->highest_jobnum;
@@ @@ -663,35 +663,25 @@ int distrend_do_config(int argc, char *a @@
           myopts_listen,
           CFGF_MULTI),
       CFG_SIMPLE_STR("datadir", NULL),
       CFG_STR_LIST("render_types", NULL, CFGF_NONE),
       CFG_END()
     };
   struct distrenjob *distrenjob;
   cfg_t *cfg_listen;
   int tmp;
   /*
    * test distrenjob_unserialize()
    */
   tmp = distrenjob_unserialize(&distrenjob, "distrenjob.xml.example");
   if(tmp)
     fprintf(stderr, "distrenjob_unserialize() returned %d. Try to cd to distren/doc if you want to test out the distrenjob_unserialize() 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__);
   fprintf(stderr, "%s:%d: running config\n", __FILE__, __LINE__);
   *config = malloc(sizeof(struct distrend_config));
   myopts[1].simple_value = &(*config)->datadir;
   if(options_init(argc, argv, &(*config)->mycfg, myopts, "daemon", &(*config)->options))
     return 1;
   /**
      grab listen blocks:
    */
   (*config)->listens = malloc(sizeof(struct distrend_listen) * (cfg_size((*config)->mycfg, "listen") + 1));
   for(counter = 0; counter < cfg_size((*config)->mycfg, "listen"); counter ++)
+    {
@@ @@ -1125,25 +1115,25 @@ 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 test mode if 1
+  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;
@@ @@ -1182,27 +1172,27 @@ int main(int argc, char *argv[]) @@
+    }
   cont = 1;
   if(distrend_do_config(argc, argv, &general_info.config))
     return 1;
   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
+  /** pre-loaded jobs for testing */
   prepare_distrenjob(&general_info, 1, "awesome", "LordOfWar", "onlylordofwar@gmail.com", 8, 1, 100, 640, 480);
-  prepare_distrenjob(&general_info, 1, "hamburger", "Ohnobinki", "ohnobinki@ohnopublishing.net", 3, 1, 50, 1280, 720);
+  prepare_distrenjob(&general_info, 1, "hamburger", "ohnobinki", "ohnobinki@ohnopublishing.net", 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");
     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 \tPrint general info\n");
     fprintf(stderr, "\t8 \tQuit\n");

0 comments (0 inline, 0 general)